Merge pull request #306 from LykosAI/main

Author: ionite34

CHANGELOG.md

@@ -5,6 +5,11 @@ 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).
 
+## v2.6.7
+### Fixed
+- Fixed prerequisite install not unpacking due to improperly formatted 7z argument (Caused the "python310._pth FileNotFoundException")
+- Fixed [#301](https://github.com/LykosAI/StabilityMatrix/issues/301) - Package updates failing silently because of a PortableGit error
+
 ## v2.6.6
 ### Fixed
 - Fixed [#297](https://github.com/LykosAI/StabilityMatrix/issues/297) - Model browser LiteAsyncException occuring when fetching entries with unrecognized values from enum name changes

StabilityMatrix.Avalonia/ViewModels/Dialogs/UpdateViewModel.cs

@@ -171,25 +171,34 @@ public async Task Preload()
     internal async Task<string> GetReleaseNotes(string changelogUrl)
     {
         using var client = httpClientFactory.CreateClient();
-        var response = await client.GetAsync(changelogUrl);
-        if (response.IsSuccessStatusCode)
-        {
-            var changelog = await response.Content.ReadAsStringAsync();
 
-            // Formatting for new changelog format
-            // https://keepachangelog.com/en/1.1.0/
-            if (changelogUrl.EndsWith(".md", StringComparison.OrdinalIgnoreCase))
+        try
+        {
+            var response = await client.GetAsync(changelogUrl);
+            if (response.IsSuccessStatusCode)
             {
-                return FormatChangelog(changelog, Compat.AppVersion)
-                    ?? "## Unable to format release notes";
+                var changelog = await response.Content.ReadAsStringAsync();
+
+                // Formatting for new changelog format
+                // https://keepachangelog.com/en/1.1.0/
+                if (changelogUrl.EndsWith(".md", StringComparison.OrdinalIgnoreCase))
+                {
+                    return FormatChangelog(changelog, Compat.AppVersion)
+                        ?? "## Unable to format release notes";
+                }
+
+                return changelog;
             }
 
-            return changelog;
+            return "## Unable to load release notes";
         }
-        else
+        catch (HttpRequestException e)
         {
-            return "## Unable to load release notes";
+            return $"## Unable to fetch release notes ({e.StatusCode})\n\n[{changelogUrl}]({changelogUrl})";
         }
+        catch (TaskCanceledException) { }
+
+        return $"## Unable to fetch release notes\n\n[{changelogUrl}]({changelogUrl})";
     }
 
     partial void OnUpdateInfoChanged(UpdateInfo? value)

StabilityMatrix.Core/Helper/ArchiveHelper.cs

@@ -1,5 +1,4 @@
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
+using System.Diagnostics.CodeAnalysis;
 using System.Text;
 using System.Text.RegularExpressions;
 using NLog;
@@ -59,8 +58,8 @@ public static string SevenZipFileName
     public static async Task<ArchiveInfo> TestArchive(string archivePath)
     {
         var process = ProcessRunner.StartAnsiProcess(SevenZipPath, new[] { "t", archivePath });
-        await process.WaitForExitAsync();
-        var output = await process.StandardOutput.ReadToEndAsync();
+        await process.WaitForExitAsync().ConfigureAwait(false);
+        var output = await process.StandardOutput.ReadToEndAsync().ConfigureAwait(false);
         var matches = Regex7ZOutput().Matches(output);
         var size = ulong.Parse(matches[0].Value);
         var compressed = ulong.Parse(matches[1].Value);
@@ -86,11 +85,11 @@ public static async Task AddToArchive7Z(string archivePath, string sourceDirecto
 
     public static async Task<ArchiveInfo> Extract7Z(string archivePath, string extractDirectory)
     {
+        var args =
+            $"x {ProcessRunner.Quote(archivePath)} -o{ProcessRunner.Quote(extractDirectory)} -y";
+
         var result = await ProcessRunner
-            .GetProcessResultAsync(
-                SevenZipPath,
-                new[] { "x", archivePath, "-o" + ProcessRunner.Quote(extractDirectory), "-y" }
-            )
+            .GetProcessResultAsync(SevenZipPath, args)
             .ConfigureAwait(false);
 
         result.EnsureSuccessExitCode();
@@ -185,7 +184,7 @@ public static async Task<ArchiveInfo> Extract7ZTar(string archivePath, string ex
             throw new ArgumentException("Archive must be a zipped tar.");
         }
         // Extract the tar.gz to tar
-        await Extract7Z(archivePath, extractDirectory);
+        await Extract7Z(archivePath, extractDirectory).ConfigureAwait(false);
 
         // Extract the tar
         var tarPath = Path.Combine(extractDirectory, Path.GetFileNameWithoutExtension(archivePath));
@@ -196,7 +195,7 @@ public static async Task<ArchiveInfo> Extract7ZTar(string archivePath, string ex
 
         try
         {
-            return await Extract7Z(tarPath, extractDirectory);
+            return await Extract7Z(tarPath, extractDirectory).ConfigureAwait(false);
         }
         finally
         {
@@ -215,11 +214,11 @@ public static async Task<ArchiveInfo> Extract7ZAuto(string archivePath, string e
     {
         if (archivePath.EndsWith(".tar.gz"))
         {
-            return await Extract7ZTar(archivePath, extractDirectory);
+            return await Extract7ZTar(archivePath, extractDirectory).ConfigureAwait(false);
         }
         else
         {
-            return await Extract7Z(archivePath, extractDirectory);
+            return await Extract7Z(archivePath, extractDirectory).ConfigureAwait(false);
         }
     }
 
@@ -241,7 +240,7 @@ public static async Task Extract(
         var count = 0ul;
 
         // Get true size
-        var (total, _) = await TestArchive(archivePath);
+        var (total, _) = await TestArchive(archivePath).ConfigureAwait(false);
 
         // If not available, use the size of the archive file
         if (total == 0)
@@ -266,32 +265,34 @@ public static async Task Extract(
             };
         }
 
-        await Task.Factory.StartNew(
-            () =>
-            {
-                var extractOptions = new ExtractionOptions
+        await Task.Factory
+            .StartNew(
+                () =>
                 {
-                    Overwrite = true,
-                    ExtractFullPath = true,
-                };
-                using var stream = File.OpenRead(archivePath);
-                using var archive = ReaderFactory.Open(stream);
+                    var extractOptions = new ExtractionOptions
+                    {
+                        Overwrite = true,
+                        ExtractFullPath = true,
+                    };
+                    using var stream = File.OpenRead(archivePath);
+                    using var archive = ReaderFactory.Open(stream);
 
-                // Start the progress reporting timer
-                progressMonitor?.Start();
+                    // Start the progress reporting timer
+                    progressMonitor?.Start();
 
-                while (archive.MoveToNextEntry())
-                {
-                    var entry = archive.Entry;
-                    if (!entry.IsDirectory)
+                    while (archive.MoveToNextEntry())
                     {
-                        count += (ulong)entry.CompressedSize;
+                        var entry = archive.Entry;
+                        if (!entry.IsDirectory)
+                        {
+                            count += (ulong)entry.CompressedSize;
+                        }
+                        archive.WriteEntryToDirectory(outputDirectory, extractOptions);
                     }
-                    archive.WriteEntryToDirectory(outputDirectory, extractOptions);
-                }
-            },
-            TaskCreationOptions.LongRunning
-        );
+                },
+                TaskCreationOptions.LongRunning
+            )
+            .ConfigureAwait(false);
 
         progress?.Report(new ProgressReport(progress: 1, message: "Done extracting"));
         progressMonitor?.Stop();
@@ -305,7 +306,7 @@ await Task.Factory.StartNew(
     public static async Task ExtractManaged(string archivePath, string outputDirectory)
     {
         await using var stream = File.OpenRead(archivePath);
-        await ExtractManaged(stream, outputDirectory);
+        await ExtractManaged(stream, outputDirectory).ConfigureAwait(false);
     }
 
     /// <summary>
@@ -381,7 +382,7 @@ public static async Task ExtractManaged(Stream stream, string outputDirectory)
                 // Write file
                 await using var entryStream = reader.OpenEntryStream();
                 await using var fileStream = File.Create(outputPath);
-                await entryStream.CopyToAsync(fileStream);
+                await entryStream.CopyToAsync(fileStream).ConfigureAwait(false);
             }
         }
     }

StabilityMatrix.Core/Models/Packages/BaseGitPackage.cs

@@ -309,7 +309,7 @@ public override async Task<InstalledPackageVersion> Update(
                 new ProgressReport(-1f, "Initializing git repo", isIndeterminate: true)
             );
             await PrerequisiteHelper
-                .RunGit(installedPackage.FullPath!, onConsoleOutput, "init")
+                .RunGit("init", onConsoleOutput, installedPackage.FullPath)
                 .ConfigureAwait(false);
             await PrerequisiteHelper
                 .RunGit(