mirror of
https://github.com/go-gitea/gitea.git
synced 2025-12-13 14:42:06 +01:00
Detect .org files if .md isn't found in wiki
Resort to raw file if neither is found too.
This commit is contained in:
parent
30254b941b
commit
cb9334414a
@ -153,14 +153,36 @@ func wikiEntryByName(ctx *context.Context, commit *git.Commit, wikiName wiki_ser
|
|||||||
return nil, "", false, false
|
return nil, "", false, false
|
||||||
}
|
}
|
||||||
if entry == nil {
|
if entry == nil {
|
||||||
// check if the file without ".md" suffix exists
|
// If .md file not found, try .org file
|
||||||
gitFilename := strings.TrimSuffix(gitFilename, ".md")
|
if strings.HasSuffix(gitFilename, ".md") {
|
||||||
entry, err = findEntryForFile(commit, gitFilename)
|
orgFilename := strings.TrimSuffix(gitFilename, ".md") + ".org"
|
||||||
if err != nil && !git.IsErrNotExist(err) {
|
entry, err = findEntryForFile(commit, orgFilename)
|
||||||
ctx.ServerError("findEntryForFile", err)
|
if err != nil && !git.IsErrNotExist(err) {
|
||||||
return nil, "", false, false
|
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 {
|
if entry == nil {
|
||||||
return nil, "", true, false
|
return nil, "", true, false
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user