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

async xz and tar completed

Browse Source
This commit is contained in:
Adam Hathcock
2026-02-02 13:28:13 +00:00
parent ddc01527bd
commit 8a8784a974
16 changed files with 288 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/SharpCompress/Compressors/Xz/Filters/ArmFilter.Async.cs Normal file
View File

@@ -0,0 +1,40 @@
using System;
using System.IO;
using System.Threading;
using System.Threading.Tasks;
using SharpCompress.Compressors.Filters;
namespace SharpCompress.Compressors.Xz.Filters;
public partial class ArmFilter
{
public override async Task<int> ReadAsync(
byte[] buffer,
int offset,
int count,
CancellationToken cancellationToken
)
{
var bytesRead = await BaseStream
.ReadAsync(buffer, offset, count, cancellationToken)
.ConfigureAwait(false);
BranchExecFilter.ARMConverter(buffer, _ip);
_ip += (uint)bytesRead;
return bytesRead;
}
#if !LEGACY_DOTNET
public override async ValueTask<int> ReadAsync(
Memory<byte> buffer,
CancellationToken cancellationToken = default
)
{
var bytesRead = await BaseStream.ReadAsync(buffer, cancellationToken).ConfigureAwait(false);
var arrayBuffer = buffer.Slice(0, bytesRead).ToArray();
BranchExecFilter.ARMConverter(arrayBuffer, _ip);
arrayBuffer.AsSpan(0, bytesRead).CopyTo(buffer.Span);
_ip += (uint)bytesRead;
return bytesRead;
}
#endif
}

2
src/SharpCompress/Compressors/Xz/Filters/ArmFilter.cs
View File

@@ -10,7 +10,7 @@ using SharpCompress.Compressors.Filters;
namespace SharpCompress.Compressors.Xz.Filters;
public class ArmFilter : BlockFilter
public partial class ArmFilter : BlockFilter
{
public override bool AllowAsLast => false;

40
src/SharpCompress/Compressors/Xz/Filters/ArmThumbFilter.Async.cs Normal file
View File

@@ -0,0 +1,40 @@
using System;
using System.IO;
using System.Threading;
using System.Threading.Tasks;
using SharpCompress.Compressors.Filters;
namespace SharpCompress.Compressors.Xz.Filters;
public partial class ArmThumbFilter
{
public override async Task<int> ReadAsync(
byte[] buffer,
int offset,
int count,
CancellationToken cancellationToken
)
{
var bytesRead = await BaseStream
.ReadAsync(buffer, offset, count, cancellationToken)
.ConfigureAwait(false);
BranchExecFilter.ARMTConverter(buffer, _ip);
_ip += (uint)bytesRead;
return bytesRead;
}
#if !LEGACY_DOTNET
public override async ValueTask<int> ReadAsync(
Memory<byte> buffer,
CancellationToken cancellationToken = default
)
{
var bytesRead = await BaseStream.ReadAsync(buffer, cancellationToken).ConfigureAwait(false);
var arrayBuffer = buffer.Slice(0, bytesRead).ToArray();
BranchExecFilter.ARMTConverter(arrayBuffer, _ip);
arrayBuffer.AsSpan(0, bytesRead).CopyTo(buffer.Span);
_ip += (uint)bytesRead;
return bytesRead;
}
#endif
}

2
src/SharpCompress/Compressors/Xz/Filters/ArmThumbFilter.cs
View File

@@ -10,7 +10,7 @@ using SharpCompress.Compressors.Filters;
namespace SharpCompress.Compressors.Xz.Filters;
public class ArmThumbFilter : BlockFilter
public partial class ArmThumbFilter : BlockFilter
{
public override bool AllowAsLast => false;

40
src/SharpCompress/Compressors/Xz/Filters/IA64Filter.Async.cs Normal file
View File

@@ -0,0 +1,40 @@
using System;
using System.IO;
using System.Threading;
using System.Threading.Tasks;
using SharpCompress.Compressors.Filters;
namespace SharpCompress.Compressors.Xz.Filters;
public partial class IA64Filter
{
public override async Task<int> ReadAsync(
byte[] buffer,
int offset,
int count,
CancellationToken cancellationToken
)
{
var bytesRead = await BaseStream
.ReadAsync(buffer, offset, count, cancellationToken)
.ConfigureAwait(false);
BranchExecFilter.IA64Converter(buffer, _ip);
_ip += (uint)bytesRead;
return bytesRead;
}
#if !LEGACY_DOTNET
public override async ValueTask<int> ReadAsync(
Memory<byte> buffer,
CancellationToken cancellationToken = default
)
{
var bytesRead = await BaseStream.ReadAsync(buffer, cancellationToken).ConfigureAwait(false);
var arrayBuffer = buffer.Slice(0, bytesRead).ToArray();
BranchExecFilter.IA64Converter(arrayBuffer, _ip);
arrayBuffer.AsSpan(0, bytesRead).CopyTo(buffer.Span);
_ip += (uint)bytesRead;
return bytesRead;
}
#endif
}

2
src/SharpCompress/Compressors/Xz/Filters/IA64Filter.cs
View File

@@ -10,7 +10,7 @@ using SharpCompress.Compressors.Filters;
namespace SharpCompress.Compressors.Xz.Filters;
public class IA64Filter : BlockFilter
public partial class IA64Filter : BlockFilter
{
public override bool AllowAsLast => false;

23
src/SharpCompress/Compressors/Xz/Filters/Lzma2Filter.Async.cs Normal file
View File

@@ -0,0 +1,23 @@
using System;
using System.IO;
using System.Threading;
using System.Threading.Tasks;
namespace SharpCompress.Compressors.Xz.Filters;
public partial class Lzma2Filter
{
public override Task<int> ReadAsync(
byte[] buffer,
int offset,
int count,
CancellationToken cancellationToken
) => BaseStream.ReadAsync(buffer, offset, count, cancellationToken);
#if !LEGACY_DOTNET
public override ValueTask<int> ReadAsync(
Memory<byte> buffer,
CancellationToken cancellationToken = default
) => BaseStream.ReadAsync(buffer, cancellationToken);
#endif
}

2
src/SharpCompress/Compressors/Xz/Filters/Lzma2Filter.cs
View File

@@ -6,7 +6,7 @@ using SharpCompress.Compressors.LZMA;
namespace SharpCompress.Compressors.Xz.Filters;
[CLSCompliant(false)]
public class Lzma2Filter : BlockFilter
public partial class Lzma2Filter : BlockFilter
{
public override bool AllowAsLast => true;
public override bool AllowAsNonLast => false;

40
src/SharpCompress/Compressors/Xz/Filters/PowerPCFilter.Async.cs Normal file
View File

@@ -0,0 +1,40 @@
using System;
using System.IO;
using System.Threading;
using System.Threading.Tasks;
using SharpCompress.Compressors.Filters;
namespace SharpCompress.Compressors.Xz.Filters;
public partial class PowerPCFilter
{
public override async Task<int> ReadAsync(
byte[] buffer,
int offset,
int count,
CancellationToken cancellationToken
)
{
var bytesRead = await BaseStream
.ReadAsync(buffer, offset, count, cancellationToken)
.ConfigureAwait(false);
BranchExecFilter.PowerPCConverter(buffer, _ip);
_ip += (uint)bytesRead;
return bytesRead;
}
#if !LEGACY_DOTNET
public override async ValueTask<int> ReadAsync(
Memory<byte> buffer,
CancellationToken cancellationToken = default
)
{
var bytesRead = await BaseStream.ReadAsync(buffer, cancellationToken).ConfigureAwait(false);
var arrayBuffer = buffer.Slice(0, bytesRead).ToArray();
BranchExecFilter.PowerPCConverter(arrayBuffer, _ip);
arrayBuffer.AsSpan(0, bytesRead).CopyTo(buffer.Span);
_ip += (uint)bytesRead;
return bytesRead;
}
#endif
}

2
src/SharpCompress/Compressors/Xz/Filters/PowerPCFilter.cs
View File

@@ -10,7 +10,7 @@ using SharpCompress.Compressors.Filters;
namespace SharpCompress.Compressors.Xz.Filters;
public class PowerPCFilter : BlockFilter
public partial class PowerPCFilter : BlockFilter
{
public override bool AllowAsLast => false;

40
src/SharpCompress/Compressors/Xz/Filters/SparcFilter.Async.cs Normal file
View File

@@ -0,0 +1,40 @@
using System;
using System.IO;
using System.Threading;
using System.Threading.Tasks;
using SharpCompress.Compressors.Filters;
namespace SharpCompress.Compressors.Xz.Filters;
public partial class SparcFilter
{
public override async Task<int> ReadAsync(
byte[] buffer,
int offset,
int count,
CancellationToken cancellationToken
)
{
var bytesRead = await BaseStream
.ReadAsync(buffer, offset, count, cancellationToken)
.ConfigureAwait(false);
BranchExecFilter.SPARCConverter(buffer, _ip);
_ip += (uint)bytesRead;
return bytesRead;
}
#if !LEGACY_DOTNET
public override async ValueTask<int> ReadAsync(
Memory<byte> buffer,
CancellationToken cancellationToken = default
)
{
var bytesRead = await BaseStream.ReadAsync(buffer, cancellationToken).ConfigureAwait(false);
var arrayBuffer = buffer.Slice(0, bytesRead).ToArray();
BranchExecFilter.SPARCConverter(arrayBuffer, _ip);
arrayBuffer.AsSpan(0, bytesRead).CopyTo(buffer.Span);
_ip += (uint)bytesRead;
return bytesRead;
}
#endif
}

2
src/SharpCompress/Compressors/Xz/Filters/SparcFilter.cs
View File

@@ -10,7 +10,7 @@ using SharpCompress.Compressors.Filters;
namespace SharpCompress.Compressors.Xz.Filters;
public class SparcFilter : BlockFilter
public partial class SparcFilter : BlockFilter
{
public override bool AllowAsLast => false;

41
src/SharpCompress/Compressors/Xz/Filters/X86Filter.Async.cs Normal file
View File

@@ -0,0 +1,41 @@
using System;
using System.IO;
using System.Threading;
using System.Threading.Tasks;
using SharpCompress.Compressors.Filters;
namespace SharpCompress.Compressors.Xz.Filters;
public partial class X86Filter
{
public override async Task<int> ReadAsync(
byte[] buffer,
int offset,
int count,
CancellationToken cancellationToken
)
{
var bytesRead = await BaseStream
.ReadAsync(buffer, offset, count, cancellationToken)
.ConfigureAwait(false);
BranchExecFilter.X86Converter(buffer, _ip, ref _state);
_ip += (uint)bytesRead;
return bytesRead;
}
#if !LEGACY_DOTNET
public override async ValueTask<int> ReadAsync(
Memory<byte> buffer,
CancellationToken cancellationToken = default
)
{
var bytesRead = await BaseStream.ReadAsync(buffer, cancellationToken).ConfigureAwait(false);
// X86Converter requires byte[], so we need to copy to an array
var arrayBuffer = buffer.Slice(0, bytesRead).ToArray();
BranchExecFilter.X86Converter(arrayBuffer, _ip, ref _state);
arrayBuffer.AsSpan(0, bytesRead).CopyTo(buffer.Span);
_ip += (uint)bytesRead;
return bytesRead;
}
#endif
}

2
src/SharpCompress/Compressors/Xz/Filters/X86Filter.cs
View File

@@ -10,7 +10,7 @@ using SharpCompress.Compressors.Filters;
namespace SharpCompress.Compressors.Xz.Filters;
public class X86Filter : BlockFilter
public partial class X86Filter : BlockFilter
{
public override bool AllowAsLast => false;

5
src/SharpCompress/Factories/TarFactory.cs
View File

@@ -84,7 +84,10 @@ public class TarFactory
if (await wrapper.IsMatchAsync(rewindableStream, cancellationToken))
{
rewindableStream.Rewind();
var decompressedStream = wrapper.CreateStream(rewindableStream);
var decompressedStream = await wrapper.CreateStreamAsync(
rewindableStream,
cancellationToken
);
if (await TarArchive.IsTarFileAsync(decompressedStream, cancellationToken))
{
rewindableStream.Rewind();

13
src/SharpCompress/Factories/TarWrapper.cs
View File

@@ -20,6 +20,7 @@ public class TarWrapper(
Func<Stream, bool> canHandle,
Func<Stream, CancellationToken, ValueTask<bool>> canHandleAsync,
Func<Stream, Stream> createStream,
Func<Stream, CancellationToken, ValueTask<Stream>> createStreamAsync,
IEnumerable<string> knownExtensions,
bool wrapInSharpCompressStream = true
)
@@ -30,6 +31,8 @@ public class TarWrapper(
public bool WrapInSharpCompressStream { get; } = wrapInSharpCompressStream;
public Func<Stream, Stream> CreateStream { get; } = createStream;
public Func<Stream, CancellationToken, ValueTask<Stream>> CreateStreamAsync { get; } =
createStreamAsync;
public IEnumerable<string> KnownExtensions { get; } = knownExtensions;
@@ -41,6 +44,7 @@ public class TarWrapper(
(_) => true,
(_, _) => new ValueTask<bool>(true),
(stream) => stream,
(stream, _) => new ValueTask<Stream>(stream),
["tar"],
false
), // We always do a test for IsTarFile later
@@ -49,6 +53,8 @@ public class TarWrapper(
BZip2Stream.IsBZip2,
BZip2Stream.IsBZip2Async,
(stream) => BZip2Stream.Create(stream, CompressionMode.Decompress, false),
async (stream, _) =>
await BZip2Stream.CreateAsync(stream, CompressionMode.Decompress, false),
["tar.bz2", "tb2", "tbz", "tbz2", "tz2"]
),
new(
@@ -56,6 +62,8 @@ public class TarWrapper(
GZipArchive.IsGZipFile,
GZipArchive.IsGZipFileAsync,
(stream) => new GZipStream(stream, CompressionMode.Decompress),
(stream, _) =>
new ValueTask<Stream>(new GZipStream(stream, CompressionMode.Decompress)),
["tar.gz", "taz", "tgz"]
),
new(
@@ -63,6 +71,7 @@ public class TarWrapper(
ZStandardStream.IsZStandard,
ZStandardStream.IsZStandardAsync,
(stream) => new ZStandardStream(stream),
(stream, _) => new ValueTask<Stream>(new ZStandardStream(stream)),
["tar.zst", "tar.zstd", "tzst", "tzstd"]
),
new(
@@ -70,6 +79,8 @@ public class TarWrapper(
LZipStream.IsLZipFile,
LZipStream.IsLZipFileAsync,
(stream) => new LZipStream(stream, CompressionMode.Decompress),
(stream, _) =>
new ValueTask<Stream>(new LZipStream(stream, CompressionMode.Decompress)),
["tar.lz"]
),
new(
@@ -77,6 +88,7 @@ public class TarWrapper(
XZStream.IsXZStream,
XZStream.IsXZStreamAsync,
(stream) => new XZStream(stream),
(stream, _) => new ValueTask<Stream>(new XZStream(stream)),
["tar.xz", "txz"],
false
),
@@ -85,6 +97,7 @@ public class TarWrapper(
LzwStream.IsLzwStream,
LzwStream.IsLzwStreamAsync,
(stream) => new LzwStream(stream),
(stream, _) => new ValueTask<Stream>(new LzwStream(stream)),
["tar.Z", "tZ", "taZ"],
false
),