fix missing file path change logs in UI

christso · christso · commit 541e482f1c59 · 2025-02-19T16:35:10.000+11:00
diff --git a/GitContentSearch.UI/ViewModels/MainWindowViewModel.cs b/GitContentSearch.UI/ViewModels/MainWindowViewModel.cs
@@ -287,23 +287,21 @@ private async Task StartSearchAsync()
         try
         {
             var processWrapper = new ProcessWrapper();
-            _gitHelper = new GitHelper(processWrapper, WorkingDirectory, FollowHistory);
-            _fileSearcher = new FileSearcher();
-            
             string logAndTempFileDirectory = LogDirectory;
             if (string.IsNullOrEmpty(logAndTempFileDirectory))
             {
                 logAndTempFileDirectory = Path.Combine(Path.GetTempPath(), "GitContentSearch");
                 Directory.CreateDirectory(logAndTempFileDirectory);
             }
 
-            _fileManager = new FileManager(logAndTempFileDirectory);
-
             var uiTextWriter = new UiTextWriter(LogOutput);
             var logFile = Path.Combine(logAndTempFileDirectory, "search_log.txt");
             var fileWriter = new StreamWriter(logFile, append: true);
+            var writer = new CompositeTextWriter(uiTextWriter, fileWriter);
 
-            using var writer = new CompositeTextWriter(uiTextWriter, fileWriter);
+            _gitHelper = new GitHelper(processWrapper, WorkingDirectory, FollowHistory, writer);
+            _fileSearcher = new FileSearcher();
+            _fileManager = new FileManager(logAndTempFileDirectory);
             
             writer.WriteLine(new string('=', 50));
             writer.WriteLine($"GitContentSearch started at {DateTime.Now:yyyy-MM-dd HH:mm:ss}");
@@ -323,6 +321,10 @@ await Task.Run(() => gitContentSearcher.SearchContent(
 
             writer.WriteLine($"GitContentSearch completed at {DateTime.Now:yyyy-MM-dd HH:mm:ss}");
             writer.WriteLine(new string('=', 50));
+            
+            // Ensure we flush and dispose the writer
+            writer.Flush();
+            fileWriter.Dispose();
         }
         catch (Exception ex)
         {
diff --git a/GitContentSearch/GitContentSearcher.cs b/GitContentSearch/GitContentSearcher.cs
@@ -12,14 +12,14 @@ public class GitContentSearcher : IGitContentSearcher
 
 		public GitContentSearcher(IGitHelper gitHelper, IFileSearcher fileSearcher, IFileManager fileManager, bool disableLinearSearch, TextWriter? logWriter = null)
 		{
-			_gitHelper = gitHelper;
-			_fileSearcher = fileSearcher;
-			_fileManager = fileManager;
-			_disableLinearSearch = disableLinearSearch;
 			_logWriter = logWriter ?? new CompositeTextWriter(
 				Console.Out,
 				new StreamWriter("search_log.txt", append: true)
 			);
+			_gitHelper = gitHelper;
+			_fileSearcher = fileSearcher;
+			_fileManager = fileManager;
+			_disableLinearSearch = disableLinearSearch;
 		}
 
 		private bool FileExistsInCurrentCommit(string filePath)
diff --git a/GitContentSearch/GitHelper.cs b/GitContentSearch/GitHelper.cs
@@ -1,4 +1,5 @@
 ﻿using System.Diagnostics;
+using System.IO;
 
 namespace GitContentSearch
 {
@@ -7,23 +8,29 @@ public class GitHelper : IGitHelper
 		private readonly IProcessWrapper _processWrapper;
 		private readonly string? _workingDirectory;
 		private readonly bool _follow;
+		private readonly TextWriter _logWriter;
 
 		public GitHelper(IProcessWrapper processWrapper)
+			: this(processWrapper, null, false, Console.Out)
 		{
-			_processWrapper = processWrapper;
 		}
 
 		public GitHelper(IProcessWrapper processWrapper, string? workingDirectory) 
-			: this(processWrapper, workingDirectory, false)
+			: this(processWrapper, workingDirectory, false, Console.Out)
 		{
-			
 		}
 
 		public GitHelper(IProcessWrapper processWrapper, string? workingDirectory, bool follow)
+			: this(processWrapper, workingDirectory, follow, Console.Out)
+		{
+		}
+
+		public GitHelper(IProcessWrapper processWrapper, string? workingDirectory, bool follow, TextWriter logWriter)
 		{
 			_processWrapper = processWrapper;
 			_workingDirectory = workingDirectory;
 			_follow = follow;
+			_logWriter = logWriter;
 		}
 
 		public string GetCommitTime(string commitHash)
@@ -81,7 +88,7 @@ public List<Commit> GetGitCommits(string earliest, string latest, string filePat
 			var result = RunGitCommand("log --pretty=format:%H -n 1");
 			if (result == null || result.ExitCode != 0)
 			{
-				Console.WriteLine($"Error retrieving git commits: {result?.StandardError}");
+				_logWriter.WriteLine($"Error retrieving git commits: {result?.StandardError}");
 				return null;
 			}
 
@@ -95,7 +102,7 @@ private List<Commit> GetCommits(string filePath)
 			var result = RunGitCommand(arguments);
 			if (result == null || result.ExitCode != 0)
 			{
-				Console.WriteLine($"Error retrieving git commits: {result?.StandardError}");
+				_logWriter.WriteLine($"Error retrieving git commits: {result?.StandardError}");
 				return new List<Commit>();
 			}
 
@@ -112,7 +119,7 @@ private List<Commit> GetCommitsWithFollow(string filePath)
 			var result = RunGitCommand(arguments);
 			if (result.ExitCode != 0)
 			{
-				Console.WriteLine($"Error retrieving git commits: {result?.StandardError}");
+				_logWriter.WriteLine($"Error retrieving git commits: {result?.StandardError}");
 				return new List<Commit>();
 			}
 
@@ -141,9 +148,9 @@ private List<Commit> GetCommitsWithFollow(string filePath)
 						if (oldPath != currentFilePath)
 						{
 							var commitTime = GetCommitTime(currentCommitHash);
-							Console.WriteLine($"File renamed in commit {currentCommitHash} at {commitTime.Trim()}:");
-							Console.WriteLine($"  From: {oldPath}");
-							Console.WriteLine($"  To:   {currentFilePath}");
+							_logWriter.WriteLine($"File renamed in commit {currentCommitHash} at {commitTime.Trim()}:");
+							_logWriter.WriteLine($"  From: {oldPath}");
+							_logWriter.WriteLine($"  To:   {currentFilePath}");
 						}
 						previousFilePath = currentFilePath;
 						commits.Add(new Commit(currentCommitHash, currentFilePath));
@@ -158,8 +165,8 @@ private List<Commit> GetCommitsWithFollow(string filePath)
 						if (previousFilePath != currentFilePath)
 						{
 							var commitTime = GetCommitTime(currentCommitHash);
-							Console.WriteLine($"File path changed in commit {currentCommitHash} at {commitTime.Trim()}:");
-							Console.WriteLine($"  New path: {currentFilePath}");
+							_logWriter.WriteLine($"File path changed in commit {currentCommitHash} at {commitTime.Trim()}:");
+							_logWriter.WriteLine($"  New path: {currentFilePath}");
 							previousFilePath = currentFilePath;
 						}
 						commits.Add(new Commit(currentCommitHash, currentFilePath));
@@ -191,7 +198,7 @@ private List<Commit> FilterCommitsByRange(List<Commit> commits, string earliest,
 				startIndex = commits.FindIndex(c => c.CommitHash == latest);
 				if (startIndex == -1)
 				{
-					Console.WriteLine($"Latest commit {latest} not found.");
+					_logWriter.WriteLine($"Latest commit {latest} not found.");
 					return new List<Commit>();
 				}
 			}
@@ -202,15 +209,15 @@ private List<Commit> FilterCommitsByRange(List<Commit> commits, string earliest,
 				endIndex = commits.FindIndex(c => c.CommitHash == earliest);
 				if (endIndex == -1)
 				{
-					Console.WriteLine($"Earliest commit {earliest} not found.");
+					_logWriter.WriteLine($"Earliest commit {earliest} not found.");
 					return new List<Commit>();
 				}
 			}
 
 			// If the latest commit appears after the earliest commit in the list, the range is invalid
 			if (startIndex > endIndex)
 			{
-				Console.WriteLine("Invalid commit range specified: latest commit is earlier than the earliest commit.");
+				_logWriter.WriteLine("Invalid commit range specified: latest commit is earlier than the earliest commit.");
 				return new List<Commit>();
 			}
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`using System.Diagnostics;`
	`2`	`+using System.IO;`
`2`	`3`
`3`	`4`	`namespace GitContentSearch`
`4`	`5`	`{`
`@@ -7,23 +8,29 @@ public class GitHelper : IGitHelper`
`7`	`8`	`private readonly IProcessWrapper _processWrapper;`
`8`	`9`	`private readonly string? _workingDirectory;`
`9`	`10`	`private readonly bool _follow;`
	`11`	`+ private readonly TextWriter _logWriter;`
`10`	`12`
`11`	`13`	`public GitHelper(IProcessWrapper processWrapper)`
	`14`	`+ : this(processWrapper, null, false, Console.Out)`
`12`	`15`	`{`
`13`		`- _processWrapper = processWrapper;`
`14`	`16`	`}`
`15`	`17`
`16`	`18`	`public GitHelper(IProcessWrapper processWrapper, string? workingDirectory)`
`17`		`- : this(processWrapper, workingDirectory, false)`
	`19`	`+ : this(processWrapper, workingDirectory, false, Console.Out)`
`18`	`20`	`{`
`19`		`-`
`20`	`21`	`}`
`21`	`22`
`22`	`23`	`public GitHelper(IProcessWrapper processWrapper, string? workingDirectory, bool follow)`
	`24`	`+ : this(processWrapper, workingDirectory, follow, Console.Out)`
	`25`	`+ {`
	`26`	`+ }`
	`27`	`+`
	`28`	`+ public GitHelper(IProcessWrapper processWrapper, string? workingDirectory, bool follow, TextWriter logWriter)`
`23`	`29`	`{`
`24`	`30`	`_processWrapper = processWrapper;`
`25`	`31`	`_workingDirectory = workingDirectory;`
`26`	`32`	`_follow = follow;`
	`33`	`+ _logWriter = logWriter;`
`27`	`34`	`}`
`28`	`35`
`29`	`36`	`public string GetCommitTime(string commitHash)`
`@@ -81,7 +88,7 @@ public List<Commit> GetGitCommits(string earliest, string latest, string filePat`
`81`	`88`	`var result = RunGitCommand("log --pretty=format:%H -n 1");`
`82`	`89`	`if (result == null \|\| result.ExitCode != 0)`
`83`	`90`	`{`
`84`		`- Console.WriteLine($"Error retrieving git commits: {result?.StandardError}");`
	`91`	`+ _logWriter.WriteLine($"Error retrieving git commits: {result?.StandardError}");`
`85`	`92`	`return null;`
`86`	`93`	`}`
`87`	`94`
`@@ -95,7 +102,7 @@ private List<Commit> GetCommits(string filePath)`
`95`	`102`	`var result = RunGitCommand(arguments);`
`96`	`103`	`if (result == null \|\| result.ExitCode != 0)`
`97`	`104`	`{`
`98`		`- Console.WriteLine($"Error retrieving git commits: {result?.StandardError}");`
	`105`	`+ _logWriter.WriteLine($"Error retrieving git commits: {result?.StandardError}");`
`99`	`106`	`return new List<Commit>();`
`100`	`107`	`}`
`101`	`108`
`@@ -112,7 +119,7 @@ private List<Commit> GetCommitsWithFollow(string filePath)`
`112`	`119`	`var result = RunGitCommand(arguments);`
`113`	`120`	`if (result.ExitCode != 0)`
`114`	`121`	`{`
`115`		`- Console.WriteLine($"Error retrieving git commits: {result?.StandardError}");`
	`122`	`+ _logWriter.WriteLine($"Error retrieving git commits: {result?.StandardError}");`
`116`	`123`	`return new List<Commit>();`
`117`	`124`	`}`
`118`	`125`
`@@ -141,9 +148,9 @@ private List<Commit> GetCommitsWithFollow(string filePath)`
`141`	`148`	`if (oldPath != currentFilePath)`
`142`	`149`	`{`
`143`	`150`	`var commitTime = GetCommitTime(currentCommitHash);`
`144`		`- Console.WriteLine($"File renamed in commit {currentCommitHash} at {commitTime.Trim()}:");`
`145`		`- Console.WriteLine($" From: {oldPath}");`
`146`		`- Console.WriteLine($" To: {currentFilePath}");`
	`151`	`+ _logWriter.WriteLine($"File renamed in commit {currentCommitHash} at {commitTime.Trim()}:");`
	`152`	`+ _logWriter.WriteLine($" From: {oldPath}");`
	`153`	`+ _logWriter.WriteLine($" To: {currentFilePath}");`
`147`	`154`	`}`
`148`	`155`	`previousFilePath = currentFilePath;`
`149`	`156`	`commits.Add(new Commit(currentCommitHash, currentFilePath));`
`@@ -158,8 +165,8 @@ private List<Commit> GetCommitsWithFollow(string filePath)`
`158`	`165`	`if (previousFilePath != currentFilePath)`
`159`	`166`	`{`
`160`	`167`	`var commitTime = GetCommitTime(currentCommitHash);`
`161`		`- Console.WriteLine($"File path changed in commit {currentCommitHash} at {commitTime.Trim()}:");`
`162`		`- Console.WriteLine($" New path: {currentFilePath}");`
	`168`	`+ _logWriter.WriteLine($"File path changed in commit {currentCommitHash} at {commitTime.Trim()}:");`
	`169`	`+ _logWriter.WriteLine($" New path: {currentFilePath}");`
`163`	`170`	`previousFilePath = currentFilePath;`
`164`	`171`	`}`
`165`	`172`	`commits.Add(new Commit(currentCommitHash, currentFilePath));`
`@@ -191,7 +198,7 @@ private List<Commit> FilterCommitsByRange(List<Commit> commits, string earliest,`
`191`	`198`	`startIndex = commits.FindIndex(c => c.CommitHash == latest);`
`192`	`199`	`if (startIndex == -1)`
`193`	`200`	`{`
`194`		`- Console.WriteLine($"Latest commit {latest} not found.");`
	`201`	`+ _logWriter.WriteLine($"Latest commit {latest} not found.");`
`195`	`202`	`return new List<Commit>();`
`196`	`203`	`}`
`197`	`204`	`}`
`@@ -202,15 +209,15 @@ private List<Commit> FilterCommitsByRange(List<Commit> commits, string earliest,`
`202`	`209`	`endIndex = commits.FindIndex(c => c.CommitHash == earliest);`
`203`	`210`	`if (endIndex == -1)`
`204`	`211`	`{`
`205`		`- Console.WriteLine($"Earliest commit {earliest} not found.");`
	`212`	`+ _logWriter.WriteLine($"Earliest commit {earliest} not found.");`
`206`	`213`	`return new List<Commit>();`
`207`	`214`	`}`
`208`	`215`	`}`
`209`	`216`
`210`	`217`	`// If the latest commit appears after the earliest commit in the list, the range is invalid`
`211`	`218`	`if (startIndex > endIndex)`
`212`	`219`	`{`
`213`		`- Console.WriteLine("Invalid commit range specified: latest commit is earlier than the earliest commit.");`
	`220`	`+ _logWriter.WriteLine("Invalid commit range specified: latest commit is earlier than the earliest commit.");`
`214`	`221`	`return new List<Commit>();`
`215`	`222`	`}`
`216`	`223`