From 30254b941b21d1544a464f962b70bcccf4744a18 Mon Sep 17 00:00:00 2001 From: Aly Sewelam Date: Mon, 24 Nov 2025 11:26:24 +0200 Subject: [PATCH 01/17] Detect markup rendering from filename Instead of hard coding it to be markdown only and allow for org files to be detected and rendered properly --- routers/web/repo/wiki.go | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/routers/web/repo/wiki.go b/routers/web/repo/wiki.go index 542ac9c7316a3..dfa8c183a3041 100644 --- a/routers/web/repo/wiki.go +++ b/routers/web/repo/wiki.go @@ -252,7 +252,7 @@ func renderViewPage(ctx *context.Context) (*git.Repository, *git.TreeEntry) { rctx := renderhelper.NewRenderContextRepoWiki(ctx, ctx.Repo.Repository) - renderFn := func(data []byte) (escaped *charset.EscapeStatus, output template.HTML, err error) { + renderFn := func(data []byte, filename string) (escaped *charset.EscapeStatus, output template.HTML, err error) { buf := &strings.Builder{} markupRd, markupWr := io.Pipe() defer markupWr.Close() @@ -265,13 +265,21 @@ func renderViewPage(ctx *context.Context) (*git.Repository, *git.TreeEntry) { close(done) }() - err = markdown.Render(rctx, bytes.NewReader(data), markupWr) + // Detect markup type from filename and use the appropriate renderer + // (.md -> markdown, .org -> orgmode) + markupType := markup.DetectMarkupTypeByFileName(filename) + if markupType == "" { + // Default to markdown if detection fails + markupType = markdown.MarkupName + } + fileRctx := rctx.WithMarkupType(markupType).WithRelativePath(filename) + err = markup.Render(fileRctx, bytes.NewReader(data), markupWr) _ = markupWr.CloseWithError(err) <-done return escaped, output, err } - ctx.Data["EscapeStatus"], ctx.Data["WikiContentHTML"], err = renderFn(data) + ctx.Data["EscapeStatus"], ctx.Data["WikiContentHTML"], err = renderFn(data, pageFilename) if err != nil { ctx.ServerError("Render", err) return nil, nil From cb9334414a71a8b0042be44b94028b9c0fa85b81 Mon Sep 17 00:00:00 2001 From: Aly Sewelam Date: Mon, 24 Nov 2025 11:29:59 +0200 Subject: [PATCH 02/17] Detect .org files if .md isn't found in wiki Resort to raw file if neither is found too. --- routers/web/repo/wiki.go | 36 +++++++++++++++++++++++++++++------- 1 file changed, 29 insertions(+), 7 deletions(-) diff --git a/routers/web/repo/wiki.go b/routers/web/repo/wiki.go index dfa8c183a3041..6795e05a4dce4 100644 --- a/routers/web/repo/wiki.go +++ b/routers/web/repo/wiki.go @@ -153,14 +153,36 @@ func wikiEntryByName(ctx *context.Context, commit *git.Commit, wikiName wiki_ser return nil, "", false, false } if entry == nil { - // check if the file without ".md" suffix exists - gitFilename := strings.TrimSuffix(gitFilename, ".md") - entry, err = findEntryForFile(commit, gitFilename) - if err != nil && !git.IsErrNotExist(err) { - ctx.ServerError("findEntryForFile", err) - return nil, "", false, false + // If .md file not found, try .org file + if strings.HasSuffix(gitFilename, ".md") { + orgFilename := strings.TrimSuffix(gitFilename, ".md") + ".org" + entry, err = findEntryForFile(commit, orgFilename) + if err != nil && !git.IsErrNotExist(err) { + ctx.ServerError("findEntryForFile", err) + return nil, "", false, false + } + if entry != nil { + gitFilename = orgFilename + } + } + // If still not found, check if the file without extension exists (for raw files) + if entry == nil { + baseFilename := gitFilename + if strings.HasSuffix(baseFilename, ".md") { + baseFilename = strings.TrimSuffix(baseFilename, ".md") + } else if strings.HasSuffix(baseFilename, ".org") { + baseFilename = strings.TrimSuffix(baseFilename, ".org") + } + entry, err = findEntryForFile(commit, baseFilename) + if err != nil && !git.IsErrNotExist(err) { + ctx.ServerError("findEntryForFile", err) + return nil, "", false, false + } + if entry != nil { + gitFilename = baseFilename + isRaw = true + } } - isRaw = true } if entry == nil { return nil, "", true, false From cb38c046b236afebeeac6757ada8125cf8797873 Mon Sep 17 00:00:00 2001 From: Aly Sewelam Date: Mon, 24 Nov 2025 11:33:12 +0200 Subject: [PATCH 03/17] Handle .org files in Sidebar and footer of wiki Used Git filename to properly handle .org files --- routers/web/repo/wiki.go | 32 ++++++++++++++++++++++---------- 1 file changed, 22 insertions(+), 10 deletions(-) diff --git a/routers/web/repo/wiki.go b/routers/web/repo/wiki.go index 6795e05a4dce4..13e2d45b0304f 100644 --- a/routers/web/repo/wiki.go +++ b/routers/web/repo/wiki.go @@ -316,26 +316,38 @@ func renderViewPage(ctx *context.Context) (*git.Repository, *git.TreeEntry) { } if !isSideBar { - sidebarContent, _, _, _ := wikiContentsByName(ctx, commit, "_Sidebar") + sidebarContent, sidebarEntry, sidebarFilename, _ := wikiContentsByName(ctx, commit, "_Sidebar") if ctx.Written() { return nil, nil } - ctx.Data["WikiSidebarEscapeStatus"], ctx.Data["WikiSidebarHTML"], err = renderFn(sidebarContent) - if err != nil { - ctx.ServerError("Render", err) - return nil, nil + if sidebarEntry != nil && sidebarContent != nil { + // Use the git filename returned by wikiContentsByName, which correctly handles .org files + if sidebarFilename == "" { + sidebarFilename = sidebarEntry.Name() + } + ctx.Data["WikiSidebarEscapeStatus"], ctx.Data["WikiSidebarHTML"], err = renderFn(sidebarContent, sidebarFilename) + if err != nil { + ctx.ServerError("Render", err) + return nil, nil + } } } if !isFooter { - footerContent, _, _, _ := wikiContentsByName(ctx, commit, "_Footer") + footerContent, footerEntry, footerFilename, _ := wikiContentsByName(ctx, commit, "_Footer") if ctx.Written() { return nil, nil } - ctx.Data["WikiFooterEscapeStatus"], ctx.Data["WikiFooterHTML"], err = renderFn(footerContent) - if err != nil { - ctx.ServerError("Render", err) - return nil, nil + if footerEntry != nil && footerContent != nil { + // Use git filename here too to handle .org files correctly + if footerFilename == "" { + footerFilename = footerEntry.Name() + } + ctx.Data["WikiFooterEscapeStatus"], ctx.Data["WikiFooterHTML"], err = renderFn(footerContent, footerFilename) + if err != nil { + ctx.ServerError("Render", err) + return nil, nil + } } } From 51b76806b49f65c1972a1ea2bd561828bb278300 Mon Sep 17 00:00:00 2001 From: Aly Sewelam Date: Mon, 24 Nov 2025 11:35:27 +0200 Subject: [PATCH 04/17] Detect markup type instead of defaulting to .md This handles .org files markup detection --- routers/web/repo/wiki.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/routers/web/repo/wiki.go b/routers/web/repo/wiki.go index 13e2d45b0304f..af6dc5cefbee4 100644 --- a/routers/web/repo/wiki.go +++ b/routers/web/repo/wiki.go @@ -534,7 +534,9 @@ func Wiki(ctx *context.Context) { } wikiPath := entry.Name() - if markup.DetectMarkupTypeByFileName(wikiPath) != markdown.MarkupName { + detectedMarkupType := markup.DetectMarkupTypeByFileName(wikiPath) + if detectedMarkupType == "" { + // Only show warning if no renderer was found for this file type ext := strings.ToUpper(filepath.Ext(wikiPath)) ctx.Data["FormatWarning"] = ext + " rendering is not supported at the moment. Rendered as Markdown." } From 3931b8fc83c7a0b4f6160e349a3c406d328ed380 Mon Sep 17 00:00:00 2001 From: Aly Sewelam Date: Mon, 24 Nov 2025 11:52:28 +0200 Subject: [PATCH 05/17] Add .org file detection to WikiRaw function --- routers/web/repo/wiki.go | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/routers/web/repo/wiki.go b/routers/web/repo/wiki.go index af6dc5cefbee4..d82611a5bad7b 100644 --- a/routers/web/repo/wiki.go +++ b/routers/web/repo/wiki.go @@ -669,8 +669,15 @@ func WikiRaw(ctx *context.Context) { } if entry == nil { - // Try to find a wiki page with that name - providedGitPath = strings.TrimSuffix(providedGitPath, ".md") + // Try to find a wiki page with that name (check both .md and .org) + providedGitPath := strings.TrimSuffix(providedGitPath, ".md") + // Try .org version + orgPath := providedGitPath + ".org" + entry, err = findEntryForFile(commit, orgPath) + if err != nil && !git.IsErrNotExist(err) { + ctx.ServerError("findFile", err) + return + } entry, err = findEntryForFile(commit, providedGitPath) if err != nil && !git.IsErrNotExist(err) { ctx.ServerError("findFile", err) From 36c23b8b8a42a386ad086816282d5ec0da23c23b Mon Sep 17 00:00:00 2001 From: Aly Sewelam Date: Mon, 24 Nov 2025 11:53:55 +0200 Subject: [PATCH 06/17] Add .org condition to escapeSegToWeb --- services/wiki/wiki_path.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/wiki/wiki_path.go b/services/wiki/wiki_path.go index fc032244b5cee..23945eae2c815 100644 --- a/services/wiki/wiki_path.go +++ b/services/wiki/wiki_path.go @@ -76,7 +76,7 @@ func unescapeSegment(s string) (string, error) { } func escapeSegToWeb(s string, hadDashMarker bool) string { - if hadDashMarker || strings.Contains(s, "-") || strings.HasSuffix(s, ".md") { + if hadDashMarker || strings.Contains(s, "-") || strings.HasSuffix(s, ".md") || strings.HasSuffix(s, ".org") { s = addDashMarker(s) } else { s = strings.ReplaceAll(s, " ", "-") From 3ae482338340ab438016f0b8083b62b5f6037dad Mon Sep 17 00:00:00 2001 From: Aly Sewelam Date: Mon, 24 Nov 2025 11:57:18 +0200 Subject: [PATCH 07/17] Add org file path resolution for Web and Git paths --- services/wiki/wiki_path.go | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/services/wiki/wiki_path.go b/services/wiki/wiki_path.go index 23945eae2c815..64ce1b5f53c18 100644 --- a/services/wiki/wiki_path.go +++ b/services/wiki/wiki_path.go @@ -94,8 +94,10 @@ func WebPathSegments(s WebPath) []string { } func WebPathToGitPath(s WebPath) string { - if strings.HasSuffix(string(s), ".md") { - ret, _ := url.PathUnescape(string(s)) + str := string(s) + // Accept only .md or .org directly + if strings.HasSuffix(str, ".md") || strings.HasSuffix(str, ".org") { + ret, _ := url.PathUnescape(str) return util.PathJoinRelX(ret) } @@ -111,10 +113,15 @@ func WebPathToGitPath(s WebPath) string { } func GitPathToWebPath(s string) (wp WebPath, err error) { - if !strings.HasSuffix(s, ".md") { + // Trim .md or .org suffix if present + if strings.HasSuffix(s, ".md") { + s = strings.TrimSuffix(s, ".md") + } else if strings.HasSuffix(s, ".org") { + s = strings.TrimSuffix(s, ".org") + } else { + // If it doesn't end with .md or .org, it's not a valid wiki file return "", repo_model.ErrWikiInvalidFileName{FileName: s} } - s = strings.TrimSuffix(s, ".md") a := strings.Split(s, "/") for i := range a { shouldAddDashMarker := hasDashMarker(a[i]) From 676a7856acc67f0f1a6173c6f1f3cd5f111f499f Mon Sep 17 00:00:00 2001 From: Aly Sewelam Date: Mon, 24 Nov 2025 11:58:52 +0200 Subject: [PATCH 08/17] add .org to WebPathToUserTitle --- services/wiki/wiki_path.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/services/wiki/wiki_path.go b/services/wiki/wiki_path.go index 64ce1b5f53c18..77271d59da7a7 100644 --- a/services/wiki/wiki_path.go +++ b/services/wiki/wiki_path.go @@ -139,6 +139,9 @@ func WebPathToUserTitle(s WebPath) (dir, display string) { if before, ok := strings.CutSuffix(display, ".md"); ok { display = before display, _ = url.PathUnescape(display) + } else if strings.HasSuffix(display, ".org") { + display = strings.TrimSuffix(display, ".org") + display, _ = url.PathUnescape(display) } display, _ = unescapeSegment(display) return dir, display From 83353a88bcf40870baaa7f790b2d29eaef4b7bc1 Mon Sep 17 00:00:00 2001 From: Aly Sewelam Date: Mon, 24 Nov 2025 12:02:44 +0200 Subject: [PATCH 09/17] Add .org to Git path preparation markdown files still take priority over org files if both are present --- services/wiki/wiki.go | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/services/wiki/wiki.go b/services/wiki/wiki.go index a9dc7269829f3..18fd8ba057e25 100644 --- a/services/wiki/wiki.go +++ b/services/wiki/wiki.go @@ -55,11 +55,12 @@ func InitWiki(ctx context.Context, repo *repo_model.Repository) error { // prepareGitPath try to find a suitable file path with file name by the given raw wiki name. // return: existence, prepared file path with name, error func prepareGitPath(gitRepo *git.Repository, defaultWikiBranch string, wikiPath WebPath) (bool, string, error) { - unescaped := string(wikiPath) + ".md" + unescapedMd := string(wikiPath) + ".md" + unescapedOrg := string(wikiPath) + ".org" gitPath := WebPathToGitPath(wikiPath) - // Look for both files - filesInIndex, err := gitRepo.LsTree(defaultWikiBranch, unescaped, gitPath) + // Look for .md, .org, and escaped file + filesInIndex, err := gitRepo.LsTree(defaultWikiBranch, unescapedMd, unescapedOrg, gitPath) if err != nil { if strings.Contains(err.Error(), "Not a valid object name") { return false, gitPath, nil // branch doesn't exist @@ -71,9 +72,11 @@ func prepareGitPath(gitRepo *git.Repository, defaultWikiBranch string, wikiPath foundEscaped := false for _, filename := range filesInIndex { switch filename { - case unescaped: - // if we find the unescaped file return it - return true, unescaped, nil + // if we find unescaped file (.md or .org) return it + case unescapedMd: + return true, unescapedMd, nil + case unescapedOrg: + return true, unescapedOrg, nil case gitPath: foundEscaped = true } From e2812ca2595f187e68b542f1008aee7db18b7de7 Mon Sep 17 00:00:00 2001 From: Aly Sewelam Date: Mon, 24 Nov 2025 13:15:33 +0200 Subject: [PATCH 10/17] Resolve linting issues Modernise string suffix check with CutSuffix Added nilcheck for entry after the org version check attempt --- routers/web/repo/wiki.go | 22 ++++++++++++---------- services/wiki/wiki_path.go | 12 ++++++------ 2 files changed, 18 insertions(+), 16 deletions(-) diff --git a/routers/web/repo/wiki.go b/routers/web/repo/wiki.go index d82611a5bad7b..e47bb569b542e 100644 --- a/routers/web/repo/wiki.go +++ b/routers/web/repo/wiki.go @@ -154,8 +154,8 @@ func wikiEntryByName(ctx *context.Context, commit *git.Commit, wikiName wiki_ser } if entry == nil { // If .md file not found, try .org file - if strings.HasSuffix(gitFilename, ".md") { - orgFilename := strings.TrimSuffix(gitFilename, ".md") + ".org" + if base, ok := strings.CutSuffix(gitFilename, ".md"); ok { + orgFilename := base + ".org" entry, err = findEntryForFile(commit, orgFilename) if err != nil && !git.IsErrNotExist(err) { ctx.ServerError("findEntryForFile", err) @@ -168,10 +168,10 @@ func wikiEntryByName(ctx *context.Context, commit *git.Commit, wikiName wiki_ser // If still not found, check if the file without extension exists (for raw files) if entry == nil { baseFilename := gitFilename - if strings.HasSuffix(baseFilename, ".md") { - baseFilename = strings.TrimSuffix(baseFilename, ".md") - } else if strings.HasSuffix(baseFilename, ".org") { - baseFilename = strings.TrimSuffix(baseFilename, ".org") + if base, ok := strings.CutSuffix(baseFilename, ".md"); ok { + baseFilename = base + } else if base, ok := strings.CutSuffix(baseFilename, ".org"); ok { + baseFilename = base } entry, err = findEntryForFile(commit, baseFilename) if err != nil && !git.IsErrNotExist(err) { @@ -678,10 +678,12 @@ func WikiRaw(ctx *context.Context) { ctx.ServerError("findFile", err) return } - entry, err = findEntryForFile(commit, providedGitPath) - if err != nil && !git.IsErrNotExist(err) { - ctx.ServerError("findFile", err) - return + if entry == nil { + entry, err = findEntryForFile(commit, providedGitPath) + if err != nil && !git.IsErrNotExist(err) { + ctx.ServerError("findFile", err) + return + } } } } diff --git a/services/wiki/wiki_path.go b/services/wiki/wiki_path.go index 77271d59da7a7..16b1da86abf63 100644 --- a/services/wiki/wiki_path.go +++ b/services/wiki/wiki_path.go @@ -114,10 +114,10 @@ func WebPathToGitPath(s WebPath) string { func GitPathToWebPath(s string) (wp WebPath, err error) { // Trim .md or .org suffix if present - if strings.HasSuffix(s, ".md") { - s = strings.TrimSuffix(s, ".md") - } else if strings.HasSuffix(s, ".org") { - s = strings.TrimSuffix(s, ".org") + if before, ok := strings.CutSuffix(s, ".md"); ok { + s = before + } else if before, ok := strings.CutSuffix(s, ".org"); ok { + s = before } else { // If it doesn't end with .md or .org, it's not a valid wiki file return "", repo_model.ErrWikiInvalidFileName{FileName: s} @@ -139,8 +139,8 @@ func WebPathToUserTitle(s WebPath) (dir, display string) { if before, ok := strings.CutSuffix(display, ".md"); ok { display = before display, _ = url.PathUnescape(display) - } else if strings.HasSuffix(display, ".org") { - display = strings.TrimSuffix(display, ".org") + } else if before, ok := strings.CutSuffix(display, ".org"); ok { + display = before display, _ = url.PathUnescape(display) } display, _ = unescapeSegment(display) From 997ce9ffd1f30d8744187654b958b04ff3e7e2e5 Mon Sep 17 00:00:00 2001 From: Aly Sewelam Date: Wed, 26 Nov 2025 11:53:34 +0200 Subject: [PATCH 11/17] Add default wiki format setting value to struct --- modules/setting/repository.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/setting/repository.go b/modules/setting/repository.go index 90c4f22ad2e3f..d952420e712d3 100644 --- a/modules/setting/repository.go +++ b/modules/setting/repository.go @@ -48,6 +48,7 @@ var ( DisableMigrations bool DisableStars bool `ini:"DISABLE_STARS"` DefaultBranch string + DefaultWikiFormat string AllowAdoptionOfUnadoptedRepositories bool AllowDeleteOfUnadoptedRepositories bool DisableDownloadSourceArchives bool @@ -172,6 +173,7 @@ var ( DisableMigrations: false, DisableStars: false, DefaultBranch: "main", + DefaultWikiFormat: "markdown", AllowForkWithoutMaximumLimit: true, StreamArchives: true, From f0c005be7de8a4a94bd115dec0aea9e88108e18b Mon Sep 17 00:00:00 2001 From: Aly Sewelam Date: Wed, 26 Nov 2025 16:33:31 +0200 Subject: [PATCH 12/17] Add DefaultWikiFormat var and its checks --- models/repo/repo.go | 1 + routers/web/repo/setting/setting.go | 3 +++ services/forms/repo_form.go | 1 + services/wiki/wiki_test.go | 4 ++-- 4 files changed, 7 insertions(+), 2 deletions(-) diff --git a/models/repo/repo.go b/models/repo/repo.go index 819356dfad342..2c864bc4d5e2f 100644 --- a/models/repo/repo.go +++ b/models/repo/repo.go @@ -164,6 +164,7 @@ type Repository struct { OriginalURL string `xorm:"VARCHAR(2048)"` DefaultBranch string DefaultWikiBranch string + DefaultWikiFormat string NumWatches int NumStars int diff --git a/routers/web/repo/setting/setting.go b/routers/web/repo/setting/setting.go index 60eb35f56d154..c87c12c1ed3ab 100644 --- a/routers/web/repo/setting/setting.go +++ b/routers/web/repo/setting/setting.go @@ -524,6 +524,9 @@ func handleSettingsPostAdvanced(ctx *context.Context) { deleteUnitTypes = append(deleteUnitTypes, unit_model.TypeCode) } + if form.EnableWiki && form.DefaultWikiFormat { + } + if form.EnableWiki && form.EnableExternalWiki && !unit_model.TypeExternalWiki.UnitGlobalDisabled() { if !validation.IsValidExternalURL(form.ExternalWikiURL) { ctx.Flash.Error(ctx.Tr("repo.settings.external_wiki_url_error")) diff --git a/services/forms/repo_form.go b/services/forms/repo_form.go index 6820521ba3de2..08a932aa3c0ef 100644 --- a/services/forms/repo_form.go +++ b/services/forms/repo_form.go @@ -110,6 +110,7 @@ type RepoSettingForm struct { // Advanced settings EnableCode bool + DefaultWikiFormat string EnableWiki bool EnableExternalWiki bool DefaultWikiBranch string diff --git a/services/wiki/wiki_test.go b/services/wiki/wiki_test.go index e571e093b6fe3..26c877b4d9fa9 100644 --- a/services/wiki/wiki_test.go +++ b/services/wiki/wiki_test.go @@ -279,7 +279,7 @@ func TestPrepareWikiFileName(t *testing.T) { for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { webPath := UserTitleToWebPath("", tt.arg) - existence, newWikiPath, err := prepareGitPath(gitRepo, repo.DefaultWikiBranch, webPath) + existence, newWikiPath, err := prepareGitPath(gitRepo, repo.DefaultWikiBranch, webPath, "both") if (err != nil) != tt.wantErr { assert.NoError(t, err) return @@ -310,7 +310,7 @@ func TestPrepareWikiFileName_FirstPage(t *testing.T) { defer gitRepo.Close() - existence, newWikiPath, err := prepareGitPath(gitRepo, "master", "Home") + existence, newWikiPath, err := prepareGitPath(gitRepo, "master", "Home", "both") assert.False(t, existence) assert.NoError(t, err) assert.Equal(t, "Home.md", newWikiPath) From a4ccf6501123157bdf84b5b2be85dcd6b77fd1ce Mon Sep 17 00:00:00 2001 From: Aly Sewelam Date: Wed, 26 Nov 2025 17:25:30 +0200 Subject: [PATCH 13/17] use config option for default wiki format paths - listing of wiki pages now depends on option and defaults to markdown only --- modules/setting/repository.go | 1 + routers/api/v1/repo/wiki.go | 1 + services/wiki/wiki.go | 42 ++++++++++++++++++++++++++++------- services/wiki/wiki_path.go | 13 ++++++++++- 4 files changed, 48 insertions(+), 9 deletions(-) diff --git a/modules/setting/repository.go b/modules/setting/repository.go index d952420e712d3..8c499774f4ff1 100644 --- a/modules/setting/repository.go +++ b/modules/setting/repository.go @@ -286,6 +286,7 @@ func loadRepositoryFrom(rootCfg ConfigProvider) { Repository.GoGetCloneURLProtocol = sec.Key("GO_GET_CLONE_URL_PROTOCOL").MustString("https") Repository.MaxCreationLimit = sec.Key("MAX_CREATION_LIMIT").MustInt(-1) Repository.DefaultBranch = sec.Key("DEFAULT_BRANCH").MustString(Repository.DefaultBranch) + Repository.DefaultWikiFormat = sec.Key("WIKI_FORMAT").MustString(Repository.DefaultWikiFormat) RepoRootPath = sec.Key("ROOT").MustString(filepath.Join(AppDataPath, "gitea-repositories")) if !filepath.IsAbs(RepoRootPath) { RepoRootPath = filepath.Join(AppWorkPath, RepoRootPath) diff --git a/routers/api/v1/repo/wiki.go b/routers/api/v1/repo/wiki.go index 8e24ffa465c14..357b37e3d82b3 100644 --- a/routers/api/v1/repo/wiki.go +++ b/routers/api/v1/repo/wiki.go @@ -8,6 +8,7 @@ import ( "fmt" "net/http" "net/url" + "strings" repo_model "code.gitea.io/gitea/models/repo" "code.gitea.io/gitea/modules/git" diff --git a/services/wiki/wiki.go b/services/wiki/wiki.go index 18fd8ba057e25..fdba8d870fa86 100644 --- a/services/wiki/wiki.go +++ b/services/wiki/wiki.go @@ -21,6 +21,7 @@ import ( "code.gitea.io/gitea/modules/graceful" "code.gitea.io/gitea/modules/log" repo_module "code.gitea.io/gitea/modules/repository" + "code.gitea.io/gitea/modules/setting" asymkey_service "code.gitea.io/gitea/services/asymkey" repo_service "code.gitea.io/gitea/services/repository" ) @@ -54,13 +55,26 @@ func InitWiki(ctx context.Context, repo *repo_model.Repository) error { // prepareGitPath try to find a suitable file path with file name by the given raw wiki name. // return: existence, prepared file path with name, error -func prepareGitPath(gitRepo *git.Repository, defaultWikiBranch string, wikiPath WebPath) (bool, string, error) { +func prepareGitPath(gitRepo *git.Repository, defaultWikiBranch string, wikiPath WebPath, defaultWikiFormat string) (bool, string, error) { unescapedMd := string(wikiPath) + ".md" unescapedOrg := string(wikiPath) + ".org" gitPath := WebPathToGitPath(wikiPath) - // Look for .md, .org, and escaped file - filesInIndex, err := gitRepo.LsTree(defaultWikiBranch, unescapedMd, unescapedOrg, gitPath) + // Build list of files to look for based on defaultWikiFormat + var filesToCheck []string + checkMarkdown := defaultWikiFormat == "markdown" || defaultWikiFormat == "both" + checkOrg := defaultWikiFormat == "org" || defaultWikiFormat == "both" + + if checkMarkdown { + filesToCheck = append(filesToCheck, unescapedMd) + } + if checkOrg { + filesToCheck = append(filesToCheck, unescapedOrg) + } + filesToCheck = append(filesToCheck, gitPath) + + // Look for files based on format setting + filesInIndex, err := gitRepo.LsTree(defaultWikiBranch, filesToCheck...) if err != nil { if strings.Contains(err.Error(), "Not a valid object name") { return false, gitPath, nil // branch doesn't exist @@ -74,9 +88,13 @@ func prepareGitPath(gitRepo *git.Repository, defaultWikiBranch string, wikiPath switch filename { // if we find unescaped file (.md or .org) return it case unescapedMd: - return true, unescapedMd, nil + if checkMarkdown { + return true, unescapedMd, nil + } case unescapedOrg: - return true, unescapedOrg, nil + if checkOrg { + return true, unescapedOrg, nil + } case gitPath: foundEscaped = true } @@ -142,7 +160,11 @@ func updateWikiPage(ctx context.Context, doer *user_model.User, repo *repo_model } } - isWikiExist, newWikiPath, err := prepareGitPath(gitRepo, repo.DefaultWikiBranch, newWikiName) + defaultWikiFormat := repo.DefaultWikiFormat + if defaultWikiFormat == "" { + defaultWikiFormat = setting.Repository.DefaultWikiFormat + } + isWikiExist, newWikiPath, err := prepareGitPath(gitRepo, repo.DefaultWikiBranch, newWikiName, defaultWikiFormat) if err != nil { return err } @@ -158,7 +180,7 @@ func updateWikiPage(ctx context.Context, doer *user_model.User, repo *repo_model isOldWikiExist := true oldWikiPath := newWikiPath if oldWikiName != newWikiName { - isOldWikiExist, oldWikiPath, err = prepareGitPath(gitRepo, repo.DefaultWikiBranch, oldWikiName) + isOldWikiExist, oldWikiPath, err = prepareGitPath(gitRepo, repo.DefaultWikiBranch, oldWikiName, defaultWikiFormat) if err != nil { return err } @@ -294,7 +316,11 @@ func DeleteWikiPage(ctx context.Context, doer *user_model.User, repo *repo_model return fmt.Errorf("unable to read HEAD tree to index in: %s %w", basePath, err) } - found, wikiPath, err := prepareGitPath(gitRepo, repo.DefaultWikiBranch, wikiName) + defaultWikiFormat := repo.DefaultWikiFormat + if defaultWikiFormat == "" { + defaultWikiFormat = setting.Repository.DefaultWikiFormat + } + found, wikiPath, err := prepareGitPath(gitRepo, repo.DefaultWikiBranch, wikiName, defaultWikiFormat) if err != nil { return err } diff --git a/services/wiki/wiki_path.go b/services/wiki/wiki_path.go index 16b1da86abf63..2fd057640c20e 100644 --- a/services/wiki/wiki_path.go +++ b/services/wiki/wiki_path.go @@ -10,6 +10,7 @@ import ( repo_model "code.gitea.io/gitea/models/repo" "code.gitea.io/gitea/modules/git" + "code.gitea.io/gitea/modules/setting" api "code.gitea.io/gitea/modules/structs" "code.gitea.io/gitea/modules/util" "code.gitea.io/gitea/services/convert" @@ -101,6 +102,9 @@ func WebPathToGitPath(s WebPath) string { return util.PathJoinRelX(ret) } + // Get default wiki format from global setting + defaultWikiFormat := setting.Repository.DefaultWikiFormat + a := strings.Split(string(s), "/") for i := range a { shouldAddDashMarker := hasDashMarker(a[i]) @@ -109,7 +113,14 @@ func WebPathToGitPath(s WebPath) string { a[i] = strings.ReplaceAll(a[i], "%20", " ") // space is safe to be kept in git path a[i] = strings.ReplaceAll(a[i], "+", " ") } - return strings.Join(a, "/") + ".md" + basePath := strings.Join(a, "/") + + // Determine extension based on format setting + if defaultWikiFormat == "org" { + return basePath + ".org" + } + // For "both" or "markdown", default to .md + return basePath + ".md" } func GitPathToWebPath(s string) (wp WebPath, err error) { From 884a1ed5ee929edee82eb00606f54ddca62bab34 Mon Sep 17 00:00:00 2001 From: Aly Sewelam Date: Thu, 27 Nov 2025 11:58:27 +0200 Subject: [PATCH 14/17] Integrate DefaultWikiFormat to wiki settings --- routers/web/repo/setting/setting.go | 15 ++++++++++++--- routers/web/repo/wiki.go | 23 +++++++++++++++++++++-- 2 files changed, 33 insertions(+), 5 deletions(-) diff --git a/routers/web/repo/setting/setting.go b/routers/web/repo/setting/setting.go index c87c12c1ed3ab..d2e7f7e7e0766 100644 --- a/routers/web/repo/setting/setting.go +++ b/routers/web/repo/setting/setting.go @@ -524,9 +524,6 @@ func handleSettingsPostAdvanced(ctx *context.Context) { deleteUnitTypes = append(deleteUnitTypes, unit_model.TypeCode) } - if form.EnableWiki && form.DefaultWikiFormat { - } - if form.EnableWiki && form.EnableExternalWiki && !unit_model.TypeExternalWiki.UnitGlobalDisabled() { if !validation.IsValidExternalURL(form.ExternalWikiURL) { ctx.Flash.Error(ctx.Tr("repo.settings.external_wiki_url_error")) @@ -557,6 +554,18 @@ func handleSettingsPostAdvanced(ctx *context.Context) { } } + // Update DefaultWikiFormat if wiki is enabled + if form.EnableWiki && !form.EnableExternalWiki { + defaultWikiFormat := form.DefaultWikiFormat + if defaultWikiFormat == "" { + defaultWikiFormat = setting.Repository.DefaultWikiFormat + } + if repo.DefaultWikiFormat != defaultWikiFormat { + repo.DefaultWikiFormat = defaultWikiFormat + repoChanged = true + } + } + if form.EnableIssues && form.EnableExternalTracker && !unit_model.TypeExternalTracker.UnitGlobalDisabled() { if !validation.IsValidExternalURL(form.ExternalTrackerURL) { ctx.Flash.Error(ctx.Tr("repo.settings.external_tracker_url_error")) diff --git a/routers/web/repo/wiki.go b/routers/web/repo/wiki.go index e47bb569b542e..034371790c9c8 100644 --- a/routers/web/repo/wiki.go +++ b/routers/web/repo/wiki.go @@ -215,12 +215,31 @@ func renderViewPage(ctx *context.Context) (*git.Repository, *git.TreeEntry) { ctx.ServerError("ListEntries", err) return nil, nil } + + // Get default wiki format from repository, using global setting as fallback + defaultWikiFormat := ctx.Repo.Repository.DefaultWikiFormat + if defaultWikiFormat == "" { + defaultWikiFormat = setting.Repository.DefaultWikiFormat + } + pages := make([]PageMeta, 0, len(entries)) for _, entry := range entries { if !entry.IsRegular() { continue } - wikiName, err := wiki_service.GitPathToWebPath(entry.Name()) + entryName := entry.Name() + + // Filter by DefaultWikiFormat + hasMdSuffix := strings.HasSuffix(entryName, ".md") + hasOrgSuffix := strings.HasSuffix(entryName, ".org") + if defaultWikiFormat == "markdown" && hasOrgSuffix { + continue + } + if defaultWikiFormat == "org" && hasMdSuffix { + continue + } + + wikiName, err := wiki_service.GitPathToWebPath(entryName) if err != nil { if repo_model.IsErrWikiInvalidFileName(err) { continue @@ -234,7 +253,7 @@ func renderViewPage(ctx *context.Context) (*git.Repository, *git.TreeEntry) { pages = append(pages, PageMeta{ Name: displayName, SubURL: wiki_service.WebPathToURLPath(wikiName), - GitEntryName: entry.Name(), + GitEntryName: entryName, }) } ctx.Data["Pages"] = pages From 535a3772d862b35bf0744e424972f7ccf753244a Mon Sep 17 00:00:00 2001 From: Aly Sewelam Date: Thu, 27 Nov 2025 12:07:34 +0200 Subject: [PATCH 15/17] check wiki entry names based on DefaultWikiFormat --- routers/api/v1/repo/wiki.go | 2 - routers/web/repo/wiki.go | 115 +++++++++++++++++++++++++++--------- 2 files changed, 88 insertions(+), 29 deletions(-) diff --git a/routers/api/v1/repo/wiki.go b/routers/api/v1/repo/wiki.go index 357b37e3d82b3..5435274eaf392 100644 --- a/routers/api/v1/repo/wiki.go +++ b/routers/api/v1/repo/wiki.go @@ -8,8 +8,6 @@ import ( "fmt" "net/http" "net/url" - "strings" - repo_model "code.gitea.io/gitea/models/repo" "code.gitea.io/gitea/modules/git" "code.gitea.io/gitea/modules/gitrepo" diff --git a/routers/web/repo/wiki.go b/routers/web/repo/wiki.go index 034371790c9c8..fbc677de80619 100644 --- a/routers/web/repo/wiki.go +++ b/routers/web/repo/wiki.go @@ -153,26 +153,50 @@ func wikiEntryByName(ctx *context.Context, commit *git.Commit, wikiName wiki_ser return nil, "", false, false } if entry == nil { - // If .md file not found, try .org file - if base, ok := strings.CutSuffix(gitFilename, ".md"); ok { - orgFilename := base + ".org" - entry, err = findEntryForFile(commit, orgFilename) - if err != nil && !git.IsErrNotExist(err) { - ctx.ServerError("findEntryForFile", err) - return nil, "", false, false + // Get default wiki format from repository, using global setting as fallback + defaultWikiFormat := ctx.Repo.Repository.DefaultWikiFormat + if defaultWikiFormat == "" { + defaultWikiFormat = setting.Repository.DefaultWikiFormat + } + + // Check if gitFilename already has .md or .org extension and extract base filename + baseFilename, hasMdSuffix := strings.CutSuffix(gitFilename, ".md") + var hasOrgSuffix bool + if !hasMdSuffix { + baseFilename, hasOrgSuffix = strings.CutSuffix(gitFilename, ".org") + if !hasOrgSuffix { + baseFilename = gitFilename } - if entry != nil { - gitFilename = orgFilename + } + + // Try alternative formats based on DefaultWikiFormat setting + if defaultWikiFormat == "markdown" || defaultWikiFormat == "both" { + if !hasMdSuffix && !hasOrgSuffix { + entry, err = findEntryForFile(commit, baseFilename+".md") + if err != nil && !git.IsErrNotExist(err) { + ctx.ServerError("findEntryForFile", err) + return nil, "", false, false + } + if entry != nil { + gitFilename = baseFilename + ".md" + } } } - // If still not found, check if the file without extension exists (for raw files) - if entry == nil { - baseFilename := gitFilename - if base, ok := strings.CutSuffix(baseFilename, ".md"); ok { - baseFilename = base - } else if base, ok := strings.CutSuffix(baseFilename, ".org"); ok { - baseFilename = base + + if entry == nil && (defaultWikiFormat == "org" || defaultWikiFormat == "both") { + if !hasMdSuffix && !hasOrgSuffix { + entry, err = findEntryForFile(commit, baseFilename+".org") + if err != nil && !git.IsErrNotExist(err) { + ctx.ServerError("findEntryForFile", err) + return nil, "", false, false + } + if entry != nil { + gitFilename = baseFilename + ".org" + } } + } + + if entry == nil { entry, err = findEntryForFile(commit, baseFilename) if err != nil && !git.IsErrNotExist(err) { ctx.ServerError("findEntryForFile", err) @@ -638,12 +662,30 @@ func WikiPages(ctx *context.Context) { return } + // Get default wiki format from repository, using global setting as fallback + defaultWikiFormat := ctx.Repo.Repository.DefaultWikiFormat + if defaultWikiFormat == "" { + defaultWikiFormat = setting.Repository.DefaultWikiFormat + } + pages := make([]PageMeta, 0, len(entries)) for _, entry := range entries { if !entry.Entry.IsRegular() { continue } - wikiName, err := wiki_service.GitPathToWebPath(entry.Entry.Name()) + entryName := entry.Entry.Name() + + // Filter by DefaultWikiFormat + hasMdSuffix := strings.HasSuffix(entryName, ".md") + hasOrgSuffix := strings.HasSuffix(entryName, ".org") + if defaultWikiFormat == "markdown" && hasOrgSuffix { + continue + } + if defaultWikiFormat == "org" && hasMdSuffix { + continue + } + + wikiName, err := wiki_service.GitPathToWebPath(entryName) if err != nil { if repo_model.IsErrWikiInvalidFileName(err) { continue @@ -655,7 +697,7 @@ func WikiPages(ctx *context.Context) { pages = append(pages, PageMeta{ Name: displayName, SubURL: wiki_service.WebPathToURLPath(wikiName), - GitEntryName: entry.Entry.Name(), + GitEntryName: entryName, UpdatedUnix: timeutil.TimeStamp(entry.Commit.Author.When.Unix()), }) } @@ -688,17 +730,36 @@ func WikiRaw(ctx *context.Context) { } if entry == nil { - // Try to find a wiki page with that name (check both .md and .org) - providedGitPath := strings.TrimSuffix(providedGitPath, ".md") - // Try .org version - orgPath := providedGitPath + ".org" - entry, err = findEntryForFile(commit, orgPath) - if err != nil && !git.IsErrNotExist(err) { - ctx.ServerError("findFile", err) - return + // Get default wiki format from repository, using global setting as fallback + defaultWikiFormat := ctx.Repo.Repository.DefaultWikiFormat + if defaultWikiFormat == "" { + defaultWikiFormat = setting.Repository.DefaultWikiFormat + } + + // Try to find a wiki page with that name based on DefaultWikiFormat + basePath, _ := strings.CutSuffix(providedGitPath, ".md") + if basePath == providedGitPath { + basePath, _ = strings.CutSuffix(providedGitPath, ".org") } + + if defaultWikiFormat == "markdown" || defaultWikiFormat == "both" { + entry, err = findEntryForFile(commit, basePath+".md") + if err != nil && !git.IsErrNotExist(err) { + ctx.ServerError("findFile", err) + return + } + } + + if entry == nil && (defaultWikiFormat == "org" || defaultWikiFormat == "both") { + entry, err = findEntryForFile(commit, basePath+".org") + if err != nil && !git.IsErrNotExist(err) { + ctx.ServerError("findFile", err) + return + } + } + if entry == nil { - entry, err = findEntryForFile(commit, providedGitPath) + entry, err = findEntryForFile(commit, basePath) if err != nil && !git.IsErrNotExist(err) { ctx.ServerError("findFile", err) return From 914926f6d7343be5449e24cabe2035949ed49574 Mon Sep 17 00:00:00 2001 From: Aly Sewelam Date: Thu, 27 Nov 2025 13:15:40 +0200 Subject: [PATCH 16/17] Add wiki format setting to option tmpl and locales --- options/locale/locale_en-US.ini | 4 ++++ templates/repo/settings/options.tmpl | 28 ++++++++++++++++++++++++++++ 2 files changed, 32 insertions(+) diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index b5b90b31a53cb..21bc15480d9f1 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -2223,6 +2223,10 @@ settings.advanced_settings = Advanced Settings settings.wiki_desc = Enable Repository Wiki settings.use_internal_wiki = Use Built-In Wiki settings.default_wiki_branch_name = Default Wiki Branch Name +settings.default_wiki_format = Default Wiki Format +settings.default_wiki_format.markdown = Markdown +settings.default_wiki_format.org = Org-mode +settings.default_wiki_format.both = Both settings.failed_to_change_default_wiki_branch = Failed to change the default wiki branch. settings.use_external_wiki = Use External Wiki settings.external_wiki_url = External Wiki URL diff --git a/templates/repo/settings/options.tmpl b/templates/repo/settings/options.tmpl index b4680431b8acf..eaec0fa7e792f 100644 --- a/templates/repo/settings/options.tmpl +++ b/templates/repo/settings/options.tmpl @@ -337,6 +337,34 @@ +
+ + {{$defaultWikiFormat := .Repository.DefaultWikiFormat}} +
+ + {{svg "octicon-triangle-down" 14 "dropdown icon"}} +
+ {{if (eq $defaultWikiFormat "markdown")}} + {{ctx.Locale.Tr "repo.settings.default_wiki_format.markdown"}} + {{else if (eq $defaultWikiFormat "org")}} + {{ctx.Locale.Tr "repo.settings.default_wiki_format.org"}} + {{else if (eq $defaultWikiFormat "both")}} + {{ctx.Locale.Tr "repo.settings.default_wiki_format.both"}} + {{else}} + {{ctx.Locale.Tr "repo.settings.default_wiki_format.markdown"}} + {{end}} +
+
+
{{ctx.Locale.Tr "repo.settings.default_wiki_format.markdown"}}
+
{{ctx.Locale.Tr "repo.settings.default_wiki_format.org"}}
+
{{ctx.Locale.Tr "repo.settings.default_wiki_format.both"}}
+
+
+
From 477851157061ce1744a6ae98125a3298aff60168 Mon Sep 17 00:00:00 2001 From: Aly Sewelam Date: Thu, 27 Nov 2025 18:16:41 +0200 Subject: [PATCH 17/17] Include defaultWikiFormat in WebPathToGitPath Updated all calls of function to include the new signature The new signature calls for the repo setting for wiki formats --- routers/api/v1/repo/wiki.go | 4 +++- routers/web/repo/wiki.go | 6 ++++-- routers/web/repo/wiki_test.go | 2 +- services/wiki/wiki.go | 2 +- services/wiki/wiki_path.go | 9 ++++++--- services/wiki/wiki_test.go | 12 ++++++------ 6 files changed, 21 insertions(+), 14 deletions(-) diff --git a/routers/api/v1/repo/wiki.go b/routers/api/v1/repo/wiki.go index 5435274eaf392..49263a4994a29 100644 --- a/routers/api/v1/repo/wiki.go +++ b/routers/api/v1/repo/wiki.go @@ -8,6 +8,7 @@ import ( "fmt" "net/http" "net/url" + repo_model "code.gitea.io/gitea/models/repo" "code.gitea.io/gitea/modules/git" "code.gitea.io/gitea/modules/gitrepo" @@ -509,7 +510,8 @@ func wikiContentsByEntry(ctx *context.APIContext, entry *git.TreeEntry) string { // wikiContentsByName returns the contents of a wiki page, along with a boolean // indicating whether the page exists. Writes to ctx if an error occurs. func wikiContentsByName(ctx *context.APIContext, commit *git.Commit, wikiName wiki_service.WebPath, isSidebarOrFooter bool) (string, string) { - gitFilename := wiki_service.WebPathToGitPath(wikiName) + repoDefaultWikiFormat := ctx.Repo.Repository.DefaultWikiFormat + gitFilename := wiki_service.WebPathToGitPath(wikiName, repoDefaultWikiFormat) entry, err := findEntryForFile(commit, gitFilename) if err != nil { if git.IsErrNotExist(err) { diff --git a/routers/web/repo/wiki.go b/routers/web/repo/wiki.go index fbc677de80619..d847a322c15b8 100644 --- a/routers/web/repo/wiki.go +++ b/routers/web/repo/wiki.go @@ -146,7 +146,8 @@ func wikiContentsByEntry(ctx *context.Context, entry *git.TreeEntry) []byte { // The last return value indicates whether the file should be returned as a raw file func wikiEntryByName(ctx *context.Context, commit *git.Commit, wikiName wiki_service.WebPath) (*git.TreeEntry, string, bool, bool) { isRaw := false - gitFilename := wiki_service.WebPathToGitPath(wikiName) + repoDefaultWikiFormat := ctx.Repo.Repository.DefaultWikiFormat + gitFilename := wiki_service.WebPathToGitPath(wikiName, repoDefaultWikiFormat) entry, err := findEntryForFile(commit, gitFilename) if err != nil && !git.IsErrNotExist(err) { ctx.ServerError("findEntryForFile", err) @@ -719,7 +720,8 @@ func WikiRaw(ctx *context.Context) { } providedWebPath := wiki_service.WebPathFromRequest(ctx.PathParamRaw("*")) - providedGitPath := wiki_service.WebPathToGitPath(providedWebPath) + repoDefaultWikiFormat := ctx.Repo.Repository.DefaultWikiFormat + providedGitPath := wiki_service.WebPathToGitPath(providedWebPath, repoDefaultWikiFormat) var entry *git.TreeEntry if commit != nil { // Try to find a file with that name diff --git a/routers/web/repo/wiki_test.go b/routers/web/repo/wiki_test.go index 409d7c9a05bca..5426ce749f1da 100644 --- a/routers/web/repo/wiki_test.go +++ b/routers/web/repo/wiki_test.go @@ -37,7 +37,7 @@ func wikiEntry(t *testing.T, repo *repo_model.Repository, wikiName wiki_service. entries, err := commit.ListEntries() assert.NoError(t, err) for _, entry := range entries { - if entry.Name() == wiki_service.WebPathToGitPath(wikiName) { + if entry.Name() == wiki_service.WebPathToGitPath(wikiName, repo.DefaultWikiFormat) { return entry } } diff --git a/services/wiki/wiki.go b/services/wiki/wiki.go index fdba8d870fa86..899c3d48f9e3a 100644 --- a/services/wiki/wiki.go +++ b/services/wiki/wiki.go @@ -58,7 +58,7 @@ func InitWiki(ctx context.Context, repo *repo_model.Repository) error { func prepareGitPath(gitRepo *git.Repository, defaultWikiBranch string, wikiPath WebPath, defaultWikiFormat string) (bool, string, error) { unescapedMd := string(wikiPath) + ".md" unescapedOrg := string(wikiPath) + ".org" - gitPath := WebPathToGitPath(wikiPath) + gitPath := WebPathToGitPath(wikiPath, defaultWikiFormat) // Build list of files to look for based on defaultWikiFormat var filesToCheck []string diff --git a/services/wiki/wiki_path.go b/services/wiki/wiki_path.go index 2fd057640c20e..2b055865952e8 100644 --- a/services/wiki/wiki_path.go +++ b/services/wiki/wiki_path.go @@ -94,7 +94,7 @@ func WebPathSegments(s WebPath) []string { return a } -func WebPathToGitPath(s WebPath) string { +func WebPathToGitPath(s WebPath, repoDefaultWikiFormat string) string { str := string(s) // Accept only .md or .org directly if strings.HasSuffix(str, ".md") || strings.HasSuffix(str, ".org") { @@ -102,8 +102,11 @@ func WebPathToGitPath(s WebPath) string { return util.PathJoinRelX(ret) } - // Get default wiki format from global setting - defaultWikiFormat := setting.Repository.DefaultWikiFormat + // Prioritize repository's DefaultWikiFormat, fallback to global setting if empty + defaultWikiFormat := repoDefaultWikiFormat + if defaultWikiFormat == "" { + defaultWikiFormat = setting.Repository.DefaultWikiFormat + } a := strings.Split(string(s), "/") for i := range a { diff --git a/services/wiki/wiki_test.go b/services/wiki/wiki_test.go index 26c877b4d9fa9..23bc65f790f89 100644 --- a/services/wiki/wiki_test.go +++ b/services/wiki/wiki_test.go @@ -81,7 +81,7 @@ func TestWebPathToGitPath(t *testing.T) { {"2000-01-02-meeting.md", "2000-01-02+meeting"}, {"2000-01-02 meeting.-.md", "2000-01-02%20meeting.-"}, } { - assert.Equal(t, test.Expected, WebPathToGitPath(test.WikiName)) + assert.Equal(t, test.Expected, WebPathToGitPath(test.WikiName, "markdown")) } } @@ -129,11 +129,11 @@ func TestUserWebGitPathConsistency(t *testing.T) { continue } webPath := UserTitleToWebPath("", userTitle) - gitPath := WebPathToGitPath(webPath) + gitPath := WebPathToGitPath(webPath, "markdown") webPath1, _ := GitPathToWebPath(gitPath) _, userTitle1 := WebPathToUserTitle(webPath1) - gitPath1 := WebPathToGitPath(webPath1) + gitPath1 := WebPathToGitPath(webPath1, "markdown") assert.Equal(t, userTitle, userTitle1, "UserTitle for userTitle: %q", userTitle) assert.Equal(t, webPath, webPath1, "WebPath for userTitle: %q", userTitle) @@ -173,7 +173,7 @@ func TestRepository_AddWikiPage(t *testing.T) { defer gitRepo.Close() masterTree, err := gitRepo.GetTree(repo.DefaultWikiBranch) assert.NoError(t, err) - gitPath := WebPathToGitPath(webPath) + gitPath := WebPathToGitPath(webPath, repo.DefaultWikiFormat) entry, err := masterTree.GetTreeEntryByPath(gitPath) assert.NoError(t, err) assert.Equal(t, gitPath, entry.Name(), "%s not added correctly", userTitle) @@ -218,7 +218,7 @@ func TestRepository_EditWikiPage(t *testing.T) { assert.NoError(t, err) masterTree, err := gitRepo.GetTree(repo.DefaultWikiBranch) assert.NoError(t, err) - gitPath := WebPathToGitPath(webPath) + gitPath := WebPathToGitPath(webPath, repo.DefaultWikiFormat) entry, err := masterTree.GetTreeEntryByPath(gitPath) assert.NoError(t, err) assert.Equal(t, gitPath, entry.Name(), "%s not edited correctly", newWikiName) @@ -244,7 +244,7 @@ func TestRepository_DeleteWikiPage(t *testing.T) { defer gitRepo.Close() masterTree, err := gitRepo.GetTree(repo.DefaultWikiBranch) assert.NoError(t, err) - gitPath := WebPathToGitPath("Home") + gitPath := WebPathToGitPath("Home", repo.DefaultWikiFormat) _, err = masterTree.GetTreeEntryByPath(gitPath) assert.Error(t, err) }