Update idle detection and folder management logic

- Increased idle timer duration in `IdleDetector` from 2 to 5 seconds.
- Adjusted `DecayPercentage` calculation in `WatchedFolder` to return 1 when sizes are equal and updated `SavedSpace` calculation.
- Enhanced `Watcher` to start `IdleDetector`; modified `UpdateWatched` to include `isFreshlyCompressed` parameter.
- Converted `OnSystemIdle` to an asynchronous method with re-entrance checks and logging.
- Made `Analyser` a class-level variable in `CompressableFolder`.
- Updated `FolderViewModel` to pass an additional parameter to `UpdateWatched` during uncompression.
- Changed `HomeViewModel` to call `UpdateWatched` for compressed folder notifications and refactored folder addition to `AddOrUpdateFolderWatcher`.

Author: Iridium-IO

CompactGUI.Watcher/IdleDetector.vb

@@ -15,7 +15,7 @@ Public Class IdleDetector
     Public Shared Property IsEnabled As Boolean = True
 
     Shared Sub New()
-        _idletimer = New PeriodicTimer(TimeSpan.FromSeconds(2))
+        _idletimer = New PeriodicTimer(TimeSpan.FromSeconds(5))
     End Sub
 
     Public Shared Sub Start()

CompactGUI.Watcher/WatchedFolder.vb

@@ -20,13 +20,13 @@ Public Class WatchedFolder : Inherits ObservableObject
     Public ReadOnly Property DecayPercentage As Decimal
         Get
             If LastCompressedSize = 0 Then Return 1
-            Return If(LastUncompressedSize = LastCompressedSize OrElse LastCompressedSize > LastUncompressedSize, 0D, Math.Clamp((LastCheckedSize - LastCompressedSize) / (LastUncompressedSize - LastCompressedSize), 0, 1))
+            Return If(LastUncompressedSize = LastCompressedSize OrElse LastCompressedSize > LastUncompressedSize, 1D, Math.Clamp((LastCheckedSize - LastCompressedSize) / (LastUncompressedSize - LastCompressedSize), 0, 1))
         End Get
     End Property
     <JsonIgnore>
     Public ReadOnly Property SavedSpace As Long
         Get
-            Return LastUncompressedSize - LastCompressedSize
+            Return LastUncompressedSize - LastCheckedSize
         End Get
     End Property
 

CompactGUI.Watcher/Watcher.vb

@@ -64,6 +64,7 @@ Public Class Watcher : Inherits ObservableObject
     Sub New(excludedFiletypes As String())
 
         IdleDetector.Start()
+        Debug.WriteLine("Idle Detector Started")
         AddHandler IdleDetector.IsIdle, AddressOf OnSystemIdle
 
         BGCompactor = New BackgroundCompactor(excludedFiletypes)
@@ -114,20 +115,25 @@ Public Class Watcher : Inherits ObservableObject
 
     End Sub
 
-    Public Sub UpdateWatched(folder As String, ByRef analyser As Analyser, Optional immediateFlushToDisk As Boolean = True)
+    Public Sub UpdateWatched(folder As String, ByRef analyser As Analyser, isFreshlyCompressed As Boolean, Optional immediateFlushToDisk As Boolean = True)
 
         Dim existingItem = WatchedFolders.FirstOrDefault(Function(f) f.Folder = folder)
         If existingItem IsNot Nothing Then
 
             existingItem.LastCheckedDate = DateTime.Now
             existingItem.LastCheckedSize = analyser.CompressedBytes
+            existingItem.LastUncompressedSize = analyser.UncompressedBytes
             existingItem.LastSystemModifiedDate = FolderMonitors.First(Function(f) f.Folder = folder).LastChangedDate
 
             existingItem.CompressionLevel = analyser.FileCompressionDetailsList.Select(Function(f) f.CompressionMode).Max
 
+            If isFreshlyCompressed OrElse existingItem.CompressionLevel = WOFCompressionAlgorithm.NO_COMPRESSION Then
+                existingItem.LastCompressedSize = analyser.CompressedBytes
+            End If
+
             FolderMonitors.First(Function(f) f.Folder = folder).HasTargetChanged = False
             OnPropertyChanged(NameOf(TotalSaved))
-            If Not immediateFlushToDisk Then WriteToFile()
+            If immediateFlushToDisk Then WriteToFile()
         End If
     End Sub
 
@@ -204,27 +210,38 @@ Public Class Watcher : Inherits ObservableObject
 
 
 
+    Private _isHandlingIdle As Boolean = False
 
-    Private Async Sub OnSystemIdle()
+    Private Async Function OnSystemIdle() As Task
+        If _isHandlingIdle Then Return
+        _isHandlingIdle = True
+        Try
 
-        If Not IsWatchingEnabled Then Return
+            Debug.WriteLine("System Idle Detected")
+            If Not IsWatchingEnabled Then Return
 
-        Dim recentThresholdDate As DateTime = DateTime.Now.AddSeconds(-LAST_SYSTEM_MODIFIED_TIME_THRESHOLD)
-        If FolderMonitors.Exists(Function(x) x.LastChangedDate > recentThresholdDate) Then Return
+            Dim recentThresholdDate As DateTime = DateTime.Now.AddSeconds(-LAST_SYSTEM_MODIFIED_TIME_THRESHOLD)
+            If FolderMonitors.Exists(Function(x) x.LastChangedDate > recentThresholdDate) Then Return
+
+            If _parseWatchersSemaphore.CurrentCount <> 0 Then
+                Await ParseWatchers()
+            End If
+            If _parseWatchersSemaphore.CurrentCount <> 0 AndAlso IsBackgroundCompactingEnabled Then
+                Await BackgroundCompact()
+            End If
+        Finally
+
+            _isHandlingIdle = False
+        End Try
+    End Function
 
-        If _parseWatchersSemaphore.CurrentCount <> 0 Then
-            Await ParseWatchers()
-        End If
-        If _parseWatchersSemaphore.CurrentCount <> 0 AndAlso IsBackgroundCompactingEnabled Then
-            Await BackgroundCompact()
-        End If
-    End Sub
 
     Public Async Function ParseWatchers(Optional ParseAll As Boolean = False) As Task
         Dim acquired = Await _parseWatchersSemaphore.WaitAsync(0)
         If Not acquired Then Return
 
         Try
+            Debug.WriteLine("Background Parsing Watchers")
 
             Dim WatchersToCheck = If(ParseAll, FolderMonitors, FolderMonitors.Where(Function(w) w.HasTargetChanged)).ToList()
 

CompactGUI/Models/NewModels/ICompressableFolder.vb

@@ -116,14 +116,16 @@ Public MustInherit Class CompressableFolder : Inherits ObservableObject
 
     Private CancellationTokenSource As CancellationTokenSource
 
+    Public Analyser As Analyser
+
     Public Async Function AnalyseFolderAsync() As Task(Of Integer)
 
         FolderActionState = ActionState.Analysing
 
         CancellationTokenSource = New CancellationTokenSource()
         Dim token = CancellationTokenSource.Token
 
-        Dim Analyser As New Analyser(FolderName)
+        Analyser = New Analyser(FolderName)
 
         If Not Analyser.HasDirectoryWritePermission Then
             FolderActionState = ActionState.Idle

CompactGUI/ViewModels/FolderViewModel.vb

@@ -95,6 +95,8 @@ Public Class FolderViewModel : Inherits ObservableObject
 
     Public Async Function UncompressFolderAsync() As Task
         Await Folder.UncompressFolder()
+        Application.GetService(Of Watcher.Watcher).UpdateWatched(Folder.FolderName, Folder.Analyser, True)
+
     End Function
 
 

CompactGUI/ViewModels/HomeViewModel.vb

@@ -172,6 +172,8 @@ Partial Public Class HomeViewModel
 
                                    End If
 
+                                   Application.GetService(Of Watcher.Watcher).UpdateWatched(folder.FolderName, folder.Analyser, True)
+
                                    'For Each poorext In folder.PoorlyCompressedFiles
                                    '    Debug.WriteLine($"{poorext.extension} : {poorext.totalFiles} with ratio of {poorext.cRatio}")
                                    'Next
@@ -183,15 +185,15 @@ Partial Public Class HomeViewModel
         Compressing = False
 
         For Each folder In Folders.Where(Function(f) f.CompressionOptions.WatchFolderForChanges)
-            AddFolderToWatcher(folder)
+            AddOrUpdateFolderWatcher(folder)
         Next
 
 
         Await Application.GetService(Of Watcher.Watcher).EnableBackgrounding()
     End Function
 
 
-    Public Sub AddFolderToWatcher(folder As CompressableFolder)
+    Public Sub AddOrUpdateFolderWatcher(folder As CompressableFolder)
         Debug.WriteLine("Adding folder to watcher: " & folder.FolderName)
         Dim newWatched = New Watcher.WatchedFolder With {
             .Folder = folder.FolderName,