Fix inconsistent wiki path converting. (#24277)

wxiaoguang · silverwind · GiteaBot · web-flow · commit 60e796314168 · 2023-04-23T07:16:30.000-04:00
The Infinite Monkey Random Typing catches a bug, inconsistent wiki path converting. Close #24276 Co-authored-by: silverwind <me@silverwind.io> Co-authored-by: Giteabot <teabot@gitea.io>
diff --git a/services/wiki/wiki_path.go b/services/wiki/wiki_path.go
@@ -72,7 +72,7 @@ func unescapeSegment(s string) (string, error) {
 }
 
 func escapeSegToWeb(s string, hadDashMarker bool) string {
-	if hadDashMarker || strings.Contains(s, "-") {
+	if hadDashMarker || strings.Contains(s, "-") || strings.HasSuffix(s, ".md") {
 		s = addDashMarker(s)
 	} else {
 		s = strings.ReplaceAll(s, " ", "-")
diff --git a/services/wiki/wiki_test.go b/services/wiki/wiki_test.go
@@ -35,6 +35,7 @@ func TestUserTitleToWebPath(t *testing.T) {
 	}
 	for _, test := range []test{
 		{"wiki-name", "wiki name"},
+		{"title.md.-", "title.md"},
 		{"wiki-name.-", "wiki-name"},
 		{"the+wiki-name.-", "the wiki-name"},
 		{"a%2Fb", "a/b"},

Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@ func unescapeSegment(s string) (string, error) {`
`72`	`72`	`}`
`73`	`73`
`74`	`74`	`func escapeSegToWeb(s string, hadDashMarker bool) string {`
`75`		`- if hadDashMarker \|\| strings.Contains(s, "-") {`
	`75`	`+ if hadDashMarker \|\| strings.Contains(s, "-") \|\| strings.HasSuffix(s, ".md") {`
`76`	`76`	`s = addDashMarker(s)`
`77`	`77`	`} else {`
`78`	`78`	`s = strings.ReplaceAll(s, " ", "-")`
Original file line number	Diff line number	Diff line change
`@@ -35,6 +35,7 @@ func TestUserTitleToWebPath(t *testing.T) {`
`35`	`35`	`}`
`36`	`36`	`for _, test := range []test{`
`37`	`37`	`{"wiki-name", "wiki name"},`
	`38`	`+ {"title.md.-", "title.md"},`
`38`	`39`	`{"wiki-name.-", "wiki-name"},`
`39`	`40`	`{"the+wiki-name.-", "the wiki-name"},`
`40`	`41`	`{"a%2Fb", "a/b"},`