From 8a0ebe220af6aa7e7138def83b7cd2ebbc8418b2 Mon Sep 17 00:00:00 2001
From: Marco Andronaco <andronacomarco@gmail.com>
Date: Fri, 5 Jul 2024 16:32:34 +0000
Subject: git: hide .git extension

---
 routes/routes.go           | 21 +++++++++++++++------
 routes/util.go             |  8 ++++++++
 templates/index.html       |  2 +-
 templates/repo-header.html |  2 +-
 4 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/routes/routes.go b/routes/routes.go
index 14dbcf7..8813baa 100644
--- a/routes/routes.go
+++ b/routes/routes.go
@@ -33,8 +33,8 @@ func (d *deps) Index(w http.ResponseWriter, r *http.Request) {
 	}
 
 	type info struct {
-		Name, Desc, Idle string
-		d                time.Time
+		DisplayName, Name, Desc, Idle string
+		d                             time.Time
 	}
 
 	infos := []info{}
@@ -58,13 +58,16 @@ func (d *deps) Index(w http.ResponseWriter, r *http.Request) {
 			return
 		}
 
+		name := dir.Name()
+
 		desc := getDescription(path)
 
 		infos = append(infos, info{
-			Name: dir.Name(),
-			Desc: desc,
-			Idle: humanize.Time(c.Author.When),
-			d:    c.Author.When,
+			DisplayName: getDisplayName(name),
+			Name:        name,
+			Desc:        desc,
+			Idle:        humanize.Time(c.Author.When),
+			d:           c.Author.When,
 		})
 	}
 
@@ -149,6 +152,7 @@ func (d *deps) RepoIndex(w http.ResponseWriter, r *http.Request) {
 
 	data := make(map[string]any)
 	data["name"] = name
+	data["displayname"] = getDisplayName(name)
 	data["ref"] = mainBranch
 	data["readme"] = readmeContent
 	data["commits"] = commits
@@ -191,6 +195,7 @@ func (d *deps) RepoTree(w http.ResponseWriter, r *http.Request) {
 
 	data := make(map[string]any)
 	data["name"] = name
+	data["displayname"] = getDisplayName(name)
 	data["ref"] = ref
 	data["parent"] = treePath
 	data["desc"] = getDescription(path)
@@ -225,6 +230,7 @@ func (d *deps) FileContent(w http.ResponseWriter, r *http.Request) {
 	contents, err := gr.FileContent(treePath)
 	data := make(map[string]any)
 	data["name"] = name
+	data["displayname"] = getDisplayName(name)
 	data["ref"] = ref
 	data["desc"] = getDescription(path)
 	data["path"] = treePath
@@ -317,6 +323,7 @@ func (d *deps) Log(w http.ResponseWriter, r *http.Request) {
 	data["commits"] = commits
 	data["meta"] = d.c.Meta
 	data["name"] = name
+	data["displayname"] = getDisplayName(name)
 	data["ref"] = ref
 	data["desc"] = getDescription(path)
 	data["log"] = true
@@ -359,6 +366,7 @@ func (d *deps) Diff(w http.ResponseWriter, r *http.Request) {
 	data["diff"] = diff.Diff
 	data["meta"] = d.c.Meta
 	data["name"] = name
+	data["displayname"] = getDisplayName(name)
 	data["ref"] = ref
 	data["desc"] = getDescription(path)
 
@@ -402,6 +410,7 @@ func (d *deps) Refs(w http.ResponseWriter, r *http.Request) {
 
 	data["meta"] = d.c.Meta
 	data["name"] = name
+	data["displayname"] = getDisplayName(name)
 	data["branches"] = branches
 	data["tags"] = tags
 	data["desc"] = getDescription(path)
diff --git a/routes/util.go b/routes/util.go
index 1b31b17..27c26ce 100644
--- a/routes/util.go
+++ b/routes/util.go
@@ -16,6 +16,14 @@ func isGoModule(gr *git.GitRepo) bool {
 	return err == nil
 }
 
+func getDisplayName(name string) string {
+	l := len(name) - 4
+	if name[l:] == ".git" {
+		name = name[:l]
+	}
+	return name
+}
+
 func getDescription(path string) (desc string) {
 	db, err := os.ReadFile(filepath.Join(path, "description"))
 	if err == nil {
diff --git a/templates/index.html b/templates/index.html
index 80c9e1d..7a77aec 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -10,7 +10,7 @@
     <main>
       <div class="index">
       {{ range .info }}
-       <div class="index-name"><a href="/{{ .Name }}">{{ .Name }}</a></div>
+       <div class="index-name"><a href="/{{ .Name }}">{{ .DisplayName }}</a></div>
        <div class="desc">{{ .Desc }}</div>
        <div>{{ .Idle }}</div>
       {{ end }}
diff --git a/templates/repo-header.html b/templates/repo-header.html
index f358278..0420da7 100644
--- a/templates/repo-header.html
+++ b/templates/repo-header.html
@@ -2,7 +2,7 @@
 <header>
   <h2>
   <a href="/">all repos</a>
-   &mdash; {{ .name }}
+   &mdash; {{ .displayname }}
     {{ if .ref }}
     <span class="ref">@ {{ .ref }}</span>
     {{ end }}
-- 
cgit v1.2.3