From 084f81fc8d20617e376c8d6af10b8fdbd69bc8be Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Tue, 28 Oct 2025 10:23:57 +0000 Subject: [PATCH] Format code with CSharpier --- .../Archives/GZip/GZipArchive.cs | 6 ++- src/SharpCompress/Archives/Tar/TarArchive.cs | 6 ++- src/SharpCompress/Archives/Zip/ZipArchive.cs | 6 ++- .../GZip/GZipArchiveDirectoryTests.cs | 7 +-- .../GZip/GZipWriterDirectoryTests.cs | 5 +- .../Tar/TarArchiveDirectoryTests.cs | 53 +++++++++++-------- .../Tar/TarWriterDirectoryTests.cs | 52 ++++++++++++++---- .../Zip/ZipArchiveDirectoryTests.cs | 53 +++++++++++-------- .../Zip/ZipWriterDirectoryTests.cs | 34 ++++++++---- 9 files changed, 146 insertions(+), 76 deletions(-) diff --git a/src/SharpCompress/Archives/GZip/GZipArchive.cs b/src/SharpCompress/Archives/GZip/GZipArchive.cs index 4e8bfe6d..34e4c648 100644 --- a/src/SharpCompress/Archives/GZip/GZipArchive.cs +++ b/src/SharpCompress/Archives/GZip/GZipArchive.cs @@ -185,8 +185,10 @@ public class GZipArchive : AbstractWritableArchive 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, diff --git a/src/SharpCompress/Archives/Tar/TarArchive.cs b/src/SharpCompress/Archives/Tar/TarArchive.cs index 2df03425..2754fd9b 100644 --- a/src/SharpCompress/Archives/Tar/TarArchive.cs +++ b/src/SharpCompress/Archives/Tar/TarArchive.cs @@ -224,8 +224,10 @@ public class TarArchive : AbstractWritableArchive 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, diff --git a/src/SharpCompress/Archives/Zip/ZipArchive.cs b/src/SharpCompress/Archives/Zip/ZipArchive.cs index 6d60bae0..57db85c2 100644 --- a/src/SharpCompress/Archives/Zip/ZipArchive.cs +++ b/src/SharpCompress/Archives/Zip/ZipArchive.cs @@ -372,8 +372,10 @@ public class ZipArchive : AbstractWritableArchive 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(); diff --git a/tests/SharpCompress.Test/GZip/GZipArchiveDirectoryTests.cs b/tests/SharpCompress.Test/GZip/GZipArchiveDirectoryTests.cs index 446e35b4..201effcb 100644 --- a/tests/SharpCompress.Test/GZip/GZipArchiveDirectoryTests.cs +++ b/tests/SharpCompress.Test/GZip/GZipArchiveDirectoryTests.cs @@ -11,8 +11,9 @@ public class GZipArchiveDirectoryTests : TestBase public void GZipArchive_AddDirectoryEntry_ThrowsNotSupportedException() { using var archive = GZipArchive.Create(); - - Assert.Throws(() => - archive.AddDirectoryEntry("test-dir", DateTime.Now)); + + Assert.Throws(() => + archive.AddDirectoryEntry("test-dir", DateTime.Now) + ); } } diff --git a/tests/SharpCompress.Test/GZip/GZipWriterDirectoryTests.cs b/tests/SharpCompress.Test/GZip/GZipWriterDirectoryTests.cs index 5c99db0b..5d51c441 100644 --- a/tests/SharpCompress.Test/GZip/GZipWriterDirectoryTests.cs +++ b/tests/SharpCompress.Test/GZip/GZipWriterDirectoryTests.cs @@ -13,8 +13,7 @@ public class GZipWriterDirectoryTests : TestBase { using var memoryStream = new MemoryStream(); using var writer = new GZipWriter(memoryStream, new GZipWriterOptions()); - - Assert.Throws(() => - writer.WriteDirectory("test-dir", DateTime.Now)); + + Assert.Throws(() => writer.WriteDirectory("test-dir", DateTime.Now)); } } diff --git a/tests/SharpCompress.Test/Tar/TarArchiveDirectoryTests.cs b/tests/SharpCompress.Test/Tar/TarArchiveDirectoryTests.cs index 5a73ee70..3046246d 100644 --- a/tests/SharpCompress.Test/Tar/TarArchiveDirectoryTests.cs +++ b/tests/SharpCompress.Test/Tar/TarArchiveDirectoryTests.cs @@ -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(() => - archive.AddDirectoryEntry("test-dir", DateTime.Now)); + + Assert.Throws(() => archive.AddDirectoryEntry("test-dir", DateTime.Now)); } } diff --git a/tests/SharpCompress.Test/Tar/TarWriterDirectoryTests.cs b/tests/SharpCompress.Test/Tar/TarWriterDirectoryTests.cs index 3a06f445..e0b5d821 100644 --- a/tests/SharpCompress.Test/Tar/TarWriterDirectoryTests.cs +++ b/tests/SharpCompress.Test/Tar/TarWriterDirectoryTests.cs @@ -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); } diff --git a/tests/SharpCompress.Test/Zip/ZipArchiveDirectoryTests.cs b/tests/SharpCompress.Test/Zip/ZipArchiveDirectoryTests.cs index 373f5e8b..45bab5e3 100644 --- a/tests/SharpCompress.Test/Zip/ZipArchiveDirectoryTests.cs +++ b/tests/SharpCompress.Test/Zip/ZipArchiveDirectoryTests.cs @@ -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(() => - archive.AddDirectoryEntry("test-dir", DateTime.Now)); + + Assert.Throws(() => archive.AddDirectoryEntry("test-dir", DateTime.Now)); } } diff --git a/tests/SharpCompress.Test/Zip/ZipWriterDirectoryTests.cs b/tests/SharpCompress.Test/Zip/ZipWriterDirectoryTests.cs index 92261e81..a3b2788e 100644 --- a/tests/SharpCompress.Test/Zip/ZipWriterDirectoryTests.cs +++ b/tests/SharpCompress.Test/Zip/ZipWriterDirectoryTests.cs @@ -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); }