starred/sharpcompress
1
0
Fork 0
mirror of https://github.com/adamhathcock/sharpcompress.git synced 2026-11-15 17:02:03 +00:00
Code Issues 975 Packages Projects Releases 25 Wiki Activity

Preserve frozen stream recordings during TAR probing

Browse Source
This commit is contained in:
Adam Hathcock
2026-10-16 15:57:21 +01:00
parent 9bb74557d5
commit a83022ca17
2 changed files with 88 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
src/SharpCompress/Readers/Tar/TarReader.Factory.cs
View File

@@ -15,6 +15,24 @@ public partial class TarReader
: IReaderOpenable
#endif
{
private static SharpCompressStream CreateReaderProbeStream(Stream stream, ReaderOptions options)
{
if (stream is SharpCompressStream { IsPassthrough: false })
{
// Keep the caller's recording scope and logical position intact, including
// frozen recordings whose buffered bytes have not been replayed yet.
return new SeekableSharpCompressStream(stream);
}
return SharpCompressStream.Create(
stream,
bufferSize: Math.Max(
options.RewindableBufferSize ?? 0,
TarWrapper.MaximumRewindBufferSize
)
);
}
private static Stream CreateProbeDecompressionStream(
Stream stream,
CompressionType compressionType,
@@ -101,20 +119,11 @@ public partial class TarReader
stream = SharpCompressStream.CreateNonDisposing(stream);
readerOptions = readerOptions with { LeaveStreamOpen = false };
}
var sharpCompressStream = SharpCompressStream.Create(
stream,
bufferSize: Math.Max(
readerOptions.RewindableBufferSize ?? 0,
TarWrapper.MaximumRewindBufferSize
)
);
var sharpCompressStream = CreateReaderProbeStream(stream, readerOptions);
var transferred = false;
try
{
if (!sharpCompressStream.IsRecording)
{
sharpCompressStream.StartRecording();
}
sharpCompressStream.StartRecording();
long pos = sharpCompressStream.Position;
foreach (var wrapper in TarWrapper.Wrappers)
{
@@ -235,17 +244,8 @@ public partial class TarReader
stream = SharpCompressStream.CreateNonDisposing(stream);
readerOptions = readerOptions with { LeaveStreamOpen = false };
}
var sharpCompressStream = SharpCompressStream.Create(
stream,
bufferSize: Math.Max(
readerOptions.RewindableBufferSize ?? 0,
TarWrapper.MaximumRewindBufferSize
)
);
if (!sharpCompressStream.IsRecording)
{
sharpCompressStream.StartRecording();
}
var sharpCompressStream = CreateReaderProbeStream(stream, readerOptions);
sharpCompressStream.StartRecording();
long pos = sharpCompressStream.Position;
foreach (var wrapper in TarWrapper.Wrappers)
{