From 226be7dd41247ad93766cd6bc2bbb07616a42567 Mon Sep 17 00:00:00 2001 From: Matthias Wientapper Date: Wed, 3 Oct 2018 22:51:23 +0200 Subject: [PATCH 1/4] Fix images in Wiki repo not showing in Gitea Wiki (#4690) wikiRaw method in routers calls WikiNameToFilename which unconditionally adds ".md" to the path. As a result, findEntryForFile will fail finding the corresponding git blob. I added WikiNameToFilenameRaw to the model used in wikiRaw which omits any additions to the filename. --- models/wiki.go | 6 ++++++ routers/repo/wiki.go | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/models/wiki.go b/models/wiki.go index 4637a449cdf64..57d02c498b1c4 100644 --- a/models/wiki.go +++ b/models/wiki.go @@ -42,6 +42,12 @@ func WikiNameToFilename(name string) string { return url.QueryEscape(name) + ".md" } +// WikiNameToFilename converts a wiki name to its corresponding raw filename. +func WikiNameToFilenameRaw(name string) string { + name = strings.Replace(name, " ", "-", -1) + return url.QueryEscape(name) +} + // WikiFilenameToName converts a wiki filename to its corresponding page name. func WikiFilenameToName(filename string) (string, error) { if !strings.HasSuffix(filename, ".md") { diff --git a/routers/repo/wiki.go b/routers/repo/wiki.go index 3220ab134d46a..2f1d87a5edaa2 100644 --- a/routers/repo/wiki.go +++ b/routers/repo/wiki.go @@ -294,7 +294,7 @@ func WikiRaw(ctx *context.Context) { if strings.HasSuffix(providedPath, ".md") { providedPath = providedPath[:len(providedPath)-3] } - wikiPath := models.WikiNameToFilename(providedPath) + wikiPath := models.WikiNameToFilenameRaw(providedPath) var entry *git.TreeEntry if commit != nil { entry, err = findEntryForFile(commit, wikiPath) From aac4d1d6b5b0e60d7fa57d1db3a8ea49cdf41661 Mon Sep 17 00:00:00 2001 From: Matthias Wientapper Date: Wed, 3 Oct 2018 23:32:03 +0200 Subject: [PATCH 2/4] Fixed comment according to style guide (#4690) --- models/wiki.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/models/wiki.go b/models/wiki.go index 57d02c498b1c4..7174053800c77 100644 --- a/models/wiki.go +++ b/models/wiki.go @@ -42,7 +42,7 @@ func WikiNameToFilename(name string) string { return url.QueryEscape(name) + ".md" } -// WikiNameToFilename converts a wiki name to its corresponding raw filename. +// WikiNameToFilenameRaw converts a wiki name to its corresponding raw filename. func WikiNameToFilenameRaw(name string) string { name = strings.Replace(name, " ", "-", -1) return url.QueryEscape(name) From 2e263a0472cf8ddeb503e12663d7beffadf3d512 Mon Sep 17 00:00:00 2001 From: Matthias Wientapper Date: Fri, 5 Oct 2018 20:42:40 +0200 Subject: [PATCH 3/4] Fixed fmt (#4690) --- models/wiki.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/models/wiki.go b/models/wiki.go index 7174053800c77..ca7d0751d6472 100644 --- a/models/wiki.go +++ b/models/wiki.go @@ -45,7 +45,7 @@ func WikiNameToFilename(name string) string { // WikiNameToFilenameRaw converts a wiki name to its corresponding raw filename. func WikiNameToFilenameRaw(name string) string { name = strings.Replace(name, " ", "-", -1) - return url.QueryEscape(name) + return url.QueryEscape(name) } // WikiFilenameToName converts a wiki filename to its corresponding page name. From 06492fcedda89f49659ed6a4282f7fdb085f1322 Mon Sep 17 00:00:00 2001 From: Matthias Wientapper Date: Sun, 7 Oct 2018 23:10:31 +0200 Subject: [PATCH 4/4] Fixed code duplication (#4690) --- models/wiki.go | 6 ------ routers/repo/wiki.go | 2 +- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/models/wiki.go b/models/wiki.go index ca7d0751d6472..4637a449cdf64 100644 --- a/models/wiki.go +++ b/models/wiki.go @@ -42,12 +42,6 @@ func WikiNameToFilename(name string) string { return url.QueryEscape(name) + ".md" } -// WikiNameToFilenameRaw converts a wiki name to its corresponding raw filename. -func WikiNameToFilenameRaw(name string) string { - name = strings.Replace(name, " ", "-", -1) - return url.QueryEscape(name) -} - // WikiFilenameToName converts a wiki filename to its corresponding page name. func WikiFilenameToName(filename string) (string, error) { if !strings.HasSuffix(filename, ".md") { diff --git a/routers/repo/wiki.go b/routers/repo/wiki.go index 2f1d87a5edaa2..785d65846fed0 100644 --- a/routers/repo/wiki.go +++ b/routers/repo/wiki.go @@ -294,7 +294,7 @@ func WikiRaw(ctx *context.Context) { if strings.HasSuffix(providedPath, ".md") { providedPath = providedPath[:len(providedPath)-3] } - wikiPath := models.WikiNameToFilenameRaw(providedPath) + wikiPath := models.WikiNameToSubURL(providedPath) var entry *git.TreeEntry if commit != nil { entry, err = findEntryForFile(commit, wikiPath)