starred/sharpcompress
1
0
Fork 0
mirror of https://github.com/adamhathcock/sharpcompress.git synced 2026-09-23 15:34:34 +00:00
Code Issues 975 Packages Projects Releases 25 Wiki Activity

more refactoring

Browse Source
This commit is contained in:
Adam Hathcock
2026-01-15 12:20:35 +00:00
parent 779fba5deb
commit 85b28dfe68
7 changed files with 28 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/SharpCompress/Archives/GZip/GZipArchive.Factory.cs
View File

@@ -16,8 +16,8 @@ namespace SharpCompress.Archives.GZip;
public partial class GZipArchive
#if NET8_0_OR_GREATER
: IArchiveOpenable<IWritableArchive, IWritableAsyncArchive>,
IMultiArchiveOpenable<IWritableArchive, IWritableAsyncArchive>
: IWritableArchiveOpenable,
IMultiArchiveOpenable<IWritableArchive, IWritableAsyncArchive>
#endif
{
public static IWritableAsyncArchive OpenAsyncArchive(
@@ -141,7 +141,9 @@ public partial class GZipArchive
return (IWritableAsyncArchive)OpenArchive(fileInfos, readerOptions);
}
public static GZipArchive CreateArchive() => new();
public static IWritableArchive CreateArchive() => new GZipArchive();
public static IWritableAsyncArchive CreateAsyncArchive() => new GZipArchive();
public static bool IsGZipFile(string filePath) => IsGZipFile(new FileInfo(filePath));

1
src/SharpCompress/Archives/IArchiveOpenable.cs
View File

@@ -36,4 +36,5 @@ public interface IArchiveOpenable<TSync, TASync>
CancellationToken cancellationToken = default
);
}
#endif

10
src/SharpCompress/Archives/IWritableArchiveOpenable.cs Normal file
View File

@@ -0,0 +1,10 @@
#if NET8_0_OR_GREATER
namespace SharpCompress.Archives;
public interface IWritableArchiveOpenable
: IArchiveOpenable<IWritableArchive, IWritableAsyncArchive>
{
public static abstract IWritableArchive CreateArchive();
public static abstract IWritableAsyncArchive CreateAsyncArchive();
}
#endif

8
src/SharpCompress/Archives/Tar/TarArchive.Factory.cs
View File

@@ -16,8 +16,8 @@ namespace SharpCompress.Archives.Tar;
public partial class TarArchive
#if NET8_0_OR_GREATER
: IArchiveOpenable<IWritableArchive, IWritableAsyncArchive>,
IMultiArchiveOpenable<IWritableArchive, IWritableAsyncArchive>
: IWritableArchiveOpenable,
IMultiArchiveOpenable<IWritableArchive, IWritableAsyncArchive>
#endif
{
public static IWritableArchive OpenArchive(string filePath, ReaderOptions? readerOptions = null)
@@ -165,5 +165,7 @@ public partial class TarArchive
return false;
}
public static TarArchive CreateArchive() => new();
public static IWritableArchive CreateArchive() => new TarArchive();
public static IWritableAsyncArchive CreateAsyncArchive() => new TarArchive();
}

8
src/SharpCompress/Archives/Zip/ZipArchive.Factory.cs
View File

@@ -14,8 +14,8 @@ namespace SharpCompress.Archives.Zip;
public partial class ZipArchive
#if NET8_0_OR_GREATER
: IArchiveOpenable<IWritableArchive, IWritableAsyncArchive>,
IMultiArchiveOpenable<IWritableArchive, IWritableAsyncArchive>
: IWritableArchiveOpenable,
IMultiArchiveOpenable<IWritableArchive, IWritableAsyncArchive>
#endif
{
public static IWritableArchive OpenArchive(string filePath, ReaderOptions? readerOptions = null)
@@ -266,7 +266,9 @@ public partial class ZipArchive
}
}
public static ZipArchive CreateArchive() => new();
public static IWritableArchive CreateArchive() => new ZipArchive();
public static IWritableAsyncArchive CreateAsyncArchive() => new ZipArchive();
public static async ValueTask<bool> IsZipMultiAsync(
Stream stream,

2
tests/SharpCompress.Test/Tar/TarArchiveAsyncTests.cs
View File

@@ -137,7 +137,7 @@ public class TarArchiveAsyncTests : ArchiveTests
var scratchPath = Path.Combine(SCRATCH_FILES_PATH, "Tar.tar");
var unmodified = Path.Combine(TEST_ARCHIVES_PATH, "Tar.noEmptyDirs.tar");
using (var archive = TarArchive.CreateArchive())
using (var archive = TarArchive.CreateAsyncArchive())
{
archive.AddAllFromDirectory(ORIGINAL_FILES_PATH);
var twopt = new TarWriterOptions(CompressionType.None, true);

2
tests/SharpCompress.Test/Zip/ZipArchiveAsyncTests.cs
View File

@@ -167,7 +167,7 @@ public class ZipArchiveAsyncTests : ArchiveTests
var scratchPath = Path.Combine(SCRATCH_FILES_PATH, "Zip.deflate.noEmptyDirs.zip");
var unmodified = Path.Combine(TEST_ARCHIVES_PATH, "Zip.deflate.noEmptyDirs.zip");
using (ZipArchive archive = ZipArchive.CreateArchive())
using (var archive = ZipArchive.CreateAsyncArchive())
{
archive.DeflateCompressionLevel = CompressionLevel.BestSpeed;
archive.AddAllFromDirectory(ORIGINAL_FILES_PATH);