From 49f2112c42b02cc01a84ea9b50e32a14977f4fcc Mon Sep 17 00:00:00 2001 From: Michael Bucari-Tovo Date: Wed, 14 Jul 2021 23:52:46 -0600 Subject: [PATCH] Updated for new AAXClean pattern. --- AaxDecrypter/AaxcDownloadConverter.cs | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/AaxDecrypter/AaxcDownloadConverter.cs b/AaxDecrypter/AaxcDownloadConverter.cs index cd3d8ff1..f1acc9f8 100644 --- a/AaxDecrypter/AaxcDownloadConverter.cs +++ b/AaxDecrypter/AaxcDownloadConverter.cs @@ -175,6 +175,8 @@ namespace AaxDecrypter public bool Step3_DownloadAndCombine() { + OutputFormat format = OutputFormat.Mp3; + DecryptProgressUpdate?.Invoke(this, int.MaxValue); if (File.Exists(outputFileName)) @@ -182,27 +184,32 @@ namespace AaxDecrypter FileStream outFile = File.OpenWrite(outputFileName); - aaxFile.DecryptionProgressUpdate += AaxFile_DecryptionProgressUpdate; - using var decryptedBook = aaxFile.DecryptAaxc(outFile, downloadLicense.AudibleKey, downloadLicense.AudibleIV, downloadLicense.ChapterInfo); - aaxFile.DecryptionProgressUpdate -= AaxFile_DecryptionProgressUpdate; + aaxFile.ConversionProgressUpdate += AaxFile_ConversionProgressUpdate; + var decryptionResult = aaxFile.DecryptAaxc(outFile, downloadLicense.AudibleKey, downloadLicense.AudibleIV, format, downloadLicense.ChapterInfo); + aaxFile.ConversionProgressUpdate -= AaxFile_ConversionProgressUpdate; downloadLicense.ChapterInfo = aaxFile.Chapters; - if (coverArt is not null) + if (decryptionResult == ConversionResult.NoErrorsDetected + && coverArt is not null + && format == OutputFormat.Mp4a) { - decryptedBook?.AppleTags?.SetCoverArt(coverArt); - decryptedBook?.Save(); + //This handles a special case where the aaxc file doesn't contain cover art and + //Libation downloaded it instead (Animal Farm). Currently only works for Mp4a files. + using var decryptedBook = new Mp4File(outputFileName, FileAccess.ReadWrite); + decryptedBook.AppleTags?.SetCoverArt(coverArt); + decryptedBook.Save(); + decryptedBook.Close(); } - decryptedBook?.Close(); nfsPersister.Dispose(); DecryptProgressUpdate?.Invoke(this, 0); - return aaxFile is not null && !isCanceled; + return decryptionResult == ConversionResult.NoErrorsDetected && !isCanceled; } - private void AaxFile_DecryptionProgressUpdate(object sender, DecryptionProgressEventArgs e) + private void AaxFile_ConversionProgressUpdate(object sender, ConversionProgressEventArgs e) { var duration = aaxFile.Duration; double remainingSecsToProcess = (duration - e.ProcessPosition).TotalSeconds;