dearwolf/sourcegit
1
0
Fork 0
mirror of https://github.com/sourcegit-scm/sourcegit synced 2025-05-20 11:44:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

fix<Repository>: filter not working

Browse source
This commit is contained in:
leo 2024-02-06 17:52:16 +08:00
parent 5781a22b4c
commit 98e65c0f11
4 changed files with 44 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/Models/BranchTreeNode.cs
View file

@ -1,4 +1,5 @@
using System;
using Avalonia.Collections;
using System;
using System.Collections.Generic;
namespace SourceGit.Models {
@ -13,6 +14,7 @@ namespace SourceGit.Models {
public BranchTreeNodeType Type { get; set; }
public object Backend { get; set; }
public bool IsExpanded { get; set; }
public bool IsFiltered { get; set; }
public List<BranchTreeNode> Children { get; set; } = new List<BranchTreeNode>();
public bool IsUpstreamTrackStatusVisible {
@ -58,11 +60,12 @@ namespace SourceGit.Models {
}
foreach (var branch in branches) {
var isFiltered = _filters.Contains(branch.FullName);
if (branch.IsLocal) {
MakeBranchNode(branch, _locals, "local");
MakeBranchNode(branch, _locals, "local", isFiltered);
} else {
var remote = _remotes.Find(x => x.Name == branch.Remote);
if (remote != null) MakeBranchNode(branch, remote.Children, $"remote/{remote.Name}");
if (remote != null) MakeBranchNode(branch, remote.Children, $"remote/{remote.Name}", isFiltered);
}
}
@ -70,6 +73,10 @@ namespace SourceGit.Models {
SortNodes(_remotes);
}
public void SetFilters(AvaloniaList<string> filters) {
_filters.AddRange(filters);
}
public void CollectExpandedNodes(List<BranchTreeNode> nodes, bool isLocal) {
CollectExpandedNodes(nodes, isLocal ? "local" : "remote");
}
@ -82,7 +89,7 @@ namespace SourceGit.Models {
}
}
private void MakeBranchNode(Branch branch, List<BranchTreeNode> roots, string prefix) {
private void MakeBranchNode(Branch branch, List<BranchTreeNode> roots, string prefix, bool isFiltered) {
var subs = branch.Name.Split(new char[] { '/' }, StringSplitOptions.RemoveEmptyEntries);
if (subs.Length == 1) {
@ -91,6 +98,7 @@ namespace SourceGit.Models {
Type = BranchTreeNodeType.Branch,
Backend = branch,
IsExpanded = false,
IsFiltered = isFiltered,
};
roots.Add(node);
return;
@ -127,6 +135,7 @@ namespace SourceGit.Models {
Type = BranchTreeNodeType.Branch,
Backend = branch,
IsExpanded = false,
IsFiltered = isFiltered,
};
lastFolder.Children.Add(last);
}
@ -146,6 +155,7 @@ namespace SourceGit.Models {
private List<BranchTreeNode> _locals = new List<BranchTreeNode>();
private List<BranchTreeNode> _remotes = new List<BranchTreeNode>();
private HashSet<string> _expanded = new HashSet<string>();
private List<string> _filters = new List<string>();
private Dictionary<string, BranchTreeNode> _maps = new Dictionary<string, BranchTreeNode>();
}
}