Merge pull request #695 from ionite34/swarm-fix-to-main

swarm fix to main

Author: mohnjiles

StabilityMatrix.Core/Models/Packages/BaseGitPackage.cs

@@ -29,30 +29,33 @@ public abstract class BaseGitPackage : BasePackage
     protected readonly IPrerequisiteHelper PrerequisiteHelper;
     public PyVenvRunner? VenvRunner;
 
+    public virtual string RepositoryName => Name;
+    public virtual string RepositoryAuthor => Author;
+
     /// <summary>
     /// URL of the hosted web page on launch
     /// </summary>
     protected string WebUrl = string.Empty;
 
-    public override string GithubUrl => $"https://github.com/{Author}/{Name}";
+    public override string GithubUrl => $"https://github.com/{RepositoryAuthor}/{RepositoryName}";
 
     public string DownloadLocation => Path.Combine(SettingsManager.LibraryDir, "Packages", $"{Name}.zip");
 
     protected string GetDownloadUrl(DownloadPackageVersionOptions versionOptions)
     {
         if (!string.IsNullOrWhiteSpace(versionOptions.CommitHash))
         {
-            return $"https://github.com/{Author}/{Name}/archive/{versionOptions.CommitHash}.zip";
+            return $"https://github.com/{RepositoryAuthor}/{RepositoryName}/archive/{versionOptions.CommitHash}.zip";
         }
 
         if (!string.IsNullOrWhiteSpace(versionOptions.VersionTag))
         {
-            return $"https://api.github.com/repos/{Author}/{Name}/zipball/{versionOptions.VersionTag}";
+            return $"https://api.github.com/repos/{RepositoryAuthor}/{RepositoryName}/zipball/{versionOptions.VersionTag}";
         }
 
         if (!string.IsNullOrWhiteSpace(versionOptions.BranchName))
         {
-            return $"https://api.github.com/repos/{Author}/{Name}/zipball/{versionOptions.BranchName}";
+            return $"https://api.github.com/repos/{RepositoryAuthor}/{RepositoryName}/zipball/{versionOptions.BranchName}";
         }
 
         throw new Exception("No download URL available");
@@ -75,7 +78,9 @@ public override async Task<DownloadPackageVersionOptions> GetLatestVersion(bool
     {
         if (ShouldIgnoreReleases)
         {
-            var commits = await GithubApi.GetAllCommits(Author, Name, MainBranch).ConfigureAwait(false);
+            var commits = await GithubApi
+                .GetAllCommits(RepositoryAuthor, RepositoryName, MainBranch)
+                .ConfigureAwait(false);
             return new DownloadPackageVersionOptions
             {
                 IsLatest = true,
@@ -85,7 +90,7 @@ public override async Task<DownloadPackageVersionOptions> GetLatestVersion(bool
             };
         }
 
-        var releases = await GithubApi.GetAllReleases(Author, Name).ConfigureAwait(false);
+        var releases = await GithubApi.GetAllReleases(RepositoryAuthor, RepositoryName).ConfigureAwait(false);
         var latestRelease = includePrerelease ? releases.First() : releases.First(x => !x.Prerelease);
 
         return new DownloadPackageVersionOptions
@@ -98,7 +103,7 @@ public override async Task<DownloadPackageVersionOptions> GetLatestVersion(bool
 
     public override Task<IEnumerable<GitCommit>?> GetAllCommits(string branch, int page = 1, int perPage = 10)
     {
-        return GithubApi.GetAllCommits(Author, Name, branch, page, perPage);
+        return GithubApi.GetAllCommits(RepositoryAuthor, RepositoryName, branch, page, perPage);
     }
 
     public override async Task<PackageVersionOptions> GetAllVersionOptions()
@@ -107,7 +112,9 @@ public override async Task<PackageVersionOptions> GetAllVersionOptions()
 
         if (!ShouldIgnoreReleases)
         {
-            var allReleases = await GithubApi.GetAllReleases(Author, Name).ConfigureAwait(false);
+            var allReleases = await GithubApi
+                .GetAllReleases(RepositoryAuthor, RepositoryName)
+                .ConfigureAwait(false);
             var releasesList = allReleases.ToList();
             if (releasesList.Any())
             {
@@ -124,7 +131,9 @@ public override async Task<PackageVersionOptions> GetAllVersionOptions()
         }
 
         // Branch mode
-        var allBranches = await GithubApi.GetAllBranches(Author, Name).ConfigureAwait(false);
+        var allBranches = await GithubApi
+            .GetAllBranches(RepositoryAuthor, RepositoryName)
+            .ConfigureAwait(false);
         packageVersionOptions.AvailableBranches = allBranches.Select(
             b => new PackageVersion { TagName = $"{b.Name}", ReleaseNotesMarkdown = string.Empty }
         );
@@ -197,7 +206,9 @@ public async Task<PyVenvRunner> SetupVenvPure(
 
     public override async Task<IEnumerable<Release>> GetReleaseTags()
     {
-        var allReleases = await GithubApi.GetAllReleases(Author, Name).ConfigureAwait(false);
+        var allReleases = await GithubApi
+            .GetAllReleases(RepositoryAuthor, RepositoryName)
+            .ConfigureAwait(false);
         return allReleases;
     }
 
@@ -576,8 +587,8 @@ SharedFolderMethod sharedFolderMethod
             await linkDir.DeleteAsync(false).ConfigureAwait(false);
         }
 
-        await StabilityMatrix
-            .Core.Helper.SharedFolders.UpdateLinksForPackage(
+        await Helper
+            .SharedFolders.UpdateLinksForPackage(
                 sharedFolders,
                 SettingsManager.ModelsDirectory,
                 installDirectory
@@ -597,7 +608,7 @@ SharedFolderMethod sharedFolderMethod
     {
         if (SharedFolders is not null && sharedFolderMethod == SharedFolderMethod.Symlink)
         {
-            StabilityMatrix.Core.Helper.SharedFolders.RemoveLinksForPackage(SharedFolders, installDirectory);
+            Helper.SharedFolders.RemoveLinksForPackage(SharedFolders, installDirectory);
         }
         return Task.CompletedTask;
     }
@@ -606,7 +617,7 @@ public override Task SetupOutputFolderLinks(DirectoryPath installDirectory)
     {
         if (SharedOutputFolders is { } sharedOutputFolders)
         {
-            return StabilityMatrix.Core.Helper.SharedFolders.UpdateLinksForPackage(
+            return Helper.SharedFolders.UpdateLinksForPackage(
                 sharedOutputFolders,
                 SettingsManager.ImagesDirectory,
                 installDirectory,
@@ -621,10 +632,7 @@ public override Task RemoveOutputFolderLinks(DirectoryPath installDirectory)
     {
         if (SharedOutputFolders is { } sharedOutputFolders)
         {
-            StabilityMatrix.Core.Helper.SharedFolders.RemoveLinksForPackage(
-                sharedOutputFolders,
-                installDirectory
-            );
+            Helper.SharedFolders.RemoveLinksForPackage(sharedOutputFolders, installDirectory);
         }
         return Task.CompletedTask;
     }

StabilityMatrix.Core/Models/Packages/StableSwarm.cs

@@ -5,7 +5,6 @@
 using StabilityMatrix.Core.Exceptions;
 using StabilityMatrix.Core.Helper;
 using StabilityMatrix.Core.Helper.Cache;
-using StabilityMatrix.Core.Models.Database;
 using StabilityMatrix.Core.Models.FDS;
 using StabilityMatrix.Core.Models.FileInterfaces;
 using StabilityMatrix.Core.Models.Progress;
@@ -25,9 +24,9 @@ IPrerequisiteHelper prerequisiteHelper
     private Process? dotnetProcess;
 
     public override string Name => "StableSwarmUI";
+    public override string RepositoryName => "SwarmUI";
     public override string DisplayName { get; set; } = "SwarmUI";
     public override string Author => "mcmonkeyprojects";
-    public override string GithubUrl => $"https://github.com/{Author}/SwarmUI";
     public override string Blurb =>
         "A Modular Stable Diffusion Web-User-Interface, with an emphasis on making powertools easily accessible, high performance, and extensibility.";
 
@@ -315,21 +314,13 @@ public override async Task<bool> CheckForUpdates(InstalledPackage package)
         if (needsMigrate)
         {
             await prerequisiteHelper
-                .RunGit(
-                    ["remote", "set-url", "origin", $"https://github.com/{Author}/SwarmUI"],
-                    package.FullPath
-                )
+                .RunGit(["remote", "set-url", "origin", GithubUrl], package.FullPath)
                 .ConfigureAwait(false);
         }
 
         return await base.CheckForUpdates(package).ConfigureAwait(false);
     }
 
-    public override Task<IEnumerable<GitCommit>?> GetAllCommits(string branch, int page = 1, int perPage = 10)
-    {
-        return GithubApi.GetAllCommits(Author, "SwarmUI", branch, page, perPage);
-    }
-
     public override Task SetupModelFolders(
         DirectoryPath installDirectory,
         SharedFolderMethod sharedFolderMethod