Skip to content

Fix Multiple dir match in wildcard #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
SimonCropp merged 5 commits into from
Apr 16, 2020
Merged

Fix Multiple dir match in wildcard #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e5474a7
.
SimonCropp Apr 16, 2020
82872fe
Merge branch 'master' into multipleDirMatchInwildcard
SimonCropp Apr 16, 2020
3c829f0
.
SimonCropp Apr 16, 2020
75992fa
Update WildcardFileFinderTests.cs
SimonCropp Apr 16, 2020
2b1ae89
Update WildcardFileFinderTests.cs
SimonCropp Apr 16, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions src/DiffEngine.Tests/DiffEngine.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,4 @@
<PackageReference Include="XunitContext" Version="1.9.1" />
<ProjectReference Include="..\DiffEngine\DiffEngine.csproj" />
</ItemGroup>
<ItemGroup>
<Folder Include="DirForSearch\dir1\" />
</ItemGroup>
</Project>
1 change: 1 addition & 0 deletions src/DiffEngine.Tests/DirForSearch/dir1/TextFile2.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@

48 changes: 24 additions & 24 deletions src/DiffEngine.Tests/WildcardFileFinderTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,32 +9,32 @@ public class WildcardFileFinderTests :
[Fact]
public void MultiMatchDir_order1()
{
var dir1 = Path.Combine(SourceDirectory, @"DirForSearch\dir1");
var dir2 = Path.Combine(SourceDirectory, @"DirForSearch\dir2");
var dir1 = Path.Combine(SourceDirectory, "DirForSearch", "dir1");
var dir2 = Path.Combine(SourceDirectory, "DirForSearch", "dir2");
Directory.SetLastWriteTime(dir2, DateTime.Now.AddDays(-1));
Directory.SetLastWriteTime(dir1, DateTime.Now);
var path = Path.Combine(SourceDirectory, @"DirForSearch\*\TextFile1.txt");
var path = Path.Combine(SourceDirectory, "DirForSearch", "*", "TextFile1.txt");
Assert.True(WildcardFileFinder.TryFind(path, out var result));
Assert.True(File.Exists(result));
Assert.True(File.Exists(result), result);
}

[Fact]
public void MultiMatchDir_order2()
{
var dir1 = Path.Combine(SourceDirectory, @"DirForSearch\dir1");
var dir2 = Path.Combine(SourceDirectory, @"DirForSearch\dir2");
var dir1 = Path.Combine(SourceDirectory, "DirForSearch", "dir1");
var dir2 = Path.Combine(SourceDirectory, "DirForSearch", "dir2");
Directory.SetLastWriteTime(dir1, DateTime.Now.AddDays(-1));
Directory.SetLastWriteTime(dir2, DateTime.Now);
var path = Path.Combine(SourceDirectory, @"DirForSearch\*\TextFile1.txt");
var path = Path.Combine(SourceDirectory, "DirForSearch", "*", "TextFile1.txt");
Assert.True(WildcardFileFinder.TryFind(path, out var result));
Assert.True(File.Exists(result));
Assert.True(File.Exists(result), result);
}

[Fact]
public void FullFilePath()
{
Assert.True(WildcardFileFinder.TryFind(SourceFile, out var result));
Assert.True(File.Exists(result));
Assert.True(File.Exists(result), result);
}

[Fact]
Expand All @@ -44,29 +44,29 @@ public void FullFilePath_missing()
Assert.Null(result);
}

[Fact]
public void WildCardInFile()
{
var path = Path.Combine(SourceDirectory, "WildcardFileFinder*.cs");
Assert.True(WildcardFileFinder.TryFind(path, out var result));
Assert.True(File.Exists(result));
}
//[Fact]
//public void WildCardInFile()
//{
// var path = Path.Combine(SourceDirectory, "WildcardFileFinder*.cs");
// Assert.True(WildcardFileFinder.TryFind(path, out var result));
// Assert.True(File.Exists(result));
//}

[Fact]
public void WildCardInFile_missing()
{
var path = Path.Combine(SourceDirectory, "WildcardFileFinder*.foo");
Assert.False(WildcardFileFinder.TryFind(path, out var result));
Assert.Null(result);
}
//[Fact]
//public void WildCardInFile_missing()
//{
// var path = Path.Combine(SourceDirectory, "WildcardFileFinder*.foo");
// Assert.False(WildcardFileFinder.TryFind(path, out var result));
// Assert.Null(result);
//}

[Fact]
public void WildCardInDir()
{
var directory = SourceDirectory.Replace("DiffEngine.Tests", "Diff*.Tests");
var path = Path.Combine(directory, "WildcardFileFinderTests.cs");
Assert.True(WildcardFileFinder.TryFind(path, out var result));
//Assert.True(File.Exists(result));
Assert.True(File.Exists(result), result);
}

[Fact]
Expand Down
88 changes: 51 additions & 37 deletions src/DiffEngine/WildcardFileFinder.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using System;
using System.Collections.Generic;
using System.Diagnostics.CodeAnalysis;
using System.IO;
using System.Linq;
Expand All @@ -11,66 +12,79 @@ static class WildcardFileFinder
Path.AltDirectorySeparatorChar
};

public static bool TryFind(string path, [NotNullWhen(true)] out string? result)
static IEnumerable<string> EnumerateDirectories(string directory)
{
var expanded = Environment.ExpandEnvironmentVariables(path);
if (path.Contains('*'))
var expanded = Environment.ExpandEnvironmentVariables(directory);
if (!directory.Contains('*'))
{
if (Directory.Exists(directory))
{
return new List<string> {directory};
}
}

var segments = expanded.Split(separators);
var currentSearchRoots = new List<string>{segments[0] + Path.DirectorySeparatorChar};
foreach (var segment in segments.Skip(1))
{
var directoryPart = Path.GetDirectoryName(expanded);
var filePart = Path.GetFileName(expanded);
var segments = directoryPart.Split(separators);
var currentPath = segments[0] + Path.DirectorySeparatorChar;
foreach (var segment in segments.Skip(1))
var newSearchRoots = new List<string>();
foreach (var searchRoot in currentSearchRoots)
{
if (segment.Contains('*'))
{
currentPath = Directory.EnumerateDirectories(currentPath, segment)
.OrderByDescending(Directory.GetLastWriteTime)
.FirstOrDefault();
if (currentPath == null)
{
result = null;
return false;
}
newSearchRoots.AddRange(Directory.EnumerateDirectories(searchRoot, segment)
.OrderByDescending(Directory.GetLastWriteTime));
}
else
{
currentPath = Path.Combine(currentPath, segment);
if (!Directory.Exists(currentPath))
var newSearchRoot = Path.Combine(searchRoot, segment);
if (Directory.Exists(newSearchRoot))
{
result = null;
return false;
newSearchRoots.Add(newSearchRoot);
}
}
}

if (filePart.Contains('*'))
if (!newSearchRoots.Any())
{
currentPath = Directory.EnumerateFiles(currentPath, filePart).FirstOrDefault();
if (currentPath != null)
{
result = currentPath;
return true;
}
return Enumerable.Empty<string>();
}
else
currentSearchRoots = newSearchRoots;
}

return currentSearchRoots;
}

public static bool TryFind(string path, [NotNullWhen(true)] out string? result)
{
var expanded = Environment.ExpandEnvironmentVariables(path);
if (!path.Contains('*'))
{
if (File.Exists(expanded))
{
currentPath = Path.Combine(currentPath, filePart);
if (File.Exists(currentPath))
{
result = currentPath;
return true;
}
result = expanded;
return true;
}

result = null;
return false;
}

if (File.Exists(expanded))
var filePart = Path.GetFileName(expanded);
var directoryPart = Path.GetDirectoryName(expanded);
foreach (var directory in EnumerateDirectories(directoryPart))
{
result = expanded;
return true;
if (filePart.Contains('*'))
{
throw new Exception("Wildcard in file part currently not supported.");
}

var filePath = Path.Combine(directory, filePart);
if (File.Exists(filePath))
{
result = filePath;
return true;
}
}

result = null;
Expand Down