Mirrors/stash
1
0
Fork 0
mirror of https://github.com/stashapp/stash.git synced 2025-12-17 12:24:38 +03:00
Code Issues Packages Projects Releases Wiki Activity

Genericise sliceutil functions (#4253)

Browse Source 
* Genericise sliceutil.SliceSame
* Genericise intslice functions
* Genericise stringutil functions
This commit is contained in:
DingDongSoLong4
2023-11-01 23:58:32 +02:00
committed by GitHub
parent cc6673f276
commit 9621213424
51 changed files with 259 additions and 409 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
scripts/test_db_generator/makeTestDB.go
View File

@@ -21,7 +21,7 @@ import (
"github.com/stashapp/stash/pkg/fsutil"
"github.com/stashapp/stash/pkg/hash/md5"
"github.com/stashapp/stash/pkg/models"
"github.com/stashapp/stash/pkg/sliceutil/intslice"
"github.com/stashapp/stash/pkg/sliceutil"
"github.com/stashapp/stash/pkg/sqlite"
"github.com/stashapp/stash/pkg/txn"
)
@@ -554,7 +554,7 @@ func makeMarkers(n int) {
tags := getRandomTags(ctx, 0, 5)
// remove primary tag
tags = intslice.IntExclude(tags, []int{marker.PrimaryTagID})
tags = sliceutil.Exclude(tags, []int{marker.PrimaryTagID})
if err := repo.SceneMarker.UpdateTags(ctx, created.ID, tags); err != nil {
return err
}
@@ -642,12 +642,12 @@ func getRandomPerformers(ctx context.Context) []int {
// }
// for _, pp := range p {
// ret = intslice.IntAppendUnique(ret, pp.ID)
// ret = sliceutil.AppendUnique(ret, pp.ID)
// }
// }
for i := 0; i < n; i++ {
ret = intslice.IntAppendUnique(ret, rand.Intn(c.Performers)+1)
ret = sliceutil.AppendUnique(ret, rand.Intn(c.Performers)+1)
}
return ret
@@ -677,12 +677,12 @@ func getRandomTags(ctx context.Context, min, max int) []int {
// }
// for _, tt := range t {
// ret = intslice.IntAppendUnique(ret, tt.ID)
// ret = sliceutil.AppendUnique(ret, tt.ID)
// }
// }
for i := 0; i < n; i++ {
ret = intslice.IntAppendUnique(ret, rand.Intn(c.Tags)+1)
ret = sliceutil.AppendUnique(ret, rand.Intn(c.Tags)+1)
}
return ret
@@ -699,12 +699,12 @@ func getRandomImages(ctx context.Context) []int {
// }
// for _, tt := range t {
// ret = intslice.IntAppendUnique(ret, tt.ID)
// ret = sliceutil.AppendUnique(ret, tt.ID)
// }
// }
for i := 0; i < n; i++ {
ret = intslice.IntAppendUnique(ret, rand.Intn(c.Images)+1)
ret = sliceutil.AppendUnique(ret, rand.Intn(c.Images)+1)
}
return ret