mirror/stash
1
0
Fork 0
mirror of https://github.com/stashapp/stash.git synced 2026-05-08 01:29:46 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix merge not deleting deleted scene generated files (#4567)

Browse Source
This commit is contained in:
WithoutPants
2024-02-16 12:38:34 +11:00
committed by GitHub
parent 5b9bdadaec
commit 8fc997dfe9
3 changed files with 21 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/api/resolver_mutation_scene.go
+8 -1
View File
@@ -560,9 +560,16 @@ func (r *mutationResolver) SceneMerge(ctx context.Context, input SceneMergeInput
values = &v
}
mgr := manager.GetInstance()
fileDeleter := &scene.FileDeleter{
Deleter: file.NewDeleter(),
FileNamingAlgo: mgr.Config.GetVideoFileNamingAlgorithm(),
Paths: mgr.Paths,
}
var ret *models.Scene
if err := r.withTxn(ctx, func(ctx context.Context) error {
if err := r.Resolver.sceneService.Merge(ctx, srcIDs, destID, *values); err != nil {
if err := r.Resolver.sceneService.Merge(ctx, srcIDs, destID, *values, fileDeleter); err != nil {
return err
}
internal/manager/repository.go
+1 -1
View File
@@ -11,7 +11,7 @@ import (
type SceneService interface {
Create(ctx context.Context, input *models.Scene, fileIDs []models.FileID, coverImage []byte) (*models.Scene, error)
AssignFile(ctx context.Context, sceneID int, fileID models.FileID) error
Merge(ctx context.Context, sourceIDs []int, destinationID int, values models.ScenePartial) error
Merge(ctx context.Context, sourceIDs []int, destinationID int, values models.ScenePartial, fileDeleter *scene.FileDeleter) error
Destroy(ctx context.Context, scene *models.Scene, fileDeleter *scene.FileDeleter, deleteGenerated, deleteFile bool) error
}