Mirrors/gitea
0
0
Fork 0
mirror of https://github.com/go-gitea/gitea.git synced 2026-05-14 10:57:54 +02:00
Code Issues Activity

Resolve linting issues

Browse Source 
Modernise string suffix check with CutSuffix
Added nilcheck for entry after the org version check attempt
This commit is contained in:
Aly Sewelam 2025-11-24 13:15:33 +02:00
parent 83353a88bc
commit e2812ca259
2 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
routers/web/repo/wiki.go
View File

@ -154,8 +154,8 @@ func wikiEntryByName(ctx *context.Context, commit *git.Commit, wikiName wiki_ser
} }
if entry == nil { if entry == nil {
// If .md file not found, try .org file // If .md file not found, try .org file
if strings.HasSuffix(gitFilename, ".md") { if base, ok := strings.CutSuffix(gitFilename, ".md"); ok {
orgFilename := strings.TrimSuffix(gitFilename, ".md") + ".org" orgFilename := base + ".org"
entry, err = findEntryForFile(commit, orgFilename) entry, err = findEntryForFile(commit, orgFilename)
if err != nil && !git.IsErrNotExist(err) { if err != nil && !git.IsErrNotExist(err) {
ctx.ServerError("findEntryForFile", 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 still not found, check if the file without extension exists (for raw files)
if entry == nil { if entry == nil {
baseFilename := gitFilename baseFilename := gitFilename
if strings.HasSuffix(baseFilename, ".md") { if base, ok := strings.CutSuffix(baseFilename, ".md"); ok {
baseFilename = strings.TrimSuffix(baseFilename, ".md") baseFilename = base
} else if strings.HasSuffix(baseFilename, ".org") { } else if base, ok := strings.CutSuffix(baseFilename, ".org"); ok {
baseFilename = strings.TrimSuffix(baseFilename, ".org") baseFilename = base
} }
entry, err = findEntryForFile(commit, baseFilename) entry, err = findEntryForFile(commit, baseFilename)
if err != nil && !git.IsErrNotExist(err) { if err != nil && !git.IsErrNotExist(err) {
@ -678,10 +678,12 @@ func WikiRaw(ctx *context.Context) {
ctx.ServerError("findFile", err) ctx.ServerError("findFile", err)
return return
} }
entry, err = findEntryForFile(commit, providedGitPath) if entry == nil {
if err != nil && !git.IsErrNotExist(err) { entry, err = findEntryForFile(commit, providedGitPath)
ctx.ServerError("findFile", err) if err != nil && !git.IsErrNotExist(err) {
return ctx.ServerError("findFile", err)
return
}
} }
} }
} }

12
services/wiki/wiki_path.go
View File

@ -114,10 +114,10 @@ func WebPathToGitPath(s WebPath) string {
func GitPathToWebPath(s string) (wp WebPath, err error) { func GitPathToWebPath(s string) (wp WebPath, err error) {
// Trim .md or .org suffix if present // Trim .md or .org suffix if present
if strings.HasSuffix(s, ".md") { if before, ok := strings.CutSuffix(s, ".md"); ok {
s = strings.TrimSuffix(s, ".md") s = before
} else if strings.HasSuffix(s, ".org") { } else if before, ok := strings.CutSuffix(s, ".org"); ok {
s = strings.TrimSuffix(s, ".org") s = before
} else { } else {
// If it doesn't end with .md or .org, it's not a valid wiki file // If it doesn't end with .md or .org, it's not a valid wiki file
return "", repo_model.ErrWikiInvalidFileName{FileName: s} 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 { if before, ok := strings.CutSuffix(display, ".md"); ok {
display = before display = before
display, _ = url.PathUnescape(display) display, _ = url.PathUnescape(display)
} else if strings.HasSuffix(display, ".org") { } else if before, ok := strings.CutSuffix(display, ".org"); ok {
display = strings.TrimSuffix(display, ".org") display = before
display, _ = url.PathUnescape(display) display, _ = url.PathUnescape(display)
} }
display, _ = unescapeSegment(display) display, _ = unescapeSegment(display)