Persist last selected compression settings. Closes #536

Author: Iridium-IO

CompactGUI/ViewModels/HomeViewModel.vb

@@ -105,6 +105,12 @@ Partial Public Class HomeViewModel : Inherits ObservableObject : Implements IRec
         For Each folderName In validFolders
 
             Dim newFolder As CompressableFolder = CompressableFolderFactory.CreateCompressableFolder(folderName)
+
+            newFolder.CompressionOptions.WatchFolderForChanges = SettingsHandler.AppSettings.WatchFolderForChanges
+            newFolder.CompressionOptions.SelectedCompressionMode = SettingsHandler.AppSettings.SelectedCompressionMode
+            newFolder.CompressionOptions.SkipPoorlyCompressedFileTypes = SettingsHandler.AppSettings.SkipNonCompressable
+            newFolder.CompressionOptions.SkipUserSubmittedFiletypes = SettingsHandler.AppSettings.SkipUserNonCompressable
+
             If Not Folders.Any(Function(f) f.FolderName = newFolder.FolderName) Then
                 Folders.Add(newFolder)
                 SelectedFolder = newFolder
@@ -123,7 +129,10 @@ Partial Public Class HomeViewModel : Inherits ObservableObject : Implements IRec
             If _watcher.WatchedFolders.Any(Function(w) w.Folder = newFolder.FolderName) Then
                 Dim watchedFolder = _watcher.WatchedFolders.First(Function(w) w.Folder = newFolder.FolderName)
                 newFolder.CompressionOptions.WatchFolderForChanges = True
-                newFolder.CompressionOptions.SelectedCompressionMode = Core.WOFHelper.CompressionModeFromWOFMode(watchedFolder.CompressionLevel)
+                If watchedFolder.CompressionLevel <> Core.WOFCompressionAlgorithm.NO_COMPRESSION Then
+                    newFolder.CompressionOptions.SelectedCompressionMode = Core.WOFHelper.CompressionModeFromWOFMode(watchedFolder.CompressionLevel)
+                End If
+
             End If
 
 

CompactGUI/Views/Pages/PendingCompression.xaml

@@ -28,28 +28,28 @@
                    Orientation="Horizontal">
 
             <local:CompressionMode_Radio Width="185" Height="85"
-                                         Margin="0,0,20,10"
+                                         Margin="0,0,20,10" Checked="CompressionMode_Radio_Checked"
                                          BorderBrush="Transparent" CompressionMode="XPRESS 4K" EstimatedVisibility="Visible"
                                          IsChecked="{Binding Folder.CompressionOptions.SelectedCompressionMode, Converter={StaticResource EnumToRadioButtonConverter}, ConverterParameter={x:Static core:CompressionMode.XPRESS4K}, Mode=TwoWay}"
                                          IsEstimating="{Binding Folder.IsGettingEstimate}"
                                          ProgressValue="{Binding Folder.WikiCompressionResults.XPress4K.CompressionPercent}"
                                          Savings="{Binding Folder.WikiCompressionResults.XPress4K.CompressionSavings}" />
             <local:CompressionMode_Radio Width="185" Height="85"
-                                         Margin="0,0,20,10"
+                                         Margin="0,0,20,10" Checked="CompressionMode_Radio_Checked"
                                          BorderBrush="Transparent" CompressionMode="XPRESS 8K" EstimatedVisibility="Visible"
                                          IsChecked="{Binding Folder.CompressionOptions.SelectedCompressionMode, Converter={StaticResource EnumToRadioButtonConverter}, ConverterParameter={x:Static core:CompressionMode.XPRESS8K}, Mode=TwoWay}"
                                          IsEstimating="{Binding Folder.IsGettingEstimate}"
                                          ProgressValue="{Binding Folder.WikiCompressionResults.XPress8K.CompressionPercent}"
                                          Savings="{Binding Folder.WikiCompressionResults.XPress8K.CompressionSavings}" />
             <local:CompressionMode_Radio Width="185" Height="85"
-                                         Margin="0,0,20,10"
+                                         Margin="0,0,20,10" Checked="CompressionMode_Radio_Checked"
                                          BorderBrush="Transparent" CompressionMode="XPRESS 16K" EstimatedVisibility="Visible"
                                          IsChecked="{Binding Folder.CompressionOptions.SelectedCompressionMode, Converter={StaticResource EnumToRadioButtonConverter}, ConverterParameter={x:Static core:CompressionMode.XPRESS16K}, Mode=TwoWay}"
                                          IsEstimating="{Binding Folder.IsGettingEstimate}"
                                          ProgressValue="{Binding Folder.WikiCompressionResults.XPress16K.CompressionPercent}"
                                          Savings="{Binding Folder.WikiCompressionResults.XPress16K.CompressionSavings}" />
             <local:CompressionMode_Radio Width="185" Height="85"
-                                         Margin="0,0,20,10"
+                                         Margin="0,0,20,10" Checked="CompressionMode_Radio_Checked"
                                          BorderBrush="Transparent" CompressionMode="LZX" EstimatedVisibility="Visible"
                                          IsChecked="{Binding Folder.CompressionOptions.SelectedCompressionMode, Converter={StaticResource EnumToRadioButtonConverter}, ConverterParameter={x:Static core:CompressionMode.LZX}, Mode=TwoWay}"
                                          IsEstimating="{Binding Folder.IsGettingEstimate}"
@@ -75,7 +75,7 @@
                           Margin="0,0,0,20" VerticalAlignment="Center"
                           FontSize="18" />
             <WrapPanel Margin="0,0,0,15" Orientation="Horizontal">
-                <CheckBox x:Name="UiChkSkipPoorlyCompressed"
+                <CheckBox x:Name="UiChkSkipPoorlyCompressed" Checked="UiChkSkipPoorlyCompressed_Checked" Unchecked="UiChkSkipPoorlyCompressed_Unchecked"
                           Content="Skip file types specified in settings"
                           Width="330"
                           FontSize="16"
@@ -95,7 +95,7 @@
                 </TextBlock>
             </WrapPanel>
             <WrapPanel Margin="0,0,0,15" Orientation="Horizontal">
-                <CheckBox x:Name="UiChkSkipUserPoorlyCompressed"
+                <CheckBox x:Name="UiChkSkipUserPoorlyCompressed" Checked="UiChkSkipUserPoorlyCompressed_Checked" Unchecked="UiChkSkipUserPoorlyCompressed_Unchecked"
                           Width="330"
                           FontSize="16"
                           IsChecked="{Binding Folder.CompressionOptions.SkipUserSubmittedFiletypes, Mode=TwoWay}">
@@ -134,7 +134,7 @@
             </WrapPanel>
 
 
-            <CheckBox Content="Watch folder for changes"
+            <CheckBox x:Name="uiChkWatchFolderForChanges" Content="Watch folder for changes" Checked="uiChkWatchFolderForChanges_Checked" Unchecked="uiChkWatchFolderForChanges_Unchecked"
                       Margin="0,0,0,15"
                       FontSize="16"
                       IsChecked="{Binding Folder.CompressionOptions.WatchFolderForChanges, Mode=TwoWay}" />

CompactGUI/Views/Pages/PendingCompression.xaml.vb

@@ -1,3 +1,45 @@
 Public Class PendingCompression
+    Private Sub CompressionMode_Radio_Checked(sender As Object, e As RoutedEventArgs)
+        Dim radio As RadioButton = CType(sender, RadioButton)
 
+        Dim ret As FolderViewModel = CType(radio.DataContext, FolderViewModel)
+
+        SettingsHandler.AppSettings.SelectedCompressionMode = ret.Folder.CompressionOptions.SelectedCompressionMode
+        SettingsHandler.WriteToFile()
+
+    End Sub
+
+    Private Sub UiChkSkipPoorlyCompressed_Checked(sender As Object, e As RoutedEventArgs)
+        SettingsHandler.AppSettings.SkipNonCompressable = True
+        SettingsHandler.WriteToFile()
+
+    End Sub
+
+    Private Sub UiChkSkipPoorlyCompressed_Unchecked(sender As Object, e As RoutedEventArgs)
+        If Not IsVisible Then Return ' Prevents issues when the page is not fully loaded
+        SettingsHandler.AppSettings.SkipNonCompressable = False
+        SettingsHandler.WriteToFile()
+    End Sub
+
+    Private Sub UiChkSkipUserPoorlyCompressed_Checked(sender As Object, e As RoutedEventArgs)
+        SettingsHandler.AppSettings.SkipUserNonCompressable = True
+        SettingsHandler.WriteToFile()
+    End Sub
+
+    Private Sub UiChkSkipUserPoorlyCompressed_Unchecked(sender As Object, e As RoutedEventArgs)
+        If Not IsVisible Then Return
+        SettingsHandler.AppSettings.SkipUserNonCompressable = False
+        SettingsHandler.WriteToFile()
+    End Sub
+
+    Private Sub uiChkWatchFolderForChanges_Checked(sender As Object, e As RoutedEventArgs)
+        SettingsHandler.AppSettings.WatchFolderForChanges = True
+        SettingsHandler.WriteToFile()
+    End Sub
+
+    Private Sub uiChkWatchFolderForChanges_Unchecked(sender As Object, e As RoutedEventArgs)
+        If Not IsVisible Then Return
+        SettingsHandler.AppSettings.WatchFolderForChanges = False
+        SettingsHandler.WriteToFile()
+    End Sub
 End Class