Mirrors/stash
1
0
Fork 0
mirror of https://github.com/stashapp/stash.git synced 2025-12-17 04:14:39 +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

8
pkg/scene/export.go
View File

@@ -10,7 +10,7 @@ import (
"github.com/stashapp/stash/pkg/models"
"github.com/stashapp/stash/pkg/models/json"
"github.com/stashapp/stash/pkg/models/jsonschema"
"github.com/stashapp/stash/pkg/sliceutil/intslice"
"github.com/stashapp/stash/pkg/sliceutil"
"github.com/stashapp/stash/pkg/utils"
)
@@ -125,7 +125,7 @@ func GetDependentTagIDs(ctx context.Context, tags TagFinder, markerReader models
}
for _, tt := range t {
ret = intslice.IntAppendUnique(ret, tt.ID)
ret = sliceutil.AppendUnique(ret, tt.ID)
}
sm, err := markerReader.FindBySceneID(ctx, scene.ID)
@@ -134,14 +134,14 @@ func GetDependentTagIDs(ctx context.Context, tags TagFinder, markerReader models
}
for _, smm := range sm {
ret = intslice.IntAppendUnique(ret, smm.PrimaryTagID)
ret = sliceutil.AppendUnique(ret, smm.PrimaryTagID)
smmt, err := tags.FindBySceneMarkerID(ctx, smm.ID)
if err != nil {
return nil, fmt.Errorf("invalid tags for scene marker: %v", err)
}
for _, smmtt := range smmt {
ret = intslice.IntAppendUnique(ret, smmtt.ID)
ret = sliceutil.AppendUnique(ret, smmtt.ID)
}
}