michael/sourcegit
1
0
Fork 0
mirror of https://github.com/sourcegit-scm/sourcegit.git synced 2024-12-24 20:57:19 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

fix: crash when scan repositories under default clone dir (#434)

Browse source
This commit is contained in:
leo 2024-09-02 07:54:46 +08:00
parent e4f95745ce
commit f586979ac5
No known key found for this signature in database
1 changed files with 19 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/ViewModels/ScanRepositories.cs
View file

@ -12,7 +12,7 @@ namespace SourceGit.ViewModels
{ {
get; get;
private set; private set;
} = string.Empty; }
public ScanRepositories(string rootDir) public ScanRepositories(string rootDir)
{ {
@ -28,7 +28,7 @@ namespace SourceGit.ViewModels
return Task.Run(() => return Task.Run(() =>
{ {
// If it is too fast, the panel will dispear very quickly, the we'll have a bad experience. // If it is too fast, the panel will disappear very quickly, then we'll have a bad experience.
Task.Delay(500).Wait(); Task.Delay(500).Wait();
var rootDir = new DirectoryInfo(RootDir); var rootDir = new DirectoryInfo(RootDir);
@ -42,14 +42,24 @@ namespace SourceGit.ViewModels
Dispatcher.UIThread.Invoke(() => Dispatcher.UIThread.Invoke(() =>
{ {
var normalizedRoot = rootDir.FullName.Replace("\\", "/"); var normalizedRoot = rootDir.FullName.Replace("\\", "/");
var prefixLen = normalizedRoot.EndsWith('/') ? normalizedRoot.Length : normalizedRoot.Length + 1;
foreach (var f in founded) foreach (var f in founded)
{ {
var fullpath = new DirectoryInfo(f); var parent = new DirectoryInfo(f).Parent!.FullName.Replace("\\", "/");
var relative = fullpath.Parent!.FullName.Replace("\\", "/").Substring(prefixLen); if (parent.Equals(normalizedRoot, StringComparison.Ordinal))
var group = FindOrCreateGroupRecursive(Preference.Instance.RepositoryNodes, relative); {
Preference.Instance.FindOrAddNodeByRepositoryPath(f, group, false); Preference.Instance.FindOrAddNodeByRepositoryPath(f, null, false);
}
else if (parent.StartsWith(normalizedRoot, StringComparison.Ordinal))
{
var relative = parent.Substring(normalizedRoot.Length).TrimStart('/');
var group = FindOrCreateGroupRecursive(Preference.Instance.RepositoryNodes, relative);
Preference.Instance.FindOrAddNodeByRepositoryPath(f, group, false);
}
else
{
// Should not happen.
}
} }
Welcome.Instance.Refresh(); Welcome.Instance.Refresh();
@ -61,7 +71,7 @@ namespace SourceGit.ViewModels
private void GetManagedRepositories(List<RepositoryNode> group, HashSet<string> repos) private void GetManagedRepositories(List<RepositoryNode> group, HashSet<string> repos)
{ {
foreach (RepositoryNode node in group) foreach (var node in group)
{ {
if (node.IsRepository) if (node.IsRepository)
repos.Add(node.Id); repos.Add(node.Id);