From e2a6d73b940bd2a222747f777efc37c3b04b1d16 Mon Sep 17 00:00:00 2001 From: Runxi Yu Date: Thu, 3 Apr 2025 17:53:30 +0800 Subject: HTML: Use the proper repo_url_root in tree/rawtree --- http_server.go | 7 +++++++ templates/repo_raw_dir.tmpl | 14 +++++++------- templates/repo_tree_dir.tmpl | 14 +++++++------- 3 files changed, 21 insertions(+), 14 deletions(-) diff --git a/http_server.go b/http_server.go index 722ac81..0a474cc 100644 --- a/http_server.go +++ b/http_server.go @@ -6,6 +6,7 @@ package main import ( "errors" "net/http" + "net/url" "strconv" "strings" @@ -184,6 +185,12 @@ func (router *forgeHTTPRouter) ServeHTTP(writer http.ResponseWriter, request *ht return } + repoURLRoot := "/" + for _, part := range segments[:sepIndex+3] { + repoURLRoot = repoURLRoot + url.PathEscape(part) + "/" + } + params["repo_url_root"] = repoURLRoot + if len(segments) == sepIndex+3 { if redirectDir(writer, request) { return diff --git a/templates/repo_raw_dir.tmpl b/templates/repo_raw_dir.tmpl index c0df8fd..4072326 100644 --- a/templates/repo_raw_dir.tmpl +++ b/templates/repo_raw_dir.tmpl @@ -16,25 +16,25 @@

{{- .repo_name -}}

diff --git a/templates/repo_tree_dir.tmpl b/templates/repo_tree_dir.tmpl index 3f43064..c528fee 100644 --- a/templates/repo_tree_dir.tmpl +++ b/templates/repo_tree_dir.tmpl @@ -16,25 +16,25 @@

{{- .repo_name -}}

-- cgit v1.2.3