Merge pull request LykosAI#983 from ionite34/backport/main/pr-982

[dev to main] backport: fix install location path combining (982)

Author: mohnjiles

CHANGELOG.md

@@ -11,6 +11,7 @@ and this project adheres to [Semantic Versioning 2.0](https://semver.org/spec/v2
 ### Fixed
 - Fixed [#1128](https://github.com/LykosAI/StabilityMatrix/issues/1128) - overwriting models when downloading multiple with the same name
 - Fixed ROCm torch indexes for ComfyUI & Forge
+- Fixed model browser sometimes downloading to `ModelsLora` or `ModelsStableDiffusion` folders instead of the correct folder
 
 ## v2.13.3
 ### Changed

StabilityMatrix.Avalonia/ViewModels/Dialogs/SelectModelVersionViewModel.cs

@@ -317,15 +317,19 @@ private void LoadInstallLocations()
 
         if (!downloadDirectory.ToString().EndsWith("Unknown"))
         {
-            installLocations.Add(downloadDirectory.ToString().Replace(rootModelsDirectory, "Models"));
+            installLocations.Add(
+                Path.Combine("Models", Path.GetRelativePath(rootModelsDirectory, downloadDirectory))
+            );
             foreach (
                 var directory in downloadDirectory.EnumerateDirectories(
                     "*",
                     EnumerationOptionConstants.AllDirectories
                 )
             )
             {
-                installLocations.Add(directory.ToString().Replace(rootModelsDirectory, "Models"));
+                installLocations.Add(
+                    Path.Combine("Models", Path.GetRelativePath(rootModelsDirectory, directory))
+                );
             }
         }
 
@@ -335,7 +339,9 @@ var directory in downloadDirectory.EnumerateDirectories(
             var stableDiffusionDirectory = rootModelsDirectory.JoinDir(
                 SharedFolderType.StableDiffusion.GetStringValue()
             );
-            installLocations.Add(stableDiffusionDirectory.ToString().Replace(rootModelsDirectory, "Models"));
+            installLocations.Add(
+                Path.Combine("Models", Path.GetRelativePath(rootModelsDirectory, stableDiffusionDirectory))
+            );
         }
 
         installLocations.Add("Custom...");

StabilityMatrix.Core/Models/Packages/FluxGym.cs

@@ -89,13 +89,13 @@ public override async Task InstallPackage(
         // check if sd-scripts is already installed - if so: pull, else: clone
         if (Directory.Exists(Path.Combine(installLocation, "sd-scripts")))
         {
-            await prerequisiteHelper
+            await PrerequisiteHelper
                 .RunGit(["pull"], onConsoleOutput, Path.Combine(installLocation, "sd-scripts"))
                 .ConfigureAwait(false);
         }
         else
         {
-            await prerequisiteHelper
+            await PrerequisiteHelper
                 .RunGit(
                     ["clone", "-b", "sd3", "https://github.com/kohya-ss/sd-scripts"],
                     onConsoleOutput,