Merge branch 'hotfix/v8.22.1'

love-linger · love-linger · commit 41dfbb375460 · 2024-07-22T16:08:44.000+08:00
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-8.22
+8.22.1
diff --git a/src/App.axaml.cs b/src/App.axaml.cs
@@ -520,7 +520,7 @@ private void TryLaunchedAsNormal(IClassicDesktopStyleApplicationLifetime desktop
             desktop.MainWindow = new Views.Launcher() { DataContext = _launcher };
 
             var pref = ViewModels.Preference.Instance;
-            if (pref.ShouldCheck4UpdateOnStartup)
+            if (pref.ShouldCheck4UpdateOnStartup())
             {
                 pref.Save();
                 Check4Update();
diff --git a/src/Commands/Command.cs b/src/Commands/Command.cs
@@ -58,7 +58,7 @@ public bool Exec()
 
             // If an SSH private key was provided, sets the environment.
             if (!string.IsNullOrEmpty(SSHKey))
-                start.Environment.Add("GIT_SSH_COMMAND", $"ssh -i '{SSHKey}'");
+                start.Environment.Add("GIT_SSH_COMMAND", $"ssh -o StrictHostKeyChecking=accept-new -i '{SSHKey}'");
             else
                 start.Arguments += "-c credential.helper=manager ";
 
diff --git a/src/Commands/QueryBranches.cs b/src/Commands/QueryBranches.cs
@@ -73,7 +73,7 @@ protected override void OnReadline(string line)
             branch.IsCurrent = parts[2] == "*";
             branch.Upstream = parts[3];
 
-            if (branch.IsLocal && !parts[4].Equals("=", StringComparison.Ordinal))
+            if (branch.IsLocal && !string.IsNullOrEmpty(parts[4]) && !parts[4].Equals("=", StringComparison.Ordinal))
                 _needQueryTrackStatus.Add(branch);
             else
                 branch.TrackStatus = new Models.BranchTrackStatus();
diff --git a/src/ViewModels/Clone.cs b/src/ViewModels/Clone.cs
@@ -130,7 +130,7 @@ public override Task<bool> Sure()
                 CallUIThread(() =>
                 {
                     var normalizedPath = path.Replace("\\", "/");
-                    var node = Preference.FindOrAddNodeByRepositoryPath(normalizedPath, null, true);
+                    var node = Preference.Instance.FindOrAddNodeByRepositoryPath(normalizedPath, null, true);
                     _launcher.OpenRepositoryInTab(node, _page);
                 });
 
diff --git a/src/ViewModels/CreateGroup.cs b/src/ViewModels/CreateGroup.cs
@@ -21,7 +21,7 @@ public CreateGroup(RepositoryNode parent)
 
         public override Task<bool> Sure()
         {
-            Preference.AddNode(new RepositoryNode()
+            Preference.Instance.AddNode(new RepositoryNode()
             {
                 Id = Guid.NewGuid().ToString(),
                 Name = _name,
diff --git a/src/ViewModels/DeleteRepositoryNode.cs b/src/ViewModels/DeleteRepositoryNode.cs
@@ -18,7 +18,7 @@ public DeleteRepositoryNode(RepositoryNode node)
 
         public override Task<bool> Sure()
         {
-            Preference.RemoveNode(_node);
+            Preference.Instance.RemoveNode(_node);
             return null;
         }
 
diff --git a/src/ViewModels/EditRepositoryNode.cs b/src/ViewModels/EditRepositoryNode.cs
@@ -48,7 +48,7 @@ public override Task<bool> Sure()
             _node.Bookmark = _bookmark;
 
             if (needSort)
-                Preference.SortByRenamedNode(_node);
+                Preference.Instance.SortByRenamedNode(_node);
 
             return null;
         }
diff --git a/src/ViewModels/Init.cs b/src/ViewModels/Init.cs
@@ -31,7 +31,7 @@ public override Task<bool> Sure()
                 CallUIThread(() =>
                 {
                     var normalizedPath = _targetPath.Replace("\\", "/");
-                    Preference.FindOrAddNodeByRepositoryPath(normalizedPath, _parentNode, true);
+                    Preference.Instance.FindOrAddNodeByRepositoryPath(normalizedPath, _parentNode, true);
                 });
 
                 return true;
diff --git a/src/ViewModels/Launcher.cs b/src/ViewModels/Launcher.cs
@@ -1,11 +1,9 @@
 ﻿using System;
 using System.IO;
 
-using Avalonia;
 using Avalonia.Collections;
 using Avalonia.Controls;
 using Avalonia.Input;
-using Avalonia.Media;
 
 using CommunityToolkit.Mvvm.ComponentModel;
 
@@ -34,6 +32,7 @@ public Launcher(string startupRepo)
             Pages = new AvaloniaList<LauncherPage>();
             AddNewTab();
 
+            var pref = Preference.Instance;
             if (!string.IsNullOrEmpty(startupRepo))
             {
                 var root = new Commands.QueryRepositoryRootPath(startupRepo).Result();
@@ -48,14 +47,14 @@ public Launcher(string startupRepo)
                 }
 
                 var normalized = root.Replace("\\", "/");
-                var node = Preference.FindOrAddNodeByRepositoryPath(normalized, null, false);
+                var node = pref.FindOrAddNodeByRepositoryPath(normalized, null, false);
                 OpenRepositoryInTab(node, null);
             }
-            else if (Preference.Instance.RestoreTabs)
+            else if (pref.RestoreTabs)
             {
-                foreach (var id in Preference.Instance.OpenedTabs)
+                foreach (var id in pref.OpenedTabs)
                 {
-                    var node = Preference.FindNode(id);
+                    var node = pref.FindNode(id);
                     if (node == null)
                     {
                         node = new RepositoryNode()
@@ -70,7 +69,7 @@ public Launcher(string startupRepo)
                     OpenRepositoryInTab(node, null);
                 }
 
-                var lastActiveIdx = Preference.Instance.LastActiveTabIdx;
+                var lastActiveIdx = pref.LastActiveTabIdx;
                 if (lastActiveIdx >= 0 && lastActiveIdx < Pages.Count)
                     ActivePage = Pages[lastActiveIdx];
             }
diff --git a/src/ViewModels/Preference.cs b/src/ViewModels/Preference.cs
@@ -43,7 +43,7 @@ public static Preference Instance
                 if (_instance.MonospaceFont == null)
                     _instance.MonospaceFont = new FontFamily("fonts:SourceGit#JetBrains Mono");
 
-                if (!_instance.IsGitConfigured)
+                if (!_instance.IsGitConfigured())
                     _instance.GitInstallPath = Native.OS.FindGitExecutable();
 
                 return _instance;
@@ -213,12 +213,6 @@ public Models.ChangeViewMode CommitChangeViewMode
             set => SetProperty(ref _commitChangeViewMode, value);
         }
 
-        [JsonIgnore]
-        public bool IsGitConfigured
-        {
-            get => !string.IsNullOrEmpty(GitInstallPath) && File.Exists(GitInstallPath);
-        }
-
         public string GitInstallPath
         {
             get => Native.OS.GitExecutable;
@@ -326,28 +320,30 @@ public double LastCheckUpdateTime
             set;
         } = 0;
 
-        [JsonIgnore]
-        public bool ShouldCheck4UpdateOnStartup
+        public bool IsGitConfigured()
         {
-            get
-            {
-                if (!_check4UpdatesOnStartup)
-                    return false;
+            var path = GitInstallPath;
+            return !string.IsNullOrEmpty(path) && File.Exists(path);
+        }
+
+        public bool ShouldCheck4UpdateOnStartup()
+        {
+            if (!_check4UpdatesOnStartup)
+                return false;
 
-                var lastCheck = DateTime.UnixEpoch.AddSeconds(LastCheckUpdateTime).ToLocalTime();
-                var now = DateTime.Now;
+            var lastCheck = DateTime.UnixEpoch.AddSeconds(LastCheckUpdateTime).ToLocalTime();
+            var now = DateTime.Now;
 
-                if (lastCheck.Year == now.Year && lastCheck.Month == now.Month && lastCheck.Day == now.Day)
-                    return false;
+            if (lastCheck.Year == now.Year && lastCheck.Month == now.Month && lastCheck.Day == now.Day)
+                return false;
 
-                LastCheckUpdateTime = now.Subtract(DateTime.UnixEpoch.ToLocalTime()).TotalSeconds;
-                return true;
-            }
+            LastCheckUpdateTime = now.Subtract(DateTime.UnixEpoch.ToLocalTime()).TotalSeconds;
+            return true;
         }
 
-        public static void AddNode(RepositoryNode node, RepositoryNode to = null)
+        public void AddNode(RepositoryNode node, RepositoryNode to = null)
         {
-            var collection = to == null ? _instance._repositoryNodes : to.SubNodes;
+            var collection = to == null ? _repositoryNodes : to.SubNodes;
             var list = new List<RepositoryNode>();
             list.AddRange(collection);
             list.Add(node);
@@ -364,14 +360,14 @@ public static void AddNode(RepositoryNode node, RepositoryNode to = null)
                 collection.Add(one);
         }
 
-        public static RepositoryNode FindNode(string id)
+        public RepositoryNode FindNode(string id)
         {
-            return FindNodeRecursive(id, _instance.RepositoryNodes);
+            return FindNodeRecursive(id, RepositoryNodes);
         }
 
-        public static RepositoryNode FindOrAddNodeByRepositoryPath(string repo, RepositoryNode parent, bool shouldMoveNode)
+        public RepositoryNode FindOrAddNodeByRepositoryPath(string repo, RepositoryNode parent, bool shouldMoveNode)
         {
-            var node = FindNodeRecursive(repo, _instance.RepositoryNodes);
+            var node = FindNodeRecursive(repo, RepositoryNodes);
             if (node == null)
             {
                 node = new RepositoryNode()
@@ -392,9 +388,9 @@ public static RepositoryNode FindOrAddNodeByRepositoryPath(string repo, Reposito
             return node;
         }
 
-        public static void MoveNode(RepositoryNode node, RepositoryNode to = null)
+        public void MoveNode(RepositoryNode node, RepositoryNode to = null)
         {
-            if (to == null && _instance._repositoryNodes.Contains(node))
+            if (to == null && _repositoryNodes.Contains(node))
                 return;
             if (to != null && to.SubNodes.Contains(node))
                 return;
@@ -403,14 +399,14 @@ public static void MoveNode(RepositoryNode node, RepositoryNode to = null)
             AddNode(node, to);
         }
 
-        public static void RemoveNode(RepositoryNode node)
+        public void RemoveNode(RepositoryNode node)
         {
-            RemoveNodeRecursive(node, _instance._repositoryNodes);
+            RemoveNodeRecursive(node, _repositoryNodes);
         }
 
-        public static void SortByRenamedNode(RepositoryNode node)
+        public void SortByRenamedNode(RepositoryNode node)
         {
-            var container = FindNodeContainer(node, _instance._repositoryNodes);
+            var container = FindNodeContainer(node, _repositoryNodes);
             if (container == null)
                 return;
 
@@ -435,7 +431,7 @@ public void Save()
             File.WriteAllText(_savePath, data);
         }
 
-        private static RepositoryNode FindNodeRecursive(string id, AvaloniaList<RepositoryNode> collection)
+        private RepositoryNode FindNodeRecursive(string id, AvaloniaList<RepositoryNode> collection)
         {
             foreach (var node in collection)
             {
@@ -450,7 +446,7 @@ private static RepositoryNode FindNodeRecursive(string id, AvaloniaList<Reposito
             return null;
         }
 
-        private static AvaloniaList<RepositoryNode> FindNodeContainer(RepositoryNode node, AvaloniaList<RepositoryNode> collection)
+        private AvaloniaList<RepositoryNode> FindNodeContainer(RepositoryNode node, AvaloniaList<RepositoryNode> collection)
         {
             foreach (var sub in collection)
             {
@@ -465,7 +461,7 @@ private static AvaloniaList<RepositoryNode> FindNodeContainer(RepositoryNode nod
             return null;
         }
 
-        private static bool RemoveNodeRecursive(RepositoryNode node, AvaloniaList<RepositoryNode> collection)
+        private bool RemoveNodeRecursive(RepositoryNode node, AvaloniaList<RepositoryNode> collection)
         {
             if (collection.Contains(node))
             {
diff --git a/src/ViewModels/Repository.cs b/src/ViewModels/Repository.cs
@@ -965,7 +965,7 @@ public void OpenSubmodule(string submodule)
             var root = Path.GetFullPath(Path.Combine(_fullpath, submodule));
             var normalizedPath = root.Replace("\\", "/");
 
-            var node = Preference.FindNode(normalizedPath);
+            var node = Preference.Instance.FindNode(normalizedPath);
             if (node == null)
             {
                 node = new RepositoryNode()
@@ -996,7 +996,7 @@ public void PruneWorktrees()
 
         public void OpenWorktree(Models.Worktree worktree)
         {
-            var node = Preference.FindNode(worktree.FullPath);
+            var node = Preference.Instance.FindNode(worktree.FullPath);
             if (node == null)
             {
                 node = new RepositoryNode()
diff --git a/src/ViewModels/Welcome.cs b/src/ViewModels/Welcome.cs
@@ -1,4 +1,5 @@
 ﻿using System;
+
 using Avalonia;
 using Avalonia.Collections;
 using Avalonia.Controls;
@@ -23,13 +24,13 @@ public string SearchFilter
             set
             {
                 if (SetProperty(ref _searchFilter, value))
-                    Referesh();
+                    Refresh();
             }
         }
 
         public void InitRepository(string path, RepositoryNode parent)
         {
-            if (!Preference.Instance.IsGitConfigured)
+            if (!Preference.Instance.IsGitConfigured())
             {
                 App.RaiseException(PopupHost.Active.GetId(), App.Text("NotConfigured"));
                 return;
@@ -43,7 +44,7 @@ public void InitRepository(string path, RepositoryNode parent)
 
         public void Clone()
         {
-            if (!Preference.Instance.IsGitConfigured)
+            if (!Preference.Instance.IsGitConfigured())
             {
                 App.RaiseException(string.Empty, App.Text("NotConfigured"));
                 return;
@@ -58,7 +59,7 @@ public void Clone()
 
         public void OpenTerminal()
         {
-            if (!Preference.Instance.IsGitConfigured)
+            if (!Preference.Instance.IsGitConfigured())
             {
                 App.RaiseException(PopupHost.Active.GetId(), App.Text("NotConfigured"));
             }
@@ -81,7 +82,7 @@ public void AddRootNode()
 
         public void MoveNode(RepositoryNode from, RepositoryNode to)
         {
-            Preference.MoveNode(from, to);
+            Preference.Instance.MoveNode(from, to);
         }
 
         public ContextMenu CreateContextMenu(RepositoryNode node)
@@ -166,7 +167,7 @@ public ContextMenu CreateContextMenu(RepositoryNode node)
             return menu;
         }
 
-        private void Referesh()
+        private void Refresh()
         {
             if (string.IsNullOrWhiteSpace(_searchFilter))
             {
diff --git a/src/Views/Preference.axaml.cs b/src/Views/Preference.axaml.cs
@@ -139,7 +139,7 @@ public Preference()
             });
 
             var ver = string.Empty;
-            if (pref.IsGitConfigured)
+            if (pref.IsGitConfigured())
             {
                 var config = new Commands.Config(null).ListAll();
 
diff --git a/src/Views/Welcome.axaml.cs b/src/Views/Welcome.axaml.cs
diff --git a/src/Views/WelcomeToolbar.axaml.cs b/src/Views/WelcomeToolbar.axaml.cs

Original file line number	Diff line number	Diff line change
`@@ -520,7 +520,7 @@ private void TryLaunchedAsNormal(IClassicDesktopStyleApplicationLifetime desktop`
`520`	`520`	`desktop.MainWindow = new Views.Launcher() { DataContext = _launcher };`
`521`	`521`
`522`	`522`	`var pref = ViewModels.Preference.Instance;`
`523`		`- if (pref.ShouldCheck4UpdateOnStartup)`
	`523`	`+ if (pref.ShouldCheck4UpdateOnStartup())`
`524`	`524`	`{`
`525`	`525`	`pref.Save();`
`526`	`526`	`Check4Update();`
Original file line number	Diff line number	Diff line change
`@@ -130,7 +130,7 @@ public override Task<bool> Sure()`
`130`	`130`	`CallUIThread(() =>`
`131`	`131`	`{`
`132`	`132`	`var normalizedPath = path.Replace("\\", "/");`
`133`		`- var node = Preference.FindOrAddNodeByRepositoryPath(normalizedPath, null, true);`
	`133`	`+ var node = Preference.Instance.FindOrAddNodeByRepositoryPath(normalizedPath, null, true);`
`134`	`134`	`_launcher.OpenRepositoryInTab(node, _page);`
`135`	`135`	`});`
`136`	`136`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ public CreateGroup(RepositoryNode parent)`
`21`	`21`
`22`	`22`	`public override Task<bool> Sure()`
`23`	`23`	`{`
`24`		`- Preference.AddNode(new RepositoryNode()`
	`24`	`+ Preference.Instance.AddNode(new RepositoryNode()`
`25`	`25`	`{`
`26`	`26`	`Id = Guid.NewGuid().ToString(),`
`27`	`27`	`Name = _name,`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ public DeleteRepositoryNode(RepositoryNode node)`
`18`	`18`
`19`	`19`	`public override Task<bool> Sure()`
`20`	`20`	`{`
`21`		`- Preference.RemoveNode(_node);`
	`21`	`+ Preference.Instance.RemoveNode(_node);`
`22`	`22`	`return null;`
`23`	`23`	`}`
`24`	`24`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ public override Task<bool> Sure()`
`48`	`48`	`_node.Bookmark = _bookmark;`
`49`	`49`
`50`	`50`	`if (needSort)`
`51`		`- Preference.SortByRenamedNode(_node);`
	`51`	`+ Preference.Instance.SortByRenamedNode(_node);`
`52`	`52`
`53`	`53`	`return null;`
`54`	`54`	`}`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ public override Task<bool> Sure()`
`31`	`31`	`CallUIThread(() =>`
`32`	`32`	`{`
`33`	`33`	`var normalizedPath = _targetPath.Replace("\\", "/");`
`34`		`- Preference.FindOrAddNodeByRepositoryPath(normalizedPath, _parentNode, true);`
	`34`	`+ Preference.Instance.FindOrAddNodeByRepositoryPath(normalizedPath, _parentNode, true);`
`35`	`35`	`});`
`36`	`36`
`37`	`37`	`return true;`
Original file line number	Diff line number	Diff line change
`@@ -1,11 +1,9 @@`
`1`	`1`	`using System;`
`2`	`2`	`using System.IO;`
`3`	`3`
`4`		`-using Avalonia;`
`5`	`4`	`using Avalonia.Collections;`
`6`	`5`	`using Avalonia.Controls;`
`7`	`6`	`using Avalonia.Input;`
`8`		`-using Avalonia.Media;`
`9`	`7`
`10`	`8`	`using CommunityToolkit.Mvvm.ComponentModel;`
`11`	`9`
`@@ -34,6 +32,7 @@ public Launcher(string startupRepo)`
`34`	`32`	`Pages = new AvaloniaList<LauncherPage>();`
`35`	`33`	`AddNewTab();`
`36`	`34`
	`35`	`+ var pref = Preference.Instance;`
`37`	`36`	`if (!string.IsNullOrEmpty(startupRepo))`
`38`	`37`	`{`
`39`	`38`	`var root = new Commands.QueryRepositoryRootPath(startupRepo).Result();`
`@@ -48,14 +47,14 @@ public Launcher(string startupRepo)`
`48`	`47`	`}`
`49`	`48`
`50`	`49`	`var normalized = root.Replace("\\", "/");`
`51`		`- var node = Preference.FindOrAddNodeByRepositoryPath(normalized, null, false);`
	`50`	`+ var node = pref.FindOrAddNodeByRepositoryPath(normalized, null, false);`
`52`	`51`	`OpenRepositoryInTab(node, null);`
`53`	`52`	`}`
`54`		`- else if (Preference.Instance.RestoreTabs)`
	`53`	`+ else if (pref.RestoreTabs)`
`55`	`54`	`{`
`56`		`- foreach (var id in Preference.Instance.OpenedTabs)`
	`55`	`+ foreach (var id in pref.OpenedTabs)`
`57`	`56`	`{`
`58`		`- var node = Preference.FindNode(id);`
	`57`	`+ var node = pref.FindNode(id);`
`59`	`58`	`if (node == null)`
`60`	`59`	`{`
`61`	`60`	`node = new RepositoryNode()`
`@@ -70,7 +69,7 @@ public Launcher(string startupRepo)`
`70`	`69`	`OpenRepositoryInTab(node, null);`
`71`	`70`	`}`
`72`	`71`
`73`		`- var lastActiveIdx = Preference.Instance.LastActiveTabIdx;`
	`72`	`+ var lastActiveIdx = pref.LastActiveTabIdx;`
`74`	`73`	`if (lastActiveIdx >= 0 && lastActiveIdx < Pages.Count)`
`75`	`74`	`ActivePage = Pages[lastActiveIdx];`
`76`	`75`	`}`