Separate idle settings times for easier config

- Also fix watcher compression mode being set to "NIL" when the system or another program totally uncompresses a folder

Author: Iridium-IO

CompactGUI.Watcher/BackgroundCompactor.vb

@@ -22,14 +22,15 @@ Public Class BackgroundCompactor
     Private _excludedFileTypes As String()
 
 
-    Private Const LAST_SYSTEM_MODIFIED_TIME_THRESHOLD As Integer = 300 ' 5 minutes
+    Private ReadOnly _logger As ILogger(Of Watcher)
 
-    Private _logger As ILogger(Of Watcher)
+    Private ReadOnly _idleSettings As IdleSettings
 
-    Public Sub New(excludedFileTypes As String(), logger As ILogger(Of Watcher))
+    Public Sub New(excludedFileTypes As String(), logger As ILogger(Of Watcher), settings As IdleSettings)
 
         _excludedFileTypes = excludedFileTypes
         _logger = logger
+        _idleSettings = settings
         AddHandler IdleDetector.IsIdle, AddressOf OnSystemIdle
         AddHandler IdleDetector.IsNotIdle, AddressOf OnSystemNotIdle
 
@@ -77,7 +78,7 @@ Public Class BackgroundCompactor
 
         For Each folder In foldersCopy
             folder.IsWorking = True
-            Dim recentThresholdDate As DateTime = DateTime.Now.AddSeconds(-LAST_SYSTEM_MODIFIED_TIME_THRESHOLD)
+            Dim recentThresholdDate As DateTime = DateTime.Now.AddSeconds(-_idleSettings.LastSystemModifiedTimeThresholdSeconds)
             If folder.LastSystemModifiedDate > recentThresholdDate Then
                 WatcherLog.SkippingRecentlyModifiedFolder(_logger, folder.DisplayName)
                 Continue For
@@ -119,6 +120,7 @@ Public Class BackgroundCompactor
 
             End If
             folder.IsWorking = False
+            folder.RefreshProperties()
             _compactor.Dispose()
             WatcherLog.FinishedCompactingFolder(_logger, folder.DisplayName)
         Next

CompactGUI.Watcher/IdleDetector.vb

@@ -6,6 +6,8 @@ Public Class IdleDetector
     Public Shared Event IsIdle As EventHandler
     Public Shared Event IsNotIdle As EventHandler
 
+    Private Shared _settings As IdleSettings
+
     Private Shared _timerTask As Task
     Private Shared _idletimer As PeriodicTimer
     Private Shared ReadOnly _cts As New CancellationTokenSource
@@ -16,10 +18,14 @@ Public Class IdleDetector
 
     Public Shared Property IsAlreadyIdle As Boolean = False
 
-    Shared Sub New()
-        _idletimer = New PeriodicTimer(TimeSpan.FromSeconds(5))
+
+    Public Shared Sub Initialize(settings As IdleSettings)
+        _settings = settings
+        _idletimer = New PeriodicTimer(TimeSpan.FromSeconds(_settings.IdleCheckIntervalSeconds))
+
     End Sub
 
+
     Public Shared Sub Start()
         If _timerTask Is Nothing OrElse _timerTask.IsCompleted Then _timerTask = IdleTimerDoWorkAsync()
     End Sub
@@ -36,7 +42,7 @@ Public Class IdleDetector
         Try
             While Await _idletimer.WaitForNextTickAsync(_cts.Token) AndAlso Not _cts.Token.IsCancellationRequested
 
-                If GetIdleTime() > 300 AndAlso Not Paused AndAlso IsEnabled Then
+                If GetIdleTime() > _settings.IdleThresholdSeconds AndAlso Not Paused AndAlso IsEnabled Then
                     If Not IsAlreadyIdle Then
                         IsAlreadyIdle = True
                         RaiseEvent IsIdle(Nothing, EventArgs.Empty)

CompactGUI.Watcher/IdleSettings.vb

@@ -0,0 +1,5 @@
+Public Class IdleSettings
+    Public Property IdleCheckIntervalSeconds As Integer = 5
+    Public Property IdleThresholdSeconds As Integer = 15
+    Public Property LastSystemModifiedTimeThresholdSeconds As Integer = 300
+End Class

CompactGUI.Watcher/Watcher.vb

@@ -26,8 +26,6 @@ Partial Public Class Watcher : Inherits ObservableRecipient : Implements IRecipi
     Private ReadOnly _logger As ILogger(Of Watcher)
     Private ReadOnly _settingsService As ISettingsService
 
-    Private Const LAST_SYSTEM_MODIFIED_TIME_THRESHOLD As Integer = 180 ' 3 minutes
-
     <NotifyPropertyChangedFor(NameOf(TotalSaved))>
     <ObservableProperty> Private _LastAnalysed As DateTime
     <ObservableProperty> Private _WatchedFolders As New ObservableCollection(Of WatchedFolder)
@@ -36,6 +34,7 @@ Partial Public Class Watcher : Inherits ObservableRecipient : Implements IRecipi
     <ObservableProperty> Private _BGCompactor As BackgroundCompactor
 
     Private ReadOnly Property WatcherJSONFile As IO.FileInfo
+    Private ReadOnly IdleSettings As IdleSettings
 
     Public ReadOnly Property TotalSaved As Long
         Get
@@ -47,10 +46,12 @@ Partial Public Class Watcher : Inherits ObservableRecipient : Implements IRecipi
     Sub New(excludedFiletypes As String(), logger As ILogger(Of Watcher), settingsService As ISettingsService)
         _logger = logger
         _settingsService = settingsService
-
         _DataFolder = settingsService.DataFolder
         WatcherJSONFile = New IO.FileInfo(IO.Path.Combine(_DataFolder.FullName, "watcher.json"))
 
+        IdleSettings = New IdleSettings
+        IdleDetector.Initialize(IdleSettings)
+
         WatcherLog.WatcherStarted(logger)
         IsActive = True
 
@@ -59,13 +60,14 @@ Partial Public Class Watcher : Inherits ObservableRecipient : Implements IRecipi
         AddHandler IdleDetector.IsIdle, AddressOf OnSystemIdle
         AddHandler WatchedFolders.CollectionChanged, AddressOf WatchedFolders_CollectionChanged
 
-        BGCompactor = New BackgroundCompactor(excludedFiletypes, _logger)
+        BGCompactor = New BackgroundCompactor(excludedFiletypes, _logger, IdleSettings)
         InitializeWatchedFoldersAsync()
 
 
     End Sub
 
 
+
     Private _disableCounter As Integer = 0
     Private _counterLock As New SemaphoreSlim(1, 1)
 
@@ -186,7 +188,7 @@ Partial Public Class Watcher : Inherits ObservableRecipient : Implements IRecipi
             .LastCheckedDate = DateTime.Now
             .LastCheckedSize = newItem.LastCheckedSize
             .LastSystemModifiedDate = DateTime.Now
-            .CompressionLevel = newItem.CompressionLevel
+            .CompressionLevel = If(newItem.CompressionLevel <> WOFCompressionAlgorithm.NO_COMPRESSION,newItem.CompressionLevel, existingItem.CompressionLevel)
         End With
         existingItem.HasTargetChanged = False
     End Sub
@@ -274,7 +276,7 @@ Partial Public Class Watcher : Inherits ObservableRecipient : Implements IRecipi
         Try
 
             If Not IsWatchingEnabled Then Return
-            Dim recentThresholdDate As DateTime = DateTime.Now.AddSeconds(-LAST_SYSTEM_MODIFIED_TIME_THRESHOLD)
+            Dim recentThresholdDate As DateTime = DateTime.Now.AddSeconds(-IdleSettings.LastSystemModifiedTimeThresholdSeconds)
             If WatchedFolders.Any(Function(x) x.LastChangedDate > recentThresholdDate) Then Return
 
             If _parseWatchersSemaphore.CurrentCount <> 0 Then
@@ -381,7 +383,7 @@ Partial Public Class Watcher : Inherits ObservableRecipient : Implements IRecipi
 
             If analysedFiles.Count <> 0 Then
                 Dim mainCompressionLVL = analysedFiles?.Select(Function(f) f.CompressionMode).Max
-                watched.CompressionLevel = If(mainCompressionLVL, WOFCompressionAlgorithm.NO_COMPRESSION)
+                watched.CompressionLevel = If(mainCompressionLVL <> WOFCompressionAlgorithm.NO_COMPRESSION, mainCompressionLVL, watched.CompressionLevel)
 
                 If checkDiskModified Then
                     Dim lastDiskWriteTime = analysedFiles.Select(Function(fl)