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

Taglib fixes.

Browse Source
This commit is contained in:
Michael Bucari-Tovo 2021-06-30 12:20:21 -06:00
parent 45080d1661
commit 0da054ccea
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
AaxDecrypter/AaxcDownloadConverter.cs
View File

@ -41,10 +41,10 @@ namespace AaxDecrypter
public string outDir { get; private set; } public string outDir { get; private set; }
public string outputFileName { get; private set; } public string outputFileName { get; private set; }
public ChapterInfo chapters { get; private set; } public ChapterInfo chapters { get; private set; }
public string Title => aaxcTagLib.TitleSansUnabridged ?? "[unknown]"; public string Title => aaxcTagLib.TitleSansUnabridged;
public string Author => aaxcTagLib.FirstAuthor ?? "[unknown]"; public string Author => aaxcTagLib.FirstAuthor ?? "[unknown]";
public string Narrator => aaxcTagLib.Narrator ?? "[unknown]"; public string Narrator => aaxcTagLib.Narrator ?? "[unknown]";
public byte[] CoverArt => aaxcTagLib.Tag.Pictures.Length > 0 ? aaxcTagLib.Tag.Pictures[0].Data.Data : default; public byte[] CoverArt => aaxcTagLib.AppleTags.Pictures.Length > 0 ? aaxcTagLib.Tag.Pictures[0].Data.Data : default;
private AaxcTagLibFile aaxcTagLib { get; set; } private AaxcTagLibFile aaxcTagLib { get; set; }
private StepSequence steps { get; } private StepSequence steps { get; }
@ -90,12 +90,12 @@ namespace AaxDecrypter
var networkFile = await NetworkFileAbstraction.CreateAsync(client, new Uri(downloadLicense.DownloadUrl)); var networkFile = await NetworkFileAbstraction.CreateAsync(client, new Uri(downloadLicense.DownloadUrl));
aaxcTagLib = await Task.Run(() => new AaxcTagLibFile(networkFile)); aaxcTagLib = await Task.Run(() => new AaxcTagLibFile(networkFile));
var defaultFilename = Path.Combine( var defaultFilename = Path.Combine(
outDir, outDir,
PathLib.ToPathSafeString(aaxcTagLib.Tag.FirstPerformer??"[unknown]"), PathLib.ToPathSafeString(aaxcTagLib.FirstAuthor ?? "[unknown]"),
PathLib.ToPathSafeString(aaxcTagLib.Tag.Title.Replace(" (Unabridged)", "")) + ".m4b" PathLib.ToPathSafeString(aaxcTagLib.TitleSansUnabridged) + ".m4b"
); );
SetOutputFilename(defaultFilename); SetOutputFilename(defaultFilename);
@ -260,7 +260,7 @@ namespace AaxDecrypter
public void Cancel() public void Cancel()
{ {
aaxcProcesser.Cancel(); aaxcProcesser?.Cancel();
} }
} }
} }

0
AaxDecrypter/TagLibMpeg4Ex.cs → AaxDecrypter/AaxcTagLibFile.cs
View File