Refactor Watcher functionality

- added manual running capability to link in with scheduler (personal note: scheduler is still in a separate unreferenced project)
- removed duplication of checks from BackgroundCompactor

Author: Iridium-IO

CompactGUI.Watcher/BackgroundCompactor.vb

@@ -32,16 +32,13 @@ Public Class BackgroundCompactor
 
     Private ReadOnly _logger As ILogger(Of Watcher)
 
-    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)
+    Public Sub New(excludedFileTypes As String(), logger As ILogger(Of Watcher))
 
         _excludedFileTypes = excludedFileTypes
         _logger = logger
-        _idleSettings = settings
-
     End Sub
 
 
@@ -55,7 +52,7 @@ Public Class BackgroundCompactor
 
     End Function
 
-    Public Async Function StartCompactingAsync(folders As ObservableCollection(Of WatchedFolder)) As Task(Of Boolean)
+    Public Async Function StartCompactingAsync(folders As IEnumerable(Of WatchedFolder)) As Task(Of Boolean)
         WatcherLog.BackgroundCompactingStarted(_logger)
         cancellationTokenSource = New CancellationTokenSource()
 
@@ -64,31 +61,14 @@ Public Class BackgroundCompactor
         Dim currentProcess As Process = Process.GetCurrentProcess()
         currentProcess.PriorityClass = ProcessPriorityClass.Idle
 
-        Dim foldersCopy As List(Of WatchedFolder) = folders.Where(Function(f) f.DecayPercentage <> 0 AndAlso f.CompressionLevel <> Core.WOFCompressionAlgorithm.NO_COMPRESSION).ToList()
-
+        isCompacting = True
 
-        For Each folder In foldersCopy
+        For Each folder In folders.ToList
             folder.IsWorking = True
-            Dim recentThresholdDate As DateTime = DateTime.Now.AddSeconds(-_idleSettings.LastSystemModifiedTimeThresholdSeconds)
-            If folder.LastSystemModifiedDate > recentThresholdDate Then
-                WatcherLog.SkippingRecentlyModifiedFolder(_logger, folder.DisplayName)
-                Continue For
-            End If
 
             WatcherLog.CompactingFolder(_logger, folder.DisplayName)
             Dim compactingTask = BeginCompacting(folder.Folder, folder.CompressionLevel)
-            isCompacting = True
-
-            '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.")

CompactGUI.Watcher/WatchedFolder.vb

@@ -64,6 +64,17 @@ Public Class WatchedFolder
         End If
     End Sub
 
+    Public Sub PauseMonitoring()
+        If FSWatcher IsNot Nothing Then
+            FSWatcher.EnableRaisingEvents = False
+        End If
+    End Sub
+
+    Public Sub ResumeMonitoring()
+        If FSWatcher IsNot Nothing Then
+            FSWatcher.EnableRaisingEvents = True
+        End If
+    End Sub
 
     ' --- Monitoring Events ---
     Private Sub WatcherErrorEvent(sender As Object, e As ErrorEventArgs) Handles FSWatcher.Error
@@ -79,6 +90,7 @@ Public Class WatchedFolder
         LastChangedDate = DateTime.Now
         OnPropertyChanged(NameOf(HasTargetChanged))
         OnPropertyChanged(NameOf(LastChangedDate))
+        OnPropertyChanged(NameOf(LastSystemModifiedDate))
         Debug.WriteLine("Folder " & Folder & " has changed!")
     End Sub
 

CompactGUI.Watcher/Watcher.vb

@@ -1,5 +1,6 @@
 Imports System.Collections.ObjectModel
 Imports System.Collections.Specialized
+Imports System.Runtime
 Imports System.Text.Json
 Imports System.Threading
 
@@ -63,7 +64,7 @@ Partial Public Class Watcher : Inherits ObservableRecipient : Implements IRecipi
         AddHandler WatchedFolders.CollectionChanged, AddressOf WatchedFolders_CollectionChanged
 
 
-        BGCompactor = New BackgroundCompactor(excludedFiletypes, _logger, IdleSettings)
+        BGCompactor = New BackgroundCompactor(excludedFiletypes, _logger)
 
 
         AddHandler BGCompactor.IsCompactingEvent, Sub(sender, isCompacting)
@@ -83,24 +84,46 @@ Partial Public Class Watcher : Inherits ObservableRecipient : Implements IRecipi
         WatcherLog.SystemIdleDetected(_logger)
         BGCompactor.ResumeCompacting()
 
+        Await RunWatcher(False)
+
+    End Sub
+
+    <RelayCommand>
+    Public Async Function RunWatcher() As Task(Of Boolean)
+        Return Await RunWatcher(True)
+    End Function
+
+    Public Async Function RunWatcher(Optional runAll As Boolean = True) As Task(Of Boolean)
+        _logger.LogDebug("RunWatcher called")
         RemoveHandler IdleDetector.IsIdle, _idleHandler
 
+        For Each watcher In WatchedFolders
+            watcher.PauseMonitoring()
+        Next
+
         Try
-            If Not IsWatchingEnabled Then Return
+            If Not IsWatchingEnabled Then Return False
             Dim recentThresholdDate As DateTime = DateTime.Now.AddSeconds(-IdleSettings.LastSystemModifiedTimeThresholdSeconds)
-            If WatchedFolders.Any(Function(x) x.LastChangedDate > recentThresholdDate) Then Return
+            If Not runAll AndAlso WatchedFolders.Any(Function(x) x.LastChangedDate > recentThresholdDate) Then Return False
 
             If _parseWatchersSemaphore.CurrentCount <> 0 Then
-                Await ParseWatchers()
+                Await ParseWatchers(runAll)
             End If
-            If _parseWatchersSemaphore.CurrentCount <> 0 AndAlso IsBackgroundCompactingEnabled Then
-                Await BackgroundCompact()
+            If _parseWatchersSemaphore.CurrentCount <> 0 AndAlso (IsBackgroundCompactingEnabled OrElse runAll) Then
+                Await BackgroundCompact(runAll)
             End If
+            Return True
         Finally
 
             AddHandler IdleDetector.IsIdle, _idleHandler
+            For Each watcher In WatchedFolders
+                watcher.ResumeMonitoring()
+            Next
         End Try
-    End Sub
+        Return False
+    End Function
+
+
 
     Private Sub OnSystemNotIdle(sender As Object, e As EventArgs)
         _isSystemIdle = False
@@ -366,7 +389,7 @@ Partial Public Class Watcher : Inherits ObservableRecipient : Implements IRecipi
 
     End Function
 
-    Public Async Function BackgroundCompact() As Task
+    Public Async Function BackgroundCompact(Optional runAll As Boolean = False) As Task
 
         Dim acquired = Await _parseWatchersSemaphore.WaitAsync(0)
         If Not acquired Then Return
@@ -375,11 +398,22 @@ Partial Public Class Watcher : Inherits ObservableRecipient : Implements IRecipi
 
             If BGCompactor.IsCompactorActive Then Return
 
-            If Not WatchedFolders.Any(Function(f) f.DecayPercentage <> 0 AndAlso f.CompressionLevel <> WOFCompressionAlgorithm.NO_COMPRESSION) Then
-                Return
-            End If
+            Dim recentThresholdDate As DateTime = DateTime.Now.AddSeconds(-IdleSettings.LastSystemModifiedTimeThresholdSeconds)
+
+            Dim foldersToCompress = WatchedFolders.
+                Where(Function(folder)
+                          Dim eligible = folder.DecayPercentage <> 0 AndAlso folder.CompressionLevel <> WOFCompressionAlgorithm.NO_COMPRESSION
+                          Dim recentlyModified = folder.LastSystemModifiedDate > recentThresholdDate AndAlso Not runAll
+                          If eligible AndAlso recentlyModified Then
+                              WatcherLog.SkippingRecentlyModifiedFolder(_logger, folder.DisplayName)
+                          End If
+                          Return eligible AndAlso Not recentlyModified
+                      End Function)
+
+            If foldersToCompress.Any = 0 Then Return
+
+            Await BGCompactor.StartCompactingAsync(foldersToCompress)
 
-            Await BGCompactor.StartCompactingAsync(WatchedFolders)
             OnPropertyChanged(NameOf(TotalSaved))
         Finally
             _parseWatchersSemaphore.Release()

CompactGUI/Views/Components/FolderWatcherCard.xaml

@@ -85,6 +85,7 @@
                                  Visibility="{Binding RefreshWatchedCommand.IsRunning, Converter={StaticResource BoolToVisConverter}}" />
 
                 <Button Content="Cancel" Margin="-100" Command="{Binding Watcher.CancelBackgroundingCommand}"/>
+                <Button Content="Run Now" Margin="-200" Command="{Binding Watcher.RunWatcherCommand}"/>
             </Grid>