Merge pull request LykosAI#1105 from ionite34/catch-symlink-removal-errors

Catch symlink removal errors during update so it doesn't completely fail the update

(cherry picked from commit 0dea261)

# Conflicts:
#	CHANGELOG.md

Author: mohnjiles

CHANGELOG.md

@@ -5,6 +5,45 @@ 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.15.0-dev.2
+### Added
+- Added new package - [FramePack](https://github.com/lllyasviel/FramePack)
+- Added new package - [FramePack Studio](https://github.com/colinurbs/FramePack-Studio)
+- Added support for authenticated model downloads in the HuggingFace model browser. Visit Settings → Accounts to add your HuggingFace token.
+- Added support for dragging-and-dropping Civitai-generated images into Inference to load metadata
+- Added the ability to search by pasting an entire Civitai model URL into the search bar in the Civitai model browser (when the Civitai API gets fixed)
+- Added "Clear Pip Cache" and "Clear uv Cache" commands to the Settings -> Embedded Python section
+### Changed
+- Civitai model browser image loading now uses dynamic resizing for better performance and a smoother scrolling experience
+- Detailed notifications for Civitai model browser api errors
+- The main sidebar now remembers whether it was collapsed or expanded between restarts
+- Updated pre-selected download locations for certain model types in the Civitai model browser
+- Updated uv to 0.7.19
+- Changed InvokeAI update process to no longer clone the repo
+### Fixed
+- Fixed missing .NET 8 dependency for SwarmUI installs in certain cases
+- Fixed [#1291](https://github.com/LykosAI/StabilityMatrix/issues/1291) - Certain GPUs not being detected on Linux
+- Fixed [#1284](https://github.com/LykosAI/StabilityMatrix/issues/1284) - Output browser not ignoring InvokeAI thumbnails folders
+- Fixed [#1305](https://github.com/LykosAI/StabilityMatrix/issues/1305) - FluxGym installing incorrect packages for Blackwell GPUs
+- Fixed [#1316](https://github.com/LykosAI/StabilityMatrix/issues/1316) - Errors when installing Triton & SageAttention
+- Fixed "directory is not empty" error when updating packages with symlinks
+
+## v2.15.0-dev.1
+### Added
+- Added Python Version selector for all new package installs
+- Added the ability to rename packages
+### Changed
+- Updated all Python version management, virtual environment creation, and pip installs to use `uv` for improved reliability, compatibility, and speed
+- The Civitai model browser Download Location selector will now remember the last location used based on the model type
+- New installs of ComfyUI, SD.Next, and InvokeAI will now use Python 3.12.10, unless otherwise specified in the Advanced Options during installation
+- New installs of all other packages will now use Python 3.10.17, unless otherwise specified in the Advanced Options during installation
+### Supporters
+#### 🌟 Visionaries
+A massive thank you to our esteemed Visionary-tier Patrons: **Waterclouds**, **bluepopsicle**, **Bob S**, **Ibixat**, and **Corey T**! Your exceptional commitment propels Stability Matrix to new heights and allows us to push the boundaries of innovation. We're incredibly grateful for your foundational support! 🚀
+
+>>>>>>> 0dea2612 (Merge pull request #1105 from ionite34/catch-symlink-removal-errors)
 ## v2.14.3
 ### Added
 - Added the ability to search by pasting an entire Civitai model URL into the search bar in the Civitai model browser (when the Civitai API gets fixed)

StabilityMatrix.Core/Models/Packages/BaseGitPackage.cs

@@ -446,18 +446,40 @@ await PrerequisiteHelper
         {
             if (SharedFolders is not null)
             {
-                Helper.SharedFolders.RemoveLinksForPackage(
-                    SharedFolders,
-                    new DirectoryPath(installedPackage.FullPath!)
-                );
+                try
+                {
+                    Helper.SharedFolders.RemoveLinksForPackage(
+                        SharedFolders,
+                        new DirectoryPath(installedPackage.FullPath!)
+                    );
+                }
+                catch (Exception e)
+                {
+                    Logger.Warn(
+                        e,
+                        "Failed to remove symlinks for package {Package}",
+                        installedPackage.PackageName
+                    );
+                }
             }
 
             if (SharedOutputFolders is not null && installedPackage.UseSharedOutputFolder)
             {
-                Helper.SharedFolders.RemoveLinksForPackage(
-                    SharedOutputFolders,
-                    new DirectoryPath(installedPackage.FullPath!)
-                );
+                try
+                {
+                    Helper.SharedFolders.RemoveLinksForPackage(
+                        SharedOutputFolders,
+                        new DirectoryPath(installedPackage.FullPath!)
+                    );
+                }
+                catch (Exception e)
+                {
+                    Logger.Warn(
+                        e,
+                        "Failed to remove output symlinks for package {Package}",
+                        installedPackage.PackageName
+                    );
+                }
             }
         }