Skip to content

Commit 275a52e

Browse files
committed
refactor: add repository
1 parent 52fba29 commit 275a52e

File tree

6 files changed

+12
-13
lines changed

6 files changed

+12
-13
lines changed

src/ViewModels/Clone.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -129,8 +129,7 @@ public override Task<bool> Sure()
129129

130130
CallUIThread(() =>
131131
{
132-
var normalizedPath = path.Replace("\\", "/");
133-
var node = Preference.Instance.FindOrAddNodeByRepositoryPath(normalizedPath, null, true);
132+
var node = Preference.Instance.FindOrAddNodeByRepositoryPath(path, null, true);
134133
var launcher = App.GetLauncer();
135134
var page = null as LauncherPage;
136135
foreach (var one in launcher.Pages)

src/ViewModels/Init.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,7 @@ public override Task<bool> Sure()
3838

3939
CallUIThread(() =>
4040
{
41-
var normalizedPath = _targetPath.Replace("\\", "/");
42-
Preference.Instance.FindOrAddNodeByRepositoryPath(normalizedPath, _parentNode, true);
41+
Preference.Instance.FindOrAddNodeByRepositoryPath(_targetPath, _parentNode, true);
4342
Welcome.Instance.Refresh();
4443
});
4544

src/ViewModels/Launcher.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,8 +103,7 @@ public Launcher(string startupRepo)
103103
}
104104
else
105105
{
106-
var normalized = test.StdOut.Trim().Replace("\\", "/");
107-
var node = pref.FindOrAddNodeByRepositoryPath(normalized, null, false);
106+
var node = pref.FindOrAddNodeByRepositoryPath(test.StdOut.Trim(), null, false);
108107
Welcome.Instance.Refresh();
109108
OpenRepositoryInTab(node, null);
110109
}

src/ViewModels/Preference.cs

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -405,13 +405,17 @@ public RepositoryNode FindNode(string id)
405405

406406
public RepositoryNode FindOrAddNodeByRepositoryPath(string repo, RepositoryNode parent, bool shouldMoveNode)
407407
{
408-
var node = FindNodeRecursive(repo, RepositoryNodes);
408+
var normalized = repo.Replace('\\', '/');
409+
if (normalized.EndsWith("/"))
410+
normalized = normalized.TrimEnd('/');
411+
412+
var node = FindNodeRecursive(normalized, RepositoryNodes);
409413
if (node == null)
410414
{
411415
node = new RepositoryNode()
412416
{
413-
Id = repo,
414-
Name = Path.GetFileName(repo),
417+
Id = normalized,
418+
Name = Path.GetFileName(normalized),
415419
Bookmark = 0,
416420
IsRepository = true,
417421
};

src/Views/Welcome.axaml.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -307,8 +307,7 @@ private void OpenOrInitRepository(string path, ViewModels.RepositoryNode parent
307307
return;
308308
}
309309

310-
var normalizedPath = test.StdOut.Trim().Replace("\\", "/");
311-
var node = ViewModels.Preference.Instance.FindOrAddNodeByRepositoryPath(normalizedPath, parent, true);
310+
var node = ViewModels.Preference.Instance.FindOrAddNodeByRepositoryPath(test.StdOut.Trim(), parent, true);
312311
ViewModels.Welcome.Instance.Refresh();
313312

314313
var launcher = this.FindAncestorOfType<Launcher>()?.DataContext as ViewModels.Launcher;

src/Views/WelcomeToolbar.axaml.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,7 @@ private void OpenOrInitRepository(string path, ViewModels.RepositoryNode parent
6363
return;
6464
}
6565

66-
var normalizedPath = test.StdOut.Trim().Replace("\\", "/");
67-
var node = ViewModels.Preference.Instance.FindOrAddNodeByRepositoryPath(normalizedPath, parent, false);
66+
var node = ViewModels.Preference.Instance.FindOrAddNodeByRepositoryPath(test.StdOut.Trim(), parent, false);
6867
ViewModels.Welcome.Instance.Refresh();
6968

7069
var launcher = this.FindAncestorOfType<Launcher>()?.DataContext as ViewModels.Launcher;

0 commit comments

Comments
 (0)