Feature: Add trash support

graphql/schema/types/config.graphql

@@ -67,6 +67,8 @@ input ConfigGeneralInput {
   databasePath: String
   "Path to backup directory"
   backupDirectoryPath: String
+  "Path to trash directory - if set, deleted files will be moved here instead of being permanently deleted"
+  deleteTrashPath: String
   "Path to generated files"
   generatedPath: String
   "Path to import/export files"
@@ -187,6 +189,8 @@ type ConfigGeneralResult {
   databasePath: String!
   "Path to backup directory"
   backupDirectoryPath: String!
+  "Path to trash directory - if set, deleted files will be moved here instead of being permanently deleted"
+  deleteTrashPath: String!
   "Path to generated files"
   generatedPath: String!
   "Path to import/export files"

internal/api/resolver_mutation_configure.go

@@ -150,6 +150,15 @@ func (r *mutationResolver) ConfigureGeneral(ctx context.Context, input ConfigGen
 		c.SetString(config.BackupDirectoryPath, *input.BackupDirectoryPath)
 	}
 
+	existingDeleteTrashPath := c.GetDeleteTrashPath()
+	if input.DeleteTrashPath != nil && existingDeleteTrashPath != *input.DeleteTrashPath {
+		if err := validateDir(config.DeleteTrashPath, *input.DeleteTrashPath, true); err != nil {
+			return makeConfigGeneralResult(), err
+		}
+
+		c.SetString(config.DeleteTrashPath, *input.DeleteTrashPath)
+	}
+
 	existingGeneratedPath := c.GetGeneratedPath()
 	if input.GeneratedPath != nil && existingGeneratedPath != *input.GeneratedPath {
 		if err := validateDir(config.Generated, *input.GeneratedPath, false); err != nil {

internal/api/resolver_mutation_file.go

@@ -149,7 +149,9 @@ func (r *mutationResolver) DeleteFiles(ctx context.Context, ids []string) (ret b
 		return false, fmt.Errorf("converting ids: %w", err)
 	}
 
-	fileDeleter := file.NewDeleter()
+	trashPath := manager.GetInstance().Config.GetDeleteTrashPath()
+
+	fileDeleter := file.NewDeleterWithTrash(trashPath)
 	destroyer := &file.ZipDestroyer{
 		FileDestroyer:   r.repository.File,
 		FolderDestroyer: r.repository.Folder,

internal/api/resolver_mutation_gallery.go

@@ -333,10 +333,12 @@ func (r *mutationResolver) GalleryDestroy(ctx context.Context, input models.Gall
 		return false, fmt.Errorf("converting ids: %w", err)
 	}
 
+	trashPath := manager.GetInstance().Config.GetDeleteTrashPath()
+
 	var galleries []*models.Gallery
 	var imgsDestroyed []*models.Image
 	fileDeleter := &image.FileDeleter{
-		Deleter: file.NewDeleter(),
+		Deleter: file.NewDeleterWithTrash(trashPath),
 		Paths:   manager.GetInstance().Paths,
 	}
 

internal/api/resolver_mutation_image.go

@@ -308,9 +308,11 @@ func (r *mutationResolver) ImageDestroy(ctx context.Context, input models.ImageD
 		return false, fmt.Errorf("converting id: %w", err)
 	}
 
+	trashPath := manager.GetInstance().Config.GetDeleteTrashPath()
+
 	var i *models.Image
 	fileDeleter := &image.FileDeleter{
-		Deleter: file.NewDeleter(),
+		Deleter: file.NewDeleterWithTrash(trashPath),
 		Paths:   manager.GetInstance().Paths,
 	}
 	if err := r.withTxn(ctx, func(ctx context.Context) error {
@@ -348,9 +350,11 @@ func (r *mutationResolver) ImagesDestroy(ctx context.Context, input models.Image
 		return false, fmt.Errorf("converting ids: %w", err)
 	}
 
+	trashPath := manager.GetInstance().Config.GetDeleteTrashPath()
+
 	var images []*models.Image
 	fileDeleter := &image.FileDeleter{
-		Deleter: file.NewDeleter(),
+		Deleter: file.NewDeleterWithTrash(trashPath),
 		Paths:   manager.GetInstance().Paths,
 	}
 	if err := r.withTxn(ctx, func(ctx context.Context) error {

internal/api/resolver_mutation_scene.go

@@ -428,10 +428,11 @@ func (r *mutationResolver) SceneDestroy(ctx context.Context, input models.SceneD
 	}
 
 	fileNamingAlgo := manager.GetInstance().Config.GetVideoFileNamingAlgorithm()
+	trashPath := manager.GetInstance().Config.GetDeleteTrashPath()
 
 	var s *models.Scene
 	fileDeleter := &scene.FileDeleter{
-		Deleter:        file.NewDeleter(),
+		Deleter:        file.NewDeleterWithTrash(trashPath),
 		FileNamingAlgo: fileNamingAlgo,
 		Paths:          manager.GetInstance().Paths,
 	}
@@ -482,9 +483,10 @@ func (r *mutationResolver) ScenesDestroy(ctx context.Context, input models.Scene
 
 	var scenes []*models.Scene
 	fileNamingAlgo := manager.GetInstance().Config.GetVideoFileNamingAlgorithm()
+	trashPath := manager.GetInstance().Config.GetDeleteTrashPath()
 
 	fileDeleter := &scene.FileDeleter{
-		Deleter:        file.NewDeleter(),
+		Deleter:        file.NewDeleterWithTrash(trashPath),
 		FileNamingAlgo: fileNamingAlgo,
 		Paths:          manager.GetInstance().Paths,
 	}
@@ -593,8 +595,9 @@ func (r *mutationResolver) SceneMerge(ctx context.Context, input SceneMergeInput
 	}
 
 	mgr := manager.GetInstance()
+	trashPath := mgr.Config.GetDeleteTrashPath()
 	fileDeleter := &scene.FileDeleter{
-		Deleter:        file.NewDeleter(),
+		Deleter:        file.NewDeleterWithTrash(trashPath),
 		FileNamingAlgo: mgr.Config.GetVideoFileNamingAlgorithm(),
 		Paths:          mgr.Paths,
 	}
@@ -736,9 +739,10 @@ func (r *mutationResolver) SceneMarkerUpdate(ctx context.Context, input SceneMar
 	}
 
 	mgr := manager.GetInstance()
+	trashPath := mgr.Config.GetDeleteTrashPath()
 
 	fileDeleter := &scene.FileDeleter{
-		Deleter:        file.NewDeleter(),
+		Deleter:        file.NewDeleterWithTrash(trashPath),
 		FileNamingAlgo: mgr.Config.GetVideoFileNamingAlgorithm(),
 		Paths:          mgr.Paths,
 	}
@@ -832,9 +836,10 @@ func (r *mutationResolver) SceneMarkersDestroy(ctx context.Context, markerIDs []
 
 	var markers []*models.SceneMarker
 	fileNamingAlgo := manager.GetInstance().Config.GetVideoFileNamingAlgorithm()
+	trashPath := manager.GetInstance().Config.GetDeleteTrashPath()
 
 	fileDeleter := &scene.FileDeleter{
-		Deleter:        file.NewDeleter(),
+		Deleter:        file.NewDeleterWithTrash(trashPath),
 		FileNamingAlgo: fileNamingAlgo,
 		Paths:          manager.GetInstance().Paths,
 	}

internal/api/resolver_query_configuration.go

@@ -82,6 +82,7 @@ func makeConfigGeneralResult() *ConfigGeneralResult {
 		Stashes:                       config.GetStashPaths(),
 		DatabasePath:                  config.GetDatabasePath(),
 		BackupDirectoryPath:           config.GetBackupDirectoryPath(),
+		DeleteTrashPath:               config.GetDeleteTrashPath(),
 		GeneratedPath:                 config.GetGeneratedPath(),
 		MetadataPath:                  config.GetMetadataPath(),
 		ConfigFilePath:                config.GetConfigFile(),

internal/manager/config/config.go

@@ -267,6 +267,9 @@ const (
 	DeleteGeneratedDefault        = "defaults.delete_generated"
 	deleteGeneratedDefaultDefault = true
 
+	// Trash/Recycle Bin options
+	DeleteTrashPath = "delete_trash_path"
+
 	// Desktop Integration Options
 	NoBrowser                           = "nobrowser"
 	NoBrowserDefault                    = false
@@ -1456,6 +1459,14 @@ func (i *Config) GetDeleteGeneratedDefault() bool {
 	return i.getBoolDefault(DeleteGeneratedDefault, deleteGeneratedDefaultDefault)
 }
 
+func (i *Config) GetDeleteTrashPath() string {
+	return i.getString(DeleteTrashPath)
+}
+
+func (i *Config) SetDeleteTrashPath(value string) {
+	i.SetString(DeleteTrashPath, value)
+}
+
 // GetDefaultIdentifySettings returns the default Identify task settings.
 // Returns nil if the settings could not be unmarshalled, or if it
 // has not been set.

internal/manager/manager_tasks.go

@@ -294,6 +294,7 @@ func (s *Manager) Clean(ctx context.Context, input CleanMetadataInput) int {
 		Handlers: []file.CleanHandler{
 			&cleanHandler{},
 		},
+		TrashPath: s.Config.GetDeleteTrashPath(),
 	}
 
 	j := cleanJob{

pkg/file/clean.go

@@ -18,7 +18,8 @@ type Cleaner struct {
 	FS         models.FS
 	Repository Repository
 
-	Handlers []CleanHandler
+	Handlers  []CleanHandler
+	TrashPath string
 }
 
 type cleanJob struct {
@@ -392,7 +393,7 @@ func (j *cleanJob) shouldCleanFolder(ctx context.Context, f *models.Folder) bool
 
 func (j *cleanJob) deleteFile(ctx context.Context, fileID models.FileID, fn string) {
 	// delete associated objects
-	fileDeleter := NewDeleter()
+	fileDeleter := NewDeleterWithTrash(j.TrashPath)
 	r := j.Repository
 	if err := r.WithTxn(ctx, func(ctx context.Context) error {
 		fileDeleter.RegisterHooks(ctx)
@@ -410,7 +411,7 @@ func (j *cleanJob) deleteFile(ctx context.Context, fileID models.FileID, fn stri
 
 func (j *cleanJob) deleteFolder(ctx context.Context, folderID models.FolderID, fn string) {
 	// delete associated objects
-	fileDeleter := NewDeleter()
+	fileDeleter := NewDeleterWithTrash(j.TrashPath)
 	r := j.Repository
 	if err := r.WithTxn(ctx, func(ctx context.Context) error {
 		fileDeleter.RegisterHooks(ctx)

pkg/file/delete.go

@@ -58,20 +58,33 @@ func newRenamerRemoverImpl() renamerRemoverImpl {
 
 // Deleter is used to safely delete files and directories from the filesystem.
 // During a transaction, files and directories are marked for deletion using
-// the Files and Dirs methods. This will rename the files/directories to be
-// deleted. If the transaction is rolled back, then the files/directories can
-// be restored to their original state with the Abort method. If the
-// transaction is committed, the marked files are then deleted from the
-// filesystem using the Complete method.
+// the Files and Dirs methods. If TrashPath is set, files are moved to trash
+// immediately. Otherwise, they are renamed with a .delete suffix. If the
+// transaction is rolled back, then the files/directories can be restored to
+// their original state with the Rollback method. If the transaction is
+// committed, the marked files are then deleted from the filesystem using the
+// Commit method.
 type Deleter struct {
 	RenamerRemover RenamerRemover
 	files          []string
 	dirs           []string
+	TrashPath      string            // if set, files will be moved to this directory instead of being permanently deleted
+	trashedPaths   map[string]string // map of original path -> trash path (only used when TrashPath is set)
 }
 
 func NewDeleter() *Deleter {
 	return &Deleter{
 		RenamerRemover: newRenamerRemoverImpl(),
+		TrashPath:      "",
+		trashedPaths:   make(map[string]string),
+	}
+}
+
+func NewDeleterWithTrash(trashPath string) *Deleter {
+	return &Deleter{
+		RenamerRemover: newRenamerRemoverImpl(),
+		TrashPath:      trashPath,
+		trashedPaths:   make(map[string]string),
 	}
 }
 
@@ -150,33 +163,65 @@ func (d *Deleter) Rollback() {
 
 	d.files = nil
 	d.dirs = nil
+	d.trashedPaths = make(map[string]string)
 }
 
 // Commit deletes all files marked for deletion and clears the marked list.
+// When using trash, files have already been moved during renameForDelete, so
+// this just clears the tracking. Otherwise, permanently delete the .delete files.
 // Any errors encountered are logged. All files will be attempted, regardless
 // of the errors encountered.
 func (d *Deleter) Commit() {
-	for _, f := range d.files {
-		if err := d.RenamerRemover.Remove(f + deleteFileSuffix); err != nil {
-			logger.Warnf("Error deleting file %q: %v", f+deleteFileSuffix, err)
+	if d.TrashPath != "" {
+		// Files were already moved to trash during renameForDelete, just clear tracking
+		logger.Debugf("Commit: %d files and %d directories already in trash, clearing tracking", len(d.files), len(d.dirs))
+	} else {
+		// Permanently delete files and directories marked with .delete suffix
+		for _, f := range d.files {
+			if err := d.RenamerRemover.Remove(f + deleteFileSuffix); err != nil {
+				logger.Warnf("Error deleting file %q: %v", f+deleteFileSuffix, err)
+			}
 		}
-	}
 
-	for _, f := range d.dirs {
-		if err := d.RenamerRemover.RemoveAll(f + deleteFileSuffix); err != nil {
-			logger.Warnf("Error deleting directory %q: %v", f+deleteFileSuffix, err)
+		for _, f := range d.dirs {
+			if err := d.RenamerRemover.RemoveAll(f + deleteFileSuffix); err != nil {
+				logger.Warnf("Error deleting directory %q: %v", f+deleteFileSuffix, err)
+			}
 		}
 	}
 
 	d.files = nil
 	d.dirs = nil
+	d.trashedPaths = make(map[string]string)
 }
 
 func (d *Deleter) renameForDelete(path string) error {
+	if d.TrashPath != "" {
+		// Move file to trash immediately
+		trashDest, err := fsutil.MoveToTrash(path, d.TrashPath)
+		if err != nil {
+			return err
+		}
+		d.trashedPaths[path] = trashDest
+		logger.Infof("Moved %q to trash at %s", path, trashDest)
+		return nil
+	}
+
+	// Standard behavior: rename with .delete suffix
 	return d.RenamerRemover.Rename(path, path+deleteFileSuffix)
 }
 
 func (d *Deleter) renameForRestore(path string) error {
+	if d.TrashPath != "" {
+		// Restore file from trash
+		trashPath, ok := d.trashedPaths[path]
+		if !ok {
+			return fmt.Errorf("no trash path found for %q", path)
+		}
+		return d.RenamerRemover.Rename(trashPath, path)
+	}
+
+	// Standard behavior: restore from .delete suffix
 	return d.RenamerRemover.Rename(path+deleteFileSuffix, path)
 }
 

pkg/fsutil/trash.go

@@ -0,0 +1,43 @@
+package fsutil
+
+import (
+	"fmt"
+	"os"
+	"path/filepath"
+	"time"
+)
+
+// MoveToTrash moves a file or directory to a custom trash directory.
+// If a file with the same name already exists in the trash, a timestamp is appended.
+// Returns the destination path where the file was moved to.
+func MoveToTrash(sourcePath string, trashPath string) (string, error) {
+	// Get absolute path for the source
+	absSourcePath, err := filepath.Abs(sourcePath)
+	if err != nil {
+		return "", fmt.Errorf("failed to get absolute path: %w", err)
+	}
+
+	// Ensure trash directory exists
+	if err := os.MkdirAll(trashPath, 0755); err != nil {
+		return "", fmt.Errorf("failed to create trash directory: %w", err)
+	}
+
+	// Get the base name of the file/directory
+	baseName := filepath.Base(absSourcePath)
+	destPath := filepath.Join(trashPath, baseName)
+
+	// If a file with the same name already exists in trash, append timestamp
+	if _, err := os.Stat(destPath); err == nil {
+		ext := filepath.Ext(baseName)
+		nameWithoutExt := baseName[:len(baseName)-len(ext)]
+		timestamp := time.Now().Format("20060102-150405")
+		destPath = filepath.Join(trashPath, fmt.Sprintf("%s_%s%s", nameWithoutExt, timestamp, ext))
+	}
+
+	// Move the file to trash using SafeMove to support cross-filesystem moves
+	if err := SafeMove(absSourcePath, destPath); err != nil {
+		return "", fmt.Errorf("failed to move to trash: %w", err)
+	}
+
+	return destPath, nil
+}

ui/v2.5/graphql/data/config.graphql

@@ -6,6 +6,7 @@ fragment ConfigGeneralData on ConfigGeneralResult {
   }
   databasePath
   backupDirectoryPath
+  deleteTrashPath
   generatedPath
   metadataPath
   scrapersPath