Simplified idle detector

Author: Iridium-IO

CompactGUI.Watcher/IdleDetector.vb

@@ -1,58 +1,63 @@
 Imports System.Runtime.InteropServices
 Imports System.Threading
 
-Public Class IdleDetector
-
-    Public Shared Event IsIdle As EventHandler
-    Public Shared Event IsNotIdle As EventHandler
+Public Enum IdleState
+    Idle
+    NotIdle
+End Enum
 
-    Private Shared _settings As IdleSettings
+Public Class IdleDetector
 
-    Private Shared _timerTask As Task
-    Private Shared _idletimer As PeriodicTimer
-    Private Shared ReadOnly _cts As New CancellationTokenSource
+    Public Event IsIdle As EventHandler
+    Public Event IsNotIdle As EventHandler
 
-    Public Shared Property Paused As Boolean = False
+    Private ReadOnly _settings As IdleSettings
 
-    Public Shared Property IsEnabled As Boolean = True
+    Private  _timerTask As Task
+    Private _idletimer As PeriodicTimer
+    Private _cts As CancellationTokenSource
 
-    Public Shared Property IsAlreadyIdle As Boolean = False
-    Public Shared Property LastIdleTime As DateTime = DateTime.MinValue
+    Public Property State As IdleState
+    Public Property LastIdleTime As DateTime = DateTime.MinValue
 
 
-    Public Shared Sub Initialize(settings As IdleSettings)
+    Public Sub New(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()
+    Public Async Sub Start()
+        Await StopAsync()
+        _cts = New CancellationTokenSource()
+        _idletimer = New PeriodicTimer(TimeSpan.FromSeconds(_settings.IdleCheckIntervalSeconds))
+        _timerTask = IdleTimerDoWorkAsync()
+        State = IdleState.NotIdle
     End Sub
 
-    Public Shared Async Sub StopAsync()
-        _cts.Cancel()
+    Public Async Function StopAsync() As Task
+        _cts?.Cancel()
+        _idletimer?.Dispose()
+        _idletimer = Nothing
         If _timerTask IsNot Nothing Then Await _timerTask
-        _idletimer.Dispose()
-        _cts.Dispose()
-    End Sub
-
-    Private Shared Async Function IdleTimerDoWorkAsync() As Task
+        _cts?.Dispose()
+        _cts = Nothing
+    End Function
 
+    Private Async Function IdleTimerDoWorkAsync() As Task
         Try
             While Await _idletimer.WaitForNextTickAsync(_cts.Token) AndAlso Not _cts.Token.IsCancellationRequested
+                Trace.WriteLine("Doing work!!!")
 
-                If GetIdleTime() > _settings.IdleThresholdSeconds AndAlso Not Paused AndAlso IsEnabled Then
-                    If Not IsAlreadyIdle OrElse DateTime.Now.AddSeconds(-_settings.IdleRepeatTimeSeconds) > LastIdleTime Then
-                        IsAlreadyIdle = True
+                If GetIdleTime() > _settings.IdleThresholdSeconds Then
+                    If State <> IdleState.Idle OrElse DateTime.Now.AddSeconds(-_settings.IdleRepeatTimeSeconds) > LastIdleTime Then
+                        State = IdleState.Idle
                         LastIdleTime = DateTime.Now
                         RaiseEvent IsIdle(Nothing, EventArgs.Empty)
                     End If
 
-                ElseIf Not Paused AndAlso IsEnabled Then
-                    If IsAlreadyIdle Then
-                        IsAlreadyIdle = False
+                Else
+                    If State = IdleState.Idle Then
+                        State = IdleState.NotIdle
                         RaiseEvent IsNotIdle(Nothing, EventArgs.Empty)
                     End If
 

CompactGUI.Watcher/Watcher.vb

@@ -27,6 +27,7 @@ Partial Public Class Watcher : Inherits ObservableRecipient : Implements IRecipi
 
     Private ReadOnly _logger As ILogger(Of Watcher)
     Private ReadOnly _settingsService As ISettingsService
+    Private ReadOnly _idleDetector As IdleDetector
 
     <NotifyPropertyChangedFor(NameOf(TotalSaved))>
     <ObservableProperty> Private _LastAnalysed As DateTime
@@ -52,15 +53,15 @@ Partial Public Class Watcher : Inherits ObservableRecipient : Implements IRecipi
         WatcherJSONFile = New IO.FileInfo(IO.Path.Combine(_DataFolder.FullName, "watcher.json"))
 
         IdleSettings = New IdleSettings
-        IdleDetector.Initialize(IdleSettings)
+        _idleDetector = New IdleDetector(IdleSettings)
 
         WatcherLog.WatcherStarted(logger)
         IsActive = True
 
 
-        IdleDetector.Start()
-        AddHandler IdleDetector.IsIdle, _idleHandler
-        AddHandler IdleDetector.IsNotIdle, AddressOf OnSystemNotIdle
+        _idleDetector.Start()
+        AddHandler _idleDetector.IsIdle, _idleHandler
+        AddHandler _idleDetector.IsNotIdle, AddressOf OnSystemNotIdle
         AddHandler WatchedFolders.CollectionChanged, AddressOf WatchedFolders_CollectionChanged
 
 
@@ -94,8 +95,7 @@ Partial Public Class Watcher : Inherits ObservableRecipient : Implements IRecipi
     End Function
 
     Public Async Function RunWatcher(Optional runAll As Boolean = True) As Task(Of Boolean)
-        _logger.LogDebug("RunWatcher called")
-        RemoveHandler IdleDetector.IsIdle, _idleHandler
+        RemoveHandler _idleDetector.IsIdle, _idleHandler
 
         For Each watcher In WatchedFolders
             watcher.PauseMonitoring()
@@ -115,7 +115,7 @@ Partial Public Class Watcher : Inherits ObservableRecipient : Implements IRecipi
             Return True
         Finally
 
-            AddHandler IdleDetector.IsIdle, _idleHandler
+            AddHandler _idleDetector.IsIdle, _idleHandler
             For Each watcher In WatchedFolders
                 watcher.ResumeMonitoring()
             Next
@@ -142,7 +142,7 @@ Partial Public Class Watcher : Inherits ObservableRecipient : Implements IRecipi
             _disableCounter += 1
             If _disableCounter = 1 Then
                 WatcherLog.BackgroundingDisabled(_logger)
-                IdleDetector.Paused = True
+                Await _idleDetector.StopAsync()
                 BGCompactor.CancelCompacting()
                 Await _parseWatchersSemaphore.WaitAsync()
             End If
@@ -158,7 +158,7 @@ Partial Public Class Watcher : Inherits ObservableRecipient : Implements IRecipi
                 _disableCounter -= 1
                 If _disableCounter = 0 Then
                     _parseWatchersSemaphore.Release()
-                    IdleDetector.Paused = False
+                    _idleDetector.Start()
                     WatcherLog.BackgroundingEnabled(_logger)
                 End If
             End If