From 0da054ccea5742404ce7e06d6bb874b0477509a7 Mon Sep 17 00:00:00 2001
From: Michael Bucari-Tovo <mbucari1@gmail.com>
Date: Wed, 30 Jun 2021 12:20:21 -0600
Subject: [PATCH] Taglib fixes.

---
 AaxDecrypter/AaxcDownloadConverter.cs                | 12 ++++++------
 AaxDecrypter/{TagLibMpeg4Ex.cs => AaxcTagLibFile.cs} |  0
 2 files changed, 6 insertions(+), 6 deletions(-)
 rename AaxDecrypter/{TagLibMpeg4Ex.cs => AaxcTagLibFile.cs} (100%)

diff --git a/AaxDecrypter/AaxcDownloadConverter.cs b/AaxDecrypter/AaxcDownloadConverter.cs
index e8ee0a0f..6c6aa3b3 100644
--- a/AaxDecrypter/AaxcDownloadConverter.cs
+++ b/AaxDecrypter/AaxcDownloadConverter.cs
@@ -41,10 +41,10 @@ namespace AaxDecrypter
         public string outDir { get; private set; }
         public string outputFileName { 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 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 StepSequence steps { get; }
@@ -90,12 +90,12 @@ namespace AaxDecrypter
 
             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(
               outDir,
-              PathLib.ToPathSafeString(aaxcTagLib.Tag.FirstPerformer??"[unknown]"),
-              PathLib.ToPathSafeString(aaxcTagLib.Tag.Title.Replace(" (Unabridged)", "")) + ".m4b"
+              PathLib.ToPathSafeString(aaxcTagLib.FirstAuthor ?? "[unknown]"),
+              PathLib.ToPathSafeString(aaxcTagLib.TitleSansUnabridged) + ".m4b"
               );
 
             SetOutputFilename(defaultFilename);
@@ -260,7 +260,7 @@ namespace AaxDecrypter
 
         public void Cancel()
         {
-            aaxcProcesser.Cancel();
+            aaxcProcesser?.Cancel();
         }
     }
 }
diff --git a/AaxDecrypter/TagLibMpeg4Ex.cs b/AaxDecrypter/AaxcTagLibFile.cs
similarity index 100%
rename from AaxDecrypter/TagLibMpeg4Ex.cs
rename to AaxDecrypter/AaxcTagLibFile.cs