Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 9 commits into from
Jul 7, 2021
Merged

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

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
6c170da
fix: not able to update local created non-urlencoded wiki pages
BLumia Jun 12, 2021
f831290
tidy code
BLumia Jun 23, 2021
66afdad
as per suggestion
zeripath Jun 26, 2021
b37a913
Merge remote-tracking branch 'origin/main' into fix-local-wiki-update
zeripath Jun 26, 2021
8880600
Don't replace space to dash for unescaped wiki filename
BLumia Jun 26, 2021
00ed6be
Remove incorrect comment
BLumia Jul 1, 2021
2aa6f97
Remove NameToUnescapedFilename()
BLumia Jul 1, 2021
ef77ebe
Merge branch 'main' into fix-local-wiki-update
zeripath Jul 1, 2021
cddad07
Merge branch 'main' into fix-local-wiki-update
techknowlogick Jul 7, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 40 additions & 8 deletions services/wiki/wiki.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,12 @@ func NormalizeWikiName(name string) string {
return strings.ReplaceAll(name, "-", " ")
}

// NameToUnescapedFilename converts a wiki name to its corresponding filename without url query escape.
func NameToUnescapedFilename(name string) string {
6543 marked this conversation as resolved.
Show resolved Hide resolved
name = strings.ReplaceAll(name, " ", "-")
BLumia marked this conversation as resolved.
Show resolved Hide resolved
return name + ".md"
}

// NameToFilename converts a wiki name to its corresponding filename.
func NameToFilename(name string) string {
name = strings.ReplaceAll(name, " ", "-")
Expand Down Expand Up @@ -81,6 +87,19 @@ func InitWiki(repo *models.Repository) error {
return nil
}

func checkFileExistence(gitRepo *git.Repository, filePath string) (bool, error) {
BLumia marked this conversation as resolved.
Show resolved Hide resolved
filesInIndex, err := gitRepo.LsFiles(filePath)
if err != nil {
log.Error("%v", err)
return false, err
}
if util.IsStringInSlice(filePath, filesInIndex) {
return true, nil
}

return false, nil
}

// updateWikiPage adds a new page to the repository wiki.
func updateWikiPage(doer *models.User, repo *models.Repository, oldWikiName, newWikiName, content, message string, isNew bool) (err error) {
if err = nameAllowed(newWikiName); err != nil {
Expand Down Expand Up @@ -133,27 +152,40 @@ func updateWikiPage(doer *models.User, repo *models.Repository, oldWikiName, new
}
}

newWikiPath := NameToFilename(newWikiName)
newWikiPath := NameToUnescapedFilename(newWikiName)
isWikiExist, err := checkFileExistence(gitRepo, newWikiPath)
if err != nil {
return err
}
if !isWikiExist {
newWikiPath = NameToFilename(newWikiName)
}

if isNew {
filesInIndex, err := gitRepo.LsFiles(newWikiPath)
isNewWikiExist, err := checkFileExistence(gitRepo, newWikiPath)
if err != nil {
log.Error("%v", err)
return err
}
if util.IsStringInSlice(newWikiPath, filesInIndex) {
if isNewWikiExist {
return models.ErrWikiAlreadyExist{
Title: newWikiPath,
}
}
} else {
oldWikiPath := NameToFilename(oldWikiName)
filesInIndex, err := gitRepo.LsFiles(oldWikiPath)
oldWikiPath := NameToUnescapedFilename(oldWikiName)
isOldWikiExist, err := checkFileExistence(gitRepo, oldWikiPath)
if err != nil {
log.Error("%v", err)
return err
}
if !isOldWikiExist {
oldWikiPath = NameToFilename(oldWikiName)
isOldWikiExist, err = checkFileExistence(gitRepo, oldWikiPath)
if err != nil {
return err
}
}

if util.IsStringInSlice(oldWikiPath, filesInIndex) {
if isOldWikiExist {
err := gitRepo.RemoveFilesFromIndex(oldWikiPath)
if err != nil {
log.Error("%v", err)
Expand Down