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 fixes

Browse Source
This commit is contained in:
Adam Hathcock
2026-01-21 16:11:40 +00:00
parent 169364f6ae
commit 7b7eba8cd9
6 changed files with 17 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/SharpCompress/Compressors/BZip2/BZip2Stream.cs
View File

@@ -59,7 +59,11 @@ public sealed class BZip2Stream : Stream, IStreamStack
}
else
{
bZip2Stream.stream = CBZip2InputStream.Create(stream, decompressConcatenated, leaveOpen);
bZip2Stream.stream = CBZip2InputStream.Create(
stream,
decompressConcatenated,
leaveOpen
);
}
return bZip2Stream;

13
src/SharpCompress/Compressors/BZip2/CBZip2InputStream.cs
View File

@@ -168,8 +168,8 @@ internal class CBZip2InputStream : Stream, IStreamStack
storedCombinedCRC;
private int computedBlockCRC,
computedCombinedCRC;
private bool decompressConcatenated;
private bool leaveOpen;
private bool decompressConcatenated;
private bool leaveOpen;
private int i2,
count,
@@ -185,8 +185,11 @@ internal class CBZip2InputStream : Stream, IStreamStack
private CBZip2InputStream() { }
public static CBZip2InputStream Create(Stream zStream, bool decompressConcatenated,
bool leaveOpen)
public static CBZip2InputStream Create(
Stream zStream,
bool decompressConcatenated,
bool leaveOpen
)
{
var cbZip2InputStream = new CBZip2InputStream();
cbZip2InputStream.decompressConcatenated = decompressConcatenated;
@@ -227,7 +230,7 @@ internal class CBZip2InputStream : Stream, IStreamStack
this.DebugDispose(typeof(CBZip2InputStream));
#endif
base.Dispose(disposing);
bsStream?.Dispose();
bsStream?.Dispose();
}
internal static int[][] InitIntArray(int n1, int n2)

12
src/SharpCompress/IO/SharpCompressStream.cs
View File

@@ -141,7 +141,7 @@ public class SharpCompressStream : Stream, IStreamStack
#if DEBUG_STREAMS
this.DebugDispose(typeof(SharpCompressStream));
#endif
if (this.LeaveOpen)
if (_isDisposed || this.LeaveOpen)
{
return;
}
@@ -152,10 +152,6 @@ public class SharpCompressStream : Stream, IStreamStack
$"Attempt to dispose of a {nameof(SharpCompressStream)} when {nameof(ThrowOnDispose)} is {ThrowOnDispose}"
);
}
if (_isDisposed)
{
return;
}
_isDisposed = true;
base.Dispose(disposing);
if (disposing)
@@ -455,7 +451,7 @@ public class SharpCompressStream : Stream, IStreamStack
#if DEBUG_STREAMS
this.DebugDispose(typeof(SharpCompressStream));
#endif
if (this.LeaveOpen)
if (_isDisposed || LeaveOpen)
{
return;
}
@@ -465,10 +461,6 @@ public class SharpCompressStream : Stream, IStreamStack
$"Attempt to dispose of a {nameof(SharpCompressStream)} when {nameof(ThrowOnDispose)} is {ThrowOnDispose}"
);
}
if (_isDisposed)
{
return;
}
_isDisposed = true;
await base.DisposeAsync();

65
tests/SharpCompress.Test/GZip/GZipReaderAsyncTests.cs
View File

@@ -37,69 +37,4 @@ public class GZipReaderAsyncTests : ReaderTests
}
}
}
protected async Task ReadAsync(
string testArchive,
CompressionType expectedCompression,
ReaderOptions? options = null
)
{
testArchive = Path.Combine(TEST_ARCHIVES_PATH, testArchive);
options ??= new ReaderOptions() { BufferSize = 0x20000 };
options.LeaveStreamOpen = true;
await ReadImplAsync(testArchive, expectedCompression, options);
options.LeaveStreamOpen = false;
await ReadImplAsync(testArchive, expectedCompression, options);
VerifyFiles();
}
private async ValueTask ReadImplAsync(
string testArchive,
CompressionType expectedCompression,
ReaderOptions options
)
{
using var file = File.OpenRead(testArchive);
using var protectedStream = SharpCompressStream.Create(
new ForwardOnlyStream(file, options.BufferSize),
leaveOpen: true,
throwOnDispose: true,
bufferSize: options.BufferSize
);
using var testStream = new TestStream(protectedStream);
await using (
var reader = await ReaderFactory.OpenAsyncReader(
new AsyncOnlyStream(testStream),
options,
default
)
)
{
await UseReaderAsync(reader, expectedCompression);
protectedStream.ThrowOnDispose = false;
Assert.False(testStream.IsDisposed, $"{nameof(testStream)} prematurely closed");
}
var message =
$"{nameof(options.LeaveStreamOpen)} is set to '{options.LeaveStreamOpen}', so {nameof(testStream.IsDisposed)} should be set to '{!testStream.IsDisposed}', but is set to {testStream.IsDisposed}";
Assert.True(options.LeaveStreamOpen != testStream.IsDisposed, message);
}
private async ValueTask UseReaderAsync(IAsyncReader reader, CompressionType expectedCompression)
{
while (await reader.MoveToNextEntryAsync())
{
if (!reader.Entry.IsDirectory)
{
Assert.Equal(expectedCompression, reader.Entry.CompressionType);
await reader.WriteEntryToDirectoryAsync(
SCRATCH_FILES_PATH,
new ExtractionOptions { ExtractFullPath = true, Overwrite = true }
);
}
}
}
}

9
tests/SharpCompress.Test/Streams/LeaveOpenBehaviorTests.cs
View File

@@ -18,14 +18,7 @@ public class LeaveOpenBehaviorTests
public void BZip2Stream_Compress_LeaveOpen_False()
{
using var innerStream = new TestStream(new MemoryStream());
using (
var bzip2 = BZip2Stream.Create(
innerStream,
CompressionMode.Compress,
false,
false
)
)
using (var bzip2 = BZip2Stream.Create(innerStream, CompressionMode.Compress, false, false))
{
bzip2.Write(CreateTestData(), 0, CreateTestData().Length);
bzip2.Finish();

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

@@ -249,6 +249,7 @@ public class ZipArchiveAsyncTests : ArchiveTests
);
}
await Task.Delay(1000);
VerifyFiles();
Assert.True(progressReports.Count > 0, "Progress reports should be generated");
}