increment version

Fix temp file storage/deletion + a few new features:

* .tmp and .json files are again properly stored in DownloadsInProgressDirectory, and the are again used if resuming a download.
* Yellow stoplight works again.
* All audio files stored in DecryptInProgressDirectory are deleted if the conversion fails Partial / Complete files in %temp%\Libation are not tidied / reused #144
* Added option to retain aax file Feature Request: Allow saving the original aax #187
* Add option to remove "(Unabridged)" from metadata tags Remove "(Unabridged)" from the title? #223
* Added options for mp3 encoding
* Add option to create cue sheet
* Prevent same book being decrypted more than once at a time
* Made a new settings tab for all audio file editing/fixing options.

.gitignore

@@ -4,6 +4,7 @@
 ## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore
 
 # User-specific files
+*.rsuser
 *.suo
 *.user
 *.userosscache
@@ -12,6 +13,9 @@
 # User-specific files (MonoDevelop/Xamarin Studio)
 *.userprefs
 
+# Mono auto generated files
+mono_crash.*
+
 # Build results
 [Dd]ebug/
 [Dd]ebugPublic/
@@ -19,10 +23,15 @@
 [Rr]eleases/
 x64/
 x86/
+[Ww][Ii][Nn]32/
+[Aa][Rr][Mm]/
+[Aa][Rr][Mm]64/
 bld/
 [Bb]in/
 [Oo]bj/
+[Oo]ut/
 [Ll]og/
+[Ll]ogs/
 
 # Visual Studio 2015/2017 cache/options directory
 .vs/
@@ -36,9 +45,10 @@ Generated\ Files/
 [Tt]est[Rr]esult*/
 [Bb]uild[Ll]og.*
 
-# NUNIT
+# NUnit
 *.VisualState.xml
 TestResult.xml
+nunit-*.xml
 
 # Build Results of an ATL Project
 [Dd]ebugPS/
@@ -52,7 +62,9 @@ BenchmarkDotNet.Artifacts/
 project.lock.json
 project.fragment.lock.json
 artifacts/
-**/Properties/launchSettings.json
+
+# ASP.NET Scaffolding
+ScaffoldingReadMe.txt
 
 # StyleCop
 StyleCopReport.xml
@@ -60,7 +72,7 @@ StyleCopReport.xml
 # Files built by Visual Studio
 *_i.c
 *_p.c
-*_i.h
+*_h.h
 *.ilk
 *.meta
 *.obj
@@ -77,6 +89,7 @@ StyleCopReport.xml
 *.tlh
 *.tmp
 *.tmp_proj
+*_wpftmp.csproj
 *.log
 *.vspscc
 *.vssscc
@@ -119,9 +132,6 @@ _ReSharper*/
 *.[Rr]e[Ss]harper
 *.DotSettings.user
 
-# JustCode is a .NET coding add-in
-.JustCode
-
 # TeamCity is a build add-in
 _TeamCity*
 
@@ -132,6 +142,11 @@ _TeamCity*
 .axoCover/*
 !.axoCover/settings.json
 
+# Coverlet is a free, cross platform Code Coverage Tool
+coverage*.json
+coverage*.xml
+coverage*.info
+
 # Visual Studio code coverage results
 *.coverage
 *.coveragexml
@@ -179,6 +194,8 @@ PublishScripts/
 
 # NuGet Packages
 *.nupkg
+# NuGet Symbol Packages
+*.snupkg
 # The packages folder can be ignored because of Package Restore
 **/[Pp]ackages/*
 # except build/, which is used as an MSBuild target.
@@ -203,12 +220,14 @@ BundleArtifacts/
 Package.StoreAssociation.xml
 _pkginfo.txt
 *.appx
+*.appxbundle
+*.appxupload
 
 # Visual Studio cache files
 # files ending in .cache can be ignored
 *.[Cc]ache
 # but keep track of directories ending in .cache
-!*.[Cc]ache/
+!?*.[Cc]ache/
 
 # Others
 ClientBin/
@@ -221,7 +240,7 @@ ClientBin/
 *.publishsettings
 orleans.codegen.cs
 
-# Including strong name files can present a security risk 
+# Including strong name files can present a security risk
 # (https://github.com/github/gitignore/pull/2483#issue-259490424)
 #*.snk
 
@@ -252,6 +271,9 @@ ServiceFabricBackup/
 *.bim.layout
 *.bim_*.settings
 *.rptproj.rsuser
+*- [Bb]ackup.rdl
+*- [Bb]ackup ([0-9]).rdl
+*- [Bb]ackup ([0-9][0-9]).rdl
 
 # Microsoft Fakes
 FakesAssemblies/
@@ -287,12 +309,8 @@ paket-files/
 # FAKE - F# Make
 .fake/
 
-# JetBrains Rider
-.idea/
-*.sln.iml
-
-# CodeRush
-.cr/
+# CodeRush personal settings
+.cr/personal
 
 # Python Tools for Visual Studio (PTVS)
 __pycache__/
@@ -317,7 +335,7 @@ __pycache__/
 # OpenCover UI analysis results
 OpenCover/
 
-# Azure Stream Analytics local run output 
+# Azure Stream Analytics local run output
 ASALocalRun/
 
 # MSBuild Binary and Structured Log
@@ -326,11 +344,29 @@ ASALocalRun/
 # NVidia Nsight GPU debugger configuration file
 *.nvuser
 
-# MFractors (Xamarin productivity tool) working folder 
+# MFractors (Xamarin productivity tool) working folder
 .mfractor/
 
+# Local History for Visual Studio
+.localhistory/
+
+# BeatPulse healthcheck temp database
+healthchecksdb
+
+# Backup folder for Package Reference Convert tool in Visual Studio 2017
+MigrationBackup/
+
+# Ionide (cross platform F# VS Code tools) working folder
+.ionide/
+
+# Fody - auto-generated XML schema
+FodyWeavers.xsd
+
+
+### manually ignored files
+
+# Windows shortcuts
+*.lnk
 
-# manually ignored files
 /__TODO.txt
 /DataLayer/LibationContext.db
-*.lnk

AaxDecrypter/AaxDecrypter.csproj

@@ -1,45 +1,16 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0-windows</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="TagLibSharp" Version="2.2.0" />
+    <PackageReference Include="AAXClean" Version="0.4.6" />
+    <PackageReference Include="AAXClean.Codecs" Version="0.2.7" />
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\Dinah.Core\Dinah.Core\Dinah.Core.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <None Update="DecryptLib\avcodec-58.dll">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Update="DecryptLib\avdevice-58.dll">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Update="DecryptLib\avfilter-7.dll">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Update="DecryptLib\avformat-58.dll">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Update="DecryptLib\avutil-56.dll">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Update="DecryptLib\ffmpeg.exe">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Update="DecryptLib\ffprobe.exe">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Update="DecryptLib\swresample-3.dll">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Update="DecryptLib\swscale-5.dll">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
+    <ProjectReference Include="..\FileManager\FileManager.csproj" />
   </ItemGroup>
 
 </Project>

AaxDecrypter/AaxcDownloadConvertBase.cs

@@ -0,0 +1,120 @@
+using System;
+using AAXClean;
+using Dinah.Core.Net.Http;
+
+namespace AaxDecrypter
+{
+	public abstract class AaxcDownloadConvertBase : AudiobookDownloadBase
+	{
+		public event EventHandler<AppleTags> RetrievedMetadata;
+
+		protected AaxFile AaxFile;
+
+		protected AaxcDownloadConvertBase(string outFileName, string cacheDirectory, DownloadOptions dlLic)
+			: base(outFileName, cacheDirectory, dlLic) { }
+
+		/// <summary>Setting cover art by this method will insert the art into the audiobook metadata</summary>
+		public override void SetCoverArt(byte[] coverArt)
+		{
+			base.SetCoverArt(coverArt);
+			if (coverArt is not null && AaxFile?.AppleTags is not null)
+				AaxFile.AppleTags.Cover = coverArt;
+		}
+
+		protected bool Step_GetMetadata()
+		{
+			AaxFile = new AaxFile(InputFileStream);
+
+			if (DownloadOptions.StripUnabridged)
+			{
+				AaxFile.AppleTags.Title = AaxFile.AppleTags.TitleSansUnabridged;
+				AaxFile.AppleTags.Album = AaxFile.AppleTags.Album?.Replace(" (Unabridged)", "");
+			}
+
+			//Finishing configuring lame encoder.
+			if (DownloadOptions.OutputFormat == OutputFormat.Mp3)
+			{
+				double bitrateMultiple = 1;
+
+				if (AaxFile.AudioChannels == 2)
+				{
+					if (DownloadOptions.Downsample)
+						bitrateMultiple = 0.5;
+					else
+						DownloadOptions.LameConfig.Mode = NAudio.Lame.MPEGMode.Stereo;
+				}
+
+				if (DownloadOptions.MatchSourceBitrate)
+				{
+					int kbps = (int)(AaxFile.AverageBitrate * bitrateMultiple / 1024);
+
+					if (DownloadOptions.LameConfig.VBR is null)
+						DownloadOptions.LameConfig.BitRate = kbps;
+					else if (DownloadOptions.LameConfig.VBR == NAudio.Lame.VBRMode.ABR)
+						DownloadOptions.LameConfig.ABRRateKbps = kbps;
+				}
+			}
+
+			OnRetrievedTitle(AaxFile.AppleTags.TitleSansUnabridged);
+			OnRetrievedAuthors(AaxFile.AppleTags.FirstAuthor ?? "[unknown]");
+			OnRetrievedNarrators(AaxFile.AppleTags.Narrator ?? "[unknown]");
+			OnRetrievedCoverArt(AaxFile.AppleTags.Cover);
+
+			RetrievedMetadata?.Invoke(this, AaxFile.AppleTags);
+
+			return !IsCanceled;
+		}
+
+		protected DownloadProgress Step_DownloadAudiobook_Start()
+		{
+			var zeroProgress = new DownloadProgress
+			{
+				BytesReceived = 0,
+				ProgressPercentage = 0,
+				TotalBytesToReceive = InputFileStream.Length
+			};
+
+			OnDecryptProgressUpdate(zeroProgress);
+
+			AaxFile.SetDecryptionKey(DownloadOptions.AudibleKey, DownloadOptions.AudibleIV);
+			return zeroProgress;
+		}
+
+		protected void Step_DownloadAudiobook_End(DownloadProgress zeroProgress)
+		{
+			AaxFile.Close();
+
+			CloseInputFileStream();
+
+			OnDecryptProgressUpdate(zeroProgress);
+		}
+
+		protected void AaxFile_ConversionProgressUpdate(object sender, ConversionProgressEventArgs e)
+		{
+			var duration = AaxFile.Duration;
+			var remainingSecsToProcess = (duration - e.ProcessPosition).TotalSeconds;
+			var estTimeRemaining = remainingSecsToProcess / e.ProcessSpeed;
+
+			if (double.IsNormal(estTimeRemaining))
+				OnDecryptTimeRemaining(TimeSpan.FromSeconds(estTimeRemaining));
+
+			var progressPercent = (e.ProcessPosition / e.TotalDuration);
+
+			OnDecryptProgressUpdate(
+				new DownloadProgress
+				{
+					ProgressPercentage = 100 * progressPercent,
+					BytesReceived = (long)(InputFileStream.Length * progressPercent),
+					TotalBytesToReceive = InputFileStream.Length
+				});
+		}
+
+		public override void Cancel()
+		{
+			IsCanceled = true;
+			AaxFile?.Cancel();
+			AaxFile?.Dispose();
+			CloseInputFileStream();
+		}
+	}
+}

AaxDecrypter/AaxcDownloadConverter.cs

@@ -1,244 +0,0 @@
-using Dinah.Core;
-using Dinah.Core.Diagnostics;
-using Dinah.Core.IO;
-using Dinah.Core.StepRunner;
-using System;
-using System.IO;
-
-namespace AaxDecrypter
-{
-    public interface ISimpleAaxcToM4bConverter
-    {
-        event EventHandler<AaxcTagLibFile> RetrievedTags;
-        event EventHandler<byte[]> RetrievedCoverArt;
-        event EventHandler<TimeSpan> DecryptTimeRemaining;
-        event EventHandler<int> DecryptProgressUpdate;
-        bool Run();
-        string AppName { get; set; }
-        string outDir { get; }
-        string outputFileName { get; }
-        DownloadLicense downloadLicense { get; }
-        AaxcTagLibFile aaxcTagLib { get; }
-        byte[] coverArt { get; }
-        void SetCoverArt(byte[] coverArt);
-        void SetOutputFilename(string outFileName);
-    }
-    public interface IAdvancedAaxcToM4bConverter : ISimpleAaxcToM4bConverter
-    {
-        void Cancel();
-        bool Step1_CreateDir();
-        bool Step2_GetMetadata();
-        bool Step3_DownloadAndCombine();
-        bool Step4_RestoreMetadata();
-        bool Step5_CreateCue();
-        bool Step6_CreateNfo();
-    }
-    public class AaxcDownloadConverter : IAdvancedAaxcToM4bConverter
-    {
-        public event EventHandler<AaxcTagLibFile> RetrievedTags;
-        public event EventHandler<byte[]> RetrievedCoverArt;
-        public event EventHandler<int> DecryptProgressUpdate;
-        public event EventHandler<TimeSpan> DecryptTimeRemaining;
-        public string AppName { get; set; } = nameof(AaxcDownloadConverter);
-        public string outDir { get; private set; }
-        public string outputFileName { get; private set; }
-        public DownloadLicense downloadLicense { get; private set; }
-        public AaxcTagLibFile aaxcTagLib { get; private set; }
-        public byte[] coverArt { get; private set; }
-
-        private StepSequence steps { get; }
-        private FFMpegAaxcProcesser aaxcProcesser;
-        private bool isCanceled { get; set; }
-
-        public static AaxcDownloadConverter Create(string outDirectory, DownloadLicense dlLic)
-        {
-            var converter = new AaxcDownloadConverter(outDirectory, dlLic);
-            converter.SetOutputFilename(Path.GetTempFileName());
-            return converter;
-        }
-
-        private AaxcDownloadConverter(string outDirectory, DownloadLicense dlLic)
-        {
-            ArgumentValidator.EnsureNotNullOrWhiteSpace(outDirectory, nameof(outDirectory));
-            ArgumentValidator.EnsureNotNull(dlLic, nameof(dlLic));
-
-            if (!Directory.Exists(outDirectory))
-                throw new ArgumentNullException(nameof(outDirectory), "Directory does not exist");
-            outDir = outDirectory;
-
-            steps = new StepSequence
-            {
-                Name = "Convert Aax To M4b",
-
-                ["Step 1: Create Dir"] = Step1_CreateDir,
-                ["Step 2: Get Aaxc Metadata"] = Step2_GetMetadata,
-                ["Step 3: Download Decrypted Audiobook"] = Step3_DownloadAndCombine,
-                ["Step 4: Restore Aaxc Metadata"] = Step4_RestoreMetadata,
-                ["Step 5: Create Cue"] = Step5_CreateCue,
-                ["Step 6: Create Nfo"] = Step6_CreateNfo,
-            };
-
-            aaxcProcesser = new FFMpegAaxcProcesser(dlLic);
-            aaxcProcesser.ProgressUpdate += AaxcProcesser_ProgressUpdate;
-
-            downloadLicense = dlLic;
-        }
-
-        public void SetOutputFilename(string outFileName)
-        {
-            outputFileName = PathLib.ReplaceExtension(outFileName, ".m4b");
-            outDir = Path.GetDirectoryName(outputFileName);
-
-            if (File.Exists(outputFileName))
-                File.Delete(outputFileName);
-        }
-
-        public void SetCoverArt(byte[] coverArt)
-        {
-            if (coverArt is null) return;
-
-            this.coverArt = coverArt;
-            RetrievedCoverArt?.Invoke(this, coverArt);
-        }
-
-        public bool Run()
-        {
-            var (IsSuccess, Elapsed) = steps.Run();
-
-            if (!IsSuccess)
-            {
-                Console.WriteLine("WARNING-Conversion failed");
-                return false;
-            }
-
-            var speedup = (int)(aaxcTagLib.Properties.Duration.TotalSeconds / (long)Elapsed.TotalSeconds);
-            Console.WriteLine("Speedup is " + speedup + "x realtime.");
-            Console.WriteLine("Done");
-            return true;
-        }
-
-        public bool Step1_CreateDir()
-        {
-            ProcessRunner.WorkingDir = outDir;
-            Directory.CreateDirectory(outDir);
-
-            return !isCanceled;
-        }
-
-        public bool Step2_GetMetadata()
-        {
-            //Get metadata from the file over http
-            var client = new System.Net.Http.HttpClient();
-            client.DefaultRequestHeaders.Add("User-Agent", downloadLicense.UserAgent);
-            var networkFile = NetworkFileAbstraction.CreateAsync(client, new Uri(downloadLicense.DownloadUrl)).GetAwaiter().GetResult();
-
-            aaxcTagLib = new AaxcTagLibFile(networkFile);
-
-            if (coverArt is null && aaxcTagLib.AppleTags.Pictures.Length > 0)
-            {
-                coverArt = aaxcTagLib.AppleTags.Pictures[0].Data.Data;
-            }
-
-            RetrievedTags?.Invoke(this, aaxcTagLib);
-            RetrievedCoverArt?.Invoke(this, coverArt);
-
-            return !isCanceled;
-        }
-
-        public bool Step3_DownloadAndCombine()
-        {
-            DecryptProgressUpdate?.Invoke(this, int.MaxValue);
-
-            bool userSuppliedChapters = downloadLicense.ChapterInfo != null;
-
-            string metadataPath = null;
-
-            if (userSuppliedChapters)
-            {
-                //Only write chaopters to the metadata file. All other aaxc metadata will be
-                //wiped out but is restored in Step 3.
-                metadataPath = Path.Combine(outDir, Path.GetFileName(outputFileName) + ".ffmeta");
-                File.WriteAllText(metadataPath, downloadLicense.ChapterInfo.ToFFMeta(true));
-            }
-
-            aaxcProcesser.ProcessBook(
-                outputFileName,
-                metadataPath)
-                .GetAwaiter()
-                .GetResult();
-
-            if (!userSuppliedChapters && aaxcProcesser.Succeeded)
-                downloadLicense.ChapterInfo = new ChapterInfo(outputFileName);
-
-            if (userSuppliedChapters)
-                FileExt.SafeDelete(metadataPath);
-
-            DecryptProgressUpdate?.Invoke(this, 0);
-
-            return aaxcProcesser.Succeeded && !isCanceled;
-        }
-
-        private void AaxcProcesser_ProgressUpdate(object sender, AaxcProcessUpdate e)
-        {
-            double remainingSecsToProcess = (aaxcTagLib.Properties.Duration - e.ProcessPosition).TotalSeconds;
-            double estTimeRemaining = remainingSecsToProcess / e.ProcessSpeed;
-
-            if (double.IsNormal(estTimeRemaining))
-                DecryptTimeRemaining?.Invoke(this, TimeSpan.FromSeconds(estTimeRemaining));
-
-            double progressPercent = 100 * e.ProcessPosition.TotalSeconds / aaxcTagLib.Properties.Duration.TotalSeconds;
-
-            DecryptProgressUpdate?.Invoke(this, (int)progressPercent);
-        }
-
-        /// <summary>
-        /// Copy all aacx metadata to m4b file, including cover art.
-        /// </summary>
-        public bool Step4_RestoreMetadata()
-        {
-            var outFile = new AaxcTagLibFile(outputFileName);
-            outFile.CopyTagsFrom(aaxcTagLib);
-
-            if (outFile.AppleTags.Pictures.Length == 0 && coverArt is not null)
-            {
-                outFile.AddPicture(coverArt);
-            }
-
-            outFile.Save();
-
-            return !isCanceled;
-        }
-
-        public bool Step5_CreateCue()
-        {
-            try
-            {
-                File.WriteAllText(PathLib.ReplaceExtension(outputFileName, ".cue"), Cue.CreateContents(Path.GetFileName(outputFileName), downloadLicense.ChapterInfo));
-            }
-            catch (Exception ex)
-            {
-                Serilog.Log.Logger.Error(ex, $"{nameof(Step5_CreateCue)}. FAILED");
-            }
-            return !isCanceled;
-        }
-
-        public bool Step6_CreateNfo()
-        {
-            try
-            {
-                File.WriteAllText(PathLib.ReplaceExtension(outputFileName, ".nfo"), NFO.CreateContents(AppName, aaxcTagLib, downloadLicense.ChapterInfo));
-            }
-            catch (Exception ex)
-            {
-                Serilog.Log.Logger.Error(ex, $"{nameof(Step5_CreateCue)}. FAILED");
-            }
-            return !isCanceled;
-        }
-
-        public void Cancel()
-        {
-            isCanceled = true;
-            aaxcProcesser.Cancel();
-        }
-    }
-}

AaxDecrypter/AaxcDownloadMultiConverter.cs

@@ -0,0 +1,141 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using AAXClean;
+using AAXClean.Codecs;
+using Dinah.Core.StepRunner;
+using FileManager;
+
+namespace AaxDecrypter
+{
+	public class AaxcDownloadMultiConverter : AaxcDownloadConvertBase
+	{
+		protected override StepSequence Steps { get; }
+
+        private Func<MultiConvertFileProperties, string> multipartFileNameCallback { get; }
+
+        private static TimeSpan minChapterLength { get; } = TimeSpan.FromSeconds(3);
+		private List<string> multiPartFilePaths { get; } = new List<string>();
+
+        public AaxcDownloadMultiConverter(string outFileName, string cacheDirectory, DownloadOptions dlLic,
+            Func<MultiConvertFileProperties, string> multipartFileNameCallback = null)
+			: base(outFileName, cacheDirectory, dlLic)
+        {
+            Steps = new StepSequence
+            {
+                Name = "Download and Convert Aaxc To " + DownloadOptions.OutputFormat,
+
+                ["Step 1: Get Aaxc Metadata"] = Step_GetMetadata,
+                ["Step 2: Download Decrypted Audiobook"] = Step_DownloadAudiobookAsMultipleFilesPerChapter,
+                ["Step 3: Cleanup"] = Step_Cleanup,
+            };
+            this.multipartFileNameCallback = multipartFileNameCallback ?? MultiConvertFileProperties.DefaultMultipartFilename;
+        }
+
+        /*
+https://github.com/rmcrackan/Libation/pull/127#issuecomment-939088489
+
+If the chapter truly is empty, that is, 0 audio frames in length, then yes it is ignored.
+If the chapter is shorter than 3 seconds long but still has some audio frames, those frames are combined with the following chapter and not split into a new file.
+
+I also implemented file naming by chapter title. When 2 or more consecutive chapters are combined, the first of the combined chapter's title is used in the file name. For example, given an audiobook with the following chapters:
+
+00:00:00 - 00:00:02 | Part 1
+00:00:02 - 00:35:00 | Chapter 1
+00:35:02 - 01:02:00 | Chapter 2
+01:02:00 - 01:02:02 | Part 2
+01:02:02 - 01:41:00 | Chapter 3
+01:41:00 - 02:05:00 | Chapter 4
+
+The book will be split into the following files:
+
+00:00:00 - 00:35:00 | Book - 01 - Part 1.m4b
+00:35:00 - 01:02:00 | Book - 02 - Chapter 2.m4b
+01:02:00 - 01:41:00 | Book - 03 - Part 2.m4b
+01:41:00 - 02:05:00 | Book - 04 - Chapter 4.m4b
+
+That naming may not be desirable for everyone, but it's an easy change to instead use the last of the combined chapter's title in the file name.
+         */
+        private bool Step_DownloadAudiobookAsMultipleFilesPerChapter()
+        {
+            var zeroProgress = Step_DownloadAudiobook_Start();
+
+            var chapters = DownloadOptions.ChapterInfo.Chapters.ToList();
+
+            // Ensure split files are at least minChapterLength in duration.
+            var splitChapters = new ChapterInfo(DownloadOptions.ChapterInfo.StartOffset);
+
+            var runningTotal = TimeSpan.Zero;
+            string title = "";
+
+            for (int i = 0; i < chapters.Count; i++)
+            {
+                if (runningTotal == TimeSpan.Zero)
+                    title = chapters[i].Title;
+
+                runningTotal += chapters[i].Duration;
+
+                if (runningTotal >= minChapterLength)
+                {
+                    splitChapters.AddChapter(title, runningTotal);
+                    runningTotal = TimeSpan.Zero;
+                }
+            }
+
+            // reset, just in case
+            multiPartFilePaths.Clear();
+
+            ConversionResult result;
+
+            AaxFile.ConversionProgressUpdate += AaxFile_ConversionProgressUpdate;
+            if (DownloadOptions.OutputFormat == OutputFormat.M4b)
+                result = ConvertToMultiMp4a(splitChapters);
+            else
+                result = ConvertToMultiMp3(splitChapters);
+            AaxFile.ConversionProgressUpdate -= AaxFile_ConversionProgressUpdate;
+
+            Step_DownloadAudiobook_End(zeroProgress);
+
+            return result == ConversionResult.NoErrorsDetected;
+        }
+
+        private ConversionResult ConvertToMultiMp4a(ChapterInfo splitChapters)
+        {
+            var chapterCount = 0;
+            return AaxFile.ConvertToMultiMp4a(splitChapters, newSplitCallback =>
+                createOutputFileStream(++chapterCount, splitChapters, newSplitCallback),
+            DownloadOptions.TrimOutputToChapterLength);
+        }
+
+        private ConversionResult ConvertToMultiMp3(ChapterInfo splitChapters)
+        {
+            var chapterCount = 0;
+            return AaxFile.ConvertToMultiMp3(splitChapters, newSplitCallback =>
+            {
+                createOutputFileStream(++chapterCount, splitChapters, newSplitCallback);
+                ((NAudio.Lame.LameConfig)newSplitCallback.UserState).ID3.Track = chapterCount.ToString();
+            }, DownloadOptions.LameConfig, DownloadOptions.TrimOutputToChapterLength);
+        }
+
+        private void createOutputFileStream(int currentChapter, ChapterInfo splitChapters, NewSplitCallback newSplitCallback)
+        {
+            var fileName = multipartFileNameCallback(new()
+            {
+                OutputFileName = OutputFileName,
+                PartsPosition = currentChapter,
+                PartsTotal = splitChapters.Count,
+                Title = newSplitCallback?.Chapter?.Title
+            });
+            fileName = FileUtility.GetValidFilename(fileName);
+
+            multiPartFilePaths.Add(fileName);
+
+            FileUtility.SaferDelete(fileName);
+
+            newSplitCallback.OutputFile = File.Open(fileName, FileMode.OpenOrCreate);
+
+            OnFileCreated(fileName);
+        }
+    }
+}

AaxDecrypter/AaxcDownloadSingleConverter.cs

@@ -0,0 +1,55 @@
+using System;
+using System.IO;
+using AAXClean;
+using AAXClean.Codecs;
+using Dinah.Core.StepRunner;
+using FileManager;
+
+namespace AaxDecrypter
+{
+	public class AaxcDownloadSingleConverter : AaxcDownloadConvertBase
+	{
+		protected override StepSequence Steps { get; }
+
+        public AaxcDownloadSingleConverter(string outFileName, string cacheDirectory, DownloadOptions dlLic)
+			: base(outFileName, cacheDirectory, dlLic)
+        {
+            Steps = new StepSequence
+            {
+                Name = "Download and Convert Aaxc To " + DownloadOptions.OutputFormat,
+
+                ["Step 1: Get Aaxc Metadata"] = Step_GetMetadata,
+                ["Step 2: Download Decrypted Audiobook"] = Step_DownloadAudiobookAsSingleFile,
+                ["Step 3: Create Cue"] = Step_CreateCue,
+                ["Step 4: Cleanup"] = Step_Cleanup,
+            };
+        }
+
+        private bool Step_DownloadAudiobookAsSingleFile()
+        {
+            var zeroProgress = Step_DownloadAudiobook_Start();
+
+            FileUtility.SaferDelete(OutputFileName);
+
+            var outputFile = File.Open(OutputFileName, FileMode.OpenOrCreate, FileAccess.ReadWrite);
+            OnFileCreated(OutputFileName);
+
+            AaxFile.ConversionProgressUpdate += AaxFile_ConversionProgressUpdate;
+            var decryptionResult
+                = DownloadOptions.OutputFormat == OutputFormat.M4b
+                ? AaxFile.ConvertToMp4a(outputFile, DownloadOptions.ChapterInfo, DownloadOptions.TrimOutputToChapterLength)
+                : AaxFile.ConvertToMp3(outputFile, DownloadOptions.LameConfig, DownloadOptions.ChapterInfo, DownloadOptions.TrimOutputToChapterLength);
+            AaxFile.ConversionProgressUpdate -= AaxFile_ConversionProgressUpdate;
+
+            DownloadOptions.ChapterInfo = AaxFile.Chapters;
+
+            Step_DownloadAudiobook_End(zeroProgress);
+
+            var success = decryptionResult == ConversionResult.NoErrorsDetected && !IsCanceled;
+            if (success)
+                base.OnFileCreated(OutputFileName);
+
+            return success;
+        }
+    }
+}

AaxDecrypter/AaxcTagLibFile.cs

@@ -1,75 +0,0 @@
-using System;
-using System.Linq;
-using Dinah.Core;
-using TagLib;
-using TagLib.Mpeg4;
-
-namespace AaxDecrypter
-{
-    public class AaxcTagLibFile : TagLib.Mpeg4.File
-    {
-        // ©
-        private const byte COPYRIGHT = 0xa9;
-
-        private static ReadOnlyByteVector narratorType { get; } = new ReadOnlyByteVector(COPYRIGHT, (byte)'n', (byte)'r', (byte)'t');
-        private static ReadOnlyByteVector descriptionType { get; } = new ReadOnlyByteVector(COPYRIGHT, (byte)'d', (byte)'e', (byte)'s');
-        private static ReadOnlyByteVector publisherType { get; } = new ReadOnlyByteVector(COPYRIGHT, (byte)'p', (byte)'u', (byte)'b');
-
-        public string AsciiTitleSansUnabridged => TitleSansUnabridged?.UnicodeToAscii();
-        public string AsciiFirstAuthor => FirstAuthor?.UnicodeToAscii();
-        public string AsciiNarrator => Narrator?.UnicodeToAscii();
-        public string AsciiComment => Comment?.UnicodeToAscii();
-        public string AsciiLongDescription => LongDescription?.UnicodeToAscii();
-
-        public AppleTag AppleTags => GetTag(TagTypes.Apple) as AppleTag;
-
-        public string Comment => AppleTags.Comment;
-        public string[] Authors => AppleTags.Performers;
-        public string FirstAuthor => Authors?.Length > 0 ? Authors[0] : default;
-        public string TitleSansUnabridged => AppleTags.Title?.Replace(" (Unabridged)", "");
-
-        public string BookCopyright => _copyright is not null && _copyright.Length > 0 ? _copyright[0] : default;
-        public string RecordingCopyright => _copyright is not null && _copyright.Length > 1 ? _copyright[1] : default;
-        private string[] _copyright => AppleTags.Copyright?.Replace("©", string.Empty)?.Replace("(P)", string.Empty)?.Split(';');
-
-        public string Narrator => getAppleTagsText(narratorType);
-        public string LongDescription => getAppleTagsText(descriptionType);
-        public string ReleaseDate => getAppleTagsText("rldt");
-        public string Publisher => getAppleTagsText(publisherType);
-        private string getAppleTagsText(ByteVector byteVector)
-        {
-            string[] text = AppleTags.GetText(byteVector);
-            return text.Length == 0 ? default : text[0];
-        }
-
-        public AaxcTagLibFile(IFileAbstraction abstraction)
-            : base(abstraction, ReadStyle.Average)
-        {          
-        }
-
-        public AaxcTagLibFile(string path) 
-            : this(new LocalFileAbstraction(path))
-        {
-        }
-        /// <summary>
-        /// Copy all metadata fields in the source file, even those that TagLib doesn't
-        /// recognize, to the output file.
-        /// NOTE: Chapters aren't stored in MPEG-4 metadata. They are encoded as a Timed
-        /// Text Stream (MPEG-4 Part 17), so taglib doesn't read or write them.
-        /// </summary>
-        /// <param name="sourceFile">File from which tags will be coppied.</param>
-        public void CopyTagsFrom(AaxcTagLibFile sourceFile)
-        {
-            AppleTags.Clear();
-
-            foreach (var stag in sourceFile.AppleTags)
-            {
-                AppleTags.SetData(stag.BoxType, stag.Children.Cast<AppleDataBox>().ToArray());
-            }
-        }
-        public void AddPicture(byte[] coverArt)
-        {
-            AppleTags.SetData("covr", coverArt, 0);
-        }
-    }
-}

AaxDecrypter/AudiobookDownloadBase.cs

@@ -0,0 +1,184 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using Dinah.Core;
+using Dinah.Core.Net.Http;
+using Dinah.Core.StepRunner;
+using FileManager;
+
+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 event EventHandler<string> FileCreated;
+
+		protected bool IsCanceled { get; set; }
+		
+		protected string OutputFileName { get; private set; }
+		protected DownloadOptions DownloadOptions { get; }
+		protected NetworkFileStream InputFileStream => (nfsPersister ??= OpenNetworkFileStream()).NetworkFileStream;
+
+		// Don't give the property a 'set'. This should have to be an obvious choice; not accidental
+		protected void SetOutputFileName(string newOutputFileName) => OutputFileName = newOutputFileName;
+
+		protected abstract StepSequence Steps { get; }
+		private NetworkFileStreamPersister nfsPersister;
+
+		private string jsonDownloadState { get; }
+		public string TempFilePath { get; }
+
+		protected AudiobookDownloadBase(string outFileName, string cacheDirectory, DownloadOptions dlLic)
+		{
+			OutputFileName = ArgumentValidator.EnsureNotNullOrWhiteSpace(outFileName, nameof(outFileName));
+
+			var outDir = Path.GetDirectoryName(OutputFileName);
+			if (!Directory.Exists(outDir))
+				throw new DirectoryNotFoundException($"Directory does not exist: {nameof(outDir)}");
+
+			if (!Directory.Exists(cacheDirectory))
+				throw new DirectoryNotFoundException($"Directory does not exist: {nameof(cacheDirectory)}");
+
+			jsonDownloadState = Path.Combine(cacheDirectory, Path.GetFileName(Path.ChangeExtension(OutputFileName, ".json")));
+			TempFilePath = Path.ChangeExtension(jsonDownloadState, ".aaxc");
+
+			DownloadOptions = ArgumentValidator.EnsureNotNull(dlLic, nameof(dlLic));
+
+			// delete file after validation is complete
+			FileUtility.SaferDelete(OutputFileName);
+		}
+
+		public abstract void Cancel();
+
+		public virtual void SetCoverArt(byte[] coverArt)
+		{
+			if (coverArt is not null)
+				OnRetrievedCoverArt(coverArt);
+		}
+
+		public bool Run()
+		{
+			var (IsSuccess, Elapsed) = Steps.Run();
+
+			if (!IsSuccess)
+				Serilog.Log.Logger.Error("Conversion failed");
+
+			return IsSuccess;
+		}
+
+		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 OnFileCreated(string path)
+			=> FileCreated?.Invoke(this, path);
+
+		protected void CloseInputFileStream()
+		{
+			nfsPersister?.NetworkFileStream?.Close();
+			nfsPersister?.Dispose();
+		}
+
+		protected bool Step_CreateCue()
+		{
+			if (!DownloadOptions.CreateCueSheet) return true;
+
+			// not a critical step. its failure should not prevent future steps from running
+			try
+			{
+				var path = Path.ChangeExtension(OutputFileName, ".cue");
+				path = FileUtility.GetValidFilename(path);
+				File.WriteAllText(path, Cue.CreateContents(Path.GetFileName(OutputFileName), DownloadOptions.ChapterInfo));
+				OnFileCreated(path);
+			}
+			catch (Exception ex)
+			{
+				Serilog.Log.Logger.Error(ex, $"{nameof(Step_CreateCue)}. FAILED");
+			}
+			return !IsCanceled;
+		}
+
+		protected bool Step_Cleanup()
+		{
+			bool success = !IsCanceled;
+			if (success)
+			{
+				FileUtility.SaferDelete(jsonDownloadState);
+
+				if (DownloadOptions.AudibleKey is not null && 
+					DownloadOptions.AudibleIV is not null && 
+					DownloadOptions.RetainEncryptedFile)
+				{
+					string aaxPath = Path.ChangeExtension(TempFilePath, ".aax");
+					FileUtility.SaferMove(TempFilePath, aaxPath);
+
+					//Write aax decryption key
+					string keyPath = Path.ChangeExtension(aaxPath, ".key");
+					FileUtility.SaferDelete(keyPath);
+					File.WriteAllText(keyPath, $"Key={DownloadOptions.AudibleKey}\r\nIV={DownloadOptions.AudibleIV}");
+
+					OnFileCreated(aaxPath);
+					OnFileCreated(keyPath);
+				}
+				else
+					FileUtility.SaferDelete(TempFilePath);
+			}
+			else
+			{
+				FileUtility.SaferDelete(OutputFileName);
+			}
+
+
+			return success;
+		}
+
+		private NetworkFileStreamPersister OpenNetworkFileStream()
+		{
+			if (!File.Exists(jsonDownloadState))
+				return NewNetworkFilePersister();
+
+			try
+			{
+				var 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(DownloadOptions.DownloadUrl));
+				return nfsp;
+			}
+			catch
+			{
+				FileUtility.SaferDelete(jsonDownloadState);
+				FileUtility.SaferDelete(TempFilePath);
+				return NewNetworkFilePersister();
+			}
+		}
+
+		private NetworkFileStreamPersister NewNetworkFilePersister()
+		{
+			var headers = new System.Net.WebHeaderCollection
+			{
+				{ "User-Agent", DownloadOptions.UserAgent }
+			};
+
+			var networkFileStream = new NetworkFileStream(TempFilePath, new Uri(DownloadOptions.DownloadUrl), 0, headers);
+			return new NetworkFileStreamPersister(networkFileStream, jsonDownloadState);
+		}
+	}
+}

AaxDecrypter/Chapters.cs

@@ -1,85 +0,0 @@
-using Dinah.Core;
-using Dinah.Core.Diagnostics;
-using Newtonsoft.Json.Linq;
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Linq;
-using System.Text;
-
-namespace AaxDecrypter
-{
-    public class ChapterInfo
-    {
-        private List<Chapter> _chapterList = new List<Chapter>();
-        public IEnumerable<Chapter> Chapters => _chapterList.AsEnumerable();
-        public int Count => _chapterList.Count;
-        public ChapterInfo() { }
-        public ChapterInfo(string audiobookFile) 
-        {
-            var info = new ProcessStartInfo
-            {
-                FileName = DecryptSupportLibraries.ffprobePath,
-                Arguments = "-loglevel panic -show_chapters -print_format json \"" + audiobookFile + "\""
-            };
-
-            var jString = info.RunHidden().Output;
-            var chapterJObject = JObject.Parse(jString);
-            var chapters = chapterJObject["chapters"]
-                .Select(c => new Chapter(
-                    c["tags"]?["title"]?.Value<string>(), 
-                    c["start_time"].Value<double>(),
-                    c["end_time"].Value<double>()
-                    ));
-
-            _chapterList.AddRange(chapters);
-        }
-        public void AddChapter(Chapter chapter)
-        {
-            ArgumentValidator.EnsureNotNull(chapter, nameof(chapter));
-            _chapterList.Add(chapter);
-        }
-        public string ToFFMeta(bool includeFFMetaHeader)
-        {
-            var ffmetaChapters = new StringBuilder();
-
-            if (includeFFMetaHeader)
-                ffmetaChapters.AppendLine(";FFMETADATA1\n");
-
-            foreach (var c in Chapters)
-            {
-                ffmetaChapters.AppendLine(c.ToFFMeta());
-            }
-            return ffmetaChapters.ToString();
-        }
-    }
-    public class Chapter
-    {
-        public string Title { get; }
-        public TimeSpan StartOffset { get; }
-        public TimeSpan EndOffset { get; }
-        public Chapter(string title, long startOffsetMs, long lengthMs)
-        {
-            ArgumentValidator.EnsureNotNullOrEmpty(title, nameof(title));
-            ArgumentValidator.EnsureGreaterThan(startOffsetMs, nameof(startOffsetMs), -1);
-            ArgumentValidator.EnsureGreaterThan(lengthMs, nameof(lengthMs), 0);
-
-            Title = title;
-            StartOffset = TimeSpan.FromMilliseconds(startOffsetMs);
-            EndOffset = StartOffset +  TimeSpan.FromMilliseconds(lengthMs);
-        }
-        public Chapter(string title, double startTimeSec, double endTimeSec)
-            :this(title, (long)(startTimeSec * 1000), (long)((endTimeSec - startTimeSec) * 1000))
-        {
-        }
-
-        public string ToFFMeta()
-        {
-            return "[CHAPTER]\n" +
-                "TIMEBASE=1/1000\n" +
-                "START=" + StartOffset.TotalMilliseconds + "\n" +
-                "END=" + EndOffset.TotalMilliseconds + "\n" +
-                "title=" + Title;
-        }
-    }
-}

AaxDecrypter/Cue.cs

@@ -1,6 +1,7 @@
 using System;
 using System.IO;
 using System.Text;
+using AAXClean;
 using Dinah.Core;
 
 namespace AaxDecrypter
@@ -13,14 +14,17 @@ namespace AaxDecrypter
 
             stringBuilder.AppendLine(GetFileLine(filePath, "MP3"));
 
+            var startOffset = chapters.StartOffset;
+
             var trackCount = 0;
             foreach (var c in chapters.Chapters)
             {
+                var startTime = c.StartOffset - startOffset;
                 trackCount++;
 
                 stringBuilder.AppendLine($"TRACK {trackCount} AUDIO");
                 stringBuilder.AppendLine($"  TITLE \"{c.Title}\"");
-                stringBuilder.AppendLine($"  INDEX 01 {(int)c.StartOffset.TotalMinutes}:{c.StartOffset:ss\\:ff}");
+                stringBuilder.AppendLine($"  INDEX 01 {(int)startTime.TotalMinutes}:{startTime:ss}:{(int)(startTime.Milliseconds / 1000d * 75)}");
             }
 
             return stringBuilder.ToString();

AaxDecrypter/DecryptSupportLibraries.cs

@@ -1,16 +0,0 @@
-using System.IO;
-
-namespace AaxDecrypter
-{
-    public static class DecryptSupportLibraries
-    {
-        // OTHER EXTERNAL DEPENDENCIES
-        // ffprobe has these pre-req.s as I'm using it:
-        // avcodec-58.dll, avdevice-58.dll, avfilter-7.dll, avformat-58.dll, avutil-56.dll, swresample-3.dll, swscale-5.dll, taglib-sharp.dll
-
-        private static string appPath_ { get; } = Path.GetDirectoryName(Dinah.Core.Exe.FileLocationOnDisk);
-        private static string decryptLib_ { get; } = Path.Combine(appPath_, "DecryptLib");
-        public static string ffmpegPath { get; } = Path.Combine(decryptLib_, "ffmpeg.exe");
-        public static string ffprobePath { get; } = Path.Combine(decryptLib_, "ffprobe.exe");
-    }
-}

AaxDecrypter/DownloadLicense.cs

@@ -1,26 +0,0 @@
-using Dinah.Core;
-
-namespace AaxDecrypter
-{
-    public class DownloadLicense
-    {
-        public string DownloadUrl { get; }
-        public string AudibleKey { get; }
-        public string AudibleIV { get; }
-        public string UserAgent { get; }
-        public ChapterInfo ChapterInfo { get; set; }
-
-        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 = downloadUrl;
-            AudibleKey = audibleKey;
-            AudibleIV = audibleIV;
-            UserAgent = userAgent;
-        }
-    }
-}

AaxDecrypter/DownloadOptions.cs

@@ -0,0 +1,30 @@
+using AAXClean;
+using Dinah.Core;
+
+namespace AaxDecrypter
+{
+    public class DownloadOptions
+    {
+        public string DownloadUrl { get; }
+        public string UserAgent { get; }
+        public string AudibleKey { get; init; }
+        public string AudibleIV { get; init; }
+        public OutputFormat OutputFormat { get; init; }
+        public bool TrimOutputToChapterLength { get; init; }
+        public bool RetainEncryptedFile { get; init; }
+        public bool StripUnabridged { get; init; }
+        public bool CreateCueSheet { get; init; }
+        public ChapterInfo ChapterInfo { get; set; }
+        public NAudio.Lame.LameConfig LameConfig { get; set; }
+        public bool Downsample { get; set; }
+        public bool MatchSourceBitrate { get; set; }       
+
+        public DownloadOptions(string downloadUrl, string userAgent)
+        {
+            DownloadUrl = ArgumentValidator.EnsureNotNullOrEmpty(downloadUrl, nameof(downloadUrl));
+            UserAgent = ArgumentValidator.EnsureNotNullOrEmpty(userAgent, nameof(userAgent));
+
+            // no null/empty check for key/iv. unencrypted files do not have them
+        }
+    }
+}

AaxDecrypter/FFMpegAaxcProcesser.cs

@@ -1,244 +0,0 @@
-using System;
-using System.Diagnostics;
-using System.IO;
-using System.Text;
-using System.Text.RegularExpressions;
-using System.Threading.Tasks;
-
-namespace AaxDecrypter
-{
-    class AaxcProcessUpdate
-    {
-        public AaxcProcessUpdate(TimeSpan position, double speed)
-        {
-            ProcessPosition = position;
-            ProcessSpeed = speed;
-            EventTime = DateTime.Now;
-        }
-        public TimeSpan ProcessPosition { get; }
-        public double ProcessSpeed { get; }
-        public DateTime EventTime { get; }
-    }
-
-    /// <summary>
-    /// Download audible aaxc, decrypt, and remux with chapters.
-    /// </summary>
-    class FFMpegAaxcProcesser
-    {
-        public event EventHandler<AaxcProcessUpdate> ProgressUpdate;
-        public string FFMpegPath { get; }
-        public DownloadLicense DownloadLicense { get; }
-        public bool IsRunning { get; private set; }
-        public bool Succeeded { get; private set; }
-        public string FFMpegRemuxerStandardError => remuxerError.ToString();
-        public string FFMpegDownloaderStandardError => downloaderError.ToString();
-
-
-        private StringBuilder remuxerError { get; } = new StringBuilder();
-        private StringBuilder downloaderError { get; } = new StringBuilder();
-        private static Regex processedTimeRegex { get; } = new Regex("time=(\\d{2}):(\\d{2}):(\\d{2}).\\d{2}.*speed=\\s{0,1}([0-9]*[.]?[0-9]+)(?:e\\+([0-9]+)){0,1}", RegexOptions.IgnoreCase | RegexOptions.Compiled);
-        private Process downloader;
-        private Process remuxer;
-        private bool isCanceled = false;
-
-        public FFMpegAaxcProcesser( DownloadLicense downloadLicense)
-        {
-            FFMpegPath = DecryptSupportLibraries.ffmpegPath;
-            DownloadLicense = downloadLicense;
-        }
-
-        public async Task ProcessBook(string outputFile, string ffmetaChaptersPath = null)
-        {
-            //This process gets the aaxc from the url and streams the decrypted
-            //aac stream to standard output
-            downloader = new Process
-            {
-                StartInfo = getDownloaderStartInfo()
-            };
-
-            //This process retreves an aac stream from standard input and muxes
-            // it into an m4b along with the cover art and metadata.
-            remuxer = new Process
-            {
-                StartInfo = getRemuxerStartInfo(outputFile, ffmetaChaptersPath)
-            };
-
-            IsRunning = true;
-
-            downloader.ErrorDataReceived += Downloader_ErrorDataReceived;
-            downloader.Start();
-            downloader.BeginErrorReadLine();
-
-            remuxer.ErrorDataReceived += Remuxer_ErrorDataReceived;
-            remuxer.Start();
-            remuxer.BeginErrorReadLine();
-
-            //Thic check needs to be placed after remuxer has started
-            if (isCanceled) return;
-
-            var pipedOutput = downloader.StandardOutput.BaseStream;
-            var pipedInput = remuxer.StandardInput.BaseStream;
-
-
-            //All the work done here. Copy download standard output into
-            //remuxer standard input
-            await Task.Run(() =>
-            {
-                int lastRead = 0;
-                byte[] buffer = new byte[32 * 1024];
-
-                do
-                {
-                    lastRead = pipedOutput.Read(buffer, 0, buffer.Length);
-                    pipedInput.Write(buffer, 0, lastRead);
-                } while (lastRead > 0 && !remuxer.HasExited);
-            });
-
-            //Closing input stream terminates remuxer
-            pipedInput.Close();
-
-            //If the remuxer exited due to failure, downloader will still have
-            //data in the pipe. Force kill downloader to continue.
-            if (remuxer.HasExited && !downloader.HasExited)
-                downloader.Kill();
-
-            remuxer.WaitForExit();
-            downloader.WaitForExit();
-
-            IsRunning = false;
-            Succeeded = downloader.ExitCode == 0 && remuxer.ExitCode == 0;
-        }
-        public void Cancel()
-        {
-            isCanceled = true;
-
-            if (IsRunning && !remuxer.HasExited)
-                remuxer.Kill();
-            if (IsRunning && !downloader.HasExited)
-                downloader.Kill();
-        }
-        private void Downloader_ErrorDataReceived(object sender, DataReceivedEventArgs e)
-        {
-            if (string.IsNullOrEmpty(e.Data))
-                return;
-
-            downloaderError.AppendLine(e.Data);            
-        }
-
-        private void Remuxer_ErrorDataReceived(object sender, DataReceivedEventArgs e)
-        {
-            if (string.IsNullOrEmpty(e.Data))
-                return;
-
-            remuxerError.AppendLine(e.Data);
-
-            if (processedTimeRegex.IsMatch(e.Data))
-            {
-                //get timestamp of of last processed audio stream position
-                //and processing speed
-                var match = processedTimeRegex.Match(e.Data);
-
-                int hours = int.Parse(match.Groups[1].Value);
-                int minutes = int.Parse(match.Groups[2].Value);
-                int seconds = int.Parse(match.Groups[3].Value);
-
-                var position = new TimeSpan(hours, minutes, seconds);
-
-                double speed = double.Parse(match.Groups[4].Value);
-                int exp = match.Groups[5].Success ? int.Parse(match.Groups[5].Value) : 0;
-                speed *= Math.Pow(10, exp);
-
-                ProgressUpdate?.Invoke(this, new AaxcProcessUpdate(position, speed));
-            }
-
-            if (e.Data.Contains("aac bitstream error"))
-            {
-                //This happens if input is corrupt (should never happen) or if caller
-                //supplied wrong key/iv
-                var process = sender as Process;
-                process.Kill();
-            }
-        }
-
-        private ProcessStartInfo getDownloaderStartInfo() =>
-         new ProcessStartInfo
-         {
-             FileName = FFMpegPath,
-             RedirectStandardError = true,
-             RedirectStandardOutput = true,
-             CreateNoWindow = true,
-             WindowStyle = ProcessWindowStyle.Hidden,
-             UseShellExecute = false,
-             WorkingDirectory = Path.GetDirectoryName(FFMpegPath),
-             ArgumentList ={
-                    "-nostdin",
-                    "-audible_key",
-                    DownloadLicense.AudibleKey,
-                    "-audible_iv",
-                    DownloadLicense.AudibleIV,
-                    "-user_agent",
-                    DownloadLicense.UserAgent, //user-agent is requied for CDN to serve the file
-                    "-i",
-                    DownloadLicense.DownloadUrl, 
-                    "-c:a", //audio codec
-                    "copy", //copy stream
-                    "-f", //force output format: adts
-                    "adts",
-                    "pipe:" //pipe output to stdout
-                }
-         };
-
-        private ProcessStartInfo getRemuxerStartInfo(string outputFile, string ffmetaChaptersPath = null)
-        {
-           var startInfo = new ProcessStartInfo
-            {
-                FileName = FFMpegPath,
-                RedirectStandardError = true,
-                RedirectStandardInput = true,
-                CreateNoWindow = true,
-                WindowStyle = ProcessWindowStyle.Hidden,
-                UseShellExecute = false,
-                WorkingDirectory = Path.GetDirectoryName(FFMpegPath),
-            };
-
-            startInfo.ArgumentList.Add("-thread_queue_size");
-            startInfo.ArgumentList.Add("1024");
-            startInfo.ArgumentList.Add("-f"); //force input format: aac
-            startInfo.ArgumentList.Add("aac");
-            startInfo.ArgumentList.Add("-i"); //read input from stdin
-            startInfo.ArgumentList.Add("pipe:");
-
-            if (ffmetaChaptersPath is null)
-            {
-                //copy metadata from aaxc file.
-                startInfo.ArgumentList.Add("-user_agent");
-                startInfo.ArgumentList.Add(DownloadLicense.UserAgent);
-                startInfo.ArgumentList.Add("-i");
-                startInfo.ArgumentList.Add(DownloadLicense.DownloadUrl);
-            }
-            else
-            {
-                //copy metadata from supplied metadata file
-                startInfo.ArgumentList.Add("-f");
-                startInfo.ArgumentList.Add("ffmetadata");
-                startInfo.ArgumentList.Add("-i");
-                startInfo.ArgumentList.Add(ffmetaChaptersPath);
-            }
-
-            startInfo.ArgumentList.Add("-map"); //map file 0 (aac audio stream)
-            startInfo.ArgumentList.Add("0");
-            startInfo.ArgumentList.Add("-map_chapters"); //copy chapter data from file 1 (either metadata file or aaxc file)
-            startInfo.ArgumentList.Add("1");
-            startInfo.ArgumentList.Add("-c"); //copy all mapped streams
-            startInfo.ArgumentList.Add("copy");
-            startInfo.ArgumentList.Add("-f"); //force output format: mp4
-            startInfo.ArgumentList.Add("mp4");
-            startInfo.ArgumentList.Add("-movflags"); 
-            startInfo.ArgumentList.Add("disable_chpl"); //Disable Nero chapters format
-            startInfo.ArgumentList.Add(outputFile);
-            startInfo.ArgumentList.Add("-y"); //overwrite existing
-
-            return startInfo;
-        }
-    }
-}

AaxDecrypter/MultiConvertFileProperties.cs

@@ -0,0 +1,25 @@
+using System;
+using System.IO;
+using FileManager;
+
+namespace AaxDecrypter
+{
+    public class MultiConvertFileProperties
+    {
+        public string OutputFileName { get; set; }
+        public int PartsPosition { get; set; }
+        public int PartsTotal { get; set; }
+        public string Title { get; set; }
+
+        public static string DefaultMultipartFilename(MultiConvertFileProperties multiConvertFileProperties)
+        {
+            var template = Path.ChangeExtension(multiConvertFileProperties.OutputFileName, null) + " - <ch# 0> - <title>" + Path.GetExtension(multiConvertFileProperties.OutputFileName);
+
+            var fileNamingTemplate = new FileNamingTemplate(template) { IllegalCharacterReplacements = " " };
+            fileNamingTemplate.AddParameterReplacement("ch# 0", FileUtility.GetSequenceFormatted(multiConvertFileProperties.PartsPosition, multiConvertFileProperties.PartsTotal));
+            fileNamingTemplate.AddParameterReplacement("title", multiConvertFileProperties.Title ?? "");
+
+            return fileNamingTemplate.GetFilePath();
+        }
+    }
+}

AaxDecrypter/NFO.cs

@@ -1,52 +0,0 @@
-
-namespace AaxDecrypter
-{
-    public static class NFO
-    {
-        public static string CreateContents(string ripper, AaxcTagLibFile aaxcTagLib, ChapterInfo chapters)
-        {
-            var _hours = (int)aaxcTagLib.Properties.Duration.TotalHours;
-            var myDuration
-                = (_hours > 0 ? _hours + " hours, " : string.Empty)
-                + aaxcTagLib.Properties.Duration.Minutes + " minutes, "
-                + aaxcTagLib.Properties.Duration.Seconds + " seconds";
-
-            var nfoString
-                = "General Information\r\n"
-                + "======================\r\n"
-                + $" Title:                  {aaxcTagLib.AsciiTitleSansUnabridged ?? "[unknown]"}\r\n"
-                + $" Author:                 {aaxcTagLib.AsciiFirstAuthor ?? "[unknown]"}\r\n"
-                + $" Read By:                {aaxcTagLib.AsciiNarrator ?? "[unknown]"}\r\n"
-                + $" Release Date:           {aaxcTagLib.ReleaseDate ?? "[unknown]"}\r\n"
-                + $" Book Copyright:         {aaxcTagLib.BookCopyright ?? "[unknown]"}\r\n"
-                + $" Recording Copyright:    {aaxcTagLib.RecordingCopyright ?? "[unknown]"}\r\n"
-                + $" Genre:                  {aaxcTagLib.AppleTags.FirstGenre ?? "[unknown]"}\r\n"
-                + $" Publisher:              {aaxcTagLib.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 AAX\r\n"
-                + $" Source Sample Rate:     {aaxcTagLib.Properties.AudioSampleRate} Hz\r\n"
-                + $" Source Channels:        {aaxcTagLib.Properties.AudioChannels}\r\n"
-                + $" Source Bitrate:         {aaxcTagLib.Properties.AudioBitrate} Kbps\r\n"
-                + "\r\n"
-                + " Lossless Encode:        Yes\r\n"
-                + " Encoded Codec:          AAC / M4B\r\n"
-                + $" Encoded Sample Rate:    {aaxcTagLib.Properties.AudioSampleRate} Hz\r\n"
-                + $" Encoded Channels:       {aaxcTagLib.Properties.AudioChannels}\r\n"
-                + $" Encoded Bitrate:        {aaxcTagLib.Properties.AudioBitrate} Kbps\r\n"
-                + "\r\n"
-                + $" Ripper:                 {ripper}\r\n"
-                + "\r\n"
-                + "\r\n"
-                + "Book Description\r\n"
-                + "================\r\n"
-                + (!string.IsNullOrWhiteSpace(aaxcTagLib.LongDescription) ? aaxcTagLib.AsciiLongDescription : aaxcTagLib.AsciiComment);
-
-            return nfoString;
-        }
-    }
-}

AaxDecrypter/NetworkFileAbstraction.cs

@@ -1,135 +0,0 @@
-using System;
-using System.IO;
-using System.Net.Http;
-using System.Threading.Tasks;
-
-namespace AaxDecrypter
-{
-    /// <summary>
-    /// Provides a <see cref="TagLib.File.IFileAbstraction"/> for a file over Http.
-    /// </summary>
-    class NetworkFileAbstraction : TagLib.File.IFileAbstraction
-    {
-        private NetworkFileStream aaxNetworkStream;
-
-        public static async Task<NetworkFileAbstraction> CreateAsync(HttpClient client, Uri webFileUri)
-        {
-            var response = await client.GetAsync(webFileUri, HttpCompletionOption.ResponseHeadersRead);
-
-            if (response.StatusCode != System.Net.HttpStatusCode.OK)
-                throw new Exception("Can't read file from client.");
-
-            var contentLength = response.Content.Headers.ContentLength ?? 0;
-
-            var networkStream = await response.Content.ReadAsStreamAsync();
-
-            var networkFile = new NetworkFileAbstraction(Path.GetFileName(webFileUri.LocalPath), networkStream, contentLength);
-
-            return networkFile;
-        }
-
-        private NetworkFileAbstraction(string fileName, Stream netStream, long contentLength)
-        {
-            Name = fileName;
-            aaxNetworkStream = new NetworkFileStream(netStream, contentLength);
-        }
-        public string Name { get; private set; }
-
-        public Stream ReadStream => aaxNetworkStream;
-
-        public Stream WriteStream => throw new NotImplementedException();
-
-        public void CloseStream(Stream stream)
-        {
-            aaxNetworkStream.Close();
-        }
-
-        private class NetworkFileStream : Stream
-        {
-            private const int BUFF_SZ = 2 * 1024;
-
-            private FileStream _fileBacker;
-
-            private Stream _networkStream;
-
-            private long networkBytesRead = 0;
-
-            private long _contentLength;
-            public NetworkFileStream(Stream netStream, long contentLength)
-            {
-                _networkStream = netStream;
-                _contentLength = contentLength;
-                _fileBacker = File.Create(Path.GetTempFileName(), BUFF_SZ, FileOptions.DeleteOnClose);
-            }
-            public override bool CanRead => true;
-
-            public override bool CanSeek => true;
-
-            public override bool CanWrite => false;
-
-            public override long Length => _contentLength;
-
-            public override long Position { get => _fileBacker.Position; set => Seek(value, 0); }
-
-            public override void Flush()
-            {
-                throw new NotImplementedException();
-            }
-            public override void SetLength(long value)
-            {
-                throw new NotImplementedException();
-            }
-            public override void Write(byte[] buffer, int offset, int count)
-            {
-                throw new NotImplementedException();
-            }
-            public override int Read(byte[] buffer, int offset, int count)
-            {
-                long requiredLength = Position + count;
-
-                if (requiredLength > networkBytesRead)
-                    readWebFileToPosition(requiredLength);
-
-                return _fileBacker.Read(buffer, offset, count);
-            }
-
-            public override long Seek(long offset, SeekOrigin origin)
-            {
-                long newPosition = (long)origin + offset;
-
-                if (newPosition > networkBytesRead)
-                    readWebFileToPosition(newPosition);
-
-                _fileBacker.Position = newPosition;
-                return newPosition;
-            }
-
-            public override void Close()
-            {
-                _fileBacker.Close();
-                _networkStream.Close();
-            }
-            /// <summary>
-            /// Read more data from <see cref="_networkStream"/> into <see cref="_fileBacker"/> as needed. 
-            /// </summary>
-            /// <param name="requiredLength">Length of strem required for the operation.</param>
-            private void readWebFileToPosition(long requiredLength)
-            {
-                byte[] buff = new byte[BUFF_SZ];
-
-                long backerPosition = _fileBacker.Position;
-
-                _fileBacker.Position = networkBytesRead;
-
-                while (networkBytesRead < requiredLength)
-                {
-                    int bytesRead = _networkStream.Read(buff, 0, BUFF_SZ);
-                    _fileBacker.Write(buff, 0, bytesRead);
-                    networkBytesRead += bytesRead;
-                }
-
-                _fileBacker.Position = backerPosition;
-            }
-        }
-    }
-}

AaxDecrypter/NetworkFileStream.cs

@@ -0,0 +1,443 @@
+using Dinah.Core;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using System;
+using System.IO;
+using System.Linq;
+using System.Net;
+using System.Threading;
+
+namespace AaxDecrypter
+{
+    /// <summary>
+    /// A <see cref="CookieContainer"/> for a single Uri.
+    /// </summary>
+    public class SingleUriCookieContainer : CookieContainer
+    {
+        private Uri baseAddress;
+        public Uri Uri
+        { 
+            get => baseAddress; 
+            set 
+            { 
+                baseAddress = new UriBuilder(value.Scheme, value.Host).Uri; 
+            } 
+        }
+
+        public CookieCollection GetCookies()
+        {
+            return GetCookies(Uri);
+        }
+    }
+
+    /// <summary>
+    /// A resumable, simultaneous file downloader and reader.
+    /// </summary>
+    public class NetworkFileStream : Stream, IUpdatable
+    {
+        public event EventHandler Updated;
+
+        #region Public Properties
+
+        /// <summary>
+        /// Location to save the downloaded data.
+        /// </summary>
+        [JsonProperty(Required = Required.Always)]
+        public string SaveFilePath { get; }
+
+        /// <summary>
+        /// Http(s) address of the file to download.
+        /// </summary>
+        [JsonProperty(Required = Required.Always)]
+        public Uri Uri { get; private set; }
+
+        /// <summary>
+        /// All cookies set by caller or by the remote server.
+        /// </summary>
+        [JsonProperty(Required = Required.Always)]
+        public SingleUriCookieContainer CookieContainer { get; }
+
+        /// <summary>
+        /// Http headers to be sent to the server with the request.
+        /// </summary>
+        [JsonProperty(Required = Required.Always)]
+        public WebHeaderCollection RequestHeaders { get; private set; }
+
+        /// <summary>
+        /// The position in <see cref="SaveFilePath"/> that has been written and flushed to disk.
+        /// </summary>
+        [JsonProperty(Required = Required.Always)]
+        public long WritePosition { get; private set; }
+
+        /// <summary>
+        /// The total length of the <see cref="Uri"/> file to download.
+        /// </summary>
+        [JsonProperty(Required = Required.Always)]
+        public long ContentLength { get; private set; }
+
+        #endregion
+
+        #region Private Properties
+        private HttpWebRequest HttpRequest { get; set; }
+        private FileStream _writeFile { get; }
+        private FileStream _readFile { get; }
+        private Stream _networkStream { get; set; }
+        private bool hasBegunDownloading { get; set; }
+        public bool IsCancelled { get; private set; }
+        private EventWaitHandle downloadEnded { get; set; } 
+        private EventWaitHandle downloadedPiece { get; set; } 
+
+        #endregion
+
+        #region Constants
+
+        //Download buffer size
+        private const int DOWNLOAD_BUFF_SZ = 4 * 1024;
+
+        //NetworkFileStream will flush all data in _writeFile to disk after every
+        //DATA_FLUSH_SZ bytes are written to the file stream.
+        private const int DATA_FLUSH_SZ = 1024 * 1024;
+
+        #endregion
+
+        #region Constructor
+
+        /// <summary>
+        /// A resumable, simultaneous file downloader and reader.
+        /// </summary>
+        /// <param name="saveFilePath">Path to a location on disk to save the downloaded data from <paramref name="uri"/></param>
+        /// <param name="uri">Http(s) address of the file to download.</param>
+        /// <param name="writePosition">The position in <paramref name="uri"/> to begin downloading.</param>
+        /// <param name="requestHeaders">Http headers to be sent to the server with the <see cref="HttpWebRequest"/>.</param>
+        /// <param name="cookies">A <see cref="SingleUriCookieContainer"/> with cookies to send with the <see cref="HttpWebRequest"/>. It will also be populated with any cookies set by the server. </param>
+        public NetworkFileStream(string saveFilePath, Uri uri, long writePosition = 0, WebHeaderCollection requestHeaders = null, SingleUriCookieContainer cookies = null)
+        {
+            ArgumentValidator.EnsureNotNullOrWhiteSpace(saveFilePath, nameof(saveFilePath));
+            ArgumentValidator.EnsureNotNullOrWhiteSpace(uri?.AbsoluteUri, nameof(uri));
+            ArgumentValidator.EnsureGreaterThan(writePosition, nameof(writePosition), -1);
+
+            if (!Directory.Exists(Path.GetDirectoryName(saveFilePath)))
+                throw new ArgumentException($"Specified {nameof(saveFilePath)} directory \"{Path.GetDirectoryName(saveFilePath)}\" does not exist.");
+
+            SaveFilePath = saveFilePath;
+            Uri = uri;
+            WritePosition = writePosition;
+            RequestHeaders = requestHeaders ?? new WebHeaderCollection();
+            CookieContainer = cookies ?? new SingleUriCookieContainer { Uri = uri };
+            
+            _writeFile = new FileStream(SaveFilePath, FileMode.OpenOrCreate, FileAccess.Write, FileShare.ReadWrite)
+            {
+                Position = WritePosition
+            };
+
+            _readFile = new FileStream(SaveFilePath, FileMode.Open, FileAccess.Read, FileShare.ReadWrite);
+
+            SetUriForSameFile(uri);
+        }
+
+        #endregion
+               
+        #region Downloader
+
+        /// <summary>
+        /// Update the <see cref="JsonFilePersister"/>.
+        /// </summary>
+        private void Update()
+        {
+            RequestHeaders = HttpRequest.Headers;
+            Updated?.Invoke(this, EventArgs.Empty);
+        }
+
+        /// <summary>
+        /// Set a different <see cref="System.Uri"/> to the same file targeted by this instance of <see cref="NetworkFileStream"/>
+        /// </summary>
+        /// <param name="uriToSameFile">New <see cref="System.Uri"/> host must match existing host.</param>
+        public void SetUriForSameFile(Uri uriToSameFile)
+        {
+            ArgumentValidator.EnsureNotNullOrWhiteSpace(uriToSameFile?.AbsoluteUri, nameof(uriToSameFile));
+
+            if (uriToSameFile.Host != Uri.Host)
+                throw new ArgumentException($"New uri to the same file must have the same host.\r\n Old Host :{Uri.Host}\r\nNew Host: {uriToSameFile.Host}");
+            if (hasBegunDownloading)
+                throw new InvalidOperationException("Cannot change Uri after download has started.");
+
+            Uri = uriToSameFile;
+            HttpRequest = WebRequest.CreateHttp(Uri);
+
+            HttpRequest.CookieContainer = CookieContainer;
+            HttpRequest.Headers = RequestHeaders;
+            //If NetworkFileStream is resuming, Header will already contain a range.
+            HttpRequest.Headers.Remove("Range");
+            HttpRequest.AddRange(WritePosition);
+        }
+
+        /// <summary>
+        /// Begins downloading <see cref="Uri"/> to <see cref="SaveFilePath"/> in a background thread.
+        /// </summary>
+        private void BeginDownloading()
+        {
+            downloadEnded = new EventWaitHandle(false, EventResetMode.ManualReset);
+
+            if (ContentLength != 0 && WritePosition == ContentLength)
+            {
+                hasBegunDownloading = true;
+                downloadEnded.Set();
+                return;
+            }
+
+            if (ContentLength != 0 && WritePosition > ContentLength)
+                throw new WebException($"Specified write position (0x{WritePosition:X10}) is larger than  {nameof(ContentLength)} (0x{ContentLength:X10}).");
+
+            var response = HttpRequest.GetResponse() as HttpWebResponse;
+
+            if (response.StatusCode != HttpStatusCode.PartialContent)
+                throw new WebException($"Server at {Uri.Host} responded with unexpected status code: {response.StatusCode}.");
+
+            //Content length is the length of the range request, and it is only equal
+            //to the complete file length if requesting Range: bytes=0-
+            if (WritePosition == 0)
+                ContentLength = response.ContentLength;
+
+            _networkStream = response.GetResponseStream();
+            downloadedPiece = new EventWaitHandle(false, EventResetMode.AutoReset);
+
+            //Download the file in the background.
+            new Thread(() => DownloadFile())
+            { IsBackground = true }
+            .Start();
+
+            hasBegunDownloading = true;
+            return;
+        }
+
+        /// <summary>
+        /// Downlod <see cref="Uri"/> to <see cref="SaveFilePath"/>.
+        /// </summary>
+        private void DownloadFile()
+        {
+            var downloadPosition = WritePosition;
+            var nextFlush = downloadPosition + DATA_FLUSH_SZ;
+
+            var buff = new byte[DOWNLOAD_BUFF_SZ];
+            do
+            {
+                var bytesRead = _networkStream.Read(buff, 0, DOWNLOAD_BUFF_SZ);
+                _writeFile.Write(buff, 0, bytesRead);
+
+                downloadPosition += bytesRead;
+
+                if (downloadPosition > nextFlush)
+                {
+                    _writeFile.Flush();
+                    WritePosition = downloadPosition;
+                    Update();
+                    nextFlush = downloadPosition + DATA_FLUSH_SZ;
+                    downloadedPiece.Set();
+                }
+
+            } while (downloadPosition < ContentLength && !IsCancelled);
+
+            _writeFile.Close();
+            _networkStream.Close();
+            WritePosition = downloadPosition;
+            Update();
+
+            downloadedPiece.Set();
+            downloadEnded.Set();
+
+            if (!IsCancelled && WritePosition < ContentLength)
+                throw new WebException($"Downloaded size (0x{WritePosition:X10}) is less than {nameof(ContentLength)} (0x{ContentLength:X10}).");
+
+            if (WritePosition > ContentLength)
+                throw new WebException($"Downloaded size (0x{WritePosition:X10}) is greater than {nameof(ContentLength)} (0x{ContentLength:X10}).");
+
+        }
+
+        #endregion
+
+        #region Json Connverters
+
+        public static JsonSerializerSettings GetJsonSerializerSettings()
+        {
+            var settings = new JsonSerializerSettings();
+            settings.Converters.Add(new CookieContainerConverter());
+            settings.Converters.Add(new WebHeaderCollectionConverter());
+            return settings;
+        }
+
+        internal class CookieContainerConverter : JsonConverter
+        {
+            public override bool CanConvert(Type objectType)
+                => objectType == typeof(SingleUriCookieContainer);
+
+            public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
+            {
+                var jObj = JObject.Load(reader);
+
+                var result = new SingleUriCookieContainer()
+                {
+                    Uri = new Uri(jObj["Uri"].Value<string>()),
+                    Capacity = jObj["Capacity"].Value<int>(),
+                    MaxCookieSize = jObj["MaxCookieSize"].Value<int>(),
+                    PerDomainCapacity = jObj["PerDomainCapacity"].Value<int>()
+                };
+
+                var cookieList = jObj["Cookies"].ToList();
+
+                foreach (var cookie in cookieList)
+                {
+                    result.Add(
+                        new Cookie
+                        {
+                            Comment = cookie["Comment"].Value<string>(),
+                            HttpOnly = cookie["HttpOnly"].Value<bool>(),
+                            Discard = cookie["Discard"].Value<bool>(),
+                            Domain = cookie["Domain"].Value<string>(),
+                            Expired = cookie["Expired"].Value<bool>(),
+                            Expires = cookie["Expires"].Value<DateTime>(),
+                            Name = cookie["Name"].Value<string>(),
+                            Path = cookie["Path"].Value<string>(),
+                            Port = cookie["Port"].Value<string>(),
+                            Secure = cookie["Secure"].Value<bool>(),
+                            Value = cookie["Value"].Value<string>(),
+                            Version = cookie["Version"].Value<int>(),
+                        });
+                }
+
+                return result;
+            }
+
+            public override bool CanWrite => true;
+
+            public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
+            {
+                var cookies = value as SingleUriCookieContainer;
+                var obj = (JObject)JToken.FromObject(value);
+                var container = cookies.GetCookies();
+                var propertyNames = container.Select(c => JToken.FromObject(c));
+                obj.AddFirst(new JProperty("Cookies", new JArray(propertyNames)));
+                obj.WriteTo(writer);
+            }
+        }
+
+        internal class WebHeaderCollectionConverter : JsonConverter
+        {
+            public override bool CanConvert(Type objectType)
+                => objectType == typeof(WebHeaderCollection);
+
+            public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
+            {
+                var jObj = JObject.Load(reader);
+                var result = new WebHeaderCollection();
+
+                foreach (var kvp in jObj)
+                    result.Add(kvp.Key, kvp.Value.Value<string>());
+
+                return result;
+            }
+
+            public override bool CanWrite => true;
+
+            public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
+            {
+                var jObj = new JObject();
+                var type = value.GetType();
+                var headers = value as WebHeaderCollection;
+                var jHeaders = headers.AllKeys.Select(k => new JProperty(k, headers[k]));
+                jObj.Add(jHeaders);
+                jObj.WriteTo(writer);
+            }
+        }
+
+        #endregion
+
+        #region Download Stream Reader
+
+        [JsonIgnore]
+        public override bool CanRead => true;
+
+        [JsonIgnore]
+        public override bool CanSeek => true;
+
+        [JsonIgnore]
+        public override bool CanWrite => false;
+
+        [JsonIgnore]
+        public override long Length
+        {
+            get
+            {
+                if (!hasBegunDownloading)
+                    BeginDownloading();
+                return ContentLength;
+            }
+        }
+
+        [JsonIgnore]
+        public override long Position { get => _readFile.Position; set => Seek(value, SeekOrigin.Begin); }
+
+        [JsonIgnore]
+        public override bool CanTimeout => false;
+
+        [JsonIgnore]
+        public override int ReadTimeout { get => base.ReadTimeout; set => base.ReadTimeout = value; }
+
+        [JsonIgnore]
+        public override int WriteTimeout { get => base.WriteTimeout; set => base.WriteTimeout = value; }
+
+        public override void Flush() => throw new NotImplementedException();
+        public override void SetLength(long value) => throw new NotImplementedException();
+        public override void Write(byte[] buffer, int offset, int count) => throw new NotImplementedException();
+
+        public override int Read(byte[] buffer, int offset, int count)
+        {
+            if (!hasBegunDownloading)
+                BeginDownloading();
+
+            var toRead = Math.Min(count, Length - Position);
+            WaitToPosition(Position + toRead);
+            return _readFile.Read(buffer, offset, count);
+        }
+
+        public override long Seek(long offset, SeekOrigin origin)
+        {
+            var newPosition = origin switch
+			{
+				SeekOrigin.Current => Position + offset,
+				SeekOrigin.End => ContentLength + offset,
+				_ => offset,
+			};
+
+            WaitToPosition(newPosition);
+            return _readFile.Position = newPosition;
+        }
+
+        /// <summary>
+        /// Blocks until the file has downloaded to at least <paramref name="requiredPosition"/>, then returns.
+        /// </summary>
+        /// <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)) ;
+        }
+
+        public override void Close()
+        {
+            IsCancelled = true;
+
+            while (downloadEnded is not null && !downloadEnded.WaitOne(1000)) ;
+
+            _readFile.Close();
+            _writeFile.Close();
+            _networkStream?.Close();
+            Update();
+        }
+
+        #endregion
+        ~NetworkFileStream()
+        {
+            downloadEnded?.Close();
+            downloadedPiece?.Close();
+        }
+    }
+}

AaxDecrypter/NetworkFileStreamPersister.cs

@@ -0,0 +1,23 @@
+using Dinah.Core.IO;
+using Newtonsoft.Json;
+
+namespace AaxDecrypter
+{
+    internal class NetworkFileStreamPersister : JsonFilePersister<NetworkFileStream>
+    {
+
+		/// <summary>Alias for Target </summary>
+		public NetworkFileStream NetworkFileStream => Target;
+
+		/// <summary>uses path. create file if doesn't yet exist</summary>
+		public NetworkFileStreamPersister(NetworkFileStream networkFileStream, string path, string jsonPath = null)
+			: base(networkFileStream, path, jsonPath) { }
+
+		/// <summary>load from existing file</summary>
+		public NetworkFileStreamPersister(string path, string jsonPath = null)
+			: base(path, jsonPath) { }
+
+		protected override JsonSerializerSettings GetSerializerSettings() => NetworkFileStream.GetJsonSerializerSettings();
+
+    }
+}

AaxDecrypter/UnencryptedAudiobookDownloader.cs

@@ -0,0 +1,76 @@
+using System;
+using System.Threading;
+using Dinah.Core.Net.Http;
+using Dinah.Core.StepRunner;
+using FileManager;
+
+namespace AaxDecrypter
+{
+	public class UnencryptedAudiobookDownloader : AudiobookDownloadBase
+	{
+		protected override StepSequence Steps { get; }
+
+		public UnencryptedAudiobookDownloader(string outFileName, string cacheDirectory, DownloadOptions dlLic)
+			: base(outFileName, cacheDirectory, dlLic)
+		{
+			Steps = new StepSequence
+			{
+				Name = "Download Mp3 Audiobook",
+
+				["Step 1: Get Mp3 Metadata"] = Step_GetMetadata,
+				["Step 2: Download Audiobook"] = Step_DownloadAudiobookAsSingleFile,
+				["Step 3: Create Cue"] = Step_CreateCue,
+				["Step 4: Cleanup"] = Step_Cleanup,
+			};
+		}
+
+		public override void Cancel()
+		{
+			IsCanceled = true;
+			CloseInputFileStream();
+		}
+
+		protected bool Step_GetMetadata()
+		{
+			OnRetrievedCoverArt(null);
+
+			return !IsCanceled;
+		}
+
+		private bool Step_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();
+
+			var realOutputFileName = FileUtility.SaferMoveToValidPath(InputFileStream.SaveFilePath, OutputFileName);
+			SetOutputFileName(realOutputFileName);
+			OnFileCreated(realOutputFileName);
+
+			return !IsCanceled;
+		}
+	}
+}

AppScaffolding/AppScaffolding.csproj

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net6.0-windows</TargetFramework>
+    <Version>7.2.0.1</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.51.0" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\AudibleUtilities\AudibleUtilities.csproj" />
+  </ItemGroup>
+
+</Project>

AppScaffolding/LibationScaffolding.cs

@@ -0,0 +1,411 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Reflection;
+using AudibleUtilities;
+using Dinah.Core;
+using Dinah.Core.IO;
+using Dinah.Core.Logging;
+using LibationFileManager;
+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();
+			PopulateMissingConfigValues(config);
+
+			//
+			// migrations go below here
+			//
+
+			Migrations.migrate_to_v6_6_9(config);
+		}
+
+		public static void PopulateMissingConfigValues(Configuration config)
+		{
+			config.InProgress ??= Configuration.WinTemp;
+
+			if (!config.Exists(nameof(config.AllowLibationFixup)))
+				config.AllowLibationFixup = true;
+
+			if (!config.Exists(nameof(config.CreateCueSheet)))
+				config.CreateCueSheet = true;
+
+			if (!config.Exists(nameof(config.RetainAaxFile)))
+				config.RetainAaxFile = false;
+
+			if (!config.Exists(nameof(config.SplitFilesByChapter)))
+				config.SplitFilesByChapter = false;
+
+			if (!config.Exists(nameof(config.StripUnabridged)))
+				config.StripUnabridged = false;
+
+			if (!config.Exists(nameof(config.StripAudibleBrandAudio)))
+				config.StripAudibleBrandAudio = false;
+
+			if (!config.Exists(nameof(config.DecryptToLossy)))
+				config.DecryptToLossy = false;
+
+			if (!config.Exists(nameof(config.LameTargetBitrate)))
+				config.LameTargetBitrate = false;			
+			
+			if (!config.Exists(nameof(config.LameDownsampleMono)))
+				config.LameDownsampleMono = true;
+			
+			if (!config.Exists(nameof(config.LameBitrate)))
+				config.LameBitrate = 64;
+			
+			if (!config.Exists(nameof(config.LameConstantBitrate)))
+				config.LameConstantBitrate = false;
+			
+			if (!config.Exists(nameof(config.LameMatchSourceBR)))
+				config.LameMatchSourceBR = true;
+			
+			if (!config.Exists(nameof(config.LameVBRQuality)))
+				config.LameVBRQuality = 2;
+
+			if (!config.Exists(nameof(config.BadBook)))
+				config.BadBook = Configuration.BadBookAction.Ask;
+
+			if (!config.Exists(nameof(config.ShowImportedStats)))
+				config.ShowImportedStats = true;
+
+			if (!config.Exists(nameof(config.ImportEpisodes)))
+				config.ImportEpisodes = true;
+
+			if (!config.Exists(nameof(config.DownloadEpisodes)))
+				config.DownloadEpisodes = true;
+
+			if (!config.Exists(nameof(config.FolderTemplate)))
+				config.FolderTemplate = Templates.Folder.DefaultTemplate;
+
+			if (!config.Exists(nameof(config.FileTemplate)))
+				config.FileTemplate = Templates.File.DefaultTemplate;
+
+			if (!config.Exists(nameof(config.ChapterFileTemplate)))
+				config.ChapterFileTemplate = Templates.ChapterFile.DefaultTemplate;
+		}
+
+		/// <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") is not null)
+				return;
+
+			var serilogObj = new JObject
+			{
+				{ "MinimumLevel", "Information" },
+				{ "WriteTo", new JArray
+					{
+						// new JObject { {"Name", "Console" } }, // this has caused more problems than it's solved
+						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
+									// {Properties:j} needed for expanded exception logging
+									{ "outputTemplate", "{Timestamp:yyyy-MM-dd HH:mm:ss.fff zzz} [{Level:u3}] (at {Caller}) {Message:lj}{NewLine}{Exception} {Properties:j}" }
+								}
+							}
+						}
+					}
+				},
+				// better exception logging with: Serilog.Exceptions library -- WithExceptionDetails
+				{ "Using", new JArray{ "Dinah.Core", "Serilog.Exceptions" } }, // dll's name, NOT namespace
+				{ "Enrich", new JArray{ "WithCaller", "WithExceptionDetails" } },
+			};
+			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.
+			//
+			// If Serilog also writes to Console, this might be asking for trouble. ie: infinite loops.
+			// To use that way, SerilogTextWriter needs to be more robust and tested. Esp the Write() methods.
+			// However, 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,
+
+				AudibleFileStorage.DownloadsInProgressDirectory,
+				DownloadsInProgressFiles = FileManager.FileUtility.SaferEnumerateFiles(AudibleFileStorage.DownloadsInProgressDirectory).Count(),
+
+				AudibleFileStorage.DecryptInProgressDirectory,
+				DecryptInProgressFiles = FileManager.FileUtility.SaferEnumerateFiles(AudibleFileStorage.DecryptInProgressDirectory).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
+			};
+		#endregion
+
+		public static void migrate_to_v6_6_9(Configuration config)
+		{
+			var writeToPath = $"Serilog.WriteTo";
+
+			// remove WriteTo[].Name == Console
+			{
+				if (UNSAFE_MigrationHelper.Settings_TryGetArrayLength(writeToPath, out var length1))
+				{
+					for (var i = length1 - 1; i >= 0; i--)
+					{
+						var exists = UNSAFE_MigrationHelper.Settings_TryGetFromJsonPath($"{writeToPath}[{i}].Name", out var value);
+
+						if (exists && value == "Console")
+							UNSAFE_MigrationHelper.Settings_RemoveFromArray(writeToPath, i);
+					}
+				}
+			}
+
+			// add Serilog.Exceptions -- WithExceptionDetails
+			{
+				// outputTemplate should contain "{Properties:j}"
+				{
+					// re-calculate. previous loop may have changed the length
+					if (UNSAFE_MigrationHelper.Settings_TryGetArrayLength(writeToPath, out var length2))
+					{
+						var propertyName = "outputTemplate";
+						for (var i = 0; i < length2; i++)
+						{
+							var jsonPath = $"{writeToPath}[{i}].Args";
+							var exists = UNSAFE_MigrationHelper.Settings_TryGetFromJsonPath($"{jsonPath}.{propertyName}", out var value);
+
+							var newValue = "{Timestamp:yyyy-MM-dd HH:mm:ss.fff zzz} [{Level:u3}] (at {Caller}) {Message:lj}{NewLine}{Exception} {Properties:j}";
+
+							if (exists && value != newValue)
+								UNSAFE_MigrationHelper.Settings_SetWithJsonPath(jsonPath, propertyName, newValue);
+						}
+					}
+				}
+
+				// Serilog.Using must include "Serilog.Exceptions"
+				UNSAFE_MigrationHelper.Settings_AddUniqueToArray("Serilog.Using", "Serilog.Exceptions");
+
+				// Serilog.Enrich must include "WithExceptionDetails"
+				UNSAFE_MigrationHelper.Settings_AddUniqueToArray("Serilog.Enrich", "WithExceptionDetails");
+			}
+		}
+	}
+}

AppScaffolding/UNSAFE_MigrationHelper.cs

@@ -0,0 +1,271 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using Dinah.Core;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+
+namespace AppScaffolding
+{
+	/// <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 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);
+
+		public static bool APPSETTINGS_TryGet(string key, out string value)
+		{
+			bool success = false;
+			JToken val = null;
+
+			process_APPSETTINGS_Json(jObj => success = jObj.TryGetValue(key, out val), false);
+
+			value = success ? val.Value<string>() : null;
+			return success;
+		}
+
+		/// <summary>only insert if not exists</summary>
+		public static void APPSETTINGS_Insert(string key, string value)
+			=> process_APPSETTINGS_Json(jObj => jObj.TryAdd(key, value));
+
+		/// <summary>only update if exists</summary>
+		public static void APPSETTINGS_Update(string key, string value)
+			=> process_APPSETTINGS_Json(jObj => {
+				if (jObj.ContainsKey(key))
+					jObj[key] = value;
+			});
+
+		/// <summary>only delete if exists</summary>
+		public static void APPSETTINGS_Delete(string key)
+			=> process_APPSETTINGS_Json(jObj => {
+				if (jObj.ContainsKey(key))
+					jObj.Remove(key);
+			});
+
+		/// <param name="save">True: save if contents changed. False: no not attempt save</param>
+		private static void process_APPSETTINGS_Json(Action<JObject> action, bool save = true)
+		{
+			// only insert if not exists
+			if (!APPSETTINGS_Json_Exists)
+				return;
+
+			var startingContents = File.ReadAllText(APPSETTINGS_JSON);
+
+			JObject jObj;
+			try
+			{
+				jObj = JObject.Parse(startingContents);
+			}
+			catch
+			{
+				return;
+			}
+
+			action(jObj);
+
+			if (!save)
+				return;
+
+			// only save if different
+			var endingContents_indented = jObj.ToString(Formatting.Indented);
+			var endingContents_compact = jObj.ToString(Formatting.None);
+			if (startingContents.EqualsInsensitive(endingContents_indented) || startingContents.EqualsInsensitive(endingContents_compact))
+				return;
+
+			File.WriteAllText(APPSETTINGS_JSON, endingContents_indented);
+			System.Threading.Thread.Sleep(100);
+		}
+		#endregion
+
+		#region Settings.json
+		public const string LIBATION_FILES_KEY = "LibationFiles";
+		private const string SETTINGS_JSON = "Settings.json";
+
+		public static string SettingsJsonPath
+		{
+			get
+			{
+				var success = APPSETTINGS_TryGet(LIBATION_FILES_KEY, out var value);
+				return !success || value is null ? null : Path.Combine(value, SETTINGS_JSON);
+			}
+		}
+		public static bool SettingsJson_Exists => SettingsJsonPath is not null && File.Exists(SettingsJsonPath);
+
+		public static bool Settings_TryGet(string key, out string value)
+		{
+			bool success = false;
+			JToken val = null;
+
+			process_SettingsJson(jObj => success = jObj.TryGetValue(key, out val), false);
+
+			value = success ? val.Value<string>() : null;
+			return success;
+		}
+
+		public static bool Settings_JsonPathIsType(string jsonPath, JTokenType jTokenType)
+		{
+			JToken val = null;
+
+			process_SettingsJson(jObj => val = jObj.SelectToken(jsonPath), false);
+
+			return val?.Type == jTokenType;
+		}
+
+		public static bool Settings_TryGetFromJsonPath(string jsonPath, out string value)
+		{
+			JToken val = null;
+
+			process_SettingsJson(jObj => val = jObj.SelectToken(jsonPath), false);
+
+			if (val?.Type == JTokenType.String)
+			{
+				value = val.Value<string>();
+				return true;
+			}
+			else
+			{
+				value = null;
+				return false;
+			}
+		}
+
+		public static void Settings_SetWithJsonPath(string jsonPath, string propertyName, string newValue)
+		{
+			if (!Settings_TryGetFromJsonPath($"{jsonPath}.{propertyName}", out _))
+				return;
+
+			process_SettingsJson(jObj =>
+			{
+				var token = jObj.SelectToken(jsonPath);
+				if (token is null
+				|| token is not JObject o
+				|| o[propertyName] is null)
+					return;
+
+				var oldValue = token.Value<string>(propertyName);
+				if (oldValue != newValue)
+					token[propertyName] = newValue;
+			});
+		}
+
+		public static bool Settings_TryGetArrayLength(string jsonPath, out int length)
+		{
+			length = 0;
+
+			if (!Settings_JsonPathIsType(jsonPath, JTokenType.Array))
+				return false;
+
+			JArray array = null;
+			process_SettingsJson(jObj => array = (JArray)jObj.SelectToken(jsonPath));
+
+			length = array.Count;
+			return true;
+		}
+
+		public static void Settings_AddToArray(string jsonPath, string newValue)
+		{
+			if (!Settings_JsonPathIsType(jsonPath, JTokenType.Array))
+				return;
+
+			process_SettingsJson(jObj =>
+			{
+				var array = (JArray)jObj.SelectToken(jsonPath);
+				array.Add(newValue);
+			});
+		}
+
+		/// <summary>Do not add if already exists</summary>
+		public static void Settings_AddUniqueToArray(string arrayPath, string newValue)
+		{
+			if (!Settings_TryGetArrayLength(arrayPath, out var qty))
+				return;
+
+			for (var i = 0; i < qty; i++)
+			{
+				var exists = Settings_TryGetFromJsonPath($"{arrayPath}[{i}]", out var value);
+				if (exists && value == newValue)
+					return;
+			}
+
+			Settings_AddToArray(arrayPath, newValue);
+		}
+
+		/// <summary>only remove if not exists</summary>
+		public static void Settings_RemoveFromArray(string jsonPath, int position)
+		{
+			if (!Settings_JsonPathIsType(jsonPath, JTokenType.Array))
+				return;
+
+			process_SettingsJson(jObj =>
+			{
+				var array = (JArray)jObj.SelectToken(jsonPath);
+				if (position < array.Count)
+					array.RemoveAt(position);
+			});
+		}
+
+		/// <summary>only insert if not exists</summary>
+		public static void Settings_Insert(string key, string value)
+			=> process_SettingsJson(jObj => jObj.TryAdd(key, value));
+
+		/// <summary>only update if exists</summary>
+		public static void Settings_Update(string key, string value)
+			=> process_SettingsJson(jObj => {
+				if (jObj.ContainsKey(key))
+					jObj[key] = value;
+			});
+
+		/// <summary>only delete if exists</summary>
+		public static void Settings_Delete(string key)
+			=> process_SettingsJson(jObj => {
+				if (jObj.ContainsKey(key))
+					jObj.Remove(key);
+			});
+
+		/// <param name="save">True: save if contents changed. False: no not attempt save</param>
+		private static void process_SettingsJson(Action<JObject> action, bool save = true)
+		{
+			// only insert if not exists
+			if (!SettingsJson_Exists)
+				return;
+
+			var startingContents = File.ReadAllText(SettingsJsonPath);
+
+			JObject jObj;
+			try
+			{
+				jObj = JObject.Parse(startingContents);
+			}
+			catch
+			{
+				return;
+			}
+
+			action(jObj);
+
+			if (!save)
+				return;
+
+			// only save if different
+			var endingContents_indented = jObj.ToString(Formatting.Indented);
+			var endingContents_compact = jObj.ToString(Formatting.None);
+			if (startingContents.EqualsInsensitive(endingContents_indented) || startingContents.EqualsInsensitive(endingContents_compact))
+				return;
+
+			File.WriteAllText(SettingsJsonPath, endingContents_indented);
+			System.Threading.Thread.Sleep(100);
+		}
+		#endregion
+	}
+}

ApplicationServices/ApplicationServices.csproj

@@ -1,19 +1,16 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0-windows</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="CsvHelper" Version="27.0.2" />
-    <PackageReference Include="NPOI" Version="2.5.3" />
+    <PackageReference Include="CsvHelper" Version="27.2.1" />
+    <PackageReference Include="NPOI" Version="2.5.6" />
   </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,16 +1,21 @@
 using System;
+using System.Collections.Generic;
 using DataLayer;
-using FileManager;
+using LibationFileManager;
 
 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

@@ -3,50 +3,137 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 using AudibleApi;
+using AudibleUtilities;
 using DataLayer;
 using Dinah.Core;
 using DtoImporterService;
-using InternalUtilities;
+using LibationFileManager;
 using Serilog;
+using static DtoImporterService.PerfLogger;
 
 namespace ApplicationServices
 {
 	public static class LibraryCommands
 	{
-		public static async Task<(int totalCount, int newCount)> ImportAccountAsync(Func<Account, ILoginCallback> loginCallbackFactoryFunc, params Account[] accounts)
+		public static event EventHandler<int> ScanBegin;
+		public static event EventHandler ScanEnd;
+
+		public static bool Scanning { get; private set; }
+		private static object _lock { get; } = new();
+
+		static LibraryCommands()
 		{
+			ScanBegin += (_, __) => Scanning = true;
+			ScanEnd += (_, __) => Scanning = false;
+		}
+
+        public static async Task<List<LibraryBook>> FindInactiveBooks(Func<Account, Task<ApiExtended>> apiExtendedfunc, List<LibraryBook> existingLibrary, params Account[] accounts)
+		{
+			logRestart();
+
+			//These are the minimum response groups required for the
+			//library scanner to pass all validation and filtering.
+			var libraryResponseGroups =
+				LibraryOptions.ResponseGroupOptions.ProductAttrs |
+				LibraryOptions.ResponseGroupOptions.ProductDesc |
+				LibraryOptions.ResponseGroupOptions.Relationships;
+
 			if (accounts is null || accounts.Length == 0)
-				return (0, 0);
+				return new List<LibraryBook>();
 
 			try
 			{
-				var importItems = await scanAccountsAsync(loginCallbackFactoryFunc, accounts);
+				logTime($"pre {nameof(scanAccountsAsync)} all");
+				var libraryItems = await scanAccountsAsync(apiExtendedfunc, accounts, libraryResponseGroups);
+				logTime($"post {nameof(scanAccountsAsync)} all");
 
-				var totalCount = importItems.Count;
+				var totalCount = libraryItems.Count;
 				Log.Logger.Information($"GetAllLibraryItems: Total count {totalCount}");
 
-				var newCount = await importIntoDbAsync(importItems);
-				Log.Logger.Information($"Import: New count {newCount}");
+				var missingBookList = existingLibrary.Where(b => !libraryItems.Any(i => i.DtoItem.Asin == b.Book.AudibleProductId)).ToList();
 
-				await Task.Run(() => SearchEngineCommands.FullReIndex());
-				Log.Logger.Information("FullReIndex: success");
-
-				return (totalCount, newCount);
+				return missingBookList;
 			}
 			catch (AudibleApi.Authentication.LoginFailedException lfEx)
 			{
-				lfEx.MoveResponseBodyFile(FileManager.Configuration.Instance.LibationFiles);
+				lfEx.SaveFiles(Configuration.Instance.LibationFiles);
 
 				// nuget Serilog.Exceptions would automatically log custom properties
 				//   However, it comes with a scary warning when used with EntityFrameworkCore which I'm not yet ready to implement:
 				//   https://github.com/RehanSaeed/Serilog.Exceptions
 				// work-around: use 3rd param. don't just put exception object in 3rd param -- info overload: stack trace, etc
-				Log.Logger.Error(lfEx, "Error importing library. Login failed. {@DebugInfo}", new {
+				Log.Logger.Error(lfEx, "Error scanning library. Login failed. {@DebugInfo}", new
+				{
 					lfEx.RequestUrl,
 					ResponseStatusCodeNumber = (int)lfEx.ResponseStatusCode,
 					ResponseStatusCodeDesc = lfEx.ResponseStatusCode,
 					lfEx.ResponseInputFields,
-					lfEx.ResponseBodyFilePath
+					lfEx.ResponseBodyFilePaths
+				});
+				throw;
+			}
+			catch (Exception ex)
+			{
+				Log.Logger.Error(ex, "Error scanning library");
+				throw;
+			}
+			finally
+			{
+				stop();
+				var putBreakPointHere = logOutput;
+			}
+		}
+
+		#region FULL LIBRARY scan and import
+		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
+			{
+				lock (_lock)
+                {
+					if (Scanning)
+						return (0, 0);
+					ScanBegin?.Invoke(null, accounts.Length);
+				}
+
+				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}");
+
+				if (totalCount == 0)
+					return default;
+
+				Log.Logger.Information("Begin long-running import");
+				logTime($"pre {nameof(importIntoDbAsync)}");
+				var newCount = await importIntoDbAsync(importItems);
+				logTime($"post {nameof(importIntoDbAsync)}");
+				Log.Logger.Information($"Import complete. New count {newCount}");
+
+				return (totalCount, newCount);
+			}
+			catch (AudibleApi.Authentication.LoginFailedException lfEx)
+			{
+				lfEx.SaveFiles(Configuration.Instance.LibationFiles);
+
+				// nuget Serilog.Exceptions would automatically log custom properties
+				//   However, it comes with a scary warning when used with EntityFrameworkCore which I'm not yet ready to implement:
+				//   https://github.com/RehanSaeed/Serilog.Exceptions
+				// work-around: use 3rd param. don't just put exception object in 3rd param -- info overload: stack trace, etc
+				Log.Logger.Error(lfEx, "Error importing library. Login failed. {@DebugInfo}", new
+				{
+					lfEx.RequestUrl,
+					ResponseStatusCodeNumber = (int)lfEx.ResponseStatusCode,
+					ResponseStatusCodeDesc = lfEx.ResponseStatusCode,
+					lfEx.ResponseInputFields,
+					lfEx.ResponseBodyFilePaths
 				});
 				throw;
 			}
@@ -55,20 +142,24 @@ namespace ApplicationServices
 				Log.Logger.Error(ex, "Error importing library");
 				throw;
 			}
+			finally
+			{
+				stop();
+				var putBreakPointHere = logOutput;
+				ScanEnd?.Invoke(null, null);
+			}
 		}
 
-		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
@@ -77,7 +168,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));
 
@@ -86,38 +177,155 @@ namespace ApplicationServices
 				Account = account?.MaskedLogEntry ?? "[null]"
 			});
 
-			var dtoItems = await AudibleApiActions.GetLibraryValidatedAsync(api);
+			logTime($"pre scanAccountAsync {account.AccountName}");
+
+			var dtoItems = await apiExtended.GetLibraryValidatedAsync(libraryResponseGroups, 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)
-		{
-			using var context = DbContexts.GetContext();
-			var libraryImporter = new LibraryImporter(context);
-			var newCount = await Task.Run(() => libraryImporter.Import(importItems));
-			context.SaveChanges();
+        {
+            logTime("importIntoDbAsync -- pre db");
+            using var context = DbContexts.GetContext();
+            var libraryBookImporter = new LibraryBookImporter(context);
+            var newCount = await Task.Run(() => libraryBookImporter.Import(importItems));
+            logTime("importIntoDbAsync -- post Import()");
+            int qtyChanges = saveChanges(context);
+            logTime("importIntoDbAsync -- post SaveChanges");
 
-			return newCount;
-		}
+			// this is any changes at all to the database, not just new books
+            if (qtyChanges > 0)
+                await Task.Run(() => finalizeLibrarySizeChange());
+            logTime("importIntoDbAsync -- post finalizeLibrarySizeChange");
 
-		public static int UpdateTags(this LibationContext context, Book book, string newTags)
+            return newCount;
+        }
+
+        private static int saveChanges(LibationContext context)
 		{
 			try
 			{
-				book.UserDefinedItem.Tags = newTags;
+				return context.SaveChanges();
+			}
+			catch (Microsoft.EntityFrameworkCore.DbUpdateException ex)
+			{
+				// DbUpdateException exceptions can wreck serilog. Condense it until we can find a better solution. I suspect the culpret is the "WithExceptionDetails" serilog extension
 
+				static string format(Exception ex) => $"\r\nMessage: {ex.Message}\r\nStack Trace:\r\n{ex.StackTrace}";
+
+				var msg = "Microsoft.EntityFrameworkCore.DbUpdateException";
+				if (ex.InnerException is null)
+					throw new Exception($"{msg}{format(ex)}");
+				throw new Exception(
+					$"{msg}{format(ex)}",
+					new Exception($"Inner Exception{format(ex.InnerException)}"));
+			}
+        }
+        #endregion
+
+        #region remove books
+        public static Task<List<LibraryBook>> RemoveBooksAsync(List<string> idsToRemove) => Task.Run(() => removeBooks(idsToRemove));
+		private static List<LibraryBook> removeBooks(List<string> idsToRemove)
+		{
+			using var context = DbContexts.GetContext();
+			var libBooks = context.GetLibrary_Flat_NoTracking();
+
+			var removeLibraryBooks = libBooks.Where(lb => idsToRemove.Contains(lb.Book.AudibleProductId)).ToList();
+			context.LibraryBooks.RemoveRange(removeLibraryBooks);
+			context.Books.RemoveRange(removeLibraryBooks.Select(lb => lb.Book));
+
+			var qtyChanges = context.SaveChanges();
+			if (qtyChanges > 0)
+				finalizeLibrarySizeChange();
+
+			return removeLibraryBooks;
+		}
+		#endregion
+
+		// call this whenever books are added or removed from library
+		private static void finalizeLibrarySizeChange()
+		{
+			SearchEngineCommands.FullReIndex();
+			LibrarySizeChanged?.Invoke(null, null);
+		}
+
+		/// <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();
+
+				// Attach() NoTracking entities before SaveChanges()
+				context.Attach(book.UserDefinedItem).State = Microsoft.EntityFrameworkCore.EntityState.Modified;
 				var qtyChanges = context.SaveChanges();
-
 				if (qtyChanges > 0)
+				{
+					SearchEngineCommands.UpdateLiberatedStatus(book);
 					SearchEngineCommands.UpdateBookTags(book);
+					BookUserDefinedItemCommitted?.Invoke(null, book.AudibleProductId);
+				}
 
 				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
+			: 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 record LibraryStats(int booksFullyBackedUp, int booksDownloadedOnly, int booksNoProgress, int booksError, int pdfsDownloaded, int pdfsNotDownloaded) { }
+		public static LibraryStats GetCounts()
+		{
+			var libraryBooks = DbContexts.GetLibrary_Flat_NoTracking();
+
+			var results = libraryBooks
+				.AsParallel()
+				.Select(lb => Liberated_Status(lb.Book))
+				.ToList();
+			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, booksError });
+
+			var boolResults = libraryBooks
+				.AsParallel()
+				.Where(lb => lb.Book.HasPdf)
+				.Select(lb => Pdf_Status(lb.Book))
+				.ToList();
+			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, booksError, pdfsDownloaded, pdfsNotDownloaded);
+		}
 	}
 }

ApplicationServices/LibraryExporter.cs

@@ -44,11 +44,14 @@ namespace ApplicationServices
 		[Name("Length In Minutes")]
 		public int LengthInMinutes { get; set; }
 
+		[Name("Description")]
+		public string Description { get; set; }
+
 		[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; }
@@ -88,6 +91,15 @@ namespace ApplicationServices
 
 		[Name("My Libation Tags")]
 		public string MyLibationTags { get; set; }
+
+		[Name("Book Liberated Status")]
+		public string BookStatus { get; set; }
+
+		[Name("PDF Liberated Status")]
+		public string PdfStatus { get; set; }
+
+		[Name("Content Type")]
+		public string ContentType { get; set; }
 	}
 	public static class LibToDtos
 	{
@@ -102,10 +114,11 @@ namespace ApplicationServices
 				AuthorNames = a.Book.AuthorNames,
 				NarratorNames = a.Book.NarratorNames,
 				LengthInMinutes = a.Book.LengthInMinutes,
+				Description = a.Book.Description,
 				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,
@@ -116,16 +129,17 @@ namespace ApplicationServices
 				MyRatingOverall = a.Book.UserDefinedItem.Rating.OverallRating,
 				MyRatingPerformance = a.Book.UserDefinedItem.Rating.PerformanceRating,
 				MyRatingStory = a.Book.UserDefinedItem.Rating.StoryRating,
-				MyLibationTags = a.Book.UserDefinedItem.Tags
+				MyLibationTags = a.Book.UserDefinedItem.Tags,
+				BookStatus = a.Book.UserDefinedItem.BookStatus.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;
 
@@ -139,17 +153,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");
@@ -173,8 +184,9 @@ namespace ApplicationServices
 				nameof (ExportDto.AuthorNames),
 				nameof (ExportDto.NarratorNames),
 				nameof (ExportDto.LengthInMinutes),
+				nameof (ExportDto.Description),
 				nameof (ExportDto.Publisher),
-				nameof (ExportDto.PdfUrl),
+				nameof (ExportDto.HasPdf),
 				nameof (ExportDto.SeriesNames),
 				nameof (ExportDto.SeriesOrder),
 				nameof (ExportDto.CommunityRatingOverall),
@@ -187,7 +199,10 @@ namespace ApplicationServices
 				nameof (ExportDto.MyRatingOverall),
 				nameof (ExportDto.MyRatingPerformance),
 				nameof (ExportDto.MyRatingStory),
-				nameof (ExportDto.MyLibationTags)
+				nameof (ExportDto.MyLibationTags),
+				nameof (ExportDto.BookStatus),
+				nameof (ExportDto.PdfStatus),
+				nameof (ExportDto.ContentType)
 			};
 			var col = 0;
 			foreach (var c in columns)
@@ -223,8 +238,9 @@ namespace ApplicationServices
 				row.CreateCell(col++).SetCellValue(dto.AuthorNames);
 				row.CreateCell(col++).SetCellValue(dto.NarratorNames);
 				row.CreateCell(col++).SetCellValue(dto.LengthInMinutes);
+				row.CreateCell(col++).SetCellValue(dto.Description);
 				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);
 
@@ -249,6 +265,9 @@ namespace ApplicationServices
 				col = createCell(row, col, dto.MyRatingStory);
 
 				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

@@ -7,10 +7,11 @@ namespace ApplicationServices
 {
 	public static class SearchEngineCommands
 	{
-		public static void FullReIndex()
+		public static void FullReIndex(SearchEngine engine = null)
 		{
-			var engine = new SearchEngine(DbContexts.GetContext());
-			engine.CreateNewIndex();
+			engine ??= new SearchEngine();
+			var library = DbContexts.GetLibrary_Flat_NoTracking();
+			engine.CreateNewIndex(library);
 		}
 
 		public static SearchResultSet Search(string searchString) => performSearchEngineFunc_safe(e =>
@@ -21,35 +22,35 @@ namespace ApplicationServices
 			e.UpdateTags(book.AudibleProductId, book.UserDefinedItem.Tags)
 		);
 
-		public static void UpdateIsLiberated(Book book) => performSearchEngineAction_safe(e =>
-			e.UpdateIsLiberated(book.AudibleProductId)
+		public static void UpdateLiberatedStatus(Book book) => performSearchEngineAction_safe(e =>
+			e.UpdateLiberatedStatus(book)
 		);
 
 		private static void performSearchEngineAction_safe(Action<SearchEngine> action)
 		{
-			var engine = new SearchEngine(DbContexts.GetContext());
+			var engine = new SearchEngine();
 			try
 			{
 				action(engine);
 			}
 			catch (FileNotFoundException)
 			{
-				FullReIndex();
+				FullReIndex(engine);
 				action(engine);
 			}
 		}
 
-		private static T performSearchEngineFunc_safe<T>(Func<SearchEngine, T> action)
+		private static T performSearchEngineFunc_safe<T>(Func<SearchEngine, T> func)
 		{
-			var engine = new SearchEngine(DbContexts.GetContext());
+			var engine = new SearchEngine();
 			try
 			{
-				return action(engine);
+				return func(engine);
 			}
 			catch (FileNotFoundException)
 			{
-				FullReIndex();
-				return action(engine);
+				FullReIndex(engine);
+				return func(engine);
 			}
 		}
 	}

AudibleUtilities/Account.cs

@@ -6,7 +6,7 @@ using AudibleApi.Authorization;
 using Dinah.Core;
 using Newtonsoft.Json;
 
-namespace InternalUtilities
+namespace AudibleUtilities
 {
 	public class Account : IUpdatable
 	{
@@ -73,10 +73,10 @@ namespace InternalUtilities
 				if (_identity is null && value is null)
 					return;
 
-				if (_identity != null)
+				if (_identity is not null)
 					_identity.Updated -= update;
 
-				if (value != null)
+				if (value is not null)
 					value.Updated += update;
 
 				_identity = value;

AudibleUtilities/AccountsSettings.cs

@@ -6,7 +6,7 @@ using AudibleApi.Authorization;
 using Dinah.Core;
 using Newtonsoft.Json;
 
-namespace InternalUtilities
+namespace AudibleUtilities
 {
 	// 'AccountsSettings' is intentionally NOT IEnumerable<> so that properties can be added/extended
 	// from newtonsoft (https://www.newtonsoft.com/json/help/html/SerializationGuide.htm):
@@ -66,7 +66,7 @@ namespace InternalUtilities
 		{
 			var acct = GetAccount(accountId, locale);
 
-			if (acct != null)
+			if (acct is not null)
 				return acct;
 
 			var l = Localization.Get(locale);

AudibleUtilities/AccountsSettingsPersister.cs

@@ -3,7 +3,7 @@ using AudibleApi.Authorization;
 using Dinah.Core.IO;
 using Newtonsoft.Json;
 
-namespace InternalUtilities
+namespace AudibleUtilities
 {
 	public class AccountsSettingsPersister : JsonFilePersister<AccountsSettings>
 	{

AudibleUtilities/ApiExtended.cs

@@ -0,0 +1,316 @@
+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 AudibleUtilities
+{
+	/// <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
+
+			Serilog.Log.Logger.Debug("Begin initial library scan");
+
+			if (!items.Any())
+				items = await Api.GetAllLibraryItemsAsync(responseGroups);
+
+			Serilog.Log.Logger.Debug("Initial library scan complete. Begin episode scan");
+
+			await manageEpisodesAsync(items, importEpisodes);
+
+			Serilog.Log.Logger.Debug("Episode scan complete");
+
+#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 is not 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
+				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);
+
+				// actual individual episode, not the parent of a series.
+				// for now I'm keeping it inside this method since it fits the work flow, incl. importEpisodes logic
+				if (!children.Any())
+				{
+					results.Add(parent);
+					continue;
+				}
+
+				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,
+							// This should properly be Single() not FirstOrDefault(), but FirstOrDefault is defensive for malformed data from audible
+							Sequence = parent.Relationships.FirstOrDefault(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();
+		}
+	}
+}

AudibleUtilities/AudibleApiStorage.cs

@@ -1,9 +1,9 @@
 using System;
 using System.IO;
-using FileManager;
+using LibationFileManager;
 using Newtonsoft.Json;
 
-namespace InternalUtilities
+namespace AudibleUtilities
 {
 	public static class AudibleApiStorage
 	{

AudibleUtilities/AudibleApiValidators.cs

@@ -1,9 +1,9 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using AudibleApiDTOs;
+using AudibleApi.Common;
 
-namespace InternalUtilities
+namespace AudibleUtilities
 {
 	public interface IValidator
 	{
@@ -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;
 		}

AudibleUtilities/AudibleUtilities.csproj

@@ -0,0 +1,15 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net6.0-windows</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="AudibleApi" Version="2.7.3.1" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\LibationFileManager\LibationFileManager.csproj" />
+  </ItemGroup>
+
+</Project>

AudibleUtilities/_InternalsVisible.cs

@@ -0,0 +1 @@
+[assembly: System.Runtime.CompilerServices.InternalsVisibleTo(nameof(AudibleUtilities) + ".Tests")]

DataLayer/Configurations/BookContributorConfig.cs

@@ -9,8 +9,8 @@ namespace DataLayer.Configurations
         {
             entity.HasKey(bc => new { bc.BookId, bc.ContributorId, bc.Role });
 
-            entity.HasIndex(b => b.BookId);
-            entity.HasIndex(b => b.ContributorId);
+            entity.HasIndex(bc => bc.BookId);
+            entity.HasIndex(bc => bc.ContributorId);
 
             entity
                 .HasOne(bc => bc.Book)

DataLayer/Configurations/LibraryBookConfig.cs

@@ -7,12 +7,26 @@ namespace DataLayer.Configurations
     {
         public void Configure(EntityTypeBuilder<LibraryBook> entity)
         {
-            entity.HasKey(b => b.BookId);
+            // 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(lb => lb.BookId);
 
             entity
-                .HasOne(le => le.Book)
+                .HasOne(lb => lb.Book)
                 .WithOne()
-                .HasForeignKey<LibraryBook>(le => le.BookId);
+                .HasForeignKey<LibraryBook>(lb => lb.BookId);
         }
     }
 }

DataLayer/Configurations/SeriesBookConfig.cs

@@ -7,10 +7,10 @@ namespace DataLayer.Configurations
     {
         public void Configure(EntityTypeBuilder<SeriesBook> entity)
         {
-            entity.HasKey(bc => new { bc.SeriesId, bc.BookId });
+            entity.HasKey(sb => new { sb.SeriesId, sb.BookId });
 
-            entity.HasIndex(b => b.SeriesId);
-            entity.HasIndex(b => b.BookId);
+            entity.HasIndex(sb => sb.SeriesId);
+            entity.HasIndex(sb => sb.BookId);
 
             entity
                 .HasOne(sb => sb.Series)

DataLayer/Configurations/SeriesConfig.cs

@@ -7,8 +7,8 @@ namespace DataLayer.Configurations
     {
         public void Configure(EntityTypeBuilder<Series> entity)
         {
-            entity.HasKey(b => b.SeriesId);
-            entity.HasIndex(b => b.AudibleSeriesId);
+            entity.HasKey(s => s.SeriesId);
+            entity.HasIndex(s => s.AudibleSeriesId);
 
             entity
                 .Metadata

DataLayer/DataLayer.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0-windows</TargetFramework>
   </PropertyGroup>
 
   <PropertyGroup>
@@ -12,20 +12,20 @@
   </PropertyGroup>
   
   <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="5.0.5">
+    <PackageReference Include="Dinah.EntityFrameworkCore" Version="4.0.0.3" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="6.0.4">
       <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="6.0.4" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="6.0.4">
       <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" />
+    <ProjectReference Include="..\LibationFileManager\LibationFileManager.csproj" />
   </ItemGroup>
   
   <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
@@ -40,17 +43,26 @@ namespace DataLayer
         internal int CategoryId { get; private set; }
         public Category Category { get; private set; }
         public string[] CategoriesNames
-            => Category == null ? new string[0]
-            : Category.ParentCategory == null ? new[] { Category.Name }
+            => Category is null ? new string[0]
+            : Category.ParentCategory is null ? new[] { Category.Name }
             : new[] { Category.ParentCategory.Name, Category.Name };
         public string[] CategoriesIds
-            => Category == null ? null
-            : Category.ParentCategory == null ? new[] { Category.AudibleCategoryId }
+            => Category is null ? null
+            : Category.ParentCategory is null ? new[] { Category.AudibleCategoryId }
             : new[] { Category.ParentCategory.AudibleCategoryId, Category.AudibleCategoryId };
 
+        public string TitleSortable => Formatters.GetSortName(Title);
+        public string SeriesSortable => Formatters.GetSortName(SeriesNames);
+
         // is owned, not optional 1:1
         public UserDefinedItem UserDefinedItem { get; private set; }
 
+        // UserDefinedItem convenience properties
+        /// <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>
         public Rating Rating { get; private set; } = new Rating(0, 0, 0);
@@ -64,9 +76,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));
@@ -88,9 +102,10 @@ namespace DataLayer
 			Category = category;
 
             // simple assigns
-            Title = title;
-            Description = description;
+            Title = title.Trim() ?? "";
+            Description = description?.Trim() ?? "";
             LengthInMinutes = lengthInMinutes;
+            ContentType = contentType;
 
             // assigns with biz logic
             ReplaceAuthors(authors);
@@ -173,6 +188,9 @@ namespace DataLayer
         {
             get
             {
+                if (_seriesLink is null)
+                    return "";
+
                 // first: alphabetical by name
                 var withNames = _seriesLink
                     .Where(s => !string.IsNullOrWhiteSpace(s.Series.Name))
@@ -191,7 +209,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));
 
@@ -201,10 +219,10 @@ namespace DataLayer
 				getEntry(context).Collection(s => s.SeriesLink).Load();
 
 			var singleSeriesBook = _seriesLink.SingleOrDefault(sb => sb.Series == series);
-            if (singleSeriesBook == null)
-                _seriesLink.Add(new SeriesBook(series, this, index));
+            if (singleSeriesBook is null)
+                _seriesLink.Add(new SeriesBook(series, this, order));
             else
-                singleSeriesBook.UpdateIndex(index);
+                singleSeriesBook.UpdateOrder(order);
         }
         #endregion
 
@@ -220,8 +238,11 @@ namespace DataLayer
 
             ArgumentValidator.EnsureNotNullOrWhiteSpace(url, nameof(url));
 
-            if (!_supplements.Any(s => url.EqualsInsensitive(url)))
-                _supplements.Add(new Supplement(this, url));
+            if (_supplements.Any(s => url.EqualsInsensitive(url)))
+                return;
+
+            _supplements.Add(new Supplement(this, url));
+            UserDefinedItem.PdfStatus ??= LiberatedStatus.NotLiberated;
         }
         #endregion
 
@@ -244,10 +265,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/BookContributor.cs

@@ -2,6 +2,8 @@
 
 namespace DataLayer
 {
+    public enum Role { Author = 1, Narrator = 2, Publisher = 3 }
+
     public class BookContributor
     {
         internal int BookId { get; private set; }

DataLayer/EfClasses/Category.cs

@@ -18,7 +18,7 @@ namespace DataLayer
     public class Category
     {
         // Empty is a special case. use private ctor w/o validation
-        public static Category GetEmpty() => new Category { CategoryId = -1, AudibleCategoryId = "", Name = "" };
+        public static Category GetEmpty() => new() { CategoryId = -1, AudibleCategoryId = "", Name = "" };
 
         internal int CategoryId { get; private set; }
         public string AudibleCategoryId { get; private set; }
@@ -44,7 +44,7 @@ namespace DataLayer
         public void UpdateParentCategory(Category parentCategory)
         {
             // don't overwrite with null but not an error
-            if (parentCategory != null)
+            if (parentCategory is not null)
                 ParentCategory = parentCategory;
         }
 

DataLayer/EfClasses/Contributor.cs

@@ -7,7 +7,7 @@ namespace DataLayer
     public class Contributor
 	{
 		// Empty is a special case. use private ctor w/o validation
-		public static Contributor GetEmpty() => new Contributor { ContributorId = -1, Name = "" };
+		public static Contributor GetEmpty() => new() { ContributorId = -1, Name = "" };
 
 		// contributors search links are just name with url-encoding. space can be + or %20
 		//   author search link:   /search?searchAuthor=Robert+Bevan
@@ -31,16 +31,12 @@ namespace DataLayer
         public string AudibleContributorId { get; private set; }
 
         private Contributor() { }
-        public Contributor(string name)
+        public Contributor(string name, string audibleContributorId = null)
         {
-            ArgumentValidator.EnsureNotNullOrWhiteSpace(name, nameof(name));
+            Name = ArgumentValidator.EnsureNotNullOrWhiteSpace(name, nameof(name));
 
             _booksLink = new HashSet<BookContributor>();
 
-            Name = name;
-        }
-		public Contributor(string name, string audibleContributorId) : this(name)
-		{
 			// don't overwrite with null or whitespace but not an error
 			if (!string.IsNullOrWhiteSpace(audibleContributorId))
 				AudibleContributorId = audibleContributorId;

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

@@ -1,4 +0,0 @@
-namespace DataLayer
-{
-    public enum Role { Author = 1, Narrator = 2, Publisher = 3 }
-}

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

@@ -6,6 +6,20 @@ using Dinah.Core;
 
 namespace DataLayer
 {
+    /// <summary>
+    /// Do not track in-process state. In-process state is determined by the presence of temp file.
+    /// </summary>
+    public enum LiberatedStatus
+    {
+        NotLiberated = 0,
+        Liberated = 1,
+        /// <summary>Error occurred during liberation. Don't retry</summary>
+        Error = 2,
+
+        /// <summary>Application-state only. Not a valid persistence state.</summary>
+        PartialDownload = 0x1000
+    }
+
     public class UserDefinedItem
     {
         internal int BookId { get; private set; }
@@ -19,14 +33,23 @@ namespace DataLayer
 
 			// import previously saved tags
 			ArgumentValidator.EnsureNotNullOrWhiteSpace(book.AudibleProductId, nameof(book.AudibleProductId));
-			Tags = FileManager.TagsPersistence.GetTags(book.AudibleProductId);
+			Tags = LibationFileManager.TagsPersistence.GetTags(book.AudibleProductId);
 		}
 
+        #region Tags
         private string _tags = "";
         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);
@@ -71,14 +94,74 @@ namespace DataLayer
             return string.Join(" ", unique);
         }
         #endregion
+        #endregion
 
+        #region Rating
         // owned: not an optional one-to-one
         /// <summary>The user's individual book rating</summary>
         public Rating Rating { get; private set; } = new Rating(0, 0, 0);
 
         public void UpdateRating(float overallRating, float performanceRating, float storyRating)
             => Rating.Update(overallRating, performanceRating, storyRating);
+        #endregion
 
-		public override string ToString() => $"{Book} {Rating} {Tags}";
+        #region LiberatedStatuses
+        /// <summary>
+        /// Occurs when <see cref="Tags"/>, <see cref="BookStatus"/>, or <see cref="PdfStatus"/> values change.
+        /// This signals the change of the in-memory value; it does not ensure that the new value has been persisted.
+        /// </summary>
+        public static event EventHandler<string> ItemChanged;
+
+        private void OnItemChanged(string e)
+        {
+            // HACK
+            // must not fire during initial import.
+            //
+            // these checks are necessary because current architecture attaches to this instead of attaching to an event *after* fully committed to db. the attached delegate/action sometimes calls commit:
+            //
+            // desired:
+            // - importing new book
+            // - update pdf status
+            // - initial book commit
+            //
+            // actual without these checks [BAD]:
+            // - importing new book
+            // - update pdf status
+            //   - invoke event
+            //   - commit UserDefinedItem
+            // - initial book commit
+            if (BookId > 0 && Book is not null && Book.BookId > 0)
+                ItemChanged?.Invoke(this, e);
+        }
+
+        private LiberatedStatus _bookStatus;
+        private LiberatedStatus? _pdfStatus;
+        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
+
+        public override string ToString() => $"{Book} {Rating} {Tags}";
 	}
 }

DataLayer/Formatters.cs

@@ -0,0 +1,27 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace DataLayer
+{
+    internal class Formatters
+	{
+		private static string[] _sortPrefixIgnores { get; } = { "the", "a", "an" };
+
+		public static string GetSortName(string unformattedName)
+		{
+			var sortName = unformattedName
+				.Replace("|", "")
+				.Replace(":", "")
+				.ToLowerInvariant()
+				.Trim();
+
+			if (_sortPrefixIgnores.Any(prefix => sortName.StartsWith(prefix + " ")))
+				sortName = sortName
+					.Substring(sortName.IndexOf(" ") + 1)
+					.TrimStart();
+
+			return sortName;
+		}
+	}
+}

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/20210727180408_AddLiberatedStatus.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("20210727180408_AddLiberatedStatus")]
+    partial class AddLiberatedStatus
+    {
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("ProductVersion", "5.0.5");
+
+            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<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<string>("BookLocation")
+                                .HasColumnType("TEXT");
+
+                            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/20210727180408_AddLiberatedStatus.cs

@@ -0,0 +1,44 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+namespace DataLayer.Migrations
+{
+    public partial class AddLiberatedStatus : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<string>(
+                name: "BookLocation",
+                table: "UserDefinedItem",
+                type: "TEXT",
+                nullable: true);
+
+            migrationBuilder.AddColumn<int>(
+                name: "BookStatus",
+                table: "UserDefinedItem",
+                type: "INTEGER",
+                nullable: false,
+                defaultValue: 0);
+
+            migrationBuilder.AddColumn<int>(
+                name: "PdfStatus",
+                table: "UserDefinedItem",
+                type: "INTEGER",
+                nullable: true);
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "BookLocation",
+                table: "UserDefinedItem");
+
+            migrationBuilder.DropColumn(
+                name: "BookStatus",
+                table: "UserDefinedItem");
+
+            migrationBuilder.DropColumn(
+                name: "PdfStatus",
+                table: "UserDefinedItem");
+        }
+    }
+}

DataLayer/Migrations/20210821012137_RemoveUdiBookLocation.Designer.cs

@@ -0,0 +1,387 @@
+// <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("20210821012137_RemoveUdiBookLocation")]
+    partial class RemoveUdiBookLocation
+    {
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("ProductVersion", "5.0.5");
+
+            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<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/20210821012137_RemoveUdiBookLocation.cs

@@ -0,0 +1,23 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+namespace DataLayer.Migrations
+{
+    public partial class RemoveUdiBookLocation : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "BookLocation",
+                table: "UserDefinedItem");
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<string>(
+                name: "BookLocation",
+                table: "UserDefinedItem",
+                type: "TEXT",
+                nullable: true);
+        }
+    }
+}

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");
 
@@ -253,6 +256,12 @@ namespace DataLayer.Migrations
                             b1.Property<int>("BookId")
                                 .HasColumnType("INTEGER");
 
+                            b1.Property<int>("BookStatus")
+                                .HasColumnType("INTEGER");
+
+                            b1.Property<int?>("PdfStatus")
+                                .HasColumnType("INTEGER");
+
                             b1.Property<string>("Tags")
                                 .HasColumnType("TEXT");
 

DataLayer/QueryObjects/BookQueries.cs

@@ -6,18 +6,21 @@ using Microsoft.EntityFrameworkCore;
 
 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 BookQueries
     {
         public static Book GetBook_Flat_NoTracking(this LibationContext context, string productId)
             => context
                 .Books
-                .AsNoTracking()
+                .AsNoTrackingWithIdentityResolution()
                 .GetBook(productId);
 
         public static Book GetBook(this IQueryable<Book> books, string productId)
             => books
                 .GetBooks()
-                .SingleOrDefault(b => b.AudibleProductId == productId);
+                // 'Single' is more accurate but 'First' is faster and less error prone
+                .FirstOrDefault(b => b.AudibleProductId == productId);
 
         /// <summary>This is still IQueryable. YOU MUST CALL ToList() YOURSELF</summary>
         public static IQueryable<Book> GetBooks(this IQueryable<Book> books, Expression<Func<Book, bool>> predicate)
@@ -25,6 +28,7 @@ namespace DataLayer
                 .GetBooks()
                 .Where(predicate);
 
+        /// <summary>This is still IQueryable. YOU MUST CALL ToList() YOURSELF</summary>
         public static IQueryable<Book> GetBooks(this IQueryable<Book> books)
             => books
                 // owned items are always loaded. eg: book.UserDefinedItem, book.Supplements

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

@@ -4,27 +4,35 @@ using Microsoft.EntityFrameworkCore;
 
 namespace DataLayer
 {
-    public static class LibraryQueries
+    // 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 LibraryBookQueries
 	{
-		public static List<LibraryBook> GetLibrary_Flat_WithTracking(this LibationContext context)
-			=> context
-				.Library
-				.GetLibrary()
-				.ToList();
+        //// 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)
+		//	=> context
+		//		.Library
+		//		.GetLibrary()
+		//		.ToList();
 
 		public static List<LibraryBook> GetLibrary_Flat_NoTracking(this LibationContext context)
             => context
-                .Library
-                .AsNoTracking()
+                .LibraryBooks
+                .AsNoTrackingWithIdentityResolution()
                 .GetLibrary()
                 .ToList();
 
         public static LibraryBook GetLibraryBook_Flat_NoTracking(this LibationContext context, string productId)
             => context
-                .Library
-                .AsNoTracking()
+                .LibraryBooks
+                .AsNoTrackingWithIdentityResolution()
                 .GetLibraryBook(productId);
 
+        public static LibraryBook GetLibraryBook(this IQueryable<LibraryBook> library, string productId)
+            => library
+                .GetLibrary()
+                .SingleOrDefault(lb => lb.Book.AudibleProductId == productId);
+
         /// <summary>This is still IQueryable. YOU MUST CALL ToList() YOURSELF</summary>
         public static IQueryable<LibraryBook> GetLibrary(this IQueryable<LibraryBook> library)
             => library
@@ -32,10 +40,5 @@ namespace DataLayer
                 .Include(le => le.Book).ThenInclude(b => b.SeriesLink).ThenInclude(sb => sb.Series)
                 .Include(le => le.Book).ThenInclude(b => b.ContributorsLink).ThenInclude(c => c.Contributor)
                 .Include(le => le.Book).ThenInclude(b => b.Category).ThenInclude(c => c.ParentCategory);
-
-        public static LibraryBook GetLibraryBook(this IQueryable<LibraryBook> library, string productId)
-            => library
-                .GetLibrary()
-                .SingleOrDefault(le => le.Book.AudibleProductId == productId);
     }
 }

DataLayer/TagPersistenceInterceptor.cs

@@ -19,12 +19,12 @@ namespace DataLayer
 				.Entries()
 				.Where(e => e.State.In(EntityState.Modified, EntityState.Added))
 				.Select(e => e.Entity as UserDefinedItem)
-				.Where(udi => udi != null)
+				.Where(udi => udi is not null)
 				// do NOT filter out entires with blank tags. blank is the valid way to show the absence of tags
 				.Select(t => (t.Book.AudibleProductId, t.Tags))
 				.ToList();
 
-			FileManager.TagsPersistence.Save(tagsCollection);
+			LibationFileManager.TagsPersistence.Save(tagsCollection);
 		}
 	}
 }

DataLayer/Utilities/LocalDatabaseInfo.cs

@@ -1,38 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-
-namespace DataLayer.Utilities
-{
-	public static class LocalDatabaseInfo
-	{
-		public static List<string> GetLocalDBInstances()
-		{
-			// Start the child process.
-			using var p = new System.Diagnostics.Process
-			{
-				StartInfo = new System.Diagnostics.ProcessStartInfo
-				{
-					UseShellExecute = false,
-					RedirectStandardOutput = true,
-					FileName = "cmd.exe",
-					Arguments = "/C sqllocaldb info",
-					CreateNoWindow = true,
-					WindowStyle = System.Diagnostics.ProcessWindowStyle.Hidden
-				}
-			};
-			p.Start();
-			var output = p.StandardOutput.ReadToEnd();
-			p.WaitForExit();
-
-			// if LocalDb is not installed then it will return that 'sqllocaldb' is not recognized as an internal or external command operable program or batch file
-			return string.IsNullOrWhiteSpace(output) || output.Contains("not recognized")
-				? new List<string>()
-				: output
-					.Split(new string[] { Environment.NewLine }, StringSplitOptions.None)
-					.Select(i => i.Trim())
-					.Where(i => !string.IsNullOrEmpty(i))
-					.ToList();
-		}
-	}
-}

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,47 +1,56 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using AudibleApiDTOs;
+using AudibleApi.Common;
+using AudibleUtilities;
 using DataLayer;
-using InternalUtilities;
+using Dinah.Core.Collections.Generic;
 
 namespace DtoImporterService
 {
 	public class BookImporter : ItemsImporterBase
 	{
-		public BookImporter(LibationContext context) : base(context) { }
+		protected override IValidator Validator => new BookValidator();
 
-		public override IEnumerable<Exception> Validate(IEnumerable<ImportItem> importItems) => new BookValidator().Validate(importItems.Select(i => i.DtoItem));
+		public Dictionary<string, Book> Cache { get; private set; } = new();
+
+		private ContributorImporter contributorImporter { get; }
+		private SeriesImporter seriesImporter { get; }
+		private CategoryImporter categoryImporter { get; }
+
+		public BookImporter(LibationContext context) : base(context)
+		{
+			contributorImporter = new ContributorImporter(DbContext);
+			seriesImporter = new SeriesImporter(DbContext);
+			categoryImporter = new CategoryImporter(DbContext);
+		}
 
 		protected override int DoImport(IEnumerable<ImportItem> importItems)
 		{
 			// pre-req.s
-			new ContributorImporter(DbContext).Import(importItems);
-			new SeriesImporter(DbContext).Import(importItems);
-			new CategoryImporter(DbContext).Import(importItems);
+			contributorImporter.Import(importItems);
+			seriesImporter.Import(importItems);
+			categoryImporter.Import(importItems);
 
-			// get distinct
-			var productIds = importItems.Select(i => i.DtoItem.ProductId).ToList();
-
-			// load db existing => .Local
-			loadLocal_books(productIds);
+			// load db existing => hash table
+			loadLocal_books(importItems);
 
 			// upsert
 			var qtyNew = upsertBooks(importItems);
 			return qtyNew;
 		}
 
-		private void loadLocal_books(List<string> productIds)
+		private void loadLocal_books(IEnumerable<ImportItem> importItems)
 		{
-			var localProductIds = DbContext.Books.Local.Select(b => b.AudibleProductId);
-			var remainingProductIds = productIds
+			// get distinct
+			var productIds = importItems
+				.Select(i => i.DtoItem.ProductId)
 				.Distinct()
-				.Except(localProductIds)
 				.ToList();
 
-			// GetBooks() eager loads Series, category, et al
-			if (remainingProductIds.Any())
-				DbContext.Books.GetBooks(b => remainingProductIds.Contains(b.AudibleProductId)).ToList();
+			Cache = DbContext.Books
+				.GetBooks(b => productIds.Contains(b.AudibleProductId))
+				.ToDictionarySafe(b => b.AudibleProductId);
 		}
 
 		private int upsertBooks(IEnumerable<ImportItem> importItems)
@@ -50,8 +59,7 @@ namespace DtoImporterService
 
 			foreach (var item in importItems)
 			{
-				var book = DbContext.Books.Local.SingleOrDefault(p => p.AudibleProductId == item.DtoItem.ProductId);
-				if (book is null)
+				if (!Cache.TryGetValue(item.DtoItem.ProductId, out var book))
 				{
 					book = createNewBook(item);
 					qtyNew++;
@@ -67,6 +75,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 } };
@@ -74,7 +84,7 @@ namespace DtoImporterService
 			// nested logic is required so order of names is retained. else, contributors may appear in the order they were inserted into the db
 			var authors = item
 				.Authors
-				.Select(a => DbContext.Contributors.Local.Single(c => a.Name == c.Name))
+				.Select(a => contributorImporter.Cache[a.Name])
 				.ToList();
 
 			var narrators
@@ -84,7 +94,7 @@ namespace DtoImporterService
 				// nested logic is required so order of names is retained. else, contributors may appear in the order they were inserted into the db
 				: item
 					.Narrators
-					.Select(n => DbContext.Contributors.Local.Single(c => n.Name == c.Name))
+					.Select(n => contributorImporter.Cache[n.Name])
 					.ToList();
 
 			// categories are laid out for a breadcrumb. category is 1st, subcategory is 2nd
@@ -98,30 +108,51 @@ namespace DtoImporterService
 				// 2+
 				: item.Categories[1].CategoryId;
 
-			var category = DbContext.Categories.Local.SingleOrDefault(c => c.AudibleCategoryId == lastCategory);
+			var category = categoryImporter.Cache[lastCategory];
 
-			var book = DbContext.Books.Add(new Book(
-				new AudibleProductId(item.ProductId),
-				item.Title,
-				item.Description,
-				item.LengthInMinutes,
-				authors,
-				narrators,
-				category,
-				importItem.LocaleName)
-			).Entity;
+			Book book;
+			try
+			{
+				book = DbContext.Books.Add(new Book(
+					new AudibleProductId(item.ProductId),
+					item.TitleWithSubtitle,
+					item.Description,
+					item.LengthInMinutes,
+					contentType,
+					authors,
+					narrators,
+					category,
+					importItem.LocaleName)
+					).Entity;
+				Cache.Add(book.AudibleProductId, book);
+			}
+			catch (Exception ex)
+			{
+				Serilog.Log.Logger.Error(ex, "Error adding book. {@DebugInfo}", new {
+					item.ProductId,
+					item.TitleWithSubtitle,
+					item.Description,
+					item.LengthInMinutes,
+					contentType,
+					QtyAuthors = authors?.Count,
+					QtyNarrators = narrators?.Count,
+					Category = category?.Name,
+					importItem.LocaleName
+				});
+				throw;
+			}
 
 			var publisherName = item.Publisher;
 			if (!string.IsNullOrWhiteSpace(publisherName))
 			{
-				var publisher = DbContext.Contributors.Local.Single(c => publisherName == c.Name);
+				var publisher = contributorImporter.Cache[publisherName];
 				book.ReplacePublisher(publisher);
 			}
 
 			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;
 		}
@@ -131,34 +162,22 @@ namespace DtoImporterService
 			var item = importItem.DtoItem;
 
 			// set/update book-specific info which may have changed
-			book.PictureId = item.PictureId;
-			book.UpdateProductRating(item.Product_OverallStars, item.Product_PerformanceStars, item.Product_StoryStars);
+			if (item.PictureId is not null)
+				book.PictureId = item.PictureId;
 
-			// needed during v3 => v4 migration
-			book.UpdateLocale(importItem.LocaleName);
+			book.UpdateProductRating(item.Product_OverallStars, item.Product_PerformanceStars, item.Product_StoryStars);
 
 			// 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);
 
 			// update series even for existing books. these are occasionally updated
 			// these will upsert over library-scraped series, but will not leave orphans
-			if (item.Series != null)
+			if (item.Series is not null)
 			{
 				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);
+					var series = seriesImporter.Cache[seriesEntry.SeriesId];
+					book.UpsertSeries(series, seriesEntry.Sequence);
 				}
 			}
 		}

DtoImporterService/CategoryImporter.cs

@@ -1,17 +1,20 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using AudibleApiDTOs;
+using AudibleApi.Common;
+using AudibleUtilities;
 using DataLayer;
-using InternalUtilities;
+using Dinah.Core.Collections.Generic;
 
 namespace DtoImporterService
 {
 	public class CategoryImporter : ItemsImporterBase
 	{
-		public CategoryImporter(LibationContext context) : base(context) { }
+		protected override IValidator Validator => new CategoryValidator();
 
-		public override IEnumerable<Exception> Validate(IEnumerable<ImportItem> importItems) => new CategoryValidator().Validate(importItems.Select(i => i.DtoItem));
+		public Dictionary<string, Category> Cache { get; private set; } = new();
+
+		public CategoryImporter(LibationContext context) : base(context) { }
 
 		protected override int DoImport(IEnumerable<ImportItem> importItems)
 		{
@@ -19,7 +22,9 @@ namespace DtoImporterService
 			var categoryIds = importItems
 				.Select(i => i.DtoItem)
 				.GetCategoriesDistinct()
-				.Select(c => c.CategoryId).ToList();
+				.Select(c => c.CategoryId)
+				.Distinct()
+				.ToList();
 
 			// load db existing => .Local
 			loadLocal_categories(categoryIds);
@@ -35,17 +40,13 @@ namespace DtoImporterService
 
 		private void loadLocal_categories(List<string> categoryIds)
 		{
-			var localIds = DbContext.Categories.Local.Select(c => c.AudibleCategoryId);
-			var remainingCategoryIds = categoryIds
-				.Distinct()
-				.Except(localIds)
-				.ToList();
+			// must include default/empty/missing
+			categoryIds.Add(Category.GetEmpty().AudibleCategoryId);
 
 			// load existing => local
-			// remember to include default/empty/missing
-			var emptyName = Contributor.GetEmpty().Name;
-			if (remainingCategoryIds.Any())
-				DbContext.Categories.Where(c => remainingCategoryIds.Contains(c.AudibleCategoryId) || c.Name == emptyName).ToList();
+			Cache = DbContext.Categories
+				.Where(c => categoryIds.Contains(c.AudibleCategoryId))
+				.ToDictionarySafe(c => c.AudibleCategoryId);
 		}
 
 		// only use after loading contributors => local
@@ -66,12 +67,11 @@ namespace DtoImporterService
 
 					Category parentCategory = null;
 					if (i == 1)
-						parentCategory = DbContext.Categories.Local.Single(c => c.AudibleCategoryId == pair[0].CategoryId);
+						Cache.TryGetValue(pair[0].CategoryId, out parentCategory);
 
-					var category = DbContext.Categories.Local.SingleOrDefault(c => c.AudibleCategoryId == id);
-					if (category is null)
+					if (!Cache.TryGetValue(id, out var category))
 					{
-						category = DbContext.Categories.Add(new Category(new AudibleCategoryId(id), name)).Entity;
+						category = addCategory(id, name);
 						qtyNew++;
 					}
 
@@ -81,5 +81,24 @@ namespace DtoImporterService
 
 			return qtyNew;
 		}
+
+		private Category addCategory(string id, string name)
+		{
+			try
+			{
+				var category = new Category(new AudibleCategoryId(id), name);
+
+				var entityEntry = DbContext.Categories.Add(category);
+				var entity = entityEntry.Entity;
+
+				Cache.Add(entity.AudibleCategoryId, entity);
+				return entity;
+			}
+			catch (Exception ex)
+			{
+				Serilog.Log.Logger.Error(ex, "Error adding category. {@DebugInfo}", new { id, name });
+				throw;
+			}
+		}
 	}
 }

DtoImporterService/ContributorImporter.cs

@@ -1,17 +1,20 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using AudibleApiDTOs;
+using AudibleApi.Common;
+using AudibleUtilities;
 using DataLayer;
-using InternalUtilities;
+using Dinah.Core.Collections.Generic;
 
 namespace DtoImporterService
 {
 	public class ContributorImporter : ItemsImporterBase
 	{
-		public ContributorImporter(LibationContext context) : base(context) { }
+		protected override IValidator Validator => new ContributorValidator();
 
-		public override IEnumerable<Exception> Validate(IEnumerable<ImportItem> importItems) => new ContributorValidator().Validate(importItems.Select(i => i.DtoItem));
+		public Dictionary<string, Contributor> Cache { get; private set; } = new();
+
+		public ContributorImporter(LibationContext context) : base(context) { }
 
 		protected override int DoImport(IEnumerable<ImportItem> importItems)
 		{
@@ -47,56 +50,64 @@ namespace DtoImporterService
 
 		private void loadLocal_contributors(List<string> contributorNames)
 		{
-			//// 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 remainingContribNames = contributorNames
-				.Distinct()
-				.Except(localNames)
-				.ToList();
+			// must include default/empty/missing
+			contributorNames.Add(Contributor.GetEmpty().Name);
 
 			// 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();
+			Cache = DbContext.Contributors
+				.Where(c => contributorNames.Contains(c.Name))
+				.ToDictionarySafe(c => c.Name);
 		}
 
-		// only use after loading contributors => local
 		private int upsertPeople(List<Person> people)
 		{
-			var qtyNew = 0;
+			var hash = people
+				// new people only
+				.Where(p => !Cache.ContainsKey(p.Name))
+				// remove duplicates by Name. first in wins
+				.ToDictionarySafe(p => p.Name);
 
-			foreach (var p in people)
+			foreach (var kvp in hash)
 			{
-				var person = DbContext.Contributors.Local.SingleOrDefault(c => c.Name == p.Name);
-				if (person == null)
-				{
-					person = DbContext.Contributors.Add(new Contributor(p.Name, p.Asin)).Entity;
-					qtyNew++;
-				}
+				var person = kvp.Value;
+				addContributor(person.Name, person.Asin);
 			}
 
-			return qtyNew;
+			return hash.Count;
 		}
 
 		// only use after loading contributors => local
 		private int upsertPublishers(List<string> publishers)
 		{
-			var qtyNew = 0;
+			var hash = publishers
+				// new publishers only
+				.Where(p => !Cache.ContainsKey(p))
+				// remove duplicates
+				.ToHashSet();
 
-			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 hash)
+				addContributor(pub);
 
-			return qtyNew;
+			return hash.Count;
 		}
-	}
+
+        private Contributor addContributor(string name, string id = null)
+		{
+			try
+			{
+				var newContrib = new Contributor(name);
+
+				var entityEntry = DbContext.Contributors.Add(newContrib);
+				var entity = entityEntry.Entity;
+
+				Cache.Add(entity.Name, entity);
+				return entity;
+			}
+			catch (Exception ex)
+			{
+				Serilog.Log.Logger.Error(ex, "Error adding contributor. {@DebugInfo}", new { name, id });
+				throw;
+			}
+        }
+    }
 }

DtoImporterService/DtoImporterService.csproj

@@ -1,13 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0-windows</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\audible api\AudibleApi\AudibleApiDTOs\AudibleApiDTOs.csproj" />
+    <ProjectReference Include="..\AudibleUtilities\AudibleUtilities.csproj" />
     <ProjectReference Include="..\DataLayer\DataLayer.csproj" />
-    <ProjectReference Include="..\InternalUtilities\InternalUtilities.csproj" />
   </ItemGroup>
 
 </Project>

DtoImporterService/ImportItem.cs

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

DtoImporterService/ImporterBase.cs

@@ -1,9 +1,9 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using AudibleUtilities;
 using DataLayer;
 using Dinah.Core;
-using InternalUtilities;
 
 namespace DtoImporterService
 {
@@ -25,7 +25,7 @@ namespace DtoImporterService
 			try
 			{
 				var exceptions = Validate(param);
-				if (exceptions != null && exceptions.Any())
+				if (exceptions is not null && exceptions.Any())
 					throw new AggregateException($"Importer validation failed", exceptions);
 			}
 			catch (Exception ex)
@@ -53,5 +53,9 @@ namespace DtoImporterService
 	public abstract class ItemsImporterBase : ImporterBase<IEnumerable<ImportItem>>
 	{
 		protected ItemsImporterBase(LibationContext context) : base(context) { }
+
+		protected abstract IValidator Validator { get; }
+        public sealed override IEnumerable<Exception> Validate(IEnumerable<ImportItem> importItems)
+			=> Validator.Validate(importItems.Select(i => i.DtoItem));
 	}
 }

DtoImporterService/LibraryBookImporter.cs

@@ -0,0 +1,73 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using AudibleUtilities;
+using DataLayer;
+using Dinah.Core.Collections.Generic;
+
+namespace DtoImporterService
+{
+	public class LibraryBookImporter : ItemsImporterBase
+	{
+		protected override IValidator Validator => new LibraryValidator();
+
+		private BookImporter bookImporter { get; }
+
+		public LibraryBookImporter(LibationContext context) : base(context)
+		{
+			bookImporter = new BookImporter(DbContext);
+		}
+
+		protected override int DoImport(IEnumerable<ImportItem> importItems)
+		{
+			bookImporter.Import(importItems);
+
+			var qtyNew = upsertLibraryBooks(importItems);
+			return qtyNew;
+		}
+
+		private int upsertLibraryBooks(IEnumerable<ImportItem> importItems)
+		{
+			// technically, we should be able to have duplicate books from separate accounts.
+			// this would violate the current pk and would be difficult to deal with elsewhere:
+			// - what to show in the grid
+			// - which to consider liberated
+			//
+			// 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.LibraryBooks.Select(l => l.Book.AudibleProductId).ToList();
+			var newItems = importItems
+				.Where(dto => !currentLibraryProductIds.Contains(dto.DtoItem.ProductId))
+				.ToList();
+
+			// if 2 accounts try to import the same book in the same transaction: error since we're only tracking and pulling by asin.
+			// just use the first
+			var hash = newItems.ToDictionarySafe(dto => dto.DtoItem.ProductId);
+			foreach (var kvp in hash)
+            {
+				var newItem = kvp.Value;
+
+				var libraryBook = new LibraryBook(
+					bookImporter.Cache[newItem.DtoItem.ProductId],
+					newItem.DtoItem.DateAdded,
+					newItem.AccountId);
+				try
+				{
+					DbContext.LibraryBooks.Add(libraryBook);
+				}
+				catch (Exception ex)
+				{
+					Serilog.Log.Logger.Error(ex, "Error adding library book. {@DebugInfo}", new { libraryBook.Book, libraryBook.Account });
+				}
+			}
+
+			var qtyNew = hash.Count;
+			return qtyNew;
+		}
+	}
+}

DtoImporterService/LibraryImporter.cs

@@ -1,62 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using AudibleApiDTOs;
-using DataLayer;
-using InternalUtilities;
-
-namespace DtoImporterService
-{
-	public class LibraryImporter : ItemsImporterBase
-	{
-		public LibraryImporter(LibationContext context) : base(context) { }
-
-		public override IEnumerable<Exception> Validate(IEnumerable<ImportItem> importItems) => new LibraryValidator().Validate(importItems.Select(i => i.DtoItem));
-
-		protected override int DoImport(IEnumerable<ImportItem> importItems)
-		{
-			new BookImporter(DbContext).Import(importItems);
-
-			var qtyNew = upsertLibraryBooks(importItems);
-			return qtyNew;
-		}
-
-		private int upsertLibraryBooks(IEnumerable<ImportItem> importItems)
-		{
-			// technically, we should be able to have duplicate books from separate accounts.
-			// this would violate the current pk and would be difficult to deal with elsewhere:
-			// - 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
-			//
-			// 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 newItems = importItems.Where(dto => !currentLibraryProductIds.Contains(dto.DtoItem.ProductId)).ToList();
-
-			foreach (var newItem in newItems)
-			{
-				var libraryBook = new LibraryBook(
-					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);
-			}
-
-			var qtyNew = newItems.Count;
-			return qtyNew;
-		}
-	}
-}

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 { get; } = new();
+		private static List<timeLogEntry> __log { get; } = new() { 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,17 +1,20 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using AudibleApiDTOs;
+using AudibleApi.Common;
+using AudibleUtilities;
 using DataLayer;
-using InternalUtilities;
+using Dinah.Core.Collections.Generic;
 
 namespace DtoImporterService
 {
 	public class SeriesImporter : ItemsImporterBase
 	{
-		public SeriesImporter(LibationContext context) : base(context) { }
+		protected override IValidator Validator => new SeriesValidator();
 
-		public override IEnumerable<Exception> Validate(IEnumerable<ImportItem> importItems) => new SeriesValidator().Validate(importItems.Select(i => i.DtoItem));
+		public Dictionary<string, DataLayer.Series> Cache { get; private set; } = new();
+
+		public SeriesImporter(LibationContext context) : base(context) { }
 
 		protected override int DoImport(IEnumerable<ImportItem> importItems)
 		{
@@ -29,29 +32,26 @@ 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();
-			var remainingSeriesIds = seriesIds
-				.Distinct()
-				.Except(localIds)
-				.ToList();
+			var seriesIds = series.Select(s => s.SeriesId).Distinct().ToList();
 
-			if (remainingSeriesIds.Any())
-				DbContext.Series.Where(s => remainingSeriesIds.Contains(s.AudibleSeriesId)).ToList();
+			if (seriesIds.Any())
+				Cache = DbContext.Series
+					.Where(s => seriesIds.Contains(s.AudibleSeriesId))
+					.ToDictionarySafe(s => s.AudibleSeriesId);
 		}
 
-		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);
-				if (series is null)
+				// AudibleApi.Common.Series.SeriesId == DataLayer.AudibleSeriesId
+				if (!Cache.TryGetValue(s.SeriesId, out var series))
 				{
-					series = DbContext.Series.Add(new DataLayer.Series(new AudibleSeriesId(s.SeriesId))).Entity;
+					series = addSeries(s.SeriesId);
 					qtyNew++;
 				}
 				series.UpdateName(s.SeriesName);
@@ -59,5 +59,24 @@ namespace DtoImporterService
 
 			return qtyNew;
 		}
+
+		private DataLayer.Series addSeries(string seriesId)
+		{
+			try
+			{
+				var series = new DataLayer.Series(new AudibleSeriesId(seriesId));
+
+				var entityEntry = DbContext.Series.Add(series);
+				var entity = entityEntry.Entity;
+
+				Cache.Add(entity.AudibleSeriesId, entity);
+				return entity;
+			}
+			catch (Exception ex)
+			{
+				Serilog.Log.Logger.Error(ex, "Error adding series. {@DebugInfo}", new { seriesId });
+				throw;
+			}
+		}
 	}
 }

DtoImporterService/_importer notes.txt

@@ -0,0 +1,37 @@
+* Local (eg DbContext.Books.Local): indexes/hashes PK and nothing else. Local.Find(PK) is fast. All other searches (eg FirstOrDefault) have awful performance. It deceptively *feels* like we get this partially for free since added/modified entries live here.
+* live db: for all importers, fields used for lookup are indexed
+
+Using BookImporter as an example: since AudibleProductId is indexed, hitting the live db is much faster than using Local. Fastest is putting all in a local hash table
+
+Note: GetBook/GetBooks eager loads Series, category, et al
+
+for 1,200 iterations
+* load to LocalView
+  DbContext.Books.Local.FirstOrDefault(p => p.AudibleProductId == item.DtoItem.ProductId)
+  27,125 ms
+* read from live db
+  DbContext.Books.GetBook(item.DtoItem.ProductId)
+  12,224 ms
+* load to hash table: Dictionary<string, Book>
+  dictionary[item.DtoItem.ProductId];
+  1 ms (yes: ONE)
+
+With hashtable, somehow memory usage was not significantly affected
+
+-----------------------------------
+
+why were we using Local to begin with?
+
+articles suggest loading to Local with
+    context.Books.Load();
+this loads this table but not associated fields
+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);

FileLiberator/AudioDecodable.cs

@@ -0,0 +1,47 @@
+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 OnTitleDiscovered(string title) => OnTitleDiscovered(null, title);
+        protected void OnTitleDiscovered(object _, string title)
+		{
+            Serilog.Log.Logger.Debug("Event fired {@DebugInfo}", new { Name = nameof(TitleDiscovered), Title = title });
+            TitleDiscovered?.Invoke(this, title);
+		}
+
+        protected void OnAuthorsDiscovered(string authors) => OnAuthorsDiscovered(null, authors);
+        protected void OnAuthorsDiscovered(object _, string authors)
+		{
+            Serilog.Log.Logger.Debug("Event fired {@DebugInfo}", new { Name = nameof(AuthorsDiscovered), Authors = authors });
+            AuthorsDiscovered?.Invoke(this, authors);
+		}
+
+        protected void OnNarratorsDiscovered(string narrators) => OnNarratorsDiscovered(null, narrators);
+        protected void OnNarratorsDiscovered(object _, string narrators)
+		{
+            Serilog.Log.Logger.Debug("Event fired {@DebugInfo}", new { Name = nameof(NarratorsDiscovered), Narrators = narrators });
+            NarratorsDiscovered?.Invoke(this, narrators);
+		}
+
+        protected void OnRequestCoverArt(Action<byte[]> setCoverArtDel)
+		{
+            Serilog.Log.Logger.Debug("Event fired {@DebugInfo}", new { Name = nameof(RequestCoverArt) });
+            RequestCoverArt?.Invoke(this, setCoverArtDel);
+        }
+
+        protected void OnCoverImageDiscovered(byte[] coverImage)
+		{
+            Serilog.Log.Logger.Debug("Event fired {@DebugInfo}", new { Name = nameof(CoverImageDiscovered), CoverImageBytes = coverImage?.Length });
+            CoverImageDiscovered?.Invoke(this, coverImage);
+        }
+    }
+}

FileLiberator/AudioFileStorageExt.cs

@@ -0,0 +1,56 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using DataLayer;
+using Dinah.Core;
+using FileManager;
+using LibationFileManager;
+
+namespace FileLiberator
+{
+    public static class AudioFileStorageExt
+    {
+        private class MultipartRenamer
+        {
+            private LibraryBook libraryBook { get; }
+
+            internal MultipartRenamer(LibraryBook libraryBook) => this.libraryBook = libraryBook;
+
+            internal string MultipartFilename(AaxDecrypter.MultiConvertFileProperties props)
+                => Templates.ChapterFile.GetFilename(libraryBook.ToDto(), props);
+        }
+
+        public static Func<AaxDecrypter.MultiConvertFileProperties, string> CreateMultipartRenamerFunc(this AudioFileStorage _, LibraryBook libraryBook)
+            => new MultipartRenamer(libraryBook).MultipartFilename;
+
+        /// <summary>
+        /// DownloadDecryptBook:
+        /// File path for where to move files into.
+        /// Path: directory nested inside of Books directory
+        /// File name: n/a
+        /// </summary>
+        public static string GetDestinationDirectory(this AudioFileStorage _, LibraryBook libraryBook)
+            => Templates.Folder.GetFilename(libraryBook.ToDto());
+
+        /// <summary>
+        /// DownloadDecryptBook:
+        /// Path: in progress directory.
+        /// File name: final file name.
+        /// </summary>
+        public static string GetInProgressFilename(this AudioFileStorage _, LibraryBook libraryBook, string extension)
+            => Templates.File.GetFilename(libraryBook.ToDto(), AudibleFileStorage.DecryptInProgressDirectory, extension, returnFirstExisting: true);
+
+        /// <summary>
+        /// PDF: audio file does not exist
+        /// </summary>
+        public static string GetBooksDirectoryFilename(this AudioFileStorage _, LibraryBook libraryBook, string extension)
+            => Templates.File.GetFilename(libraryBook.ToDto(), AudibleFileStorage.BooksDirectory, extension);
+
+        /// <summary>
+        /// PDF: audio file already exists
+        /// </summary>
+        public static string GetCustomDirFilename(this AudioFileStorage _, LibraryBook libraryBook, string dirFullPath, string extension)
+            => Templates.File.GetFilename(libraryBook.ToDto(), dirFullPath, extension);
+    }
+}

FileLiberator/BackupBook.cs

@@ -1,57 +0,0 @@
-using System;
-using System.Threading.Tasks;
-using DataLayer;
-using Dinah.Core.ErrorHandling;
-using FileManager;
-
-namespace FileLiberator
-{
-    /// <summary>
-    /// Download DRM book and decrypt audiobook files
-    /// 
-    /// Processes:
-    /// Download: download aax file: the DRM encrypted audiobook
-    /// Decrypt: remove DRM encryption from audiobook. Store final book
-    /// Backup: perform all steps (downloaded, decrypt) still needed to get final book
-    /// </summary>
-    public class BackupBook : IProcessable
-    {
-        public event EventHandler<LibraryBook> Begin;
-        public event EventHandler<string> StatusUpdate;
-        public event EventHandler<LibraryBook> Completed;
-
-        public DownloadDecryptBook DecryptBook { get; } = new DownloadDecryptBook();
-		public DownloadPdf DownloadPdf { get; } = new DownloadPdf();
-
-		public bool Validate(LibraryBook libraryBook)
-            => !AudibleFileStorage.Audio.Exists(libraryBook.Book.AudibleProductId);
-
-		// 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
-			{
-				{
-					var statusHandler = await DecryptBook.TryProcessAsync(libraryBook);
-					if (statusHandler.HasErrors)
-						return statusHandler;
-				}
-
-				{
-					var statusHandler = await DownloadPdf.TryProcessAsync(libraryBook);
-					if (statusHandler.HasErrors)
-						return statusHandler;
-				}
-
-				return new StatusHandler();
-			}
-			finally
-            {
-                Completed?.Invoke(this, libraryBook);
-            }
-        }
-	}
-}

FileLiberator/ConvertToMp3.cs

@@ -0,0 +1,93 @@
+using System;
+using System.IO;
+using System.Threading.Tasks;
+using AAXClean;
+using AAXClean.Codecs;
+using DataLayer;
+using Dinah.Core;
+using Dinah.Core.ErrorHandling;
+using Dinah.Core.Net.Http;
+using FileManager;
+using LibationFileManager;
+
+namespace FileLiberator
+{
+    public class ConvertToMp3 : AudioDecodable
+    {
+        private Mp4File m4bBook;
+
+		private long fileSize;
+        private static string Mp3FileName(string m4bPath) => Path.ChangeExtension(m4bPath ?? "", ".mp3");
+
+        public override void Cancel() => m4bBook?.Cancel();
+
+        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 override async Task<StatusHandler> ProcessAsync(LibraryBook libraryBook)
+        {
+            OnBegin(libraryBook);
+
+            OnStreamingBegin($"Begin converting {libraryBook} to mp3");
+
+            try
+            {
+                var m4bPath = AudibleFileStorage.Audio.GetPath(libraryBook.Book.AudibleProductId);
+                m4bBook = new Mp4File(m4bPath, FileAccess.Read);
+                m4bBook.ConversionProgressUpdate += M4bBook_ConversionProgressUpdate;
+
+                fileSize = m4bBook.InputStream.Length;
+
+                OnTitleDiscovered(m4bBook.AppleTags.Title);
+                OnAuthorsDiscovered(m4bBook.AppleTags.FirstAuthor);
+                OnNarratorsDiscovered(m4bBook.AppleTags.Narrator);
+                OnCoverImageDiscovered(m4bBook.AppleTags.Cover);
+
+                using var mp3File = File.OpenWrite(Path.GetTempFileName());
+
+                var result = await Task.Run(() => m4bBook.ConvertToMp3(mp3File));
+                m4bBook.InputStream.Close();
+                mp3File.Close();
+
+                var proposedMp3Path = Mp3FileName(m4bPath);
+                var realMp3Path = FileUtility.SaferMoveToValidPath(mp3File.Name, proposedMp3Path);
+                OnFileCreated(libraryBook, realMp3Path);
+
+                var statusHandler = new StatusHandler();
+
+                if (result == ConversionResult.Failed)
+                    statusHandler.AddError("Conversion failed");
+
+                return statusHandler;
+            }
+            finally
+            {
+                OnStreamingCompleted($"Completed converting to mp3: {libraryBook.Book.Title}");
+                OnCompleted(libraryBook);
+            }
+        }
+
+        private void M4bBook_ConversionProgressUpdate(object sender, ConversionProgressEventArgs e)
+        {
+            var duration = m4bBook.Duration;
+            var remainingSecsToProcess = (duration - e.ProcessPosition).TotalSeconds;
+            var estTimeRemaining = remainingSecsToProcess / e.ProcessSpeed;
+
+            if (double.IsNormal(estTimeRemaining))
+                OnStreamingTimeRemaining(TimeSpan.FromSeconds(estTimeRemaining));
+
+            double progressPercent = 100 * e.ProcessPosition.TotalSeconds / duration.TotalSeconds;
+
+            OnStreamingProgressChanged(
+                new DownloadProgress
+                {
+                    ProgressPercentage = progressPercent,
+                    BytesReceived = (long)(fileSize * progressPercent),
+                    TotalBytesToReceive = fileSize
+                });
+        }
+    }
+}

FileLiberator/DownloadDecryptBook.cs

@@ -1,224 +1,281 @@
-using DataLayer;
-using Dinah.Core;
-using Dinah.Core.ErrorHandling;
-using FileManager;
-using System;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using System.Text;
 using System.Threading.Tasks;
 using AaxDecrypter;
 using AudibleApi;
+using DataLayer;
+using Dinah.Core;
+using Dinah.Core.ErrorHandling;
+using FileManager;
+using LibationFileManager;
 
 namespace FileLiberator
 {
-    public class DownloadDecryptBook : IDecryptable
+    public class DownloadDecryptBook : AudioDecodable
     {
-        public event EventHandler<Action<byte[]>> RequestCoverArt;
-        public event EventHandler<LibraryBook> Begin;
-        public event EventHandler<string> DecryptBegin;
-        public event EventHandler<string> TitleDiscovered;
-        public event EventHandler<string> AuthorsDiscovered;
-        public event EventHandler<string> NarratorsDiscovered;
-        public event EventHandler<byte[]> CoverImageFilepathDiscovered;
-        public event EventHandler<int> UpdateProgress;
-        public event EventHandler<TimeSpan> UpdateRemainingTime;
-        public event EventHandler<string> DecryptCompleted;
-        public event EventHandler<LibraryBook> Completed;
-        public event EventHandler<string> StatusUpdate;
+        private AudiobookDownloadBase abDownloader;
 
-        private AaxcDownloadConverter aaxcDownloader;
-        public async Task<StatusHandler> ProcessAsync(LibraryBook libraryBook)
+        public override bool Validate(LibraryBook libraryBook) => !libraryBook.Book.Audio_Exists;
+
+        public override void Cancel() => abDownloader?.Cancel();
+
+        public override async Task<StatusHandler> ProcessAsync(LibraryBook libraryBook)
         {
-            Begin?.Invoke(this, libraryBook);
+            var entries = new List<FilePathCache.CacheEntry>();
+            // these only work so minimally b/c CacheEntry is a record.
+            // in case of parallel decrypts, only capture the ones for this book id.
+            // if user somehow starts multiple decrypts of the same book in parallel: on their own head be it
+            void FilePathCache_Inserted(object sender, FilePathCache.CacheEntry e)
+            {
+                if (e.Id.EqualsInsensitive(libraryBook.Book.AudibleProductId))
+                    entries.Add(e);
+            }
+            void FilePathCache_Removed(object sender, FilePathCache.CacheEntry e)
+            {
+                if (e.Id.EqualsInsensitive(libraryBook.Book.AudibleProductId))
+                    entries.Remove(e);
+            }
+
+            OnBegin(libraryBook);
 
             try
             {
-                if (AudibleFileStorage.Audio.Exists(libraryBook.Book.AudibleProductId))
+                if (libraryBook.Book.Audio_Exists)
                     return new StatusHandler { "Cannot find decrypt. Final audio file already exists" };
 
-                var outputAudioFilename = await aaxToM4bConverterDecryptAsync(AudibleFileStorage.DecryptInProgress, libraryBook);
+                bool success = false;
+                try
+                {
+                    FilePathCache.Inserted += FilePathCache_Inserted;
+                    FilePathCache.Removed += FilePathCache_Removed;
+
+                    success = await downloadAudiobookAsync(libraryBook);
+                }
+                finally
+                {
+                    FilePathCache.Inserted -= FilePathCache_Inserted;
+                    FilePathCache.Removed -= FilePathCache_Removed;
+                }
 
                 // decrypt failed
-                if (outputAudioFilename is null)
+                if (!success)
+                {
+                    foreach (var tmpFile in entries.Where(f => f.FileType != FileType.AAXC))
+                        FileUtility.SaferDelete(tmpFile.Path);
+
                     return new StatusHandler { "Decrypt failed" };
+                }
 
-                // moves files and returns dest dir
-                _ = moveFilesToBooksDir(libraryBook.Book, outputAudioFilename);
+                // moves new files from temp dir to final dest
+                var movedAudioFile = moveFilesToBooksDir(libraryBook, entries);
 
-                var finalAudioExists = AudibleFileStorage.Audio.Exists(libraryBook.Book.AudibleProductId);
-                if (!finalAudioExists)
+                // decrypt failed
+                if (!movedAudioFile)
                     return new StatusHandler { "Cannot find final audio file after decryption" };
 
+                libraryBook.Book.UserDefinedItem.BookStatus = LiberatedStatus.Liberated;
+
                 return new StatusHandler();
             }
             finally
             {
-                Completed?.Invoke(this, libraryBook);
+                OnCompleted(libraryBook);
             }
         }
 
-        private async Task<string> aaxToM4bConverterDecryptAsync(string destinationDir, LibraryBook libraryBook)
+        private async Task<bool> downloadAudiobookAsync(LibraryBook libraryBook)
         {
-            DecryptBegin?.Invoke(this, $"Begin decrypting {libraryBook}");
+            OnStreamingBegin($"Begin decrypting {libraryBook}");
 
             try
             {
-                validate(libraryBook);
+                var config = Configuration.Instance;
 
-                var api = await InternalUtilities.AudibleApiActions.GetApiAsync(libraryBook.Account, libraryBook.Book.Locale);
+                downloadValidation(libraryBook);
 
+                var api = await libraryBook.GetApiAsync();
                 var contentLic = await api.GetDownloadLicenseAsync(libraryBook.Book.AudibleProductId);
+                var audiobookDlLic = BuildDownloadOptions(config, contentLic);
 
-                var aaxcDecryptDlLic = new DownloadLicense
-                    (
-                    contentLic.ContentMetadata?.ContentUrl?.OfflineUrl,
-                    contentLic.Voucher?.Key,
-                    contentLic.Voucher?.Iv,
-                    Resources.UserAgent
-                    );
+                var outFileName = AudibleFileStorage.Audio.GetInProgressFilename(libraryBook, audiobookDlLic.OutputFormat.ToString().ToLower());
+                var cacheDir = AudibleFileStorage.DownloadsInProgressDirectory;
 
-                if (Configuration.Instance.AllowLibationFixup)
+                if (contentLic.DrmType != AudibleApi.Common.DrmType.Adrm)
+                    abDownloader = new UnencryptedAudiobookDownloader(outFileName, cacheDir, audiobookDlLic);
+                else
                 {
-                    aaxcDecryptDlLic.ChapterInfo = new ChapterInfo();
+                    AaxcDownloadConvertBase converter
+                        = config.SplitFilesByChapter ? new AaxcDownloadMultiConverter(
+                            outFileName, cacheDir, audiobookDlLic,
+                            AudibleFileStorage.Audio.CreateMultipartRenamerFunc(libraryBook))
+                        : new AaxcDownloadSingleConverter(outFileName, cacheDir, audiobookDlLic);
 
-                    foreach (var chap in contentLic.ContentMetadata?.ChapterInfo?.Chapters)
-                        aaxcDecryptDlLic.ChapterInfo.AddChapter(
-                            new Chapter(
-                                chap.Title,
-                                chap.StartOffsetMs,
-                                chap.LengthMs
-                                ));
+                    if (config.AllowLibationFixup)
+                        converter.RetrievedMetadata += (_, tags) => tags.Generes = string.Join(", ", libraryBook.Book.CategoriesNames);
+
+                    abDownloader = converter;
                 }
 
-                aaxcDownloader = AaxcDownloadConverter.Create(destinationDir, aaxcDecryptDlLic);
-
-                aaxcDownloader.AppName = "Libation";                              
-
-                // override default which was set in CreateAsync
-                var proposedOutputFile = Path.Combine(destinationDir, $"{PathLib.ToPathSafeString(libraryBook.Book.Title)} [{libraryBook.Book.AudibleProductId}].m4b");
-                aaxcDownloader.SetOutputFilename(proposedOutputFile);
-                aaxcDownloader.DecryptProgressUpdate += (s, progress) => UpdateProgress?.Invoke(this, progress);
-                aaxcDownloader.DecryptTimeRemaining += (s, remaining) => UpdateRemainingTime?.Invoke(this, remaining);
-                aaxcDownloader.RetrievedCoverArt += AaxcDownloader_RetrievedCoverArt;
-                aaxcDownloader.RetrievedTags += aaxcDownloader_RetrievedTags;
+                abDownloader.DecryptProgressUpdate += OnStreamingProgressChanged;
+                abDownloader.DecryptTimeRemaining += OnStreamingTimeRemaining;
+                abDownloader.RetrievedTitle += OnTitleDiscovered;
+                abDownloader.RetrievedAuthors += OnAuthorsDiscovered;
+                abDownloader.RetrievedNarrators += OnNarratorsDiscovered;
+                abDownloader.RetrievedCoverArt += AaxcDownloader_RetrievedCoverArt;
+                abDownloader.FileCreated += (_, path) => OnFileCreated(libraryBook, path);
 
                 // REAL WORK DONE HERE
-                var success = await Task.Run(() => aaxcDownloader.Run());
-
-                // decrypt failed
-                if (!success)
-                    return null;
-
-                return aaxcDownloader.outputFileName;
+                var success = await Task.Run(abDownloader.Run);
+                return success;
             }
             finally
             {
-                DecryptCompleted?.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 static DownloadOptions BuildDownloadOptions(Configuration config, AudibleApi.Common.ContentLicense contentLic)
         {
-            if (e is null && 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.
+
+            bool encrypted = contentLic.DrmType == AudibleApi.Common.DrmType.Adrm;
+
+            var outputFormat = !encrypted || (config.AllowLibationFixup && config.DecryptToLossy) ?
+                     OutputFormat.Mp3 : OutputFormat.M4b;
+
+            var audiobookDlLic = new DownloadOptions
+                 (
+                 contentLic?.ContentMetadata?.ContentUrl?.OfflineUrl,
+                 Resources.USER_AGENT
+                 )
             {
-                RequestCoverArt?.Invoke(this, aaxcDownloader.SetCoverArt);
+                AudibleKey = contentLic?.Voucher?.Key,
+                AudibleIV = contentLic?.Voucher?.Iv,
+                OutputFormat = outputFormat,
+                TrimOutputToChapterLength = config.AllowLibationFixup && config.StripAudibleBrandAudio,
+                RetainEncryptedFile = config.RetainAaxFile && encrypted,
+                StripUnabridged = config.AllowLibationFixup && config.StripUnabridged,
+                Downsample = config.AllowLibationFixup && config.LameDownsampleMono,
+                MatchSourceBitrate = config.AllowLibationFixup && config.LameMatchSourceBR && config.LameTargetBitrate,
+                CreateCueSheet = config.CreateCueSheet
+            };
+
+            if (config.AllowLibationFixup || outputFormat == OutputFormat.Mp3)
+            {
+
+                long startMs = audiobookDlLic.TrimOutputToChapterLength ?
+                    contentLic.ContentMetadata.ChapterInfo.BrandIntroDurationMs : 0;
+
+                audiobookDlLic.ChapterInfo = new AAXClean.ChapterInfo(TimeSpan.FromMilliseconds(startMs));
+
+                for (int i = 0; i < contentLic.ContentMetadata.ChapterInfo.Chapters.Length; i++)
+                {
+                    var chapter = contentLic.ContentMetadata.ChapterInfo.Chapters[i];
+                    long chapLenMs = chapter.LengthMs;
+
+                    if (i == 0)
+                        chapLenMs -= startMs;
+
+                    if (config.StripAudibleBrandAudio && i == contentLic.ContentMetadata.ChapterInfo.Chapters.Length - 1)
+                        chapLenMs -= contentLic.ContentMetadata.ChapterInfo.BrandOutroDurationMs;
+
+                    audiobookDlLic.ChapterInfo.AddChapter(chapter.Title, TimeSpan.FromMilliseconds(chapLenMs));
+                }
             }
 
+            NAudio.Lame.LameConfig lameConfig = new();
+
+
+            lameConfig.Mode = NAudio.Lame.MPEGMode.Mono;
+
+            if (config.LameTargetBitrate)
+			{
+                if (config.LameConstantBitrate)
+                    lameConfig.BitRate = config.LameBitrate;
+                else
+                {
+                    lameConfig.ABRRateKbps = config.LameBitrate;
+                    lameConfig.VBR = NAudio.Lame.VBRMode.ABR;
+                    lameConfig.WriteVBRTag = true;
+                }
+			}
+			else
+			{
+                lameConfig.VBR = NAudio.Lame.VBRMode.Default;
+                lameConfig.VBRQuality = config.LameVBRQuality;
+                lameConfig.WriteVBRTag = true;
+            }
+
+            audiobookDlLic.LameConfig = lameConfig;
+
+            return audiobookDlLic;
+        }
+
+        private static void downloadValidation(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"));
+        }
+
+        private void AaxcDownloader_RetrievedCoverArt(object _, byte[] e)
+        {
             if (e is not null)
-            {
-                CoverImageFilepathDiscovered?.Invoke(this, e);
-            }
+                OnCoverImageDiscovered(e);
+            else if (Configuration.Instance.AllowLibationFixup)
+                OnRequestCoverArt(abDownloader.SetCoverArt);
         }
 
-        private void aaxcDownloader_RetrievedTags(object sender, AaxcTagLibFile e)
+        /// <summary>Move new files to 'Books' directory</summary>
+        /// <returns>True if audiobook file(s) were successfully created and can be located on disk. Else false.</returns>
+        private static bool moveFilesToBooksDir(LibraryBook libraryBook, List<FilePathCache.CacheEntry> entries)
         {
-            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)
-        {
-            // create final directory. move each file into it. MOVE AUDIO FILE LAST
-            // new dir: safetitle_limit50char + " [" + productId + "]"
-
-            var destinationDir = AudibleFileStorage.Audio.GetDestDir(product.Title, product.AudibleProductId);
+            // create final directory. move each file into it
+            var destinationDir = AudibleFileStorage.Audio.GetDestinationDirectory(libraryBook);
             Directory.CreateDirectory(destinationDir);
 
-            var sortedFiles = getProductFilesSorted(product, outputAudioFilename);
+            FilePathCache.CacheEntry getFirstAudio() => entries.FirstOrDefault(f => f.FileType == FileType.Audio);
 
-            var musicFileExt = Path.GetExtension(outputAudioFilename).Trim('.');
+			if (getFirstAudio() == default)
+				return false;
 
-            // audio filename: safetitle_limit50char + " [" + productId + "]." + audio_ext
-            var audioFileName = FileUtility.GetValidFilename(destinationDir, product.Title, musicFileExt, product.AudibleProductId);
-
-            foreach (var f in sortedFiles)
-            {
-                var dest
-                    = AudibleFileStorage.Audio.IsFileTypeMatch(f)
-                    ? audioFileName
-                    // 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);
-            }
-
-            return destinationDir;
-        }
-
-        private static List<FileInfo> getProductFilesSorted(Book product, string outputAudioFilename)
-        {
-            // files are: temp path\author\[asin].ext
-            var m4bDir = new FileInfo(outputAudioFilename).Directory;
-            var files = m4bDir
-                .EnumerateFiles()
-                .Where(f => f.Name.ContainsInsensitive(product.AudibleProductId))
-                .ToList();
-
-            // move audio files to the end of the collection so these files are moved last
-            var musicFiles = files.Where(f => AudibleFileStorage.Audio.IsFileTypeMatch(f));
-            var sortedFiles = files
-                .Except(musicFiles)
-                .Concat(musicFiles)
-                .ToList();
-
-            return sortedFiles;
-        }
-
-        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()
+			for (var i = 0; i < entries.Count; i++)
 			{
-				var title
-					= (libraryBook.Book.Title.Length > 53)
-					? $"{libraryBook.Book.Title.Truncate(50)}..."
-					: libraryBook.Book.Title;
-				var errorBookTitle = $"{title} [{libraryBook.Book.AudibleProductId}]";
-				return errorBookTitle;
-			};
+				var entry = entries[i];
 
-			if (string.IsNullOrWhiteSpace(libraryBook.Account))
-				throw new Exception(errorString("Account"));
+				var realDest = FileUtility.SaferMoveToValidPath(entry.Path, Path.Combine(destinationDir, Path.GetFileName(entry.Path)));
+				FilePathCache.Insert(libraryBook.Book.AudibleProductId, realDest);
 
-			if (string.IsNullOrWhiteSpace(libraryBook.Book.Locale))
-				throw new Exception(errorString("Locale"));
+				// propogate corrected path. Must update cache with corrected path. Also want updated path for cue file (after this for-loop)
+				entries[i] = entry with { Path = realDest };
+			}
+
+			var cue = entries.FirstOrDefault(f => f.FileType == FileType.Cue);
+			if (cue != default)
+				Cue.UpdateFileName(cue.Path, getFirstAudio().Path);
+
+			AudibleFileStorage.Audio.Refresh();
+
+			return true;
 		}
-
-        public bool Validate(LibraryBook libraryBook)
-            => !AudibleFileStorage.Audio.Exists(libraryBook.Book.AudibleProductId)
-            && !AudibleFileStorage.AAX.Exists(libraryBook.Book.AudibleProductId);
-
-        public void Cancel()
-        {
-            aaxcDownloader.Cancel();
-        }
-    }
+	}
 }

FileLiberator/DownloadFile.cs

@@ -5,30 +5,26 @@ using Dinah.Core.Net.Http;
 
 namespace FileLiberator
 {
-	// frustratingly copy pasta from DownloadableBase and DownloadPdf
-	public class DownloadFile : IDownloadable
+	// currently only used to download the .zip flies for upgrade
+	public class DownloadFile : Streamable
 	{
-		public event EventHandler<string> DownloadBegin;
-		public event EventHandler<DownloadProgress> DownloadProgressChanged;
-		public event EventHandler<string> DownloadCompleted;
-
 		public async Task<string> PerformDownloadFileAsync(string downloadUrl, string proposedDownloadFilePath)
 		{
 			var client = new HttpClient();
 
-			var progress = new Progress<DownloadProgress>();
-			progress.ProgressChanged += (_, e) => DownloadProgressChanged?.Invoke(this, e);
+			var progress = new Progress<DownloadProgress>(OnStreamingProgressChanged);
 
-			DownloadBegin?.Invoke(this, proposedDownloadFilePath);
+			OnStreamingBegin(proposedDownloadFilePath);
 
 			try
 			{
 				var actualDownloadedFilePath = await client.DownloadFileAsync(downloadUrl, proposedDownloadFilePath, progress);
+				OnFileCreated("Upgrade", actualDownloadedFilePath);
 				return actualDownloadedFilePath;
 			}
 			finally
 			{
-				DownloadCompleted?.Invoke(this, proposedDownloadFilePath);
+				OnStreamingCompleted(proposedDownloadFilePath);
 			}
 		}
 	}

FileLiberator/DownloadPdf.cs

@@ -1,4 +1,6 @@
-using System.IO;
+using System;
+using System.Collections.Generic;
+using System.IO;
 using System.Linq;
 using System.Net.Http;
 using System.Threading.Tasks;
@@ -6,56 +8,79 @@ using DataLayer;
 using Dinah.Core.ErrorHandling;
 using Dinah.Core.Net.Http;
 using FileManager;
+using LibationFileManager;
 
 namespace FileLiberator
 {
-	public class DownloadPdf : DownloadableBase
+	public class DownloadPdf : Processable
 	{
 		public override bool Validate(LibraryBook libraryBook)
 			=> !string.IsNullOrWhiteSpace(getdownloadUrl(libraryBook))
-			&& !AudibleFileStorage.PDF.Exists(libraryBook.Book.AudibleProductId);
+			&& !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);
-			return verifyDownload(libraryBook);
-		}
+			OnBegin(libraryBook);
 
-		private static StatusHandler verifyDownload(LibraryBook libraryBook)
-			=> !AudibleFileStorage.PDF.Exists(libraryBook.Book.AudibleProductId)
-			? new StatusHandler { "Downloaded PDF cannot be found" }
-			: new StatusHandler();
+			try
+			{
+				var proposedDownloadFilePath = getProposedDownloadFilePath(libraryBook);
+				var actualDownloadedFilePath = await downloadPdfAsync(libraryBook, proposedDownloadFilePath);
+				var result = verifyDownload(actualDownloadedFilePath);
+
+				libraryBook.Book.UserDefinedItem.PdfStatus = result.IsSuccess ? LiberatedStatus.Liberated : LiberatedStatus.NotLiberated;
+
+				return result;
+			}
+			finally
+			{
+				OnCompleted(libraryBook);
+			}
+		}
 
 		private static string getProposedDownloadFilePath(LibraryBook libraryBook)
 		{
+			var extension = Path.GetExtension(getdownloadUrl(libraryBook));
+
 			// if audio file exists, get it's dir. else return base Book dir
 			var existingPath = Path.GetDirectoryName(AudibleFileStorage.Audio.GetPath(libraryBook.Book.AudibleProductId));
-			var file = getdownloadUrl(libraryBook);
+			if (existingPath is not null)
+				return AudibleFileStorage.Audio.GetCustomDirFilename(libraryBook, existingPath, extension);
 
-			if (existingPath != null)
-				return Path.Combine(existingPath, Path.GetFileName(file));
-
-			var full = FileUtility.GetValidFilename(
-				AudibleFileStorage.PDF.StorageDirectory,
-				libraryBook.Book.Title,
-				Path.GetExtension(file),
-				libraryBook.Book.AudibleProductId);
-			return full;
-		}
-
-		private async Task downloadPdfAsync(LibraryBook libraryBook, string proposedDownloadFilePath)
-		{
-			var api = await GetApiAsync(libraryBook);
-			var downloadUrl = await api.GetPdfDownloadLinkAsync(libraryBook.Book.AudibleProductId);
-
-			var client = new HttpClient();
-			var actualDownloadedFilePath = await PerformDownloadAsync(
-				proposedDownloadFilePath,
-				(p) => client.DownloadFileAsync(downloadUrl, proposedDownloadFilePath, p));
+			return AudibleFileStorage.Audio.GetBooksDirectoryFilename(libraryBook, extension);
 		}
 
 		private static string getdownloadUrl(LibraryBook libraryBook)
 			=> libraryBook?.Book?.Supplements?.FirstOrDefault()?.Url;
+
+		private async Task<string> downloadPdfAsync(LibraryBook libraryBook, string proposedDownloadFilePath)
+		{
+			OnStreamingBegin(proposedDownloadFilePath);
+
+			try
+			{
+				var api = await libraryBook.GetApiAsync();
+				var downloadUrl = await api.GetPdfDownloadLinkAsync(libraryBook.Book.AudibleProductId);
+
+				var progress = new Progress<DownloadProgress>(OnStreamingProgressChanged);
+
+				var client = new HttpClient();
+
+				var actualDownloadedFilePath = await client.DownloadFileAsync(downloadUrl, proposedDownloadFilePath, progress);
+				OnFileCreated(libraryBook, actualDownloadedFilePath);
+
+				OnStatusUpdate(actualDownloadedFilePath);
+				return actualDownloadedFilePath;
+			}
+			finally
+			{
+				OnStreamingCompleted(proposedDownloadFilePath);
+			}
+		}
+
+		private static StatusHandler verifyDownload(string actualDownloadedFilePath)
+			=> !File.Exists(actualDownloadedFilePath)
+			? new StatusHandler { "Downloaded PDF cannot be found" }
+			: new StatusHandler();
 	}
 }

FileLiberator/DownloadableBase.cs

@@ -1,64 +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 : IDownloadableProcessable
-	{
-		public event EventHandler<LibraryBook> Begin;
-		public event EventHandler<LibraryBook> Completed;
-
-		public event EventHandler<string> DownloadBegin;
-		public event EventHandler<DownloadProgress> DownloadProgressChanged;
-		public event EventHandler<string> DownloadCompleted;
-
-		public event EventHandler<string> StatusUpdate;
-		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) => DownloadProgressChanged?.Invoke(this, e);
-
-			DownloadBegin?.Invoke(this, proposedDownloadFilePath);
-
-			try
-			{
-				var result = await func(progress);
-				StatusUpdate?.Invoke(this, result);
-
-				return result;
-			}
-			finally
-			{
-				DownloadCompleted?.Invoke(this, proposedDownloadFilePath);
-			}
-		}
-	}
-}

FileLiberator/FileLiberator.csproj

@@ -1,16 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0-windows</TargetFramework>
   </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" />
+    <ProjectReference Include="..\AudibleUtilities\AudibleUtilities.csproj" />
   </ItemGroup>
 
 </Project>

FileLiberator/IDecryptable.cs

@@ -1,20 +0,0 @@
-using System;
-
-namespace FileLiberator
-{
-    public interface IDecryptable : IProcessable
-    {
-        event EventHandler<string> DecryptBegin;
-
-        event EventHandler<Action<byte[]>> RequestCoverArt;
-        event EventHandler<string> TitleDiscovered;
-        event EventHandler<string> AuthorsDiscovered;
-        event EventHandler<string> NarratorsDiscovered;
-        event EventHandler<byte[]> CoverImageFilepathDiscovered;
-        event EventHandler<int> UpdateProgress;
-        event EventHandler<TimeSpan> UpdateRemainingTime;
-
-        event EventHandler<string> DecryptCompleted;
-        void Cancel();
-    }
-}