starred/sharpcompress
1
0
Fork 0
mirror of https://github.com/adamhathcock/sharpcompress.git synced 2026-07-08 18:16:30 +00:00
Code Issues 975 Packages Projects Releases 25 Wiki Activity

review feedback

Browse Source
This commit is contained in:
Adam Hathcock
2026-05-15 10:21:29 +01:00
parent 7b73b0b5de
commit 20a656c1a5
6 changed files with 56 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
src/SharpCompress/Compressors/LZMA/LZipStream.Async.cs
View File

@@ -1,4 +1,5 @@
using System;
using System.Buffers;
using System.Buffers.Binary;
using System.IO;
using System.Threading;
@@ -34,7 +35,7 @@ public sealed partial class LZipStream
return new LZipStream(stream, mode, leaveOpen);
}
public async ValueTask FinishAsync()
public async ValueTask FinishAsync(CancellationToken cancellationToken)
{
if (_finished)
{
@@ -43,32 +44,40 @@ public sealed partial class LZipStream
if (Mode == CompressionMode.Compress)
{
cancellationToken.ThrowIfCancellationRequested();
var crc32Stream = (Crc32Stream)_stream;
await FinishWrappedStreamAsync(crc32Stream).ConfigureAwait(false);
var compressedCount = _countingWritableSubStream.NotNull().BytesWritten;
var intBuf = new byte[8];
BinaryPrimitives.WriteUInt32LittleEndian(intBuf, crc32Stream.Crc);
await _countingWritableSubStream
.NotNull()
.WriteAsync(intBuf, 0, 4, CancellationToken.None)
.ConfigureAwait(false);
var intBuf = ArrayPool<byte>.Shared.Rent(8);
try
{
BinaryPrimitives.WriteUInt32LittleEndian(intBuf, crc32Stream.Crc);
await _countingWritableSubStream
.NotNull()
.WriteAsync(intBuf, 0, 4, cancellationToken)
.ConfigureAwait(false);
BinaryPrimitives.WriteInt64LittleEndian(intBuf, _writeCount);
await _countingWritableSubStream
.NotNull()
.WriteAsync(intBuf, 0, intBuf.Length, CancellationToken.None)
.ConfigureAwait(false);
BinaryPrimitives.WriteInt64LittleEndian(intBuf, _writeCount);
await _countingWritableSubStream
.NotNull()
.WriteAsync(intBuf, 0, 8, cancellationToken)
.ConfigureAwait(false);
// Total member size includes the 6-byte header and 20-byte trailer.
BinaryPrimitives.WriteUInt64LittleEndian(
intBuf,
(ulong)compressedCount + (ulong)(6 + 20)
);
await _countingWritableSubStream
.NotNull()
.WriteAsync(intBuf, 0, intBuf.Length, CancellationToken.None)
.ConfigureAwait(false);
// Total member size includes the 6-byte header and 20-byte trailer.
BinaryPrimitives.WriteUInt64LittleEndian(
intBuf,
(ulong)compressedCount + (ulong)(6 + 20)
);
await _countingWritableSubStream
.NotNull()
.WriteAsync(intBuf, 0, 8, cancellationToken)
.ConfigureAwait(false);
}
finally
{
ArrayPool<byte>.Shared.Return(intBuf);
}
}
_finished = true;

8
src/SharpCompress/Compressors/LZMA/Lzma2EncoderStream.cs
View File

@@ -157,6 +157,8 @@ internal sealed class Lzma2EncoderStream : Stream
base.Dispose(disposing);
}
private static readonly byte[] _endMarker = [0x00];
#if !LEGACY_DOTNET || NETSTANDARD2_1
public override async ValueTask DisposeAsync()
#else
@@ -171,8 +173,12 @@ internal sealed class Lzma2EncoderStream : Stream
{
await FlushChunkAsync().ConfigureAwait(false);
}
#if !LEGACY_DOTNET || NETSTANDARD2_1
await _output.WriteAsync(new byte[] { 0x00 }, 0, 1).ConfigureAwait(false);
await _output.WriteAsync(new Memory<byte>(_endMarker)).ConfigureAwait(false);
#else
await _output.WriteAsync(_endMarker, 0, 1).ConfigureAwait(false);
#endif
}
#if !LEGACY_DOTNET || NETSTANDARD2_1

3
src/SharpCompress/Providers/IFinishable.cs
View File

@@ -1,3 +1,4 @@
using System.Threading;
using System.Threading.Tasks;
namespace SharpCompress.Providers;
@@ -19,5 +20,5 @@ public interface IFinishable
/// </summary>
void Finish();
ValueTask FinishAsync();
ValueTask FinishAsync(CancellationToken cancellationToken);
}

9
src/SharpCompress/Writers/SevenZip/SevenZipWriter.Async.cs
View File

@@ -29,7 +29,14 @@ public partial class SevenZipWriter
finalized = true;
await FinalizeArchiveAsync().ConfigureAwait(false);
}
OutputStream?.Dispose();
if (OutputStream is IAsyncDisposable asyncDisposable)
{
await asyncDisposable.DisposeAsync().ConfigureAwait(false);
}
else
{
OutputStream?.Dispose();
}
// base.DisposeAsync() is a no-op since _isDisposed is already set
await base.DisposeAsync().ConfigureAwait(false);
}

2
src/SharpCompress/Writers/Tar/TarWriter.Async.cs
View File

@@ -29,7 +29,7 @@ public partial class TarWriter
}
if (OutputStream is IFinishable finishable)
{
await finishable.FinishAsync().ConfigureAwait(false);
await finishable.FinishAsync(CancellationToken.None).ConfigureAwait(false);
}
if (OutputStream is IAsyncDisposable asyncDisposableOutputStream)
{

9
src/SharpCompress/Writers/Zip/ZipWriter.Async.cs
View File

@@ -34,7 +34,14 @@ public partial class ZipWriter
ms.Position = 0;
await ms.CopyToAsync(OutputStream.NotNull()).ConfigureAwait(false);
OutputStream?.Dispose();
if (OutputStream is IAsyncDisposable asyncDisposable)
{
await asyncDisposable.DisposeAsync().ConfigureAwait(false);
}
else
{
OutputStream?.Dispose();
}
// base.DisposeAsync() is a no-op since _isDisposed is already set
await base.DisposeAsync().ConfigureAwait(false);
}