Fix for #476

TV-Rename · Aug 20, 2018 · ecdca02 · ecdca02
1 parent 4d2bdb8
commit ecdca02
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 11 deletions.
diff --git a/TVRename/Forms/UI.cs b/TVRename/Forms/UI.cs
@@ -346,6 +346,12 @@ private ListView ListViewByName(string name)
 
         private void flushCacheToolStripMenuItem_Click(object sender, EventArgs e)
         {
+            if (busy != 0)
+            {
+                MessageBox.Show("Can't refresh until background download is complete");
+                return;
+            }
+
             DialogResult res = MessageBox.Show(
                 "Are you sure you want to remove all " +
                 "locally stored TheTVDB information?  This information will have to be downloaded again.  You " +
@@ -355,11 +361,12 @@ private void flushCacheToolStripMenuItem_Click(object sender, EventArgs e)
 
             if (res == DialogResult.Yes)
             {
+
                 TheTVDB.Instance.ForgetEverything();
                 FillMyShows();
                 FillEpGuideHtml();
                 FillWhenToWatchList();
-                backgroundDownloadToolStripMenuItem_Click(sender, e);
+                BGDownloadTimer_QuickFire();
             }
         }
 
@@ -1871,21 +1878,27 @@ private void BGDownloadTimer_Tick(object sender, EventArgs e)
             {
                 BGDownloadTimer.Interval = 10000; // come back in 10 seconds
                 BGDownloadTimer.Start();
+                Logger.Info("BG Download is busy - try again in 10 seconds");
                 return;
             }
 
             BGDownloadTimer.Interval = BgdlLongInterval(); // after first time (10 seconds), put up to 60 minutes
             BGDownloadTimer.Start();
 
-            if (TVSettings.Instance.BGDownload && mDoc.DownloadsRemaining() == 0
-            ) // only do auto-download if don't have stuff to do already
+            if (TVSettings.Instance.BGDownload && mDoc.DownloadsRemaining() == 0)
+                // only do auto-download if don't have stuff to do already
             {
-                mDoc.DoDownloadsBG();
-
-                statusTimer_Tick(null, null);
+                BackgroundDownloadNow();
             }
         }
 
+        private void BGDownloadTimer_QuickFire()
+        {
+            BGDownloadTimer.Stop();
+            BGDownloadTimer.Interval = 1000;
+            BGDownloadTimer.Start();
+        }
+
         private void backgroundDownloadNowToolStripMenuItem_Click(object sender, EventArgs e)
         {
             if (TVSettings.Instance.OfflineMode)
@@ -1897,6 +1910,11 @@ private void backgroundDownloadNowToolStripMenuItem_Click(object sender, EventAr
                     return;
             }
 
+            BackgroundDownloadNow();
+        }
+
+        private void BackgroundDownloadNow()
+        {
             BGDownloadTimer.Stop();
             BGDownloadTimer.Start();
 

diff --git a/TVRename/TheTVDB/TheTVDB.cs b/TVRename/TheTVDB/TheTVDB.cs
@@ -705,7 +705,7 @@ public bool GetUpdates()
                             int numberOfUpdatedEpisodes = 0;
 
                             ICollection<int> oldEpisodeIds = new List<int>();
-                            foreach (KeyValuePair<int, Season> kvp2 in this.series[id].AiredSeasons)
+                            foreach (KeyValuePair<int, Season> kvp2 in GetSeries(id)?.AiredSeasons??new Dictionary<int, Season>())
                             {
                                 foreach (Episode ep in kvp2.Value.Episodes.Values)
                                 {
@@ -863,7 +863,7 @@ private List<JObject> GetEpisodes(int id,string lang)
                     JToken x = jsonEpisodeResponse["links"]["next"];
                     bool moreResponses = !string.IsNullOrWhiteSpace(x.ToString());
                     Logger.Info(
-                        $"Page {pageNumber} of {this.series[id].Name} had {numberOfResponses} episodes listed in {lang} with {(moreResponses?"":"no ")}more to come");
+                        $"Page {pageNumber} of {GetSeries(id)?.Name} had {numberOfResponses} episodes listed in {lang} with {(moreResponses?"":"no ")}more to come");
 
                     if (numberOfResponses < 100 || !moreResponses)
                     {
@@ -1411,7 +1411,7 @@ private SeriesInfo DownloadSeriesNow(int code, bool episodesToo, bool bannersToo
                 JObject jsonActorsResponse = HttpHelper.JsonHttpGetRequest(TvDbTokenProvider.TVDB_API_URL + "/series/" + code + "/actors",
                     null, tvDbTokenProvider.GetToken());
 
-                series[si.TvdbCode].ClearActors();
+                GetSeries(si.TvdbCode)?.ClearActors();
                 foreach (JToken jsonActor in jsonActorsResponse["data"])
                 {
                     int actorId = (int)jsonActor["id"];
@@ -1421,7 +1421,7 @@ private SeriesInfo DownloadSeriesNow(int code, bool episodesToo, bool bannersToo
                     int actorSeriesId = (int)jsonActor["seriesId"];
                     int actorSortOrder = (int)jsonActor["sortOrder"];
 
-                    series[si.TvdbCode].AddActor(new Actor(actorId, actorImage, actorName, actorRole, actorSeriesId,
+                    GetSeries(si.TvdbCode)?.AddActor(new Actor(actorId, actorImage, actorName, actorRole, actorSeriesId,
                         actorSortOrder));
                 }
             }
@@ -1711,7 +1711,7 @@ public bool EnsureUpdated(int code, bool bannersToo)
             if ((series[code].Dirty) || (bannersToo && !series[code].BannersLoaded))
                 ok = (DownloadSeriesNow(code, false, bannersToo) != null);
 
-            foreach (KeyValuePair<int, Season> kvp in series[code].AiredSeasons)
+            foreach (KeyValuePair<int, Season> kvp in GetSeries(code)?.AiredSeasons??new Dictionary<int, Season>())
             {
                 Season seas = kvp.Value;
                 foreach (Episode e in seas.Episodes.Values)