update version

Added support for downloaded chapter titles.

.gitignore

@@ -328,3 +328,8 @@ ASALocalRun/
 
 # MFractors (Xamarin productivity tool) working folder 
 .mfractor/
+
+
+# manually ignored files
+/__TODO.txt
+/DataLayer/LibationContext.db

AaxDecrypter/AAXChapters.cs

@@ -0,0 +1,40 @@
+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

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.1</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

AaxDecrypter/AaxToM4bConverter.cs

@@ -62,9 +62,10 @@ namespace AaxDecrypter
         public Tags tags { get; private set; }
         public EncodingInfo encodingInfo { get; private set; }
 
-        public static async Task<AaxToM4bConverter> CreateAsync(string inputFile, string decryptKey)
+        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();
 
@@ -72,8 +73,9 @@ namespace AaxDecrypter
         }
         private AaxToM4bConverter(string inputFile, string decryptKey)
         {
-            if (string.IsNullOrWhiteSpace(inputFile)) throw new ArgumentNullException(nameof(inputFile), "Input file may not be null or whitespace");
-            if (!File.Exists(inputFile)) throw new ArgumentNullException(nameof(inputFile), "File does not exist");
+			ArgumentValidator.EnsureNotNullOrWhiteSpace(inputFile, nameof(inputFile));
+            if (!File.Exists(inputFile))
+                throw new ArgumentNullException(nameof(inputFile), "File does not exist");
 
             steps = new StepSequence
             {
@@ -89,53 +91,43 @@ namespace AaxDecrypter
                 ["End: Create Nfo"] = End_CreateNfo
             };
 
-            this.inputFileName = inputFile;
+            inputFileName = inputFile;
             this.decryptKey = decryptKey;
         }
 
         private async Task prelimProcessing()
         {
-            this.tags = new Tags(this.inputFileName);
-            this.encodingInfo = new EncodingInfo(this.inputFileName);
-            this.chapters = new Chapters(this.inputFileName, this.tags.duration.TotalSeconds);
+            tags = new Tags(inputFileName);
+            encodingInfo = new EncodingInfo(inputFileName);
 
             var defaultFilename = Path.Combine(
-                Path.GetDirectoryName(this.inputFileName),
-                getASCIITag(this.tags.author),
-                getASCIITag(this.tags.title) + ".m4b"
+                Path.GetDirectoryName(inputFileName),
+                PathLib.ToPathSafeString(tags.author),
+                PathLib.ToPathSafeString(tags.title) + ".m4b"
                 );
-            SetOutputFilename(defaultFilename);
+
+			// set default name
+			SetOutputFilename(defaultFilename);
 
             await Task.Run(() => saveCover(inputFileName));
         }
-        private string getASCIITag(string property)
-        {
-            foreach (char ch in new string(Path.GetInvalidFileNameChars()) + new string(Path.GetInvalidPathChars()))
-                property = property.Replace(ch.ToString(), "");
-            return property;
-        }
 
         private void saveCover(string aaxFile)
         {
 			using var file = TagLib.File.Create(aaxFile, "audio/mp4", TagLib.ReadStyle.Average);
-			this.coverBytes = file.Tag.Pictures[0].Data.Data;
+			coverBytes = file.Tag.Pictures[0].Data.Data;
 		}
 
         private void printPrelim()
         {
-            Console.WriteLine("Audible Book ID = " + tags.id);
+            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");
+            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()
@@ -156,21 +148,19 @@ namespace AaxDecrypter
 
         public void SetOutputFilename(string outFileName)
         {
-            this.outputFileName = outFileName;
+            outputFileName = PathLib.ReplaceExtension(outFileName, ".m4b");
+            outDir = Path.GetDirectoryName(outputFileName);
 
-            if (Path.GetExtension(this.outputFileName) != ".m4b")
-                this.outputFileName = outputFileWithNewExt(".m4b");
-
-            this.outDir = Path.GetDirectoryName(this.outputFileName);
+            if (File.Exists(outputFileName))
+                File.Delete(outputFileName);
         }
 
-        private string outputFileWithNewExt(string extension)
-            => Path.Combine(this.outDir, Path.GetFileNameWithoutExtension(this.outputFileName) + '.' + extension.Trim('.'));
+        private string outputFileWithNewExt(string extension) => PathLib.ReplaceExtension(outputFileName, extension);
 
         public bool Step1_CreateDir()
         {
-            ProcessRunner.WorkingDir = this.outDir;
-            Directory.CreateDirectory(this.outDir);
+            ProcessRunner.WorkingDir = outDir;
+            Directory.CreateDirectory(outDir);
             return true;
         }
 
@@ -178,7 +168,7 @@ namespace AaxDecrypter
         {
             DecryptProgressUpdate?.Invoke(this, 0);
 
-            var tempRipFile = Path.Combine(this.outDir, "funny.aac");
+            var tempRipFile = Path.Combine(outDir, "funny.aac");
 
             var fail = "WARNING-Decrypt failure. ";
 
@@ -193,7 +183,7 @@ namespace AaxDecrypter
                 if (returnCode == -99)
                 {
                     Console.WriteLine($"{fail}Incorrect decrypt key: {decryptKey}");
-                    this.decryptKey = null;
+                    decryptKey = null;
                     returnCode = getKey_decrypt(tempRipFile);
                 }
             }
@@ -232,7 +222,7 @@ namespace AaxDecrypter
 
             Console.WriteLine("Cracking activation bytes");
             var activation_bytes = BytesCracker.GetActivationBytes(checksum);
-            this.decryptKey = activation_bytes;
+            decryptKey = activation_bytes;
             Console.WriteLine("Activation bytes cracked. Decrypt key: " + activation_bytes);
         }
 
@@ -243,10 +233,10 @@ namespace AaxDecrypter
             Console.WriteLine("Decrypting with key " + decryptKey);
 
             var returnCode = 100;
-            var thread = new Thread(() => returnCode = this.ngDecrypt());
+            var thread = new Thread(() => returnCode = ngDecrypt());
             thread.Start();
 
-            double fileLen = new FileInfo(this.inputFileName).Length;
+            double fileLen = new FileInfo(inputFileName).Length;
             while (thread.IsAlive && returnCode == 100)
             {
                 Thread.Sleep(500);
@@ -266,34 +256,35 @@ namespace AaxDecrypter
             var info = new ProcessStartInfo
             {
                 FileName = DecryptSupportLibraries.mp4trackdumpPath,
-                Arguments = "-c " + this.encodingInfo.channels + " -r " + this.encodingInfo.sampleRate + " \"" + this.inputFileName + "\""
+                Arguments = "-c " + encodingInfo.channels + " -r " + encodingInfo.sampleRate + " \"" + inputFileName + "\""
             };
             info.EnvironmentVariables["VARIABLE"] = decryptKey;
 
-            var (output, exitCode) = info.RunHidden();
+            var result = info.RunHidden();
 
             // bad checksum -- bad decrypt key
-            if (output.Contains("checksums mismatch, aborting!"))
+            if (result.Output.Contains("checksums mismatch, aborting!"))
                 return -99;
 
-            return exitCode;
+            return result.ExitCode;
         }
 
-        // temp file names for steps 3, 4, 5
-        string tempChapsPath => Path.Combine(this.outDir, "tempChaps.mp4");
+		// 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()
         {
-            string str1 = "";
-            if (this.chapters.FirstChapterStart != 0.0)
+            var str1 = "";
+            if (chapters.FirstChapter.StartTime != 0.0)
             {
-                str1 = " -ss " + this.chapters.FirstChapterStart.ToString("0.000", CultureInfo.InvariantCulture) + " -t " + (this.chapters.LastChapterStart - 1.0).ToString("0.000", CultureInfo.InvariantCulture) + " ";
+                str1 = " -ss " + chapters.FirstChapter.StartTime.ToString("0.000", CultureInfo.InvariantCulture) + " -t " + chapters.LastChapter.EndTime.ToString("0.000", CultureInfo.InvariantCulture) + " ";
             }
 
-            string ffmpegTags = this.tags.GenerateFfmpegTags();
-            string ffmpegChapters = this.chapters.GenerateFfmpegChapters();
+            var ffmpegTags = tags.GenerateFfmpegTags();
+            var ffmpegChapters = chapters.GenerateFfmpegChapters();
             File.WriteAllText(ff_txt_file, ffmpegTags + ffmpegChapters);
 
             var tagAndChapterInfo = new ProcessStartInfo
@@ -309,8 +300,8 @@ namespace AaxDecrypter
         public bool Step4_InsertCoverArt()
         {
             // save cover image as temp file
-            var coverPath = Path.Combine(this.outDir, "cover-" + Guid.NewGuid() + ".jpg");
-            FileExt.CreateFile(coverPath, this.coverBytes);
+            var coverPath = Path.Combine(outDir, "cover-" + Guid.NewGuid() + ".jpg");
+            FileExt.CreateFile(coverPath, coverBytes);
 
             var insertCoverArtInfo = new ProcessStartInfo
             {
@@ -329,26 +320,26 @@ namespace AaxDecrypter
         {
             FileExt.SafeDelete(mp4_file);
             FileExt.SafeDelete(ff_txt_file);
-            FileExt.SafeMove(tempChapsPath, this.outputFileName);
+            FileExt.SafeMove(tempChapsPath, outputFileName);
 
             return true;
         }
 
         public bool Step6_AddTags()
         {
-            this.tags.AddAppleTags(this.outputFileName);
+            tags.AddAppleTags(outputFileName);
             return true;
         }
 
         public bool End_CreateCue()
         {
-            File.WriteAllText(outputFileWithNewExt(".cue"), this.chapters.GetCuefromChapters(Path.GetFileName(this.outputFileName)));
+            File.WriteAllText(outputFileWithNewExt(".cue"), Cue.CreateContents(Path.GetFileName(outputFileName), chapters));
             return true;
         }
 
         public bool End_CreateNfo()
         {
-            File.WriteAllText(outputFileWithNewExt(".nfo"), NFO.CreateNfoContents(AppName, this.tags, this.encodingInfo, this.chapters));
+            File.WriteAllText(outputFileWithNewExt(".nfo"), NFO.CreateContents(AppName, tags, encodingInfo, chapters));
             return true;
         }
     }

AaxDecrypter/BytesCracker.cs

@@ -21,8 +21,7 @@ namespace AaxDecrypter
             };
 
             // checksum is in the debug info. ffprobe's debug info is written to stderr, not stdout
-            var readErrorOutput = true;
-            var ffprobeStderr = info.RunHidden(readErrorOutput).Output;
+            var ffprobeStderr = info.RunHidden().Error;
 
             // example checksum line:
             // ... [aax] file checksum == 0c527840c4f18517157eb0b4f9d6f9317ce60cd1

AaxDecrypter/Chapter.cs

@@ -0,0 +1,27 @@
+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

@@ -0,0 +1,40 @@
+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

@@ -0,0 +1,60 @@
+using System;
+using System.IO;
+using System.Linq;
+using System.Text;
+using Dinah.Core;
+
+namespace AaxDecrypter
+{
+    public static class Cue
+    {
+        public static string CreateContents(string filePath, Chapters chapters)
+        {
+            var stringBuilder = new StringBuilder();
+
+            stringBuilder.AppendLine(GetFileLine(filePath, "MP3"));
+
+            var trackCount = 0;
+            foreach (Chapter c in chapters.ChapterList)
+            {
+                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}");
+            }
+
+            return stringBuilder.ToString();
+        }
+
+        public static void UpdateFileName(FileInfo cueFileInfo, string audioFilePath)
+            => UpdateFileName(cueFileInfo.FullName, audioFilePath);
+
+        public static void UpdateFileName(string cueFilePath, FileInfo audioFileInfo)
+            => UpdateFileName(cueFilePath, audioFileInfo.FullName);
+
+        public static void UpdateFileName(FileInfo cueFileInfo, FileInfo audioFileInfo)
+            => UpdateFileName(cueFileInfo.FullName, audioFileInfo.FullName);
+
+        public static void UpdateFileName(string cueFilePath, string audioFilePath)
+        {
+            var cueContents = File.ReadAllLines(cueFilePath);
+
+            for (var i = 0; i < cueContents.Length; i++)
+            {
+                var line = cueContents[i];
+                if (!line.Trim().StartsWith("FILE") || !line.Contains(" "))
+                    continue;
+
+                var fileTypeBegins = line.LastIndexOf(" ") + 1;
+                cueContents[i] = GetFileLine(audioFilePath, line[fileTypeBegins..]);
+                break;
+            }
+
+            File.WriteAllLines(cueFilePath, cueContents);
+        }
+
+        private static string GetFileLine(string filePath, string audioType) => $"FILE {Path.GetFileName(filePath).SurroundWithQuotes()} {audioType}";
+    }
+}

AaxDecrypter/NFO.cs

@@ -0,0 +1,54 @@
+namespace AaxDecrypter
+{
+    public static class NFO
+    {
+        public static string CreateContents(string ripper, Tags tags, EncodingInfo encodingInfo, Chapters chapters)
+        {
+            var _hours = (int)tags.duration.TotalHours;
+            var myDuration
+                = (_hours > 0 ? _hours + " hours, " : "")
+                + tags.duration.Minutes + " minutes, "
+                + tags.duration.Seconds + " seconds";
+
+            var header
+                = "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"
+                + $" 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"
+                + " 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"
+                + "\r\n"
+                + $" Ripper:                 {ripper}\r\n"
+                + "\r\n"
+                + "\r\n"
+                + "Book Description\r\n"
+                + "================\r\n"
+                + tags.comments;
+
+            return s;
+        }
+    }
+}

AaxDecrypter/Tags.cs

@@ -0,0 +1,67 @@
+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";
+    }
+}

AaxDecrypter/UNTESTED/Chapters.cs

@@ -1,95 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Globalization;
-using System.Linq;
-using System.Text;
-using Dinah.Core.Diagnostics;
-
-namespace AaxDecrypter
-{
-    public class Chapters
-    {
-        private List<double> markers { get; }
-
-        public double FirstChapterStart => markers[0];
-        public double LastChapterStart => markers[markers.Count - 1];
-
-        public Chapters(string file, double totalTime)
-        {
-            this.markers = getAAXChapters(file);
-
-            // add end time
-            this.markers.Add(totalTime);
-        }
-
-        private static List<double> getAAXChapters(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 chapters = xmlDocument.SelectNodes("/ffprobe/chapters/chapter")
-                .Cast<System.Xml.XmlNode>()
-                .Select(xmlNode => double.Parse(xmlNode.Attributes["start_time"].Value.Replace(",", "."), CultureInfo.InvariantCulture))
-                .ToList();
-            return chapters;
-        }
-
-        // subtract 1 b/c end time marker is a real entry but isn't a real chapter
-        public int Count() => this.markers.Count - 1;
-
-        public string GetCuefromChapters(string fileName)
-        {
-            var stringBuilder = new StringBuilder();
-            if (fileName != "")
-            {
-                stringBuilder.Append("FILE \"" + fileName + "\" MP4\n");
-            }
-
-            for (var i = 0; i < Count(); i++)
-            {
-                var chapter = i + 1;
-
-                var timeSpan = TimeSpan.FromSeconds(this.markers[i]);
-                var minutes = Math.Floor(timeSpan.TotalMinutes).ToString();
-                var seconds = timeSpan.Seconds.ToString("D2");
-                var milliseconds = (timeSpan.Milliseconds / 10).ToString("D2");
-                string str = minutes + ":" + seconds + ":" + milliseconds;
-
-                stringBuilder.Append("TRACK " + chapter + " AUDIO\n");
-                stringBuilder.Append("  TITLE \"Chapter " + chapter.ToString("D2") + "\"\n");
-                stringBuilder.Append("  INDEX 01 " + str + "\n");
-            }
-
-            return stringBuilder.ToString();
-        }
-
-        public string GenerateFfmpegChapters()
-        {
-            var stringBuilder = new StringBuilder();
-
-            for (var i = 0; i < Count(); i++)
-            {
-                var chapter = i + 1;
-
-                var start = this.markers[i] * 1000.0;
-                var end = this.markers[i + 1] * 1000.0;
-                var chapterName = chapter.ToString("D3");
-
-                stringBuilder.Append("[CHAPTER]\n");
-                stringBuilder.Append("TIMEBASE=1/1000\n");
-                stringBuilder.Append("START=" + start + "\n");
-                stringBuilder.Append("END=" + end + "\n");
-                stringBuilder.Append("title=" + chapterName + "\n");
-            }
-
-            return stringBuilder.ToString();
-        }
-    }
-}

AaxDecrypter/UNTESTED/NFO.cs

@@ -1,56 +0,0 @@
-namespace AaxDecrypter
-{
-    public static class NFO
-    {
-        public static string CreateNfoContents(string ripper, Tags tags, EncodingInfo encodingInfo, Chapters chapters)
-        {
-            int _hours = (int)tags.duration.TotalHours;
-            string myDuration
-                = (_hours > 0 ? _hours + " hours, " : "")
-                + tags.duration.Minutes + " minutes, "
-                + tags.duration.Seconds + " seconds";
-
-            string str4
-                = "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 != "")
-            {
-                str4 = str4 + " Genre:                  " + tags.genre + "\r\n";
-            }
-
-            string s
-                = str4
-                + " Publisher:              " + tags.publisher + "\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"
-                + " 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"
-                + "\r\n"
-                + " Ripper:                 " + ripper + "\r\n"
-                + "\r\n"
-                + "\r\n"
-                + "Book Description\r\n"
-                + "================\r\n"
-                + tags.comments;
-
-            return s;
-        }
-    }
-}

AaxDecrypter/UNTESTED/Tags.cs

@@ -1,74 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Globalization;
-using System.IO;
-using System.Text;
-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; }
-
-        public Tags(string file)
-        {
-			using TagLib.File tagLibFile = TagLib.File.Create(file, "audio/mp4", ReadStyle.Average);
-			this.title = tagLibFile.Tag.Title.Replace(" (Unabridged)", "");
-			this.album = tagLibFile.Tag.Album.Replace(" (Unabridged)", "");
-			this.author = tagLibFile.Tag.FirstPerformer;
-			this.year = tagLibFile.Tag.Year.ToString();
-			this.comments = tagLibFile.Tag.Comment;
-			this.duration = tagLibFile.Properties.Duration;
-			this.genre = tagLibFile.Tag.FirstGenre;
-
-			var tag = tagLibFile.GetTag(TagTypes.Apple, true);
-			this.publisher = tag.Publisher;
-			this.narrator = string.IsNullOrWhiteSpace(tagLibFile.Tag.FirstComposer) ? tag.Narrator : tagLibFile.Tag.FirstComposer;
-			this.comments = !string.IsNullOrWhiteSpace(tag.LongDescription) ? tag.LongDescription : tag.Description;
-			this.id = tag.AudibleCDEK;
-		}
-
-        public void AddAppleTags(string file)
-        {
-			using var file1 = TagLib.File.Create(file, "audio/mp4", ReadStyle.Average);
-			var tag = (AppleTag)file1.GetTag(TagTypes.Apple, true);
-			tag.Publisher = this.publisher;
-			tag.LongDescription = this.comments;
-			tag.Description = this.comments;
-			file1.Save();
-		}
-
-        public string GenerateFfmpegTags()
-        {
-            StringBuilder stringBuilder = new StringBuilder();
-
-            stringBuilder.Append(";FFMETADATA1\n");
-            stringBuilder.Append("major_brand=aax\n");
-            stringBuilder.Append("minor_version=1\n");
-            stringBuilder.Append("compatible_brands=aax M4B mp42isom\n");
-            stringBuilder.Append("date=" + this.year + "\n");
-            stringBuilder.Append("genre=" + this.genre + "\n");
-            stringBuilder.Append("title=" + this.title + "\n");
-            stringBuilder.Append("artist=" + this.author + "\n");
-            stringBuilder.Append("album=" + this.album + "\n");
-            stringBuilder.Append("composer=" + this.narrator + "\n");
-            stringBuilder.Append("comment=" + this.comments.Truncate(254) + "\n");
-            stringBuilder.Append("description=" + this.comments + "\n");
-
-            return stringBuilder.ToString();
-        }
-    }
-}

ApplicationServices/ApplicationServices.csproj

@@ -1,9 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.1</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
   </PropertyGroup>
 
+  <ItemGroup>
+    <PackageReference Include="CsvHelper" Version="27.0.2" />
+    <PackageReference Include="NPOI" Version="2.5.3" />
+  </ItemGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\..\audible api\AudibleApi\AudibleApiDTOs\AudibleApiDTOs.csproj" />
     <ProjectReference Include="..\..\audible api\AudibleApi\AudibleApi\AudibleApi.csproj" />

ApplicationServices/DbContexts.cs

@@ -0,0 +1,16 @@
+using System;
+using DataLayer;
+using FileManager;
+
+namespace ApplicationServices
+{
+	public static class DbContexts
+	{
+		//// idea for future command/query separation
+		// public static LibationContext GetCommandContext() { }
+		// public static LibationContext GetQueryContext() { }
+
+		public static LibationContext GetContext()
+			=> LibationContext.Create(SqliteStorage.ConnectionString);
+	}
+}

ApplicationServices/LibraryCommands.cs

@@ -0,0 +1,123 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using AudibleApi;
+using DataLayer;
+using Dinah.Core;
+using DtoImporterService;
+using InternalUtilities;
+using Serilog;
+
+namespace ApplicationServices
+{
+	public static class LibraryCommands
+	{
+		public static async Task<(int totalCount, int newCount)> ImportAccountAsync(Func<Account, ILoginCallback> loginCallbackFactoryFunc, params Account[] accounts)
+		{
+			if (accounts is null || accounts.Length == 0)
+				return (0, 0);
+
+			try
+			{
+				var importItems = await scanAccountsAsync(loginCallbackFactoryFunc, accounts);
+
+				var totalCount = importItems.Count;
+				Log.Logger.Information($"GetAllLibraryItems: Total count {totalCount}");
+
+				var newCount = await importIntoDbAsync(importItems);
+				Log.Logger.Information($"Import: New count {newCount}");
+
+				await Task.Run(() => SearchEngineCommands.FullReIndex());
+				Log.Logger.Information("FullReIndex: success");
+
+				return (totalCount, newCount);
+			}
+			catch (AudibleApi.Authentication.LoginFailedException lfEx)
+			{
+				lfEx.MoveResponseBodyFile(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 {
+					lfEx.RequestUrl,
+					ResponseStatusCodeNumber = (int)lfEx.ResponseStatusCode,
+					ResponseStatusCodeDesc = lfEx.ResponseStatusCode,
+					lfEx.ResponseInputFields,
+					lfEx.ResponseBodyFilePath
+				});
+				throw;
+			}
+			catch (Exception ex)
+			{
+				Log.Logger.Error(ex, "Error importing library");
+				throw;
+			}
+		}
+
+		private static async Task<List<ImportItem>> scanAccountsAsync(Func<Account, ILoginCallback> loginCallbackFactoryFunc, Account[] accounts)
+		{
+			var tasks = new List<Task<List<ImportItem>>>();
+			foreach (var account in accounts)
+			{
+				var callback = loginCallbackFactoryFunc(account);
+
+				// get APIs in serial, esp b/c of logins
+				var api = await AudibleApiActions.GetApiAsync(callback, account);
+
+				// add scanAccountAsync as a TASK: do not await
+				tasks.Add(scanAccountAsync(api, account));
+			}
+
+			// import library in parallel
+			var arrayOfLists = await Task.WhenAll(tasks);
+			var importItems = arrayOfLists.SelectMany(a => a).ToList();
+			return importItems;
+		}
+
+		private static async Task<List<ImportItem>> scanAccountAsync(Api api, Account account)
+		{
+			ArgumentValidator.EnsureNotNull(account, nameof(account));
+
+			Log.Logger.Information("ImportLibraryAsync. {@DebugInfo}", new
+			{
+				Account = account?.MaskedLogEntry ?? "[null]"
+			});
+
+			var dtoItems = await AudibleApiActions.GetLibraryValidatedAsync(api);
+			return dtoItems.Select(d => new ImportItem { DtoItem = d, AccountId = account.AccountId, LocaleName = account.Locale?.Name }).ToList();
+		}
+
+		private static async Task<int> importIntoDbAsync(List<ImportItem> importItems)
+		{
+			using var context = DbContexts.GetContext();
+			var libraryImporter = new LibraryImporter(context);
+			var newCount = await Task.Run(() => libraryImporter.Import(importItems));
+			context.SaveChanges();
+
+			return newCount;
+		}
+
+		public static int UpdateTags(this LibationContext context, Book book, string newTags)
+		{
+			try
+			{
+				book.UserDefinedItem.Tags = newTags;
+
+				var qtyChanges = context.SaveChanges();
+
+				if (qtyChanges > 0)
+					SearchEngineCommands.UpdateBookTags(book);
+
+				return qtyChanges;
+			}
+			catch (Exception ex)
+			{
+				Log.Logger.Error(ex, "Error updating tags");
+				throw;
+			}
+		}
+	}
+}

ApplicationServices/LibraryExporter.cs

@@ -0,0 +1,268 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using CsvHelper;
+using CsvHelper.Configuration.Attributes;
+using DataLayer;
+using NPOI.XSSF.UserModel;
+using Serilog;
+
+namespace ApplicationServices
+{
+	public class ExportDto
+	{
+		public static string GetName(string fieldName)
+		{
+			var property = typeof(ExportDto).GetProperty(fieldName);
+			var attribute = property.GetCustomAttributes(typeof(NameAttribute), true)[0];
+			var description = (NameAttribute)attribute;
+			var text = description.Names;
+			return text[0];
+		}
+
+		[Name("Account")]
+		public string Account { get; set; }
+
+		[Name("Date Added to library")]
+		public DateTime DateAdded { get; set; }
+
+		[Name("Audible Product Id")]
+		public string AudibleProductId { get; set; }
+
+		[Name("Locale")]
+		public string Locale { get; set; }
+
+		[Name("Title")]
+		public string Title { get; set; }
+
+		[Name("Authors")]
+		public string AuthorNames { get; set; }
+
+		[Name("Narrators")]
+		public string NarratorNames { get; set; }
+
+		[Name("Length In Minutes")]
+		public int LengthInMinutes { get; set; }
+
+		[Name("Publisher")]
+		public string Publisher { get; set; }
+
+		[Name("Pdf url")]
+		public string PdfUrl { get; set; }
+
+		[Name("Series Names")]
+		public string SeriesNames { get; set; }
+
+		[Name("Series Order")]
+		public string SeriesOrder { get; set; }
+
+		[Name("Community Rating: Overall")]
+		public float? CommunityRatingOverall { get; set; }
+
+		[Name("Community Rating: Performance")]
+		public float? CommunityRatingPerformance { get; set; }
+
+		[Name("Community Rating: Story")]
+		public float? CommunityRatingStory { get; set; }
+
+		[Name("Cover Id")]
+		public string PictureId { get; set; }
+
+		[Name("Is Abridged?")]
+		public bool IsAbridged { get; set; }
+
+		[Name("Date Published")]
+		public DateTime? DatePublished { get; set; }
+
+		[Name("Categories")]
+		public string CategoriesNames { get; set; }
+
+		[Name("My Rating: Overall")]
+		public float? MyRatingOverall { get; set; }
+
+		[Name("My Rating: Performance")]
+		public float? MyRatingPerformance { get; set; }
+
+		[Name("My Rating: Story")]
+		public float? MyRatingStory { get; set; }
+
+		[Name("My Libation Tags")]
+		public string MyLibationTags { get; set; }
+	}
+	public static class LibToDtos
+	{
+		public static List<ExportDto> ToDtos(this IEnumerable<LibraryBook> library)
+			=> library.Select(a => new ExportDto
+			{
+				Account = a.Account,
+				DateAdded = a.DateAdded,
+				AudibleProductId = a.Book.AudibleProductId,
+				Locale = a.Book.Locale,
+				Title = a.Book.Title,
+				AuthorNames = a.Book.AuthorNames,
+				NarratorNames = a.Book.NarratorNames,
+				LengthInMinutes = a.Book.LengthInMinutes,
+				Publisher = a.Book.Publisher,
+				PdfUrl = a.Book.Supplements?.FirstOrDefault()?.Url,
+				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,
+				CommunityRatingPerformance = a.Book.Rating?.PerformanceRating,
+				CommunityRatingStory = a.Book.Rating?.StoryRating,
+				PictureId = a.Book.PictureId,
+				IsAbridged = a.Book.IsAbridged,
+				DatePublished = a.Book.DatePublished,
+				CategoriesNames = a.Book.CategoriesNames.Any() ? a.Book.CategoriesNames.Aggregate((a, b) => $"{a}, {b}") : "",
+				MyRatingOverall = a.Book.UserDefinedItem.Rating.OverallRating,
+				MyRatingPerformance = a.Book.UserDefinedItem.Rating.PerformanceRating,
+				MyRatingStory = a.Book.UserDefinedItem.Rating.StoryRating,
+				MyLibationTags = a.Book.UserDefinedItem.Tags
+			}).ToList();
+	}
+	public static class LibraryExporter
+	{
+		public static void ToCsv(string saveFilePath)
+		{
+			using var context = DbContexts.GetContext();
+			var dtos = context.GetLibrary_Flat_NoTracking().ToDtos();
+
+			if (!dtos.Any())
+				return;
+
+			using var writer = new System.IO.StreamWriter(saveFilePath);
+			using var csv = new CsvWriter(writer, System.Globalization.CultureInfo.CurrentCulture);
+
+			csv.WriteHeader(typeof(ExportDto));
+			csv.NextRecord();
+			csv.WriteRecords(dtos);
+		}
+
+		public static void ToJson(string saveFilePath)
+		{
+			using var context = DbContexts.GetContext();
+			var dtos = context.GetLibrary_Flat_NoTracking().ToDtos();
+
+			var json = Newtonsoft.Json.JsonConvert.SerializeObject(dtos, Newtonsoft.Json.Formatting.Indented);
+			System.IO.File.WriteAllText(saveFilePath, json);
+		}
+
+		public static void ToXlsx(string saveFilePath)
+		{
+			using var context = DbContexts.GetContext();
+			var dtos = context.GetLibrary_Flat_NoTracking().ToDtos();
+
+			var workbook = new XSSFWorkbook();
+			var sheet = workbook.CreateSheet("Library");
+
+			var detailSubtotalFont = workbook.CreateFont();
+			detailSubtotalFont.IsBold = true;
+
+			var detailSubtotalCellStyle = workbook.CreateCellStyle();
+			detailSubtotalCellStyle.SetFont(detailSubtotalFont);
+
+			// headers
+			var rowIndex = 0;
+			var row = sheet.CreateRow(rowIndex);
+
+			var columns = new[] {
+				nameof (ExportDto.Account),
+				nameof (ExportDto.DateAdded),
+				nameof (ExportDto.AudibleProductId),
+				nameof (ExportDto.Locale),
+				nameof (ExportDto.Title),
+				nameof (ExportDto.AuthorNames),
+				nameof (ExportDto.NarratorNames),
+				nameof (ExportDto.LengthInMinutes),
+				nameof (ExportDto.Publisher),
+				nameof (ExportDto.PdfUrl),
+				nameof (ExportDto.SeriesNames),
+				nameof (ExportDto.SeriesOrder),
+				nameof (ExportDto.CommunityRatingOverall),
+				nameof (ExportDto.CommunityRatingPerformance),
+				nameof (ExportDto.CommunityRatingStory),
+				nameof (ExportDto.PictureId),
+				nameof (ExportDto.IsAbridged),
+				nameof (ExportDto.DatePublished),
+				nameof (ExportDto.CategoriesNames),
+				nameof (ExportDto.MyRatingOverall),
+				nameof (ExportDto.MyRatingPerformance),
+				nameof (ExportDto.MyRatingStory),
+				nameof (ExportDto.MyLibationTags)
+			};
+			var col = 0;
+			foreach (var c in columns)
+			{
+				var cell = row.CreateCell(col++);
+				var name = ExportDto.GetName(c);
+				cell.SetCellValue(name);
+				cell.CellStyle = detailSubtotalCellStyle;
+			}
+
+			var dateFormat = workbook.CreateDataFormat();
+			var dateStyle = workbook.CreateCellStyle();
+			dateStyle.DataFormat = dateFormat.GetFormat("MM/dd/yyyy HH:mm:ss");
+
+			rowIndex++;
+
+			// Add data rows
+			foreach (var dto in dtos)
+			{
+				col = 0;
+
+				row = sheet.CreateRow(rowIndex);
+
+				row.CreateCell(col++).SetCellValue(dto.Account);
+
+				var dateAddedCell = row.CreateCell(col++);
+				dateAddedCell.CellStyle = dateStyle;
+				dateAddedCell.SetCellValue(dto.DateAdded);
+
+				row.CreateCell(col++).SetCellValue(dto.AudibleProductId);
+				row.CreateCell(col++).SetCellValue(dto.Locale);
+				row.CreateCell(col++).SetCellValue(dto.Title);
+				row.CreateCell(col++).SetCellValue(dto.AuthorNames);
+				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.SeriesNames);
+				row.CreateCell(col++).SetCellValue(dto.SeriesOrder);
+
+				col = createCell(row, col, dto.CommunityRatingOverall);
+				col = createCell(row, col, dto.CommunityRatingPerformance);
+				col = createCell(row, col, dto.CommunityRatingStory);
+
+				row.CreateCell(col++).SetCellValue(dto.PictureId);
+				row.CreateCell(col++).SetCellValue(dto.IsAbridged);
+
+				var datePubCell = row.CreateCell(col++);
+				datePubCell.CellStyle = dateStyle;
+				if (dto.DatePublished.HasValue)
+					datePubCell.SetCellValue(dto.DatePublished.Value);
+				else
+					datePubCell.SetCellValue("");
+
+				row.CreateCell(col++).SetCellValue(dto.CategoriesNames);
+
+				col = createCell(row, col, dto.MyRatingOverall);
+				col = createCell(row, col, dto.MyRatingPerformance);
+				col = createCell(row, col, dto.MyRatingStory);
+
+				row.CreateCell(col++).SetCellValue(dto.MyLibationTags);
+
+				rowIndex++;
+			}
+
+			using var fileData = new System.IO.FileStream(saveFilePath, System.IO.FileMode.Create);
+			workbook.Write(fileData);
+		}
+		private static int createCell(NPOI.SS.UserModel.IRow row, int col, float? nullableFloat)
+		{
+			if (nullableFloat.HasValue)
+				row.CreateCell(col++).SetCellValue(nullableFloat.Value);
+			else
+				row.CreateCell(col++).SetCellValue("");
+			return col;
+		}
+	}
+}

ApplicationServices/SearchEngineCommands.cs

@@ -0,0 +1,56 @@
+using System;
+using System.IO;
+using DataLayer;
+using LibationSearchEngine;
+
+namespace ApplicationServices
+{
+	public static class SearchEngineCommands
+	{
+		public static void FullReIndex()
+		{
+			var engine = new SearchEngine(DbContexts.GetContext());
+			engine.CreateNewIndex();
+		}
+
+		public static SearchResultSet Search(string searchString) => performSearchEngineFunc_safe(e =>
+			e.Search(searchString)
+		);
+
+		public static void UpdateBookTags(Book book) => performSearchEngineAction_safe(e =>
+			e.UpdateTags(book.AudibleProductId, book.UserDefinedItem.Tags)
+		);
+
+		public static void UpdateIsLiberated(Book book) => performSearchEngineAction_safe(e =>
+			e.UpdateIsLiberated(book.AudibleProductId)
+		);
+
+		private static void performSearchEngineAction_safe(Action<SearchEngine> action)
+		{
+			var engine = new SearchEngine(DbContexts.GetContext());
+			try
+			{
+				action(engine);
+			}
+			catch (FileNotFoundException)
+			{
+				FullReIndex();
+				action(engine);
+			}
+		}
+
+		private static T performSearchEngineFunc_safe<T>(Func<SearchEngine, T> action)
+		{
+			var engine = new SearchEngine(DbContexts.GetContext());
+			try
+			{
+				return action(engine);
+			}
+			catch (FileNotFoundException)
+			{
+				FullReIndex();
+				return action(engine);
+			}
+		}
+	}
+}

ApplicationServices/UNTESTED/LibraryCommands.cs

@@ -1,40 +0,0 @@
-using System;
-using System.Threading.Tasks;
-using AudibleApi;
-using DataLayer;
-using DtoImporterService;
-using InternalUtilities;
-
-namespace ApplicationServices
-{
-	public static class LibraryCommands
-	{
-		public static async Task<(int totalCount, int newCount)> IndexLibraryAsync(ILoginCallback callback)
-		{
-			var audibleApiActions = new AudibleApiActions();
-			var items = await audibleApiActions.GetAllLibraryItemsAsync(callback);
-			var totalCount = items.Count;
-
-			var libImporter = new LibraryImporter();
-			var newCount = await Task.Run(() => libImporter.Import(items));
-
-			await Task.Run(() => SearchEngineCommands.FullReIndex());
-
-			return (totalCount, newCount);
-		}
-
-		public static int IndexChangedTags(Book book)
-		{
-			// update disconnected entity
-			using var context = LibationContext.Create();
-			context.Update(book);
-			var qtyChanges = context.SaveChanges();
-
-			// this part is tags-specific
-			if (qtyChanges > 0)
-				SearchEngineCommands.UpdateBookTags(book);
-
-			return qtyChanges;
-		}
-	}
-}

ApplicationServices/UNTESTED/SearchEngineCommands.cs

@@ -1,43 +0,0 @@
-using System.Threading.Tasks;
-using DataLayer;
-using LibationSearchEngine;
-
-namespace ApplicationServices
-{
-	public static class SearchEngineCommands
-	{
-		public static void FullReIndex()
-		{
-			var engine = new SearchEngine();
-			engine.CreateNewIndex();
-		}
-
-		public static SearchResultSet Search(string searchString)
-		{
-			var engine = new SearchEngine();
-			try
-			{
-				return engine.Search(searchString);
-			}
-			catch (System.IO.FileNotFoundException)
-			{
-				FullReIndex();
-				return engine.Search(searchString);
-			}
-		}
-
-		public static void UpdateBookTags(Book book)
-		{
-			var engine = new SearchEngine();
-			try
-			{
-				engine.UpdateTags(book.AudibleProductId, book.UserDefinedItem.Tags);
-			}
-			catch (System.IO.FileNotFoundException)
-			{
-				FullReIndex();
-				engine.UpdateTags(book.AudibleProductId, book.UserDefinedItem.Tags);
-			}
-		}
-	}
-}

DataLayer/DataLayer.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp3.0;netstandard2.1</TargetFrameworks>
+    <TargetFramework>net5.0</TargetFramework>
   </PropertyGroup>
 
   <PropertyGroup>
@@ -12,13 +12,12 @@
   </PropertyGroup>
   
   <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="3.0.0">
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="5.0.5">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="3.0.0" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="3.0.0" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="3.0.0">
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="5.0.5" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="5.0.5">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
@@ -32,7 +31,6 @@
   <ItemGroup>
     <None Update="appsettings.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
     </None>
   </ItemGroup>
 

DataLayer/EfClasses/Book.cs

@@ -26,6 +26,9 @@ namespace DataLayer
         public string Description { get; private set; }
         public int LengthInMinutes { get; private set; }
 
+        // immutable-ish. should be immutable. mutability is necessary for v3 => v4 upgrades
+        public string Locale { get; private set; }
+
         // mutable
         public string PictureId { get; set; }
 
@@ -61,12 +64,19 @@ namespace DataLayer
             string title,
             string description,
             int lengthInMinutes,
-            IEnumerable<Contributor> authors)
+			IEnumerable<Contributor> authors,
+			IEnumerable<Contributor> narrators,
+			Category category, string localeName)
         {
             // validate
             ArgumentValidator.EnsureNotNull(audibleProductId, nameof(audibleProductId));
             var productId = audibleProductId.Id;
             ArgumentValidator.EnsureNotNullOrWhiteSpace(productId, nameof(productId));
+
+			// assign as soon as possible. stuff below relies on this
+            AudibleProductId = productId;
+            Locale = localeName;
+
             ArgumentValidator.EnsureNotNullOrWhiteSpace(title, nameof(title));
 
             // non-ef-ctor init.s
@@ -75,24 +85,17 @@ namespace DataLayer
             _seriesLink = new HashSet<SeriesBook>();
             _supplements = new HashSet<Supplement>();
 
-            // since category/id is never null, nullity means it hasn't been loaded
-            CategoryId = Category.GetEmpty().CategoryId;
+			Category = category;
 
             // simple assigns
-            AudibleProductId = productId;
             Title = title;
             Description = description;
             LengthInMinutes = lengthInMinutes;
 
             // assigns with biz logic
             ReplaceAuthors(authors);
-            //ReplaceNarrators(narrators);
-
-            // import previously saved tags
-            // do this immediately. any save occurs before reloading tags will overwrite persistent tags with new blank entries; all old persisted tags will be lost
-            // if refactoring, DO NOT use "ProductId" before it's assigned to. to be safe, just use "productId"
-            UserDefinedItem = new UserDefinedItem(this) { Tags = FileManager.TagsPersistence.GetTags(productId) };
-        }
+            ReplaceNarrators(narrators);
+		}
 
         #region contributors, authors, narrators
         // use uninitialised backing fields - this means we can detect if the collection was loaded
@@ -124,16 +127,10 @@ namespace DataLayer
             ArgumentValidator.EnsureEnumerableNotNullOrEmpty(newContributors, nameof(newContributors));
 
             // the edge cases of doing local-loaded vs remote-only got weird. just load it
-            if (_contributorsLink == null)
-            {
-                ArgumentValidator.EnsureNotNull(context, nameof(context));
-                if (!context.Entry(this).IsKeySet)
-                    throw new InvalidOperationException("Could not add contributors");
+            if (_contributorsLink is null)
+				getEntry(context).Collection(s => s.ContributorsLink).Load();
 
-                context.Entry(this).Collection(s => s.ContributorsLink).Load();
-            }
-
-            var roleContributions = getContributions(role);
+			var roleContributions = getContributions(role);
             var isIdentical = roleContributions.Select(c => c.Contributor).SequenceEqual(newContributors);
             if (isIdentical)
                 return;
@@ -141,7 +138,8 @@ namespace DataLayer
             _contributorsLink.RemoveWhere(bc => bc.Role == role);
             addNewContributors(newContributors, role);
         }
-        private void addNewContributors(IEnumerable<Contributor> newContributors, Role role)
+
+		private void addNewContributors(IEnumerable<Contributor> newContributors, Role role)
         {
             byte order = 0;
             var newContributionsEnum = newContributors.Select(c => new BookContributor(this, c, role, order++));
@@ -156,6 +154,18 @@ namespace DataLayer
                 .ToList();
         #endregion
 
+		private Microsoft.EntityFrameworkCore.ChangeTracking.EntityEntry<Book> getEntry(DbContext context)
+		{
+			ArgumentValidator.EnsureNotNull(context, nameof(context));
+
+			var entry = context.Entry(this);
+
+			if (!entry.IsKeySet)
+				throw new InvalidOperationException("Could not load a valid Book from database");
+
+			return entry;
+		}
+
         #region series
         private HashSet<SeriesBook> _seriesLink;
         public IEnumerable<SeriesBook> SeriesLink => _seriesLink?.ToList();
@@ -187,16 +197,10 @@ namespace DataLayer
 
             // our add() is conditional upon what's already included in the collection.
             // therefore if not loaded, a trip is required. might as well just load it
-            if (_seriesLink == null)
-            {
-                ArgumentValidator.EnsureNotNull(context, nameof(context));
-                if (!context.Entry(this).IsKeySet)
-                    throw new InvalidOperationException("Could not add series");
+            if (_seriesLink is null)
+				getEntry(context).Collection(s => s.SeriesLink).Load();
 
-                context.Entry(this).Collection(s => s.SeriesLink).Load();
-            }
-
-            var singleSeriesBook = _seriesLink.SingleOrDefault(sb => sb.Series == series);
+			var singleSeriesBook = _seriesLink.SingleOrDefault(sb => sb.Series == series);
             if (singleSeriesBook == null)
                 _seriesLink.Add(new SeriesBook(series, this, index));
             else
@@ -207,13 +211,12 @@ namespace DataLayer
         #region supplements
         private HashSet<Supplement> _supplements;
         public IEnumerable<Supplement> Supplements => _supplements?.ToList();
-        public bool HasPdfs => Supplements.Any();
+        public bool HasPdf => Supplements.Any();
 
         public void AddSupplementDownloadUrl(string url)
         {
             // supplements are owned by Book, so no need to Load():
-            // OwnsMany: "Can only ever appear on navigation properties of other entity types.
-            //  Are automatically loaded, and can only be tracked by a DbContext alongside their owner."
+            //  Are automatically loaded, and can only be tracked by a DbContext alongside their owner.
 
             ArgumentValidator.EnsureNotNullOrWhiteSpace(url, nameof(url));
 
@@ -233,19 +236,18 @@ namespace DataLayer
         }
 
         public void UpdateCategory(Category category, DbContext context = null)
-        {
-            // since category is never null, nullity means it hasn't been loaded
-            if (Category != null || CategoryId == Category.GetEmpty().CategoryId)
-            {
-                Category = category;
-                return;
-            }
+		{
+			// since category is never null, nullity means it hasn't been loaded
+			if (Category is null)
+				getEntry(context).Reference(s => s.Category).Load();
 
-            if (context == null)
-                throw new Exception("need context");
-            
-            context.Entry(this).Reference(s => s.Category).Load();
-            Category = category;
+			Category = category;
         }
-    }
+
+        // needed for v3 => v4 upgrade
+        public void UpdateLocale(string localeName)
+            => Locale ??= localeName;
+
+        public override string ToString() => $"[{AudibleProductId}] {Title}";
+	}
 }

DataLayer/EfClasses/BookContributor.cs

@@ -23,5 +23,7 @@ namespace DataLayer
             Role = role;
             Order = order;
         }
-    }
+
+		public override string ToString() => $"{Book} {Contributor} {Role} {Order}";
+	}
 }

DataLayer/EfClasses/Category.cs

@@ -18,8 +18,7 @@ namespace DataLayer
     public class Category
     {
         // Empty is a special case. use private ctor w/o validation
-        public static Category GetEmpty() => new Category { CategoryId = -1, AudibleCategoryId = "", Name = "", ParentCategory = null };
-        public bool IsEmpty() => string.IsNullOrWhiteSpace(AudibleCategoryId) || string.IsNullOrWhiteSpace(Name) || ParentCategory == null;
+        public static Category GetEmpty() => new Category { CategoryId = -1, AudibleCategoryId = "", Name = "" };
 
         internal int CategoryId { get; private set; }
         public string AudibleCategoryId { get; private set; }
@@ -48,5 +47,7 @@ namespace DataLayer
             if (parentCategory != null)
                 ParentCategory = parentCategory;
         }
-    }
+
+		public override string ToString() => $"[{AudibleCategoryId}] {Name}";
+	}
 }

DataLayer/EfClasses/Contributor.cs

@@ -0,0 +1,51 @@
+using System.Collections.Generic;
+using System.Linq;
+using Dinah.Core;
+
+namespace DataLayer
+{
+    public class Contributor
+	{
+		// Empty is a special case. use private ctor w/o validation
+		public static Contributor GetEmpty() => new Contributor { ContributorId = -1, Name = "" };
+
+		// contributors search links are just name with url-encoding. space can be + or %20
+		//   author search link:   /search?searchAuthor=Robert+Bevan
+		//   narrator search link: /search?searchNarrator=Robert+Bevan
+		// can also search multiples. concat with comma before url encode
+
+		// id.s
+		// ----
+		// https://www.audible.com/author/Neil-Gaiman/B000AQ01G2 == https://www.audible.com/author/B000AQ01G2
+		//     goes to summary page
+		//     at bottom "See all titles by Neil Gaiman" goes to https://www.audible.com/search?searchAuthor=Neil+Gaiman
+		// some authors have no id. simply goes to https://www.audible.com/search?searchAuthor=Rufus+Fears
+		// all narrators have no id: https://www.audible.com/search?searchNarrator=Neil+Gaiman
+
+		internal int ContributorId { get; private set; }
+        public string Name { get; private set; }
+
+        private HashSet<BookContributor> _booksLink;
+        public IEnumerable<BookContributor> BooksLink => _booksLink?.ToList();
+
+        public string AudibleContributorId { get; private set; }
+
+        private Contributor() { }
+        public Contributor(string name)
+        {
+            ArgumentValidator.EnsureNotNullOrWhiteSpace(name, nameof(name));
+
+            _booksLink = new HashSet<BookContributor>();
+
+            Name = name;
+        }
+		public Contributor(string name, string audibleContributorId) : this(name)
+		{
+			// don't overwrite with null or whitespace but not an error
+			if (!string.IsNullOrWhiteSpace(audibleContributorId))
+				AudibleContributorId = audibleContributorId;
+		}
+
+		public override string ToString() => Name;
+	}
+}

DataLayer/EfClasses/LibraryBook.cs

@@ -0,0 +1,33 @@
+using System;
+using Dinah.Core;
+
+namespace DataLayer
+{
+    public class LibraryBook
+    {
+        internal int BookId { get; private set; }
+        public Book Book { get; private set; }
+
+        public DateTime DateAdded { get; private set; }
+
+        // immutable-ish. should be immutable. mutability is necessary for v3 => v4 upgrades
+        public string Account { get; private set; }
+
+        private LibraryBook() { }
+        public LibraryBook(Book book, DateTime dateAdded, string account)
+        {
+            ArgumentValidator.EnsureNotNull(book, nameof(book));
+            ArgumentValidator.EnsureNotNull(account, nameof(account));
+
+            Book = book;
+            DateAdded = dateAdded;
+            Account = account;
+        }
+
+        // needed for v3 => v4 upgrade
+        public void UpdateAccount(string account)
+            => Account ??= account;
+
+        public override string ToString() => $"{DateAdded:d} {Book}";
+	}
+}

DataLayer/EfClasses/Rating.cs

@@ -72,5 +72,7 @@ namespace DataLayer
 
             return string.Join("\r\n", items);
         }
-    }
+
+		public override string ToString() => $"Overall={OverallRating} Perf={PerformanceRating} Story={StoryRating}";
+	}
 }

DataLayer/EfClasses/Series.cs

@@ -66,5 +66,7 @@ namespace DataLayer
             if (_booksLink.SingleOrDefault(sb => sb.Book == book) == null)
                 _booksLink.Add(new SeriesBook(this, book, index));
         }
-    }
+
+		public override string ToString() => Name;
+	}
 }

DataLayer/EfClasses/SeriesBook.cs

@@ -34,5 +34,7 @@ namespace DataLayer
             if (index.HasValue)
                 Index = index.Value;
         }
-    }
+
+		public override string ToString() => $"Series={Series} Book={Book}";
+	}
 }

DataLayer/EfClasses/Supplement.cs

@@ -20,5 +20,7 @@ namespace DataLayer
             Book = book;
             Url = url;
         }
-    }
+
+		public override string ToString() => $"{Book} {Url.Substring(Url.Length - 4)}";
+	}
 }

DataLayer/EfClasses/UserDefinedItem.cs

@@ -13,29 +13,36 @@ namespace DataLayer
 
         private UserDefinedItem() { }
         internal UserDefinedItem(Book book)
-        {
-            ArgumentValidator.EnsureNotNull(book, nameof(book));
+		{
+			ArgumentValidator.EnsureNotNull(book, nameof(book));
             Book = book;
-        }
+
+			// import previously saved tags
+			ArgumentValidator.EnsureNotNullOrWhiteSpace(book.AudibleProductId, nameof(book.AudibleProductId));
+			Tags = FileManager.TagsPersistence.GetTags(book.AudibleProductId);
+		}
 
         private string _tags = "";
         public string Tags
         {
             get => _tags;
             set => _tags = sanitize(value);
-        }
-        #region sanitize tags: space delimited. Inline/denormalized. Lower case. Alpha numeric and hyphen
-        // only legal chars are letters numbers underscores and separating whitespace
-        //
-        // technically, the only char.s which aren't easily supported are  \  [  ]
-        // however, whitelisting is far safer than blacklisting (eg: new lines, non-printable character)
-        // it's easy to expand whitelist as needed
-        // for lucene, ToLower() isn't needed because search is case-inspecific. for here, it prevents duplicates
-        //
-        // there are also other allowed but misleading characters. eg: the ^ operator defines a 'boost' score
-        // full list of characters which must be escaped:
-        //   + - && || ! ( ) { } [ ] ^ " ~ * ? : \
-        static Regex regex = new Regex(@"[^\w\d\s_]", RegexOptions.Compiled);
+		}
+
+		public IEnumerable<string> TagsEnumerated => Tags == "" ? new string[0] : Tags.Split(null as char[], StringSplitOptions.RemoveEmptyEntries);
+
+		#region sanitize tags: space delimited. Inline/denormalized. Lower case. Alpha numeric and hyphen
+		// only legal chars are letters numbers underscores and separating whitespace
+		//
+		// technically, the only char.s which aren't easily supported are  \  [  ]
+		// however, whitelisting is far safer than blacklisting (eg: new lines, non-printable character)
+		// it's easy to expand whitelist as needed
+		// for lucene, ToLower() isn't needed because search is case-inspecific. for here, it prevents duplicates
+		//
+		// there are also other allowed but misleading characters. eg: the ^ operator defines a 'boost' score
+		// full list of characters which must be escaped:
+		//   + - && || ! ( ) { } [ ] ^ " ~ * ? : \
+		static Regex regex { get; } = new Regex(@"[^\w\d\s_]", RegexOptions.Compiled);
         private static string sanitize(string input)
         {
             if (string.IsNullOrWhiteSpace(input))
@@ -63,8 +70,6 @@ namespace DataLayer
 
             return string.Join(" ", unique);
         }
-
-        public IEnumerable<string> TagsEnumerated => Tags == "" ? new string[0] : Tags.Split(null as char[], StringSplitOptions.RemoveEmptyEntries);
         #endregion
 
         // owned: not an optional one-to-one
@@ -73,5 +78,7 @@ namespace DataLayer
 
         public void UpdateRating(float overallRating, float performanceRating, float storyRating)
             => Rating.Update(overallRating, performanceRating, storyRating);
-    }
+
+		public override string ToString() => $"{Book} {Rating} {Tags}";
+	}
 }

DataLayer/LibationContext.cs

@@ -25,10 +25,10 @@ namespace DataLayer
         public DbSet<Series> Series { get; private set; }
         public DbSet<Category> Categories { get; private set; }
 
-        public static LibationContext Create()
+        public static LibationContext Create(string connectionString)
         {
             var factory = new LibationContextFactory();
-            var context = factory.Create();
+            var context = factory.Create(connectionString);
             return context;
         }
 
@@ -56,12 +56,17 @@ namespace DataLayer
             modelBuilder.ApplyConfiguration(new SeriesBookConfig());
             modelBuilder.ApplyConfiguration(new CategoryConfig());
 
-            // seeds go here. examples in scratch pad
+            // seeds go here. examples in Dinah.EntityFrameworkCore.Tests\DbContextFactoryExample.cs
+
             modelBuilder
                 .Entity<Category>()
-                .HasData(Category.GetEmpty());
+				.HasData(Category.GetEmpty());
+			modelBuilder
+				.Entity<Contributor>()
+				.HasData(Contributor.GetEmpty());
 
-            // views are now supported via "query types" (instead of "entity types"): https://docs.microsoft.com/en-us/ef/core/modeling/query-types
-        }
-    }
+			// views are now supported via "keyless entity types" (instead of "entity types" or the prev "query types"):
+			// https://docs.microsoft.com/en-us/ef/core/modeling/keyless-entity-types
+		}
+	}
 }

DataLayer/LibationContextFactory.cs

@@ -6,6 +6,6 @@ namespace DataLayer
     public class LibationContextFactory : DesignTimeDbContextFactoryBase<LibationContext>
     {
         protected override LibationContext CreateNewInstance(DbContextOptions<LibationContext> options) => new LibationContext(options);
-        protected override void UseDatabaseEngine(DbContextOptionsBuilder optionsBuilder, string connectionString) => optionsBuilder.UseSqlServer(connectionString);
+        protected override void UseDatabaseEngine(DbContextOptionsBuilder optionsBuilder, string connectionString) => optionsBuilder.UseSqlite(connectionString);
     }
 }

DataLayer/Migrations/20191125182309_Fresh.Designer.cs

@@ -3,54 +3,50 @@ using System;
 using DataLayer;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Metadata;
 using Microsoft.EntityFrameworkCore.Migrations;
 using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
 
 namespace DataLayer.Migrations
 {
     [DbContext(typeof(LibationContext))]
-    [Migration("20191115193402_Fresh")]
+    [Migration("20191125182309_Fresh")]
     partial class Fresh
     {
         protected override void BuildTargetModel(ModelBuilder modelBuilder)
         {
 #pragma warning disable 612, 618
             modelBuilder
-                .HasAnnotation("ProductVersion", "3.0.0")
-                .HasAnnotation("Relational:MaxIdentifierLength", 128)
-                .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
+                .HasAnnotation("ProductVersion", "3.0.0");
 
             modelBuilder.Entity("DataLayer.Book", b =>
                 {
                     b.Property<int>("BookId")
                         .ValueGeneratedOnAdd()
-                        .HasColumnType("int")
-                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
+                        .HasColumnType("INTEGER");
 
                     b.Property<string>("AudibleProductId")
-                        .HasColumnType("nvarchar(450)");
+                        .HasColumnType("TEXT");
 
                     b.Property<int>("CategoryId")
-                        .HasColumnType("int");
+                        .HasColumnType("INTEGER");
 
                     b.Property<DateTime?>("DatePublished")
-                        .HasColumnType("datetime2");
+                        .HasColumnType("TEXT");
 
                     b.Property<string>("Description")
-                        .HasColumnType("nvarchar(max)");
+                        .HasColumnType("TEXT");
 
                     b.Property<bool>("IsAbridged")
-                        .HasColumnType("bit");
+                        .HasColumnType("INTEGER");
 
                     b.Property<int>("LengthInMinutes")
-                        .HasColumnType("int");
+                        .HasColumnType("INTEGER");
 
                     b.Property<string>("PictureId")
-                        .HasColumnType("nvarchar(max)");
+                        .HasColumnType("TEXT");
 
                     b.Property<string>("Title")
-                        .HasColumnType("nvarchar(max)");
+                        .HasColumnType("TEXT");
 
                     b.HasKey("BookId");
 
@@ -64,16 +60,16 @@ namespace DataLayer.Migrations
             modelBuilder.Entity("DataLayer.BookContributor", b =>
                 {
                     b.Property<int>("BookId")
-                        .HasColumnType("int");
+                        .HasColumnType("INTEGER");
 
                     b.Property<int>("ContributorId")
-                        .HasColumnType("int");
+                        .HasColumnType("INTEGER");
 
                     b.Property<int>("Role")
-                        .HasColumnType("int");
+                        .HasColumnType("INTEGER");
 
                     b.Property<byte>("Order")
-                        .HasColumnType("tinyint");
+                        .HasColumnType("INTEGER");
 
                     b.HasKey("BookId", "ContributorId", "Role");
 
@@ -88,17 +84,16 @@ namespace DataLayer.Migrations
                 {
                     b.Property<int>("CategoryId")
                         .ValueGeneratedOnAdd()
-                        .HasColumnType("int")
-                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
+                        .HasColumnType("INTEGER");
 
                     b.Property<string>("AudibleCategoryId")
-                        .HasColumnType("nvarchar(450)");
+                        .HasColumnType("TEXT");
 
                     b.Property<string>("Name")
-                        .HasColumnType("nvarchar(max)");
+                        .HasColumnType("TEXT");
 
                     b.Property<int?>("ParentCategoryCategoryId")
-                        .HasColumnType("int");
+                        .HasColumnType("INTEGER");
 
                     b.HasKey("CategoryId");
 
@@ -121,29 +116,35 @@ namespace DataLayer.Migrations
                 {
                     b.Property<int>("ContributorId")
                         .ValueGeneratedOnAdd()
-                        .HasColumnType("int")
-                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
+                        .HasColumnType("INTEGER");
 
-                    b.Property<string>("AudibleAuthorId")
-                        .HasColumnType("nvarchar(max)");
+                    b.Property<string>("AudibleContributorId")
+                        .HasColumnType("TEXT");
 
                     b.Property<string>("Name")
-                        .HasColumnType("nvarchar(450)");
+                        .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("int");
+                        .HasColumnType("INTEGER");
 
                     b.Property<DateTime>("DateAdded")
-                        .HasColumnType("datetime2");
+                        .HasColumnType("TEXT");
 
                     b.HasKey("BookId");
 
@@ -154,14 +155,13 @@ namespace DataLayer.Migrations
                 {
                     b.Property<int>("SeriesId")
                         .ValueGeneratedOnAdd()
-                        .HasColumnType("int")
-                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
+                        .HasColumnType("INTEGER");
 
                     b.Property<string>("AudibleSeriesId")
-                        .HasColumnType("nvarchar(450)");
+                        .HasColumnType("TEXT");
 
                     b.Property<string>("Name")
-                        .HasColumnType("nvarchar(max)");
+                        .HasColumnType("TEXT");
 
                     b.HasKey("SeriesId");
 
@@ -173,13 +173,13 @@ namespace DataLayer.Migrations
             modelBuilder.Entity("DataLayer.SeriesBook", b =>
                 {
                     b.Property<int>("SeriesId")
-                        .HasColumnType("int");
+                        .HasColumnType("INTEGER");
 
                     b.Property<int>("BookId")
-                        .HasColumnType("int");
+                        .HasColumnType("INTEGER");
 
                     b.Property<float?>("Index")
-                        .HasColumnType("real");
+                        .HasColumnType("REAL");
 
                     b.HasKey("SeriesId", "BookId");
 
@@ -201,18 +201,16 @@ namespace DataLayer.Migrations
                     b.OwnsOne("DataLayer.Rating", "Rating", b1 =>
                         {
                             b1.Property<int>("BookId")
-                                .ValueGeneratedOnAdd()
-                                .HasColumnType("int")
-                                .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
+                                .HasColumnType("INTEGER");
 
                             b1.Property<float>("OverallRating")
-                                .HasColumnType("real");
+                                .HasColumnType("REAL");
 
                             b1.Property<float>("PerformanceRating")
-                                .HasColumnType("real");
+                                .HasColumnType("REAL");
 
                             b1.Property<float>("StoryRating")
-                                .HasColumnType("real");
+                                .HasColumnType("REAL");
 
                             b1.HasKey("BookId");
 
@@ -226,14 +224,13 @@ namespace DataLayer.Migrations
                         {
                             b1.Property<int>("SupplementId")
                                 .ValueGeneratedOnAdd()
-                                .HasColumnType("int")
-                                .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
+                                .HasColumnType("INTEGER");
 
                             b1.Property<int>("BookId")
-                                .HasColumnType("int");
+                                .HasColumnType("INTEGER");
 
                             b1.Property<string>("Url")
-                                .HasColumnType("nvarchar(max)");
+                                .HasColumnType("TEXT");
 
                             b1.HasKey("SupplementId");
 
@@ -248,10 +245,10 @@ namespace DataLayer.Migrations
                     b.OwnsOne("DataLayer.UserDefinedItem", "UserDefinedItem", b1 =>
                         {
                             b1.Property<int>("BookId")
-                                .HasColumnType("int");
+                                .HasColumnType("INTEGER");
 
                             b1.Property<string>("Tags")
-                                .HasColumnType("nvarchar(max)");
+                                .HasColumnType("TEXT");
 
                             b1.HasKey("BookId");
 
@@ -263,16 +260,16 @@ namespace DataLayer.Migrations
                             b1.OwnsOne("DataLayer.Rating", "Rating", b2 =>
                                 {
                                     b2.Property<int>("UserDefinedItemBookId")
-                                        .HasColumnType("int");
+                                        .HasColumnType("INTEGER");
 
                                     b2.Property<float>("OverallRating")
-                                        .HasColumnType("real");
+                                        .HasColumnType("REAL");
 
                                     b2.Property<float>("PerformanceRating")
-                                        .HasColumnType("real");
+                                        .HasColumnType("REAL");
 
                                     b2.Property<float>("StoryRating")
-                                        .HasColumnType("real");
+                                        .HasColumnType("REAL");
 
                                     b2.HasKey("UserDefinedItemBookId");
 

DataLayer/Migrations/20191125182309_Fresh.cs

@@ -12,7 +12,7 @@ namespace DataLayer.Migrations
                 columns: table => new
                 {
                     CategoryId = table.Column<int>(nullable: false)
-                        .Annotation("SqlServer:Identity", "1, 1"),
+                        .Annotation("Sqlite:Autoincrement", true),
                     AudibleCategoryId = table.Column<string>(nullable: true),
                     Name = table.Column<string>(nullable: true),
                     ParentCategoryCategoryId = table.Column<int>(nullable: true)
@@ -33,9 +33,9 @@ namespace DataLayer.Migrations
                 columns: table => new
                 {
                     ContributorId = table.Column<int>(nullable: false)
-                        .Annotation("SqlServer:Identity", "1, 1"),
+                        .Annotation("Sqlite:Autoincrement", true),
                     Name = table.Column<string>(nullable: true),
-                    AudibleAuthorId = table.Column<string>(nullable: true)
+                    AudibleContributorId = table.Column<string>(nullable: true)
                 },
                 constraints: table =>
                 {
@@ -47,7 +47,7 @@ namespace DataLayer.Migrations
                 columns: table => new
                 {
                     SeriesId = table.Column<int>(nullable: false)
-                        .Annotation("SqlServer:Identity", "1, 1"),
+                        .Annotation("Sqlite:Autoincrement", true),
                     AudibleSeriesId = table.Column<string>(nullable: true),
                     Name = table.Column<string>(nullable: true)
                 },
@@ -61,7 +61,7 @@ namespace DataLayer.Migrations
                 columns: table => new
                 {
                     BookId = table.Column<int>(nullable: false)
-                        .Annotation("SqlServer:Identity", "1, 1"),
+                        .Annotation("Sqlite:Autoincrement", true),
                     AudibleProductId = table.Column<string>(nullable: true),
                     Title = table.Column<string>(nullable: true),
                     Description = table.Column<string>(nullable: true),
@@ -159,7 +159,7 @@ namespace DataLayer.Migrations
                 columns: table => new
                 {
                     SupplementId = table.Column<int>(nullable: false)
-                        .Annotation("SqlServer:Identity", "1, 1"),
+                        .Annotation("Sqlite:Autoincrement", true),
                     BookId = table.Column<int>(nullable: false),
                     Url = table.Column<string>(nullable: true)
                 },
@@ -200,6 +200,11 @@ namespace DataLayer.Migrations
                 columns: new[] { "CategoryId", "AudibleCategoryId", "Name", "ParentCategoryCategoryId" },
                 values: new object[] { -1, "", "", null });
 
+            migrationBuilder.InsertData(
+                table: "Contributors",
+                columns: new[] { "ContributorId", "AudibleContributorId", "Name" },
+                values: new object[] { -1, null, "" });
+
             migrationBuilder.CreateIndex(
                 name: "IX_BookContributor_BookId",
                 table: "BookContributor",

DataLayer/Migrations/20200812152646_AddLocaleAndAccount.Designer.cs

@@ -0,0 +1,338 @@
+// <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("20200812152646_AddLocaleAndAccount")]
+    partial class AddLocaleAndAccount
+    {
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("ProductVersion", "3.1.7");
+
+            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");
+                        });
+
+                    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");
+                                });
+                        });
+                });
+
+            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();
+                });
+
+            modelBuilder.Entity("DataLayer.Category", b =>
+                {
+                    b.HasOne("DataLayer.Category", "ParentCategory")
+                        .WithMany()
+                        .HasForeignKey("ParentCategoryCategoryId");
+                });
+
+            modelBuilder.Entity("DataLayer.LibraryBook", b =>
+                {
+                    b.HasOne("DataLayer.Book", "Book")
+                        .WithOne()
+                        .HasForeignKey("DataLayer.LibraryBook", "BookId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            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();
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}

DataLayer/Migrations/20200812152646_AddLocaleAndAccount.cs

@@ -0,0 +1,31 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+namespace DataLayer.Migrations
+{
+    public partial class AddLocaleAndAccount : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<string>(
+                name: "Account",
+                table: "Library",
+                nullable: true);
+
+            migrationBuilder.AddColumn<string>(
+                name: "Locale",
+                table: "Books",
+                nullable: true);
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "Account",
+                table: "Library");
+
+            migrationBuilder.DropColumn(
+                name: "Locale",
+                table: "Books");
+        }
+    }
+}

DataLayer/Migrations/LibationContextModelSnapshot.cs

@@ -3,7 +3,6 @@ using System;
 using DataLayer;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Metadata;
 using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
 
 namespace DataLayer.Migrations
@@ -15,40 +14,40 @@ namespace DataLayer.Migrations
         {
 #pragma warning disable 612, 618
             modelBuilder
-                .HasAnnotation("ProductVersion", "3.0.0")
-                .HasAnnotation("Relational:MaxIdentifierLength", 128)
-                .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
+                .HasAnnotation("ProductVersion", "3.1.7");
 
             modelBuilder.Entity("DataLayer.Book", b =>
                 {
                     b.Property<int>("BookId")
                         .ValueGeneratedOnAdd()
-                        .HasColumnType("int")
-                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
+                        .HasColumnType("INTEGER");
 
                     b.Property<string>("AudibleProductId")
-                        .HasColumnType("nvarchar(450)");
+                        .HasColumnType("TEXT");
 
                     b.Property<int>("CategoryId")
-                        .HasColumnType("int");
+                        .HasColumnType("INTEGER");
 
                     b.Property<DateTime?>("DatePublished")
-                        .HasColumnType("datetime2");
+                        .HasColumnType("TEXT");
 
                     b.Property<string>("Description")
-                        .HasColumnType("nvarchar(max)");
+                        .HasColumnType("TEXT");
 
                     b.Property<bool>("IsAbridged")
-                        .HasColumnType("bit");
+                        .HasColumnType("INTEGER");
 
                     b.Property<int>("LengthInMinutes")
-                        .HasColumnType("int");
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Locale")
+                        .HasColumnType("TEXT");
 
                     b.Property<string>("PictureId")
-                        .HasColumnType("nvarchar(max)");
+                        .HasColumnType("TEXT");
 
                     b.Property<string>("Title")
-                        .HasColumnType("nvarchar(max)");
+                        .HasColumnType("TEXT");
 
                     b.HasKey("BookId");
 
@@ -62,16 +61,16 @@ namespace DataLayer.Migrations
             modelBuilder.Entity("DataLayer.BookContributor", b =>
                 {
                     b.Property<int>("BookId")
-                        .HasColumnType("int");
+                        .HasColumnType("INTEGER");
 
                     b.Property<int>("ContributorId")
-                        .HasColumnType("int");
+                        .HasColumnType("INTEGER");
 
                     b.Property<int>("Role")
-                        .HasColumnType("int");
+                        .HasColumnType("INTEGER");
 
                     b.Property<byte>("Order")
-                        .HasColumnType("tinyint");
+                        .HasColumnType("INTEGER");
 
                     b.HasKey("BookId", "ContributorId", "Role");
 
@@ -86,17 +85,16 @@ namespace DataLayer.Migrations
                 {
                     b.Property<int>("CategoryId")
                         .ValueGeneratedOnAdd()
-                        .HasColumnType("int")
-                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
+                        .HasColumnType("INTEGER");
 
                     b.Property<string>("AudibleCategoryId")
-                        .HasColumnType("nvarchar(450)");
+                        .HasColumnType("TEXT");
 
                     b.Property<string>("Name")
-                        .HasColumnType("nvarchar(max)");
+                        .HasColumnType("TEXT");
 
                     b.Property<int?>("ParentCategoryCategoryId")
-                        .HasColumnType("int");
+                        .HasColumnType("INTEGER");
 
                     b.HasKey("CategoryId");
 
@@ -119,29 +117,38 @@ namespace DataLayer.Migrations
                 {
                     b.Property<int>("ContributorId")
                         .ValueGeneratedOnAdd()
-                        .HasColumnType("int")
-                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
+                        .HasColumnType("INTEGER");
 
-                    b.Property<string>("AudibleAuthorId")
-                        .HasColumnType("nvarchar(max)");
+                    b.Property<string>("AudibleContributorId")
+                        .HasColumnType("TEXT");
 
                     b.Property<string>("Name")
-                        .HasColumnType("nvarchar(450)");
+                        .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("int");
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Account")
+                        .HasColumnType("TEXT");
 
                     b.Property<DateTime>("DateAdded")
-                        .HasColumnType("datetime2");
+                        .HasColumnType("TEXT");
 
                     b.HasKey("BookId");
 
@@ -152,14 +159,13 @@ namespace DataLayer.Migrations
                 {
                     b.Property<int>("SeriesId")
                         .ValueGeneratedOnAdd()
-                        .HasColumnType("int")
-                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
+                        .HasColumnType("INTEGER");
 
                     b.Property<string>("AudibleSeriesId")
-                        .HasColumnType("nvarchar(450)");
+                        .HasColumnType("TEXT");
 
                     b.Property<string>("Name")
-                        .HasColumnType("nvarchar(max)");
+                        .HasColumnType("TEXT");
 
                     b.HasKey("SeriesId");
 
@@ -171,13 +177,13 @@ namespace DataLayer.Migrations
             modelBuilder.Entity("DataLayer.SeriesBook", b =>
                 {
                     b.Property<int>("SeriesId")
-                        .HasColumnType("int");
+                        .HasColumnType("INTEGER");
 
                     b.Property<int>("BookId")
-                        .HasColumnType("int");
+                        .HasColumnType("INTEGER");
 
                     b.Property<float?>("Index")
-                        .HasColumnType("real");
+                        .HasColumnType("REAL");
 
                     b.HasKey("SeriesId", "BookId");
 
@@ -199,18 +205,16 @@ namespace DataLayer.Migrations
                     b.OwnsOne("DataLayer.Rating", "Rating", b1 =>
                         {
                             b1.Property<int>("BookId")
-                                .ValueGeneratedOnAdd()
-                                .HasColumnType("int")
-                                .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
+                                .HasColumnType("INTEGER");
 
                             b1.Property<float>("OverallRating")
-                                .HasColumnType("real");
+                                .HasColumnType("REAL");
 
                             b1.Property<float>("PerformanceRating")
-                                .HasColumnType("real");
+                                .HasColumnType("REAL");
 
                             b1.Property<float>("StoryRating")
-                                .HasColumnType("real");
+                                .HasColumnType("REAL");
 
                             b1.HasKey("BookId");
 
@@ -224,14 +228,13 @@ namespace DataLayer.Migrations
                         {
                             b1.Property<int>("SupplementId")
                                 .ValueGeneratedOnAdd()
-                                .HasColumnType("int")
-                                .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
+                                .HasColumnType("INTEGER");
 
                             b1.Property<int>("BookId")
-                                .HasColumnType("int");
+                                .HasColumnType("INTEGER");
 
                             b1.Property<string>("Url")
-                                .HasColumnType("nvarchar(max)");
+                                .HasColumnType("TEXT");
 
                             b1.HasKey("SupplementId");
 
@@ -246,10 +249,10 @@ namespace DataLayer.Migrations
                     b.OwnsOne("DataLayer.UserDefinedItem", "UserDefinedItem", b1 =>
                         {
                             b1.Property<int>("BookId")
-                                .HasColumnType("int");
+                                .HasColumnType("INTEGER");
 
                             b1.Property<string>("Tags")
-                                .HasColumnType("nvarchar(max)");
+                                .HasColumnType("TEXT");
 
                             b1.HasKey("BookId");
 
@@ -261,16 +264,16 @@ namespace DataLayer.Migrations
                             b1.OwnsOne("DataLayer.Rating", "Rating", b2 =>
                                 {
                                     b2.Property<int>("UserDefinedItemBookId")
-                                        .HasColumnType("int");
+                                        .HasColumnType("INTEGER");
 
                                     b2.Property<float>("OverallRating")
-                                        .HasColumnType("real");
+                                        .HasColumnType("REAL");
 
                                     b2.Property<float>("PerformanceRating")
-                                        .HasColumnType("real");
+                                        .HasColumnType("REAL");
 
                                     b2.Property<float>("StoryRating")
-                                        .HasColumnType("real");
+                                        .HasColumnType("REAL");
 
                                     b2.HasKey("UserDefinedItemBookId");
 

DataLayer/QueryObjects/BookQueries.cs

@@ -8,14 +8,11 @@ namespace DataLayer
 {
     public static class BookQueries
     {
-        public static Book GetBook_Flat_NoTracking(string productId)
-        {
-			using var context = LibationContext.Create();
-			return context
+        public static Book GetBook_Flat_NoTracking(this LibationContext context, string productId)
+            => context
                 .Books
                 .AsNoTracking()
                 .GetBook(productId);
-		}
 
         public static Book GetBook(this IQueryable<Book> books, string productId)
             => books

DataLayer/QueryObjects/LibraryQueries.cs

@@ -5,25 +5,25 @@ using Microsoft.EntityFrameworkCore;
 namespace DataLayer
 {
     public static class LibraryQueries
-    {
-        public static List<LibraryBook> GetLibrary_Flat_NoTracking()
-        {
-			using var context = LibationContext.Create();
-			return context
+	{
+		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()
+                .AsNoTracking()
                 .GetLibrary()
                 .ToList();
-		}
 
-        public static LibraryBook GetLibraryBook_Flat_NoTracking(string productId)
-        {
-			using var context = LibationContext.Create();
-			return context
+        public static LibraryBook GetLibraryBook_Flat_NoTracking(this LibationContext context, string productId)
+            => context
                 .Library
-//.AsNoTracking()
-				.GetLibraryBook(productId);
-		}
+                .AsNoTracking()
+                .GetLibraryBook(productId);
 
         /// <summary>This is still IQueryable. YOU MUST CALL ToList() YOURSELF</summary>
         public static IQueryable<LibraryBook> GetLibrary(this IQueryable<LibraryBook> library)

DataLayer/TagPersistenceInterceptor.cs

@@ -0,0 +1,30 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Dinah.Core.Collections.Generic;
+using Dinah.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore;
+
+namespace DataLayer
+{
+    internal class TagPersistenceInterceptor : IDbInterceptor
+    {
+        public void Executed(DbContext context) { }
+
+        public void Executing(DbContext context)
+		{
+			var tagsCollection
+				= context
+				.ChangeTracker
+				.Entries()
+				.Where(e => e.State.In(EntityState.Modified, EntityState.Added))
+				.Select(e => e.Entity as UserDefinedItem)
+				.Where(udi => udi != null)
+				// do NOT filter out entires with blank tags. blank is the valid way to show the absence of tags
+				.Select(t => (t.Book.AudibleProductId, t.Tags))
+				.ToList();
+
+			FileManager.TagsPersistence.Save(tagsCollection);
+		}
+	}
+}

DataLayer/UNTESTED/EfClasses/Contributor.cs

@@ -1,82 +0,0 @@
-using System.Collections.Generic;
-using System.Linq;
-using Dinah.Core;
-
-namespace DataLayer
-{
-    public class Contributor
-    {
-        // contributors search links are just name with url-encoding. space can be + or %20
-        //   author search link:   /search?searchAuthor=Robert+Bevan
-        //   narrator search link: /search?searchNarrator=Robert+Bevan
-        // can also search multiples. concat with comma before url encode
-
-        // id.s
-        // ----
-        // https://www.audible.com/author/Neil-Gaiman/B000AQ01G2 == https://www.audible.com/author/B000AQ01G2
-        //     goes to summary page
-        //     at bottom "See all titles by Neil Gaiman" goes to https://www.audible.com/search?searchAuthor=Neil+Gaiman
-        // some authors have no id. simply goes to https://www.audible.com/search?searchAuthor=Rufus+Fears
-        // all narrators have no id: https://www.audible.com/search?searchNarrator=Neil+Gaiman
-
-        internal int ContributorId { get; private set; }
-        public string Name { get; private set; }
-
-        private HashSet<BookContributor> _booksLink;
-        public IEnumerable<BookContributor> BooksLink => _booksLink?.ToList();
-
-        private Contributor() { }
-        public Contributor(string name)
-        {
-            ArgumentValidator.EnsureNotNullOrWhiteSpace(name, nameof(name));
-
-            _booksLink = new HashSet<BookContributor>();
-
-            Name = name;
-        }
-
-        public string AudibleAuthorId { get; private set; }
-        public void UpdateAudibleAuthorId(string authorId)
-        {
-            // don't overwrite with null or whitespace but not an error
-            if (!string.IsNullOrWhiteSpace(authorId))
-                AudibleAuthorId = authorId;
-        }
-
-        #region // AudibleAuthorId refactor: separate author-specific info. overkill for a single optional string
-        ///// <summary>Most authors in Audible have a unique id</summary>
-        //public AudibleAuthorProperty AudibleAuthorProperty { get; private set; }
-        //public void UpdateAuthorId(string authorId, LibationContext context = null)
-        //{
-        //    if (authorId == null)
-        //        return;
-        //    if (AudibleAuthorProperty != null)
-        //    {
-        //        AudibleAuthorProperty.UpdateAudibleAuthorId(authorId);
-        //        return;
-        //    }
-        //    if (context == null)
-        //        throw new ArgumentNullException(nameof(context), "You must provide a context");
-        //    if (context.Contributors.Find(ContributorId) == null)
-        //        throw new InvalidOperationException("Could not update audible author id.");
-        //    var audibleAuthorProperty = new AudibleAuthorProperty();
-        //    audibleAuthorProperty.UpdateAudibleAuthorId(authorId);
-        //    context.AuthorProperties.Add(audibleAuthorProperty);
-        //}
-        //public class AudibleAuthorProperty
-        //{
-        //    public int ContributorId { get; private set; }
-        //    public Contributor Contributor { get; set; }
-
-        //    public string AudibleAuthorId { get; private set; }
-
-        //    public void UpdateAudibleAuthorId(string authorId)
-        //    {
-        //        if (!string.IsNullOrWhiteSpace(authorId))
-        //            AudibleAuthorId = authorId;
-        //    }
-        //}
-        //// ...and create EF table config
-        #endregion
-    }
-}

DataLayer/UNTESTED/EfClasses/LibraryBook.cs

@@ -1,21 +0,0 @@
-using System;
-using Dinah.Core;
-
-namespace DataLayer
-{
-    public class LibraryBook
-    {
-        internal int BookId { get; private set; }
-        public Book Book { get; private set; }
-
-        public DateTime DateAdded { get; private set; }
-
-        private LibraryBook() { }
-        public LibraryBook(Book book, DateTime dateAdded)
-        {
-            ArgumentValidator.EnsureNotNull(book, nameof(book));
-            Book = book;
-            DateAdded = dateAdded;
-        }
-    }
-}

DataLayer/UNTESTED/TagPersistenceInterceptor.cs

@@ -1,60 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using Dinah.Core.Collections.Generic;
-using Dinah.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore;
-
-namespace DataLayer
-{
-    internal class TagPersistenceInterceptor : IDbInterceptor
-    {
-        public void Executing(DbContext context)
-        {
-            doWork__EFCore(context);
-        }
-
-        public void Executed(DbContext context) { }
-
-        static void doWork__EFCore(DbContext context)
-        {
-            // persist tags:
-            var modifiedEntities = context.ChangeTracker.Entries().Where(p => p.State.In(EntityState.Modified, EntityState.Added)).ToList();
-            var tagSets = modifiedEntities.Select(e => e.Entity as UserDefinedItem).Where(a => a != null).ToList();
-            foreach (var t in tagSets)
-                FileManager.TagsPersistence.Save(t.Book.AudibleProductId, t.Tags);
-        }
-
-        #region // notes: working with proxies, esp EF 6
-        // EF 6: entities are proxied with lazy loading when collections are virtual
-        // EF Core: lazy loading is supported in 2.1 (there is a version of lazy loading with proxy-wrapping and a proxy-less version with DI) but not on by default and are not supported here
-
-        //static void doWork_EF6(DbContext context)
-        //{
-        //    var modifiedEntities = context.ChangeTracker.Entries().Where(p => p.State == EntityState.Modified).ToList();
-        //    var unproxiedEntities = modifiedEntities.Select(me => UnProxy(context, me.Entity)).ToList();
-
-        //    // persist tags
-        //    var tagSets = unproxiedEntities.Select(ue => ue as UserDefinedItem).Where(a => a != null).ToList();
-        //    foreach (var t in tagSets)
-        //        FileManager.TagsPersistence.Save(t.ProductId, t.TagsRaw);
-        //}
-
-        //// https://stackoverflow.com/a/25774651
-        //private static T UnProxy<T>(DbContext context, T proxyObject) where T : class
-        //{
-        //    // alternative: https://docs.microsoft.com/en-us/ef/ef6/fundamentals/proxies
-        //    var proxyCreationEnabled = context.Configuration.ProxyCreationEnabled;
-        //    try
-        //    {
-        //        context.Configuration.ProxyCreationEnabled = false;
-        //        return context.Entry(proxyObject).CurrentValues.ToObject() as T;
-        //    }
-        //    finally
-        //    {
-        //        context.Configuration.ProxyCreationEnabled = proxyCreationEnabled;
-        //    }
-        //}
-        #endregion
-    }
-}

DataLayer/UNTESTED/_scratch pad/ScratchPad.cs

@@ -1,122 +0,0 @@
-using System;
-using Dinah.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore;
-
-namespace _scratch_pad
-{
-    ////// to use this as a console, open properties and change from class library => console
-    //// DON'T FORGET TO REVERT IT
-    //public class Program
-    //{
-    //    public static void Main(string[] args)
-    //    {
-    //        var user = new Student() { Name = "Dinah Cheshire" };
-    //        var udi = new UserDef { UserDefId = 1, TagsRaw = "my,tags" };
-
-    //        using var context = new MyTestContextDesignTimeDbContextFactory().Create();
-    //        context.Add(user);
-    //        //context.Add(udi);
-    //        context.Update(udi);
-    //        context.SaveChanges();
-
-    //        Console.WriteLine($"Student was saved in the database with id: {user.Id}");
-    //    }
-    //}
-
-    public class MyTestContextDesignTimeDbContextFactory : DesignTimeDbContextFactoryBase<MyTestContext>
-    {
-        protected override MyTestContext CreateNewInstance(DbContextOptions<MyTestContext> options) => new MyTestContext(options);
-        protected override void UseDatabaseEngine(DbContextOptionsBuilder optionsBuilder, string connectionString) => optionsBuilder.UseSqlite(connectionString);
-    }
-
-    public class MyTestContext : DbContext
-    {
-        // see DesignTimeDbContextFactoryBase for info about ctors and connection strings/OnConfiguring()
-        public MyTestContext(DbContextOptions<MyTestContext> options) : base(options) { }
-
-        #region classes for OnModelCreating() seed example
-        class Blog
-        {
-            public int BlogId { get; set; }
-            public string Url { get; set; }
-            public System.Collections.Generic.ICollection<Post> Posts { get; set; }
-        }
-        class Post
-        {
-            public int PostId { get; set; }
-            public string Content { get; set; }
-            public string Title { get; set; }
-            public int BlogId { get; set; }
-            public Blog Blog { get; set; }
-            public Name AuthorName { get; set; }
-        }
-        class Name
-        {
-            public string First { get; set; }
-            public string Last { get; set; }
-        }
-        #endregion
-        protected override void OnModelCreating(ModelBuilder modelBuilder)
-        {
-            base.OnModelCreating(modelBuilder);
-
-            // config
-            modelBuilder.Entity<Blog>(entity => entity.Property(e => e.Url).IsRequired());
-            modelBuilder.Entity<Order>().OwnsOne(p => p.OrderDetails, cb =>
-            {
-                cb.OwnsOne(c => c.BillingAddress);
-                cb.OwnsOne(c => c.ShippingAddress);
-            });
-            modelBuilder.Entity<Post>(entity =>
-                entity
-                    .HasOne(d => d.Blog)
-                    .WithMany(p => p.Posts)
-                    .HasForeignKey("BlogId"));
-
-            // BlogSeed
-            modelBuilder.Entity<Blog>().HasData(new Blog { BlogId = 1, Url = "http://sample.com" });
-
-            // PostSeed
-            modelBuilder.Entity<Post>().HasData(new Post() { BlogId = 1, PostId = 1, Title = "First post", Content = "Test 1" });
-
-            // AnonymousPostSeed
-            modelBuilder.Entity<Post>().HasData(new { BlogId = 1, PostId = 2, Title = "Second post", Content = "Test 2" });
-
-            // OwnedTypeSeed
-            modelBuilder.Entity<Post>().OwnsOne(p => p.AuthorName).HasData(
-                new { PostId = 1, First = "Andriy", Last = "Svyryd" },
-                new { PostId = 2, First = "Diego", Last = "Vega" });
-        }
-
-        public DbSet<Student> Students { get; set; }
-        public DbSet<UserDef> UserDefs { get; set; }
-        public DbSet<Order> Orders { get; set; }
-    }
-
-    public class Student
-    {
-        public int Id { get; set; }
-        public string Name { get; set; }
-    }
-    public class UserDef
-    {
-        public int UserDefId { get; set; }
-        public string TagsRaw { get; set; }
-    }
-
-    public class Order
-    {
-        public int Id { get; set; }
-        public OrderDetails OrderDetails { get; set; }
-    }
-    public class OrderDetails
-    {
-        public StreetAddress BillingAddress { get; set; }
-        public StreetAddress ShippingAddress { get; set; }
-    }
-    public class StreetAddress
-    {
-        public string Street { get; set; }
-        public string City { get; set; }
-    }
-}

DataLayer/Utilities/LocalDatabaseInfo.cs

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

DataLayer/_HowTo- EF Core.txt

@@ -1,4 +1,8 @@
-HOW TO CREATE: EF CORE PROJECT
+FOR QUICK MIGRATION INSTRUCTIONS:
+_DB_NOTES.txt
+
+
+HOW TO CREATE: EF CORE PROJECT
 ==============================
 example is for sqlite but the same works with MsSql
 
@@ -7,15 +11,22 @@ nuget
 Microsoft.EntityFrameworkCore.Tools (needed for using Package Manager Console)
 Microsoft.EntityFrameworkCore.Sqlite
 
-MIGRATIONS require standard, not core
-using standard instead of core. edit 3 things in csproj
-1of3: pluralize xml TargetFramework tag to TargetFrameworks
-2of2: TargetFrameworks from: netstandard2.1
-to: netcoreapp3.0;netstandard2.1
-3of3: add
-  <PropertyGroup>
-    <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
-  </PropertyGroup>
+MIGRATIONS
+  require core, not standard
+  this can be a problem b/c standard and framework can only reference standard, not core
+TO USE MIGRATIONS (core and/or standard)
+  add to csproj
+    <PropertyGroup>
+      <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
+    </PropertyGroup>
+TO USE MIGRATIONS AS *BOTH* CORE AND STANDARD
+  edit csproj
+    pluralize this xml tag
+      from: TargetFramework
+      to: TargetFrameworks
+    inside of TargetFrameworks
+      from: netstandard2.1
+      to: netcoreapp3.1;netstandard2.1
 
 run. error
 SQLite Error 1: 'no such table: Blogs'.

DataLayer/appsettings.json

@@ -1,8 +1,6 @@
 {
   "ConnectionStrings": {
-    "LibationContext": "Server=(LocalDb)\\MSSQLLocalDB;Database=DataLayer.LibationContext;Integrated Security=true;",
-
-    "// on windows sqlite paths accept windows and/or unix slashes": "",
-    "MyTestContext": "Data Source=%DESKTOP%/sample.db"
+    "// this connection string is ONLY used for DataLayer's Migrations. this appsettings.json file is NOT used at all by application; it is overwritten":  "",
+    "LibationContext": "Data Source=LibationContext.db;Foreign Keys=False;"
   }
 }

DtoImporterService/BookImporter.cs

@@ -9,29 +9,31 @@ namespace DtoImporterService
 {
 	public class BookImporter : ItemsImporterBase
 	{
-		public override IEnumerable<Exception> Validate(IEnumerable<Item> items) => new BookValidator().Validate(items);
+		public BookImporter(LibationContext context) : base(context) { }
 
-		protected override int DoImport(IEnumerable<Item> items, LibationContext context)
+		public override IEnumerable<Exception> Validate(IEnumerable<ImportItem> importItems) => new BookValidator().Validate(importItems.Select(i => i.DtoItem));
+
+		protected override int DoImport(IEnumerable<ImportItem> importItems)
 		{
 			// pre-req.s
-			new ContributorImporter().Import(items, context);
-			new SeriesImporter().Import(items, context);
-			new CategoryImporter().Import(items, context);
+			new ContributorImporter(DbContext).Import(importItems);
+			new SeriesImporter(DbContext).Import(importItems);
+			new CategoryImporter(DbContext).Import(importItems);
 
 			// get distinct
-			var productIds = items.Select(i => i.ProductId).ToList();
+			var productIds = importItems.Select(i => i.DtoItem.ProductId).ToList();
 
 			// load db existing => .Local
-			loadLocal_books(productIds, context);
+			loadLocal_books(productIds);
 
 			// upsert
-			var qtyNew = upsertBooks(items, context);
+			var qtyNew = upsertBooks(importItems);
 			return qtyNew;
 		}
 
-		private void loadLocal_books(List<string> productIds, LibationContext context)
+		private void loadLocal_books(List<string> productIds)
 		{
-			var localProductIds = context.Books.Local.Select(b => b.AudibleProductId);
+			var localProductIds = DbContext.Books.Local.Select(b => b.AudibleProductId);
 			var remainingProductIds = productIds
 				.Distinct()
 				.Except(localProductIds)
@@ -39,87 +41,126 @@ namespace DtoImporterService
 
 			// GetBooks() eager loads Series, category, et al
 			if (remainingProductIds.Any())
-				context.Books.GetBooks(b => remainingProductIds.Contains(b.AudibleProductId)).ToList();
+				DbContext.Books.GetBooks(b => remainingProductIds.Contains(b.AudibleProductId)).ToList();
 		}
 
-		private int upsertBooks(IEnumerable<Item> items, LibationContext context)
+		private int upsertBooks(IEnumerable<ImportItem> importItems)
 		{
 			var qtyNew = 0;
 
-			foreach (var item in items)
+			foreach (var item in importItems)
 			{
-				var book = context.Books.Local.SingleOrDefault(p => p.AudibleProductId == item.ProductId);
+				var book = DbContext.Books.Local.SingleOrDefault(p => p.AudibleProductId == item.DtoItem.ProductId);
 				if (book is null)
 				{
-					// nested logic is required so order of names is retained. else, contributors may appear in the order they were inserted into the db
-					var authors = item
-						.Authors
-						.Select(a => context.Contributors.Local.Single(c => a.Name == c.Name))
-						.ToList();
-
-					book = context.Books.Add(new Book(
-						new AudibleProductId(item.ProductId), item.Title, item.Description, item.LengthInMinutes, authors))
-						.Entity;
-
+					book = createNewBook(item);
 					qtyNew++;
 				}
 
-				// if no narrators listed, author is the narrator
-				if (item.Narrators is null || !item.Narrators.Any())
-					item.Narrators = item.Authors;
-				// nested logic is required so order of names is retained. else, contributors may appear in the order they were inserted into the db
-				var narrators = item
-					.Narrators
-					.Select(n => context.Contributors.Local.Single(c => n.Name == c.Name))
-					.ToList();
-				// not all books have narrators. these will already be using author as narrator. don't undo this
-				if (narrators.Any())
-					book.ReplaceNarrators(narrators);
-
-				// set/update book-specific info which may have changed
-				book.PictureId = item.PictureId;
-				book.UpdateProductRating(item.Product_OverallStars, item.Product_PerformanceStars, item.Product_StoryStars);
-				if (!string.IsNullOrWhiteSpace(item.SupplementUrl))
-					book.AddSupplementDownloadUrl(item.SupplementUrl);
-
-				var publisherName = item.Publisher;
-				if (!string.IsNullOrWhiteSpace(publisherName))
-				{
-					var publisher = context.Contributors.Local.Single(c => publisherName == c.Name);
-					book.ReplacePublisher(publisher);
-				}
-
-				// important to update user-specific info. this will have changed if user has rated/reviewed the book since last library import
-				book.UserDefinedItem.UpdateRating(item.MyUserRating_Overall, item.MyUserRating_Performance, item.MyUserRating_Story);
-
-				//
-				// this was round 1 when it was a 2 step process
-				//
-				//// update series even for existing books. these are occasionally updated
-				//var seriesIds = item.Series.Select(kvp => kvp.SeriesId).ToList();
-				//var allSeries = context.Series.Local.Where(c => seriesIds.Contains(c.AudibleSeriesId)).ToList();
-				//foreach (var series in allSeries)
-				//	book.UpsertSeries(series);
-
-				// these will upsert over library-scraped series, but will not leave orphans
-				if (item.Series != null)
-				{
-					foreach (var seriesEntry in item.Series)
-					{
-						var series = context.Series.Local.Single(s => seriesEntry.SeriesId == s.AudibleSeriesId);
-						book.UpsertSeries(series, seriesEntry.Index);
-					}
-				}
-
-				// categories are laid out for a breadcrumb. category is 1st, subcategory is 2nd
-				var category = context.Categories.Local.SingleOrDefault(c => c.AudibleCategoryId == item.Categories.LastOrDefault().CategoryId);
-				if (category != null)
-					book.UpdateCategory(category, context);
-
-				book.UpdateBookDetails(item.IsAbridged, item.DatePublished);
+				updateBook(item, book);
 			}
 
 			return qtyNew;
 		}
+
+		private Book createNewBook(ImportItem importItem)
+		{
+			var item = importItem.DtoItem;
+
+			// absence of authors is very rare, but possible
+			if (!item.Authors?.Any() ?? true)
+				item.Authors = new[] { new Person { Name = "", Asin = null } };
+
+			// nested logic is required so order of names is retained. else, contributors may appear in the order they were inserted into the db
+			var authors = item
+				.Authors
+				.Select(a => DbContext.Contributors.Local.Single(c => a.Name == c.Name))
+				.ToList();
+
+			var narrators
+				= item.Narrators is null || !item.Narrators.Any()
+				// if no narrators listed, author is the narrator
+				? authors
+				// nested logic is required so order of names is retained. else, contributors may appear in the order they were inserted into the db
+				: item
+					.Narrators
+					.Select(n => DbContext.Contributors.Local.Single(c => n.Name == c.Name))
+					.ToList();
+
+			// categories are laid out for a breadcrumb. category is 1st, subcategory is 2nd
+			// absence of categories is also possible
+
+			// CATEGORY HACK: only use the 1st 2 categories
+			// (real impl: var lastCategory = item.Categories.LastOrDefault()?.CategoryId ?? "";)
+			var lastCategory
+				= item.Categories.Length == 0 ? ""
+				: item.Categories.Length == 1 ? item.Categories[0].CategoryId
+				// 2+
+				: item.Categories[1].CategoryId;
+
+			var category = DbContext.Categories.Local.SingleOrDefault(c => c.AudibleCategoryId == lastCategory);
+
+			var book = DbContext.Books.Add(new Book(
+				new AudibleProductId(item.ProductId),
+				item.Title,
+				item.Description,
+				item.LengthInMinutes,
+				authors,
+				narrators,
+				category,
+				importItem.LocaleName)
+			).Entity;
+
+			var publisherName = item.Publisher;
+			if (!string.IsNullOrWhiteSpace(publisherName))
+			{
+				var publisher = DbContext.Contributors.Local.Single(c => publisherName == c.Name);
+				book.ReplacePublisher(publisher);
+			}
+
+			book.UpdateBookDetails(item.IsAbridged, item.DatePublished);
+
+			if (!string.IsNullOrWhiteSpace(item.SupplementUrl))
+				book.AddSupplementDownloadUrl(item.SupplementUrl);
+
+			return book;
+		}
+
+		private void updateBook(ImportItem importItem, Book book)
+		{
+			var item = importItem.DtoItem;
+
+			// set/update book-specific info which may have changed
+			book.PictureId = item.PictureId;
+			book.UpdateProductRating(item.Product_OverallStars, item.Product_PerformanceStars, item.Product_StoryStars);
+
+			// needed during v3 => v4 migration
+			book.UpdateLocale(importItem.LocaleName);
+
+			// important to update user-specific info. this will have changed if user has rated/reviewed the book since last library import
+			book.UserDefinedItem.UpdateRating(item.MyUserRating_Overall, item.MyUserRating_Performance, item.MyUserRating_Story);
+
+			// update series even for existing books. these are occasionally updated
+			// these will upsert over library-scraped series, but will not leave orphans
+			if (item.Series != null)
+			{
+				foreach (var seriesEntry in item.Series)
+				{
+					var series = DbContext.Series.Local.Single(s => seriesEntry.SeriesId == s.AudibleSeriesId);
+
+					var index = 0f;
+					try
+					{
+						index = seriesEntry.Index;
+					}
+					catch (Exception ex)
+					{
+						Serilog.Log.Logger.Error(ex, $"Error parsing series index. Title: {item.Title}. ASIN: {item.Asin}. Series index: {seriesEntry.Sequence}");
+					}
+
+					book.UpsertSeries(series, index);
+				}
+			}
+		}
 	}
 }

DtoImporterService/CategoryImporter.cs

@@ -9,36 +9,47 @@ namespace DtoImporterService
 {
 	public class CategoryImporter : ItemsImporterBase
 	{
-		public override IEnumerable<Exception> Validate(IEnumerable<Item> items) => new CategoryValidator().Validate(items);
+		public CategoryImporter(LibationContext context) : base(context) { }
 
-		protected override int DoImport(IEnumerable<Item> items, LibationContext context)
+		public override IEnumerable<Exception> Validate(IEnumerable<ImportItem> importItems) => new CategoryValidator().Validate(importItems.Select(i => i.DtoItem));
+
+		protected override int DoImport(IEnumerable<ImportItem> importItems)
 		{
 			// get distinct
-			var categoryIds = items.GetCategoriesDistinct().Select(c => c.CategoryId).ToList();
+			var categoryIds = importItems
+				.Select(i => i.DtoItem)
+				.GetCategoriesDistinct()
+				.Select(c => c.CategoryId).ToList();
 
 			// load db existing => .Local
-			loadLocal_categories(categoryIds, context);
+			loadLocal_categories(categoryIds);
 
 			// upsert
-			var categoryPairs = items.GetCategoryPairsDistinct().ToList();
-			var qtyNew = upsertCategories(categoryPairs, context);
+			var categoryPairs = importItems
+				.Select(i => i.DtoItem)
+				.GetCategoryPairsDistinct()
+				.ToList();
+			var qtyNew = upsertCategories(categoryPairs);
 			return qtyNew;
 		}
 
-		private void loadLocal_categories(List<string> categoryIds, LibationContext context)
+		private void loadLocal_categories(List<string> categoryIds)
 		{
-			var localIds = context.Categories.Local.Select(c => c.AudibleCategoryId);
+			var localIds = DbContext.Categories.Local.Select(c => c.AudibleCategoryId);
 			var remainingCategoryIds = categoryIds
 				.Distinct()
 				.Except(localIds)
 				.ToList();
 
+			// load existing => local
+			// remember to include default/empty/missing
+			var emptyName = Contributor.GetEmpty().Name;
 			if (remainingCategoryIds.Any())
-				context.Categories.Where(c => remainingCategoryIds.Contains(c.AudibleCategoryId)).ToList();
+				DbContext.Categories.Where(c => remainingCategoryIds.Contains(c.AudibleCategoryId) || c.Name == emptyName).ToList();
 		}
 
 		// only use after loading contributors => local
-		private int upsertCategories(List<Ladder[]> categoryPairs, LibationContext context)
+		private int upsertCategories(List<Ladder[]> categoryPairs)
 		{
 			var qtyNew = 0;
 
@@ -46,17 +57,21 @@ namespace DtoImporterService
 			{
 				for (var i = 0; i < pair.Length; i++)
 				{
+					// CATEGORY HACK: not yet supported: depth beyond 0 and 1
+					if (i > 1)
+						break;
+
 					var id = pair[i].CategoryId;
 					var name = pair[i].CategoryName;
 
 					Category parentCategory = null;
 					if (i == 1)
-						parentCategory = context.Categories.Local.Single(c => c.AudibleCategoryId == pair[0].CategoryId);
+						parentCategory = DbContext.Categories.Local.Single(c => c.AudibleCategoryId == pair[0].CategoryId);
 
-					var category = context.Categories.Local.SingleOrDefault(c => c.AudibleCategoryId == id);
+					var category = DbContext.Categories.Local.SingleOrDefault(c => c.AudibleCategoryId == id);
 					if (category is null)
 					{
-						category = context.Categories.Add(new Category(new AudibleCategoryId(id), name)).Entity;
+						category = DbContext.Categories.Add(new Category(new AudibleCategoryId(id), name)).Entity;
 						qtyNew++;
 					}
 

DtoImporterService/ContributorImporter.cs

@@ -9,84 +9,89 @@ namespace DtoImporterService
 {
 	public class ContributorImporter : ItemsImporterBase
 	{
-		public override IEnumerable<Exception> Validate(IEnumerable<Item> items) => new ContributorValidator().Validate(items);
+		public ContributorImporter(LibationContext context) : base(context) { }
 
-		protected override int DoImport(IEnumerable<Item> items, LibationContext context)
+		public override IEnumerable<Exception> Validate(IEnumerable<ImportItem> importItems) => new ContributorValidator().Validate(importItems.Select(i => i.DtoItem));
+
+		protected override int DoImport(IEnumerable<ImportItem> importItems)
 		{
 			// get distinct
-			var authors = items.GetAuthorsDistinct().ToList();
-			var narrators = items.GetNarratorsDistinct().ToList();
-			var publishers = items.GetPublishersDistinct().ToList();
+			var authors = importItems
+				.Select(i => i.DtoItem)
+				.GetAuthorsDistinct()
+				.ToList();
+			var narrators = importItems
+				.Select(i => i.DtoItem)
+				.GetNarratorsDistinct()
+				.ToList();
+			var publishers = importItems
+				.Select(i => i.DtoItem)
+				.GetPublishersDistinct()
+				.ToList();
 
 			// load db existing => .Local
-			var allNames = authors
-				.Select(a => a.Name)
+			var allNames = publishers
+				.Union(authors.Select(n => n.Name))
 				.Union(narrators.Select(n => n.Name))
-				.Union(publishers)
+				.Where(name => !string.IsNullOrWhiteSpace(name))
 				.ToList();
-			loadLocal_contributors(allNames, context);
+			loadLocal_contributors(allNames);
 
 			// upsert
 			var qtyNew = 0;
-			qtyNew += upsertPeople(authors, context);
-			qtyNew += upsertPeople(narrators, context);
-			qtyNew += upsertPublishers(publishers, context);
+			qtyNew += upsertPeople(authors);
+			qtyNew += upsertPeople(narrators);
+			qtyNew += upsertPublishers(publishers);
 			return qtyNew;
 		}
 
-		private void loadLocal_contributors(List<string> contributorNames, LibationContext context)
+		private void loadLocal_contributors(List<string> contributorNames)
 		{
-			contributorNames.Remove(null);
-			contributorNames.Remove("");
-
 			//// BAD: very inefficient
 			// var x = context.Contributors.Local.Where(c => !contribNames.Contains(c.Name));
 
 			// GOOD: Except() is efficient. Due to hashing, it's close to O(n)
-			var localNames = context.Contributors.Local.Select(c => c.Name);
+			var localNames = DbContext.Contributors.Local.Select(c => c.Name);
 			var remainingContribNames = contributorNames
 				.Distinct()
 				.Except(localNames)
 				.ToList();
 
 			// load existing => local
+			// remember to include default/empty/missing
+			var emptyName = Contributor.GetEmpty().Name;
 			if (remainingContribNames.Any())
-				context.Contributors.Where(c => remainingContribNames.Contains(c.Name)).ToList();
-			// _________________________________^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-			// i tried to extract this pattern, but this part prohibits doing so
-			// wouldn't work anyway for Books.GetBooks()
+				DbContext.Contributors.Where(c => remainingContribNames.Contains(c.Name) || c.Name == emptyName).ToList();
 		}
 
 		// only use after loading contributors => local
-		private int upsertPeople(List<Person> people, LibationContext context)
+		private int upsertPeople(List<Person> people)
 		{
 			var qtyNew = 0;
 
 			foreach (var p in people)
 			{
-				var person = context.Contributors.Local.SingleOrDefault(c => c.Name == p.Name);
+				var person = DbContext.Contributors.Local.SingleOrDefault(c => c.Name == p.Name);
 				if (person == null)
 				{
-					person = context.Contributors.Add(new Contributor(p.Name)).Entity;
+					person = DbContext.Contributors.Add(new Contributor(p.Name, p.Asin)).Entity;
 					qtyNew++;
 				}
-
-				person.UpdateAudibleAuthorId(p.Asin);
 			}
 
 			return qtyNew;
 		}
 
 		// only use after loading contributors => local
-		private int upsertPublishers(List<string> publishers, LibationContext context)
+		private int upsertPublishers(List<string> publishers)
 		{
 			var qtyNew = 0;
 
 			foreach (var publisherName in publishers)
 			{
-				if (context.Contributors.Local.SingleOrDefault(c => c.Name == publisherName) == null)
+				if (DbContext.Contributors.Local.SingleOrDefault(c => c.Name == publisherName) == null)
 				{
-					context.Contributors.Add(new Contributor(publisherName));
+					DbContext.Contributors.Add(new Contributor(publisherName));
 					qtyNew++;
 				}
 			}

DtoImporterService/DtoImporterService.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.1</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

DtoImporterService/ImporterBase.cs

@@ -1,44 +1,57 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using AudibleApiDTOs;
 using DataLayer;
+using Dinah.Core;
+using InternalUtilities;
 
 namespace DtoImporterService
 {
-	public interface IContextRunner<T>
+	public abstract class ImporterBase<T>
 	{
-		public TResult Run<TResult>(Func<T, LibationContext, TResult> func, T param, LibationContext context = null)
+		protected LibationContext DbContext { get; }
+
+		protected ImporterBase(LibationContext context)
 		{
-			if (context is null)
+			ArgumentValidator.EnsureNotNull(context, nameof(context));
+			DbContext = context;
+		}
+
+		/// <summary>LONG RUNNING. call with await Task.Run</summary>
+		public int Import(T param) => Run(DoImport, param);
+
+		public TResult Run<TResult>(Func<T, TResult> func, T param)
+		{
+			try
 			{
-				using (context = LibationContext.Create())
-				{
-					var r = Run(func, param, context);
-					context.SaveChanges();
-					return r;
-				}
+				var exceptions = Validate(param);
+				if (exceptions != null && exceptions.Any())
+					throw new AggregateException($"Importer validation failed", exceptions);
+			}
+			catch (Exception ex)
+			{
+				Serilog.Log.Logger.Error(ex, "Import error: validation");
+				throw;
 			}
 
-			var exceptions = Validate(param);
-			if (exceptions != null && exceptions.Any())
-				throw new AggregateException($"Device Jobs Service configuration validation failed", exceptions);
-
-			var result = func(param, context);
-			return result;
+			try
+			{
+				var result = func(param);
+				return result;
+			}
+			catch (Exception ex)
+			{
+				Serilog.Log.Logger.Error(ex, "Import error: post-validation importing");
+				throw;
+			}
 		}
-		IEnumerable<Exception> Validate(T param);
-	}
 
-	public abstract class ImporterBase<T> : IContextRunner<T>
-	{
-		/// <summary>LONG RUNNING. call with await Task.Run</summary>
-		public int Import(T param, LibationContext context = null)
-			=> ((IContextRunner<T>)this).Run(DoImport, param, context);
-
-		protected abstract int DoImport(T elements, LibationContext context);
+		protected abstract int DoImport(T elements);
 		public abstract IEnumerable<Exception> Validate(T param);
 	}
 
-	public abstract class ItemsImporterBase : ImporterBase<IEnumerable<Item>> { }
+	public abstract class ItemsImporterBase : ImporterBase<IEnumerable<ImportItem>>
+	{
+		protected ItemsImporterBase(LibationContext context) : base(context) { }
+	}
 }

DtoImporterService/LibraryImporter.cs

@@ -9,27 +9,50 @@ namespace DtoImporterService
 {
 	public class LibraryImporter : ItemsImporterBase
 	{
-		public override IEnumerable<Exception> Validate(IEnumerable<Item> items) => new LibraryValidator().Validate(items);
+		public LibraryImporter(LibationContext context) : base(context) { }
 
-		protected override int DoImport(IEnumerable<Item> items, LibationContext context)
+		public override IEnumerable<Exception> Validate(IEnumerable<ImportItem> importItems) => new LibraryValidator().Validate(importItems.Select(i => i.DtoItem));
+
+		protected override int DoImport(IEnumerable<ImportItem> importItems)
 		{
-			new BookImporter().Import(items, context);
+			new BookImporter(DbContext).Import(importItems);
 
-			var qtyNew = upsertLibraryBooks(items, context);
+			var qtyNew = upsertLibraryBooks(importItems);
 			return qtyNew;
 		}
 
-		private int upsertLibraryBooks(IEnumerable<Item> items, LibationContext context)
+		private int upsertLibraryBooks(IEnumerable<ImportItem> importItems)
 		{
-			var currentLibraryProductIds = context.Library.Select(l => l.Book.AudibleProductId).ToList();
-			var newItems = items.Where(dto => !currentLibraryProductIds.Contains(dto.ProductId)).ToList();
+			// technically, we should be able to have duplicate books from separate accounts.
+			// this would violate the current pk and would be difficult to deal with elsewhere:
+			// - what to show in the grid
+			// - which to consider liberated
+			//
+			// sqlite cannot alter pk. the work around is an extensive headache. it'll be fixed in pre .net5/efcore5
+			//
+			// currently, inserting LibraryBook will throw error if the same book is in multiple accounts for the same region.
+			//
+			// CURRENT SOLUTION: don't re-insert
+
+			var currentLibraryProductIds = DbContext.Library.Select(l => l.Book.AudibleProductId).ToList();
+			var newItems = importItems.Where(dto => !currentLibraryProductIds.Contains(dto.DtoItem.ProductId)).ToList();
 
 			foreach (var newItem in newItems)
 			{
 				var libraryBook = new LibraryBook(
-					context.Books.Local.Single(b => b.AudibleProductId == newItem.ProductId),
-					newItem.DateAdded);
-				context.Library.Add(libraryBook);
+					DbContext.Books.Local.Single(b => b.AudibleProductId == newItem.DtoItem.ProductId),
+					newItem.DtoItem.DateAdded,
+					newItem.AccountId);
+				DbContext.Library.Add(libraryBook);
+			}
+
+			// needed for v3 => v4 upgrade
+			var toUpdate = DbContext.Library.Where(l => l.Account == null);
+			foreach (var u in toUpdate)
+			{
+				var item = importItems.FirstOrDefault(ii => ii.DtoItem.ProductId == u.Book.AudibleProductId);
+				if (item != null)
+					u.UpdateAccount(item.AccountId);
 			}
 
 			var qtyNew = newItems.Count;

DtoImporterService/SeriesImporter.cs

@@ -9,44 +9,49 @@ namespace DtoImporterService
 {
 	public class SeriesImporter : ItemsImporterBase
 	{
-		public override IEnumerable<Exception> Validate(IEnumerable<Item> items) => new SeriesValidator().Validate(items);
+		public SeriesImporter(LibationContext context) : base(context) { }
 
-		protected override int DoImport(IEnumerable<Item> items, LibationContext context)
+		public override IEnumerable<Exception> Validate(IEnumerable<ImportItem> importItems) => new SeriesValidator().Validate(importItems.Select(i => i.DtoItem));
+
+		protected override int DoImport(IEnumerable<ImportItem> importItems)
 		{
 			// get distinct
-			var series = items.GetSeriesDistinct().ToList();
+			var series = importItems
+				.Select(i => i.DtoItem)
+				.GetSeriesDistinct()
+				.ToList();
 
 			// load db existing => .Local
-			var seriesIds = series.Select(s => s.SeriesId).ToList();
-			loadLocal_series(seriesIds, context);
+			loadLocal_series(series);
 
 			// upsert
-			var qtyNew = upsertSeries(series, context);
+			var qtyNew = upsertSeries(series);
 			return qtyNew;
 		}
 
-		private void loadLocal_series(List<string> seriesIds, LibationContext context)
+		private void loadLocal_series(List<AudibleApiDTOs.Series> series)
 		{
-			var localIds = context.Series.Local.Select(s => s.AudibleSeriesId);
+			var seriesIds = series.Select(s => s.SeriesId).ToList();
+			var localIds = DbContext.Series.Local.Select(s => s.AudibleSeriesId).ToList();
 			var remainingSeriesIds = seriesIds
 				.Distinct()
 				.Except(localIds)
 				.ToList();
 
 			if (remainingSeriesIds.Any())
-				context.Series.Where(s => remainingSeriesIds.Contains(s.AudibleSeriesId)).ToList();
+				DbContext.Series.Where(s => remainingSeriesIds.Contains(s.AudibleSeriesId)).ToList();
 		}
 
-		private int upsertSeries(List<AudibleApiDTOs.Series> requestedSeries, LibationContext context)
+		private int upsertSeries(List<AudibleApiDTOs.Series> requestedSeries)
 		{
 			var qtyNew = 0;
 
 			foreach (var s in requestedSeries)
 			{
-				var series = context.Series.Local.SingleOrDefault(c => c.AudibleSeriesId == s.SeriesId);
+				var series = DbContext.Series.Local.SingleOrDefault(c => c.AudibleSeriesId == s.SeriesId);
 				if (series is null)
 				{
-					series = context.Series.Add(new DataLayer.Series(new AudibleSeriesId(s.SeriesId))).Entity;
+					series = DbContext.Series.Add(new DataLayer.Series(new AudibleSeriesId(s.SeriesId))).Entity;
 					qtyNew++;
 				}
 				series.UpdateName(s.SeriesName);

FileLiberator/BackupBook.cs

@@ -17,45 +17,39 @@ namespace FileLiberator
     /// </summary>
     public class BackupBook : IProcessable
     {
-        public event EventHandler<string> Begin;
+        public event EventHandler<LibraryBook> Begin;
         public event EventHandler<string> StatusUpdate;
-        public event EventHandler<string> Completed;
+        public event EventHandler<LibraryBook> Completed;
 
         public DownloadBook DownloadBook { get; } = new DownloadBook();
         public DecryptBook DecryptBook { get; } = new DecryptBook();
 		public DownloadPdf DownloadPdf { get; } = new DownloadPdf();
 
-		// ValidateAsync() doesn't need UI context
-		public async Task<bool> ValidateAsync(LibraryBook libraryBook)
-            => await validateAsync_ConfigureAwaitFalse(libraryBook.Book.AudibleProductId).ConfigureAwait(false);
-        private async Task<bool> validateAsync_ConfigureAwaitFalse(string productId)
-            => !await AudibleFileStorage.Audio.ExistsAsync(productId);
+		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)
         {
-			var productId = libraryBook.Book.AudibleProductId;
-            var displayMessage = $"[{productId}] {libraryBook.Book.Title}";
-
-            Begin?.Invoke(this, displayMessage);
+            Begin?.Invoke(this, libraryBook);
 
             try
 			{
 				{
-					var statusHandler = await processAsync(libraryBook, AudibleFileStorage.AAX, DownloadBook);
+					var statusHandler = await DownloadBook.TryProcessAsync(libraryBook);
 					if (statusHandler.HasErrors)
 						return statusHandler;
 				}
 
 				{
-					var statusHandler = await processAsync(libraryBook, AudibleFileStorage.Audio, DecryptBook);
+					var statusHandler = await DecryptBook.TryProcessAsync(libraryBook);
 					if (statusHandler.HasErrors)
 						return statusHandler;
 				}
 
 				{
-					var statusHandler = await processAsync(libraryBook, AudibleFileStorage.PDF, DownloadPdf);
+					var statusHandler = await DownloadPdf.TryProcessAsync(libraryBook);
 					if (statusHandler.HasErrors)
 						return statusHandler;
 				}
@@ -64,13 +58,8 @@ namespace FileLiberator
 			}
 			finally
             {
-                Completed?.Invoke(this, displayMessage);
+                Completed?.Invoke(this, libraryBook);
             }
         }
-
-		private static async Task<StatusHandler> processAsync(LibraryBook libraryBook, AudibleFileStorage afs, IProcessable processable)
-			=> !await afs.ExistsAsync(libraryBook.Book.AudibleProductId)
-			? await processable.ProcessAsync(libraryBook)
-			: new StatusHandler();
 	}
 }

FileLiberator/DecryptBook.cs

@@ -0,0 +1,205 @@
+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

@@ -0,0 +1,122 @@
+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/DownloadFile.cs

@@ -0,0 +1,35 @@
+using System;
+using System.Net.Http;
+using System.Threading.Tasks;
+using Dinah.Core.Net.Http;
+
+namespace FileLiberator
+{
+	// frustratingly copy pasta from DownloadableBase and DownloadPdf
+	public class DownloadFile : IDownloadable
+	{
+		public event EventHandler<string> DownloadBegin;
+		public event EventHandler<DownloadProgress> DownloadProgressChanged;
+		public event EventHandler<string> DownloadCompleted;
+
+		public async Task<string> PerformDownloadFileAsync(string downloadUrl, string proposedDownloadFilePath)
+		{
+			var client = new HttpClient();
+
+			var progress = new Progress<DownloadProgress>();
+			progress.ProgressChanged += (_, e) => DownloadProgressChanged?.Invoke(this, e);
+
+			DownloadBegin?.Invoke(this, proposedDownloadFilePath);
+
+			try
+			{
+				var actualDownloadedFilePath = await client.DownloadFileAsync(downloadUrl, proposedDownloadFilePath, progress);
+				return actualDownloadedFilePath;
+			}
+			finally
+			{
+				DownloadCompleted?.Invoke(this, proposedDownloadFilePath);
+			}
+		}
+	}
+}

FileLiberator/DownloadPdf.cs

@@ -0,0 +1,62 @@
+using System;
+using System.IO;
+using System.Linq;
+using System.Net.Http;
+using System.Threading.Tasks;
+using DataLayer;
+using Dinah.Core.ErrorHandling;
+using Dinah.Core.Net.Http;
+using FileManager;
+
+namespace FileLiberator
+{
+	public class DownloadPdf : DownloadableBase
+	{
+		public override bool Validate(LibraryBook libraryBook)
+			=> !string.IsNullOrWhiteSpace(getdownloadUrl(libraryBook))
+			&& !AudibleFileStorage.PDF.Exists(libraryBook.Book.AudibleProductId);
+
+		public override async Task<StatusHandler> ProcessItemAsync(LibraryBook libraryBook)
+		{
+			var proposedDownloadFilePath = getProposedDownloadFilePath(libraryBook);
+			await downloadPdfAsync(libraryBook, proposedDownloadFilePath);
+			return verifyDownload(libraryBook);
+		}
+
+		private static StatusHandler verifyDownload(LibraryBook libraryBook)
+			=> !AudibleFileStorage.PDF.Exists(libraryBook.Book.AudibleProductId)
+			? new StatusHandler { "Downloaded PDF cannot be found" }
+			: new StatusHandler();
+
+		private static string getProposedDownloadFilePath(LibraryBook libraryBook)
+		{
+			// if audio file exists, get it's dir. else return base Book dir
+			var existingPath = Path.GetDirectoryName(AudibleFileStorage.Audio.GetPath(libraryBook.Book.AudibleProductId));
+			var file = getdownloadUrl(libraryBook);
+
+			if (existingPath != null)
+				return Path.Combine(existingPath, Path.GetFileName(file));
+
+			var full = FileUtility.GetValidFilename(
+				AudibleFileStorage.PDF.StorageDirectory,
+				libraryBook.Book.Title,
+				Path.GetExtension(file),
+				libraryBook.Book.AudibleProductId);
+			return full;
+		}
+
+		private async Task downloadPdfAsync(LibraryBook libraryBook, string proposedDownloadFilePath)
+		{
+			var api = await GetApiAsync(libraryBook);
+			var downloadUrl = await api.GetPdfDownloadLinkAsync(libraryBook.Book.AudibleProductId);
+
+			var client = new HttpClient();
+			var actualDownloadedFilePath = await PerformDownloadAsync(
+				proposedDownloadFilePath,
+				(p) => client.DownloadFileAsync(downloadUrl, proposedDownloadFilePath, p));
+		}
+
+		private static string getdownloadUrl(LibraryBook libraryBook)
+			=> libraryBook?.Book?.Supplements?.FirstOrDefault()?.Url;
+	}
+}

FileLiberator/DownloadableBase.cs

@@ -6,10 +6,10 @@ using Dinah.Core.Net.Http;
 
 namespace FileLiberator
 {
-	public abstract class DownloadableBase : IDownloadable
+	public abstract class DownloadableBase : IDownloadableProcessable
 	{
-		public event EventHandler<string> Begin;
-		public event EventHandler<string> Completed;
+		public event EventHandler<LibraryBook> Begin;
+		public event EventHandler<LibraryBook> Completed;
 
 		public event EventHandler<string> DownloadBegin;
 		public event EventHandler<DownloadProgress> DownloadProgressChanged;
@@ -18,7 +18,7 @@ namespace FileLiberator
 		public event EventHandler<string> StatusUpdate;
 		protected void Invoke_StatusUpdate(string message) => StatusUpdate?.Invoke(this, message);
 
-        public abstract Task<bool> ValidateAsync(LibraryBook libraryBook);
+        public abstract bool Validate(LibraryBook libraryBook);
 
         public abstract Task<StatusHandler> ProcessItemAsync(LibraryBook libraryBook);
 
@@ -26,9 +26,7 @@ namespace FileLiberator
 		// often calls events which prints to forms in the UI context
 		public async Task<StatusHandler> ProcessAsync(LibraryBook libraryBook)
         {
-            var displayMessage = $"[{libraryBook.Book.AudibleProductId}] {libraryBook.Book.Title}";
-
-            Begin?.Invoke(this, displayMessage);
+            Begin?.Invoke(this, libraryBook);
 
             try
             {
@@ -36,10 +34,13 @@ namespace FileLiberator
             }
             finally
             {
-                Completed?.Invoke(this, displayMessage);
+                Completed?.Invoke(this, libraryBook);
             }
         }
 
+		protected static Task<AudibleApi.Api> GetApiAsync(LibraryBook libraryBook)
+			=> InternalUtilities.AudibleApiActions.GetApiAsync(libraryBook.Account, libraryBook.Book.Locale);
+
 		protected async Task<string> PerformDownloadAsync(string proposedDownloadFilePath, Func<Progress<DownloadProgress>, Task<string>> func)
 		{
 			var progress = new Progress<DownloadProgress>();

FileLiberator/DownloadedChapters.cs

@@ -0,0 +1,22 @@
+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

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.1</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

FileLiberator/IDownloadable.cs

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

FileLiberator/IDownloadableProcessable.cs

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

FileLiberator/IProcessable.cs

@@ -7,15 +7,15 @@ namespace FileLiberator
 {
     public interface IProcessable
     {
-        event EventHandler<string> Begin;
+        event EventHandler<LibraryBook> Begin;
 
         /// <summary>General string message to display. DON'T rely on this for success, failure, or control logic</summary>
         event EventHandler<string> StatusUpdate;
 
-        event EventHandler<string> Completed;
+        event EventHandler<LibraryBook> Completed;
 
-        /// <returns>True == Valid</returns>
-        Task<bool> ValidateAsync(LibraryBook libraryBook);
+		/// <returns>True == Valid</returns>
+		bool Validate(LibraryBook libraryBook);
 
         /// <returns>True == success</returns>
         Task<StatusHandler> ProcessAsync(LibraryBook libraryBook);

FileLiberator/IProcessableExt.cs

@@ -0,0 +1,66 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using ApplicationServices;
+using DataLayer;
+using Dinah.Core;
+using Dinah.Core.ErrorHandling;
+
+namespace FileLiberator
+{
+    public static class IProcessableExt
+    {
+        //
+        // DO NOT USE ConfigureAwait(false) WITH ProcessAsync() unless ensuring ProcessAsync() implementation is cross-thread compatible
+        // ProcessAsync() often does a lot with forms in the UI context
+        //
+
+
+        // when used in foreach: stateful. deferred execution
+        public static IEnumerable<LibraryBook> GetValidLibraryBooks(this IProcessable processable)
+            => DbContexts.GetContext()
+            .GetLibrary_Flat_NoTracking()
+            .Where(libraryBook => processable.Validate(libraryBook));
+
+        public static LibraryBook GetSingleLibraryBook(string productId)
+        {
+            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))
+                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
+            {
+                libraryBook.Book.Title,
+                libraryBook.Book.AudibleProductId,
+                libraryBook.Book.Locale,
+                Account = libraryBook.Account?.ToMask() ?? "[empty]"
+            });
+
+            var status
+                = (await processable.ProcessAsync(libraryBook))
+                ?? new StatusHandler { "Processable should never return a null status" };
+
+            return status;
+        }
+
+		public static async Task<StatusHandler> TryProcessAsync(this IProcessable processable, LibraryBook libraryBook)
+			=> processable.Validate(libraryBook)
+			? await processable.ProcessAsync(libraryBook)
+			: new StatusHandler();
+	}
+}

FileLiberator/UNTESTED/DecryptBook.cs

@@ -1,165 +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;
-
-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<string> 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<string> Completed;
-
-        // ValidateAsync() doesn't need UI context
-        public async Task<bool> ValidateAsync(LibraryBook libraryBook)
-            => await validateAsync_ConfigureAwaitFalse(libraryBook.Book.AudibleProductId).ConfigureAwait(false);
-        private async Task<bool> validateAsync_ConfigureAwaitFalse(string productId)
-            => await AudibleFileStorage.AAX.ExistsAsync(productId)
-            && !await AudibleFileStorage.Audio.ExistsAsync(productId);
-
-		// 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)
-        {
-            var displayMessage = $"[{libraryBook.Book.AudibleProductId}] {libraryBook.Book.Title}";
-
-            Begin?.Invoke(this, displayMessage);
-
-            try
-            {
-                var aaxFilename = await AudibleFileStorage.AAX.GetAsync(libraryBook.Book.AudibleProductId);
-
-                if (aaxFilename == null)
-                    return new StatusHandler { "aaxFilename parameter is null" };
-                if (!FileUtility.FileExists(aaxFilename))
-                    return new StatusHandler { $"Cannot find AAX file: {aaxFilename}" };
-                if (await AudibleFileStorage.Audio.ExistsAsync(libraryBook.Book.AudibleProductId))
-                    return new StatusHandler { "Cannot find decrypt. Final audio file already exists" };
-
-                var proposedOutputFile = Path.Combine(AudibleFileStorage.DecryptInProgress, $"[{libraryBook.Book.AudibleProductId}].m4b");
-                var outputAudioFilename = await aaxToM4bConverterDecrypt(proposedOutputFile, aaxFilename);
-
-                // decrypt failed
-                if (outputAudioFilename == null)
-                    return new StatusHandler { "Decrypt failed" };
-
-                moveFilesToBooksDir(libraryBook.Book, outputAudioFilename);
-
-                Dinah.Core.IO.FileExt.SafeDelete(aaxFilename);
-
-                var statusHandler = new StatusHandler();
-                var finalAudioExists = await AudibleFileStorage.Audio.ExistsAsync(libraryBook.Book.AudibleProductId);
-                if (!finalAudioExists)
-                    statusHandler.AddError("Cannot find final audio file after decryption");
-                return statusHandler;
-            }
-            finally
-            {
-                Completed?.Invoke(this, displayMessage);
-            }
-        }
-
-        private async Task<string> aaxToM4bConverterDecrypt(string proposedOutputFile, string aaxFilename)
-        {
-            DecryptBegin?.Invoke(this, $"Begin decrypting {aaxFilename}");
-
-            try
-            {
-                var converter = await AaxToM4bConverter.CreateAsync(aaxFilename, Configuration.Instance.DecryptKey);
-                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);
-
-                converter.SetOutputFilename(proposedOutputFile);
-                converter.DecryptProgressUpdate += (s, progress) => UpdateProgress?.Invoke(this, progress);
-
-                // REAL WORK DONE HERE
-                var success = await Task.Run(() => converter.Run());
-
-                if (!success)
-                {
-                    Console.WriteLine("decrypt failed");
-                    return null;
-                }
-
-                Configuration.Instance.DecryptKey = converter.decryptKey;
-
-                return converter.outputFileName;
-            }
-            finally
-            {
-                DecryptCompleted?.Invoke(this, $"Completed decrypting {aaxFilename}");
-            }
-        }
-
-        private static void moveFilesToBooksDir(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();
-
-            // create final directory. move each file into it. MOVE AUDIO FILE LAST
-            // new dir: safetitle_limit50char + " [" + productId + "]"
-
-            // to prevent the paths from getting too long, we don't need after the 1st ":" for the folder
-            var underscoreIndex = product.Title.IndexOf(':');
-            var titleDir = (underscoreIndex < 4) ? product.Title : product.Title.Substring(0, underscoreIndex);
-            var finalDir = FileUtility.GetValidFilename(AudibleFileStorage.BooksDirectory, titleDir, null, product.AudibleProductId);
-            Directory.CreateDirectory(finalDir);
-
-            // move audio files to the end of the collection so these files are moved last
-            var musicFiles = files.Where(f => AudibleFileStorage.Audio.IsFileTypeMatch(f));
-            files = files
-                .Except(musicFiles)
-                .Concat(musicFiles)
-                .ToList();
-
-            var musicFileExt = musicFiles
-                .Select(f => f.Extension)
-                .Distinct()
-                .Single()
-                .Trim('.');
-
-            foreach (var f in files)
-            {
-                var dest = AudibleFileStorage.Audio.IsFileTypeMatch(f)
-                    // audio filename: safetitle_limit50char + " [" + productId + "]." + audio_ext
-                    ? FileUtility.GetValidFilename(finalDir, product.Title, musicFileExt, product.AudibleProductId)
-                    // non-audio filename: safetitle_limit50char + " [" + productId + "][" + audio_ext +"]." + non_audio_ext
-                    : FileUtility.GetValidFilename(finalDir, product.Title, f.Extension, product.AudibleProductId, musicFileExt);
-
-                File.Move(f.FullName, dest);
-            }
-        }
-    }
-}

FileLiberator/UNTESTED/DownloadBook.cs

@@ -1,66 +0,0 @@
-using System;
-using System.IO;
-using System.Threading.Tasks;
-using DataLayer;
-using Dinah.Core.ErrorHandling;
-using FileManager;
-
-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
-    {
-        public override async Task<bool> ValidateAsync(LibraryBook libraryBook)
-            => !await AudibleFileStorage.Audio.ExistsAsync(libraryBook.Book.AudibleProductId)
-            && !await AudibleFileStorage.AAX.ExistsAsync(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 await verifyDownloadAsync(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)
-		{
-			var api = await AudibleApi.EzApiCreator.GetApiAsync(AudibleApiStorage.IdentityTokensFile);
-
-			var actualFilePath = await PerformDownloadAsync(
-				tempAaxFilename,
-				(p) => api.DownloadAaxWorkaroundAsync(libraryBook.Book.AudibleProductId, tempAaxFilename, p));
-
-			return actualFilePath;
-		}
-
-		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 async Task<StatusHandler> verifyDownloadAsync(LibraryBook libraryBook)
-			=> !await AudibleFileStorage.AAX.ExistsAsync(libraryBook.Book.AudibleProductId)
-			? new StatusHandler { "Downloaded AAX file cannot be found" }
-			: new StatusHandler();
-	}
-}

FileLiberator/UNTESTED/DownloadPdf.cs

@@ -1,57 +0,0 @@
-using System;
-using System.IO;
-using System.Linq;
-using System.Net.Http;
-using System.Threading.Tasks;
-using DataLayer;
-using Dinah.Core.ErrorHandling;
-using Dinah.Core.Net.Http;
-using FileManager;
-
-namespace FileLiberator
-{
-	public class DownloadPdf : DownloadableBase
-	{
-		public override async Task<bool> ValidateAsync(LibraryBook libraryBook)
-		{
-			if (string.IsNullOrWhiteSpace(getdownloadUrl(libraryBook)))
-				return false;
-
-			return !await AudibleFileStorage.PDF.ExistsAsync(libraryBook.Book.AudibleProductId);
-		}
-
-		private static string getdownloadUrl(LibraryBook libraryBook)
-			=> libraryBook?.Book?.Supplements?.FirstOrDefault()?.Url;
-
-		public override async Task<StatusHandler> ProcessItemAsync(LibraryBook libraryBook)
-		{
-			var proposedDownloadFilePath = await getProposedDownloadFilePathAsync(libraryBook);
-			await downloadPdfAsync(libraryBook, proposedDownloadFilePath);
-			return await verifyDownloadAsync(libraryBook);
-		}
-
-		private static async Task<string> getProposedDownloadFilePathAsync(LibraryBook libraryBook)
-		{
-			// if audio file exists, get it's dir. else return base Book dir
-			var destinationDir =
-				// this is safe b/c GetDirectoryName(null) == null
-				Path.GetDirectoryName(await AudibleFileStorage.Audio.GetAsync(libraryBook.Book.AudibleProductId))
-				?? AudibleFileStorage.PDF.StorageDirectory;
-
-			return Path.Combine(destinationDir, Path.GetFileName(getdownloadUrl(libraryBook)));
-		}
-
-		private async Task downloadPdfAsync(LibraryBook libraryBook, string proposedDownloadFilePath)
-		{
-			var client = new HttpClient();
-			var actualDownloadedFilePath = await PerformDownloadAsync(
-				proposedDownloadFilePath,
-				(p) => client.DownloadFileAsync(getdownloadUrl(libraryBook), proposedDownloadFilePath, p));
-		}
-
-		private static async Task<StatusHandler> verifyDownloadAsync(LibraryBook libraryBook)
-			=> !await AudibleFileStorage.PDF.ExistsAsync(libraryBook.Book.AudibleProductId)
-			? new StatusHandler { "Downloaded PDF cannot be found" }
-			: new StatusHandler();
-	}
-}

FileLiberator/UNTESTED/IProcessableExt.cs

@@ -1,44 +0,0 @@
-using System;
-using System.Threading.Tasks;
-using DataLayer;
-using Dinah.Core.ErrorHandling;
-
-namespace FileLiberator
-{
-    public static class IProcessableExt
-    {
-        //
-        // DO NOT USE ConfigureAwait(false) WITH ProcessAsync() unless ensuring ProcessAsync() implementation is cross-thread compatible
-        // - ValidateAsync() doesn't need UI context. however, each class already uses ConfigureAwait(false)
-        // - ProcessAsync() often does a lot with forms in the UI context
-        //
-
-
-        /// <summary>Process the first valid product. Create default context</summary>
-        /// <returns>Returns either the status handler from the process, or null if all books have been processed</returns>
-        public static async Task<StatusHandler> ProcessFirstValidAsync(this IProcessable processable)
-        {
-            var libraryBook = await processable.GetNextValidAsync();
-            if (libraryBook == null)
-                return null;
-
-			// this should never happen. check anyway. ProcessFirstValidAsync returning null is the signal that we're done. we can't let another IProcessable accidentally send this commans
-			var status = await processable.ProcessAsync(libraryBook);
-            if (status == null)
-                throw new Exception("Processable should never return a null status");
-
-            return status;
-        }
-
-        public static async Task<LibraryBook> GetNextValidAsync(this IProcessable processable)
-        {
-            var libraryBooks = LibraryQueries.GetLibrary_Flat_NoTracking();
-
-            foreach (var libraryBook in libraryBooks)
-                if (await processable.ValidateAsync(libraryBook))
-                    return libraryBook;
-
-            return null;
-        }
-    }
-}

FileManager/AudibleFileStorage.cs

@@ -0,0 +1,179 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text.RegularExpressions;
+using Dinah.Core;
+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 }
+
+	/// <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; }
+		public abstract string StorageDirectory { get; }
+
+		#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");
+                return Directory.CreateDirectory(Configuration.Instance.Books).FullName;
+            }
+        }
+        #endregion
+
+        #region instance
+        public FileType FileType => (FileType)Value;
+
+		private 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}");
+		}
+
+        /// <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)
+        {
+            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));
+
+			if (firstOrNull is null)
+				return null;
+
+			FilePathCache.Upsert(productId, FileType, firstOrNull);
+			return firstOrNull;
+        }
+
+        public string GetDestDir(string title, string asin)
+        {
+            // to prevent the paths from getting too long, we don't need after the 1st ":" for the folder
+            var underscoreIndex = title.IndexOf(':');
+            var titleDir
+                = underscoreIndex < 4
+                ? title
+                : title.Substring(0, underscoreIndex);
+            var finalDir = FileUtility.GetValidFilename(StorageDirectory, titleDir, null, asin);
+            return finalDir;
+        }
+
+        public bool IsFileTypeMatch(FileInfo fileInfo)
+            => extensions_noDots.ContainsInsensative(fileInfo.Extension.Trim('.'));
+        #endregion
+    }
+
+    public class AudioFileStorage : AudibleFileStorage
+    {
+        public const string SKIP_FILE_EXT = "libhack";
+
+		public override string[] Extensions { get; } = new[] { "m4b", "mp3", "aac", "mp4", "m4a", "ogg", "flac", SKIP_FILE_EXT };
+
+        // 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 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) { }
+    }
+}

FileManager/Configuration.cs

@@ -0,0 +1,190 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.IO;
+using System.Linq;
+using Dinah.Core;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+
+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
+            => File.Exists(APPSETTINGS_JSON)
+            && File.Exists(SettingsFilePath)
+            && Directory.Exists(LibationFiles)
+            && Directory.Exists(Books);
+
+        public string SettingsFilePath => Path.Combine(LibationFiles, "Settings.json");
+
+        [Description("Location for book storage. Includes destination of newly liberated books")]
+        public string Books
+        {
+            get => persistentDictionary.GetString(nameof(Books));
+            set => persistentDictionary.Set(nameof(Books), value);
+        }
+
+        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"));
+
+        private Dictionary<string, string> wellKnownPaths { get; } = new Dictionary<string, string>
+        {
+            [APP_DIR] = AppDir,
+            ["MyDocs"] = MyDocs,
+            ["WinTemp"] = WinTemp
+        };
+        private string libationFilesPathCache;
+
+        // 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;
+        }
+
+        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 static string GetDescription(string propertyName)
+        {
+            var attribute = typeof(Configuration)
+                .GetProperty(propertyName)
+                ?.GetCustomAttributes(typeof(DescriptionAttribute), true)
+                .SingleOrDefault()
+                as DescriptionAttribute;
+
+            return attribute?.Description;
+        }
+
+        public bool TrySetLibationFiles(string directory)
+        {
+            if (!Directory.Exists(directory) && !wellKnownPaths.ContainsKey(directory))
+                return false;
+
+            // if moving from default, delete old settings file and dir (if empty)
+            if (LibationFiles.EqualsInsensitive(AppDir))
+            {
+                File.Delete(SettingsFilePath);
+                System.Threading.Thread.Sleep(100);
+                if (!Directory.EnumerateDirectories(AppDir).Any() && !Directory.EnumerateFiles(AppDir).Any())
+                    Directory.Delete(AppDir);
+            }
+
+
+            libationFilesPathCache = null;
+
+
+            var contents = File.ReadAllText(APPSETTINGS_JSON);
+            var jObj = JObject.Parse(contents);
+
+            jObj[LIBATION_FILES] = directory;
+
+            var output = JsonConvert.SerializeObject(jObj, Formatting.Indented);
+            File.WriteAllText(APPSETTINGS_JSON, output);
+
+
+            return true;
+        }
+    }
+}

FileManager/FileManager.csproj

@@ -1,9 +1,15 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.1</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
   </PropertyGroup>
 
+  <ItemGroup>
+    <PackageReference Include="HtmlAgilityPack" Version="1.11.33" />
+    <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>

FileManager/FilePathCache.cs

@@ -0,0 +1,94 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using Dinah.Core.Collections.Immutable;
+using Newtonsoft.Json;
+
+namespace FileManager
+{
+	public static class FilePathCache
+    {
+        internal class CacheEntry
+        {
+            public string Id { get; set; }
+            public FileType FileType { get; set; }
+            public string Path { get; set; }
+        }
+
+        static Cache<CacheEntry> cache { get; } = new Cache<CacheEntry>();
+
+        public static string JsonFile => Path.Combine(Configuration.Instance.LibationFiles, "FilePaths.json");
+
+        static FilePathCache()
+        {
+			// load json into memory. if file doesn't exist, nothing to do. save() will create if needed
+			if (File.Exists(JsonFile))
+			{
+				var list = JsonConvert.DeserializeObject<List<CacheEntry>>(File.ReadAllText(JsonFile));
+				cache = new Cache<CacheEntry>(list);
+			}
+        }
+
+        public static bool Exists(string id, FileType type) => GetPath(id, type) != null;
+
+        public static string GetPath(string id, FileType type)
+        {
+            var entry = cache.SingleOrDefault(i => i.Id == id && i.FileType == type);
+
+            if (entry == null)
+                return null;
+
+            if (!File.Exists(entry.Path))
+            {
+                remove(entry);
+                return null;
+            }
+
+            return entry.Path;
+        }
+
+        private static void remove(CacheEntry entry)
+		{
+			cache.Remove(entry);
+			save();
+		}
+
+        public static void Upsert(string id, FileType type, string path)
+        {
+            if (!File.Exists(path))
+                throw new FileNotFoundException("Cannot add path to cache. File not found");
+
+			var entry = cache.SingleOrDefault(i => i.Id == id && i.FileType == type);
+
+			if (entry is null)
+				cache.Add(new CacheEntry { Id = id, FileType = type, Path = path });
+			else
+				entry.Path = path;
+
+			save();
+		}
+
+		// cache is thread-safe and lock free. but file saving is not
+		private static object locker { get; } = new object();
+		private static void save()
+		{
+			// create json if not exists
+			static void resave() => File.WriteAllText(JsonFile, JsonConvert.SerializeObject(cache.ToList(), Formatting.Indented));
+
+			lock (locker)
+			{
+				try { resave(); }
+				catch (IOException)
+				{
+					try { resave(); }
+					catch (IOException ex)
+					{
+						Serilog.Log.Logger.Error(ex, "Error saving FilePaths.json");
+						throw;
+					}
+				}
+			}
+        }
+    }
+}

FileManager/FileUtility.cs

@@ -1,32 +1,10 @@
 using System;
-using System.Collections.Generic;
 using System.IO;
-using System.Linq;
 
 namespace FileManager
 {
     public static class FileUtility
     {
-        // a replacement for File.Exists() which allows long paths
-        // not needed in .net-core
-        public static bool FileExists(string path)
-        {
-            var basic = File.Exists(path);
-            if (basic)
-                return true;
-
-            // character cutoff is usually 269 but this isn't a hard number. there are edgecases which shorted the threshold
-            if (path.Length < 260)
-                return false;
-
-            // try long name prefix:
-            //   \\?\
-            // https://blogs.msdn.microsoft.com/jeremykuhne/2016/06/21/more-on-new-net-path-handling/
-            path = @"\\?\" + path;
-
-            return File.Exists(path);
-        }
-
         public static string GetValidFilename(string dirFullPath, string filename, string extension, params string[] metadataSuffixes)
         {
             if (string.IsNullOrWhiteSpace(dirFullPath))
@@ -51,7 +29,7 @@ namespace FileManager
             // ensure uniqueness
             var fullfilename = Path.Combine(dirFullPath, filename + extension);
             var i = 0;
-            while (FileExists(fullfilename))
+            while (File.Exists(fullfilename))
                 fullfilename = Path.Combine(dirFullPath, filename + $" ({++i})" + extension);
 
             return fullfilename;

FileManager/PersistentDictionary.cs

@@ -0,0 +1,129 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+
+namespace FileManager
+{
+    public class PersistentDictionary
+    {
+        public string Filepath { 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)
+        {
+            Filepath = filepath;
+
+            if (File.Exists(Filepath))
+                return;
+
+            // will create any missing directories, incl subdirectories. if all already exist: no action
+            Directory.CreateDirectory(Path.GetDirectoryName(filepath));
+
+            File.WriteAllText(Filepath, "{}");
+            System.Threading.Thread.Sleep(100);
+        }
+
+        public string GetString(string propertyName)
+        {
+            if (!stringCache.ContainsKey(propertyName))
+            {
+                var jObject = readFile();
+                stringCache[propertyName] = jObject.ContainsKey(propertyName) ? jObject[propertyName].Value<string>() : null;
+            }
+
+            return stringCache[propertyName];
+        }
+
+        public T Get<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;
+        }
+
+        public object GetObject(string propertyName)
+        {
+            if (!objectCache.ContainsKey(propertyName))
+            {
+                var jObject = readFile();
+                objectCache[propertyName] = jObject.ContainsKey(propertyName) ? jObject[propertyName].Value<object>() : null;
+            }
+
+            return objectCache[propertyName];
+        }
+
+        private object locker { get; } = new object();
+        public void Set(string propertyName, string newValue)
+        {
+            // only do this check in string cache, NOT object cache
+            if (stringCache[propertyName] == newValue)
+                return;
+
+            // set cache
+            stringCache[propertyName] = newValue;
+
+            writeFile(propertyName, newValue);
+        }
+
+        public void Set(string propertyName, object newValue)
+        {
+            // set cache
+            objectCache[propertyName] = newValue;
+
+            var parsedNewValue = JToken.Parse(JsonConvert.SerializeObject(newValue));
+            writeFile(propertyName, parsedNewValue);
+        }
+
+        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 { }
+
+            // write new setting to file
+            lock (locker)
+            {
+                var jObject = readFile();
+                jObject[propertyName] = newValue;
+                File.WriteAllText(Filepath, JsonConvert.SerializeObject(jObject, Formatting.Indented));
+            }
+        }
+
+        // special case: no caching. no logging
+        public void SetWithJsonPath(string jsonPath, string propertyName, string newValue)
+        {
+            lock (locker)
+            {
+                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));
+            }
+        }
+
+        private JObject readFile()
+        {
+            var settingsJsonContents = File.ReadAllText(Filepath);
+            var jObject = JsonConvert.DeserializeObject<JObject>(settingsJsonContents);
+            return jObject;
+        }
+    }
+}

FileManager/PictureStorage.cs

@@ -38,6 +38,8 @@ namespace FileManager
 			timer.Elapsed += (_, __) => timerDownload();
 		}
 
+		public static event EventHandler<string> PictureCached;
+
 		private static Dictionary<PictureDefinition, byte[]> cache { get; } = new Dictionary<PictureDefinition, byte[]>();
 		public static (bool isDefault, byte[] bytes) GetPicture(PictureDefinition def)
 		{
@@ -45,7 +47,7 @@ namespace FileManager
 			{
 				var path = getPath(def);
 				cache[def]
-					= FileUtility.FileExists(path)
+					= File.Exists(path)
 					? File.ReadAllBytes(path)
 					: null;
 			}
@@ -86,6 +88,8 @@ namespace FileManager
 				var bytes = downloadBytes(def);
 				saveFile(def, bytes);
 				cache[def] = bytes;
+
+				PictureCached?.Invoke(nameof(PictureStorage), def.PictureId);
 			}
 			finally
 			{

FileManager/QuickFilters.cs

@@ -22,7 +22,7 @@ namespace FileManager
         static QuickFilters()
         {
             // load json into memory. if file doesn't exist, nothing to do. save() will create if needed
-            if (FileUtility.FileExists(JsonFile))
+            if (File.Exists(JsonFile))
                 inMemoryState = JsonConvert.DeserializeObject<FilterState>(File.ReadAllText(JsonFile));
         }
 
@@ -105,12 +105,12 @@ namespace FileManager
             catch (IOException)
             {
                 try { resave(); }
-                catch (IOException)
-                {
-                    Console.WriteLine("...that's not good");
-                    throw;
-                }
-            }
+				catch (IOException ex)
+				{
+					Serilog.Log.Logger.Error(ex, "Error saving QuickFilters.json");
+					throw;
+				}
+			}
         }
     }
 }

FileManager/SqliteStorage.cs

@@ -0,0 +1,11 @@
+using System.IO;
+
+namespace FileManager
+{
+	public static class SqliteStorage
+	{
+		// not customizable. don't move to config
+		private static string databasePath => Path.Combine(Configuration.Instance.LibationFiles, "LibationContext.db");
+		public static string ConnectionString => $"Data Source={databasePath};Foreign Keys=False;";
+	}
+}

FileManager/TagsPersistence.cs

@@ -0,0 +1,61 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using Newtonsoft.Json;
+using Polly;
+using Polly.Retry;
+
+namespace FileManager
+{
+    /// <summary>
+    /// Tags must also be stored in db for search performance. Stored in json file to survive a db reset.
+    /// json is only read when a product is first loaded into the db
+    /// json is only written to when tags are edited
+    /// json access is infrequent and one-off
+    /// </summary>
+    public static class TagsPersistence
+    {
+		private static string TagsFile => Path.Combine(Configuration.Instance.LibationFiles, "BookTags.json");
+
+        private static object locker { get; } = new object();
+
+		// if failed, retry only 1 time after a wait of 100 ms
+		// 1st save attempt sometimes fails with
+		//   The requested operation cannot be performed on a file with a user-mapped section open.
+		private static RetryPolicy policy { get; }
+			= Policy.Handle<Exception>()
+			.WaitAndRetry(new[] { TimeSpan.FromMilliseconds(100) });
+
+		public static void Save(IEnumerable<(string productId, string tags)> tagsCollection)
+		{
+			ensureCache();
+
+			// on initial reload, there's a huge benefit to adding to cache individually then updating the file only once
+			foreach ((string productId, string tags) in tagsCollection)
+				cache[productId] = tags;
+
+			lock (locker)
+				policy.Execute(() => File.WriteAllText(TagsFile, JsonConvert.SerializeObject(cache, Formatting.Indented)));
+		}
+
+		private static Dictionary<string, string> cache;
+
+		public static string GetTags(string productId)
+        {
+			ensureCache();
+
+			cache.TryGetValue(productId, out string value);
+			return value;
+        }
+
+		private static void ensureCache()
+		{
+			if (cache is null)
+				lock (locker)
+					cache = !File.Exists(TagsFile)
+						? new Dictionary<string, string>()
+						: JsonConvert.DeserializeObject<Dictionary<string, string>>(File.ReadAllText(TagsFile));
+		}
+	}
+}

FileManager/UNTESTED/AudibleApiStorage.cs

@@ -1,10 +0,0 @@
-using System.IO;
-
-namespace FileManager
-{
-	public static class AudibleApiStorage
-	{
-		// not customizable. don't move to config
-		public static string IdentityTokensFile => Path.Combine(Configuration.Instance.LibationFiles, "IdentityTokens.json");
-	}
-}

FileManager/UNTESTED/AudibleFileStorage.cs

@@ -1,179 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Threading.Tasks;
-using Dinah.Core;
-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 }
-
-    /// <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 sealed class AudibleFileStorage : Enumeration<AudibleFileStorage>
-    {
-        #region static
-        // centralize filetype mappings to ensure uniqueness
-        private static Dictionary<string, FileType> extensionMap => new Dictionary<string, FileType>
-        {
-            [".m4b"] = FileType.Audio,
-            [".mp3"] = FileType.Audio,
-            [".aac"] = FileType.Audio,
-            [".mp4"] = FileType.Audio,
-            [".m4a"] = FileType.Audio,
-			[".ogg"] = FileType.Audio,
-			[".flac"] = FileType.Audio,
-
-			[".aax"] = FileType.AAX,
-
-            [".pdf"] = FileType.PDF,
-            [".zip"] = FileType.PDF,
-        };
-
-        public static AudibleFileStorage Audio { get; }
-        public static AudibleFileStorage AAX { get; }
-        public static AudibleFileStorage PDF { get; }
-
-        public static string DownloadsInProgress { get; }
-        public static string DecryptInProgress { get; }
-        public static string BooksDirectory => Configuration.Instance.Books;
-        // not customizable. don't move to config
-        public static string DownloadsFinal { get; }
-            = new DirectoryInfo(Configuration.Instance.LibationFiles).CreateSubdirectory("DownloadsFinal").FullName;
-
-        static AudibleFileStorage()
-        {
-            #region init DecryptInProgress
-            if (!Configuration.Instance.DecryptInProgressEnum.In("WinTemp", "LibationFiles"))
-                Configuration.Instance.DecryptInProgressEnum = "WinTemp";
-            var M4bRootDir
-                = Configuration.Instance.DecryptInProgressEnum == "WinTemp" // else "LibationFiles"
-                ? Configuration.Instance.WinTemp
-                : Configuration.Instance.LibationFiles;
-            DecryptInProgress = Path.Combine(M4bRootDir, "DecryptInProgress");
-            Directory.CreateDirectory(DecryptInProgress);
-            #endregion
-
-            #region init DownloadsInProgress
-            if (!Configuration.Instance.DownloadsInProgressEnum.In("WinTemp", "LibationFiles"))
-                Configuration.Instance.DownloadsInProgressEnum = "WinTemp";
-            var AaxRootDir
-                = Configuration.Instance.DownloadsInProgressEnum == "WinTemp" // else "LibationFiles"
-                ? Configuration.Instance.WinTemp
-                : Configuration.Instance.LibationFiles;
-            DownloadsInProgress = Path.Combine(AaxRootDir, "DownloadsInProgress");
-            Directory.CreateDirectory(DownloadsInProgress);
-            #endregion
-
-            #region init BooksDirectory
-            if (string.IsNullOrWhiteSpace(Configuration.Instance.Books))
-                Configuration.Instance.Books = Path.Combine(Configuration.Instance.LibationFiles, "Books");
-            Directory.CreateDirectory(Configuration.Instance.Books);
-            #endregion
-
-            // must do this in static ctor, not w/inline properties
-            // static properties init before static ctor so these dir.s would still be null
-            Audio = new AudibleFileStorage(FileType.Audio, BooksDirectory);
-            AAX = new AudibleFileStorage(FileType.AAX, DownloadsFinal);
-            PDF = new AudibleFileStorage(FileType.PDF, BooksDirectory);
-        }
-        #endregion
-
-        #region instance
-        public FileType FileType => (FileType)Value;
-
-        public string StorageDirectory => DisplayName;
-
-        public IEnumerable<string> Extensions => extensionMap.Where(kvp => kvp.Value == FileType).Select(kvp => kvp.Key);
-
-        private AudibleFileStorage(FileType fileType, string storageDirectory) : base((int)fileType, storageDirectory) { }
-
-        /// <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 async Task<bool> ExistsAsync(string productId)
-            => (await GetAsync(productId).ConfigureAwait(false)) != null;
-
-        public async Task<string> GetAsync(string productId)
-            => await getAsync(productId).ConfigureAwait(false);
-
-        private async Task<string> getAsync(string productId)
-        {
-            {
-                var cachedFile = FilePathCache.GetPath(productId, FileType);
-                if (cachedFile != null)
-                    return cachedFile;
-            }
-
-            // this is how files are saved by default. check this method first
-            {
-                var diskFile_byDirName = (await Task.Run(() => getFile_checkDirName(productId)).ConfigureAwait(false));
-                if (diskFile_byDirName != null)
-                {
-                    FilePathCache.Upsert(productId, FileType, diskFile_byDirName);
-                    return diskFile_byDirName;
-                }
-            }
-
-            {
-                var diskFile_byFileName = (await Task.Run(() => getFile_checkFileName(productId, StorageDirectory, SearchOption.AllDirectories)).ConfigureAwait(false));
-                if (diskFile_byFileName != null)
-                {
-                    FilePathCache.Upsert(productId, FileType, diskFile_byFileName);
-                    return diskFile_byFileName;
-                }
-            }
-
-            return null;
-        }
-
-        // returns audio file if there is a directory where both are true
-        // - the directory name contains the productId
-        // - the directory contains an audio file in it's top dir (not recursively)
-        private string getFile_checkDirName(string productId)
-        {
-            foreach (var d in Directory.EnumerateDirectories(StorageDirectory, "*.*", SearchOption.AllDirectories))
-            {
-                if (!fileHasId(d, productId))
-                    continue;
-
-                var firstAudio = Directory
-                    .EnumerateFiles(d, "*.*", SearchOption.TopDirectoryOnly)
-                    .FirstOrDefault(f => IsFileTypeMatch(f));
-                if (firstAudio != null)
-                    return firstAudio;
-            }
-            return null;
-        }
-
-        // returns audio file if there is an file where both are true
-        // - the file name contains the productId
-        // - the file is an audio type
-        private string getFile_checkFileName(string productId, string dir, SearchOption searchOption)
-            => Directory
-            .EnumerateFiles(dir, "*.*", searchOption)
-            .FirstOrDefault(f => fileHasId(f, productId) && IsFileTypeMatch(f));
-
-        public bool IsFileTypeMatch(string filename)
-            => Extensions.ContainsInsensative(Path.GetExtension(filename));
-
-        public bool IsFileTypeMatch(FileInfo fileInfo)
-            => Extensions.ContainsInsensative(fileInfo.Extension);
-
-        // use GetFileName, NOT GetFileNameWithoutExtension. This tests files AND directories. if the dir has a dot in the final part of the path, it will be treated like the file extension
-        private static bool fileHasId(string file, string productId)
-            => Path.GetFileName(file).ContainsInsensitive(productId);
-        #endregion
-    }
-}

FileManager/UNTESTED/Configuration.cs

@@ -1,192 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.IO;
-using System.Linq;
-using Dinah.Core;
-
-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 const string configFilename = "LibationSettings.json";
-
-        private PersistentDictionary persistentDictionary { get; }
-
-        [Description("Location of the configuration file where these settings are saved. Please do not edit this file directly while Libation is running.")]
-        public string Filepath { get; }
-
-        [Description("[Advanced. Leave alone in most cases.] Your user-specific key used to decrypt your audible files (*.aax) into audio files you can use anywhere (*.m4b)")]
-        public string DecryptKey
-        {
-            get => persistentDictionary[nameof(DecryptKey)];
-            set => persistentDictionary[nameof(DecryptKey)] = value;
-        }
-
-        [Description("Location for book storage. Includes destination of newly liberated books")]
-        public string Books
-        {
-            get => persistentDictionary[nameof(Books)];
-            set => persistentDictionary[nameof(Books)] = value;
-        }
-
-        public string WinTemp { get; } = Path.Combine(Path.GetTempPath(), "Libation");
-
-        [Description("Location for storage of program-created files")]
-        public string LibationFiles
-        {
-            get => persistentDictionary[nameof(LibationFiles)];
-            set => persistentDictionary[nameof(LibationFiles)] = value;
-        }
-
-        // 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
-
-        // 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[nameof(DownloadsInProgressEnum)];
-            set => persistentDictionary[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[nameof(DecryptInProgressEnum)];
-            set => persistentDictionary[nameof(DecryptInProgressEnum)] = value;
-        }
-
-		public string LocaleCountryCode
-		{
-			get => persistentDictionary[nameof(LocaleCountryCode)];
-			set => persistentDictionary[nameof(LocaleCountryCode)] = value;
-		}
-
-        // singleton stuff
-        public static Configuration Instance { get; } = new Configuration();
-        private Configuration()
-        {
-            Filepath = getPath();
-
-            // load json values into memory
-            persistentDictionary = new PersistentDictionary(Filepath);
-            ensureDictionaryEntries();
-
-            // setUserFilesDirectoryDefault
-            // don't create dir. dir creation is the responsibility of places that use the dir
-            if (string.IsNullOrWhiteSpace(LibationFiles))
-                LibationFiles = Path.Combine(Path.GetDirectoryName(Exe.FileLocationOnDisk), "Libation");
-        }
-
-        public static string GetDescription(string propertyName)
-        {
-			var attribute = typeof(Configuration)
-				.GetProperty(propertyName)
-				?.GetCustomAttributes(typeof(DescriptionAttribute), true)
-				.SingleOrDefault()
-				as DescriptionAttribute;
-
-			return attribute?.Description;
-		}
-
-        private static string getPath()
-        {
-            // search folders for config file. accept the first match
-            var defaultdir = Path.GetDirectoryName(Exe.FileLocationOnDisk);
-
-            var baseDirs = new HashSet<string>
-            {
-                defaultdir,
-                getNonDevelopmentDir(defaultdir),
-                Environment.GetFolderPath(Environment.SpecialFolder.Personal)
-            };
-
-            var subDirs = baseDirs.Select(dir => Path.Combine(dir, "Libation"));
-            var dirs = baseDirs.Concat(subDirs).ToList();
-
-            foreach (var dir in dirs)
-            {
-                var f = Path.Combine(dir, configFilename);
-                if (File.Exists(f))
-                    return f;
-            }
-
-            return Path.Combine(defaultdir, configFilename);
-        }
-
-        private static string getNonDevelopmentDir(string path)
-        {
-            // examples:
-            // \Libation\Core2_0\bin\Debug\netcoreapp3.0
-            // \Libation\StndLib\bin\Debug\netstandard2.1
-            // \Libation\MyWnfrm\bin\Debug
-            // \Libation\Core2_0\bin\Release\netcoreapp3.0
-            // \Libation\StndLib\bin\Release\netstandard2.1
-            // \Libation\MyWnfrm\bin\Release
-
-            var curr = new DirectoryInfo(path);
-
-            if (!curr.Name.EqualsInsensitive("debug") && !curr.Name.EqualsInsensitive("release") && !curr.Name.StartsWithInsensitive("netcoreapp") && !curr.Name.StartsWithInsensitive("netstandard"))
-                return path;
-
-            // get out of netcore/standard dir => debug
-            if (curr.Name.StartsWithInsensitive("netcoreapp") || curr.Name.StartsWithInsensitive("netstandard"))
-                curr = curr.Parent;
-
-            if (!curr.Name.EqualsInsensitive("debug") && !curr.Name.EqualsInsensitive("release"))
-                return path;
-
-            // get out of debug => bin
-            curr = curr.Parent;
-            if (!curr.Name.EqualsInsensitive("bin"))
-                return path;
-
-            // get out of bin
-            curr = curr.Parent;
-            // get out of csproj-level dir
-            curr = curr.Parent;
-
-            // curr should now be sln-level dir
-            return curr.FullName;
-        }
-
-        private void ensureDictionaryEntries()
-        {
-            var stringProperties = getDictionaryProperties().Select(p => p.Name).ToList();
-            var missingKeys = stringProperties.Except(persistentDictionary.Keys).ToArray();
-            persistentDictionary.AddKeys(missingKeys);
-        }
-
-        private IEnumerable<System.Reflection.PropertyInfo> dicPropertiesCache;
-        private IEnumerable<System.Reflection.PropertyInfo> getDictionaryProperties()
-        {
-            if (dicPropertiesCache == null)
-                dicPropertiesCache = PersistentDictionary.GetPropertiesToPersist(this.GetType());
-            return dicPropertiesCache;
-        }
-    }
-}

FileManager/UNTESTED/FilePathCache.cs

@@ -1,94 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using Newtonsoft.Json;
-
-namespace FileManager
-{
-    public static class FilePathCache
-    {
-        internal class CacheEntry
-        {
-            public string Id { get; set; }
-            public FileType FileType { get; set; }
-            public string Path { get; set; }
-        }
-
-        static List<CacheEntry> inMemoryCache = new List<CacheEntry>();
-
-        public static string JsonFile => Path.Combine(Configuration.Instance.LibationFiles, "FilePaths.json");
-
-        static FilePathCache()
-        {
-            // load json into memory. if file doesn't exist, nothing to do. save() will create if needed
-            if (FileUtility.FileExists(JsonFile))
-                inMemoryCache = JsonConvert.DeserializeObject<List<CacheEntry>>(File.ReadAllText(JsonFile));
-        }
-
-        public static bool Exists(string id, FileType type) => GetPath(id, type) != null;
-
-        public static string GetPath(string id, FileType type)
-        {
-            var entry = inMemoryCache.SingleOrDefault(i => i.Id == id && i.FileType == type);
-
-            if (entry == null)
-                return null;
-
-            if (!FileUtility.FileExists(entry.Path))
-            {
-                remove(entry);
-                return null;
-            }
-
-            return entry.Path;
-        }
-
-        private static object locker { get; } = new object();
-
-        private static void remove(CacheEntry entry)
-        {
-            lock (locker)
-            {
-                inMemoryCache.Remove(entry);
-                save();
-            }
-        }
-
-        public static void Upsert(string id, FileType type, string path)
-        {
-            if (!FileUtility.FileExists(path))
-                throw new FileNotFoundException("Cannot add path to cache. File not found");
-
-            lock (locker)
-            {
-                var entry = inMemoryCache.SingleOrDefault(i => i.Id == id && i.FileType == type);
-                if (entry != null)
-                    entry.Path = path;
-                else
-                {
-                    entry = new CacheEntry { Id = id, FileType = type, Path = path };
-                    inMemoryCache.Add(entry);
-                }
-                save();
-            }
-        }
-
-        // ONLY call this within lock()
-        private static void save()
-        {
-            // create json if not exists
-            void resave() => File.WriteAllText(JsonFile, JsonConvert.SerializeObject(inMemoryCache, Formatting.Indented));
-            try { resave(); }
-            catch (IOException)
-            {
-                try { resave(); }
-                catch (IOException)
-                {
-                    Console.WriteLine("...that's not good");
-                    throw;
-                }
-            }
-        }
-    }
-}

FileManager/UNTESTED/PersistentDictionary.cs

@@ -1,79 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using Newtonsoft.Json;
-
-namespace FileManager
-{
-    public class PersistentDictionary
-    {
-        public string Filepath { get; }
-
-        // forgiving -- doesn't drop settings. old entries will continue to be persisted even if not publicly visible
-        private Dictionary<string, string> settingsDic { get; }
-
-        public string this[string key]
-        {
-            get => settingsDic[key];
-            set
-            {
-                if (settingsDic.ContainsKey(key) && settingsDic[key] == value)
-                    return;
-
-                settingsDic[key] = value;
-
-                // auto-save to file
-                save();
-            }
-        }
-
-        public PersistentDictionary(string filepath)
-        {
-            Filepath = filepath;
-
-            // not found. create blank file
-            if (!File.Exists(Filepath))
-            {
-                File.WriteAllText(Filepath, "{}");
-
-                // give system time to create file before first use
-                System.Threading.Thread.Sleep(100);
-            }
-
-            settingsDic = JsonConvert.DeserializeObject<Dictionary<string, string>>(File.ReadAllText(Filepath));
-        }
-
-        public IEnumerable<string> Keys => settingsDic.Keys.Cast<string>();
-
-        public void AddKeys(params string[] keys)
-        {
-            if (keys == null || keys.Length == 0)
-                return;
-
-            foreach (var key in keys)
-                settingsDic.Add(key, null);
-            save();
-        }
-
-        private object locker { get; } = new object();
-        private void save()
-        {
-            lock (locker)
-                File.WriteAllText(Filepath, JsonConvert.SerializeObject(settingsDic, Formatting.Indented));
-        }
-
-        public static IEnumerable<System.Reflection.PropertyInfo> GetPropertiesToPersist(Type type)
-            => type
-            .GetProperties(System.Reflection.BindingFlags.Public | System.Reflection.BindingFlags.Instance)
-            .Where(p =>
-                // string properties only
-                p.PropertyType == typeof(string)
-                // exclude indexer
-                && p.GetIndexParameters().Length == 0
-                // exclude read-only, write-only
-                && p.GetGetMethod(false) != null
-                && p.GetSetMethod(false) != null
-            ).ToList();
-    }
-}

FileManager/UNTESTED/TagsPersistence.cs

@@ -1,66 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using Newtonsoft.Json;
-
-namespace FileManager
-{
-    /// <summary>
-    /// Tags must also be stored in db for search performance. Stored in json file to survive a db reset.
-    /// json is only read when a product is first loaded
-    /// json is only written to when tags are edited
-    /// json access is infrequent and one-off
-    /// all other reads happen against db. No volitile storage
-    /// </summary>
-    public static class TagsPersistence
-    {
-        public static string TagsFile => Path.Combine(Configuration.Instance.LibationFiles, "BookTags.json");
-
-        private static object locker { get; } = new object();
-
-        public static void Save(string productId, string tags)
-			=> System.Threading.Tasks.Task.Run(() => save_fireAndForget(productId, tags));
-
-		private static void save_fireAndForget(string productId, string tags)
-		{
-			lock (locker)
-			{
-				// get all
-				var allDictionary = retrieve();
-
-				// update/upsert tag list
-				allDictionary[productId] = tags;
-
-				// re-save:
-				//   this often fails the first time with
-				//     The requested operation cannot be performed on a file with a user-mapped section open.
-				//   2nd immediate attempt failing was rare. So I added sleep. We'll see...
-				void resave() => File.WriteAllText(TagsFile, JsonConvert.SerializeObject(allDictionary, Formatting.Indented));
-				try { resave(); }
-				catch (IOException debugEx)
-				{
-					// 1000 was always reliable but very slow. trying other values
-					var waitMs = 100;
-
-					System.Threading.Thread.Sleep(waitMs);
-					resave();
-				}
-			}
-		}
-
-		public static string GetTags(string productId)
-        {
-            var dic = retrieve();
-            return dic.ContainsKey(productId) ? dic[productId] : null;
-        }
-
-        private static Dictionary<string, string> retrieve()
-        {
-            if (!FileUtility.FileExists(TagsFile))
-                return new Dictionary<string, string>();
-			lock (locker)
-				return JsonConvert.DeserializeObject<Dictionary<string, string>>(File.ReadAllText(TagsFile));
-        }
-    }
-}