routes: index view
Anirudh Oppiliappan x@icyphox.sh
Mon, 12 Dec 2022 21:33:09 +0530
7 files changed, 86 insertions(+), 11 deletions(-)
M config.yaml → config.yaml
@@ -1,5 +1,5 @@ git: - scanPath: /home/icy/code/tmp + scanPath: /home/icy/code/tmp/testrepos readme: - readme - README
M git/git.go → git/git.go
@@ -52,6 +52,14 @@ return commits, nil } +func (g *GitRepo) LastCommit() (*object.Commit, error) { + c, err := g.r.CommitObject(g.h) + if err != nil { + return nil, fmt.Errorf("last commit: %w", err) + } + return c, nil +} + func (g *GitRepo) FileContent(path string) (string, error) { c, err := g.r.CommitObject(g.h) if err != nil {
M routes/routes.go → routes/routes.go
@@ -4,7 +4,9 @@ import ( "html/template" "log" "net/http" + "os" "path/filepath" + "time" "github.com/alexedwards/flow" "icyphox.sh/legit/config" @@ -16,14 +18,50 @@ c *config.Config } func (d *deps) Index(w http.ResponseWriter, r *http.Request) { + dirs, err := os.ReadDir(d.c.Git.ScanPath) + if err != nil { + d.Write500(w) + log.Printf("reading scan path: %s", err) + return + } + repoInfo := make(map[string]time.Time) + + for _, dir := range dirs { + path := filepath.Join(d.c.Git.ScanPath, dir.Name()) + gr, err := git.Open(path, "") + if err != nil { + d.Write500(w) + log.Printf("opening dir %s: %s", path, err) + return + } + + c, err := gr.LastCommit() + if err != nil { + d.Write500(w) + log.Println(err) + } + + repoInfo[dir.Name()] = c.Author.When + } + + tpath := filepath.Join(d.c.Template.Dir, "*") + t := template.Must(template.ParseGlob(tpath)) + + data := make(map[string]interface{}) + data["meta"] = d.c.Meta + data["info"] = repoInfo + + if err := t.ExecuteTemplate(w, "index", data); err != nil { + log.Println(err) + return + } } func (d *deps) RepoIndex(w http.ResponseWriter, r *http.Request) { name := flow.Param(r.Context(), "name") name = filepath.Clean(name) - // TODO: remove .git - path := filepath.Join(d.c.Git.ScanPath, name+".git") + path := filepath.Join(d.c.Git.ScanPath, name) gr, err := git.Open(path, "") if err != nil { d.Write404(w) @@ -65,8 +103,7 @@ treePath := flow.Param(r.Context(), "...") ref := flow.Param(r.Context(), "ref") name = filepath.Clean(name) - // TODO: remove .git - path := filepath.Join(d.c.Git.ScanPath, name+".git") + path := filepath.Join(d.c.Git.ScanPath, name) gr, err := git.Open(path, ref) if err != nil { d.Write404(w) @@ -95,8 +132,7 @@ treePath := flow.Param(r.Context(), "...") ref := flow.Param(r.Context(), "ref") name = filepath.Clean(name) - // TODO: remove .git - path := filepath.Join(d.c.Git.ScanPath, name+".git") + path := filepath.Join(d.c.Git.ScanPath, name) gr, err := git.Open(path, ref) if err != nil { d.Write404(w) @@ -116,7 +152,7 @@ func (d *deps) Log(w http.ResponseWriter, r *http.Request) { name := flow.Param(r.Context(), "name") ref := flow.Param(r.Context(), "ref") - path := filepath.Join(d.c.Git.ScanPath, name+".git") + path := filepath.Join(d.c.Git.ScanPath, name) gr, err := git.Open(path, ref) if err != nil { d.Write404(w) @@ -149,7 +185,7 @@ func (d *deps) Diff(w http.ResponseWriter, r *http.Request) { name := flow.Param(r.Context(), "name") ref := flow.Param(r.Context(), "ref") - path := filepath.Join(d.c.Git.ScanPath, name+".git") + path := filepath.Join(d.c.Git.ScanPath, name) gr, err := git.Open(path, ref) if err != nil { d.Write404(w)
M templates/500.html → templates/500.html
@@ -1,7 +1,7 @@ {{ define "500" }} <html> <title>500</title> -{{ template "header" . }} +{{ template "head" . }} <body> 500 — something broke! </body>
A templates/index.html
@@ -0,0 +1,27 @@+{{ define "index" }} +<html> +{{ template "head" . }} + + <header> + <h1>{{ .meta.Title }}</h1> + <h2>{{ .meta.Description }}</h2> + </header> + <body> + {{ template "nav" . }} + <main> + <table> + <tr> + <td>repository</td> + <td>last active</td> + </tr> + {{ range $repo, $lc := .info }} + <tr> + <td><a href="/{{ $repo }}">{{ $repo }}</a></td> + <td>{{ $lc }}</td> + </tr> + {{ end }} + </table> + </main> + </body> +</html> +{{ end }}
M templates/repo.html → templates/repo.html
@@ -37,7 +37,7 @@ <td> {{ if $parent }} <a href="/{{ $repo }}/tree/{{ $ref }}/{{ $parent }}/{{ .Name }}">{{ .Name }}/</a> {{ else }} - <a href="{{ $repo }}/tree/{{ $ref }}/{{ .Name }}">{{ .Name }}/</a> + <a href="/{{ $repo }}/tree/{{ $ref }}/{{ .Name }}">{{ .Name }}/</a> {{ end }} </td> </tr>