starred/sharpcompress
1
0
Fork 0
mirror of https://github.com/adamhathcock/sharpcompress.git synced 2026-07-20 07:55:49 +00:00
Code Issues 975 Packages Projects Releases 25 Wiki Activity

Format code with CSharpier

Browse Source
This commit is contained in:
copilot-swe-agent[bot]
2025-10-28 10:23:57 +00:00
parent d148f36e87
commit 084f81fc8d
9 changed files with 146 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/SharpCompress/Archives/GZip/GZipArchive.cs
View File

@@ -185,8 +185,10 @@ public class GZipArchive : AbstractWritableArchive<GZipArchiveEntry, GZipVolume>
return new GZipWritableArchiveEntry(this, source, filePath, size, modified, closeStream);
}
protected override GZipArchiveEntry CreateDirectoryEntry(string directoryPath, DateTime? modified) =>
throw new NotSupportedException("GZip archives do not support directory entries.");
protected override GZipArchiveEntry CreateDirectoryEntry(
string directoryPath,
DateTime? modified
) => throw new NotSupportedException("GZip archives do not support directory entries.");
protected override void SaveTo(
Stream stream,

6
src/SharpCompress/Archives/Tar/TarArchive.cs
View File

@@ -224,8 +224,10 @@ public class TarArchive : AbstractWritableArchive<TarArchiveEntry, TarVolume>
closeStream
);
protected override TarArchiveEntry CreateDirectoryEntry(string directoryPath, DateTime? modified) =>
new TarWritableArchiveEntry(this, directoryPath, modified);
protected override TarArchiveEntry CreateDirectoryEntry(
string directoryPath,
DateTime? modified
) => new TarWritableArchiveEntry(this, directoryPath, modified);
protected override void SaveTo(
Stream stream,

6
src/SharpCompress/Archives/Zip/ZipArchive.cs
View File

@@ -372,8 +372,10 @@ public class ZipArchive : AbstractWritableArchive<ZipArchiveEntry, ZipVolume>
bool closeStream
) => new ZipWritableArchiveEntry(this, source, filePath, size, modified, closeStream);
protected override ZipArchiveEntry CreateDirectoryEntry(string directoryPath, DateTime? modified) =>
new ZipWritableArchiveEntry(this, directoryPath, modified);
protected override ZipArchiveEntry CreateDirectoryEntry(
string directoryPath,
DateTime? modified
) => new ZipWritableArchiveEntry(this, directoryPath, modified);
public static ZipArchive Create() => new();

7
tests/SharpCompress.Test/GZip/GZipArchiveDirectoryTests.cs
View File

@@ -11,8 +11,9 @@ public class GZipArchiveDirectoryTests : TestBase
public void GZipArchive_AddDirectoryEntry_ThrowsNotSupportedException()
{
using var archive = GZipArchive.Create();
Assert.Throws<NotSupportedException>(() =>
archive.AddDirectoryEntry("test-dir", DateTime.Now));
Assert.Throws<NotSupportedException>(() =>
archive.AddDirectoryEntry("test-dir", DateTime.Now)
);
}
}

5
tests/SharpCompress.Test/GZip/GZipWriterDirectoryTests.cs
View File

@@ -13,8 +13,7 @@ public class GZipWriterDirectoryTests : TestBase
{
using var memoryStream = new MemoryStream();
using var writer = new GZipWriter(memoryStream, new GZipWriterOptions());
Assert.Throws<NotSupportedException>(() =>
writer.WriteDirectory("test-dir", DateTime.Now));
Assert.Throws<NotSupportedException>(() => writer.WriteDirectory("test-dir", DateTime.Now));
}
}

53
tests/SharpCompress.Test/Tar/TarArchiveDirectoryTests.cs
View File

@@ -13,9 +13,9 @@ public class TarArchiveDirectoryTests : TestBase
public void TarArchive_AddDirectoryEntry_CreatesDirectoryEntry()
{
using var archive = TarArchive.Create();
archive.AddDirectoryEntry("test-dir", DateTime.Now);
var entries = archive.Entries.ToList();
Assert.Single(entries);
Assert.Equal("test-dir", entries[0].Key);
@@ -26,11 +26,11 @@ public class TarArchiveDirectoryTests : TestBase
public void TarArchive_AddDirectoryEntry_MultipleDirectories()
{
using var archive = TarArchive.Create();
archive.AddDirectoryEntry("dir1", DateTime.Now);
archive.AddDirectoryEntry("dir2", DateTime.Now);
archive.AddDirectoryEntry("dir1/subdir", DateTime.Now);
var entries = archive.Entries.OrderBy(e => e.Key).ToList();
Assert.Equal(3, entries.Count);
Assert.True(entries.All(e => e.IsDirectory));
@@ -40,14 +40,16 @@ public class TarArchiveDirectoryTests : TestBase
public void TarArchive_AddDirectoryEntry_MixedWithFiles()
{
using var archive = TarArchive.Create();
archive.AddDirectoryEntry("dir1", DateTime.Now);
using var contentStream = new MemoryStream(System.Text.Encoding.UTF8.GetBytes("test content"));
using var contentStream = new MemoryStream(
System.Text.Encoding.UTF8.GetBytes("test content")
);
archive.AddEntry("dir1/file.txt", contentStream, false, contentStream.Length, DateTime.Now);
archive.AddDirectoryEntry("dir2", DateTime.Now);
var entries = archive.Entries.OrderBy(e => e.Key).ToList();
Assert.Equal(3, entries.Count);
Assert.True(entries[0].IsDirectory);
@@ -59,32 +61,40 @@ public class TarArchiveDirectoryTests : TestBase
public void TarArchive_AddDirectoryEntry_SaveAndReload()
{
var scratchPath = Path.Combine(SCRATCH_FILES_PATH, "tar-directory-test.tar");
using (var archive = TarArchive.Create())
{
archive.AddDirectoryEntry("dir1", DateTime.Now);
archive.AddDirectoryEntry("dir2", DateTime.Now);
using var contentStream = new MemoryStream(System.Text.Encoding.UTF8.GetBytes("test content"));
archive.AddEntry("dir1/file.txt", contentStream, false, contentStream.Length, DateTime.Now);
using var contentStream = new MemoryStream(
System.Text.Encoding.UTF8.GetBytes("test content")
);
archive.AddEntry(
"dir1/file.txt",
contentStream,
false,
contentStream.Length,
DateTime.Now
);
using (var fileStream = File.Create(scratchPath))
{
archive.SaveTo(fileStream, CompressionType.None);
}
}
using (var archive = TarArchive.Open(scratchPath))
{
var entries = archive.Entries.OrderBy(e => e.Key).ToList();
Assert.Equal(3, entries.Count);
Assert.Equal("dir1/", entries[0].Key);
Assert.True(entries[0].IsDirectory);
Assert.Equal("dir1/file.txt", entries[1].Key);
Assert.False(entries[1].IsDirectory);
Assert.Equal("dir2/", entries[2].Key);
Assert.True(entries[2].IsDirectory);
}
@@ -94,10 +104,9 @@ public class TarArchiveDirectoryTests : TestBase
public void TarArchive_AddDirectoryEntry_DuplicateKey_ThrowsException()
{
using var archive = TarArchive.Create();
archive.AddDirectoryEntry("test-dir", DateTime.Now);
Assert.Throws<ArchiveException>(() =>
archive.AddDirectoryEntry("test-dir", DateTime.Now));
Assert.Throws<ArchiveException>(() => archive.AddDirectoryEntry("test-dir", DateTime.Now));
}
}

52
tests/SharpCompress.Test/Tar/TarWriterDirectoryTests.cs
View File

@@ -14,7 +14,12 @@ public class TarWriterDirectoryTests : TestBase
public void TarWriter_WriteDirectory_CreatesDirectoryEntry()
{
using var memoryStream = new MemoryStream();
using (var writer = new TarWriter(memoryStream, new TarWriterOptions(CompressionType.None, true)))
using (
var writer = new TarWriter(
memoryStream,
new TarWriterOptions(CompressionType.None, true)
)
)
{
writer.WriteDirectory("test-dir", DateTime.Now);
}
@@ -32,7 +37,12 @@ public class TarWriterDirectoryTests : TestBase
public void TarWriter_WriteDirectory_WithTrailingSlash()
{
using var memoryStream = new MemoryStream();
using (var writer = new TarWriter(memoryStream, new TarWriterOptions(CompressionType.None, true)))
using (
var writer = new TarWriter(
memoryStream,
new TarWriterOptions(CompressionType.None, true)
)
)
{
writer.WriteDirectory("test-dir/", DateTime.Now);
}
@@ -50,7 +60,12 @@ public class TarWriterDirectoryTests : TestBase
public void TarWriter_WriteDirectory_WithBackslash()
{
using var memoryStream = new MemoryStream();
using (var writer = new TarWriter(memoryStream, new TarWriterOptions(CompressionType.None, true)))
using (
var writer = new TarWriter(
memoryStream,
new TarWriterOptions(CompressionType.None, true)
)
)
{
writer.WriteDirectory("test-dir\\subdir", DateTime.Now);
}
@@ -68,14 +83,19 @@ public class TarWriterDirectoryTests : TestBase
public void TarWriter_WriteDirectory_EmptyString_IsSkipped()
{
using var memoryStream = new MemoryStream();
using (var writer = new TarWriter(memoryStream, new TarWriterOptions(CompressionType.None, true)))
using (
var writer = new TarWriter(
memoryStream,
new TarWriterOptions(CompressionType.None, true)
)
)
{
writer.WriteDirectory("", DateTime.Now);
}
memoryStream.Position = 0;
using var archive = TarArchive.Open(memoryStream);
Assert.Empty(archive.Entries);
}
@@ -83,7 +103,12 @@ public class TarWriterDirectoryTests : TestBase
public void TarWriter_WriteDirectory_MultipleDirectories()
{
using var memoryStream = new MemoryStream();
using (var writer = new TarWriter(memoryStream, new TarWriterOptions(CompressionType.None, true)))
using (
var writer = new TarWriter(
memoryStream,
new TarWriterOptions(CompressionType.None, true)
)
)
{
writer.WriteDirectory("dir1", DateTime.Now);
writer.WriteDirectory("dir2", DateTime.Now);
@@ -107,13 +132,20 @@ public class TarWriterDirectoryTests : TestBase
public void TarWriter_WriteDirectory_MixedWithFiles()
{
using var memoryStream = new MemoryStream();
using (var writer = new TarWriter(memoryStream, new TarWriterOptions(CompressionType.None, true)))
using (
var writer = new TarWriter(
memoryStream,
new TarWriterOptions(CompressionType.None, true)
)
)
{
writer.WriteDirectory("dir1", DateTime.Now);
using var contentStream = new MemoryStream(System.Text.Encoding.UTF8.GetBytes("test content"));
using var contentStream = new MemoryStream(
System.Text.Encoding.UTF8.GetBytes("test content")
);
writer.Write("dir1/file.txt", contentStream, DateTime.Now);
writer.WriteDirectory("dir2", DateTime.Now);
}

53
tests/SharpCompress.Test/Zip/ZipArchiveDirectoryTests.cs
View File

@@ -13,9 +13,9 @@ public class ZipArchiveDirectoryTests : TestBase
public void ZipArchive_AddDirectoryEntry_CreatesDirectoryEntry()
{
using var archive = ZipArchive.Create();
archive.AddDirectoryEntry("test-dir", DateTime.Now);
var entries = archive.Entries.ToList();
Assert.Single(entries);
Assert.Equal("test-dir", entries[0].Key);
@@ -26,11 +26,11 @@ public class ZipArchiveDirectoryTests : TestBase
public void ZipArchive_AddDirectoryEntry_MultipleDirectories()
{
using var archive = ZipArchive.Create();
archive.AddDirectoryEntry("dir1", DateTime.Now);
archive.AddDirectoryEntry("dir2", DateTime.Now);
archive.AddDirectoryEntry("dir1/subdir", DateTime.Now);
var entries = archive.Entries.OrderBy(e => e.Key).ToList();
Assert.Equal(3, entries.Count);
Assert.True(entries.All(e => e.IsDirectory));
@@ -40,14 +40,16 @@ public class ZipArchiveDirectoryTests : TestBase
public void ZipArchive_AddDirectoryEntry_MixedWithFiles()
{
using var archive = ZipArchive.Create();
archive.AddDirectoryEntry("dir1", DateTime.Now);
using var contentStream = new MemoryStream(System.Text.Encoding.UTF8.GetBytes("test content"));
using var contentStream = new MemoryStream(
System.Text.Encoding.UTF8.GetBytes("test content")
);
archive.AddEntry("dir1/file.txt", contentStream, false, contentStream.Length, DateTime.Now);
archive.AddDirectoryEntry("dir2", DateTime.Now);
var entries = archive.Entries.OrderBy(e => e.Key).ToList();
Assert.Equal(3, entries.Count);
Assert.True(entries[0].IsDirectory);
@@ -59,32 +61,40 @@ public class ZipArchiveDirectoryTests : TestBase
public void ZipArchive_AddDirectoryEntry_SaveAndReload()
{
var scratchPath = Path.Combine(SCRATCH_FILES_PATH, "zip-directory-test.zip");
using (var archive = ZipArchive.Create())
{
archive.AddDirectoryEntry("dir1", DateTime.Now);
archive.AddDirectoryEntry("dir2", DateTime.Now);
using var contentStream = new MemoryStream(System.Text.Encoding.UTF8.GetBytes("test content"));
archive.AddEntry("dir1/file.txt", contentStream, false, contentStream.Length, DateTime.Now);
using var contentStream = new MemoryStream(
System.Text.Encoding.UTF8.GetBytes("test content")
);
archive.AddEntry(
"dir1/file.txt",
contentStream,
false,
contentStream.Length,
DateTime.Now
);
using (var fileStream = File.Create(scratchPath))
{
archive.SaveTo(fileStream, CompressionType.Deflate);
}
}
using (var archive = ZipArchive.Open(scratchPath))
{
var entries = archive.Entries.OrderBy(e => e.Key).ToList();
Assert.Equal(3, entries.Count);
Assert.Equal("dir1/", entries[0].Key);
Assert.True(entries[0].IsDirectory);
Assert.Equal("dir1/file.txt", entries[1].Key);
Assert.False(entries[1].IsDirectory);
Assert.Equal("dir2/", entries[2].Key);
Assert.True(entries[2].IsDirectory);
}
@@ -94,10 +104,9 @@ public class ZipArchiveDirectoryTests : TestBase
public void ZipArchive_AddDirectoryEntry_DuplicateKey_ThrowsException()
{
using var archive = ZipArchive.Create();
archive.AddDirectoryEntry("test-dir", DateTime.Now);
Assert.Throws<ArchiveException>(() =>
archive.AddDirectoryEntry("test-dir", DateTime.Now));
Assert.Throws<ArchiveException>(() => archive.AddDirectoryEntry("test-dir", DateTime.Now));
}
}

34
tests/SharpCompress.Test/Zip/ZipWriterDirectoryTests.cs
View File

@@ -14,7 +14,9 @@ public class ZipWriterDirectoryTests : TestBase
public void ZipWriter_WriteDirectory_CreatesDirectoryEntry()
{
using var memoryStream = new MemoryStream();
using (var writer = new ZipWriter(memoryStream, new ZipWriterOptions(CompressionType.Deflate)))
using (
var writer = new ZipWriter(memoryStream, new ZipWriterOptions(CompressionType.Deflate))
)
{
writer.WriteDirectory("test-dir", DateTime.Now);
}
@@ -32,7 +34,9 @@ public class ZipWriterDirectoryTests : TestBase
public void ZipWriter_WriteDirectory_WithTrailingSlash()
{
using var memoryStream = new MemoryStream();
using (var writer = new ZipWriter(memoryStream, new ZipWriterOptions(CompressionType.Deflate)))
using (
var writer = new ZipWriter(memoryStream, new ZipWriterOptions(CompressionType.Deflate))
)
{
writer.WriteDirectory("test-dir/", DateTime.Now);
}
@@ -50,7 +54,9 @@ public class ZipWriterDirectoryTests : TestBase
public void ZipWriter_WriteDirectory_WithBackslash()
{
using var memoryStream = new MemoryStream();
using (var writer = new ZipWriter(memoryStream, new ZipWriterOptions(CompressionType.Deflate)))
using (
var writer = new ZipWriter(memoryStream, new ZipWriterOptions(CompressionType.Deflate))
)
{
writer.WriteDirectory("test-dir\\subdir", DateTime.Now);
}
@@ -68,14 +74,16 @@ public class ZipWriterDirectoryTests : TestBase
public void ZipWriter_WriteDirectory_EmptyString_IsSkipped()
{
using var memoryStream = new MemoryStream();
using (var writer = new ZipWriter(memoryStream, new ZipWriterOptions(CompressionType.Deflate)))
using (
var writer = new ZipWriter(memoryStream, new ZipWriterOptions(CompressionType.Deflate))
)
{
writer.WriteDirectory("", DateTime.Now);
}
memoryStream.Position = 0;
using var archive = ZipArchive.Open(memoryStream);
Assert.Empty(archive.Entries);
}
@@ -83,7 +91,9 @@ public class ZipWriterDirectoryTests : TestBase
public void ZipWriter_WriteDirectory_MultipleDirectories()
{
using var memoryStream = new MemoryStream();
using (var writer = new ZipWriter(memoryStream, new ZipWriterOptions(CompressionType.Deflate)))
using (
var writer = new ZipWriter(memoryStream, new ZipWriterOptions(CompressionType.Deflate))
)
{
writer.WriteDirectory("dir1", DateTime.Now);
writer.WriteDirectory("dir2", DateTime.Now);
@@ -107,13 +117,17 @@ public class ZipWriterDirectoryTests : TestBase
public void ZipWriter_WriteDirectory_MixedWithFiles()
{
using var memoryStream = new MemoryStream();
using (var writer = new ZipWriter(memoryStream, new ZipWriterOptions(CompressionType.Deflate)))
using (
var writer = new ZipWriter(memoryStream, new ZipWriterOptions(CompressionType.Deflate))
)
{
writer.WriteDirectory("dir1", DateTime.Now);
using var contentStream = new MemoryStream(System.Text.Encoding.UTF8.GetBytes("test content"));
using var contentStream = new MemoryStream(
System.Text.Encoding.UTF8.GetBytes("test content")
);
writer.Write("dir1/file.txt", contentStream, DateTime.Now);
writer.WriteDirectory("dir2", DateTime.Now);
}