Merge pull request #394 from MarkSummerville/25

Update from latest
TV-Rename · May 7, 2018 · aa15b7f · aa15b7f
2 parents ea03eaf + 1cb2b89
commit aa15b7f
Show file tree

Hide file tree

Showing 9 changed files with 175 additions and 95 deletions.
diff --git a/TVRename#/Forms/Preferences.Designer.cs b/TVRename#/Forms/Preferences.Designer.cs
diff --git a/TVRename#/Forms/Preferences.cs b/TVRename#/Forms/Preferences.cs
@@ -174,6 +174,8 @@ private void OKButton_Click(object sender, System.EventArgs e)
             S.CheckuTorrent = this.cbCheckuTorrent.Checked;
             S.LookForDateInFilename = this.cbLookForAirdate.Checked;
             S.AutoMergeEpisodes = this.chkAutoMergeEpisodes.Checked;
+            S.RetainLanguageSpecificSubtitles = this.chkRetainLanguageSpecificSubtitles.Checked;
+            S.ForceBulkAddToUseSettingsOnly = this.chkForceBulkAddToUseSettingsOnly.Checked;
 
             S.MonitorFolders = this.cbMonitorFolder.Checked;
             S.runStartupCheck = this.chkScanOnStartup.Checked;
@@ -400,6 +402,8 @@ private void Preferences_Load(object sender, System.EventArgs e)
             this.chkPreventMove.Checked = S.PreventMove;
             this.cbCheckuTorrent.Checked = S.CheckuTorrent;
             this.cbLookForAirdate.Checked = S.LookForDateInFilename;
+            this.chkRetainLanguageSpecificSubtitles.Checked = S.RetainLanguageSpecificSubtitles;
+            this.chkForceBulkAddToUseSettingsOnly.Checked = S.ForceBulkAddToUseSettingsOnly;
             this.chkAutoMergeEpisodes.Checked = S.AutoMergeEpisodes;
             this.cbMonitorFolder.Checked = S.MonitorFolders;
             this.chkScheduledScan.Checked = S.RunPeriodicCheck();
@@ -1249,6 +1253,5 @@ private void domainUpDown1_KeyDown(object sender, KeyEventArgs e)
                 e.SuppressKeyPress = true;
 
         }
-
     }
 }
diff --git a/TVRename#/Forms/UI.cs b/TVRename#/Forms/UI.cs
@@ -2993,15 +2993,20 @@ private void GetNewShows(bool unattended)
             //for each saved show (order by recent)
             //does show match selected file?
             //if so add series to list of series scanned
-            if (!TVSettings.Instance.AutoSearchForDownloadedFiles) return;
+            if (!TVSettings.Instance.AutoSearchForDownloadedFiles)
+            {
+                logger.Info("Not looking for new shows as 'Auto-Add' is turned off");
+                return;
+            }
 
             //Dont support unattended mode
-            if (unattended) return;
+            if (unattended) { logger.Info("Not looking for new shows as app is unattended"); return;}
 
             List<string> possibleShowNames = new List<string>();
 
             foreach (string dirPath in this.mDoc.SearchFolders)
             {
+                logger.Info("Parsing {0} for new shows",dirPath);
                 if (!Directory.Exists(dirPath)) continue;
 
                 foreach (string filePath in Directory.GetFiles(dirPath, "*", System.IO.SearchOption.AllDirectories))
@@ -3171,7 +3176,8 @@ private bool LookForSeries(string test,IEnumerable<ShowItem> shows)
         public void QuickScan(bool unattended)
         {
             logger.Info("*******************************");
-            logger.Info("Starting QuickScan...");
+            string desc = unattended ? "unattended " : "";
+            logger.Info($@"Starting {desc}QuickScan...");
             GetNewShows(unattended);
             this.MoreBusy();
             this.mDoc.QuickScan();