refactor: auto dispatch notifications to UI thread in Launcher (#1489)

NathanBaulch · web-flow · commit 25afcba44b95 · 2025-07-02T13:09:30.000+08:00
diff --git a/src/Commands/Command.cs b/src/Commands/Command.cs
@@ -5,8 +5,6 @@
 using System.Text.RegularExpressions;
 using System.Threading;
 
-using Avalonia.Threading;
-
 namespace SourceGit.Commands
 {
     public partial class Command
@@ -68,7 +66,7 @@ public bool Exec()
             catch (Exception e)
             {
                 if (RaiseError)
-                    Dispatcher.UIThread.Post(() => App.RaiseException(Context, e.Message));
+                    App.RaiseException(Context, e.Message);
 
                 Log?.AppendLine(string.Empty);
                 return false;
@@ -96,7 +94,7 @@ public bool Exec()
                 {
                     var errMsg = string.Join("\n", errs).Trim();
                     if (!string.IsNullOrEmpty(errMsg))
-                        Dispatcher.UIThread.Post(() => App.RaiseException(Context, errMsg));
+                        App.RaiseException(Context, errMsg);
                 }
 
                 return false;
diff --git a/src/Commands/Discard.cs b/src/Commands/Discard.cs
@@ -2,8 +2,6 @@
 using System.Collections.Generic;
 using System.IO;
 
-using Avalonia.Threading;
-
 namespace SourceGit.Commands
 {
     public static class Discard
@@ -36,10 +34,7 @@ public static void All(string repo, bool includeIgnored, Models.ICommandLog log)
             }
             catch (Exception e)
             {
-                Dispatcher.UIThread.Invoke(() =>
-                {
-                    App.RaiseException(repo, $"Failed to discard changes. Reason: {e.Message}");
-                });
+                App.RaiseException(repo, $"Failed to discard changes. Reason: {e.Message}");
             }
 
             new Reset(repo, "HEAD", "--hard") { Log = log }.Exec();
@@ -78,10 +73,7 @@ public static void Changes(string repo, List<Models.Change> changes, Models.ICom
             }
             catch (Exception e)
             {
-                Dispatcher.UIThread.Invoke(() =>
-                {
-                    App.RaiseException(repo, $"Failed to discard changes. Reason: {e.Message}");
-                });
+                App.RaiseException(repo, $"Failed to discard changes. Reason: {e.Message}");
             }
 
             if (restores.Count > 0)
diff --git a/src/Commands/GenerateCommitMessage.cs b/src/Commands/GenerateCommitMessage.cs
@@ -3,8 +3,6 @@
 using System.Text;
 using System.Threading;
 
-using Avalonia.Threading;
-
 namespace SourceGit.Commands
 {
     /// <summary>
@@ -86,7 +84,7 @@ public void Exec()
             }
             catch (Exception e)
             {
-                Dispatcher.UIThread.Post(() => App.RaiseException(_repo, $"Failed to generate commit message: {e}"));
+                App.RaiseException(_repo, $"Failed to generate commit message: {e}");
             }
         }
 
diff --git a/src/Commands/GitFlow.cs b/src/Commands/GitFlow.cs
@@ -1,5 +1,4 @@
 ﻿using System.Text;
-using Avalonia.Threading;
 
 namespace SourceGit.Commands
 {
@@ -43,7 +42,7 @@ public static bool Start(string repo, Models.GitFlowBranchType type, string name
                     start.Args = $"flow hotfix start {name}";
                     break;
                 default:
-                    Dispatcher.UIThread.Invoke(() => App.RaiseException(repo, "Bad git-flow branch type!!!"));
+                    App.RaiseException(repo, "Bad git-flow branch type!!!");
                     return false;
             }
 
@@ -68,7 +67,7 @@ public static bool Finish(string repo, Models.GitFlowBranchType type, string nam
                     builder.Append("hotfix");
                     break;
                 default:
-                    Dispatcher.UIThread.Invoke(() => App.RaiseException(repo, "Bad git-flow branch type!!!"));
+                    App.RaiseException(repo, "Bad git-flow branch type!!!");
                     return false;
             }
 
diff --git a/src/Commands/MergeTool.cs b/src/Commands/MergeTool.cs
@@ -1,7 +1,5 @@
 ﻿using System.IO;
 
-using Avalonia.Threading;
-
 namespace SourceGit.Commands
 {
     public static class MergeTool
@@ -24,14 +22,14 @@ public static bool OpenForMerge(string repo, int toolType, string toolPath, stri
 
             if (!File.Exists(toolPath))
             {
-                Dispatcher.UIThread.Post(() => App.RaiseException(repo, $"Can NOT find external merge tool in '{toolPath}'!"));
+                App.RaiseException(repo, $"Can NOT find external merge tool in '{toolPath}'!");
                 return false;
             }
 
             var supported = Models.ExternalMerger.Supported.Find(x => x.Type == toolType);
             if (supported == null)
             {
-                Dispatcher.UIThread.Post(() => App.RaiseException(repo, "Invalid merge tool in preference setting!"));
+                App.RaiseException(repo, "Invalid merge tool in preference setting!");
                 return false;
             }
 
@@ -54,14 +52,14 @@ public static bool OpenForDiff(string repo, int toolType, string toolPath, Model
 
             if (!File.Exists(toolPath))
             {
-                Dispatcher.UIThread.Invoke(() => App.RaiseException(repo, $"Can NOT find external diff tool in '{toolPath}'!"));
+                App.RaiseException(repo, $"Can NOT find external diff tool in '{toolPath}'!");
                 return false;
             }
 
             var supported = Models.ExternalMerger.Supported.Find(x => x.Type == toolType);
             if (supported == null)
             {
-                Dispatcher.UIThread.Post(() => App.RaiseException(repo, "Invalid merge tool in preference setting!"));
+                App.RaiseException(repo, "Invalid merge tool in preference setting!");
                 return false;
             }
 
diff --git a/src/Commands/QueryLocalChanges.cs b/src/Commands/QueryLocalChanges.cs
@@ -2,8 +2,6 @@
 using System.Collections.Generic;
 using System.Text.RegularExpressions;
 
-using Avalonia.Threading;
-
 namespace SourceGit.Commands
 {
     public partial class QueryLocalChanges : Command
@@ -25,7 +23,7 @@ public QueryLocalChanges(string repo, bool includeUntracked = true)
             var rs = ReadToEnd();
             if (!rs.IsSuccess)
             {
-                Dispatcher.UIThread.Post(() => App.RaiseException(Context, rs.StdErr));
+                App.RaiseException(Context, rs.StdErr);
                 return outs;
             }
 
diff --git a/src/Commands/SaveChangesAsPatch.cs b/src/Commands/SaveChangesAsPatch.cs
@@ -3,8 +3,6 @@
 using System.Diagnostics;
 using System.IO;
 
-using Avalonia.Threading;
-
 namespace SourceGit.Commands
 {
     public static class SaveChangesAsPatch
@@ -74,10 +72,7 @@ private static bool ProcessSingleChange(string repo, Models.DiffOption opt, File
             }
             catch (Exception e)
             {
-                Dispatcher.UIThread.Invoke(() =>
-                {
-                    App.RaiseException(repo, "Save change to patch failed: " + e.Message);
-                });
+                App.RaiseException(repo, "Save change to patch failed: " + e.Message);
                 return false;
             }
         }
diff --git a/src/Commands/SaveRevisionFile.cs b/src/Commands/SaveRevisionFile.cs
@@ -2,8 +2,6 @@
 using System.Diagnostics;
 using System.IO;
 
-using Avalonia.Threading;
-
 namespace SourceGit.Commands
 {
     public static class SaveRevisionFile
@@ -53,10 +51,7 @@ private static void ExecCmd(string repo, string args, string outputFile, Stream
                 }
                 catch (Exception e)
                 {
-                    Dispatcher.UIThread.Invoke(() =>
-                    {
-                        App.RaiseException(repo, "Save file failed: " + e.Message);
-                    });
+                    App.RaiseException(repo, "Save file failed: " + e.Message);
                 }
             }
         }
diff --git a/src/Commands/UnstageChangesForAmend.cs b/src/Commands/UnstageChangesForAmend.cs
@@ -3,8 +3,6 @@
 using System.Diagnostics;
 using System.Text;
 
-using Avalonia.Threading;
-
 namespace SourceGit.Commands
 {
     public class UnstageChangesForAmend
@@ -75,16 +73,13 @@ public bool Exec()
                 proc.Close();
 
                 if (!rs)
-                    Dispatcher.UIThread.Invoke(() => App.RaiseException(_repo, err));
+                    App.RaiseException(_repo, err);
 
                 return rs;
             }
             catch (Exception e)
             {
-                Dispatcher.UIThread.Invoke(() =>
-                {
-                    App.RaiseException(_repo, "Failed to unstage changes: " + e.Message);
-                });
+                App.RaiseException(_repo, "Failed to unstage changes: " + e.Message);
                 return false;
             }
         }
diff --git a/src/ViewModels/ExecuteCustomAction.cs b/src/ViewModels/ExecuteCustomAction.cs
@@ -237,7 +237,7 @@ private void Run(string args)
             }
             catch (Exception e)
             {
-                CallUIThread(() => App.RaiseException(_repo.FullPath, e.Message));
+                App.RaiseException(_repo.FullPath, e.Message);
             }
         }
 
@@ -284,12 +284,12 @@ private void RunAndWait(string args, Models.ICommandLog log)
                 {
                     var errMsg = builder.ToString().Trim();
                     if (!string.IsNullOrEmpty(errMsg))
-                        CallUIThread(() => App.RaiseException(_repo.FullPath, errMsg));
+                        App.RaiseException(_repo.FullPath, errMsg);
                 }
             }
             catch (Exception e)
             {
-                CallUIThread(() => App.RaiseException(_repo.FullPath, e.Message));
+                App.RaiseException(_repo.FullPath, e.Message);
             }
 
             proc.Close();
diff --git a/src/ViewModels/Launcher.cs b/src/ViewModels/Launcher.cs
@@ -4,6 +4,7 @@
 using Avalonia.Collections;
 using Avalonia.Controls;
 using Avalonia.Input;
+using Avalonia.Threading;
 
 using CommunityToolkit.Mvvm.ComponentModel;
 
@@ -394,6 +395,12 @@ public void OpenRepositoryInTab(RepositoryNode node, LauncherPage page)
 
         public void DispatchNotification(string pageId, string message, bool isError)
         {
+            if (!Dispatcher.UIThread.CheckAccess())
+            {
+                Dispatcher.UIThread.Invoke(() => DispatchNotification(pageId, message, isError));
+                return;
+            }
+
             var notification = new Models.Notification()
             {
                 IsError = isError,
diff --git a/src/ViewModels/RevisionCompare.cs b/src/ViewModels/RevisionCompare.cs
@@ -124,7 +124,7 @@ public void SaveAsPatch(string saveTo)
             {
                 var succ = Commands.SaveChangesAsPatch.ProcessRevisionCompareChanges(_repo, _changes, GetSHA(_startPoint), GetSHA(_endPoint), saveTo);
                 if (succ)
-                    Dispatcher.UIThread.Invoke(() => App.SendNotification(_repo, App.Text("SaveAsPatchSuccess")));
+                    App.SendNotification(_repo, App.Text("SaveAsPatchSuccess"));
             });
         }
 

Original file line number	Diff line number	Diff line change
`@@ -5,8 +5,6 @@`
`5`	`5`	`using System.Text.RegularExpressions;`
`6`	`6`	`using System.Threading;`
`7`	`7`
`8`		`-using Avalonia.Threading;`
`9`		`-`
`10`	`8`	`namespace SourceGit.Commands`
`11`	`9`	`{`
`12`	`10`	`public partial class Command`
`@@ -68,7 +66,7 @@ public bool Exec()`
`68`	`66`	`catch (Exception e)`
`69`	`67`	`{`
`70`	`68`	`if (RaiseError)`
`71`		`- Dispatcher.UIThread.Post(() => App.RaiseException(Context, e.Message));`
	`69`	`+ App.RaiseException(Context, e.Message);`
`72`	`70`
`73`	`71`	`Log?.AppendLine(string.Empty);`
`74`	`72`	`return false;`
`@@ -96,7 +94,7 @@ public bool Exec()`
`96`	`94`	`{`
`97`	`95`	`var errMsg = string.Join("\n", errs).Trim();`
`98`	`96`	`if (!string.IsNullOrEmpty(errMsg))`
`99`		`- Dispatcher.UIThread.Post(() => App.RaiseException(Context, errMsg));`
	`97`	`+ App.RaiseException(Context, errMsg);`
`100`	`98`	`}`
`101`	`99`
`102`	`100`	`return false;`
Original file line number	Diff line number	Diff line change
`@@ -2,8 +2,6 @@`
`2`	`2`	`using System.Collections.Generic;`
`3`	`3`	`using System.IO;`
`4`	`4`
`5`		`-using Avalonia.Threading;`
`6`		`-`
`7`	`5`	`namespace SourceGit.Commands`
`8`	`6`	`{`
`9`	`7`	`public static class Discard`
`@@ -36,10 +34,7 @@ public static void All(string repo, bool includeIgnored, Models.ICommandLog log)`
`36`	`34`	`}`
`37`	`35`	`catch (Exception e)`
`38`	`36`	`{`
`39`		`- Dispatcher.UIThread.Invoke(() =>`
`40`		`- {`
`41`		`- App.RaiseException(repo, $"Failed to discard changes. Reason: {e.Message}");`
`42`		`- });`
	`37`	`+ App.RaiseException(repo, $"Failed to discard changes. Reason: {e.Message}");`
`43`	`38`	`}`
`44`	`39`
`45`	`40`	`new Reset(repo, "HEAD", "--hard") { Log = log }.Exec();`
`@@ -78,10 +73,7 @@ public static void Changes(string repo, List<Models.Change> changes, Models.ICom`
`78`	`73`	`}`
`79`	`74`	`catch (Exception e)`
`80`	`75`	`{`
`81`		`- Dispatcher.UIThread.Invoke(() =>`
`82`		`- {`
`83`		`- App.RaiseException(repo, $"Failed to discard changes. Reason: {e.Message}");`
`84`		`- });`
	`76`	`+ App.RaiseException(repo, $"Failed to discard changes. Reason: {e.Message}");`
`85`	`77`	`}`
`86`	`78`
`87`	`79`	`if (restores.Count > 0)`
Original file line number	Diff line number	Diff line change
`@@ -3,8 +3,6 @@`
`3`	`3`	`using System.Text;`
`4`	`4`	`using System.Threading;`
`5`	`5`
`6`		`-using Avalonia.Threading;`
`7`		`-`
`8`	`6`	`namespace SourceGit.Commands`
`9`	`7`	`{`
`10`	`8`	`/// <summary>`
`@@ -86,7 +84,7 @@ public void Exec()`
`86`	`84`	`}`
`87`	`85`	`catch (Exception e)`
`88`	`86`	`{`
`89`		`- Dispatcher.UIThread.Post(() => App.RaiseException(_repo, $"Failed to generate commit message: {e}"));`
	`87`	`+ App.RaiseException(_repo, $"Failed to generate commit message: {e}");`
`90`	`88`	`}`
`91`	`89`	`}`
`92`	`90`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`using System.Text;`
`2`		`-using Avalonia.Threading;`
`3`	`2`
`4`	`3`	`namespace SourceGit.Commands`
`5`	`4`	`{`
`@@ -43,7 +42,7 @@ public static bool Start(string repo, Models.GitFlowBranchType type, string name`
`43`	`42`	`start.Args = $"flow hotfix start {name}";`
`44`	`43`	`break;`
`45`	`44`	`default:`
`46`		`- Dispatcher.UIThread.Invoke(() => App.RaiseException(repo, "Bad git-flow branch type!!!"));`
	`45`	`+ App.RaiseException(repo, "Bad git-flow branch type!!!");`
`47`	`46`	`return false;`
`48`	`47`	`}`
`49`	`48`
`@@ -68,7 +67,7 @@ public static bool Finish(string repo, Models.GitFlowBranchType type, string nam`
`68`	`67`	`builder.Append("hotfix");`
`69`	`68`	`break;`
`70`	`69`	`default:`
`71`		`- Dispatcher.UIThread.Invoke(() => App.RaiseException(repo, "Bad git-flow branch type!!!"));`
	`70`	`+ App.RaiseException(repo, "Bad git-flow branch type!!!");`
`72`	`71`	`return false;`
`73`	`72`	`}`
`74`	`73`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,5 @@`
`1`	`1`	`using System.IO;`
`2`	`2`
`3`		`-using Avalonia.Threading;`
`4`		`-`
`5`	`3`	`namespace SourceGit.Commands`
`6`	`4`	`{`
`7`	`5`	`public static class MergeTool`
`@@ -24,14 +22,14 @@ public static bool OpenForMerge(string repo, int toolType, string toolPath, stri`
`24`	`22`
`25`	`23`	`if (!File.Exists(toolPath))`
`26`	`24`	`{`
`27`		`- Dispatcher.UIThread.Post(() => App.RaiseException(repo, $"Can NOT find external merge tool in '{toolPath}'!"));`
	`25`	`+ App.RaiseException(repo, $"Can NOT find external merge tool in '{toolPath}'!");`
`28`	`26`	`return false;`
`29`	`27`	`}`
`30`	`28`
`31`	`29`	`var supported = Models.ExternalMerger.Supported.Find(x => x.Type == toolType);`
`32`	`30`	`if (supported == null)`
`33`	`31`	`{`
`34`		`- Dispatcher.UIThread.Post(() => App.RaiseException(repo, "Invalid merge tool in preference setting!"));`
	`32`	`+ App.RaiseException(repo, "Invalid merge tool in preference setting!");`
`35`	`33`	`return false;`
`36`	`34`	`}`
`37`	`35`
`@@ -54,14 +52,14 @@ public static bool OpenForDiff(string repo, int toolType, string toolPath, Model`
`54`	`52`
`55`	`53`	`if (!File.Exists(toolPath))`
`56`	`54`	`{`
`57`		`- Dispatcher.UIThread.Invoke(() => App.RaiseException(repo, $"Can NOT find external diff tool in '{toolPath}'!"));`
	`55`	`+ App.RaiseException(repo, $"Can NOT find external diff tool in '{toolPath}'!");`
`58`	`56`	`return false;`
`59`	`57`	`}`
`60`	`58`
`61`	`59`	`var supported = Models.ExternalMerger.Supported.Find(x => x.Type == toolType);`
`62`	`60`	`if (supported == null)`
`63`	`61`	`{`
`64`		`- Dispatcher.UIThread.Post(() => App.RaiseException(repo, "Invalid merge tool in preference setting!"));`
	`62`	`+ App.RaiseException(repo, "Invalid merge tool in preference setting!");`
`65`	`63`	`return false;`
`66`	`64`	`}`
`67`	`65`
Original file line number	Diff line number	Diff line change
`@@ -3,8 +3,6 @@`
`3`	`3`	`using System.Diagnostics;`
`4`	`4`	`using System.IO;`
`5`	`5`
`6`		`-using Avalonia.Threading;`
`7`		`-`
`8`	`6`	`namespace SourceGit.Commands`
`9`	`7`	`{`
`10`	`8`	`public static class SaveChangesAsPatch`
`@@ -74,10 +72,7 @@ private static bool ProcessSingleChange(string repo, Models.DiffOption opt, File`
`74`	`72`	`}`
`75`	`73`	`catch (Exception e)`
`76`	`74`	`{`
`77`		`- Dispatcher.UIThread.Invoke(() =>`
`78`		`- {`
`79`		`- App.RaiseException(repo, "Save change to patch failed: " + e.Message);`
`80`		`- });`
	`75`	`+ App.RaiseException(repo, "Save change to patch failed: " + e.Message);`
`81`	`76`	`return false;`
`82`	`77`	`}`
`83`	`78`	`}`
Original file line number	Diff line number	Diff line change
`@@ -237,7 +237,7 @@ private void Run(string args)`
`237`	`237`	`}`
`238`	`238`	`catch (Exception e)`
`239`	`239`	`{`
`240`		`- CallUIThread(() => App.RaiseException(_repo.FullPath, e.Message));`
	`240`	`+ App.RaiseException(_repo.FullPath, e.Message);`
`241`	`241`	`}`
`242`	`242`	`}`
`243`	`243`
`@@ -284,12 +284,12 @@ private void RunAndWait(string args, Models.ICommandLog log)`
`284`	`284`	`{`
`285`	`285`	`var errMsg = builder.ToString().Trim();`
`286`	`286`	`if (!string.IsNullOrEmpty(errMsg))`
`287`		`- CallUIThread(() => App.RaiseException(_repo.FullPath, errMsg));`
	`287`	`+ App.RaiseException(_repo.FullPath, errMsg);`
`288`	`288`	`}`
`289`	`289`	`}`
`290`	`290`	`catch (Exception e)`
`291`	`291`	`{`
`292`		`- CallUIThread(() => App.RaiseException(_repo.FullPath, e.Message));`
	`292`	`+ App.RaiseException(_repo.FullPath, e.Message);`
`293`	`293`	`}`
`294`	`294`
`295`	`295`	`proc.Close();`