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

Enabling Bzip2 but something else is broken

Browse Source
This commit is contained in:
Adam Hathcock
2021-02-21 18:01:56 +00:00
parent dd710ec308
commit e08e4e5d9f
6 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/SharpCompress/Common/Tar/TarReadOnlySubStream.cs
View File

@@ -66,6 +66,11 @@ namespace SharpCompress.Common.Tar
return read;
}
public override Task<int> ReadAsync(byte[] buffer, int offset, int count, CancellationToken cancellationToken)
{
throw new NotSupportedException();
}
public override long Seek(long offset, SeekOrigin origin)
{
throw new NotSupportedException();

4
src/SharpCompress/Common/Zip/ZipFilePart.cs
View File

@@ -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))

6
src/SharpCompress/Readers/ReaderFactory.cs
View File

@@ -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))
{

2
src/SharpCompress/Utility.cs
View File

@@ -70,7 +70,7 @@ namespace SharpCompress
return func(memory);
}
public static async ValueTask<byte> ReadByteAsync(this Stream stream, CancellationToken cancellationToken)
public static async ValueTask<byte> ReadByteAsync(this Stream stream, CancellationToken cancellationToken = default)
{
return await stream.ReadPrimitive(x => x.Span[0], cancellationToken) ?? default;
}

4
src/SharpCompress/Writers/Tar/TarWriter.cs
View File

@@ -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);

4
src/SharpCompress/Writers/Zip/ZipWriter.cs
View File

@@ -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);