Finish implementation of DownloadManager.Clear()

vlad-patras · Oct 22, 2023 · 82f0ac3 · 82f0ac3
1 parent 02fcde0
commit 82f0ac3
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/GChan/Controllers/Download.cs b/GChan/Controllers/Download.cs
@@ -23,7 +23,7 @@ public void Cancel()
         }
 
         /// <summary>
-        /// Cancel and dispose of download.
+        /// Cancel download and dispose resources.
         /// </summary>
         public void Dispose()
         {

diff --git a/GChan/Controllers/DownloadManager.cs b/GChan/Controllers/DownloadManager.cs
@@ -96,8 +96,16 @@ public void Cancel(Func<T, bool> predicate)
             }
         }
 
+        /// <summary>
+        /// Clear the entire download manager (waiting and currently downloading), and cancel those that were in progress.
+        /// </summary>
         public void Clear()
         {
+            while (waiting.Count > 0)
+            {
+                waiting.TryDequeue(out _);
+            }
+
             while (downloading.Count > 0) 
             {
                 var kvp = downloading.FirstOrDefault();

diff --git a/GChan/Forms/MainForm.cs b/GChan/Forms/MainForm.cs
@@ -182,7 +182,8 @@ private void settingsToolStripMenuItem_Click(object sender, EventArgs e)
             // TODO: #41 - Cancellation currently not working, implement later.
             //if (!Settings.Default.SaveHTML)
             //{
-            //    // Clear all downloads on main controller threadHtmlDownloader.
+            //  Clear all downloads on main controller threadHtmlDownloader.
+            //  threadHtmlDownloader.Clear();
             //}
 
             systemTrayNotifyIcon.Visible = Settings.Default.MinimizeToTray;