KenSchae
/
StabilityMatrix
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Fix IPAdapters link recursion & actually clean up configs/symlinks when switching to the other

pull/341/head
JT 11 months ago
parent
f8b3021a8c
commit
d0be16beb0
3 changed files with 46 additions and 69 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      CHANGELOG.md
  2. 93
      StabilityMatrix.Avalonia/ViewModels/PackageManager/PackageCardViewModel.cs
  3. 20
      StabilityMatrix.Core/Models/Packages/ComfyUI.cs

2
CHANGELOG.md
Unescape View File

@ -10,6 +10,8 @@ and this project adheres to [Semantic Versioning 2.0](https://semver.org/spec/v2
- Improved low disk space handling
### Fixed
- Fixed denoise strength in Inference Text to Image
- Fixed PathTooLongException for IPAdapter folders when using ComfyUI in Symlink mode
- Fixed configs and symlinks not being cleaned up when switched to the opposite mode
## v2.7.3
### Added

93
StabilityMatrix.Avalonia/ViewModels/PackageManager/PackageCardViewModel.cs
Unescape View File

@ -97,10 +97,7 @@ public partial class PackageCardViewModel : ProgressViewModel
if (string.IsNullOrWhiteSpace(value?.PackageName))
return;
if (
value.PackageName == UnknownPackage.Key
|| packageFactory.FindPackageByName(value.PackageName) is null
)
if (value.PackageName == UnknownPackage.Key || packageFactory.FindPackageByName(value.PackageName) is null)
{
IsUnknownPackage = true;
CardImageSource = "";
@ -114,11 +111,9 @@ public partial class PackageCardViewModel : ProgressViewModel
CardImageSource = basePackage?.PreviewImageUri.ToString() ?? Assets.NoImage.ToString();
InstalledVersion = value.Version?.DisplayVersion ?? "Unknown";
CanUseConfigMethod =
basePackage?.AvailableSharedFolderMethods.Contains(SharedFolderMethod.Configuration)
?? false;
basePackage?.AvailableSharedFolderMethods.Contains(SharedFolderMethod.Configuration) ?? false;
CanUseSymlinkMethod =
basePackage?.AvailableSharedFolderMethods.Contains(SharedFolderMethod.Symlink)
?? false;
basePackage?.AvailableSharedFolderMethods.Contains(SharedFolderMethod.Symlink) ?? false;
UseSharedOutput = Package?.UseSharedOutputFolder ?? false;
CanUseSharedOutput = basePackage?.SharedOutputFolders != null;
}
@ -126,22 +121,13 @@ public partial class PackageCardViewModel : ProgressViewModel
public override async Task OnLoadedAsync()
{
if (
Design.IsDesignMode
|| !settingsManager.IsLibraryDirSet
|| Package is not { } currentPackage
)
if (Design.IsDesignMode || !settingsManager.IsLibraryDirSet || Package is not { } currentPackage)
return;
if (
packageFactory.FindPackageByName(currentPackage.PackageName)
is { } basePackage
and not UnknownPackage
)
if (packageFactory.FindPackageByName(currentPackage.PackageName) is { } basePackage and not UnknownPackage)
{
// Migrate old packages with null preferred shared folder method
currentPackage.PreferredSharedFolderMethod ??=
basePackage.RecommendedSharedFolderMethod;
currentPackage.PreferredSharedFolderMethod ??= basePackage.RecommendedSharedFolderMethod;
switch (currentPackage.PreferredSharedFolderMethod)
{
@ -199,18 +185,11 @@ public partial class PackageCardViewModel : ProgressViewModel
var packagePath = new DirectoryPath(settingsManager.LibraryDir, Package.LibraryPath);
var deleteTask = packagePath.DeleteVerboseAsync(logger);
var taskResult = await notificationService.TryAsync(
deleteTask,
Resources.Text_SomeFilesCouldNotBeDeleted
);
var taskResult = await notificationService.TryAsync(deleteTask, Resources.Text_SomeFilesCouldNotBeDeleted);
if (taskResult.IsSuccessful)
{
notificationService.Show(
new Notification(
Resources.Label_PackageUninstalled,
Package.DisplayName,
NotificationType.Success
)
new Notification(Resources.Label_PackageUninstalled, Package.DisplayName, NotificationType.Success)
);
if (!IsUnknownPackage)
@ -238,10 +217,7 @@ public partial class PackageCardViewModel : ProgressViewModel
var basePackage = packageFactory[Package.PackageName!];
if (basePackage == null)
{
logger.LogWarning(
"Could not find package {SelectedPackagePackageName}",
Package.PackageName
);
logger.LogWarning("Could not find package {SelectedPackagePackageName}", Package.PackageName);
notificationService.Show(
Resources.Label_InvalidPackageType,
Package.PackageName.ToRepr(),
@ -278,12 +254,7 @@ public partial class PackageCardViewModel : ProgressViewModel
versionOptions.CommitHash = latest.Sha;
}
var updatePackageStep = new UpdatePackageStep(
settingsManager,
Package,
versionOptions,
basePackage
);
var updatePackageStep = new UpdatePackageStep(settingsManager, Package, versionOptions, basePackage);
var steps = new List<IPackageStep> { updatePackageStep };
EventManager.Instance.OnPackageInstallProgressAdded(runner);
@ -321,9 +292,7 @@ public partial class PackageCardViewModel : ProgressViewModel
var viewModel = vmFactory.Get<PackageImportViewModel>(vm =>
{
vm.PackagePath = new DirectoryPath(
Package?.FullPath ?? throw new InvalidOperationException()
);
vm.PackagePath = new DirectoryPath(Package?.FullPath ?? throw new InvalidOperationException());
});
var dialog = new TaskDialog
@ -349,9 +318,7 @@ public partial class PackageCardViewModel : ProgressViewModel
await using (new MinimumDelay(200, 300))
{
var result = await notificationService.TryAsync(
viewModel.AddPackageWithCurrentInputs()
);
var result = await notificationService.TryAsync(viewModel.AddPackageWithCurrentInputs());
if (result.IsSuccessful)
{
EventManager.Instance.OnInstalledPackagesChanged();
@ -398,10 +365,7 @@ public partial class PackageCardViewModel : ProgressViewModel
var basePackage = packageFactory[Package.PackageName!];
if (basePackage == null)
{
logger.LogWarning(
"Could not find package {SelectedPackagePackageName}",
Package.PackageName
);
logger.LogWarning("Could not find package {SelectedPackagePackageName}", Package.PackageName);
return;
}
@ -417,9 +381,7 @@ public partial class PackageCardViewModel : ProgressViewModel
if (basePackage == null)
return false;
var canCheckUpdate =
Package.LastUpdateCheck == null
|| Package.LastUpdateCheck < DateTime.Now.AddMinutes(-15);
var canCheckUpdate = Package.LastUpdateCheck == null || Package.LastUpdateCheck < DateTime.Now.AddMinutes(-15);
if (!canCheckUpdate)
{
@ -482,13 +444,6 @@ public partial class PackageCardViewModel : ProgressViewModel
if (newValue != Package!.PreferredSharedFolderMethod is SharedFolderMethod.Symlink)
{
if (!newValue)
{
var basePackage = packageFactory[Package!.PackageName!];
basePackage!.RemoveModelFolderLinks(Package.FullPath!, SharedFolderMethod.Symlink);
return;
}
using var st = settingsManager.BeginTransaction();
Package.PreferredSharedFolderMethod = SharedFolderMethod.Symlink;
}
@ -498,6 +453,11 @@ public partial class PackageCardViewModel : ProgressViewModel
IsSharedModelConfig = false;
IsSharedModelDisabled = false;
}
else
{
var basePackage = packageFactory[Package!.PackageName!];
basePackage!.RemoveModelFolderLinks(Package.FullPath!, SharedFolderMethod.Symlink);
}
}
partial void OnIsSharedModelConfigChanged(bool oldValue, bool newValue)
@ -507,16 +467,6 @@ public partial class PackageCardViewModel : ProgressViewModel
if (newValue != Package!.PreferredSharedFolderMethod is SharedFolderMethod.Configuration)
{
if (!newValue)
{
var basePackage = packageFactory[Package!.PackageName!];
basePackage!.RemoveModelFolderLinks(
Package.FullPath!,
SharedFolderMethod.Configuration
);
return;
}
using var st = settingsManager.BeginTransaction();
Package.PreferredSharedFolderMethod = SharedFolderMethod.Configuration;
}
@ -526,6 +476,11 @@ public partial class PackageCardViewModel : ProgressViewModel
IsSharedModelSymlink = false;
IsSharedModelDisabled = false;
}
else
{
var basePackage = packageFactory[Package!.PackageName!];
basePackage!.RemoveModelFolderLinks(Package.FullPath!, SharedFolderMethod.Configuration);
}
}
partial void OnIsSharedModelDisabledChanged(bool value)

20
StabilityMatrix.Core/Models/Packages/ComfyUI.cs
Unescape View File

@ -272,6 +272,26 @@ public class ComfyUI(
await controlnetOldLink.DeleteAsync(false).ConfigureAwait(false);
}
// and also ipadapter links
if (installDirectory.JoinDir("models/ipadapter") is { IsSymbolicLink: true } oldIpAdapterLink)
{
Logger.Info("Migration: Removing old ipadapter link {Path}", oldIpAdapterLink);
await oldIpAdapterLink.DeleteAsync(false).ConfigureAwait(false);
}
// also fix broken links in models dir
var modelsDir = new DirectoryPath(settingsManager.ModelsDirectory);
string[] links = ["base", "sd15", "sdxl"];
foreach (var link in links)
{
var oldLink = modelsDir.JoinDir($"IpAdapter{Path.DirectorySeparatorChar}{link}");
if (!oldLink.IsSymbolicLink)
continue;
Logger.Info("Fixing broken IPadapter links {Path}", oldLink);
await oldLink.DeleteAsync(false).ConfigureAwait(false);
}
// Resume base setup
await base.SetupModelFolders(installDirectory, SharedFolderMethod.Symlink).ConfigureAwait(false);
}

Write Preview
Loading…
Cancel
Save