logging or something who cares

Author: mohnjiles

StabilityMatrix.Core/Helper/IPrerequisiteHelper.cs

@@ -114,38 +114,16 @@ async Task CloneGitRepository(
         // If pinning to a specific commit, we need a destination directory to continue
         if (!string.IsNullOrWhiteSpace(version?.CommitSha))
         {
-            try
-            {
-                await RunGit(
-                        ["fetch", "--depth", "1", "origin", version.CommitSha!],
-                        onProcessOutput,
-                        rootDir
-                    )
-                    .ConfigureAwait(false);
-                await RunGit(["checkout", "--force", version.CommitSha!], onProcessOutput, rootDir)
-                    .ConfigureAwait(false);
-                await RunGit(
-                        ["submodule", "update", "--init", "--recursive", "--depth", "1"],
-                        onProcessOutput,
-                        rootDir
-                    )
-                    .ConfigureAwait(false);
-            }
-            catch (ProcessException ex)
-            {
-                if (ex.Message.Contains("Git exited with code 128"))
-                {
-                    onProcessOutput?.Invoke(
-                        ProcessOutput.FromStdErrLine(
-                            $"Unable to check out commit {version.CommitSha} - continuing with latest commit from {version.Branch}\n\n{ex.ProcessResult?.StandardError}\n"
-                        )
-                    );
-                }
-                else
-                {
-                    throw;
-                }
-            }
+            await RunGit(["fetch", "--depth", "1", "origin", version.CommitSha!], onProcessOutput, rootDir)
+                .ConfigureAwait(false);
+            await RunGit(["checkout", "--force", version.CommitSha!], onProcessOutput, rootDir)
+                .ConfigureAwait(false);
+            await RunGit(
+                    ["submodule", "update", "--init", "--recursive", "--depth", "1"],
+                    onProcessOutput,
+                    rootDir
+                )
+                .ConfigureAwait(false);
         }
     }
 

StabilityMatrix.Core/Models/Packages/AiToolkit.cs

@@ -1,6 +1,7 @@
 using System.Collections.Immutable;
 using System.Text.RegularExpressions;
 using Injectio.Attributes;
+using NLog;
 using StabilityMatrix.Core.Extensions;
 using StabilityMatrix.Core.Helper;
 using StabilityMatrix.Core.Helper.Cache;
@@ -10,6 +11,7 @@
 using StabilityMatrix.Core.Processes;
 using StabilityMatrix.Core.Python;
 using StabilityMatrix.Core.Services;
+using LogLevel = Microsoft.Extensions.Logging.LogLevel;
 
 namespace StabilityMatrix.Core.Models.Packages;
 
@@ -23,6 +25,7 @@ IPyInstallationManager pyInstallationManager
 ) : BaseGitPackage(githubApi, settingsManager, downloadService, prerequisiteHelper, pyInstallationManager)
 {
     private AnsiProcess? npmProcess;
+    private static readonly Logger Logger = LogManager.GetCurrentClassLogger();
 
     public override string Name => "ai-toolkit";
     public override string DisplayName { get; set; } = "AI-Toolkit";
@@ -186,12 +189,11 @@ await npmProcess
             }
             catch (OperationCanceledException e)
             {
-                Console.WriteLine(e);
+                Logger.Warn(e, "Timed out waiting for npm to exit");
+                npmProcess.CancelStreamReaders();
             }
         }
-
         npmProcess = null;
-        GC.SuppressFinalize(this);
     }
 
     private ImmutableDictionary<string, string> GetEnvVars(ImmutableDictionary<string, string> env)

StabilityMatrix.Core/Models/Packages/Extensions/GitPackageExtensionManager.cs

@@ -2,6 +2,7 @@
 using KGySoft.CoreLibraries;
 using Microsoft.Extensions.Caching.Memory;
 using NLog;
+using StabilityMatrix.Core.Exceptions;
 using StabilityMatrix.Core.Extensions;
 using StabilityMatrix.Core.Helper;
 using StabilityMatrix.Core.Models.FileInterfaces;
@@ -80,9 +81,10 @@ public virtual async Task<IEnumerable<InstalledPackageExtension>> GetInstalledEx
 
         // Search for installed extensions in the package's index directories.
         foreach (
-            var indexDirectory in IndexRelativeDirectories.Select(
-                path => new DirectoryPath(packagePath, path)
-            )
+            var indexDirectory in IndexRelativeDirectories.Select(path => new DirectoryPath(
+                packagePath,
+                path
+            ))
         )
         {
             cancellationToken.ThrowIfCancellationRequested();
@@ -120,11 +122,11 @@ var indexDirectory in IndexRelativeDirectories.Select(
                         {
                             Tag = version.Tag,
                             Branch = version.Branch,
-                            CommitSha = version.CommitSha
+                            CommitSha = version.CommitSha,
                         },
                         GitRepositoryUrl = remoteUrlResult.IsSuccessExitCode
                             ? remoteUrlResult.StandardOutput?.Trim()
-                            : null
+                            : null,
                     }
                 );
             }
@@ -150,9 +152,10 @@ public virtual async Task<IEnumerable<InstalledPackageExtension>> GetInstalledEx
 
         // Search for installed extensions in the package's index directories.
         foreach (
-            var indexDirectory in IndexRelativeDirectories.Select(
-                path => new DirectoryPath(packagePath, path)
-            )
+            var indexDirectory in IndexRelativeDirectories.Select(path => new DirectoryPath(
+                packagePath,
+                path
+            ))
         )
         {
             cancellationToken.ThrowIfCancellationRequested();
@@ -221,8 +224,8 @@ InstalledPackageExtension installedExtension
             {
                 Tag = version.Tag,
                 Branch = version.Branch,
-                CommitSha = version.CommitSha
-            }
+                CommitSha = version.CommitSha,
+            },
         };
     }
 
@@ -257,14 +260,34 @@ public virtual async Task InstallExtensionAsync(
                 new ProgressReport(0f, message: $"Cloning {repositoryUri}", isIndeterminate: true)
             );
 
-            await prerequisiteHelper
-                .CloneGitRepository(
-                    cloneRoot,
-                    repositoryUri.ToString(),
-                    version,
-                    progress.AsProcessOutputHandler()
-                )
-                .ConfigureAwait(false);
+            try
+            {
+                await prerequisiteHelper
+                    .CloneGitRepository(
+                        cloneRoot,
+                        repositoryUri.ToString(),
+                        version,
+                        progress.AsProcessOutputHandler()
+                    )
+                    .ConfigureAwait(false);
+            }
+            catch (ProcessException ex)
+            {
+                if (ex.Message.Contains("Git exited with code 128"))
+                {
+                    progress?.Report(
+                        new ProgressReport(
+                            -1f,
+                            $"Unable to check out commit {version?.CommitSha} - continuing with latest commit from {version?.Branch}\n\n{ex.ProcessResult?.StandardError}\n",
+                            isIndeterminate: true
+                        )
+                    );
+                }
+                else
+                {
+                    throw;
+                }
+            }
 
             progress?.Report(new ProgressReport(1f, message: $"Cloned {repositoryUri}"));
         }