Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -29,26 +29,46 @@ public ZstandardStream(Stream stream, CompressionLevel compressionLevel) : this(
/// <exception cref="ArgumentOutOfRangeException"><paramref name="compressionLevel"/> is not a valid <see cref="CompressionLevel"/> value.</exception>
public ZstandardStream(Stream stream, CompressionLevel compressionLevel, bool leaveOpen)
{
int quality = ZstandardUtils.GetQualityFromCompressionLevel(compressionLevel);

Init(stream, CompressionMode.Compress);
_mode = CompressionMode.Compress;
_leaveOpen = leaveOpen;

_encoder = new ZstandardEncoder(ZstandardUtils.GetQualityFromCompressionLevel(compressionLevel));
try
{
_encoder = new ZstandardEncoder(quality);
}
catch
{
_buffer.Dispose();
throw;
}
}

/// <summary>Initializes a new instance of the <see cref="ZstandardStream" /> class by using the specified stream, options, and optionally leaves the stream open.</summary>
/// <param name="stream">The stream to which compressed data is written or from which data to decompress is read.</param>
/// <param name="compressionOptions">The options to use for Zstandard compression or decompression.</param>
/// <param name="leaveOpen"><see langword="true" /> to leave the stream open after the <see cref="ZstandardStream" /> object is disposed; otherwise, <see langword="false" />.</param>
/// <exception cref="ArgumentNullException"><paramref name="stream"/> is <see langword="null"/>.</exception>
/// <exception cref="ArgumentNullException"><paramref name="stream"/> or <paramref name="compressionOptions"/> is <see langword="null"/>.</exception>
/// <exception cref="ArgumentException"><paramref name="stream"/> does not support writing.</exception>
public ZstandardStream(Stream stream, ZstandardCompressionOptions compressionOptions, bool leaveOpen = false)
{
ArgumentNullException.ThrowIfNull(compressionOptions);

Init(stream, CompressionMode.Compress);
_mode = CompressionMode.Compress;
_leaveOpen = leaveOpen;

_encoder = new ZstandardEncoder(compressionOptions);
try
{
_encoder = new ZstandardEncoder(compressionOptions);
}
catch
{
_buffer.Dispose();
throw;
}
}

/// <summary>Initializes a new instance of the <see cref="ZstandardStream" /> class by using the specified stream and encoder instance.</summary>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,15 @@ public ZstandardStream(Stream stream, ZstandardDecompressionOptions decompressio
_mode = CompressionMode.Decompress;
_leaveOpen = leaveOpen;

_decoder = new ZstandardDecoder(decompressionOptions);
try
{
_decoder = new ZstandardDecoder(decompressionOptions);
}
catch
{
_buffer.Dispose();
throw;
}
}

// Decompresses buffered input for the current frame only. Returns true when there is a result for
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -66,13 +66,21 @@ public ZstandardStream(Stream stream, CompressionMode mode, bool leaveOpen)
_leaveOpen = leaveOpen;
_mode = mode;

if (mode == CompressionMode.Compress)
try
{
_encoder = new ZstandardEncoder();
if (mode == CompressionMode.Compress)
{
_encoder = new ZstandardEncoder();
}
else
{
_decoder = new ZstandardDecoder();
}
}
else
catch
{
_decoder = new ZstandardDecoder();
_buffer.Dispose();
throw;
}
}

Expand All @@ -98,13 +106,21 @@ public ZstandardStream(Stream stream, CompressionMode mode, ZstandardDictionary
_mode = mode;
_leaveOpen = leaveOpen;

if (mode == CompressionMode.Compress)
try
{
_encoder = new ZstandardEncoder(dictionary);
if (mode == CompressionMode.Compress)
{
_encoder = new ZstandardEncoder(dictionary);
}
else
{
_decoder = new ZstandardDecoder(dictionary);
}
}
else
catch
{
_decoder = new ZstandardDecoder(dictionary);
_buffer.Dispose();
throw;
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -310,6 +310,21 @@ public void ZstandardStream_WithDecompressionOptions_NullOptions_ThrowsArgumentN
Assert.Throws<ArgumentNullException>("decompressionOptions", () => new ZstandardStream(input, (ZstandardDecompressionOptions)null!));
}

[Fact]
public void ZstandardStream_WithCompressionOptions_NullOptions_ThrowsArgumentNullException()
{
using MemoryStream output = new();
Assert.Throws<ArgumentNullException>("compressionOptions", () => new ZstandardStream(output, (ZstandardCompressionOptions)null!));
}

[Fact]
public void ZstandardStream_InvalidCompressionLevel_ThrowsArgumentOutOfRangeException()
{
using MemoryStream output = new();
Assert.Throws<ArgumentOutOfRangeException>("compressionLevel", () => new ZstandardStream(output, (CompressionLevel)999));
Assert.Throws<ArgumentOutOfRangeException>("compressionLevel", () => new ZstandardStream(output, (CompressionLevel)999, leaveOpen: true));
}

[Theory]
[InlineData(false)]
[InlineData(true)]
Expand Down
Loading