fix: avoid duplicated nodes being added into the repository tree

sourcegit-scm · May 7, 2024 · eeb6abb · eeb6abb
1 parent 207e82b
commit eeb6abb
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 28 deletions.
diff --git a/src/ViewModels/Clone.cs b/src/ViewModels/Clone.cs
@@ -1,5 +1,4 @@
-using System;
-using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations;
 using System.IO;
 using System.Threading.Tasks;
 
@@ -114,15 +113,7 @@ public override Task<bool> Sure()
                 CallUIThread(() =>
                 {
                     var repo = Preference.AddRepository(path, Path.Combine(path, ".git"));
-                    var node = new RepositoryNode()
-                    {
-                        Id = repo.FullPath,
-                        Name = Path.GetFileName(repo.FullPath),
-                        Bookmark = 0,
-                        IsRepository = true,
-                    };
-                    Preference.AddNode(node);
-
+                    var node = Preference.FindOrAddNodeByRepositoryPath(repo.FullPath, null);
                     _launcher.OpenRepositoryInTab(node, _page);
                 });
 

diff --git a/src/ViewModels/Init.cs b/src/ViewModels/Init.cs
@@ -28,18 +28,10 @@ public override Task<bool> Sure()
                     return false;
 
                 var gitDir = Path.GetFullPath(Path.Combine(_targetPath, ".git"));
-
                 CallUIThread(() =>
                 {
                     var repo = Preference.AddRepository(_targetPath, gitDir);
-                    var node = new RepositoryNode()
-                    {
-                        Id = repo.FullPath,
-                        Name = Path.GetFileName(repo.FullPath),
-                        Bookmark = 0,
-                        IsRepository = true,
-                    };
-                    Preference.AddNode(node);
+                    Preference.FindOrAddNodeByRepositoryPath(repo.FullPath, null);
                 });
 
                 return true;

diff --git a/src/ViewModels/Preference.cs b/src/ViewModels/Preference.cs
@@ -346,6 +346,29 @@ public static RepositoryNode FindNode(string id)
             return FindNodeRecursive(id, _instance.RepositoryNodes);
         }
 
+        public static RepositoryNode FindOrAddNodeByRepositoryPath(string repo, RepositoryNode parent)
+        {
+            var node = FindNodeRecursive(repo, _instance.RepositoryNodes);
+            if (node == null)
+            {
+                node = new RepositoryNode()
+                {
+                    Id = Guid.NewGuid().ToString(),
+                    Name = Path.GetFileName(repo),
+                    Bookmark = 0,
+                    IsRepository = true,
+                };
+
+                AddNode(node, parent);
+            }
+            else
+            {
+                MoveNode(node, parent);
+            }
+
+            return node;
+        }
+
         public static void MoveNode(RepositoryNode node, RepositoryNode to = null)
         {
             if (to == null && _instance._repositoryNodes.Contains(node))

diff --git a/src/Views/Welcome.axaml.cs b/src/Views/Welcome.axaml.cs
@@ -257,14 +257,7 @@ private Task OpenOrInitRepository(string path, ViewModels.RepositoryNode parent
                 Dispatcher.UIThread.Invoke(() =>
                 {
                     var repo = ViewModels.Preference.AddRepository(root, gitDir);
-                    var node = new ViewModels.RepositoryNode()
-                    {
-                        Id = repo.FullPath,
-                        Name = Path.GetFileName(repo.FullPath),
-                        Bookmark = 0,
-                        IsRepository = true,
-                    };
-                    ViewModels.Preference.AddNode(node, parent);
+                    var node = ViewModels.Preference.FindOrAddNodeByRepositoryPath(repo.FullPath, parent);
                     launcher.OpenRepositoryInTab(node, page);
                 });
             });