Fix System.ArgumentOutOfRangeException in workers

TV-Rename · Nov 5, 2021 · abf1231 · abf1231
1 parent 54f6c9d
commit abf1231
Show file tree

Hide file tree

Showing 9 changed files with 23 additions and 9 deletions.
diff --git a/TVRename/Forms/BulkAddMovies/BulkAddMovie.cs b/TVRename/Forms/BulkAddMovies/BulkAddMovie.cs
@@ -605,7 +605,7 @@ private void bwIdentify_ProgressChanged(object sender, [NotNull] ProgressChanged
         {
             lvFMNewShows.Update();
 
-            pbProgress.Value = e.ProgressPercentage;
+            pbProgress.Value = e.ProgressPercentage.Between(0,100); 
             lblStatusLabel.Text = ((PossibleNewMovie)e.UserState).RefinedHint;
             UpdateListItem((PossibleNewMovie)e.UserState, false);
         }
@@ -619,7 +619,7 @@ private void bwIdentify_RunWorkerCompleted(object sender, RunWorkerCompletedEven
 
         private void bwRescan_ProgressChanged(object sender, [NotNull] ProgressChangedEventArgs e)
         {
-            pbProgress.Value = e.ProgressPercentage;
+            pbProgress.Value = e.ProgressPercentage.Between(0, 100);
             lblStatusLabel.Text = e.UserState.ToString();
         }
 

diff --git a/TVRename/Forms/Tools/CollectionsView.cs b/TVRename/Forms/Tools/CollectionsView.cs
@@ -111,7 +111,7 @@ private void BwScan_DoWork(object sender, DoWorkEventArgs e)
 
         private void BwScan_ProgressChanged(object sender, [NotNull] ProgressChangedEventArgs e)
         {
-            pbProgress.Value = e.ProgressPercentage;
+            pbProgress.Value = e.ProgressPercentage.Between(0, 100); 
             lblStatus.Text = e.UserState.ToString();
         }
 

diff --git a/TVRename/Forms/Tools/DuplicateMovieFinder.cs b/TVRename/Forms/Tools/DuplicateMovieFinder.cs
@@ -86,7 +86,7 @@ private void ProcessMovie([NotNull] MovieConfiguration movie)
 
         private void BwScan_ProgressChanged(object sender, [NotNull] ProgressChangedEventArgs e)
         {
-            pbProgress.Value = e.ProgressPercentage;
+            pbProgress.Value = e.ProgressPercentage.Between(0, 100);
             lblStatus.Text = e.UserState.ToString();
         }
 

diff --git a/TVRename/Forms/Tools/MergedEpisodeFinder.cs b/TVRename/Forms/Tools/MergedEpisodeFinder.cs
@@ -210,7 +210,7 @@ private void BwScan_DoWork([NotNull] object sender, DoWorkEventArgs e)
 
         private void BwScan_ProgressChanged(object sender, [NotNull] ProgressChangedEventArgs e)
         {
-            pbProgress.Value = e.ProgressPercentage;
+            pbProgress.Value = e.ProgressPercentage.Between(0, 100);
             lblStatus.Text = e.UserState.ToString();
         }
 

diff --git a/TVRename/Forms/Tools/OrphanFiles.cs b/TVRename/Forms/Tools/OrphanFiles.cs
@@ -169,7 +169,7 @@ private static bool HasEpisode([NotNull] IEnumerable<ProcessedEpisode> showSeaso
 
         private void BwRescan_ProgressChanged(object sender, [NotNull] ProgressChangedEventArgs e)
         {
-            pbProgress.Value = e.ProgressPercentage;
+            pbProgress.Value = e.ProgressPercentage.Between(0, 100);
             lblStatus.Text = e.UserState.ToString();
         }
 

diff --git a/TVRename/Forms/Tools/RecommendationView.cs b/TVRename/Forms/Tools/RecommendationView.cs
@@ -205,7 +205,7 @@ private void BwScan_DoWork(object sender, DoWorkEventArgs e)
 
         private void BwScan_ProgressChanged(object sender, [NotNull] ProgressChangedEventArgs e)
         {
-            pbProgress.Value = e.ProgressPercentage;
+            pbProgress.Value = e.ProgressPercentage.Between(0, 100);
             lblStatus.Text = e.UserState?.ToString();
         }
 

diff --git a/TVRename/Forms/Tools/SettingsReview.cs b/TVRename/Forms/Tools/SettingsReview.cs
@@ -103,7 +103,7 @@ private void BwScan_DoWork(object sender, DoWorkEventArgs e)
 
         private void BwScan_ProgressChanged(object sender, [NotNull] ProgressChangedEventArgs e)
         {
-            pbProgress.Value = e.ProgressPercentage;
+            pbProgress.Value = e.ProgressPercentage.Between(0, 100);
             lblStatus.Text = e.UserState.ToString();
         }
 

diff --git a/TVRename/Forms/Tools/ShowSummary.cs b/TVRename/Forms/Tools/ShowSummary.cs
@@ -737,7 +737,7 @@ private void BwRescan_DoWork(object sender, DoWorkEventArgs e)
 
         private void BwRescan_ProgressChanged(object sender, [NotNull] ProgressChangedEventArgs e)
         {
-            pbProgress.Value = e.ProgressPercentage;
+            pbProgress.Value = e.ProgressPercentage.Between(0, 100);
             lblStatus.Text = e.UserState.ToString();
         }
 

diff --git a/TVRename/Utility/Helper/Helpers.cs b/TVRename/Utility/Helper/Helpers.cs
@@ -38,6 +38,20 @@ public static class Helpers
 
         public static bool InDebug() => Debugger.IsAttached;
 
+
+        public static int Between(this int value, int min, int max)
+        {
+            if (value < min)
+            {
+                return min;
+            }
+            if (value > max)
+            {
+                return max;
+            }
+            return value;
+        }
+
         public static bool In<T>([CanBeNull] this T item, [NotNull] params T[] items)
         {
             if (items == null)