Fixed laggy cancellation of compression and decompression tasks

Author: Iridium-IO

CompactGUI.Core/Compactor.vb

@@ -48,11 +48,16 @@ Public Class Compactor : Implements IDisposable, ICompressor
 
         Dim paraOptions As New ParallelOptions With {.MaxDegreeOfParallelism = MaxParallelism}
 
-        Await Parallel.ForEachAsync(workingFiles, paraOptions,
-                                Function(file, _ctx) As ValueTask
-                                    If _ctx.IsCancellationRequested Then Return ValueTask.FromCanceled(_ctx)
-                                    Return New ValueTask(PauseAndProcessFile(file, totalFilesSize, cancellationTokenSource.Token, progressMonitor))
-                                End Function).ConfigureAwait(False)
+        Try
+            Await Parallel.ForEachAsync(workingFiles, paraOptions,
+            Function(file, _ctx) As ValueTask
+                _ctx.ThrowIfCancellationRequested()
+                Return New ValueTask(PauseAndProcessFile(file, totalFilesSize, cancellationTokenSource.Token, progressMonitor))
+            End Function).ConfigureAwait(False)
+        Catch ex As OperationCanceledException
+            ' Swallow cancellation, return false
+            Return False
+        End Try
 
         Return Not cancellationTokenSource.IsCancellationRequested
 
@@ -64,16 +69,17 @@ Public Class Compactor : Implements IDisposable, ICompressor
             Await pauseSemaphore.WaitAsync(_ctx).ConfigureAwait(False)
             pauseSemaphore.Release()
         Catch ex As OperationCanceledException
+            Throw
             Return
         End Try
 
-        If _ctx.IsCancellationRequested Then Return
+        _ctx.ThrowIfCancellationRequested()
 
         Dim res = WOFCompressFile(details.FileName)
         Interlocked.Add(totalProcessedBytes, details.UncompressedSize)
-
         progressMonitor?.Report(New CompressionProgress(totalProcessedBytes / totalFilesSize * 100, details.FileName))
 
+
     End Function
 
 

CompactGUI.Core/Uncompactor.vb

@@ -16,11 +16,16 @@ Public Class Uncompactor : Implements ICompressor, IDisposable
         Dim paraOptions As New ParallelOptions With {.MaxDegreeOfParallelism = MaxParallelism}
 
         _processedFileCount.Clear()
-        Await Parallel.ForEachAsync(filesList, paraOptions,
-                                   Function(file, _ctx) As ValueTask
-                                       If _ctx.IsCancellationRequested Then Return ValueTask.FromCanceled(_ctx)
-                                       Return New ValueTask(PauseAndProcessFile(file, totalFiles, _cancellationTokenSource.Token, progressMonitor))
-                                   End Function).ConfigureAwait(False)
+        Try
+            Await Parallel.ForEachAsync(filesList, paraOptions,
+                                  Function(file, _ctx) As ValueTask
+                                      _ctx.ThrowIfCancellationRequested()
+                                      Return New ValueTask(PauseAndProcessFile(file, totalFiles, _cancellationTokenSource.Token, progressMonitor))
+                                  End Function).ConfigureAwait(False)
+        Catch ex As OperationCanceledException
+            Return False
+        End Try
+
         Return True
 
     End Function
@@ -31,10 +36,11 @@ Public Class Uncompactor : Implements ICompressor, IDisposable
             Await _pauseSemaphore.WaitAsync(_ctx).ConfigureAwait(False)
             _pauseSemaphore.Release()
         Catch ex As OperationCanceledException
+            Throw
             Return
         End Try
 
-        If _ctx.IsCancellationRequested Then Return
+        _ctx.ThrowIfCancellationRequested()
 
         Dim res = WOFDecompressFile(file)
         _processedFileCount.TryAdd(file, 1)