Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
12 changes: 11 additions & 1 deletion Terminal.Gui/FileServices/FileSystemTreeBuilder.cs
Original file line number Diff line number Diff line change
Expand Up @@ -72,5 +72,15 @@ private IEnumerable<IFileSystemInfo> TryGetChildren (IFileSystemInfo entry)
}
}

internal static bool IsReparsePoint (IFileSystemInfo entry) => (entry.Attributes & FileAttributes.ReparsePoint) == FileAttributes.ReparsePoint;
internal static bool IsReparsePoint (IFileSystemInfo entry)
{
try
{
return (entry.Attributes & FileAttributes.ReparsePoint) == FileAttributes.ReparsePoint;
}
catch (Exception)
{
return false; // treat an unreadable entry as not a reparse point / not expandable
}
}
}
27 changes: 14 additions & 13 deletions Terminal.Gui/Views/FileDialogs/FileDialogState.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ namespace Terminal.Gui.Views;

internal class FileDialogState
{
private static readonly EnumerationOptions _ignoreInaccessibleEnumerationOptions = new () { IgnoreInaccessible = true };

public FileDialogState (IDirectoryInfo dir, FileDialog parent)
{
Parent = parent;
Expand Down Expand Up @@ -60,19 +62,7 @@ private void AddReadableChildren (List<FileSystemInfoStats> children, IDirectory
{
try
{
IEnumerable<IFileSystemInfo> entries;

// if directories only
if (Parent.OpenMode == OpenMode.Directory)
{
entries = dir.GetDirectories ();
}
else
{
entries = dir.GetFileSystemInfos ();
}

foreach (IFileSystemInfo entry in entries)
foreach (IFileSystemInfo entry in EnumerateReadableEntries (dir))
{
AddReadableChild (children, entry);
}
Expand All @@ -83,6 +73,17 @@ private void AddReadableChildren (List<FileSystemInfoStats> children, IDirectory
}
}

private IEnumerable<IFileSystemInfo> EnumerateReadableEntries (IDirectoryInfo dir)
{
// if directories only
if (Parent.OpenMode == OpenMode.Directory)
{
return dir.EnumerateDirectories ("*", _ignoreInaccessibleEnumerationOptions);
}

return dir.EnumerateFileSystemInfos ("*", _ignoreInaccessibleEnumerationOptions);
}

private void AddReadableChild (List<FileSystemInfoStats> children, IFileSystemInfo entry)
{
try
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
using System.IO.Abstractions;
using Moq;

namespace FileServicesTests;

public class FileSystemTreeBuilderTests
{
[Fact]
public void CanExpand_DirectoryWithUnreadableAttributes_DoesNotThrowAndReturnsFalse ()
{
Mock<IDirectoryInfo> directory = new ();
directory.SetupGet (d => d.Attributes).Throws (new UnauthorizedAccessException ("Access denied"));
directory.SetupGet (d => d.Exists).Returns (true);
directory.Setup (d => d.GetFileSystemInfos ()).Returns ([]);

FileSystemTreeBuilder builder = new ();

bool canExpand = builder.CanExpand (directory.Object);

Assert.False (canExpand);
}

[Fact]
public void GetChildren_DirectoryWithUnreadableAttributes_DoesNotThrowAndReturnsEmpty ()
{
Mock<IDirectoryInfo> directory = new ();
directory.SetupGet (d => d.Attributes).Throws (new UnauthorizedAccessException ("Access denied"));
directory.SetupGet (d => d.Exists).Returns (true);
directory.Setup (d => d.GetFileSystemInfos ()).Returns ([]);

FileSystemTreeBuilder builder = new ();

IEnumerable<IFileSystemInfo> children = builder.GetChildren (directory.Object);

Assert.Empty (children);
}
}
70 changes: 70 additions & 0 deletions Tests/UnitTestsParallelizable/Views/FileDialogResultTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -265,6 +265,10 @@ public void FileDialog_MixedMode_SkipsUnreadableEntry_AndKeepsReadableEntries ()
.Setup (d => d.GetFileSystemInfos ())
.Returns ([goodFile, badFile, goodDirectory]);

Mock.Get (directory)
.Setup (d => d.EnumerateFileSystemInfos ("*", It.IsAny<EnumerationOptions> ()))
.Returns ([goodFile, badFile, goodDirectory]);

using FileDialog fd = new TestableFileDialog (fileSystem);
fd.OpenMode = OpenMode.Mixed;

Expand All @@ -288,6 +292,10 @@ public void FileDialog_DirectoryMode_SkipsUnreadableDirectory_AndKeepsParentNavi
.Setup (d => d.GetDirectories ())
.Returns ([goodDirectory, badDirectory]);

Mock.Get (directory)
.Setup (d => d.EnumerateDirectories ("*", It.IsAny<EnumerationOptions> ()))
.Returns ([goodDirectory, badDirectory]);

using FileDialog fd = new TestableFileDialog (fileSystem);
fd.OpenMode = OpenMode.Directory;

Expand All @@ -299,6 +307,64 @@ public void FileDialog_DirectoryMode_SkipsUnreadableDirectory_AndKeepsParentNavi
Assert.DoesNotContain (fd.State.Children, c => c.Name == "bad-dir");
}

[Fact]
public void FileDialog_MixedMode_WhenEagerListingThrows_StillKeepsReadableEntries ()
{
IFileSystem fileSystem = CreateFileSystemWithDirectory (out IDirectoryInfo directory);
IFileInfo goodFile = CreateFile ("/testdir/good.txt", "good.txt");
IDirectoryInfo goodDirectory = CreateDirectory ("/testdir/good-dir", "good-dir", directory);

Mock.Get (directory)
.Setup (d => d.GetFileSystemInfos ())
.Throws (new UnauthorizedAccessException ());

Mock.Get (directory)
.Setup (d => d.EnumerateFileSystemInfos ())
.Returns ([goodFile, goodDirectory]);

Mock.Get (directory)
.Setup (d => d.EnumerateFileSystemInfos ("*", It.IsAny<EnumerationOptions> ()))
.Returns ([goodFile, goodDirectory]);

using FileDialog fd = new TestableFileDialog (fileSystem);
fd.OpenMode = OpenMode.Mixed;

fd.Path = "/testdir";

Assert.NotNull (fd.State);
Assert.Contains (fd.State!.Children, c => c.Name == "good.txt");
Assert.Contains (fd.State.Children, c => c.Name == "good-dir");
Assert.Contains (fd.State.Children, c => c.IsParent && c.Name == "..");
}

[Fact]
public void FileDialog_DirectoryMode_WhenEagerListingThrows_StillKeepsReadableDirectories ()
{
IFileSystem fileSystem = CreateFileSystemWithDirectory (out IDirectoryInfo directory);
IDirectoryInfo goodDirectory = CreateDirectory ("/testdir/good-dir", "good-dir", directory);

Mock.Get (directory)
.Setup (d => d.GetDirectories ())
.Throws (new UnauthorizedAccessException ());

Mock.Get (directory)
.Setup (d => d.EnumerateDirectories ())
.Returns ([goodDirectory]);

Mock.Get (directory)
.Setup (d => d.EnumerateDirectories ("*", It.IsAny<EnumerationOptions> ()))
.Returns ([goodDirectory]);

using FileDialog fd = new TestableFileDialog (fileSystem);
fd.OpenMode = OpenMode.Directory;

fd.Path = "/testdir";

Assert.NotNull (fd.State);
Assert.Contains (fd.State!.Children, c => c.Name == "good-dir");
Assert.Contains (fd.State.Children, c => c.IsParent && c.Name == "..");
}

[Fact]
public void FileDialog_Accepting_Directory_From_Table_Keeps_Path_On_Opened_Directory ()
{
Expand Down Expand Up @@ -418,6 +484,10 @@ private static Mock<IDirectoryInfo> CreateDirectoryMock (string fullName, string
directory.SetupGet (d => d.LastWriteTime).Returns (new DateTime (2026, 1, 1));
directory.Setup (d => d.GetFileSystemInfos ()).Returns ([]);
directory.Setup (d => d.GetDirectories ()).Returns ([]);
directory.Setup (d => d.EnumerateFileSystemInfos ()).Returns ([]);
directory.Setup (d => d.EnumerateDirectories ()).Returns ([]);
directory.Setup (d => d.EnumerateFileSystemInfos ("*", It.IsAny<EnumerationOptions> ())).Returns ([]);
directory.Setup (d => d.EnumerateDirectories ("*", It.IsAny<EnumerationOptions> ())).Returns ([]);

return directory;
}
Expand Down
Loading