book liberation status Error:

* show system error icon in grid instead of stoplight
* list error count in bottom right #s
* SearchEngine bool: LiberatedError

.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,10 +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

AaxDecrypter/AAXChapters.cs

@@ -1,40 +0,0 @@
-using System.Diagnostics;
-using System.Globalization;
-using System.Linq;
-using Dinah.Core.Diagnostics;
-
-namespace AaxDecrypter
-{
-    public class AAXChapters : Chapters
-    {
-        public AAXChapters(string file)
-        {
-            var info = new ProcessStartInfo
-            {
-                FileName = DecryptSupportLibraries.ffprobePath,
-                Arguments = "-loglevel panic -show_chapters -print_format xml \"" + file + "\""
-            };
-            var xml = info.RunHidden().Output;
-
-            var xmlDocument = new System.Xml.XmlDocument();
-            xmlDocument.LoadXml(xml);
-            var chaptersXml = xmlDocument.SelectNodes("/ffprobe/chapters/chapter")
-                .Cast<System.Xml.XmlNode>()
-                .Where(n => n.Name == "chapter");
-
-            foreach (var cnode in chaptersXml)
-            {
-                double startTime = double.Parse(cnode.Attributes["start_time"].Value.Replace(",", "."), CultureInfo.InvariantCulture);
-                double endTime = double.Parse(cnode.Attributes["end_time"].Value.Replace(",", "."), CultureInfo.InvariantCulture);
-
-                string chapterTitle = cnode.ChildNodes
-                    .Cast<System.Xml.XmlNode>()
-                    .Where(childnode => childnode.Attributes["key"].Value == "title")
-                    .Select(childnode => childnode.Attributes["value"].Value)
-                    .FirstOrDefault();
-
-                AddChapter(new Chapter(startTime, endTime, chapterTitle));
-            }
-        }
-    }
-}

AaxDecrypter/AaxDecrypter.csproj

@@ -5,119 +5,11 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <Reference Include="taglib-sharp">
-      <HintPath>lib\taglib-sharp.dll</HintPath>
-    </Reference>
+    <PackageReference Include="Dinah.Core" Version="1.0.5.1" />
   </ItemGroup>
 
   <ItemGroup>
-    <Folder Include="..\..\..\..\..\..\Dinah%2527s folder\coding\_NET\Visual Studio 2019\Libation\AaxDecrypter\UNTESTED\BytesCrackerLib\" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\..\Dinah.Core\Dinah.Core\Dinah.Core.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <None Update="BytesCrackerLib\alglib1.dll">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Update="BytesCrackerLib\audible_byte#4-4_0_10000x789935_0.rtc">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Update="BytesCrackerLib\audible_byte#4-4_1_10000x791425_0.rtc">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Update="BytesCrackerLib\audible_byte#4-4_2_10000x790991_0.rtc">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Update="BytesCrackerLib\audible_byte#4-4_3_10000x792120_0.rtc">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Update="BytesCrackerLib\audible_byte#4-4_4_10000x790743_0.rtc">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Update="BytesCrackerLib\audible_byte#4-4_5_10000x790568_0.rtc">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Update="BytesCrackerLib\audible_byte#4-4_6_10000x791458_0.rtc">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Update="BytesCrackerLib\audible_byte#4-4_7_10000x791707_0.rtc">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Update="BytesCrackerLib\audible_byte#4-4_8_10000x790202_0.rtc">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Update="BytesCrackerLib\audible_byte#4-4_9_10000x791022_0.rtc">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Update="BytesCrackerLib\ffmpeg.exe">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Update="BytesCrackerLib\ffprobe.exe">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Update="BytesCrackerLib\rcrack.exe">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Update="DecryptLib\AtomicParsley.exe">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Update="DecryptLib\avcodec-57.dll">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Update="DecryptLib\avdevice-57.dll">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Update="DecryptLib\avfilter-6.dll">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Update="DecryptLib\avformat-57.dll">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Update="DecryptLib\avutil-55.dll">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Update="DecryptLib\cygcrypto-1.0.0.dll">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Update="DecryptLib\cyggcc_s-1.dll">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Update="DecryptLib\cygmp4v2-2.dll">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Update="DecryptLib\cygstdc++-6.dll">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Update="DecryptLib\cygwin1.dll">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Update="DecryptLib\cygz.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\mp4trackdump.exe">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Update="DecryptLib\postproc-54.dll">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Update="DecryptLib\swresample-2.dll">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Update="DecryptLib\swscale-4.dll">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Update="DecryptLib\taglib-sharp.dll">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
+    <ProjectReference Include="..\..\AAXClean\AAXClean.csproj" />
   </ItemGroup>
 
 </Project>

AaxDecrypter/AaxToM4bConverter.cs

@@ -1,346 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Globalization;
-using System.IO;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-using Dinah.Core;
-using Dinah.Core.Diagnostics;
-using Dinah.Core.IO;
-using Dinah.Core.StepRunner;
-
-namespace AaxDecrypter
-{
-    public interface ISimpleAaxToM4bConverter
-    {
-        event EventHandler<int> DecryptProgressUpdate;
-
-        bool Run();
-
-        string AppName { get; set; }
-        string inputFileName { get; }
-        byte[] coverBytes { get;  }
-        string outDir { get; }
-        string outputFileName { get; }
-
-        Chapters chapters { get; }
-        Tags tags { get; }
-        EncodingInfo encodingInfo { get; }
-
-        void SetOutputFilename(string outFileName);
-    }
-    public interface IAdvancedAaxToM4bConverter : ISimpleAaxToM4bConverter
-    {
-        bool Step1_CreateDir();
-        bool Step2_DecryptAax();
-        bool Step3_Chapterize();
-        bool Step4_InsertCoverArt();
-        bool Step5_Cleanup();
-        bool Step6_AddTags();
-        bool End_CreateCue();
-        bool End_CreateNfo();
-    }
-    /// <summary>full c# app. integrated logging. no UI</summary>
-    public class AaxToM4bConverter : IAdvancedAaxToM4bConverter
-    {
-        public event EventHandler<int> DecryptProgressUpdate;
-
-        public string inputFileName { get; }
-        public string decryptKey { get; private set; }
-
-        private StepSequence steps { get; }
-        public byte[] coverBytes { get; private set; }
-
-        public string AppName { get; set; } = nameof(AaxToM4bConverter);
-
-        public string outDir { get; private set; }
-        public string outputFileName { get; private set; }
-
-        public Chapters chapters { get; private set; }
-        public Tags tags { get; private set; }
-        public EncodingInfo encodingInfo { get; private set; }
-
-        public static async Task<AaxToM4bConverter> CreateAsync(string inputFile, string decryptKey, Chapters chapters = null)
-        {
-            var converter = new AaxToM4bConverter(inputFile, decryptKey);
-            converter.chapters = chapters ?? new AAXChapters(inputFile);
-            await converter.prelimProcessing();
-            converter.printPrelim();
-
-            return converter;
-        }
-        private AaxToM4bConverter(string inputFile, string decryptKey)
-        {
-			ArgumentValidator.EnsureNotNullOrWhiteSpace(inputFile, nameof(inputFile));
-            if (!File.Exists(inputFile))
-                throw new ArgumentNullException(nameof(inputFile), "File does not exist");
-
-            steps = new StepSequence
-            {
-                Name = "Convert Aax To M4b",
-
-                ["Step 1: Create Dir"] = Step1_CreateDir,
-                ["Step 2: Decrypt Aax"] = Step2_DecryptAax,
-                ["Step 3: Chapterize and tag"] = Step3_Chapterize,
-                ["Step 4: Insert Cover Art"] = Step4_InsertCoverArt,
-                ["Step 5: Cleanup"] = Step5_Cleanup,
-                ["Step 6: Add Tags"] = Step6_AddTags,
-                ["End: Create Cue"] = End_CreateCue,
-                ["End: Create Nfo"] = End_CreateNfo
-            };
-
-            inputFileName = inputFile;
-            this.decryptKey = decryptKey;
-        }
-
-        private async Task prelimProcessing()
-        {
-            tags = new Tags(inputFileName);
-            encodingInfo = new EncodingInfo(inputFileName);
-
-            var defaultFilename = Path.Combine(
-                Path.GetDirectoryName(inputFileName),
-                PathLib.ToPathSafeString(tags.author),
-                PathLib.ToPathSafeString(tags.title) + ".m4b"
-                );
-
-			// set default name
-			SetOutputFilename(defaultFilename);
-
-            await Task.Run(() => saveCover(inputFileName));
-        }
-
-        private void saveCover(string aaxFile)
-        {
-			using var file = TagLib.File.Create(aaxFile, "audio/mp4", TagLib.ReadStyle.Average);
-			coverBytes = file.Tag.Pictures[0].Data.Data;
-		}
-
-        private void printPrelim()
-        {
-            Console.WriteLine($"Audible Book ID = {tags.id}");
-
-            Console.WriteLine($"Book: {tags.title}");
-            Console.WriteLine($"Author: {tags.author}");
-            Console.WriteLine($"Narrator: {tags.narrator}");
-            Console.WriteLine($"Year: {tags.year}");
-            Console.WriteLine($"Total Time: {tags.duration.GetTotalTimeFormatted()} in {chapters.Count} chapters");
-            Console.WriteLine($"WARNING-Source is {encodingInfo.originalBitrate} kbits @ {encodingInfo.sampleRate}Hz, {encodingInfo.channels} channels");
-        }
-
-        public bool Run()
-        {
-            var (IsSuccess, Elapsed) = steps.Run();
-
-            if (!IsSuccess)
-            {
-                Console.WriteLine("WARNING-Conversion failed");
-                return false;
-            }
-
-            var speedup = (int)(tags.duration.TotalSeconds / (long)Elapsed.TotalSeconds);
-            Console.WriteLine("Speedup is " + speedup + "x realtime.");
-            Console.WriteLine("Done");
-            return true;
-        }
-
-        public void SetOutputFilename(string outFileName)
-        {
-            outputFileName = PathLib.ReplaceExtension(outFileName, ".m4b");
-            outDir = Path.GetDirectoryName(outputFileName);
-
-            if (File.Exists(outputFileName))
-                File.Delete(outputFileName);
-        }
-
-        private string outputFileWithNewExt(string extension) => PathLib.ReplaceExtension(outputFileName, extension);
-
-        public bool Step1_CreateDir()
-        {
-            ProcessRunner.WorkingDir = outDir;
-            Directory.CreateDirectory(outDir);
-            return true;
-        }
-
-        public bool Step2_DecryptAax()
-        {
-            DecryptProgressUpdate?.Invoke(this, 0);
-
-            var tempRipFile = Path.Combine(outDir, "funny.aac");
-
-            var fail = "WARNING-Decrypt failure. ";
-
-            int returnCode;
-            if (string.IsNullOrWhiteSpace(decryptKey))
-            {
-                returnCode = getKey_decrypt(tempRipFile);
-            }
-            else
-            {
-                returnCode = decrypt(tempRipFile);
-                if (returnCode == -99)
-                {
-                    Console.WriteLine($"{fail}Incorrect decrypt key: {decryptKey}");
-                    decryptKey = null;
-                    returnCode = getKey_decrypt(tempRipFile);
-                }
-            }
-
-            if (returnCode == 100)
-                Console.WriteLine($"{fail}Thread completed without changing return code. This shouldn't be possible");
-            else if (returnCode == 0)
-            {
-                // success!
-                FileExt.SafeMove(tempRipFile, outputFileWithNewExt(".mp4"));
-                DecryptProgressUpdate?.Invoke(this, 100);
-                return true;
-            }
-            else if (returnCode == -99)
-                Console.WriteLine($"{fail}Incorrect decrypt key: {decryptKey}");
-            else // any other returnCode
-                Console.WriteLine($"{fail}Unknown failure code: {returnCode}");
-
-            FileExt.SafeDelete(tempRipFile);
-            DecryptProgressUpdate?.Invoke(this, 0);
-            return false;
-        }
-
-        private int getKey_decrypt(string tempRipFile)
-        {
-            getKey();
-            return decrypt(tempRipFile);
-        }
-        private void getKey()
-        {
-            Console.WriteLine("Discovering decrypt key");
-
-            Console.WriteLine("Getting file hash");
-            var checksum = BytesCracker.GetChecksum(inputFileName);
-            Console.WriteLine("File hash calculated: " + checksum);
-
-            Console.WriteLine("Cracking activation bytes");
-            var activation_bytes = BytesCracker.GetActivationBytes(checksum);
-            decryptKey = activation_bytes;
-            Console.WriteLine("Activation bytes cracked. Decrypt key: " + activation_bytes);
-        }
-
-        private int decrypt(string tempRipFile)
-        {
-            FileExt.SafeDelete(tempRipFile);
-
-            Console.WriteLine("Decrypting with key " + decryptKey);
-
-            var returnCode = 100;
-            var thread = new Thread(() => returnCode = ngDecrypt());
-            thread.Start();
-
-            double fileLen = new FileInfo(inputFileName).Length;
-            while (thread.IsAlive && returnCode == 100)
-            {
-                Thread.Sleep(500);
-                if (File.Exists(tempRipFile))
-                {
-                    double tempLen = new FileInfo(tempRipFile).Length;
-                    var percentProgress = tempLen / fileLen * 100.0;
-                    DecryptProgressUpdate?.Invoke(this, (int)percentProgress);
-                }
-            }
-
-            return returnCode;
-        }
-
-        private int ngDecrypt()
-        {
-            var info = new ProcessStartInfo
-            {
-                FileName = DecryptSupportLibraries.mp4trackdumpPath,
-                Arguments = "-c " + encodingInfo.channels + " -r " + encodingInfo.sampleRate + " \"" + inputFileName + "\""
-            };
-            info.EnvironmentVariables["VARIABLE"] = decryptKey;
-
-            var result = info.RunHidden();
-
-            // bad checksum -- bad decrypt key
-            if (result.Output.Contains("checksums mismatch, aborting!"))
-                return -99;
-
-            return result.ExitCode;
-        }
-
-		// temp file names for steps 3, 4, 5
-        string tempChapsGuid { get; } = Guid.NewGuid().ToString().ToUpper().Replace("-", "");
-        string tempChapsPath => Path.Combine(outDir, $"tempChaps_{tempChapsGuid}.mp4");
-        string mp4_file => outputFileWithNewExt(".mp4");
-        string ff_txt_file => mp4_file + ".ff.txt";
-
-        public bool Step3_Chapterize()
-        {
-            var str1 = "";
-            if (chapters.FirstChapter.StartTime != 0.0)
-            {
-                str1 = " -ss " + chapters.FirstChapter.StartTime.ToString("0.000", CultureInfo.InvariantCulture) + " -t " + chapters.LastChapter.EndTime.ToString("0.000", CultureInfo.InvariantCulture) + " ";
-            }
-
-            var ffmpegTags = tags.GenerateFfmpegTags();
-            var ffmpegChapters = chapters.GenerateFfmpegChapters();
-            File.WriteAllText(ff_txt_file, ffmpegTags + ffmpegChapters);
-
-            var tagAndChapterInfo = new ProcessStartInfo
-            {
-                FileName = DecryptSupportLibraries.ffmpegPath,
-                Arguments = "-y -i \"" + mp4_file + "\" -f ffmetadata -i \"" + ff_txt_file + "\" -map_metadata 1  -bsf:a aac_adtstoasc -c:a copy" + str1 + " -map 0 \"" + tempChapsPath + "\""
-            };
-            tagAndChapterInfo.RunHidden();
-
-            return true;
-        }
-
-        public bool Step4_InsertCoverArt()
-        {
-            // save cover image as temp file
-            var coverPath = Path.Combine(outDir, "cover-" + Guid.NewGuid() + ".jpg");
-            FileExt.CreateFile(coverPath, coverBytes);
-
-            var insertCoverArtInfo = new ProcessStartInfo
-            {
-                FileName = DecryptSupportLibraries.atomicParsleyPath,
-                Arguments = "\"" + tempChapsPath + "\" --encodingTool \"" + AppName + "\" --artwork \"" + coverPath + "\" --overWrite"
-            };
-            insertCoverArtInfo.RunHidden();
-
-            // delete temp file
-            FileExt.SafeDelete(coverPath);
-
-            return true;
-        }
-
-        public bool Step5_Cleanup()
-        {
-            FileExt.SafeDelete(mp4_file);
-            FileExt.SafeDelete(ff_txt_file);
-            FileExt.SafeMove(tempChapsPath, outputFileName);
-
-            return true;
-        }
-
-        public bool Step6_AddTags()
-        {
-            tags.AddAppleTags(outputFileName);
-            return true;
-        }
-
-        public bool End_CreateCue()
-        {
-            File.WriteAllText(outputFileWithNewExt(".cue"), Cue.CreateContents(Path.GetFileName(outputFileName), chapters));
-            return true;
-        }
-
-        public bool End_CreateNfo()
-        {
-            File.WriteAllText(outputFileWithNewExt(".nfo"), NFO.CreateContents(AppName, tags, encodingInfo, chapters));
-            return true;
-        }
-    }
-}

AaxDecrypter/AaxcDownloadConverter.cs

@@ -0,0 +1,231 @@
+using AAXClean;
+using Dinah.Core;
+using Dinah.Core.IO;
+using Dinah.Core.Net.Http;
+using Dinah.Core.StepRunner;
+using System;
+using System.IO;
+
+namespace AaxDecrypter
+{
+    public enum OutputFormat { Mp4a,  Mp3 }
+    public class AaxcDownloadConverter
+    {
+        public event EventHandler<AppleTags> RetrievedTags;
+        public event EventHandler<byte[]> RetrievedCoverArt;
+        public event EventHandler<DownloadProgress> DecryptProgressUpdate;
+        public event EventHandler<TimeSpan> DecryptTimeRemaining;
+
+        public string AppName { get; set; } = nameof(AaxcDownloadConverter);
+
+        private string outputFileName { get; }
+        private string cacheDir { get; }
+        private DownloadLicense downloadLicense { get; }
+        private AaxFile aaxFile;
+        private OutputFormat OutputFormat;
+
+        private StepSequence steps { get; }
+        private NetworkFileStreamPersister nfsPersister;
+        private bool isCanceled { get; set; }
+        private string jsonDownloadState => Path.Combine(cacheDir, Path.GetFileNameWithoutExtension(outputFileName) + ".json");
+        private string tempFile => PathLib.ReplaceExtension(jsonDownloadState, ".aaxc");
+
+        public AaxcDownloadConverter(string outFileName, string cacheDirectory, DownloadLicense dlLic, OutputFormat outputFormat)
+        {
+            ArgumentValidator.EnsureNotNullOrWhiteSpace(outFileName, nameof(outFileName));
+            outputFileName = outFileName;
+
+            var outDir = Path.GetDirectoryName(outputFileName);
+            if (!Directory.Exists(outDir))
+                throw new ArgumentNullException(nameof(outDir), "Directory does not exist");
+            if (File.Exists(outputFileName))
+                File.Delete(outputFileName);
+
+            if (!Directory.Exists(cacheDirectory))
+                throw new ArgumentNullException(nameof(cacheDirectory), "Directory does not exist");
+            cacheDir = cacheDirectory;
+
+            downloadLicense = ArgumentValidator.EnsureNotNull(dlLic, nameof(dlLic));
+            OutputFormat = outputFormat;
+
+            steps = new StepSequence
+            {
+                Name = "Download and Convert Aaxc To " + (outputFormat == OutputFormat.Mp4a ? "M4b" : "Mp3"),
+
+                ["Step 1: Get Aaxc Metadata"] = Step1_GetMetadata,
+                ["Step 2: Download Decrypted Audiobook"] = Step2_DownloadAndCombine,
+                ["Step 3: Create Cue"] = Step3_CreateCue,
+                ["Step 4: Create Nfo"] = Step4_CreateNfo,
+                ["Step 5: Cleanup"] = Step5_Cleanup,
+            };
+        }
+
+        /// <summary>
+        /// Setting cover art by this method will insert the art into the audiobook metadata
+        /// </summary>
+        public void SetCoverArt(byte[] coverArt)
+        {
+            if (coverArt is null) return;
+
+            aaxFile?.AppleTags.SetCoverArt(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)(aaxFile.Duration.TotalSeconds / (long)Elapsed.TotalSeconds);
+            Console.WriteLine("Speedup is " + speedup + "x realtime.");
+            Console.WriteLine("Done");
+            return true;
+        }
+
+        public bool Step1_GetMetadata()
+        {
+            //Get metadata from the file over http
+                       
+            if (File.Exists(jsonDownloadState))
+            {
+                try
+                {
+                    nfsPersister = new NetworkFileStreamPersister(jsonDownloadState);
+                    //If More than ~1 hour has elapsed since getting the download url, it will expire.
+                    //The new url will be to the same file.
+                    nfsPersister.NetworkFileStream.SetUriForSameFile(new Uri(downloadLicense.DownloadUrl));
+                }
+                catch
+                {
+                    FileExt.SafeDelete(jsonDownloadState);
+                    FileExt.SafeDelete(tempFile);
+                    nfsPersister = NewNetworkFilePersister();
+                }
+            }
+            else
+            {
+                nfsPersister = NewNetworkFilePersister();
+            }
+
+            aaxFile = new AaxFile(nfsPersister.NetworkFileStream);
+
+            RetrievedTags?.Invoke(this, aaxFile.AppleTags);
+            RetrievedCoverArt?.Invoke(this, aaxFile.AppleTags.Cover);
+
+            return !isCanceled;
+        }
+        private NetworkFileStreamPersister NewNetworkFilePersister()
+        {
+			var headers = new System.Net.WebHeaderCollection
+			{
+				{ "User-Agent", downloadLicense.UserAgent }
+			};
+
+			var networkFileStream = new NetworkFileStream(tempFile, new Uri(downloadLicense.DownloadUrl), 0, headers);
+            return new NetworkFileStreamPersister(networkFileStream, jsonDownloadState);
+        }
+
+        public bool Step2_DownloadAndCombine()
+        {
+            var zeroProgress = new DownloadProgress 
+            { 
+                BytesReceived = 0,
+                ProgressPercentage = 0, 
+                TotalBytesToReceive = nfsPersister.NetworkFileStream.Length 
+            };
+
+            DecryptProgressUpdate?.Invoke(this, zeroProgress);
+
+            if (File.Exists(outputFileName))
+                FileExt.SafeDelete(outputFileName);
+
+            FileStream outFile = File.OpenWrite(outputFileName);
+
+            aaxFile.SetDecryptionKey(downloadLicense.AudibleKey, downloadLicense.AudibleIV);
+
+            aaxFile.ConversionProgressUpdate += AaxFile_ConversionProgressUpdate;
+            var decryptionResult = OutputFormat == OutputFormat.Mp4a ? aaxFile.ConvertToMp4a(outFile, downloadLicense.ChapterInfo) : aaxFile.ConvertToMp3(outFile);
+            aaxFile.ConversionProgressUpdate -= AaxFile_ConversionProgressUpdate;
+
+            aaxFile.Close();
+
+            downloadLicense.ChapterInfo = aaxFile.Chapters;
+
+            nfsPersister.Dispose();
+
+            DecryptProgressUpdate?.Invoke(this, zeroProgress);
+
+            return decryptionResult == ConversionResult.NoErrorsDetected && !isCanceled;
+        }
+
+        private void AaxFile_ConversionProgressUpdate(object sender, ConversionProgressEventArgs e)
+        {
+            var duration = aaxFile.Duration;
+            double remainingSecsToProcess = (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 / duration.TotalSeconds;
+
+            DecryptProgressUpdate?.Invoke(this,
+                new DownloadProgress 
+                {
+                    ProgressPercentage = progressPercent,
+                    BytesReceived = (long)(nfsPersister.NetworkFileStream.Length * progressPercent),
+                    TotalBytesToReceive = nfsPersister.NetworkFileStream.Length
+                });
+        }
+
+        public bool Step3_CreateCue()
+        {
+            // not a critical step. its failure should not prevent future steps from running
+            try
+            {
+                File.WriteAllText(PathLib.ReplaceExtension(outputFileName, ".cue"), Cue.CreateContents(Path.GetFileName(outputFileName), downloadLicense.ChapterInfo));
+            }
+            catch (Exception ex)
+            {
+                Serilog.Log.Logger.Error(ex, $"{nameof(Step3_CreateCue)}. FAILED");
+            }
+            return !isCanceled;
+        }
+
+        public bool Step4_CreateNfo()
+        {
+            // not a critical step. its failure should not prevent future steps from running
+            try
+            {
+                File.WriteAllText(PathLib.ReplaceExtension(outputFileName, ".nfo"), NFO.CreateContents(AppName, aaxFile, downloadLicense.ChapterInfo));
+            }
+            catch (Exception ex)
+            {
+                Serilog.Log.Logger.Error(ex, $"{nameof(Step4_CreateNfo)}. FAILED");
+            }
+            return !isCanceled;
+        }
+
+        public bool Step5_Cleanup()
+        {
+            FileExt.SafeDelete(jsonDownloadState);
+            FileExt.SafeDelete(tempFile);
+            return !isCanceled;
+        }
+
+        public void Cancel()
+        {
+            isCanceled = true;
+            aaxFile?.Cancel();
+            aaxFile?.Dispose();
+            nfsPersister?.NetworkFileStream?.Close();
+            nfsPersister?.Dispose();
+        }
+    }
+}

AaxDecrypter/BytesCracker.cs

@@ -1,52 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.IO;
-using System.Text;
-using System.Threading.Tasks;
-using Dinah.Core;
-using Dinah.Core.Diagnostics;
-
-namespace AaxDecrypter
-{
-    public static class BytesCracker
-    {
-        public static string GetChecksum(string aaxPath)
-        {
-            var info = new ProcessStartInfo
-            {
-                FileName = BytesCrackerSupportLibraries.ffprobePath,
-                Arguments = aaxPath.SurroundWithQuotes(),
-                WorkingDirectory = Directory.GetCurrentDirectory()
-            };
-
-            // checksum is in the debug info. ffprobe's debug info is written to stderr, not stdout
-            var ffprobeStderr = info.RunHidden().Error;
-
-            // example checksum line:
-            // ... [aax] file checksum == 0c527840c4f18517157eb0b4f9d6f9317ce60cd1
-            var checksum = ffprobeStderr.ExtractString("file checksum == ", 40);
-
-            return checksum;
-        }
-
-        /// <summary>use checksum to get activation bytes. activation bytes are unique per audible customer. only have to do this 1x/customer</summary>
-        public static string GetActivationBytes(string checksum)
-        {
-            var info = new ProcessStartInfo
-            {
-                FileName = BytesCrackerSupportLibraries.rcrackPath,
-                Arguments = @". -h " + checksum,
-                WorkingDirectory = Directory.GetCurrentDirectory()
-            };
-
-            var rcrackStdout = info.RunHidden().Output;
-
-            // example result
-            // 0c527840c4f18517157eb0b4f9d6f9317ce60cd1  \xbd\x89X\x09  hex:bd895809
-            var activation_bytes = rcrackStdout.ExtractString("hex:", 8);
-
-            return activation_bytes;
-        }
-    }
-}

AaxDecrypter/BytesCrackerSupportLibraries.cs

@@ -1,28 +0,0 @@
-using System.IO;
-
-namespace AaxDecrypter
-{
-    public static class BytesCrackerSupportLibraries
-    {
-        // GetActivationBytes dependencies
-        //   rcrack.exe
-        //   alglib1.dll
-        //   RainbowCrack files to recover your own Audible activation data (activation_bytes) in an offline manner
-        //   audible_byte#4-4_0_10000x789935_0.rtc
-        //   audible_byte#4-4_1_10000x791425_0.rtc
-        //   audible_byte#4-4_2_10000x790991_0.rtc
-        //   audible_byte#4-4_3_10000x792120_0.rtc
-        //   audible_byte#4-4_4_10000x790743_0.rtc
-        //   audible_byte#4-4_5_10000x790568_0.rtc
-        //   audible_byte#4-4_6_10000x791458_0.rtc
-        //   audible_byte#4-4_7_10000x791707_0.rtc
-        //   audible_byte#4-4_8_10000x790202_0.rtc
-        //   audible_byte#4-4_9_10000x791022_0.rtc
-
-        private static string appPath_ { get; } = Path.GetDirectoryName(Dinah.Core.Exe.FileLocationOnDisk);
-        private static string bytesCrackerLib_ { get; } = Path.Combine(appPath_, "BytesCrackerLib");
-
-        public static string ffprobePath { get; } = Path.Combine(bytesCrackerLib_, "ffprobe.exe");
-        public static string rcrackPath { get; } = Path.Combine(bytesCrackerLib_, "rcrack.exe");
-    }
-}

AaxDecrypter/Chapter.cs

@@ -1,27 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace AaxDecrypter
-{
-    public class Chapter
-    {
-        public Chapter(double startTime, double endTime, string title)
-        {
-            StartTime = startTime;
-            EndTime = endTime;
-            Title = title;
-        }
-        /// <summary>
-        /// Chapter start time, in seconds.
-        /// </summary>
-        public double StartTime { get; private set; }
-        /// <summary>
-        /// Chapter end time, in seconds.
-        /// </summary>
-        public double EndTime { get; private set; }
-        public string Title { get; private set; }
-    }
-}

AaxDecrypter/Chapters.cs

@@ -1,40 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace AaxDecrypter
-{
-    public abstract class Chapters
-    {
-        private List<Chapter> _chapterList = new();
-        public int Count => _chapterList.Count;
-        public Chapter FirstChapter => _chapterList[0];
-        public Chapter LastChapter => _chapterList[Count - 1];
-        public IEnumerable<Chapter> ChapterList => _chapterList.AsEnumerable();
-        public IEnumerable<TimeSpan> GetBeginningTimes() => ChapterList.Select(c => TimeSpan.FromSeconds(c.StartTime));
-        protected void AddChapter(Chapter chapter)
-        {
-            _chapterList.Add(chapter);
-        }
-        protected void AddChapters(IEnumerable<Chapter> chapters)
-        {
-            _chapterList.AddRange(chapters);
-        }
-        public string GenerateFfmpegChapters()
-        {
-            var stringBuilder = new StringBuilder();
-
-            foreach (Chapter c in ChapterList)
-            {
-                stringBuilder.Append("[CHAPTER]\n");
-                stringBuilder.Append("TIMEBASE=1/1000\n");
-                stringBuilder.Append("START=" + c.StartTime * 1000 + "\n");
-                stringBuilder.Append("END=" + c.EndTime * 1000 + "\n");
-                stringBuilder.Append("title=" + c.Title + "\n");
-            }
-
-            return stringBuilder.ToString();
-        }
-    }
-}

AaxDecrypter/Cue.cs

@@ -1,28 +1,27 @@
 using System;
 using System.IO;
-using System.Linq;
 using System.Text;
+using AAXClean;
 using Dinah.Core;
 
 namespace AaxDecrypter
 {
     public static class Cue
     {
-        public static string CreateContents(string filePath, Chapters chapters)
+        public static string CreateContents(string filePath, ChapterInfo chapters)
         {
             var stringBuilder = new StringBuilder();
 
             stringBuilder.AppendLine(GetFileLine(filePath, "MP3"));
 
             var trackCount = 0;
-            foreach (Chapter c in chapters.ChapterList)
+            foreach (var c in chapters.Chapters)
             {
                 trackCount++;
-                var startTime = TimeSpan.FromSeconds(c.StartTime);
 
                 stringBuilder.AppendLine($"TRACK {trackCount} AUDIO");
                 stringBuilder.AppendLine($"  TITLE \"{c.Title}\"");
-                stringBuilder.AppendLine($"  INDEX 01 {(int)startTime.TotalMinutes}:{startTime:ss\\:ff}");
+                stringBuilder.AppendLine($"  INDEX 01 {(int)c.StartOffset.TotalMinutes}:{c.StartOffset:ss\\:ff}");
             }
 
             return stringBuilder.ToString();

AaxDecrypter/DecryptSupportLibraries.cs

@@ -1,21 +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-57.dll, avdevice-57.dll, avfilter-6.dll, avformat-57.dll, avutil-55.dll, postproc-54.dll, swresample-2.dll, swscale-4.dll, taglib-sharp.dll
-        //
-        // something else needs the cygwin files (cyg*.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");
-        public static string atomicParsleyPath { get; } = Path.Combine(decryptLib_, "AtomicParsley.exe");
-        public static string mp4trackdumpPath { get; } = Path.Combine(decryptLib_, "mp4trackdump.exe");
-    }
-}

AaxDecrypter/DownloadLicense.cs

@@ -0,0 +1,27 @@
+using AAXClean;
+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/EncodingInfo.cs

@@ -1,41 +0,0 @@
-using System;
-using System.Diagnostics;
-using Dinah.Core.Diagnostics;
-
-namespace AaxDecrypter
-{
-    public class EncodingInfo
-    {
-        public int sampleRate { get; } = 44100;
-        public int channels { get; } = 2;
-        public int originalBitrate { get; }
-
-        public EncodingInfo(string file)
-        {
-            var info = new ProcessStartInfo
-            {
-                FileName = DecryptSupportLibraries.ffprobePath,
-                Arguments = "-loglevel panic -show_streams -print_format flat \"" + file + "\""
-            };
-            var end = info.RunHidden().Output;
-
-            foreach (string str2 in end.Split('\n'))
-            {
-                string[] strArray = str2.Split('=');
-                switch (strArray[0])
-                {
-                    case "streams.stream.0.channels":
-                        this.channels = int.Parse(strArray[1].Replace("\"", "").TrimEnd('\r', '\n'));
-                        break;
-                    case "streams.stream.0.sample_rate":
-                        this.sampleRate = int.Parse(strArray[1].Replace("\"", "").TrimEnd('\r', '\n'));
-                        break;
-                    case "streams.stream.0.bit_rate":
-                        string s = strArray[1].Replace("\"", "").TrimEnd('\r', '\n');
-                        this.originalBitrate = (int)Math.Round(double.Parse(s) / 1000.0, MidpointRounding.AwayFromZero);
-                        break;
-                }
-            }
-        }
-    }
-}

AaxDecrypter/NFO.cs

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

AaxDecrypter/NetworkFileStream.cs

@@ -0,0 +1,446 @@
+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; }
+        private bool isCancelled { get; 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}.");
+
+            if (response.Headers.GetValues("Accept-Ranges").FirstOrDefault(r => r.EqualsInsensitive("bytes")) is null)
+                throw new WebException($"Server at {Uri.Host} does not support Http ranges");
+
+            //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/Tags.cs

@@ -1,67 +0,0 @@
-using System;
-using TagLib;
-using TagLib.Mpeg4;
-using Dinah.Core;
-
-namespace AaxDecrypter
-{
-    public class Tags
-    {
-        public string title { get; }
-        public string album { get; }
-        public string author { get; }
-        public string comments { get; }
-        public string narrator { get; }
-        public string year { get; }
-        public string publisher { get; }
-        public string id { get; }
-        public string genre { get; }
-        public TimeSpan duration { get; }
-
-        // input file
-        public Tags(string file)
-        {
-            using var tagLibFile = TagLib.File.Create(file, "audio/mp4", ReadStyle.Average);
-			title = tagLibFile.Tag.Title.Replace(" (Unabridged)", "");
-			album = tagLibFile.Tag.Album.Replace(" (Unabridged)", "");
-			author = tagLibFile.Tag.FirstPerformer ?? "[unknown]";
-			year = tagLibFile.Tag.Year.ToString();
-			comments = tagLibFile.Tag.Comment ?? "";
-			duration = tagLibFile.Properties.Duration;
-			genre = tagLibFile.Tag.FirstGenre ?? "";
-
-            var tag = tagLibFile.GetTag(TagTypes.Apple, true);
-			publisher = tag.Publisher ?? "";
-			narrator = string.IsNullOrWhiteSpace(tagLibFile.Tag.FirstComposer) ? tag.Narrator : tagLibFile.Tag.FirstComposer;
-			comments = !string.IsNullOrWhiteSpace(tag.LongDescription) ? tag.LongDescription : tag.Description;
-			id = tag.AudibleCDEK;
-		}
-
-        // my best guess of what this step is doing:
-        // re-publish the data we read from the input file => output file
-        public void AddAppleTags(string file)
-        {
-            using var tagLibFile = TagLib.File.Create(file, "audio/mp4", ReadStyle.Average);
-            var tag = (AppleTag)tagLibFile.GetTag(TagTypes.Apple, true);
-			tag.Publisher = publisher;
-			tag.LongDescription = comments;
-			tag.Description = comments;
-            tagLibFile.Save();
-		}
-
-        public string GenerateFfmpegTags()
-            => $";FFMETADATA1"
-            + $"\nmajor_brand=aax"
-            + $"\nminor_version=1"
-            + $"\ncompatible_brands=aax M4B mp42isom"
-            + $"\ndate={year}"
-            + $"\ngenre={genre}"
-            + $"\ntitle={title}"
-            + $"\nartist={author}"
-            + $"\nalbum={album}"
-            + $"\ncomposer={narrator}"
-            + $"\ncomment={comments.Truncate(254)}"
-            + $"\ndescription={comments}"
-            + $"\n";
-    }
-}

ApplicationServices/ApplicationServices.csproj

@@ -5,15 +5,12 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="CsvHelper" Version="27.0.2" />
-    <PackageReference Include="NPOI" Version="2.5.3" />
+    <PackageReference Include="CsvHelper" Version="27.1.1" />
+    <PackageReference Include="NPOI" Version="2.5.4" />
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\audible api\AudibleApi\AudibleApiDTOs\AudibleApiDTOs.csproj" />
-    <ProjectReference Include="..\..\audible api\AudibleApi\AudibleApi\AudibleApi.csproj" />
     <ProjectReference Include="..\DtoImporterService\DtoImporterService.csproj" />
-    <ProjectReference Include="..\InternalUtilities\InternalUtilities.csproj" />
     <ProjectReference Include="..\LibationSearchEngine\LibationSearchEngine.csproj" />
   </ItemGroup>
 

ApplicationServices/LibraryCommands.cs

@@ -13,6 +13,58 @@ namespace ApplicationServices
 {
 	public static class LibraryCommands
 	{
+		private static LibraryOptions.ResponseGroupOptions LibraryResponseGroups = LibraryOptions.ResponseGroupOptions.ALL_OPTIONS;
+
+		public static async Task<List<LibraryBook>> FindInactiveBooks(Func<Account, ILoginCallback> loginCallbackFactoryFunc, List<LibraryBook> existingLibrary, params Account[] accounts)
+        {
+			//These are the minimum response groups required for the
+			//library scanner to pass all validation and filtering.
+			LibraryResponseGroups = 
+				LibraryOptions.ResponseGroupOptions.ProductAttrs |
+				LibraryOptions.ResponseGroupOptions.ProductDesc | 
+				LibraryOptions.ResponseGroupOptions.Relationships;
+
+			if (accounts is null || accounts.Length == 0)
+				return new List<LibraryBook>();
+
+			try
+			{
+				var libraryItems = await scanAccountsAsync(loginCallbackFactoryFunc, accounts);
+				Log.Logger.Information($"GetAllLibraryItems: Total count {libraryItems.Count}");
+
+				var missingBookList = existingLibrary.Where(b => !libraryItems.Any(i => i.DtoItem.Asin == b.Book.AudibleProductId)).ToList();
+
+				return missingBookList;
+			}
+			catch (AudibleApi.Authentication.LoginFailedException lfEx)
+			{
+				lfEx.SaveFiles(FileManager.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 scanning library. Login failed. {@DebugInfo}", new
+				{
+					lfEx.RequestUrl,
+					ResponseStatusCodeNumber = (int)lfEx.ResponseStatusCode,
+					ResponseStatusCodeDesc = lfEx.ResponseStatusCode,
+					lfEx.ResponseInputFields,
+					lfEx.ResponseBodyFilePaths
+				});
+				throw;
+			}
+			catch (Exception ex)
+			{
+				Log.Logger.Error(ex, "Error importing library");
+				throw;
+			}
+            finally
+            {
+				LibraryResponseGroups = LibraryOptions.ResponseGroupOptions.ALL_OPTIONS;
+            }
+		}
+		#region FULL LIBRARY scan and import
 		public static async Task<(int totalCount, int newCount)> ImportAccountAsync(Func<Account, ILoginCallback> loginCallbackFactoryFunc, params Account[] accounts)
 		{
 			if (accounts is null || accounts.Length == 0)
@@ -35,18 +87,19 @@ namespace ApplicationServices
 			}
 			catch (AudibleApi.Authentication.LoginFailedException lfEx)
 			{
-				lfEx.MoveResponseBodyFile(FileManager.Configuration.Instance.LibationFiles);
+				lfEx.SaveFiles(FileManager.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 importing library. Login failed. {@DebugInfo}", new
+				{
 					lfEx.RequestUrl,
 					ResponseStatusCodeNumber = (int)lfEx.ResponseStatusCode,
 					ResponseStatusCodeDesc = lfEx.ResponseStatusCode,
 					lfEx.ResponseInputFields,
-					lfEx.ResponseBodyFilePath
+					lfEx.ResponseBodyFilePaths
 				});
 				throw;
 			}
@@ -86,7 +139,7 @@ namespace ApplicationServices
 				Account = account?.MaskedLogEntry ?? "[null]"
 			});
 
-			var dtoItems = await AudibleApiActions.GetLibraryValidatedAsync(api);
+			var dtoItems = await AudibleApiActions.GetLibraryValidatedAsync(api, LibraryResponseGroups);
 			return dtoItems.Select(d => new ImportItem { DtoItem = d, AccountId = account.AccountId, LocaleName = account.Locale?.Name }).ToList();
 		}
 
@@ -99,25 +152,71 @@ namespace ApplicationServices
 
 			return newCount;
 		}
+		#endregion
 
-		public static int UpdateTags(this LibationContext context, Book book, string newTags)
+		#region Update book details
+	
+		public static int UpdateUserDefinedItem(Book book)
 		{
 			try
 			{
-				book.UserDefinedItem.Tags = newTags;
+				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.UpdateBookTags(book);
+					SearchEngineCommands.UpdateLiberatedStatus(book);
 
 				return qtyChanges;
 			}
 			catch (Exception ex)
 			{
-				Log.Logger.Error(ex, "Error updating tags");
+				Log.Logger.Error(ex, $"Error updating {nameof(book.UserDefinedItem)}");
 				throw;
 			}
 		}
+		#endregion
+
+		public static LiberatedStatus Liberated_Status(Book book)
+			=> book.Audio_Exists ? LiberatedStatus.Liberated
+			: FileManager.AudibleFileStorage.AaxcExists(book.AudibleProductId) ? LiberatedStatus.PartialDownload
+			: LiberatedStatus.NotLiberated;
+
+		public static LiberatedStatus? Pdf_Status(Book book)
+			=> !book.HasPdf ? null
+			: book.PDF_Exists ? LiberatedStatus.Liberated
+			: LiberatedStatus.NotLiberated;
+
+		// 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.GetContext().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

@@ -47,8 +47,8 @@ namespace ApplicationServices
 		[Name("Publisher")]
 		public string Publisher { get; set; }
 
-		[Name("Pdf url")]
-		public string PdfUrl { get; set; }
+		[Name("Has PDF")]
+		public bool HasPdf { get; set; }
 
 		[Name("Series Names")]
 		public string SeriesNames { get; set; }
@@ -88,6 +88,12 @@ namespace ApplicationServices
 
 		[Name("My Libation Tags")]
 		public string MyLibationTags { get; set; }
+
+		[Name("Book Liberation Status")]
+		public string BookStatus { get; set; }
+
+		[Name("PDF Liberation Status")]
+		public string PdfStatus { get; set; }
 	}
 	public static class LibToDtos
 	{
@@ -103,7 +109,7 @@ namespace ApplicationServices
 				NarratorNames = a.Book.NarratorNames,
 				LengthInMinutes = a.Book.LengthInMinutes,
 				Publisher = a.Book.Publisher,
-				PdfUrl = a.Book.Supplements?.FirstOrDefault()?.Url,
+				HasPdf = a.Book.HasPdf,
 				SeriesNames = a.Book.SeriesNames,
 				SeriesOrder = a.Book.SeriesLink.Any() ? a.Book.SeriesLink?.Select(sl => $"{sl.Index} : {sl.Series.Name}").Aggregate((a, b) => $"{a}, {b}") : "",
 				CommunityRatingOverall = a.Book.Rating?.OverallRating,
@@ -116,7 +122,9 @@ 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()
 			}).ToList();
 	}
 	public static class LibraryExporter
@@ -174,7 +182,7 @@ namespace ApplicationServices
 				nameof (ExportDto.NarratorNames),
 				nameof (ExportDto.LengthInMinutes),
 				nameof (ExportDto.Publisher),
-				nameof (ExportDto.PdfUrl),
+				nameof (ExportDto.HasPdf),
 				nameof (ExportDto.SeriesNames),
 				nameof (ExportDto.SeriesOrder),
 				nameof (ExportDto.CommunityRatingOverall),
@@ -187,7 +195,9 @@ namespace ApplicationServices
 				nameof (ExportDto.MyRatingOverall),
 				nameof (ExportDto.MyRatingPerformance),
 				nameof (ExportDto.MyRatingStory),
-				nameof (ExportDto.MyLibationTags)
+				nameof (ExportDto.MyLibationTags),
+				nameof (ExportDto.BookStatus),
+				nameof (ExportDto.PdfStatus)
 			};
 			var col = 0;
 			foreach (var c in columns)
@@ -224,7 +234,7 @@ namespace ApplicationServices
 				row.CreateCell(col++).SetCellValue(dto.NarratorNames);
 				row.CreateCell(col++).SetCellValue(dto.LengthInMinutes);
 				row.CreateCell(col++).SetCellValue(dto.Publisher);
-				row.CreateCell(col++).SetCellValue(dto.PdfUrl);
+				row.CreateCell(col++).SetCellValue(dto.HasPdf);
 				row.CreateCell(col++).SetCellValue(dto.SeriesNames);
 				row.CreateCell(col++).SetCellValue(dto.SeriesOrder);
 
@@ -249,6 +259,8 @@ 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);
 
 				rowIndex++;
 			}

ApplicationServices/SearchEngineCommands.cs

@@ -7,10 +7,10 @@ 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();
+			engine.CreateNewIndex(DbContexts.GetContext());
 		}
 
 		public static SearchResultSet Search(string searchString) => performSearchEngineFunc_safe(e =>
@@ -21,34 +21,34 @@ 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)
 		{
-			var engine = new SearchEngine(DbContexts.GetContext());
+			var engine = new SearchEngine();
 			try
 			{
 				return action(engine);
 			}
 			catch (FileNotFoundException)
 			{
-				FullReIndex();
+				FullReIndex(engine);
 				return action(engine);
 			}
 		}

DataLayer/DataLayer.csproj

@@ -12,19 +12,19 @@
   </PropertyGroup>
   
   <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="5.0.5">
+    <PackageReference Include="Dinah.EntityFrameworkCore" Version="1.0.2.2" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="5.0.9">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="5.0.5" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="5.0.5">
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="5.0.9" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="5.0.9">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
   </ItemGroup>
   
   <ItemGroup>
-    <ProjectReference Include="..\..\Dinah.Core\Dinah.EntityFrameworkCore\Dinah.EntityFrameworkCore.csproj" />
     <ProjectReference Include="..\FileManager\FileManager.csproj" />
   </ItemGroup>
   

DataLayer/EfClasses/Book.cs

@@ -51,6 +51,24 @@ namespace DataLayer
         // is owned, not optional 1:1
         public UserDefinedItem UserDefinedItem { get; private set; }
 
+        // UserDefinedItem convenience properties
+        public bool Audio_Exists
+        {
+            get
+            {
+                var status = UserDefinedItem?.BookStatus;
+                return status.HasValue && status.Value != LiberatedStatus.NotLiberated;
+            }
+        }
+        public bool PDF_Exists
+        {
+            get
+            {
+                var status = UserDefinedItem?.PdfStatus;
+                return (status.HasValue && status.Value == LiberatedStatus.Liberated);
+            }
+        }
+
         // 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);
@@ -88,8 +106,8 @@ namespace DataLayer
 			Category = category;
 
             // simple assigns
-            Title = title;
-            Description = description;
+            Title = title.Trim();
+            Description = description.Trim();
             LengthInMinutes = lengthInMinutes;
 
             // assigns with biz logic
@@ -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
 

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

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

DataLayer/EfClasses/UserDefinedItem.cs

@@ -6,6 +6,21 @@ 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; }
@@ -22,11 +37,20 @@ namespace DataLayer
 			Tags = FileManager.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;
+                    ItemChanged?.Invoke(this, nameof(Tags));
+                }
+            }
 		}
 
 		public IEnumerable<string> TagsEnumerated => Tags == "" ? new string[0] : Tags.Split(null as char[], StringSplitOptions.RemoveEmptyEntries);
@@ -71,14 +95,50 @@ 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
+
+        private LiberatedStatus _bookStatus;
+        private LiberatedStatus? _pdfStatus;
+        public LiberatedStatus BookStatus
+        {
+            get => _bookStatus;
+            set
+            {
+                if (_bookStatus != value)
+				{
+                    _bookStatus = value;
+                    ItemChanged?.Invoke(this, nameof(BookStatus));
+                }
+            }
+        }
+        public LiberatedStatus? PdfStatus
+        {
+            get => _pdfStatus;
+            set
+            {
+                if (_pdfStatus != value)
+                {
+                    _pdfStatus = value;
+                    ItemChanged?.Invoke(this, nameof(PdfStatus));
+                }
+            }
+        }
+        #endregion
+        /// <summary>
+        /// Occurs when <see cref="Tags"/>, <see cref="BookStatus"/>, or <see cref="PdfStatus"/> values change.
+        /// </summary>
+        public static event EventHandler<string> ItemChanged;
+        public override string ToString() => $"{Book} {Rating} {Tags}";
 	}
 }

DataLayer/Migrations/20210619030017_AddAaxcDecryptionKeys.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("20210619030017_AddAaxcDecryptionKeys")]
+    partial class AddAaxcDecryptionKeys
+    {
+        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>("AudibleIV")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("AudibleKey")
+                        .HasColumnType("TEXT");
+
+                    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>("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/20210619030017_AddAaxcDecryptionKeys.cs

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

DataLayer/Migrations/20210622205558_RemoveAaxcDecryptionKeys.Designer.cs

@@ -0,0 +1,381 @@
+// <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("20210622205558_RemoveAaxcDecryptionKeys")]
+    partial class RemoveAaxcDecryptionKeys
+    {
+        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>("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/20210622205558_RemoveAaxcDecryptionKeys.cs

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

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

@@ -14,7 +14,7 @@ namespace DataLayer.Migrations
         {
 #pragma warning disable 612, 618
             modelBuilder
-                .HasAnnotation("ProductVersion", "3.1.7");
+                .HasAnnotation("ProductVersion", "5.0.5");
 
             modelBuilder.Entity("DataLayer.Book", b =>
                 {
@@ -244,6 +244,8 @@ namespace DataLayer.Migrations
 
                             b1.WithOwner("Book")
                                 .HasForeignKey("BookId");
+
+                            b1.Navigation("Book");
                         });
 
                     b.OwnsOne("DataLayer.UserDefinedItem", "UserDefinedItem", b1 =>
@@ -251,6 +253,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");
 
@@ -282,7 +290,19 @@ namespace DataLayer.Migrations
                                     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 =>
@@ -298,6 +318,10 @@ namespace DataLayer.Migrations
                         .HasForeignKey("ContributorId")
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
+
+                    b.Navigation("Book");
+
+                    b.Navigation("Contributor");
                 });
 
             modelBuilder.Entity("DataLayer.Category", b =>
@@ -305,6 +329,8 @@ namespace DataLayer.Migrations
                     b.HasOne("DataLayer.Category", "ParentCategory")
                         .WithMany()
                         .HasForeignKey("ParentCategoryCategoryId");
+
+                    b.Navigation("ParentCategory");
                 });
 
             modelBuilder.Entity("DataLayer.LibraryBook", b =>
@@ -314,6 +340,8 @@ namespace DataLayer.Migrations
                         .HasForeignKey("DataLayer.LibraryBook", "BookId")
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
+
+                    b.Navigation("Book");
                 });
 
             modelBuilder.Entity("DataLayer.SeriesBook", b =>
@@ -329,6 +357,27 @@ namespace DataLayer.Migrations
                         .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/QueryObjects/BookQueries.cs

@@ -6,12 +6,14 @@ 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)
@@ -25,6 +27,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/LibraryQueries.cs

@@ -4,27 +4,35 @@ 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 LibraryQueries
 	{
-		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()
+                .AsNoTrackingWithIdentityResolution()
                 .GetLibrary()
                 .ToList();
 
         public static LibraryBook GetLibraryBook_Flat_NoTracking(this LibationContext context, string productId)
             => context
                 .Library
-                .AsNoTracking()
+                .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);
     }
 }

DtoImporterService/BookImporter.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using AudibleApiDTOs;
+using AudibleApi.Common;
 using DataLayer;
 using InternalUtilities;
 
@@ -102,7 +102,7 @@ namespace DtoImporterService
 
 			var book = DbContext.Books.Add(new Book(
 				new AudibleProductId(item.ProductId),
-				item.Title,
+				item.TitleWithSubtitle,
 				item.Description,
 				item.LengthInMinutes,
 				authors,
@@ -120,8 +120,8 @@ namespace DtoImporterService
 
 			book.UpdateBookDetails(item.IsAbridged, item.DatePublished);
 
-			if (!string.IsNullOrWhiteSpace(item.SupplementUrl))
-				book.AddSupplementDownloadUrl(item.SupplementUrl);
+			if (item.PdfUrl is not null)
+				book.AddSupplementDownloadUrl(item.PdfUrl.ToString());
 
 			return book;
 		}

DtoImporterService/CategoryImporter.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using AudibleApiDTOs;
+using AudibleApi.Common;
 using DataLayer;
 using InternalUtilities;
 

DtoImporterService/ContributorImporter.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using AudibleApiDTOs;
+using AudibleApi.Common;
 using DataLayer;
 using InternalUtilities;
 
@@ -71,7 +71,8 @@ namespace DtoImporterService
 
 			foreach (var p in people)
 			{
-				var person = DbContext.Contributors.Local.SingleOrDefault(c => c.Name == p.Name);
+				// Should be 'Single' not 'First'. A user had a duplicate get in somehow though so I'm now using 'First' defensively
+				var person = DbContext.Contributors.Local.FirstOrDefault(c => c.Name == p.Name);
 				if (person == null)
 				{
 					person = DbContext.Contributors.Add(new Contributor(p.Name, p.Asin)).Entity;

DtoImporterService/DtoImporterService.csproj

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

DtoImporterService/LibraryImporter.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using AudibleApiDTOs;
+using AudibleApi.Common;
 using DataLayer;
 using InternalUtilities;
 

DtoImporterService/SeriesImporter.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using AudibleApiDTOs;
+using AudibleApi.Common;
 using DataLayer;
 using InternalUtilities;
 
@@ -29,7 +29,7 @@ namespace DtoImporterService
 			return qtyNew;
 		}
 
-		private void loadLocal_series(List<AudibleApiDTOs.Series> series)
+		private void loadLocal_series(List<AudibleApi.Common.Series> series)
 		{
 			var seriesIds = series.Select(s => s.SeriesId).ToList();
 			var localIds = DbContext.Series.Local.Select(s => s.AudibleSeriesId).ToList();
@@ -42,7 +42,7 @@ namespace DtoImporterService
 				DbContext.Series.Where(s => remainingSeriesIds.Contains(s.AudibleSeriesId)).ToList();
 		}
 
-		private int upsertSeries(List<AudibleApiDTOs.Series> requestedSeries)
+		private int upsertSeries(List<AudibleApi.Common.Series> requestedSeries)
 		{
 			var qtyNew = 0;
 

FileLiberator/BackupBook.cs

@@ -1,65 +0,0 @@
-using System;
-using System.Linq;
-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 DownloadBook DownloadBook { get; } = new DownloadBook();
-        public DecryptBook DecryptBook { get; } = new DecryptBook();
-		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 DownloadBook.TryProcessAsync(libraryBook);
-					if (statusHandler.HasErrors)
-						return statusHandler;
-				}
-
-				{
-					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,107 @@
+using AAXClean;
+using DataLayer;
+using Dinah.Core;
+using Dinah.Core.ErrorHandling;
+using Dinah.Core.IO;
+using Dinah.Core.Net.Http;
+using FileManager;
+using System;
+using System.IO;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace FileLiberator
+{
+    public class ConvertToMp3 : IAudioDecodable
+    {
+
+        private Mp4File m4bBook;
+
+		public event EventHandler<TimeSpan> StreamingTimeRemaining;
+		public event EventHandler<Action<byte[]>> RequestCoverArt;
+		public event EventHandler<string> TitleDiscovered;
+		public event EventHandler<string> AuthorsDiscovered;
+		public event EventHandler<string> NarratorsDiscovered;
+		public event EventHandler<byte[]> CoverImageDiscovered;
+		public event EventHandler<string> StreamingBegin;
+		public event EventHandler<DownloadProgress> StreamingProgressChanged;
+		public event EventHandler<string> StreamingCompleted;
+		public event EventHandler<LibraryBook> Begin;
+		public event EventHandler<string> StatusUpdate;
+		public event EventHandler<LibraryBook> Completed;
+
+        private long fileSize;
+		private string Mp3FileName(string m4bPath) => m4bPath is null ? string.Empty : PathLib.ReplaceExtension(m4bPath, ".mp3");
+
+        public void Cancel() => m4bBook?.Cancel();
+
+        public bool Validate(LibraryBook libraryBook)
+        {
+            var path = AudibleFileStorage.Audio.GetPath(libraryBook.Book.AudibleProductId);
+            return path?.ToLower()?.EndsWith(".m4b") == true && !File.Exists(Mp3FileName(path));
+        }
+
+        public async Task<StatusHandler> ProcessAsync(LibraryBook libraryBook)
+        {
+            Begin?.Invoke(this, libraryBook);
+
+            StreamingBegin?.Invoke(this, $"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;
+
+                TitleDiscovered?.Invoke(this, m4bBook.AppleTags.Title);
+                AuthorsDiscovered?.Invoke(this, m4bBook.AppleTags.FirstAuthor);
+                NarratorsDiscovered?.Invoke(this, m4bBook.AppleTags.Narrator);
+                CoverImageDiscovered?.Invoke(this, m4bBook.AppleTags.Cover);
+
+                using var mp3File = File.OpenWrite(Path.GetTempFileName());
+
+                var result = await Task.Run(() => m4bBook.ConvertToMp3(mp3File));
+                m4bBook.InputStream.Close();
+                mp3File.Close();
+
+                var mp3Path = Mp3FileName(m4bPath);
+
+                FileExt.SafeMove(mp3File.Name, mp3Path);
+
+                var statusHandler = new StatusHandler();
+
+                if (result == ConversionResult.Failed)
+                    statusHandler.AddError("Conversion failed");
+
+                return statusHandler;
+            }
+            finally
+            {
+                StreamingCompleted?.Invoke(this, $"Completed converting to mp3: {libraryBook.Book.Title}");
+                Completed?.Invoke(this, libraryBook);
+            }
+        }
+
+        private void M4bBook_ConversionProgressUpdate(object sender, ConversionProgressEventArgs e)
+        {
+            var duration = m4bBook.Duration;
+            double remainingSecsToProcess = (duration - e.ProcessPosition).TotalSeconds;
+            double estTimeRemaining = remainingSecsToProcess / e.ProcessSpeed;
+
+            if (double.IsNormal(estTimeRemaining))
+                StreamingTimeRemaining?.Invoke(this, TimeSpan.FromSeconds(estTimeRemaining));
+
+            double progressPercent = 100 * e.ProcessPosition.TotalSeconds / duration.TotalSeconds;
+
+            StreamingProgressChanged?.Invoke(this,
+                new DownloadProgress
+                {
+                    ProgressPercentage = progressPercent,
+                    BytesReceived = (long)(fileSize * progressPercent),
+                    TotalBytesToReceive = fileSize
+                });
+        }
+    }
+}

FileLiberator/DecryptBook.cs

@@ -1,205 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Threading.Tasks;
-using AaxDecrypter;
-using DataLayer;
-using Dinah.Core;
-using Dinah.Core.ErrorHandling;
-using FileManager;
-using InternalUtilities;
-
-namespace FileLiberator
-{
-    /// <summary>
-    /// 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 DecryptBook : IDecryptable
-    {
-        public event EventHandler<LibraryBook> Begin;
-        public event EventHandler<string> StatusUpdate;
-        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<string> DecryptCompleted;
-        public event EventHandler<LibraryBook> Completed;
-
-        public bool Validate(LibraryBook libraryBook)
-            => AudibleFileStorage.AAX.Exists(libraryBook.Book.AudibleProductId)
-            && !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 aaxFilename = AudibleFileStorage.AAX.GetPath(libraryBook.Book.AudibleProductId);
-
-                if (aaxFilename == null)
-                    return new StatusHandler { "aaxFilename parameter is null" };
-                if (!File.Exists(aaxFilename))
-                    return new StatusHandler { $"Cannot find AAX file: {aaxFilename}" };
-                if (AudibleFileStorage.Audio.Exists(libraryBook.Book.AudibleProductId))
-                    return new StatusHandler { "Cannot find decrypt. Final audio file already exists" };
-
-                var chapters = await downloadChapterNames(libraryBook);
-
-                var outputAudioFilename = await aaxToM4bConverterDecrypt(aaxFilename, libraryBook, chapters);
-
-                // decrypt failed
-                if (outputAudioFilename == null)
-                    return new StatusHandler { "Decrypt failed" };
-
-                var destinationDir = moveFilesToBooksDir(libraryBook.Book, outputAudioFilename);
-
-                var config = Configuration.Instance;
-                if (config.RetainAaxFiles)
-                {
-                    var newAaxFilename = FileUtility.GetValidFilename(
-                        destinationDir,
-                        Path.GetFileNameWithoutExtension(aaxFilename),
-                        "aax");
-                    File.Move(aaxFilename, newAaxFilename);
-                }
-                else
-                {
-                    Dinah.Core.IO.FileExt.SafeDelete(aaxFilename);
-                }
-
-                var finalAudioExists = AudibleFileStorage.Audio.Exists(libraryBook.Book.AudibleProductId);
-                if (!finalAudioExists)
-                    return new StatusHandler { "Cannot find final audio file after decryption" };
-
-                return new StatusHandler();
-            }
-            finally
-            {
-                Completed?.Invoke(this, libraryBook);
-            }
-        }
-
-        private async Task<string> aaxToM4bConverterDecrypt(string aaxFilename, LibraryBook libraryBook, Chapters chapters = null)
-        {
-            DecryptBegin?.Invoke(this, $"Begin decrypting {aaxFilename}");
-
-            try
-            {
-                using var persister = AudibleApiStorage.GetAccountsSettingsPersister();
-
-                var account = persister
-                    .AccountsSettings
-                    .GetAccount(libraryBook.Account, libraryBook.Book.Locale);
-
-                var converter = await AaxToM4bConverter.CreateAsync(aaxFilename, account.DecryptKey, chapters);
-                converter.AppName = "Libation";
-
-                TitleDiscovered?.Invoke(this, converter.tags.title);
-                AuthorsDiscovered?.Invoke(this, converter.tags.author);
-                NarratorsDiscovered?.Invoke(this, converter.tags.narrator);
-                CoverImageFilepathDiscovered?.Invoke(this, converter.coverBytes);
-
-                // override default which was set in CreateAsync
-                var proposedOutputFile = Path.Combine(AudibleFileStorage.DecryptInProgress, $"[{libraryBook.Book.AudibleProductId}].m4b");
-                converter.SetOutputFilename(proposedOutputFile);
-                converter.DecryptProgressUpdate += (s, progress) => UpdateProgress?.Invoke(this, progress);
-
-                // REAL WORK DONE HERE
-                var success = await Task.Run(() => converter.Run());
-
-                // decrypt failed
-                if (!success)
-                    return null;
-
-                account.DecryptKey = converter.decryptKey;
-
-                return converter.outputFileName;
-            }
-            finally
-            {
-                DecryptCompleted?.Invoke(this, $"Completed decrypting {aaxFilename}");
-            }
-        }
-
-        private async Task<Chapters> downloadChapterNames(LibraryBook libraryBook)
-        {
-            try
-            {
-                var api = await AudibleApiActions.GetApiAsync(libraryBook.Account, libraryBook.Book.Locale);
-                var contentMetadata = await api.GetLibraryBookMetadataAsync(libraryBook.Book.AudibleProductId);
-
-                if (contentMetadata?.ChapterInfo != null)
-                    return new DownloadedChapters(contentMetadata.ChapterInfo);
-                return null;
-            }
-            catch
-            {
-                return null;
-            }
-        }
-
-        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);
-			Directory.CreateDirectory(destinationDir);
-
-			var sortedFiles = getProductFilesSorted(product, outputAudioFilename);
-
-			var musicFileExt = Path.GetExtension(outputAudioFilename).Trim('.');
-
-            // 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;
-		}
-	}
-}

FileLiberator/DownloadBook.cs

@@ -1,122 +0,0 @@
-using System;
-using System.IO;
-using System.Threading.Tasks;
-using AudibleApi;
-using DataLayer;
-using Dinah.Core;
-using Dinah.Core.ErrorHandling;
-using FileManager;
-using InternalUtilities;
-
-namespace FileLiberator
-{
-    /// <summary>
-    /// Download DRM book
-    /// 
-    /// 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 DownloadBook : DownloadableBase
-    {
-		private const string SERVICE_UNAVAILABLE = "Content Delivery Companion Service is not available.";
-
-        public override bool Validate(LibraryBook libraryBook)
-            => !AudibleFileStorage.Audio.Exists(libraryBook.Book.AudibleProductId)
-            && !AudibleFileStorage.AAX.Exists(libraryBook.Book.AudibleProductId);
-
-		public override async Task<StatusHandler> ProcessItemAsync(LibraryBook libraryBook)
-		{
-			var tempAaxFilename = getDownloadPath(libraryBook);
-			var actualFilePath = await downloadBookAsync(libraryBook, tempAaxFilename);
-			moveBook(libraryBook, actualFilePath);
-			return verifyDownload(libraryBook);
-		}
-
-		private static string getDownloadPath(LibraryBook libraryBook)
-			=> FileUtility.GetValidFilename(
-				AudibleFileStorage.DownloadsInProgress,
-				libraryBook.Book.Title,
-				"aax",
-				libraryBook.Book.AudibleProductId);
-
-		private async Task<string> downloadBookAsync(LibraryBook libraryBook, string tempAaxFilename)
-		{
-			validate(libraryBook);
-
-			var api = await GetApiAsync(libraryBook);
-
-			var actualFilePath = await PerformDownloadAsync(
-				tempAaxFilename,
-				(p) => api.DownloadAaxWorkaroundAsync(libraryBook.Book.AudibleProductId, tempAaxFilename, p));
-
-			System.Threading.Thread.Sleep(100);
-			// if bad file download, a 0-33 byte file will be created
-			// if service unavailable, a 52 byte string will be saved as file
-			var length = new FileInfo(actualFilePath).Length;
-
-			if (length > 100)
-				return actualFilePath;
-
-			var contents = File.ReadAllText(actualFilePath);
-			File.Delete(actualFilePath);
-
-			var exMsg = contents.StartsWithInsensitive(SERVICE_UNAVAILABLE)
-				? SERVICE_UNAVAILABLE
-				: "Error downloading file";
-
-			var ex = new Exception(exMsg);
-			Serilog.Log.Logger.Error(ex, "Download error {@DebugInfo}", new
-			{
-				libraryBook.Book.Title,
-				libraryBook.Book.AudibleProductId,
-				libraryBook.Book.Locale,
-				Account = libraryBook.Account?.ToMask() ?? "[empty]",
-				tempAaxFilename,
-				actualFilePath,
-				length,
-				contents
-			});
-			throw ex;
-		}
-
-		private static void validate(LibraryBook libraryBook)
-		{
-			string errorString(string field)
-				=> $"{errorTitle()}\r\nCannot download book. {field} is not known. Try re-importing the account which owns this book.";
-
-			string errorTitle()
-			{
-				var title
-					= (libraryBook.Book.Title.Length > 53)
-					? $"{libraryBook.Book.Title.Truncate(50)}..."
-					: libraryBook.Book.Title;
-				var errorBookTitle = $"{title} [{libraryBook.Book.AudibleProductId}]";
-				return errorBookTitle;
-			};
-
-			if (string.IsNullOrWhiteSpace(libraryBook.Account))
-				throw new Exception(errorString("Account"));
-
-			if (string.IsNullOrWhiteSpace(libraryBook.Book.Locale))
-				throw new Exception(errorString("Locale"));
-		}
-
-		private void moveBook(LibraryBook libraryBook, string actualFilePath)
-		{
-			var newAaxFilename = FileUtility.GetValidFilename(
-				AudibleFileStorage.DownloadsFinal,
-				libraryBook.Book.Title,
-				"aax",
-				libraryBook.Book.AudibleProductId);
-			File.Move(actualFilePath, newAaxFilename);
-			Invoke_StatusUpdate($"Successfully downloaded. Moved to: {newAaxFilename}");
-		}
-
-		private static StatusHandler verifyDownload(LibraryBook libraryBook)
-			=> !AudibleFileStorage.AAX.Exists(libraryBook.Book.AudibleProductId)
-			? new StatusHandler { "Downloaded AAX file cannot be found" }
-			: new StatusHandler();
-	}
-}

FileLiberator/DownloadDecryptBook.cs

@@ -0,0 +1,233 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Threading.Tasks;
+using AaxDecrypter;
+using AudibleApi;
+using DataLayer;
+using Dinah.Core;
+using Dinah.Core.ErrorHandling;
+using Dinah.Core.Net.Http;
+using FileManager;
+
+namespace FileLiberator
+{
+    public class DownloadDecryptBook : IAudioDecodable
+    {
+
+        private AaxcDownloadConverter aaxcDownloader;
+
+        public event EventHandler<TimeSpan> StreamingTimeRemaining;
+        public event EventHandler<Action<byte[]>> RequestCoverArt;
+        public event EventHandler<string> TitleDiscovered;
+        public event EventHandler<string> AuthorsDiscovered;
+        public event EventHandler<string> NarratorsDiscovered;
+        public event EventHandler<byte[]> CoverImageDiscovered;
+        public event EventHandler<string> StreamingBegin;
+        public event EventHandler<DownloadProgress> StreamingProgressChanged;
+        public event EventHandler<string> StreamingCompleted;
+        public event EventHandler<LibraryBook> Begin;
+        public event EventHandler<string> StatusUpdate;
+        public event EventHandler<LibraryBook> Completed;
+
+        public async Task<StatusHandler> ProcessAsync(LibraryBook libraryBook)
+        {
+            Begin?.Invoke(this, libraryBook);
+
+            try
+            {
+                if (libraryBook.Book.Audio_Exists)
+                    return new StatusHandler { "Cannot find decrypt. Final audio file already exists" };
+
+                var outputAudioFilename = await aaxToM4bConverterDecryptAsync(AudibleFileStorage.DownloadsInProgress, AudibleFileStorage.DecryptInProgress, libraryBook);
+
+                // decrypt failed
+                if (outputAudioFilename is null)
+                    return new StatusHandler { "Decrypt failed" };
+
+                // moves files and returns dest dir
+                var moveResults = MoveFilesToBooksDir(libraryBook.Book, outputAudioFilename);
+
+                if (!moveResults.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);
+            }
+        }
+
+        private async Task<string> aaxToM4bConverterDecryptAsync(string cacheDir, string destinationDir, LibraryBook libraryBook)
+        {
+            StreamingBegin?.Invoke(this, $"Begin decrypting {libraryBook}");
+
+            try
+            {
+                validate(libraryBook);
+
+                var api = await InternalUtilities.AudibleApiActions.GetApiAsync(libraryBook.Account, libraryBook.Book.Locale);
+
+                var contentLic = await api.GetDownloadLicenseAsync(libraryBook.Book.AudibleProductId);
+
+                var aaxcDecryptDlLic = new DownloadLicense
+                    (
+                    contentLic?.ContentMetadata?.ContentUrl?.OfflineUrl,
+                    contentLic?.Voucher?.Key,
+                    contentLic?.Voucher?.Iv,
+                    Resources.UserAgent
+                    );
+
+                if (Configuration.Instance.AllowLibationFixup)
+                {
+                    aaxcDecryptDlLic.ChapterInfo = new AAXClean.ChapterInfo();
+
+                    foreach (var chap in contentLic.ContentMetadata?.ChapterInfo?.Chapters)
+                        aaxcDecryptDlLic.ChapterInfo.AddChapter(chap.Title, TimeSpan.FromMilliseconds(chap.LengthMs));
+                }
+
+
+                var format = Configuration.Instance.DecryptToLossy ? OutputFormat.Mp3 : OutputFormat.Mp4a;
+
+                var extension = format switch
+                {
+                    OutputFormat.Mp4a => "m4b",
+                    OutputFormat.Mp3 => "mp3",
+                    _ => throw new NotImplementedException(),
+                };
+
+                var outFileName = Path.Combine(destinationDir, $"{PathLib.ToPathSafeString(libraryBook.Book.Title)} [{libraryBook.Book.AudibleProductId}].{extension}");
+
+
+                aaxcDownloader = new AaxcDownloadConverter(outFileName, cacheDir, aaxcDecryptDlLic, format) { AppName = "Libation" };
+                aaxcDownloader.DecryptProgressUpdate += (s, progress) => StreamingProgressChanged?.Invoke(this, progress);
+                aaxcDownloader.DecryptTimeRemaining += (s, remaining) => StreamingTimeRemaining?.Invoke(this, remaining);
+                aaxcDownloader.RetrievedCoverArt += AaxcDownloader_RetrievedCoverArt;
+                aaxcDownloader.RetrievedTags += aaxcDownloader_RetrievedTags;
+
+                // REAL WORK DONE HERE
+                var success = await Task.Run(() => aaxcDownloader.Run());
+
+                // decrypt failed
+                if (!success)
+                    return null;
+
+                return outFileName;
+            }
+            finally
+            {
+                StreamingCompleted?.Invoke(this, $"Completed downloading and decrypting {libraryBook.Book.Title}");
+            }
+        }
+
+
+        private void AaxcDownloader_RetrievedCoverArt(object sender, byte[] e)
+        {
+            if (e is null && Configuration.Instance.AllowLibationFixup)
+            {
+                RequestCoverArt?.Invoke(this, aaxcDownloader.SetCoverArt);
+            }
+
+            if (e is not null)
+            {
+                CoverImageDiscovered?.Invoke(this, e);
+            }
+        }
+
+        private void aaxcDownloader_RetrievedTags(object sender, AAXClean.AppleTags e)
+        {
+            TitleDiscovered?.Invoke(this, e.TitleSansUnabridged);
+            AuthorsDiscovered?.Invoke(this, e.FirstAuthor ?? "[unknown]");
+            NarratorsDiscovered?.Invoke(this, e.Narrator ?? "[unknown]");
+        }
+
+        private static (string destinationDir, bool movedAudioFile) MoveFilesToBooksDir(Book product, string outputAudioFilename)
+        {
+            // create final directory. move each file into it. MOVE AUDIO FILE LAST
+            // new dir: safetitle_limit50char + " [" + productId + "]"
+
+            var destinationDir = AudibleFileStorage.Audio.GetDestDir(product.Title, product.AudibleProductId);
+            Directory.CreateDirectory(destinationDir);
+
+            var sortedFiles = getProductFilesSorted(product, outputAudioFilename);
+
+            var musicFileExt = Path.GetExtension(outputAudioFilename).Trim('.');
+
+            // audio filename: safetitle_limit50char + " [" + productId + "]." + audio_ext
+            var audioFileName = FileUtility.GetValidFilename(destinationDir, product.Title, musicFileExt, product.AudibleProductId);
+
+            bool movedAudioFile = false;
+            foreach (var f in sortedFiles)
+            {
+                var dest
+                    = AudibleFileStorage.Audio.IsFileTypeMatch(f)
+                    ? audioFileName
+                    // non-audio filename: safetitle_limit50char + " [" + productId + "][" + audio_ext +"]." + non_audio_ext
+                    : FileUtility.GetValidFilename(destinationDir, product.Title, f.Extension, product.AudibleProductId, musicFileExt);
+
+                if (Path.GetExtension(dest).Trim('.').ToLower() == "cue")
+                    Cue.UpdateFileName(f, audioFileName);
+
+                File.Move(f.FullName, dest);
+
+                movedAudioFile |= AudibleFileStorage.Audio.IsFileTypeMatch(f);
+            }
+
+            AudibleFileStorage.Audio.Refresh();
+
+            return (destinationDir, movedAudioFile);
+        }
+
+        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()
+            {
+                var title
+                    = (libraryBook.Book.Title.Length > 53)
+                    ? $"{libraryBook.Book.Title.Truncate(50)}..."
+                    : libraryBook.Book.Title;
+                var errorBookTitle = $"{title} [{libraryBook.Book.AudibleProductId}]";
+                return errorBookTitle;
+            };
+
+            if (string.IsNullOrWhiteSpace(libraryBook.Account))
+                throw new Exception(errorString("Account"));
+
+            if (string.IsNullOrWhiteSpace(libraryBook.Book.Locale))
+                throw new Exception(errorString("Locale"));
+        }
+
+        public bool Validate(LibraryBook libraryBook) => !libraryBook.Book.Audio_Exists;
+
+        public void Cancel()
+        {
+            aaxcDownloader?.Cancel();
+        }
+    }
+}

FileLiberator/DownloadFile.cs

@@ -5,21 +5,22 @@ 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 : IStreamable
 	{
-		public event EventHandler<string> DownloadBegin;
-		public event EventHandler<DownloadProgress> DownloadProgressChanged;
-		public event EventHandler<string> DownloadCompleted;
+		public event EventHandler<string> StreamingBegin;
+		public event EventHandler<DownloadProgress> StreamingProgressChanged;
+		public event EventHandler<string> StreamingCompleted;
+		public event EventHandler<TimeSpan> StreamingTimeRemaining;
 
 		public async Task<string> PerformDownloadFileAsync(string downloadUrl, string proposedDownloadFilePath)
 		{
 			var client = new HttpClient();
 
 			var progress = new Progress<DownloadProgress>();
-			progress.ProgressChanged += (_, e) => DownloadProgressChanged?.Invoke(this, e);
+			progress.ProgressChanged += (_, e) => StreamingProgressChanged?.Invoke(this, e);
 
-			DownloadBegin?.Invoke(this, proposedDownloadFilePath);
+			StreamingBegin?.Invoke(this, proposedDownloadFilePath);
 
 			try
 			{
@@ -28,7 +29,7 @@ namespace FileLiberator
 			}
 			finally
 			{
-				DownloadCompleted?.Invoke(this, proposedDownloadFilePath);
+				StreamingCompleted?.Invoke(this, proposedDownloadFilePath);
 			}
 		}
 	}

FileLiberator/DownloadPdf.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Net.Http;
@@ -14,19 +15,18 @@ namespace FileLiberator
 	{
 		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)
 		{
 			var proposedDownloadFilePath = getProposedDownloadFilePath(libraryBook);
-			await downloadPdfAsync(libraryBook, proposedDownloadFilePath);
-			return verifyDownload(libraryBook);
-		}
+			var actualDownloadedFilePath = await downloadPdfAsync(libraryBook, proposedDownloadFilePath);
+			var result = verifyDownload(actualDownloadedFilePath);
 
-		private static StatusHandler verifyDownload(LibraryBook libraryBook)
-			=> !AudibleFileStorage.PDF.Exists(libraryBook.Book.AudibleProductId)
-			? new StatusHandler { "Downloaded PDF cannot be found" }
-			: new StatusHandler();
+			libraryBook.Book.UserDefinedItem.PdfStatus = result.IsSuccess ? LiberatedStatus.Liberated : LiberatedStatus.NotLiberated;
+
+			return result;
+		}
 
 		private static string getProposedDownloadFilePath(LibraryBook libraryBook)
 		{
@@ -38,14 +38,17 @@ namespace FileLiberator
 				return Path.Combine(existingPath, Path.GetFileName(file));
 
 			var full = FileUtility.GetValidFilename(
-				AudibleFileStorage.PDF.StorageDirectory,
+				AudibleFileStorage.PdfStorageDirectory,
 				libraryBook.Book.Title,
 				Path.GetExtension(file),
 				libraryBook.Book.AudibleProductId);
 			return full;
 		}
 
-		private async Task downloadPdfAsync(LibraryBook libraryBook, string proposedDownloadFilePath)
+		private static string getdownloadUrl(LibraryBook libraryBook)
+			=> libraryBook?.Book?.Supplements?.FirstOrDefault()?.Url;
+
+		private async Task<string> downloadPdfAsync(LibraryBook libraryBook, string proposedDownloadFilePath)
 		{
 			var api = await GetApiAsync(libraryBook);
 			var downloadUrl = await api.GetPdfDownloadLinkAsync(libraryBook.Book.AudibleProductId);
@@ -54,9 +57,13 @@ namespace FileLiberator
 			var actualDownloadedFilePath = await PerformDownloadAsync(
 				proposedDownloadFilePath,
 				(p) => client.DownloadFileAsync(downloadUrl, proposedDownloadFilePath, p));
+
+			return actualDownloadedFilePath;
 		}
 
-		private static string getdownloadUrl(LibraryBook libraryBook)
-			=> libraryBook?.Book?.Supplements?.FirstOrDefault()?.Url;
+		private static StatusHandler verifyDownload(string actualDownloadedFilePath)
+			=> !File.Exists(actualDownloadedFilePath)
+			? new StatusHandler { "Downloaded PDF cannot be found" }
+			: new StatusHandler();
 	}
 }

FileLiberator/DownloadableBase.cs

@@ -6,16 +6,18 @@ using Dinah.Core.Net.Http;
 
 namespace FileLiberator
 {
-	public abstract class DownloadableBase : IDownloadableProcessable
+	public abstract class DownloadableBase : IProcessable
 	{
 		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> StreamingBegin;
+		public event EventHandler<DownloadProgress> StreamingProgressChanged;
+		public event EventHandler<string> StreamingCompleted;
 
 		public event EventHandler<string> StatusUpdate;
+		public event EventHandler<TimeSpan> StreamingTimeRemaining;
+
 		protected void Invoke_StatusUpdate(string message) => StatusUpdate?.Invoke(this, message);
 
         public abstract bool Validate(LibraryBook libraryBook);
@@ -44,9 +46,9 @@ namespace FileLiberator
 		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);
+			progress.ProgressChanged += (_, e) => StreamingProgressChanged?.Invoke(this, e);
 
-			DownloadBegin?.Invoke(this, proposedDownloadFilePath);
+			StreamingBegin?.Invoke(this, proposedDownloadFilePath);
 
 			try
 			{
@@ -57,7 +59,7 @@ namespace FileLiberator
 			}
 			finally
 			{
-				DownloadCompleted?.Invoke(this, proposedDownloadFilePath);
+				StreamingCompleted?.Invoke(this, proposedDownloadFilePath);
 			}
 		}
 	}

FileLiberator/DownloadedChapters.cs

@@ -1,22 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Globalization;
-using System.Linq;
-using System.Text;
-using AaxDecrypter;
-using AudibleApiDTOs;
-using Dinah.Core.Diagnostics;
-
-
-namespace FileLiberator
-{
-    public class DownloadedChapters : Chapters
-    {
-        public DownloadedChapters(ChapterInfo chapterInfo)
-        {
-            AddChapters(chapterInfo.Chapters
-                .Select(c => new AaxDecrypter.Chapter(c.StartOffsetMs / 1000d, (c.StartOffsetMs + c.LengthMs) / 1000d, c.Title)));
-        }
-    }
-}

FileLiberator/FileLiberator.csproj

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

FileLiberator/IAudioDecodable.cs

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

FileLiberator/IDecryptable.cs

@@ -1,17 +0,0 @@
-using System;
-
-namespace FileLiberator
-{
-    public interface IDecryptable : IProcessable
-    {
-        event EventHandler<string> DecryptBegin;
-
-        event EventHandler<string> TitleDiscovered;
-        event EventHandler<string> AuthorsDiscovered;
-        event EventHandler<string> NarratorsDiscovered;
-        event EventHandler<byte[]> CoverImageFilepathDiscovered;
-        event EventHandler<int> UpdateProgress;
-
-        event EventHandler<string> DecryptCompleted;
-    }
-}

FileLiberator/IDownloadable.cs

@@ -1,12 +0,0 @@
-using System;
-using Dinah.Core.Net.Http;
-
-namespace FileLiberator
-{
-    public interface IDownloadable 
-    {
-        event EventHandler<string> DownloadBegin;
-        event EventHandler<DownloadProgress> DownloadProgressChanged;
-        event EventHandler<string> DownloadCompleted;
-    }
-}

FileLiberator/IDownloadableProcessable.cs

@@ -1,4 +0,0 @@
-namespace FileLiberator
-{
-    public interface IDownloadableProcessable : IDownloadable, IProcessable { }
-}

FileLiberator/IProcessable.cs

@@ -5,7 +5,7 @@ using Dinah.Core.ErrorHandling;
 
 namespace FileLiberator
 {
-    public interface IProcessable
+    public interface IProcessable : IStreamable
     {
         event EventHandler<LibraryBook> Begin;
 

FileLiberator/IProcessableExt.cs

@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
-using ApplicationServices;
 using DataLayer;
 using Dinah.Core;
 using Dinah.Core.ErrorHandling;
@@ -18,32 +17,15 @@ namespace FileLiberator
 
 
         // when used in foreach: stateful. deferred execution
-        public static IEnumerable<LibraryBook> GetValidLibraryBooks(this IProcessable processable)
-            => DbContexts.GetContext()
-            .GetLibrary_Flat_NoTracking()
-            .Where(libraryBook => processable.Validate(libraryBook));
+        public static IEnumerable<LibraryBook> GetValidLibraryBooks(this IProcessable processable, IEnumerable<LibraryBook> library)
+            => library.Where(libraryBook => processable.Validate(libraryBook));
 
-        public static LibraryBook GetSingleLibraryBook(string productId)
+        public static async Task<StatusHandler> ProcessSingleAsync(this IProcessable processable, LibraryBook libraryBook, bool validate)
         {
-            using var context = DbContexts.GetContext();
-            var libraryBook = context
-                .Library
-                .GetLibrary()
-                .SingleOrDefault(lb => lb.Book.AudibleProductId == productId);
-            return libraryBook;
-        }
-
-        public static async Task<StatusHandler> ProcessSingleAsync(this IProcessable processable, LibraryBook libraryBook)
-        {
-            if (!processable.Validate(libraryBook))
+            if (validate && !processable.Validate(libraryBook))
                 return new StatusHandler { "Validation failed" };
 
-            return await processable.ProcessBookAsync_NoValidation(libraryBook);
-        }
-
-        public static async Task<StatusHandler> ProcessBookAsync_NoValidation(this IProcessable processable, LibraryBook libraryBook)
-        {
-            Serilog.Log.Logger.Information("Begin " + nameof(ProcessBookAsync_NoValidation) + " {@DebugInfo}", new
+            Serilog.Log.Logger.Information("Begin " + nameof(ProcessSingleAsync) + " {@DebugInfo}", new
             {
                 libraryBook.Book.Title,
                 libraryBook.Book.AudibleProductId,

FileLiberator/IStreamable.cs

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

FileManager/AudibleFileStorage.cs

@@ -8,101 +8,82 @@ using Dinah.Core.Collections.Generic;
 
 namespace FileManager
 {
-    // could add images here, but for now images are stored in a well-known location
-    public enum FileType { Unknown, Audio, AAX, PDF }
+    public enum FileType { Unknown, Audio, AAXC, PDF }
 
-	/// <summary>
-	/// Files are large. File contents are never read by app.
-	/// Paths are varied.
-	/// Files are written during download/decrypt/backup/liberate.
-	/// Paths are read at app launch and during download/decrypt/backup/liberate.
-	/// Many files are often looked up at once
-	/// </summary>
 	public abstract class AudibleFileStorage : Enumeration<AudibleFileStorage>
 	{
-		public abstract string[] Extensions { get; }
+		protected abstract string[] Extensions { get; }
 		public abstract string StorageDirectory { get; }
 
+		public static string DownloadsInProgress => Directory.CreateDirectory(Path.Combine(Configuration.Instance.InProgress, "DownloadsInProgress")).FullName;
+        public static string DecryptInProgress => Directory.CreateDirectory(Path.Combine(Configuration.Instance.InProgress, "DecryptInProgress")).FullName;
+
+        public static string PdfStorageDirectory => BooksDirectory;
+
+		private static AaxcFileStorage AAXC { get; } = new AaxcFileStorage();
+        public static bool AaxcExists(string productId) => AAXC.Exists(productId);
+
 		#region static
 		public static AudioFileStorage Audio { get; } = new AudioFileStorage();
-		public static AudibleFileStorage AAX { get; } = new AaxFileStorage();
-		public static AudibleFileStorage PDF { get; } = new PdfFileStorage();
-
-		public static string DownloadsInProgress
-        {
-            get
-            {
-                if (!Configuration.Instance.DownloadsInProgressEnum.In("WinTemp", "LibationFiles"))
-                    Configuration.Instance.DownloadsInProgressEnum = "WinTemp";
-                var AaxRootDir
-                    = Configuration.Instance.DownloadsInProgressEnum == "WinTemp"
-                    ? Configuration.WinTemp
-                    : Configuration.Instance.LibationFiles;
-
-                return Directory.CreateDirectory(Path.Combine(AaxRootDir, "DownloadsInProgress")).FullName;
-            }
-        }
-
-        public static string DecryptInProgress
-        {
-            get
-            {
-                if (!Configuration.Instance.DecryptInProgressEnum.In("WinTemp", "LibationFiles"))
-                    Configuration.Instance.DecryptInProgressEnum = "WinTemp";
-
-                var M4bRootDir
-                    = Configuration.Instance.DecryptInProgressEnum == "WinTemp"
-                    ? Configuration.WinTemp
-                    : Configuration.Instance.LibationFiles;
-
-                return Directory.CreateDirectory(Path.Combine(M4bRootDir, "DecryptInProgress")).FullName;
-            }
-        }
-
-        // not customizable. don't move to config
-        public static string DownloadsFinal => new DirectoryInfo(Configuration.Instance.LibationFiles).CreateSubdirectory("DownloadsFinal").FullName;
 
         public static string BooksDirectory
         {
             get
             {
                 if (string.IsNullOrWhiteSpace(Configuration.Instance.Books))
-                    Configuration.Instance.Books = Path.Combine(Configuration.Instance.LibationFiles, "Books");
+                    Configuration.Instance.Books = Path.Combine(Configuration.UserProfile, "Books");
                 return Directory.CreateDirectory(Configuration.Instance.Books).FullName;
             }
         }
+
+        internal static BackgroundFileSystem BookDirectoryFiles { get; set; }
         #endregion
 
         #region instance
         public FileType FileType => (FileType)Value;
 
-		private IEnumerable<string> extensions_noDots { get; }
-		private string extAggr { get; }
+		protected IEnumerable<string> extensions_noDots { get; }
+        private string extAggr { get; }
 
         protected AudibleFileStorage(FileType fileType) : base((int)fileType, fileType.ToString())
 		{
 			extensions_noDots = Extensions.Select(ext => ext.Trim('.')).ToList();
 			extAggr = extensions_noDots.Aggregate((a, b) => $"{a}|{b}");
-		}
+            BookDirectoryFiles ??= new BackgroundFileSystem(BooksDirectory, "*.*", SearchOption.AllDirectories);
+        }
 
-        /// <summary>
-        /// Example for full books:
-        /// Search recursively in _books directory. Full book exists if either are true
-        /// - a directory name has the product id and an audio file is immediately inside
-        /// - any audio filename contains the product id
-        /// </summary>
-        public bool Exists(string productId) => GetPath(productId) != null;
-
-		public string GetPath(string productId)
+        protected string GetFilePath(string productId)
         {
             var cachedFile = FilePathCache.GetPath(productId, FileType);
             if (cachedFile != null)
                 return cachedFile;
 
-            var firstOrNull =
-				Directory
-				.EnumerateFiles(StorageDirectory, "*.*", SearchOption.AllDirectories)
-				.FirstOrDefault(s => Regex.IsMatch(s, $@"{productId}.*?\.({extAggr})$", RegexOptions.IgnoreCase));
+            string regexPattern = $@"{productId}.*?\.({extAggr})$";
+            string firstOrNull;
+
+            if (StorageDirectory == BooksDirectory)
+            {
+                //If user changed the BooksDirectory, reinitialize.
+                if (StorageDirectory != BookDirectoryFiles.RootDirectory)
+				{
+                    lock (BookDirectoryFiles)
+                    {
+                        if (StorageDirectory != BookDirectoryFiles.RootDirectory)
+                        {
+                            BookDirectoryFiles = new BackgroundFileSystem(StorageDirectory, "*.*", SearchOption.AllDirectories);
+                        }
+                    }
+				}
+
+                firstOrNull = BookDirectoryFiles.FindFile(regexPattern, RegexOptions.IgnoreCase);
+            }
+            else
+            {
+                firstOrNull =
+                    Directory
+                    .EnumerateFiles(StorageDirectory, "*.*", SearchOption.AllDirectories)
+                    .FirstOrDefault(s => Regex.IsMatch(s, regexPattern, RegexOptions.IgnoreCase));
+            }
 
 			if (firstOrNull is null)
 				return null;
@@ -110,6 +91,21 @@ namespace FileManager
 			FilePathCache.Upsert(productId, FileType, firstOrNull);
 			return firstOrNull;
         }
+        #endregion
+    }
+
+    public class AudioFileStorage : AudibleFileStorage
+    {
+        protected override string[] Extensions { get; } = new[] { "m4b", "mp3", "aac", "mp4", "m4a", "ogg", "flac" };
+
+        // we always want to use the latest config value, therefore
+        // - DO use 'get' arrow "=>"
+        // - do NOT use assign "="
+        public override string StorageDirectory => BooksDirectory;
+
+        public AudioFileStorage() : base(FileType.Audio) { }
+
+        public void Refresh() => BookDirectoryFiles.RefreshFiles();
 
         public string GetDestDir(string title, string asin)
         {
@@ -125,55 +121,27 @@ namespace FileManager
 
         public bool IsFileTypeMatch(FileInfo fileInfo)
             => extensions_noDots.ContainsInsensative(fileInfo.Extension.Trim('.'));
-        #endregion
+
+        public string GetPath(string productId) => GetFilePath(productId);
     }
 
-    public class AudioFileStorage : AudibleFileStorage
+    public class AaxcFileStorage : AudibleFileStorage
     {
-        public const string SKIP_FILE_EXT = "libhack";
-
-		public override string[] Extensions { get; } = new[] { "m4b", "mp3", "aac", "mp4", "m4a", "ogg", "flac", SKIP_FILE_EXT };
+        protected override string[] Extensions { get; } = new[] { "aaxc" };
 
         // we always want to use the latest config value, therefore
         // - DO use 'get' arrow "=>"
         // - do NOT use assign "="
-        public override string StorageDirectory => BooksDirectory;
+        public override string StorageDirectory => DownloadsInProgress;
 
-        public AudioFileStorage() : base(FileType.Audio) { }
+        public AaxcFileStorage() : base(FileType.AAXC) { }
 
-        public string CreateSkipFile(string title, string asin, string contents = null)
-        {
-            var destinationDir = GetDestDir(title, asin);
-            Directory.CreateDirectory(destinationDir);
-
-            var path = FileUtility.GetValidFilename(destinationDir, title, SKIP_FILE_EXT, asin);
-            File.WriteAllText(path, contents ?? string.Empty);
-
-            return path;
-        }
-    }
-
-    public class AaxFileStorage : AudibleFileStorage
-    {
-        public override string[] Extensions { get; } = new[] { "aax" };
-
-        // we always want to use the latest config value, therefore
-        // - DO use 'get' arrow "=>"
-        // - do NOT use assign "="
-        public override string StorageDirectory => DownloadsFinal;
-
-        public AaxFileStorage() : base(FileType.AAX) { }
-    }
-
-    public class PdfFileStorage : AudibleFileStorage
-    {
-		public override string[] Extensions { get; } = new[] { "pdf", "zip" };
-
-        // we always want to use the latest config value, therefore
-        // - DO use 'get' arrow "=>"
-        // - do NOT use assign "="
-        public override string StorageDirectory => BooksDirectory;
-
-        public PdfFileStorage() : base(FileType.PDF) { }
+        /// <summary>
+        /// Example for full books:
+        /// Search recursively in _books directory. Full book exists if either are true
+        /// - a directory name has the product id and an audio file is immediately inside
+        /// - any audio filename contains the product id
+        /// </summary>
+        public bool Exists(string productId) => GetFilePath(productId) != null;
     }
 }

FileManager/BackgroundFileSystem.cs

@@ -0,0 +1,163 @@
+using System;
+using System.Collections.Concurrent;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Threading.Tasks;
+
+namespace FileManager
+{
+    /// <summary>
+    /// Tracks actual locations of files. This is especially useful for clicking button to navigate to the book's files.
+    /// 
+    /// Note: this is no longer how Libation manages "Liberated" state. That is not statefully managed in the database.
+    /// This paradigm is what allows users to manually choose to not download books. Also allows them to manually toggle
+    /// this state and download again.
+    /// </summary>
+    internal class BackgroundFileSystem
+    {
+        public string RootDirectory { get; private set; }
+        public string SearchPattern { get; private set; }
+        public SearchOption SearchOption { get; private set; }
+
+        private FileSystemWatcher fileSystemWatcher { get; set; }
+        private BlockingCollection<FileSystemEventArgs> directoryChangesEvents { get; set; }
+        private Task backgroundScanner { get; set; }
+        private List<string> fsCache { get; } = new();
+
+        public BackgroundFileSystem(string rootDirectory, string searchPattern, SearchOption searchOptions)
+        {
+            RootDirectory = rootDirectory;
+            SearchPattern = searchPattern;
+            SearchOption = searchOptions;
+
+            Init();
+        }
+
+        public string FindFile(string regexPattern, RegexOptions options)
+        {
+            lock (fsCache)
+            {
+                return fsCache.FirstOrDefault(s => Regex.IsMatch(s, regexPattern, options));
+            }
+        }
+
+        public void RefreshFiles()
+        {
+            lock (fsCache)
+            {
+                fsCache.Clear();
+                fsCache.AddRange(Directory.EnumerateFiles(RootDirectory, SearchPattern, SearchOption));
+            }
+        }
+
+        private void Init()
+        {
+            Stop();
+
+            lock (fsCache)
+                fsCache.AddRange(Directory.EnumerateFiles(RootDirectory, SearchPattern, SearchOption));
+
+            directoryChangesEvents = new BlockingCollection<FileSystemEventArgs>();
+            fileSystemWatcher = new FileSystemWatcher(RootDirectory);
+            fileSystemWatcher.Created += FileSystemWatcher_Changed;
+            fileSystemWatcher.Deleted += FileSystemWatcher_Changed;
+            fileSystemWatcher.Renamed += FileSystemWatcher_Changed;
+            fileSystemWatcher.Error += FileSystemWatcher_Error;
+            fileSystemWatcher.IncludeSubdirectories = true;
+            fileSystemWatcher.EnableRaisingEvents = true;
+
+            backgroundScanner = new Task(BackgroundScanner);
+            backgroundScanner.Start();
+        }
+        private void Stop()
+        {
+            //Stop raising events
+            fileSystemWatcher?.Dispose();
+
+            //Calling CompleteAdding() will cause background scanner to terminate.
+            directoryChangesEvents?.CompleteAdding();
+
+            //Wait for background scanner to terminate before reinitializing.
+            backgroundScanner?.Wait();
+
+            //Dispose of directoryChangesEvents after backgroundScanner exists.
+            directoryChangesEvents?.Dispose();
+
+            lock (fsCache)
+                fsCache.Clear();
+        }
+
+        private void FileSystemWatcher_Error(object sender, ErrorEventArgs e)
+        {
+            Stop();
+            Init();
+        }
+
+        private void FileSystemWatcher_Changed(object sender, FileSystemEventArgs e)
+        {
+            directoryChangesEvents.Add(e);
+        }
+
+        #region Background Thread
+        private void BackgroundScanner()
+        {
+            while (directoryChangesEvents.TryTake(out FileSystemEventArgs change, -1))
+            {
+                lock (fsCache)
+                    UpdateLocalCache(change);
+            }
+        }
+
+        private void UpdateLocalCache(FileSystemEventArgs change)
+        {
+            if (change.ChangeType == WatcherChangeTypes.Deleted)
+            {
+                RemovePath(change.FullPath);
+            }
+            else if (change.ChangeType == WatcherChangeTypes.Created)
+            {
+                AddPath(change.FullPath);
+            }
+            else if (change.ChangeType == WatcherChangeTypes.Renamed && change is RenamedEventArgs renameChange)
+            {
+                RemovePath(renameChange.OldFullPath);
+                AddPath(renameChange.FullPath);
+            }
+        }
+
+        private void RemovePath(string path)
+        {
+            var pathsToRemove = fsCache.Where(p => p.StartsWith(path)).ToArray();
+
+            foreach (var p in pathsToRemove)
+                fsCache.Remove(p);
+        }
+
+        private void AddPath(string path)
+        {
+            if (File.GetAttributes(path).HasFlag(FileAttributes.Directory))
+                AddUniqueFiles(Directory.EnumerateFiles(path, SearchPattern, SearchOption));
+            else
+                AddUniqueFile(path);
+        }
+        private void AddUniqueFiles(IEnumerable<string> newFiles)
+        {
+            foreach (var file in newFiles)
+            {
+                AddUniqueFile(file);
+            }
+        }
+        private void AddUniqueFile(string newFile)
+        {
+            if (!fsCache.Contains(newFile))
+                fsCache.Add(newFile);
+        }
+
+        #endregion
+
+        ~BackgroundFileSystem() => Stop();
+    }
+}

FileManager/Configuration.cs

@@ -4,147 +4,57 @@ using System.ComponentModel;
 using System.IO;
 using System.Linq;
 using Dinah.Core;
+using Dinah.Core.Logging;
+using Microsoft.Extensions.Configuration;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
+using Serilog;
+using Serilog.Events;
 
 namespace FileManager
 {
     public class Configuration
     {
-        // settings will be persisted when all are true
-        // - property (not field)
-        // - string
-        // - public getter
-        // - public setter
-
-        #region // properties to test reflection
-        /*
-        // field should NOT be populated
-        public string TestField;
-        // int should NOT be populated
-        public int TestInt { get; set; }
-        // read-only should NOT be populated
-        public string TestGet { get; } // get only: should NOT get auto-populated
-        // set-only should NOT be populated
-        public string TestSet { private get; set; }
-
-        // get and set: SHOULD be auto-populated
-        public string TestGetSet { get; set; }
-        */
-        #endregion
-
-        private PersistentDictionary persistentDictionary;
-
-        public bool FilesExist
+        public bool LibationSettingsAreValid
             => File.Exists(APPSETTINGS_JSON)
-            && File.Exists(SettingsFilePath)
-            && Directory.Exists(LibationFiles)
-            && Directory.Exists(Books);
+            && SettingsFileIsValid(SettingsFilePath);
 
-        public string SettingsFilePath => Path.Combine(LibationFiles, "Settings.json");
-
-        [Description("Location for book storage. Includes destination of newly liberated books")]
-        public string Books
+        public static bool SettingsFileIsValid(string settingsFile)
         {
-            get => persistentDictionary.GetString(nameof(Books));
-            set => persistentDictionary.Set(nameof(Books), value);
+            if (!Directory.Exists(Path.GetDirectoryName(settingsFile)) || !File.Exists(settingsFile))
+                return false;
+
+            var pDic = new PersistentDictionary(settingsFile, isReadOnly: true);
+
+            var booksDir = pDic.GetString(nameof(Books));
+            if (booksDir is null || !Directory.Exists(booksDir))
+                return false;
+
+            if (string.IsNullOrWhiteSpace(pDic.GetString(nameof(InProgress))))
+                return false;
+
+            return true;
         }
 
-        private const string APP_DIR = "AppDir";
-        public static string AppDir { get; } = Path.GetFullPath(Path.Combine(Path.GetDirectoryName(Exe.FileLocationOnDisk), LIBATION_FILES));
-        public static string MyDocs { get; } = Path.GetFullPath(Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments), LIBATION_FILES));
-        public static string WinTemp { get; } = Path.GetFullPath(Path.Combine(Path.GetTempPath(), "Libation"));
+        #region persistent configuration settings/values
 
-        private Dictionary<string, string> wellKnownPaths { get; } = new Dictionary<string, string>
-        {
-            [APP_DIR] = AppDir,
-            ["MyDocs"] = MyDocs,
-            ["WinTemp"] = WinTemp
-        };
-        private string libationFilesPathCache;
+        // note: any potential file manager static ctors can't compensate if storage dir is changed at run time via settings. this is partly bad architecture. but the side effect is desirable. if changing LibationFiles location: restart app
 
         // default setting and directory creation occur in class responsible for files.
         // config class is only responsible for path. not responsible for setting defaults, dir validation, or dir creation
         // exceptions: appsettings.json, LibationFiles dir, Settings.json
 
-        // temp/working dir(s) should be outside of dropbox
-        [Description("Temporary location of files while they're in process of being downloaded.\r\nWhen download is complete, the final file will be in [LibationFiles]\\DownloadsFinal")]
-        public string DownloadsInProgressEnum
-        {
-            get => persistentDictionary.GetString(nameof(DownloadsInProgressEnum));
-            set => persistentDictionary.Set(nameof(DownloadsInProgressEnum), value);
-        }
-
-        // temp/working dir(s) should be outside of dropbox
-        [Description("Temporary location of files while they're in process of being decrypted.\r\nWhen decryption is complete, the final file will be in Books location")]
-        public string DecryptInProgressEnum
-        {
-            get => persistentDictionary.GetString(nameof(DecryptInProgressEnum));
-            set => persistentDictionary.Set(nameof(DecryptInProgressEnum), value);
-        }
-
-        [Description("Retain .aax files after decrypting?")]
-        public bool RetainAaxFiles
-        {
-            get => persistentDictionary.Get<bool>(nameof(RetainAaxFiles));
-            set => persistentDictionary.Set(nameof(RetainAaxFiles), value);
-        }
-
-        // note: any potential file manager static ctors can't compensate if storage dir is changed at run time via settings. this is partly bad architecture. but the side effect is desirable. if changing LibationFiles location: restart app
-
-        // singleton stuff
-        public static Configuration Instance { get; } = new Configuration();
-        private Configuration() { }
-
-        private const string APPSETTINGS_JSON = "appsettings.json";
-        private const string LIBATION_FILES = "LibationFiles";
-
-        [Description("Location for storage of program-created files")]
-        public string LibationFiles => libationFilesPathCache ?? getLibationFiles();
-        private string getLibationFiles()
-        {
-            var value = getLiberationFilesSettingFromJson();
-
-            // this looks weird but is correct for translating wellKnownPaths
-            if (wellKnownPaths.ContainsKey(value))
-                value = wellKnownPaths[value];
-
-            // must write here before SettingsFilePath in next step reads cache
-            libationFilesPathCache = value;
-
-            // load json values into memory. create if not exists
-            persistentDictionary = new PersistentDictionary(SettingsFilePath);
-
-            return libationFilesPathCache;
-        }
-        private string getLiberationFilesSettingFromJson()
-        {
-            try
-            {
-                if (File.Exists(APPSETTINGS_JSON))
-                {
-                    var appSettingsContents = File.ReadAllText(APPSETTINGS_JSON);
-                    var jObj = JObject.Parse(appSettingsContents);
-
-                    if (jObj.ContainsKey(LIBATION_FILES))
-                    {
-                        var value = jObj[LIBATION_FILES].Value<string>();
-
-                        // do not check whether directory exists. special/meta directory (eg: AppDir) is valid
-                        if (!string.IsNullOrWhiteSpace(value))
-                            return value;
-                    }
-                }
-            }
-            catch { }
-
-            File.WriteAllText(APPSETTINGS_JSON, new JObject { { LIBATION_FILES, APP_DIR } }.ToString(Formatting.Indented));
-            return APP_DIR;
-        }
+        private PersistentDictionary persistentDictionary;
 
         public object GetObject(string propertyName) => persistentDictionary.GetObject(propertyName);
-        public void SetObject(string propertyName, object newValue) => persistentDictionary.Set(propertyName, newValue);
-        public void SetWithJsonPath(string jsonPath, string propertyName, string newValue) => persistentDictionary.SetWithJsonPath(jsonPath, propertyName, newValue);
+        public void SetObject(string propertyName, object newValue) => persistentDictionary.SetNonString(propertyName, newValue);
+
+        /// <summary>WILL ONLY set if already present. WILL NOT create new</summary>
+        /// <returns>Value was changed</returns>
+        public bool SetWithJsonPath(string jsonPath, string propertyName, string newValue, bool suppressLogging = false)
+            => persistentDictionary.SetWithJsonPath(jsonPath, propertyName, newValue, suppressLogging);
+
+        public string SettingsFilePath => Path.Combine(LibationFiles, "Settings.json");
 
         public static string GetDescription(string propertyName)
         {
@@ -157,34 +67,278 @@ namespace FileManager
             return attribute?.Description;
         }
 
-        public bool TrySetLibationFiles(string directory)
-        {
-            if (!Directory.Exists(directory) && !wellKnownPaths.ContainsKey(directory))
-                return false;
+        public bool Exists(string propertyName) => persistentDictionary.Exists(propertyName);
 
-            // if moving from default, delete old settings file and dir (if empty)
-            if (LibationFiles.EqualsInsensitive(AppDir))
+        #region MainForm: X, Y, Width, Height, MainFormIsMaximized
+        public int MainFormX
+        {
+            get => persistentDictionary.GetNonString<int>(nameof(MainFormX));
+            set => persistentDictionary.SetNonString(nameof(MainFormX), value);
+        }
+
+        public int MainFormY
+        {
+            get => persistentDictionary.GetNonString<int>(nameof(MainFormY));
+            set => persistentDictionary.SetNonString(nameof(MainFormY), value);
+        }
+
+        public int MainFormWidth
+        {
+            get => persistentDictionary.GetNonString<int>(nameof(MainFormWidth));
+            set => persistentDictionary.SetNonString(nameof(MainFormWidth), value);
+        }
+
+        public int MainFormHeight
+        {
+            get => persistentDictionary.GetNonString<int>(nameof(MainFormHeight));
+            set => persistentDictionary.SetNonString(nameof(MainFormHeight), value);
+        }
+
+        public bool MainFormIsMaximized
+        {
+            get => persistentDictionary.GetNonString<bool>(nameof(MainFormIsMaximized));
+            set => persistentDictionary.SetNonString(nameof(MainFormIsMaximized), value);
+        }
+        #endregion
+
+        [Description("Location for book storage. Includes destination of newly liberated books")]
+        public string Books
+        {
+            get => persistentDictionary.GetString(nameof(Books));
+            set => persistentDictionary.SetString(nameof(Books), value);
+        }
+
+        // temp/working dir(s) should be outside of dropbox
+        [Description("Temporary location of files while they're in process of being downloaded and decrypted.\r\nWhen decryption is complete, the final file will be in Books location\r\nRecommend not using a folder which is backed up real time. Eg: Dropbox, iCloud, Google Drive")]
+        public string InProgress
+        {
+            get => persistentDictionary.GetString(nameof(InProgress));
+            set => persistentDictionary.SetString(nameof(InProgress), value);
+        }
+
+        [Description("Allow Libation for fix up audiobook metadata?")]
+        public bool AllowLibationFixup
+        {
+            get => persistentDictionary.GetNonString<bool>(nameof(AllowLibationFixup));
+            set => persistentDictionary.SetNonString(nameof(AllowLibationFixup), value);
+        }
+
+        [Description("Decrypt to lossy format?")]
+        public bool DecryptToLossy
+        {
+            get => persistentDictionary.GetNonString<bool>(nameof(DecryptToLossy));
+            set => persistentDictionary.SetNonString(nameof(DecryptToLossy), value);
+        }
+
+        #endregion
+
+        #region known directories
+        public static string AppDir_Relative => $@".\{LIBATION_FILES_KEY}";
+        public static string AppDir_Absolute => Path.GetFullPath(Path.Combine(Path.GetDirectoryName(Exe.FileLocationOnDisk), LIBATION_FILES_KEY));
+        public static string MyDocs => Path.GetFullPath(Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments), "Libation"));
+        public static string WinTemp => Path.GetFullPath(Path.Combine(Path.GetTempPath(), "Libation"));
+        public static string UserProfile => Path.GetFullPath(Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile), "Libation"));
+
+        public enum KnownDirectories
+        {
+            None = 0,
+
+            [Description("My Users folder")]
+            UserProfile = 1,
+
+            [Description("The same folder that Libation is running from")]
+            AppDir = 2,
+
+            [Description("Windows temporary folder")]
+            WinTemp = 3,
+
+            [Description("My Documents")]
+            MyDocs = 4,
+
+            [Description("Your settings folder (aka: Libation Files)")]
+            LibationFiles = 5
+        }
+        // use func calls so we always get the latest value of LibationFiles
+        private static List<(KnownDirectories directory, Func<string> getPathFunc)> directoryOptionsPaths { get; } = new()
+        {
+            (KnownDirectories.None, () => null),
+            (KnownDirectories.UserProfile, () => UserProfile),
+            (KnownDirectories.AppDir, () => AppDir_Relative),
+            (KnownDirectories.WinTemp, () => WinTemp),
+            (KnownDirectories.MyDocs, () => MyDocs),
+            // this is important to not let very early calls try to accidentally load LibationFiles too early.
+            // also, keep this at bottom of this list
+            (KnownDirectories.LibationFiles, () => libationFilesPathCache)
+        };
+        public static string GetKnownDirectoryPath(KnownDirectories directory)
+        {
+            var dirFunc = directoryOptionsPaths.SingleOrDefault(dirFunc => dirFunc.directory == directory);
+            return dirFunc == default ? null : dirFunc.getPathFunc();
+        }
+        public static KnownDirectories GetKnownDirectory(string directory)
+        {
+            // especially important so a very early call doesn't match null => LibationFiles
+            if (string.IsNullOrWhiteSpace(directory))
+                return KnownDirectories.None;
+
+            // 'First' instead of 'Single' because LibationFiles could match other directories. eg: default value of LibationFiles == UserProfile.
+            // since it's a list, order matters and non-LibationFiles will be returned first
+            var dirFunc = directoryOptionsPaths.FirstOrDefault(dirFunc => dirFunc.getPathFunc() == directory);
+            return dirFunc == default ? KnownDirectories.None : dirFunc.directory;
+        }
+        #endregion
+
+        #region logging
+        private IConfigurationRoot configuration;
+        public void ConfigureLogging()
+        {
+            //// with code. also persists to Settings.json
+            //SetWithJsonPath("Serilog.WriteTo[1].Args", "path", logPath, true);
+            //// hack which achieves the same, in memory only
+            //configuration["Serilog:WriteTo:1:Args:path"] = logPath;
+
+            configuration = new ConfigurationBuilder()
+                .AddJsonFile(SettingsFilePath, optional: false, reloadOnChange: true)
+                .Build();
+            Log.Logger = new LoggerConfiguration()
+                .ReadFrom.Configuration(configuration)
+                .CreateLogger();
+        }
+
+        [Description("The importance of a log event")]
+        public LogEventLevel LogLevel
+        {
+            get
             {
-                File.Delete(SettingsFilePath);
+                try
+                {
+                    var logLevelStr = persistentDictionary.GetStringFromJsonPath("Serilog", "MinimumLevel");
+                    var logLevelEnum = Enum<LogEventLevel>.Parse(logLevelStr);
+                    return logLevelEnum;
+                }
+                catch
+                {
+                    return LogEventLevel.Information;
+                }
+            }
+            set
+            {
+                var valueWasChanged = persistentDictionary.SetWithJsonPath("Serilog", "MinimumLevel", value.ToString());
+                if (!valueWasChanged)
+                {
+                    Log.Logger.Information("LogLevel.set attempt. No change");
+                    return;
+                }
+
+                configuration.Reload();
+
+                Log.Logger.Information("Updated LogLevel MinimumLevel. {@DebugInfo}", new
+                {
+                    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()
+                });
+            }
+        }
+		#endregion
+
+		#region singleton stuff
+		public static Configuration Instance { get; } = new Configuration();
+        private Configuration() { }
+		#endregion
+
+		#region LibationFiles
+
+		private const string APPSETTINGS_JSON = "appsettings.json";
+        private const string LIBATION_FILES_KEY = "LibationFiles";
+
+        [Description("Location for storage of program-created files")]
+        public string LibationFiles
+        {
+            get
+            {
+                if (libationFilesPathCache is not null)
+                    return libationFilesPathCache;
+
+                // FIRST: must write here before SettingsFilePath in next step reads cache
+                libationFilesPathCache = getLiberationFilesSettingFromJson();
+
+                // SECOND. before setting to json file with SetWithJsonPath, PersistentDictionary must exist
+                persistentDictionary = new PersistentDictionary(SettingsFilePath);
+
+                // Config init in Program.ensureSerilogConfig() only happens when serilog setting is first created (prob on 1st run).
+                // This Set() enforces current LibationFiles every time we restart Libation or redirect LibationFiles
+                var logPath = Path.Combine(LibationFiles, "Log.log");
+                bool settingWasChanged = SetWithJsonPath("Serilog.WriteTo[1].Args", "path", logPath, true);
+                if (settingWasChanged)
+                    configuration?.Reload();
+
+                return libationFilesPathCache;
+            }
+        }
+
+        private static string libationFilesPathCache;
+
+        private string getLiberationFilesSettingFromJson()
+        {
+            string startingContents = null;
+            try
+            {
+                if (File.Exists(APPSETTINGS_JSON))
+                {
+                    startingContents = File.ReadAllText(APPSETTINGS_JSON);
+                    var startingJObj = JObject.Parse(startingContents);
+
+                    if (startingJObj.ContainsKey(LIBATION_FILES_KEY))
+                    {
+                        var startingValue = startingJObj[LIBATION_FILES_KEY].Value<string>();
+                        if (!string.IsNullOrWhiteSpace(startingValue))
+                            return startingValue;
+                    }
+                }
+            }
+            catch { }
+
+            // not found. write to file. read from file
+            var endingContents = new JObject { { LIBATION_FILES_KEY, UserProfile } }.ToString(Formatting.Indented);
+            if (startingContents != endingContents)
+            {
+                File.WriteAllText(APPSETTINGS_JSON, endingContents);
                 System.Threading.Thread.Sleep(100);
-                if (!Directory.EnumerateDirectories(AppDir).Any() && !Directory.EnumerateFiles(AppDir).Any())
-                    Directory.Delete(AppDir);
             }
 
+            // do not check whether directory exists. special/meta directory (eg: AppDir) is valid
+            // verify from live file. no try/catch. want failures to be visible
+            var jObjFinal = JObject.Parse(File.ReadAllText(APPSETTINGS_JSON));
+            var valueFinal = jObjFinal[LIBATION_FILES_KEY].Value<string>();
+            return valueFinal;
+        }
 
+        public void SetLibationFiles(string directory)
+        {
             libationFilesPathCache = null;
 
+            var startingContents = File.ReadAllText(APPSETTINGS_JSON);
+            var jObj = JObject.Parse(startingContents);
 
-            var contents = File.ReadAllText(APPSETTINGS_JSON);
-            var jObj = JObject.Parse(contents);
+            jObj[LIBATION_FILES_KEY] = directory;
 
-            jObj[LIBATION_FILES] = directory;
+            var endingContents = JsonConvert.SerializeObject(jObj, Formatting.Indented);
+            if (startingContents == endingContents)
+                return;
 
-            var output = JsonConvert.SerializeObject(jObj, Formatting.Indented);
-            File.WriteAllText(APPSETTINGS_JSON, output);
+            // now it's set in the file again but no settings have moved yet
+            File.WriteAllText(APPSETTINGS_JSON, endingContents);
 
-
-            return true;
+            try
+            {
+                Log.Logger.Information("Libation files changed {@DebugInfo}", new { APPSETTINGS_JSON, LIBATION_FILES_KEY, directory });
+            }
+            catch { }
         }
+        #endregion
     }
 }

FileManager/FileManager.csproj

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

FileManager/FilePathCache.cs

@@ -9,6 +9,7 @@ namespace FileManager
 {
 	public static class FilePathCache
     {
+		private const string FILENAME = "FileLocations.json";
         internal class CacheEntry
         {
             public string Id { get; set; }
@@ -16,16 +17,16 @@ namespace FileManager
             public string Path { get; set; }
         }
 
-        static Cache<CacheEntry> cache { get; } = new Cache<CacheEntry>();
+		private static Cache<CacheEntry> cache { get; } = new Cache<CacheEntry>();
 
-        public static string JsonFile => Path.Combine(Configuration.Instance.LibationFiles, "FilePaths.json");
+		private static string jsonFile => Path.Combine(Configuration.Instance.LibationFiles, FILENAME);
 
         static FilePathCache()
         {
 			// load json into memory. if file doesn't exist, nothing to do. save() will create if needed
-			if (File.Exists(JsonFile))
+			if (File.Exists(jsonFile))
 			{
-				var list = JsonConvert.DeserializeObject<List<CacheEntry>>(File.ReadAllText(JsonFile));
+				var list = JsonConvert.DeserializeObject<List<CacheEntry>>(File.ReadAllText(jsonFile));
 				cache = new Cache<CacheEntry>(list);
 			}
         }
@@ -74,7 +75,7 @@ namespace FileManager
 		private static void save()
 		{
 			// create json if not exists
-			static void resave() => File.WriteAllText(JsonFile, JsonConvert.SerializeObject(cache.ToList(), Formatting.Indented));
+			static void resave() => File.WriteAllText(jsonFile, JsonConvert.SerializeObject(cache.ToList(), Formatting.Indented));
 
 			lock (locker)
 			{
@@ -84,7 +85,7 @@ namespace FileManager
 					try { resave(); }
 					catch (IOException ex)
 					{
-						Serilog.Log.Logger.Error(ex, "Error saving FilePaths.json");
+						Serilog.Log.Logger.Error(ex, $"Error saving {FILENAME}");
 						throw;
 					}
 				}

FileManager/PersistentDictionary.cs

@@ -10,14 +10,16 @@ namespace FileManager
     public class PersistentDictionary
     {
         public string Filepath { get; }
+        public bool IsReadOnly { get; }
 
         // optimize for strings. expectation is most settings will be strings and a rare exception will be something else
         private Dictionary<string, string> stringCache { get; } = new Dictionary<string, string>();
         private Dictionary<string, object> objectCache { get; } = new Dictionary<string, object>();
 
-        public PersistentDictionary(string filepath)
+        public PersistentDictionary(string filepath, bool isReadOnly = false)
         {
             Filepath = filepath;
+            IsReadOnly = isReadOnly;
 
             if (File.Exists(Filepath))
                 return;
@@ -25,6 +27,9 @@ namespace FileManager
             // will create any missing directories, incl subdirectories. if all already exist: no action
             Directory.CreateDirectory(Path.GetDirectoryName(filepath));
 
+            if (IsReadOnly)
+                return;
+
             File.WriteAllText(Filepath, "{}");
             System.Threading.Thread.Sleep(100);
         }
@@ -34,18 +39,20 @@ namespace FileManager
             if (!stringCache.ContainsKey(propertyName))
             {
                 var jObject = readFile();
-                stringCache[propertyName] = jObject.ContainsKey(propertyName) ? jObject[propertyName].Value<string>() : null;
+                if (!jObject.ContainsKey(propertyName))
+                    return null;
+                stringCache[propertyName] = jObject[propertyName].Value<string>();
             }
 
             return stringCache[propertyName];
         }
 
-        public T Get<T>(string propertyName)
+        public T GetNonString<T>(string propertyName)
         {
-            var o = GetObject(propertyName);
-            if (o is null) return default;
-            if (o is JToken jt) return jt.Value<T>();
-            return (T)o;
+            var obj = GetObject(propertyName);
+            if (obj is null) return default;
+            if (obj is JToken jToken) return jToken.Value<T>();
+            return (T)obj;
         }
 
         public object GetObject(string propertyName)
@@ -53,17 +60,43 @@ namespace FileManager
             if (!objectCache.ContainsKey(propertyName))
             {
                 var jObject = readFile();
-                objectCache[propertyName] = jObject.ContainsKey(propertyName) ? jObject[propertyName].Value<object>() : null;
+                if (!jObject.ContainsKey(propertyName))
+                    return null;
+                objectCache[propertyName] = jObject[propertyName].Value<object>();
             }
 
             return objectCache[propertyName];
         }
 
+        public string GetStringFromJsonPath(string jsonPath, string propertyName) => GetStringFromJsonPath($"{jsonPath}.{propertyName}");
+        public string GetStringFromJsonPath(string jsonPath)
+        {
+            if (!stringCache.ContainsKey(jsonPath))
+            {
+                try
+                {
+                    var jObject = readFile();
+                    var token = jObject.SelectToken(jsonPath);
+                    if (token is null)
+                        return null;
+                    stringCache[jsonPath] = (string)token;
+                }
+                catch
+                {
+                    return null;
+                }
+            }
+
+            return stringCache[jsonPath];
+        }
+
+        public bool Exists(string propertyName) => readFile().ContainsKey(propertyName);
+
         private object locker { get; } = new object();
-        public void Set(string propertyName, string newValue)
+        public void SetString(string propertyName, string newValue)
         {
             // only do this check in string cache, NOT object cache
-            if (stringCache[propertyName] == newValue)
+            if (stringCache.ContainsKey(propertyName) && stringCache[propertyName] == newValue)
                 return;
 
             // set cache
@@ -72,7 +105,7 @@ namespace FileManager
             writeFile(propertyName, newValue);
         }
 
-        public void Set(string propertyName, object newValue)
+        public void SetNonString(string propertyName, object newValue)
         {
             // set cache
             objectCache[propertyName] = newValue;
@@ -83,42 +116,92 @@ namespace FileManager
 
         private void writeFile(string propertyName, JToken newValue)
         {
-            try
-            {
-                var str = newValue?.ToString();
-                var formattedValue
-                    = str is null ? "[null]"
-                    : string.IsNullOrEmpty(str) ? "[empty]"
-                    : string.IsNullOrWhiteSpace(str) ? $"[whitespace. Length={str.Length}]"
-                    : str.Length > 100 ? $"[Length={str.Length}] {str[0..50]}...{str[^50..^0]}"
-                    : str;
-                Serilog.Log.Logger.Information($"Config changed. {propertyName}={formattedValue}");
-            }
-            catch { }
+            if (IsReadOnly)
+                return;
 
             // write new setting to file
             lock (locker)
             {
                 var jObject = readFile();
+                var startContents = JsonConvert.SerializeObject(jObject, Formatting.Indented);
+
                 jObject[propertyName] = newValue;
-                File.WriteAllText(Filepath, JsonConvert.SerializeObject(jObject, Formatting.Indented));
-            }
-        }
+                var endContents = JsonConvert.SerializeObject(jObject, Formatting.Indented);
 
-        // special case: no caching. no logging
-        public void SetWithJsonPath(string jsonPath, string propertyName, string newValue)
-        {
-            lock (locker)
+                if (startContents == endContents)
+                    return;
+                
+                File.WriteAllText(Filepath, endContents);
+            }
+
+            try
             {
-                var jObject = readFile();
-                var token = jObject.SelectToken(jsonPath);
-                var debug_oldValue = (string)token[propertyName];
-
-                token[propertyName] = newValue;
-                File.WriteAllText(Filepath, JsonConvert.SerializeObject(jObject, Formatting.Indented));
+                var str = formatValueForLog(newValue?.ToString());
+                Serilog.Log.Logger.Information("Config changed. {@DebugInfo}", new { propertyName, newValue = str });
             }
+            catch { }
         }
 
+        /// <summary>WILL ONLY set if already present. WILL NOT create new</summary>
+        /// <returns>Value was changed</returns>
+        public bool SetWithJsonPath(string jsonPath, string propertyName, string newValue, bool suppressLogging = false)
+        {
+            if (IsReadOnly)
+                return false;
+
+            var path = $"{jsonPath}.{propertyName}";
+
+            {
+                // only do this check in string cache, NOT object cache
+                if (stringCache.ContainsKey(path) && stringCache[path] == newValue)
+                    return false;
+
+                // set cache
+                stringCache[path] = newValue;
+            }
+
+            try
+            {
+                lock (locker)
+                {
+                    var jObject = readFile();
+                    var token = jObject.SelectToken(jsonPath);
+                    if (token is null || token[propertyName] is null)
+                        return false;
+
+                    var oldValue = token.Value<string>(propertyName);
+                    if (oldValue == newValue)
+                        return false;
+
+                    token[propertyName] = newValue;
+                    File.WriteAllText(Filepath, JsonConvert.SerializeObject(jObject, Formatting.Indented));
+                }
+            }
+            catch (Exception exDebug)
+            {
+                return false;
+            }
+
+            if (!suppressLogging)
+            {
+                try
+                {
+                    var str = formatValueForLog(newValue?.ToString());
+                    Serilog.Log.Logger.Information("Config changed. {@DebugInfo}", new { jsonPath, propertyName, newValue = str });
+                }
+                catch { }
+            }
+
+            return true;
+        }
+
+        private static string formatValueForLog(string value)
+            => value is null ? "[null]"
+            : string.IsNullOrEmpty(value) ? "[empty]"
+            : string.IsNullOrWhiteSpace(value) ? $"[whitespace. Length={value.Length}]"
+            : value.Length > 100 ? $"[Length={value.Length}] {value[0..50]}...{value[^50..^0]}"
+            : value;
+
         private JObject readFile()
         {
             var settingsJsonContents = File.ReadAllText(Filepath);

FileManager/PictureStorage.cs

@@ -1,12 +1,19 @@
 using System;
+using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Net.Http;
+using System.Threading.Tasks;
 
 namespace FileManager
 {
-	public enum PictureSize { _80x80, _300x300, _500x500 }
+	public enum PictureSize { _80x80 = 80, _300x300 = 300, _500x500 = 500 }
+	public class PictureCachedEventArgs : EventArgs
+	{
+		public PictureDefinition Definition { get; internal set; }
+		public byte[] Picture { get; internal set; }
+	}
 	public struct PictureDefinition
 	{
 		public string PictureId { get; }
@@ -27,34 +34,60 @@ namespace FileManager
 		private static string getPath(PictureDefinition def)
 			=> Path.Combine(ImagesDirectory, $"{def.PictureId}{def.Size}.jpg");
 
-		private static System.Timers.Timer timer { get; }
 		static PictureStorage()
 		{
-			timer = new System.Timers.Timer(700)
-			{
-				AutoReset = true,
-				Enabled = true
-			};
-			timer.Elapsed += (_, __) => timerDownload();
+			new Task(BackgroundDownloader, TaskCreationOptions.LongRunning)
+			.Start();
 		}
 
-		public static event EventHandler<string> PictureCached;
+		public static event EventHandler<PictureCachedEventArgs> PictureCached;
 
+		private static BlockingCollection<PictureDefinition> DownloadQueue { get; } = new BlockingCollection<PictureDefinition>();
 		private static Dictionary<PictureDefinition, byte[]> cache { get; } = new Dictionary<PictureDefinition, byte[]>();
+		private static Dictionary<PictureSize, byte[]> defaultImages { get; } = new Dictionary<PictureSize, byte[]>();
 		public static (bool isDefault, byte[] bytes) GetPicture(PictureDefinition def)
 		{
-			if (!cache.ContainsKey(def))
+			lock (cache)
 			{
+				if (cache.ContainsKey(def))
+					return (false, cache[def]);
+
 				var path = getPath(def);
-				cache[def]
-					= File.Exists(path)
-					? File.ReadAllBytes(path)
-					: null;
+
+				if (File.Exists(path))
+				{
+					cache[def] = File.ReadAllBytes(path);
+					return (false, cache[def]);
+				}
+
+				DownloadQueue.Add(def);
+				return (true, getDefaultImage(def.Size));
+			}
+		}
+
+		public static byte[] GetPictureSynchronously(PictureDefinition def)
+		{
+			lock (cache)
+			{
+				if (!cache.ContainsKey(def) || cache[def] == null)
+				{
+					var path = getPath(def);
+					byte[] bytes;
+
+					if (File.Exists(path))
+						bytes = File.ReadAllBytes(path);
+					else
+					{
+						bytes = downloadBytes(def);
+						saveFile(def, bytes);
+					}
+
+					cache[def] = bytes;
+				}
+				return cache[def];
 			}
-			return (cache[def] == null, cache[def] ?? getDefaultImage(def.Size));
 		}
 
-		private static Dictionary<PictureSize, byte[]> defaultImages { get; } = new Dictionary<PictureSize, byte[]>();
 		public static void SetDefaultImage(PictureSize pictureSize, byte[] bytes)
 			=> defaultImages[pictureSize] = bytes;
 		private static byte[] getDefaultImage(PictureSize size)
@@ -62,45 +95,26 @@ namespace FileManager
 			? defaultImages[size]
 			: new byte[0];
 
-		// necessary to avoid IO errors. ReadAllBytes and WriteAllBytes can conflict in some cases, esp when debugging
-		private static bool isProcessing;
-		private static void timerDownload()
+		static void BackgroundDownloader()
 		{
-			// must live outside try-catch, else 'finally' can reset another thread's lock
-			if (isProcessing)
-				return;
-
-			try
+			while (!DownloadQueue.IsCompleted)
 			{
-				isProcessing = true;
-
-				var def = cache
-					.Where(kvp => kvp.Value is null)
-					.Select(kvp => kvp.Key)
-					// 80x80 should be 1st since it's enum value == 0
-					.OrderBy(d => d.PictureId)
-					.FirstOrDefault();
-
-				// no more null entries. all requsted images are cached
-				if (string.IsNullOrWhiteSpace(def.PictureId))
-					return;
+				if (!DownloadQueue.TryTake(out var def, System.Threading.Timeout.InfiniteTimeSpan))
+					continue;
 
 				var bytes = downloadBytes(def);
 				saveFile(def, bytes);
-				cache[def] = bytes;
+				lock (cache)
+					cache[def] = bytes;
 
-				PictureCached?.Invoke(nameof(PictureStorage), def.PictureId);
-			}
-			finally
-			{
-				isProcessing = false;
+				PictureCached?.Invoke(nameof(PictureStorage), new PictureCachedEventArgs { Definition = def, Picture = bytes });
 			}
 		}
 
 		private static HttpClient imageDownloadClient { get; } = new HttpClient();
 		private static byte[] downloadBytes(PictureDefinition def)
 		{
-			var sz = def.Size.ToString().Split('x')[1];
+			var sz = (int)def.Size;
 			return imageDownloadClient.GetByteArrayAsync("ht" + $"tps://images-na.ssl-images-amazon.com/images/I/{def.PictureId}._SL{sz}_.jpg").Result;
 		}
 
@@ -110,4 +124,4 @@ namespace FileManager
 			File.WriteAllBytes(path, bytes);
 		}
 	}
-}
+}