From 8b0c8afb81211b6b27a9c3a64a95f982d20f3647 Mon Sep 17 00:00:00 2001
From: "kay.one" <kay.one@gmail.com>
Date: Mon, 4 Jul 2011 23:52:06 -0700
Subject: [PATCH] PostDownloadScanJob will not fail completely if a single
 folder fails.

---
 .../Providers/Jobs/PostDownloadScanJob.cs     | 61 +++++++++++--------
 1 file changed, 34 insertions(+), 27 deletions(-)

diff --git a/NzbDrone.Core/Providers/Jobs/PostDownloadScanJob.cs b/NzbDrone.Core/Providers/Jobs/PostDownloadScanJob.cs
index 0e80a24f1..241fcdb39 100644
--- a/NzbDrone.Core/Providers/Jobs/PostDownloadScanJob.cs
+++ b/NzbDrone.Core/Providers/Jobs/PostDownloadScanJob.cs
@@ -31,7 +31,7 @@ namespace NzbDrone.Core.Providers.Jobs
 
         public string Name
         {
-            get { return "Post Download Media File Scan"; }
+            get { return "Drop folder monitor"; }
         }
 
         public int DefaultInterval
@@ -58,36 +58,43 @@ namespace NzbDrone.Core.Providers.Jobs
 
             foreach (var subfolder in _diskProvider.GetDirectories(dropFolder))
             {
-                var subfolderInfo = new DirectoryInfo(subfolder);
-
-                if (subfolderInfo.Name.StartsWith("_UNPACK_", StringComparison.CurrentCultureIgnoreCase))
-                {
-                    Logger.Info("Folder [{0}] is still being unpacked. skipping.", subfolder);
-                    continue;
-                }
-
-                if (subfolderInfo.Name.StartsWith("_FAILED_", StringComparison.CurrentCultureIgnoreCase))
+                try
                 {
-                    Logger.Info("Folder [{0}] is marked as failed. skipping.", subfolder);
-                    continue;
+                    var subfolderInfo = new DirectoryInfo(subfolder);
+
+                    if (subfolderInfo.Name.StartsWith("_UNPACK_", StringComparison.CurrentCultureIgnoreCase))
+                    {
+                        Logger.Info("Folder [{0}] is still being unpacked. skipping.", subfolder);
+                        continue;
+                    }
+
+                    if (subfolderInfo.Name.StartsWith("_FAILED_", StringComparison.CurrentCultureIgnoreCase))
+                    {
+                        Logger.Info("Folder [{0}] is marked as failed. skipping.", subfolder);
+                        continue;
+                    }
+
+                    //Parse the Folder name
+                    var seriesName = Parser.ParseSeriesName(subfolderInfo.Name);
+                    var series = _seriesProvider.FindSeries(seriesName);
+
+                    if (series == null)
+                    {
+                        Logger.Warn("Unable to Import new download, series is not being watched");
+                        return;
+                    }
+
+                    var importedFiles = _diskScanProvider.Scan(series, subfolder);
+                    importedFiles.ForEach(file => _diskScanProvider.MoveEpisodeFile(file));
+
+                    //Delete the folder only if all files were removed
+                    if (_diskProvider.GetFiles(subfolder, "*.*", SearchOption.AllDirectories).Length == 0)
+                        _diskProvider.DeleteFolder(subfolder, false);
                 }
-
-                //Parse the Folder name
-                var seriesName = Parser.ParseSeriesName(subfolderInfo.Name);
-                var series = _seriesProvider.FindSeries(seriesName);
-
-                if (series == null)
+                catch (Exception e)
                 {
-                    Logger.Warn("Unable to Import new download, series is not being watched");
-                    return;
+                    Logger.ErrorException("An error has occurred while importing " + subfolder, e);
                 }
-
-                var importedFiles = _diskScanProvider.Scan(series, subfolder);
-                importedFiles.ForEach(file => _diskScanProvider.MoveEpisodeFile(file));
-
-                //Delete the folder only if all files were removed
-                if (_diskProvider.GetFiles(subfolder, "*.*", SearchOption.AllDirectories).Length == 0)
-                    _diskProvider.DeleteFolder(subfolder, false);
             }
 
             Logger.Debug("New Download Scan Job completed successfully");