Fix: #138 (#139)

Author: QuintenQVD0

router/router_server_files.go

@@ -237,12 +237,10 @@ func postServerDeleteFiles(c *gin.Context) {
 			case <-ctx.Done():
 				return ctx.Err()
 			default:
-				if err := s.Filesystem().IsIgnored(pi); err != nil {
-					return err
-				}
-				return s.Filesystem().Delete(pi)
+				return s.Filesystem().SafeDeleteRecursively(pi)
 			}
 		})
+		
 	}
 
 	if err := g.Wait(); err != nil {

server/filesystem/filesystem.go

@@ -401,6 +401,66 @@ func (fs *Filesystem) Delete(p string) error {
 	return fs.unixFS.RemoveAll(p)
 }
 
+// SafeDeleteRecursively deletes a file or directory while respecting the denylist.
+// For files, deletion is skipped if the file matches the denylist. For directories,
+// it recursively deletes all non-denylisted files and subdirectories. Empty directories
+// are removed automatically, but directories containing denylisted files are preserved.
+func (fs *Filesystem) SafeDeleteRecursively(p string) error {
+	info, err := fs.Stat(p)
+	if err != nil {
+		return err
+	}
+
+	// Check if this path (file or directory) is denylisted
+	if err := fs.IsIgnored(p); err != nil {
+		// Skip denylisted file or directory
+		return nil
+	}
+
+	if !info.IsDir() {
+		return fs.Delete(p)
+	}
+
+	entries, err := fs.ReadDir(p)
+	if err != nil {
+		return err
+	}
+
+	hasRemainingFiles := false
+
+	for _, e := range entries {
+		child := filepath.Join(p, e.Name())
+
+		if e.IsDir() {
+			if err := fs.SafeDeleteRecursively(child); err != nil {
+				return err
+			}
+			// Check if the directory still exists after recursive deletion
+			if _, statErr := fs.Stat(child); statErr == nil {
+				hasRemainingFiles = true
+			}
+			continue
+		}
+
+		// File handling - check if ignored
+		if err := fs.IsIgnored(child); err != nil {
+			hasRemainingFiles = true
+			continue // skip denylisted
+		}
+
+		if err := fs.Delete(child); err != nil {
+			return err
+		}
+	}
+
+	// Only remove directory if no files remain
+	if !hasRemainingFiles {
+		return fs.unixFS.Remove(p)
+	}
+
+	return nil
+}
+
 //type fileOpener struct {
 //	fs   *Filesystem
 //	busy uint