diff options
| -rw-r--r-- | git_misc.go | 3 | ||||
| -rw-r--r-- | handle_repo_tree.go | 81 | ||||
| -rw-r--r-- | resources.go | 5 | ||||
| -rw-r--r-- | template_funcs.go | 9 | ||||
| -rw-r--r-- | templates/repo_tree_dir.html | 6 |
5 files changed, 64 insertions, 40 deletions
diff --git a/git_misc.go b/git_misc.go index 4c8ea4d..64d1ff5 100644 --- a/git_misc.go +++ b/git_misc.go @@ -3,6 +3,7 @@ package main import ( "errors" "path/filepath" + "strings" "github.com/go-git/go-git/v5" "github.com/go-git/go-git/v5/plumbing" @@ -29,7 +30,7 @@ func build_display_git_tree(tree *object.Tree) []display_git_tree_entry_t { if err != nil { display_git_tree_entry.Size = 0 } - display_git_tree_entry.Name = entry.Name + display_git_tree_entry.Name = strings.TrimPrefix(entry.Name, "/") display_git_tree = append(display_git_tree, display_git_tree_entry) } return display_git_tree diff --git a/handle_repo_tree.go b/handle_repo_tree.go index 0782ce8..8397a84 100644 --- a/handle_repo_tree.go +++ b/handle_repo_tree.go @@ -5,17 +5,20 @@ import ( "html/template" "net/http" "strings" + "path" chroma_formatters_html "github.com/alecthomas/chroma/v2/formatters/html" chroma_lexers "github.com/alecthomas/chroma/v2/lexers" chroma_styles "github.com/alecthomas/chroma/v2/styles" "github.com/go-git/go-git/v5/plumbing" + "github.com/go-git/go-git/v5/plumbing/object" ) func handle_repo_tree(w http.ResponseWriter, r *http.Request) { data := make(map[string]any) // TODO: Sanitize path values - ref_name, category_name, repo_name, path_spec := r.PathValue("ref"), r.PathValue("category_name"), r.PathValue("repo_name"), strings.TrimSuffix(r.PathValue("rest"), "/") + raw_path_spec := r.PathValue("rest") + ref_name, category_name, repo_name, path_spec := r.PathValue("ref"), r.PathValue("category_name"), r.PathValue("repo_name"), strings.TrimSuffix(raw_path_spec, "/") data["ref"], data["category_name"], data["repo_name"], data["path_spec"] = ref_name, category_name, repo_name, path_spec repo, err := open_git_repo(category_name, repo_name) if err != nil { @@ -39,43 +42,53 @@ func handle_repo_tree(w http.ResponseWriter, r *http.Request) { return } - target, err := tree.Tree(path_spec) - if err != nil { - file, err := tree.File(path_spec) - if err != nil { - _, _ = w.Write([]byte("Error retrieving path: " + err.Error())) - return - } - file_contents, err := file.Contents() - if err != nil { - _, _ = w.Write([]byte("Error reading file: " + err.Error())) - return - } - lexer := chroma_lexers.Match(path_spec) - if lexer == nil { - lexer = chroma_lexers.Fallback - } - iterator, err := lexer.Tokenise(nil, file_contents) + var target *object.Tree + if path_spec == "" { + target = tree + } else { + target, err = tree.Tree(path_spec) if err != nil { - _, _ = w.Write([]byte("Error tokenizing code: " + err.Error())) + file, err := tree.File(path_spec) + if err != nil { + _, _ = w.Write([]byte("Error retrieving path: " + err.Error())) + return + } + file_contents, err := file.Contents() + if err != nil { + _, _ = w.Write([]byte("Error reading file: " + err.Error())) + return + } + lexer := chroma_lexers.Match(path_spec) + if lexer == nil { + lexer = chroma_lexers.Fallback + } + iterator, err := lexer.Tokenise(nil, file_contents) + if err != nil { + _, _ = w.Write([]byte("Error tokenizing code: " + err.Error())) + return + } + var formatted_unencapsulated bytes.Buffer + style := chroma_styles.Get("autumn") + formatter := chroma_formatters_html.New(chroma_formatters_html.WithClasses(true), chroma_formatters_html.TabWidth(8)) + err = formatter.Format(&formatted_unencapsulated, style, iterator) + if err != nil { + _, _ = w.Write([]byte("Error formatting code: " + err.Error())) + return + } + formatted_encapsulated := template.HTML(formatted_unencapsulated.Bytes()) + data["file_contents"] = formatted_encapsulated + + err = templates.ExecuteTemplate(w, "repo_tree_file", data) + if err != nil { + _, _ = w.Write([]byte("Error rendering template: " + err.Error())) + return + } return } - var formatted_unencapsulated bytes.Buffer - style := chroma_styles.Get("autumn") - formatter := chroma_formatters_html.New(chroma_formatters_html.WithClasses(true), chroma_formatters_html.TabWidth(8)) - err = formatter.Format(&formatted_unencapsulated, style, iterator) - if err != nil { - _, _ = w.Write([]byte("Error formatting code: " + err.Error())) - return - } - formatted_encapsulated := template.HTML(formatted_unencapsulated.Bytes()) - data["file_contents"] = formatted_encapsulated + } - err = templates.ExecuteTemplate(w, "repo_tree_file", data) - if err != nil { - _, _ = w.Write([]byte("Error rendering template: " + err.Error())) - return - } + if raw_path_spec[len(raw_path_spec) - 1] != '/' { + http.Redirect(w, r, path.Base(path_spec) + "/", http.StatusSeeOther) return } diff --git a/resources.go b/resources.go index afec157..860971c 100644 --- a/resources.go +++ b/resources.go @@ -13,7 +13,10 @@ var resources_fs embed.FS var templates *template.Template func load_templates() (err error) { - templates, err = template.New("templates").Funcs(template.FuncMap{"first_line": first_line}).ParseFS(resources_fs, "templates/*") + templates, err = template.New("templates").Funcs(template.FuncMap{ + "first_line": first_line, + "base_name": base_name, + }).ParseFS(resources_fs, "templates/*") return err } diff --git a/template_funcs.go b/template_funcs.go index 3c5ca0b..1c68650 100644 --- a/template_funcs.go +++ b/template_funcs.go @@ -1,8 +1,15 @@ package main -import "strings" +import ( + "path/filepath" + "strings" +) func first_line(s string) string { before, _, _ := strings.Cut(s, "\n") return before } + +func base_name (s string) string { + return filepath.Base(s) +} diff --git a/templates/repo_tree_dir.html b/templates/repo_tree_dir.html index cb5b264..207fcaa 100644 --- a/templates/repo_tree_dir.html +++ b/templates/repo_tree_dir.html @@ -3,7 +3,7 @@ <html> <head> {{ template "head_common" . }} - <title>{{ .category_name }}/repos/{{ .repo_name }}/{{ .path_spec }} – Lindenii Forge</title> + <title>{{ .category_name }}/repos/{{ .repo_name }}/{{ .path_spec }}{{ if ne .path_spec "" }}/{{ end }} – Lindenii Forge</title> </head> <body class="repo-tree-dir"> <div class="padding-wrapper"> @@ -11,7 +11,7 @@ <thead> <tr class="title-row"> <th colspan="3"> - /{{ .path_spec }}/ on {{ .ref }} + /{{ .path_spec }}{{ if ne .path_spec "" }}/{{ end }} on {{ .ref }} </th> </tr> <tr> @@ -25,7 +25,7 @@ {{- range .files }} <tr> <td class="file-mode">{{ .Mode }}</td> - <td class="file-name"><a href="{{ $path_spec }}/{{ .Name }}">{{ .Name }}</a>{{ if not .Is_file }}/{{ end }}</td> + <td class="file-name"><a href="{{ .Name }}{{ if not .Is_file }}/{{ end }}">{{ .Name }}</a>{{ if not .Is_file }}/{{ end }}</td> <td class="file-size">{{ .Size }}</td> </tr> {{- end }} |