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

enhance: remove invalid expanded node records in repository's settings

Browse source
This commit is contained in:
leo 2024-12-23 16:56:49 +08:00
parent ec94c8c1b4
commit 7028e08390
No known key found for this signature in database
2 changed files with 11 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/ViewModels/BranchTreeNode.cs
View file

@ -58,6 +58,7 @@ namespace SourceGit.ViewModels
{ {
public List<BranchTreeNode> Locals => _locals; public List<BranchTreeNode> Locals => _locals;
public List<BranchTreeNode> Remotes => _remotes; public List<BranchTreeNode> Remotes => _remotes;
public List<string> InvalidExpandedNodes => _invalidExpandedNodes;
public void SetExpandedNodes(List<string> expanded) public void SetExpandedNodes(List<string> expanded)
{ {
@ -98,6 +99,12 @@ namespace SourceGit.ViewModels
} }
} }
foreach (var path in _expanded)
{
if (!folders.ContainsKey(path))
_invalidExpandedNodes.Add(path);
}
folders.Clear(); folders.Clear();
SortNodes(_locals); SortNodes(_locals);
SortNodes(_remotes); SortNodes(_remotes);
@ -188,6 +195,7 @@ namespace SourceGit.ViewModels
private readonly List<BranchTreeNode> _locals = new List<BranchTreeNode>(); private readonly List<BranchTreeNode> _locals = new List<BranchTreeNode>();
private readonly List<BranchTreeNode> _remotes = new List<BranchTreeNode>(); private readonly List<BranchTreeNode> _remotes = new List<BranchTreeNode>();
private readonly List<string> _invalidExpandedNodes = new List<string>();
private readonly HashSet<string> _expanded = new HashSet<string>(); private readonly HashSet<string> _expanded = new HashSet<string>();
} }
} }

3
src/ViewModels/Repository.cs
View file

@ -2088,6 +2088,9 @@ namespace SourceGit.ViewModels
{ {
builder.SetExpandedNodes(_settings.ExpandedBranchNodesInSideBar); builder.SetExpandedNodes(_settings.ExpandedBranchNodesInSideBar);
builder.Run(branches, remotes, false); builder.Run(branches, remotes, false);
foreach (var invalid in builder.InvalidExpandedNodes)
_settings.ExpandedBranchNodesInSideBar.Remove(invalid);
} }
else else
{ {