refactor: move searching commit code from Repository to SearchCommitContext and keep inputs remained while repo is opened (#1884)

Signed-off-by: leo <longshuang@msn.cn>

Author: love-linger

src/ViewModels/Histories.cs

@@ -157,14 +157,14 @@ public void Select(IList commits)
         {
             if (commits.Count == 0)
             {
-                _repo.SelectedSearchedCommit = null;
+                _repo.SearchCommitContext.Selected = null;
                 DetailContext = null;
             }
             else if (commits.Count == 1)
             {
                 var commit = (commits[0] as Models.Commit)!;
-                if (_repo.SelectedSearchedCommit == null || _repo.SelectedSearchedCommit.SHA != commit.SHA)
-                    _repo.SelectedSearchedCommit = _repo.SearchedCommits.Find(x => x.SHA == commit.SHA);
+                if (_repo.SearchCommitContext.Selected == null || _repo.SearchCommitContext.Selected.SHA != commit.SHA)
+                    _repo.SearchCommitContext.Selected = _repo.SearchCommitContext.Results?.Find(x => x.SHA == commit.SHA);
 
                 AutoSelectedCommit = commit;
                 NavigationId = _navigationId + 1;
@@ -182,15 +182,15 @@ public void Select(IList commits)
             }
             else if (commits.Count == 2)
             {
-                _repo.SelectedSearchedCommit = null;
+                _repo.SearchCommitContext.Selected = null;
 
                 var end = commits[0] as Models.Commit;
                 var start = commits[1] as Models.Commit;
                 DetailContext = new RevisionCompare(_repo.FullPath, start, end);
             }
             else
             {
-                _repo.SelectedSearchedCommit = null;
+                _repo.SearchCommitContext.Selected = null;
                 DetailContext = new Models.Count(commits.Count);
             }
         }
@@ -379,7 +379,7 @@ public async Task<string> GetCommitFullMessageAsync(Models.Commit commit)
             var head = _commits.Find(x => x.IsCurrentHead);
             if (head == null)
             {
-                _repo.SelectedSearchedCommit = null;
+                _repo.SearchCommitContext.Selected = null;
                 head = await new Commands.QuerySingleCommit(_repo.FullPath, "HEAD").GetResultAsync();
                 if (head != null)
                     DetailContext = new RevisionCompare(_repo.FullPath, commit, head);

src/ViewModels/Repository.cs

@@ -271,83 +271,16 @@ public bool IsSearching
                 if (SetProperty(ref _isSearching, value))
                 {
                     if (value)
-                    {
                         SelectedViewIndex = 0;
-                        CalcWorktreeFilesForSearching();
-                    }
                     else
-                    {
-                        SearchedCommits = new List<Models.Commit>();
-                        SelectedSearchedCommit = null;
-                        SearchCommitFilter = string.Empty;
-                        MatchedFilesForSearching = null;
-                        _requestingWorktreeFiles = false;
-                        _worktreeFiles = null;
-                    }
-                }
-            }
-        }
-
-        public bool IsSearchLoadingVisible
-        {
-            get => _isSearchLoadingVisible;
-            private set => SetProperty(ref _isSearchLoadingVisible, value);
-        }
-
-        public bool OnlySearchCommitsInCurrentBranch
-        {
-            get => _onlySearchCommitsInCurrentBranch;
-            set
-            {
-                if (SetProperty(ref _onlySearchCommitsInCurrentBranch, value) && !string.IsNullOrEmpty(_searchCommitFilter))
-                    StartSearchCommits();
-            }
-        }
-
-        public int SearchCommitFilterType
-        {
-            get => _searchCommitFilterType;
-            set
-            {
-                if (SetProperty(ref _searchCommitFilterType, value))
-                {
-                    CalcWorktreeFilesForSearching();
-                    if (!string.IsNullOrEmpty(_searchCommitFilter))
-                        StartSearchCommits();
+                        _searchCommitContext.EndSearch();
                 }
             }
         }
 
-        public string SearchCommitFilter
+        public SearchCommitContext SearchCommitContext
         {
-            get => _searchCommitFilter;
-            set
-            {
-                if (SetProperty(ref _searchCommitFilter, value) && IsSearchingCommitsByFilePath())
-                    CalcMatchedFilesForSearching();
-            }
-        }
-
-        public List<string> MatchedFilesForSearching
-        {
-            get => _matchedFilesForSearching;
-            private set => SetProperty(ref _matchedFilesForSearching, value);
-        }
-
-        public List<Models.Commit> SearchedCommits
-        {
-            get => _searchedCommits;
-            set => SetProperty(ref _searchedCommits, value);
-        }
-
-        public Models.Commit SelectedSearchedCommit
-        {
-            get => _selectedSearchedCommit;
-            set
-            {
-                if (SetProperty(ref _selectedSearchedCommit, value) && value != null)
-                    NavigateToCommit(value.SHA);
-            }
+            get => _searchCommitContext;
         }
 
         public bool IsLocalBranchGroupExpanded
@@ -562,6 +495,7 @@ public void Open()
             _histories = new Histories(this);
             _workingCopy = new WorkingCopy(this) { CommitMessage = _settings.LastCommitMessage };
             _stashesPage = new StashesPage(this);
+            _searchCommitContext = new SearchCommitContext(this);
 
             if (Preferences.Instance.ShowLocalChangesByDefault)
             {
@@ -633,6 +567,7 @@ public void Close()
             _histories.Dispose();
             _workingCopy.Dispose();
             _stashesPage.Dispose();
+            _searchCommitContext.Dispose();
 
             _watcher = null;
             _histories = null;
@@ -650,12 +585,6 @@ public void Close()
             _visibleTags = null;
             _submodules.Clear();
             _visibleSubmodules = null;
-            _searchedCommits.Clear();
-            _selectedSearchedCommit = null;
-
-            _requestingWorktreeFiles = false;
-            _worktreeFiles = null;
-            _matchedFilesForSearching = null;
         }
 
         public bool CanCreatePopup()
@@ -904,83 +833,6 @@ public void ClearFilter()
             Filter = string.Empty;
         }
 
-        public void ClearSearchCommitFilter()
-        {
-            SearchCommitFilter = string.Empty;
-        }
-
-        public void ClearMatchedFilesForSearching()
-        {
-            MatchedFilesForSearching = null;
-        }
-
-        public void StartSearchCommits()
-        {
-            if (_histories == null)
-                return;
-
-            IsSearchLoadingVisible = true;
-            SelectedSearchedCommit = null;
-            MatchedFilesForSearching = null;
-
-            Task.Run(async () =>
-            {
-                var visible = new List<Models.Commit>();
-                var method = (Models.CommitSearchMethod)_searchCommitFilterType;
-
-                if (method == Models.CommitSearchMethod.BySHA)
-                {
-                    var isCommitSHA = await new Commands.IsCommitSHA(FullPath, _searchCommitFilter)
-                        .GetResultAsync()
-                        .ConfigureAwait(false);
-
-                    if (isCommitSHA)
-                    {
-                        var commit = await new Commands.QuerySingleCommit(FullPath, _searchCommitFilter)
-                            .GetResultAsync()
-                            .ConfigureAwait(false);
-
-                        commit.IsMerged = await new Commands.IsAncestor(FullPath, commit.SHA, "HEAD")
-                            .GetResultAsync()
-                            .ConfigureAwait(false);
-
-                        visible.Add(commit);
-                    }
-                }
-                else if (_onlySearchCommitsInCurrentBranch)
-                {
-                    visible = await new Commands.QueryCommits(FullPath, _searchCommitFilter, method, true)
-                        .GetResultAsync()
-                        .ConfigureAwait(false);
-
-                    foreach (var c in visible)
-                        c.IsMerged = true;
-                }
-                else
-                {
-                    visible = await new Commands.QueryCommits(FullPath, _searchCommitFilter, method, false)
-                        .GetResultAsync()
-                        .ConfigureAwait(false);
-
-                    if (visible.Count > 0)
-                    {
-                        var set = await new Commands.QueryCurrentBranchCommitHashes(FullPath, visible[^1].CommitterTime)
-                            .GetResultAsync()
-                            .ConfigureAwait(false);
-
-                        foreach (var c in visible)
-                            c.IsMerged = set.Contains(c.SHA);
-                    }
-                }
-
-                Dispatcher.UIThread.Post(() =>
-                {
-                    SearchedCommits = visible;
-                    IsSearchLoadingVisible = false;
-                });
-            });
-        }
-
         public IDisposable LockWatcher()
         {
             return _watcher?.Lock();
@@ -1559,7 +1411,7 @@ public async Task CompareBranchWithWorktreeAsync(Models.Branch branch)
         {
             if (_histories != null)
             {
-                SelectedSearchedCommit = null;
+                _searchCommitContext.Selected = null;
 
                 var target = await new Commands.QuerySingleCommit(FullPath, branch.Head).GetResultAsync();
                 _histories.AutoSelectedCommit = null;
@@ -1956,65 +1808,6 @@ private BranchTreeNode FindBranchNode(List<BranchTreeNode> nodes, string path)
             return null;
         }
 
-        private bool IsSearchingCommitsByFilePath()
-        {
-            return _isSearching && _searchCommitFilterType == (int)Models.CommitSearchMethod.ByPath;
-        }
-
-        private void CalcWorktreeFilesForSearching()
-        {
-            if (!IsSearchingCommitsByFilePath())
-            {
-                _requestingWorktreeFiles = false;
-                _worktreeFiles = null;
-                MatchedFilesForSearching = null;
-                GC.Collect();
-                return;
-            }
-
-            if (_requestingWorktreeFiles)
-                return;
-
-            _requestingWorktreeFiles = true;
-
-            Task.Run(async () =>
-            {
-                _worktreeFiles = await new Commands.QueryRevisionFileNames(FullPath, "HEAD")
-                    .GetResultAsync()
-                    .ConfigureAwait(false);
-
-                Dispatcher.UIThread.Post(() =>
-                {
-                    if (IsSearchingCommitsByFilePath() && _requestingWorktreeFiles)
-                        CalcMatchedFilesForSearching();
-
-                    _requestingWorktreeFiles = false;
-                });
-            });
-        }
-
-        private void CalcMatchedFilesForSearching()
-        {
-            if (_worktreeFiles == null || _worktreeFiles.Count == 0 || _searchCommitFilter.Length < 3)
-            {
-                MatchedFilesForSearching = null;
-                return;
-            }
-
-            var matched = new List<string>();
-            foreach (var file in _worktreeFiles)
-            {
-                if (file.Contains(_searchCommitFilter, StringComparison.OrdinalIgnoreCase) && file.Length != _searchCommitFilter.Length)
-                {
-                    matched.Add(file);
-                    if (matched.Count > 100)
-                        break;
-                }
-            }
-
-            MatchedFilesForSearching = matched;
-        }
-
         private void FetchInBackground(object sender)
         {
             Dispatcher.UIThread.Invoke(async Task () =>
@@ -2081,15 +1874,7 @@ private void FetchInBackground(object sender)
         private int _stashesCount = 0;
 
         private bool _isSearching = false;
-        private bool _isSearchLoadingVisible = false;
-        private int _searchCommitFilterType = (int)Models.CommitSearchMethod.ByMessage;
-        private bool _onlySearchCommitsInCurrentBranch = false;
-        private string _searchCommitFilter = string.Empty;
-        private List<Models.Commit> _searchedCommits = [];
-        private Models.Commit _selectedSearchedCommit = null;
-        private bool _requestingWorktreeFiles = false;
-        private List<string> _worktreeFiles = null;
-        private List<string> _matchedFilesForSearching = null;
+        private SearchCommitContext _searchCommitContext = null;
 
         private string _filter = string.Empty;
         private List<Models.Remote> _remotes = [];