Cleanup (#1196)

* Use CancellationTokenSource.CreateLinkedTokenSource * Remove redundant code * Non-blocking GC * Make ITwitchTask.DependantTask init
lay295 · Aug 27, 2024 · d54ae22 · d54ae22
1 parent 818aa28
commit d54ae22
Show file tree

Hide file tree

Showing 12 changed files with 15 additions and 36 deletions.
diff --git a/TwitchDownloaderCore/Tools/VideoDownloadThread.cs b/TwitchDownloaderCore/Tools/VideoDownloadThread.cs
@@ -51,8 +51,7 @@ public void StartDownload()
 
         private void Execute()
         {
-            using var cts = new CancellationTokenSource();
-            _cancellationToken.Register(PropagateCancel, cts);
+            using var cts = CancellationTokenSource.CreateLinkedTokenSource(_cancellationToken);
 
             while (!_videoPartsQueue.IsEmpty)
             {
@@ -81,15 +80,6 @@ private void Execute()
             }
         }
 
-        private static void PropagateCancel(object tokenSourceToCancel)
-        {
-            try
-            {
-                (tokenSourceToCancel as CancellationTokenSource)?.Cancel();
-            }
-            catch (ObjectDisposedException) { }
-        }
-
         /// <remarks>The <paramref name="cancellationTokenSource"/> may be canceled by this method.</remarks>
         private async Task DownloadVideoPartAsync(string videoPartName, CancellationTokenSource cancellationTokenSource)
         {

diff --git a/TwitchDownloaderWPF/PageChatDownload.xaml.cs b/TwitchDownloaderWPF/PageChatDownload.xaml.cs
@@ -574,7 +574,6 @@ private async void SplitBtnDownload_Click(object sender, RoutedEventArgs e)
                 _cancellationTokenSource.Dispose();
                 UpdateActionButtons(false);
 
-                currentDownload = null;
                 GC.Collect();
             }
             catch (Exception ex)

diff --git a/TwitchDownloaderWPF/PageChatRender.xaml.cs b/TwitchDownloaderWPF/PageChatRender.xaml.cs
@@ -684,7 +684,7 @@ private async void SplitBtnRender_Click(object sender, RoutedEventArgs e)
                 UpdateActionButtons(false);
 
                 currentRender.Dispose();
-                GC.Collect(2, GCCollectionMode.Default, false);
+                GC.Collect();
             }
         }
 

diff --git a/TwitchDownloaderWPF/PageChatUpdate.xaml.cs b/TwitchDownloaderWPF/PageChatUpdate.xaml.cs
@@ -587,7 +587,6 @@ private async void SplitBtnUpdate_Click(object sender, RoutedEventArgs e)
                 _cancellationTokenSource.Dispose();
                 UpdateActionButtons(false);
 
-                currentUpdate = null;
                 GC.Collect();
             }
             catch (Exception ex)

diff --git a/TwitchDownloaderWPF/PageVodDownload.xaml.cs b/TwitchDownloaderWPF/PageVodDownload.xaml.cs
@@ -471,7 +471,6 @@ private async void SplitBtnDownloader_Click(object sender, RoutedEventArgs e)
             _cancellationTokenSource.Dispose();
             UpdateActionButtons(false);
 
-            currentDownload = null;
             GC.Collect();
         }
 

diff --git a/TwitchDownloaderWPF/TwitchTasks/ChatDownloadTask.cs b/TwitchDownloaderWPF/TwitchTasks/ChatDownloadTask.cs
@@ -44,7 +44,7 @@ public string StatusImage
 
         public ChatDownloadOptions DownloadOptions { get; init; }
         public CancellationTokenSource TokenSource { get; private set; } = new();
-        public ITwitchTask DependantTask { get; set; }
+        public ITwitchTask DependantTask { get; init; }
         public string TaskType { get; } = Translations.Strings.ChatDownload;
 
         private Exception _exception;
@@ -158,10 +158,8 @@ public async Task RunAsync()
                 Exception = ex;
                 CanReinitialize = true;
             }
-            downloader = null;
             TokenSource.Dispose();
-            GC.Collect();
-            GC.WaitForPendingFinalizers();
+            GC.Collect(-1, GCCollectionMode.Default, false);
         }
 
         private void OnPropertyChanged([CallerMemberName] string propertyName = null)

diff --git a/TwitchDownloaderWPF/TwitchTasks/ChatRenderTask.cs b/TwitchDownloaderWPF/TwitchTasks/ChatRenderTask.cs
@@ -44,7 +44,7 @@ public string StatusImage
 
         public ChatRenderOptions DownloadOptions { get; init; }
         public CancellationTokenSource TokenSource { get; private set; } = new();
-        public ITwitchTask DependantTask { get; set; }
+        public ITwitchTask DependantTask { get; init; }
         public string TaskType { get; } = Translations.Strings.ChatRender;
 
         private Exception _exception;
@@ -181,7 +181,7 @@ public async Task RunAsync()
             }
             renderer.Dispose();
             TokenSource.Dispose();
-            GC.Collect(2, GCCollectionMode.Default, false);
+            GC.Collect(-1, GCCollectionMode.Default, false);
         }
 
         private void OnPropertyChanged([CallerMemberName] string propertyName = null)

diff --git a/TwitchDownloaderWPF/TwitchTasks/ChatUpdateTask.cs b/TwitchDownloaderWPF/TwitchTasks/ChatUpdateTask.cs
@@ -44,7 +44,7 @@ public string StatusImage
 
         public ChatUpdateOptions UpdateOptions { get; init; }
         public CancellationTokenSource TokenSource { get; private set; } = new();
-        public ITwitchTask DependantTask { get; set; }
+        public ITwitchTask DependantTask { get; init; }
         public string TaskType { get; } = Translations.Strings.ChatUpdate;
 
         private Exception _exception;
@@ -159,10 +159,8 @@ public async Task RunAsync()
                 Exception = ex;
                 CanReinitialize = true;
             }
-            updater = null;
             TokenSource.Dispose();
-            GC.Collect();
-            GC.WaitForPendingFinalizers();
+            GC.Collect(-1, GCCollectionMode.Default, false);
         }
 
         private void OnPropertyChanged([CallerMemberName] string propertyName = null)

diff --git a/TwitchDownloaderWPF/TwitchTasks/ClipDownloadTask.cs b/TwitchDownloaderWPF/TwitchTasks/ClipDownloadTask.cs
@@ -44,7 +44,7 @@ public string StatusImage
 
         public ClipDownloadOptions DownloadOptions { get; init; }
         public CancellationTokenSource TokenSource { get; private set; } = new();
-        public ITwitchTask DependantTask { get; set; }
+        public ITwitchTask DependantTask { get; init; }
         public string TaskType { get; } = Translations.Strings.ClipDownload;
 
         private Exception _exception;
@@ -158,10 +158,8 @@ public async Task RunAsync()
                 Exception = ex;
                 CanReinitialize = true;
             }
-            downloader = null;
             TokenSource.Dispose();
-            GC.Collect();
-            GC.WaitForPendingFinalizers();
+            GC.Collect(-1, GCCollectionMode.Default, false);
         }
 
         private void OnPropertyChanged([CallerMemberName] string propertyName = null)

diff --git a/TwitchDownloaderWPF/TwitchTasks/ITwitchTask.cs b/TwitchDownloaderWPF/TwitchTasks/ITwitchTask.cs
@@ -24,7 +24,7 @@ public interface ITwitchTask : INotifyPropertyChanged
         string DisplayStatus { get; }
         string StatusImage { get; }
         CancellationTokenSource TokenSource { get; }
-        ITwitchTask DependantTask { get; set; }
+        ITwitchTask DependantTask { get; init; }
         string TaskType { get; }
         Exception Exception { get; }
         string OutputFile { get; }

diff --git a/TwitchDownloaderWPF/TwitchTasks/VodDownloadTask.cs b/TwitchDownloaderWPF/TwitchTasks/VodDownloadTask.cs
@@ -44,7 +44,7 @@ public string StatusImage
 
         public VideoDownloadOptions DownloadOptions { get; init; }
         public CancellationTokenSource TokenSource { get; private set; } = new();
-        public ITwitchTask DependantTask { get; set; }
+        public ITwitchTask DependantTask { get; init; }
         public string TaskType { get; } = Translations.Strings.VodDownload;
 
         private Exception _exception;
@@ -158,10 +158,8 @@ public async Task RunAsync()
                 Exception = ex;
                 CanReinitialize = true;
             }
-            downloader = null;
             TokenSource.Dispose();
-            GC.Collect();
-            GC.WaitForPendingFinalizers();
+            GC.Collect(-1, GCCollectionMode.Default, false);
         }
 
         private void OnPropertyChanged([CallerMemberName] string propertyName = null)

diff --git a/TwitchDownloaderWPF/WindowQueueOptions.xaml.cs b/TwitchDownloaderWPF/WindowQueueOptions.xaml.cs
@@ -206,10 +206,10 @@ private void btnQueue_Click(object sender, RoutedEventArgs e)
                                 {
                                     Title = vodDownloadPage.textTitle.Text,
                                     Thumbnail = vodDownloadPage.imgThumbnail.Source
-                                }
+                                },
+                                DependantTask = chatTask,
                             };
                             renderTask.ChangeStatus(TwitchTaskStatus.Waiting);
-                            renderTask.DependantTask = chatTask;
 
                             lock (PageQueue.taskLock)
                             {