Add button to re-scan a single folder in the watchlist. Closes #452

- Also fix error where analysing icon wouldn't show up when analysing all folders

Author: Iridium-IO

CompactGUI.Watcher/Watcher.vb

@@ -278,6 +278,27 @@ Public Class Watcher : Inherits ObservableObject
 
     End Function
 
+    Public Async Function ParseSingleWatcher(watchedFolder As WatchedFolder) As Task
+
+        Dim acquired = Await _parseWatchersSemaphore.WaitAsync(0)
+        If Not acquired Then Return
+
+        Try
+            If watchedFolder Is Nothing Then Return
+            If Not IO.Directory.Exists(watchedFolder.Folder) Then
+                RemoveWatched(watchedFolder)
+                Return
+            End If
+
+            Await Analyse(watchedFolder.Folder, False)
+            LastAnalysed = DateTime.Now
+            WriteToFile()
+        Finally
+            _parseWatchersSemaphore.Release()
+        End Try
+
+
+    End Function
 
     Public Async Function BackgroundCompact() As Task
 
@@ -306,22 +327,14 @@ Public Class Watcher : Inherits ObservableObject
         Debug.WriteLine("Background Analysing: " & folder)
         Dim analyser As New Analyser(folder)
 
-        Dim ret = Await analyser.AnalyseFolder(Nothing)
-
-        'Dim retMSG As String = ""
-
-        'retMSG &= $"Compressed Bytes: {analyser.CompressedBytes}" & Environment.NewLine
-        'retMSG &= $"Uncompressed Bytes: {analyser.UncompressedBytes}" & Environment.NewLine
-        'retMSG &= $"FileCompressionDetails: {analyser.FileCompressionDetailsList.Count}" & Environment.NewLine
-        'retMSG &= $"FolderSubs: {analyser.FolderName.Count}" & Environment.NewLine
-
+        Dim watched = WatchedFolders.First(Function(f) f.Folder = folder)
+        watched.IsWorking = True
 
-        'MsgBox(retMSG)
+        Dim ret = Await analyser.AnalyseFolder(Nothing)
 
         analyser.FileCompressionDetailsList.Clear()
 
-        Dim watched = WatchedFolders.First(Function(f) f.Folder = folder)
-        watched.IsWorking = True
+
         watched.LastCheckedDate = DateTime.Now
         watched.LastCheckedSize = analyser.CompressedBytes
         watched.LastUncompressedSize = analyser.UncompressedBytes

CompactGUI/ViewModels/WatcherViewModel.vb

@@ -13,6 +13,9 @@ Public Class WatcherViewModel : Inherits ObservableObject
     Public ReadOnly Property ReCompressWatchedCommand As IRelayCommand = New RelayCommand(Of Watcher.WatchedFolder)(Sub(f) AddWatchedFolderToQueue(f))
 
     Public Property RefreshWatchedCommand As AsyncRelayCommand = New AsyncRelayCommand(AddressOf RefreshWatchedAsync)
+
+    Public ReadOnly Property ReAnalyseWatchedCommand As IRelayCommand = New AsyncRelayCommand(Of Watcher.WatchedFolder)(Function(f) ReAnalyseWatchedAsync(f))
+
     Public Property ManuallyAddFolderToWatcherCommand As AsyncRelayCommand = New AsyncRelayCommand(AddressOf ManuallyAddFolderToWatcher)
 
 
@@ -30,6 +33,11 @@ Public Class WatcherViewModel : Inherits ObservableObject
     End Function
 
 
+    Private Async Function ReAnalyseWatchedAsync(watchedfolder As Watcher.WatchedFolder) As Task
+        Await Task.Run(Function() Watcher.ParseSingleWatcher(watchedfolder))
+    End Function
+
+
     Private Sub DeleteWatchersWithNonExistentFolders()
 
         Dim watchersToRemove As New List(Of Watcher.WatchedFolder)

CompactGUI/Views/Components/FolderWatcherCard.xaml

@@ -157,7 +157,7 @@
                                     <ui:ProgressRing Width="15" Height="15"
                                                      Margin="0,0,6,0" Padding="7"
                                                      Foreground="#FFBFC7CE" IsIndeterminate="True"
-                                                     Visibility="{Binding IsWorking, Converter={StaticResource BoolToVisConverter}}" />
+                                                     Visibility="{Binding IsWorking, Converter={StaticResource BoolToVisConverter}, Mode=OneWay}" />
                                     <Viewbox Grid.Column="1"
                                              Width="12" Height="12"
                                              Margin="0,0,5,0" HorizontalAlignment="Left"
@@ -172,17 +172,18 @@
                                                Visibility="{Binding IsSteamGame, Converter={StaticResource BooleanToInverseVisibilityConverter}}" />
                                     <Grid>
                                         <TextBlock Text="{Binding DisplayName, Converter={StaticResource StrippedFolderPathConverter}}"
-                                                   MaxWidth="280" MinWidth="100"
+                                                   MinWidth="100" MaxWidth="280"
                                                    Margin="0,-2,0,0" VerticalAlignment="Top"
                                                    FontSize="15" FontWeight="SemiBold" Foreground="White"
                                                    MouseLeftButtonDown="DisplayNameTextBlock_MouseLeftButtonDown"
                                                    TextTrimming="CharacterEllipsis"
                                                    Visibility="{Binding IsEditing, Converter={StaticResource BooleanToInverseVisibilityConverter}}" />
 
                                         <TextBox Text="{Binding DisplayName, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
-                                                 MaxWidth="280" MinWidth="100"
-                                                 Margin="-3,-3,0,0" VerticalAlignment="Top" Padding="0" 
-                                                 FontSize="15" FontWeight="SemiBold" Foreground="{StaticResource TextControlForeground}"
+                                                 MinWidth="100" MaxWidth="280"
+                                                 Margin="-3,-3,0,0" Padding="0" VerticalAlignment="Top"
+                                                 FontSize="15" FontWeight="SemiBold"
+                                                 Foreground="{StaticResource TextControlForeground}"
                                                  KeyDown="DisplayNameTextBox_KeyDown" LostFocus="DisplayNameTextBox_LostFocus"
                                                  Visibility="{Binding IsEditing, Converter={StaticResource BoolToVisConverter}}" />
                                     </Grid>
@@ -251,14 +252,14 @@
                                         Foreground="White">
                                     <ui:SymbolIcon FontSize="14" Symbol="Delete16" />
                                     <Button.ToolTip>
-                                        <ToolTip Background="#304257" ToolTipService.InitialShowDelay="100">
+                                        <ToolTip ToolTipService.InitialShowDelay="100">
                                             <TextBlock Text="Remove from Watchlist"
                                                        FontSize="12" Foreground="#FFBFC7CE" TextWrapping="NoWrap" />
                                         </ToolTip>
                                     </Button.ToolTip>
                                 </Button>
 
-                                <Button Margin="0,0,35,0" HorizontalAlignment="Right"
+                                <Button Margin="0,0,40,0" HorizontalAlignment="Right"
                                         Background="#6B8399"
                                         Command="{Binding ElementName=UiWatcherListView, Path=DataContext.ReCompressWatchedCommand}"
                                         CommandParameter="{Binding}"
@@ -274,12 +275,27 @@
                                         </ui:SymbolIcon.RenderTransform>
                                     </ui:SymbolIcon>
                                     <Button.ToolTip>
-                                        <ToolTip Background="#304257" ToolTipService.InitialShowDelay="100">
+                                        <ToolTip  ToolTipService.InitialShowDelay="100">
                                             <TextBlock Text="Add to compression queue"
                                                        FontSize="12" Foreground="#FFBFC7CE" TextWrapping="NoWrap" />
                                         </ToolTip>
                                     </Button.ToolTip>
                                 </Button>
+
+                                <Button Margin="0,0,80,0" HorizontalAlignment="Right" Visibility="{Binding IsWorking, Converter={StaticResource BooleanToInverseVisibilityConverter}}"
+                                        Command="{Binding ElementName=UiWatcherListView, Path=DataContext.ReAnalyseWatchedCommand}"
+                                        CommandParameter="{Binding}"
+                                        Foreground="White">
+                                    <ui:FontIcon FontFamily="Segoe Fluent Icons, Segoe MDL2 Assets" FontSize="14"
+                                                 Glyph="&#xE9F3;" />
+                                    <Button.ToolTip>
+                                        <ToolTip ToolTipService.InitialShowDelay="100">
+                                            <TextBlock Text="Re-analyse this folder"
+                                                       FontSize="12" Foreground="#FFBFC7CE" TextWrapping="NoWrap" />
+                                        </ToolTip>
+                                    </Button.ToolTip>
+                                </Button>
+
                             </Grid>