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

Restructure go project (#2356)

Browse Source 
* Move main to cmd
* Move api to internal
* Move logger and manager to internal
* Move shell hiding code to separate package
* Decouple job from desktop and utils
* Decouple session from config
* Move static into internal
* Decouple config from dlna
* Move desktop to internal
* Move dlna to internal
* Decouple remaining packages from config
* Move config into internal
* Move jsonschema and paths to models
* Make ffmpeg functions private
* Move file utility methods into fsutil package
* Move symwalk into fsutil
* Move single-use util functions into client package
* Move slice functions to separate packages
* Add env var to suppress windowsgui arg
* Move hash functions into separate package
* Move identify to internal
* Move autotag to internal
* Touch UI when generating backend
This commit is contained in:
WithoutPants
2022-03-17 11:33:59 +11:00
committed by GitHub
parent dcee874f59
commit f69bd8a94f
334 changed files with 1845 additions and 1525 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
pkg/scene/export.go
View File

@@ -5,8 +5,9 @@ import (
"math"
"strconv"
"github.com/stashapp/stash/pkg/manager/jsonschema"
"github.com/stashapp/stash/pkg/models"
"github.com/stashapp/stash/pkg/models/jsonschema"
"github.com/stashapp/stash/pkg/sliceutil/intslice"
"github.com/stashapp/stash/pkg/utils"
)
@@ -175,7 +176,7 @@ func GetDependentTagIDs(tags models.TagReader, markerReader models.SceneMarkerRe
}
for _, tt := range t {
ret = utils.IntAppendUnique(ret, tt.ID)
ret = intslice.IntAppendUnique(ret, tt.ID)
}
sm, err := markerReader.FindBySceneID(scene.ID)
@@ -184,14 +185,14 @@ func GetDependentTagIDs(tags models.TagReader, markerReader models.SceneMarkerRe
}
for _, smm := range sm {
ret = utils.IntAppendUnique(ret, smm.PrimaryTagID)
ret = intslice.IntAppendUnique(ret, smm.PrimaryTagID)
smmt, err := tags.FindBySceneMarkerID(smm.ID)
if err != nil {
return nil, fmt.Errorf("invalid tags for scene marker: %v", err)
}
for _, smmtt := range smmt {
ret = utils.IntAppendUnique(ret, smmtt.ID)
ret = intslice.IntAppendUnique(ret, smmtt.ID)
}
}