tyler/Libation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed NetworkFileStream not resuming from cancellation.

Browse Source
This commit is contained in:
Michael Bucari-Tovo 2021-08-20 21:05:29 -06:00
parent 85a6e21dcf
commit 0b129fcf7c
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
AaxDecrypter/AaxcDownloadConverter.cs
View File

@ -118,12 +118,6 @@ namespace AaxDecrypter
RetrievedTags?.Invoke(this, aaxFile.AppleTags); RetrievedTags?.Invoke(this, aaxFile.AppleTags);
RetrievedCoverArt?.Invoke(this, aaxFile.AppleTags.Cover); RetrievedCoverArt?.Invoke(this, aaxFile.AppleTags.Cover);
if (isCanceled)
{
aaxFile.Dispose();
nfsPersister.Dispose();
}
return !isCanceled; return !isCanceled;
} }
private NetworkFileStreamPersister NewNetworkFilePersister() private NetworkFileStreamPersister NewNetworkFilePersister()
@ -230,6 +224,8 @@ namespace AaxDecrypter
isCanceled = true; isCanceled = true;
aaxFile?.Cancel(); aaxFile?.Cancel();
aaxFile?.Dispose(); aaxFile?.Dispose();
nfsPersister?.NetworkFileStream?.Close();
nfsPersister?.Dispose();
} }
} }
} }

6
AaxDecrypter/NetworkFileStream.cs
View File

@ -241,9 +241,12 @@ namespace AaxDecrypter
} while (downloadPosition < ContentLength && !isCancelled); } while (downloadPosition < ContentLength && !isCancelled);
_writeFile.Close(); _writeFile.Close();
_networkStream.Close();
WritePosition = downloadPosition; WritePosition = downloadPosition;
Update(); Update();
_networkStream.Close();
downloadedPiece.Set();
downloadEnded.Set();
if (!isCancelled && WritePosition < ContentLength) if (!isCancelled && WritePosition < ContentLength)
throw new WebException($"Downloaded size (0x{WritePosition:X10}) is less than {nameof(ContentLength)} (0x{ContentLength:X10})."); throw new WebException($"Downloaded size (0x{WritePosition:X10}) is less than {nameof(ContentLength)} (0x{ContentLength:X10}).");
@ -251,7 +254,6 @@ namespace AaxDecrypter
if (WritePosition > ContentLength) if (WritePosition > ContentLength)
throw new WebException($"Downloaded size (0x{WritePosition:X10}) is greater than {nameof(ContentLength)} (0x{ContentLength:X10})."); throw new WebException($"Downloaded size (0x{WritePosition:X10}) is greater than {nameof(ContentLength)} (0x{ContentLength:X10}).");
downloadEnded.Set();
} }
#endregion #endregion