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
2 changes: 2 additions & 0 deletions Library/DiscUtils.Fat/Directory.cs
Original file line number Diff line number Diff line change
Expand Up @@ -471,6 +471,8 @@ private void LoadEntries()
{
AddEntryRaw(streamPos, entry);
}

_endOfEntries = _dirStream.Position;
}

// Record any pending free entry
Expand Down
70 changes: 69 additions & 1 deletion Tests/LibraryTests/Fat/FatFileSystemTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -608,4 +608,72 @@ public void CreateDirectoryWithExistingData()

Assert.Empty(entries);
}
}

[Fact]
public void CreateFilesInSubdirectoryUsingFatFileSystemPerFile()
{
using var diskStream = new SparseMemoryStream();

diskStream.Position = 0;
using (var fsFormat = FatFileSystem.FormatFloppy(diskStream, FloppyDiskType.HighDensity, "FLOPPY_IMG "))
{
fsFormat.CreateDirectory("dir");
}

for (var i = 0; i < 20; i++)
{
using (var fsCreate = new FatFileSystem(diskStream))
{
using (var fileStream = fsCreate.OpenFile($"dir{Path.DirectorySeparatorChar}file{i}.txt", FileMode.Create))
{
fileStream.Write(new byte[10]);
}
}
}

using var fsAssert = new FatFileSystem(diskStream);
{
var entries = fsAssert.GetFileSystemEntries("").ToList();
Assert.Single(entries);
Assert.Equal("dir", entries[0]);

entries = fsAssert.GetFileSystemEntries("dir").ToList();
Assert.Equal(20, entries.Count);
Assert.Equal(Enumerable.Range(0, 20).Select(i => $"dir\\file{i}.txt"), entries);
}
}

[Fact]
public void CreateFilesInSubdirectoryUsingOneFatFileSystem()
{
using var diskStream = new SparseMemoryStream();

diskStream.Position = 0;
using (var fsFormat = FatFileSystem.FormatFloppy(diskStream, FloppyDiskType.HighDensity, "FLOPPY_IMG "))
{
fsFormat.CreateDirectory("dir");
}

using (var fsCreate = new FatFileSystem(diskStream))
{
for (var i = 0; i < 20; i++)
{
using (var fileStream = fsCreate.OpenFile($"dir{Path.DirectorySeparatorChar}file{i}.txt", FileMode.Create))
{
fileStream.Write(new byte[10]);
}
}
}

using var fsAssert = new FatFileSystem(diskStream);
{
var entries = fsAssert.GetFileSystemEntries("").ToList();
Assert.Single(entries);
Assert.Equal("dir", entries[0]);

entries = fsAssert.GetFileSystemEntries("dir").ToList();
Assert.Equal(20, entries.Count);
Assert.Equal(Enumerable.Range(0, 20).Select(i => $"dir\\file{i}.txt"), entries);
}
}
}