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

Merge remote-tracking branch 'origin/release' into copilot/fix-async-only-stream-writes

Browse Source
This commit is contained in:
Adam Hathcock
2026-04-28 12:21:10 +01:00
parent 8a8fb98768 a3772608f3
commit 56bf786ecb
17 changed files with 562 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
tests/SharpCompress.Test/Mocks/AsyncOnlyStream.cs
View File

@@ -5,14 +5,9 @@ using System.Threading.Tasks;
namespace SharpCompress.Test.Mocks;
public class AsyncOnlyStream : Stream
public class AsyncOnlyStream(Stream stream) : Stream
{
private readonly Stream _stream;
public AsyncOnlyStream(Stream stream)
{
_stream = stream ?? throw new ArgumentNullException(nameof(stream));
}
private readonly Stream _stream = stream ?? throw new ArgumentNullException(nameof(stream));
public override bool CanRead => _stream.CanRead;
public override bool CanSeek => _stream.CanSeek;

25
tests/SharpCompress.Test/Rar/RarArchiveAsyncTests.cs
View File

@@ -13,6 +13,31 @@ namespace SharpCompress.Test.Rar;
public class RarArchiveAsyncTests : ArchiveTests
{
[Theory]
[InlineData("Rar15.rar")]
[InlineData("Rar2.rar")]
[InlineData("Rar.rar")]
[InlineData("Rar.Audio_program.rar")]
[InlineData("Rar5.rar")]
[InlineData("Rar5.solid.rar")]
public async ValueTask Rar_Archive_Recently_Changed_Unpackers_Async(string filename)
{
var extractedEntries = 0;
await using var archive = await RarArchive.OpenAsyncArchive(
Path.Combine(TEST_ARCHIVES_PATH, filename),
new ReaderOptions { LookForHeader = true }
);
await foreach (var entry in archive.EntriesAsync.Where(entry => !entry.IsDirectory))
{
using var output = new AsyncOnlyStream(new MemoryStream());
await entry.WriteToAsync(output);
extractedEntries++;
}
Assert.True(extractedEntries > 0);
}
[Fact]
public async ValueTask Rar_EncryptedFileAndHeader_Archive_Async() =>
await ReadRarPasswordAsync("Rar.encrypted_filesAndHeader.rar", "test");

26
tests/SharpCompress.Test/Rar/RarArchiveTests.cs
View File

@@ -13,6 +13,32 @@ namespace SharpCompress.Test.Rar;
public class RarArchiveTests : ArchiveTests
{
[Theory]
[InlineData("Rar15.rar")]
[InlineData("Rar2.rar")]
[InlineData("Rar.rar")]
[InlineData("Rar.Audio_program.rar")]
[InlineData("Rar5.rar")]
[InlineData("Rar5.solid.rar")]
public void Rar_Archive_Recently_Changed_Unpackers_Sync(string filename)
{
var extractedEntries = 0;
using var stream = File.OpenRead(Path.Combine(TEST_ARCHIVES_PATH, filename));
using var archive = RarArchive.OpenArchive(
stream,
new ReaderOptions { LookForHeader = true }
);
foreach (var entry in archive.Entries.Where(entry => !entry.IsDirectory))
{
using var output = new MemoryStream();
entry.WriteTo(output);
extractedEntries++;
}
Assert.True(extractedEntries > 0);
}
[Fact]
public void Rar_EncryptedFileAndHeader_Archive() =>
ReadRarPassword("Rar.encrypted_filesAndHeader.rar", "test");

24
tests/SharpCompress.Test/Rar/RarReaderAsyncTests.cs
View File

@@ -14,6 +14,30 @@ namespace SharpCompress.Test.Rar;
public class RarReaderAsyncTests : ReaderTests
{
[Theory]
[InlineData("Rar15.rar")]
[InlineData("Rar.rar")]
[InlineData("Rar.Audio_program.rar")]
[InlineData("Rar5.rar")]
[InlineData("Rar5.solid.rar")]
public async ValueTask Rar_Reader_Async_Uses_Only_Async_Stream_Operations(string filename)
{
using var stream = File.OpenRead(Path.Combine(TEST_ARCHIVES_PATH, filename));
await using var reader = await ReaderFactory.OpenAsyncReader(
new AsyncOnlyStream(stream),
new ReaderOptions { LookForHeader = true }
);
while (await reader.MoveToNextEntryAsync())
{
if (!reader.Entry.IsDirectory)
{
using var output = new AsyncOnlyStream(new MemoryStream());
await reader.WriteEntryToAsync(output);
}
}
}
[Fact]
public async ValueTask Rar_Multi_Reader_Async() =>
await DoRar_Multi_Reader_Async([