Merge pull request LykosAI#982 from ionite34/fix-model-download-locations

fix install location path combining

(cherry picked from commit c4c5a7d)

# Conflicts:
#	CHANGELOG.md

Author: mohnjiles

CHANGELOG.md

@@ -5,12 +5,75 @@ All notable changes to Stability Matrix will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 and this project adheres to [Semantic Versioning 2.0](https://semver.org/spec/v2.0.0.html).
 
+<<<<<<< HEAD
+=======
+## v2.14.0-dev.3
+### Changed
+- Upgraded ComfyUI CUDA torch to 12.6
+### 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.14.0-dev.2
+### Added
+- Added Align Your Steps scheduler to Inference
+- Added wildcards to Inference prompts, e.g. `{blue|green|red}` will randomly select one of the colors
+- Added Safetensor Metadata viewer to the Checkpoint Manager context menu - thanks to @genteure!
+### Changed
+- Updated the Civitai Model Browser base model selector to match the new Checkpoint Manager filter UI 
+- FaceDetailers in Inference will now inherit the primary sampler/scheduler/etc. by default. You can still manually set these by enabling the options via the ⚙️ button on the FaceDetailer card
+- Slightly rearranged the FaceDetailer card layout due to the above change
+- "Remove symbolic links on shutdown" option now also removes links from Output Sharing
+- Inference "Extra Networks" selector now filters extra networks based on the selected base model
+- Updated Japanese, Brazilian Portuguese, Chinese, and Russian translations
+### Fixed
+- Fixed crash when dragging & dropping images in Inference (hopefully)
+- Fixed HiresFix Inference addon not inheriting sampler/scheduler properly
+- Fixed some plus (+) buttons getting cut off in the Inference UI
+- Fixed CFG Rescale addon interfering with refiner model in Inference
+- Fixed [#1083](https://github.com/LykosAI/StabilityMatrix/issues/1083) - "Show Nested Models" incorrectly displaying models from some non-nested folders
+- Fixed issue with InvokeAI model sharing when the host address is set to 0.0.0.0
+- Fixed issue when parsing index URLs in Python Dependencies Override menu
+- Fixed ComfyUI-Zluda not respecting pip user overrides
+- Fixed issue with Checkpoint Manager not displaying any models
+- (dev.2 re-release) Fixed autocomplete not showing in certain cases when using wildcards
+- (dev.2 re-release) Fixed package restart button not working 
+- (dev.2 re-release) Fixed [#1120](https://github.com/LykosAI/StabilityMatrix/issues/1120) - crash when right clicking in the console after restarting a package
+### Supporters
+#### Visionaries
+- A huge thank you to our incredible Visionary-tier Patreon supporters, **Waterclouds**, **TheTekknician**, and our newest Visionary, **Corey**! Your generous support is greatly appreciated!
+
+## v2.14.0-dev.1
+### Added
+- Added Rescale CFG addon to Inference
+- Added Swap Dimensions button between the width/height input in Inference
+- Added Ctrl+Tab/Ctrl+Shift+Tab shortcuts for navigating between Inference tabs
+- Added OpenModelDB tab to the Model Browser
+### Changed
+- Improved the quality of Inference inpainting by upgrading the workflow behind the scenes. The workflow remains the same for you — just better results!
+- Redesigned the Checkpoint Manager Filter flyout to include more options and improve the layout
+- "Clear All" button will now remain at the top of the Downloads list regardless of scroll position - thanks to @Genteure!
+- Improved image metadata parsing - thanks to @Genteure!
+### Fixed
+- Fixed Inference image selector card buttons taking up the whole height of the card
+- Fixed Inference mask editor failing to paint to the right-most edge on large images
+- Fixed Inference mask editor not showing the entire image in certain circumstances
+- Fixed an issue where certain sampler/scheduler combos would not get saved in image metadata - thanks to @yansigit!
+- Fixed [#1078](https://github.com/LykosAI/StabilityMatrix/issues/1078) - "Call from invalid thread" error after one-click install finishes
+- Fixed [#1080](https://github.com/LykosAI/StabilityMatrix/issues/1080) - Some models not displayed in Checkpoint Manager
+### Supporters
+#### Visionaries
+- Many thanks to our incredible Visionary-tier Patreon supporters, **Waterclouds** and **TheTekknician**! Your support helps us continue to improve Stability Matrix!
+
+>>>>>>> c4c5a7de (Merge pull request #982 from ionite34/fix-model-download-locations)
 ## v2.13.4
 ### Changed
 - Upgraded ComfyUI CUDA torch to 12.6
 ### 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,