starred/sharpcompress
1
0
Fork 0
mirror of https://github.com/adamhathcock/sharpcompress.git synced 2026-09-22 06:54:40 +00:00
Code Issues 975 Packages Projects Releases 25 Wiki Activity

fixes found by gh and sol

Browse Source
This commit is contained in:
Adam Hathcock
2026-08-03 16:38:27 +01:00
parent d391cf21e1
commit 4a71ec898b
4 changed files with 67 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/SharpCompress/Factories/GZipFactory.cs
View File

@@ -185,14 +185,25 @@ public class GZipFactory
}
sharpCompressStream.Rewind();
var tarReader = await new TarFactory()
.TryOpenReaderAsync(sharpCompressStream, options, cancellationToken)
using var testStream = SharpCompressStream.CreateNonDisposing(
await options
.Providers.CreateDecompressStreamAsync(
CompressionType.GZip,
SharpCompressStream.CreateNonDisposing(sharpCompressStream),
CompressionContext.FromStream(sharpCompressStream).WithReaderOptions(options),
cancellationToken
)
.ConfigureAwait(false)
);
var isTarArchive = await TarArchive
.IsTarFileAsync(testStream, cancellationToken)
.ConfigureAwait(false);
sharpCompressStream.Rewind();
sharpCompressStream.StopRecording();
if (tarReader is not null)
if (isTarArchive)
{
return tarReader;
return new TarReader(sharpCompressStream, options, CompressionType.GZip);
}
return await OpenAsyncReader(sharpCompressStream, options, cancellationToken)

18
src/SharpCompress/Factories/LzwFactory.cs
View File

@@ -100,14 +100,24 @@ public class LzwFactory : Factory, IReaderFactory
}
sharpCompressStream.Rewind();
var tarReader = await new TarFactory()
.TryOpenReaderAsync(sharpCompressStream, options, cancellationToken)
using var testStream = SharpCompressStream.CreateNonDisposing(
await options
.Providers.CreateDecompressStreamAsync(
CompressionType.Lzw,
SharpCompressStream.CreateNonDisposing(sharpCompressStream),
cancellationToken
)
.ConfigureAwait(false)
);
var isTarArchive = await TarArchive
.IsTarFileAsync(testStream, cancellationToken)
.ConfigureAwait(false);
sharpCompressStream.Rewind();
sharpCompressStream.StopRecording();
if (tarReader is not null)
if (isTarArchive)
{
return tarReader;
return new TarReader(sharpCompressStream, options, CompressionType.Lzw);
}
return await OpenAsyncReader(sharpCompressStream, options, cancellationToken)

16
tests/SharpCompress.Test/LargeArchiveTests.cs
View File

@@ -84,6 +84,22 @@ public class LargeArchiveTests : TestBase
Assert.False(await reader.MoveToNextEntryAsync());
}
[Fact]
public async Task OpenAsyncReader_WithGZipExtensionHint_ShouldStreamLargeTarEntry()
{
using var file = File.OpenRead(GetFixturePath("Large/Large.tar.gz"));
await using var stream = new AsyncOnlyStream(new ForwardOnlyStream(file));
var options = new ReaderOptions { ExtensionHint = "gz" };
await using var reader = await ReaderFactory.OpenAsyncReader(stream, options);
Assert.True(await reader.MoveToNextEntryAsync());
Assert.False(reader.Entry.IsDirectory);
await using var entryStream = await reader.OpenEntryStreamAsync();
await VerifyContentAsync(reader.Entry.Key, entryStream);
Assert.False(await reader.MoveToNextEntryAsync());
}
private static string GetFixturePath(string fixtureName) =>
Path.Combine(TEST_ARCHIVES_PATH, fixtureName);

28
tests/SharpCompress.Test/Tar/TarReaderAsyncTests.cs
View File

@@ -47,22 +47,38 @@ public class TarReaderAsyncTests : ReaderTests
await ReadAsync("Tar.tar.Z", CompressionType.Lzw);
[Theory]
[InlineData("Tar.tar.gz", "gz", CompressionType.GZip)]
[InlineData("Tar.tar.Z", "z", CompressionType.Lzw)]
[InlineData("Tar.tar.gz", "gz", CompressionType.GZip, false)]
[InlineData("Tar.tar.gz", "gz", CompressionType.GZip, true)]
[InlineData("Tar.tar.Z", "z", CompressionType.Lzw, false)]
[InlineData("Tar.tar.Z", "z", CompressionType.Lzw, true)]
public async ValueTask ReaderFactory_ExtensionHint_PreservesCompressedTarDetection_Async(
string archiveName,
string extensionHint,
CompressionType compressionType
CompressionType compressionType,
bool useForwardOnlyStream
)
{
using var stream = File.OpenRead(Path.Combine(TEST_ARCHIVES_PATH, archiveName));
using var file = File.OpenRead(Path.Combine(TEST_ARCHIVES_PATH, archiveName));
Stream source = useForwardOnlyStream ? new ForwardOnlyStream(file) : file;
await using var stream = new AsyncOnlyStream(source);
var options = ReaderOptions.ForExternalStream.WithExtensionHint(extensionHint);
await using var reader = await ReaderFactory.OpenAsyncReader(stream, options);
Assert.Equal(ArchiveType.Tar, reader.Type);
Assert.True(await reader.MoveToNextEntryAsync());
Assert.Equal(compressionType, reader.Entry.CompressionType);
var entryCount = 0;
while (await reader.MoveToNextEntryAsync())
{
entryCount++;
Assert.Equal(compressionType, reader.Entry.CompressionType);
if (!reader.Entry.IsDirectory)
{
await reader.WriteEntryToDirectoryAsync(SCRATCH_FILES_PATH);
}
}
Assert.True(entryCount > 0);
VerifyFiles();
}
[Fact]