Refactor file deletion (#1954)

* Add file deleter
* Change scene delete code
* Add image/gallery delete code
* Don't remove stash library paths
* Fail silently if file does not exist

pkg/api/resolver_mutation_gallery.go

@@ -5,9 +5,12 @@ import (
 	"database/sql"
 	"errors"
 	"fmt"
+	"os"
 	"strconv"
 	"time"
 
+	"github.com/stashapp/stash/pkg/file"
+	"github.com/stashapp/stash/pkg/image"
 	"github.com/stashapp/stash/pkg/manager"
 	"github.com/stashapp/stash/pkg/models"
 	"github.com/stashapp/stash/pkg/plugin"
@@ -395,8 +398,14 @@ func (r *mutationResolver) GalleryDestroy(ctx context.Context, input models.Gall
 	}
 
 	var galleries []*models.Gallery
-	var imgsToPostProcess []*models.Image
-	var imgsToDelete []*models.Image
+	var imgsDestroyed []*models.Image
+	fileDeleter := &image.FileDeleter{
+		Deleter: *file.NewDeleter(),
+		Paths:   manager.GetInstance().Paths,
+	}
+
+	deleteGenerated := utils.IsTrue(input.DeleteGenerated)
+	deleteFile := utils.IsTrue(input.DeleteFile)
 
 	if err := r.withTxn(ctx, func(repo models.Repository) error {
 		qb := repo.Gallery()
@@ -422,13 +431,19 @@ func (r *mutationResolver) GalleryDestroy(ctx context.Context, input models.Gall
 				}
 
 				for _, img := range imgs {
-					if err := iqb.Destroy(img.ID); err != nil {
+					if err := image.Destroy(img, iqb, fileDeleter, deleteGenerated, false); err != nil {
 						return err
 					}
 
-					imgsToPostProcess = append(imgsToPostProcess, img)
+					imgsDestroyed = append(imgsDestroyed, img)
 				}
-			} else if input.DeleteFile != nil && *input.DeleteFile {
+
+				if deleteFile {
+					if err := fileDeleter.Files([]string{gallery.Path.String}); err != nil {
+						return err
+					}
+				}
+			} else if deleteFile {
 				// Delete image if it is only attached to this gallery
 				imgs, err := iqb.FindByGalleryID(id)
 				if err != nil {
@@ -442,14 +457,16 @@ func (r *mutationResolver) GalleryDestroy(ctx context.Context, input models.Gall
 					}
 
 					if len(imgGalleries) == 1 {
-						if err := iqb.Destroy(img.ID); err != nil {
+						if err := image.Destroy(img, iqb, fileDeleter, deleteGenerated, deleteFile); err != nil {
 							return err
 						}
 
-						imgsToDelete = append(imgsToDelete, img)
-						imgsToPostProcess = append(imgsToPostProcess, img)
+						imgsDestroyed = append(imgsDestroyed, img)
 					}
 				}
+
+				// we only want to delete a folder-based gallery if it is empty.
+				// don't do this with the file deleter
 			}
 
 			if err := qb.Destroy(id); err != nil {
@@ -459,28 +476,19 @@ func (r *mutationResolver) GalleryDestroy(ctx context.Context, input models.Gall
 
 		return nil
 	}); err != nil {
+		fileDeleter.Rollback()
 		return false, err
 	}
 
-	// if delete file is true, then delete the file as well
-	// if it fails, just log a message
-	if input.DeleteFile != nil && *input.DeleteFile {
-		// #1804 - delete the image files first, since they must be removed
-		// before deleting a folder
-		for _, img := range imgsToDelete {
-			manager.DeleteImageFile(img)
-		}
+	// perform the post-commit actions
+	fileDeleter.Commit()
 
-		for _, gallery := range galleries {
-			manager.DeleteGalleryFile(gallery)
-		}
-	}
-
-	// if delete generated is true, then delete the generated files
-	// for the gallery
-	if input.DeleteGenerated != nil && *input.DeleteGenerated {
-		for _, img := range imgsToPostProcess {
-			manager.DeleteGeneratedImageFiles(img)
+	for _, gallery := range galleries {
+		// don't delete stash library paths
+		if utils.IsTrue(input.DeleteFile) && !gallery.Zip && gallery.Path.Valid && !isStashPath(gallery.Path.String) {
+			// try to remove the folder - it is possible that it is not empty
+			// so swallow the error if present
+			_ = os.Remove(gallery.Path.String)
 		}
 	}
 
@@ -490,13 +498,24 @@ func (r *mutationResolver) GalleryDestroy(ctx context.Context, input models.Gall
 	}
 
 	// call image destroy post hook as well
-	for _, img := range imgsToDelete {
+	for _, img := range imgsDestroyed {
 		r.hookExecutor.ExecutePostHooks(ctx, img.ID, plugin.ImageDestroyPost, nil, nil)
 	}
 
 	return true, nil
 }
 
+func isStashPath(path string) bool {
+	stashConfigs := manager.GetInstance().Config.GetStashPaths()
+	for _, config := range stashConfigs {
+		if path == config.Path {
+			return true
+		}
+	}
+
+	return false
+}
+
 func (r *mutationResolver) AddGalleryImages(ctx context.Context, input models.GalleryAddInput) (bool, error) {
 	galleryID, err := strconv.Atoi(input.GalleryID)
 	if err != nil {