From 8615e1421faf5abf9d417c4efc9a3ecd56522676 Mon Sep 17 00:00:00 2001
From: Genteure <genteure@gmail.com>
Date: Sun, 2 May 2021 21:34:27 +0800
Subject: [PATCH] ToolBox: Add cancel

---
 BililiveRecorder.ToolBox/Commands/Analyze.cs  | 16 ++++--
 BililiveRecorder.ToolBox/Commands/Export.cs   | 16 ++++--
 BililiveRecorder.ToolBox/Commands/Fix.cs      | 19 +++++--
 BililiveRecorder.ToolBox/ResponseStatus.cs    |  1 +
 .../Controls/AutoFixProgressDialog.xaml       |  6 ++-
 .../Controls/AutoFixProgressDialog.xaml.cs    | 15 ++++++
 BililiveRecorder.WPF/Pages/RootPage.xaml      |  3 +-
 .../Pages/ToolboxAutoFixPage.xaml             |  2 +-
 .../Pages/ToolboxAutoFixPage.xaml.cs          | 49 +++++++++++++------
 9 files changed, 96 insertions(+), 31 deletions(-)

diff --git a/BililiveRecorder.ToolBox/Commands/Analyze.cs b/BililiveRecorder.ToolBox/Commands/Analyze.cs
index 6e345a0..f0343c9 100644
--- a/BililiveRecorder.ToolBox/Commands/Analyze.cs
+++ b/BililiveRecorder.ToolBox/Commands/Analyze.cs
@@ -4,6 +4,7 @@ using System.IO;
 using System.IO.Compression;
 using System.IO.Pipelines;
 using System.Linq;
+using System.Threading;
 using System.Threading.Tasks;
 using BililiveRecorder.Flv;
 using BililiveRecorder.Flv.Amf;
@@ -48,9 +49,9 @@ namespace BililiveRecorder.ToolBox.Commands
     {
         private static readonly ILogger logger = Log.ForContext<AnalyzeHandler>();
 
-        public Task<CommandResponse<AnalyzeResponse>> Handle(AnalyzeRequest request) => this.Handle(request, null);
+        public Task<CommandResponse<AnalyzeResponse>> Handle(AnalyzeRequest request) => this.Handle(request, default, null);
 
-        public async Task<CommandResponse<AnalyzeResponse>> Handle(AnalyzeRequest request, Func<double, Task>? progress)
+        public async Task<CommandResponse<AnalyzeResponse>> Handle(AnalyzeRequest request, CancellationToken cancellationToken, Func<double, Task>? progress)
         {
             FileStream? flvFileStream = null;
             try
@@ -109,9 +110,9 @@ namespace BililiveRecorder.ToolBox.Commands
                 await Task.Run(async () =>
                 {
                     var count = 0;
-                    while (true)
+                    while (!cancellationToken.IsCancellationRequested)
                     {
-                        var group = await grouping.ReadGroupAsync(default).ConfigureAwait(false);
+                        var group = await grouping.ReadGroupAsync(cancellationToken).ConfigureAwait(false);
                         if (group is null)
                             break;
 
@@ -136,6 +137,9 @@ namespace BililiveRecorder.ToolBox.Commands
                     }
                 }).ConfigureAwait(false);
 
+                if (cancellationToken.IsCancellationRequested)
+                    return new CommandResponse<AnalyzeResponse> { Status = ResponseStatus.Cancelled };
+
                 // Result
                 var response = await Task.Run(() =>
                 {
@@ -169,6 +173,10 @@ namespace BililiveRecorder.ToolBox.Commands
                     Result = response
                 };
             }
+            catch (TaskCanceledException) when (cancellationToken.IsCancellationRequested)
+            {
+                return new CommandResponse<AnalyzeResponse> { Status = ResponseStatus.Cancelled };
+            }
             catch (NotFlvFileException ex)
             {
                 return new CommandResponse<AnalyzeResponse>
diff --git a/BililiveRecorder.ToolBox/Commands/Export.cs b/BililiveRecorder.ToolBox/Commands/Export.cs
index ab9512b..93bbdf4 100644
--- a/BililiveRecorder.ToolBox/Commands/Export.cs
+++ b/BililiveRecorder.ToolBox/Commands/Export.cs
@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.IO;
 using System.IO.Compression;
 using System.IO.Pipelines;
+using System.Threading;
 using System.Threading.Tasks;
 using BililiveRecorder.Flv;
 using BililiveRecorder.Flv.Parser;
@@ -26,9 +27,9 @@ namespace BililiveRecorder.ToolBox.Commands
     {
         private static readonly ILogger logger = Log.ForContext<ExportHandler>();
 
-        public Task<CommandResponse<ExportResponse>> Handle(ExportRequest request) => this.Handle(request, null);
+        public Task<CommandResponse<ExportResponse>> Handle(ExportRequest request) => this.Handle(request, default, null);
 
-        public async Task<CommandResponse<ExportResponse>> Handle(ExportRequest request, Func<double, Task>? progress)
+        public async Task<CommandResponse<ExportResponse>> Handle(ExportRequest request, CancellationToken cancellationToken, Func<double, Task>? progress)
         {
             FileStream? inputStream = null, outputStream = null;
             try
@@ -67,9 +68,9 @@ namespace BililiveRecorder.ToolBox.Commands
                     var tags = new List<Tag>();
                     var memoryStreamProvider = new RecyclableMemoryStreamProvider();
                     using var reader = new FlvTagPipeReader(PipeReader.Create(inputStream), memoryStreamProvider, skipData: true, logger: logger);
-                    while (true)
+                    while (!cancellationToken.IsCancellationRequested)
                     {
-                        var tag = await reader.ReadTagAsync(default).ConfigureAwait(false);
+                        var tag = await reader.ReadTagAsync(cancellationToken).ConfigureAwait(false);
                         if (tag is null) break;
                         tags.Add(tag);
 
@@ -79,6 +80,9 @@ namespace BililiveRecorder.ToolBox.Commands
                     return tags;
                 });
 
+                if (cancellationToken.IsCancellationRequested)
+                    return new CommandResponse<ExportResponse> { Status = ResponseStatus.Cancelled };
+
                 await Task.Run(() =>
                 {
                     using var writer = new StreamWriter(new GZipStream(outputStream, CompressionLevel.Optimal));
@@ -90,6 +94,10 @@ namespace BililiveRecorder.ToolBox.Commands
 
                 return new CommandResponse<ExportResponse> { Status = ResponseStatus.OK, Result = new ExportResponse() };
             }
+            catch (TaskCanceledException) when (cancellationToken.IsCancellationRequested)
+            {
+                return new CommandResponse<ExportResponse> { Status = ResponseStatus.Cancelled };
+            }
             catch (NotFlvFileException ex)
             {
                 return new CommandResponse<ExportResponse>
diff --git a/BililiveRecorder.ToolBox/Commands/Fix.cs b/BililiveRecorder.ToolBox/Commands/Fix.cs
index e8080c5..aaee342 100644
--- a/BililiveRecorder.ToolBox/Commands/Fix.cs
+++ b/BililiveRecorder.ToolBox/Commands/Fix.cs
@@ -4,6 +4,7 @@ using System.IO;
 using System.IO.Compression;
 using System.IO.Pipelines;
 using System.Linq;
+using System.Threading;
 using System.Threading.Tasks;
 using BililiveRecorder.Flv;
 using BililiveRecorder.Flv.Grouping;
@@ -51,9 +52,9 @@ namespace BililiveRecorder.ToolBox.Commands
     {
         private static readonly ILogger logger = Log.ForContext<FixHandler>();
 
-        public Task<CommandResponse<FixResponse>> Handle(FixRequest request) => this.Handle(request, null);
+        public Task<CommandResponse<FixResponse>> Handle(FixRequest request) => this.Handle(request, default, null);
 
-        public async Task<CommandResponse<FixResponse>> Handle(FixRequest request, Func<double, Task>? progress)
+        public async Task<CommandResponse<FixResponse>> Handle(FixRequest request, CancellationToken cancellationToken, Func<double, Task>? progress)
         {
             FileStream? flvFileStream = null;
             try
@@ -130,9 +131,9 @@ namespace BililiveRecorder.ToolBox.Commands
                 await Task.Run(async () =>
                 {
                     var count = 0;
-                    while (true)
+                    while (!cancellationToken.IsCancellationRequested)
                     {
-                        var group = await grouping.ReadGroupAsync(default).ConfigureAwait(false);
+                        var group = await grouping.ReadGroupAsync(cancellationToken).ConfigureAwait(false);
                         if (group is null)
                             break;
 
@@ -157,6 +158,9 @@ namespace BililiveRecorder.ToolBox.Commands
                     }
                 }).ConfigureAwait(false);
 
+                if (cancellationToken.IsCancellationRequested)
+                    return new CommandResponse<FixResponse> { Status = ResponseStatus.Cancelled };
+
                 // Post Run
                 if (xmlMode)
                 {
@@ -186,6 +190,9 @@ namespace BililiveRecorder.ToolBox.Commands
                     });
                 }
 
+                if (cancellationToken.IsCancellationRequested)
+                    return new CommandResponse<FixResponse> { Status = ResponseStatus.Cancelled };
+
                 // Result
                 var response = await Task.Run(() =>
                 {
@@ -215,6 +222,10 @@ namespace BililiveRecorder.ToolBox.Commands
 
                 return new CommandResponse<FixResponse> { Status = ResponseStatus.OK, Result = response };
             }
+            catch (TaskCanceledException) when (cancellationToken.IsCancellationRequested)
+            {
+                return new CommandResponse<FixResponse> { Status = ResponseStatus.Cancelled };
+            }
             catch (NotFlvFileException ex)
             {
                 return new CommandResponse<FixResponse>
diff --git a/BililiveRecorder.ToolBox/ResponseStatus.cs b/BililiveRecorder.ToolBox/ResponseStatus.cs
index b8b7c08..ed7ef09 100644
--- a/BililiveRecorder.ToolBox/ResponseStatus.cs
+++ b/BililiveRecorder.ToolBox/ResponseStatus.cs
@@ -4,6 +4,7 @@ namespace BililiveRecorder.ToolBox
     {
         Error = 0,
         OK,
+        Cancelled,
         NotFlvFile,
         UnknownFlvTagType,
         InputIOError,
diff --git a/BililiveRecorder.WPF/Controls/AutoFixProgressDialog.xaml b/BililiveRecorder.WPF/Controls/AutoFixProgressDialog.xaml
index c990993..0b7fd23 100644
--- a/BililiveRecorder.WPF/Controls/AutoFixProgressDialog.xaml
+++ b/BililiveRecorder.WPF/Controls/AutoFixProgressDialog.xaml
@@ -8,13 +8,15 @@
     l:LocalizeDictionary.DesignCulture=""
     l:ResxLocalizationProvider.DefaultAssembly="BililiveRecorder.WPF"
     l:ResxLocalizationProvider.DefaultDictionary="Strings"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:local="clr-namespace:BililiveRecorder.WPF.Controls"
     Name="autoFixProgressDialog"
-    mc:Ignorable="d" 
+    mc:Ignorable="d"
     d:DesignHeight="450" d:DesignWidth="800">
     <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center">
         <ui:ProgressRing Margin="10" Height="50" Width="50" IsActive="True"/>
         <ui:ProgressBar Value="{Binding ElementName=autoFixProgressDialog,Path=Progress}" Width="200"/>
+        <Button HorizontalAlignment="Center" Margin="10" Content="{l:Loc Global_Cancel}" Click="Button_Click"
+                Visibility="{Binding ElementName=autoFixProgressDialog,Path=CancelButtonVisibility}"/>
     </StackPanel>
 </ui:ContentDialog>
diff --git a/BililiveRecorder.WPF/Controls/AutoFixProgressDialog.xaml.cs b/BililiveRecorder.WPF/Controls/AutoFixProgressDialog.xaml.cs
index e9aa776..ce403a0 100644
--- a/BililiveRecorder.WPF/Controls/AutoFixProgressDialog.xaml.cs
+++ b/BililiveRecorder.WPF/Controls/AutoFixProgressDialog.xaml.cs
@@ -1,5 +1,7 @@
+using System.Threading;
 using System.Windows;
 
+#nullable enable
 namespace BililiveRecorder.WPF.Controls
 {
     /// <summary>
@@ -20,5 +22,18 @@ namespace BililiveRecorder.WPF.Controls
             get => (int)this.GetValue(ProgressProperty);
             set => this.SetValue(ProgressProperty, value);
         }
+
+        public static readonly DependencyProperty CancelButtonVisibilityProperty =
+            DependencyProperty.Register(nameof(CancelButtonVisibility), typeof(Visibility), typeof(AutoFixProgressDialog), new PropertyMetadata(Visibility.Collapsed));
+
+        public Visibility CancelButtonVisibility
+        {
+            get => (Visibility)this.GetValue(CancelButtonVisibilityProperty);
+            set => this.SetValue(CancelButtonVisibilityProperty, value);
+        }
+
+        public CancellationTokenSource? CancellationTokenSource { get; set; }
+
+        private void Button_Click(object sender, RoutedEventArgs e) => this.CancellationTokenSource?.Cancel();
     }
 }
diff --git a/BililiveRecorder.WPF/Pages/RootPage.xaml b/BililiveRecorder.WPF/Pages/RootPage.xaml
index aef9307..b2ee414 100644
--- a/BililiveRecorder.WPF/Pages/RootPage.xaml
+++ b/BililiveRecorder.WPF/Pages/RootPage.xaml
@@ -88,7 +88,8 @@
                         <ui:PathIcon Style="{StaticResource PathIconDataToolboxOutline}"/>
                     </ui:NavigationViewItem.Icon>
                     <ui:NavigationViewItem.MenuItems>
-                        <ui:NavigationViewItem Content="{l:Loc Toolbox_AutoFix_Title}" Tag="ToolboxAutoFixPage">
+                        <ui:NavigationViewItem l:ResxLocalizationProvider.DefaultDictionary="Strings" 
+                                               Content="{l:Loc Toolbox_AutoFix_Title}" Tag="ToolboxAutoFixPage">
                             <ui:NavigationViewItem.Icon>
                                 <ui:PathIcon Style="{StaticResource PathIconDataAutoFix}"/>
                             </ui:NavigationViewItem.Icon>
diff --git a/BililiveRecorder.WPF/Pages/ToolboxAutoFixPage.xaml b/BililiveRecorder.WPF/Pages/ToolboxAutoFixPage.xaml
index 6346a98..cd87350 100644
--- a/BililiveRecorder.WPF/Pages/ToolboxAutoFixPage.xaml
+++ b/BililiveRecorder.WPF/Pages/ToolboxAutoFixPage.xaml
@@ -27,7 +27,7 @@
                 <Button VerticalAlignment="Bottom" DockPanel.Dock="Right" Content="{l:Loc Toolbox_AutoFix_ButtonNotFixed}">
                     <ui:FlyoutService.Flyout>
                         <ui:Flyout Placement="LeftEdgeAlignedTop">
-                            <StackPanel>
+                            <StackPanel l:ResxLocalizationProvider.DefaultDictionary="Strings">
                                 <TextBlock Text="{l:Loc Toolbox_AutoFix_NotFixed_Description}"/>
                                 <ui:HyperlinkButton NavigateUri="" Content="{l:Loc Toolbox_AutoFix_NotFixed_LearnMore}"/>
                                 <Button Margin="0,15,0,10" HorizontalAlignment="Center" Click="Export_Button_Click">
diff --git a/BililiveRecorder.WPF/Pages/ToolboxAutoFixPage.xaml.cs b/BililiveRecorder.WPF/Pages/ToolboxAutoFixPage.xaml.cs
index e5dc960..27ee0b3 100644
--- a/BililiveRecorder.WPF/Pages/ToolboxAutoFixPage.xaml.cs
+++ b/BililiveRecorder.WPF/Pages/ToolboxAutoFixPage.xaml.cs
@@ -1,5 +1,6 @@
 using System;
 using System.IO;
+using System.Threading;
 using System.Threading.Tasks;
 using System.Windows;
 using BililiveRecorder.ToolBox;
@@ -62,7 +63,12 @@ namespace BililiveRecorder.WPF.Pages
 
                 logger.Debug("修复文件 {Path}", inputPath);
 
-                progressDialog = new AutoFixProgressDialog();
+                progressDialog = new AutoFixProgressDialog()
+                {
+                    CancelButtonVisibility = Visibility.Visible,
+                    CancellationTokenSource = new CancellationTokenSource()
+                };
+                var token = progressDialog.CancellationTokenSource.Token;
                 var showTask = progressDialog.ShowAsync();
 
                 string? output_path;
@@ -94,7 +100,7 @@ namespace BililiveRecorder.WPF.Pages
 
                 var handler = new FixHandler();
 
-                var resp = await handler.Handle(req, async p =>
+                var resp = await handler.Handle(req, token, async p =>
                 {
                     await this.Dispatcher.InvokeAsync(() =>
                     {
@@ -102,7 +108,7 @@ namespace BililiveRecorder.WPF.Pages
                     });
                 }).ConfigureAwait(true);
 
-                if (resp.Status != ResponseStatus.OK)
+                if (resp.Status != ResponseStatus.Cancelled && resp.Status != ResponseStatus.OK)
                 {
                     logger.Warning(resp.Exception, "修复时发生错误 (@Status)", resp.Status);
                     await Task.Run(() => ShowErrorMessageBox(resp)).ConfigureAwait(true);
@@ -145,7 +151,12 @@ namespace BililiveRecorder.WPF.Pages
 
                 logger.Debug("分析文件 {Path}", inputPath);
 
-                progressDialog = new AutoFixProgressDialog();
+                progressDialog = new AutoFixProgressDialog()
+                {
+                    CancelButtonVisibility = Visibility.Visible,
+                    CancellationTokenSource = new CancellationTokenSource()
+                };
+                var token = progressDialog.CancellationTokenSource.Token;
                 var showTask = progressDialog.ShowAsync();
 
                 var req = new AnalyzeRequest
@@ -155,7 +166,7 @@ namespace BililiveRecorder.WPF.Pages
 
                 var handler = new AnalyzeHandler();
 
-                var resp = await handler.Handle(req, async p =>
+                var resp = await handler.Handle(req, token, async p =>
                 {
                     await this.Dispatcher.InvokeAsync(() =>
                     {
@@ -163,14 +174,17 @@ namespace BililiveRecorder.WPF.Pages
                     });
                 }).ConfigureAwait(true);
 
-                if (resp.Status != ResponseStatus.OK)
+                if (resp.Status != ResponseStatus.Cancelled)
                 {
-                    logger.Warning(resp.Exception, "分析时发生错误 (@Status)", resp.Status);
-                    await Task.Run(() => ShowErrorMessageBox(resp)).ConfigureAwait(true);
-                }
-                else
-                {
-                    this.analyzeResultDisplayArea.DataContext = resp.Result;
+                    if (resp.Status != ResponseStatus.OK)
+                    {
+                        logger.Warning(resp.Exception, "分析时发生错误 (@Status)", resp.Status);
+                        await Task.Run(() => ShowErrorMessageBox(resp)).ConfigureAwait(true);
+                    }
+                    else
+                    {
+                        this.analyzeResultDisplayArea.DataContext = resp.Result;
+                    }
                 }
 
                 progressDialog.Hide();
@@ -203,7 +217,12 @@ namespace BililiveRecorder.WPF.Pages
 
                 logger.Debug("导出文件 {Path}", inputPath);
 
-                progressDialog = new AutoFixProgressDialog();
+                progressDialog = new AutoFixProgressDialog()
+                {
+                    CancelButtonVisibility = Visibility.Visible,
+                    CancellationTokenSource = new CancellationTokenSource()
+                };
+                var token = progressDialog.CancellationTokenSource.Token;
                 var showTask = progressDialog.ShowAsync();
 
                 var outputPath = string.Empty;
@@ -235,7 +254,7 @@ namespace BililiveRecorder.WPF.Pages
 
                 var handler = new ExportHandler();
 
-                var resp = await handler.Handle(req, async p =>
+                var resp = await handler.Handle(req, token, async p =>
                 {
                     await this.Dispatcher.InvokeAsync(() =>
                     {
@@ -243,7 +262,7 @@ namespace BililiveRecorder.WPF.Pages
                     });
                 }).ConfigureAwait(true);
 
-                if (resp.Status != ResponseStatus.OK)
+                if (resp.Status != ResponseStatus.Cancelled && resp.Status != ResponseStatus.OK)
                 {
                     logger.Warning(resp.Exception, "导出分析数据时发生错误 (@Status)", resp.Status);
                     await Task.Run(() => ShowErrorMessageBox(resp)).ConfigureAwait(true);