routes: split repo index and files views
2 files changed, 48 insertions(+), 4 deletions(-)
M routes/handler.go → routes/handler.go
@@ -8,7 +8,7 @@ func Handlers(c *config.Config) *flow.Mux { mux := flow.New() d := deps{c} - mux.HandleFunc("/:name", d.Repo, "GET") - mux.HandleFunc("/:name/tree/...", d.Repo, "GET") + mux.HandleFunc("/:name", d.RepoIndex, "GET") + mux.HandleFunc("/:name/tree/:ref/...", d.RepoFiles, "GET") return mux }
M routes/routes.go → routes/routes.go
@@ -8,6 +8,7 @@ "path/filepath" "github.com/alexedwards/flow" gogit "github.com/go-git/go-git/v5" + "github.com/go-git/go-git/v5/plumbing" "icyphox.sh/legit/config" "icyphox.sh/legit/git" )@@ -16,9 +17,39 @@ type deps struct { c *config.Config } -func (d *deps) Repo(w http.ResponseWriter, r *http.Request) { +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") + repo, err := gogit.PlainOpen(path) + if err != nil { + Write404(w, *d.c) + return + } + + head, err := repo.Head() + if err != nil { + Write500(w, *d.c) + log.Println(err) + return + } + + files, err := git.FilesAtRef(repo, head.Hash(), "") + if err != nil { + Write500(w, *d.c) + log.Println(err) + return + } + + d.renderFiles(files, w) + return +} + +func (d *deps) RepoFiles(w http.ResponseWriter, r *http.Request) { name := flow.Param(r.Context(), "name") treePath := flow.Param(r.Context(), "...") + ref := flow.Param(r.Context(), "ref") name = filepath.Clean(name) // TODO: remove .git@@ -29,12 +60,25 @@ Write404(w, *d.c) return } - files, err := git.FilesAtHead(repo, treePath) + hash, err := repo.ResolveRevision(plumbing.Revision(ref)) if err != nil { Write500(w, *d.c) log.Println(err) + return } + files, err := git.FilesAtRef(repo, *hash, treePath) + if err != nil { + Write500(w, *d.c) + log.Println(err) + return + } + + d.renderFiles(files, w) + return +} + +func (d *deps) renderFiles(files []git.NiceTree, w http.ResponseWriter) { tpath := filepath.Join(d.c.Template.Dir, "*") t := template.Must(template.ParseGlob(tpath))