Implemented Watcher cancellation

Author: Iridium-IO

CompactGUI.Watcher/BackgroundCompactor.vb

@@ -9,7 +9,17 @@ Imports Microsoft.Extensions.Logging.Abstractions
 
 Public Class BackgroundCompactor
 
-    Public Property IsCompactorActive As Boolean = False
+    Private _IsCompactorActive As Boolean = False
+    Public Property IsCompactorActive As Boolean
+        Get
+            Return _IsCompactorActive
+        End Get
+        Set(value As Boolean)
+            If _IsCompactorActive = value Then Return
+            _IsCompactorActive = value
+            RaiseEvent IsCompactingEvent(Me, value)
+        End Set
+    End Property
 
     Private cancellationTokenSource As New CancellationTokenSource()
     Private isCompacting As Boolean = False
@@ -24,6 +34,8 @@ Public Class BackgroundCompactor
 
     Private ReadOnly _idleSettings As IdleSettings
 
+    Public Event IsCompactingEvent As EventHandler(Of Boolean)
+
     Public Sub New(excludedFileTypes As String(), logger As ILogger(Of Watcher), settings As IdleSettings)
 
         _excludedFileTypes = excludedFileTypes
@@ -45,7 +57,7 @@ Public Class BackgroundCompactor
 
     Public Async Function StartCompactingAsync(folders As ObservableCollection(Of WatchedFolder)) As Task(Of Boolean)
         WatcherLog.BackgroundCompactingStarted(_logger)
-        Dim cancellationToken As CancellationToken = cancellationTokenSource.Token
+        cancellationTokenSource = New CancellationTokenSource()
 
         IsCompactorActive = True
 
@@ -67,16 +79,25 @@ Public Class BackgroundCompactor
             Dim compactingTask = BeginCompacting(folder.Folder, folder.CompressionLevel)
             isCompacting = True
 
-            While Not cancellationToken.IsCancellationRequested AndAlso Not compactingTask.IsCompleted
-                Await Task.WhenAny(compactingTask, Task.Delay(1000, cancellationToken))
-
-                '' Check the idle state and adjust compacting status accordingly
-                'If Not isSystemIdle AndAlso Not isCompactingPaused Then
-                '    PauseCompacting()
-                'ElseIf isSystemIdle AndAlso isCompactingPaused Then
-                '    ResumeCompacting()
-                'End If
-            End While
+            'While Not cancellationToken.IsCancellationRequested AndAlso Not compactingTask.IsCompleted AndAlso Not compactingTask.IsCanceled
+            ' Dim ret = Await compactingTask
+
+            '' Check the idle state and adjust compacting status accordingly
+            'If Not isSystemIdle AndAlso Not isCompactingPaused Then
+            '    PauseCompacting()
+            'ElseIf isSystemIdle AndAlso isCompactingPaused Then
+            '    ResumeCompacting()
+            'End If
+            'End While
+
+            If cancellationTokenSource.IsCancellationRequested Then
+                Trace.WriteLine("Compacting cancelled by user.")
+                folder.IsWorking = False
+                IsCompactorActive = False
+                isCompacting = False ' Ensure compacting status is reset after operation
+                _compactor.Dispose()
+                Return False
+            End If
 
             Dim result = Await compactingTask
             If result AndAlso folders.Contains(folder) Then
@@ -131,4 +152,17 @@ Public Class BackgroundCompactor
         _compactor?.Resume()
     End Sub
 
+    Public Sub CancelCompacting()
+        If Not isCompacting Then
+            Return
+        End If
+        Debug.WriteLine("Cancelling background compactor...")
+        cancellationTokenSource.Cancel()
+        cancellationTokenSource.Dispose()
+        _compactor?.Cancel()
+        _compactor?.Dispose()
+        isCompacting = False
+        isCompactingPaused = False ' Reset pause state on cancellation
+    End Sub
+
 End Class

CompactGUI.Watcher/Watcher.vb

@@ -4,6 +4,7 @@ Imports System.Text.Json
 Imports System.Threading
 
 Imports CommunityToolkit.Mvvm.ComponentModel
+Imports CommunityToolkit.Mvvm.Input
 Imports CommunityToolkit.Mvvm.Messaging
 Imports CommunityToolkit.Mvvm.Messaging.Messages
 
@@ -61,7 +62,14 @@ Partial Public Class Watcher : Inherits ObservableRecipient : Implements IRecipi
         AddHandler IdleDetector.IsNotIdle, AddressOf OnSystemNotIdle
         AddHandler WatchedFolders.CollectionChanged, AddressOf WatchedFolders_CollectionChanged
 
+
         BGCompactor = New BackgroundCompactor(excludedFiletypes, _logger, IdleSettings)
+
+
+        AddHandler BGCompactor.IsCompactingEvent, Sub(sender, isCompacting)
+                                                      CancelBackgroundingCommand.NotifyCanExecuteChanged()
+                                                  End Sub
+
         InitializeWatchedFoldersAsync()
 
 
@@ -112,6 +120,7 @@ Partial Public Class Watcher : Inherits ObservableRecipient : Implements IRecipi
             If _disableCounter = 1 Then
                 WatcherLog.BackgroundingDisabled(_logger)
                 IdleDetector.Paused = True
+                BGCompactor.CancelCompacting()
                 Await _parseWatchersSemaphore.WaitAsync()
             End If
         Finally
@@ -222,7 +231,7 @@ Partial Public Class Watcher : Inherits ObservableRecipient : Implements IRecipi
             .LastCheckedDate = DateTime.Now
             .LastCheckedSize = newItem.LastCheckedSize
             .LastSystemModifiedDate = DateTime.Now
-            .CompressionLevel = If(newItem.CompressionLevel <> WOFCompressionAlgorithm.NO_COMPRESSION,newItem.CompressionLevel, existingItem.CompressionLevel)
+            .CompressionLevel = If(newItem.CompressionLevel <> WOFCompressionAlgorithm.NO_COMPRESSION, newItem.CompressionLevel, existingItem.CompressionLevel)
         End With
         existingItem.HasTargetChanged = False
     End Sub
@@ -427,6 +436,15 @@ Partial Public Class Watcher : Inherits ObservableRecipient : Implements IRecipi
 
     End Sub
 
+    <RelayCommand>
+    Public Sub CancelBackgrounding()
+        BGCompactor.CancelCompacting()
+        CancelBackgroundingCommand.NotifyCanExecuteChanged()
+    End Sub
+
+    Public Function CanCancelBackgrounding() As Boolean
+        Return BGCompactor.IsCompactorActive
+    End Function
 
 End Class
 

CompactGUI/Views/Components/FolderWatcherCard.xaml

@@ -83,6 +83,8 @@
                                  Margin="-15,0,0,0"
                                  Foreground="#FFBFC7CE" IsIndeterminate="True"
                                  Visibility="{Binding RefreshWatchedCommand.IsRunning, Converter={StaticResource BoolToVisConverter}}" />
+
+                <Button Content="Cancel" Margin="-100" Command="{Binding Watcher.CancelBackgroundingCommand}"/>
             </Grid>