Ignore non-video files with missing articles.

Author: nzbdav-dev

backend/Queue/FileProcessors/BaseProcessor.cs

@@ -2,6 +2,6 @@
 
 public abstract class BaseProcessor
 {
-    public abstract Task<Result> ProcessAsync();
+    public abstract Task<Result?> ProcessAsync();
     public class Result { }
 }

backend/Queue/FileProcessors/FileProcessor.cs

@@ -1,27 +1,46 @@
 using NzbWebDAV.Clients;
+using NzbWebDAV.Exceptions;
+using NzbWebDAV.Utils;
+using Serilog;
 using Usenet.Nzb;
 
 namespace NzbWebDAV.Queue.FileProcessors;
 
-public class FileProcessor(NzbFile nzbFile, string filename, UsenetStreamingClient usenet, CancellationToken ct) : BaseProcessor
+public class FileProcessor(
+    NzbFile nzbFile,
+    string filename,
+    UsenetStreamingClient usenet,
+    CancellationToken ct
+) : BaseProcessor
 {
     public static bool CanProcess(string filename)
     {
         // skip par2 files
         return !filename.EndsWith(".par2", StringComparison.OrdinalIgnoreCase);
     }
 
-    public override async Task<BaseProcessor.Result> ProcessAsync()
+    public override async Task<BaseProcessor.Result?> ProcessAsync()
     {
-        var firstSegment = nzbFile.Segments[0].MessageId.Value;
-        var header = await usenet.GetSegmentYencHeaderAsync(firstSegment, default);
+        try
+        {
+            var firstSegment = nzbFile.Segments[0].MessageId.Value;
+            var header = await usenet.GetSegmentYencHeaderAsync(firstSegment, ct);
+
+            return new Result()
+            {
+                NzbFile = nzbFile,
+                FileName = filename,
+                FileSize = header.FileSize,
+            };
+        }
 
-        return new Result()
+        // Ignore missing articles if it's not a video file.
+        // In that case, simply skip the file altogether.
+        catch (UsenetArticleNotFoundException) when (!FilenameUtil.IsVideoFile(filename))
         {
-            NzbFile = nzbFile,
-            FileName = filename,
-            FileSize = header.FileSize,
-        };
+            Log.Warning($"File `{filename}` has missing articles. Skipping file since it is not a video.");
+            return null;
+        }
     }
 
     public new class Result : BaseProcessor.Result

backend/Queue/FileProcessors/RarProcessor.cs

@@ -22,7 +22,7 @@ public static bool CanProcess(string filename)
         return IsRarFile(filename);
     }
 
-    public override async Task<BaseProcessor.Result> ProcessAsync()
+    public override async Task<BaseProcessor.Result?> ProcessAsync()
     {
         try
         {

backend/Queue/QueueItemProcessor.cs

@@ -101,7 +101,10 @@ private async Task ProcessQueueItemAsync(DateTime startTime)
             .ToList();
 
         // wait for all file processing tasks to finish
-        var fileProcessingResults = await TaskUtil.WhenAllOrError(fileProcessingTasks, progress);
+        var fileProcessingResults = (await TaskUtil.WhenAllOrError(fileProcessingTasks, progress))
+            .Where(x => x is not null)
+            .Select(x => x!)
+            .ToList();
 
         // update the database
         await MarkQueueItemCompleted(startTime, error: null, () =>

backend/Queue/Validators/EnsureImportableVideoValidator.cs

@@ -2,19 +2,12 @@
 using NzbWebDAV.Database;
 using NzbWebDAV.Database.Models;
 using NzbWebDAV.Exceptions;
+using NzbWebDAV.Utils;
 
 namespace NzbWebDAV.Queue.Validators;
 
 public class EnsureImportableVideoValidator(DavDatabaseClient dbClient)
 {
-    private static readonly HashSet<string> VideoExtensions =
-    [
-        ".webm", ".m4v", ".3gp", ".nsv", ".ty", ".strm", ".rm", ".rmvb", ".m3u", ".ifo", ".mov", ".qt", ".divx",
-        ".xvid", ".bivx", ".nrg", ".pva", ".wmv", ".asf", ".asx", ".ogm", ".ogv", ".m2v", ".avi", ".bin", ".dat",
-        ".dvr-ms", ".mpg", ".mpeg", ".mp4", ".avc", ".vp3", ".svq3", ".nuv", ".viv", ".dv", ".fli", ".flv", ".wpl",
-        ".img", ".iso", ".vob", ".mkv", ".mk3d", ".ts", ".wtv", ".m2ts"
-    ];
-
     public void ThrowIfValidationFails()
     {
         if (!IsValid())
@@ -29,7 +22,6 @@ private bool IsValid()
             .Where(x => x.State == EntityState.Added)
             .Select(x => x.Entity)
             .Where(x => x.Type != DavItem.ItemType.Directory)
-            .Select(x => Path.GetExtension(x.Name).ToLower())
-            .Any(x => VideoExtensions.Contains(x));
+            .Any(x => FilenameUtil.IsVideoFile(x.Name));
     }
 }

backend/Utils/FilenameUtil.cs

@@ -0,0 +1,17 @@
+namespace NzbWebDAV.Utils;
+
+public class FilenameUtil
+{
+    private static readonly HashSet<string> VideoExtensions =
+    [
+        ".webm", ".m4v", ".3gp", ".nsv", ".ty", ".strm", ".rm", ".rmvb", ".m3u", ".ifo", ".mov", ".qt", ".divx",
+        ".xvid", ".bivx", ".nrg", ".pva", ".wmv", ".asf", ".asx", ".ogm", ".ogv", ".m2v", ".avi", ".bin", ".dat",
+        ".dvr-ms", ".mpg", ".mpeg", ".mp4", ".avc", ".vp3", ".svq3", ".nuv", ".viv", ".dv", ".fli", ".flv", ".wpl",
+        ".img", ".iso", ".vob", ".mkv", ".mk3d", ".ts", ".wtv", ".m2ts"
+    ];
+
+    public static bool IsVideoFile(string filename)
+    {
+        return VideoExtensions.Contains(Path.GetExtension(filename).ToLower());
+    }
+}