aboutsummaryrefslogtreecommitdiffstats
path: root/modules/repository
diff options
context:
space:
mode:
authorJason Song <i@wolfogre.com>2023-01-11 13:31:16 +0800
committerGitHub <noreply@github.com>2023-01-11 13:31:16 +0800
commit477a1cc40ebd3ecb116c632b0717bba748e914d2 (patch)
treef8834d481acbf410d53828d21f5aa149c21a44bd /modules/repository
parentdc5f2cf5906ec2f87ad47ea4724cc245c401eef6 (diff)
downloadgitea-477a1cc40ebd3ecb116c632b0717bba748e914d2.tar.gz
gitea-477a1cc40ebd3ecb116c632b0717bba748e914d2.zip
Improve utils of slices (#22379)
- Move the file `compare.go` and `slice.go` to `slice.go`. - Fix `ExistsInSlice`, it's buggy - It uses `sort.Search`, so it assumes that the input slice is sorted. - It passes `func(i int) bool { return slice[i] == target })` to `sort.Search`, that's incorrect, check the doc of `sort.Search`. - Conbine `IsInt64InSlice(int64, []int64)` and `ExistsInSlice(string, []string)` to `SliceContains[T]([]T, T)`. - Conbine `IsSliceInt64Eq([]int64, []int64)` and `IsEqualSlice([]string, []string)` to `SliceSortedEqual[T]([]T, T)`. - Add `SliceEqual[T]([]T, T)` as a distinction from `SliceSortedEqual[T]([]T, T)`. - Redesign `RemoveIDFromList([]int64, int64) ([]int64, bool)` to `SliceRemoveAll[T]([]T, T) []T`. - Add `SliceContainsFunc[T]([]T, func(T) bool)` and `SliceRemoveAllFunc[T]([]T, func(T) bool)` for general use. - Add comments to explain why not `golang.org/x/exp/slices`. - Add unit tests.
Diffstat (limited to 'modules/repository')
-rw-r--r--modules/repository/init.go6
1 files changed, 3 insertions, 3 deletions
diff --git a/modules/repository/init.go b/modules/repository/init.go
index 59284a5baf..2b0d0be7bc 100644
--- a/modules/repository/init.go
+++ b/modules/repository/init.go
@@ -170,7 +170,7 @@ func LoadRepoConfig() {
}
for _, f := range customFiles {
- if !util.IsStringInSlice(f, files, true) {
+ if !util.SliceContainsString(files, f, true) {
files = append(files, f)
}
}
@@ -200,12 +200,12 @@ func LoadRepoConfig() {
// Filter out invalid names and promote preferred licenses.
sortedLicenses := make([]string, 0, len(Licenses))
for _, name := range setting.Repository.PreferredLicenses {
- if util.IsStringInSlice(name, Licenses, true) {
+ if util.SliceContainsString(Licenses, name, true) {
sortedLicenses = append(sortedLicenses, name)
}
}
for _, name := range Licenses {
- if !util.IsStringInSlice(name, setting.Repository.PreferredLicenses, true) {
+ if !util.SliceContainsString(setting.Repository.PreferredLicenses, name, true) {
sortedLicenses = append(sortedLicenses, name)
}
}