From abb6f92c572c19428020abd678bda7827a0d1d27 Mon Sep 17 00:00:00 2001
From: Ionite <dev@ionite.io>
Date: Wed, 28 Jun 2023 03:12:24 -0400
Subject: [PATCH] Migration dialog fixes

---
 .../DataDirectoryMigrationDialog.xaml         | 18 ++++---
 StabilityMatrix/Models/InstalledPackage.cs    | 18 +++++++
 .../SelectInstallLocationsDialog.xaml         |  2 +-
 .../DataDirectoryMigrationViewModel.cs        |  2 +-
 .../ViewModels/MainWindowViewModel.cs         | 50 +++++++++----------
 5 files changed, 55 insertions(+), 35 deletions(-)

diff --git a/StabilityMatrix/DataDirectoryMigrationDialog.xaml b/StabilityMatrix/DataDirectoryMigrationDialog.xaml
index 566cbd7d..2478439f 100644
--- a/StabilityMatrix/DataDirectoryMigrationDialog.xaml
+++ b/StabilityMatrix/DataDirectoryMigrationDialog.xaml
@@ -1,7 +1,5 @@
 <ui:ContentDialog
     CloseButtonText="Close"
-    DialogHeight="720"
-    DialogWidth="840"
     Loaded="DataDirectoryMigrationDialog_OnLoaded"
     Title="Select Data Directory"
     d:DataContext="{d:DesignInstance Type=viewModels:DataDirectoryMigrationViewModel,
@@ -24,14 +22,18 @@
 
     <ui:ContentDialog.Resources>
         <!--  ReSharper disable once Xaml.StaticResourceNotResolved  -->
-        <Style BasedOn="{StaticResource {x:Type ui:ContentDialog}}" TargetType="{x:Type local:SelectInstallLocationsDialog}" />
-        <converters:StringNullOrEmptyToVisibilityConverter x:Key="StringNullOrEmptyToVisibilityConverter" />
+        <Style BasedOn="{StaticResource {x:Type ui:ContentDialog}}" TargetType="{x:Type local:DataDirectoryMigrationDialog}" />
         <BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
+        <converters:ValueConverterGroup x:Key="InvertIsStringNullOrWhitespaceConverter">
+            <converters:IsStringNullOrWhitespaceConverter />
+            <converters:BoolNegationConverter />
+        </converters:ValueConverterGroup>
     </ui:ContentDialog.Resources>
 
     <Grid
         Margin="16"
-        MaxHeight="900"
+        MaxWidth="700"
+        MinHeight="300"
         VerticalAlignment="Stretch">
         <Grid.RowDefinitions>
             <RowDefinition Height="*" />
@@ -39,7 +41,7 @@
             <RowDefinition Height="Auto" />
         </Grid.RowDefinitions>
 
-        <StackPanel MaxWidth="700">
+        <StackPanel>
             <TextBlock
                 FontSize="16"
                 Margin="8,8,8,8"
@@ -47,13 +49,13 @@
                 TextWrapping="Wrap" />
             <ui:InfoBar
                 IsClosable="False"
-                IsOpen="{Binding AutoMigrateText, Converter={StaticResource StringNullOrEmptyToVisibilityConverter}}"
+                IsOpen="{Binding AutoMigrateText, Converter={StaticResource InvertIsStringNullOrWhitespaceConverter}}"
                 Margin="8"
                 Severity="Success"
                 Title="{Binding AutoMigrateText, FallbackValue=5 Packages will be automatically migrated to the new format}" />
             <ui:InfoBar
                 IsClosable="False"
-                IsOpen="{Binding NeedsMoveMigrateText, Converter={StaticResource StringNullOrEmptyToVisibilityConverter}}"
+                IsOpen="{Binding NeedsMoveMigrateText, Converter={StaticResource InvertIsStringNullOrWhitespaceConverter}}"
                 Margin="8"
                 Severity="Informational"
                 Title="{Binding NeedsMoveMigrateText, FallbackValue=2 Packages are not relative to the Data Directory and will be moved this may take a few minutes}" />
diff --git a/StabilityMatrix/Models/InstalledPackage.cs b/StabilityMatrix/Models/InstalledPackage.cs
index 47407fb6..d8c52a36 100644
--- a/StabilityMatrix/Models/InstalledPackage.cs
+++ b/StabilityMatrix/Models/InstalledPackage.cs
@@ -89,6 +89,24 @@ public class InstalledPackage
         return false;
     }
 
+    /// <summary>
+    ///  Check if the old Path can be migrated to the new LibraryPath.
+    /// </summary>
+    /// <param name="libraryDirectory"></param>
+    /// <returns></returns>
+    public bool CanPureMigratePath(string? libraryDirectory = null)
+    {
+#pragma warning disable CS0618
+        var oldPath = Path;
+#pragma warning restore CS0618
+        if (oldPath == null) return false;
+        
+        // Check if the path is a sub-path of the library
+        var library = libraryDirectory ?? GlobalConfig.LibraryDir;
+        var relativePath = GetSubPath(library, oldPath);
+        return relativePath != null;
+    }
+
     /// <summary>
     /// Migrate the old Path to the new LibraryPath.
     /// If libraryDirectory is null, GlobalConfig.LibraryDir is used.
diff --git a/StabilityMatrix/SelectInstallLocationsDialog.xaml b/StabilityMatrix/SelectInstallLocationsDialog.xaml
index 42e39ee4..43824504 100644
--- a/StabilityMatrix/SelectInstallLocationsDialog.xaml
+++ b/StabilityMatrix/SelectInstallLocationsDialog.xaml
@@ -29,7 +29,7 @@
         <BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
     </ui:ContentDialog.Resources>
 
-    <Grid Height="600" Margin="16,0,16,16">
+    <Grid Height="500" Margin="16,0,16,16">
         <Grid.RowDefinitions>
             <RowDefinition Height="*" />
             <RowDefinition Height="Auto" />
diff --git a/StabilityMatrix/ViewModels/DataDirectoryMigrationViewModel.cs b/StabilityMatrix/ViewModels/DataDirectoryMigrationViewModel.cs
index 7632730d..365b3563 100644
--- a/StabilityMatrix/ViewModels/DataDirectoryMigrationViewModel.cs
+++ b/StabilityMatrix/ViewModels/DataDirectoryMigrationViewModel.cs
@@ -47,7 +47,7 @@ public partial class DataDirectoryMigrationViewModel : ObservableObject
         // Get all old packages
         var oldPackages = settingsManager.GetOldInstalledPackages().ToArray();
         // Attempt to migrate with pure, and count successful migrations
-        AutoMigrateCount = oldPackages.Count(p => p.TryPureMigratePath());
+        AutoMigrateCount = oldPackages.Count(p => p.CanPureMigratePath());
         // Any remaining packages need to be moved
         NeedsMoveMigrateCount = oldPackages.Length - AutoMigrateCount;
     }
diff --git a/StabilityMatrix/ViewModels/MainWindowViewModel.cs b/StabilityMatrix/ViewModels/MainWindowViewModel.cs
index f8794b1e..c1aaf314 100644
--- a/StabilityMatrix/ViewModels/MainWindowViewModel.cs
+++ b/StabilityMatrix/ViewModels/MainWindowViewModel.cs
@@ -118,35 +118,35 @@ public partial class MainWindowViewModel : ObservableObject
     
     private async Task DoSettingsCheck()
     {
-        var found = settingsManager.TryFindLibrary();
-        if (found) 
-            return;
-            
-        // See if this is an existing user for message variation
-        var appDataPath = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData);
-        var settingsPath = Path.Combine(appDataPath, "StabilityMatrix", "settings.json");
-        var isExistingUser = File.Exists(settingsPath);
-            
-        // need to show dialog to choose library location
+        // Check if library path is set
         if (!settingsManager.TryFindLibrary())
         {
-            var dialog = dialogFactory.CreateInstallLocationsDialog();
-            var result = await dialog.ShowAsync();
-            if (result != ContentDialogResult.Primary)
+            // See if this is an existing user for message variation
+            var appDataPath = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData);
+            var settingsPath = Path.Combine(appDataPath, "StabilityMatrix", "settings.json");
+            var isExistingUser = File.Exists(settingsPath);
+            
+            // need to show dialog to choose library location
+            if (!settingsManager.TryFindLibrary())
             {
-                Application.Current.Shutdown();
-            }
+                var dialog = dialogFactory.CreateInstallLocationsDialog();
+                var result = await dialog.ShowAsync();
+                if (result != ContentDialogResult.Primary)
+                {
+                    Application.Current.Shutdown();
+                }
 
-            // 1. For portable mode, call settings.SetPortableMode()
-            var viewModel = (dialog.DataContext as SelectInstallLocationsViewModel)!;
-            if (viewModel.IsPortableMode)
-            {
-                settingsManager.SetPortableMode();
-            }
-            // 2. For custom path, call settings.SetLibraryPath(path)
-            else
-            {
-                settingsManager.SetLibraryPath(viewModel.DataDirectory);
+                // 1. For portable mode, call settings.SetPortableMode()
+                var viewModel = (dialog.DataContext as SelectInstallLocationsViewModel)!;
+                if (viewModel.IsPortableMode)
+                {
+                    settingsManager.SetPortableMode();
+                }
+                // 2. For custom path, call settings.SetLibraryPath(path)
+                else
+                {
+                    settingsManager.SetLibraryPath(viewModel.DataDirectory);
+                }
             }
         }