fix progress bar

Author: christso

GitContentSearch.UI/ViewModels/MainWindowViewModel.cs

@@ -130,6 +130,9 @@ await Avalonia.Threading.Dispatcher.UIThread.InvokeAsync(() =>
     [ObservableProperty]
     private double searchProgress;
 
+    [ObservableProperty]
+    private bool showProgress;
+
     private ObservableCollection<string> _logOutput = new();
     public ObservableCollection<string> LogOutput
     {
@@ -305,12 +308,15 @@ private async Task BrowseLogDirectoryAsync()
     private async Task StartSearchAsync()
     {
         IsSearching = true;
+        ShowProgress = true;
+        SearchProgress = 0;
         LogOutput.Clear();
         try
         {
             if (!Directory.Exists(WorkingDirectory))
             {
                 LogOutput.Add($"Error: Working directory '{WorkingDirectory}' does not exist or is invalid.");
+                ShowProgress = false;
                 return;
             }
 
@@ -339,13 +345,23 @@ private async Task StartSearchAsync()
 
             var gitContentSearcher = new GitContentSearcher(_gitHelper, _fileSearcher, _fileManager, DisableLinearSearch, writer);
 
+            var progress = new Progress<double>(value =>
+            {
+                // Ensure UI updates happen on the UI thread
+                Avalonia.Threading.Dispatcher.UIThread.Post(() =>
+                {
+                    SearchProgress = value * 100;
+                });
+            });
+
             // Since we've already validated in CanStartSearch that FilePath and SearchString are non-empty,
             // and EarliestCommit and LatestCommit have default empty string values, we can safely pass them
             await Task.Run(() => gitContentSearcher.SearchContent(
                 FilePath,
                 SearchString,
                 EarliestCommit,
-                LatestCommit));
+                LatestCommit,
+                progress));
 
             writer.WriteLine($"GitContentSearch completed at {DateTime.Now:yyyy-MM-dd HH:mm:ss}");
             writer.WriteLine(new string('=', 50));
@@ -361,6 +377,8 @@ await Task.Run(() => gitContentSearcher.SearchContent(
             {
                 LogOutput.Add($"Inner Error: {ex.InnerException.Message}");
             }
+            SearchProgress = 0;
+            ShowProgress = false;
         }
         finally
         {

GitContentSearch.UI/Views/MainWindow.axaml

@@ -79,7 +79,7 @@
         <!-- Search Button and Progress -->
         <Grid Grid.Row="6" Margin="0,8">
             <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="120"/>
+                <ColumnDefinition Width="140"/>
                 <ColumnDefinition Width="*"/>
             </Grid.ColumnDefinitions>
             <Button Grid.Column="0" 
@@ -88,9 +88,10 @@
                     Command="{Binding StartSearchCommand}"/>
             <ProgressBar Grid.Column="1" 
                         Height="4"
+                        Maximum="100"
                         Value="{Binding SearchProgress}" 
-                        IsVisible="{Binding IsSearching}"
-                        Margin="8,0"/>
+                        IsVisible="{Binding ShowProgress}"
+                        Margin="8,0,0,0"/>
         </Grid>
 
         <!-- Log Output -->

GitContentSearch/GitContentSearcher.cs

@@ -9,6 +9,8 @@ public class GitContentSearcher : IGitContentSearcher
 		private readonly IFileManager _fileManager;
 		private readonly TextWriter _logWriter;
 		private readonly bool _disableLinearSearch;
+		private IProgress<double>? _progress;
+		private double _currentProgress = 0;
 
 		public GitContentSearcher(IGitHelper gitHelper, IFileSearcher fileSearcher, IFileManager fileManager, bool disableLinearSearch, TextWriter? logWriter = null)
 		{
@@ -37,8 +39,12 @@ private bool FileExistsInCurrentCommit(string filePath)
 			}
 		}
 
-		public void SearchContent(string filePath, string searchString, string earliestCommit = "", string latestCommit = "")
+		public void SearchContent(string filePath, string searchString, string earliestCommit = "", string latestCommit = "", IProgress<double>? progress = null)
 		{
+			_progress = progress;
+			_currentProgress = 0;
+			_progress?.Report(0.05); // Initial 5% progress to show activity
+
 			if (!FileExistsInCurrentCommit(filePath))
 			{
 				_logWriter.WriteLine($"Warning: The file '{filePath}' does not exist in the current commit.");
@@ -53,12 +59,16 @@ public void SearchContent(string filePath, string searchString, string earliestC
 			if (commits == null || commits.Count == 0)
 			{
 				_logWriter.WriteLine("No commits found in the specified range.");
+				_progress?.Report(1.0);
 				return;
 			}
 
+			_progress?.Report(0.25); // Commits retrieved
+
 			if (commits.FindIndex(c => c.CommitHash == earliestCommit) > commits.FindIndex(c => c.CommitHash == latestCommit))
 			{
 				_logWriter.WriteLine("Error: The earliest commit is more recent than the latest commit.");
+				_progress?.Report(1.0);
 				return;
 			}
 
@@ -69,13 +79,18 @@ public void SearchContent(string filePath, string searchString, string earliestC
 			int firstMatchIndex = FindFirstMatchIndex(commits, filePath, searchString, lastMatchIndex);
 
 			LogResults(firstMatchIndex, lastMatchIndex, commits, searchString);
+			
+			_progress?.Report(1.0);
 		}
 
 		private int FindFirstMatchIndex(List<Commit> commits, string filePath, string searchString, int lastMatchIndex)
 		{
 			int left = 0;
 			int right = lastMatchIndex; // Use lastMatchIndex as the upper bound
 			int? firstMatchIndex = null;
+			// For binary search, we'll make approximately log2(n) comparisons
+			int expectedSearches = (int)Math.Ceiling(Math.Log2(Math.Max(1, right - left + 1)));
+			int searchesDone = 0;
 
 			while (left <= right)
 			{
@@ -100,6 +115,12 @@ private int FindFirstMatchIndex(List<Commit> commits, string filePath, string se
 				_logWriter.WriteLine($"Checked commit: {commit.CommitHash} at {commitTime}, found: {found}");
 				_logWriter.Flush();
 
+				searchesDone++;
+				// Calculate progress between 62.5% and 100%
+				double searchProgress = (double)searchesDone / expectedSearches;
+				_currentProgress = 0.625 + (searchProgress * 0.375);
+				_progress?.Report(_currentProgress);
+
 				if (found)
 				{
 					firstMatchIndex = mid;
@@ -121,6 +142,9 @@ private int FindLastMatchIndex(List<Commit> commits, string filePath, string sea
 			int left = searchStartIndex == -1 ? 0 : searchStartIndex;
 			int right = commits.Count - 1;
 			int? lastMatchIndex = null;
+			// For binary search, we'll make approximately log2(n) comparisons
+			int expectedSearches = (int)Math.Ceiling(Math.Log2(Math.Max(1, right - left + 1)));
+			int searchesDone = 0;
 
 			while (left <= right)
 			{
@@ -145,6 +169,12 @@ private int FindLastMatchIndex(List<Commit> commits, string filePath, string sea
 				_logWriter.WriteLine($"Checked commit: {commit.CommitHash} at {commitTime}, found: {found}");
 				_logWriter.Flush();
 
+				searchesDone++;
+				// Calculate progress between 25% and 62.5%
+				double searchProgress = (double)searchesDone / expectedSearches;
+				_currentProgress = 0.25 + (searchProgress * 0.375);
+				_progress?.Report(_currentProgress);
+
 				if (found)
 				{
 					lastMatchIndex = mid;
@@ -159,6 +189,9 @@ private int FindLastMatchIndex(List<Commit> commits, string filePath, string sea
 						if (linearSearchResult.HasValue)
 						{
 							lastMatchIndex = linearSearchResult;
+							// Update progress to 62.5% since we're done with this phase
+							_currentProgress = 0.625;
+							_progress?.Report(_currentProgress);
 							break;
 						}
 					}
@@ -177,6 +210,8 @@ private int FindLastMatchIndex(List<Commit> commits, string filePath, string sea
 			int step = reverse ? -1 : 1; // Use step to control direction of iteration
 			int start = reverse ? right : left;
 			int end = reverse ? left : right;
+			int totalSearches = Math.Abs(end - start) + 1;
+			int searchesDone = 0;
 
 			for (int i = start; reverse ? i >= end : i <= end; i += step)
 			{
@@ -200,6 +235,12 @@ private int FindLastMatchIndex(List<Commit> commits, string filePath, string sea
 				_logWriter.WriteLine($"Checked commit: {commit.CommitHash} at {commitTime}, found: {found}");
 				_logWriter.Flush();
 
+				searchesDone++;
+				// Calculate progress for linear search portion
+				double searchProgress = (double)searchesDone / totalSearches;
+				_currentProgress = 0.25 + (searchProgress * 0.375);
+				_progress?.Report(_currentProgress);
+
 				_fileManager.DeleteTempFile(tempFileName); // Always clean up the temp file
 
 				if (found)

GitContentSearch/Interfaces/IGitContentSearcher.cs

@@ -8,6 +8,6 @@ namespace GitContentSearch
 {
     public interface IGitContentSearcher
     {
-        void SearchContent(string filePath, string searchString, string earliestCommit = "", string latestCommit = "");
+        void SearchContent(string filePath, string searchString, string earliestCommit = "", string latestCommit = "", IProgress<double>? progress = null);
     }
 }