Add tray notifications for scheduler.

Author: Iridium-IO

CompactGUI.Watcher/Watcher.vb

@@ -102,28 +102,29 @@ Partial Public Class Watcher : Inherits ObservableRecipient : Implements IRecipi
         Next
 
         Try
-            Await Task.Run(Async Function()
-                               _settingsService.AppSettings.ScheduledBackgroundLastRan = DateTime.Now
-                               If Not IsWatchingEnabled Then Return False
-                               Dim recentThresholdDate As DateTime = DateTime.Now.AddSeconds(-IdleSettings.LastSystemModifiedTimeThresholdSeconds)
-                               If Not runAll AndAlso WatchedFolders.Any(Function(x) x.LastChangedDate > recentThresholdDate) Then Return False
-
-                               If _parseWatchersSemaphore.CurrentCount <> 0 Then
-                                   Await ParseWatchers(runAll, cToken)
-                               End If
-                               If cToken <> Nothing AndAlso cToken.IsCancellationRequested Then
-                                   _logger.LogInformation("Watcher run cancelled by user.")
-                                   Return False
-                               End If
-                               If _parseWatchersSemaphore.CurrentCount <> 0 AndAlso (IsBackgroundCompactingEnabled OrElse runAll) Then
-                                   Await BackgroundCompact(runAll) 'Don't need to pass the cancellation token here, as the background compactor handles it internally.
-                               End If
-                               Return True
-                           End Function, cToken)
 
+            _settingsService.AppSettings.ScheduledBackgroundLastRan = DateTime.Now
+            If Not IsWatchingEnabled Then Return False
+            Dim recentThresholdDate As DateTime = DateTime.Now.AddSeconds(-IdleSettings.LastSystemModifiedTimeThresholdSeconds)
+            If Not runAll AndAlso WatchedFolders.Any(Function(x) x.LastChangedDate > recentThresholdDate) Then Return False
 
+            If _parseWatchersSemaphore.CurrentCount <> 0 Then
+                Await ParseWatchers(runAll, cToken)
+            End If
+            If cToken <> Nothing AndAlso cToken.IsCancellationRequested Then
+                _logger.LogInformation("Watcher run cancelled by user.")
+                Return False
+            End If
+            If _parseWatchersSemaphore.CurrentCount <> 0 AndAlso (IsBackgroundCompactingEnabled OrElse runAll) Then
+                Await BackgroundCompact(runAll) 'Don't need to pass the cancellation token here, as the background compactor handles it internally.
+            End If
+            If cToken <> Nothing AndAlso cToken.IsCancellationRequested Then
+                _logger.LogInformation("Watcher run cancelled by user.")
+                Return False
+            End If
             Return True
-        Catch ex As OperationCanceledException
+
+        Catch ex As TaskCanceledException
             Return False
         Finally
 

CompactGUI/Services/SchedulerService.vb

@@ -23,13 +23,30 @@ Public Class SchedulerService
         Dim scheduler = CType(Application.GetService(Of IScheduler), Scheduler)
         If Not scheduler.TryUnschedule(NameOf(Watcher)) Then Return
 
-        scheduler.ScheduleAsync(Async Function() Await Application.GetService(Of Watcher.Watcher).RunWatcher()).
+        scheduler.ScheduleAsync(Async Function() Await RunScheduledTask()).
                                 Cron($"{settings.ScheduledBackgroundMinute} {settings.ScheduledBackgroundHour} * * *").Zoned(TimeZoneInfo.Local).
                                 When(Function() Task.FromResult(IsSchedulerRunnable)).
                                 PreventOverlapping(NameOf(Watcher))
 
     End Sub
 
+
+    Public Async Function RunScheduledTask() As Task(Of Boolean)
+
+        Dim trayService = Application.GetService(Of TrayNotifierService)
+        trayService.Notify_BackgroundSchedulerRunning()
+        Dim task = Await Application.GetService(Of Watcher.Watcher).RunWatcher()
+
+        If task Then
+            trayService.Notify_BackgroundSchedulerCompleted()
+            Return True
+        End If
+        Return False
+
+    End Function
+
+
+
     Public Function IsSchedulerRunnable() As Boolean
 
         SchedulerServiceLog.CheckingSchedulerRunnable(logger)

CompactGUI/Services/TrayNotifierService.vb

@@ -2,6 +2,8 @@
 Imports System.Runtime.InteropServices
 Imports System.Windows.Interop
 
+Imports CompactGUI.Core.Settings
+
 Public Class TrayNotifierService
     Private Const NIM_ADD As Integer = &H0
     Private Const NIM_MODIFY As Integer = &H1
@@ -92,5 +94,16 @@ Public Class TrayNotifierService
 
     End Sub
 
+    Public Sub Notify_BackgroundSchedulerRunning()
+        Dim title = "Scheduled Compression Running"
+        Dim message = "CompactGUI is running a scheduled task and will compress monitored folders in the background"
+        ShowBalloon(title, message)
+    End Sub
+
+    Public Sub Notify_BackgroundSchedulerCompleted()
+        Dim title = "Scheduled Compression Completed"
+        Dim message = $"Next scheduled task is on {Application.GetService(Of ISettingsService).AppSettings.NextScheduledBackgroundRun}"
+        ShowBalloon(title, message)
+    End Sub
 
 End Class

CompactGUI/Views/SettingsPage.xaml

@@ -302,21 +302,11 @@
                                     </i:EventTrigger>
                                 </i:Interaction.Triggers>
                             </CheckBox>
-                            <!--<CheckBox x:Name="UiEnableBackgroundAutoCompression"
-                                      Content="Run background compressor when system is idle"
-                                      Margin="30,-3,0,-3"
-                                      IsChecked="{Binding AppSettings.EnableBackgroundAutoCompression, Mode=TwoWay}">
 
-                                <i:Interaction.Triggers>
-                                    <i:EventTrigger EventName="Checked">
-                                        <i:InvokeCommandAction Command="{Binding EnableBackgroundWatcherCommand}" />
-                                    </i:EventTrigger>
-                                </i:Interaction.Triggers>
-                            </CheckBox>-->
                             <WrapPanel Margin="45,10,0,0"
                                        IsEnabled="{Binding AppSettings.EnableBackgroundWatcher}"
                                        Orientation="Horizontal">
-                                <TextBlock Text="Run background compressor: " VerticalAlignment="Center" />
+                                <TextBlock Text="Compress folders: " VerticalAlignment="Center" />
 
                                 <ComboBox x:Name="BackgroundModeSelector"
                                           Width="290" Height="35"