Bugfixes (#2862)

Co-authored-by: Robbie Davis <robbie@therobbiedavis.com>

API/Services/DirectoryService.cs

@@ -596,14 +596,12 @@ public class DirectoryService : IDirectoryService
     /// <returns></returns>
     public string? FindLowestDirectoriesFromFiles(IEnumerable<string> libraryFolders, IList<string> filePaths)
     {
-
-
-        var stopLookingForDirectories = false;
         var dirs = new Dictionary<string, string>();
-        foreach (var folder in libraryFolders.Select(Tasks.Scanner.Parser.Parser.NormalizePath))
+        var normalizedFilePaths = filePaths.Select(Parser.NormalizePath).ToList();
+
+        foreach (var folder in libraryFolders.Select(Parser.NormalizePath))
         {
-            if (stopLookingForDirectories) break;
-            foreach (var file in filePaths.Select(Tasks.Scanner.Parser.Parser.NormalizePath))
+            foreach (var file in normalizedFilePaths)
             {
                 if (!file.Contains(folder)) continue;
 
@@ -619,8 +617,16 @@ public class DirectoryService : IDirectoryService
         if (dirs.Keys.Count == 1) return dirs.Keys.First();
         if (dirs.Keys.Count > 1)
         {
-            return dirs.Keys.Last();
+            // For each key, validate that each file exists in the key path
+            foreach (var folder in dirs.Keys)
+            {
+                if (normalizedFilePaths.TrueForAll(filePath => filePath.Contains(Parser.NormalizePath(folder))))
+                {
+                    return folder;
+                }
+            }
         }
+
         return null;
     }
 

API/Services/TaskScheduler.cs

@@ -265,7 +265,7 @@ public class TaskScheduler : ITaskScheduler
     public void ScheduleUpdaterTasks()
     {
         _logger.LogInformation("Scheduling Auto-Update tasks");
-        RecurringJob.AddOrUpdate(CheckForUpdateId, () => CheckForUpdate(), $"0 */{Rnd.Next(1, 2)} * * *", RecurringJobOptions);
+        RecurringJob.AddOrUpdate(CheckForUpdateId, () => CheckForUpdate(), $"0 */{Rnd.Next(4, 6)} * * *", RecurringJobOptions);
         BackgroundJob.Enqueue(() => CheckForUpdate());
     }
 

API/Services/Tasks/Scanner/ParseScannedFiles.cs

@@ -463,7 +463,7 @@ public class ParseScannedFiles
                         chapter.IssueOrder = counter;
                         counter++;
                     }
-                    return;
+                    continue;
                 }
 
 
@@ -479,7 +479,7 @@ public class ParseScannedFiles
                         chapter.IssueOrder = counter;
                         counter++;
                     }
-                    return;
+                    continue;
                 }
 
                 chapters = infos