From 8e644e4c1bc610452092deacded2846329df9622 Mon Sep 17 00:00:00 2001
From: JT <mohnjiles@gmail.com>
Date: Sat, 22 Jul 2023 00:42:15 -0700
Subject: [PATCH] keepFolderLinksOnShutdown -> RemoveFolderLinksOnShutdown &
 also fix app version

---
 StabilityMatrix.Avalonia/App.axaml.cs         |  4 ++--
 .../ViewModels/SettingsViewModel.cs           | 22 +++++++++++++++----
 .../Views/SettingsPage.axaml                  |  8 +++----
 .../Models/Settings/Settings.cs               |  2 +-
 StabilityMatrix/App.xaml.cs                   |  4 ++--
 .../ViewModels/SettingsViewModel.cs           |  6 ++---
 6 files changed, 30 insertions(+), 16 deletions(-)

diff --git a/StabilityMatrix.Avalonia/App.axaml.cs b/StabilityMatrix.Avalonia/App.axaml.cs
index b9dc0b20..9bb76323 100644
--- a/StabilityMatrix.Avalonia/App.axaml.cs
+++ b/StabilityMatrix.Avalonia/App.axaml.cs
@@ -358,11 +358,11 @@ public sealed class App : Application
         // Services.GetRequiredService<LaunchViewModel>().OnShutdown();
         var settingsManager = Services.GetRequiredService<ISettingsManager>();
 
-        // Unless KeepFolderLinksOnShutdown is set, delete all package junctions
+        // If RemoveFolderLinksOnShutdown is set, delete all package junctions
         if (settingsManager is
             {
                 IsLibraryDirSet: true,
-                Settings.KeepFolderLinksOnShutdown: false
+                Settings.RemoveFolderLinksOnShutdown: true
             })
         {
             var sharedFolders = Services.GetRequiredService<ISharedFolders>();
diff --git a/StabilityMatrix.Avalonia/ViewModels/SettingsViewModel.cs b/StabilityMatrix.Avalonia/ViewModels/SettingsViewModel.cs
index f48f79ba..2ce4573c 100644
--- a/StabilityMatrix.Avalonia/ViewModels/SettingsViewModel.cs
+++ b/StabilityMatrix.Avalonia/ViewModels/SettingsViewModel.cs
@@ -34,10 +34,18 @@ public partial class SettingsViewModel : PageViewModelBase
     
     public override string Title => "Settings";
     public override IconSource IconSource => new SymbolIconSource {Symbol = Symbol.Settings, IsFilled = true};
+    public string AppVersion => GetAppVersion();
     
     // Theme panel
     [ObservableProperty] private string? selectedTheme;
     
+    // Debug info
+    [ObservableProperty] private string? debugPaths;
+    [ObservableProperty] private string? debugCompatInfo;
+    [ObservableProperty] private string? debugGpuInfo;
+
+    [ObservableProperty] private bool removeSymlinksOnShutdown;
+    
     public ObservableCollection<string> AvailableThemes { get; } = new()
     {
         "Light",
@@ -57,6 +65,7 @@ public partial class SettingsViewModel : PageViewModelBase
         this.pyRunner = pyRunner;
 
         SelectedTheme = AvailableThemes[1];
+        RemoveSymlinksOnShutdown = settingsManager.Settings.RemoveFolderLinksOnShutdown;
     }
     
     partial void OnSelectedThemeChanged(string? value)
@@ -72,10 +81,6 @@ public partial class SettingsViewModel : PageViewModelBase
         };
     }
     
-    // Debug info
-    [ObservableProperty] private string? debugPaths;
-    [ObservableProperty] private string? debugCompatInfo;
-    [ObservableProperty] private string? debugGpuInfo;
 
     public void LoadDebugInfo()
     {
@@ -183,4 +188,13 @@ public partial class SettingsViewModel : PageViewModelBase
         dialog.PrimaryButtonText = "Ok";
         await dialog.ShowAsync();
     }
+    
+    private static string GetAppVersion()
+    {
+        var assembly = Assembly.GetExecutingAssembly();
+        var version = assembly.GetName().Version;
+        return version == null
+            ? "(Unknown)"
+            : $"Version {version.Major}.{version.Minor}.{version.Build}";
+    }
 }
diff --git a/StabilityMatrix.Avalonia/Views/SettingsPage.axaml b/StabilityMatrix.Avalonia/Views/SettingsPage.axaml
index 7294842e..92ee9df0 100644
--- a/StabilityMatrix.Avalonia/Views/SettingsPage.axaml
+++ b/StabilityMatrix.Avalonia/Views/SettingsPage.axaml
@@ -39,8 +39,8 @@
                         <StackPanel Grid.Row="1">
                             <ui:SettingsExpander
                                 IconSource="Folder"
-                                Header="Keep shared checkpoints directory symbolic links on shutdown"
-                                Description="Normally removed on shutdown to allow the data folder to be moved without potential file explorer issues."
+                                Header="Remove shared checkpoints directory symbolic links on shutdown"
+                                Description="Select this option if you're having problems moving Stability Matrix to another drive."
                                 Margin="8">
                                 <ui:SettingsExpander.Footer>
                                     <CheckBox Margin="8" />
@@ -165,9 +165,9 @@
                                 <Button
                                     Background="Transparent"
                                     BorderThickness="0"
-                                    Content="Version 0.0.0"
+                                    Content="{Binding AppVersion}"
                                     Margin="8,0,8,8"
-                                    Padding="2,0,2,0" />
+                                    Padding="2,0,2,0"/>
                             </Grid>
                             
                             <StackPanel HorizontalAlignment="Left" Orientation="Horizontal">
diff --git a/StabilityMatrix.Core/Models/Settings/Settings.cs b/StabilityMatrix.Core/Models/Settings/Settings.cs
index a5dc7fd1..fe281d92 100644
--- a/StabilityMatrix.Core/Models/Settings/Settings.cs
+++ b/StabilityMatrix.Core/Models/Settings/Settings.cs
@@ -26,7 +26,7 @@ public class Settings
 
     public ModelSearchOptions? ModelSearchOptions { get; set; }
     
-    public bool KeepFolderLinksOnShutdown { get; set; }
+    public bool RemoveFolderLinksOnShutdown { get; set; }
 
     public HashSet<string>? InstalledModelHashes { get; set; } = new();
 
diff --git a/StabilityMatrix/App.xaml.cs b/StabilityMatrix/App.xaml.cs
index e10cffc0..d0da0cf5 100644
--- a/StabilityMatrix/App.xaml.cs
+++ b/StabilityMatrix/App.xaml.cs
@@ -377,8 +377,8 @@ namespace StabilityMatrix
             // Skip remaining steps if no library is set
             if (!(settingsManager?.TryFindLibrary() ?? false)) return;
             
-            // Unless KeepFolderLinksOnShutdown is set, delete all package junctions
-            if (!settingsManager.Settings.KeepFolderLinksOnShutdown)
+            // If RemoveFolderLinksOnShutdown is set, delete all package junctions
+            if (settingsManager.Settings.RemoveFolderLinksOnShutdown)
             {
                 var sharedFolders = serviceProvider?.GetRequiredService<ISharedFolders>();
                 sharedFolders?.RemoveLinksForAllPackages();
diff --git a/StabilityMatrix/ViewModels/SettingsViewModel.cs b/StabilityMatrix/ViewModels/SettingsViewModel.cs
index 8540569e..86c9b045 100644
--- a/StabilityMatrix/ViewModels/SettingsViewModel.cs
+++ b/StabilityMatrix/ViewModels/SettingsViewModel.cs
@@ -91,9 +91,9 @@ public partial class SettingsViewModel : ObservableObject
     
     partial void OnKeepFolderLinksOnShutdownChanged(bool value)
     {
-        if (value != settingsManager.Settings.KeepFolderLinksOnShutdown)
+        if (value != settingsManager.Settings.RemoveFolderLinksOnShutdown)
         {
-            settingsManager.Transaction(s => s.KeepFolderLinksOnShutdown = value);
+            settingsManager.Transaction(s => s.RemoveFolderLinksOnShutdown = value);
         }
     }
 
@@ -127,7 +127,7 @@ public partial class SettingsViewModel : ObservableObject
         this.liteDbContext = liteDbContext;
         this.prerequisiteHelper = prerequisiteHelper;
         SelectedTheme = settingsManager.Settings.Theme ?? "Dark";
-        KeepFolderLinksOnShutdown = settingsManager.Settings.KeepFolderLinksOnShutdown;
+        KeepFolderLinksOnShutdown = settingsManager.Settings.RemoveFolderLinksOnShutdown;
     }
 
     [ObservableProperty]