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

Merge pull request #135 from Mbucari/master

Browse Source 
Fix chapter splitting.
This commit is contained in:
rmcrackan 2021-10-06 21:20:04 -04:00 committed by GitHub
commit fa24831693
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 43 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
AaxDecrypter/AaxcDownloadConverter.cs
View File

@ -1,4 +1,5 @@
using AAXClean; using AAXClean;
using Dinah.Core;
using Dinah.Core.IO; using Dinah.Core.IO;
using Dinah.Core.Net.Http; using Dinah.Core.Net.Http;
using Dinah.Core.StepRunner; using Dinah.Core.StepRunner;
@ -10,11 +11,11 @@ namespace AaxDecrypter
{ {
public class AaxcDownloadConverter : AudiobookDownloadBase public class AaxcDownloadConverter : AudiobookDownloadBase
{ {
private static readonly TimeSpan minChapterLength = TimeSpan.FromSeconds(15); const int MAX_FILENAME_LENGTH = 255;
private static readonly TimeSpan minChapterLength = TimeSpan.FromSeconds(3);
protected override StepSequence steps { get; } protected override StepSequence steps { get; }
private AaxFile aaxFile; private AaxFile aaxFile;
private OutputFormat OutputFormat { get; } private OutputFormat OutputFormat { get; }
public AaxcDownloadConverter(string outFileName, string cacheDirectory, DownloadLicense dlLic, OutputFormat outputFormat, bool splitFileByChapters) public AaxcDownloadConverter(string outFileName, string cacheDirectory, DownloadLicense dlLic, OutputFormat outputFormat, bool splitFileByChapters)
@ -87,19 +88,22 @@ namespace AaxDecrypter
//Ensure split files are at least minChapterLength in duration. //Ensure split files are at least minChapterLength in duration.
var splitChapters = new ChapterInfo(); var splitChapters = new ChapterInfo();
splitChapters.AddChapter(chapters[0].Title, chapters[0].Duration);
var runningTotal = chapters[0].Duration; var runningTotal = TimeSpan.Zero;
string title = "";
for (int i = 0; i < chapters.Count; i++)
{
if (runningTotal == TimeSpan.Zero)
title = chapters[i].Title;
runningTotal += chapters[i].Duration;
for (int i = 1; i < chapters.Count; i++)
{
if (runningTotal >= minChapterLength) if (runningTotal >= minChapterLength)
{ {
splitChapters.AddChapter(chapters[i].Title, chapters[i].Duration); splitChapters.AddChapter(title, runningTotal);
runningTotal = chapters[i].Duration; runningTotal = TimeSpan.Zero;
} }
else
runningTotal += chapters[i].Duration;
} }
aaxFile.ConversionProgressUpdate += AaxFile_ConversionProgressUpdate; aaxFile.ConversionProgressUpdate += AaxFile_ConversionProgressUpdate;
@ -111,7 +115,7 @@ namespace AaxDecrypter
Step2_End(zeroProgress); Step2_End(zeroProgress);
return true; return !isCanceled;
} }
private DownloadProgress Step2_Start() private DownloadProgress Step2_Start()
@ -143,8 +147,7 @@ namespace AaxDecrypter
var chapterCount = 0; var chapterCount = 0;
aaxFile.ConvertToMultiMp4a(splitChapters, newSplitCallback => aaxFile.ConvertToMultiMp4a(splitChapters, newSplitCallback =>
{ {
chapterCount++; var fileName = GetMultipartFileName(outputFileName, ++chapterCount, newSplitCallback.Chapter.Title);
var fileName = Path.ChangeExtension(outputFileName, $"{chapterCount}.m4b");
if (File.Exists(fileName)) if (File.Exists(fileName))
FileExt.SafeDelete(fileName); FileExt.SafeDelete(fileName);
newSplitCallback.OutputFile = File.Open(fileName, FileMode.OpenOrCreate); newSplitCallback.OutputFile = File.Open(fileName, FileMode.OpenOrCreate);
@ -154,11 +157,9 @@ namespace AaxDecrypter
private void ConvertToMultiMp3(ChapterInfo splitChapters) private void ConvertToMultiMp3(ChapterInfo splitChapters)
{ {
var chapterCount = 0; var chapterCount = 0;
aaxFile.ConvertToMultiMp3(splitChapters, newSplitCallback => aaxFile.ConvertToMultiMp3(splitChapters, newSplitCallback =>
{ {
chapterCount++; var fileName = GetMultipartFileName(outputFileName, ++chapterCount, newSplitCallback.Chapter.Title);
var fileName = Path.ChangeExtension(outputFileName, $"{chapterCount}.mp3");
if (File.Exists(fileName)) if (File.Exists(fileName))
FileExt.SafeDelete(fileName); FileExt.SafeDelete(fileName);
newSplitCallback.OutputFile = File.Open(fileName, FileMode.OpenOrCreate); newSplitCallback.OutputFile = File.Open(fileName, FileMode.OpenOrCreate);
@ -166,6 +167,30 @@ namespace AaxDecrypter
}); });
} }
private static string GetMultipartFileName(string baseFileName, int chapterCount, string chapterTitle)
{
string extension = Path.GetExtension(baseFileName);
var fileNameChars = $"{Path.GetFileNameWithoutExtension(baseFileName)} - {chapterCount:D2} - {chapterTitle}".ToCharArray();
//Replace illegal path characters with spaces.
for (int i = 0; i <fileNameChars.Length; i++)
{
foreach (var illegal in Path.GetInvalidFileNameChars())
{
if (fileNameChars[i] == illegal)
{
fileNameChars[i] = ' ';
break;
}
}
}
var fileName = new string(fileNameChars).Truncate(MAX_FILENAME_LENGTH - extension.Length);
return Path.Combine(Path.GetDirectoryName(baseFileName), fileName + extension);
}
private void AaxFile_ConversionProgressUpdate(object sender, ConversionProgressEventArgs e) private void AaxFile_ConversionProgressUpdate(object sender, ConversionProgressEventArgs e)
{ {
var duration = aaxFile.Duration; var duration = aaxFile.Duration;
@ -178,7 +203,7 @@ namespace AaxDecrypter
double progressPercent = e.ProcessPosition.TotalSeconds / duration.TotalSeconds; double progressPercent = e.ProcessPosition.TotalSeconds / duration.TotalSeconds;
OnDecryptProgressUpdate( OnDecryptProgressUpdate(
new DownloadProgress new DownloadProgress
{ {
ProgressPercentage = 100 * progressPercent, ProgressPercentage = 100 * progressPercent,
BytesReceived = (long)(InputFileStream.Length * progressPercent), BytesReceived = (long)(InputFileStream.Length * progressPercent),