better git call handling

prevents overlapping calls per-folder cleanly

Author: mcmonkey4eva

src/BuiltinExtensions/ComfyUIBackend/ComfyUISelfStartBackend.cs

@@ -60,7 +60,8 @@ public static async Task<bool> EnsureNodeRepo(string url)
         string folderName = url.AfterLast('/');
         if (!Directory.Exists($"{nodePath}/{folderName}"))
         {
-            await Process.Start(new ProcessStartInfo("git", $"clone {url}") { WorkingDirectory = nodePath }).WaitForExitAsync(Program.GlobalProgramCancel);
+            string response = await Utilities.RunGitProcess($"clone {url}", nodePath);
+            Logs.Debug($"Comfy node clone response for {folderName}: {response.Trim()}");
             string reqFile = $"{nodePath}/{folderName}/requirements.txt";
             ComfyUISelfStartBackend[] backends = [.. Program.Backends.RunningBackendsOfType<ComfyUISelfStartBackend>()];
             if (File.Exists(reqFile) && backends.Any())
@@ -92,7 +93,8 @@ public static async Task<bool> EnsureNodeRepo(string url)
         }
         else
         {
-            await NetworkBackendUtils.RunProcessWithMonitoring(new ProcessStartInfo("git", "pull") { WorkingDirectory = Path.GetFullPath($"{nodePath}/{folderName}") }, $"comfy node pull ({folderName})", "comfynodepull");
+            string response = await Utilities.RunGitProcess($"pull", $"{nodePath}/{folderName}");
+            Logs.Debug($"Comfy node pull response for {folderName}: {response.Trim()}");
         }
         return false;
     }
@@ -117,7 +119,8 @@ public static async Task EnsureNodeRepos()
             {
                 if (Directory.Exists($"{node}/.git"))
                 {
-                    tasks.Add(NetworkBackendUtils.RunProcessWithMonitoring(new ProcessStartInfo("git", "pull") { WorkingDirectory = node }, $"comfy node pull ({node.Replace('\\', '/').AfterLast('/')})", "comfynodepull"));
+                    string response = await Utilities.RunGitProcess($"pull", node);
+                    Logs.Debug($"Comfy node pull response for {node.Replace('\\', '/').AfterLast('/')}: {response.Trim()}");
                 }
             }
             await Task.WhenAll(tasks);
@@ -234,15 +237,8 @@ public override async Task Init()
             {
                 try
                 {
-                    ProcessStartInfo psi = new("git", "pull")
-                    {
-                        WorkingDirectory = Path.GetFullPath(settings.StartScript).Replace('\\', '/').BeforeLast('/'),
-                        RedirectStandardError = true,
-                        RedirectStandardOutput = true
-                    };
-                    Process p = Process.Start(psi);
-                    NetworkBackendUtils.ReportLogsFromProcess(p, "ComfyUI (Git Pull)", "");
-                    await p.WaitForExitAsync(Program.GlobalProgramCancel);
+                    string response = await Utilities.RunGitProcess($"pull", Path.GetFullPath(settings.StartScript).Replace('\\', '/').BeforeLast('/'));
+                    Logs.Debug($"Comfy git pull response: {response.Trim()}");
                 }
                 catch (Exception ex)
                 {

src/SwarmUI.csproj

@@ -8,8 +8,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="FreneticLLC.FreneticUtilities" Version="1.0.29" />
-    <PackageReference Include="Hardware.Info" Version="100.1.0" />
+    <PackageReference Include="FreneticLLC.FreneticUtilities" Version="1.0.32" />
+    <PackageReference Include="Hardware.Info" Version="100.1.0.1" />
     <PackageReference Include="LiteDB" Version="5.0.17" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageReference Include="SixLabors.ImageSharp" Version="3.1.4" />

src/Utils/Utilities.cs

@@ -840,17 +840,32 @@ void Warn()
         });
     }
 
+    /// <summary>MultiSemaphoreSet to prevent git calls in the same directory from overlapping.</summary>
+    public static MultiSemaphoreSet<string> GitOverlapLocks = new(32);
+
     /// <summary>Launch, run, and return the text output of, a 'git' command input.</summary>
-    public static async Task<string> RunGitProcess(string args)
+    public static async Task<string> RunGitProcess(string args, string dir = null)
     {
+        dir ??= Environment.CurrentDirectory;
+        dir = Path.GetFullPath(dir);
         ProcessStartInfo start = new("git", args)
         {
             RedirectStandardOutput = true,
-            UseShellExecute = false
+            UseShellExecute = false,
+            WorkingDirectory = dir
         };
-        Process p = Process.Start(start);
-        await p.WaitForExitAsync(Program.GlobalProgramCancel);
-        return await p.StandardOutput.ReadToEndAsync();
+        SemaphoreSlim semaphore = GitOverlapLocks.GetLock(dir);
+        semaphore.Wait();
+        try
+        {
+            Process p = Process.Start(start);
+            await p.WaitForExitAsync(Program.GlobalProgramCancel);
+            return await p.StandardOutput.ReadToEndAsync();
+        }
+        finally
+        {
+            semaphore.Release();
+        }
     }
 
     /// <summary>Deletes a file 'cleanly' by sending it to the recycle bin.</summary>

src/WebAPI/BasicAPIFeatures.cs

@@ -222,7 +222,8 @@ void moveFolder()
                             await output("Fixing Comfy install...");
                             // Note: the old Python 3.10 comfy file is needed for AMD, and it has a cursed git config (mandatory auth header? argh) so this is a hack-fix for that
                             File.WriteAllBytes("dlbackend/comfy/ComfyUI/.git/config", "[core]\n\trepositoryformatversion = 0\n\tfilemode = false\n\tbare = false\n\tlogallrefupdates = true\n\tignorecase = true\n[remote \"origin\"]\n\turl = https://github.com/comfyanonymous/ComfyUI\n\tfetch = +refs/heads/*:refs/remotes/origin/*\n[gc]\n\tauto = 0\n[branch \"master\"]\n\tremote = origin\n\tmerge = refs/heads/master\n[lfs]\n\trepositoryformatversion = 0\n[remote \"upstream\"]\n\turl = https://github.com/comfyanonymous/ComfyUI.git\n\tfetch = +refs/heads/*:refs/remotes/upstream/*\n".EncodeUTF8());
-                            await NetworkBackendUtils.RunProcessWithMonitoring(new ProcessStartInfo("git", "pull") { WorkingDirectory = $"{comfyFolderPath}/ComfyUI" }, "ComfyUI Install (git pull)", "comfyinstall");
+                            string response = await Utilities.RunGitProcess($"pull", $"{comfyFolderPath}/ComfyUI");
+                            Logs.Debug($"ComfyUI Install git pull response: {response}");
                             await NetworkBackendUtils.RunProcessWithMonitoring(new ProcessStartInfo($"{comfyFolderPath}/python_embeded/python.exe", "-s -m pip install -U -r ComfyUI/requirements.txt") { WorkingDirectory = comfyFolderPath }, "ComfyUI Install (python requirements)", "comfyinstall");
                             await output("Installing AMD compatible Torch-DirectML...");
                             await NetworkBackendUtils.RunProcessWithMonitoring(new ProcessStartInfo($"{comfyFolderPath}/python_embeded/python.exe", "-s -m pip install torch-directml") { UseShellExecute = false, WorkingDirectory = comfyFolderPath }, "ComfyUI Install (directml)", "comfyinstall");