Fix/nzb cleanup

cmd/altmount/cmd/setup.go

@@ -20,6 +20,7 @@ import (
 	"github.com/javi11/altmount/internal/health"
 	"github.com/javi11/altmount/internal/httpclient"
 	"github.com/javi11/altmount/internal/importer"
+	"github.com/javi11/altmount/internal/importer/scanner"
 	"github.com/javi11/altmount/internal/metadata"
 	"github.com/javi11/altmount/internal/nzbfilesystem"
 	"github.com/javi11/altmount/internal/pool"
@@ -82,7 +83,8 @@ func initializeImporter(
 		Workers: maxProcessorWorkers,
 	}
 
-	importerService, err := importer.NewService(serviceConfig, metadataService, db, poolManager, rcloneClient, configGetter, healthRepo, broadcaster, userRepo)
+	nzbdavImporter := scanner.NewNzbDavImporter(db.Repository)
+	importerService, err := importer.NewService(serviceConfig, metadataService, db, poolManager, rcloneClient, configGetter, healthRepo, broadcaster, userRepo, nzbdavImporter)
 	if err != nil {
 		slog.ErrorContext(ctx, "failed to create importer service", "err", err)
 		return nil, err

config.sample.yaml

@@ -142,6 +142,13 @@ import:
   import_strategy: 'NONE' # Import strategy: NONE (direct import), SYMLINK (create symlinks), STRM (create .strm files)
   import_dir: '' # Import directory (required when import_strategy is SYMLINK or STRM, must be absolute path)
   skip_health_check: true # Bypass Usenet article validation during import (default: true)
+  # Directory Watcher settings
+  watch_dir: '' # Path to monitor for new .nzb files. Leave empty to disable.
+  watch_interval_seconds: 10 # How often to scan the watch directory (default: 10s)
+  # NZB cleanup behavior
+  nzb_cleanup_behavior:
+    on_success: 'delete' # Options: delete, keep (default: delete)
+    on_failure: 'delete' # Options: delete, keep (default: delete)
 
 # Health monitoring configuration
 health:

config/config.yaml

@@ -108,6 +108,8 @@ import:
     segment_sample_percentage: 1
     import_strategy: NONE
     import_dir: null
+    watch_dir: /config/watch
+    watch_interval_seconds: 15
 log:
     file: /config/altmount.log
     level: info

docker/Dockerfile

@@ -84,20 +84,12 @@ ENV PGID=${PGID}
 # Set the working directory inside the container
 WORKDIR /app
 
-# Copy web binary from builder
-COPY --from=backend-builder /app/altmount /app/altmount
-COPY --from=frontend-builder /app/frontend/dist ./frontend/dist
-
-# Install required packages for runtime (mime-support already in custom-base)
+# Install required packages and rclone in a single cached layer
+# This layer will only rebuild if the Dockerfile itself changes
 RUN apt-get update && \
     apt-get install -y --no-install-recommends \
         wget \
-        ca-certificates && \
-    rm -rf /var/lib/apt/lists/*
-
-# Install rclone and FUSE support for internal mount functionality
-RUN apt-get update && \
-    apt-get install -y --no-install-recommends \
+        ca-certificates \
         fuse3 \
         curl \
         unzip && \
@@ -117,12 +109,16 @@ RUN apt-get update && \
     apt-get autoremove -y && \
     rm -rf /var/lib/apt/lists/*
 
-# Make binary executable
-RUN chmod +x /app/altmount
-
 # Copy s6-overlay service configuration
 COPY docker/root/ /
 
+# Copy web binary and frontend from builders (at the end to maximize cache usage)
+COPY --from=backend-builder /app/altmount /app/altmount
+COPY --from=frontend-builder /app/frontend/dist ./frontend/dist
+
+# Make binary executable
+RUN chmod +x /app/altmount
+
 # Set environment variables
 ENV PORT=8080
 ENV HOST=0.0.0.0

frontend/src/components/config/WorkersConfigSection.tsx

@@ -27,13 +27,30 @@ export function ImportConfigSection({
 
 	const handleInputChange = (
 		field: keyof ImportConfig,
-		value: number | boolean | string | string[],
+		value: number | boolean | string | string[] | any,
 	) => {
 		const newData = { ...formData, [field]: value };
 		setFormData(newData);
 		setHasChanges(JSON.stringify(newData) !== JSON.stringify(config.import));
 	};
 
+	const handleNestedInputChange = (
+		parentField: keyof ImportConfig,
+		childField: string,
+		value: string
+	) => {
+		const parentData = formData[parentField] as any || {};
+		const newData = {
+			...formData,
+			[parentField]: {
+				...parentData,
+				[childField]: value
+			}
+		};
+		setFormData(newData);
+		setHasChanges(JSON.stringify(newData) !== JSON.stringify(config.import));
+	};
+
 	const handleSave = async () => {
 		if (onUpdate && hasChanges) {
 			await onUpdate("import", formData);
@@ -252,6 +269,11 @@ export function ImportConfigSection({
 					)}
 				</div>
 
+<<<<<<< HEAD
+				<div className="divider" />
+
+=======
+>>>>>>> upstream/main
 				<div className="space-y-4">
 					<div>
 						<h4 className="font-medium">Watch Directory</h4>
@@ -295,6 +317,57 @@ export function ImportConfigSection({
 					)}
 				</div>
 
+<<<<<<< HEAD
+				<div className="divider" />
+
+				{/* NZB Cleanup Behavior Configuration */}
+				<div className="space-y-4">
+					<div>
+						<h4 className="font-medium text-lg">NZB Cleanup Behavior</h4>
+						<p className="text-base-content/70 text-sm">
+							Configure what happens to the source NZB file after processing.
+						</p>
+					</div>
+
+					<div className="grid grid-cols-1 md:grid-cols-2 gap-4">
+						<fieldset className="fieldset">
+							<legend className="fieldset-legend">On Success</legend>
+							<select
+								className="select w-full"
+								value={formData.nzb_cleanup_behavior?.on_success || "delete"}
+								disabled={isReadOnly}
+								onChange={(e) => handleNestedInputChange("nzb_cleanup_behavior", "on_success", e.target.value)}
+							>
+								<option value="delete">Delete</option>
+								<option value="keep">Keep</option>
+							</select>
+							<p className="label">
+								Action when import is successful (default: delete)
+							</p>
+						</fieldset>
+
+						<fieldset className="fieldset">
+							<legend className="fieldset-legend">On Failure</legend>
+							<select
+								className="select w-full"
+								value={formData.nzb_cleanup_behavior?.on_failure || "delete"}
+								disabled={isReadOnly}
+								onChange={(e) => handleNestedInputChange("nzb_cleanup_behavior", "on_failure", e.target.value)}
+							>
+								<option value="delete">Delete</option>
+								<option value="keep">Keep (Move to failed folder)</option>
+							</select>
+							<p className="label">
+								Action when import fails (default: delete)
+							</p>
+						</fieldset>
+					</div>
+				</div>
+
+				<div className="divider" />
+
+=======
+>>>>>>> upstream/main
 				<fieldset className="fieldset">
 					<legend className="fieldset-legend">Segment Sample Percentage</legend>
 					<input

frontend/src/pages/HealthPage/components/ProviderHealth/ProviderHealth.tsx

@@ -171,4 +171,4 @@ export function ProviderHealth() {
 			</div>
 		</div>
 	);
-}
+}

frontend/src/types/config.ts

@@ -78,8 +78,7 @@ export interface LibrarySyncProgress {
 export interface LibrarySyncResult {
 	files_added: number;
 	files_deleted: number;
-	metadata_deleted: number;
-	duration: string;
+	duration: number;
 	completed_at: string;
 }
 
@@ -169,6 +168,11 @@ export interface FuseConfig {
 // Import strategy type
 export type ImportStrategy = "NONE" | "SYMLINK" | "STRM";
 
+export interface NzbCleanupBehaviorConfig {
+	on_success: string;
+	on_failure: string;
+}
+
 // Import configuration
 export interface ImportConfig {
 	max_processor_workers: number;
@@ -183,6 +187,7 @@ export interface ImportConfig {
 	skip_health_check?: boolean;
 	watch_dir?: string | null;
 	watch_interval_seconds?: number | null;
+	nzb_cleanup_behavior: NzbCleanupBehaviorConfig;
 }
 
 // Log configuration
@@ -357,6 +362,7 @@ export interface ImportUpdateRequest {
 	skip_health_check?: boolean;
 	watch_dir?: string | null;
 	watch_interval_seconds?: number | null;
+	nzb_cleanup_behavior?: NzbCleanupBehaviorConfig;
 }
 
 // Log update request
@@ -443,6 +449,7 @@ export interface ImportFormData {
 	import_dir: string;
 	watch_dir?: string;
 	watch_interval_seconds?: number;
+	nzb_cleanup_behavior?: NzbCleanupBehaviorConfig;
 }
 
 export interface MetadataFormData {

internal/api/queue_handlers.go

@@ -398,14 +398,17 @@ func (s *Server) handleUploadToQueue(c *fiber.Ctx) error {
 		priority = database.QueuePriorityNormal
 	}
 
-	// Create temporary directory for upload
-	tempDir := os.TempDir()
-	uploadDir := filepath.Join(tempDir, "altmount-uploads")
+	// Determine upload directory (prefer persistent storage)
+	uploadDir := filepath.Join(os.TempDir(), "altmount-uploads")
+	if s.importerService != nil {
+		uploadDir = s.importerService.GetNzbFolder()
+	}
+
 	if err := os.MkdirAll(uploadDir, 0755); err != nil {
 		return RespondInternalError(c, "Failed to create upload directory", err.Error())
 	}
 
-	// Save the uploaded file to temporary location
+	// Save the uploaded file directly to persistent location
 	tempFile := filepath.Join(uploadDir, file.Filename)
 	if err := c.SaveFile(file, tempFile); err != nil {
 		return RespondInternalError(c, "Failed to save file", err.Error())

internal/api/sabnzbd_handlers.go

@@ -303,8 +303,12 @@ func (s *Server) handleSABnzbdAddFile(c *fiber.Ctx) error {
 	}
 
 	// Build category path and create temporary file with category subdirectory
-	tempDir := os.TempDir()
-	uploadDir := filepath.Join(tempDir, "altmount-uploads")
+	// Build category path and create temporary file with category subdirectory (prefer persistent storage)
+	uploadDir := filepath.Join(os.TempDir(), "altmount-uploads")
+	if s.importerService != nil {
+		uploadDir = s.importerService.GetNzbFolder()
+	}
+
 	if err := os.MkdirAll(uploadDir, 0755); err != nil {
 		return s.writeSABnzbdErrorFiber(c, "Failed to create upload directory")
 	}
@@ -380,8 +384,12 @@ func (s *Server) handleSABnzbdAddUrl(c *fiber.Ctx) error {
 	}
 
 	// Create temporary file with category path
-	tempDir := os.TempDir()
-	uploadDir := filepath.Join(tempDir, "altmount-uploads")
+	// Build category path and create temporary file with category subdirectory (prefer persistent storage)
+	uploadDir := filepath.Join(os.TempDir(), "altmount-uploads")
+	if s.importerService != nil {
+		uploadDir = s.importerService.GetNzbFolder()
+	}
+
 	if err := os.MkdirAll(uploadDir, 0755); err != nil {
 		return s.writeSABnzbdErrorFiber(c, "Failed to create upload directory")
 	}