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

Fix deleting folder-based gallery file deleting (#1872)

Browse Source 
* Fix deleting gallery image files
* Clarify delete file documentation
This commit is contained in:
WithoutPants
2021-10-25 09:29:03 +11:00
committed by GitHub
parent 0ab8d32687
commit d292ed0b34
5 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
pkg/api/resolver_mutation_gallery.go
View File

@@ -441,7 +441,7 @@ func (r *mutationResolver) GalleryDestroy(ctx context.Context, input models.Gall
return err
}
if len(imgGalleries) == 0 {
if len(imgGalleries) == 1 {
if err := iqb.Destroy(img.ID); err != nil {
return err
}
@@ -465,13 +465,15 @@ func (r *mutationResolver) GalleryDestroy(ctx context.Context, input models.Gall
// if delete file is true, then delete the file as well
// if it fails, just log a message
if input.DeleteFile != nil && *input.DeleteFile {
for _, gallery := range galleries {
manager.DeleteGalleryFile(gallery)
}
// #1804 - delete the image files first, since they must be removed
// before deleting a folder
for _, img := range imgsToDelete {
manager.DeleteImageFile(img)
}
for _, gallery := range galleries {
manager.DeleteGalleryFile(gallery)
}
}
// if delete generated is true, then delete the generated files