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

Move files

Browse Source
This commit is contained in:
Sean Kelly 2021-09-30 19:44:32 +13:00
parent 13294d3414
commit 4b78b757aa
4 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
AaxDecrypter/AaxcDownloadConverter.cs
View File

@ -25,8 +25,12 @@ namespace AaxDecrypter
Name = "Download and Convert Aaxc To " + OutputFormat, Name = "Download and Convert Aaxc To " + OutputFormat,
["Step 1: Get Aaxc Metadata"] = Step1_GetMetadata, ["Step 1: Get Aaxc Metadata"] = Step1_GetMetadata,
["Step 2: Download Decrypted Audiobook"] = splitFileByChapters ? Step2_DownloadAudiobookAsMultipleFilesPerChapter : Step2_DownloadAudiobookAsSingleFile, ["Step 2: Download Decrypted Audiobook"] = splitFileByChapters
["Step 3: Create Cue"] = Step3_CreateCue, ? Step2_DownloadAudiobookAsMultipleFilesPerChapter
: Step2_DownloadAudiobookAsSingleFile,
["Step 3: Create Cue"] = splitFileByChapters
? () => true
: Step3_CreateCue,
["Step 4: Cleanup"] = Step4_Cleanup, ["Step 4: Cleanup"] = Step4_Cleanup,
}; };
} }
@ -118,6 +122,7 @@ namespace AaxDecrypter
var chapterCount = 0; var chapterCount = 0;
aaxFile.ConvertToMultiMp4a(downloadLicense.ChapterInfo, newSplitCallback => aaxFile.ConvertToMultiMp4a(downloadLicense.ChapterInfo, newSplitCallback =>
{ {
// TODO I need to find a way to inject the track number into the m4b file. It's easier with the MP3.
chapterCount++; chapterCount++;
var fileName = Path.ChangeExtension(outputFileName, $"{chapterCount}.m4b"); var fileName = Path.ChangeExtension(outputFileName, $"{chapterCount}.m4b");
if (File.Exists(fileName)) if (File.Exists(fileName))

2
AaxDecrypter/AudiobookDownloadBase.cs
View File

@ -59,7 +59,7 @@ namespace AaxDecrypter
public abstract void Cancel(); public abstract void Cancel();
protected abstract int GetSpeedup(TimeSpan elapsed); protected abstract int GetSpeedup(TimeSpan elapsed);
protected abstract bool Step2_DownloadAudiobookAsSingleFile(); //TODO do I need to change this?? protected abstract bool Step2_DownloadAudiobookAsSingleFile();
protected abstract bool Step1_GetMetadata(); protected abstract bool Step1_GetMetadata();
public virtual void SetCoverArt(byte[] coverArt) public virtual void SetCoverArt(byte[] coverArt)

4
AppScaffolding/AppScaffolding.csproj
View File

@ -7,10 +7,10 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="MSBump" Version="2.3.2"> <!--<PackageReference Include="MSBump" Version="2.3.2">
<PrivateAssets>all</PrivateAssets> <PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets> <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference> </PackageReference>-->
<PackageReference Include="Octokit" Version="0.50.0" /> <PackageReference Include="Octokit" Version="0.50.0" />
</ItemGroup> </ItemGroup>

4
FileLiberator/DownloadDecryptBook.cs
View File

@ -155,8 +155,8 @@ namespace FileLiberator
foreach (var f in sortedFiles) foreach (var f in sortedFiles)
{ {
var dest var dest
= AudibleFileStorage.Audio.IsFileTypeMatch(f) = f.Extension.Equals($".{musicFileExt}", StringComparison.OrdinalIgnoreCase)
? audioFileName ? Path.Join(destinationDir, f.Name)
// non-audio filename: safetitle_limit50char + " [" + productId + "][" + audio_ext + "]." + non_audio_ext // non-audio filename: safetitle_limit50char + " [" + productId + "][" + audio_ext + "]." + non_audio_ext
: FileUtility.GetValidFilename(destinationDir, product.Title, f.Extension, product.AudibleProductId, musicFileExt); : FileUtility.GetValidFilename(destinationDir, product.Title, f.Extension, product.AudibleProductId, musicFileExt);