Skip to content

fix: zipped file remains locked after ZipFile().CreateFromDirectory #766

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
merged 1 commit into from
Mar 13, 2025
Merged

fix: zipped file remains locked after ZipFile().CreateFromDirectory #766

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
6 changes: 4 additions & 2 deletions Source/Testably.Abstractions.Compression/Internal/ZipUtilities.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,8 @@ internal static void CreateFromDirectory(IFileSystem fileSystem,
? archive.CreateEntry(entryName, compressionLevel.Value)
: archive.CreateEntry(entryName);
using Stream stream = entry.Open();
fileInfo.OpenRead().CopyTo(stream);
using FileSystemStream fileStream = fileInfo.OpenRead();
fileStream.CopyTo(stream);
}
else if (file is IDirectoryInfo directoryInfo &&
directoryInfo.GetFileSystemInfos().Length == 0)
Expand Down Expand Up @@ -172,7 +173,8 @@ internal static void CreateFromDirectory(
? archive.CreateEntry(entryName, compressionLevel.Value)
: archive.CreateEntry(entryName);
using Stream stream = entry.Open();
fileInfo.OpenRead().CopyTo(stream);
using FileSystemStream fileStream = fileInfo.OpenRead();
fileStream.CopyTo(stream);
}
else if (file is IDirectoryInfo directoryInfo &&
directoryInfo.GetFileSystemInfos().Length == 0)
Expand Down
15 changes: 15 additions & 0 deletions Tests/Testably.Abstractions.Compression.Tests/ZipFile/CreateFromDirectoryTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -374,6 +374,21 @@ await That(FileSystem).HasFile("destination/bar/test.txt")
}
#endif

[Fact]
public async Task ShouldNotLock()
{
string directory = "ToBeZipped";
string archive = "zippedDirectory.zip";
FileSystem.Directory.CreateDirectory(directory);
FileSystem.File.WriteAllText(FileSystem.Path.Combine(directory, "file.txt"),
"Some content");
void Act() => FileSystem.Directory.Delete(directory, true);

FileSystem.ZipFile().CreateFromDirectory(directory, archive);

await That(Act).DoesNotThrow();
}

#region Helpers

#pragma warning disable MA0018
Expand Down
Loading