Skip to content

Skip enumeration entirely for excluded directories #34

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
rameel merged 1 commit into from
Jul 31, 2025
Merged

Skip enumeration entirely for excluded directories #34

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
39 changes: 24 additions & 15 deletions src/Ramstack.FileSystem.Globbing/GlobbingDirectory.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,18 +56,21 @@ protected override ValueTask DeleteCoreAsync(CancellationToken cancellationToken
/// <inheritdoc />
protected override async IAsyncEnumerable<VirtualNode> GetFileNodesCoreAsync([EnumeratorCancellation] CancellationToken cancellationToken)
{
await foreach (var node in _directory.GetFileNodesAsync(cancellationToken).ConfigureAwait(false))
if (_included)
{
if (!_fs.IsExcluded(node.FullName))
await foreach (var node in _directory.GetFileNodesAsync(cancellationToken).ConfigureAwait(false))
{
if (node is VirtualFile file)
{
if (_fs.IsIncluded(node.FullName))
yield return new GlobbingFile(_fs, file, true);
}
else
if (!_fs.IsExcluded(node.FullName))
{
yield return new GlobbingDirectory(_fs, (VirtualDirectory)node, true);
if (node is VirtualFile file)
{
if (_fs.IsIncluded(node.FullName))
yield return new GlobbingFile(_fs, file, true);
}
else
{
yield return new GlobbingDirectory(_fs, (VirtualDirectory)node, true);
}
}
}
}
Expand All @@ -76,20 +79,26 @@ protected override async IAsyncEnumerable<VirtualNode> GetFileNodesCoreAsync([En
/// <inheritdoc />
protected override async IAsyncEnumerable<VirtualFile> GetFilesCoreAsync([EnumeratorCancellation] CancellationToken cancellationToken)
{
await foreach (var file in _directory.GetFilesAsync(cancellationToken).ConfigureAwait(false))
if (_included)
{
if (_fs.IsFileIncluded(file.FullName))
yield return new GlobbingFile(_fs, file, true);
await foreach (var file in _directory.GetFilesAsync(cancellationToken).ConfigureAwait(false))
{
if (_fs.IsFileIncluded(file.FullName))
yield return new GlobbingFile(_fs, file, true);
}
}
}

/// <inheritdoc />
protected override async IAsyncEnumerable<VirtualDirectory> GetDirectoriesCoreAsync([EnumeratorCancellation] CancellationToken cancellationToken)
{
await foreach (var directory in _directory.GetDirectoriesAsync(cancellationToken).ConfigureAwait(false))
if (_included)
{
if (_fs.IsDirectoryIncluded(directory.FullName))
yield return new GlobbingDirectory(_fs, directory, true);
await foreach (var directory in _directory.GetDirectoriesAsync(cancellationToken).ConfigureAwait(false))
{
if (_fs.IsDirectoryIncluded(directory.FullName))
yield return new GlobbingDirectory(_fs, directory, true);
}
}
}
}
51 changes: 51 additions & 0 deletions tests/Ramstack.FileSystem.Globbing.Tests/GlobingFileSystemTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,57 @@ public void Setup()
public void Cleanup() =>
_storage.Dispose();

[Test]
public async Task ExcludedDirectory_HasNoFileNodes()
{
using var storage = new TempFileStorage();
using var fs = new GlobbingFileSystem(new PhysicalFileSystem(storage.Root), "**", exclude: "/project/src/**");

var directories = new[]
{
"/project/src",
"/project/src/App",
"/project/src/Modules",
"/project/src/Modules/Module1",
"/project/src/Modules/Module1/Submodule",
"/project/src/Modules/Module2"
};

foreach (var path in directories)
{
var directory = fs.GetDirectory(path);

Assert.That(
await directory.ExistsAsync(),
Is.False);

Assert.That(
await directory.GetFileNodesAsync("**").CountAsync(),
Is.Zero);
}

var files = new[]
{
"/project/src/App/App.csproj",
"/project/src/App/Program.cs",
"/project/src/App/Utils.cs",
"/project/src/Modules/Module1/Module1.cs",
"/project/src/Modules/Module1/Module1.csproj",
"/project/src/Modules/Module1/Submodule/Submodule1.cs",
"/project/src/Modules/Module1/Submodule/Submodule2.cs",
"/project/src/Modules/Module1/Submodule/Submodule.csproj",
"/project/src/Modules/Module2/Module2.cs",
"/project/src/Modules/Module2/Module2.csproj",
"/project/src/App.sln"
};

foreach (var path in files)
{
var file = fs.GetFile(path);
Assert.That(await file.ExistsAsync(), Is.False);
}
}

protected override IVirtualFileSystem GetFileSystem()
{
var fs = new PhysicalFileSystem(_storage.Root);
Expand Down