From 9c4f62a4a0705657404745c84d9ba9472d32def5 Mon Sep 17 00:00:00 2001 From: Runxi Yu Date: Mon, 10 Feb 2025 21:19:55 +0800 Subject: [PATCH] *: category -> group --- git_misc.go | 4 ++-- handle_category_index.go | 10 +++++----- handle_repo_index.go | 6 +++--- handle_repo_tree.go | 6 +++--- main.go | 6 +++--- templates/category_repos.html | 8 ++++---- templates/repo_index.html | 2 +- templates/repo_tree_dir.html | 2 +- templates/repo_tree_file.html | 2 +- diff --git a/git_misc.go b/git_misc.go index 64d1ff5649f536f05dbd494201192485e66594a1..984d0f252e43b103b6df36f64876d76a38fc2b68 100644 --- a/git_misc.go +++ b/git_misc.go @@ -11,8 +11,8 @@ "github.com/go-git/go-git/v5/plumbing/object" "go.lindenii.runxiyu.org/lindenii-common/misc" ) -func open_git_repo(category_name, repo_name string) (*git.Repository, error) { - return git.PlainOpen(filepath.Join(config.Git.Root, category_name, repo_name+".git")) +func open_git_repo(group_name, repo_name string) (*git.Repository, error) { + return git.PlainOpen(filepath.Join(config.Git.Root, group_name, repo_name+".git")) } func build_display_git_tree(tree *object.Tree) []display_git_tree_entry_t { diff --git a/handle_category_index.go b/handle_category_index.go index f9b201c2afcd6421dd66c940ec9df13fe0bec62c..f194cee095835e9c76d77711a7e2904d800915f6 100644 --- a/handle_category_index.go +++ b/handle_category_index.go @@ -7,11 +7,11 @@ "path/filepath" "strings" ) -func handle_category_repos(w http.ResponseWriter, r *http.Request) { +func handle_group_repos(w http.ResponseWriter, r *http.Request) { data := make(map[string]any) - category_name := r.PathValue("category_name") - data["category_name"] = category_name - entries, err := os.ReadDir(filepath.Join(config.Git.Root, category_name)) + group_name := r.PathValue("group_name") + data["group_name"] = group_name + entries, err := os.ReadDir(filepath.Join(config.Git.Root, group_name)) if err != nil { _, _ = w.Write([]byte("Error listing repos: " + err.Error())) return @@ -26,7 +26,7 @@ } } data["repos"] = repos - err = templates.ExecuteTemplate(w, "category_repos", data) + err = templates.ExecuteTemplate(w, "group_repos", data) if err != nil { _, _ = w.Write([]byte("Error rendering template: " + err.Error())) return diff --git a/handle_repo_index.go b/handle_repo_index.go index cdcc0922cf4845c6f80673b1d438698550a2064b..0f38fc267852032e9b427f071a91e7a261166d62 100644 --- a/handle_repo_index.go +++ b/handle_repo_index.go @@ -7,9 +7,9 @@ func handle_repo_index(w http.ResponseWriter, r *http.Request) { data := make(map[string]any) // TODO: Sanitize path values - category_name, repo_name := r.PathValue("category_name"), r.PathValue("repo_name") - data["category_name"], data["repo_name"] = category_name, repo_name - repo, err := open_git_repo(category_name, repo_name) + group_name, repo_name := r.PathValue("group_name"), r.PathValue("repo_name") + data["group_name"], data["repo_name"] = group_name, repo_name + repo, err := open_git_repo(group_name, repo_name) if err != nil { _, _ = w.Write([]byte("Error opening repo: " + err.Error())) return diff --git a/handle_repo_tree.go b/handle_repo_tree.go index 8397a841f893e8f82183aacdb4ce6ebcecfdf31a..26d7fd6098f9f3b1d51c5caf82e310a78d290f11 100644 --- a/handle_repo_tree.go +++ b/handle_repo_tree.go @@ -18,9 +18,9 @@ func handle_repo_tree(w http.ResponseWriter, r *http.Request) { data := make(map[string]any) // TODO: Sanitize path values 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) + ref_name, group_name, repo_name, path_spec := r.PathValue("ref"), r.PathValue("group_name"), r.PathValue("repo_name"), strings.TrimSuffix(raw_path_spec, "/") + data["ref"], data["group_name"], data["repo_name"], data["path_spec"] = ref_name, group_name, repo_name, path_spec + repo, err := open_git_repo(group_name, repo_name) if err != nil { _, _ = w.Write([]byte("Error opening repo: " + err.Error())) return diff --git a/main.go b/main.go index 6c69af45204b697f0785c3b7f58b02330fe5ded6..5997e082df7f6168176c461caeab6c9d8f5fb9cd 100644 --- a/main.go +++ b/main.go @@ -34,9 +34,9 @@ serve_source() http.HandleFunc("/{$}", handle_index) - http.HandleFunc("/{category_name}/repos/{$}", handle_category_repos) - http.HandleFunc("/{category_name}/repos/{repo_name}/{$}", handle_repo_index) - http.HandleFunc("/{category_name}/repos/{repo_name}/tree/{ref}/{rest...}", handle_repo_tree) + http.HandleFunc("/{group_name}/repos/{$}", handle_group_repos) + http.HandleFunc("/{group_name}/repos/{repo_name}/{$}", handle_repo_index) + http.HandleFunc("/{group_name}/repos/{repo_name}/tree/{ref}/{rest...}", handle_repo_tree) listener, err := net.Listen(config.HTTP.Net, config.HTTP.Addr) if err != nil { diff --git a/templates/category_repos.html b/templates/category_repos.html index 406fee48b9bc6f3e493a1cd3dd1ec973ccf6c71c..aa4c9262311bf843a21b2840e67ccd15cdbc9ad6 100644 --- a/templates/category_repos.html +++ b/templates/category_repos.html @@ -1,14 +1,14 @@ -{{- define "category_repos" -}} +{{- define "group_repos" -}} {{ template "head_common" . }} - Repos in {{ .category_name }} – Lindenii Forge + Repos in {{ .group_name }} – Lindenii Forge - +

- Repos in {{ .category_name }} + Repos in {{ .group_name }}