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

Added progress bar to Chapterize step.

Browse Source
This commit is contained in:
Michael Bucari-Tovo 2021-06-22 17:30:48 -06:00
parent 919175cc10
commit d619c82fd8
1 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
AaxDecrypter/AaxToM4bConverter.cs
View File

@ -1,5 +1,4 @@
using System; using System;
using System.Collections.Generic;
using System.Diagnostics; using System.Diagnostics;
using System.Globalization; using System.Globalization;
using System.IO; using System.IO;
@ -207,8 +206,8 @@ namespace AaxDecrypter
Console.WriteLine($"Decrypting with key={audible_key}, iv={audible_iv}"); Console.WriteLine($"Decrypting with key={audible_key}, iv={audible_iv}");
var returnCode = 100; var returnCode = 100;
var thread = new Thread((b) => returnCode = ngDecrypt(b)); var thread = new Thread(_ => returnCode = ngDecrypt(tempRipFile));
thread.Start(tempRipFile); thread.Start();
double fileLen = new FileInfo(inputFileName).Length; double fileLen = new FileInfo(inputFileName).Length;
while (thread.IsAlive && returnCode == 100) while (thread.IsAlive && returnCode == 100)
@ -225,7 +224,7 @@ namespace AaxDecrypter
return returnCode; return returnCode;
} }
private int ngDecrypt(object tempFileNameObj) private int ngDecrypt(string tempFileName)
{ {
#region avformat-58.dll HACK EXPLANATION #region avformat-58.dll HACK EXPLANATION
/* avformat-58.dll HACK EXPLANATION /* avformat-58.dll HACK EXPLANATION
@ -301,8 +300,6 @@ namespace AaxDecrypter
*/ */
#endregion #endregion
var tempFileName = tempFileNameObj as string;
string args = "-audible_key " string args = "-audible_key "
+ audible_key + audible_key
+ " -audible_iv " + " -audible_iv "
@ -350,11 +347,29 @@ namespace AaxDecrypter
FileName = DecryptSupportLibraries.ffmpegPath, FileName = DecryptSupportLibraries.ffmpegPath,
Arguments = "-y -i \"" + mp4_file + "\" -f ffmetadata -i \"" + ff_txt_file + "\" -map_metadata 1 -bsf:a aac_adtstoasc -c:a copy" + str1 + " -map 0 \"" + tempChapsPath + "\"" Arguments = "-y -i \"" + mp4_file + "\" -f ffmetadata -i \"" + ff_txt_file + "\" -map_metadata 1 -bsf:a aac_adtstoasc -c:a copy" + str1 + " -map 0 \"" + tempChapsPath + "\""
}; };
tagAndChapterInfo.RunHidden();
var thread = new Thread(_ => tagAndChapterInfo.RunHidden());
thread.Start();
double fileLen = new FileInfo(mp4_file).Length;
while (thread.IsAlive)
{
Thread.Sleep(500);
if (File.Exists(tempChapsPath))
{
double tempLen = new FileInfo(tempChapsPath).Length;
var percentProgress = tempLen / fileLen * 100.0;
DecryptProgressUpdate?.Invoke(this, (int)percentProgress);
}
}
DecryptProgressUpdate?.Invoke(this, 0);
return true; return true;
} }
public bool Step4_InsertCoverArt() public bool Step4_InsertCoverArt()
{ {
// save cover image as temp file // save cover image as temp file