diff --git a/src/SharpCompress/Common/Tar/TarReadOnlySubStream.cs b/src/SharpCompress/Common/Tar/TarReadOnlySubStream.cs index 88b28a22..f5c8924d 100644 --- a/src/SharpCompress/Common/Tar/TarReadOnlySubStream.cs +++ b/src/SharpCompress/Common/Tar/TarReadOnlySubStream.cs @@ -66,6 +66,11 @@ namespace SharpCompress.Common.Tar return read; } + public override Task ReadAsync(byte[] buffer, int offset, int count, CancellationToken cancellationToken) + { + throw new NotSupportedException(); + } + public override long Seek(long offset, SeekOrigin origin) { throw new NotSupportedException(); diff --git a/src/SharpCompress/Common/Zip/ZipFilePart.cs b/src/SharpCompress/Common/Zip/ZipFilePart.cs index fbb09132..e9624e62 100644 --- a/src/SharpCompress/Common/Zip/ZipFilePart.cs +++ b/src/SharpCompress/Common/Zip/ZipFilePart.cs @@ -73,10 +73,10 @@ namespace SharpCompress.Common.Zip { return new Deflate64Stream(stream, CompressionMode.Decompress); } - /** case ZipCompressionMethod.BZip2: + case ZipCompressionMethod.BZip2: { return await BZip2Stream.CreateAsync(stream, CompressionMode.Decompress, false, cancellationToken); - } */ + } case ZipCompressionMethod.LZMA: { if (FlagUtility.HasFlag(Header.Flags, HeaderFlags.Encrypted)) diff --git a/src/SharpCompress/Readers/ReaderFactory.cs b/src/SharpCompress/Readers/ReaderFactory.cs index f17e749e..f86545eb 100644 --- a/src/SharpCompress/Readers/ReaderFactory.cs +++ b/src/SharpCompress/Readers/ReaderFactory.cs @@ -56,7 +56,7 @@ namespace SharpCompress.Readers return GZipReader.Open(rewindableStream, options); } - /* rewindableStream.Rewind(false); + rewindableStream.Rewind(false); if (await BZip2Stream.IsBZip2Async(rewindableStream, cancellationToken)) { rewindableStream.Rewind(false); @@ -66,8 +66,8 @@ namespace SharpCompress.Readers rewindableStream.Rewind(true); return new TarReader(rewindableStream, options, CompressionType.BZip2); } - } */ - + } + rewindableStream.Rewind(false); if (await LZipStream.IsLZipFileAsync(rewindableStream)) { diff --git a/src/SharpCompress/Utility.cs b/src/SharpCompress/Utility.cs index 282573ec..219e631f 100644 --- a/src/SharpCompress/Utility.cs +++ b/src/SharpCompress/Utility.cs @@ -70,7 +70,7 @@ namespace SharpCompress return func(memory); } - public static async ValueTask ReadByteAsync(this Stream stream, CancellationToken cancellationToken) + public static async ValueTask ReadByteAsync(this Stream stream, CancellationToken cancellationToken = default) { return await stream.ReadPrimitive(x => x.Span[0], cancellationToken) ?? default; } diff --git a/src/SharpCompress/Writers/Tar/TarWriter.cs b/src/SharpCompress/Writers/Tar/TarWriter.cs index 3a7dc416..10a4833c 100644 --- a/src/SharpCompress/Writers/Tar/TarWriter.cs +++ b/src/SharpCompress/Writers/Tar/TarWriter.cs @@ -40,11 +40,11 @@ namespace SharpCompress.Writers.Tar { case CompressionType.None: break; - /* case CompressionType.BZip2: + case CompressionType.BZip2: { destination = await BZip2Stream.CreateAsync(destination, CompressionMode.Compress, false, cancellationToken); } - break; */ + break; case CompressionType.GZip: { destination = new GZipStream(destination, CompressionMode.Compress); diff --git a/src/SharpCompress/Writers/Zip/ZipWriter.cs b/src/SharpCompress/Writers/Zip/ZipWriter.cs index 2af446af..32b79046 100644 --- a/src/SharpCompress/Writers/Zip/ZipWriter.cs +++ b/src/SharpCompress/Writers/Zip/ZipWriter.cs @@ -333,10 +333,10 @@ namespace SharpCompress.Writers.Zip { return new DeflateStream(counting, CompressionMode.Compress, compressionLevel); } - /*case ZipCompressionMethod.BZip2: + case ZipCompressionMethod.BZip2: { return await BZip2Stream.CreateAsync(counting, CompressionMode.Compress, false, cancellationToken); - } */ + } case ZipCompressionMethod.LZMA: { await counting.WriteBytes(9, 20, 5, 0);