Skip to content

Commit 0295e1b

Browse files
committed
improve code
1 parent 1139302 commit 0295e1b

File tree

1 file changed

+9
-18
lines changed

1 file changed

+9
-18
lines changed

services/wiki/wiki.go

Lines changed: 9 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ import (
1515
"code.gitea.io/gitea/modules/git"
1616
"code.gitea.io/gitea/modules/log"
1717
"code.gitea.io/gitea/modules/sync"
18+
"code.gitea.io/gitea/modules/util"
1819

1920
"github.com/unknwon/com"
2021
)
@@ -25,11 +26,9 @@ var (
2526
)
2627

2728
func nameAllowed(name string) error {
28-
for _, reservedName := range reservedWikiNames {
29-
if name == reservedName {
30-
return models.ErrWikiReservedName{
31-
Title: name,
32-
}
29+
if util.IsStringInSlice(name, reservedWikiNames) {
30+
return models.ErrWikiReservedName{
31+
Title: name,
3332
}
3433
}
3534
return nil
@@ -140,11 +139,9 @@ func updateWikiPage(doer *models.User, repo *models.Repository, oldWikiName, new
140139
log.Error("%v", err)
141140
return err
142141
}
143-
for _, file := range filesInIndex {
144-
if file == newWikiPath {
145-
return models.ErrWikiAlreadyExist{
146-
Title: newWikiPath,
147-
}
142+
if util.IsStringInSlice(newWikiPath, filesInIndex) {
143+
return models.ErrWikiAlreadyExist{
144+
Title: newWikiPath,
148145
}
149146
}
150147
} else {
@@ -154,14 +151,8 @@ func updateWikiPage(doer *models.User, repo *models.Repository, oldWikiName, new
154151
log.Error("%v", err)
155152
return err
156153
}
157-
found := false
158-
for _, file := range filesInIndex {
159-
if file == oldWikiPath {
160-
found = true
161-
break
162-
}
163-
}
164-
if found {
154+
155+
if util.IsStringInSlice(oldWikiPath, filesInIndex) {
165156
err := gitRepo.RemoveFilesFromIndex(oldWikiPath)
166157
if err != nil {
167158
log.Error("%v", err)

0 commit comments

Comments
 (0)