From 9a73af056287ad19881667c88c687e2864cfa363 Mon Sep 17 00:00:00 2001 From: Runxi Yu Date: Mon, 10 Feb 2025 10:56:30 +0800 Subject: [PATCH] repo_tree: Display files too --- handle_repo_tree.go | 27 +++++++++++++++++++++------ templates/repo_tree_file.html | 15 +++++++++++++++ diff --git a/handle_repo_tree.go b/handle_repo_tree.go index 7c1b0cc0d660534b25066c6eab2bc95283904817..e5ea2c94330d7857b4e48ff1143f60fef9318c9b 100644 --- a/handle_repo_tree.go +++ b/handle_repo_tree.go @@ -55,12 +55,28 @@ if err != nil { w.Write([]byte("Error getting file tree: " + err.Error())) return } - tree, err = tree.Tree(path_spec) + + target, err := tree.Tree(path_spec) if err != nil { - w.Write([]byte("Error getting subtree: " + err.Error())) + file, err := tree.File(path_spec) + if err != nil { + w.Write([]byte("Error retrieving path: " + err.Error())) + return + } + data["file_contents"], err = file.Contents() + if err != nil { + w.Write([]byte("Error reading file: " + err.Error())) + return + } + err = templates.ExecuteTemplate(w, "repo_tree_file", data) + if err != nil { + w.Write([]byte("Error rendering template: " + err.Error())) + return + } return } - readme_file, err := tree.File("README.md") + + readme_file, err := target.File("README.md") if err != nil { data["readme"] = "" } else { @@ -69,14 +85,13 @@ var readme_rendered_unsafe bytes.Buffer err = goldmark.Convert([]byte(readme_file_contents), &readme_rendered_unsafe) if err != nil { readme_rendered_unsafe.WriteString("Unable to render README: " + err.Error()) - return } readme_rendered_safe := template.HTML(bluemonday.UGCPolicy().SanitizeBytes(readme_rendered_unsafe.Bytes())) data["readme"] = readme_rendered_safe } display_git_tree := make([]display_git_tree_entry_t, 0) - for _, entry := range tree.Entries { + for _, entry := range target.Entries { display_git_tree_entry := display_git_tree_entry_t{} os_mode, err := entry.Mode.ToOSFileMode() if err != nil { @@ -85,7 +100,7 @@ } else { display_git_tree_entry.Mode = os_mode.String()[:4] } display_git_tree_entry.Is_file = entry.Mode.IsFile() - display_git_tree_entry.Size, err = tree.Size(entry.Name) + display_git_tree_entry.Size, err = target.Size(entry.Name) if err != nil { display_git_tree_entry.Size = 0 } diff --git a/templates/repo_tree_file.html b/templates/repo_tree_file.html new file mode 100644 index 0000000000000000000000000000000000000000..0df921632d91d24b7b84c91dceece7d1bf5fb89d --- /dev/null +++ b/templates/repo_tree_file.html @@ -0,0 +1,15 @@ +{{- define "repo_tree_file" -}} + + + + +{{ .project_name }}/repos/{{ .repo_name }}/{{ .path_spec }} + + +

+/{{ .path_spec }} +

+
{{ .file_contents }}
+ + +{{- end -}} -- 2.48.1