CLI: error when scan has new book with pdf attachment:

Convert IProcessable to abstract class Processable.

AaxDecrypter/AaxDecrypter.csproj

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

AaxDecrypter/AaxcDownloadConverter.cs

@@ -1,5 +1,4 @@
 using AAXClean;
-using Dinah.Core;
 using Dinah.Core.IO;
 using Dinah.Core.Net.Http;
 using Dinah.Core.StepRunner;
@@ -8,162 +7,143 @@ using System.IO;
 
 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;
+        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 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");
+        private OutputFormat OutputFormat { get; }
 
-        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);
-            Console.WriteLine("Speedup is " + speedup + "x realtime.");
-            Console.WriteLine("Done");
-            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();
+
+            aaxFile.ConversionProgressUpdate += AaxFile_ConversionProgressUpdate;
+            if(OutputFormat == OutputFormat.M4b) 
+                ConvertToMultiMp4b();
+            else 
+                ConvertToMultiMp3();
+            aaxFile.ConversionProgressUpdate -= AaxFile_ConversionProgressUpdate;
+
+            Step2_End(zeroProgress);
+
+            return true;
+        }
+
+        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()
+        {
+            var chapterCount = 0;
+            aaxFile.ConvertToMultiMp4a(downloadLicense.ChapterInfo, newSplitCallback =>
+            {
+                chapterCount++;
+                var fileName = Path.ChangeExtension(outputFileName, $"{chapterCount}.m4b");
+                if (File.Exists(fileName))
+                    FileExt.SafeDelete(fileName);
+                newSplitCallback.OutputFile = File.Open(fileName, FileMode.OpenOrCreate);
+            });
+        }
+        
+        private void ConvertToMultiMp3()
+        {
+            var chapterCount = 0;
+            aaxFile.ConvertToMultiMp3(downloadLicense.ChapterInfo, newSplitCallback =>
+            {
+                chapterCount++;
+                var fileName = Path.ChangeExtension(outputFileName, $"{chapterCount}.mp3");
+                if (File.Exists(fileName))
+                    FileExt.SafeDelete(fileName);
+                newSplitCallback.OutputFile = File.Open(fileName, FileMode.OpenOrCreate);
+                newSplitCallback.LameConfig.ID3.Track = chapterCount.ToString();
+            });
+        }
+
         private void AaxFile_ConversionProgressUpdate(object sender, ConversionProgressEventArgs e)
         {
             var duration = aaxFile.Duration;
@@ -171,61 +151,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,
+            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

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net5.0</TargetFramework>
+    <Version>6.2.2.0</Version>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="MSBump" Version="2.3.2">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+    <PackageReference Include="Octokit" Version="0.50.0" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\InternalUtilities\InternalUtilities.csproj" />
+  </ItemGroup>
+
+</Project>

AppScaffolding/LibationScaffolding.cs

@@ -0,0 +1,349 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Reflection;
+using Dinah.Core;
+using Dinah.Core.IO;
+using Dinah.Core.Logging;
+using FileManager;
+using InternalUtilities;
+using Newtonsoft.Json.Linq;
+using Serilog;
+
+namespace AppScaffolding
+{
+	public static class LibationScaffolding
+	{
+		// AppScaffolding
+		private static Assembly _executingAssembly;
+		private static Assembly ExecutingAssembly
+			=> _executingAssembly ??= Assembly.GetExecutingAssembly();
+
+		// LibationWinForms or LibationCli
+		private static Assembly _entryAssembly;
+		private static Assembly EntryAssembly
+			=> _entryAssembly ??= Assembly.GetEntryAssembly();
+
+		// previously: System.Reflection.Assembly.GetExecutingAssembly().GetName().Version;
+		private static Version _buildVersion;
+		public static Version BuildVersion
+			=> _buildVersion
+			??= new[] { ExecutingAssembly.GetName(), EntryAssembly.GetName() }
+			.Max(a => a.Version);
+
+		/// <summary>Run migrations before loading Configuration for the first time. Then load and return Configuration</summary>
+		public static Configuration RunPreConfigMigrations()
+		{
+			// must occur before access to Configuration instance
+			Migrations.migrate_to_v5_2_0__pre_config();
+
+			//***********************************************//
+			//                                               //
+			//   do not use Configuration before this line   //
+			//                                               //
+			//***********************************************//
+			return Configuration.Instance;
+		}
+
+		/// <summary>most migrations go in here</summary>
+		public static void RunPostConfigMigrations(Configuration config)
+		{
+			AudibleApiStorage.EnsureAccountsSettingsFileExists();
+
+			//
+			// 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(Configuration config)
+		{
+			ensureSerilogConfig(config);
+			configureLogging(config);
+			logStartupState(config);
+		}
+
+		private static void ensureSerilogConfig(Configuration config)
+		{
+			if (config.GetObject("Serilog") != null)
+				return;
+
+			// "Serilog": {
+			//   "MinimumLevel": "Information"
+			//   "WriteTo": [
+			//     {
+			//       "Name": "Console"
+			//     },
+			//     {
+			//       "Name": "File",
+			//       "Args": {
+			//         "rollingInterval": "Day",
+			//         "outputTemplate": ...
+			//       }
+			//     }
+			//   ],
+			//   "Using": [ "Dinah.Core" ],
+			//   "Enrich": [ "WithCaller" ]
+			// }
+			var serilogObj = new JObject
+			{
+				{ "MinimumLevel", "Information" },
+				{ "WriteTo", new JArray
+					{
+						new JObject { {"Name", "Console" } },
+						new JObject
+						{
+							{ "Name", "File" },
+							{ "Args",
+								new JObject
+								{
+									// for this sink to work, a path must be provided. we override this below
+									{ "path", Path.Combine(config.LibationFiles, "_Log.log") },
+									{ "rollingInterval", "Month" },
+									// Serilog template formatting examples
+									// - default:                    "{Timestamp:yyyy-MM-dd HH:mm:ss.fff zzz} [{Level:u3}] {Message:lj}{NewLine}{Exception}"
+									//   output example:             2019-11-26 08:48:40.224 -05:00 [DBG] Begin Libation
+									// - with class and method info: "{Timestamp:yyyy-MM-dd HH:mm:ss.fff zzz} [{Level:u3}] (at {Caller}) {Message:lj}{NewLine}{Exception}";
+									//   output example:             2019-11-26 08:48:40.224 -05:00 [DBG] (at LibationWinForms.Program.init()) Begin Libation
+									{ "outputTemplate", "{Timestamp:yyyy-MM-dd HH:mm:ss.fff zzz} [{Level:u3}] (at {Caller}) {Message:lj}{NewLine}{Exception}" }
+								}
+							}
+						}
+					}
+				},
+				{ "Using", new JArray{ "Dinah.Core" } }, // dll's name, NOT namespace
+				{ "Enrich", new JArray{ "WithCaller" } },
+			};
+			config.SetObject("Serilog", serilogObj);
+		}
+
+		// to restore original: Console.SetOut(origOut);
+		private static TextWriter origOut { get; } = Console.Out;
+
+		private static void configureLogging(Configuration config)
+		{
+			config.ConfigureLogging();
+
+			// capture most Console.WriteLine() and write to serilog. See below tests for details.
+			// Some dependencies print helpful info via Console.WriteLine. We'd like to log it.
+			//
+			// Serilog also writes to Console so this might be asking for trouble. ie: infinite loops.
+			// SerilogTextWriter needs to be more robust and tested. Esp the Write() methods.
+			// Empirical testing so far has shown no issues.
+			Console.SetOut(new MultiTextWriter(origOut, new SerilogTextWriter()));
+
+			#region Console => Serilog tests
+			/*
+			// all below apply to "Console." and "Console.Out."
+
+			// captured
+			Console.WriteLine("str");
+			Console.WriteLine(new { a = "anon" });
+			Console.WriteLine("{0}", "format");
+			Console.WriteLine("{0}{1}", "zero|", "one");
+			Console.WriteLine("{0}{1}{2}", "zero|", "one|", "two");
+			Console.WriteLine("{0}", new object[] { "arr" });
+
+			// not captured
+			Console.WriteLine();
+			Console.WriteLine(true);
+			Console.WriteLine('0');
+			Console.WriteLine(1);
+			Console.WriteLine(2m);
+			Console.WriteLine(3f);
+			Console.WriteLine(4d);
+			Console.WriteLine(5L);
+			Console.WriteLine((uint)6);
+			Console.WriteLine((ulong)7);
+
+			Console.Write("str");
+			Console.Write(true);
+			Console.Write('0');
+			Console.Write(1);
+			Console.Write(2m);
+			Console.Write(3f);
+			Console.Write(4d);
+			Console.Write(5L);
+			Console.Write((uint)6);
+			Console.Write((ulong)7);
+			Console.Write(new { a = "anon" });
+			Console.Write("{0}", "format");
+			Console.Write("{0}{1}", "zero|", "one");
+			Console.Write("{0}{1}{2}", "zero|", "one|", "two");
+			Console.Write("{0}", new object[] { "arr" });
+			*/
+			#endregion
+
+			// .Here() captures debug info via System.Runtime.CompilerServices attributes. Warning: expensive
+			//var withLineNumbers_outputTemplate = "[{Timestamp:HH:mm:ss} {Level}] {SourceContext}{NewLine}{Message}{NewLine}in method {MemberName} at {FilePath}:{LineNumber}{NewLine}{Exception}{NewLine}";
+			//Log.Logger.Here().Debug("Begin Libation. Debug with line numbers");
+		}
+
+		private static void logStartupState(Configuration config)
+		{
+			// begin logging session with a form feed
+			Log.Logger.Information("\r\n\f");
+			Log.Logger.Information("Begin. {@DebugInfo}", new
+			{
+				AppName = EntryAssembly.GetName().Name,
+				Version = BuildVersion.ToString(),
+#if DEBUG
+				Mode = "Debug",
+#else
+				Mode = "Release",
+#endif
+
+				LogLevel_Verbose_Enabled = Log.Logger.IsVerboseEnabled(),
+				LogLevel_Debug_Enabled = Log.Logger.IsDebugEnabled(),
+				LogLevel_Information_Enabled = Log.Logger.IsInformationEnabled(),
+				LogLevel_Warning_Enabled = Log.Logger.IsWarningEnabled(),
+				LogLevel_Error_Enabled = Log.Logger.IsErrorEnabled(),
+				LogLevel_Fatal_Enabled = Log.Logger.IsFatalEnabled(),
+
+				config.LibationFiles,
+				AudibleFileStorage.BooksDirectory,
+
+				config.InProgress,
+
+				DownloadsInProgressDir = AudibleFileStorage.DownloadsInProgress,
+				DownloadsInProgressFiles = Directory.EnumerateFiles(AudibleFileStorage.DownloadsInProgress).Count(),
+
+				DecryptInProgressDir = AudibleFileStorage.DecryptInProgress,
+				DecryptInProgressFiles = Directory.EnumerateFiles(AudibleFileStorage.DecryptInProgress).Count(),
+			});
+		}
+
+		public static (bool hasUpgrade, string zipUrl, string htmlUrl, string zipName) GetLatestRelease()
+		{
+			(bool, string, string, string) isFalse = (false, null, null, null);
+
+			// timed out
+			var latest = getLatestRelease(TimeSpan.FromSeconds(10));
+			if (latest is null)
+				return isFalse;
+
+			var latestVersionString = latest.TagName.Trim('v');
+			if (!Version.TryParse(latestVersionString, out var latestRelease))
+				return isFalse;
+
+			// we're up to date
+			if (latestRelease <= BuildVersion)
+				return isFalse;
+
+			// we have an update
+			var zip = latest.Assets.FirstOrDefault(a => a.BrowserDownloadUrl.EndsWith(".zip"));
+			var zipUrl = zip?.BrowserDownloadUrl;
+
+			Log.Logger.Information("Update available: {@DebugInfo}", new
+			{
+				latestRelease = latestRelease.ToString(),
+				latest.HtmlUrl,
+				zipUrl
+			});
+
+			return (true, zipUrl, latest.HtmlUrl, zip.Name);
+		}
+		private static Octokit.Release getLatestRelease(TimeSpan timeout)
+		{
+			try
+			{
+				var task = System.Threading.Tasks.Task.Run(() => getLatestRelease());
+				if (task.Wait(timeout))
+					return task.Result;
+
+				Log.Logger.Information("Timed out");
+			}
+			catch (AggregateException aggEx)
+			{
+				Log.Logger.Error(aggEx, "Checking for new version too often");
+			}
+			return null;
+		}
+		private static Octokit.Release getLatestRelease()
+		{
+			var gitHubClient = new Octokit.GitHubClient(new Octokit.ProductHeaderValue("Libation"));
+
+			// https://octokitnet.readthedocs.io/en/latest/releases/
+			var releases = gitHubClient.Repository.Release.GetAll("rmcrackan", "Libation").GetAwaiter().GetResult();
+			var latest = releases.First(r => !r.Draft && !r.Prerelease);
+			return latest;
+		}
+	}
+
+	internal static class Migrations
+	{
+		#region migrate to v5.2.0
+		// get rid of meta-directories, combine DownloadsInProgressEnum and DecryptInProgressEnum => InProgress
+		public static void migrate_to_v5_2_0__pre_config()
+		{
+			{
+				var settingsKey = "DownloadsInProgressEnum";
+				if (UNSAFE_MigrationHelper.Settings_TryGet(settingsKey, out var value))
+				{
+					UNSAFE_MigrationHelper.Settings_Delete(settingsKey);
+					UNSAFE_MigrationHelper.Settings_Insert("InProgress", translatePath(value));
+				}
+			}
+
+			{
+				UNSAFE_MigrationHelper.Settings_Delete("DecryptInProgressEnum");
+			}
+
+			{ // appsettings.json
+				var appSettingsKey = UNSAFE_MigrationHelper.LIBATION_FILES_KEY;
+				if (UNSAFE_MigrationHelper.APPSETTINGS_TryGet(appSettingsKey, out var value))
+					UNSAFE_MigrationHelper.APPSETTINGS_Update(appSettingsKey, translatePath(value));
+			}
+		}
+
+		private static string translatePath(string path)
+			=> path switch
+			{
+				"AppDir" => @".\LibationFiles",
+				"MyDocs" => Path.GetFullPath(Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments), "LibationFiles")),
+				"UserProfile" => Path.GetFullPath(Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile), "Libation")),
+				"WinTemp" => Path.GetFullPath(Path.Combine(Path.GetTempPath(), "Libation")),
+				_ => path
+			};
+
+		public static void migrate_to_v5_2_0__post_config(Configuration config)
+		{
+			if (!config.Exists(nameof(config.AllowLibationFixup)))
+				config.AllowLibationFixup = true;
+
+			if (!config.Exists(nameof(config.DecryptToLossy)))
+				config.DecryptToLossy = false;
+		}
+		#endregion
+
+		// add config.BadBook
+		public static void migrate_to_v5_7_1(Configuration config)
+		{
+			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

@@ -6,13 +6,21 @@ using Dinah.Core;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 
-namespace LibationLauncher
+namespace AppScaffolding
 {
-	/// <summary>for migrations only. directly manipulatings settings files without going through domain logic</summary>
+	/// <summary>
+	/// 
+	/// 
+	///      directly manipulates settings files without going through domain logic.
+	///      
+	///      for migrations only. use with caution.
+	/// 
+	/// 
+	/// </summary>
 	internal static class UNSAFE_MigrationHelper
 	{
 		#region appsettings.json
-		private const string APPSETTINGS_JSON = "appsettings.json";
+		private static string APPSETTINGS_JSON { get; } = Path.Combine(Path.GetDirectoryName(System.Reflection.Assembly.GetEntryAssembly().Location), "appsettings.json");
 
 		public static bool APPSETTINGS_Json_Exists => File.Exists(APPSETTINGS_JSON);
 
@@ -53,7 +61,16 @@ namespace LibationLauncher
 				return;
 
 			var startingContents = File.ReadAllText(APPSETTINGS_JSON);
-			var jObj = JObject.Parse(startingContents);
+
+			JObject jObj;
+			try
+			{
+				jObj = JObject.Parse(startingContents);
+			}
+			catch
+			{
+				return;
+			}
 
 			action(jObj);
 
@@ -122,7 +139,16 @@ namespace LibationLauncher
 				return;
 
 			var startingContents = File.ReadAllText(SettingsJsonPath);
-			var jObj = JObject.Parse(startingContents);
+
+			JObject jObj;
+			try
+			{
+				jObj = JObject.Parse(startingContents);
+			}
+			catch
+			{
+				return;
+			}
 
 			action(jObj);
 

ApplicationServices/ApplicationServices.csproj

@@ -6,14 +6,11 @@
 
   <ItemGroup>
     <PackageReference Include="CsvHelper" Version="27.1.1" />
-    <PackageReference Include="NPOI" Version="2.5.3" />
+    <PackageReference Include="NPOI" Version="2.5.4" />
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\audible api\AudibleApi\AudibleApiDTOs\AudibleApiDTOs.csproj" />
-    <ProjectReference Include="..\..\audible api\AudibleApi\AudibleApi\AudibleApi.csproj" />
     <ProjectReference Include="..\DtoImporterService\DtoImporterService.csproj" />
-    <ProjectReference Include="..\InternalUtilities\InternalUtilities.csproj" />
     <ProjectReference Include="..\LibationSearchEngine\LibationSearchEngine.csproj" />
   </ItemGroup>
 

ApplicationServices/DbContexts.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using DataLayer;
 using FileManager;
 
@@ -6,11 +7,15 @@ namespace ApplicationServices
 {
 	public static class DbContexts
 	{
-		//// idea for future command/query separation
-		// public static LibationContext GetCommandContext() { }
-		// public static LibationContext GetQueryContext() { }
-
+		/// <summary>Use for fully functional context, incl. SaveChanges(). For query-only, use the other method</summary>
 		public static LibationContext GetContext()
 			=> LibationContext.Create(SqliteStorage.ConnectionString);
+
+		/// <summary>Use for full library querying. No lazy loading</summary>
+		public static List<LibraryBook> GetLibrary_Flat_NoTracking()
+		{
+			using var context = GetContext();
+			return context.GetLibrary_Flat_NoTracking();
+		}
 	}
 }

ApplicationServices/LibraryCommands.cs

@@ -8,27 +8,21 @@ using Dinah.Core;
 using DtoImporterService;
 using InternalUtilities;
 using Serilog;
+using static DtoImporterService.PerfLogger;
 
 namespace ApplicationServices
 {
-	// subtly different from DataLayer.LiberatedStatus
-	// - DataLayer.LiberatedStatus: has no concept of partially downloaded
-	// - ApplicationServices.LiberatedState: has no concept of Error/skipped
-	public enum LiberatedState { NotDownloaded, PartialDownload, Liberated }
-
-	public enum PdfState { NoPdf, Downloaded, NotDownloaded }
-
 	public static class LibraryCommands
 	{
-		private static LibraryOptions.ResponseGroupOptions LibraryResponseGroups = LibraryOptions.ResponseGroupOptions.ALL_OPTIONS;
+		public static async Task<List<LibraryBook>> FindInactiveBooks(Func<Account, Task<ApiExtended>> apiExtendedfunc, List<LibraryBook> existingLibrary, params Account[] accounts)
+		{
+			logRestart();
 
-		public static async Task<List<LibraryBook>> FindInactiveBooks(Func<Account, ILoginCallback> loginCallbackFactoryFunc, List<LibraryBook> existingLibrary, params Account[] accounts)
-        {
 			//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.ProductDesc |
 				LibraryOptions.ResponseGroupOptions.Relationships;
 
 			if (accounts is null || accounts.Length == 0)
@@ -36,8 +30,12 @@ namespace ApplicationServices
 
 			try
 			{
-				var libraryItems = await scanAccountsAsync(loginCallbackFactoryFunc, accounts);
-				Log.Logger.Information($"GetAllLibraryItems: Total count {libraryItems.Count}");
+				logTime($"pre {nameof(scanAccountsAsync)} all");
+				var libraryItems = await scanAccountsAsync(apiExtendedfunc, accounts, libraryResponseGroups);
+				logTime($"post {nameof(scanAccountsAsync)} all");
+
+				var totalCount = libraryItems.Count;
+				Log.Logger.Information($"GetAllLibraryItems: Total count {totalCount}");
 
 				var missingBookList = existingLibrary.Where(b => !libraryItems.Any(i => i.DtoItem.Asin == b.Book.AudibleProductId)).ToList();
 
@@ -63,32 +61,38 @@ namespace ApplicationServices
 			}
 			catch (Exception ex)
 			{
-				Log.Logger.Error(ex, "Error importing library");
+				Log.Logger.Error(ex, "Error scanning library");
 				throw;
 			}
-            finally
-            {
-				LibraryResponseGroups = LibraryOptions.ResponseGroupOptions.ALL_OPTIONS;
-            }
+			finally
+			{
+				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();
+
 			if (accounts is null || accounts.Length == 0)
 				return (0, 0);
 
 			try
 			{
-				var importItems = await scanAccountsAsync(loginCallbackFactoryFunc, accounts);
+				logTime($"pre {nameof(scanAccountsAsync)} all");
+				var importItems = await scanAccountsAsync(apiExtendedfunc, accounts, LibraryOptions.ResponseGroupOptions.ALL_OPTIONS);
+				logTime($"post {nameof(scanAccountsAsync)} all");
 
 				var totalCount = importItems.Count;
 				Log.Logger.Information($"GetAllLibraryItems: Total count {totalCount}");
 
+				Log.Logger.Information("Begin long-running import");
+				logTime($"pre {nameof(importIntoDbAsync)}");
 				var newCount = await importIntoDbAsync(importItems);
-				Log.Logger.Information($"Import: New count {newCount}");
-
-				await Task.Run(() => SearchEngineCommands.FullReIndex());
-				Log.Logger.Information("FullReIndex: success");
+				logTime($"post {nameof(importIntoDbAsync)}");
+				Log.Logger.Information($"Import complete. New count {newCount}");
 
 				return (totalCount, newCount);
 			}
@@ -115,20 +119,23 @@ namespace ApplicationServices
 				Log.Logger.Error(ex, "Error importing library");
 				throw;
 			}
+			finally
+			{
+				stop();
+				var putBreakPointHere = logOutput;
+			}
 		}
 
-		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
@@ -137,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));
 
@@ -146,153 +153,132 @@ namespace ApplicationServices
 				Account = account?.MaskedLogEntry ?? "[null]"
 			});
 
-			var dtoItems = await AudibleApiActions.GetLibraryValidatedAsync(api, LibraryResponseGroups);
+			logTime($"pre scanAccountAsync {account.AccountName}");
+
+			var dtoItems = await apiExtended.GetLibraryValidatedAsync(libraryResponseGroups, FileManager.Configuration.Instance.ImportEpisodes);
+
+			logTime($"post scanAccountAsync {account.AccountName} qty: {dtoItems.Count}");
+
 			return dtoItems.Select(d => new ImportItem { DtoItem = d, AccountId = account.AccountId, LocaleName = account.Locale?.Name }).ToList();
 		}
 
 		private static async Task<int> importIntoDbAsync(List<ImportItem> importItems)
 		{
+			logTime("importIntoDbAsync -- pre db");
 			using var context = DbContexts.GetContext();
-			var libraryImporter = new LibraryImporter(context);
+			var libraryImporter = new LibraryBookImporter(context);
 			var newCount = await Task.Run(() => libraryImporter.Import(importItems));
-			context.SaveChanges();
+			logTime("importIntoDbAsync -- post Import()");
+			var qtyChanges = context.SaveChanges();
+			logTime("importIntoDbAsync -- post SaveChanges");
+
+			if (qtyChanges > 0)
+				await Task.Run(() => finalizeLibrarySizeChange());
+			logTime("importIntoDbAsync -- post finalizeLibrarySizeChange");
 
 			return newCount;
 		}
 		#endregion
 
-		#region Update book details
-		public static int UpdateUserDefinedItem(Book book, string newTags, LiberatedStatus bookStatus, LiberatedStatus? pdfStatus)
+		#region remove books
+		public static Task<List<LibraryBook>> RemoveBooksAsync(List<string> idsToRemove) => Task.Run(() => removeBooks(idsToRemove));
+		private static List<LibraryBook> removeBooks(List<string> idsToRemove)
 		{
-			try
-			{
-				using var context = DbContexts.GetContext();
+			using var context = DbContexts.GetContext();
+			var libBooks = context.GetLibrary_Flat_NoTracking();
 
-				var udi = book.UserDefinedItem;
+			var removeLibraryBooks = libBooks.Where(lb => idsToRemove.Contains(lb.Book.AudibleProductId)).ToList();
+			context.LibraryBooks.RemoveRange(removeLibraryBooks);
+			context.Books.RemoveRange(removeLibraryBooks.Select(lb => lb.Book));
 
-				var tagsChanged = udi.Tags != newTags;
-				var bookStatusChanged = udi.BookStatus != bookStatus;
-				var pdfStatusChanged = udi.PdfStatus != pdfStatus;
+			var qtyChanges = context.SaveChanges();
+			if (qtyChanges > 0)
+				finalizeLibrarySizeChange();
 
-				if (!tagsChanged && !bookStatusChanged && !pdfStatusChanged)
-					return 0;
+			return removeLibraryBooks;
+		}
+		#endregion
 
-				udi.Tags = newTags;
-				udi.BookStatus = bookStatus;
-				udi.PdfStatus = pdfStatus;
-
-				// Attach() NoTracking entities before SaveChanges()
-				context.Attach(udi).State = Microsoft.EntityFrameworkCore.EntityState.Modified;
-				var qtyChanges = context.SaveChanges();
-
-				if (qtyChanges == 0)
-					return 0;
-
-				if (tagsChanged)
-					SearchEngineCommands.UpdateBookTags(book);
-				if (bookStatusChanged || pdfStatusChanged)
-					SearchEngineCommands.UpdateLiberatedStatus(book);
-
-				return qtyChanges;
-			}
-			catch (Exception ex)
-			{
-				Log.Logger.Error(ex, "Error updating tags");
-				throw;
-			}
+		// call this whenever books are added or removed from library
+		private static void finalizeLibrarySizeChange()
+		{
+			SearchEngineCommands.FullReIndex();
+			LibrarySizeChanged?.Invoke(null, null);
 		}
 
-		public static int UpdateBook(LibraryBook libraryBook, LiberatedStatus liberatedStatus)
+		/// <summary>Occurs when books are added or removed from library</summary>
+		public static event EventHandler LibrarySizeChanged;
+
+		/// <summary>
+		/// Occurs when <see cref="UserDefinedItem.Tags"/>, <see cref="UserDefinedItem.BookStatus"/>, or <see cref="UserDefinedItem.PdfStatus"/>
+		/// changed values are successfully persisted.
+		/// </summary>
+		public static event EventHandler<string> BookUserDefinedItemCommitted;
+
+		#region Update book details
+		public static int UpdateUserDefinedItem(Book book)
 		{
 			try
 			{
 				using var context = DbContexts.GetContext();
 
-				var udi = libraryBook.Book.UserDefinedItem;
-
-				if (udi.BookStatus == liberatedStatus)
-					return 0;
-
 				// Attach() NoTracking entities before SaveChanges()
-				udi.BookStatus = liberatedStatus;
-				context.Attach(udi).State = Microsoft.EntityFrameworkCore.EntityState.Modified;
+				context.Attach(book.UserDefinedItem).State = Microsoft.EntityFrameworkCore.EntityState.Modified;
 				var qtyChanges = context.SaveChanges();
 				if (qtyChanges > 0)
-					SearchEngineCommands.UpdateLiberatedStatus(libraryBook.Book);
+				{
+					SearchEngineCommands.UpdateLiberatedStatus(book);
+					BookUserDefinedItemCommitted?.Invoke(null, book.AudibleProductId);
+				}
 
 				return qtyChanges;
 			}
 			catch (Exception ex)
 			{
-				Log.Logger.Error(ex, "Error updating tags");
-				throw;
-			}
-		}
-
-		public static int UpdatePdf(LibraryBook libraryBook, LiberatedStatus liberatedStatus)
-		{
-			try
-			{
-				using var context = DbContexts.GetContext();
-
-				var udi = libraryBook.Book.UserDefinedItem;
-
-				if (udi.PdfStatus == liberatedStatus)
-					return 0;
-
-				// Attach() NoTracking entities before SaveChanges()
-				udi.PdfStatus = liberatedStatus;
-				context.Attach(udi).State = Microsoft.EntityFrameworkCore.EntityState.Modified;
-				var qtyChanges = context.SaveChanges();
-
-				return qtyChanges;
-			}
-			catch (Exception ex)
-			{
-				Log.Logger.Error(ex, "Error updating tags");
+				Log.Logger.Error(ex, $"Error updating {nameof(book.UserDefinedItem)}");
 				throw;
 			}
 		}
 		#endregion
 
+		// must be here instead of in db layer due to AaxcExists
+		public static LiberatedStatus Liberated_Status(Book book)
+			=> book.Audio_Exists ? book.UserDefinedItem.BookStatus
+			: FileManager.AudibleFileStorage.AaxcExists(book.AudibleProductId) ? LiberatedStatus.PartialDownload
+			: LiberatedStatus.NotLiberated;
+
+		// exists here for feature predictability. It makes sense for this to be where Liberated_Status is
+		public static LiberatedStatus? Pdf_Status(Book book) => book.UserDefinedItem.PdfStatus;
+
 		// below are queries, not commands. maybe I should make a LibraryQueries. except there's already one of those...
 
-		public static LiberatedState Liberated_Status(Book book)
-			=> book.Audio_Exists ? LiberatedState.Liberated
-			: FileManager.AudibleFileStorage.AaxcExists(book.AudibleProductId) ? LiberatedState.PartialDownload
-			: LiberatedState.NotDownloaded;
-
-		public static PdfState Pdf_Status(Book book)
-			=> !book.Supplements.Any() ? PdfState.NoPdf
-			: book.PDF_Exists ? PdfState.Downloaded
-			: PdfState.NotDownloaded;
-
-		public record LibraryStats(int booksFullyBackedUp, int booksDownloadedOnly, int booksNoProgress, int pdfsDownloaded, int pdfsNotDownloaded) { }
+		public record LibraryStats(int booksFullyBackedUp, int booksDownloadedOnly, int booksNoProgress, int booksError, int pdfsDownloaded, int pdfsNotDownloaded) { }
 		public static LibraryStats GetCounts()
 		{
-			var libraryBooks = DbContexts.GetContext().GetLibrary_Flat_NoTracking();
+			var libraryBooks = DbContexts.GetLibrary_Flat_NoTracking();
 
 			var results = libraryBooks
 				.AsParallel()
 				.Select(lb => Liberated_Status(lb.Book))
 				.ToList();
-			var booksFullyBackedUp = results.Count(r => r == LiberatedState.Liberated);
-			var booksDownloadedOnly = results.Count(r => r == LiberatedState.PartialDownload);
-			var booksNoProgress = results.Count(r => r == LiberatedState.NotDownloaded);
+			var booksFullyBackedUp = results.Count(r => r == LiberatedStatus.Liberated);
+			var booksDownloadedOnly = results.Count(r => r == LiberatedStatus.PartialDownload);
+			var booksNoProgress = results.Count(r => r == LiberatedStatus.NotLiberated);
+			var booksError = results.Count(r => r == LiberatedStatus.Error);
 
-			Log.Logger.Information("Book counts. {@DebugInfo}", new { total = results.Count, booksFullyBackedUp, booksDownloadedOnly, booksNoProgress });
+			Log.Logger.Information("Book counts. {@DebugInfo}", new { total = results.Count, booksFullyBackedUp, booksDownloadedOnly, booksNoProgress, booksError });
 
 			var boolResults = libraryBooks
 				.AsParallel()
-				.Where(lb => lb.Book.Supplements.Any())
+				.Where(lb => lb.Book.HasPdf)
 				.Select(lb => Pdf_Status(lb.Book))
 				.ToList();
-			var pdfsDownloaded = boolResults.Count(r => r == PdfState.Downloaded);
-			var pdfsNotDownloaded = boolResults.Count(r => r == PdfState.NotDownloaded);
+			var pdfsDownloaded = boolResults.Count(r => r == LiberatedStatus.Liberated);
+			var pdfsNotDownloaded = boolResults.Count(r => r == LiberatedStatus.NotLiberated);
 
 			Log.Logger.Information("PDF counts. {@DebugInfo}", new { total = boolResults.Count, pdfsDownloaded, pdfsNotDownloaded });
 
-			return new(booksFullyBackedUp, booksDownloadedOnly, booksNoProgress, pdfsDownloaded, pdfsNotDownloaded);
+			return new(booksFullyBackedUp, booksDownloadedOnly, booksNoProgress, booksError, pdfsDownloaded, pdfsNotDownloaded);
 		}
 	}
 }

ApplicationServices/LibraryExporter.cs

@@ -47,8 +47,8 @@ namespace ApplicationServices
 		[Name("Publisher")]
 		public string Publisher { get; set; }
 
-		[Name("Pdf url")]
-		public string PdfUrl { get; set; }
+		[Name("Has PDF")]
+		public bool HasPdf { get; set; }
 
 		[Name("Series Names")]
 		public string SeriesNames { get; set; }
@@ -89,11 +89,14 @@ namespace ApplicationServices
 		[Name("My Libation Tags")]
 		public string MyLibationTags { get; set; }
 
-		[Name("Book Liberation Status")]
+		[Name("Book Liberated Status")]
 		public string BookStatus { get; set; }
 
-		[Name("PDF Liberation Status")]
+		[Name("PDF Liberated Status")]
 		public string PdfStatus { get; set; }
+
+		[Name("Content Type")]
+		public string ContentType { get; set; }
 	}
 	public static class LibToDtos
 	{
@@ -109,9 +112,9 @@ namespace ApplicationServices
 				NarratorNames = a.Book.NarratorNames,
 				LengthInMinutes = a.Book.LengthInMinutes,
 				Publisher = a.Book.Publisher,
-				PdfUrl = a.Book.Supplements?.FirstOrDefault()?.Url,
+				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,
@@ -124,16 +127,15 @@ namespace ApplicationServices
 				MyRatingStory = a.Book.UserDefinedItem.Rating.StoryRating,
 				MyLibationTags = a.Book.UserDefinedItem.Tags,
 				BookStatus = a.Book.UserDefinedItem.BookStatus.ToString(),
-				PdfStatus = a.Book.UserDefinedItem.PdfStatus.ToString()
+				PdfStatus = a.Book.UserDefinedItem.PdfStatus.ToString(),
+				ContentType = a.Book.ContentType.ToString()
 			}).ToList();
 	}
 	public static class LibraryExporter
 	{
 		public static void ToCsv(string saveFilePath)
 		{
-			using var context = DbContexts.GetContext();
-			var dtos = context.GetLibrary_Flat_NoTracking().ToDtos();
-
+			var dtos = DbContexts.GetLibrary_Flat_NoTracking().ToDtos();
 			if (!dtos.Any())
 				return;
 
@@ -147,17 +149,14 @@ namespace ApplicationServices
 
 		public static void ToJson(string saveFilePath)
 		{
-			using var context = DbContexts.GetContext();
-			var dtos = context.GetLibrary_Flat_NoTracking().ToDtos();
-
+			var dtos = DbContexts.GetLibrary_Flat_NoTracking().ToDtos();
 			var json = Newtonsoft.Json.JsonConvert.SerializeObject(dtos, Newtonsoft.Json.Formatting.Indented);
 			System.IO.File.WriteAllText(saveFilePath, json);
 		}
 
 		public static void ToXlsx(string saveFilePath)
 		{
-			using var context = DbContexts.GetContext();
-			var dtos = context.GetLibrary_Flat_NoTracking().ToDtos();
+			var dtos = DbContexts.GetLibrary_Flat_NoTracking().ToDtos();
 
 			var workbook = new XSSFWorkbook();
 			var sheet = workbook.CreateSheet("Library");
@@ -182,7 +181,7 @@ namespace ApplicationServices
 				nameof (ExportDto.NarratorNames),
 				nameof (ExportDto.LengthInMinutes),
 				nameof (ExportDto.Publisher),
-				nameof (ExportDto.PdfUrl),
+				nameof (ExportDto.HasPdf),
 				nameof (ExportDto.SeriesNames),
 				nameof (ExportDto.SeriesOrder),
 				nameof (ExportDto.CommunityRatingOverall),
@@ -197,7 +196,8 @@ namespace ApplicationServices
 				nameof (ExportDto.MyRatingStory),
 				nameof (ExportDto.MyLibationTags),
 				nameof (ExportDto.BookStatus),
-				nameof (ExportDto.PdfStatus)
+				nameof (ExportDto.PdfStatus),
+				nameof (ExportDto.ContentType)
 			};
 			var col = 0;
 			foreach (var c in columns)
@@ -234,7 +234,7 @@ namespace ApplicationServices
 				row.CreateCell(col++).SetCellValue(dto.NarratorNames);
 				row.CreateCell(col++).SetCellValue(dto.LengthInMinutes);
 				row.CreateCell(col++).SetCellValue(dto.Publisher);
-				row.CreateCell(col++).SetCellValue(dto.PdfUrl);
+				row.CreateCell(col++).SetCellValue(dto.HasPdf);
 				row.CreateCell(col++).SetCellValue(dto.SeriesNames);
 				row.CreateCell(col++).SetCellValue(dto.SeriesOrder);
 
@@ -261,6 +261,7 @@ namespace ApplicationServices
 				row.CreateCell(col++).SetCellValue(dto.MyLibationTags);
 				row.CreateCell(col++).SetCellValue(dto.BookStatus);
 				row.CreateCell(col++).SetCellValue(dto.PdfStatus);
+				row.CreateCell(col++).SetCellValue(dto.ContentType);
 
 				rowIndex++;
 			}

ApplicationServices/SearchEngineCommands.cs

@@ -10,7 +10,8 @@ namespace ApplicationServices
 		public static void FullReIndex(SearchEngine engine = null)
 		{
 			engine ??= new SearchEngine();
-			engine.CreateNewIndex(DbContexts.GetContext());
+			var library = DbContexts.GetLibrary_Flat_NoTracking();
+			engine.CreateNewIndex(library);
 		}
 
 		public static SearchResultSet Search(string searchString) => performSearchEngineFunc_safe(e =>
@@ -39,17 +40,17 @@ namespace ApplicationServices
 			}
 		}
 
-		private static T performSearchEngineFunc_safe<T>(Func<SearchEngine, T> action)
+		private static T performSearchEngineFunc_safe<T>(Func<SearchEngine, T> func)
 		{
 			var engine = new SearchEngine();
 			try
 			{
-				return action(engine);
+				return func(engine);
 			}
 			catch (FileNotFoundException)
 			{
 				FullReIndex(engine);
-				return action(engine);
+				return func(engine);
 			}
 		}
 	}

DataLayer/Configurations/LibraryBookConfig.cs

@@ -7,6 +7,20 @@ namespace DataLayer.Configurations
     {
         public void Configure(EntityTypeBuilder<LibraryBook> entity)
         {
+            // to allow same book (incl region) with diff acct.s:
+            //
+            // this file:
+            // - composite key:
+            //     entity.HasKey(b => new { b.BookId, b.Account });
+            //     entity.HasIndex(b => b.BookId);
+            //     entity.HasIndex(b => b.Account);
+            // - change the below relationship since Book+LibraryBook would no longer be 1:1
+            //
+            // other files:
+            // - change Book class since Book+LibraryBook would no longer be 1:1
+            // - update LibraryBook import code
+            // - would likely challenge assumptions throughout Libation which have been true up until now
+
             entity.HasKey(b => b.BookId);
 
             entity

DataLayer/DataLayer.csproj

@@ -12,19 +12,19 @@
   </PropertyGroup>
   
   <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="5.0.5">
+    <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.5" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="5.0.5">
+    <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>
   </ItemGroup>
   
   <ItemGroup>
-    <ProjectReference Include="..\..\Dinah.Core\Dinah.EntityFrameworkCore\Dinah.EntityFrameworkCore.csproj" />
     <ProjectReference Include="..\FileManager\FileManager.csproj" />
   </ItemGroup>
   

DataLayer/EfClasses/Book.cs

@@ -15,6 +15,10 @@ namespace DataLayer
             Id = id;
         }
     }
+
+    // enum will be easier than bool to extend later
+    public enum ContentType { Unknown = 0, Product = 1, Episode = 2 }
+
     public class Book
     {
         // implementation detail. set by db only. only used by data layer
@@ -25,8 +29,7 @@ namespace DataLayer
         public string Title { get; private set; }
         public string Description { get; private set; }
         public int LengthInMinutes { get; private set; }
-
-        // immutable-ish. should be immutable. mutability is necessary for v3 => v4 upgrades
+        public ContentType ContentType { get; private set; }
         public string Locale { get; private set; }
 
         // mutable
@@ -52,22 +55,10 @@ namespace DataLayer
         public UserDefinedItem UserDefinedItem { get; private set; }
 
         // UserDefinedItem convenience properties
-        public bool Audio_Exists
-        {
-            get
-            {
-                var status = UserDefinedItem?.BookStatus;
-                return status.HasValue && status.Value != LiberatedStatus.NotLiberated;
-            }
-        }
-        public bool PDF_Exists
-        {
-            get
-            {
-                var status = UserDefinedItem?.PdfStatus;
-                return (status.HasValue && status.Value == LiberatedStatus.Liberated);
-            }
-        }
+        /// <summary>True if IsLiberated or Error. False if NotLiberated</summary>
+        public bool Audio_Exists => UserDefinedItem.BookStatus != LiberatedStatus.NotLiberated;
+        /// <summary>True if exists and IsLiberated. Else false</summary>
+        public bool PDF_Exists => UserDefinedItem.PdfStatus == LiberatedStatus.Liberated;
 
         // is owned, not optional 1:1
         /// <summary>The product's aggregate community rating</summary>
@@ -82,9 +73,11 @@ namespace DataLayer
             string title,
             string description,
             int lengthInMinutes,
+            ContentType contentType,
 			IEnumerable<Contributor> authors,
 			IEnumerable<Contributor> narrators,
-			Category category, string localeName)
+			Category category,
+            string localeName)
         {
             // validate
             ArgumentValidator.EnsureNotNull(audibleProductId, nameof(audibleProductId));
@@ -106,9 +99,10 @@ namespace DataLayer
 			Category = category;
 
             // simple assigns
-            Title = title.Trim();
-            Description = description.Trim();
+            Title = title.Trim() ?? "";
+            Description = description?.Trim() ?? "";
             LengthInMinutes = lengthInMinutes;
+            ContentType = contentType;
 
             // assigns with biz logic
             ReplaceAuthors(authors);
@@ -209,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));
 
@@ -220,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
 
@@ -265,10 +259,6 @@ namespace DataLayer
 			Category = category;
         }
 
-        // needed for v3 => v4 upgrade
-        public void UpdateLocale(string localeName)
-            => Locale ??= localeName;
-
         public override string ToString() => $"[{AudibleProductId}] {Title}";
 	}
 }

DataLayer/EfClasses/LibraryBook.cs

@@ -9,8 +9,6 @@ namespace DataLayer
         public Book Book { get; private set; }
 
         public DateTime DateAdded { get; private set; }
-
-        // immutable-ish. should be immutable. mutability is necessary for v3 => v4 upgrades
         public string Account { get; private set; }
 
         private LibraryBook() { }
@@ -24,10 +22,6 @@ namespace DataLayer
             Account = account;
         }
 
-        // needed for v3 => v4 upgrade
-        public void UpdateAccount(string account)
-            => Account ??= account;
-
         public override string ToString() => $"{DateAdded:d} {Book}";
 	}
 }

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

@@ -14,7 +14,10 @@ namespace DataLayer
         NotLiberated = 0,
         Liberated = 1,
         /// <summary>Error occurred during liberation. Don't retry</summary>
-        Error = 2
+        Error = 2,
+
+        /// <summary>Application-state only. Not a valid persistence state.</summary>
+        PartialDownload = 0x1000
     }
 
     public class UserDefinedItem
@@ -38,7 +41,15 @@ namespace DataLayer
         public string Tags
         {
             get => _tags;
-            set => _tags = sanitize(value);
+            set
+            {
+                var newTags = sanitize(value);
+                if (_tags != newTags)
+                {
+                    _tags = newTags;
+                    OnItemChanged(nameof(Tags));
+                }
+            }
 		}
 
 		public IEnumerable<string> TagsEnumerated => Tags == "" ? new string[0] : Tags.Split(null as char[], StringSplitOptions.RemoveEmptyEntries);
@@ -95,8 +106,92 @@ namespace DataLayer
         #endregion
 
         #region LiberatedStatuses
-        public LiberatedStatus BookStatus { get; set; }
-        public LiberatedStatus? PdfStatus { get; set; }
+        /// <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;
+        public LiberatedStatus BookStatus
+        {
+            get => _bookStatus;
+            set
+            {
+                if (_bookStatus != value)
+				{
+                    _bookStatus = value;
+                    OnItemChanged(nameof(BookStatus));
+                }
+            }
+        }
+        public LiberatedStatus? PdfStatus
+        {
+            get => _pdfStatus;
+            set
+            {
+                if (_pdfStatus != value)
+                {
+                    _pdfStatus = value;
+                    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
 
         public override string ToString() => $"{Book} {Rating} {Tags}";

DataLayer/LibationContext.cs

@@ -19,7 +19,7 @@ namespace DataLayer
         //     // overwrite collection
         //     Entry(product).Collection(x => x.Narrators).Load();
         //     product.Narrators = narrators;
-        public DbSet<LibraryBook> Library { get; private set; }
+        public DbSet<LibraryBook> LibraryBooks { get; private set; }
         public DbSet<Book> Books { get; private set; }
         public DbSet<Contributor> Contributors { get; private set; }
         public DbSet<Series> Series { get; private set; }

DataLayer/Migrations/20210901205042_BookIsEpisode.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("20210901205042_BookIsEpisode")]
+    partial class BookIsEpisode
+    {
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("ProductVersion", "5.0.9");
+
+            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("Library");
+                });
+
+            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<float?>("Index")
+                        .HasColumnType("REAL");
+
+                    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/20210901205042_BookIsEpisode.cs

@@ -0,0 +1,24 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+namespace DataLayer.Migrations
+{
+    public partial class BookIsEpisode : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<int>(
+                name: "ContentType",
+                table: "Books",
+                type: "INTEGER",
+                nullable: false,
+                defaultValue: 0);
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "ContentType",
+                table: "Books");
+        }
+    }
+}

DataLayer/Migrations/20210902192153_RenameLibraryBooks.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("20210902192153_RenameLibraryBooks")]
+    partial class RenameLibraryBooks
+    {
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("ProductVersion", "5.0.9");
+
+            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<float?>("Index")
+                        .HasColumnType("REAL");
+
+                    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/20210902192153_RenameLibraryBooks.cs

@@ -0,0 +1,63 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+namespace DataLayer.Migrations
+{
+    public partial class RenameLibraryBooks : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropForeignKey(
+                name: "FK_Library_Books_BookId",
+                table: "Library");
+
+            migrationBuilder.DropPrimaryKey(
+                name: "PK_Library",
+                table: "Library");
+
+            migrationBuilder.RenameTable(
+                name: "Library",
+                newName: "LibraryBooks");
+
+            migrationBuilder.AddPrimaryKey(
+                name: "PK_LibraryBooks",
+                table: "LibraryBooks",
+                column: "BookId");
+
+            migrationBuilder.AddForeignKey(
+                name: "FK_LibraryBooks_Books_BookId",
+                table: "LibraryBooks",
+                column: "BookId",
+                principalTable: "Books",
+                principalColumn: "BookId",
+                onDelete: ReferentialAction.Cascade);
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropForeignKey(
+                name: "FK_LibraryBooks_Books_BookId",
+                table: "LibraryBooks");
+
+            migrationBuilder.DropPrimaryKey(
+                name: "PK_LibraryBooks",
+                table: "LibraryBooks");
+
+            migrationBuilder.RenameTable(
+                name: "LibraryBooks",
+                newName: "Library");
+
+            migrationBuilder.AddPrimaryKey(
+                name: "PK_Library",
+                table: "Library",
+                column: "BookId");
+
+            migrationBuilder.AddForeignKey(
+                name: "FK_Library_Books_BookId",
+                table: "Library",
+                column: "BookId",
+                principalTable: "Books",
+                principalColumn: "BookId",
+                onDelete: ReferentialAction.Cascade);
+        }
+    }
+}

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.5");
+                .HasAnnotation("ProductVersion", "5.0.10");
 
             modelBuilder.Entity("DataLayer.Book", b =>
                 {
@@ -28,6 +28,9 @@ namespace DataLayer.Migrations
                     b.Property<int>("CategoryId")
                         .HasColumnType("INTEGER");
 
+                    b.Property<int>("ContentType")
+                        .HasColumnType("INTEGER");
+
                     b.Property<DateTime?>("DatePublished")
                         .HasColumnType("TEXT");
 
@@ -152,7 +155,7 @@ namespace DataLayer.Migrations
 
                     b.HasKey("BookId");
 
-                    b.ToTable("Library");
+                    b.ToTable("LibraryBooks");
                 });
 
             modelBuilder.Entity("DataLayer.Series", b =>
@@ -182,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");
 

DataLayer/QueryObjects/GenericPaging.cs

@@ -1,19 +0,0 @@
-using System;
-using System.Linq;
-
-namespace DataLayer
-{
-    public static class GenericPaging
-    {
-        public static IQueryable<T> Page<T>(this IQueryable<T> query, int pageNumZeroStart, int pageSize)
-        {
-            if (pageSize < 1)
-                throw new ArgumentOutOfRangeException(nameof(pageSize), "pageSize must be at least 1");
-
-            if (pageNumZeroStart > 0)
-                query = query.Skip(pageNumZeroStart * pageSize);
-
-            return query.Take(pageSize);
-        }
-    }
-}

DataLayer/QueryObjects/LibraryBookQueries.cs

@@ -6,7 +6,7 @@ namespace DataLayer
 {
     // only library importing should use tracking. All else should be NoTracking.
     // only library importing should directly query Book. All else should use LibraryBook
-    public static class LibraryQueries
+    public static class LibraryBookQueries
 	{
         //// tracking is a bad idea for main grid. it prevents anything else from updating entities unless getting them from the grid
 		//public static List<LibraryBook> GetLibrary_Flat_WithTracking(this LibationContext context)
@@ -17,14 +17,14 @@ namespace DataLayer
 
 		public static List<LibraryBook> GetLibrary_Flat_NoTracking(this LibationContext context)
             => context
-                .Library
+                .LibraryBooks
                 .AsNoTrackingWithIdentityResolution()
                 .GetLibrary()
                 .ToList();
 
         public static LibraryBook GetLibraryBook_Flat_NoTracking(this LibationContext context, string productId)
             => context
-                .Library
+                .LibraryBooks
                 .AsNoTrackingWithIdentityResolution()
                 .GetLibraryBook(productId);
 

DataLayer/_HowTo- EF Core.txt

@@ -1,57 +0,0 @@
-FOR QUICK MIGRATION INSTRUCTIONS:
-_DB_NOTES.txt
-
-
-HOW TO CREATE: EF CORE PROJECT
-==============================
-example is for sqlite but the same works with MsSql
-
-
-nuget
-Microsoft.EntityFrameworkCore.Tools (needed for using Package Manager Console)
-Microsoft.EntityFrameworkCore.Sqlite
-
-MIGRATIONS
-  require core, not standard
-  this can be a problem b/c standard and framework can only reference standard, not core
-TO USE MIGRATIONS (core and/or standard)
-  add to csproj
-    <PropertyGroup>
-      <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
-    </PropertyGroup>
-TO USE MIGRATIONS AS *BOTH* CORE AND STANDARD
-  edit csproj
-    pluralize this xml tag
-      from: TargetFramework
-      to: TargetFrameworks
-    inside of TargetFrameworks
-      from: netstandard2.1
-      to: netcoreapp3.1;netstandard2.1
-
-run. error
-SQLite Error 1: 'no such table: Blogs'.
-
-set project "Set as StartUp Project"
-
-Tools >> Nuget Package Manager >> Package Manager Console
-default project: Examples\SQLite_NETCore2_0
-
-PM> add-migration InitialCreate
-PM> Update-Database
-
-if add-migration xyz throws and error, don't take the error msg at face value. try again with add-migration xyz -verbose
-
-new sqlite .db file created: Copy always/Copy if newer
-or copy .db file to destination
-
-relative:
-   optionsBuilder.UseSqlite("Data Source=blogging.db");
-absolute  (use fwd slashes):
-   optionsBuilder.UseSqlite("Data Source=C:/foo/bar/blogging.db");
-
-
-REFERENCE ARTICLES
-------------------
-https://docs.microsoft.com/en-us/ef/core/get-started/netcore/new-db-sqlite
-https://carlos.mendible.com/2016/07/11/step-by-step-dotnet-core-and-entity-framework-core/
-https://www.benday.com/2017/12/19/ef-core-2-0-migrations-without-hard-coded-connection-strings/

DtoImporterService/BookImporter.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using AudibleApiDTOs;
+using AudibleApi.Common;
 using DataLayer;
 using InternalUtilities;
 
@@ -19,13 +19,13 @@ namespace DtoImporterService
 			new ContributorImporter(DbContext).Import(importItems);
 			new SeriesImporter(DbContext).Import(importItems);
 			new CategoryImporter(DbContext).Import(importItems);
-
+			
 			// get distinct
-			var productIds = importItems.Select(i => i.DtoItem.ProductId).ToList();
-
+			var productIds = importItems.Select(i => i.DtoItem.ProductId).Distinct().ToList();
+			
 			// load db existing => .Local
 			loadLocal_books(productIds);
-
+			
 			// upsert
 			var qtyNew = upsertBooks(importItems);
 			return qtyNew;
@@ -33,12 +33,30 @@ namespace DtoImporterService
 
 		private void loadLocal_books(List<string> productIds)
 		{
-			var localProductIds = DbContext.Books.Local.Select(b => b.AudibleProductId);
+			// if this context has already loaded books, don't need to reload them. vestige from when context was long-lived. in practice, we now typically use a fresh context. this is quick though so no harm in leaving it.
+			var localProductIds = DbContext.Books.Local.Select(b => b.AudibleProductId).ToList();
 			var remainingProductIds = productIds
-				.Distinct()
 				.Except(localProductIds)
 				.ToList();
 
+			#region // explanation of DbContext.Books.GetBooks(b => remainingProductIds.Contains(b.AudibleProductId)).ToList();
+			/*
+			articles suggest loading to Local with
+			    context.Books.Load();
+			we want Books and associated fields
+			    context.Books.GetBooks(b => remainingProductIds.Contains(b.AudibleProductId)).ToList();
+			this is emulating Load() but with also getting associated fields
+
+			from: Microsoft.EntityFrameworkCore.EntityFrameworkQueryableExtensions
+			// Summary:
+			//     Enumerates the query. When using Entity Framework, this causes the results of
+			//     the query to be loaded into the associated context. This is equivalent to calling
+			//     ToList and then throwing away the list (without the overhead of actually creating
+			//     the list).
+			public static void Load<TSource>([NotNullAttribute] this IQueryable<TSource> source); 
+			*/
+			#endregion
+
 			// GetBooks() eager loads Series, category, et al
 			if (remainingProductIds.Any())
 				DbContext.Books.GetBooks(b => remainingProductIds.Contains(b.AudibleProductId)).ToList();
@@ -67,6 +85,8 @@ namespace DtoImporterService
 		{
 			var item = importItem.DtoItem;
 
+			var contentType = item.IsEpisodes ? DataLayer.ContentType.Episode : DataLayer.ContentType.Product;
+
 			// absence of authors is very rare, but possible
 			if (!item.Authors?.Any() ?? true)
 				item.Authors = new[] { new Person { Name = "", Asin = null } };
@@ -105,6 +125,7 @@ namespace DtoImporterService
 				item.TitleWithSubtitle,
 				item.Description,
 				item.LengthInMinutes,
+				contentType,
 				authors,
 				narrators,
 				category,
@@ -120,8 +141,8 @@ namespace DtoImporterService
 
 			book.UpdateBookDetails(item.IsAbridged, item.DatePublished);
 
-			if (!string.IsNullOrWhiteSpace(item.SupplementUrl))
-				book.AddSupplementDownloadUrl(item.SupplementUrl);
+			if (item.PdfUrl is not null)
+				book.AddSupplementDownloadUrl(item.PdfUrl.ToString());
 
 			return book;
 		}
@@ -134,9 +155,6 @@ namespace DtoImporterService
 			book.PictureId = item.PictureId;
 			book.UpdateProductRating(item.Product_OverallStars, item.Product_PerformanceStars, item.Product_StoryStars);
 
-			// needed during v3 => v4 migration
-			book.UpdateLocale(importItem.LocaleName);
-
 			// important to update user-specific info. this will have changed if user has rated/reviewed the book since last library import
 			book.UserDefinedItem.UpdateRating(item.MyUserRating_Overall, item.MyUserRating_Performance, item.MyUserRating_Story);
 
@@ -147,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

@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using AudibleApiDTOs;
+using AudibleApi.Common;
 using DataLayer;
 using InternalUtilities;
 
@@ -35,7 +35,7 @@ namespace DtoImporterService
 
 		private void loadLocal_categories(List<string> categoryIds)
 		{
-			var localIds = DbContext.Categories.Local.Select(c => c.AudibleCategoryId);
+			var localIds = DbContext.Categories.Local.Select(c => c.AudibleCategoryId).ToList();
 			var remainingCategoryIds = categoryIds
 				.Distinct()
 				.Except(localIds)
@@ -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/ContributorImporter.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using AudibleApiDTOs;
+using AudibleApi.Common;
 using DataLayer;
 using InternalUtilities;
 
@@ -47,57 +47,61 @@ namespace DtoImporterService
 
 		private void loadLocal_contributors(List<string> contributorNames)
 		{
+			// must include default/empty/missing
+			contributorNames.Add(Contributor.GetEmpty().Name);
+
 			//// BAD: very inefficient
 			// var x = context.Contributors.Local.Where(c => !contribNames.Contains(c.Name));
 
 			// GOOD: Except() is efficient. Due to hashing, it's close to O(n)
-			var localNames = DbContext.Contributors.Local.Select(c => c.Name);
+			var localNames = DbContext.Contributors.Local.Select(c => c.Name).ToList();
 			var remainingContribNames = contributorNames
 				.Distinct()
 				.Except(localNames)
 				.ToList();
 
 			// load existing => local
-			// remember to include default/empty/missing
-			var emptyName = Contributor.GetEmpty().Name;
 			if (remainingContribNames.Any())
-				DbContext.Contributors.Where(c => remainingContribNames.Contains(c.Name) || c.Name == emptyName).ToList();
+				DbContext.Contributors.Where(c => remainingContribNames.Contains(c.Name)).ToList();
 		}
 
 		// only use after loading contributors => local
 		private int upsertPeople(List<Person> people)
 		{
-			var qtyNew = 0;
+			var localNames = DbContext.Contributors.Local.Select(c => c.Name).ToList();
+			var newPeople = people
+				.Select(p => p.Name)
+				.Distinct()
+				.Except(localNames)
+				.ToList();
 
-			foreach (var p in people)
+			var groupby = people.GroupBy(
+				p => p.Name,
+				p => p,
+				(key, g) => new { Name = key, People = g.ToList() }
+				);
+			foreach (var name in newPeople)
 			{
-				// Should be 'Single' not 'First'. A user had a duplicate get in somehow though so I'm now using 'First' defensively
-				var person = DbContext.Contributors.Local.FirstOrDefault(c => c.Name == p.Name);
-				if (person == null)
-				{
-					person = DbContext.Contributors.Add(new Contributor(p.Name, p.Asin)).Entity;
-					qtyNew++;
-				}
+				var p = groupby.Single(g => g.Name == name).People.First();
+				DbContext.Contributors.Add(new Contributor(p.Name, p.Asin));
 			}
 
-			return qtyNew;
+			return newPeople.Count;
 		}
 
 		// only use after loading contributors => local
 		private int upsertPublishers(List<string> publishers)
 		{
-			var qtyNew = 0;
+			var localNames = DbContext.Contributors.Local.Select(c => c.Name).ToList();
+			var newPublishers = publishers
+				.Distinct()
+				.Except(localNames)
+				.ToList();
 
-			foreach (var publisherName in publishers)
-			{
-				if (DbContext.Contributors.Local.SingleOrDefault(c => c.Name == publisherName) == null)
-				{
-					DbContext.Contributors.Add(new Contributor(publisherName));
-					qtyNew++;
-				}
-			}
+			foreach (var pub in newPublishers)
+				DbContext.Contributors.Add(new Contributor(pub));
 
-			return qtyNew;
+			return newPublishers.Count;
 		}
 	}
 }

DtoImporterService/DtoImporterService.csproj

@@ -5,7 +5,6 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\audible api\AudibleApi\AudibleApiDTOs\AudibleApiDTOs.csproj" />
     <ProjectReference Include="..\DataLayer\DataLayer.csproj" />
     <ProjectReference Include="..\InternalUtilities\InternalUtilities.csproj" />
   </ItemGroup>

DtoImporterService/ImportItem.cs

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

DtoImporterService/LibraryBookImporter.cs

@@ -1,15 +1,14 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using AudibleApiDTOs;
 using DataLayer;
 using InternalUtilities;
 
 namespace DtoImporterService
 {
-	public class LibraryImporter : ItemsImporterBase
+	public class LibraryBookImporter : ItemsImporterBase
 	{
-		public LibraryImporter(LibationContext context) : base(context) { }
+		public LibraryBookImporter(LibationContext context) : base(context) { }
 
 		public override IEnumerable<Exception> Validate(IEnumerable<ImportItem> importItems) => new LibraryValidator().Validate(importItems.Select(i => i.DtoItem));
 
@@ -28,13 +27,14 @@ namespace DtoImporterService
 			// - what to show in the grid
 			// - which to consider liberated
 			//
-			// sqlite cannot alter pk. the work around is an extensive headache. it'll be fixed in pre .net5/efcore5
+			// sqlite cannot alter pk. the work around is an extensive headache
+			// - update: now possible in .net5/efcore5
 			//
 			// currently, inserting LibraryBook will throw error if the same book is in multiple accounts for the same region.
 			//
 			// CURRENT SOLUTION: don't re-insert
 
-			var currentLibraryProductIds = DbContext.Library.Select(l => l.Book.AudibleProductId).ToList();
+			var currentLibraryProductIds = DbContext.LibraryBooks.Select(l => l.Book.AudibleProductId).ToList();
 			var newItems = importItems.Where(dto => !currentLibraryProductIds.Contains(dto.DtoItem.ProductId)).ToList();
 
 			foreach (var newItem in newItems)
@@ -43,16 +43,7 @@ namespace DtoImporterService
 					DbContext.Books.Local.Single(b => b.AudibleProductId == newItem.DtoItem.ProductId),
 					newItem.DtoItem.DateAdded,
 					newItem.AccountId);
-				DbContext.Library.Add(libraryBook);
-			}
-
-			// needed for v3 => v4 upgrade
-			var toUpdate = DbContext.Library.Where(l => l.Account == null);
-			foreach (var u in toUpdate)
-			{
-				var item = importItems.FirstOrDefault(ii => ii.DtoItem.ProductId == u.Book.AudibleProductId);
-				if (item != null)
-					u.UpdateAccount(item.AccountId);
+				DbContext.LibraryBooks.Add(libraryBook);
 			}
 
 			var qtyNew = newItems.Count;

DtoImporterService/PerfLogger.cs

@@ -0,0 +1,34 @@
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+
+namespace DtoImporterService
+{
+	public record timeLogEntry(string msg, long totalElapsed, long delta);
+	public static class PerfLogger
+	{
+		private static Stopwatch sw = new Stopwatch();
+		private static List<timeLogEntry> __log { get; } = new List<timeLogEntry> { new("begin", 0, 0) };
+
+		public static void logTime(string s)
+		{
+			var totalElapsed = sw.ElapsedMilliseconds;
+
+			var prev = __log.Last().totalElapsed;
+			var delta = totalElapsed - prev;
+
+			__log.Add(new(s, totalElapsed, delta));
+		}
+		public static void logRestart()
+		{
+			__log.Clear();
+			__log.Add(new("begin", 0, 0));
+			sw.Restart();
+		}
+		public static void stop() => sw.Stop();
+		public static string logOutput =>
+			$"{nameof(timeLogEntry.msg)}\t{nameof(timeLogEntry.totalElapsed)}\t{nameof(timeLogEntry.delta)}\r\n"
+			+ __log.Select(t => $"{t.msg}\t{t.totalElapsed}\t{t.delta}").Aggregate((a, b) => $"{a}\r\n{b}");
+	}
+}

DtoImporterService/SeriesImporter.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using AudibleApiDTOs;
+using AudibleApi.Common;
 using DataLayer;
 using InternalUtilities;
 
@@ -29,7 +29,7 @@ namespace DtoImporterService
 			return qtyNew;
 		}
 
-		private void loadLocal_series(List<AudibleApiDTOs.Series> series)
+		private void loadLocal_series(List<AudibleApi.Common.Series> series)
 		{
 			var seriesIds = series.Select(s => s.SeriesId).ToList();
 			var localIds = DbContext.Series.Local.Select(s => s.AudibleSeriesId).ToList();
@@ -42,13 +42,13 @@ namespace DtoImporterService
 				DbContext.Series.Where(s => remainingSeriesIds.Contains(s.AudibleSeriesId)).ToList();
 		}
 
-		private int upsertSeries(List<AudibleApiDTOs.Series> requestedSeries)
+		private int upsertSeries(List<AudibleApi.Common.Series> requestedSeries)
 		{
 			var qtyNew = 0;
 
 			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,40 +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;
+		private long fileSize;
+		private static string Mp3FileName(string m4bPath) => m4bPath is null ? string.Empty : PathLib.ReplaceExtension(m4bPath, ".mp3");
 
-        private long fileSize;
-		private string Mp3FileName(string m4bPath) => m4bPath is null ? string.Empty : PathLib.ReplaceExtension(m4bPath, ".mp3");
+        public override void Cancel() => m4bBook?.Cancel();
 
-        public 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
             {
@@ -55,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());
 
@@ -79,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);
             }
         }
 
@@ -91,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,110 +8,95 @@ 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 AudiobookDownloadBase abDownloader;
 
-		private AaxcDownloadConverter aaxcDownloader;
-
-		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 async Task<StatusHandler> ProcessAsync(LibraryBook libraryBook)
+        public override 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)
                     return new StatusHandler { "Decrypt failed" };
 
                 // moves files and returns dest dir
-                _ = moveFilesToBooksDir(libraryBook.Book, outputAudioFilename);
+                var moveResults = MoveFilesToBooksDir(libraryBook.Book, outputAudioFilename);
 
-                if (!libraryBook.Book.Audio_Exists)
+                if (!moveResults.movedAudioFile)
                     return new StatusHandler { "Cannot find final audio file after decryption" };
 
-                // only need to update if success. if failure, it will remain at 0 == NotLiberated
-                ApplicationServices.LibraryCommands.UpdateBook(libraryBook, LiberatedStatus.Liberated);
+                libraryBook.Book.UserDefinedItem.BookStatus = LiberatedStatus.Liberated;
 
                 return new StatusHandler();
             }
             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)
@@ -121,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)
+        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 moveFilesToBooksDir(Book product, string outputAudioFilename)
+        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);
 
@@ -161,23 +138,26 @@ namespace FileLiberator
             // audio filename: safetitle_limit50char + " [" + productId + "]." + audio_ext
             var audioFileName = FileUtility.GetValidFilename(destinationDir, product.Title, musicFileExt, product.AudibleProductId);
 
+            bool movedAudioFile = false;
             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")
                     Cue.UpdateFileName(f, audioFileName);
 
                 File.Move(f.FullName, dest);
+
+                movedAudioFile |= AudibleFileStorage.Audio.IsFileTypeMatch(f);
             }
 
             AudibleFileStorage.Audio.Refresh();
 
-            return destinationDir;
+            return (destinationDir, movedAudioFile);
         }
 
         private static List<FileInfo> getProductFilesSorted(Book product, string outputAudioFilename)
@@ -200,32 +180,32 @@ namespace FileLiberator
         }
 
         private static void validate(LibraryBook libraryBook)
-		{
-			string errorString(string field)
-				=> $"{errorTitle()}\r\nCannot download book. {field} is not known. Try re-importing the account which owns this book.";
-
-			string errorTitle()
-			{
-				var title
-					= (libraryBook.Book.Title.Length > 53)
-					? $"{libraryBook.Book.Title.Truncate(50)}..."
-					: libraryBook.Book.Title;
-				var errorBookTitle = $"{title} [{libraryBook.Book.AudibleProductId}]";
-				return errorBookTitle;
-			};
-
-			if (string.IsNullOrWhiteSpace(libraryBook.Account))
-				throw new Exception(errorString("Account"));
-
-			if (string.IsNullOrWhiteSpace(libraryBook.Book.Locale))
-				throw new Exception(errorString("Locale"));
-		}
-
-        public bool Validate(LibraryBook libraryBook) => !libraryBook.Book.Audio_Exists;
-
-        public void Cancel()
         {
-            aaxcDownloader?.Cancel();
+            string errorString(string field)
+                => $"{errorTitle()}\r\nCannot download book. {field} is not known. Try re-importing the account which owns this book.";
+
+            string errorTitle()
+            {
+                var title
+                    = (libraryBook.Book.Title.Length > 53)
+                    ? $"{libraryBook.Book.Title.Truncate(50)}..."
+                    : libraryBook.Book.Title;
+                var errorBookTitle = $"{title} [{libraryBook.Book.AudibleProductId}]";
+                return errorBookTitle;
+            };
+
+            if (string.IsNullOrWhiteSpace(libraryBook.Account))
+                throw new Exception(errorString("Account"));
+
+            if (string.IsNullOrWhiteSpace(libraryBook.Book.Locale))
+                throw new Exception(errorString("Locale"));
+        }
+
+        public override bool Validate(LibraryBook libraryBook) => !libraryBook.Book.Audio_Exists;
+
+        public override void Cancel()
+        {
+            abDownloader?.Cancel();
         }
     }
 }

FileLiberator/DownloadFile.cs

@@ -6,21 +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 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
 			{
@@ -29,7 +24,7 @@ namespace FileLiberator
 			}
 			finally
 			{
-				StreamingCompleted?.Invoke(this, proposedDownloadFilePath);
+				OnStreamingCompleted(proposedDownloadFilePath);
 			}
 		}
 	}

FileLiberator/DownloadPdf.cs

@@ -11,22 +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 override async Task<StatusHandler> ProcessItemAsync(LibraryBook libraryBook)
+		public override async Task<StatusHandler> ProcessAsync(LibraryBook libraryBook)
 		{
-			var proposedDownloadFilePath = getProposedDownloadFilePath(libraryBook);
-			await downloadPdfAsync(libraryBook, proposedDownloadFilePath);
-			var result = verifyDownload(libraryBook);
+			OnBegin(libraryBook);
 
-			var liberatedStatus = result.IsSuccess ? LiberatedStatus.Liberated : LiberatedStatus.NotLiberated;
-			ApplicationServices.LibraryCommands.UpdatePdf(libraryBook, liberatedStatus);
+			try
+			{
+				var proposedDownloadFilePath = getProposedDownloadFilePath(libraryBook);
+				var actualDownloadedFilePath = await downloadPdfAsync(libraryBook, proposedDownloadFilePath);
+				var result = verifyDownload(actualDownloadedFilePath);
 
-			return result;
+				libraryBook.Book.UserDefinedItem.PdfStatus = result.IsSuccess ? LiberatedStatus.Liberated : LiberatedStatus.NotLiberated;
+
+				return result;
+			}
+			finally
+			{
+				OnCompleted(libraryBook);
+			}
 		}
 
 		private static string getProposedDownloadFilePath(LibraryBook libraryBook)
@@ -49,19 +57,32 @@ namespace FileLiberator
 		private static string getdownloadUrl(LibraryBook libraryBook)
 			=> libraryBook?.Book?.Supplements?.FirstOrDefault()?.Url;
 
-		private async Task downloadPdfAsync(LibraryBook libraryBook, string proposedDownloadFilePath)
+		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);
+
+				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(LibraryBook libraryBook)
-			=> !libraryBook.Book.PDF_Exists
+		private static StatusHandler verifyDownload(string actualDownloadedFilePath)
+			=> !File.Exists(actualDownloadedFilePath)
 			? new StatusHandler { "Downloaded PDF cannot be found" }
 			: new StatusHandler();
 	}

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/FileLiberator.csproj

@@ -5,9 +5,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\Dinah.Core\Dinah.Core\Dinah.Core.csproj" />
     <ProjectReference Include="..\AaxDecrypter\AaxDecrypter.csproj" />
-    <ProjectReference Include="..\ApplicationServices\ApplicationServices.csproj" />
     <ProjectReference Include="..\DataLayer\DataLayer.csproj" />
     <ProjectReference Include="..\FileManager\FileManager.csproj" />
     <ProjectReference Include="..\InternalUtilities\InternalUtilities.csproj" />

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,51 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using ApplicationServices;
-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)
-            => DbContexts.GetContext()
-            .GetLibrary_Flat_NoTracking()
-            .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

@@ -0,0 +1,26 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using DataLayer;
+using Dinah.Core;
+
+namespace FileLiberator
+{
+	public static class UtilityExtensions
+	{
+		public static (string id, string title, string locale, string account) LogFriendly(this LibraryBook libraryBook)
+			=> (
+			id: libraryBook.Book.AudibleProductId,
+			title: libraryBook.Book.Title,
+			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

@@ -46,13 +46,17 @@ namespace FileManager
 
         private PersistentDictionary persistentDictionary;
 
+        public T GetNonString<T>(string propertyName) => persistentDictionary.GetNonString<T>(propertyName);
         public object GetObject(string propertyName) => persistentDictionary.GetObject(propertyName);
         public void SetObject(string propertyName, object newValue) => persistentDictionary.SetNonString(propertyName, newValue);
 
         /// <summary>WILL ONLY set if already present. WILL NOT create new</summary>
-        /// <returns>Value was changed</returns>
-        public bool SetWithJsonPath(string jsonPath, string propertyName, string newValue, bool suppressLogging = false)
-            => persistentDictionary.SetWithJsonPath(jsonPath, propertyName, newValue, suppressLogging);
+        public void SetWithJsonPath(string jsonPath, string propertyName, string newValue, bool suppressLogging = false)
+        {
+            var settingWasChanged = persistentDictionary.SetWithJsonPath(jsonPath, propertyName, newValue, suppressLogging);
+            if (settingWasChanged)
+                configuration?.Reload();
+        }
 
         public string SettingsFilePath => Path.Combine(LibationFiles, "Settings.json");
 
@@ -67,39 +71,7 @@ namespace FileManager
             return attribute?.Description;
         }
 
-        public bool Exists(string propertyName) => persistentDictionary.Exists(propertyName);
-
-        #region MainForm: X, Y, Width, Height, MainFormIsMaximized
-        public int MainFormX
-        {
-            get => persistentDictionary.GetNonString<int>(nameof(MainFormX));
-            set => persistentDictionary.SetNonString(nameof(MainFormX), value);
-        }
-
-        public int MainFormY
-        {
-            get => persistentDictionary.GetNonString<int>(nameof(MainFormY));
-            set => persistentDictionary.SetNonString(nameof(MainFormY), value);
-        }
-
-        public int MainFormWidth
-        {
-            get => persistentDictionary.GetNonString<int>(nameof(MainFormWidth));
-            set => persistentDictionary.SetNonString(nameof(MainFormWidth), value);
-        }
-
-        public int MainFormHeight
-        {
-            get => persistentDictionary.GetNonString<int>(nameof(MainFormHeight));
-            set => persistentDictionary.SetNonString(nameof(MainFormHeight), value);
-        }
-
-        public bool MainFormIsMaximized
-        {
-            get => persistentDictionary.GetNonString<bool>(nameof(MainFormIsMaximized));
-            set => persistentDictionary.SetNonString(nameof(MainFormIsMaximized), value);
-        }
-        #endregion
+        public bool Exists(string propertyName) => persistentDictionary.Exists(propertyName);       
 
         [Description("Location for book storage. Includes destination of newly liberated books")]
         public string Books
@@ -116,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));
@@ -129,6 +101,50 @@ 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
+        {
+            [Description("Ask each time what action to take.")]
+            Ask = 0,
+            [Description("Stop processing books.")]
+            Abort = 1,
+            [Description("Retry book later. Skip for now. Continue processing books.")]
+            Retry = 2,
+            [Description("Permanently ignore book. Continue processing books. Do not try book again.")]
+            Ignore = 3
+        }
+
+        [Description("When liberating books and there is an error, Libation should:")]
+        public BadBookAction BadBook
+        {
+            get
+            {
+                var badBookStr = persistentDictionary.GetString(nameof(BadBook));
+				return Enum.TryParse<BadBookAction>(badBookStr, out var badBookEnum) ? badBookEnum : BadBookAction.Ask;
+            }
+            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
 
@@ -190,13 +206,9 @@ namespace FileManager
 
         #region logging
         private IConfigurationRoot configuration;
+
         public void ConfigureLogging()
         {
-            //// with code. also persists to Settings.json
-            //SetWithJsonPath("Serilog.WriteTo[1].Args", "path", logPath, true);
-            //// hack which achieves the same, in memory only
-            //configuration["Serilog:WriteTo:1:Args:path"] = logPath;
-
             configuration = new ConfigurationBuilder()
                 .AddJsonFile(SettingsFilePath, optional: false, reloadOnChange: true)
                 .Build();
@@ -210,16 +222,8 @@ namespace FileManager
         {
             get
             {
-                try
-                {
-                    var logLevelStr = persistentDictionary.GetStringFromJsonPath("Serilog", "MinimumLevel");
-                    var logLevelEnum = Enum<LogEventLevel>.Parse(logLevelStr);
-                    return logLevelEnum;
-                }
-                catch
-                {
-                    return LogEventLevel.Information;
-                }
+                var logLevelStr = persistentDictionary.GetStringFromJsonPath("Serilog", "MinimumLevel");
+                return Enum.TryParse<LogEventLevel>(logLevelStr, out var logLevelEnum) ? logLevelEnum : LogEventLevel.Information;
             }
             set
             {
@@ -248,11 +252,10 @@ namespace FileManager
 		#region singleton stuff
 		public static Configuration Instance { get; } = new Configuration();
         private Configuration() { }
-		#endregion
+        #endregion
 
-		#region LibationFiles
-
-		private const string APPSETTINGS_JSON = "appsettings.json";
+        #region LibationFiles
+        private static string APPSETTINGS_JSON { get; } = Path.Combine(Path.GetDirectoryName(System.Reflection.Assembly.GetEntryAssembly().Location), "appsettings.json");
         private const string LIBATION_FILES_KEY = "LibationFiles";
 
         [Description("Location for storage of program-created files")]
@@ -269,12 +272,16 @@ namespace FileManager
                 // SECOND. before setting to json file with SetWithJsonPath, PersistentDictionary must exist
                 persistentDictionary = new PersistentDictionary(SettingsFilePath);
 
-                // Config init in Program.ensureSerilogConfig() only happens when serilog setting is first created (prob on 1st run).
+                // Config init in ensureSerilogConfig() only happens when serilog setting is first created (prob on 1st run).
                 // This Set() enforces current LibationFiles every time we restart Libation or redirect LibationFiles
                 var logPath = Path.Combine(LibationFiles, "Log.log");
-                bool settingWasChanged = SetWithJsonPath("Serilog.WriteTo[1].Args", "path", logPath, true);
-                if (settingWasChanged)
-                    configuration?.Reload();
+
+                // BAD: Serilog.WriteTo[1].Args
+                //      "[1]" assumes ordinal position
+                // GOOD: Serilog.WriteTo[?(@.Name=='File')].Args
+                var jsonpath = "Serilog.WriteTo[?(@.Name=='File')].Args";
+
+                SetWithJsonPath(jsonpath, "path", logPath, true);
 
                 return libationFilesPathCache;
             }

FileManager/FileManager.csproj

@@ -5,13 +5,9 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="Dinah.Core" Version="1.1.1.2" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="5.0.0" />
-    <PackageReference Include="Octokit" Version="0.50.0" />
     <PackageReference Include="Polly" Version="7.2.2" />
   </ItemGroup>
 
-  <ItemGroup>
-    <ProjectReference Include="..\..\Dinah.Core\Dinah.Core\Dinah.Core.csproj" />
-  </ItemGroup>
-
 </Project>

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/PersistentDictionary.cs

@@ -51,7 +51,8 @@ namespace FileManager
         {
             var obj = GetObject(propertyName);
             if (obj is null) return default;
-            if (obj is JToken jToken) return jToken.Value<T>();
+            if (obj is JValue jValue) return jValue.Value<T>();
+            if (obj is JObject jObject)  return jObject.ToObject<T>();
             return (T)obj;
         }
 

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

@@ -0,0 +1,301 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using AudibleApi;
+using AudibleApi.Common;
+using Dinah.Core;
+using Polly;
+using Polly.Retry;
+
+namespace InternalUtilities
+{
+	/// <summary>USE THIS from within Libation. It wraps the call with correct JSONPath</summary>
+	public class ApiExtended
+	{
+		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("{@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,
+			});
+
+			var api = await EzApiCreator.GetApiAsync(
+					Localization.Get(localeName),
+					AudibleApiStorage.AccountsSettingsFile,
+					AudibleApiStorage.GetIdentityTokensJsonPath(username, localeName));
+			return new ApiExtended(api);
+		}
+
+		private static AsyncRetryPolicy policy { get; }
+			= Policy.Handle<Exception>()
+			// 2 retries == 3 total
+			.RetryAsync(2);
+
+		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 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(responseGroups, importEpisodes));
+		}
+
+		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);
+
+			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());
+			foreach (var v in validators)
+			{
+				var exceptions = v.Validate(items);
+				if (exceptions != null && exceptions.Any())
+					throw new AggregateException(exceptions);
+			}
+
+			return items;
+		}
+
+		#region episodes and podcasts
+		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
+			{
+				// get parents
+				var parents = items.Where(i => i.IsEpisodes).ToList();
+#if DEBUG
+//var parentsDebug = parents.Select(i => i.ToJson()).Aggregate((a, b) => $"{a}\r\n\r\n{b}");
+//System.IO.File.WriteAllText("parents.json", parentsDebug);
+#endif
+
+				if (!parents.Any())
+					return;
+
+				Serilog.Log.Logger.Information($"{parents.Count} series of shows/podcasts found");
+
+				// remove episode parents. even if the following stuff fails, these will still be removed from the collection.
+				// also must happen before processing children because children abuses this flag
+				items.RemoveAll(i => i.IsEpisodes);
+
+				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)
+			{
+				Serilog.Log.Logger.Error(ex, "Error adding podcasts and episodes");
+			}
+		}
+
+		private async Task<List<Item>> getEpisodesAsync(List<Item> parents)
+		{
+			var results = new List<Item>();
+
+			foreach (var parent in parents)
+			{
+				var children = await getEpisodeChildrenAsync(parent);
+
+				foreach (var child in children)
+				{
+					// use parent's 'DateAdded'. DateAdded is just a convenience prop for: PurchaseDate.UtcDateTime
+					child.PurchaseDate = parent.PurchaseDate;
+					// parent is essentially a series
+					child.Series = new Series[]
+					{
+						new Series
+						{
+							Asin = parent.Asin,
+							Sequence = parent.Relationships.Single(r => r.Asin == child.Asin).Sort.ToString(),
+							Title = parent.TitleWithSubtitle
+						}
+					};
+					// overload (read: abuse) IsEpisodes flag
+					child.Relationships = new Relationship[]
+					{
+						new Relationship
+						{
+							RelationshipToProduct = RelationshipToProduct.Child,
+							RelationshipType = RelationshipType.Episode
+						}
+					};
+				}
+
+				results.AddRange(children);
+			}
+
+			return results;
+		}
+
+		private async Task<List<Item>> getEpisodeChildrenAsync(Item parent)
+		{
+			var childrenIds = parent.Relationships
+				.Where(r => r.RelationshipToProduct == RelationshipToProduct.Child && r.RelationshipType == RelationshipType.Episode)
+				.Select(r => r.Asin)
+				.ToList();
+
+			// fetch children in batches
+			const int batchSize = 20;
+
+			var results = new List<Item>();
+
+			for (var i = 1; ; i++)
+			{
+				var idBatch = childrenIds.Skip((i - 1) * batchSize).Take(batchSize).ToList();
+				if (!idBatch.Any())
+					break;
+
+				List<Item> childrenBatch;
+				try
+				{
+					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);
+#endif
+				}
+				catch (Exception ex)
+				{
+					Serilog.Log.Logger.Error(ex, "Error fetching batch of episodes. {@DebugInfo}", new
+					{
+						ParentId = parent.Asin,
+						ParentTitle = parent.Title,
+						BatchNumber = i,
+						ChildIdBatch = idBatch
+					});
+					throw;
+				}
+
+				Serilog.Log.Logger.Debug($"Batch {i}: {childrenBatch.Count} results");
+				// the service returned no results. probably indicates an error. stop running batches
+				if (!childrenBatch.Any())
+					break;
+
+				results.AddRange(childrenBatch);
+			}
+
+			Serilog.Log.Logger.Debug("Parent episodes/podcasts series. Children found. {@DebugInfo}", new
+			{
+				ParentId = parent.Asin,
+				ParentTitle = parent.Title,
+				ChildCount = childrenIds.Count
+			});
+
+			if (childrenIds.Count != results.Count)
+			{
+				var ex = new ApplicationException($"Mis-match: Children defined by parent={childrenIds.Count}. Children returned by batches={results.Count}");
+				Serilog.Log.Logger.Error(ex, "Quantity of series episodes defined by parent does not match quantity returned by batch fetching.");
+				throw ex;
+			}
+
+			return results;
+		}
+		#endregion
+
+		private static List<IValidator> getValidators()
+		{
+			var type = typeof(IValidator);
+			var types = AppDomain.CurrentDomain.GetAssemblies()
+				.SelectMany(s => s.GetTypes())
+				.Where(p => type.IsAssignableFrom(p) && !p.IsInterface);
+
+			return types.Select(t => Activator.CreateInstance(t) as IValidator).ToList();
+		}
+	}
+}

InternalUtilities/AudibleApiActions.cs

@@ -1,104 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using AudibleApi;
-using AudibleApiDTOs;
-using Dinah.Core;
-using Polly;
-using Polly.Retry;
-
-namespace InternalUtilities
-{
-	public static class AudibleApiActions
-	{
-		/// <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)
-		{
-			Serilog.Log.Logger.Information("GetApiAsync. {@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);
-		}
-
-		private static AsyncRetryPolicy policy { get; }
-			= Policy.Handle<Exception>()
-			// 2 retries == 3 total
-			.RetryAsync(2);
-
-		public static Task<List<Item>> GetLibraryValidatedAsync(Api api, LibraryOptions.ResponseGroupOptions responseGroups = LibraryOptions.ResponseGroupOptions.ALL_OPTIONS)
-		{
-			// 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
-			// 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));
-		}
-
-		private static async Task<List<Item>> getItemsAsync(Api api, LibraryOptions.ResponseGroupOptions responseGroups)
-		{
-			var items = await api.GetAllLibraryItemsAsync(responseGroups);
-
-			// remove episode parents
-			items.RemoveAll(i => i.IsEpisodes);
-
-			#region // episode handling. doesn't quite work
-			//				// add individual/children episodes
-			//				var childIds = items
-			//					.Where(i => i.Episodes)
-			//					.SelectMany(ep => ep.Relationships)
-			//					.Where(r => r.RelationshipToProduct == AudibleApiDTOs.RelationshipToProduct.Child && r.RelationshipType == AudibleApiDTOs.RelationshipType.Episode)
-			//					.Select(c => c.Asin)
-			//					.ToList();
-			//				foreach (var childId in childIds)
-			//				{
-			//					var bookResult = await api.GetLibraryBookAsync(childId, AudibleApi.LibraryOptions.ResponseGroupOptions.ALL_OPTIONS);
-			//					var bookItem = AudibleApiDTOs.LibraryDtoV10.FromJson(bookResult.ToString()).Item;
-			//					items.Add(bookItem);
-			//				}
-			#endregion
-
-			var validators = new List<IValidator>();
-			validators.AddRange(getValidators());
-			foreach (var v in validators)
-			{
-				var exceptions = v.Validate(items);
-				if (exceptions != null && exceptions.Any())
-					throw new AggregateException(exceptions);
-			}
-
-			return items;
-		}
-
-		private static List<IValidator> getValidators()
-		{
-			var type = typeof(IValidator);
-			var types = AppDomain.CurrentDomain.GetAssemblies()
-				.SelectMany(s => s.GetTypes())
-				.Where(p => type.IsAssignableFrom(p) && !p.IsInterface);
-
-			return types.Select(t => Activator.CreateInstance(t) as IValidator).ToList();
-		}
-	}
-}

InternalUtilities/AudibleApiValidators.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using AudibleApiDTOs;
+using AudibleApi.Common;
 
 namespace InternalUtilities
 {
@@ -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(AudibleApiDTOs.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(AudibleApiDTOs.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,10 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\audible api\AudibleApi\AudibleApi\AudibleApi.csproj" />
+    <PackageReference Include="AudibleApi" Version="2.2.0.1" />
+  </ItemGroup>
+
+  <ItemGroup>
     <ProjectReference Include="..\FileManager\FileManager.csproj" />
   </ItemGroup>
 

Libation.sln

@@ -5,6 +5,7 @@ VisualStudioVersion = 16.0.28803.156
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "_Solution Items", "_Solution Items", "{03C8835F-936C-4AF7-87AE-FF92BDBE8B9B}"
 	ProjectSection(SolutionItems) = preProject
+		__README - COLLABORATORS.txt = __README - COLLABORATORS.txt
 		__TODO.txt = __TODO.txt
 		_DB_NOTES.txt = _DB_NOTES.txt
 		REFERENCE.txt = REFERENCE.txt
@@ -34,59 +35,26 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "3 Domain Internal Utilities
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibationSearchEngine", "LibationSearchEngine\LibationSearchEngine.csproj", "{2E1F5DB4-40CC-4804-A893-5DCE0193E598}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "0 Tests", "0 Tests", "{38E6C6D9-963A-4C5B-89F4-F2F14885ADFD}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "0 Demos and Examples", "0 Demos and Examples", "{F61184E7-2426-4A13-ACEF-5689928E2CE2}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Dinah.Core.Demos", "..\Dinah.Core\_Demos\Dinah.Core.Demos\Dinah.Core.Demos.csproj", "{9F1AA3DE-962F-469B-82B2-46F93491389B}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Dinah.Core.Tests", "..\Dinah.Core\_Tests\Dinah.Core.Tests\Dinah.Core.Tests.csproj", "{E874D000-AD3A-4629-AC65-7219C2C7C1F0}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestCommon", "..\Dinah.Core\_Tests\TestCommon\TestCommon.csproj", "{FF12ADA0-8975-4E67-B6EA-4AC82E0C8994}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GitAllRepos", "..\GitAllRepos\GitAllRepos\GitAllRepos.csproj", "{AD1FDDC9-8D2A-436A-8EED-91FD74E7C7B4}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AudibleApi", "..\audible api\AudibleApi\AudibleApi\AudibleApi.csproj", "{7EA01F9C-E579-4B01-A3B9-733B49DD0B60}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AudibleApi.Tests", "..\audible api\AudibleApi\_Tests\AudibleApi.Tests\AudibleApi.Tests.csproj", "{111420E2-D4F0-4068-B46A-C4B6DCC823DC}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibationWinForms", "LibationWinForms\LibationWinForms.csproj", "{635F00E1-AAD1-45F7-BEB7-D909AD33B9F6}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WinFormsDesigner", "WinFormsDesigner\WinFormsDesigner.csproj", "{0807616A-A77A-4B08-A65A-1582B09E114B}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Dinah.Core", "..\Dinah.Core\Dinah.Core\Dinah.Core.csproj", "{9E951521-2587-4FC6-AD26-FAA9179FB6C4}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Dinah.EntityFrameworkCore", "..\Dinah.Core\Dinah.EntityFrameworkCore\Dinah.EntityFrameworkCore.csproj", "{1255D9BA-CE6E-42E4-A253-6376540B9661}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LuceneNet303r2", "..\LuceneNet303r2\LuceneNet303r2\LuceneNet303r2.csproj", "{35803735-B669-4090-9681-CC7F7FABDC71}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LuceneNet303r2.Tests", "..\LuceneNet303r2\LuceneNet303r2.Tests\LuceneNet303r2.Tests.csproj", "{5A7681A5-60D9-480B-9AC7-63E0812A2548}"
+	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
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AudibleApiDTOs", "..\audible api\AudibleApi\AudibleApiDTOs\AudibleApiDTOs.csproj", "{C03C5D65-3B7F-453B-972F-23950B7E0604}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AudibleApiDTOs.Tests", "..\audible api\AudibleApi\_Tests\AudibleApiDTOs.Tests\AudibleApiDTOs.Tests.csproj", "{6069D7F6-BEA0-4917-AFD4-4EB680CB0EDD}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AudibleApiClientExample", "..\audible api\AudibleApi\_Demos\AudibleApiClientExample\AudibleApiClientExample.csproj", "{282EEE16-F569-47E1-992F-C6DB8AEC7AA6}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ApplicationServices", "ApplicationServices\ApplicationServices.csproj", "{B95650EA-25F0-449E-BA5D-99126BC5D730}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Dinah.Core.WindowsDesktop", "..\Dinah.Core\Dinah.Core.WindowsDesktop\Dinah.Core.WindowsDesktop.csproj", "{059CE32C-9AD6-45E9-A166-790DFFB0B730}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibationLauncher", "LibationLauncher\LibationLauncher.csproj", "{F3B04A3A-20C8-4582-A54A-715AF6A5D859}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "0 Libation Tests", "0 Libation Tests", "{67E66E82-5532-4440-AFB3-9FB1DF9DEF53}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "_Tests", "_Tests", "{67E66E82-5532-4440-AFB3-9FB1DF9DEF53}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "InternalUtilities.Tests", "_Tests\InternalUtilities.Tests\InternalUtilities.Tests.csproj", "{8447C956-B03E-4F59-9DD4-877793B849D9}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibationSearchEngine.Tests", "_Tests\LibationSearchEngine.Tests\LibationSearchEngine.Tests.csproj", "{C5B21768-C7C9-4FCB-AC1E-187B223D5A98}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Dinah.EntityFrameworkCore.Tests", "..\Dinah.Core\_Tests\Dinah.EntityFrameworkCore.Tests\Dinah.EntityFrameworkCore.Tests.csproj", "{6F5131A0-09AE-4707-B82B-5E53CB74688E}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Hoopla", "Hoopla\Hoopla.csproj", "{D8F56E5A-3E65-41A6-B7E7-C4515A264B1F}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AAXClean", "..\AAXClean\AAXClean.csproj", "{94BEB7CC-511D-45AB-9F09-09BE858EE486}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibationCli", "LibationCli\LibationCli.csproj", "{428163C3-D558-4914-B570-A92069521877}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Hoopla", "Hoopla\Hoopla.csproj", "{D8F56E5A-3E65-41A6-B7E7-C4515A264B1F}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AppScaffolding", "AppScaffolding\AppScaffolding.csproj", "{595E7C4D-506D-486D-98B7-5FDDF398D033}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -118,82 +86,18 @@ Global
 		{2E1F5DB4-40CC-4804-A893-5DCE0193E598}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{2E1F5DB4-40CC-4804-A893-5DCE0193E598}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{2E1F5DB4-40CC-4804-A893-5DCE0193E598}.Release|Any CPU.Build.0 = Release|Any CPU
-		{9F1AA3DE-962F-469B-82B2-46F93491389B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9F1AA3DE-962F-469B-82B2-46F93491389B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9F1AA3DE-962F-469B-82B2-46F93491389B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{9F1AA3DE-962F-469B-82B2-46F93491389B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E874D000-AD3A-4629-AC65-7219C2C7C1F0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E874D000-AD3A-4629-AC65-7219C2C7C1F0}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E874D000-AD3A-4629-AC65-7219C2C7C1F0}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E874D000-AD3A-4629-AC65-7219C2C7C1F0}.Release|Any CPU.Build.0 = Release|Any CPU
-		{FF12ADA0-8975-4E67-B6EA-4AC82E0C8994}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{FF12ADA0-8975-4E67-B6EA-4AC82E0C8994}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FF12ADA0-8975-4E67-B6EA-4AC82E0C8994}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{FF12ADA0-8975-4E67-B6EA-4AC82E0C8994}.Release|Any CPU.Build.0 = Release|Any CPU
-		{AD1FDDC9-8D2A-436A-8EED-91FD74E7C7B4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{AD1FDDC9-8D2A-436A-8EED-91FD74E7C7B4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{AD1FDDC9-8D2A-436A-8EED-91FD74E7C7B4}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{AD1FDDC9-8D2A-436A-8EED-91FD74E7C7B4}.Release|Any CPU.Build.0 = Release|Any CPU
-		{7EA01F9C-E579-4B01-A3B9-733B49DD0B60}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7EA01F9C-E579-4B01-A3B9-733B49DD0B60}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7EA01F9C-E579-4B01-A3B9-733B49DD0B60}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{7EA01F9C-E579-4B01-A3B9-733B49DD0B60}.Release|Any CPU.Build.0 = Release|Any CPU
-		{111420E2-D4F0-4068-B46A-C4B6DCC823DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{111420E2-D4F0-4068-B46A-C4B6DCC823DC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{111420E2-D4F0-4068-B46A-C4B6DCC823DC}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{111420E2-D4F0-4068-B46A-C4B6DCC823DC}.Release|Any CPU.Build.0 = Release|Any CPU
 		{635F00E1-AAD1-45F7-BEB7-D909AD33B9F6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{635F00E1-AAD1-45F7-BEB7-D909AD33B9F6}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{635F00E1-AAD1-45F7-BEB7-D909AD33B9F6}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{635F00E1-AAD1-45F7-BEB7-D909AD33B9F6}.Release|Any CPU.Build.0 = Release|Any CPU
-		{0807616A-A77A-4B08-A65A-1582B09E114B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0807616A-A77A-4B08-A65A-1582B09E114B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0807616A-A77A-4B08-A65A-1582B09E114B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{0807616A-A77A-4B08-A65A-1582B09E114B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{9E951521-2587-4FC6-AD26-FAA9179FB6C4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9E951521-2587-4FC6-AD26-FAA9179FB6C4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9E951521-2587-4FC6-AD26-FAA9179FB6C4}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{9E951521-2587-4FC6-AD26-FAA9179FB6C4}.Release|Any CPU.Build.0 = Release|Any CPU
-		{1255D9BA-CE6E-42E4-A253-6376540B9661}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1255D9BA-CE6E-42E4-A253-6376540B9661}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1255D9BA-CE6E-42E4-A253-6376540B9661}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{1255D9BA-CE6E-42E4-A253-6376540B9661}.Release|Any CPU.Build.0 = Release|Any CPU
-		{35803735-B669-4090-9681-CC7F7FABDC71}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{35803735-B669-4090-9681-CC7F7FABDC71}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{35803735-B669-4090-9681-CC7F7FABDC71}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{35803735-B669-4090-9681-CC7F7FABDC71}.Release|Any CPU.Build.0 = Release|Any CPU
-		{5A7681A5-60D9-480B-9AC7-63E0812A2548}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5A7681A5-60D9-480B-9AC7-63E0812A2548}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5A7681A5-60D9-480B-9AC7-63E0812A2548}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{5A7681A5-60D9-480B-9AC7-63E0812A2548}.Release|Any CPU.Build.0 = Release|Any CPU
 		{401865F5-1942-4713-B230-04544C0A97B0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{401865F5-1942-4713-B230-04544C0A97B0}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{401865F5-1942-4713-B230-04544C0A97B0}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{401865F5-1942-4713-B230-04544C0A97B0}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C03C5D65-3B7F-453B-972F-23950B7E0604}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C03C5D65-3B7F-453B-972F-23950B7E0604}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C03C5D65-3B7F-453B-972F-23950B7E0604}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C03C5D65-3B7F-453B-972F-23950B7E0604}.Release|Any CPU.Build.0 = Release|Any CPU
-		{6069D7F6-BEA0-4917-AFD4-4EB680CB0EDD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6069D7F6-BEA0-4917-AFD4-4EB680CB0EDD}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6069D7F6-BEA0-4917-AFD4-4EB680CB0EDD}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{6069D7F6-BEA0-4917-AFD4-4EB680CB0EDD}.Release|Any CPU.Build.0 = Release|Any CPU
-		{282EEE16-F569-47E1-992F-C6DB8AEC7AA6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{282EEE16-F569-47E1-992F-C6DB8AEC7AA6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{282EEE16-F569-47E1-992F-C6DB8AEC7AA6}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{282EEE16-F569-47E1-992F-C6DB8AEC7AA6}.Release|Any CPU.Build.0 = Release|Any CPU
 		{B95650EA-25F0-449E-BA5D-99126BC5D730}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{B95650EA-25F0-449E-BA5D-99126BC5D730}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{B95650EA-25F0-449E-BA5D-99126BC5D730}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{B95650EA-25F0-449E-BA5D-99126BC5D730}.Release|Any CPU.Build.0 = Release|Any CPU
-		{059CE32C-9AD6-45E9-A166-790DFFB0B730}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{059CE32C-9AD6-45E9-A166-790DFFB0B730}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{059CE32C-9AD6-45E9-A166-790DFFB0B730}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{059CE32C-9AD6-45E9-A166-790DFFB0B730}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F3B04A3A-20C8-4582-A54A-715AF6A5D859}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F3B04A3A-20C8-4582-A54A-715AF6A5D859}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F3B04A3A-20C8-4582-A54A-715AF6A5D859}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F3B04A3A-20C8-4582-A54A-715AF6A5D859}.Release|Any CPU.Build.0 = Release|Any CPU
 		{8447C956-B03E-4F59-9DD4-877793B849D9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{8447C956-B03E-4F59-9DD4-877793B849D9}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{8447C956-B03E-4F59-9DD4-877793B849D9}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -202,53 +106,37 @@ Global
 		{C5B21768-C7C9-4FCB-AC1E-187B223D5A98}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{C5B21768-C7C9-4FCB-AC1E-187B223D5A98}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{C5B21768-C7C9-4FCB-AC1E-187B223D5A98}.Release|Any CPU.Build.0 = Release|Any CPU
-		{6F5131A0-09AE-4707-B82B-5E53CB74688E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6F5131A0-09AE-4707-B82B-5E53CB74688E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6F5131A0-09AE-4707-B82B-5E53CB74688E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{6F5131A0-09AE-4707-B82B-5E53CB74688E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{94BEB7CC-511D-45AB-9F09-09BE858EE486}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{94BEB7CC-511D-45AB-9F09-09BE858EE486}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{94BEB7CC-511D-45AB-9F09-09BE858EE486}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{94BEB7CC-511D-45AB-9F09-09BE858EE486}.Release|Any CPU.Build.0 = Release|Any CPU
 		{D8F56E5A-3E65-41A6-B7E7-C4515A264B1F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{D8F56E5A-3E65-41A6-B7E7-C4515A264B1F}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{D8F56E5A-3E65-41A6-B7E7-C4515A264B1F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D8F56E5A-3E65-41A6-B7E7-C4515A264B1F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{428163C3-D558-4914-B570-A92069521877}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{428163C3-D558-4914-B570-A92069521877}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{428163C3-D558-4914-B570-A92069521877}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{428163C3-D558-4914-B570-A92069521877}.Release|Any CPU.Build.0 = Release|Any CPU
+		{595E7C4D-506D-486D-98B7-5FDDF398D033}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{595E7C4D-506D-486D-98B7-5FDDF398D033}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{595E7C4D-506D-486D-98B7-5FDDF398D033}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{595E7C4D-506D-486D-98B7-5FDDF398D033}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
 		{8BD8E012-F44F-4EE2-A234-D66C14D5FE4B} = {7FBBB086-0807-4998-85BF-6D1A49C8AD05}
-		{1AE65B61-9C05-4C80-ABFF-48F16E22FDF1} = {7FBBB086-0807-4998-85BF-6D1A49C8AD05}
+		{1AE65B61-9C05-4C80-ABFF-48F16E22FDF1} = {F0CBB7A7-D3FB-41FF-8F47-CF3F6A592249}
 		{59A10DF3-63EC-43F1-A3BF-4000CFA118D2} = {751093DD-5DBA-463E-ADBE-E05FAFB6983E}
 		{393B5B27-D15C-4F77-9457-FA14BA8F3C73} = {41CDCC73-9B81-49DD-9570-C54406E852AF}
 		{06882742-27A6-4347-97D9-56162CEC9C11} = {F0CBB7A7-D3FB-41FF-8F47-CF3F6A592249}
 		{2E1F5DB4-40CC-4804-A893-5DCE0193E598} = {41CDCC73-9B81-49DD-9570-C54406E852AF}
-		{9F1AA3DE-962F-469B-82B2-46F93491389B} = {F61184E7-2426-4A13-ACEF-5689928E2CE2}
-		{E874D000-AD3A-4629-AC65-7219C2C7C1F0} = {38E6C6D9-963A-4C5B-89F4-F2F14885ADFD}
-		{FF12ADA0-8975-4E67-B6EA-4AC82E0C8994} = {38E6C6D9-963A-4C5B-89F4-F2F14885ADFD}
-		{AD1FDDC9-8D2A-436A-8EED-91FD74E7C7B4} = {38E6C6D9-963A-4C5B-89F4-F2F14885ADFD}
-		{7EA01F9C-E579-4B01-A3B9-733B49DD0B60} = {7FBBB086-0807-4998-85BF-6D1A49C8AD05}
-		{111420E2-D4F0-4068-B46A-C4B6DCC823DC} = {38E6C6D9-963A-4C5B-89F4-F2F14885ADFD}
 		{635F00E1-AAD1-45F7-BEB7-D909AD33B9F6} = {8679CAC8-9164-4007-BDD2-F004810EDA14}
-		{0807616A-A77A-4B08-A65A-1582B09E114B} = {8679CAC8-9164-4007-BDD2-F004810EDA14}
-		{9E951521-2587-4FC6-AD26-FAA9179FB6C4} = {43E3ACB3-E0BC-4370-8DBB-E3720C8C8FD1}
-		{1255D9BA-CE6E-42E4-A253-6376540B9661} = {43E3ACB3-E0BC-4370-8DBB-E3720C8C8FD1}
-		{35803735-B669-4090-9681-CC7F7FABDC71} = {7FBBB086-0807-4998-85BF-6D1A49C8AD05}
-		{5A7681A5-60D9-480B-9AC7-63E0812A2548} = {38E6C6D9-963A-4C5B-89F4-F2F14885ADFD}
 		{401865F5-1942-4713-B230-04544C0A97B0} = {41CDCC73-9B81-49DD-9570-C54406E852AF}
-		{C03C5D65-3B7F-453B-972F-23950B7E0604} = {7FBBB086-0807-4998-85BF-6D1A49C8AD05}
-		{6069D7F6-BEA0-4917-AFD4-4EB680CB0EDD} = {38E6C6D9-963A-4C5B-89F4-F2F14885ADFD}
-		{282EEE16-F569-47E1-992F-C6DB8AEC7AA6} = {F61184E7-2426-4A13-ACEF-5689928E2CE2}
 		{B95650EA-25F0-449E-BA5D-99126BC5D730} = {41CDCC73-9B81-49DD-9570-C54406E852AF}
-		{059CE32C-9AD6-45E9-A166-790DFFB0B730} = {43E3ACB3-E0BC-4370-8DBB-E3720C8C8FD1}
-		{F3B04A3A-20C8-4582-A54A-715AF6A5D859} = {8679CAC8-9164-4007-BDD2-F004810EDA14}
 		{8447C956-B03E-4F59-9DD4-877793B849D9} = {67E66E82-5532-4440-AFB3-9FB1DF9DEF53}
 		{C5B21768-C7C9-4FCB-AC1E-187B223D5A98} = {67E66E82-5532-4440-AFB3-9FB1DF9DEF53}
-		{6F5131A0-09AE-4707-B82B-5E53CB74688E} = {38E6C6D9-963A-4C5B-89F4-F2F14885ADFD}
-		{94BEB7CC-511D-45AB-9F09-09BE858EE486} = {7FBBB086-0807-4998-85BF-6D1A49C8AD05}
 		{D8F56E5A-3E65-41A6-B7E7-C4515A264B1F} = {7FBBB086-0807-4998-85BF-6D1A49C8AD05}
+		{428163C3-D558-4914-B570-A92069521877} = {8679CAC8-9164-4007-BDD2-F004810EDA14}
+		{595E7C4D-506D-486D-98B7-5FDDF398D033} = {8679CAC8-9164-4007-BDD2-F004810EDA14}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {615E00ED-BAEF-4E8E-A92A-9B82D87942A9}

LibationCli/LibationCli.csproj

@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>net5.0</TargetFramework>
+
+    <PublishTrimmed>true</PublishTrimmed>
+    <PublishReadyToRun>true</PublishReadyToRun>
+    <RuntimeIdentifier>win-x64</RuntimeIdentifier>
+    <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
+    <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>
+
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
+    <OutputPath>..\LibationWinForms\bin\Release</OutputPath>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="CommandLineParser" Version="2.8.0" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\ApplicationServices\ApplicationServices.csproj" />
+    <ProjectReference Include="..\AppScaffolding\AppScaffolding.csproj" />
+    <ProjectReference Include="..\FileLiberator\FileLiberator.csproj" />
+  </ItemGroup>
+
+</Project>

LibationCli/Options/ConvertOptions.cs

@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using CommandLine;
+
+namespace LibationCli
+{
+	[Verb("convert", HelpText = "Convert mp4 to mp3.")]
+	public class ConvertOptions : ProcessableOptionsBase
+	{
+		protected override Task ProcessAsync() => RunAsync(CreateProcessable<FileLiberator.ConvertToMp3>());
+	}
+}

LibationCli/Options/ExportOptions.cs

@@ -0,0 +1,55 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using ApplicationServices;
+using CommandLine;
+using InternalUtilities;
+
+namespace LibationCli
+{
+	[Verb("export", HelpText = "Must include path and flag for export file type: --xlsx , --csv , --json]")]
+	public class ExportOptions : OptionsBase
+	{
+		[Option(shortName: 'p', longName: "path", Required = true, HelpText = "Path to save file to.")]
+		public string FilePath { get; set; }
+
+		#region explanation of mutually exclusive options
+		/*
+		giving these SetName values makes them mutually exclusive. they are in different sets. eg:
+		class Options
+		{
+		    [Option("username", SetName = "auth")]
+		    public string Username { get; set; }
+		    [Option("password", SetName = "auth")]
+		    public string Password { get; set; }
+
+		    [Option("guestaccess", SetName = "guest")]
+		    public bool GuestAccess { get; set; }
+		}
+		*/
+		#endregion
+		[Option(shortName: 'x', longName: "xlsx", SetName = "xlsx", Required = true)]
+		public bool xlsx { get; set; }
+
+		[Option(shortName: 'c', longName: "csv", SetName = "csv", Required = true)]
+		public bool csv { get; set; }
+
+		[Option(shortName: 'j', longName: "json", SetName = "json", Required = true)]
+		public bool json { get; set; }
+
+		protected override Task ProcessAsync()
+		{
+			if (xlsx)
+				LibraryExporter.ToXlsx(FilePath);
+			if (csv)
+				LibraryExporter.ToCsv(FilePath);
+			if (json)
+				LibraryExporter.ToJson(FilePath);
+
+			Console.WriteLine($"Library exported to: {FilePath}");
+
+			return Task.CompletedTask;
+		}
+	}
+}

LibationCli/Options/LiberateOptions.cs

@@ -0,0 +1,37 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using CommandLine;
+using DataLayer;
+using FileLiberator;
+
+namespace LibationCli
+{
+	[Verb("liberate", HelpText = "Liberate: book and pdf backups. Default: download and decrypt all un-liberated titles and download pdfs. "
+		+ "Optional: use 'pdf' flag to only download pdfs.")]
+	public class LiberateOptions : ProcessableOptionsBase
+	{
+		[Option(shortName: 'p', longName: "pdf", Required = false, Default = false, HelpText = "Flag to only download pdfs")]
+		public bool PdfOnly { get; set; }
+
+		protected override Task ProcessAsync()
+			=> PdfOnly
+			? RunAsync(CreateProcessable<DownloadPdf>())
+			: RunAsync(CreateBackupBook());
+
+		private static Processable CreateBackupBook()
+		{
+			var downloadPdf = CreateProcessable<DownloadPdf>();
+
+			//Chain pdf download on DownloadDecryptBook.Completed
+			async void onDownloadDecryptBookCompleted(object sender, LibraryBook e)
+			{
+				await downloadPdf.TryProcessAsync(e);
+			}
+
+			var downloadDecryptBook = CreateProcessable<DownloadDecryptBook>(onDownloadDecryptBookCompleted);
+			return downloadDecryptBook;
+		}
+	}
+}

LibationCli/Options/ScanOptions.cs

@@ -0,0 +1,77 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using ApplicationServices;
+using CommandLine;
+using InternalUtilities;
+
+namespace LibationCli
+{
+	[Verb("scan", HelpText = "Scan library. Default: scan all accounts. Optional: use 'account' flag to specify a single account.")]
+	public class ScanOptions : OptionsBase
+	{
+		[Value(0, MetaName = "Accounts", HelpText = "Optional: nicknames of accounts to scan.", Required = false)]
+		public IEnumerable<string> AccountNicknames { get; set; }
+
+		protected override async Task ProcessAsync()
+		{
+			var accounts = getAccounts();
+			if (!accounts.Any())
+			{
+				Console.WriteLine("No accounts. Exiting.");
+				Environment.ExitCode = (int)ExitCode.RunTimeError;
+				return;
+			}
+
+			var _accounts = accounts.ToArray();
+
+			var intro
+				= (_accounts.Length == 1)
+				? "Scanning Audible library. This may take a few minutes."
+				: $"Scanning Audible library: {_accounts.Length} accounts. This may take a few minutes per account.";
+			Console.WriteLine(intro);
+
+			var (TotalBooksProcessed, NewBooksAdded) = await LibraryCommands.ImportAccountAsync((a) => ApiExtended.CreateAsync(a), _accounts);
+
+			Console.WriteLine("Scan complete.");
+			Console.WriteLine($"Total processed: {TotalBooksProcessed}\r\nNew: {NewBooksAdded}");
+		}
+
+		private Account[] getAccounts()
+		{
+			using var persister = AudibleApiStorage.GetAccountsSettingsPersister();
+			var accounts = persister.AccountsSettings.GetAll().ToArray();
+
+			if (!AccountNicknames.Any())
+				return accounts;
+
+			var found = accounts.Where(acct => AccountNicknames.Contains(acct.AccountName)).ToArray();
+			var notFound = AccountNicknames.Except(found.Select(f => f.AccountName)).ToArray();
+
+			// no accounts found. do not continue
+			if (!found.Any())
+			{
+				Console.WriteLine("Accounts not found:");
+				foreach (var nf in notFound)
+					Console.WriteLine($"- {nf}");
+				return found;
+			}
+
+			// some accounts not found. continue after message
+			if (notFound.Any())
+			{
+				Console.WriteLine("Accounts found:");
+				foreach (var f in found)
+					Console.WriteLine($"- {f}");
+				Console.WriteLine("Accounts not found:");
+				foreach (var nf in notFound)
+					Console.WriteLine($"- {nf}");
+			}
+
+			// else: all accounts area found. silently continue
+
+			return found;
+		}
+	}
+}

LibationCli/Options/_OptionsBase.cs

@@ -0,0 +1,31 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using CommandLine;
+
+namespace LibationCli
+{
+	public abstract class OptionsBase
+	{
+		public async Task Run()
+		{
+			try
+			{
+				await ProcessAsync();
+			}
+			catch (Exception ex)
+			{
+				Environment.ExitCode = (int)ExitCode.RunTimeError;
+
+				Console.WriteLine("ERROR");
+				Console.WriteLine("=====");
+				Console.WriteLine(ex.Message);
+				Console.WriteLine();
+				Console.WriteLine(ex.StackTrace);
+			}
+		}
+
+		protected abstract Task ProcessAsync();
+	}
+}

LibationCli/Options/_ProcessableOptionsBase.cs

@@ -0,0 +1,58 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using ApplicationServices;
+using CommandLine;
+using DataLayer;
+using FileLiberator;
+
+namespace LibationCli
+{
+	// streamlined, non-Forms copy of ProcessorAutomationController
+	public abstract class ProcessableOptionsBase : OptionsBase
+	{
+		protected static TProcessable CreateProcessable<TProcessable>(EventHandler<LibraryBook> completedAction = null)
+			where TProcessable : Processable, new()
+		{
+			var strProc = new TProcessable();
+
+			strProc.Begin += (o, e) => Console.WriteLine($"{typeof(TProcessable).Name} Begin: {e}");
+			strProc.Completed += (o, e) => Console.WriteLine($"{typeof(TProcessable).Name} Completed: {e}");
+
+			strProc.Completed += completedAction;
+
+			return strProc;
+		}
+
+		protected static async Task RunAsync(Processable Processable)
+		{
+			foreach (var libraryBook in Processable.GetValidLibraryBooks(DbContexts.GetLibrary_Flat_NoTracking()))
+				await ProcessOneAsync(Processable, libraryBook, false);
+
+			var done = "Done. All books have been processed";
+			Console.WriteLine(done);
+			Serilog.Log.Logger.Information(done);
+		}
+
+		private static async Task ProcessOneAsync(Processable Processable, LibraryBook libraryBook, bool validate)
+		{
+			try
+			{
+				var statusHandler = await Processable.ProcessSingleAsync(libraryBook, validate);
+
+				if (statusHandler.IsSuccess)
+					return;
+
+				foreach (var errorMessage in statusHandler.Errors)
+					Serilog.Log.Logger.Error(errorMessage);
+			}
+			catch (Exception ex)
+			{
+				var msg = "Error processing book. Skipping. This book will be tried again on next attempt. For options of skipping or marking as error, retry with main Libation app.";
+				Console.WriteLine(msg + ". See log for more details.");
+				Serilog.Log.Logger.Error(ex, $"{msg} {{@DebugInfo}}", new { Book = libraryBook.LogFriendly() });
+			}
+		}
+	}
+}

LibationCli/Program.cs

@@ -0,0 +1,84 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using CommandLine;
+using CommandLine.Text;
+using Dinah.Core;
+using Dinah.Core.Collections;
+using Dinah.Core.Collections.Generic;
+
+namespace LibationCli
+{
+	public enum ExitCode
+	{
+		ProcessCompletedSuccessfully = 0,
+		NonRunNonError = 1,
+		ParseError = 2,
+		RunTimeError = 3
+	}
+	class Program
+	{
+        static async Task<int> Main(string[] args)
+		{
+			//***********************************************//
+			//                                               //
+			//   do not use Configuration before this line   //
+			//                                               //
+			//***********************************************//
+			Setup.Initialize();
+			Setup.SubscribeToDatabaseEvents();
+
+			var types = Setup.LoadVerbs();
+
+#if DEBUG
+			string input = null;
+
+			//input = "  export --help";
+			//input = "  scan  rmcrackan";
+			//input = "  liberate ";
+
+
+			// note: this hack will fail for quoted file paths with spaces because it will break on those spaces
+			if (!string.IsNullOrWhiteSpace(input))
+				args = input.Split(' ', StringSplitOptions.RemoveEmptyEntries);
+			var setBreakPointHere = args;
+#endif
+
+			var result = Parser.Default.ParseArguments(args, types);
+
+			// if successfully parsed
+			// async: run parsed options
+			await result.WithParsedAsync<OptionsBase>(opt => opt.Run());
+
+			// if not successfully parsed
+			// sync: handle parse errors
+			result.WithNotParsed(errors => HandleErrors(result, errors));
+
+			return Environment.ExitCode;
+		}
+
+		private static void HandleErrors(ParserResult<object> result, IEnumerable<Error> errors)
+		{
+			var errorsList = errors.ToList();
+			if (errorsList.Any(e => e.Tag.In(ErrorType.HelpRequestedError, ErrorType.VersionRequestedError, ErrorType.HelpVerbRequestedError)))
+			{
+				Environment.ExitCode = (int)ExitCode.NonRunNonError;
+				return;
+			}
+
+			Environment.ExitCode = (int)ExitCode.ParseError;
+
+			if (errorsList.Any(e => e.Tag.In(ErrorType.NoVerbSelectedError)))
+			{
+				Console.WriteLine("No verb selected");
+				return;
+			}
+
+			var helpText = HelpText.AutoBuild(result,
+				h => HelpText.DefaultParsingErrorsHandler(result, h),
+				e => e);
+			Console.WriteLine(helpText);
+		}
+	}
+}

LibationCli/Setup.cs

@@ -0,0 +1,63 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using System.Threading.Tasks;
+using AppScaffolding;
+using CommandLine;
+using CommandLine.Text;
+using Dinah.Core;
+using Dinah.Core.Collections;
+using Dinah.Core.Collections.Generic;
+
+namespace LibationCli
+{
+	public static class Setup
+	{
+		public static void Initialize()
+		{
+			//***********************************************//
+			//                                               //
+			//   do not use Configuration before this line   //
+			//                                               //
+			//***********************************************//
+			var config = LibationScaffolding.RunPreConfigMigrations();
+
+
+			LibationScaffolding.RunPostConfigMigrations(config);
+			LibationScaffolding.RunPostMigrationScaffolding(config);
+
+#if !DEBUG
+			checkForUpdate();
+#endif
+		}
+
+		private static void checkForUpdate()
+		{
+			var (hasUpgrade, zipUrl, htmlUrl, zipName) = LibationScaffolding.GetLatestRelease();
+			if (!hasUpgrade)
+				return;
+
+			var origColor = Console.ForegroundColor;
+			try
+			{
+				Console.ForegroundColor = ConsoleColor.Red;
+				Console.WriteLine($"UPDATE AVAILABLE @ {zipUrl}");
+			}
+			finally
+			{
+				Console.ForegroundColor = origColor;
+			}
+		}
+
+		public static void SubscribeToDatabaseEvents()
+		{
+			DataLayer.UserDefinedItem.ItemChanged += (sender, e) => ApplicationServices.LibraryCommands.UpdateUserDefinedItem(((DataLayer.UserDefinedItem)sender).Book);
+		}
+
+		public static Type[] LoadVerbs() => Assembly.GetExecutingAssembly()
+			.GetTypes()
+			.Where(t => t.GetCustomAttribute<VerbAttribute>() is not null)
+			.ToArray();
+	}
+}

LibationLauncher/LibationLauncher.csproj

@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <OutputType>WinExe</OutputType>
-    <TargetFramework>net5.0-windows</TargetFramework>
-    <UseWindowsForms>true</UseWindowsForms>
-    <ApplicationIcon>libation.ico</ApplicationIcon>
-    <AssemblyName>Libation</AssemblyName>
-
-    <PublishTrimmed>true</PublishTrimmed>
-    <PublishReadyToRun>true</PublishReadyToRun>
-    <!-- <PublishSingleFile>true</PublishSingleFile> -->
-    <RuntimeIdentifier>win-x64</RuntimeIdentifier>
-
-    <Version>5.5.2.1</Version>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-    <DefineConstants>TRACE;DEBUG</DefineConstants>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="MSBump" Version="2.3.2">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
-    <PackageReference Include="Octokit" Version="0.50.0" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\LibationWinForms\LibationWinForms.csproj" />
-  </ItemGroup>
-
-</Project>

LibationLauncher/Program.cs

@@ -1,508 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Windows.Forms;
-using AudibleApi.Authorization;
-using DataLayer;
-using Dinah.Core;
-using Dinah.Core.IO;
-using Dinah.Core.Logging;
-using FileManager;
-using InternalUtilities;
-using LibationWinForms;
-using LibationWinForms.Dialogs;
-using Microsoft.EntityFrameworkCore;
-using Newtonsoft.Json.Linq;
-using Serilog;
-
-namespace LibationLauncher
-{
-	static class Program
-	{
-		[System.Runtime.InteropServices.DllImport("kernel32.dll", SetLastError = true)]
-		[return: System.Runtime.InteropServices.MarshalAs(System.Runtime.InteropServices.UnmanagedType.Bool)]
-		static extern bool AllocConsole();
-
-		[STAThread]
-		static void Main()
-		{
-			//// uncomment to see Console. MUST be called before anything writes to Console. Might only work from VS
-			//AllocConsole();
-
-			Application.SetHighDpiMode(HighDpiMode.SystemAware);
-			Application.EnableVisualStyles();
-			Application.SetCompatibleTextRenderingDefault(false);
-
-			// must occur before access to Configuration instance
-			migrate_to_v5_2_0__pre_config();
-
-
-			//***********************************************//
-			//                                               //
-			//   do not use Configuration before this line   //
-			//                                               //
-			//***********************************************//
-
-
-			var config = Configuration.Instance;
-
-			createSettings(config);
-
-			AudibleApiStorage.EnsureAccountsSettingsFileExists();
-
-			migrate_to_v5_0_0(config);
-			migrate_to_v5_2_0__post_config(config);
-			migrate_to_v5_5_0(config);
-
-			ensureSerilogConfig(config);
-			configureLogging(config);
-			logStartupState(config);
-
-#if !DEBUG
-			checkForUpdate(config);
-#endif
-			Application.Run(new Form1());
-		}
-
-		private static void createSettings(Configuration config)
-		{
-			// all returns should be preceded by either:
-			// - if config.LibationSettingsAreValid
-			// - error message, Exit()
-
-			static void CancelInstallation()
-			{
-				MessageBox.Show("Initial set up cancelled.", "Cancelled", MessageBoxButtons.OK, MessageBoxIcon.Warning);
-				Application.Exit();
-				Environment.Exit(0);
-			}
-
-			if (config.LibationSettingsAreValid)
-				return;
-
-			var defaultLibationFilesDir = Configuration.UserProfile;
-
-			// check for existing settigns in default location
-			var defaultSettingsFile = Path.Combine(defaultLibationFilesDir, "Settings.json");
-			if (Configuration.SettingsFileIsValid(defaultSettingsFile))
-				config.SetLibationFiles(defaultLibationFilesDir);
-
-			if (config.LibationSettingsAreValid)
-				return;
-
-			var setupDialog = new SetupDialog();
-			if (setupDialog.ShowDialog() != DialogResult.OK)
-			{
-				CancelInstallation();
-				return;
-			}
-
-			if (setupDialog.IsNewUser)
-				config.SetLibationFiles(defaultLibationFilesDir);
-			else if (setupDialog.IsReturningUser)
-			{
-				var libationFilesDialog = new LibationFilesDialog();
-
-				if (libationFilesDialog.ShowDialog() != DialogResult.OK)
-				{
-					CancelInstallation();
-					return;
-				}
-
-				config.SetLibationFiles(libationFilesDialog.SelectedDirectory);
-				if (config.LibationSettingsAreValid)
-					return;
-
-				// path did not result in valid settings
-				MessageBox.Show(
-					$"No valid settings were found at this location.\r\nWould you like to create a new install settings in this folder?\r\n\r\n{libationFilesDialog.SelectedDirectory}",
-					"New install?",
-					MessageBoxButtons.YesNo,
-					MessageBoxIcon.Question);
-
-				if (libationFilesDialog.ShowDialog() != DialogResult.Yes)
-				{
-					CancelInstallation();
-					return;
-				}
-			}
-
-			// 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)
-			{
-				CancelInstallation();
-				return;
-			}
-
-			if (config.LibationSettingsAreValid)
-				return;
-
-			CancelInstallation();
-		}
-
-		#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;
-
-			var accountsPersister = AudibleApiStorage.GetAccountsSettingsPersister();
-
-			var accounts = accountsPersister?.AccountsSettings?.Accounts;
-			if (accounts is null)
-				return;
-
-			foreach (var account in accounts)
-			{
-				var identity = account?.IdentityTokens;
-
-				if (identity is null)
-					continue;
-
-				if (!string.IsNullOrWhiteSpace(identity.DeviceType) &&
-					!string.IsNullOrWhiteSpace(identity.DeviceSerialNumber) &&
-					!string.IsNullOrWhiteSpace(identity.AmazonAccountId))
-					continue;
-
-				var authorize = new Authorize(identity.Locale);
-
-				try
-				{
-					authorize.DeregisterAsync(identity.ExistingAccessToken, identity.Cookies.ToKeyValuePair()).GetAwaiter().GetResult();
-					identity.Invalidate();
-
-					var api = AudibleApiActions.GetApiAsync(new LibationWinForms.Login.WinformResponder(account), account).GetAwaiter().GetResult();
-				}
-                catch
-                {
-					// Don't care if it fails
-                }
-			}
-		}
-		#endregion
-
-		#region migrate to v5.2.0
-		// get rid of meta-directories, combine DownloadsInProgressEnum and DecryptInProgressEnum => InProgress
-		private static void migrate_to_v5_2_0__pre_config()
-		{
-			{
-				var settingsKey = "DownloadsInProgressEnum";
-				if (UNSAFE_MigrationHelper.Settings_TryGet(settingsKey, out var value))
-				{
-					UNSAFE_MigrationHelper.Settings_Delete(settingsKey);
-					UNSAFE_MigrationHelper.Settings_Insert("InProgress", translatePath(value));
-				}
-			}
-
-			{
-				UNSAFE_MigrationHelper.Settings_Delete("DecryptInProgressEnum");
-			}
-
-			{ // appsettings.json
-				var appSettingsKey = UNSAFE_MigrationHelper.LIBATION_FILES_KEY;
-				if (UNSAFE_MigrationHelper.APPSETTINGS_TryGet(appSettingsKey, out var value))
-					UNSAFE_MigrationHelper.APPSETTINGS_Update(appSettingsKey, translatePath(value));
-			}
-		}
-
-		private static string translatePath(string path)
-			=> path switch
-			{
-				"AppDir" => @".\LibationFiles",
-				"MyDocs" => Path.GetFullPath(Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments), "LibationFiles")),
-				"UserProfile" => Path.GetFullPath(Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile), "Libation")),
-				"WinTemp" => Path.GetFullPath(Path.Combine(Path.GetTempPath(), "Libation")),
-				_ => path
-			};
-
-		private static void migrate_to_v5_2_0__post_config(Configuration config)
-		{
-			if (!config.Exists(nameof(config.AllowLibationFixup)))
-				config.AllowLibationFixup = true;
-
-			if (!config.Exists(nameof(config.DecryptToLossy)))
-				config.DecryptToLossy = false;
-		}
-		#endregion
-
-		#region migrate to v5.5.0. FilePaths.json => db. long running. fire and forget
-		private static void migrate_to_v5_5_0(Configuration config)
-			=> new System.Threading.Thread(() => migrate_to_v5_5_0_thread(config)) { IsBackground = true }.Start();
-		private static void migrate_to_v5_5_0_thread(Configuration config)
-		{
-			try
-			{
-				var filePaths = Path.Combine(config.LibationFiles, "FilePaths.json");
-				if (!File.Exists(filePaths))
-					return;
-
-				var fileLocations = Path.Combine(config.LibationFiles, "FileLocations.json");
-				if (!File.Exists(fileLocations))
-					File.Copy(filePaths, fileLocations);
-
-				// files to be deleted at the end
-				var libhackFilesToDelete = new List<string>();
-				// .libhack files => errors
-				var libhackFiles = Directory.EnumerateDirectories(config.Books, "*.libhack", SearchOption.AllDirectories);
-
-				using var context = ApplicationServices.DbContexts.GetContext();
-				context.Books.Load();
-
-				var jArr = JArray.Parse(File.ReadAllText(filePaths));
-
-				foreach (var jToken in jArr)
-				{
-					var asinToken = jToken["Id"];
-					var fileTypeToken = jToken["FileType"];
-					var pathToken = jToken["Path"];
-					if (asinToken is null || fileTypeToken is null || pathToken is null ||
-						asinToken.Type != JTokenType.String || fileTypeToken.Type != JTokenType.Integer || pathToken.Type != JTokenType.String)
-						continue;
-
-					var asin = asinToken.Value<string>();
-					var fileType = (FileType)fileTypeToken.Value<int>();
-					var path = pathToken.Value<string>();
-
-					if (fileType == FileType.Unknown || fileType == FileType.AAXC)
-						continue;
-
-					var book = context.Books.Local.FirstOrDefault(b => b.AudibleProductId == asin);
-					if (book is null)
-						continue;
-
-					// assign these strings and enums/ints unconditionally. EFCore will only update if changed
-					if (fileType == FileType.PDF)
-						book.UserDefinedItem.PdfStatus = LiberatedStatus.Liberated;
-
-					if (fileType == FileType.Audio)
-					{
-						var lhack = libhackFiles.FirstOrDefault(f => f.ContainsInsensitive(asin));
-						if (lhack is null)
-							book.UserDefinedItem.BookStatus = LiberatedStatus.Liberated;
-						else
-						{
-							book.UserDefinedItem.BookStatus = LiberatedStatus.Error;
-							libhackFilesToDelete.Add(lhack);
-						}
-					}
-				}
-
-				context.SaveChanges();
-
-				// only do this after save changes
-				foreach (var libhackFile in libhackFilesToDelete)
-					File.Delete(libhackFile);
-
-				File.Delete(filePaths);
-			}
-			catch (Exception ex)
-			{
-				Log.Logger.Error(ex, "Error attempting to insert FilePaths into db");
-			}
-		}
-		#endregion
-
-		private static void ensureSerilogConfig(Configuration config)
-		{
-			if (config.GetObject("Serilog") != null)
-				return;
-
-			// "Serilog": {
-			//   "MinimumLevel": "Information"
-			//   "WriteTo": [
-			//     {
-			//       "Name": "Console"
-			//     },
-			//     {
-			//       "Name": "File",
-			//       "Args": {
-			//         "rollingInterval": "Day",
-			//         "outputTemplate": ...
-			//       }
-			//     }
-			//   ],
-			//   "Using": [ "Dinah.Core" ],
-			//   "Enrich": [ "WithCaller" ]
-			// }
-			var serilogObj = new JObject
-			{
-				{ "MinimumLevel", "Information" },
-				{ "WriteTo", new JArray
-					{
-						new JObject { {"Name", "Console" } },
-						new JObject
-						{
-							{ "Name", "File" },
-							{ "Args",
-								new JObject
-								{
-									// for this sink to work, a path must be provided. we override this below
-									{ "path", Path.Combine(config.LibationFiles, "_Log.log") },
-									{ "rollingInterval", "Month" },
-									// Serilog template formatting examples
-									// - default:                    "{Timestamp:yyyy-MM-dd HH:mm:ss.fff zzz} [{Level:u3}] {Message:lj}{NewLine}{Exception}"
-									//   output example:             2019-11-26 08:48:40.224 -05:00 [DBG] Begin Libation
-									// - with class and method info: "{Timestamp:yyyy-MM-dd HH:mm:ss.fff zzz} [{Level:u3}] (at {Caller}) {Message:lj}{NewLine}{Exception}";
-									//   output example:             2019-11-26 08:48:40.224 -05:00 [DBG] (at LibationWinForms.Program.init()) Begin Libation
-									{ "outputTemplate", "{Timestamp:yyyy-MM-dd HH:mm:ss.fff zzz} [{Level:u3}] (at {Caller}) {Message:lj}{NewLine}{Exception}" }
-								}
-							}
-						}
-					}
-				},
-				{ "Using", new JArray{ "Dinah.Core" } }, // dll's name, NOT namespace
-				{ "Enrich", new JArray{ "WithCaller" } },
-			};
-			config.SetObject("Serilog", serilogObj);
-		}
-
-		// to restore original: Console.SetOut(origOut);
-		private static TextWriter origOut { get; } = Console.Out;
-
-		private static void configureLogging(Configuration config)
-		{
-			config.ConfigureLogging();
-
-			// Fwd Console to serilog.
-			// Serilog also writes to Console (should probably change this) so it might be asking for trouble.
-			// SerilogTextWriter needs to be more robust and tested. Esp the Write() methods.
-			// Empirical testing so far has shown no issues.
-			Console.SetOut(new MultiTextWriter(origOut, new SerilogTextWriter()));
-
-			// .Here() captures debug info via System.Runtime.CompilerServices attributes. Warning: expensive
-			//var withLineNumbers_outputTemplate = "[{Timestamp:HH:mm:ss} {Level}] {SourceContext}{NewLine}{Message}{NewLine}in method {MemberName} at {FilePath}:{LineNumber}{NewLine}{Exception}{NewLine}";
-			//Log.Logger.Here().Debug("Begin Libation. Debug with line numbers");
-		}
-
-		private static void logStartupState(Configuration config)
-		{
-			// begin logging session with a form feed
-			Log.Logger.Information("\r\n\f");
-			Log.Logger.Information("Begin Libation. {@DebugInfo}", new
-			{
-				Version = BuildVersion.ToString(),
-#if DEBUG
-				Mode = "Debug",
-#else
-				Mode = "Release",
-#endif
-
-				LogLevel_Verbose_Enabled = Log.Logger.IsVerboseEnabled(),
-				LogLevel_Debug_Enabled = Log.Logger.IsDebugEnabled(),
-				LogLevel_Information_Enabled = Log.Logger.IsInformationEnabled(),
-				LogLevel_Warning_Enabled = Log.Logger.IsWarningEnabled(),
-				LogLevel_Error_Enabled = Log.Logger.IsErrorEnabled(),
-				LogLevel_Fatal_Enabled = Log.Logger.IsFatalEnabled(),
-
-				config.LibationFiles,
-				AudibleFileStorage.BooksDirectory,
-
-				config.InProgress,
-
-				DownloadsInProgressDir = AudibleFileStorage.DownloadsInProgress,
-				DownloadsInProgressFiles = Directory.EnumerateFiles(AudibleFileStorage.DownloadsInProgress).Count(),
-
-				DecryptInProgressDir = AudibleFileStorage.DecryptInProgress,
-				DecryptInProgressFiles = Directory.EnumerateFiles(AudibleFileStorage.DecryptInProgress).Count(),
-			});
-
-			MessageBoxVerboseLoggingWarning.ShowIfTrue();
-		}
-
-		private static void checkForUpdate(Configuration config)
-		{
-			string zipUrl;
-			string selectedPath;
-
-			try
-			{
-				// timed out
-				var latest = getLatestRelease(TimeSpan.FromSeconds(10));
-				if (latest is null)
-					return;
-
-				var latestVersionString = latest.TagName.Trim('v');
-				if (!Version.TryParse(latestVersionString, out var latestRelease))
-					return;
-
-				// we're up to date
-				if (latestRelease <= BuildVersion)
-					return;
-
-				// we have an update
-				var zip = latest.Assets.FirstOrDefault(a => a.BrowserDownloadUrl.EndsWith(".zip"));
-				zipUrl = zip?.BrowserDownloadUrl;
-
-				Log.Logger.Information("Update available: {@DebugInfo}", new {
-					latestRelease = latestRelease.ToString(),
-					latest.HtmlUrl,
-					zipUrl
-				});
-
-				if (zipUrl is null)
-				{
-					MessageBox.Show(latest.HtmlUrl, "New version available");
-					return;
-				}
-
-				var result = MessageBox.Show($"New version available @ {latest.HtmlUrl}\r\nDownload the zip file?", "New version available", MessageBoxButtons.YesNo, MessageBoxIcon.Question);
-				if (result != DialogResult.Yes)
-					return;
-
-				using var fileSelector = new SaveFileDialog { FileName = zip.Name, Filter = "Zip Files (*.zip)|*.zip|All files (*.*)|*.*" };
-				if (fileSelector.ShowDialog() != DialogResult.OK)
-					return;
-				selectedPath = fileSelector.FileName;
-			}
-			catch (AggregateException aggEx)
-			{
-				Log.Logger.Error(aggEx, "Checking for new version too often");
-				return;
-			}
-			catch (Exception ex)
-			{
-				MessageBoxAlertAdmin.Show("Error checking for update", "Error checking for update", ex);
-				return;
-			}
-
-			try
-			{
-				LibationWinForms.BookLiberation.ProcessorAutomationController.DownloadFile(zipUrl, selectedPath, true);
-			}
-			catch (Exception ex)
-			{
-				MessageBoxAlertAdmin.Show("Error downloading update", "Error downloading update", ex);
-			}
-		}
-
-		private static Octokit.Release getLatestRelease(TimeSpan timeout)
-		{
-			var task = System.Threading.Tasks.Task.Run(() => getLatestRelease());
-			if (task.Wait(timeout))
-				return task.Result;
-
-			Log.Logger.Information("Timed out");
-			return null;
-		}
-		private static Octokit.Release getLatestRelease()
-		{
-			var gitHubClient = new Octokit.GitHubClient(new Octokit.ProductHeaderValue("Libation"));
-
-			// https://octokitnet.readthedocs.io/en/latest/releases/
-			var releases = gitHubClient.Repository.Release.GetAll("rmcrackan", "Libation").GetAwaiter().GetResult();
-			var latest = releases.First(r => !r.Draft && !r.Prerelease);
-			return latest;
-		}
-
-		private static Version BuildVersion => System.Reflection.Assembly.GetExecutingAssembly().GetName().Version;
-	}
-}

LibationSearchEngine/LibationSearchEngine.csproj

@@ -9,7 +9,10 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\LuceneNet303r2\LuceneNet303r2\LuceneNet303r2.csproj" />
+    <PackageReference Include="LuceneNet303r2" Version="3.0.3.2" />
+  </ItemGroup>
+
+  <ItemGroup>
     <ProjectReference Include="..\DataLayer\DataLayer.csproj" />
     <ProjectReference Include="..\FileManager\FileManager.csproj" />
   </ItemGroup>

LibationSearchEngine/LuceneExtensions.cs

@@ -9,24 +9,24 @@ using Lucene.Net.Search;
 namespace LibationSearchEngine
 {
     // field names are case specific and, due to StandardAnalyzer, content is case INspecific
-    public static class LuceneExtensions
+    internal static class LuceneExtensions
     {
-        public static void AddRaw(this Document document, string name, string value)
+        internal static void AddRaw(this Document document, string name, string value)
             => document.Add(new Field(name, value, Field.Store.YES, Field.Index.NOT_ANALYZED));
 
-        public static void AddAnalyzed(this Document document, string name, string value)
+        internal static void AddAnalyzed(this Document document, string name, string value)
         {
             if (value != null)
                 document.Add(new Field(name.ToLowerInvariant(), value, Field.Store.YES, Field.Index.ANALYZED));
         }
 
-        public static void AddNotAnalyzed(this Document document, string name, string value)
+        internal static void AddNotAnalyzed(this Document document, string name, string value)
             => document.Add(new Field(name.ToLowerInvariant(), value, Field.Store.YES, Field.Index.NOT_ANALYZED));
 
-        public static void AddBool(this Document document, string name, bool value)
+        internal static void AddBool(this Document document, string name, bool value)
             => document.Add(new Field(name.ToLowerInvariant(), value.ToString(), Field.Store.YES, Field.Index.ANALYZED_NO_NORMS));
 
-        public static Query GetQuery(this Analyzer analyzer, string defaultField, string searchString)
+        internal static Query GetQuery(this Analyzer analyzer, string defaultField, string searchString)
             => new QueryParser(SearchEngine.Version, defaultField.ToLowerInvariant(), analyzer).Parse(searchString);
 
         // put all numbers, including dates, into this format:

LibationSearchEngine/SearchEngine.cs

@@ -107,14 +107,14 @@ namespace LibationSearchEngine
             = new ReadOnlyDictionary<string, Func<LibraryBook, bool>>(
                 new Dictionary<string, Func<LibraryBook, bool>>
                 {
-                    ["HasDownloads"] = lb => lb.Book.Supplements.Any(),
-                    ["HasDownload"] = lb => lb.Book.Supplements.Any(),
-                    ["Downloads"] = lb => lb.Book.Supplements.Any(),
-                    ["Download"] = lb => lb.Book.Supplements.Any(),
-                    ["HasPDFs"] = lb => lb.Book.Supplements.Any(),
-                    ["HasPDF"] = lb => lb.Book.Supplements.Any(),
-                    ["PDFs"] = lb => lb.Book.Supplements.Any(),
-                    ["PDF"] = lb => lb.Book.Supplements.Any(),
+                    ["HasDownloads"] = lb => lb.Book.HasPdf,
+                    ["HasDownload"] = lb => lb.Book.HasPdf,
+                    ["Downloads"] = lb => lb.Book.HasPdf,
+                    ["Download"] = lb => lb.Book.HasPdf,
+                    ["HasPDFs"] = lb => lb.Book.HasPdf,
+                    ["HasPDF"] = lb => lb.Book.HasPdf,
+                    ["PDFs"] = lb => lb.Book.HasPdf,
+                    ["PDF"] = lb => lb.Book.HasPdf,
 
                     ["IsRated"] = lb => lb.Book.UserDefinedItem.Rating.OverallRating > 0f,
                     ["Rated"] = lb => lb.Book.UserDefinedItem.Rating.OverallRating > 0f,
@@ -129,6 +129,11 @@ namespace LibationSearchEngine
                     ["IsLiberated"] = lb => isLiberated(lb.Book),
                     ["Liberated"] = lb => isLiberated(lb.Book),
                     ["LiberatedError"] = lb => liberatedError(lb.Book),
+
+                    ["Podcast"] = lb => lb.Book.ContentType == ContentType.Episode,
+                    ["IsPodcast"] = lb => lb.Book.ContentType == ContentType.Episode,
+                    ["Episode"] = lb => lb.Book.ContentType == ContentType.Episode,
+                    ["IsEpisode"] = lb => lb.Book.ContentType == ContentType.Episode,
                 }
                 );
 
@@ -192,25 +197,9 @@ namespace LibationSearchEngine
 		#endregion
 
 		#region create and update index
-        /// <summary>
-        /// create new. ie: full re-index
-        /// </summary>
-        /// <param name="overwrite"></param>
-        public void CreateNewIndex(LibationContext context, bool overwrite = true)
+        /// <summary>create new. ie: full re-index</summary>
+        public void CreateNewIndex(IEnumerable<LibraryBook> library, bool overwrite = true)
         {
-            //  300 titles:  200- 400 ms
-            // 1021 titles: 1777-2250 ms
-            var sw = System.Diagnostics.Stopwatch.StartNew();
-            var stamps = new List<long>();
-            void log() => stamps.Add(sw.ElapsedMilliseconds);
-
-
-            log();
-
-            var library = context.GetLibrary_Flat_NoTracking();
-
-            log();
-
 			// location of index/create the index
 			using var index = getIndex();
             var exists = IndexReader.IndexExists(index);
@@ -224,8 +213,6 @@ namespace LibationSearchEngine
 				var doc = createBookIndexDocument(libraryBook);
 				ixWriter.AddDocument(doc);
 			}
-
-            log();
         }
 
 		/// <summary>Long running. Use await Task.Run(() => UpdateBook(productId))</summary>
@@ -328,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/AsyncNotifyPropertyChanged.cs

@@ -9,6 +9,6 @@ namespace LibationWinForms
 		public event PropertyChangedEventHandler PropertyChanged;
 
 		public void NotifyPropertyChanged([CallerMemberName] string propertyName = "")
-			=> this.UIThread(() => PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName)));
+			=> this.UIThreadAsync(() => PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName)));
 	}
 }

LibationWinForms/BookLiberation/AudioConvertForm.cs

@@ -1,23 +1,33 @@
 using DataLayer;
+using FileManager;
 using System;
 
 namespace LibationWinForms.BookLiberation
 {
 	class AudioConvertForm : AudioDecodeForm
 	{
+		public AudioConvertForm()
+		{
+			this.Load += (_, _) => this.RestoreSizeAndLocation(Configuration.Instance);
+			this.FormClosing += (_, _) => this.SaveSizeAndLocation(Configuration.Instance);
+		}
+
 		#region AudioDecodeForm overrides
 		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

@@ -1,8 +1,8 @@
-using DataLayer;
+using System;
+using DataLayer;
 using Dinah.Core.Net.Http;
-using Dinah.Core.Windows.Forms;
+using Dinah.Core.Threading;
 using LibationWinForms.BookLiberation.BaseForms;
-using System;
 
 namespace LibationWinForms.BookLiberation
 {
@@ -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,55 +40,68 @@ 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;
 
 			if (downloadProgress.ProgressPercentage == 0)
 				updateRemainingTime(0);
 			else
-				progressBar1.UIThread(() => progressBar1.Value = (int)downloadProgress.ProgressPercentage);
+				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)
 		{
-			this.UIThread(() => this.Text = DecodeActionName + " " + title);
+			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.UIThread(() => 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
 		private void updateBookInfo()
-			=> bookInfoLbl.UIThread(() => bookInfoLbl.Text = $"{title}\r\nBy {authorNames}\r\nNarrated by {narratorNames}");
+			=> bookInfoLbl.UIThreadAsync(() => bookInfoLbl.Text = $"{title}\r\nBy {authorNames}\r\nNarrated by {narratorNames}");
 
 		private void updateRemainingTime(int remaining)
-			=> remainingTimeLbl.UIThread(() => remainingTimeLbl.Text = $"ETA:\r\n{remaining} sec");
+			=> remainingTimeLbl.UIThreadAsync(() => remainingTimeLbl.Text = $"ETA:\r\n{remaining} sec");
 	}
 }

LibationWinForms/BookLiberation/AudioDecryptForm.cs

@@ -1,23 +1,33 @@
 using DataLayer;
+using FileManager;
 using System;
 
 namespace LibationWinForms.BookLiberation
 {
 	class AudioDecryptForm : AudioDecodeForm
 	{
+		public AudioDecryptForm()
+		{
+			this.Load += (_, _) => this.RestoreSizeAndLocation(Configuration.Instance);
+			this.FormClosing += (_, _) => this.SaveSizeAndLocation(Configuration.Instance);
+		}
+
 		#region AudioDecodeForm overrides
 		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/AutomatedBackupsForm.cs

@@ -1,7 +1,6 @@
-using Dinah.Core.Windows.Forms;
-using System;
-using System.Linq;
+using System;
 using System.Windows.Forms;
+using Dinah.Core.Threading;
 
 namespace LibationWinForms.BookLiberation
 {
@@ -19,7 +18,7 @@ namespace LibationWinForms.BookLiberation
 		public void WriteLine(string text)
 		{
 			if (!IsDisposed)
-				logTb.UIThread(() => logTb.AppendText($"{DateTime.Now} {text}{Environment.NewLine}"));
+				logTb.UIThreadAsync(() => logTb.AppendText($"{DateTime.Now} {text}{Environment.NewLine}"));
 		}
 
 		public void FinalizeUI()

LibationWinForms/BookLiberation/BaseForms/LiberationBaseForm.cs

@@ -1,15 +1,15 @@
-using DataLayer;
+using System;
+using System.Windows.Forms;
+using DataLayer;
 using Dinah.Core.Net.Http;
 using Dinah.Core.Threading;
 using FileLiberator;
-using System;
-using System.Windows.Forms;
 
 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();
 		}
@@ -122,8 +122,8 @@ namespace LibationWinForms.BookLiberation.BaseForms
 		/// <summary>
 		/// If the form was shown using Show (not ShowDialog), Form.Close calls Form.Dispose
 		/// </summary>
-		private void OnStreamingCompletedClose(object sender, string completedString) => this.UIThread(Close);
-		private void OnCompletedDispose(object sender, LibraryBook e) => this.UIThread(Dispose);
+		private void OnStreamingCompletedClose(object sender, string completedString) => this.UIThreadAsync(Close);
+		private void OnCompletedDispose(object sender, LibraryBook e) => this.UIThreadAsync(Dispose);
 
 		/// <summary>
 		/// If StreamingBegin is fired from a worker thread, the window will be created on that
@@ -132,29 +132,31 @@ namespace LibationWinForms.BookLiberation.BaseForms
 		/// could cause it to freeze. Form.BeginInvoke won't work until the form is created 
 		/// (ie. shown) because Control doesn't get a window handle until it is Shown.
 		/// </summary>
-		private void OnStreamingBeginShow(object sender, string beginString) => Invoker.UIThread(Show);
-		
+		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

@@ -1,9 +1,8 @@
-using Dinah.Core.Net.Http;
-using Dinah.Core.Windows.Forms;
-using LibationWinForms.BookLiberation.BaseForms;
-using System;
-using System.Linq;
+using System;
 using System.Windows.Forms;
+using Dinah.Core.Net.Http;
+using Dinah.Core.Threading;
+using LibationWinForms.BookLiberation.BaseForms;
 
 namespace LibationWinForms.BookLiberation
 {
@@ -18,22 +17,24 @@ 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)
 		{
-			filenameLbl.UIThread(() => filenameLbl.Text = 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;
 
-			progressLbl.UIThread(() => progressLbl.Text = $"{downloadProgress.BytesReceived:#,##0} of {downloadProgress.TotalBytesToReceive.Value:#,##0}");
+			progressLbl.UIThreadAsync(() => progressLbl.Text = $"{downloadProgress.BytesReceived:#,##0} of {downloadProgress.TotalBytesToReceive.Value:#,##0}");
 
 			var d = double.Parse(downloadProgress.BytesReceived.ToString()) / double.Parse(downloadProgress.TotalBytesToReceive.Value.ToString()) * 100.0;
 			var i = int.Parse(Math.Truncate(d).ToString());
-			progressBar1.UIThread(() => progressBar1.Value = i);
+			progressBar1.UIThreadAsync(() => progressBar1.Value = i);
 
 			lastDownloadProgress = DateTime.Now;
 		}
@@ -50,14 +51,14 @@ namespace LibationWinForms.BookLiberation
 		private void timer_Tick(object sender, EventArgs e)
 		{
 			// if no update in the last 30 seconds, display frozen label
-			lastUpdateLbl.UIThread(() => lastUpdateLbl.Visible = lastDownloadProgress.AddSeconds(30) < DateTime.Now);
+			lastUpdateLbl.UIThreadAsync(() => lastUpdateLbl.Visible = lastDownloadProgress.AddSeconds(30) < DateTime.Now);
 			if (lastUpdateLbl.Visible)
 			{
 				var diff = DateTime.Now - lastDownloadProgress;
 				var min = (int)diff.TotalMinutes;
 				var minText = min > 0 ? $"{min}min " : "";
 
-				lastUpdateLbl.UIThread(() => lastUpdateLbl.Text = $"Frozen? Last download activity: {minText}{diff.Seconds}sec ago");
+				lastUpdateLbl.UIThreadAsync(() => lastUpdateLbl.Text = $"Frozen? Last download activity: {minText}{diff.Seconds}sec ago");
 			}
 		}
 		private void DownloadForm_FormClosing(object sender, FormClosingEventArgs e) => timer.Stop();

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

@@ -50,24 +50,24 @@ namespace LibationWinForms.BookLiberation
 
 	public static class ProcessorAutomationController
 	{
-		public static async Task BackupSingleBookAsync(LibraryBook libraryBook, EventHandler<LibraryBook> completedAction = null)
+		public static async Task BackupSingleBookAsync(LibraryBook libraryBook)
 		{
 			Serilog.Log.Logger.Information($"Begin {nameof(BackupSingleBookAsync)} {{@DebugInfo}}", new { libraryBook?.Book?.AudibleProductId });
 
 			var logMe = LogMe.RegisterForm();
-			var backupBook = CreateBackupBook(completedAction, logMe);
+			var backupBook = CreateBackupBook(logMe);
 
 			// continue even if libraryBook is null. we'll display even that in the processing box
 			await new BackupSingle(logMe, backupBook, libraryBook).RunBackupAsync();
 		}
 
-		public static async Task BackupAllBooksAsync(EventHandler<LibraryBook> completedAction = null)
+		public static async Task BackupAllBooksAsync()
 		{
 			Serilog.Log.Logger.Information("Begin " + nameof(BackupAllBooksAsync));
 
 			var automatedBackupsForm = new AutomatedBackupsForm();
 			var logMe = LogMe.RegisterForm(automatedBackupsForm);
-			var backupBook = CreateBackupBook(completedAction, logMe);
+			var backupBook = CreateBackupBook(logMe);
 
 			await new BackupLoop(logMe, backupBook, automatedBackupsForm).RunBackupAsync();
 		}
@@ -84,19 +84,19 @@ namespace LibationWinForms.BookLiberation
 			await new BackupLoop(logMe, convertBook, automatedBackupsForm).RunBackupAsync();
 		}
 
-		public static async Task BackupAllPdfsAsync(EventHandler<LibraryBook> completedAction = null)
+		public static async Task BackupAllPdfsAsync()
 		{
 			Serilog.Log.Logger.Information("Begin " + nameof(BackupAllPdfsAsync));
 
 			var automatedBackupsForm = new AutomatedBackupsForm();
 			var logMe = LogMe.RegisterForm(automatedBackupsForm);
 
-			var downloadPdf = CreateProcessable<DownloadPdf, PdfDownloadForm>(logMe, completedAction);
+			var downloadPdf = CreateProcessable<DownloadPdf, PdfDownloadForm>(logMe);
 
 			await new BackupLoop(logMe, downloadPdf, automatedBackupsForm).RunBackupAsync();
 		}
 
-		private static IProcessable CreateBackupBook(EventHandler<LibraryBook> completedAction, LogMe logMe)
+		private static Processable CreateBackupBook(LogMe logMe)
 		{
 			var downloadPdf = CreateProcessable<DownloadPdf, PdfDownloadForm>(logMe);
 
@@ -104,7 +104,6 @@ namespace LibationWinForms.BookLiberation
 			async void onDownloadDecryptBookCompleted(object sender, LibraryBook e)
 			{
 				await downloadPdf.TryProcessAsync(e);
-				completedAction(sender, e);
 			}
 
 			var downloadDecryptBook = CreateProcessable<DownloadDecryptBook, AudioDecryptForm>(logMe, onDownloadDecryptBookCompleted);
@@ -133,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();
 
@@ -150,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;
@@ -162,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;
@@ -197,8 +196,6 @@ namespace LibationWinForms.BookLiberation
 
 		protected async Task<bool> ProcessOneAsync(LibraryBook libraryBook, bool validate)
 		{
-			string logMessage;
-
 			try
 			{
 				var statusHandler = await Processable.ProcessSingleAsync(libraryBook, validate);
@@ -208,18 +205,28 @@ namespace LibationWinForms.BookLiberation
 
 				foreach (var errorMessage in statusHandler.Errors)
 					LogMe.Error(errorMessage);
-
-				logMessage = statusHandler.Errors.Aggregate((a, b) => $"{a}\r\n{b}");
 			}
 			catch (Exception ex)
 			{
 				LogMe.Error(ex);
-
-				logMessage = ex.Message + "\r\n|\r\n" + ex.StackTrace;
 			}
 
+			return showRetry(libraryBook);
+		}
+
+		private bool showRetry(LibraryBook libraryBook)
+		{
 			LogMe.Error("ERROR. All books have not been processed. Most recent book: processing failed");
 
+			DialogResult? dialogResult = FileManager.Configuration.Instance.BadBook switch
+			{
+				FileManager.Configuration.BadBookAction.Abort => DialogResult.Abort,
+				FileManager.Configuration.BadBookAction.Retry => DialogResult.Retry,
+				FileManager.Configuration.BadBookAction.Ignore => DialogResult.Ignore,
+				FileManager.Configuration.BadBookAction.Ask => null,
+				_ => null
+			};
+
 			string details;
 			try
 			{
@@ -239,14 +246,15 @@ $@"  Title: {libraryBook.Book.Title}
 				details = "[Error retrieving details]";
 			}
 
-			var dialogResult = MessageBox.Show(string.Format(SkipDialogText, details), "Skip importing this book?", SkipDialogButtons, MessageBoxIcon.Question, SkipDialogDefaultButton);
+			// if null then ask user
+			dialogResult ??= MessageBox.Show(string.Format(SkipDialogText + "\r\n\r\nSee Settings to avoid this box in the future.", details), "Skip importing this book?", SkipDialogButtons, MessageBoxIcon.Question, SkipDialogDefaultButton);
 
 			if (dialogResult == DialogResult.Abort)
 				return false;
 
 			if (dialogResult == SkipResult)
 			{
-				ApplicationServices.LibraryCommands.UpdateBook(libraryBook, LiberatedStatus.Error);
+				libraryBook.Book.UserDefinedItem.BookStatus = LiberatedStatus.Error;
 				LogMe.Info($"Error. Skip: [{libraryBook.Book.AudibleProductId}] {libraryBook.Book.Title}");
 			}
 
@@ -270,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;
@@ -289,7 +297,7 @@ An error occurred while trying to process this book. Skip this book permanently?
 An error occurred while trying to process this book.
 {0}
 
-- ABORT: stop processing books.
+- ABORT: Stop processing books.
 
 - RETRY: retry this book later. Just skip it for now. Continue processing books. (Will try this book again later.)
 
@@ -299,13 +307,13 @@ 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()
 		{
 			// support for 'skip this time only' requires state. iterators provide this state for free. therefore: use foreach/iterator here
-			foreach (var libraryBook in Processable.GetValidLibraryBooks())
+			foreach (var libraryBook in Processable.GetValidLibraryBooks(ApplicationServices.DbContexts.GetLibrary_Flat_NoTracking()))
 			{
 				var keepGoing = await ProcessOneAsync(libraryBook, validate: false);
 				if (!keepGoing)

LibationWinForms/Dialogs/BookDetailsDialog.Designer.cs

@@ -99,7 +99,7 @@
 			this.detailsTb.ReadOnly = true;
 			this.detailsTb.ScrollBars = System.Windows.Forms.ScrollBars.Both;
 			this.detailsTb.Size = new System.Drawing.Size(484, 202);
-			this.detailsTb.TabIndex = 0;
+			this.detailsTb.TabIndex = 1;
 			// 
 			// tagsGb
 			// 
@@ -110,7 +110,7 @@
 			this.tagsGb.Location = new System.Drawing.Point(12, 220);
 			this.tagsGb.Name = "tagsGb";
 			this.tagsGb.Size = new System.Drawing.Size(570, 73);
-			this.tagsGb.TabIndex = 1;
+			this.tagsGb.TabIndex = 0;
 			this.tagsGb.TabStop = false;
 			this.tagsGb.Text = "Edit Tags";
 			// 

LibationWinForms/Dialogs/BookDetailsDialog.cs

@@ -77,7 +77,6 @@ Purchase Date: {_libraryBook.DateAdded.ToString("d")}
 				if (status == LiberatedStatus.Error)
 					this.bookLiberatedCb.Items.Add(new liberatedComboBoxItem { Status = LiberatedStatus.Error, Text = "Error" });
 
-
 				setDefaultComboBox(this.bookLiberatedCb, status);
 			}
 

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">