-
Notifications
You must be signed in to change notification settings - Fork 512
RAR5 (and maybe others) async methods are different #1203
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
103ae60
codex found problems
adamhathcock e786c00
divide async and sync logic
adamhathcock 218af5a
validate and make sure rar5 methods are the same
adamhathcock cd5da3d
moved and validated more async code
adamhathcock ab1dd45
more moved and validated
adamhathcock 6f50545
more cleaning
adamhathcock File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
603 changes: 603 additions & 0 deletions
603
src/SharpCompress/Compressors/Rar/UnpackV1/Unpack.Async.cs
Large diffs are not rendered by default.
Oops, something went wrong.
Large diffs are not rendered by default.
Oops, something went wrong.
162 changes: 162 additions & 0 deletions
162
src/SharpCompress/Compressors/Rar/UnpackV1/Unpack15.Async.cs
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
| @@ -0,0 +1,162 @@ | ||||||
| using System; | ||||||
| using System.Threading; | ||||||
| using System.Threading.Tasks; | ||||||
| using SharpCompress.Compressors.Rar.UnpackV1.Decode; | ||||||
|
|
||||||
| namespace SharpCompress.Compressors.Rar.UnpackV1; | ||||||
|
|
||||||
| internal partial class Unpack | ||||||
| { | ||||||
| private async Task unpack15Async(bool solid, CancellationToken cancellationToken = default) | ||||||
| { | ||||||
| if (suspended) | ||||||
| { | ||||||
| unpPtr = wrPtr; | ||||||
| } | ||||||
| else | ||||||
| { | ||||||
| UnpInitData(solid); | ||||||
| oldUnpInitData(solid); | ||||||
| await unpReadBufAsync(cancellationToken).ConfigureAwait(false); | ||||||
| if (!solid) | ||||||
| { | ||||||
| initHuff(); | ||||||
| unpPtr = 0; | ||||||
| } | ||||||
| else | ||||||
| { | ||||||
| unpPtr = wrPtr; | ||||||
| } | ||||||
| --destUnpSize; | ||||||
| } | ||||||
| if (destUnpSize >= 0) | ||||||
| { | ||||||
| getFlagsBuf(); | ||||||
| FlagsCnt = 8; | ||||||
| } | ||||||
|
|
||||||
| while (destUnpSize >= 0) | ||||||
| { | ||||||
| unpPtr &= PackDef.MAXWINMASK; | ||||||
|
|
||||||
| if ( | ||||||
| inAddr > readTop - 30 | ||||||
| && !await unpReadBufAsync(cancellationToken).ConfigureAwait(false) | ||||||
| ) | ||||||
| { | ||||||
| break; | ||||||
| } | ||||||
| if (((wrPtr - unpPtr) & PackDef.MAXWINMASK) < 270 && wrPtr != unpPtr) | ||||||
| { | ||||||
| oldUnpWriteBuf(); | ||||||
| if (suspended) | ||||||
| { | ||||||
| return; | ||||||
| } | ||||||
| } | ||||||
| if (StMode != 0) | ||||||
| { | ||||||
| huffDecode(); | ||||||
| continue; | ||||||
| } | ||||||
|
|
||||||
| if (--FlagsCnt < 0) | ||||||
| { | ||||||
| getFlagsBuf(); | ||||||
| FlagsCnt = 7; | ||||||
| } | ||||||
|
|
||||||
| if ((FlagBuf & 0x80) != 0) | ||||||
| { | ||||||
| FlagBuf <<= 1; | ||||||
| if (Nlzb > Nhfb) | ||||||
| { | ||||||
| longLZ(); | ||||||
| } | ||||||
| else | ||||||
| { | ||||||
| huffDecode(); | ||||||
| } | ||||||
| } | ||||||
| else | ||||||
| { | ||||||
| FlagBuf <<= 1; | ||||||
| if (--FlagsCnt < 0) | ||||||
| { | ||||||
| getFlagsBuf(); | ||||||
| FlagsCnt = 7; | ||||||
| } | ||||||
| if ((FlagBuf & 0x80) != 0) | ||||||
| { | ||||||
| FlagBuf <<= 1; | ||||||
| if (Nlzb > Nhfb) | ||||||
| { | ||||||
| huffDecode(); | ||||||
| } | ||||||
| else | ||||||
| { | ||||||
| longLZ(); | ||||||
| } | ||||||
| } | ||||||
| else | ||||||
| { | ||||||
| FlagBuf <<= 1; | ||||||
| shortLZ(); | ||||||
| } | ||||||
| } | ||||||
| } | ||||||
| oldUnpWriteBuf(); | ||||||
|
||||||
| oldUnpWriteBuf(); | |
| await oldUnpWriteBufAsync(cancellationToken).ConfigureAwait(false); |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
unpack15Asyncflushes usingoldUnpWriteBuf()(syncStream.Write) instead of the available async variant. This blocks the async extraction path and ignores the providedCancellationToken. Useawait oldUnpWriteBufAsync(cancellationToken).ConfigureAwait(false)here.