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

Merge pull request #54 from Mbucari/master

Browse Source 
Added Mp3 support to AAXClean.
This commit is contained in:
rmcrackan 2021-07-15 08:15:43 -04:00 committed by GitHub
commit c6e1278e42
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
AaxDecrypter/AaxcDownloadConverter.cs
View File

@ -175,34 +175,41 @@ namespace AaxDecrypter
public bool Step3_DownloadAndCombine()
{
DecryptProgressUpdate?.Invoke(this, int.MaxValue);
OutputFormat format = OutputFormat.Mp4a;
DecryptProgressUpdate?.Invoke(this, 0);
if (File.Exists(outputFileName))
FileExt.SafeDelete(outputFileName);
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;

8
LibationWinForms/BookLiberation/DecryptForm.cs
View File

@ -64,14 +64,8 @@ namespace LibationWinForms.BookLiberation
if (percentage == 0)
remainingTimeLbl.UIThread(() => remainingTimeLbl.Text = "ETA:\r\n0 sec");
if (percentage == int.MaxValue)
progressBar1.UIThread(() => progressBar1.Style = ProgressBarStyle.Marquee);
else
progressBar1.UIThread(() =>
{
progressBar1.Value = percentage;
progressBar1.Style = ProgressBarStyle.Blocks;
});
progressBar1.UIThread(() => progressBar1.Value = percentage);
}
public void UpdateRemainingTime(TimeSpan remaining)