Merge branch 'master' of https://github.com/rmcrackan/Libation

Fix chapter splitting.

AaxDecrypter/AaxDecrypter.csproj

@@ -5,8 +5,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="AAXClean" Version="0.1.8" />
-    <PackageReference Include="Dinah.Core" Version="1.1.0.1" />
+    <PackageReference Include="AAXClean" Version="0.1.9" />
+    <PackageReference Include="Dinah.Core" Version="1.1.1.2" />
   </ItemGroup>
 
 </Project>

AaxDecrypter/AaxcDownloadConverter.cs

@@ -5,164 +5,192 @@ using Dinah.Core.Net.Http;
 using Dinah.Core.StepRunner;
 using System;
 using System.IO;
+using System.Linq;
 
 namespace AaxDecrypter
 {
-    public enum OutputFormat { Mp4a,  Mp3 }
-    public class AaxcDownloadConverter
+    public class AaxcDownloadConverter : AudiobookDownloadBase
     {
-        public event EventHandler<AppleTags> RetrievedTags;
-        public event EventHandler<byte[]> RetrievedCoverArt;
-        public event EventHandler<DownloadProgress> DecryptProgressUpdate;
-        public event EventHandler<TimeSpan> DecryptTimeRemaining;
+        const int MAX_FILENAME_LENGTH = 255;
+        private static readonly TimeSpan minChapterLength = TimeSpan.FromSeconds(3);
+        protected override StepSequence steps { get; }
 
-        public string AppName { get; set; } = nameof(AaxcDownloadConverter);
-
-        private string outputFileName { get; }
-        private string cacheDir { get; }
-        private DownloadLicense downloadLicense { get; }
         private AaxFile aaxFile;
-        private OutputFormat OutputFormat;
+        private OutputFormat OutputFormat { get; }
 
-        private StepSequence steps { get; }
-        private NetworkFileStreamPersister nfsPersister;
-        private bool isCanceled { get; set; }
-        private string jsonDownloadState => Path.Combine(cacheDir, Path.GetFileNameWithoutExtension(outputFileName) + ".json");
-        private string tempFile => PathLib.ReplaceExtension(jsonDownloadState, ".aaxc");
-
-        public AaxcDownloadConverter(string outFileName, string cacheDirectory, DownloadLicense dlLic, OutputFormat outputFormat)
+        public AaxcDownloadConverter(string outFileName, string cacheDirectory, DownloadLicense dlLic, OutputFormat outputFormat, bool splitFileByChapters)
+            :base(outFileName, cacheDirectory, dlLic)
         {
-            ArgumentValidator.EnsureNotNullOrWhiteSpace(outFileName, nameof(outFileName));
-            outputFileName = outFileName;
-
-            var outDir = Path.GetDirectoryName(outputFileName);
-            if (!Directory.Exists(outDir))
-                throw new ArgumentNullException(nameof(outDir), "Directory does not exist");
-            if (File.Exists(outputFileName))
-                File.Delete(outputFileName);
-
-            if (!Directory.Exists(cacheDirectory))
-                throw new ArgumentNullException(nameof(cacheDirectory), "Directory does not exist");
-            cacheDir = cacheDirectory;
-
-            downloadLicense = ArgumentValidator.EnsureNotNull(dlLic, nameof(dlLic));
             OutputFormat = outputFormat;
 
             steps = new StepSequence
             {
-                Name = "Download and Convert Aaxc To " + (outputFormat == OutputFormat.Mp4a ? "M4b" : "Mp3"),
+                Name = "Download and Convert Aaxc To " + OutputFormat,
 
                 ["Step 1: Get Aaxc Metadata"] = Step1_GetMetadata,
-                ["Step 2: Download Decrypted Audiobook"] = Step2_DownloadAndCombine,
-                ["Step 3: Create Cue"] = Step3_CreateCue,
-                ["Step 4: Create Nfo"] = Step4_CreateNfo,
-                ["Step 5: Cleanup"] = Step5_Cleanup,
+                ["Step 2: Download Decrypted Audiobook"] = splitFileByChapters
+                    ? Step2_DownloadAudiobookAsMultipleFilesPerChapter
+                    : Step2_DownloadAudiobookAsSingleFile,
+                ["Step 3: Create Cue"] = splitFileByChapters 
+                    ? () => true 
+                    : Step3_CreateCue,
+                ["Step 4: Cleanup"] = Step4_Cleanup,
             };
         }
 
         /// <summary>
         /// Setting cover art by this method will insert the art into the audiobook metadata
         /// </summary>
-        public void SetCoverArt(byte[] coverArt)
+        public override void SetCoverArt(byte[] coverArt)
         {
-            if (coverArt is null) return;
+            base.SetCoverArt(coverArt);
 
             aaxFile?.AppleTags.SetCoverArt(coverArt);
-
-            RetrievedCoverArt?.Invoke(this, coverArt);
         }
 
-        public bool Run()
-        {
-            var (IsSuccess, Elapsed) = steps.Run();
+        protected override bool Step1_GetMetadata()
+        {    
+            aaxFile = new AaxFile(InputFileStream);
 
-            if (!IsSuccess)
-            {
-                Console.WriteLine("WARNING-Conversion failed");
-                return false;
-            }
-
-            var speedup = (int)(aaxFile.Duration.TotalSeconds / (long)Elapsed.TotalSeconds);
-            Serilog.Log.Logger.Information($"Speedup is {speedup}x realtime.");
-            return true;
-        }
-
-        public bool Step1_GetMetadata()
-        {
-            //Get metadata from the file over http
-                       
-            if (File.Exists(jsonDownloadState))
-            {
-                try
-                {
-                    nfsPersister = new NetworkFileStreamPersister(jsonDownloadState);
-                    //If More than ~1 hour has elapsed since getting the download url, it will expire.
-                    //The new url will be to the same file.
-                    nfsPersister.NetworkFileStream.SetUriForSameFile(new Uri(downloadLicense.DownloadUrl));
-                }
-                catch
-                {
-                    FileExt.SafeDelete(jsonDownloadState);
-                    FileExt.SafeDelete(tempFile);
-                    nfsPersister = NewNetworkFilePersister();
-                }
-            }
-            else
-            {
-                nfsPersister = NewNetworkFilePersister();
-            }
-
-            aaxFile = new AaxFile(nfsPersister.NetworkFileStream);
-
-            RetrievedTags?.Invoke(this, aaxFile.AppleTags);
-            RetrievedCoverArt?.Invoke(this, aaxFile.AppleTags.Cover);
+            OnRetrievedTitle(aaxFile.AppleTags.TitleSansUnabridged);
+            OnRetrievedAuthors(aaxFile.AppleTags.FirstAuthor ?? "[unknown]");
+            OnRetrievedNarrators(aaxFile.AppleTags.Narrator ?? "[unknown]");
+            OnRetrievedCoverArt(aaxFile.AppleTags.Cover);
 
             return !isCanceled;
         }
-        private NetworkFileStreamPersister NewNetworkFilePersister()
+
+        protected override bool Step2_DownloadAudiobookAsSingleFile()
         {
-			var headers = new System.Net.WebHeaderCollection
-			{
-				{ "User-Agent", downloadLicense.UserAgent }
-			};
-
-			var networkFileStream = new NetworkFileStream(tempFile, new Uri(downloadLicense.DownloadUrl), 0, headers);
-            return new NetworkFileStreamPersister(networkFileStream, jsonDownloadState);
-        }
-
-        public bool Step2_DownloadAndCombine()
-        {
-            var zeroProgress = new DownloadProgress 
-            { 
-                BytesReceived = 0,
-                ProgressPercentage = 0, 
-                TotalBytesToReceive = nfsPersister.NetworkFileStream.Length 
-            };
-
-            DecryptProgressUpdate?.Invoke(this, zeroProgress);
-
+            var zeroProgress = Step2_Start();
+            
             if (File.Exists(outputFileName))
                 FileExt.SafeDelete(outputFileName);
 
-            FileStream outFile = File.OpenWrite(outputFileName);
-
-            aaxFile.SetDecryptionKey(downloadLicense.AudibleKey, downloadLicense.AudibleIV);
+            var outputFile =  File.Open(outputFileName, FileMode.OpenOrCreate, FileAccess.ReadWrite);
 
             aaxFile.ConversionProgressUpdate += AaxFile_ConversionProgressUpdate;
-            var decryptionResult = OutputFormat == OutputFormat.Mp4a ? aaxFile.ConvertToMp4a(outFile, downloadLicense.ChapterInfo) : aaxFile.ConvertToMp3(outFile);
+            var decryptionResult = OutputFormat == OutputFormat.M4b ? aaxFile.ConvertToMp4a(outputFile, downloadLicense.ChapterInfo) : aaxFile.ConvertToMp3(outputFile);
             aaxFile.ConversionProgressUpdate -= AaxFile_ConversionProgressUpdate;
 
-            aaxFile.Close();
-
             downloadLicense.ChapterInfo = aaxFile.Chapters;
-
-            nfsPersister.Dispose();
-
-            DecryptProgressUpdate?.Invoke(this, zeroProgress);
+            
+            Step2_End(zeroProgress);
 
             return decryptionResult == ConversionResult.NoErrorsDetected && !isCanceled;
         }
 
+        private bool Step2_DownloadAudiobookAsMultipleFilesPerChapter()
+        {
+            var zeroProgress = Step2_Start();
+
+            var chapters = downloadLicense.ChapterInfo.Chapters.ToList();
+
+            //Ensure split files are at least minChapterLength in duration.
+            var splitChapters = new ChapterInfo();
+
+            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;
+
+                if (runningTotal >= minChapterLength)
+                {
+                    splitChapters.AddChapter(title, runningTotal);
+                    runningTotal = TimeSpan.Zero;
+                }
+            }
+
+            aaxFile.ConversionProgressUpdate += AaxFile_ConversionProgressUpdate;
+            if(OutputFormat == OutputFormat.M4b) 
+                ConvertToMultiMp4b(splitChapters);
+            else 
+                ConvertToMultiMp3(splitChapters);
+            aaxFile.ConversionProgressUpdate -= AaxFile_ConversionProgressUpdate;
+
+            Step2_End(zeroProgress);
+
+            return !isCanceled;
+        }
+
+        private DownloadProgress Step2_Start()
+        {
+            var zeroProgress = new DownloadProgress
+            {
+                BytesReceived = 0,
+                ProgressPercentage = 0,
+                TotalBytesToReceive = InputFileStream.Length
+            };
+
+            OnDecryptProgressUpdate(zeroProgress);
+
+            aaxFile.SetDecryptionKey(downloadLicense.AudibleKey, downloadLicense.AudibleIV);
+            return zeroProgress;
+        }
+        
+        private void Step2_End(DownloadProgress zeroProgress)
+        {
+            aaxFile.Close();
+
+            CloseInputFileStream();
+
+            OnDecryptProgressUpdate(zeroProgress);
+        }
+
+        private void ConvertToMultiMp4b(ChapterInfo splitChapters)
+        {
+            var chapterCount = 0;
+            aaxFile.ConvertToMultiMp4a(splitChapters, newSplitCallback =>
+            {
+                var fileName = GetMultipartFileName(outputFileName, ++chapterCount, newSplitCallback.Chapter.Title);
+                if (File.Exists(fileName))
+                    FileExt.SafeDelete(fileName);
+                newSplitCallback.OutputFile = File.Open(fileName, FileMode.OpenOrCreate);
+            });
+        }
+        
+        private void ConvertToMultiMp3(ChapterInfo splitChapters)
+        {
+            var chapterCount = 0;
+            aaxFile.ConvertToMultiMp3(splitChapters, newSplitCallback =>
+            {
+                var fileName = GetMultipartFileName(outputFileName, ++chapterCount, newSplitCallback.Chapter.Title);
+                if (File.Exists(fileName))
+                    FileExt.SafeDelete(fileName);
+                newSplitCallback.OutputFile = File.Open(fileName, FileMode.OpenOrCreate);
+                newSplitCallback.LameConfig.ID3.Track = chapterCount.ToString();
+            });
+        }
+
+        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)
         {
             var duration = aaxFile.Duration;
@@ -170,61 +198,28 @@ namespace AaxDecrypter
             double estTimeRemaining = remainingSecsToProcess / e.ProcessSpeed;
 
             if (double.IsNormal(estTimeRemaining))
-                DecryptTimeRemaining?.Invoke(this, TimeSpan.FromSeconds(estTimeRemaining));
+                OnDecryptTimeRemaining(TimeSpan.FromSeconds(estTimeRemaining));
 
-            double progressPercent = 100 * e.ProcessPosition.TotalSeconds / duration.TotalSeconds;
+            double progressPercent = e.ProcessPosition.TotalSeconds / duration.TotalSeconds;
 
-            DecryptProgressUpdate?.Invoke(this,
-                new DownloadProgress 
+            OnDecryptProgressUpdate(
+                new DownloadProgress
                 {
-                    ProgressPercentage = progressPercent,
-                    BytesReceived = (long)(nfsPersister.NetworkFileStream.Length * progressPercent),
-                    TotalBytesToReceive = nfsPersister.NetworkFileStream.Length
+                    ProgressPercentage = 100 * progressPercent,
+                    BytesReceived = (long)(InputFileStream.Length * progressPercent),
+                    TotalBytesToReceive = InputFileStream.Length
                 });
         }
 
-        public bool Step3_CreateCue()
-        {
-            // not a critical step. its failure should not prevent future steps from running
-            try
-            {
-                File.WriteAllText(PathLib.ReplaceExtension(outputFileName, ".cue"), Cue.CreateContents(Path.GetFileName(outputFileName), downloadLicense.ChapterInfo));
-            }
-            catch (Exception ex)
-            {
-                Serilog.Log.Logger.Error(ex, $"{nameof(Step3_CreateCue)}. FAILED");
-            }
-            return !isCanceled;
-        }
-
-        public bool Step4_CreateNfo()
-        {
-            // not a critical step. its failure should not prevent future steps from running
-            try
-            {
-                File.WriteAllText(PathLib.ReplaceExtension(outputFileName, ".nfo"), NFO.CreateContents(AppName, aaxFile, downloadLicense.ChapterInfo));
-            }
-            catch (Exception ex)
-            {
-                Serilog.Log.Logger.Error(ex, $"{nameof(Step4_CreateNfo)}. FAILED");
-            }
-            return !isCanceled;
-        }
-
-        public bool Step5_Cleanup()
-        {
-            FileExt.SafeDelete(jsonDownloadState);
-            FileExt.SafeDelete(tempFile);
-            return !isCanceled;
-        }
-
-        public void Cancel()
+        public override void Cancel()
         {
             isCanceled = true;
             aaxFile?.Cancel();
             aaxFile?.Dispose();
-            nfsPersister?.NetworkFileStream?.Close();
-            nfsPersister?.Dispose();
+            CloseInputFileStream();
         }
-    }
+
+		protected override int GetSpeedup(TimeSpan elapsed)
+            => (int)(aaxFile.Duration.TotalSeconds / (long)elapsed.TotalSeconds);
+	}
 }

AaxDecrypter/AudiobookDownloadBase.cs

@@ -0,0 +1,165 @@
+using Dinah.Core;
+using Dinah.Core.IO;
+using Dinah.Core.Net.Http;
+using Dinah.Core.StepRunner;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace AaxDecrypter
+{
+	public enum OutputFormat { M4b, Mp3 }
+
+	public abstract class AudiobookDownloadBase
+	{
+		public event EventHandler<string> RetrievedTitle;
+		public event EventHandler<string> RetrievedAuthors;
+		public event EventHandler<string> RetrievedNarrators;
+		public event EventHandler<byte[]> RetrievedCoverArt;
+		public event EventHandler<DownloadProgress> DecryptProgressUpdate;
+		public event EventHandler<TimeSpan> DecryptTimeRemaining;
+
+		public string AppName { get; set; }
+
+		protected bool isCanceled { get; set; }
+		protected string outputFileName { get; }
+		protected string cacheDir { get; }
+		protected DownloadLicense downloadLicense { get; }
+		protected NetworkFileStream InputFileStream => (nfsPersister ??= OpenNetworkFileStream()).NetworkFileStream;
+
+
+		protected abstract StepSequence steps { get; }
+		private NetworkFileStreamPersister nfsPersister;
+
+		private string jsonDownloadState => Path.Combine(cacheDir, Path.GetFileNameWithoutExtension(outputFileName) + ".json");
+		private string tempFile => PathLib.ReplaceExtension(jsonDownloadState, ".tmp");
+
+		public AudiobookDownloadBase(string outFileName, string cacheDirectory, DownloadLicense dlLic)
+		{
+			AppName = GetType().Name;
+
+			ArgumentValidator.EnsureNotNullOrWhiteSpace(outFileName, nameof(outFileName));
+			outputFileName = outFileName;
+
+			var outDir = Path.GetDirectoryName(outputFileName);
+			if (!Directory.Exists(outDir))
+				throw new ArgumentNullException(nameof(outDir), "Directory does not exist");
+			if (File.Exists(outputFileName))
+				File.Delete(outputFileName);
+
+			if (!Directory.Exists(cacheDirectory))
+				throw new ArgumentNullException(nameof(cacheDirectory), "Directory does not exist");
+			cacheDir = cacheDirectory;
+
+			downloadLicense = ArgumentValidator.EnsureNotNull(dlLic, nameof(dlLic));
+		}
+
+		public abstract void Cancel();
+		protected abstract int GetSpeedup(TimeSpan elapsed);
+		protected abstract bool Step2_DownloadAudiobookAsSingleFile();
+		protected abstract bool Step1_GetMetadata();
+
+		public virtual void SetCoverArt(byte[] coverArt)
+		{
+			if (coverArt is null) return;
+
+			OnRetrievedCoverArt(coverArt);
+		}
+
+
+		public bool Run()
+		{
+			var (IsSuccess, Elapsed) = steps.Run();
+
+			if (!IsSuccess)
+			{
+				Console.WriteLine("WARNING-Conversion failed");
+				return false;
+			}
+
+			//Serilog.Log.Logger.Information($"Speedup is {GetSpeedup(Elapsed)}x realtime.");
+			return true;
+		}		
+
+		protected void OnRetrievedTitle(string title) 
+			=> RetrievedTitle?.Invoke(this, title);
+		protected void OnRetrievedAuthors(string authors) 
+			=> RetrievedAuthors?.Invoke(this, authors);
+		protected void OnRetrievedNarrators(string narrators) 
+			=> RetrievedNarrators?.Invoke(this, narrators);
+		protected void OnRetrievedCoverArt(byte[] coverArt) 
+			=> RetrievedCoverArt?.Invoke(this, coverArt);
+		protected void OnDecryptProgressUpdate(DownloadProgress downloadProgress) 
+			=> DecryptProgressUpdate?.Invoke(this, downloadProgress);
+		protected void OnDecryptTimeRemaining(TimeSpan timeRemaining) 
+			=> DecryptTimeRemaining?.Invoke(this, timeRemaining);
+
+		protected void CloseInputFileStream()
+		{
+			nfsPersister?.NetworkFileStream?.Close();
+			nfsPersister?.Dispose();
+		}
+
+		protected bool Step3_CreateCue()
+		{
+			// not a critical step. its failure should not prevent future steps from running
+			try
+			{
+				File.WriteAllText(PathLib.ReplaceExtension(outputFileName, ".cue"), Cue.CreateContents(Path.GetFileName(outputFileName), downloadLicense.ChapterInfo));
+			}
+			catch (Exception ex)
+			{
+				Serilog.Log.Logger.Error(ex, $"{nameof(Step3_CreateCue)}. FAILED");
+			}
+			return !isCanceled;
+		}
+
+		protected bool Step4_Cleanup()
+		{
+			FileExt.SafeDelete(jsonDownloadState);
+			FileExt.SafeDelete(tempFile);
+			return !isCanceled;
+		}
+
+		private NetworkFileStreamPersister OpenNetworkFileStream()
+		{
+			NetworkFileStreamPersister nfsp;
+
+			if (File.Exists(jsonDownloadState))
+			{
+				try
+				{
+					nfsp = new NetworkFileStreamPersister(jsonDownloadState);
+					//If More than ~1 hour has elapsed since getting the download url, it will expire.
+					//The new url will be to the same file.
+					nfsp.NetworkFileStream.SetUriForSameFile(new Uri(downloadLicense.DownloadUrl));
+				}
+				catch
+				{
+					FileExt.SafeDelete(jsonDownloadState);
+					FileExt.SafeDelete(tempFile);
+					nfsp = NewNetworkFilePersister();
+				}
+			}
+			else
+			{
+				nfsp = NewNetworkFilePersister();
+			}
+			return nfsp;
+		}
+
+		private NetworkFileStreamPersister NewNetworkFilePersister()
+		{
+			var headers = new System.Net.WebHeaderCollection
+			{
+				{ "User-Agent", downloadLicense.UserAgent }
+			};
+
+			var networkFileStream = new NetworkFileStream(tempFile, new Uri(downloadLicense.DownloadUrl), 0, headers);
+			return new NetworkFileStreamPersister(networkFileStream, jsonDownloadState);
+		}
+	}
+}

AaxDecrypter/DownloadLicense.cs

@@ -13,15 +13,12 @@ namespace AaxDecrypter
 
         public DownloadLicense(string downloadUrl, string audibleKey, string audibleIV, string userAgent)
         {
-            ArgumentValidator.EnsureNotNullOrEmpty(downloadUrl, nameof(downloadUrl));
-            ArgumentValidator.EnsureNotNullOrEmpty(audibleKey, nameof(audibleKey));
-            ArgumentValidator.EnsureNotNullOrEmpty(audibleIV, nameof(audibleIV));
-            ArgumentValidator.EnsureNotNullOrEmpty(userAgent, nameof(userAgent));
+            DownloadUrl = ArgumentValidator.EnsureNotNullOrEmpty(downloadUrl, nameof(downloadUrl));
+            UserAgent = ArgumentValidator.EnsureNotNullOrEmpty(userAgent, nameof(userAgent));
 
-            DownloadUrl = downloadUrl;
+            // no null/empty check. unencrypted files do not have these
             AudibleKey = audibleKey;
             AudibleIV = audibleIV;
-            UserAgent = userAgent;
         }
     }
 }

AaxDecrypter/NFO.cs

@@ -1,54 +0,0 @@
-using AAXClean;
-using Dinah.Core;
-
-namespace AaxDecrypter
-{
-    public static class NFO
-    {
-        public static string CreateContents(string ripper, Mp4File aaxcTagLib, ChapterInfo chapters)
-        {
-            var _hours = (int)aaxcTagLib.Duration.TotalHours;
-            var myDuration
-                = (_hours > 0 ? _hours + " hours, " : string.Empty)
-                + aaxcTagLib.Duration.Minutes + " minutes, "
-                + aaxcTagLib.Duration.Seconds + " seconds";
-
-            var nfoString
-                = "General Information\r\n"
-                + "======================\r\n"
-                + $" Title:                  {aaxcTagLib.AppleTags.TitleSansUnabridged?.UnicodeToAscii() ?? "[unknown]"}\r\n"
-                + $" Author:                 {aaxcTagLib.AppleTags.FirstAuthor?.UnicodeToAscii() ?? "[unknown]"}\r\n"
-                + $" Read By:                {aaxcTagLib.AppleTags.Narrator?.UnicodeToAscii() ?? "[unknown]"}\r\n"
-                + $" Release Date:           {aaxcTagLib.AppleTags.ReleaseDate ?? "[unknown]"}\r\n"
-                + $" Book Copyright:         {aaxcTagLib.AppleTags.BookCopyright ?? "[unknown]"}\r\n"
-                + $" Recording Copyright:    {aaxcTagLib.AppleTags.RecordingCopyright ?? "[unknown]"}\r\n"
-                + $" Genre:                  {aaxcTagLib.AppleTags.Generes ?? "[unknown]"}\r\n"
-                + $" Publisher:              {aaxcTagLib.AppleTags.Publisher ?? "[unknown]"}\r\n"
-                + $" Duration:               {myDuration}\r\n"
-                + $" Chapters:               {chapters.Count}\r\n"
-                + "\r\n"
-                + "\r\n"
-                + "Media Information\r\n"
-                + "======================\r\n"
-                + " Source Format:          Audible AAXC\r\n"
-                + $" Source Sample Rate:     {aaxcTagLib.TimeScale} Hz\r\n"
-                + $" Source Channels:        {aaxcTagLib.AudioChannels}\r\n"
-                + $" Source Bitrate:         {aaxcTagLib.AverageBitrate} Kbps\r\n"
-                + "\r\n"
-                + " Lossless Encode:        Yes\r\n"
-                + " Encoded Codec:          AAC / M4B\r\n"
-                + $" Encoded Sample Rate:    {aaxcTagLib.TimeScale} Hz\r\n"
-                + $" Encoded Channels:       {aaxcTagLib.AudioChannels}\r\n"
-                + $" Encoded Bitrate:        {aaxcTagLib.AverageBitrate} Kbps\r\n"
-                + "\r\n"
-                + $" Ripper:                 {ripper}\r\n"
-                + "\r\n"
-                + "\r\n"
-                + "Book Description\r\n"
-                + "================\r\n"
-                + (!string.IsNullOrWhiteSpace(aaxcTagLib.AppleTags.LongDescription) ? aaxcTagLib.AppleTags.LongDescription.UnicodeToAscii() : aaxcTagLib.AppleTags.Comment?.UnicodeToAscii());
-
-            return nfoString;
-        }
-    }
-}

AaxDecrypter/NetworkFileStream.cs

@@ -83,7 +83,7 @@ namespace AaxDecrypter
         private FileStream _readFile { get; }
         private Stream _networkStream { get; set; }
         private bool hasBegunDownloading { get; set; }
-        private bool isCancelled { get; set; }
+        public bool IsCancelled { get; private set; }
         private EventWaitHandle downloadEnded { get; set; } 
         private EventWaitHandle downloadedPiece { get; set; } 
 
@@ -238,7 +238,7 @@ namespace AaxDecrypter
                     downloadedPiece.Set();
                 }
 
-            } while (downloadPosition < ContentLength && !isCancelled);
+            } while (downloadPosition < ContentLength && !IsCancelled);
 
             _writeFile.Close();
             _networkStream.Close();
@@ -248,7 +248,7 @@ namespace AaxDecrypter
             downloadedPiece.Set();
             downloadEnded.Set();
 
-            if (!isCancelled && WritePosition < ContentLength)
+            if (!IsCancelled && WritePosition < ContentLength)
                 throw new WebException($"Downloaded size (0x{WritePosition:X10}) is less than {nameof(ContentLength)} (0x{ContentLength:X10}).");
 
             if (WritePosition > ContentLength)
@@ -421,12 +421,12 @@ namespace AaxDecrypter
         /// <param name="requiredPosition">The minimum required flished data length in <see cref="SaveFilePath"/>.</param>
         private void WaitToPosition(long requiredPosition)
 		{
-            while (requiredPosition > WritePosition && !isCancelled && hasBegunDownloading && !downloadedPiece.WaitOne(1000)) ;
+            while (requiredPosition > WritePosition && !IsCancelled && hasBegunDownloading && !downloadedPiece.WaitOne(1000)) ;
         }
 
         public override void Close()
         {
-            isCancelled = true;
+            IsCancelled = true;
 
             while (downloadEnded is not null && !downloadEnded.WaitOne(1000)) ;
 

AaxDecrypter/UnencryptedAudiobookDownloader.cs

@@ -0,0 +1,86 @@
+using Dinah.Core.IO;
+using Dinah.Core.Net.Http;
+using Dinah.Core.StepRunner;
+using System;
+using System.IO;
+using System.Linq;
+using System.Threading;
+
+namespace AaxDecrypter
+{
+	public class UnencryptedAudiobookDownloader : AudiobookDownloadBase
+	{
+		protected override StepSequence steps { get; }
+
+		public UnencryptedAudiobookDownloader(string outFileName, string cacheDirectory, DownloadLicense dlLic)
+			: base(outFileName, cacheDirectory, dlLic)
+		{
+
+			steps = new StepSequence
+			{
+				Name = "Download Mp3 Audiobook",
+
+				["Step 1: Get Mp3 Metadata"] = Step1_GetMetadata,
+				["Step 2: Download Audiobook"] = Step2_DownloadAudiobookAsSingleFile,
+				["Step 3: Create Cue"] = Step3_CreateCue,
+				["Step 4: Cleanup"] = Step4_Cleanup,
+			};
+		}
+
+		public override void Cancel()
+		{
+			isCanceled = true;
+			CloseInputFileStream();
+		}
+
+		protected override int GetSpeedup(TimeSpan elapsed)
+		{
+			//Not implemented
+			return 0;
+		}
+
+		protected override bool Step1_GetMetadata()
+		{
+			OnRetrievedCoverArt(null);
+
+			return !isCanceled;
+		}
+
+		protected override bool Step2_DownloadAudiobookAsSingleFile()
+		{
+			DateTime startTime = DateTime.Now;
+
+			//MUST put InputFileStream.Length first, because it starts background downloader.
+
+			while (InputFileStream.Length > InputFileStream.WritePosition && !InputFileStream.IsCancelled) 
+			{
+				var rate = InputFileStream.WritePosition / (DateTime.Now - startTime).TotalSeconds;
+
+				var estTimeRemaining = (InputFileStream.Length - InputFileStream.WritePosition) / rate;
+
+				if (double.IsNormal(estTimeRemaining))
+					OnDecryptTimeRemaining(TimeSpan.FromSeconds(estTimeRemaining));
+
+				var progressPercent = (double)InputFileStream.WritePosition / InputFileStream.Length;
+
+				OnDecryptProgressUpdate(
+					new DownloadProgress
+					{
+						ProgressPercentage = 100 * progressPercent,
+						BytesReceived = (long)(InputFileStream.Length * progressPercent),
+						TotalBytesToReceive = InputFileStream.Length
+					});
+				Thread.Sleep(200);
+			}
+
+			CloseInputFileStream();
+
+			if (File.Exists(outputFileName))
+				FileExt.SafeDelete(outputFileName);
+
+			FileExt.SafeMove(InputFileStream.SaveFilePath, outputFileName);
+
+			return !isCanceled;
+		}
+	}
+}

AppScaffolding/AppScaffolding.csproj

@@ -3,7 +3,7 @@
 
   <PropertyGroup>
     <TargetFramework>net5.0</TargetFramework>
-    <Version>5.7.2.1</Version>
+    <Version>6.2.3.0</Version>
   </PropertyGroup>
 
   <ItemGroup>

AppScaffolding/LibationScaffolding.cs

@@ -46,25 +46,24 @@ namespace AppScaffolding
 			return Configuration.Instance;
 		}
 
-		public static void RunPostConfigMigrations()
+		/// <summary>most migrations go in here</summary>
+		public static void RunPostConfigMigrations(Configuration config)
 		{
 			AudibleApiStorage.EnsureAccountsSettingsFileExists();
 
-			var config = Configuration.Instance;
-
 			//
 			// migrations go below here
 			//
 
 			Migrations.migrate_to_v5_2_0__post_config(config);
 			Migrations.migrate_to_v5_7_1(config);
+			Migrations.migrate_to_v6_1_2(config);
+			Migrations.migrate_to_v6_2_0(config);
 		}
 
 		/// <summary>Initialize logging. Run after migration</summary>
-		public static void RunPostMigrationScaffolding()
+		public static void RunPostMigrationScaffolding(Configuration config)
 		{
-			var config = Configuration.Instance;
-
 			ensureSerilogConfig(config);
 			configureLogging(config);
 			logStartupState(config);
@@ -329,5 +328,22 @@ namespace AppScaffolding
 			if (!config.Exists(nameof(config.BadBook)))
 				config.BadBook = Configuration.BadBookAction.Ask;
 		}
+
+		// add config.DownloadEpisodes , config.ImportEpisodes
+		public static void migrate_to_v6_1_2(Configuration config)
+		{
+			if (!config.Exists(nameof(config.DownloadEpisodes)))
+				config.DownloadEpisodes = true;
+
+			if (!config.Exists(nameof(config.ImportEpisodes)))
+				config.ImportEpisodes = true;
+		}
+
+		// add config.SplitFilesByChapter
+		public static void migrate_to_v6_2_0(Configuration config)
+		{
+			if (!config.Exists(nameof(config.SplitFilesByChapter)))
+				config.SplitFilesByChapter = false;
+		}
 	}
 }

AppScaffolding/UNSAFE_MigrationHelper.cs

@@ -61,7 +61,16 @@ namespace AppScaffolding
 				return;
 
 			var startingContents = File.ReadAllText(APPSETTINGS_JSON);
-			var jObj = JObject.Parse(startingContents);
+
+			JObject jObj;
+			try
+			{
+				jObj = JObject.Parse(startingContents);
+			}
+			catch
+			{
+				return;
+			}
 
 			action(jObj);
 
@@ -130,7 +139,16 @@ namespace AppScaffolding
 				return;
 
 			var startingContents = File.ReadAllText(SettingsJsonPath);
-			var jObj = JObject.Parse(startingContents);
+
+			JObject jObj;
+			try
+			{
+				jObj = JObject.Parse(startingContents);
+			}
+			catch
+			{
+				return;
+			}
 
 			action(jObj);
 

ApplicationServices/LibraryCommands.cs

@@ -14,15 +14,13 @@ namespace ApplicationServices
 {
 	public static class LibraryCommands
 	{
-		private static LibraryOptions.ResponseGroupOptions LibraryResponseGroups = LibraryOptions.ResponseGroupOptions.ALL_OPTIONS;
-
-		public static async Task<List<LibraryBook>> FindInactiveBooks(Func<Account, ILoginCallback> loginCallbackFactoryFunc, List<LibraryBook> existingLibrary, params Account[] accounts)
+		public static async Task<List<LibraryBook>> FindInactiveBooks(Func<Account, Task<ApiExtended>> apiExtendedfunc, List<LibraryBook> existingLibrary, params Account[] accounts)
 		{
 			logRestart();
 
 			//These are the minimum response groups required for the
 			//library scanner to pass all validation and filtering.
-			LibraryResponseGroups =
+			var libraryResponseGroups =
 				LibraryOptions.ResponseGroupOptions.ProductAttrs |
 				LibraryOptions.ResponseGroupOptions.ProductDesc |
 				LibraryOptions.ResponseGroupOptions.Relationships;
@@ -33,7 +31,7 @@ namespace ApplicationServices
 			try
 			{
 				logTime($"pre {nameof(scanAccountsAsync)} all");
-				var libraryItems = await scanAccountsAsync(loginCallbackFactoryFunc, accounts);
+				var libraryItems = await scanAccountsAsync(apiExtendedfunc, accounts, libraryResponseGroups);
 				logTime($"post {nameof(scanAccountsAsync)} all");
 
 				var totalCount = libraryItems.Count;
@@ -68,14 +66,13 @@ namespace ApplicationServices
 			}
 			finally
 			{
-				LibraryResponseGroups = LibraryOptions.ResponseGroupOptions.ALL_OPTIONS;
 				stop();
 				var putBreakPointHere = logOutput;
 			}
 		}
 
 		#region FULL LIBRARY scan and import
-		public static async Task<(int totalCount, int newCount)> ImportAccountAsync(Func<Account, ILoginCallback> loginCallbackFactoryFunc, params Account[] accounts)
+		public static async Task<(int totalCount, int newCount)> ImportAccountAsync(Func<Account, Task<ApiExtended>> apiExtendedfunc, params Account[] accounts)
 		{
 			logRestart();
 
@@ -85,7 +82,7 @@ namespace ApplicationServices
 			try
 			{
 				logTime($"pre {nameof(scanAccountsAsync)} all");
-				var importItems = await scanAccountsAsync(loginCallbackFactoryFunc, accounts);
+				var importItems = await scanAccountsAsync(apiExtendedfunc, accounts, LibraryOptions.ResponseGroupOptions.ALL_OPTIONS);
 				logTime($"post {nameof(scanAccountsAsync)} all");
 
 				var totalCount = importItems.Count;
@@ -129,18 +126,16 @@ namespace ApplicationServices
 			}
 		}
 
-		private static async Task<List<ImportItem>> scanAccountsAsync(Func<Account, ILoginCallback> loginCallbackFactoryFunc, Account[] accounts)
+		private static async Task<List<ImportItem>> scanAccountsAsync(Func<Account, Task<ApiExtended>> apiExtendedfunc, Account[] accounts, LibraryOptions.ResponseGroupOptions libraryResponseGroups)
 		{
 			var tasks = new List<Task<List<ImportItem>>>();
 			foreach (var account in accounts)
 			{
-				var callback = loginCallbackFactoryFunc(account);
-
-				// get APIs in serial, esp b/c of logins
-				var api = await AudibleApiActions.GetApiAsync(callback, account);
+				// get APIs in serial b/c of logins. do NOT move inside of parallel (Task.WhenAll)
+				var apiExtended = await apiExtendedfunc(account);
 
 				// add scanAccountAsync as a TASK: do not await
-				tasks.Add(scanAccountAsync(api, account));
+				tasks.Add(scanAccountAsync(apiExtended, account, libraryResponseGroups));
 			}
 
 			// import library in parallel
@@ -149,7 +144,7 @@ namespace ApplicationServices
 			return importItems;
 		}
 
-		private static async Task<List<ImportItem>> scanAccountAsync(Api api, Account account)
+		private static async Task<List<ImportItem>> scanAccountAsync(ApiExtended apiExtended, Account account, LibraryOptions.ResponseGroupOptions libraryResponseGroups)
 		{
 			ArgumentValidator.EnsureNotNull(account, nameof(account));
 
@@ -160,7 +155,7 @@ namespace ApplicationServices
 
 			logTime($"pre scanAccountAsync {account.AccountName}");
 
-			var dtoItems = await AudibleApiActions.GetLibraryValidatedAsync(api, LibraryResponseGroups);
+			var dtoItems = await apiExtended.GetLibraryValidatedAsync(libraryResponseGroups, FileManager.Configuration.Instance.ImportEpisodes);
 
 			logTime($"post scanAccountAsync {account.AccountName} qty: {dtoItems.Count}");
 
@@ -194,6 +189,7 @@ namespace ApplicationServices
 
 			var removeLibraryBooks = libBooks.Where(lb => idsToRemove.Contains(lb.Book.AudibleProductId)).ToList();
 			context.LibraryBooks.RemoveRange(removeLibraryBooks);
+			context.Books.RemoveRange(removeLibraryBooks.Select(lb => lb.Book));
 
 			var qtyChanges = context.SaveChanges();
 			if (qtyChanges > 0)

ApplicationServices/LibraryExporter.cs

@@ -114,7 +114,7 @@ namespace ApplicationServices
 				Publisher = a.Book.Publisher,
 				HasPdf = a.Book.HasPdf,
 				SeriesNames = a.Book.SeriesNames,
-				SeriesOrder = a.Book.SeriesLink.Any() ? a.Book.SeriesLink?.Select(sl => $"{sl.Index} : {sl.Series.Name}").Aggregate((a, b) => $"{a}, {b}") : "",
+				SeriesOrder = a.Book.SeriesLink.Any() ? a.Book.SeriesLink?.Select(sl => $"{sl.Order} : {sl.Series.Name}").Aggregate((a, b) => $"{a}, {b}") : "",
 				CommunityRatingOverall = a.Book.Rating?.OverallRating,
 				CommunityRatingPerformance = a.Book.Rating?.PerformanceRating,
 				CommunityRatingStory = a.Book.Rating?.StoryRating,

DataLayer/DataLayer.csproj

@@ -12,13 +12,13 @@
   </PropertyGroup>
   
   <ItemGroup>
-    <PackageReference Include="Dinah.EntityFrameworkCore" Version="1.0.5.1" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="5.0.9">
+    <PackageReference Include="Dinah.EntityFrameworkCore" Version="1.0.5.2" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="5.0.10">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="5.0.9" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="5.0.9">
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="5.0.10" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="5.0.10">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

DataLayer/EfClasses/Book.cs

@@ -99,8 +99,8 @@ namespace DataLayer
 			Category = category;
 
             // simple assigns
-            Title = title.Trim();
-            Description = description.Trim();
+            Title = title.Trim() ?? "";
+            Description = description?.Trim() ?? "";
             LengthInMinutes = lengthInMinutes;
             ContentType = contentType;
 
@@ -203,7 +203,7 @@ namespace DataLayer
             }
         }
 
-        public void UpsertSeries(Series series, float? index = null, DbContext context = null)
+        public void UpsertSeries(Series series, string order, DbContext context = null)
         {
             ArgumentValidator.EnsureNotNull(series, nameof(series));
 
@@ -214,9 +214,9 @@ namespace DataLayer
 
 			var singleSeriesBook = _seriesLink.SingleOrDefault(sb => sb.Series == series);
             if (singleSeriesBook == null)
-                _seriesLink.Add(new SeriesBook(series, this, index));
+                _seriesLink.Add(new SeriesBook(series, this, order));
             else
-                singleSeriesBook.UpdateIndex(index);
+                singleSeriesBook.UpdateOrder(order);
         }
         #endregion
 

DataLayer/EfClasses/Series.cs

@@ -48,25 +48,6 @@ namespace DataLayer
                 Name = name;
         }
 
-        public void AddBook(Book book, float? index = null, DbContext context = null)
-        {
-            ArgumentValidator.EnsureNotNull(book, nameof(book));
-
-            // our add() is conditional upon what's already included in the collection.
-            // therefore if not loaded, a trip is required. might as well just load it
-            if (_booksLink == null)
-            {
-                ArgumentValidator.EnsureNotNull(context, nameof(context));
-                if (!context.Entry(this).IsKeySet)
-                    throw new InvalidOperationException("Could not add series");
-
-                context.Entry(this).Collection(s => s.BooksLink).Load();
-            }
-
-            if (_booksLink.SingleOrDefault(sb => sb.Book == book) == null)
-                _booksLink.Add(new SeriesBook(this, book, index));
-        }
-
 		public override string ToString() => Name;
 	}
 }

DataLayer/EfClasses/SeriesBook.cs

@@ -7,32 +7,27 @@ namespace DataLayer
         internal int SeriesId { get; private set; }
         internal int BookId { get; private set; }
 
-        /// <summary>
-        /// <para>"index" not "order". This is both for sequence and display</para>
-        /// <para>Float allows for in-between books. eg: 2.5</para>
-        /// <para>To show 2 editions as the same book in a series, give them the same index</para>
-        /// <para>null IS NOT the same as 0. Some series call a book "book 0"</para>
-        /// </summary>
-        public float? Index { get; private set; }
+        public string Order { get; private set; }
+        public float Index => StringLib.ExtractFirstNumber(Order);
 
         public Series Series { get; private set; }
         public Book Book { get; private set; }
 
         private SeriesBook() { }
-        internal SeriesBook(Series series, Book book, float? index = null)
+        internal SeriesBook(Series series, Book book, string order)
         {
             ArgumentValidator.EnsureNotNull(series, nameof(series));
             ArgumentValidator.EnsureNotNull(book, nameof(book));
 
             Series = series;
             Book = book;
-            Index = index;
+            Order = order;
         }
 
-        public void UpdateIndex(float? index)
+        public void UpdateOrder(string order)
         {
-            if (index.HasValue)
-                Index = index.Value;
+            if (!string.IsNullOrWhiteSpace(order))
+                Order = order;
         }
 
 		public override string ToString() => $"Series={Series} Book={Book}";

DataLayer/EfClasses/UserDefinedItem.cs

@@ -47,7 +47,7 @@ namespace DataLayer
                 if (_tags != newTags)
                 {
                     _tags = newTags;
-                    ItemChanged?.Invoke(this, nameof(Tags));
+                    OnItemChanged(nameof(Tags));
                 }
             }
 		}
@@ -106,6 +106,33 @@ namespace DataLayer
         #endregion
 
         #region LiberatedStatuses
+        /// <summary>
+        /// Occurs when <see cref="Tags"/>, <see cref="BookStatus"/>, or <see cref="PdfStatus"/> values change.
+        /// This signals the change of the in-memory value; it does not ensure that the new value has been persisted.
+        /// </summary>
+        public static event EventHandler<string> ItemChanged;
+
+        private void OnItemChanged(string e)
+        {
+            // HACK
+            // must not fire during initial import.
+            //
+            // these checks are necessary because current architecture attaches to this instead of attaching to an event *after* fully committed to db. the attached delegate/action sometimes calls commit:
+            //
+            // desired:
+            // - importing new book
+            // - update pdf status
+            // - initial book commit
+            //
+            // actual without these checks [BAD]:
+            // - importing new book
+            // - update pdf status
+            //   - invoke event
+            //   - commit UserDefinedItem
+            // - initial book commit
+            if (BookId > 0 && Book is not null && Book.BookId > 0)
+                ItemChanged?.Invoke(this, e);
+        }
 
         private LiberatedStatus _bookStatus;
         private LiberatedStatus? _pdfStatus;
@@ -117,7 +144,7 @@ namespace DataLayer
                 if (_bookStatus != value)
 				{
                     _bookStatus = value;
-                    ItemChanged?.Invoke(this, nameof(BookStatus));
+                    OnItemChanged(nameof(BookStatus));
                 }
             }
         }
@@ -129,16 +156,44 @@ namespace DataLayer
                 if (_pdfStatus != value)
                 {
                     _pdfStatus = value;
-                    ItemChanged?.Invoke(this, nameof(PdfStatus));
+                    OnItemChanged(nameof(PdfStatus));
                 }
             }
+        }
+		#endregion
+
+		#region batch changes
+		public static event EventHandler<string> Batch_ItemChanged;
+        public void BatchMode_UpdateBookStatus(LiberatedStatus value)
+        {
+            if (_bookStatus != value)
+            {
+                _bookStatus = value;
+                batchFlag = true;
+            }
+        }
+
+        // don't overwrite current with null. Therefore input is "LiberatedStatus" not "LiberatedStatus?"
+        public void BatchMode_UpdatePdfStatus(LiberatedStatus value)
+        {
+            if (_pdfStatus != value)
+            {
+                _pdfStatus = value;
+                batchFlag = true;
+            }
+        }
+
+        private static bool batchFlag = false;
+
+        public static void BatchMode_Finalize()
+        {
+            if (batchFlag)
+                Batch_ItemChanged?.Invoke(null, null);
+
+            batchFlag = false;
         }
         #endregion
-        /// <summary>
-        /// Occurs when <see cref="Tags"/>, <see cref="BookStatus"/>, or <see cref="PdfStatus"/> values change.
-        /// This signals the change of the in-memory value; it does not ensure that the new value has been persisted.
-        /// </summary>
-        public static event EventHandler<string> ItemChanged;
+
         public override string ToString() => $"{Book} {Rating} {Tags}";
 	}
 }

DataLayer/Migrations/20210922154900_AddSeriesOrderString.Designer.cs

@@ -0,0 +1,390 @@
+// <auto-generated />
+using System;
+using DataLayer;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+
+namespace DataLayer.Migrations
+{
+    [DbContext(typeof(LibationContext))]
+    [Migration("20210922154900_AddSeriesOrderString")]
+    partial class AddSeriesOrderString
+    {
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("ProductVersion", "5.0.10");
+
+            modelBuilder.Entity("DataLayer.Book", b =>
+                {
+                    b.Property<int>("BookId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("AudibleProductId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("CategoryId")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("ContentType")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<DateTime?>("DatePublished")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("IsAbridged")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("LengthInMinutes")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Locale")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("PictureId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Title")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("BookId");
+
+                    b.HasIndex("AudibleProductId");
+
+                    b.HasIndex("CategoryId");
+
+                    b.ToTable("Books");
+                });
+
+            modelBuilder.Entity("DataLayer.BookContributor", b =>
+                {
+                    b.Property<int>("BookId")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("ContributorId")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("Role")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<byte>("Order")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("BookId", "ContributorId", "Role");
+
+                    b.HasIndex("BookId");
+
+                    b.HasIndex("ContributorId");
+
+                    b.ToTable("BookContributor");
+                });
+
+            modelBuilder.Entity("DataLayer.Category", b =>
+                {
+                    b.Property<int>("CategoryId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("AudibleCategoryId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int?>("ParentCategoryCategoryId")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("CategoryId");
+
+                    b.HasIndex("AudibleCategoryId");
+
+                    b.HasIndex("ParentCategoryCategoryId");
+
+                    b.ToTable("Categories");
+
+                    b.HasData(
+                        new
+                        {
+                            CategoryId = -1,
+                            AudibleCategoryId = "",
+                            Name = ""
+                        });
+                });
+
+            modelBuilder.Entity("DataLayer.Contributor", b =>
+                {
+                    b.Property<int>("ContributorId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("AudibleContributorId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("ContributorId");
+
+                    b.HasIndex("Name");
+
+                    b.ToTable("Contributors");
+
+                    b.HasData(
+                        new
+                        {
+                            ContributorId = -1,
+                            Name = ""
+                        });
+                });
+
+            modelBuilder.Entity("DataLayer.LibraryBook", b =>
+                {
+                    b.Property<int>("BookId")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Account")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("DateAdded")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("BookId");
+
+                    b.ToTable("LibraryBooks");
+                });
+
+            modelBuilder.Entity("DataLayer.Series", b =>
+                {
+                    b.Property<int>("SeriesId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("AudibleSeriesId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("SeriesId");
+
+                    b.HasIndex("AudibleSeriesId");
+
+                    b.ToTable("Series");
+                });
+
+            modelBuilder.Entity("DataLayer.SeriesBook", b =>
+                {
+                    b.Property<int>("SeriesId")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("BookId")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Order")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("SeriesId", "BookId");
+
+                    b.HasIndex("BookId");
+
+                    b.HasIndex("SeriesId");
+
+                    b.ToTable("SeriesBook");
+                });
+
+            modelBuilder.Entity("DataLayer.Book", b =>
+                {
+                    b.HasOne("DataLayer.Category", "Category")
+                        .WithMany()
+                        .HasForeignKey("CategoryId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.OwnsOne("DataLayer.Rating", "Rating", b1 =>
+                        {
+                            b1.Property<int>("BookId")
+                                .HasColumnType("INTEGER");
+
+                            b1.Property<float>("OverallRating")
+                                .HasColumnType("REAL");
+
+                            b1.Property<float>("PerformanceRating")
+                                .HasColumnType("REAL");
+
+                            b1.Property<float>("StoryRating")
+                                .HasColumnType("REAL");
+
+                            b1.HasKey("BookId");
+
+                            b1.ToTable("Books");
+
+                            b1.WithOwner()
+                                .HasForeignKey("BookId");
+                        });
+
+                    b.OwnsMany("DataLayer.Supplement", "Supplements", b1 =>
+                        {
+                            b1.Property<int>("SupplementId")
+                                .ValueGeneratedOnAdd()
+                                .HasColumnType("INTEGER");
+
+                            b1.Property<int>("BookId")
+                                .HasColumnType("INTEGER");
+
+                            b1.Property<string>("Url")
+                                .HasColumnType("TEXT");
+
+                            b1.HasKey("SupplementId");
+
+                            b1.HasIndex("BookId");
+
+                            b1.ToTable("Supplement");
+
+                            b1.WithOwner("Book")
+                                .HasForeignKey("BookId");
+
+                            b1.Navigation("Book");
+                        });
+
+                    b.OwnsOne("DataLayer.UserDefinedItem", "UserDefinedItem", b1 =>
+                        {
+                            b1.Property<int>("BookId")
+                                .HasColumnType("INTEGER");
+
+                            b1.Property<int>("BookStatus")
+                                .HasColumnType("INTEGER");
+
+                            b1.Property<int?>("PdfStatus")
+                                .HasColumnType("INTEGER");
+
+                            b1.Property<string>("Tags")
+                                .HasColumnType("TEXT");
+
+                            b1.HasKey("BookId");
+
+                            b1.ToTable("UserDefinedItem");
+
+                            b1.WithOwner("Book")
+                                .HasForeignKey("BookId");
+
+                            b1.OwnsOne("DataLayer.Rating", "Rating", b2 =>
+                                {
+                                    b2.Property<int>("UserDefinedItemBookId")
+                                        .HasColumnType("INTEGER");
+
+                                    b2.Property<float>("OverallRating")
+                                        .HasColumnType("REAL");
+
+                                    b2.Property<float>("PerformanceRating")
+                                        .HasColumnType("REAL");
+
+                                    b2.Property<float>("StoryRating")
+                                        .HasColumnType("REAL");
+
+                                    b2.HasKey("UserDefinedItemBookId");
+
+                                    b2.ToTable("UserDefinedItem");
+
+                                    b2.WithOwner()
+                                        .HasForeignKey("UserDefinedItemBookId");
+                                });
+
+                            b1.Navigation("Book");
+
+                            b1.Navigation("Rating");
+                        });
+
+                    b.Navigation("Category");
+
+                    b.Navigation("Rating");
+
+                    b.Navigation("Supplements");
+
+                    b.Navigation("UserDefinedItem");
+                });
+
+            modelBuilder.Entity("DataLayer.BookContributor", b =>
+                {
+                    b.HasOne("DataLayer.Book", "Book")
+                        .WithMany("ContributorsLink")
+                        .HasForeignKey("BookId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("DataLayer.Contributor", "Contributor")
+                        .WithMany("BooksLink")
+                        .HasForeignKey("ContributorId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Book");
+
+                    b.Navigation("Contributor");
+                });
+
+            modelBuilder.Entity("DataLayer.Category", b =>
+                {
+                    b.HasOne("DataLayer.Category", "ParentCategory")
+                        .WithMany()
+                        .HasForeignKey("ParentCategoryCategoryId");
+
+                    b.Navigation("ParentCategory");
+                });
+
+            modelBuilder.Entity("DataLayer.LibraryBook", b =>
+                {
+                    b.HasOne("DataLayer.Book", "Book")
+                        .WithOne()
+                        .HasForeignKey("DataLayer.LibraryBook", "BookId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Book");
+                });
+
+            modelBuilder.Entity("DataLayer.SeriesBook", b =>
+                {
+                    b.HasOne("DataLayer.Book", "Book")
+                        .WithMany("SeriesLink")
+                        .HasForeignKey("BookId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("DataLayer.Series", "Series")
+                        .WithMany("BooksLink")
+                        .HasForeignKey("SeriesId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Book");
+
+                    b.Navigation("Series");
+                });
+
+            modelBuilder.Entity("DataLayer.Book", b =>
+                {
+                    b.Navigation("ContributorsLink");
+
+                    b.Navigation("SeriesLink");
+                });
+
+            modelBuilder.Entity("DataLayer.Contributor", b =>
+                {
+                    b.Navigation("BooksLink");
+                });
+
+            modelBuilder.Entity("DataLayer.Series", b =>
+                {
+                    b.Navigation("BooksLink");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}

DataLayer/Migrations/20210922154900_AddSeriesOrderString.cs

@@ -0,0 +1,33 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+namespace DataLayer.Migrations
+{
+    public partial class AddSeriesOrderString : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "Index",
+                table: "SeriesBook");
+
+            migrationBuilder.AddColumn<string>(
+                name: "Order",
+                table: "SeriesBook",
+                type: "TEXT",
+                nullable: true);
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "Order",
+                table: "SeriesBook");
+
+            migrationBuilder.AddColumn<float>(
+                name: "Index",
+                table: "SeriesBook",
+                type: "REAL",
+                nullable: true);
+        }
+    }
+}

DataLayer/Migrations/LibationContextModelSnapshot.cs

@@ -14,7 +14,7 @@ namespace DataLayer.Migrations
         {
 #pragma warning disable 612, 618
             modelBuilder
-                .HasAnnotation("ProductVersion", "5.0.9");
+                .HasAnnotation("ProductVersion", "5.0.10");
 
             modelBuilder.Entity("DataLayer.Book", b =>
                 {
@@ -185,8 +185,8 @@ namespace DataLayer.Migrations
                     b.Property<int>("BookId")
                         .HasColumnType("INTEGER");
 
-                    b.Property<float?>("Index")
-                        .HasColumnType("REAL");
+                    b.Property<string>("Order")
+                        .HasColumnType("TEXT");
 
                     b.HasKey("SeriesId", "BookId");
 

DtoImporterService/BookImporter.cs

@@ -165,18 +165,7 @@ namespace DtoImporterService
 				foreach (var seriesEntry in item.Series)
 				{
 					var series = DbContext.Series.Local.Single(s => seriesEntry.SeriesId == s.AudibleSeriesId);
-
-					var index = 0f;
-					try
-					{
-						index = seriesEntry.Index;
-					}
-					catch (Exception ex)
-					{
-						Serilog.Log.Logger.Error(ex, $"Error parsing series index. Title: {item.Title}. ASIN: {item.Asin}. Series index: {seriesEntry.Sequence}");
-					}
-
-					book.UpsertSeries(series, index);
+					book.UpsertSeries(series, seriesEntry.Sequence);
 				}
 			}
 		}

DtoImporterService/CategoryImporter.cs

@@ -66,9 +66,11 @@ namespace DtoImporterService
 
 					Category parentCategory = null;
 					if (i == 1)
-						parentCategory = DbContext.Categories.Local.Single(c => c.AudibleCategoryId == pair[0].CategoryId);
+						// should be "Single()" but user is getting a strange error
+						parentCategory = DbContext.Categories.Local.FirstOrDefault(c => c.AudibleCategoryId == pair[0].CategoryId);
 
-					var category = DbContext.Categories.Local.SingleOrDefault(c => c.AudibleCategoryId == id);
+					// should be "SingleOrDefault()" but user is getting a strange error
+					var category = DbContext.Categories.Local.FirstOrDefault(c => c.AudibleCategoryId == id);
 					if (category is null)
 					{
 						category = DbContext.Categories.Add(new Category(new AudibleCategoryId(id), name)).Entity;

DtoImporterService/ImportItem.cs

@@ -1,7 +1,7 @@
 using System;
 using AudibleApi.Common;
 
-namespace InternalUtilities
+namespace DtoImporterService
 {
 	public class ImportItem
 	{

DtoImporterService/SeriesImporter.cs

@@ -48,7 +48,7 @@ namespace DtoImporterService
 
 			foreach (var s in requestedSeries)
 			{
-				var series = DbContext.Series.Local.SingleOrDefault(c => c.AudibleSeriesId == s.SeriesId);
+				var series = DbContext.Series.Local.FirstOrDefault(c => c.AudibleSeriesId == s.SeriesId);
 				if (series is null)
 				{
 					series = DbContext.Series.Add(new DataLayer.Series(new AudibleSeriesId(s.SeriesId))).Entity;

FileLiberator/AudioDecodable.cs

@@ -0,0 +1,44 @@
+using System;
+
+namespace FileLiberator
+{
+    public abstract class AudioDecodable : Processable
+    {
+        public event EventHandler<Action<byte[]>> RequestCoverArt;
+        public event EventHandler<string> TitleDiscovered;
+        public event EventHandler<string> AuthorsDiscovered;
+        public event EventHandler<string> NarratorsDiscovered;
+        public event EventHandler<byte[]> CoverImageDiscovered;
+        public abstract void Cancel();
+
+        protected void OnRequestCoverArt(Action<byte[]> setCoverArtDel)
+		{
+            Serilog.Log.Logger.Debug("Event fired {@DebugInfo}", new { Name = nameof(RequestCoverArt) });
+            RequestCoverArt?.Invoke(this, setCoverArtDel);
+        }
+
+        protected void OnTitleDiscovered(string title)
+		{
+            Serilog.Log.Logger.Debug("Event fired {@DebugInfo}", new { Name = nameof(TitleDiscovered), Title = title });
+            TitleDiscovered?.Invoke(this, title);
+		}
+
+        protected void OnAuthorsDiscovered(string authors)
+		{
+            Serilog.Log.Logger.Debug("Event fired {@DebugInfo}", new { Name = nameof(AuthorsDiscovered), Authors = authors });
+            AuthorsDiscovered?.Invoke(this, authors);
+		}
+
+        protected void OnNarratorsDiscovered(string narrators)
+		{
+            Serilog.Log.Logger.Debug("Event fired {@DebugInfo}", new { Name = nameof(NarratorsDiscovered), Narrators = narrators });
+            NarratorsDiscovered?.Invoke(this, narrators);
+		}
+
+        protected void OnCoverImageDiscovered(byte[] coverImage)
+		{
+            Serilog.Log.Logger.Debug("Event fired {@DebugInfo}", new { Name = nameof(CoverImageDiscovered), CoverImageBytes = coverImage?.Length });
+            CoverImageDiscovered?.Invoke(this, coverImage);
+        }
+    }
+}

FileLiberator/ConvertToMp3.cs

@@ -12,54 +12,26 @@ using System.Threading.Tasks;
 
 namespace FileLiberator
 {
-    public class ConvertToMp3 : IAudioDecodable
+    public class ConvertToMp3 : AudioDecodable
     {
         private Mp4File m4bBook;
 
-		public event EventHandler<TimeSpan> StreamingTimeRemaining;
-		public event EventHandler<Action<byte[]>> RequestCoverArt;
-		public event EventHandler<string> TitleDiscovered;
-		public event EventHandler<string> AuthorsDiscovered;
-		public event EventHandler<string> NarratorsDiscovered;
-		public event EventHandler<byte[]> CoverImageDiscovered;
-		public event EventHandler<string> StreamingBegin;
-		public event EventHandler<DownloadProgress> StreamingProgressChanged;
-		public event EventHandler<string> StreamingCompleted;
-		public event EventHandler<LibraryBook> Begin;
-		public event EventHandler<string> StatusUpdate;
-		public event EventHandler<LibraryBook> Completed;
-
-        public ConvertToMp3()
-        {
-            RequestCoverArt += (o, e) => Serilog.Log.Logger.Debug("Event fired {@DebugInfo}", new { Name = nameof(RequestCoverArt) });
-            TitleDiscovered += (o, e) => Serilog.Log.Logger.Debug("Event fired {@DebugInfo}", new { Name = nameof(TitleDiscovered), Title = e });
-            AuthorsDiscovered += (o, e) => Serilog.Log.Logger.Debug("Event fired {@DebugInfo}", new { Name = nameof(AuthorsDiscovered), Authors = e });
-            NarratorsDiscovered += (o, e) => Serilog.Log.Logger.Debug("Event fired {@DebugInfo}", new { Name = nameof(NarratorsDiscovered), Narrators = e });
-            CoverImageDiscovered += (o, e) => Serilog.Log.Logger.Debug("Event fired {@DebugInfo}", new { Name = nameof(CoverImageDiscovered), CoverImageBytes = e?.Length });
-
-            StreamingBegin += (o, e) => Serilog.Log.Logger.Information("Event fired {@DebugInfo}", new { Name = nameof(StreamingBegin), Message = e });
-            StreamingCompleted += (o, e) => Serilog.Log.Logger.Information("Event fired {@DebugInfo}", new { Name = nameof(StreamingCompleted), Message = e });
-
-            Begin += (o, e) => Serilog.Log.Logger.Information("Event fired {@DebugInfo}", new { Name = nameof(Begin), Book = e.LogFriendly() });
-            Completed += (o, e) => Serilog.Log.Logger.Information("Event fired {@DebugInfo}", new { Name = nameof(Completed), Book = e.LogFriendly() });
-        }
-
 		private long fileSize;
-		private string Mp3FileName(string m4bPath) => m4bPath is null ? string.Empty : PathLib.ReplaceExtension(m4bPath, ".mp3");
+		private static string Mp3FileName(string m4bPath) => m4bPath is null ? string.Empty : PathLib.ReplaceExtension(m4bPath, ".mp3");
 
-        public void Cancel() => m4bBook?.Cancel();
+        public override void Cancel() => m4bBook?.Cancel();
 
-        public bool Validate(LibraryBook libraryBook)
+        public override bool Validate(LibraryBook libraryBook)
         {
             var path = AudibleFileStorage.Audio.GetPath(libraryBook.Book.AudibleProductId);
             return path?.ToLower()?.EndsWith(".m4b") == true && !File.Exists(Mp3FileName(path));
         }
 
-        public async Task<StatusHandler> ProcessAsync(LibraryBook libraryBook)
+        public override async Task<StatusHandler> ProcessAsync(LibraryBook libraryBook)
         {
-            Begin?.Invoke(this, libraryBook);
+            OnBegin(libraryBook);
 
-            StreamingBegin?.Invoke(this, $"Begin converting {libraryBook} to mp3");
+            OnStreamingBegin($"Begin converting {libraryBook} to mp3");
 
             try
             {
@@ -69,10 +41,10 @@ namespace FileLiberator
 
                 fileSize = m4bBook.InputStream.Length;
 
-                TitleDiscovered?.Invoke(this, m4bBook.AppleTags.Title);
-                AuthorsDiscovered?.Invoke(this, m4bBook.AppleTags.FirstAuthor);
-                NarratorsDiscovered?.Invoke(this, m4bBook.AppleTags.Narrator);
-                CoverImageDiscovered?.Invoke(this, m4bBook.AppleTags.Cover);
+                OnTitleDiscovered(m4bBook.AppleTags.Title);
+                OnAuthorsDiscovered(m4bBook.AppleTags.FirstAuthor);
+                OnNarratorsDiscovered(m4bBook.AppleTags.Narrator);
+                OnCoverImageDiscovered(m4bBook.AppleTags.Cover);
 
                 using var mp3File = File.OpenWrite(Path.GetTempFileName());
 
@@ -93,8 +65,8 @@ namespace FileLiberator
             }
             finally
             {
-                StreamingCompleted?.Invoke(this, $"Completed converting to mp3: {libraryBook.Book.Title}");
-                Completed?.Invoke(this, libraryBook);
+                OnStreamingCompleted($"Completed converting to mp3: {libraryBook.Book.Title}");
+                OnCompleted(libraryBook);
             }
         }
 
@@ -105,11 +77,11 @@ namespace FileLiberator
             double estTimeRemaining = remainingSecsToProcess / e.ProcessSpeed;
 
             if (double.IsNormal(estTimeRemaining))
-                StreamingTimeRemaining?.Invoke(this, TimeSpan.FromSeconds(estTimeRemaining));
+                OnStreamingTimeRemaining(TimeSpan.FromSeconds(estTimeRemaining));
 
             double progressPercent = 100 * e.ProcessPosition.TotalSeconds / duration.TotalSeconds;
 
-            StreamingProgressChanged?.Invoke(this,
+            OnStreamingProgressChanged(
                 new DownloadProgress
                 {
                     ProgressPercentage = progressPercent,

FileLiberator/DownloadDecryptBook.cs

@@ -8,53 +8,24 @@ using AudibleApi;
 using DataLayer;
 using Dinah.Core;
 using Dinah.Core.ErrorHandling;
-using Dinah.Core.Net.Http;
 using FileManager;
 
 namespace FileLiberator
 {
-    public class DownloadDecryptBook : IAudioDecodable
+    public class DownloadDecryptBook : AudioDecodable
     {
-        private AaxcDownloadConverter aaxcDownloader;
+        private AudiobookDownloadBase abDownloader;
 
-        public event EventHandler<TimeSpan> StreamingTimeRemaining;
-        public event EventHandler<Action<byte[]>> RequestCoverArt;
-        public event EventHandler<string> TitleDiscovered;
-        public event EventHandler<string> AuthorsDiscovered;
-        public event EventHandler<string> NarratorsDiscovered;
-        public event EventHandler<byte[]> CoverImageDiscovered;
-        public event EventHandler<string> StreamingBegin;
-        public event EventHandler<DownloadProgress> StreamingProgressChanged;
-        public event EventHandler<string> StreamingCompleted;
-        public event EventHandler<LibraryBook> Begin;
-        public event EventHandler<string> StatusUpdate;
-        public event EventHandler<LibraryBook> Completed;
-
-        public DownloadDecryptBook()
+        public override async Task<StatusHandler> ProcessAsync(LibraryBook libraryBook)
         {
-            RequestCoverArt += (o, e) => Serilog.Log.Logger.Debug("Event fired {@DebugInfo}", new { Name = nameof(RequestCoverArt) });
-            TitleDiscovered += (o, e) => Serilog.Log.Logger.Debug("Event fired {@DebugInfo}", new { Name = nameof(TitleDiscovered), Title = e });
-            AuthorsDiscovered += (o, e) => Serilog.Log.Logger.Debug("Event fired {@DebugInfo}", new { Name = nameof(AuthorsDiscovered), Authors = e });
-            NarratorsDiscovered += (o, e) => Serilog.Log.Logger.Debug("Event fired {@DebugInfo}", new { Name = nameof(NarratorsDiscovered), Narrators = e });
-            CoverImageDiscovered += (o, e) => Serilog.Log.Logger.Debug("Event fired {@DebugInfo}", new { Name = nameof(CoverImageDiscovered), CoverImageBytes = e?.Length });
-
-            StreamingBegin += (o, e) => Serilog.Log.Logger.Information("Event fired {@DebugInfo}", new { Name = nameof(StreamingBegin), Message = e });
-            StreamingCompleted += (o, e) => Serilog.Log.Logger.Information("Event fired {@DebugInfo}", new { Name = nameof(StreamingCompleted), Message = e });
-
-            Begin += (o, e) => Serilog.Log.Logger.Information("Event fired {@DebugInfo}", new { Name = nameof(Begin), Book = e.LogFriendly() });
-            Completed += (o, e) => Serilog.Log.Logger.Information("Event fired {@DebugInfo}", new { Name = nameof(Completed), Book = e.LogFriendly() });
-        }
-
-        public async Task<StatusHandler> ProcessAsync(LibraryBook libraryBook)
-        {
-            Begin?.Invoke(this, libraryBook);
+            OnBegin(libraryBook);
 
             try
             {
                 if (libraryBook.Book.Audio_Exists)
                     return new StatusHandler { "Cannot find decrypt. Final audio file already exists" };
 
-                var outputAudioFilename = await aaxToM4bConverterDecryptAsync(AudibleFileStorage.DownloadsInProgress, AudibleFileStorage.DecryptInProgress, libraryBook);
+                var outputAudioFilename = await downloadAudiobookAsync(AudibleFileStorage.DownloadsInProgress, AudibleFileStorage.DecryptInProgress, libraryBook);
 
                 // decrypt failed
                 if (outputAudioFilename is null)
@@ -72,59 +43,60 @@ namespace FileLiberator
             }
             finally
             {
-                Completed?.Invoke(this, libraryBook);
+                OnCompleted(libraryBook);
             }
         }
 
-        private async Task<string> aaxToM4bConverterDecryptAsync(string cacheDir, string destinationDir, LibraryBook libraryBook)
+        private async Task<string> downloadAudiobookAsync(string cacheDir, string destinationDir, LibraryBook libraryBook)
         {
-            StreamingBegin?.Invoke(this, $"Begin decrypting {libraryBook}");
+            OnStreamingBegin($"Begin decrypting {libraryBook}");
 
             try
             {
                 validate(libraryBook);
 
-                var api = await InternalUtilities.AudibleApiActions.GetApiAsync(libraryBook.Account, libraryBook.Book.Locale);
-
+                var api = await libraryBook.GetApiAsync();
                 var contentLic = await api.GetDownloadLicenseAsync(libraryBook.Book.AudibleProductId);
 
-                var aaxcDecryptDlLic = new DownloadLicense
+                var audiobookDlLic = new DownloadLicense
                     (
                     contentLic?.ContentMetadata?.ContentUrl?.OfflineUrl,
                     contentLic?.Voucher?.Key,
                     contentLic?.Voucher?.Iv,
-                    Resources.UserAgent
+                    Resources.USER_AGENT
                     );
 
-                if (Configuration.Instance.AllowLibationFixup)
+                //I assume if ContentFormat == "MPEG" that the delivered file is an unencrypted mp3.
+                //I also assume that if DrmType != Adrm, the file will be an mp3.
+                //These assumptions may be wrong, and only time and bug reports will tell.
+                var outputFormat = 
+                    contentLic.ContentMetadata.ContentReference.ContentFormat == "MPEG" ||
+                    (Configuration.Instance.AllowLibationFixup && Configuration.Instance.DecryptToLossy) ? 
+                    OutputFormat.Mp3 : OutputFormat.M4b;
+
+                if (Configuration.Instance.AllowLibationFixup || outputFormat == OutputFormat.Mp3)
                 {
-                    aaxcDecryptDlLic.ChapterInfo = new AAXClean.ChapterInfo();
+                    audiobookDlLic.ChapterInfo = new AAXClean.ChapterInfo();
 
                     foreach (var chap in contentLic.ContentMetadata?.ChapterInfo?.Chapters)
-                        aaxcDecryptDlLic.ChapterInfo.AddChapter(chap.Title, TimeSpan.FromMilliseconds(chap.LengthMs));
+                        audiobookDlLic.ChapterInfo.AddChapter(chap.Title, TimeSpan.FromMilliseconds(chap.LengthMs));
                 }
+                
+                var outFileName = Path.Combine(destinationDir, $"{PathLib.ToPathSafeString(libraryBook.Book.Title)} [{libraryBook.Book.AudibleProductId}].{outputFormat.ToString().ToLower()}");
 
-
-                var format = Configuration.Instance.DecryptToLossy ? OutputFormat.Mp3 : OutputFormat.Mp4a;
-
-                var extension = format switch
-                {
-                    OutputFormat.Mp4a => "m4b",
-                    OutputFormat.Mp3 => "mp3",
-                    _ => throw new NotImplementedException(),
-                };
-
-                var outFileName = Path.Combine(destinationDir, $"{PathLib.ToPathSafeString(libraryBook.Book.Title)} [{libraryBook.Book.AudibleProductId}].{extension}");
-
-
-                aaxcDownloader = new AaxcDownloadConverter(outFileName, cacheDir, aaxcDecryptDlLic, format) { AppName = "Libation" };
-                aaxcDownloader.DecryptProgressUpdate += (s, progress) => StreamingProgressChanged?.Invoke(this, progress);
-                aaxcDownloader.DecryptTimeRemaining += (s, remaining) => StreamingTimeRemaining?.Invoke(this, remaining);
-                aaxcDownloader.RetrievedCoverArt += AaxcDownloader_RetrievedCoverArt;
-                aaxcDownloader.RetrievedTags += aaxcDownloader_RetrievedTags;
+                abDownloader = contentLic.DrmType == AudibleApi.Common.DrmType.Adrm
+                    ? new AaxcDownloadConverter(outFileName, cacheDir, audiobookDlLic, outputFormat, Configuration.Instance.SplitFilesByChapter)
+                    : new UnencryptedAudiobookDownloader(outFileName, cacheDir, audiobookDlLic);
+                abDownloader.AppName = "Libation";
+                abDownloader.DecryptProgressUpdate += (_, progress) => OnStreamingProgressChanged(progress);
+                abDownloader.DecryptTimeRemaining += (_, remaining) => OnStreamingTimeRemaining(remaining);
+                abDownloader.RetrievedTitle += (_, title) => OnTitleDiscovered(title);
+                abDownloader.RetrievedAuthors += (_, authors) => OnAuthorsDiscovered(authors);
+                abDownloader.RetrievedNarrators += (_, narrators) => OnNarratorsDiscovered(narrators);
+                abDownloader.RetrievedCoverArt += AaxcDownloader_RetrievedCoverArt;
 
                 // REAL WORK DONE HERE
-                var success = await Task.Run(() => aaxcDownloader.Run());
+                var success = await Task.Run(abDownloader.Run);
 
                 // decrypt failed
                 if (!success)
@@ -134,36 +106,28 @@ namespace FileLiberator
             }
             finally
             {
-                StreamingCompleted?.Invoke(this, $"Completed downloading and decrypting {libraryBook.Book.Title}");
+                OnStreamingCompleted($"Completed downloading and decrypting {libraryBook.Book.Title}");
             }
         }
 
-
         private void AaxcDownloader_RetrievedCoverArt(object sender, byte[] e)
         {
             if (e is null && Configuration.Instance.AllowLibationFixup)
             {
-                RequestCoverArt?.Invoke(this, aaxcDownloader.SetCoverArt);
+                OnRequestCoverArt(abDownloader.SetCoverArt);
             }
 
             if (e is not null)
             {
-                CoverImageDiscovered?.Invoke(this, e);
+                OnCoverImageDiscovered(e);
             }
         }
 
-        private void aaxcDownloader_RetrievedTags(object sender, AAXClean.AppleTags e)
-        {
-            TitleDiscovered?.Invoke(this, e.TitleSansUnabridged);
-            AuthorsDiscovered?.Invoke(this, e.FirstAuthor ?? "[unknown]");
-            NarratorsDiscovered?.Invoke(this, e.Narrator ?? "[unknown]");
-        }
-
         private static (string destinationDir, bool movedAudioFile) MoveFilesToBooksDir(Book product, string outputAudioFilename)
         {
             // create final directory. move each file into it. MOVE AUDIO FILE LAST
             // new dir: safetitle_limit50char + " [" + productId + "]"
-
+            // TODO make this method handle multiple audio files or a single audio file.
             var destinationDir = AudibleFileStorage.Audio.GetDestDir(product.Title, product.AudibleProductId);
             Directory.CreateDirectory(destinationDir);
 
@@ -178,9 +142,9 @@ namespace FileLiberator
             foreach (var f in sortedFiles)
             {
                 var dest
-                    = AudibleFileStorage.Audio.IsFileTypeMatch(f)
-                    ? audioFileName
-                    // non-audio filename: safetitle_limit50char + " [" + productId + "][" + audio_ext +"]." + non_audio_ext
+                    = AudibleFileStorage.Audio.IsFileTypeMatch(f)//f.Extension.Equals($".{musicFileExt}", StringComparison.OrdinalIgnoreCase)
+                    ? Path.Join(destinationDir, f.Name)
+                    // non-audio filename: safetitle_limit50char + " [" + productId + "][" + audio_ext + "]." + non_audio_ext
                     : FileUtility.GetValidFilename(destinationDir, product.Title, f.Extension, product.AudibleProductId, musicFileExt);
 
                 if (Path.GetExtension(dest).Trim('.').ToLower() == "cue")
@@ -237,11 +201,11 @@ namespace FileLiberator
                 throw new Exception(errorString("Locale"));
         }
 
-        public bool Validate(LibraryBook libraryBook) => !libraryBook.Book.Audio_Exists;
+        public override bool Validate(LibraryBook libraryBook) => !libraryBook.Book.Audio_Exists;
 
-        public void Cancel()
+        public override void Cancel()
         {
-            aaxcDownloader?.Cancel();
+            abDownloader?.Cancel();
         }
     }
 }

FileLiberator/DownloadFile.cs

@@ -6,27 +6,16 @@ using Dinah.Core.Net.Http;
 namespace FileLiberator
 {
 	// currently only used to download the .zip flies for upgrade
-	public class DownloadFile : IStreamable
+	public class DownloadFile : Streamable
 	{
-		public event EventHandler<string> StreamingBegin;
-		public event EventHandler<DownloadProgress> StreamingProgressChanged;
-		public event EventHandler<string> StreamingCompleted;
-		public event EventHandler<TimeSpan> StreamingTimeRemaining;
-
-		public DownloadFile()
-		{
-			StreamingBegin += (o, e) => Serilog.Log.Logger.Information("Event fired {@DebugInfo}", new { Name = nameof(StreamingBegin), Message = e });
-			StreamingCompleted += (o, e) => Serilog.Log.Logger.Information("Event fired {@DebugInfo}", new { Name = nameof(StreamingCompleted), Message = e });
-		}
-
 		public async Task<string> PerformDownloadFileAsync(string downloadUrl, string proposedDownloadFilePath)
 		{
 			var client = new HttpClient();
 
 			var progress = new Progress<DownloadProgress>();
-			progress.ProgressChanged += (_, e) => StreamingProgressChanged?.Invoke(this, e);
+			progress.ProgressChanged += (_, e) => OnStreamingProgressChanged(e);
 
-			StreamingBegin?.Invoke(this, proposedDownloadFilePath);
+			OnStreamingBegin(proposedDownloadFilePath);
 
 			try
 			{
@@ -35,7 +24,7 @@ namespace FileLiberator
 			}
 			finally
 			{
-				StreamingCompleted?.Invoke(this, proposedDownloadFilePath);
+				OnStreamingCompleted(proposedDownloadFilePath);
 			}
 		}
 	}

FileLiberator/DownloadPdf.cs

@@ -11,30 +11,30 @@ using FileManager;
 
 namespace FileLiberator
 {
-	public class DownloadPdf : DownloadableBase
+	public class DownloadPdf : Processable
 	{
 		public override bool Validate(LibraryBook libraryBook)
 			=> !string.IsNullOrWhiteSpace(getdownloadUrl(libraryBook))
 			&& !libraryBook.Book.PDF_Exists;
 
-		public DownloadPdf()
+		public override async Task<StatusHandler> ProcessAsync(LibraryBook libraryBook)
 		{
-			StreamingBegin += (o, e) => Serilog.Log.Logger.Information("Event fired {@DebugInfo}", new { Name = nameof(StreamingBegin), Message = e });
-			StreamingCompleted += (o, e) => Serilog.Log.Logger.Information("Event fired {@DebugInfo}", new { Name = nameof(StreamingCompleted), Message = e });
+			OnBegin(libraryBook);
 
-			Begin += (o, e) => Serilog.Log.Logger.Information("Event fired {@DebugInfo}", new { Name = nameof(Begin), Book = e.LogFriendly() });
-			Completed += (o, e) => Serilog.Log.Logger.Information("Event fired {@DebugInfo}", new { Name = nameof(Completed), Book = e.LogFriendly() });
-		}
+			try
+			{
+				var proposedDownloadFilePath = getProposedDownloadFilePath(libraryBook);
+				var actualDownloadedFilePath = await downloadPdfAsync(libraryBook, proposedDownloadFilePath);
+				var result = verifyDownload(actualDownloadedFilePath);
 
-		public override async Task<StatusHandler> ProcessItemAsync(LibraryBook libraryBook)
-		{
-			var proposedDownloadFilePath = getProposedDownloadFilePath(libraryBook);
-			var actualDownloadedFilePath = await downloadPdfAsync(libraryBook, proposedDownloadFilePath);
-			var result = verifyDownload(actualDownloadedFilePath);
+				libraryBook.Book.UserDefinedItem.PdfStatus = result.IsSuccess ? LiberatedStatus.Liberated : LiberatedStatus.NotLiberated;
 
-			libraryBook.Book.UserDefinedItem.PdfStatus = result.IsSuccess ? LiberatedStatus.Liberated : LiberatedStatus.NotLiberated;
-
-			return result;
+				return result;
+			}
+			finally
+			{
+				OnCompleted(libraryBook);
+			}
 		}
 
 		private static string getProposedDownloadFilePath(LibraryBook libraryBook)
@@ -59,15 +59,26 @@ namespace FileLiberator
 
 		private async Task<string> downloadPdfAsync(LibraryBook libraryBook, string proposedDownloadFilePath)
 		{
-			var api = await GetApiAsync(libraryBook);
-			var downloadUrl = await api.GetPdfDownloadLinkAsync(libraryBook.Book.AudibleProductId);
+			OnStreamingBegin(proposedDownloadFilePath);
 
-			var client = new HttpClient();
-			var actualDownloadedFilePath = await PerformDownloadAsync(
-				proposedDownloadFilePath,
-				(p) => client.DownloadFileAsync(downloadUrl, proposedDownloadFilePath, p));
+			try
+			{
+				var api = await libraryBook.GetApiAsync();
+				var downloadUrl = await api.GetPdfDownloadLinkAsync(libraryBook.Book.AudibleProductId);
 
-			return actualDownloadedFilePath;
+				var progress = new Progress<DownloadProgress>();
+				progress.ProgressChanged += (_, e) => OnStreamingProgressChanged(e);
+
+				var client = new HttpClient();
+
+				var actualDownloadedFilePath = await client.DownloadFileAsync(downloadUrl, proposedDownloadFilePath, progress);
+				OnStatusUpdate(actualDownloadedFilePath);
+				return actualDownloadedFilePath;
+			}
+			finally
+			{
+				OnStreamingCompleted(proposedDownloadFilePath);
+			}
 		}
 
 		private static StatusHandler verifyDownload(string actualDownloadedFilePath)

FileLiberator/DownloadableBase.cs

@@ -1,66 +0,0 @@
-using System;
-using System.Threading.Tasks;
-using DataLayer;
-using Dinah.Core.ErrorHandling;
-using Dinah.Core.Net.Http;
-
-namespace FileLiberator
-{
-	public abstract class DownloadableBase : IProcessable
-	{
-		public event EventHandler<LibraryBook> Begin;
-		public event EventHandler<LibraryBook> Completed;
-
-		public event EventHandler<string> StreamingBegin;
-		public event EventHandler<DownloadProgress> StreamingProgressChanged;
-		public event EventHandler<string> StreamingCompleted;
-
-		public event EventHandler<string> StatusUpdate;
-		public event EventHandler<TimeSpan> StreamingTimeRemaining;
-
-		protected void Invoke_StatusUpdate(string message) => StatusUpdate?.Invoke(this, message);
-
-        public abstract bool Validate(LibraryBook libraryBook);
-
-        public abstract Task<StatusHandler> ProcessItemAsync(LibraryBook libraryBook);
-
-		// do NOT use ConfigureAwait(false) on ProcessAsync()
-		// often calls events which prints to forms in the UI context
-		public async Task<StatusHandler> ProcessAsync(LibraryBook libraryBook)
-        {
-            Begin?.Invoke(this, libraryBook);
-
-            try
-            {
-                return await ProcessItemAsync(libraryBook);
-            }
-            finally
-            {
-                Completed?.Invoke(this, libraryBook);
-            }
-        }
-
-		protected static Task<AudibleApi.Api> GetApiAsync(LibraryBook libraryBook)
-			=> InternalUtilities.AudibleApiActions.GetApiAsync(libraryBook.Account, libraryBook.Book.Locale);
-
-		protected async Task<string> PerformDownloadAsync(string proposedDownloadFilePath, Func<Progress<DownloadProgress>, Task<string>> func)
-		{
-			var progress = new Progress<DownloadProgress>();
-			progress.ProgressChanged += (_, e) => StreamingProgressChanged?.Invoke(this, e);
-
-			StreamingBegin?.Invoke(this, proposedDownloadFilePath);
-
-			try
-			{
-				var result = await func(progress);
-				StatusUpdate?.Invoke(this, result);
-
-				return result;
-			}
-			finally
-			{
-				StreamingCompleted?.Invoke(this, proposedDownloadFilePath);
-			}
-		}
-	}
-}

FileLiberator/IAudioDecodable.cs

@@ -1,14 +0,0 @@
-using System;
-
-namespace FileLiberator
-{
-    public interface IAudioDecodable : IProcessable
-    {
-        event EventHandler<Action<byte[]>> RequestCoverArt;
-        event EventHandler<string> TitleDiscovered;
-        event EventHandler<string> AuthorsDiscovered;
-        event EventHandler<string> NarratorsDiscovered;
-        event EventHandler<byte[]> CoverImageDiscovered;
-        void Cancel();
-    }
-}

FileLiberator/IProcessable.cs

@@ -1,23 +0,0 @@
-using System;
-using System.Threading.Tasks;
-using DataLayer;
-using Dinah.Core.ErrorHandling;
-
-namespace FileLiberator
-{
-    public interface IProcessable : IStreamable
-    {
-        event EventHandler<LibraryBook> Begin;
-
-        /// <summary>General string message to display. DON'T rely on this for success, failure, or control logic</summary>
-        event EventHandler<string> StatusUpdate;
-
-        event EventHandler<LibraryBook> Completed;
-
-		/// <returns>True == Valid</returns>
-		bool Validate(LibraryBook libraryBook);
-
-        /// <returns>True == success</returns>
-        Task<StatusHandler> ProcessAsync(LibraryBook libraryBook);
-    }
-}

FileLiberator/IProcessableExt.cs

@@ -1,48 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using DataLayer;
-using Dinah.Core;
-using Dinah.Core.ErrorHandling;
-
-namespace FileLiberator
-{
-    public static class IProcessableExt
-    {
-        //
-        // DO NOT USE ConfigureAwait(false) WITH ProcessAsync() unless ensuring ProcessAsync() implementation is cross-thread compatible
-        // ProcessAsync() often does a lot with forms in the UI context
-        //
-
-
-        // when used in foreach: stateful. deferred execution
-        public static IEnumerable<LibraryBook> GetValidLibraryBooks(this IProcessable processable, IEnumerable<LibraryBook> library)
-            => library.Where(libraryBook => processable.Validate(libraryBook));
-
-        public static async Task<StatusHandler> ProcessSingleAsync(this IProcessable processable, LibraryBook libraryBook, bool validate)
-        {
-            if (validate && !processable.Validate(libraryBook))
-                return new StatusHandler { "Validation failed" };
-
-            Serilog.Log.Logger.Information("Begin " + nameof(ProcessSingleAsync) + " {@DebugInfo}", new
-            {
-                libraryBook.Book.Title,
-                libraryBook.Book.AudibleProductId,
-                libraryBook.Book.Locale,
-                Account = libraryBook.Account?.ToMask() ?? "[empty]"
-            });
-
-            var status
-                = (await processable.ProcessAsync(libraryBook))
-                ?? new StatusHandler { "Processable should never return a null status" };
-
-            return status;
-        }
-
-		public static async Task<StatusHandler> TryProcessAsync(this IProcessable processable, LibraryBook libraryBook)
-			=> processable.Validate(libraryBook)
-			? await processable.ProcessAsync(libraryBook)
-			: new StatusHandler();
-	}
-}

FileLiberator/IStreamable.cs

@@ -1,13 +0,0 @@
-using System;
-using Dinah.Core.Net.Http;
-
-namespace FileLiberator
-{
-    public interface IStreamable
-    {
-        event EventHandler<string> StreamingBegin;
-		event EventHandler<DownloadProgress> StreamingProgressChanged;
-        event EventHandler<TimeSpan> StreamingTimeRemaining;
-        event EventHandler<string> StreamingCompleted;
-    }
-}

FileLiberator/Processable.cs

@@ -0,0 +1,76 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using DataLayer;
+using Dinah.Core;
+using Dinah.Core.ErrorHandling;
+
+namespace FileLiberator
+{
+    public abstract class Processable : Streamable
+    {
+        public event EventHandler<LibraryBook> Begin;
+
+        /// <summary>General string message to display. DON'T rely on this for success, failure, or control logic</summary>
+        public event EventHandler<string> StatusUpdate;
+
+        public event EventHandler<LibraryBook> Completed;
+
+        /// <returns>True == Valid</returns>
+        public abstract bool Validate(LibraryBook libraryBook);
+
+        /// <returns>True == success</returns>
+        public abstract Task<StatusHandler> ProcessAsync(LibraryBook libraryBook);
+
+        // when used in foreach: stateful. deferred execution
+        public IEnumerable<LibraryBook> GetValidLibraryBooks(IEnumerable<LibraryBook> library)
+            => library.Where(libraryBook =>
+                Validate(libraryBook)
+                && (libraryBook.Book.ContentType != ContentType.Episode || FileManager.Configuration.Instance.DownloadEpisodes)
+                );
+
+        public async Task<StatusHandler> ProcessSingleAsync(LibraryBook libraryBook, bool validate)
+        {
+            if (validate && !Validate(libraryBook))
+                return new StatusHandler { "Validation failed" };
+
+            Serilog.Log.Logger.Information("Begin " + nameof(ProcessSingleAsync) + " {@DebugInfo}", new
+            {
+                libraryBook.Book.Title,
+                libraryBook.Book.AudibleProductId,
+                libraryBook.Book.Locale,
+                Account = libraryBook.Account?.ToMask() ?? "[empty]"
+            });
+
+            var status
+                = (await ProcessAsync(libraryBook))
+                ?? new StatusHandler { "Processable should never return a null status" };
+
+            return status;
+        }
+
+        public async Task<StatusHandler> TryProcessAsync(LibraryBook libraryBook)
+            => Validate(libraryBook)
+            ? await ProcessAsync(libraryBook)
+            : new StatusHandler();
+
+        protected void OnBegin(LibraryBook libraryBook)
+        {
+            Serilog.Log.Logger.Debug("Event fired {@DebugInfo}", new { Name = nameof(Begin), Book = libraryBook.LogFriendly() });
+            Begin?.Invoke(this, libraryBook);
+        }
+
+        protected void OnStatusUpdate(string statusUpdate)
+        {
+            Serilog.Log.Logger.Debug("Event fired {@DebugInfo}", new { Name = nameof(StatusUpdate), Status = statusUpdate });
+            StatusUpdate?.Invoke(this, statusUpdate);
+        }
+
+        protected void OnCompleted(LibraryBook libraryBook)
+        {
+            Serilog.Log.Logger.Debug("Event fired {@DebugInfo}", new { Name = nameof(Completed), Book = libraryBook.LogFriendly() });
+            Completed?.Invoke(this, libraryBook);
+        }
+    }
+}

FileLiberator/Streamable.cs

@@ -0,0 +1,37 @@
+using System;
+using Dinah.Core.Net.Http;
+
+namespace FileLiberator
+{
+    public abstract class Streamable
+    {
+        public event EventHandler<string> StreamingBegin;
+        public event EventHandler<DownloadProgress> StreamingProgressChanged;
+        public event EventHandler<TimeSpan> StreamingTimeRemaining;
+        public event EventHandler<string> StreamingCompleted;
+
+        protected void OnStreamingBegin(string filePath)
+        {
+            Serilog.Log.Logger.Debug("Event fired {@DebugInfo}", new { Name = nameof(StreamingBegin), Message = filePath });
+            StreamingBegin?.Invoke(this, filePath);
+        }
+
+        protected void OnStreamingProgressChanged(DownloadProgress progress)
+        {
+            StreamingProgressChanged?.Invoke(this, progress);
+        }
+
+        protected void OnStreamingTimeRemaining(TimeSpan timeRemaining)
+        {
+            StreamingTimeRemaining?.Invoke(this, timeRemaining);
+        }
+
+        protected void OnStreamingCompleted(string filePath)
+        {
+            Serilog.Log.Logger.Debug("Event fired {@DebugInfo}", new { Name = nameof(StreamingCompleted), Message = filePath });
+            StreamingCompleted?.Invoke(this, filePath);
+
+            //TODO: Update file cache
+        }
+    }
+}

FileLiberator/UtilityExtensions.cs

@@ -1,16 +1,13 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Runtime.CompilerServices;
-using System.Text;
 using System.Threading.Tasks;
 using DataLayer;
 using Dinah.Core;
-using Dinah.Core.ErrorHandling;
 
 namespace FileLiberator
 {
-	public static class LoggerUtilities
+	public static class UtilityExtensions
 	{
 		public static (string id, string title, string locale, string account) LogFriendly(this LibraryBook libraryBook)
 			=> (
@@ -19,5 +16,11 @@ namespace FileLiberator
 			locale: libraryBook.Book.Locale,
 			account: libraryBook.Account.ToMask()
 			);
+
+		public static async Task<AudibleApi.Api> GetApiAsync(this LibraryBook libraryBook)
+		{
+			var apiExtended = await InternalUtilities.ApiExtended.CreateAsync(libraryBook.Account, libraryBook.Book.Locale);
+			return apiExtended.Api;
+		}
 	}
 }

FileManager/AudibleFileStorage.cs

@@ -36,6 +36,7 @@ namespace FileManager
             }
         }
 
+        private static object bookDirectoryFilesLocker { get; } = new();
         internal static BackgroundFileSystem BookDirectoryFiles { get; set; }
         #endregion
 
@@ -47,7 +48,7 @@ namespace FileManager
 
         protected AudibleFileStorage(FileType fileType) : base((int)fileType, fileType.ToString())
 		{
-			extensions_noDots = Extensions.Select(ext => ext.Trim('.')).ToList();
+			extensions_noDots = Extensions.Select(ext => ext.ToLower().Trim('.')).ToList();
 			extAggr = extensions_noDots.Aggregate((a, b) => $"{a}|{b}");
             BookDirectoryFiles ??= new BackgroundFileSystem(BooksDirectory, "*.*", SearchOption.AllDirectories);
         }
@@ -58,7 +59,8 @@ namespace FileManager
             if (cachedFile != null)
                 return cachedFile;
 
-            string regexPattern = $@"{productId}.*?\.({extAggr})$";
+            var regex = new Regex($@"{productId}.*?\.({extAggr})$", RegexOptions.IgnoreCase);
+
             string firstOrNull;
 
             if (StorageDirectory == BooksDirectory)
@@ -66,7 +68,7 @@ namespace FileManager
                 //If user changed the BooksDirectory, reinitialize.
                 if (StorageDirectory != BookDirectoryFiles.RootDirectory)
 				{
-                    lock (BookDirectoryFiles)
+                    lock (bookDirectoryFilesLocker)
                     {
                         if (StorageDirectory != BookDirectoryFiles.RootDirectory)
                         {
@@ -75,14 +77,14 @@ namespace FileManager
                     }
 				}
 
-                firstOrNull = BookDirectoryFiles.FindFile(regexPattern, RegexOptions.IgnoreCase);
+                firstOrNull = BookDirectoryFiles.FindFile(regex);
             }
             else
             {
                 firstOrNull =
                     Directory
                     .EnumerateFiles(StorageDirectory, "*.*", SearchOption.AllDirectories)
-                    .FirstOrDefault(s => Regex.IsMatch(s, regexPattern, RegexOptions.IgnoreCase));
+                    .FirstOrDefault(s => regex.IsMatch(s));
             }
 
 			if (firstOrNull is null)

FileManager/BackgroundFileSystem.cs

@@ -3,8 +3,6 @@ using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using System.Text;
-using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 
 namespace FileManager
@@ -25,6 +23,8 @@ namespace FileManager
         private FileSystemWatcher fileSystemWatcher { get; set; }
         private BlockingCollection<FileSystemEventArgs> directoryChangesEvents { get; set; }
         private Task backgroundScanner { get; set; }
+
+        private object fsCacheLocker { get; } = new();
         private List<string> fsCache { get; } = new();
 
         public BackgroundFileSystem(string rootDirectory, string searchPattern, SearchOption searchOptions)
@@ -36,17 +36,15 @@ namespace FileManager
             Init();
         }
 
-        public string FindFile(string regexPattern, RegexOptions options)
+        public string FindFile(System.Text.RegularExpressions.Regex regex)
         {
-            lock (fsCache)
-            {
-                return fsCache.FirstOrDefault(s => Regex.IsMatch(s, regexPattern, options));
-            }
+            lock (fsCacheLocker)
+                return fsCache.FirstOrDefault(s => regex.IsMatch(s));
         }
 
         public void RefreshFiles()
         {
-            lock (fsCache)
+            lock (fsCacheLocker)
             {
                 fsCache.Clear();
                 fsCache.AddRange(Directory.EnumerateFiles(RootDirectory, SearchPattern, SearchOption));
@@ -57,17 +55,19 @@ namespace FileManager
         {
             Stop();
 
-            lock (fsCache)
+            lock (fsCacheLocker)
                 fsCache.AddRange(Directory.EnumerateFiles(RootDirectory, SearchPattern, SearchOption));
 
             directoryChangesEvents = new BlockingCollection<FileSystemEventArgs>();
-            fileSystemWatcher = new FileSystemWatcher(RootDirectory);
-            fileSystemWatcher.Created += FileSystemWatcher_Changed;
+			fileSystemWatcher = new FileSystemWatcher(RootDirectory)
+			{
+				IncludeSubdirectories = true,
+				EnableRaisingEvents = true
+			};
+			fileSystemWatcher.Created += FileSystemWatcher_Changed;
             fileSystemWatcher.Deleted += FileSystemWatcher_Changed;
             fileSystemWatcher.Renamed += FileSystemWatcher_Changed;
             fileSystemWatcher.Error += FileSystemWatcher_Error;
-            fileSystemWatcher.IncludeSubdirectories = true;
-            fileSystemWatcher.EnableRaisingEvents = true;
 
             backgroundScanner = new Task(BackgroundScanner);
             backgroundScanner.Start();
@@ -86,7 +86,7 @@ namespace FileManager
             //Dispose of directoryChangesEvents after backgroundScanner exists.
             directoryChangesEvents?.Dispose();
 
-            lock (fsCache)
+            lock (fsCacheLocker)
                 fsCache.Clear();
         }
 
@@ -106,7 +106,7 @@ namespace FileManager
         {
             while (directoryChangesEvents.TryTake(out FileSystemEventArgs change, -1))
             {
-                lock (fsCache)
+                lock (fsCacheLocker)
                     UpdateLocalCache(change);
             }
         }
@@ -146,9 +146,7 @@ namespace FileManager
         private void AddUniqueFiles(IEnumerable<string> newFiles)
         {
             foreach (var file in newFiles)
-            {
                 AddUniqueFile(file);
-            }
         }
         private void AddUniqueFile(string newFile)
         {

FileManager/Configuration.cs

@@ -88,7 +88,7 @@ namespace FileManager
             set => persistentDictionary.SetString(nameof(InProgress), value);
         }
 
-        [Description("Allow Libation for fix up audiobook metadata?")]
+        [Description("Allow Libation to fix up audiobook metadata")]
         public bool AllowLibationFixup
         {
             get => persistentDictionary.GetNonString<bool>(nameof(AllowLibationFixup));
@@ -101,6 +101,13 @@ namespace FileManager
             get => persistentDictionary.GetNonString<bool>(nameof(DecryptToLossy));
             set => persistentDictionary.SetNonString(nameof(DecryptToLossy), value);
         }
+        
+        [Description("Split my books into multiple files by chapter")]
+        public bool SplitFilesByChapter
+        {
+            get => persistentDictionary.GetNonString<bool>(nameof(SplitFilesByChapter));
+            set => persistentDictionary.SetNonString(nameof(SplitFilesByChapter), value);
+        }
 
         public enum BadBookAction
         {
@@ -125,6 +132,20 @@ namespace FileManager
             set => persistentDictionary.SetString(nameof(BadBook), value.ToString());
         }
 
+        [Description("Import episodes? (eg: podcasts) When unchecked, episodes will not be imported into Libation.")]
+        public bool ImportEpisodes
+        {
+            get => persistentDictionary.GetNonString<bool>(nameof(ImportEpisodes));
+            set => persistentDictionary.SetNonString(nameof(ImportEpisodes), value);
+        }
+
+        [Description("Download episodes? (eg: podcasts). When unchecked, episodes already in Libation will not be downloaded.")]
+        public bool DownloadEpisodes
+        {
+            get => persistentDictionary.GetNonString<bool>(nameof(DownloadEpisodes));
+            set => persistentDictionary.SetNonString(nameof(DownloadEpisodes), value);
+        }
+
         #endregion
 
         #region known directories

FileManager/FileManager.csproj

@@ -5,7 +5,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Dinah.Core" Version="1.1.0.1" />
+    <PackageReference Include="Dinah.Core" Version="1.1.1.2" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="5.0.0" />
     <PackageReference Include="Polly" Version="7.2.2" />
   </ItemGroup>

FileManager/FileUtility.cs

@@ -13,7 +13,7 @@ namespace FileManager
             // file max length = 255. dir max len = 247
 
             // sanitize
-            filename = GetAsciiTag(filename);
+            filename = getAsciiTag(filename);
             // manage length
             if (filename.Length > 50)
                 filename = filename.Substring(0, 50) + "[...]";
@@ -35,7 +35,7 @@ namespace FileManager
             return fullfilename;
         }
 
-        public static string GetAsciiTag(string property)
+        private static string getAsciiTag(string property)
         {
             if (property == null)
                 return "";

FileManager/PictureStorage.cs

@@ -43,11 +43,12 @@ namespace FileManager
 		public static event EventHandler<PictureCachedEventArgs> PictureCached;
 
 		private static BlockingCollection<PictureDefinition> DownloadQueue { get; } = new BlockingCollection<PictureDefinition>();
+		private static object cacheLocker { get; } = new object();
 		private static Dictionary<PictureDefinition, byte[]> cache { get; } = new Dictionary<PictureDefinition, byte[]>();
 		private static Dictionary<PictureSize, byte[]> defaultImages { get; } = new Dictionary<PictureSize, byte[]>();
 		public static (bool isDefault, byte[] bytes) GetPicture(PictureDefinition def)
 		{
-			lock (cache)
+			lock (cacheLocker)
 			{
 				if (cache.ContainsKey(def))
 					return (false, cache[def]);
@@ -67,7 +68,7 @@ namespace FileManager
 
 		public static byte[] GetPictureSynchronously(PictureDefinition def)
 		{
-			lock (cache)
+			lock (cacheLocker)
 			{
 				if (!cache.ContainsKey(def) || cache[def] == null)
 				{
@@ -104,7 +105,7 @@ namespace FileManager
 
 				var bytes = downloadBytes(def);
 				saveFile(def, bytes);
-				lock (cache)
+				lock (cacheLocker)
 					cache[def] = bytes;
 
 				PictureCached?.Invoke(nameof(PictureStorage), new PictureCachedEventArgs { Definition = def, Picture = bytes });

InternalUtilities/ApiExtended.cs

@@ -10,36 +10,95 @@ using Polly.Retry;
 
 namespace InternalUtilities
 {
-	public static class AudibleApiActions
+	/// <summary>USE THIS from within Libation. It wraps the call with correct JSONPath</summary>
+	public class ApiExtended
 	{
-		/// <summary>USE THIS from within Libation. It wraps the call with correct JSONPath</summary>
-		public static Task<Api> GetApiAsync(string username, string localeName, ILoginCallback loginCallback = null)
+		public Api Api { get; private set; }
+
+		private ApiExtended(Api api) => Api = api;
+
+		/// <summary>Get api from existing tokens else login with 'eager' choice. External browser url is provided. Response can be external browser login or continuing with native api callbacks.</summary>
+		public static async Task<ApiExtended> CreateAsync(Account account, ILoginChoiceEager loginChoiceEager)
 		{
-			Serilog.Log.Logger.Information("GetApiAsync. {@DebugInfo}", new
+			Serilog.Log.Logger.Information("{@DebugInfo}", new
+			{
+				LoginType = nameof(ILoginChoiceEager),
+				Account = account?.MaskedLogEntry ?? "[null]",
+				LocaleName = account?.Locale?.Name
+			});
+
+			var api = await EzApiCreator.GetApiAsync(
+				loginChoiceEager,
+				account.Locale,
+				AudibleApiStorage.AccountsSettingsFile,
+				account.GetIdentityTokensJsonPath());
+			return new ApiExtended(api);
+		}
+
+		/// <summary>Get api from existing tokens else login with native api callbacks.</summary>
+		public static async Task<ApiExtended> CreateAsync(Account account, ILoginCallback loginCallback)
+		{
+			Serilog.Log.Logger.Information("{@DebugInfo}", new
+			{
+				LoginType = nameof(ILoginCallback),
+				Account = account?.MaskedLogEntry ?? "[null]",
+				LocaleName = account?.Locale?.Name
+			});
+
+			var api = await EzApiCreator.GetApiAsync(
+				loginCallback,
+				account.Locale,
+				AudibleApiStorage.AccountsSettingsFile,
+				account.GetIdentityTokensJsonPath());
+			return new ApiExtended(api);
+		}
+
+		/// <summary>Get api from existing tokens else login with external browser</summary>
+		public static async Task<ApiExtended> CreateAsync(Account account, ILoginExternal loginExternal)
+		{
+			Serilog.Log.Logger.Information("{@DebugInfo}", new
+			{
+				LoginType = nameof(ILoginExternal),
+				Account = account?.MaskedLogEntry ?? "[null]",
+				LocaleName = account?.Locale?.Name
+			});
+
+			var api = await EzApiCreator.GetApiAsync(
+				loginExternal,
+				account.Locale,
+				AudibleApiStorage.AccountsSettingsFile,
+				account.GetIdentityTokensJsonPath());
+			return new ApiExtended(api);
+		}
+
+		/// <summary>Get api from existing tokens. Assumes you have valid login tokens. Else exception</summary>
+		public static async Task<ApiExtended> CreateAsync(Account account)
+		{
+			ArgumentValidator.EnsureNotNull(account, nameof(account));
+			ArgumentValidator.EnsureNotNull(account.Locale, nameof(account.Locale));
+
+			Serilog.Log.Logger.Information("{@DebugInfo}", new
+			{
+				AccountMaskedLogEntry = account.MaskedLogEntry
+			});
+
+			return await CreateAsync(account.AccountId, account.Locale.Name);
+		}
+
+		/// <summary>Get api from existing tokens. Assumes you have valid login tokens. Else exception</summary>
+		public static async Task<ApiExtended> CreateAsync(string username, string localeName)
+		{
+			Serilog.Log.Logger.Information("{@DebugInfo}", new
 			{
 				Username = username.ToMask(),
 				LocaleName = localeName,
 			});
-			return EzApiCreator.GetApiAsync(
-				Localization.Get(localeName),
-				AudibleApiStorage.AccountsSettingsFile,
-				AudibleApiStorage.GetIdentityTokensJsonPath(username, localeName),
-				loginCallback);
-		}
 
-		/// <summary>USE THIS from within Libation. It wraps the call with correct JSONPath</summary>
-		public static Task<Api> GetApiAsync(ILoginCallback loginCallback, Account account)
-		{
-			Serilog.Log.Logger.Information("GetApiAsync. {@DebugInfo}", new
-			{
-				Account = account?.MaskedLogEntry ?? "[null]",
-				LocaleName = account?.Locale?.Name
-			});
-			return EzApiCreator.GetApiAsync(
-				account.Locale,
-				AudibleApiStorage.AccountsSettingsFile,
-				account.GetIdentityTokensJsonPath(),
-				loginCallback);
+			var api = await EzApiCreator.GetApiAsync(
+					Localization.Get(localeName),
+					AudibleApiStorage.AccountsSettingsFile,
+					AudibleApiStorage.GetIdentityTokensJsonPath(username, localeName));
+			return new ApiExtended(api);
 		}
 
 		private static AsyncRetryPolicy policy { get; }
@@ -47,33 +106,35 @@ namespace InternalUtilities
 			// 2 retries == 3 total
 			.RetryAsync(2);
 
-		public static Task<List<Item>> GetLibraryValidatedAsync(Api api, LibraryOptions.ResponseGroupOptions responseGroups = LibraryOptions.ResponseGroupOptions.ALL_OPTIONS)
+		public Task<List<Item>> GetLibraryValidatedAsync(LibraryOptions.ResponseGroupOptions responseGroups = LibraryOptions.ResponseGroupOptions.ALL_OPTIONS, bool importEpisodes = true)
 		{
-			// bug on audible's side. the 1st time after a long absence, a query to get library will return without titles or authors. a subsequent identical query will be successful. this is true whether or tokens are refreshed
+			// bug on audible's side. the 1st time after a long absence, a query to get library will return without titles or authors. a subsequent identical query will be successful. this is true whether or not tokens are refreshed
 			// worse, this 1st dummy call doesn't seem to help:
 			//    var page = await api.GetLibraryAsync(new AudibleApi.LibraryOptions { NumberOfResultPerPage = 1, PageNumber = 1, PurchasedAfter = DateTime.Now.AddYears(-20), ResponseGroups = AudibleApi.LibraryOptions.ResponseGroupOptions.ALL_OPTIONS });
 			// i don't want to incur the cost of making a full dummy call every time because it fails sometimes
-			return policy.ExecuteAsync(() => getItemsAsync(api, responseGroups));
+			return policy.ExecuteAsync(() => getItemsAsync(responseGroups, importEpisodes));
 		}
 
-		private static async Task<List<Item>> getItemsAsync(Api api, LibraryOptions.ResponseGroupOptions responseGroups)
+		private async Task<List<Item>> getItemsAsync(LibraryOptions.ResponseGroupOptions responseGroups, bool importEpisodes)
 		{
 			var items = new List<Item>();
 #if DEBUG
 //// this will not work for multi accounts
 //var library_json = "library.json";
+//library_json = System.IO.Path.GetFullPath(library_json);
 //if (System.IO.File.Exists(library_json))
 //{
 //    items = AudibleApi.Common.Converter.FromJson<List<Item>>(System.IO.File.ReadAllText(library_json));
 //}
 #endif
 			if (!items.Any())
-				items = await api.GetAllLibraryItemsAsync(responseGroups);
-#if DEBUG
-//System.IO.File.WriteAllText("library.json", AudibleApi.Common.Converter.ToJson(items));
-#endif
+				items = await Api.GetAllLibraryItemsAsync(responseGroups);
 
-			await manageEpisodesAsync(api, items);
+			await manageEpisodesAsync(items, importEpisodes);
+
+#if DEBUG
+//System.IO.File.WriteAllText(library_json, AudibleApi.Common.Converter.ToJson(items));
+#endif
 
 			var validators = new List<IValidator>();
 			validators.AddRange(getValidators());
@@ -88,7 +149,7 @@ namespace InternalUtilities
 		}
 
 		#region episodes and podcasts
-		private static async Task manageEpisodesAsync(Api api, List<Item> items)
+		private async Task manageEpisodesAsync(List<Item> items, bool importEpisodes)
 		{
 			// add podcasts and episodes to list. If fail, don't let it de-rail the rest of the import
 			try
@@ -109,10 +170,13 @@ namespace InternalUtilities
 				// also must happen before processing children because children abuses this flag
 				items.RemoveAll(i => i.IsEpisodes);
 
-				// add children
-				var children = await getEpisodesAsync(api, parents);
-				Serilog.Log.Logger.Information($"{children.Count} episodes of shows/podcasts found");
-				items.AddRange(children);
+				if (importEpisodes)
+				{
+					// add children
+					var children = await getEpisodesAsync(parents);
+					Serilog.Log.Logger.Information($"{children.Count} episodes of shows/podcasts found");
+					items.AddRange(children);
+				}
 			}
 			catch (Exception ex)
 			{
@@ -120,13 +184,13 @@ namespace InternalUtilities
 			}
 		}
 
-		private static async Task<List<Item>> getEpisodesAsync(Api api, List<Item> parents)
+		private async Task<List<Item>> getEpisodesAsync(List<Item> parents)
 		{
 			var results = new List<Item>();
 
 			foreach (var parent in parents)
 			{
-				var children = await getEpisodeChildrenAsync(api, parent);
+				var children = await getEpisodeChildrenAsync(parent);
 
 				foreach (var child in children)
 				{
@@ -159,7 +223,7 @@ namespace InternalUtilities
 			return results;
 		}
 
-		private static async Task<List<Item>> getEpisodeChildrenAsync(Api api, Item parent)
+		private async Task<List<Item>> getEpisodeChildrenAsync(Item parent)
 		{
 			var childrenIds = parent.Relationships
 				.Where(r => r.RelationshipToProduct == RelationshipToProduct.Child && r.RelationshipType == RelationshipType.Episode)
@@ -180,7 +244,7 @@ namespace InternalUtilities
 				List<Item> childrenBatch;
 				try
 				{
-					childrenBatch = await api.GetCatalogProductsAsync(idBatch, CatalogOptions.ResponseGroupOptions.ALL_OPTIONS);
+					childrenBatch = await Api.GetCatalogProductsAsync(idBatch, CatalogOptions.ResponseGroupOptions.ALL_OPTIONS);
 #if DEBUG
 //var childrenBatchDebug = childrenBatch.Select(i => i.ToJson()).Aggregate((a, b) => $"{a}\r\n\r\n{b}");
 //System.IO.File.WriteAllText($"children of {parent.Asin}.json", childrenBatchDebug);
@@ -222,7 +286,7 @@ namespace InternalUtilities
 
 			return results;
 		}
-#endregion
+		#endregion
 
 		private static List<IValidator> getValidators()
 		{

InternalUtilities/AudibleApiValidators.cs

@@ -33,8 +33,10 @@ namespace InternalUtilities
 
 			if (items.Any(i => string.IsNullOrWhiteSpace(i.ProductId)))
 				exceptions.Add(new ArgumentException($"Collection contains item(s) with blank {nameof(Item.ProductId)}", nameof(items)));
-			if (items.Any(i => string.IsNullOrWhiteSpace(i.Title)))
-				exceptions.Add(new ArgumentException($"Collection contains item(s) with blank {nameof(Item.Title)}", nameof(items)));
+
+			// this can happen with podcast episodes
+			foreach (var i in items.Where(i => string.IsNullOrWhiteSpace(i.Title)))
+				i.Title = "[blank title]";
 
 			return exceptions;
 		}
@@ -76,9 +78,9 @@ namespace InternalUtilities
 
 			var distinct = items.GetSeriesDistinct();
 			if (distinct.Any(s => s.SeriesId is null))
-				exceptions.Add(new ArgumentException($"Collection contains {nameof(Item.Series)} with null {nameof(AudibleApi.Common.Series.SeriesId)}", nameof(items)));
+				exceptions.Add(new ArgumentException($"Collection contains {nameof(Item.Series)} with null {nameof(Series.SeriesId)}", nameof(items)));
 			if (distinct.Any(s => s.SeriesName is null))
-				exceptions.Add(new ArgumentException($"Collection contains {nameof(Item.Series)} with null {nameof(AudibleApi.Common.Series.SeriesName)}", nameof(items)));
+				exceptions.Add(new ArgumentException($"Collection contains {nameof(Item.Series)} with null {nameof(Series.SeriesName)}", nameof(items)));
 
 			return exceptions;
 		}

InternalUtilities/InternalUtilities.csproj

@@ -5,7 +5,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="AudibleApi" Version="1.2.1.2" />
+    <PackageReference Include="AudibleApi" Version="2.2.0.1" />
   </ItemGroup>
 
   <ItemGroup>

Libation.sln

@@ -36,6 +36,9 @@ EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibationSearchEngine", "LibationSearchEngine\LibationSearchEngine.csproj", "{2E1F5DB4-40CC-4804-A893-5DCE0193E598}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibationWinForms", "LibationWinForms\LibationWinForms.csproj", "{635F00E1-AAD1-45F7-BEB7-D909AD33B9F6}"
+	ProjectSection(ProjectDependencies) = postProject
+		{428163C3-D558-4914-B570-A92069521877} = {428163C3-D558-4914-B570-A92069521877}
+	EndProjectSection
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DtoImporterService", "DtoImporterService\DtoImporterService.csproj", "{401865F5-1942-4713-B230-04544C0A97B0}"
 EndProject

LibationCli/LibationCli.csproj

@@ -12,6 +12,14 @@
     <AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
   </PropertyGroup>
 
+  <!--
+  When LibationWinForms and LibationCli output to the same dir, LibationCli must build before LibationWinForms
+  
+  VS > rt-clik solution > Project Build Order...
+  Dependencies [tab]
+  Projects: LibationWinForms
+  manually check LibationCli
+  -->
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
     <OutputPath>..\LibationWinForms\bin\Debug</OutputPath>
   </PropertyGroup>

LibationCli/Options/LiberateOptions.cs

@@ -20,7 +20,7 @@ namespace LibationCli
 			? RunAsync(CreateProcessable<DownloadPdf>())
 			: RunAsync(CreateBackupBook());
 
-		private static IProcessable CreateBackupBook()
+		private static Processable CreateBackupBook()
 		{
 			var downloadPdf = CreateProcessable<DownloadPdf>();
 

LibationCli/Options/ScanOptions.cs

@@ -32,9 +32,7 @@ namespace LibationCli
 				: $"Scanning Audible library: {_accounts.Length} accounts. This may take a few minutes per account.";
 			Console.WriteLine(intro);
 
-			var (TotalBooksProcessed, NewBooksAdded) = await LibraryCommands.ImportAccountAsync(
-				(account) => null,
-				_accounts);
+			var (TotalBooksProcessed, NewBooksAdded) = await LibraryCommands.ImportAccountAsync((a) => ApiExtended.CreateAsync(a), _accounts);
 
 			Console.WriteLine("Scan complete.");
 			Console.WriteLine($"Total processed: {TotalBooksProcessed}\r\nNew: {NewBooksAdded}");

LibationCli/Options/_ProcessableOptionsBase.cs

@@ -13,7 +13,7 @@ namespace LibationCli
 	public abstract class ProcessableOptionsBase : OptionsBase
 	{
 		protected static TProcessable CreateProcessable<TProcessable>(EventHandler<LibraryBook> completedAction = null)
-			where TProcessable : IProcessable, new()
+			where TProcessable : Processable, new()
 		{
 			var strProc = new TProcessable();
 
@@ -25,7 +25,7 @@ namespace LibationCli
 			return strProc;
 		}
 
-		protected static async Task RunAsync(IProcessable Processable)
+		protected static async Task RunAsync(Processable Processable)
 		{
 			foreach (var libraryBook in Processable.GetValidLibraryBooks(DbContexts.GetLibrary_Flat_NoTracking()))
 				await ProcessOneAsync(Processable, libraryBook, false);
@@ -35,7 +35,7 @@ namespace LibationCli
 			Serilog.Log.Logger.Information(done);
 		}
 
-		private static async Task ProcessOneAsync(IProcessable Processable, LibraryBook libraryBook, bool validate)
+		private static async Task ProcessOneAsync(Processable Processable, LibraryBook libraryBook, bool validate)
 		{
 			try
 			{

LibationCli/Program.cs

@@ -35,7 +35,7 @@ namespace LibationCli
 			string input = null;
 
 			//input = "  export --help";
-			//input = "  scan  cupidneedsglasses";
+			//input = "  scan  rmcrackan";
 			//input = "  liberate ";
 
 

LibationCli/Setup.cs

@@ -24,8 +24,8 @@ namespace LibationCli
 			var config = LibationScaffolding.RunPreConfigMigrations();
 
 
-			LibationScaffolding.RunPostConfigMigrations();
-			LibationScaffolding.RunPostMigrationScaffolding();
+			LibationScaffolding.RunPostConfigMigrations(config);
+			LibationScaffolding.RunPostMigrationScaffolding(config);
 
 #if !DEBUG
 			checkForUpdate();

LibationSearchEngine/SearchEngine.cs

@@ -315,7 +315,7 @@ namespace LibationSearchEngine
             var docs = searcher.Search(query, 1);
             var scoreDoc = docs.ScoreDocs.SingleOrDefault();
             if (scoreDoc == null)
-                throw new Exception("document not found");
+                return;
             var document = searcher.Doc(scoreDoc.Doc);
 
 

LibationWinForms/BookLiberation/AudioConvertForm.cs

@@ -16,15 +16,18 @@ namespace LibationWinForms.BookLiberation
 		public override string DecodeActionName => "Converting";
 		#endregion
 
-		#region IProcessable event handler overrides
-		public override void OnBegin(object sender, LibraryBook libraryBook)
+		#region Processable event handler overrides
+		public override void Processable_Begin(object sender, LibraryBook libraryBook)
 		{
 			LogMe.Info($"Convert Step, Begin: {libraryBook.Book}");
 
-			base.OnBegin(sender, libraryBook);
+			base.Processable_Begin(sender, libraryBook);
+		}
+		public override void Processable_Completed(object sender, LibraryBook libraryBook)
+		{
+			base.Processable_Completed(sender, libraryBook);
+			LogMe.Info($"Convert Step, Completed: {libraryBook.Book}{Environment.NewLine}");
 		}
-		public override void OnCompleted(object sender, LibraryBook libraryBook)
-			=> LogMe.Info($"Convert Step, Completed: {libraryBook.Book}{Environment.NewLine}");
 
 		#endregion
 	}

LibationWinForms/BookLiberation/AudioDecodeForm.cs

@@ -18,19 +18,21 @@ namespace LibationWinForms.BookLiberation
 		private string authorNames;
 		private string narratorNames;
 
-		#region IProcessable event handler overrides
-		public override void OnBegin(object sender, LibraryBook libraryBook)
+		#region Processable event handler overrides
+		public override void Processable_Begin(object sender, LibraryBook libraryBook)
 		{
+			base.Processable_Begin(sender, libraryBook);
+
 			GetCoverArtDelegate = () => FileManager.PictureStorage.GetPictureSynchronously(
 						new FileManager.PictureDefinition(
 							libraryBook.Book.PictureId,
 							FileManager.PictureSize._500x500));
 
 			//Set default values from library
-			OnTitleDiscovered(sender, libraryBook.Book.Title);
-			OnAuthorsDiscovered(sender, string.Join(", ", libraryBook.Book.Authors));
-			OnNarratorsDiscovered(sender, string.Join(", ", libraryBook.Book.NarratorNames));
-			OnCoverImageDiscovered(sender,
+			AudioDecodable_TitleDiscovered(sender, libraryBook.Book.Title);
+			AudioDecodable_AuthorsDiscovered(sender, string.Join(", ", libraryBook.Book.Authors));
+			AudioDecodable_NarratorsDiscovered(sender, string.Join(", ", libraryBook.Book.NarratorNames));
+			AudioDecodable_CoverImageDiscovered(sender,
 					FileManager.PictureStorage.GetPicture(
 						new FileManager.PictureDefinition(
 							libraryBook.Book.PictureId,
@@ -38,9 +40,10 @@ namespace LibationWinForms.BookLiberation
 		}
 		#endregion
 
-		#region IStreamable event handler overrides
-		public override void OnStreamingProgressChanged(object sender, DownloadProgress downloadProgress)
+		#region Streamable event handler overrides
+		public override void Streamable_StreamingProgressChanged(object sender, DownloadProgress downloadProgress)
 		{
+			base.Streamable_StreamingProgressChanged(sender, downloadProgress);
 			if (!downloadProgress.ProgressPercentage.HasValue)
 				return;
 
@@ -50,36 +53,48 @@ namespace LibationWinForms.BookLiberation
 				progressBar1.UIThreadAsync(() => progressBar1.Value = (int)downloadProgress.ProgressPercentage);
 		}
 
-		public override void OnStreamingTimeRemaining(object sender, TimeSpan timeRemaining)
-			=> updateRemainingTime((int)timeRemaining.TotalSeconds);
+		public override void Streamable_StreamingTimeRemaining(object sender, TimeSpan timeRemaining)
+		{
+			base.Streamable_StreamingTimeRemaining(sender, timeRemaining);
+			updateRemainingTime((int)timeRemaining.TotalSeconds);
+		}
 
 		#endregion
 
-		#region IAudioDecodable event handlers
-		public override void OnRequestCoverArt(object sender, Action<byte[]> setCoverArtDelegate)
-			=> setCoverArtDelegate(GetCoverArtDelegate?.Invoke());
-
-		public override void OnTitleDiscovered(object sender, string title)
+		#region AudioDecodable event handlers
+		public override void AudioDecodable_RequestCoverArt(object sender, Action<byte[]> setCoverArtDelegate)
 		{
+			base.AudioDecodable_RequestCoverArt(sender, setCoverArtDelegate);
+			setCoverArtDelegate(GetCoverArtDelegate?.Invoke());
+		}
+
+		public override void AudioDecodable_TitleDiscovered(object sender, string title)
+		{
+			base.AudioDecodable_TitleDiscovered(sender, title);
 			this.UIThreadAsync(() => this.Text = DecodeActionName + " " + title);
 			this.title = title;
 			updateBookInfo();
 		}
 
-		public override void OnAuthorsDiscovered(object sender, string authors)
+		public override void AudioDecodable_AuthorsDiscovered(object sender, string authors)
 		{
+			base.AudioDecodable_AuthorsDiscovered(sender, authors);
 			authorNames = authors;
 			updateBookInfo();
 		}
 
-		public override void OnNarratorsDiscovered(object sender, string narrators)
+		public override void AudioDecodable_NarratorsDiscovered(object sender, string narrators)
 		{
+			base.AudioDecodable_NarratorsDiscovered(sender, narrators);
 			narratorNames = narrators;
 			updateBookInfo();
 		}
 
-		public override void OnCoverImageDiscovered(object sender, byte[] coverArt) 
-			=> pictureBox1.UIThreadAsync(() => pictureBox1.Image = Dinah.Core.Drawing.ImageReader.ToImage(coverArt));
+		public override void AudioDecodable_CoverImageDiscovered(object sender, byte[] coverArt)
+		{
+			base.AudioDecodable_CoverImageDiscovered(sender, coverArt);
+			pictureBox1.UIThreadAsync(() => pictureBox1.Image = Dinah.Core.Drawing.ImageReader.ToImage(coverArt));
+		}
 		#endregion
 
 		// thread-safe UI updates

LibationWinForms/BookLiberation/AudioDecryptForm.cs

@@ -16,15 +16,18 @@ namespace LibationWinForms.BookLiberation
 		public override string DecodeActionName => "Decrypting";
 		#endregion
 
-		#region IProcessable event handler overrides
-		public override void OnBegin(object sender, LibraryBook libraryBook)
+		#region Processable event handler overrides
+		public override void Processable_Begin(object sender, LibraryBook libraryBook)
 		{
 			LogMe.Info($"Download & Decrypt Step, Begin: {libraryBook.Book}");
 
-			base.OnBegin(sender, libraryBook);
+			base.Processable_Begin(sender, libraryBook);
+		}
+		public override void Processable_Completed(object sender, LibraryBook libraryBook)
+		{
+			base.Processable_Completed(sender, libraryBook);
+			LogMe.Info($"Download & Decrypt Step, Completed: {libraryBook.Book}{Environment.NewLine}");
 		}
-		public override void OnCompleted(object sender, LibraryBook libraryBook)
-			=> LogMe.Info($"Download & Decrypt Step, Completed: {libraryBook.Book}{Environment.NewLine}");
 
 		#endregion
 	}

LibationWinForms/BookLiberation/BaseForms/LiberationBaseForm.cs

@@ -9,7 +9,7 @@ namespace LibationWinForms.BookLiberation.BaseForms
 {
 	public class LiberationBaseForm : Form
 	{
-		protected IStreamable Streamable { get; private set; }
+		protected Streamable Streamable { get; private set; }
 		protected LogMe LogMe { get; private set; }
 		private SynchronizeInvoker Invoker { get; init; } 
 
@@ -21,7 +21,7 @@ namespace LibationWinForms.BookLiberation.BaseForms
 			Invoker = new SynchronizeInvoker();
 		}
 
-		public void RegisterFileLiberator(IStreamable streamable, LogMe logMe = null)
+		public void RegisterFileLiberator(Streamable streamable, LogMe logMe = null)
 		{
 			if (streamable is null) return;
 
@@ -30,52 +30,52 @@ namespace LibationWinForms.BookLiberation.BaseForms
 
 			Subscribe(streamable);
 
-			if (Streamable is IProcessable processable)
+			if (Streamable is Processable processable)
 				Subscribe(processable);
-			if (Streamable is IAudioDecodable audioDecodable)
+			if (Streamable is AudioDecodable audioDecodable)
 				Subscribe(audioDecodable);
 		}
 
 		#region Event Subscribers and Unsubscribers
-		private void Subscribe(IStreamable streamable)
+		private void Subscribe(Streamable streamable)
 		{
 			UnsubscribeStreamable(this, EventArgs.Empty);
 
 			streamable.StreamingBegin += OnStreamingBeginShow;
-			streamable.StreamingBegin += OnStreamingBegin;
-			streamable.StreamingProgressChanged += OnStreamingProgressChanged;
-			streamable.StreamingTimeRemaining += OnStreamingTimeRemaining;
-			streamable.StreamingCompleted += OnStreamingCompleted;
+			streamable.StreamingBegin += Streamable_StreamingBegin;
+			streamable.StreamingProgressChanged += Streamable_StreamingProgressChanged;
+			streamable.StreamingTimeRemaining += Streamable_StreamingTimeRemaining;
+			streamable.StreamingCompleted += Streamable_StreamingCompleted;
 			streamable.StreamingCompleted += OnStreamingCompletedClose;
 
 			Disposed += UnsubscribeStreamable;
 		}
-		private void Subscribe(IProcessable processable)
+		private void Subscribe(Processable processable)
 		{
 			UnsubscribeProcessable(this, null);
 
-			processable.Begin += OnBegin;
-			processable.StatusUpdate += OnStatusUpdate;
-			processable.Completed += OnCompleted;
+			processable.Begin += Processable_Begin;
+			processable.StatusUpdate += Processable_StatusUpdate;
+			processable.Completed += Processable_Completed;
 
-			//The form is created on IProcessable.Begin and we
-			//dispose of it on IProcessable.Completed
+			//The form is created on Processable.Begin and we
+			//dispose of it on Processable.Completed
 			processable.Completed += OnCompletedDispose;
 
 			//Don't unsubscribe from Dispose because it fires when
-			//IStreamable.StreamingCompleted closes the form, and
-			//the IProcessable events need to live past that event.
+			//Streamable.StreamingCompleted closes the form, and
+			//the Processable events need to live past that event.
 			processable.Completed += UnsubscribeProcessable;
 		}
-		private void Subscribe(IAudioDecodable audioDecodable)
+		private void Subscribe(AudioDecodable audioDecodable)
 		{
 			UnsubscribeAudioDecodable(this, EventArgs.Empty);
 
-			audioDecodable.RequestCoverArt += OnRequestCoverArt;
-			audioDecodable.TitleDiscovered += OnTitleDiscovered;
-			audioDecodable.AuthorsDiscovered += OnAuthorsDiscovered;
-			audioDecodable.NarratorsDiscovered += OnNarratorsDiscovered;
-			audioDecodable.CoverImageDiscovered += OnCoverImageDiscovered;
+			audioDecodable.RequestCoverArt += AudioDecodable_RequestCoverArt;
+			audioDecodable.TitleDiscovered += AudioDecodable_TitleDiscovered;
+			audioDecodable.AuthorsDiscovered += AudioDecodable_AuthorsDiscovered;
+			audioDecodable.NarratorsDiscovered += AudioDecodable_NarratorsDiscovered;
+			audioDecodable.CoverImageDiscovered += AudioDecodable_CoverImageDiscovered;
 
 			Disposed += UnsubscribeAudioDecodable;
 		}
@@ -84,34 +84,34 @@ namespace LibationWinForms.BookLiberation.BaseForms
 			Disposed -= UnsubscribeStreamable;
 
 			Streamable.StreamingBegin -= OnStreamingBeginShow;
-			Streamable.StreamingBegin -= OnStreamingBegin;
-			Streamable.StreamingProgressChanged -= OnStreamingProgressChanged;
-			Streamable.StreamingTimeRemaining -= OnStreamingTimeRemaining;
-			Streamable.StreamingCompleted -= OnStreamingCompleted;
+			Streamable.StreamingBegin -= Streamable_StreamingBegin;
+			Streamable.StreamingProgressChanged -= Streamable_StreamingProgressChanged;
+			Streamable.StreamingTimeRemaining -= Streamable_StreamingTimeRemaining;
+			Streamable.StreamingCompleted -= Streamable_StreamingCompleted;
 			Streamable.StreamingCompleted -= OnStreamingCompletedClose;
 		}
 		private void UnsubscribeProcessable(object sender, LibraryBook e)
 		{
-			if (Streamable is not IProcessable processable)
+			if (Streamable is not Processable processable)
 				return;
 
 			processable.Completed -= UnsubscribeProcessable;
 			processable.Completed -= OnCompletedDispose;
-			processable.Completed -= OnCompleted;
-			processable.StatusUpdate -= OnStatusUpdate;
-			processable.Begin -= OnBegin;
+			processable.Completed -= Processable_Completed;
+			processable.StatusUpdate -= Processable_StatusUpdate;
+			processable.Begin -= Processable_Begin;
 		}
 		private void UnsubscribeAudioDecodable(object sender, EventArgs e)
 		{
-			if (Streamable is not IAudioDecodable audioDecodable)
+			if (Streamable is not AudioDecodable audioDecodable)
 				return;
 
 			Disposed -= UnsubscribeAudioDecodable;
-			audioDecodable.RequestCoverArt -= OnRequestCoverArt;
-			audioDecodable.TitleDiscovered -= OnTitleDiscovered;
-			audioDecodable.AuthorsDiscovered -= OnAuthorsDiscovered;
-			audioDecodable.NarratorsDiscovered -= OnNarratorsDiscovered;
-			audioDecodable.CoverImageDiscovered -= OnCoverImageDiscovered;
+			audioDecodable.RequestCoverArt -= AudioDecodable_RequestCoverArt;
+			audioDecodable.TitleDiscovered -= AudioDecodable_TitleDiscovered;
+			audioDecodable.AuthorsDiscovered -= AudioDecodable_AuthorsDiscovered;
+			audioDecodable.NarratorsDiscovered -= AudioDecodable_NarratorsDiscovered;
+			audioDecodable.CoverImageDiscovered -= AudioDecodable_CoverImageDiscovered;
 
 			audioDecodable.Cancel();
 		}
@@ -133,28 +133,30 @@ namespace LibationWinForms.BookLiberation.BaseForms
 		/// (ie. shown) because Control doesn't get a window handle until it is Shown.
 		/// </summary>
 		private void OnStreamingBeginShow(object sender, string beginString) => Invoker.UIThreadAsync(Show);
-		
+
 		#endregion
 
-		#region IStreamable event handlers
-		public virtual void OnStreamingBegin(object sender, string beginString) { }
-		public virtual void OnStreamingProgressChanged(object sender, DownloadProgress downloadProgress) { }
-		public virtual void OnStreamingTimeRemaining(object sender, TimeSpan timeRemaining) { }
-		public virtual void OnStreamingCompleted(object sender, string completedString) { }
+		#region Streamable event handlers
+		public virtual void Streamable_StreamingBegin(object sender, string beginString) { }
+		public virtual void Streamable_StreamingProgressChanged(object sender, DownloadProgress downloadProgress) { }
+		public virtual void Streamable_StreamingTimeRemaining(object sender, TimeSpan timeRemaining) { }
+		public virtual void Streamable_StreamingCompleted(object sender, string completedString) { }
+
 		#endregion
 
-		#region IProcessable event handlers
-		public virtual void OnBegin(object sender, LibraryBook libraryBook) { }
-		public virtual void OnStatusUpdate(object sender, string statusUpdate) { }
-		public virtual void OnCompleted(object sender, LibraryBook libraryBook) { }
+		#region Processable event handlers
+		public virtual void Processable_Begin(object sender, LibraryBook libraryBook) { }
+		public virtual void Processable_StatusUpdate(object sender, string statusUpdate) { }
+		public virtual void Processable_Completed(object sender, LibraryBook libraryBook) { }
+
 		#endregion
 
-		#region IAudioDecodable event handlers
-		public virtual void OnRequestCoverArt(object sender, Action<byte[]> setCoverArtDelegate) { }
-		public virtual void OnTitleDiscovered(object sender, string title) { }
-		public virtual void OnAuthorsDiscovered(object sender, string authors) { }
-		public virtual void OnNarratorsDiscovered(object sender, string narrators) { }
-		public virtual void OnCoverImageDiscovered(object sender, byte[] coverArt) { }
+		#region AudioDecodable event handlers
+		public virtual void AudioDecodable_RequestCoverArt(object sender, Action<byte[]> setCoverArtDelegate) { }
+		public virtual void AudioDecodable_TitleDiscovered(object sender, string title) { }
+		public virtual void AudioDecodable_AuthorsDiscovered(object sender, string authors) { }
+		public virtual void AudioDecodable_NarratorsDiscovered(object sender, string narrators) { }
+		public virtual void AudioDecodable_CoverImageDiscovered(object sender, byte[] coverArt) { }
 		#endregion
 	}
 }

LibationWinForms/BookLiberation/DownloadForm.cs

@@ -17,13 +17,15 @@ namespace LibationWinForms.BookLiberation
 		}
 
 
-		#region IStreamable event handler overrides
-		public override void OnStreamingBegin(object sender, string beginString)
+		#region Streamable event handler overrides
+		public override void Streamable_StreamingBegin(object sender, string beginString)
 		{
+			base.Streamable_StreamingBegin(sender, beginString);
 			filenameLbl.UIThreadAsync(() => filenameLbl.Text = beginString);
 		}
-		public override void OnStreamingProgressChanged(object sender, DownloadProgress downloadProgress)
+		public override void Streamable_StreamingProgressChanged(object sender, DownloadProgress downloadProgress)
 		{
+			base.Streamable_StreamingProgressChanged(sender, downloadProgress);
 			// this won't happen with download file. it will happen with download string
 			if (!downloadProgress.TotalBytesToReceive.HasValue || downloadProgress.TotalBytesToReceive.Value <= 0)
 				return;

LibationWinForms/BookLiberation/PdfDownloadForm.cs

@@ -4,7 +4,15 @@ namespace LibationWinForms.BookLiberation
 {
 	internal class PdfDownloadForm : DownloadForm
 	{
-		public override void OnBegin(object sender, LibraryBook libraryBook) => LogMe.Info($"PDF Step, Begin: {libraryBook.Book}");
-		public override void OnCompleted(object sender, LibraryBook libraryBook) => LogMe.Info($"PDF Step, Completed: {libraryBook.Book}");
+		public override void Processable_Begin(object sender, LibraryBook libraryBook)
+		{
+			base.Processable_Begin(sender, libraryBook);
+			LogMe.Info($"PDF Step, Begin: {libraryBook.Book}");
+		}
+		public override void Processable_Completed(object sender, LibraryBook libraryBook)
+		{
+			base.Processable_Completed(sender, libraryBook);
+			LogMe.Info($"PDF Step, Completed: {libraryBook.Book}");
+		}
 	}
 }

LibationWinForms/BookLiberation/ProcessorAutomationController.cs

@@ -96,7 +96,7 @@ namespace LibationWinForms.BookLiberation
 			await new BackupLoop(logMe, downloadPdf, automatedBackupsForm).RunBackupAsync();
 		}
 
-		private static IProcessable CreateBackupBook(LogMe logMe)
+		private static Processable CreateBackupBook(LogMe logMe)
 		{
 			var downloadPdf = CreateProcessable<DownloadPdf, PdfDownloadForm>(logMe);
 
@@ -132,16 +132,16 @@ namespace LibationWinForms.BookLiberation
 		}
 
 		/// <summary>
-		/// Create a new <see cref="IProcessable"/> and links it to a new <see cref="LiberationBaseForm"/>.
+		/// Create a new <see cref="Processable"/> and links it to a new <see cref="LiberationBaseForm"/>.
 		/// </summary>
-		/// <typeparam name="TProcessable">The <see cref="IProcessable"/> derived type to create.</typeparam>
-		/// <typeparam name="TForm">The <see cref="LiberationBaseForm"/> derived Form to create on <see cref="IProcessable.Begin"/>, Show on <see cref="IStreamable.StreamingBegin"/>, Close on <see cref="IStreamable.StreamingCompleted"/>, and Dispose on <see cref="IProcessable.Completed"/> </typeparam>
+		/// <typeparam name="TProcessable">The <see cref="Processable"/> derived type to create.</typeparam>
+		/// <typeparam name="TForm">The <see cref="LiberationBaseForm"/> derived Form to create on <see cref="Processable.Begin"/>, Show on <see cref="Streamable.StreamingBegin"/>, Close on <see cref="Streamable.StreamingCompleted"/>, and Dispose on <see cref="Processable.Completed"/> </typeparam>
 		/// <param name="logMe">The logger</param>
-		/// <param name="completedAction">An additional event handler to handle <see cref="IProcessable.Completed"/></param>
-		/// <returns>A new <see cref="IProcessable"/> of type <typeparamref name="TProcessable"/></returns>
+		/// <param name="completedAction">An additional event handler to handle <see cref="Processable.Completed"/></param>
+		/// <returns>A new <see cref="Processable"/> of type <typeparamref name="TProcessable"/></returns>
 		private static TProcessable CreateProcessable<TProcessable, TForm>(LogMe logMe, EventHandler<LibraryBook> completedAction = null)
 			where TForm : LiberationBaseForm, new()
-			where TProcessable : IProcessable, new()
+			where TProcessable : Processable, new()
 		{
 			var strProc = new TProcessable();
 
@@ -149,7 +149,7 @@ namespace LibationWinForms.BookLiberation
 			{
 				var processForm = new TForm();
 				processForm.RegisterFileLiberator(strProc, logMe);
-				processForm.OnBegin(sender, libraryBook);
+				processForm.Processable_Begin(sender, libraryBook);
 			};
 
 			strProc.Completed += completedAction;
@@ -161,10 +161,10 @@ namespace LibationWinForms.BookLiberation
 	internal abstract class BackupRunner
 	{
 		protected LogMe LogMe { get; }
-		protected IProcessable Processable { get; }
+		protected Processable Processable { get; }
 		protected AutomatedBackupsForm AutomatedBackupsForm { get; }
 
-		protected BackupRunner(LogMe logMe, IProcessable processable, AutomatedBackupsForm automatedBackupsForm = null)
+		protected BackupRunner(LogMe logMe, Processable processable, AutomatedBackupsForm automatedBackupsForm = null)
 		{
 			LogMe = logMe;
 			Processable = processable;
@@ -278,7 +278,7 @@ An error occurred while trying to process this book. Skip this book permanently?
 		protected override MessageBoxDefaultButton SkipDialogDefaultButton => MessageBoxDefaultButton.Button2;
 		protected override DialogResult SkipResult => DialogResult.Yes;
 
-		public BackupSingle(LogMe logMe, IProcessable processable, LibraryBook libraryBook)
+		public BackupSingle(LogMe logMe, Processable processable, LibraryBook libraryBook)
 			: base(logMe, processable)
 		{
 			_libraryBook = libraryBook;
@@ -307,7 +307,7 @@ An error occurred while trying to process this book.
 		protected override MessageBoxDefaultButton SkipDialogDefaultButton => MessageBoxDefaultButton.Button1;
 		protected override DialogResult SkipResult => DialogResult.Ignore;
 
-		public BackupLoop(LogMe logMe, IProcessable processable, AutomatedBackupsForm automatedBackupsForm)
+		public BackupLoop(LogMe logMe, Processable processable, AutomatedBackupsForm automatedBackupsForm)
 			: base(logMe, processable, automatedBackupsForm) { }
 
 		protected override async Task RunAsync()

LibationWinForms/Dialogs/DirectorySelectControl.Designer.cs

@@ -41,7 +41,7 @@ namespace LibationWinForms.Dialogs
 			this.directoryComboBox.FormattingEnabled = true;
 			this.directoryComboBox.Location = new System.Drawing.Point(0, 0);
 			this.directoryComboBox.Name = "directoryComboBox";
-			this.directoryComboBox.Size = new System.Drawing.Size(647, 23);
+			this.directoryComboBox.Size = new System.Drawing.Size(407, 23);
 			this.directoryComboBox.TabIndex = 0;
 			this.directoryComboBox.SelectedIndexChanged += new System.EventHandler(this.directoryComboBox_SelectedIndexChanged);
 			// 
@@ -52,7 +52,7 @@ namespace LibationWinForms.Dialogs
 			this.textBox1.Location = new System.Drawing.Point(0, 29);
 			this.textBox1.Name = "textBox1";
 			this.textBox1.ReadOnly = true;
-			this.textBox1.Size = new System.Drawing.Size(647, 23);
+			this.textBox1.Size = new System.Drawing.Size(407, 23);
 			this.textBox1.TabIndex = 1;
 			// 
 			// DirectorySelectControl
@@ -62,7 +62,7 @@ namespace LibationWinForms.Dialogs
 			this.Controls.Add(this.textBox1);
 			this.Controls.Add(this.directoryComboBox);
 			this.Name = "DirectorySelectControl";
-			this.Size = new System.Drawing.Size(647, 52);
+			this.Size = new System.Drawing.Size(407, 52);
 			this.Load += new System.EventHandler(this.DirectorySelectControl_Load);
 			this.ResumeLayout(false);
 			this.PerformLayout();

LibationWinForms/Dialogs/DirectorySelectControl.resx

@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
+<root>
   <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
     <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
     <xsd:element name="root" msdata:IsDataSet="true">

LibationWinForms/Dialogs/IndexLibraryDialog.cs

@@ -32,7 +32,7 @@ namespace LibationWinForms.Dialogs
 
 				try
 				{
-					(TotalBooksProcessed, NewBooksAdded) = await LibraryCommands.ImportAccountAsync((account) => new WinformResponder(account), _accounts);
+					(TotalBooksProcessed, NewBooksAdded) = await LibraryCommands.ImportAccountAsync((account) => ApiExtended.CreateAsync(account, new WinformLoginChoiceEager(account)), _accounts);
 				}
 				catch (Exception ex)
 				{

LibationWinForms/Dialogs/Login/LoginCallbackDialog.Designer.cs

@@ -1,6 +1,6 @@
 namespace LibationWinForms.Dialogs.Login
 {
-	partial class AudibleLoginDialog
+	partial class LoginCallbackDialog
 	{
 		/// <summary>
 		/// Required designer variable.
@@ -38,25 +38,29 @@
 			// passwordLbl
 			// 
 			this.passwordLbl.AutoSize = true;
-			this.passwordLbl.Location = new System.Drawing.Point(12, 41);
+			this.passwordLbl.Location = new System.Drawing.Point(14, 47);
+			this.passwordLbl.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
 			this.passwordLbl.Name = "passwordLbl";
-			this.passwordLbl.Size = new System.Drawing.Size(53, 13);
+			this.passwordLbl.Size = new System.Drawing.Size(57, 15);
 			this.passwordLbl.TabIndex = 2;
 			this.passwordLbl.Text = "Password";
 			// 
 			// passwordTb
 			// 
-			this.passwordTb.Location = new System.Drawing.Point(71, 38);
+			this.passwordTb.Location = new System.Drawing.Point(83, 44);
+			this.passwordTb.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
 			this.passwordTb.Name = "passwordTb";
 			this.passwordTb.PasswordChar = '*';
-			this.passwordTb.Size = new System.Drawing.Size(200, 20);
+			this.passwordTb.Size = new System.Drawing.Size(233, 23);
 			this.passwordTb.TabIndex = 3;
 			// 
 			// submitBtn
 			// 
-			this.submitBtn.Location = new System.Drawing.Point(196, 64);
+			this.submitBtn.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+			this.submitBtn.Location = new System.Drawing.Point(229, 74);
+			this.submitBtn.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
 			this.submitBtn.Name = "submitBtn";
-			this.submitBtn.Size = new System.Drawing.Size(75, 23);
+			this.submitBtn.Size = new System.Drawing.Size(88, 27);
 			this.submitBtn.TabIndex = 4;
 			this.submitBtn.Text = "Submit";
 			this.submitBtn.UseVisualStyleBackColor = true;
@@ -65,36 +69,39 @@
 			// localeLbl
 			// 
 			this.localeLbl.AutoSize = true;
-			this.localeLbl.Location = new System.Drawing.Point(12, 9);
+			this.localeLbl.Location = new System.Drawing.Point(14, 10);
+			this.localeLbl.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
 			this.localeLbl.Name = "localeLbl";
-			this.localeLbl.Size = new System.Drawing.Size(59, 13);
+			this.localeLbl.Size = new System.Drawing.Size(61, 15);
 			this.localeLbl.TabIndex = 0;
 			this.localeLbl.Text = "Locale: {0}";
 			// 
 			// usernameLbl
 			// 
 			this.usernameLbl.AutoSize = true;
-			this.usernameLbl.Location = new System.Drawing.Point(12, 22);
+			this.usernameLbl.Location = new System.Drawing.Point(14, 25);
+			this.usernameLbl.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
 			this.usernameLbl.Name = "usernameLbl";
-			this.usernameLbl.Size = new System.Drawing.Size(75, 13);
+			this.usernameLbl.Size = new System.Drawing.Size(80, 15);
 			this.usernameLbl.TabIndex = 1;
 			this.usernameLbl.Text = "Username: {0}";
 			// 
-			// AudibleLoginDialog
+			// LoginCallbackDialog
 			// 
 			this.AcceptButton = this.submitBtn;
-			this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+			this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
 			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-			this.ClientSize = new System.Drawing.Size(283, 99);
+			this.ClientSize = new System.Drawing.Size(330, 114);
 			this.Controls.Add(this.usernameLbl);
 			this.Controls.Add(this.localeLbl);
 			this.Controls.Add(this.submitBtn);
 			this.Controls.Add(this.passwordLbl);
 			this.Controls.Add(this.passwordTb);
 			this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
+			this.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
 			this.MaximizeBox = false;
 			this.MinimizeBox = false;
-			this.Name = "AudibleLoginDialog";
+			this.Name = "LoginCallbackDialog";
 			this.ShowIcon = false;
 			this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
 			this.Text = "Audible Login";

LibationWinForms/Dialogs/Login/LoginCallbackDialog.cs

@@ -1,28 +1,25 @@
-using Dinah.Core;
-using InternalUtilities;
-using System;
-using System.Linq;
+using System;
 using System.Windows.Forms;
+using Dinah.Core;
+using InternalUtilities;
 
 namespace LibationWinForms.Dialogs.Login
 {
-	public partial class AudibleLoginDialog : Form
+	public partial class LoginCallbackDialog : Form
 	{
-		private string locale { get; }
 		private string accountId { get; }
 
 		public string Email { get; private set; }
 		public string Password { get; private set; }
 
-		public AudibleLoginDialog(Account account)
+		public LoginCallbackDialog(Account account)
 		{
 			InitializeComponent();
 
-			locale = account.Locale.Name;
 			accountId = account.AccountId;
 
 			// do not allow user to change login id here. if they do then jsonpath will fail
-			this.localeLbl.Text = string.Format(this.localeLbl.Text, locale);
+			this.localeLbl.Text = string.Format(this.localeLbl.Text, account.Locale.Name);
 			this.usernameLbl.Text = string.Format(this.usernameLbl.Text, accountId);
 		}
 

LibationWinForms/Dialogs/Login/LoginCallbackDialog.resx

@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
+<root>
   <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
     <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
     <xsd:element name="root" msdata:IsDataSet="true">

LibationWinForms/Dialogs/Login/LoginChoiceEagerDialog.Designer.cs

@@ -0,0 +1,161 @@
+namespace LibationWinForms.Dialogs.Login
+{
+	partial class LoginChoiceEagerDialog
+	{
+		/// <summary>
+		/// Required designer variable.
+		/// </summary>
+		private System.ComponentModel.IContainer components = null;
+
+		/// <summary>
+		/// Clean up any resources being used.
+		/// </summary>
+		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+		protected override void Dispose(bool disposing)
+		{
+			if (disposing && (components != null))
+			{
+				components.Dispose();
+			}
+			base.Dispose(disposing);
+		}
+
+		#region Windows Form Designer generated code
+
+		/// <summary>
+		/// Required method for Designer support - do not modify
+		/// the contents of this method with the code editor.
+		/// </summary>
+		private void InitializeComponent()
+		{
+			this.passwordLbl = new System.Windows.Forms.Label();
+			this.passwordTb = new System.Windows.Forms.TextBox();
+			this.submitBtn = new System.Windows.Forms.Button();
+			this.localeLbl = new System.Windows.Forms.Label();
+			this.usernameLbl = new System.Windows.Forms.Label();
+			this.externalLoginLink = new System.Windows.Forms.LinkLabel();
+			this.externalLoginLbl2 = new System.Windows.Forms.Label();
+			this.externalLoginLbl1 = new System.Windows.Forms.Label();
+			this.SuspendLayout();
+			// 
+			// passwordLbl
+			// 
+			this.passwordLbl.AutoSize = true;
+			this.passwordLbl.Location = new System.Drawing.Point(14, 47);
+			this.passwordLbl.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+			this.passwordLbl.Name = "passwordLbl";
+			this.passwordLbl.Size = new System.Drawing.Size(57, 15);
+			this.passwordLbl.TabIndex = 2;
+			this.passwordLbl.Text = "Password";
+			// 
+			// passwordTb
+			// 
+			this.passwordTb.Location = new System.Drawing.Point(83, 44);
+			this.passwordTb.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
+			this.passwordTb.Name = "passwordTb";
+			this.passwordTb.PasswordChar = '*';
+			this.passwordTb.Size = new System.Drawing.Size(233, 23);
+			this.passwordTb.TabIndex = 3;
+			// 
+			// submitBtn
+			// 
+			this.submitBtn.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+			this.submitBtn.Location = new System.Drawing.Point(293, 176);
+			this.submitBtn.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
+			this.submitBtn.Name = "submitBtn";
+			this.submitBtn.Size = new System.Drawing.Size(88, 27);
+			this.submitBtn.TabIndex = 7;
+			this.submitBtn.Text = "Submit";
+			this.submitBtn.UseVisualStyleBackColor = true;
+			this.submitBtn.Click += new System.EventHandler(this.submitBtn_Click);
+			// 
+			// localeLbl
+			// 
+			this.localeLbl.AutoSize = true;
+			this.localeLbl.Location = new System.Drawing.Point(14, 10);
+			this.localeLbl.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+			this.localeLbl.Name = "localeLbl";
+			this.localeLbl.Size = new System.Drawing.Size(61, 15);
+			this.localeLbl.TabIndex = 0;
+			this.localeLbl.Text = "Locale: {0}";
+			// 
+			// usernameLbl
+			// 
+			this.usernameLbl.AutoSize = true;
+			this.usernameLbl.Location = new System.Drawing.Point(14, 25);
+			this.usernameLbl.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+			this.usernameLbl.Name = "usernameLbl";
+			this.usernameLbl.Size = new System.Drawing.Size(80, 15);
+			this.usernameLbl.TabIndex = 1;
+			this.usernameLbl.Text = "Username: {0}";
+			// 
+			// externalLoginLink
+			// 
+			this.externalLoginLink.AutoSize = true;
+			this.externalLoginLink.Location = new System.Drawing.Point(14, 93);
+			this.externalLoginLink.Name = "externalLoginLink";
+			this.externalLoginLink.Size = new System.Drawing.Size(107, 15);
+			this.externalLoginLink.TabIndex = 4;
+			this.externalLoginLink.TabStop = true;
+			this.externalLoginLink.Text = "Or click here to log";
+			this.externalLoginLink.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.externalLoginLink_LinkClicked);
+			// 
+			// externalLoginLbl2
+			// 
+			this.externalLoginLbl2.AutoSize = true;
+			this.externalLoginLbl2.Location = new System.Drawing.Point(14, 108);
+			this.externalLoginLbl2.Name = "externalLoginLbl2";
+			this.externalLoginLbl2.Size = new System.Drawing.Size(352, 45);
+			this.externalLoginLbl2.TabIndex = 6;
+			this.externalLoginLbl2.Text = "This more advanced login is recommended if you\'re experiencing\r\nerrors logging in" +
+    " the conventional way above or if you\'re not\r\ncomfortable typing your password h" +
+    "ere.";
+			// 
+			// externalLoginLbl1
+			// 
+			this.externalLoginLbl1.AutoSize = true;
+			this.externalLoginLbl1.Location = new System.Drawing.Point(83, 93);
+			this.externalLoginLbl1.Name = "externalLoginLbl1";
+			this.externalLoginLbl1.Size = new System.Drawing.Size(158, 15);
+			this.externalLoginLbl1.TabIndex = 5;
+			this.externalLoginLbl1.Text = "to log in using your browser.";
+			// 
+			// LoginChoiceEagerDialog
+			// 
+			this.AcceptButton = this.submitBtn;
+			this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
+			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+			this.ClientSize = new System.Drawing.Size(394, 216);
+			this.Controls.Add(this.externalLoginLbl2);
+			this.Controls.Add(this.externalLoginLbl1);
+			this.Controls.Add(this.externalLoginLink);
+			this.Controls.Add(this.usernameLbl);
+			this.Controls.Add(this.localeLbl);
+			this.Controls.Add(this.submitBtn);
+			this.Controls.Add(this.passwordLbl);
+			this.Controls.Add(this.passwordTb);
+			this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
+			this.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
+			this.MaximizeBox = false;
+			this.MinimizeBox = false;
+			this.Name = "LoginChoiceEagerDialog";
+			this.ShowIcon = false;
+			this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
+			this.Text = "Audible Login";
+			this.ResumeLayout(false);
+			this.PerformLayout();
+
+		}
+
+		#endregion
+
+		private System.Windows.Forms.Label passwordLbl;
+		private System.Windows.Forms.TextBox passwordTb;
+		private System.Windows.Forms.Button submitBtn;
+		private System.Windows.Forms.Label localeLbl;
+		private System.Windows.Forms.Label usernameLbl;
+		private System.Windows.Forms.LinkLabel externalLoginLink;
+		private System.Windows.Forms.Label externalLoginLbl2;
+		private System.Windows.Forms.Label externalLoginLbl1;
+	}
+}

LibationWinForms/Dialogs/Login/LoginChoiceEagerDialog.cs

@@ -0,0 +1,47 @@
+using System;
+using System.Windows.Forms;
+using Dinah.Core;
+using InternalUtilities;
+
+namespace LibationWinForms.Dialogs.Login
+{
+	public partial class LoginChoiceEagerDialog : Form
+	{
+		private string accountId { get; }
+
+		public AudibleApi.LoginMethod LoginMethod { get; private set; }
+
+		public string Email { get; private set; }
+		public string Password { get; private set; }
+
+		public LoginChoiceEagerDialog(Account account)
+		{
+			InitializeComponent();
+
+			accountId = account.AccountId;
+
+			// do not allow user to change login id here. if they do then jsonpath will fail
+			this.localeLbl.Text = string.Format(this.localeLbl.Text, account.Locale.Name);
+			this.usernameLbl.Text = string.Format(this.usernameLbl.Text, accountId);
+		}
+
+		private void externalLoginLink_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
+		{
+			LoginMethod = AudibleApi.LoginMethod.External;
+			DialogResult = DialogResult.OK;
+			this.Close();
+		}
+
+		private void submitBtn_Click(object sender, EventArgs e)
+		{
+			Email = accountId;
+			Password = this.passwordTb.Text;
+
+			Serilog.Log.Logger.Information("Submit button clicked: {@DebugInfo}", new { email = Email?.ToMask(), passwordLength = Password.Length });
+
+			LoginMethod = AudibleApi.LoginMethod.Api;
+			DialogResult = DialogResult.OK;
+			// Close() not needed for AcceptButton
+		}
+	}
+}

LibationWinForms/Dialogs/Login/LoginChoiceEagerDialog.resx

@@ -0,0 +1,60 @@
+<root>
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>

LibationWinForms/Dialogs/Login/LoginExternalDialog.Designer.cs

@@ -0,0 +1,179 @@
+namespace LibationWinForms.Dialogs.Login
+{
+	partial class LoginExternalDialog
+	{
+		/// <summary>
+		/// Required designer variable.
+		/// </summary>
+		private System.ComponentModel.IContainer components = null;
+
+		/// <summary>
+		/// Clean up any resources being used.
+		/// </summary>
+		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+		protected override void Dispose(bool disposing)
+		{
+			if (disposing && (components != null))
+			{
+				components.Dispose();
+			}
+			base.Dispose(disposing);
+		}
+
+		#region Windows Form Designer generated code
+
+		/// <summary>
+		/// Required method for Designer support - do not modify
+		/// the contents of this method with the code editor.
+		/// </summary>
+		private void InitializeComponent()
+		{
+			System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(LoginExternalDialog));
+			this.submitBtn = new System.Windows.Forms.Button();
+			this.localeLbl = new System.Windows.Forms.Label();
+			this.usernameLbl = new System.Windows.Forms.Label();
+			this.loginUrlLbl = new System.Windows.Forms.Label();
+			this.loginUrlTb = new System.Windows.Forms.TextBox();
+			this.copyBtn = new System.Windows.Forms.Button();
+			this.launchBrowserBtn = new System.Windows.Forms.Button();
+			this.instructionsLbl = new System.Windows.Forms.Label();
+			this.responseUrlTb = new System.Windows.Forms.TextBox();
+			this.SuspendLayout();
+			// 
+			// submitBtn
+			// 
+			this.submitBtn.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+			this.submitBtn.Location = new System.Drawing.Point(665, 400);
+			this.submitBtn.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
+			this.submitBtn.Name = "submitBtn";
+			this.submitBtn.Size = new System.Drawing.Size(88, 27);
+			this.submitBtn.TabIndex = 8;
+			this.submitBtn.Text = "Submit";
+			this.submitBtn.UseVisualStyleBackColor = true;
+			this.submitBtn.Click += new System.EventHandler(this.submitBtn_Click);
+			// 
+			// localeLbl
+			// 
+			this.localeLbl.AutoSize = true;
+			this.localeLbl.Location = new System.Drawing.Point(14, 10);
+			this.localeLbl.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+			this.localeLbl.Name = "localeLbl";
+			this.localeLbl.Size = new System.Drawing.Size(61, 15);
+			this.localeLbl.TabIndex = 0;
+			this.localeLbl.Text = "Locale: {0}";
+			// 
+			// usernameLbl
+			// 
+			this.usernameLbl.AutoSize = true;
+			this.usernameLbl.Location = new System.Drawing.Point(14, 25);
+			this.usernameLbl.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+			this.usernameLbl.Name = "usernameLbl";
+			this.usernameLbl.Size = new System.Drawing.Size(80, 15);
+			this.usernameLbl.TabIndex = 1;
+			this.usernameLbl.Text = "Username: {0}";
+			// 
+			// loginUrlLbl
+			// 
+			this.loginUrlLbl.AutoSize = true;
+			this.loginUrlLbl.Location = new System.Drawing.Point(14, 61);
+			this.loginUrlLbl.Name = "loginUrlLbl";
+			this.loginUrlLbl.Size = new System.Drawing.Size(180, 15);
+			this.loginUrlLbl.TabIndex = 2;
+			this.loginUrlLbl.Text = "Paste this URL into your browser:";
+			// 
+			// loginUrlTb
+			// 
+			this.loginUrlTb.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+			this.loginUrlTb.Location = new System.Drawing.Point(14, 79);
+			this.loginUrlTb.Multiline = true;
+			this.loginUrlTb.Name = "loginUrlTb";
+			this.loginUrlTb.ReadOnly = true;
+			this.loginUrlTb.ScrollBars = System.Windows.Forms.ScrollBars.Both;
+			this.loginUrlTb.Size = new System.Drawing.Size(739, 92);
+			this.loginUrlTb.TabIndex = 3;
+			// 
+			// copyBtn
+			// 
+			this.copyBtn.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+			this.copyBtn.Location = new System.Drawing.Point(14, 177);
+			this.copyBtn.Name = "copyBtn";
+			this.copyBtn.Size = new System.Drawing.Size(165, 23);
+			this.copyBtn.TabIndex = 4;
+			this.copyBtn.Text = "Copy URL to clipboard";
+			this.copyBtn.UseVisualStyleBackColor = true;
+			this.copyBtn.Click += new System.EventHandler(this.copyBtn_Click);
+			// 
+			// launchBrowserBtn
+			// 
+			this.launchBrowserBtn.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+			this.launchBrowserBtn.Location = new System.Drawing.Point(588, 177);
+			this.launchBrowserBtn.Name = "launchBrowserBtn";
+			this.launchBrowserBtn.Size = new System.Drawing.Size(165, 23);
+			this.launchBrowserBtn.TabIndex = 5;
+			this.launchBrowserBtn.Text = "Launch in browser";
+			this.launchBrowserBtn.UseVisualStyleBackColor = true;
+			this.launchBrowserBtn.Click += new System.EventHandler(this.launchBrowserBtn_Click);
+			// 
+			// instructionsLbl
+			// 
+			this.instructionsLbl.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+			this.instructionsLbl.AutoSize = true;
+			this.instructionsLbl.Location = new System.Drawing.Point(14, 203);
+			this.instructionsLbl.Name = "instructionsLbl";
+			this.instructionsLbl.Size = new System.Drawing.Size(436, 90);
+			this.instructionsLbl.TabIndex = 6;
+			this.instructionsLbl.Text = resources.GetString("instructionsLbl.Text");
+			// 
+			// responseUrlTb
+			// 
+			this.responseUrlTb.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+			this.responseUrlTb.Location = new System.Drawing.Point(14, 296);
+			this.responseUrlTb.Multiline = true;
+			this.responseUrlTb.Name = "responseUrlTb";
+			this.responseUrlTb.ScrollBars = System.Windows.Forms.ScrollBars.Both;
+			this.responseUrlTb.Size = new System.Drawing.Size(739, 98);
+			this.responseUrlTb.TabIndex = 7;
+			// 
+			// LoginExternalDialog
+			// 
+			this.AcceptButton = this.submitBtn;
+			this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
+			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+			this.ClientSize = new System.Drawing.Size(766, 440);
+			this.Controls.Add(this.responseUrlTb);
+			this.Controls.Add(this.instructionsLbl);
+			this.Controls.Add(this.launchBrowserBtn);
+			this.Controls.Add(this.copyBtn);
+			this.Controls.Add(this.loginUrlTb);
+			this.Controls.Add(this.loginUrlLbl);
+			this.Controls.Add(this.usernameLbl);
+			this.Controls.Add(this.localeLbl);
+			this.Controls.Add(this.submitBtn);
+			this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
+			this.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
+			this.MaximizeBox = false;
+			this.MinimizeBox = false;
+			this.Name = "LoginExternalDialog";
+			this.ShowIcon = false;
+			this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
+			this.Text = "Audible External Login";
+			this.ResumeLayout(false);
+			this.PerformLayout();
+
+		}
+
+		#endregion
+		private System.Windows.Forms.Button submitBtn;
+		private System.Windows.Forms.Label localeLbl;
+		private System.Windows.Forms.Label usernameLbl;
+		private System.Windows.Forms.Label loginUrlLbl;
+		private System.Windows.Forms.TextBox loginUrlTb;
+		private System.Windows.Forms.Button copyBtn;
+		private System.Windows.Forms.Button launchBrowserBtn;
+		private System.Windows.Forms.Label instructionsLbl;
+		private System.Windows.Forms.TextBox responseUrlTb;
+	}
+}

LibationWinForms/Dialogs/Login/LoginExternalDialog.cs

@@ -0,0 +1,42 @@
+using System;
+using System.Windows.Forms;
+using Dinah.Core;
+using InternalUtilities;
+
+namespace LibationWinForms.Dialogs.Login
+{
+	public partial class LoginExternalDialog : Form
+	{
+		public string ResponseUrl { get; private set; }
+
+		public LoginExternalDialog(Account account, string loginUrl)
+		{
+			InitializeComponent();
+
+			// do not allow user to change login id here. if they do then jsonpath will fail
+			this.localeLbl.Text = string.Format(this.localeLbl.Text, account.Locale.Name);
+			this.usernameLbl.Text = string.Format(this.usernameLbl.Text, account.AccountId);
+
+			this.loginUrlTb.Text = loginUrl;
+		}
+
+		private void copyBtn_Click(object sender, EventArgs e) => Clipboard.SetText(this.loginUrlTb.Text);
+
+		private void launchBrowserBtn_Click(object sender, EventArgs e) => Go.To.Url(this.loginUrlTb.Text);
+
+		private void submitBtn_Click(object sender, EventArgs e)
+		{
+			ResponseUrl = this.responseUrlTb.Text?.Trim();
+
+			Serilog.Log.Logger.Information("Submit button clicked: {@DebugInfo}", new { ResponseUrl });
+			if (!Uri.TryCreate(ResponseUrl, UriKind.Absolute, out var result))
+			{
+				MessageBox.Show("Invalid response URL");
+				return;
+			}
+
+			DialogResult = DialogResult.OK;
+			// Close() not needed for AcceptButton
+		}
+	}
+}

LibationWinForms/Dialogs/Login/LoginExternalDialog.resx

@@ -0,0 +1,68 @@
+<root>
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="instructionsLbl.Text" xml:space="preserve">
+    <value>Login with your Amazon/Audible credentials.
+After login is complete, your browser will show you an error page similar to:
+     Looking for Something?
+     We're sorry. The Web address you entered is not a functioning page on our site
+Don't worry -- this is ACTUALLY A SUCCESSFUL LOGIN.
+Copy the current url from your browser's address bar and paste it here:</value>
+  </data>
+</root>

LibationWinForms/Dialogs/Login/WinformLoginBase.cs

@@ -0,0 +1,15 @@
+using System;
+
+namespace LibationWinForms.Dialogs.Login
+{
+	public abstract class WinformLoginBase
+	{
+		/// <returns>True if ShowDialog's DialogResult == OK</returns>
+		protected static bool ShowDialog(System.Windows.Forms.Form dialog)
+		{
+			var result = dialog.ShowDialog();
+			Serilog.Log.Logger.Debug("{@DebugInfo}", new { DialogResult = result });
+			return result == System.Windows.Forms.DialogResult.OK;
+		}
+	}
+}

LibationWinForms/Dialogs/Login/WinformLoginCallback.cs

@@ -1,16 +1,15 @@
-using AudibleApi;
+using System;
+using AudibleApi;
 using InternalUtilities;
 using LibationWinForms.Dialogs.Login;
-using System;
-using System.Linq;
 
 namespace LibationWinForms.Login
 {
-	public class WinformResponder : ILoginCallback
+	public class WinformLoginCallback : WinformLoginBase, ILoginCallback
 	{
 		private Account _account { get; }
 
-		public WinformResponder(Account account)
+		public WinformLoginCallback(Account account)
 		{
 			_account = Dinah.Core.ArgumentValidator.EnsureNotNull(account, nameof(account));
 		}
@@ -18,7 +17,7 @@ namespace LibationWinForms.Login
 		public string Get2faCode()
 		{
 			using var dialog = new _2faCodeDialog();
-			if (showDialog(dialog))
+			if (ShowDialog(dialog))
 				return dialog.Code;
 			return null;
 		}
@@ -26,7 +25,7 @@ namespace LibationWinForms.Login
 		public string GetCaptchaAnswer(byte[] captchaImage)
 		{
 			using var dialog = new CaptchaDialog(captchaImage);
-			if (showDialog(dialog))
+			if (ShowDialog(dialog))
 				return dialog.Answer;
 			return null;
 		}
@@ -34,15 +33,15 @@ namespace LibationWinForms.Login
 		public (string name, string value) GetMfaChoice(MfaConfig mfaConfig)
 		{
 			using var dialog = new MfaDialog(mfaConfig);
-			if (showDialog(dialog))
+			if (ShowDialog(dialog))
 				return (dialog.SelectedName, dialog.SelectedValue);
 			return (null, null);
 		}
 
 		public (string email, string password) GetLogin()
 		{
-			using var dialog = new AudibleLoginDialog(_account);
-			if (showDialog(dialog))
+			using var dialog = new LoginCallbackDialog(_account);
+			if (ShowDialog(dialog))
 				return (dialog.Email, dialog.Password);
 			return (null, null);
 		}
@@ -50,15 +49,7 @@ namespace LibationWinForms.Login
 		public void ShowApprovalNeeded()
 		{
 			using var dialog = new ApprovalNeededDialog();
-			showDialog(dialog);
-		}
-
-		/// <returns>True if ShowDialog's DialogResult == OK</returns>
-		private static bool showDialog(System.Windows.Forms.Form dialog)
-		{
-			var result = dialog.ShowDialog();
-			Serilog.Log.Logger.Debug("{@DebugInfo}", new { DialogResult = result });
-			return result == System.Windows.Forms.DialogResult.OK;
+			ShowDialog(dialog);
 		}
 	}
 }

LibationWinForms/Dialogs/Login/WinformLoginChoiceEager.cs

@@ -0,0 +1,43 @@
+using System;
+using AudibleApi;
+using InternalUtilities;
+using LibationWinForms.Dialogs.Login;
+
+namespace LibationWinForms.Login
+{
+	public class WinformLoginChoiceEager : WinformLoginBase, ILoginChoiceEager
+	{
+		public ILoginCallback LoginCallback { get; private set; }
+
+		private Account _account { get; }
+
+		public WinformLoginChoiceEager(Account account)
+		{
+			_account = Dinah.Core.ArgumentValidator.EnsureNotNull(account, nameof(account));
+			LoginCallback = new WinformLoginCallback(_account);
+		}
+
+		public ChoiceOut Start(ChoiceIn choiceIn)
+		{
+			using var dialog = new LoginChoiceEagerDialog(_account);
+
+			if (!ShowDialog(dialog))
+				return null;
+
+			switch (dialog.LoginMethod)
+			{
+				case LoginMethod.Api:
+					return ChoiceOut.WithApi(dialog.Email, dialog.Password);
+				case LoginMethod.External:
+				{
+					using var externalDialog = new LoginExternalDialog(_account, choiceIn.LoginUrl);
+					return ShowDialog(externalDialog)
+						? ChoiceOut.External(externalDialog.ResponseUrl)
+						: null;
+				}
+				default:
+					throw new Exception($"Unknown {nameof(LoginMethod)} value");
+			}
+		}
+	}
+}

LibationWinForms/Dialogs/MessageBoxAlertAdminDialog.cs

@@ -33,10 +33,37 @@ namespace LibationWinForms.Dialogs
 		}
 
 		private void githubLink_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
-			=> Go.To.Url("https://github.com/rmcrackan/Libation/issues");
+		{
+			var url = "https://github.com/rmcrackan/Libation/issues";
+			try
+			{
+				Go.To.Url(url);
+			}
+			catch
+			{
+				MessageBox.Show($"Error opening url\r\n{url}", "Error opening url", MessageBoxButtons.OK, MessageBoxIcon.Error);
+			}
+		}
 
 		private void logsLink_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
-			=> Go.To.Folder(FileManager.Configuration.Instance.LibationFiles);
+		{
+			string dir = "";
+			try
+			{
+				dir = FileManager.Configuration.Instance.LibationFiles;
+			}
+			catch { }
+
+			try
+			{
+				Go.To.Folder(dir);
+			}
+			catch
+			{
+				MessageBox.Show($"Error opening folder\r\n{dir}", "Error opening folder", MessageBoxButtons.OK, MessageBoxIcon.Error);
+			}
+		}
+
 
 		private void okBtn_Click(object sender, EventArgs e)
 		{

LibationWinForms/Dialogs/RemoveBooksDialog.Designer.cs

@@ -38,7 +38,7 @@ namespace LibationWinForms.Dialogs
 			this.authorsDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.miscDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.purchaseDateGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
-			this.gridEntryBindingSource = new System.Windows.Forms.BindingSource(this.components);
+			this.gridEntryBindingSource = new LibationWinForms.SyncBindingSource(this.components);
 			this.btnRemoveBooks = new System.Windows.Forms.Button();
 			this.label1 = new System.Windows.Forms.Label();
 			((System.ComponentModel.ISupportInitialize)(this._dataGridView)).BeginInit();
@@ -176,7 +176,7 @@ namespace LibationWinForms.Dialogs
         #endregion
 
         private System.Windows.Forms.DataGridView _dataGridView;
-        private System.Windows.Forms.BindingSource gridEntryBindingSource;
+        private LibationWinForms.SyncBindingSource gridEntryBindingSource;
         private System.Windows.Forms.Button btnRemoveBooks;
         private System.Windows.Forms.Label label1;
 		private System.Windows.Forms.DataGridViewCheckBoxColumn removeDataGridViewCheckBoxColumn;

LibationWinForms/Dialogs/RemoveBooksDialog.cs

@@ -62,7 +62,7 @@ namespace LibationWinForms.Dialogs
 				return;
 			try
 			{
-				var removedBooks = await LibraryCommands.FindInactiveBooks((account) => new WinformResponder(account), _libraryBooks, _accounts);
+				var removedBooks = await LibraryCommands.FindInactiveBooks((account) => ApiExtended.CreateAsync(account, new WinformLoginChoiceEager(account)), _libraryBooks, _accounts);
 
 				var removable = _removableGridEntries.Where(rge => removedBooks.Any(rb => rb.Book.AudibleProductId == rge.AudibleProductId)).ToList();
 
@@ -91,16 +91,22 @@ namespace LibationWinForms.Dialogs
 		{
 			var selectedBooks = SelectedEntries.ToList();
 
-			if (selectedBooks.Count == 0) return;
+			if (selectedBooks.Count == 0)
+				return;
 
-			string titles = string.Join("\r\n", selectedBooks.Select(rge => "-" + rge.Title));
+			var titles = selectedBooks.Select(rge => "- " + rge.Title).ToList();
+			var titlesAgg = titles.Take(5).Aggregate((a, b) => $"{a}\r\n{b}");
+			if (titles.Count == 6)
+				titlesAgg += $"\r\n\r\nand 1 other";
+			else if (titles.Count > 6)
+				titlesAgg += $"\r\n\r\nand {titles.Count - 5} others";
 
 			string thisThese = selectedBooks.Count > 1 ? "these" : "this";
 			string bookBooks = selectedBooks.Count > 1 ? "books" : "book";
 
 			var result = MessageBox.Show(
 				this,
-				$"Are you sure you want to remove {thisThese} {selectedBooks.Count} {bookBooks} from Libation's library?\r\n\r\n{titles}",
+				$"Are you sure you want to remove {thisThese} {selectedBooks.Count} {bookBooks} from Libation's library?\r\n\r\n{titlesAgg}",
 				"Remove books from Libation?",
 				MessageBoxButtons.YesNo,
 				MessageBoxIcon.Question,

LibationWinForms/Dialogs/SettingsDialog.Designer.cs

@@ -33,12 +33,15 @@
 			this.saveBtn = new System.Windows.Forms.Button();
 			this.cancelBtn = new System.Windows.Forms.Button();
 			this.advancedSettingsGb = new System.Windows.Forms.GroupBox();
+			this.importEpisodesCb = new System.Windows.Forms.CheckBox();
+			this.downloadEpisodesCb = new System.Windows.Forms.CheckBox();
 			this.badBookGb = new System.Windows.Forms.GroupBox();
 			this.badBookIgnoreRb = new System.Windows.Forms.RadioButton();
 			this.badBookRetryRb = new System.Windows.Forms.RadioButton();
 			this.badBookAbortRb = new System.Windows.Forms.RadioButton();
 			this.badBookAskRb = new System.Windows.Forms.RadioButton();
 			this.decryptAndConvertGb = new System.Windows.Forms.GroupBox();
+			this.splitFilesByChapterCbox = new System.Windows.Forms.CheckBox();
 			this.allowLibationFixupCbox = new System.Windows.Forms.CheckBox();
 			this.convertLossyRb = new System.Windows.Forms.RadioButton();
 			this.convertLosslessRb = new System.Windows.Forms.RadioButton();
@@ -67,21 +70,21 @@
 			// inProgressDescLbl
 			// 
 			this.inProgressDescLbl.AutoSize = true;
-			this.inProgressDescLbl.Location = new System.Drawing.Point(8, 149);
+			this.inProgressDescLbl.Location = new System.Drawing.Point(8, 199);
 			this.inProgressDescLbl.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
 			this.inProgressDescLbl.Name = "inProgressDescLbl";
 			this.inProgressDescLbl.Size = new System.Drawing.Size(43, 45);
-			this.inProgressDescLbl.TabIndex = 15;
+			this.inProgressDescLbl.TabIndex = 18;
 			this.inProgressDescLbl.Text = "[desc]\r\n[line 2]\r\n[line 3]";
 			// 
 			// saveBtn
 			// 
 			this.saveBtn.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-			this.saveBtn.Location = new System.Drawing.Point(714, 445);
+			this.saveBtn.Location = new System.Drawing.Point(714, 496);
 			this.saveBtn.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
 			this.saveBtn.Name = "saveBtn";
 			this.saveBtn.Size = new System.Drawing.Size(88, 27);
-			this.saveBtn.TabIndex = 17;
+			this.saveBtn.TabIndex = 98;
 			this.saveBtn.Text = "Save";
 			this.saveBtn.UseVisualStyleBackColor = true;
 			this.saveBtn.Click += new System.EventHandler(this.saveBtn_Click);
@@ -90,11 +93,11 @@
 			// 
 			this.cancelBtn.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
 			this.cancelBtn.DialogResult = System.Windows.Forms.DialogResult.Cancel;
-			this.cancelBtn.Location = new System.Drawing.Point(832, 445);
+			this.cancelBtn.Location = new System.Drawing.Point(832, 496);
 			this.cancelBtn.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
 			this.cancelBtn.Name = "cancelBtn";
 			this.cancelBtn.Size = new System.Drawing.Size(88, 27);
-			this.cancelBtn.TabIndex = 18;
+			this.cancelBtn.TabIndex = 99;
 			this.cancelBtn.Text = "Cancel";
 			this.cancelBtn.UseVisualStyleBackColor = true;
 			this.cancelBtn.Click += new System.EventHandler(this.cancelBtn_Click);
@@ -104,6 +107,8 @@
 			this.advancedSettingsGb.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
             | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
+			this.advancedSettingsGb.Controls.Add(this.importEpisodesCb);
+			this.advancedSettingsGb.Controls.Add(this.downloadEpisodesCb);
 			this.advancedSettingsGb.Controls.Add(this.badBookGb);
 			this.advancedSettingsGb.Controls.Add(this.decryptAndConvertGb);
 			this.advancedSettingsGb.Controls.Add(this.inProgressSelectControl);
@@ -112,21 +117,41 @@
 			this.advancedSettingsGb.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
 			this.advancedSettingsGb.Name = "advancedSettingsGb";
 			this.advancedSettingsGb.Padding = new System.Windows.Forms.Padding(4, 3, 4, 3);
-			this.advancedSettingsGb.Size = new System.Drawing.Size(908, 258);
+			this.advancedSettingsGb.Size = new System.Drawing.Size(908, 309);
 			this.advancedSettingsGb.TabIndex = 6;
 			this.advancedSettingsGb.TabStop = false;
 			this.advancedSettingsGb.Text = "Advanced settings for control freaks";
 			// 
+			// importEpisodesCb
+			// 
+			this.importEpisodesCb.AutoSize = true;
+			this.importEpisodesCb.Location = new System.Drawing.Point(7, 22);
+			this.importEpisodesCb.Name = "importEpisodesCb";
+			this.importEpisodesCb.Size = new System.Drawing.Size(146, 19);
+			this.importEpisodesCb.TabIndex = 7;
+			this.importEpisodesCb.Text = "[import episodes desc]";
+			this.importEpisodesCb.UseVisualStyleBackColor = true;
+			// 
+			// downloadEpisodesCb
+			// 
+			this.downloadEpisodesCb.AutoSize = true;
+			this.downloadEpisodesCb.Location = new System.Drawing.Point(7, 47);
+			this.downloadEpisodesCb.Name = "downloadEpisodesCb";
+			this.downloadEpisodesCb.Size = new System.Drawing.Size(163, 19);
+			this.downloadEpisodesCb.TabIndex = 8;
+			this.downloadEpisodesCb.Text = "[download episodes desc]";
+			this.downloadEpisodesCb.UseVisualStyleBackColor = true;
+			// 
 			// badBookGb
 			// 
 			this.badBookGb.Controls.Add(this.badBookIgnoreRb);
 			this.badBookGb.Controls.Add(this.badBookRetryRb);
 			this.badBookGb.Controls.Add(this.badBookAbortRb);
 			this.badBookGb.Controls.Add(this.badBookAskRb);
-			this.badBookGb.Location = new System.Drawing.Point(372, 22);
+			this.badBookGb.Location = new System.Drawing.Point(372, 72);
 			this.badBookGb.Name = "badBookGb";
 			this.badBookGb.Size = new System.Drawing.Size(529, 124);
-			this.badBookGb.TabIndex = 11;
+			this.badBookGb.TabIndex = 13;
 			this.badBookGb.TabStop = false;
 			this.badBookGb.Text = "[bad book desc]";
 			// 
@@ -136,7 +161,7 @@
 			this.badBookIgnoreRb.Location = new System.Drawing.Point(6, 97);
 			this.badBookIgnoreRb.Name = "badBookIgnoreRb";
 			this.badBookIgnoreRb.Size = new System.Drawing.Size(94, 19);
-			this.badBookIgnoreRb.TabIndex = 15;
+			this.badBookIgnoreRb.TabIndex = 17;
 			this.badBookIgnoreRb.TabStop = true;
 			this.badBookIgnoreRb.Text = "[ignore desc]";
 			this.badBookIgnoreRb.UseVisualStyleBackColor = true;
@@ -147,7 +172,7 @@
 			this.badBookRetryRb.Location = new System.Drawing.Point(6, 72);
 			this.badBookRetryRb.Name = "badBookRetryRb";
 			this.badBookRetryRb.Size = new System.Drawing.Size(84, 19);
-			this.badBookRetryRb.TabIndex = 14;
+			this.badBookRetryRb.TabIndex = 16;
 			this.badBookRetryRb.TabStop = true;
 			this.badBookRetryRb.Text = "[retry desc]";
 			this.badBookRetryRb.UseVisualStyleBackColor = true;
@@ -158,7 +183,7 @@
 			this.badBookAbortRb.Location = new System.Drawing.Point(6, 47);
 			this.badBookAbortRb.Name = "badBookAbortRb";
 			this.badBookAbortRb.Size = new System.Drawing.Size(88, 19);
-			this.badBookAbortRb.TabIndex = 13;
+			this.badBookAbortRb.TabIndex = 15;
 			this.badBookAbortRb.TabStop = true;
 			this.badBookAbortRb.Text = "[abort desc]";
 			this.badBookAbortRb.UseVisualStyleBackColor = true;
@@ -169,23 +194,34 @@
 			this.badBookAskRb.Location = new System.Drawing.Point(6, 22);
 			this.badBookAskRb.Name = "badBookAskRb";
 			this.badBookAskRb.Size = new System.Drawing.Size(77, 19);
-			this.badBookAskRb.TabIndex = 12;
+			this.badBookAskRb.TabIndex = 14;
 			this.badBookAskRb.TabStop = true;
 			this.badBookAskRb.Text = "[ask desc]";
 			this.badBookAskRb.UseVisualStyleBackColor = true;
 			// 
 			// decryptAndConvertGb
 			// 
+			this.decryptAndConvertGb.Controls.Add(this.splitFilesByChapterCbox);
 			this.decryptAndConvertGb.Controls.Add(this.allowLibationFixupCbox);
 			this.decryptAndConvertGb.Controls.Add(this.convertLossyRb);
 			this.decryptAndConvertGb.Controls.Add(this.convertLosslessRb);
-			this.decryptAndConvertGb.Location = new System.Drawing.Point(7, 22);
+			this.decryptAndConvertGb.Location = new System.Drawing.Point(7, 72);
 			this.decryptAndConvertGb.Name = "decryptAndConvertGb";
 			this.decryptAndConvertGb.Size = new System.Drawing.Size(359, 124);
-			this.decryptAndConvertGb.TabIndex = 7;
+			this.decryptAndConvertGb.TabIndex = 9;
 			this.decryptAndConvertGb.TabStop = false;
 			this.decryptAndConvertGb.Text = "Decrypt and convert";
 			// 
+			// splitFilesByChapterCbox
+			// 
+			this.splitFilesByChapterCbox.AutoSize = true;
+			this.splitFilesByChapterCbox.Location = new System.Drawing.Point(6, 46);
+			this.splitFilesByChapterCbox.Name = "splitFilesByChapterCbox";
+			this.splitFilesByChapterCbox.Size = new System.Drawing.Size(162, 19);
+			this.splitFilesByChapterCbox.TabIndex = 13;
+			this.splitFilesByChapterCbox.Text = "[SplitFilesByChapter desc]";
+			this.splitFilesByChapterCbox.UseVisualStyleBackColor = true;
+			// 
 			// allowLibationFixupCbox
 			// 
 			this.allowLibationFixupCbox.AutoSize = true;
@@ -193,42 +229,43 @@
 			this.allowLibationFixupCbox.CheckState = System.Windows.Forms.CheckState.Checked;
 			this.allowLibationFixupCbox.Location = new System.Drawing.Point(6, 22);
 			this.allowLibationFixupCbox.Name = "allowLibationFixupCbox";
-			this.allowLibationFixupCbox.Size = new System.Drawing.Size(262, 19);
-			this.allowLibationFixupCbox.TabIndex = 8;
-			this.allowLibationFixupCbox.Text = "Allow Libation to fix up audiobook metadata";
+			this.allowLibationFixupCbox.Size = new System.Drawing.Size(163, 19);
+			this.allowLibationFixupCbox.TabIndex = 10;
+			this.allowLibationFixupCbox.Text = "[AllowLibationFixup desc]";
 			this.allowLibationFixupCbox.UseVisualStyleBackColor = true;
 			this.allowLibationFixupCbox.CheckedChanged += new System.EventHandler(this.allowLibationFixupCbox_CheckedChanged);
 			// 
 			// convertLossyRb
 			// 
 			this.convertLossyRb.AutoSize = true;
-			this.convertLossyRb.Location = new System.Drawing.Point(6, 81);
+			this.convertLossyRb.Location = new System.Drawing.Point(6, 101);
 			this.convertLossyRb.Name = "convertLossyRb";
-			this.convertLossyRb.Size = new System.Drawing.Size(242, 19);
-			this.convertLossyRb.TabIndex = 10;
-			this.convertLossyRb.Text = "Download my books as .MP3 files (Lossy)";
+			this.convertLossyRb.Size = new System.Drawing.Size(329, 19);
+			this.convertLossyRb.TabIndex = 12;
+			this.convertLossyRb.Text = "Download my books as .MP3 files (transcode if necessary)";
 			this.convertLossyRb.UseVisualStyleBackColor = true;
 			// 
 			// convertLosslessRb
 			// 
 			this.convertLosslessRb.AutoSize = true;
 			this.convertLosslessRb.Checked = true;
-			this.convertLosslessRb.Location = new System.Drawing.Point(6, 56);
+			this.convertLosslessRb.Location = new System.Drawing.Point(6, 76);
 			this.convertLosslessRb.Name = "convertLosslessRb";
-			this.convertLosslessRb.Size = new System.Drawing.Size(327, 19);
-			this.convertLosslessRb.TabIndex = 9;
+			this.convertLosslessRb.Size = new System.Drawing.Size(335, 19);
+			this.convertLosslessRb.TabIndex = 11;
 			this.convertLosslessRb.TabStop = true;
-			this.convertLosslessRb.Text = "Download my books as .M4B files (Lossless Mp4a format)";
+			this.convertLosslessRb.Text = "Download my books in the original audio format (Lossless)";
 			this.convertLosslessRb.UseVisualStyleBackColor = true;
 			// 
 			// inProgressSelectControl
 			// 
 			this.inProgressSelectControl.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
-			this.inProgressSelectControl.Location = new System.Drawing.Point(7, 197);
+			this.inProgressSelectControl.Location = new System.Drawing.Point(7, 247);
+			this.inProgressSelectControl.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
 			this.inProgressSelectControl.Name = "inProgressSelectControl";
-			this.inProgressSelectControl.Size = new System.Drawing.Size(552, 52);
-			this.inProgressSelectControl.TabIndex = 16;
+			this.inProgressSelectControl.Size = new System.Drawing.Size(894, 52);
+			this.inProgressSelectControl.TabIndex = 19;
 			// 
 			// logsBtn
 			// 
@@ -245,6 +282,7 @@
 			this.booksSelectControl.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
 			this.booksSelectControl.Location = new System.Drawing.Point(7, 37);
+			this.booksSelectControl.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
 			this.booksSelectControl.Name = "booksSelectControl";
 			this.booksSelectControl.Size = new System.Drawing.Size(895, 87);
 			this.booksSelectControl.TabIndex = 2;
@@ -286,7 +324,7 @@
 			this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
 			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
 			this.CancelButton = this.cancelBtn;
-			this.ClientSize = new System.Drawing.Size(933, 488);
+			this.ClientSize = new System.Drawing.Size(933, 539);
 			this.Controls.Add(this.logsBtn);
 			this.Controls.Add(this.loggingLevelCb);
 			this.Controls.Add(this.loggingLevelLbl);
@@ -334,5 +372,8 @@
 		private System.Windows.Forms.RadioButton badBookAbortRb;
 		private System.Windows.Forms.RadioButton badBookAskRb;
 		private System.Windows.Forms.RadioButton badBookIgnoreRb;
-	}
+		private System.Windows.Forms.CheckBox downloadEpisodesCb;
+		private System.Windows.Forms.CheckBox importEpisodesCb;
+        private System.Windows.Forms.CheckBox splitFilesByChapterCbox;
+    }
 }

LibationWinForms/Dialogs/SettingsDialog.cs

@@ -26,8 +26,12 @@ namespace LibationWinForms.Dialogs
 				loggingLevelCb.SelectedItem = config.LogLevel;
 			}
 
+			this.importEpisodesCb.Text = desc(nameof(config.ImportEpisodes));
+			this.downloadEpisodesCb.Text = desc(nameof(config.DownloadEpisodes));
 			this.booksLocationDescLbl.Text = desc(nameof(config.Books));
 			this.inProgressDescLbl.Text = desc(nameof(config.InProgress));
+			this.allowLibationFixupCbox.Text = desc(nameof(config.AllowLibationFixup));
+			this.splitFilesByChapterCbox.Text = desc(nameof(config.SplitFilesByChapter));
 
 			booksSelectControl.SetSearchTitle("books location");
 			booksSelectControl.SetDirectoryItems(
@@ -41,9 +45,12 @@ namespace LibationWinForms.Dialogs
 				"Books");
 			booksSelectControl.SelectDirectory(config.Books);
 
+			importEpisodesCb.Checked = config.ImportEpisodes;
+			downloadEpisodesCb.Checked = config.DownloadEpisodes;
 			allowLibationFixupCbox.Checked = config.AllowLibationFixup;
 			convertLosslessRb.Checked = !config.DecryptToLossy;
 			convertLossyRb.Checked = config.DecryptToLossy;
+			splitFilesByChapterCbox.Checked = config.SplitFilesByChapter;
 
 			allowLibationFixupCbox_CheckedChanged(this, e);
 
@@ -77,10 +84,12 @@ namespace LibationWinForms.Dialogs
 		{
 			convertLosslessRb.Enabled = allowLibationFixupCbox.Checked;
 			convertLossyRb.Enabled = allowLibationFixupCbox.Checked;
+			splitFilesByChapterCbox.Enabled = allowLibationFixupCbox.Checked;
 
 			if (!allowLibationFixupCbox.Checked)
 			{
 				convertLosslessRb.Checked = true;
+				splitFilesByChapterCbox.Checked = false;
 			}
 		}
 
@@ -121,8 +130,11 @@ namespace LibationWinForms.Dialogs
 					MessageBoxVerboseLoggingWarning.ShowIfTrue();
 			}
 
+			config.ImportEpisodes = importEpisodesCb.Checked;
+			config.DownloadEpisodes = downloadEpisodesCb.Checked;
 			config.AllowLibationFixup = allowLibationFixupCbox.Checked;
 			config.DecryptToLossy = convertLossyRb.Checked;
+			config.SplitFilesByChapter = splitFilesByChapterCbox.Checked;
 
 			config.InProgress = inProgressSelectControl.SelectedDirectory;
 

LibationWinForms/Form1.cs

@@ -34,6 +34,8 @@ namespace LibationWinForms
 			this.FormClosing += (_, _) => this.SaveSizeAndLocation(Configuration.Instance);
 			LibraryCommands.LibrarySizeChanged += reloadGridAndUpdateBottomNumbers;
 			LibraryCommands.BookUserDefinedItemCommitted += setBackupCounts;
+			// used by async migrations to update ui when complete
+			DataLayer.UserDefinedItem.Batch_ItemChanged += reloadGridAndUpdateBottomNumbers;
 
 			var format = System.Drawing.Imaging.ImageFormat.Jpeg;
 			PictureStorage.SetDefaultImage(PictureSize._80x80, Properties.Resources.default_cover_80x80.ToBytes(format));

LibationWinForms/GridEntry.cs

@@ -27,17 +27,16 @@ namespace LibationWinForms
 
 		#endregion
 
+		public event EventHandler Committed;
+
 		private Book Book => LibraryBook.Book;
 		private Image _cover;
-		private Action Refilter { get; }
 
-		public GridEntry(LibraryBook libraryBook, Action refilterOnChanged = null)
+		public GridEntry(LibraryBook libraryBook)
 		{
 			LibraryBook = libraryBook;
-			Refilter = refilterOnChanged;
 			_memberValues = CreateMemberValueDictionary();
 
-
 			//Get cover art. If it's default, subscribe to PictureCached
 			{
 				(bool isDefault, byte[] picture) = FileManager.PictureStorage.GetPicture(new FileManager.PictureDefinition(Book.PictureId, FileManager.PictureSize._80x80));
@@ -142,7 +141,7 @@ namespace LibationWinForms
 
 			Book.UserDefinedItem.BookStatus = displayStatus;
 
-			Refilter?.Invoke();
+			Committed?.Invoke(this, null);
 		}
 
 		#endregion	
@@ -253,7 +252,7 @@ namespace LibationWinForms
 		private static string GetDescriptionDisplay(Book book)
 		{
 			var doc = new HtmlAgilityPack.HtmlDocument();
-			doc.LoadHtml(book.Description);
+			doc.LoadHtml(book?.Description ?? "");
 			var noHtml = doc.DocumentNode.InnerText;
 			return
 				noHtml.Length < 63 ?

LibationWinForms/LibationWinForms.csproj

@@ -18,8 +18,18 @@
     <!-- Version is now in AppScaffolding.csproj -->
   </PropertyGroup>
 
+  <PropertyGroup>
+    <!--
+    HACK FOR COMPILER BUG  2021-09-14. Hopefully will be fixed in future versions
+    - Not using SatelliteResourceLanguages will load all language packs: works
+    - Specifying 'en' semicolon 1 more should load 1 language pack: works
+    - Specifying only 'en' should load no language packs: broken, still loads all
+    -->
+    <SatelliteResourceLanguages>en;es</SatelliteResourceLanguages>
+  </PropertyGroup>
+
   <ItemGroup>
-    <PackageReference Include="Dinah.Core.WindowsDesktop" Version="1.1.0.2" />
+    <PackageReference Include="Dinah.Core.WindowsDesktop" Version="1.1.1.1" />
   </ItemGroup>
 
   <ItemGroup>

LibationWinForms/MessageBoxAlertAdmin.cs

@@ -1,6 +1,5 @@
-using LibationWinForms.Dialogs;
-using System;
-using System.Linq;
+using System;
+using LibationWinForms.Dialogs;
 
 namespace LibationWinForms
 {
@@ -15,7 +14,11 @@ namespace LibationWinForms
 		/// <returns>One of the System.Windows.Forms.DialogResult values.</returns>
 		public static System.Windows.Forms.DialogResult Show(string text, string caption, Exception exception)
 		{
-			Serilog.Log.Logger.Error(exception, "Alert admin error: {@DebugText}", new { text, caption });
+			try
+			{
+				Serilog.Log.Logger.Error(exception, "Alert admin error: {@DebugText}", new { text, caption });
+			}
+			catch { }
 
 			using var form = new MessageBoxAlertAdminDialog(text, caption, exception);
 			return form.ShowDialog();

LibationWinForms/ProductsGrid.Designer.cs

@@ -30,7 +30,7 @@
 		{
             this.components = new System.ComponentModel.Container();
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
-            this.gridEntryBindingSource = new System.Windows.Forms.BindingSource(this.components);
+            this.gridEntryBindingSource = new LibationWinForms.SyncBindingSource(this.components);
             this.gridEntryDataGridView = new System.Windows.Forms.DataGridView();
             this.dataGridViewImageButtonBoxColumn1 = new LibationWinForms.LiberateDataGridViewImageButtonColumn();
             this.dataGridViewImageColumn1 = new System.Windows.Forms.DataGridViewImageColumn();
@@ -222,7 +222,7 @@
 
 		#endregion
 
-		private System.Windows.Forms.BindingSource gridEntryBindingSource;
+		private LibationWinForms.SyncBindingSource gridEntryBindingSource;
 		private System.Windows.Forms.DataGridView gridEntryDataGridView;
         private LiberateDataGridViewImageButtonColumn dataGridViewImageButtonBoxColumn1;
         private System.Windows.Forms.DataGridViewImageColumn dataGridViewImageColumn1;

LibationWinForms/ProductsGrid.cs

@@ -3,9 +3,9 @@ using System.Linq;
 using System.Threading.Tasks;
 using System.Windows.Forms;
 using ApplicationServices;
-using DataLayer;
 using Dinah.Core;
 using Dinah.Core.DataBinding;
+using Dinah.Core.Threading;
 using Dinah.Core.Windows.Forms;
 using LibationWinForms.Dialogs;
 
@@ -130,7 +130,12 @@ namespace LibationWinForms
 			}
 
 			var orderedGridEntries = lib
-				.Select(lb => new GridEntry(lb, Filter)).ToList()
+				.Select(lb =>
+				{
+					var entry = new GridEntry(lb);
+					entry.Committed += (_, __) => Filter();
+					return entry;
+				}).ToList()
 				// default load order
 				.OrderByDescending(ge => (DateTime)ge.GetMemberValue(nameof(ge.PurchaseDate)))
 				//// more advanced example: sort by author, then series, then title
@@ -166,8 +171,11 @@ namespace LibationWinForms
 			var bindingContext = BindingContext[_dataGridView.DataSource];
 			bindingContext.SuspendBinding();
 			{
-				for (var r = _dataGridView.RowCount - 1; r >= 0; r--)
-					_dataGridView.Rows[r].Visible = productIds.Contains(getGridEntry(r).AudibleProductId);
+				this.UIThreadSync(() =>
+				{
+					for (var r = _dataGridView.RowCount - 1; r >= 0; r--)
+						_dataGridView.Rows[r].Visible = productIds.Contains(getGridEntry(r).AudibleProductId);
+				});
 			}
 
 			//Causes repainting of the DataGridView

LibationWinForms/Program.cs

@@ -24,37 +24,55 @@ namespace LibationWinForms
 		[STAThread]
 		static void Main()
 		{
-			//// Uncomment to see Console. Must be called before anything writes to Console.
-			//// Only use while debugging. Acts erratically in the wild
-			//AllocConsole();
+			try
+			{
+				//// Uncomment to see Console. Must be called before anything writes to Console.
+				//// Only use while debugging. Acts erratically in the wild
+				//AllocConsole();
 
-			Application.SetHighDpiMode(HighDpiMode.SystemAware);
-			Application.EnableVisualStyles();
-			Application.SetCompatibleTextRenderingDefault(false);
+				Application.SetHighDpiMode(HighDpiMode.SystemAware);
+				Application.EnableVisualStyles();
+				Application.SetCompatibleTextRenderingDefault(false);
 
-			//***********************************************//
-			//                                               //
-			//   do not use Configuration before this line   //
-			//                                               //
-			//***********************************************//
-			// Migrations which must occur before configuration is loaded for the first time. Usually ones which alter the Configuration
-			var config = AppScaffolding.LibationScaffolding.RunPreConfigMigrations();
+				//***********************************************//
+				//                                               //
+				//   do not use Configuration before this line   //
+				//                                               //
+				//***********************************************//
+				// Migrations which must occur before configuration is loaded for the first time. Usually ones which alter the Configuration
+				var config = AppScaffolding.LibationScaffolding.RunPreConfigMigrations();
 
-			RunInstaller(config);
+				// do this as soon as possible (post-config)
+				RunInstaller(config);
 
-			// most migrations go in here
-			AppScaffolding.LibationScaffolding.RunPostConfigMigrations();
+				// most migrations go in here
+				AppScaffolding.LibationScaffolding.RunPostConfigMigrations(config);
 
-			// migrations which require Forms or are long-running
-			RunWindowsOnlyMigrations(config);
+				// migrations which require Forms or are long-running
+				RunWindowsOnlyMigrations(config);
 
-			MessageBoxVerboseLoggingWarning.ShowIfTrue();
+				MessageBoxVerboseLoggingWarning.ShowIfTrue();
 
 #if !DEBUG
-			checkForUpdate();
+				checkForUpdate();
 #endif
 
-			AppScaffolding.LibationScaffolding.RunPostMigrationScaffolding();
+				AppScaffolding.LibationScaffolding.RunPostMigrationScaffolding(config);
+			}
+			catch (Exception ex)
+			{
+				var title = "Fatal error, pre-logging";
+				var body = "An unrecoverable error occurred. Since this error happened before logging could be initialized, this error can not be written to the log file.";
+				try
+				{
+					MessageBoxAlertAdmin.Show(body, title, ex);
+				}
+				catch
+				{
+					MessageBox.Show($"{body}\r\n\r\n{ex.Message}\r\n\r\n{ex.StackTrace}", title, MessageBoxButtons.OK, MessageBoxIcon.Error);
+				}
+				return;
+			}
 
 			Application.Run(new Form1());
 		}
@@ -125,8 +143,6 @@ namespace LibationWinForms
 			// if 'new user' was clicked, or if 'returning user' chose new install: show basic settings dialog
 			config.Books ??= Path.Combine(defaultLibationFilesDir, "Books");
 			config.InProgress ??= Configuration.WinTemp;
-			config.AllowLibationFixup = true;
-			config.DecryptToLossy = false;
 
 			if (new SettingsDialog().ShowDialog() != DialogResult.OK)
 			{
@@ -140,6 +156,7 @@ namespace LibationWinForms
 			CancelInstallation();
 		}
 
+		/// <summary>migrations which require Forms or are long-running</summary>
 		private static void RunWindowsOnlyMigrations(Configuration config)
 		{
 			// only supported in winforms. don't move to app scaffolding
@@ -152,9 +169,6 @@ namespace LibationWinForms
 		#region migrate to v5.0.0 re-register device if device info not in settings
 		private static void migrate_to_v5_0_0(Configuration config)
 		{
-			if (!config.Exists(nameof(config.AllowLibationFixup)))
-				config.AllowLibationFixup = true;
-
 			if (!File.Exists(AudibleApiStorage.AccountsSettingsFile))
 				return;
 
@@ -183,7 +197,8 @@ namespace LibationWinForms
 					authorize.DeregisterAsync(identity.ExistingAccessToken, identity.Cookies.ToKeyValuePair()).GetAwaiter().GetResult();
 					identity.Invalidate();
 
-					var api = AudibleApiActions.GetApiAsync(new LibationWinForms.Login.WinformResponder(account), account).GetAwaiter().GetResult();
+					// re-registers device
+					ApiExtended.CreateAsync(account, new Login.WinformLoginChoiceEager(account)).GetAwaiter().GetResult();
 				}
                 catch
                 {
@@ -240,22 +255,26 @@ namespace LibationWinForms
 
 					// assign these strings and enums/ints unconditionally. EFCore will only update if changed
 					if (fileType == FileType.PDF)
-						book.UserDefinedItem.PdfStatus = LiberatedStatus.Liberated;
+						book.UserDefinedItem.BatchMode_UpdatePdfStatus(LiberatedStatus.Liberated);
 
 					if (fileType == FileType.Audio)
 					{
 						var lhack = libhackFiles.FirstOrDefault(f => f.ContainsInsensitive(asin));
 						if (lhack is null)
-							book.UserDefinedItem.BookStatus = LiberatedStatus.Liberated;
+							book.UserDefinedItem.BatchMode_UpdateBookStatus(LiberatedStatus.Liberated);
 						else
 						{
-							book.UserDefinedItem.BookStatus = LiberatedStatus.Error;
+							book.UserDefinedItem.BatchMode_UpdateBookStatus(LiberatedStatus.Error);
 							libhackFilesToDelete.Add(lhack);
 						}
 					}
 				}
 
-				context.SaveChanges();
+				// in order: save to db, full reindex from db, refresh ui
+				var changed = context.SaveChanges();
+				if (changed > 0)
+					ApplicationServices.SearchEngineCommands.FullReIndex();
+				UserDefinedItem.BatchMode_Finalize();
 
 				// only do this after save changes
 				foreach (var libhackFile in libhackFilesToDelete)
@@ -299,14 +318,14 @@ namespace LibationWinForms
 			if (result != DialogResult.Yes)
 				return;
 
-			using var fileSelector = new SaveFileDialog { FileName = zipName, Filter = "Zip Files (*.zip)|*.zip|All files (*.*)|*.*" };
-			if (fileSelector.ShowDialog() != DialogResult.OK)
-				return;
-			var selectedPath = fileSelector.FileName;
-
 			try
 			{
-				LibationWinForms.BookLiberation.ProcessorAutomationController.DownloadFile(zipUrl, selectedPath, true);
+				using var fileSelector = new SaveFileDialog { FileName = zipName, Filter = "Zip Files (*.zip)|*.zip|All files (*.*)|*.*" };
+				if (fileSelector.ShowDialog() != DialogResult.OK)
+					return;
+				var selectedPath = fileSelector.FileName;
+
+				BookLiberation.ProcessorAutomationController.DownloadFile(zipUrl, selectedPath, true);
 			}
 			catch (Exception ex)
 			{

LibationWinForms/SyncBindingSource.cs

@@ -0,0 +1,28 @@
+using System;
+using System.ComponentModel;
+using System.Threading;
+using System.Windows.Forms;
+
+// https://stackoverflow.com/a/32886415
+namespace LibationWinForms
+{
+    public class SyncBindingSource : BindingSource
+    {
+        private SynchronizationContext syncContext { get; }
+
+        public SyncBindingSource() : base()
+            => syncContext = SynchronizationContext.Current;
+        public SyncBindingSource(IContainer container) : base(container)
+            => syncContext = SynchronizationContext.Current;
+        public SyncBindingSource(object dataSource, string dataMember) : base(dataSource, dataMember)
+            => syncContext = SynchronizationContext.Current;
+
+        protected override void OnListChanged(ListChangedEventArgs e)
+        {
+            if (syncContext != null)
+                syncContext.Send(_ => base.OnListChanged(e), null);
+            else
+                base.OnListChanged(e);
+        }
+    }
+}