fix: not able to update local created non-urlencoded wiki pages (#16139)

* fix: not able to update local created non-urlencoded wiki pages

* tidy code

* as per suggestion

Signed-off-by: Andrew Thornton <[email protected]>

* Don't replace space to dash for unescaped wiki filename

Co-authored-by: zeripath <[email protected]>

* Remove incorrect comment

* Remove NameToUnescapedFilename()

Co-authored-by: Andrew Thornton <[email protected]>
Co-authored-by: techknowlogick <[email protected]>

Author: 3 people

services/wiki/wiki.go

@@ -81,6 +81,34 @@ func InitUncyclo(repo *models.Repository) error {
 	return nil
 }
 
+// prepareUncycloFileName 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 prepareUncycloFileName(gitRepo *git.Repository, wikiName string) (bool, string, error) {
+	unescaped := wikiName + ".md"
+	escaped := NameToFilename(wikiName)
+
+	// Look for both files
+	filesInIndex, err := gitRepo.LsFiles(unescaped, escaped)
+	if err != nil {
+		log.Error("%v", err)
+		return false, escaped, err
+	}
+
+	foundEscaped := false
+	for _, filename := range filesInIndex {
+		switch filename {
+		case unescaped:
+			// if we find the unescaped file return it
+			return true, unescaped, nil
+		case escaped:
+			foundEscaped = true
+		}
+	}
+
+	// If not return whether the escaped file exists, and the escaped filename to keep backwards compatibility.
+	return foundEscaped, escaped, nil
+}
+
 // updateUncycloPage adds a new page to the repository wiki.
 func updateUncycloPage(doer *models.User, repo *models.Repository, oldUncycloName, newUncycloName, content, message string, isNew bool) (err error) {
 	if err = nameAllowed(newUncycloName); err != nil {
@@ -133,27 +161,29 @@ func updateUncycloPage(doer *models.User, repo *models.Repository, oldUncycloName, new
 		}
 	}
 
-	newUncycloPath := NameToFilename(newUncycloName)
+	isUncycloExist, newUncycloPath, err := prepareUncycloFileName(gitRepo, newUncycloName)
+	if err != nil {
+		return err
+	}
+
 	if isNew {
-		filesInIndex, err := gitRepo.LsFiles(newUncycloPath)
-		if err != nil {
-			log.Error("%v", err)
-			return err
-		}
-		if util.IsStringInSlice(newUncycloPath, filesInIndex) {
+		if isUncycloExist {
 			return models.ErrUncycloAlreadyExist{
 				Title: newUncycloPath,
 			}
 		}
 	} else {
-		oldUncycloPath := NameToFilename(oldUncycloName)
-		filesInIndex, err := gitRepo.LsFiles(oldUncycloPath)
-		if err != nil {
-			log.Error("%v", err)
-			return err
+		// avoid check existence again if wiki name is not changed since gitRepo.LsFiles(...) is not free.
+		isOldUncycloExist := true
+		oldUncycloPath := newUncycloPath
+		if oldUncycloName != newUncycloName {
+			isOldUncycloExist, oldUncycloPath, err = prepareUncycloFileName(gitRepo, oldUncycloName)
+			if err != nil {
+				return err
+			}
 		}
 
-		if util.IsStringInSlice(oldUncycloPath, filesInIndex) {
+		if isOldUncycloExist {
 			err := gitRepo.RemoveFilesFromIndex(oldUncycloPath)
 			if err != nil {
 				log.Error("%v", err)