fix binary search logic when file not found in commit

christso · christso · commit a29510439834 · 2024-09-02T23:32:26.000+10:00
diff --git a/GitContentSearch/GitContentSearcher.cs b/GitContentSearch/GitContentSearcher.cs
@@ -54,21 +54,20 @@ private int FindFirstMatchIndex(string[] commits, string filePath, string search
                 int mid = left + (right - left) / 2;
                 string commit = commits[mid];
                 string tempFileName = _fileManager.GenerateTempFileName(commit, filePath);
+                string commitTime = GetCommitTime(commit, _logWriter);
 
+                bool gitShowSuccess = false;
                 try
                 {
                     _gitHelper.RunGitShow(commit, filePath, tempFileName);
+                    gitShowSuccess = true;
                 }
                 catch (Exception ex)
                 {
                     _logWriter.WriteLine($"Error retrieving file at commit {commit}: {ex.Message}");
-                    right = mid - 1;
-                    _fileManager.DeleteTempFile(tempFileName);
-                    continue;
                 }
 
-                bool found = _fileSearcher.SearchInFile(tempFileName, searchString);
-                string commitTime = GetCommitTime(commit, _logWriter);
+                bool found = gitShowSuccess && _fileSearcher.SearchInFile(tempFileName, searchString);
 
                 _logWriter.WriteLine($"Checked commit: {commit} at {commitTime}, found: {found}");
                 _logWriter.Flush();
@@ -100,20 +99,20 @@ private int FindLastMatchIndex(string[] commits, string filePath, string searchS
                 int mid = left + (right - left) / 2;
                 string commit = commits[mid];
                 string tempFileName = _fileManager.GenerateTempFileName(commit, filePath);
+                string commitTime = GetCommitTime(commit, _logWriter);
 
+                bool gitShowSuccess = false;
                 try
                 {
                     _gitHelper.RunGitShow(commit, filePath, tempFileName);
+                    gitShowSuccess = true;
                 }
                 catch (Exception ex)
                 {
                     _logWriter.WriteLine($"Error retrieving file at commit {commit}: {ex.Message}");
-                    right = mid - 1;
-                    continue;
                 }
 
-                bool found = _fileSearcher.SearchInFile(tempFileName, searchString);
-                string commitTime = GetCommitTime(commit, _logWriter);
+                bool found = gitShowSuccess && _fileSearcher.SearchInFile(tempFileName, searchString);
 
                 _logWriter.WriteLine($"Checked commit: {commit} at {commitTime}, found: {found}");
                 _logWriter.Flush();

Original file line number	Diff line number	Diff line change
`@@ -54,21 +54,20 @@ private int FindFirstMatchIndex(string[] commits, string filePath, string search`
`54`	`54`	`int mid = left + (right - left) / 2;`
`55`	`55`	`string commit = commits[mid];`
`56`	`56`	`string tempFileName = _fileManager.GenerateTempFileName(commit, filePath);`
	`57`	`+ string commitTime = GetCommitTime(commit, _logWriter);`
`57`	`58`
	`59`	`+ bool gitShowSuccess = false;`
`58`	`60`	`try`
`59`	`61`	`{`
`60`	`62`	`_gitHelper.RunGitShow(commit, filePath, tempFileName);`
	`63`	`+ gitShowSuccess = true;`
`61`	`64`	`}`
`62`	`65`	`catch (Exception ex)`
`63`	`66`	`{`
`64`	`67`	`_logWriter.WriteLine($"Error retrieving file at commit {commit}: {ex.Message}");`
`65`		`- right = mid - 1;`
`66`		`- _fileManager.DeleteTempFile(tempFileName);`
`67`		`- continue;`
`68`	`68`	`}`
`69`	`69`
`70`		`- bool found = _fileSearcher.SearchInFile(tempFileName, searchString);`
`71`		`- string commitTime = GetCommitTime(commit, _logWriter);`
	`70`	`+ bool found = gitShowSuccess && _fileSearcher.SearchInFile(tempFileName, searchString);`
`72`	`71`
`73`	`72`	`_logWriter.WriteLine($"Checked commit: {commit} at {commitTime}, found: {found}");`
`74`	`73`	`_logWriter.Flush();`
`@@ -100,20 +99,20 @@ private int FindLastMatchIndex(string[] commits, string filePath, string searchS`
`100`	`99`	`int mid = left + (right - left) / 2;`
`101`	`100`	`string commit = commits[mid];`
`102`	`101`	`string tempFileName = _fileManager.GenerateTempFileName(commit, filePath);`
	`102`	`+ string commitTime = GetCommitTime(commit, _logWriter);`
`103`	`103`
	`104`	`+ bool gitShowSuccess = false;`
`104`	`105`	`try`
`105`	`106`	`{`
`106`	`107`	`_gitHelper.RunGitShow(commit, filePath, tempFileName);`
	`108`	`+ gitShowSuccess = true;`
`107`	`109`	`}`
`108`	`110`	`catch (Exception ex)`
`109`	`111`	`{`
`110`	`112`	`_logWriter.WriteLine($"Error retrieving file at commit {commit}: {ex.Message}");`
`111`		`- right = mid - 1;`
`112`		`- continue;`
`113`	`113`	`}`
`114`	`114`
`115`		`- bool found = _fileSearcher.SearchInFile(tempFileName, searchString);`
`116`		`- string commitTime = GetCommitTime(commit, _logWriter);`
	`115`	`+ bool found = gitShowSuccess && _fileSearcher.SearchInFile(tempFileName, searchString);`
`117`	`116`
`118`	`117`	`_logWriter.WriteLine($"Checked commit: {commit} at {commitTime}, found: {found}");`
`119`	`118`	`_logWriter.Flush();`