Skip to content

Commit

Permalink
fixed the path file recursive query issue (#225)
Browse files Browse the repository at this point in the history
  • Loading branch information
blackWins authored Jul 6, 2023
1 parent e44b0ca commit d3be05f
Showing 1 changed file with 7 additions and 9 deletions.
16 changes: 7 additions & 9 deletions src/AbpHelper.Core/Steps/StepWithOption.cs
Original file line number Diff line number Diff line change
Expand Up @@ -109,13 +109,11 @@ private static IEnumerable<string> SearchInDirectoryRecursive(Queue<string> queu
matchedSln = true;
}

var result = searchFunc(directory, pattern, SearchOption.TopDirectoryOnly).FirstOrDefault();
if (!result.IsNullOrWhiteSpace())
var result = searchFunc(directory, pattern, SearchOption.TopDirectoryOnly);

foreach (var item in result)
{
if (result != null)
{
yield return result;
}
yield return item;
}

foreach (var d in Directory.EnumerateDirectories(directory))
Expand Down Expand Up @@ -148,10 +146,10 @@ private static IEnumerable<string> SearchInDirectoryRecursive(Queue<string> queu
matchedSln = true;
}

var result = searchFunc(directory, pattern, SearchOption.TopDirectoryOnly).FirstOrDefault();
if (!result.IsNullOrWhiteSpace())
var result = searchFunc(directory, pattern, SearchOption.TopDirectoryOnly);
if (result != null && result.Any())
{
return result;
return result.FirstOrDefault();
}

foreach (var d in Directory.EnumerateDirectories(directory))
Expand Down

0 comments on commit d3be05f

Please sign in to comment.