New version. Failed attempt to fix publish error

move IdentityTokens data to new AccountsSettings.json file

.gitignore

@@ -332,3 +332,4 @@ ASALocalRun/
 
 # manually ignored files
 /__TODO.txt
+/DataLayer/LibationContext.db

AaxDecrypter/UNTESTED/AaxToM4bConverter.cs

@@ -72,8 +72,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,22 +90,24 @@ 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);
+            chapters = new Chapters(inputFileName, tags.duration.TotalSeconds);
 
             var defaultFilename = Path.Combine(
-                Path.GetDirectoryName(this.inputFileName),
-                getASCIITag(this.tags.author),
-                getASCIITag(this.tags.title) + ".m4b"
+                Path.GetDirectoryName(inputFileName),
+                getASCIITag(tags.author),
+                getASCIITag(tags.title) + ".m4b"
                 );
-            SetOutputFilename(defaultFilename);
+
+			// set default name
+			SetOutputFilename(defaultFilename);
 
             await Task.Run(() => saveCover(inputFileName));
         }
@@ -118,7 +121,7 @@ namespace AaxDecrypter
         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()
@@ -156,21 +159,24 @@ namespace AaxDecrypter
 
         public void SetOutputFilename(string outFileName)
         {
-            this.outputFileName = outFileName;
+            outputFileName = outFileName;
 
-            if (Path.GetExtension(this.outputFileName) != ".m4b")
-                this.outputFileName = outputFileWithNewExt(".m4b");
+            if (Path.GetExtension(outputFileName) != ".m4b")
+                outputFileName = outputFileWithNewExt(".m4b");
 
-            this.outDir = Path.GetDirectoryName(this.outputFileName);
+			if (File.Exists(outputFileName))
+				File.Delete(outputFileName);
+
+            outDir = Path.GetDirectoryName(outputFileName);
         }
 
         private string outputFileWithNewExt(string extension)
-            => Path.Combine(this.outDir, Path.GetFileNameWithoutExtension(this.outputFileName) + '.' + extension.Trim('.'));
+            => Path.Combine(outDir, Path.GetFileNameWithoutExtension(outputFileName) + '.' + extension.Trim('.'));
 
         public bool Step1_CreateDir()
         {
-            ProcessRunner.WorkingDir = this.outDir;
-            Directory.CreateDirectory(this.outDir);
+            ProcessRunner.WorkingDir = outDir;
+            Directory.CreateDirectory(outDir);
             return true;
         }
 
@@ -178,7 +184,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 +199,7 @@ namespace AaxDecrypter
                 if (returnCode == -99)
                 {
                     Console.WriteLine($"{fail}Incorrect decrypt key: {decryptKey}");
-                    this.decryptKey = null;
+                    decryptKey = null;
                     returnCode = getKey_decrypt(tempRipFile);
                 }
             }
@@ -232,7 +238,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 +249,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 +272,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.FirstChapterStart != 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.FirstChapterStart.ToString("0.000", CultureInfo.InvariantCulture) + " -t " + (chapters.LastChapterStart - 1.0).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 +316,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 +336,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"), chapters.GetCuefromChapters(Path.GetFileName(outputFileName)));
             return true;
         }
 
         public bool End_CreateNfo()
         {
-            File.WriteAllText(outputFileWithNewExt(".nfo"), NFO.CreateNfoContents(AppName, this.tags, this.encodingInfo, this.chapters));
+            File.WriteAllText(outputFileWithNewExt(".nfo"), NFO.CreateNfoContents(AppName, tags, encodingInfo, chapters));
             return true;
         }
     }

AaxDecrypter/UNTESTED/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/UNTESTED/Chapters.cs

@@ -17,10 +17,10 @@ namespace AaxDecrypter
 
         public Chapters(string file, double totalTime)
         {
-            this.markers = getAAXChapters(file);
+            markers = getAAXChapters(file);
 
             // add end time
-            this.markers.Add(totalTime);
+            markers.Add(totalTime);
         }
 
         private static List<double> getAAXChapters(string file)
@@ -42,7 +42,7 @@ namespace AaxDecrypter
         }
 
         // 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 int Count() => markers.Count - 1;
 
         public string GetCuefromChapters(string fileName)
         {
@@ -56,7 +56,7 @@ namespace AaxDecrypter
             {
                 var chapter = i + 1;
 
-                var timeSpan = TimeSpan.FromSeconds(this.markers[i]);
+                var timeSpan = TimeSpan.FromSeconds(markers[i]);
                 var minutes = Math.Floor(timeSpan.TotalMinutes).ToString();
                 var seconds = timeSpan.Seconds.ToString("D2");
                 var milliseconds = (timeSpan.Milliseconds / 10).ToString("D2");
@@ -78,8 +78,8 @@ namespace AaxDecrypter
             {
                 var chapter = i + 1;
 
-                var start = this.markers[i] * 1000.0;
-                var end = this.markers[i + 1] * 1000.0;
+                var start = markers[i] * 1000.0;
+                var end = markers[i + 1] * 1000.0;
                 var chapterName = chapter.ToString("D3");
 
                 stringBuilder.Append("[CHAPTER]\n");

AaxDecrypter/UNTESTED/Tags.cs

@@ -1,9 +1,4 @@
 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;
@@ -23,52 +18,50 @@ namespace AaxDecrypter
         public string genre { get; }
         public TimeSpan duration { get; }
 
+        // input file
         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;
+            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);
-			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;
+            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 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();
+            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()
-        {
-            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();
-        }
+            => $";FFMETADATA1"
+            + $"\nmajor_brand=aax"
+            + $"\nminor_version=1"
+            + $"\ncompatible_brands=aax M4B mp42isom"
+            + $"\ndate={year}"
+            + $"\ngenre={genre}"
+            + $"\ntitle={title}"
+            + $"\nartist={author}"
+            + $"\nalbum={album}"
+            + $"\ncomposer={narrator}"
+            + $"\ncomment={comments.Truncate(254)}"
+            + $"\ndescription={comments}"
+            + $"\n";
     }
 }

ApplicationServices/UNTESTED/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/UNTESTED/LibraryCommands.cs

@@ -1,38 +1,108 @@
 using System;
+using System.Collections.Generic;
+using System.Linq;
 using System.Threading.Tasks;
 using AudibleApi;
 using DataLayer;
 using DtoImporterService;
 using InternalUtilities;
+using Serilog;
 
 namespace ApplicationServices
 {
 	public static class LibraryCommands
 	{
-		public static async Task<(int totalCount, int newCount)> IndexLibraryAsync(ILoginCallback callback)
+		public static async Task<(int totalCount, int newCount)> ImportAccountAsync(Func<Account, ILoginCallback> loginCallbackFactoryFunc, params Account[] accounts)
 		{
-			var audibleApiActions = new AudibleApiActions();
-			var items = await audibleApiActions.GetAllLibraryItemsAsync(callback);
-			var totalCount = items.Count;
+			if (accounts is null || accounts.Length == 0)
+				return (0, 0);
 
-			var libImporter = new LibraryImporter();
-			var newCount = await Task.Run(() => libImporter.Import(items));
+			try
+			{
+				var importItems = await scanAccountsAsync(loginCallbackFactoryFunc, accounts);
 
-			await Task.Run(() => SearchEngineCommands.FullReIndex());
+				var totalCount = importItems.Count;
+				Log.Logger.Information($"GetAllLibraryItems: Total count {totalCount}");
 
-			return (totalCount, newCount);
+				var newCount = await getNewCountAsync(importItems);
+				Log.Logger.Information($"Import: New count {newCount}");
+
+				await Task.Run(() => SearchEngineCommands.FullReIndex());
+				Log.Logger.Information("FullReIndex: success");
+
+				return (totalCount, newCount);
+			}
+			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)
+		{
+			Dinah.Core.ArgumentValidator.EnsureNotNull(account, nameof(account));
+
+			var localeName = account.Locale?.Name;
+			Log.Logger.Information("ImportLibraryAsync. {@DebugInfo}", new
+			{
+				account.AccountName,
+				account.AccountId,
+				LocaleName = localeName,
+			});
+
+			var dtoItems = await AudibleApiActions.GetLibraryValidatedAsync(api);
+			return dtoItems.Select(d => new ImportItem { DtoItem = d, AccountId = account.AccountId, LocaleName = localeName }).ToList();
+		}
+
+		private static async Task<int> getNewCountAsync(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)
 		{
-			book.UserDefinedItem.Tags = newTags;
+			try
+			{
+				book.UserDefinedItem.Tags = newTags;
 
-			var qtyChanges = context.SaveChanges();
+				var qtyChanges = context.SaveChanges();
 
-			if (qtyChanges > 0)
-				SearchEngineCommands.UpdateBookTags(book);
+				if (qtyChanges > 0)
+					SearchEngineCommands.UpdateBookTags(book);
 
-			return qtyChanges;
+				return qtyChanges;
+			}
+			catch (Exception ex)
+			{
+				Log.Logger.Error(ex, "Error updating tags");
+				throw;
+			}
 		}
 	}
 }

ApplicationServices/UNTESTED/SearchEngineCommands.cs

@@ -1,4 +1,5 @@
-using DataLayer;
+using System.IO;
+using DataLayer;
 using LibationSearchEngine;
 
 namespace ApplicationServices
@@ -7,18 +8,18 @@ namespace ApplicationServices
 	{
 		public static void FullReIndex()
 		{
-			var engine = new SearchEngine();
+			var engine = new SearchEngine(DbContexts.GetContext());
 			engine.CreateNewIndex();
 		}
 
 		public static SearchResultSet Search(string searchString)
 		{
-			var engine = new SearchEngine();
+			var engine = new SearchEngine(DbContexts.GetContext());
 			try
 			{
 				return engine.Search(searchString);
 			}
-			catch (System.IO.FileNotFoundException)
+			catch (FileNotFoundException)
 			{
 				FullReIndex();
 				return engine.Search(searchString);
@@ -27,12 +28,12 @@ namespace ApplicationServices
 
 		public static void UpdateBookTags(Book book)
 		{
-			var engine = new SearchEngine();
+			var engine = new SearchEngine(DbContexts.GetContext());
 			try
 			{
 				engine.UpdateTags(book.AudibleProductId, book.UserDefinedItem.Tags);
 			}
-			catch (System.IO.FileNotFoundException)
+			catch (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>
+    <TargetFrameworks>netcoreapp3.1;netstandard2.1</TargetFrameworks>
   </PropertyGroup>
 
   <PropertyGroup>
@@ -12,13 +12,13 @@
   </PropertyGroup>
   
   <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="3.0.0">
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="3.1.7">
       <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="3.1.7" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="3.1.7" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="3.1.7">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
@@ -32,7 +32,6 @@
   <ItemGroup>
     <None Update="appsettings.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
     </None>
   </ItemGroup>
 

DataLayer/Migrations/20191125182309_Fresh.Designer.cs

@@ -9,7 +9,7 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
 namespace DataLayer.Migrations
 {
     [DbContext(typeof(LibationContext))]
-    [Migration("20191119144803_Fresh")]
+    [Migration("20191125182309_Fresh")]
     partial class Fresh
     {
         protected override void BuildTargetModel(ModelBuilder modelBuilder)
@@ -129,6 +129,13 @@ namespace DataLayer.Migrations
                     b.HasIndex("Name");
 
                     b.ToTable("Contributors");
+
+                    b.HasData(
+                        new
+                        {
+                            ContributorId = -1,
+                            Name = ""
+                        });
                 });
 
             modelBuilder.Entity("DataLayer.LibraryBook", b =>

DataLayer/Migrations/20191125182309_Fresh.cs

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

@@ -14,7 +14,7 @@ namespace DataLayer.Migrations
         {
 #pragma warning disable 612, 618
             modelBuilder
-                .HasAnnotation("ProductVersion", "3.0.0");
+                .HasAnnotation("ProductVersion", "3.1.7");
 
             modelBuilder.Entity("DataLayer.Book", b =>
                 {
@@ -40,6 +40,9 @@ namespace DataLayer.Migrations
                     b.Property<int>("LengthInMinutes")
                         .HasColumnType("INTEGER");
 
+                    b.Property<string>("Locale")
+                        .HasColumnType("TEXT");
+
                     b.Property<string>("PictureId")
                         .HasColumnType("TEXT");
 
@@ -127,6 +130,13 @@ namespace DataLayer.Migrations
                     b.HasIndex("Name");
 
                     b.ToTable("Contributors");
+
+                    b.HasData(
+                        new
+                        {
+                            ContributorId = -1,
+                            Name = ""
+                        });
                 });
 
             modelBuilder.Entity("DataLayer.LibraryBook", b =>
@@ -134,6 +144,9 @@ namespace DataLayer.Migrations
                     b.Property<int>("BookId")
                         .HasColumnType("INTEGER");
 
+                    b.Property<string>("Account")
+                        .HasColumnType("TEXT");
+
                     b.Property<DateTime>("DateAdded")
                         .HasColumnType("TEXT");
 

DataLayer/UNTESTED/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; }
 
@@ -62,7 +65,8 @@ namespace DataLayer
             string description,
             int lengthInMinutes,
 			IEnumerable<Contributor> authors,
-			IEnumerable<Contributor> narrators)
+			IEnumerable<Contributor> narrators,
+			Category category, string localeName)
         {
             // validate
             ArgumentValidator.EnsureNotNull(audibleProductId, nameof(audibleProductId));
@@ -71,6 +75,7 @@ namespace DataLayer
 
 			// assign as soon as possible. stuff below relies on this
             AudibleProductId = productId;
+            Locale = localeName;
 
             ArgumentValidator.EnsureNotNullOrWhiteSpace(title, nameof(title));
 
@@ -80,8 +85,7 @@ 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
             Title = title;
@@ -91,7 +95,7 @@ namespace DataLayer
             // assigns with biz logic
             ReplaceAuthors(authors);
             ReplaceNarrators(narrators);
-        }
+		}
 
         #region contributors, authors, narrators
         // use uninitialised backing fields - this means we can detect if the collection was loaded
@@ -123,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;
@@ -140,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++));
@@ -155,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();
@@ -186,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
@@ -211,8 +216,7 @@ namespace DataLayer
         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));
 
@@ -232,21 +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;
         }
 
-		public override string ToString() => $"[{AudibleProductId}] {Title}";
+        // needed for v3 => v4 upgrade
+        public void UpdateLocale(string localeName)
+            => Locale ??= localeName;
+
+        public override string ToString() => $"[{AudibleProductId}] {Title}";
 	}
 }

DataLayer/UNTESTED/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; }

DataLayer/UNTESTED/EfClasses/Contributor.cs

@@ -5,21 +5,24 @@ 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
+	{
+		// Empty is a special case. use private ctor w/o validation
+		public static Contributor GetEmpty() => new Contributor { ContributorId = -1, Name = "" };
 
-        // 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
+		// 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
 
-        internal int ContributorId { get; private set; }
+		// 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;

DataLayer/UNTESTED/EfClasses/LibraryBook.cs

@@ -10,14 +10,24 @@ namespace DataLayer
 
         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)
+        public LibraryBook(Book book, DateTime dateAdded, string account)
         {
             ArgumentValidator.EnsureNotNull(book, nameof(book));
+            ArgumentValidator.EnsureNotNull(account, nameof(account));
+
             Book = book;
             DateAdded = dateAdded;
+            Account = account;
         }
 
-		public override string ToString() => $"{DateAdded:d} {Book}";
+        // needed for v3 => v4 upgrade
+        public void UpdateAccount(string account)
+            => Account ??= account;
+
+        public override string ToString() => $"{DateAdded:d} {Book}";
 	}
 }

DataLayer/UNTESTED/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,16 @@ namespace DataLayer
             modelBuilder.ApplyConfiguration(new SeriesBookConfig());
             modelBuilder.ApplyConfiguration(new CategoryConfig());
 
-            // seeds go here. examples in scratch pad
-            modelBuilder
-                .Entity<Category>()
-                .HasData(Category.GetEmpty());
+			// seeds go here. examples in scratch pad
+			modelBuilder
+				.Entity<Category>()
+				.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/UNTESTED/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/UNTESTED/QueryObjects/LibraryQueries.cs

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

DataLayer/UNTESTED/TagPersistenceInterceptor.cs

@@ -4,7 +4,6 @@ using System.Linq;
 using Dinah.Core.Collections.Generic;
 using Dinah.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.ChangeTracking;
 
 namespace DataLayer
 {
@@ -14,25 +13,18 @@ namespace DataLayer
 
         public void Executing(DbContext context)
 		{
-			// persist tags:
-			var modifiedEntities = context
+			var tagsCollection
+				= context
 				.ChangeTracker
 				.Entries()
-				.Where(p => p.State.In(EntityState.Modified, EntityState.Added))
-				.ToList();
-
-			persistTags(modifiedEntities);
-		}
-
-		private static void persistTags(List<EntityEntry> modifiedEntities)
-		{
-			var tagSets = modifiedEntities
+				.Where(e => e.State.In(EntityState.Modified, EntityState.Added))
 				.Select(e => e.Entity as UserDefinedItem)
-				// filter by null but NOT by blank. blank is the valid way to show the absence of tags
-				.Where(a => a != null)
+				.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();
-			foreach (var t in tagSets)
-				FileManager.TagsPersistence.Save(t.Book.AudibleProductId, t.Tags);
+
+			FileManager.TagsPersistence.Save(tagsCollection);
 		}
 	}
 }

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,9 +1,14 @@
 {
   "ConnectionStrings": {
     "LibationContext_sqlserver": "Server=(LocalDb)\\MSSQLLocalDB;Database=DataLayer.LibationContext;Integrated Security=true;",
+
+    "// 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;",
 
-    "// on windows sqlite paths accept windows and/or unix slashes": "",
+    "// sqlite notes": "",
+    "// absolute path example": "Data Source=C:/foo/bar/sample.db",
+    "// relative path example": "Data Source=sample.db",
+    "// on windows: sqlite paths accept windows and/or unix slashes": "",
     "MyTestContext": "Data Source=%DESKTOP%/sample.db"
   }
 }

DtoImporterService/BookImporter.cs

@@ -1,127 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using AudibleApiDTOs;
-using DataLayer;
-using InternalUtilities;
-
-namespace DtoImporterService
-{
-	public class BookImporter : ItemsImporterBase
-	{
-		public override IEnumerable<Exception> Validate(IEnumerable<Item> items) => new BookValidator().Validate(items);
-
-		protected override int DoImport(IEnumerable<Item> items, LibationContext context)
-		{
-			// pre-req.s
-			new ContributorImporter().Import(items, context);
-			new SeriesImporter().Import(items, context);
-			new CategoryImporter().Import(items, context);
-
-			// get distinct
-			var productIds = items.Select(i => i.ProductId).ToList();
-
-			// load db existing => .Local
-			loadLocal_books(productIds, context);
-
-			// upsert
-			var qtyNew = upsertBooks(items, context);
-			return qtyNew;
-		}
-
-		private void loadLocal_books(List<string> productIds, LibationContext context)
-		{
-			var localProductIds = context.Books.Local.Select(b => b.AudibleProductId);
-			var remainingProductIds = productIds
-				.Distinct()
-				.Except(localProductIds)
-				.ToList();
-
-			// GetBooks() eager loads Series, category, et al
-			if (remainingProductIds.Any())
-				context.Books.GetBooks(b => remainingProductIds.Contains(b.AudibleProductId)).ToList();
-		}
-
-		private int upsertBooks(IEnumerable<Item> items, LibationContext context)
-		{
-			var qtyNew = 0;
-
-			foreach (var item in items)
-			{
-				var book = context.Books.Local.SingleOrDefault(p => p.AudibleProductId == item.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();
-
-					// 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();
-
-					book = context.Books.Add(new Book(
-						new AudibleProductId(item.ProductId),
-						item.Title,
-						item.Description,
-						item.LengthInMinutes,
-						authors,
-						narrators)
-					).Entity;
-
-					var publisherName = item.Publisher;
-					if (!string.IsNullOrWhiteSpace(publisherName))
-					{
-						var publisher = context.Contributors.Local.Single(c => publisherName == c.Name);
-						book.ReplacePublisher(publisher);
-					}
-
-					qtyNew++;
-				}
-
-				// 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);
-
-				// 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);
-			}
-
-			return qtyNew;
-		}
-	}
-}

DtoImporterService/CategoryImporter.cs

@@ -1,70 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using AudibleApiDTOs;
-using DataLayer;
-using InternalUtilities;
-
-namespace DtoImporterService
-{
-	public class CategoryImporter : ItemsImporterBase
-	{
-		public override IEnumerable<Exception> Validate(IEnumerable<Item> items) => new CategoryValidator().Validate(items);
-
-		protected override int DoImport(IEnumerable<Item> items, LibationContext context)
-		{
-			// get distinct
-			var categoryIds = items.GetCategoriesDistinct().Select(c => c.CategoryId).ToList();
-
-			// load db existing => .Local
-			loadLocal_categories(categoryIds, context);
-
-			// upsert
-			var categoryPairs = items.GetCategoryPairsDistinct().ToList();
-			var qtyNew = upsertCategories(categoryPairs, context);
-			return qtyNew;
-		}
-
-		private void loadLocal_categories(List<string> categoryIds, LibationContext context)
-		{
-			var localIds = context.Categories.Local.Select(c => c.AudibleCategoryId);
-			var remainingCategoryIds = categoryIds
-				.Distinct()
-				.Except(localIds)
-				.ToList();
-
-			if (remainingCategoryIds.Any())
-				context.Categories.Where(c => remainingCategoryIds.Contains(c.AudibleCategoryId)).ToList();
-		}
-
-		// only use after loading contributors => local
-		private int upsertCategories(List<Ladder[]> categoryPairs, LibationContext context)
-		{
-			var qtyNew = 0;
-
-			foreach (var pair in categoryPairs)
-			{
-				for (var i = 0; i < pair.Length; i++)
-				{
-					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);
-
-					var category = context.Categories.Local.SingleOrDefault(c => c.AudibleCategoryId == id);
-					if (category is null)
-					{
-						category = context.Categories.Add(new Category(new AudibleCategoryId(id), name)).Entity;
-						qtyNew++;
-					}
-
-					category.UpdateParentCategory(parentCategory);
-				}
-			}
-
-			return qtyNew;
-		}
-	}
-}

DtoImporterService/ContributorImporter.cs

@@ -1,95 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using AudibleApiDTOs;
-using DataLayer;
-using InternalUtilities;
-
-namespace DtoImporterService
-{
-	public class ContributorImporter : ItemsImporterBase
-	{
-		public override IEnumerable<Exception> Validate(IEnumerable<Item> items) => new ContributorValidator().Validate(items);
-
-		protected override int DoImport(IEnumerable<Item> items, LibationContext context)
-		{
-			// get distinct
-			var authors = items.GetAuthorsDistinct().ToList();
-			var narrators = items.GetNarratorsDistinct().ToList();
-			var publishers = items.GetPublishersDistinct().ToList();
-
-			// load db existing => .Local
-			var allNames = authors
-				.Select(a => a.Name)
-				.Union(narrators.Select(n => n.Name))
-				.Union(publishers)
-				.ToList();
-			loadLocal_contributors(allNames, context);
-
-			// upsert
-			var qtyNew = 0;
-			qtyNew += upsertPeople(authors, context);
-			qtyNew += upsertPeople(narrators, context);
-			qtyNew += upsertPublishers(publishers, context);
-			return qtyNew;
-		}
-
-		private void loadLocal_contributors(List<string> contributorNames, LibationContext context)
-		{
-			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 remainingContribNames = contributorNames
-				.Distinct()
-				.Except(localNames)
-				.ToList();
-
-			// load existing => local
-			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()
-		}
-
-		// only use after loading contributors => local
-		private int upsertPeople(List<Person> people, LibationContext context)
-		{
-			var qtyNew = 0;
-
-			foreach (var p in people)
-			{
-				var person = context.Contributors.Local.SingleOrDefault(c => c.Name == p.Name);
-				if (person == null)
-				{
-					person = context.Contributors.Add(new Contributor(p.Name, p.Asin)).Entity;
-					qtyNew++;
-				}
-			}
-
-			return qtyNew;
-		}
-
-		// only use after loading contributors => local
-		private int upsertPublishers(List<string> publishers, LibationContext context)
-		{
-			var qtyNew = 0;
-
-			foreach (var publisherName in publishers)
-			{
-				if (context.Contributors.Local.SingleOrDefault(c => c.Name == publisherName) == null)
-				{
-					context.Contributors.Add(new Contributor(publisherName));
-					qtyNew++;
-				}
-			}
-
-			return qtyNew;
-		}
-	}
-}

DtoImporterService/ImporterBase.cs

@@ -1,44 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using AudibleApiDTOs;
-using DataLayer;
-
-namespace DtoImporterService
-{
-	public interface IContextRunner<T>
-	{
-		public TResult Run<TResult>(Func<T, LibationContext, TResult> func, T param, LibationContext context = null)
-		{
-			if (context is null)
-			{
-				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($"Device Jobs Service configuration validation failed", exceptions);
-
-			var result = func(param, context);
-			return result;
-		}
-		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);
-		public abstract IEnumerable<Exception> Validate(T param);
-	}
-
-	public abstract class ItemsImporterBase : ImporterBase<IEnumerable<Item>> { }
-}

DtoImporterService/LibraryImporter.cs

@@ -1,39 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using AudibleApiDTOs;
-using DataLayer;
-using InternalUtilities;
-
-namespace DtoImporterService
-{
-	public class LibraryImporter : ItemsImporterBase
-	{
-		public override IEnumerable<Exception> Validate(IEnumerable<Item> items) => new LibraryValidator().Validate(items);
-
-		protected override int DoImport(IEnumerable<Item> items, LibationContext context)
-		{
-			new BookImporter().Import(items, context);
-
-			var qtyNew = upsertLibraryBooks(items, context);
-			return qtyNew;
-		}
-
-		private int upsertLibraryBooks(IEnumerable<Item> items, LibationContext context)
-		{
-			var currentLibraryProductIds = context.Library.Select(l => l.Book.AudibleProductId).ToList();
-			var newItems = items.Where(dto => !currentLibraryProductIds.Contains(dto.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);
-			}
-
-			var qtyNew = newItems.Count;
-			return qtyNew;
-		}
-	}
-}

DtoImporterService/SeriesImporter.cs

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

DtoImporterService/UNTESTED/BookImporter.cs

@@ -0,0 +1,166 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using AudibleApiDTOs;
+using DataLayer;
+using InternalUtilities;
+
+namespace DtoImporterService
+{
+	public class BookImporter : ItemsImporterBase
+	{
+		public BookImporter(LibationContext context) : base(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(DbContext).Import(importItems);
+			new SeriesImporter(DbContext).Import(importItems);
+			new CategoryImporter(DbContext).Import(importItems);
+
+			// get distinct
+			var productIds = importItems.Select(i => i.DtoItem.ProductId).ToList();
+
+			// load db existing => .Local
+			loadLocal_books(productIds);
+
+			// upsert
+			var qtyNew = upsertBooks(importItems);
+			return qtyNew;
+		}
+
+		private void loadLocal_books(List<string> productIds)
+		{
+			var localProductIds = DbContext.Books.Local.Select(b => b.AudibleProductId);
+			var remainingProductIds = productIds
+				.Distinct()
+				.Except(localProductIds)
+				.ToList();
+
+			// GetBooks() eager loads Series, category, et al
+			if (remainingProductIds.Any())
+				DbContext.Books.GetBooks(b => remainingProductIds.Contains(b.AudibleProductId)).ToList();
+		}
+
+		private int upsertBooks(IEnumerable<ImportItem> importItems)
+		{
+			var qtyNew = 0;
+
+			foreach (var item in importItems)
+			{
+				var book = DbContext.Books.Local.SingleOrDefault(p => p.AudibleProductId == item.DtoItem.ProductId);
+				if (book is null)
+				{
+					book = createNewBook(item);
+					qtyNew++;
+				}
+
+				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/UNTESTED/CategoryImporter.cs

@@ -0,0 +1,85 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using AudibleApiDTOs;
+using DataLayer;
+using InternalUtilities;
+
+namespace DtoImporterService
+{
+	public class CategoryImporter : ItemsImporterBase
+	{
+		public CategoryImporter(LibationContext context) : base(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 = importItems
+				.Select(i => i.DtoItem)
+				.GetCategoriesDistinct()
+				.Select(c => c.CategoryId).ToList();
+
+			// load db existing => .Local
+			loadLocal_categories(categoryIds);
+
+			// upsert
+			var categoryPairs = importItems
+				.Select(i => i.DtoItem)
+				.GetCategoryPairsDistinct()
+				.ToList();
+			var qtyNew = upsertCategories(categoryPairs);
+			return qtyNew;
+		}
+
+		private void loadLocal_categories(List<string> categoryIds)
+		{
+			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())
+				DbContext.Categories.Where(c => remainingCategoryIds.Contains(c.AudibleCategoryId) || c.Name == emptyName).ToList();
+		}
+
+		// only use after loading contributors => local
+		private int upsertCategories(List<Ladder[]> categoryPairs)
+		{
+			var qtyNew = 0;
+
+			foreach (var pair in categoryPairs)
+			{
+				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 = DbContext.Categories.Local.Single(c => c.AudibleCategoryId == pair[0].CategoryId);
+
+					var category = DbContext.Categories.Local.SingleOrDefault(c => c.AudibleCategoryId == id);
+					if (category is null)
+					{
+						category = DbContext.Categories.Add(new Category(new AudibleCategoryId(id), name)).Entity;
+						qtyNew++;
+					}
+
+					category.UpdateParentCategory(parentCategory);
+				}
+			}
+
+			return qtyNew;
+		}
+	}
+}

DtoImporterService/UNTESTED/ContributorImporter.cs

@@ -0,0 +1,102 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using AudibleApiDTOs;
+using DataLayer;
+using InternalUtilities;
+
+namespace DtoImporterService
+{
+	public class ContributorImporter : ItemsImporterBase
+	{
+		public ContributorImporter(LibationContext context) : base(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 = 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 = publishers
+				.Union(authors.Select(n => n.Name))
+				.Union(narrators.Select(n => n.Name))
+				.Where(name => !string.IsNullOrWhiteSpace(name))
+				.ToList();
+			loadLocal_contributors(allNames);
+
+			// upsert
+			var qtyNew = 0;
+			qtyNew += upsertPeople(authors);
+			qtyNew += upsertPeople(narrators);
+			qtyNew += upsertPublishers(publishers);
+			return qtyNew;
+		}
+
+		private void loadLocal_contributors(List<string> contributorNames)
+		{
+			//// BAD: very inefficient
+			// var x = context.Contributors.Local.Where(c => !contribNames.Contains(c.Name));
+
+			// GOOD: Except() is efficient. Due to hashing, it's close to O(n)
+			var localNames = DbContext.Contributors.Local.Select(c => c.Name);
+			var remainingContribNames = contributorNames
+				.Distinct()
+				.Except(localNames)
+				.ToList();
+
+			// load existing => local
+			// remember to include default/empty/missing
+			var emptyName = Contributor.GetEmpty().Name;
+			if (remainingContribNames.Any())
+				DbContext.Contributors.Where(c => remainingContribNames.Contains(c.Name) || c.Name == emptyName).ToList();
+		}
+
+		// only use after loading contributors => local
+		private int upsertPeople(List<Person> people)
+		{
+			var qtyNew = 0;
+
+			foreach (var p in people)
+			{
+				var person = DbContext.Contributors.Local.SingleOrDefault(c => c.Name == p.Name);
+				if (person == null)
+				{
+					person = DbContext.Contributors.Add(new Contributor(p.Name, p.Asin)).Entity;
+					qtyNew++;
+				}
+			}
+
+			return qtyNew;
+		}
+
+		// only use after loading contributors => local
+		private int upsertPublishers(List<string> publishers)
+		{
+			var qtyNew = 0;
+
+			foreach (var publisherName in publishers)
+			{
+				if (DbContext.Contributors.Local.SingleOrDefault(c => c.Name == publisherName) == null)
+				{
+					DbContext.Contributors.Add(new Contributor(publisherName));
+					qtyNew++;
+				}
+			}
+
+			return qtyNew;
+		}
+	}
+}

DtoImporterService/UNTESTED/ImporterBase.cs

@@ -0,0 +1,57 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using DataLayer;
+using Dinah.Core;
+using InternalUtilities;
+
+namespace DtoImporterService
+{
+	public abstract class ImporterBase<T>
+	{
+		protected LibationContext DbContext { get; }
+
+		protected ImporterBase(LibationContext context)
+		{
+			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
+			{
+				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;
+			}
+
+			try
+			{
+				var result = func(param);
+				return result;
+			}
+			catch (Exception ex)
+			{
+				Serilog.Log.Logger.Error(ex, "Import error: post-validation importing");
+				throw;
+			}
+		}
+
+		protected abstract int DoImport(T elements);
+		public abstract IEnumerable<Exception> Validate(T param);
+	}
+
+	public abstract class ItemsImporterBase : ImporterBase<IEnumerable<ImportItem>>
+	{
+		protected ItemsImporterBase(LibationContext context) : base(context) { }
+	}
+}

DtoImporterService/UNTESTED/LibraryImporter.cs

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

DtoImporterService/UNTESTED/SeriesImporter.cs

@@ -0,0 +1,63 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using AudibleApiDTOs;
+using DataLayer;
+using InternalUtilities;
+
+namespace DtoImporterService
+{
+	public class SeriesImporter : ItemsImporterBase
+	{
+		public SeriesImporter(LibationContext context) : base(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 = importItems
+				.Select(i => i.DtoItem)
+				.GetSeriesDistinct()
+				.ToList();
+
+			// load db existing => .Local
+			loadLocal_series(series);
+
+			// upsert
+			var qtyNew = upsertSeries(series);
+			return qtyNew;
+		}
+
+		private void loadLocal_series(List<AudibleApiDTOs.Series> series)
+		{
+			var seriesIds = series.Select(s => s.SeriesId).ToList();
+			var localIds = DbContext.Series.Local.Select(s => s.AudibleSeriesId).ToList();
+			var remainingSeriesIds = seriesIds
+				.Distinct()
+				.Except(localIds)
+				.ToList();
+
+			if (remainingSeriesIds.Any())
+				DbContext.Series.Where(s => remainingSeriesIds.Contains(s.AudibleSeriesId)).ToList();
+		}
+
+		private int upsertSeries(List<AudibleApiDTOs.Series> requestedSeries)
+		{
+			var qtyNew = 0;
+
+			foreach (var s in requestedSeries)
+			{
+				var series = DbContext.Series.Local.SingleOrDefault(c => c.AudibleSeriesId == s.SeriesId);
+				if (series is null)
+				{
+					series = DbContext.Series.Add(new DataLayer.Series(new AudibleSeriesId(s.SeriesId))).Entity;
+					qtyNew++;
+				}
+				series.UpdateName(s.SeriesName);
+			}
+
+			return qtyNew;
+		}
+	}
+}

FileLiberator/UNTESTED/BackupBook.cs

@@ -17,9 +17,9 @@ 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();
@@ -32,10 +32,7 @@ namespace FileLiberator
 		// 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
 			{
@@ -61,7 +58,7 @@ namespace FileLiberator
 			}
 			finally
             {
-                Completed?.Invoke(this, displayMessage);
+                Completed?.Invoke(this, libraryBook);
             }
         }
 	}

FileLiberator/UNTESTED/DecryptBook.cs

@@ -8,6 +8,7 @@ using DataLayer;
 using Dinah.Core;
 using Dinah.Core.ErrorHandling;
 using FileManager;
+using InternalUtilities;
 
 namespace FileLiberator
 {
@@ -21,7 +22,7 @@ namespace FileLiberator
     /// </summary>
     public class DecryptBook : IDecryptable
     {
-        public event EventHandler<string> Begin;
+        public event EventHandler<LibraryBook> Begin;
         public event EventHandler<string> StatusUpdate;
         public event EventHandler<string> DecryptBegin;
 
@@ -32,7 +33,7 @@ namespace FileLiberator
         public event EventHandler<int> UpdateProgress;
 
         public event EventHandler<string> DecryptCompleted;
-        public event EventHandler<string> Completed;
+        public event EventHandler<LibraryBook> Completed;
 
         public bool Validate(LibraryBook libraryBook)
             => AudibleFileStorage.AAX.Exists(libraryBook.Book.AudibleProductId)
@@ -42,9 +43,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
             {
@@ -52,13 +51,12 @@ namespace FileLiberator
 
                 if (aaxFilename == null)
                     return new StatusHandler { "aaxFilename parameter is null" };
-                if (!FileUtility.FileExists(aaxFilename))
+                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 proposedOutputFile = Path.Combine(AudibleFileStorage.DecryptInProgress, $"[{libraryBook.Book.AudibleProductId}].m4b");
-                var outputAudioFilename = await aaxToM4bConverterDecrypt(proposedOutputFile, aaxFilename);
+                var outputAudioFilename = await aaxToM4bConverterDecrypt(aaxFilename, libraryBook);
 
                 // decrypt failed
                 if (outputAudioFilename == null)
@@ -76,17 +74,23 @@ namespace FileLiberator
             }
             finally
             {
-                Completed?.Invoke(this, displayMessage);
+                Completed?.Invoke(this, libraryBook);
             }
         }
 
-        private async Task<string> aaxToM4bConverterDecrypt(string proposedOutputFile, string aaxFilename)
+        private async Task<string> aaxToM4bConverterDecrypt(string aaxFilename, LibraryBook libraryBook)
         {
             DecryptBegin?.Invoke(this, $"Begin decrypting {aaxFilename}");
 
             try
             {
-                var converter = await AaxToM4bConverter.CreateAsync(aaxFilename, Configuration.Instance.DecryptKey);
+                using var persister = AudibleApiStorage.GetAccountsSettingsPersister();
+
+                var account = persister
+                    .AccountsSettings
+                    .GetAccount(libraryBook.Account, libraryBook.Book.Locale);
+
+                var converter = await AaxToM4bConverter.CreateAsync(aaxFilename, account.DecryptKey);
                 converter.AppName = "Libation";
 
                 TitleDiscovered?.Invoke(this, converter.tags.title);
@@ -94,19 +98,19 @@ namespace FileLiberator
                 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)
-                {
-                    Console.WriteLine("decrypt failed");
                     return null;
-                }
 
-                Configuration.Instance.DecryptKey = converter.decryptKey;
+                account.DecryptKey = converter.decryptKey;
 
                 return converter.outputFileName;
             }
@@ -117,46 +121,58 @@ namespace FileLiberator
         }
 
         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 + "]"
 
-            // create final directory. move each file into it. MOVE AUDIO FILE LAST
-            // new dir: safetitle_limit50char + " [" + productId + "]"
+			var destinationDir = getDestDir(product);
+			Directory.CreateDirectory(destinationDir);
 
-            // 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);
+			var sortedFiles = getProductFilesSorted(product, outputAudioFilename);
 
-            // 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 = Path.GetExtension(outputAudioFilename).Trim('.');
 
-            var musicFileExt = musicFiles
-                .Select(f => f.Extension)
-                .Distinct()
-                .Single()
-                .Trim('.');
+			foreach (var f in sortedFiles)
+			{
+				var dest = AudibleFileStorage.Audio.IsFileTypeMatch(f)
+					// audio filename: safetitle_limit50char + " [" + productId + "]." + audio_ext
+					? FileUtility.GetValidFilename(destinationDir, product.Title, musicFileExt, product.AudibleProductId)
+					// non-audio filename: safetitle_limit50char + " [" + productId + "][" + audio_ext +"]." + non_audio_ext
+					: FileUtility.GetValidFilename(destinationDir, product.Title, f.Extension, product.AudibleProductId, musicFileExt);
 
-            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);
+			}
+		}
 
-                File.Move(f.FullName, dest);
-            }
-        }
-    }
+		private static string getDestDir(Book product)
+		{
+			// 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);
+			return finalDir;
+		}
+
+		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/UNTESTED/DownloadBook.cs

@@ -1,9 +1,12 @@
 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
 {
@@ -17,6 +20,8 @@ namespace FileLiberator
     /// </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);
@@ -38,13 +43,64 @@ namespace FileLiberator
 
 		private async Task<string> downloadBookAsync(LibraryBook libraryBook, string tempAaxFilename)
 		{
-			var api = await AudibleApi.EzApiCreator.GetApiAsync(AudibleApiStorage.IdentityTokensFile);
+			validate(libraryBook);
+
+			var api = await AudibleApiActions.GetApiAsync(libraryBook.Account, libraryBook.Book.Locale);
 
 			var actualFilePath = await PerformDownloadAsync(
 				tempAaxFilename,
 				(p) => api.DownloadAaxWorkaroundAsync(libraryBook.Book.AudibleProductId, tempAaxFilename, p));
 
-			return actualFilePath;
+			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,
+				libraryBook.Account,
+				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)

FileLiberator/UNTESTED/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/UNTESTED/DownloadPdf.cs

@@ -16,9 +16,6 @@ namespace FileLiberator
 			=> !string.IsNullOrWhiteSpace(getdownloadUrl(libraryBook))
 			&& !AudibleFileStorage.PDF.Exists(libraryBook.Book.AudibleProductId);
 
-		private static string getdownloadUrl(LibraryBook libraryBook)
-			=> libraryBook?.Book?.Supplements?.FirstOrDefault()?.Url;
-
 		public override async Task<StatusHandler> ProcessItemAsync(LibraryBook libraryBook)
 		{
 			var proposedDownloadFilePath = getProposedDownloadFilePath(libraryBook);
@@ -26,6 +23,11 @@ namespace FileLiberator
 			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
@@ -39,15 +41,15 @@ namespace FileLiberator
 
 		private async Task downloadPdfAsync(LibraryBook libraryBook, string proposedDownloadFilePath)
 		{
+			var downloadUrl = getdownloadUrl(libraryBook);
+
 			var client = new HttpClient();
 			var actualDownloadedFilePath = await PerformDownloadAsync(
 				proposedDownloadFilePath,
-				(p) => client.DownloadFileAsync(getdownloadUrl(libraryBook), proposedDownloadFilePath, p));
+				(p) => client.DownloadFileAsync(downloadUrl, proposedDownloadFilePath, p));
 		}
 
-		private static StatusHandler verifyDownload(LibraryBook libraryBook)
-			=> !AudibleFileStorage.PDF.Exists(libraryBook.Book.AudibleProductId)
-			? new StatusHandler { "Downloaded PDF cannot be found" }
-			: new StatusHandler();
+		private static string getdownloadUrl(LibraryBook libraryBook)
+			=> libraryBook?.Book?.Supplements?.FirstOrDefault()?.Url;
 	}
 }

FileLiberator/UNTESTED/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;
@@ -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,7 +34,7 @@ namespace FileLiberator
             }
             finally
             {
-                Completed?.Invoke(this, displayMessage);
+                Completed?.Invoke(this, libraryBook);
             }
         }
 

FileLiberator/UNTESTED/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/UNTESTED/IDownloadableProcessable.cs

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

FileLiberator/UNTESTED/IProcessable.cs

@@ -7,12 +7,12 @@ 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>
 		bool Validate(LibraryBook libraryBook);

FileLiberator/UNTESTED/IProcessableExt.cs

@@ -1,5 +1,7 @@
 using System;
+using System.Linq;
 using System.Threading.Tasks;
+using ApplicationServices;
 using DataLayer;
 using Dinah.Core.ErrorHandling;
 
@@ -17,28 +19,59 @@ namespace FileLiberator
         /// <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 = processable.GetNextValid();
+            var libraryBook = processable.getNextValidBook();
             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);
+            return await processBookAsync(processable, libraryBook);
+        }
+
+        /// <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> ProcessSingleAsync(this IProcessable processable, string productId)
+        {
+            using var context = DbContexts.GetContext();
+            var libraryBook = context
+                .Library
+                .GetLibrary()
+                .SingleOrDefault(lb => lb.Book.AudibleProductId == productId);
+
+            if (libraryBook == null)
+                return null;
+            if (!processable.Validate(libraryBook))
+                return new StatusHandler { "Validation failed" };
+
+            return await processBookAsync(processable, libraryBook);
+        }
+
+        private static async Task<StatusHandler> processBookAsync(IProcessable processable, LibraryBook libraryBook)
+        {
+            Serilog.Log.Information("Begin " + nameof(processBookAsync) + " {@DebugInfo}", new
+            {
+                libraryBook.Book.Title,
+                libraryBook.Book.AudibleProductId,
+                libraryBook.Book.Locale,
+                libraryBook.Account
+            });
+
+            // 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 command
+            var status = await processable.ProcessAsync(libraryBook);
             if (status == null)
                 throw new Exception("Processable should never return a null status");
 
             return status;
         }
 
-        public static LibraryBook GetNextValid(this IProcessable processable)
+        private static LibraryBook getNextValidBook(this IProcessable processable)
         {
-            var libraryBooks = LibraryQueries.GetLibrary_Flat_NoTracking();
+            var libraryBooks = DbContexts.GetContext().GetLibrary_Flat_NoTracking();
 
             foreach (var libraryBook in libraryBooks)
                 if (processable.Validate(libraryBook))
                     return libraryBook;
 
             return null;
-        }
+        }   
 
 		public static async Task<StatusHandler> TryProcessAsync(this IProcessable processable, LibraryBook libraryBook)
 			=> processable.Validate(libraryBook)

FileManager/FileManager.csproj

@@ -5,7 +5,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Polly" Version="7.1.1" />
+    <PackageReference Include="Polly" Version="7.2.1" />
   </ItemGroup>
 
   <ItemGroup>

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

@@ -39,7 +39,7 @@ namespace FileManager
                 Configuration.Instance.DecryptInProgressEnum = "WinTemp";
             var M4bRootDir
                 = Configuration.Instance.DecryptInProgressEnum == "WinTemp" // else "LibationFiles"
-                ? Configuration.Instance.WinTemp
+                ? Configuration.WinTemp
                 : Configuration.Instance.LibationFiles;
             DecryptInProgress = Path.Combine(M4bRootDir, "DecryptInProgress");
             Directory.CreateDirectory(DecryptInProgress);
@@ -50,7 +50,7 @@ namespace FileManager
                 Configuration.Instance.DownloadsInProgressEnum = "WinTemp";
             var AaxRootDir
                 = Configuration.Instance.DownloadsInProgressEnum == "WinTemp" // else "LibationFiles"
-                ? Configuration.Instance.WinTemp
+                ? Configuration.WinTemp
                 : Configuration.Instance.LibationFiles;
             DownloadsInProgress = Path.Combine(AaxRootDir, "DownloadsInProgress");
             Directory.CreateDirectory(DownloadsInProgress);

FileManager/UNTESTED/Configuration.cs

@@ -4,6 +4,8 @@ using System.ComponentModel;
 using System.IO;
 using System.Linq;
 using Dinah.Core;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
 
 namespace FileManager
 {
@@ -31,162 +33,151 @@ namespace FileManager
         */
         #endregion
 
-        private const string configFilename = "LibationSettings.json";
+        private PersistentDictionary persistentDictionary;
 
-        private PersistentDictionary persistentDictionary { get; }
+        public bool FilesExist
+            => File.Exists(APPSETTINGS_JSON)
+            && File.Exists(SettingsFilePath)
+            && Directory.Exists(LibationFiles)
+            && Directory.Exists(Books);
 
-        [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;
-        }
+        public string SettingsFilePath => Path.Combine(LibationFiles, "Settings.json");
 
         [Description("Location for book storage. Includes destination of newly liberated books")]
         public string Books
         {
-            get => persistentDictionary[nameof(Books)];
-            set => persistentDictionary[nameof(Books)] = value;
+            get => persistentDictionary.GetString(nameof(Books));
+            set => persistentDictionary.Set(nameof(Books), value);
         }
 
-        public string WinTemp { get; } = Path.Combine(Path.GetTempPath(), "Libation");
+        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"));
 
-        [Description("Location for storage of program-created files")]
-        public string LibationFiles
+        private Dictionary<string, string> wellKnownPaths { get; } = new Dictionary<string, string>
         {
-            get => persistentDictionary[nameof(LibationFiles)];
-            set => persistentDictionary[nameof(LibationFiles)] = value;
-        }
+            [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[nameof(DownloadsInProgressEnum)];
-            set => persistentDictionary[nameof(DownloadsInProgressEnum)] = value;
+            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[nameof(DecryptInProgressEnum)];
-            set => persistentDictionary[nameof(DecryptInProgressEnum)] = value;
+            get => persistentDictionary.GetString(nameof(DecryptInProgressEnum));
+            set => persistentDictionary.Set(nameof(DecryptInProgressEnum), value);
         }
 
-		public string LocaleCountryCode
-		{
-			get => persistentDictionary[nameof(LocaleCountryCode)];
-			set => persistentDictionary[nameof(LocaleCountryCode)] = 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 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()
         {
-            Filepath = getPath();
+            var value = getLiberationFilesSettingFromJson();
 
-            // load json values into memory
-            persistentDictionary = new PersistentDictionary(Filepath);
-            ensureDictionaryEntries();
+            // this looks weird but is correct for translating wellKnownPaths
+            if (wellKnownPaths.ContainsKey(value))
+                value = wellKnownPaths[value];
 
-            // 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");
+            // 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;
+            var attribute = typeof(Configuration)
+                .GetProperty(propertyName)
+                ?.GetCustomAttributes(typeof(DescriptionAttribute), true)
+                .SingleOrDefault()
+                as DescriptionAttribute;
 
-			return attribute?.Description;
-		}
+            return attribute?.Description;
+        }
 
-        private static string getPath()
+        public bool TrySetLibationFiles(string directory)
         {
-            // search folders for config file. accept the first match
-            var defaultdir = Path.GetDirectoryName(Exe.FileLocationOnDisk);
+            if (!Directory.Exists(directory) && !wellKnownPaths.ContainsKey(directory))
+                return false;
 
-            var baseDirs = new HashSet<string>
+            // if moving from default, delete old settings file and dir (if empty)
+            if (LibationFiles.EqualsInsensitive(AppDir))
             {
-                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;
+                File.Delete(SettingsFilePath);
+                System.Threading.Thread.Sleep(100);
+                if (!Directory.EnumerateDirectories(AppDir).Any() && !Directory.EnumerateFiles(AppDir).Any())
+                    Directory.Delete(AppDir);
             }
 
-            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
+            libationFilesPathCache = null;
 
-            var curr = new DirectoryInfo(path);
 
-            if (!curr.Name.EqualsInsensitive("debug") && !curr.Name.EqualsInsensitive("release") && !curr.Name.StartsWithInsensitive("netcoreapp") && !curr.Name.StartsWithInsensitive("netstandard"))
-                return path;
+            var contents = File.ReadAllText(APPSETTINGS_JSON);
+            var jObj = JObject.Parse(contents);
 
-            // get out of netcore/standard dir => debug
-            if (curr.Name.StartsWithInsensitive("netcoreapp") || curr.Name.StartsWithInsensitive("netstandard"))
-                curr = curr.Parent;
+            jObj[LIBATION_FILES] = directory;
 
-            if (!curr.Name.EqualsInsensitive("debug") && !curr.Name.EqualsInsensitive("release"))
-                return path;
+            var output = JsonConvert.SerializeObject(jObj, Formatting.Indented);
+            File.WriteAllText(APPSETTINGS_JSON, output);
 
-            // 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;
+            return true;
         }
     }
 }

FileManager/UNTESTED/FilePathCache.cs

@@ -2,11 +2,12 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using Dinah.Core.Collections.Immutable;
 using Newtonsoft.Json;
 
 namespace FileManager
 {
-    public static class FilePathCache
+	public static class FilePathCache
     {
         internal class CacheEntry
         {
@@ -15,27 +16,30 @@ namespace FileManager
             public string Path { get; set; }
         }
 
-        static List<CacheEntry> inMemoryCache { get; } = new List<CacheEntry>();
+        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 (FileUtility.FileExists(JsonFile))
-                inMemoryCache = JsonConvert.DeserializeObject<List<CacheEntry>>(File.ReadAllText(JsonFile));
+			// 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 = inMemoryCache.SingleOrDefault(i => i.Id == id && i.FileType == type);
+            var entry = cache.SingleOrDefault(i => i.Id == id && i.FileType == type);
 
             if (entry == null)
                 return null;
 
-            if (!FileUtility.FileExists(entry.Path))
+            if (!File.Exists(entry.Path))
             {
                 remove(entry);
                 return null;
@@ -44,51 +48,47 @@ namespace FileManager
             return entry.Path;
         }
 
-        private static object locker { get; } = new object();
-
         private static void remove(CacheEntry entry)
-        {
-            lock (locker)
-            {
-                inMemoryCache.Remove(entry);
-                save();
-            }
-        }
+		{
+			cache.Remove(entry);
+			save();
+		}
 
         public static void Upsert(string id, FileType type, string path)
         {
-            if (!FileUtility.FileExists(path))
+            if (!File.Exists(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();
-            }
-        }
+			var entry = cache.SingleOrDefault(i => i.Id == id && i.FileType == type);
 
-        // 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;
-                }
-            }
+			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/UNTESTED/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/UNTESTED/PersistentDictionary.cs

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
 
 namespace FileManager
 {
@@ -10,70 +11,114 @@ namespace FileManager
     {
         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();
-            }
-        }
+        // 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;
 
-            // 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)
+            if (File.Exists(Filepath))
                 return;
 
-            foreach (var key in keys)
-                settingsDic.Add(key, null);
-            save();
+            // 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) where T : class
+            => GetObject(propertyName) is T obj ? obj : default;
+
+        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();
-        private void save()
+        public void Set(string propertyName, string newValue)
         {
-            lock (locker)
-                File.WriteAllText(Filepath, JsonConvert.SerializeObject(settingsDic, Formatting.Indented));
+            // only do this check in string cache, NOT object cache
+            if (stringCache[propertyName] == newValue)
+                return;
+
+            // set cache
+            stringCache[propertyName] = newValue;
+
+            writeFile(propertyName, newValue);
         }
 
-        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();
+        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/UNTESTED/PictureStorage.cs

@@ -47,7 +47,7 @@ namespace FileManager
 			{
 				var path = getPath(def);
 				cache[def]
-					= FileUtility.FileExists(path)
+					= File.Exists(path)
 					? File.ReadAllBytes(path)
 					: null;
 			}

FileManager/UNTESTED/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/UNTESTED/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/UNTESTED/TagsPersistence.cs

@@ -27,11 +27,13 @@ namespace FileManager
 			= Policy.Handle<Exception>()
 			.WaitAndRetry(new[] { TimeSpan.FromMilliseconds(100) });
 
-        public static void Save(string productId, string tags)
+		public static void Save(IEnumerable<(string productId, string tags)> tagsCollection)
 		{
 			ensureCache();
 
-			cache[productId] = tags;
+			// 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)));
@@ -51,7 +53,7 @@ namespace FileManager
 		{
 			if (cache is null)
 				lock (locker)
-					cache = !FileUtility.FileExists(TagsFile)
+					cache = !File.Exists(TagsFile)
 						? new Dictionary<string, string>()
 						: JsonConvert.DeserializeObject<Dictionary<string, string>>(File.ReadAllText(TagsFile));
 		}

InternalUtilities/Account.cs

@@ -0,0 +1,97 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using AudibleApi;
+using AudibleApi.Authorization;
+using Dinah.Core;
+using Newtonsoft.Json;
+
+namespace InternalUtilities
+{
+	public class Account : IUpdatable
+	{
+		public event EventHandler Updated;
+		private void update(object sender = null, EventArgs e = null)
+			=> Updated?.Invoke(this, new EventArgs());
+
+		// canonical. immutable. email or phone number
+		public string AccountId { get; }
+
+		// user-friendly, non-canonical name. mutable
+		private string _accountName;
+		public string AccountName
+		{
+			get => _accountName;
+			set
+			{
+				if (string.IsNullOrWhiteSpace(value))
+					return;
+				var v = value.Trim();
+				if (v == _accountName)
+					return;
+				_accountName = v;
+				update();
+			}
+		}
+
+		// whether to include this account when scanning libraries.
+		// technically this is an app setting; not an attribute of account. but since it's managed with accounts, it makes sense to put this exception-to-the-rule here
+		private bool _libraryScan = true;
+		public bool LibraryScan
+		{
+			get => _libraryScan;
+			set
+			{
+				if (value == _libraryScan)
+					return;
+				_libraryScan = value;
+				update();
+			}
+		}
+
+		private string _decryptKey = "";
+		/// <summary>aka: activation bytes</summary>
+		public string DecryptKey
+		{
+			get => _decryptKey;
+			set
+			{
+				var v = (value ?? "").Trim();
+				if (v == _decryptKey)
+					return;
+				_decryptKey = v;
+				update();
+			}
+		}
+
+		private Identity _identity;
+		public Identity IdentityTokens
+		{
+			get => _identity;
+			set
+			{
+				if (_identity is null && value is null)
+					return;
+
+				if (_identity != null)
+					_identity.Updated -= update;
+
+				if (value != null)
+					value.Updated += update;
+
+				_identity = value;
+				update();
+			}
+		}
+
+		[JsonIgnore]
+		public Locale Locale => IdentityTokens?.Locale;
+
+		public Account(string accountId)
+		{
+			AccountId = ArgumentValidator.EnsureNotNullOrWhiteSpace(accountId, nameof(accountId)).Trim();
+		}
+
+		public override string ToString() => $"{AccountId} - {Locale?.Name ?? "[empty]"}";
+	}
+}

InternalUtilities/AccountsSettings.cs

@@ -0,0 +1,142 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using AudibleApi;
+using AudibleApi.Authorization;
+using Dinah.Core;
+using Newtonsoft.Json;
+
+namespace InternalUtilities
+{
+	// 'AccountsSettings' is intentionally NOT IEnumerable<> so that properties can be added/extended
+	// from newtonsoft (https://www.newtonsoft.com/json/help/html/SerializationGuide.htm):
+	//   .NET :  IList, IEnumerable, IList<T>, Array
+	//   JSON :  Array (properties on the collection will not be serialized)
+	public class AccountsSettings : IUpdatable
+	{
+		public event EventHandler Updated;
+		private void update(object sender = null, EventArgs e = null)
+		{
+			foreach (var account in Accounts)
+				validate(account);
+			update_no_validate();
+		}
+		private void update_no_validate() => Updated?.Invoke(this, new EventArgs());
+
+		public AccountsSettings() { }
+
+		// for some reason this will make the json instantiator use _accounts_json.set()
+		[JsonConstructor]
+		protected AccountsSettings(List<Account> accountsSettings) { }
+
+		#region Accounts
+		private List<Account> _accounts_backing = new List<Account>();
+		[JsonProperty(PropertyName = nameof(Accounts))]
+		private List<Account> _accounts_json
+		{
+			get => _accounts_backing;
+			// 'set' is only used by json deser
+			set
+			{
+				if (value is null)
+					return;
+
+				foreach (var account in value)
+					_add(account);
+
+				update_no_validate();
+			}
+		}
+		[JsonIgnore]
+		public IReadOnlyList<Account> Accounts => _accounts_json.AsReadOnly();
+		#endregion
+
+		#region de/serialize
+		public static AccountsSettings FromJson(string json)
+			=> JsonConvert.DeserializeObject<AccountsSettings>(json, Identity.GetJsonSerializerSettings());
+
+		public string ToJson(Formatting formatting = Formatting.Indented)
+			=> JsonConvert.SerializeObject(this, formatting, Identity.GetJsonSerializerSettings());
+		#endregion
+
+		// more common naming convention alias for internal collection
+		public IReadOnlyList<Account> GetAll() => Accounts;
+
+		public Account Upsert(string accountId, string locale)
+		{
+			var acct = GetAccount(accountId, locale);
+
+			if (acct != null)
+				return acct;
+
+			var l = Localization.Get(locale);
+			var id = new Identity(l);
+
+			var account = new Account(accountId) { IdentityTokens = id };
+			Add(account);
+			return account;
+		}
+
+		public void Add(Account account)
+		{
+			_add(account);
+			update_no_validate();
+		}
+
+		public void _add(Account account)
+		{
+			validate(account);
+
+			_accounts_backing.Add(account);
+			account.Updated += update;
+		}
+
+		public Account GetAccount(string accountId, string locale)
+		{
+			if (locale is null)
+				return null;
+
+			return Accounts.SingleOrDefault(a => a.AccountId == accountId && a.IdentityTokens.Locale.Name == locale);
+		}
+
+		public bool Delete(string accountId, string locale)
+		{
+			var acct = GetAccount(accountId, locale);
+			if (acct is null)
+				return false;
+			return Delete(acct);
+		}
+
+		public bool Delete(Account account)
+		{
+			if (!_accounts_backing.Contains(account))
+				return false;
+
+			account.Updated -= update;
+			var result = _accounts_backing.Remove(account);
+			update_no_validate();
+			return result;
+		}
+
+		private void validate(Account account)
+		{
+			ArgumentValidator.EnsureNotNull(account, nameof(account));
+
+			var accountId = account.AccountId;
+			var locale = account?.IdentityTokens?.Locale?.Name;
+
+			var acct = GetAccount(accountId, locale);
+
+			// new: ok
+			if (acct is null)
+				return;
+
+			// same account instance: ok
+			if (acct == account)
+				return;
+			
+			// same account id + locale, different instance: bad
+			throw new InvalidOperationException("Cannot add an account with the same account Id and Locale");
+		}
+	}
+}

InternalUtilities/AccountsSettingsPersister.cs

@@ -0,0 +1,24 @@
+using System;
+using AudibleApi.Authorization;
+using Dinah.Core.IO;
+using Newtonsoft.Json;
+
+namespace InternalUtilities
+{
+	public class AccountsSettingsPersister : JsonFilePersister<AccountsSettings>
+	{
+		/// <summary>Alias for Target </summary>
+		public AccountsSettings AccountsSettings => Target;
+
+		/// <summary>uses path. create file if doesn't yet exist</summary>
+		public AccountsSettingsPersister(AccountsSettings target, string path, string jsonPath = null)
+			: base(target, path, jsonPath) { }
+
+		/// <summary>load from existing file</summary>
+		public AccountsSettingsPersister(string path, string jsonPath = null)
+			: base(path, jsonPath) { }
+
+		protected override JsonSerializerSettings GetSerializerSettings()
+			=> Identity.GetJsonSerializerSettings();
+	}
+}

InternalUtilities/ImportItem.cs

@@ -0,0 +1,12 @@
+using System;
+using AudibleApiDTOs;
+
+namespace InternalUtilities
+{
+	public class ImportItem
+	{
+		public Item DtoItem { get; set; }
+		public string AccountId { get; set; }
+		public string LocaleName { get; set; }
+	}
+}

InternalUtilities/UNTESTED/AudibleApiActions.cs

@@ -4,35 +4,63 @@ using System.Linq;
 using System.Threading.Tasks;
 using AudibleApi;
 using AudibleApiDTOs;
-using FileManager;
 using Polly;
 using Polly.Retry;
 
 namespace InternalUtilities
 {
-	public class AudibleApiActions
+	public static class AudibleApiActions
 	{
-		private AsyncRetryPolicy policy { get; }
+		/// <summary>USE THIS from within Libation. It wraps the call with correct JSONPath</summary>
+		public static Task<Api> GetApiAsync(string username, string localeName, ILoginCallback loginCallback = null)
+		{
+			Serilog.Log.Logger.Information("GetApiAsync. {@DebugInfo}", new
+			{
+				username,
+				LocaleName = localeName,
+			});
+			return EzApiCreator.GetApiAsync(
+				Localization.Get(localeName),
+				AudibleApiStorage.AccountsSettingsFile,
+				AudibleApiStorage.GetIdentityTokensJsonPath(username, localeName),
+				loginCallback);
+		}
+
+		/// <summary>USE THIS from within Libation. It wraps the call with correct JSONPath</summary>
+		public static Task<Api> GetApiAsync(ILoginCallback loginCallback, Account account)
+		{
+			Serilog.Log.Logger.Information("GetApiAsync. {@DebugInfo}", new
+			{
+				AccountId = account?.AccountId ?? "[empty]",
+				LocaleName = account?.Locale?.Name
+			});
+			return EzApiCreator.GetApiAsync(
+				account.Locale,
+				AudibleApiStorage.AccountsSettingsFile,
+				account.GetIdentityTokensJsonPath(),
+				loginCallback);
+		}
+
+		private static AsyncRetryPolicy policy { get; }
 			= Policy.Handle<Exception>()
 			// 2 retries == 3 total
 			.RetryAsync(2);
 
-		public async Task<List<Item>> GetAllLibraryItemsAsync(ILoginCallback callback)
+		public static Task<List<Item>> GetLibraryValidatedAsync(Api api)
 		{
 			// bug on audible's side. the 1st time after a long absence, a query to get library will return without titles or authors. a subsequent identical query will be successful. this is true whether or tokens are refreshed
 			// worse, this 1st dummy call doesn't seem to help:
 			//    var page = await api.GetLibraryAsync(new AudibleApi.LibraryOptions { NumberOfResultPerPage = 1, PageNumber = 1, PurchasedAfter = DateTime.Now.AddYears(-20), ResponseGroups = AudibleApi.LibraryOptions.ResponseGroupOptions.ALL_OPTIONS });
 			// i don't want to incur the cost of making a full dummy call every time because it fails sometimes
-			return await policy.ExecuteAsync(() => getItemsAsync(callback));
+			return policy.ExecuteAsync(() => getItemsAsync(api));
 		}
 
-		private async Task<List<Item>> getItemsAsync(ILoginCallback callback)
+		private static async Task<List<Item>> getItemsAsync(Api api)
 		{
-			var api = await EzApiCreator.GetApiAsync(AudibleApiStorage.IdentityTokensFile, callback, Configuration.Instance.LocaleCountryCode);
-			var items = await AudibleApiExtensions.GetAllLibraryItemsAsync(api);
+			var items = await api.GetAllLibraryItemsAsync();
 
-			// remove episode parents
-			items.RemoveAll(i => i.IsEpisodes);
+			// remove episode parents and 'audible plus' check-outs
+			items.RemoveAll(i => i.IsEpisodes || i.IsNonLibraryAudiblePlus);
 
 			#region // episode handling. doesn't quite work
 			//				// add individual/children episodes

InternalUtilities/UNTESTED/AudibleApiExtensions.cs

@@ -1,42 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using AudibleApi;
-using AudibleApiDTOs;
-
-//
-// probably not the best place for this
-// but good enough for now
-//
-namespace InternalUtilities
-{
-	public static class AudibleApiExtensions
-	{
-		public static async Task<List<Item>> GetAllLibraryItemsAsync(this Api api)
-		{
-			var allItems = new List<Item>();
-
-			for (var i = 1; ; i++)
-			{
-				var page = await api.GetLibraryAsync(new LibraryOptions
-				{
-					NumberOfResultPerPage = 1000,
-					PageNumber = i,
-					PurchasedAfter = new DateTime(2000, 1, 1),
-					ResponseGroups = LibraryOptions.ResponseGroupOptions.ALL_OPTIONS
-				});
-
-				// important! use this convert method
-				var libResult = LibraryDtoV10.FromJson(page.ToString());
-
-				if (!libResult.Items.Any())
-					break;
-
-				allItems.AddRange(libResult.Items);
-			}
-
-			return allItems;
-		}
-	}
-}

InternalUtilities/UNTESTED/AudibleApiStorage.cs

@@ -0,0 +1,47 @@
+using System;
+using System.IO;
+using FileManager;
+using Newtonsoft.Json;
+
+namespace InternalUtilities
+{
+	public static class AudibleApiStorage
+	{
+		public static string AccountsSettingsFile => Path.Combine(Configuration.Instance.LibationFiles, "AccountsSettings.json");
+
+		public static void EnsureAccountsSettingsFileExists()
+		{
+			// saves. BEWARE: this will overwrite an existing file
+			if (!File.Exists(AccountsSettingsFile))
+				_ = new AccountsSettingsPersister(new AccountsSettings(), AccountsSettingsFile);
+		}
+
+		/// <summary>If you use this, be a good citizen and DISPOSE of it</summary>
+		public static AccountsSettingsPersister GetAccountsSettingsPersister() => new AccountsSettingsPersister(AccountsSettingsFile);
+
+		public static string GetIdentityTokensJsonPath(this Account account)
+			=> GetIdentityTokensJsonPath(account.AccountId, account.Locale?.Name);
+		public static string GetIdentityTokensJsonPath(string username, string localeName)
+		{
+			var usernameSanitized = trimSurroundingQuotes(JsonConvert.ToString(username));
+			var localeNameSanitized = trimSurroundingQuotes(JsonConvert.ToString(localeName));
+
+			return $"$.Accounts[?(@.AccountId == '{usernameSanitized}' && @.IdentityTokens.LocaleName == '{localeNameSanitized}')].IdentityTokens";
+		}
+		private static string trimSurroundingQuotes(string str)
+		{
+			// SubString algo is better than .Trim("\"")
+			//   orig string  "
+			//   json string  "\""
+			// Eg:
+			//   =>           str.Trim("\"")
+			//   output       \
+			// vs
+			//   =>           str.Substring(1, str.Length - 2)
+			//   output       \"
+			// also works with surrounding single quotes
+
+			return str.Substring(1, str.Length - 2);
+		}
+	}
+}

InternalUtilities/UNTESTED/AudibleApiValidators.cs

@@ -29,12 +29,12 @@ namespace InternalUtilities
 		{
 			var exceptions = new List<Exception>();
 
+			// a book having no authors is rare but allowed
+
 			if (items.Any(i => string.IsNullOrWhiteSpace(i.ProductId)))
 				exceptions.Add(new ArgumentException($"Collection contains item(s) with blank {nameof(Item.ProductId)}", nameof(items)));
 			if (items.Any(i => string.IsNullOrWhiteSpace(i.Title)))
 				exceptions.Add(new ArgumentException($"Collection contains item(s) with blank {nameof(Item.Title)}", nameof(items)));
-			if (items.Any(i => i.Authors is null))
-				exceptions.Add(new ArgumentException($"Collection contains item(s) with null {nameof(Item.Authors)}", nameof(items)));
 
 			return exceptions;
 		}
@@ -51,9 +51,6 @@ namespace InternalUtilities
 			if (distinct.Any(s => s.CategoryName is null))
 				exceptions.Add(new ArgumentException($"Collection contains {nameof(Item.Categories)} with null {nameof(Ladder.CategoryName)}", nameof(items)));
 
-			if (items.GetCategoryPairsDistinct().Any(p => p.Length > 2))
-				exceptions.Add(new ArgumentException($"Collection contains {nameof(Item.Categories)} with wrong number of categories. Expecting 0, 1, or 2 categories per title", nameof(items)));
-
 			return exceptions;
 		}
 	}

Libation.sln

@@ -10,13 +10,13 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "_Solution Items", "_Solutio
 		REFERENCE.txt = REFERENCE.txt
 	EndProjectSection
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "3.2 Domain Utilities (database aware)", "3.2 Domain Utilities (database aware)", "{41CDCC73-9B81-49DD-9570-C54406E852AF}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "5 Domain Utilities (db aware)", "5 Domain Utilities (db aware)", "{41CDCC73-9B81-49DD-9570-C54406E852AF}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "4 Application", "4 Application", "{8679CAC8-9164-4007-BDD2-F004810EDA14}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "6 Application", "6 Application", "{8679CAC8-9164-4007-BDD2-F004810EDA14}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "1 Core Libraries", "1 Core Libraries", "{43E3ACB3-E0BC-4370-8DBB-E3720C8C8FD1}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "3 Domain", "3 Domain", "{751093DD-5DBA-463E-ADBE-E05FAFB6983E}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "4 Domain (db)", "4 Domain (db)", "{751093DD-5DBA-463E-ADBE-E05FAFB6983E}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "2 Utilities (domain ignorant)", "2 Utilities (domain ignorant)", "{7FBBB086-0807-4998-85BF-6D1A49C8AD05}"
 EndProject
@@ -30,7 +30,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FileLiberator", "FileLibera
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "InternalUtilities", "InternalUtilities\InternalUtilities.csproj", "{06882742-27A6-4347-97D9-56162CEC9C11}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "3.1 Domain Internal Utilities (db ignorant)", "3.1 Domain Internal Utilities (db ignorant)", "{F0CBB7A7-D3FB-41FF-8F47-CF3F6A592249}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "3 Domain Internal Utilities (db ignorant)", "3 Domain Internal Utilities (db ignorant)", "{F0CBB7A7-D3FB-41FF-8F47-CF3F6A592249}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibationSearchEngine", "LibationSearchEngine\LibationSearchEngine.csproj", "{2E1F5DB4-40CC-4804-A893-5DCE0193E598}"
 EndProject
@@ -50,7 +50,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AudibleApi", "..\audible ap
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AudibleApi.Tests", "..\audible api\AudibleApi\_Tests\AudibleApi.Tests\AudibleApi.Tests.csproj", "{111420E2-D4F0-4068-B46A-C4B6DCC823DC}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibationWinForm", "LibationWinForm\LibationWinForm.csproj", "{635F00E1-AAD1-45F7-BEB7-D909AD33B9F6}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibationWinForms", "LibationWinForms\LibationWinForms.csproj", "{635F00E1-AAD1-45F7-BEB7-D909AD33B9F6}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WinFormsDesigner", "WinFormsDesigner\WinFormsDesigner.csproj", "{0807616A-A77A-4B08-A65A-1582B09E114B}"
 EndProject
@@ -78,7 +78,13 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ApplicationServices", "Appl
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Dinah.Core.WindowsDesktop", "..\Dinah.Core\Dinah.Core.WindowsDesktop\Dinah.Core.WindowsDesktop.csproj", "{059CE32C-9AD6-45E9-A166-790DFFB0B730}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WindowsDesktopUtilities", "WindowsDesktopUtilities\WindowsDesktopUtilities.csproj", "{E7EFD64D-6630-4426-B09C-B6862A92E3FD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WindowsDesktopUtilities", "WindowsDesktopUtilities\WindowsDesktopUtilities.csproj", "{E7EFD64D-6630-4426-B09C-B6862A92E3FD}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibationLauncher", "LibationLauncher\LibationLauncher.csproj", "{F3B04A3A-20C8-4582-A54A-715AF6A5D859}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "0 Libation Tests", "0 Libation Tests", "{67E66E82-5532-4440-AFB3-9FB1DF9DEF53}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "InternalUtilities.Tests", "_Tests\InternalUtilities.Tests\InternalUtilities.Tests.csproj", "{8447C956-B03E-4F59-9DD4-877793B849D9}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -194,6 +200,14 @@ Global
 		{E7EFD64D-6630-4426-B09C-B6862A92E3FD}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{E7EFD64D-6630-4426-B09C-B6862A92E3FD}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{E7EFD64D-6630-4426-B09C-B6862A92E3FD}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F3B04A3A-20C8-4582-A54A-715AF6A5D859}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F3B04A3A-20C8-4582-A54A-715AF6A5D859}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F3B04A3A-20C8-4582-A54A-715AF6A5D859}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F3B04A3A-20C8-4582-A54A-715AF6A5D859}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8447C956-B03E-4F59-9DD4-877793B849D9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8447C956-B03E-4F59-9DD4-877793B849D9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8447C956-B03E-4F59-9DD4-877793B849D9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8447C956-B03E-4F59-9DD4-877793B849D9}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -226,6 +240,8 @@ Global
 		{B95650EA-25F0-449E-BA5D-99126BC5D730} = {41CDCC73-9B81-49DD-9570-C54406E852AF}
 		{059CE32C-9AD6-45E9-A166-790DFFB0B730} = {43E3ACB3-E0BC-4370-8DBB-E3720C8C8FD1}
 		{E7EFD64D-6630-4426-B09C-B6862A92E3FD} = {F0CBB7A7-D3FB-41FF-8F47-CF3F6A592249}
+		{F3B04A3A-20C8-4582-A54A-715AF6A5D859} = {8679CAC8-9164-4007-BDD2-F004810EDA14}
+		{8447C956-B03E-4F59-9DD4-877793B849D9} = {67E66E82-5532-4440-AFB3-9FB1DF9DEF53}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {615E00ED-BAEF-4E8E-A92A-9B82D87942A9}

LibationLauncher/.msbump

@@ -0,0 +1,4 @@
+{
+  "//": "https://github.com/BalassaMarton/MSBump",
+  BumpRevision: true
+}

LibationLauncher/LibationLauncher.csproj

@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
+
+  <PropertyGroup>
+    <OutputType>WinExe</OutputType>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <UseWindowsForms>true</UseWindowsForms>
+    <ApplicationIcon>libation.ico</ApplicationIcon>
+    <AssemblyName>Libation</AssemblyName>
+
+    <PublishTrimmed>true</PublishTrimmed>
+    <PublishReadyToRun>true</PublishReadyToRun>
+    <!-- <PublishSingleFile>true</PublishSingleFile> -->
+    <RuntimeIdentifier>win-x64</RuntimeIdentifier>
+
+    <Version>4.0.2.3</Version>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="MSBump" Version="2.3.2">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+    <PackageReference Include="Octokit" Version="0.48.0" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\LibationWinForms\LibationWinForms.csproj" />
+  </ItemGroup>
+
+</Project>

LibationLauncher/UNTESTED/Program.cs

@@ -0,0 +1,400 @@
+using System;
+using System.IO;
+using System.Linq;
+using System.Windows.Forms;
+using AudibleApi;
+using FileManager;
+using InternalUtilities;
+using LibationWinForms;
+using LibationWinForms.Dialogs;
+using Microsoft.Extensions.Configuration;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using Serilog;
+
+namespace LibationLauncher
+{
+	static class Program
+	{
+		[STAThread]
+		static void Main()
+		{
+			Application.SetHighDpiMode(HighDpiMode.SystemAware);
+			Application.EnableVisualStyles();
+			Application.SetCompatibleTextRenderingDefault(false);
+
+			createSettings();
+
+			AudibleApiStorage.EnsureAccountsSettingsFileExists();
+
+			migrate_v3_to_v4();
+
+			ensureLoggingConfig();
+			ensureSerilogConfig();
+			configureLogging();
+			checkForUpdate();
+			logStartupState();
+
+			Application.Run(new Form1());
+		}
+
+		private static void createSettings()
+		{
+			static bool configSetupIsComplete(Configuration config)
+				=> config.FilesExist
+				&& !string.IsNullOrWhiteSpace(config.DownloadsInProgressEnum)
+				&& !string.IsNullOrWhiteSpace(config.DecryptInProgressEnum);
+
+			var config = Configuration.Instance;
+			if (configSetupIsComplete(config))
+				return;
+
+			var isAdvanced = false;
+
+			var setupDialog = new SetupDialog();
+			setupDialog.NoQuestionsBtn_Click += (_, __) =>
+			{
+				config.DownloadsInProgressEnum ??= "WinTemp";
+				config.DecryptInProgressEnum ??= "WinTemp";
+				config.Books ??= Configuration.AppDir;
+			};
+			// setupDialog.BasicBtn_Click += (_, __) => // no action needed
+			setupDialog.AdvancedBtn_Click += (_, __) => isAdvanced = true;
+			setupDialog.ShowDialog();
+
+			if (isAdvanced)
+			{
+				var dialog = new LibationFilesDialog();
+				if (dialog.ShowDialog() != DialogResult.OK)
+					MessageBox.Show("Libation Files location not changed");
+			}
+
+			if (configSetupIsComplete(config))
+				return;
+
+			if (new SettingsDialog().ShowDialog() == DialogResult.OK)
+				return;
+
+			MessageBox.Show("Initial set up cancelled.", "Cancelled", MessageBoxButtons.OK, MessageBoxIcon.Warning);
+			Application.Exit();
+			Environment.Exit(0);
+		}
+
+		#region v3 => v4 migration
+		static string AccountsSettingsFileLegacy30 => Path.Combine(Configuration.Instance.LibationFiles, "IdentityTokens.json");
+
+		private static void migrate_v3_to_v4()
+		{
+			migrateLegacyIdentityFile();
+
+			updateSettingsFile();
+		}
+
+		private static void migrateLegacyIdentityFile()
+		{
+			if (File.Exists(AccountsSettingsFileLegacy30))
+			{
+				// don't always rely on applicable POCOs. some is legacy and must be: json file => JObject
+				try
+				{
+					updateLegacyFileWithLocale();
+
+					var account = createAccountFromLegacySettings();
+					account.DecryptKey = getDecryptKey(account);
+
+					// the next few methods need persistence. to be a good citizen, dispose of persister at the end of current scope
+					using var persister = AudibleApiStorage.GetAccountsSettingsPersister();
+					persister.AccountsSettings.Add(account);
+				}
+				// migration is a convenience. if something goes wrong: just move on
+				catch { }
+
+				// delete legacy token file
+				File.Delete(AccountsSettingsFileLegacy30);
+			}
+		}
+
+		private static void updateLegacyFileWithLocale()
+		{
+			var legacyContents = File.ReadAllText(AccountsSettingsFileLegacy30);
+			var legacyJObj = JObject.Parse(legacyContents);
+
+			// attempt to update legacy token file with locale from settings
+			if (!legacyJObj.ContainsKey("LocaleName"))
+			{
+				var settings = File.ReadAllText(Configuration.Instance.SettingsFilePath);
+				var settingsJObj = JObject.Parse(settings);
+				if (settingsJObj.TryGetValue("LocaleCountryCode", out var localeName))
+				{
+					// update legacy token file with locale from settings
+					legacyJObj.AddFirst(new JProperty("LocaleName", localeName.Value<string>()));
+
+					// save
+					var newContents = legacyJObj.ToString(Formatting.Indented);
+					File.WriteAllText(AccountsSettingsFileLegacy30, newContents);
+				}
+			}
+		}
+
+		private static Account createAccountFromLegacySettings()
+		{
+			// get required locale from settings file
+			var settingsContents = File.ReadAllText(Configuration.Instance.SettingsFilePath);
+			if (!JObject.Parse(settingsContents).TryGetValue("LocaleCountryCode", out var jLocale))
+				return null;
+
+			var localeName = jLocale.Value<string>();
+			var locale = Localization.Get(localeName);
+
+			var api = EzApiCreator.GetApiAsync(locale, AccountsSettingsFileLegacy30).GetAwaiter().GetResult();
+			var email = api.GetEmailAsync().GetAwaiter().GetResult();
+
+			// identity has likely been updated above. re-get contents
+			var legacyContents = File.ReadAllText(AccountsSettingsFileLegacy30);
+
+			var identity = AudibleApi.Authorization.Identity.FromJson(legacyContents);
+
+			if (!identity.IsValid)
+				return null;
+
+			var account = new Account(email)
+			{
+				AccountName = $"{email} - {locale.Name}",
+				LibraryScan = true,
+				IdentityTokens = identity
+			};
+
+			return account;
+		}
+
+		private static string getDecryptKey(Account account)
+		{
+			if (!string.IsNullOrWhiteSpace(account?.DecryptKey))
+				return account.DecryptKey;
+
+			if (!File.Exists(Configuration.Instance.SettingsFilePath) || account is null)
+				return "";
+
+			var settingsContents = File.ReadAllText(Configuration.Instance.SettingsFilePath);
+			if (JObject.Parse(settingsContents).TryGetValue("DecryptKey", out var jToken))
+				return jToken.Value<string>() ?? "";
+
+			return "";
+		}
+
+		private static void updateSettingsFile()
+		{
+			if (!File.Exists(Configuration.Instance.SettingsFilePath))
+				return;
+
+			// use JObject to remove decrypt key and locale from Settings.json
+			var settingsContents = File.ReadAllText(Configuration.Instance.SettingsFilePath);
+			var jObj = JObject.Parse(settingsContents);
+
+			var jLocale = jObj.Property("LocaleCountryCode");
+			var jDecryptKey = jObj.Property("DecryptKey");
+			
+			jDecryptKey?.Remove();
+			jLocale?.Remove();
+
+			if (jDecryptKey != null || jLocale != null)
+			{
+				var newContents = jObj.ToString(Formatting.Indented);
+				File.WriteAllText(Configuration.Instance.SettingsFilePath, newContents);
+			}
+		}
+		#endregion
+
+		private static string defaultLoggingLevel { get; } = "Information";
+		private static void ensureLoggingConfig()
+		{
+			var config = Configuration.Instance;
+
+			if (config.GetObject("Logging") != null)
+				return;
+
+			// "Logging": {
+			//   "LogLevel": {
+			//     "Default": "Debug"
+			//   }
+			// }
+			var loggingObj = new JObject
+			{
+				{
+					"LogLevel", new JObject { { "Default", defaultLoggingLevel } }
+				}
+			};
+			config.SetObject("Logging", loggingObj);
+		}
+
+		private static void ensureSerilogConfig()
+		{
+			var config = Configuration.Instance;
+
+			if (config.GetObject("Serilog") != null)
+				return;
+
+			// default. for reference. output example:
+			// 2019-11-26 08:48:40.224 -05:00 [DBG] Begin Libation
+			var default_outputTemplate = "{Timestamp:yyyy-MM-dd HH:mm:ss.fff zzz} [{Level:u3}] {Message:lj}{NewLine}{Exception}";
+			// with class and method info. output example:
+			// 2019-11-26 08:48:40.224 -05:00 [DBG] (at LibationWinForms.Program.init()) Begin Libation
+			var code_outputTemplate = "{Timestamp:yyyy-MM-dd HH:mm:ss.fff zzz} [{Level:u3}] (at {Caller}) {Message:lj}{NewLine}{Exception}";
+
+			// "Serilog": {
+			//   "MinimumLevel": "Information"
+			//   "WriteTo": [
+			//     {
+			//       "Name": "Console"
+			//     },
+			//     {
+			//       "Name": "File",
+			//       "Args": {
+			//         "rollingInterval": "Day",
+			//         "outputTemplate": ...
+			//       }
+			//     }
+			//   ],
+			//   "Using": [ "Dinah.Core" ],
+			//   "Enrich": [ "WithCaller" ]
+			// }
+			var serilogObj = new JObject
+			{
+				{ "MinimumLevel", defaultLoggingLevel },
+				{ "WriteTo", new JArray
+					{
+						new JObject { {"Name", "Console" } },
+						new JObject
+						{
+							{ "Name", "File" },
+							{ "Args",
+								new JObject
+								{
+									// for this sink to work, a path must be provided. we override this below
+									{ "path", Path.Combine(Configuration.Instance.LibationFiles, "_Log.log") },
+									{ "rollingInterval", "Month" },
+									{ "outputTemplate", code_outputTemplate }
+								}
+							}
+						}
+					}
+				},
+				{ "Using", new JArray{ "Dinah.Core" } }, // dll's name, NOT namespace
+				{ "Enrich", new JArray{ "WithCaller" } },
+			};
+			config.SetObject("Serilog", serilogObj);
+		}
+
+		private static void configureLogging()
+		{
+			var config = Configuration.Instance;
+
+			// override path. always use current libation files
+			var logPath = Path.Combine(Configuration.Instance.LibationFiles, "Log.log");
+			config.SetWithJsonPath("Serilog.WriteTo[1].Args", "path", logPath);
+
+			//// hack which achieves the same
+			//configuration["Serilog:WriteTo:1:Args:path"] = logPath;
+
+			// CONFIGURATION-DRIVEN (json)
+			var configuration = new ConfigurationBuilder()
+				.AddJsonFile(config.SettingsFilePath)
+				.Build();
+			Log.Logger = new LoggerConfiguration()
+			  .ReadFrom.Configuration(configuration)
+			  .CreateLogger();
+
+			//// MANUAL HARD CODED
+			//Log.Logger = new LoggerConfiguration()
+			//  // requires: using Dinah.Core.Logging;
+			//	.Enrich.WithCaller()
+			//	.MinimumLevel.Information()
+			//	.WriteTo.File(logPath,
+			//		rollingInterval: RollingInterval.Month,
+			//		outputTemplate: code_outputTemplate)
+			//	.CreateLogger();
+
+			// .Here() captures debug info via System.Runtime.CompilerServices attributes. Warning: expensive
+			//var withLineNumbers_outputTemplate = "[{Timestamp:HH:mm:ss} {Level}] {SourceContext}{NewLine}{Message}{NewLine}in method {MemberName} at {FilePath}:{LineNumber}{NewLine}{Exception}{NewLine}";
+			//Log.Logger.Here().Debug("Begin Libation. Debug with line numbers");
+		}
+
+		private static void checkForUpdate()
+		{
+			try
+			{
+				var gitHubClient = new Octokit.GitHubClient(new Octokit.ProductHeaderValue("Libation"));
+
+				// https://octokitnet.readthedocs.io/en/latest/releases/
+				var releases =  gitHubClient.Repository.Release.GetAll("rmcrackan", "Libation").GetAwaiter().GetResult();
+				var latest = releases.First(r => !r.Draft);
+
+				var latestVersionString = latest.TagName.Trim('v');
+				if (!Version.TryParse(latestVersionString, out var latestRelease))
+					return;
+
+				// we're up to date
+				if (latestRelease <= BuildVersion)
+					return;
+
+				// we have an update
+				var zip = latest.Assets.FirstOrDefault(a => a.BrowserDownloadUrl.EndsWith(".zip"));
+				var zipUrl = zip?.BrowserDownloadUrl;
+				if (zipUrl is null)
+				{
+					MessageBox.Show(latest.HtmlUrl, "New version available");
+					return;
+				}
+
+				var result = MessageBox.Show($"New version available @ {latest.HtmlUrl}\r\nDownload the zip file?", "New version available", MessageBoxButtons.YesNo, MessageBoxIcon.Information);
+				if (result != DialogResult.Yes)
+					return;
+
+				using var fileSelector = new SaveFileDialog { FileName = zip.Name, Filter = "Zip Files (*.zip)|*.zip|All files (*.*)|*.*" };
+				if (fileSelector.ShowDialog() != DialogResult.OK)
+					return;
+				var selectedPath = fileSelector.FileName;
+
+				try
+				{
+					LibationWinForms.BookLiberation.ProcessorAutomationController.DownloadFileAsync(zipUrl, selectedPath).GetAwaiter().GetResult();
+					MessageBox.Show($"File downloaded");
+				}
+				catch (Exception ex)
+				{
+					MessageBox.Show($"ERROR: {ex.Message}\r\n{ex.StackTrace}");
+				}
+			}
+			catch (Exception ex)
+			{
+				MessageBox.Show($"Error checking for update. ERROR: {ex.Message}\r\n{ex.StackTrace}");
+			}
+		}
+
+		private static void logStartupState()
+		{
+			var config = Configuration.Instance;
+
+			Log.Logger.Information("Begin Libation. {@DebugInfo}", new
+			{
+				Version = BuildVersion.ToString(),
+
+				config.LibationFiles,
+				AudibleFileStorage.BooksDirectory,
+
+				config.DownloadsInProgressEnum,
+				DownloadsInProgressDir = AudibleFileStorage.DownloadsInProgress,
+				DownloadsInProgressFiles = Directory.EnumerateFiles(AudibleFileStorage.DownloadsInProgress).Count(),
+
+				AudibleFileStorage.DownloadsFinal,
+				DownloadsFinalFiles = Directory.EnumerateFiles(AudibleFileStorage.DownloadsFinal).Count(),
+
+				config.DecryptInProgressEnum,
+				DecryptInProgressDir = AudibleFileStorage.DecryptInProgress,
+				DecryptInProgressFiles = Directory.EnumerateFiles(AudibleFileStorage.DecryptInProgress).Count(),
+			});
+		}
+
+		private static Version BuildVersion => System.Reflection.Assembly.GetExecutingAssembly().GetName().Version;
+	}
+}

LibationSearchEngine/UNTESTED/SearchEngine.cs

@@ -3,7 +3,6 @@ using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
 using System.Text.RegularExpressions;
-using System.Threading.Tasks;
 using DataLayer;
 using Dinah.Core;
 using FileManager;
@@ -19,6 +18,8 @@ namespace LibationSearchEngine
     {
         public const Lucene.Net.Util.Version Version = Lucene.Net.Util.Version.LUCENE_30;
 
+        private LibationContext context { get; }
+
         // not customizable. don't move to config
         private static string SearchEngineDirectory { get; }
             = new System.IO.DirectoryInfo(Configuration.Instance.LibationFiles).CreateSubdirectory("SearchEngine").FullName;
@@ -71,7 +72,12 @@ namespace LibationSearchEngine
                     ["CategoriesId"] = lb => lb.Book.CategoriesIds == null ? null : string.Join(", ", lb.Book.CategoriesIds),
                     ["CategoryId"] = lb => lb.Book.CategoriesIds == null ? null : string.Join(", ", lb.Book.CategoriesIds),
 
-                    [TAGS.FirstCharToUpper()] = lb => lb.Book.UserDefinedItem.Tags
+                    [TAGS.FirstCharToUpper()] = lb => lb.Book.UserDefinedItem.Tags,
+
+                    ["Locale"] = lb => lb.Book.Locale,
+                    ["Region"] = lb => lb.Book.Locale,
+                    ["Account"] = lb => lb.Account,
+                    ["Email"] = lb => lb.Account
                 }
                 );
 
@@ -104,14 +110,24 @@ namespace LibationSearchEngine
                     ["HasPDF"] = lb => lb.Book.Supplements.Any(),
                     ["PDFs"] = lb => lb.Book.Supplements.Any(),
                     ["PDF"] = lb => lb.Book.Supplements.Any(),
+
                     ["IsRated"] = lb => lb.Book.UserDefinedItem.Rating.OverallRating > 0f,
                     ["Rated"] = lb => lb.Book.UserDefinedItem.Rating.OverallRating > 0f,
-                    ["IsAuthorNarrated"] = lb => lb.Book.Authors.Intersect(lb.Book.Narrators).Any(),
-                    ["AuthorNarrated"] = lb => lb.Book.Authors.Intersect(lb.Book.Narrators).Any(),
+
+                    ["IsAuthorNarrated"] = lb => isAuthorNarrated(lb),
+                    ["AuthorNarrated"] = lb => isAuthorNarrated(lb),
+
                     [nameof(Book.IsAbridged)] = lb => lb.Book.IsAbridged,
                     ["Abridged"] = lb => lb.Book.IsAbridged,
                 });
 
+        private static bool isAuthorNarrated(LibraryBook lb)
+        {
+            var authors = lb.Book.Authors.Select(a => a.Name).ToArray();
+            var narrators = lb.Book.Narrators.Select(a => a.Name).ToArray();
+            return authors.Intersect(narrators).Any();
+        }
+
         // use these common fields in the "all" default search field
         private static IEnumerable<Func<LibraryBook, string>> allFieldIndexRules { get; }
             = new List<Func<LibraryBook, string>>
@@ -160,7 +176,9 @@ namespace LibationSearchEngine
 
         private Directory getIndex() => FSDirectory.Open(SearchEngineDirectory);
 
-		public void CreateNewIndex(bool overwrite = true)
+        public SearchEngine(LibationContext context) => this.context = context;
+
+        public void CreateNewIndex(bool overwrite = true)
         {
             // 300 products
             // 1st run after app is started: 400ms
@@ -172,7 +190,7 @@ namespace LibationSearchEngine
 
             log();
 
-            var library = LibraryQueries.GetLibrary_Flat_NoTracking();
+            var library = context.GetLibrary_Flat_NoTracking();
 
             log();
 
@@ -233,7 +251,7 @@ namespace LibationSearchEngine
 		/// <summary>Long running. Use await Task.Run(() => UpdateBook(productId))</summary>
 		public void UpdateBook(string productId)
         {
-            var libraryBook = LibraryQueries.GetLibraryBook_Flat_NoTracking(productId);
+            var libraryBook = context.GetLibraryBook_Flat_NoTracking(productId);
             var term = new Term(_ID_, productId);
 
             var document = createBookIndexDocument(libraryBook);

LibationWinForm/LibationWinForm.csproj

@@ -1,42 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
-
-  <PropertyGroup>
-    <OutputType>WinExe</OutputType>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
-    <UseWindowsForms>true</UseWindowsForms>
-    <ApplicationIcon>libation.ico</ApplicationIcon>
-    <AssemblyName>Libation</AssemblyName>
-
-    <PublishTrimmed>true</PublishTrimmed>
-    <PublishReadyToRun>true</PublishReadyToRun>
-    <!-- <PublishSingleFile>true</PublishSingleFile> -->
-    <RuntimeIdentifier>win-x64</RuntimeIdentifier>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\FileLiberator\FileLiberator.csproj" />
-    <ProjectReference Include="..\WindowsDesktopUtilities\WindowsDesktopUtilities.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Compile Update="Properties\Resources.Designer.cs">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Resources.resx</DependentUpon>
-    </Compile>
-    <Compile Update="UNTESTED\Dialogs\IndexLibraryDialog.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Update="UNTESTED\Dialogs\IndexLibraryDialog.Designer.cs">
-      <DependentUpon>IndexLibraryDialog.cs</DependentUpon>
-    </Compile>
-  </ItemGroup>
-
-  <ItemGroup>
-    <EmbeddedResource Update="Properties\Resources.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-    </EmbeddedResource>
-  </ItemGroup>
-
-</Project>

LibationWinForm/UNTESTED/BookLiberation/AutomatedBackupsForm.cs

@@ -1,28 +0,0 @@
-using System;
-using System.Windows.Forms;
-using Dinah.Core.Windows.Forms;
-
-namespace LibationWinForm.BookLiberation
-{
-    public partial class AutomatedBackupsForm : Form
-    {
-        public bool KeepGoingIsChecked => keepGoingCb.Checked;
-
-        public AutomatedBackupsForm()
-        {
-            InitializeComponent();
-        }
-
-        public void AppendError(Exception ex) => AppendText("ERROR: " + ex.Message);
-        public void AppendText(string text) => logTb.UIThread(() => logTb.AppendText($"{DateTime.Now} {text}{Environment.NewLine}"));
-
-        public void FinalizeUI()
-        {
-            keepGoingCb.Enabled = false;
-            logTb.AppendText("");
-            AppendText("DONE");
-        }
-
-        private void AutomatedBackupsForm_FormClosing(object sender, FormClosingEventArgs e) => keepGoingCb.Checked = false;
-    }
-}

LibationWinForm/UNTESTED/BookLiberation/ProcessorAutomationController.Examples.cs

@@ -1,65 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using DataLayer;
-using Dinah.Core.ErrorHandling;
-using FileLiberator;
-
-namespace LibationWinForm.BookLiberation
-{
-    public class BookLiberatorControllerExamples
-    {
-        async Task BackupBookAsync(string productId)
-        {
-			using var context = LibationContext.Create();
-
-            var libraryBook = context
-                .Library
-                .GetLibrary()
-                .SingleOrDefault(lb => lb.Book.AudibleProductId == productId);
-
-            if (libraryBook == null)
-                return;
-
-            var backupBook = new BackupBook();
-            backupBook.DownloadBook.Completed += SetBackupCountsAsync;
-            backupBook.DecryptBook.Completed += SetBackupCountsAsync;
-            await ProcessValidateLibraryBookAsync(backupBook, libraryBook);
-		}
-
-		static async Task<StatusHandler> ProcessValidateLibraryBookAsync(IProcessable processable, LibraryBook libraryBook)
-		{
-			if (!processable.Validate(libraryBook))
-				return new StatusHandler { "Validation failed" };
-			return await processable.ProcessAsync(libraryBook);
-		}
-
-		// Download First Book (Download encrypted/DRM file)
-		async Task DownloadFirstBookAsync()
-        {
-            var downloadBook = ProcessorAutomationController.GetWiredUpDownloadBook();
-            downloadBook.Completed += SetBackupCountsAsync;
-            await downloadBook.ProcessFirstValidAsync();
-        }
-
-        // Decrypt First Book (Remove DRM from downloaded file)
-        async Task DecryptFirstBookAsync()
-        {
-            var decryptBook = ProcessorAutomationController.GetWiredUpDecryptBook();
-            decryptBook.Completed += SetBackupCountsAsync;
-            await decryptBook.ProcessFirstValidAsync();
-        }
-
-        // Backup First Book (Decrypt a non-liberated book. Download if needed)
-        async Task BackupFirstBookAsync()
-        {
-            var backupBook = ProcessorAutomationController.GetWiredUpBackupBook();
-            backupBook.DownloadBook.Completed += SetBackupCountsAsync;
-            backupBook.DecryptBook.Completed += SetBackupCountsAsync;
-            await backupBook.ProcessFirstValidAsync();
-        }
-
-        async void SetBackupCountsAsync(object obj, string str) => throw new NotImplementedException();
-    }
-}

LibationWinForm/UNTESTED/Dialogs/IndexLibraryDialog.cs

@@ -1,31 +0,0 @@
-using System.Windows.Forms;
-using ApplicationServices;
-
-namespace LibationWinForm
-{
-	public partial class IndexLibraryDialog : Form
-	{
-		public int NewBooksAdded { get; private set; }
-		public int TotalBooksProcessed { get; private set; }
-
-		public IndexLibraryDialog()
-		{
-			InitializeComponent();
-			this.Shown += IndexLibraryDialog_Shown;
-		}
-
-		private async void IndexLibraryDialog_Shown(object sender, System.EventArgs e)
-		{
-			try
-			{
-				(TotalBooksProcessed, NewBooksAdded) = await LibraryCommands.IndexLibraryAsync(new Login.WinformResponder());
-			}
-			catch
-			{
-				MessageBox.Show("Error importing library. Please try again. If this happens after 2 or 3 tries, contact administrator", "Error importing library", MessageBoxButtons.OK, MessageBoxIcon.Error);
-			}
-
-			this.Close();
-		}
-	}
-}

LibationWinForm/UNTESTED/Dialogs/Login/AudibleLoginDialog.cs

@@ -1,23 +0,0 @@
-using System;
-using System.Windows.Forms;
-
-namespace LibationWinForm.Dialogs.Login
-{
-	public partial class AudibleLoginDialog : Form
-	{
-		public string Email { get; private set; }
-		public string Password { get; private set; }
-
-		public AudibleLoginDialog()
-		{
-			InitializeComponent();
-		}
-
-		private void submitBtn_Click(object sender, EventArgs e)
-		{
-			Email = this.emailTb.Text;
-			Password = this.passwordTb.Text;
-			DialogResult = DialogResult.OK;
-		}
-	}
-}

LibationWinForm/UNTESTED/Dialogs/SettingsDialog.Designer.cs

@@ -1,441 +0,0 @@
-namespace LibationWinForm
-{
-    partial class SettingsDialog
-    {
-        /// <summary>
-        /// Required designer variable.
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary>
-        /// Clean up any resources being used.
-        /// </summary>
-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing && (components != null))
-            {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
-        #region Windows Form Designer generated code
-
-        /// <summary>
-        /// Required method for Designer support - do not modify
-        /// the contents of this method with the code editor.
-        /// </summary>
-        private void InitializeComponent()
-        {
-            this.settingsFileLbl = new System.Windows.Forms.Label();
-            this.settingsFileTb = new System.Windows.Forms.TextBox();
-            this.decryptKeyLbl = new System.Windows.Forms.Label();
-            this.decryptKeyTb = new System.Windows.Forms.TextBox();
-            this.booksLocationLbl = new System.Windows.Forms.Label();
-            this.booksLocationTb = new System.Windows.Forms.TextBox();
-            this.booksLocationSearchBtn = new System.Windows.Forms.Button();
-            this.settingsFileDescLbl = new System.Windows.Forms.Label();
-            this.decryptKeyDescLbl = new System.Windows.Forms.Label();
-            this.booksLocationDescLbl = new System.Windows.Forms.Label();
-            this.libationFilesGb = new System.Windows.Forms.GroupBox();
-            this.libationFilesDescLbl = new System.Windows.Forms.Label();
-            this.libationFilesCustomBtn = new System.Windows.Forms.Button();
-            this.libationFilesCustomTb = new System.Windows.Forms.TextBox();
-            this.libationFilesCustomRb = new System.Windows.Forms.RadioButton();
-            this.libationFilesMyDocsRb = new System.Windows.Forms.RadioButton();
-            this.libationFilesRootRb = new System.Windows.Forms.RadioButton();
-            this.downloadsInProgressGb = new System.Windows.Forms.GroupBox();
-            this.downloadsInProgressLibationFilesRb = new System.Windows.Forms.RadioButton();
-            this.downloadsInProgressWinTempRb = new System.Windows.Forms.RadioButton();
-            this.downloadsInProgressDescLbl = new System.Windows.Forms.Label();
-            this.decryptInProgressGb = new System.Windows.Forms.GroupBox();
-            this.decryptInProgressLibationFilesRb = new System.Windows.Forms.RadioButton();
-            this.decryptInProgressWinTempRb = new System.Windows.Forms.RadioButton();
-            this.decryptInProgressDescLbl = new System.Windows.Forms.Label();
-            this.saveBtn = new System.Windows.Forms.Button();
-            this.cancelBtn = new System.Windows.Forms.Button();
-			this.audibleLocaleLbl = new System.Windows.Forms.Label();
-			this.audibleLocaleCb = new System.Windows.Forms.ComboBox();
-			this.libationFilesGb.SuspendLayout();
-            this.downloadsInProgressGb.SuspendLayout();
-            this.decryptInProgressGb.SuspendLayout();
-            this.SuspendLayout();
-            // 
-            // settingsFileLbl
-            // 
-            this.settingsFileLbl.AutoSize = true;
-            this.settingsFileLbl.Location = new System.Drawing.Point(7, 15);
-            this.settingsFileLbl.Name = "settingsFileLbl";
-            this.settingsFileLbl.Size = new System.Drawing.Size(61, 13);
-            this.settingsFileLbl.TabIndex = 0;
-            this.settingsFileLbl.Text = "Settings file";
-            // 
-            // settingsFileTb
-            // 
-            this.settingsFileTb.Location = new System.Drawing.Point(90, 12);
-            this.settingsFileTb.Name = "settingsFileTb";
-            this.settingsFileTb.ReadOnly = true;
-            this.settingsFileTb.Size = new System.Drawing.Size(698, 20);
-            this.settingsFileTb.TabIndex = 1;
-            // 
-            // decryptKeyLbl
-            // 
-            this.decryptKeyLbl.AutoSize = true;
-            this.decryptKeyLbl.Location = new System.Drawing.Point(7, 59);
-            this.decryptKeyLbl.Name = "decryptKeyLbl";
-            this.decryptKeyLbl.Size = new System.Drawing.Size(64, 13);
-            this.decryptKeyLbl.TabIndex = 3;
-            this.decryptKeyLbl.Text = "Decrypt key";
-            // 
-            // decryptKeyTb
-            // 
-            this.decryptKeyTb.Location = new System.Drawing.Point(90, 56);
-            this.decryptKeyTb.Name = "decryptKeyTb";
-            this.decryptKeyTb.Size = new System.Drawing.Size(100, 20);
-            this.decryptKeyTb.TabIndex = 4;
-            // 
-            // booksLocationLbl
-            // 
-            this.booksLocationLbl.AutoSize = true;
-            this.booksLocationLbl.Location = new System.Drawing.Point(7, 125);
-            this.booksLocationLbl.Name = "booksLocationLbl";
-            this.booksLocationLbl.Size = new System.Drawing.Size(77, 13);
-            this.booksLocationLbl.TabIndex = 8;
-            this.booksLocationLbl.Text = "Books location";
-            // 
-            // booksLocationTb
-            // 
-            this.booksLocationTb.Location = new System.Drawing.Point(90, 122);
-            this.booksLocationTb.Name = "booksLocationTb";
-            this.booksLocationTb.Size = new System.Drawing.Size(657, 20);
-            this.booksLocationTb.TabIndex = 9;
-            // 
-            // booksLocationSearchBtn
-            // 
-            this.booksLocationSearchBtn.Location = new System.Drawing.Point(753, 120);
-            this.booksLocationSearchBtn.Name = "booksLocationSearchBtn";
-            this.booksLocationSearchBtn.Size = new System.Drawing.Size(35, 23);
-            this.booksLocationSearchBtn.TabIndex = 10;
-            this.booksLocationSearchBtn.Text = "...";
-            this.booksLocationSearchBtn.UseVisualStyleBackColor = true;
-            this.booksLocationSearchBtn.Click += new System.EventHandler(this.booksLocationSearchBtn_Click);
-            // 
-            // settingsFileDescLbl
-            // 
-            this.settingsFileDescLbl.AutoSize = true;
-            this.settingsFileDescLbl.Location = new System.Drawing.Point(87, 35);
-            this.settingsFileDescLbl.Name = "settingsFileDescLbl";
-            this.settingsFileDescLbl.Size = new System.Drawing.Size(36, 13);
-            this.settingsFileDescLbl.TabIndex = 2;
-            this.settingsFileDescLbl.Text = "[desc]";
-            // 
-            // decryptKeyDescLbl
-            // 
-            this.decryptKeyDescLbl.AutoSize = true;
-            this.decryptKeyDescLbl.Location = new System.Drawing.Point(87, 79);
-            this.decryptKeyDescLbl.Name = "decryptKeyDescLbl";
-            this.decryptKeyDescLbl.Size = new System.Drawing.Size(36, 13);
-            this.decryptKeyDescLbl.TabIndex = 5;
-            this.decryptKeyDescLbl.Text = "[desc]";
-            // 
-            // booksLocationDescLbl
-            // 
-            this.booksLocationDescLbl.AutoSize = true;
-            this.booksLocationDescLbl.Location = new System.Drawing.Point(87, 145);
-            this.booksLocationDescLbl.Name = "booksLocationDescLbl";
-            this.booksLocationDescLbl.Size = new System.Drawing.Size(36, 13);
-            this.booksLocationDescLbl.TabIndex = 11;
-            this.booksLocationDescLbl.Text = "[desc]";
-            // 
-            // libationFilesGb
-            // 
-            this.libationFilesGb.Controls.Add(this.libationFilesDescLbl);
-            this.libationFilesGb.Controls.Add(this.libationFilesCustomBtn);
-            this.libationFilesGb.Controls.Add(this.libationFilesCustomTb);
-            this.libationFilesGb.Controls.Add(this.libationFilesCustomRb);
-            this.libationFilesGb.Controls.Add(this.libationFilesMyDocsRb);
-            this.libationFilesGb.Controls.Add(this.libationFilesRootRb);
-            this.libationFilesGb.Location = new System.Drawing.Point(12, 161);
-            this.libationFilesGb.Name = "libationFilesGb";
-            this.libationFilesGb.Size = new System.Drawing.Size(776, 131);
-            this.libationFilesGb.TabIndex = 12;
-            this.libationFilesGb.TabStop = false;
-            this.libationFilesGb.Text = "Libation files";
-            // 
-            // libationFilesDescLbl
-            // 
-            this.libationFilesDescLbl.AutoSize = true;
-            this.libationFilesDescLbl.Location = new System.Drawing.Point(6, 16);
-            this.libationFilesDescLbl.Name = "libationFilesDescLbl";
-            this.libationFilesDescLbl.Size = new System.Drawing.Size(36, 13);
-            this.libationFilesDescLbl.TabIndex = 0;
-            this.libationFilesDescLbl.Text = "[desc]";
-            // 
-            // libationFilesCustomBtn
-            // 
-            this.libationFilesCustomBtn.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.libationFilesCustomBtn.Location = new System.Drawing.Point(741, 102);
-            this.libationFilesCustomBtn.Name = "libationFilesCustomBtn";
-            this.libationFilesCustomBtn.Size = new System.Drawing.Size(35, 23);
-            this.libationFilesCustomBtn.TabIndex = 5;
-            this.libationFilesCustomBtn.Text = "...";
-            this.libationFilesCustomBtn.UseVisualStyleBackColor = true;
-            this.libationFilesCustomBtn.Click += new System.EventHandler(this.libationFilesCustomBtn_Click);
-            // 
-            // libationFilesCustomTb
-            // 
-            this.libationFilesCustomTb.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-            this.libationFilesCustomTb.Location = new System.Drawing.Point(29, 104);
-            this.libationFilesCustomTb.Name = "libationFilesCustomTb";
-            this.libationFilesCustomTb.Size = new System.Drawing.Size(706, 20);
-            this.libationFilesCustomTb.TabIndex = 4;
-            this.libationFilesCustomTb.TextChanged += new System.EventHandler(this.libationFiles_Changed);
-            // 
-            // libationFilesCustomRb
-            // 
-            this.libationFilesCustomRb.AutoSize = true;
-            this.libationFilesCustomRb.Location = new System.Drawing.Point(9, 107);
-            this.libationFilesCustomRb.Name = "libationFilesCustomRb";
-            this.libationFilesCustomRb.Size = new System.Drawing.Size(14, 13);
-            this.libationFilesCustomRb.TabIndex = 3;
-            this.libationFilesCustomRb.TabStop = true;
-            this.libationFilesCustomRb.UseVisualStyleBackColor = true;
-            // 
-            // libationFilesMyDocsRb
-            // 
-			this.libationFilesMyDocsRb.AutoSize = true;
-            this.libationFilesMyDocsRb.CheckAlign = System.Drawing.ContentAlignment.TopLeft;
-            this.libationFilesMyDocsRb.Location = new System.Drawing.Point(9, 68);
-            this.libationFilesMyDocsRb.Name = "libationFilesMyDocsRb";
-            this.libationFilesMyDocsRb.Size = new System.Drawing.Size(111, 30);
-            this.libationFilesMyDocsRb.TabIndex = 2;
-            this.libationFilesMyDocsRb.TabStop = true;
-            this.libationFilesMyDocsRb.Text = "[desc]\r\n[myDocs\\Libation]";
-            this.libationFilesMyDocsRb.UseVisualStyleBackColor = true;
-            this.libationFilesMyDocsRb.CheckedChanged += new System.EventHandler(this.libationFiles_Changed);
-            // 
-            // libationFilesRootRb
-            // 
-            this.libationFilesRootRb.AutoSize = true;
-            this.libationFilesRootRb.CheckAlign = System.Drawing.ContentAlignment.TopLeft;
-            this.libationFilesRootRb.Location = new System.Drawing.Point(9, 32);
-            this.libationFilesRootRb.Name = "libationFilesRootRb";
-            this.libationFilesRootRb.Size = new System.Drawing.Size(113, 30);
-            this.libationFilesRootRb.TabIndex = 1;
-            this.libationFilesRootRb.TabStop = true;
-            this.libationFilesRootRb.Text = "[desc]\r\n[exeRoot\\Libation]";
-            this.libationFilesRootRb.UseVisualStyleBackColor = true;
-            this.libationFilesRootRb.CheckedChanged += new System.EventHandler(this.libationFiles_Changed);
-            // 
-            // downloadsInProgressGb
-            // 
-            this.downloadsInProgressGb.Controls.Add(this.downloadsInProgressLibationFilesRb);
-            this.downloadsInProgressGb.Controls.Add(this.downloadsInProgressWinTempRb);
-            this.downloadsInProgressGb.Controls.Add(this.downloadsInProgressDescLbl);
-            this.downloadsInProgressGb.Location = new System.Drawing.Point(12, 298);
-            this.downloadsInProgressGb.Name = "downloadsInProgressGb";
-            this.downloadsInProgressGb.Size = new System.Drawing.Size(776, 117);
-            this.downloadsInProgressGb.TabIndex = 13;
-            this.downloadsInProgressGb.TabStop = false;
-            this.downloadsInProgressGb.Text = "Downloads in progress";
-            // 
-            // downloadsInProgressLibationFilesRb
-            // 
-            this.downloadsInProgressLibationFilesRb.AutoSize = true;
-            this.downloadsInProgressLibationFilesRb.CheckAlign = System.Drawing.ContentAlignment.TopLeft;
-            this.downloadsInProgressLibationFilesRb.Location = new System.Drawing.Point(9, 81);
-            this.downloadsInProgressLibationFilesRb.Name = "downloadsInProgressLibationFilesRb";
-            this.downloadsInProgressLibationFilesRb.Size = new System.Drawing.Size(193, 30);
-            this.downloadsInProgressLibationFilesRb.TabIndex = 2;
-            this.downloadsInProgressLibationFilesRb.TabStop = true;
-            this.downloadsInProgressLibationFilesRb.Text = "[desc]\r\n[libationFiles\\DownloadsInProgress]";
-            this.downloadsInProgressLibationFilesRb.UseVisualStyleBackColor = true;
-            // 
-            // downloadsInProgressWinTempRb
-            // 
-            this.downloadsInProgressWinTempRb.AutoSize = true;
-            this.downloadsInProgressWinTempRb.CheckAlign = System.Drawing.ContentAlignment.TopLeft;
-            this.downloadsInProgressWinTempRb.Location = new System.Drawing.Point(9, 45);
-            this.downloadsInProgressWinTempRb.Name = "downloadsInProgressWinTempRb";
-            this.downloadsInProgressWinTempRb.Size = new System.Drawing.Size(182, 30);
-            this.downloadsInProgressWinTempRb.TabIndex = 1;
-            this.downloadsInProgressWinTempRb.TabStop = true;
-            this.downloadsInProgressWinTempRb.Text = "[desc]\r\n[winTemp\\DownloadsInProgress]";
-            this.downloadsInProgressWinTempRb.UseVisualStyleBackColor = true;
-            // 
-            // downloadsInProgressDescLbl
-            // 
-            this.downloadsInProgressDescLbl.AutoSize = true;
-            this.downloadsInProgressDescLbl.Location = new System.Drawing.Point(6, 16);
-            this.downloadsInProgressDescLbl.Name = "downloadsInProgressDescLbl";
-            this.downloadsInProgressDescLbl.Size = new System.Drawing.Size(38, 26);
-            this.downloadsInProgressDescLbl.TabIndex = 0;
-            this.downloadsInProgressDescLbl.Text = "[desc]\r\n[line 2]";
-            // 
-            // decryptInProgressGb
-            // 
-            this.decryptInProgressGb.Controls.Add(this.decryptInProgressLibationFilesRb);
-            this.decryptInProgressGb.Controls.Add(this.decryptInProgressWinTempRb);
-            this.decryptInProgressGb.Controls.Add(this.decryptInProgressDescLbl);
-            this.decryptInProgressGb.Location = new System.Drawing.Point(12, 421);
-            this.decryptInProgressGb.Name = "decryptInProgressGb";
-            this.decryptInProgressGb.Size = new System.Drawing.Size(776, 117);
-            this.decryptInProgressGb.TabIndex = 14;
-            this.decryptInProgressGb.TabStop = false;
-            this.decryptInProgressGb.Text = "Decrypt in progress";
-            // 
-            // decryptInProgressLibationFilesRb
-            // 
-            this.decryptInProgressLibationFilesRb.AutoSize = true;
-            this.decryptInProgressLibationFilesRb.CheckAlign = System.Drawing.ContentAlignment.TopLeft;
-            this.decryptInProgressLibationFilesRb.Location = new System.Drawing.Point(6, 81);
-            this.decryptInProgressLibationFilesRb.Name = "decryptInProgressLibationFilesRb";
-            this.decryptInProgressLibationFilesRb.Size = new System.Drawing.Size(177, 30);
-            this.decryptInProgressLibationFilesRb.TabIndex = 2;
-            this.decryptInProgressLibationFilesRb.TabStop = true;
-            this.decryptInProgressLibationFilesRb.Text = "[desc]\r\n[libationFiles\\DecryptInProgress]";
-            this.decryptInProgressLibationFilesRb.UseVisualStyleBackColor = true;
-            // 
-            // decryptInProgressWinTempRb
-            // 
-            this.decryptInProgressWinTempRb.AutoSize = true;
-            this.decryptInProgressWinTempRb.CheckAlign = System.Drawing.ContentAlignment.TopLeft;
-            this.decryptInProgressWinTempRb.Location = new System.Drawing.Point(6, 45);
-            this.decryptInProgressWinTempRb.Name = "decryptInProgressWinTempRb";
-            this.decryptInProgressWinTempRb.Size = new System.Drawing.Size(166, 30);
-            this.decryptInProgressWinTempRb.TabIndex = 1;
-            this.decryptInProgressWinTempRb.TabStop = true;
-            this.decryptInProgressWinTempRb.Text = "[desc]\r\n[winTemp\\DecryptInProgress]";
-            this.decryptInProgressWinTempRb.UseVisualStyleBackColor = true;
-            // 
-            // decryptInProgressDescLbl
-            // 
-            this.decryptInProgressDescLbl.AutoSize = true;
-            this.decryptInProgressDescLbl.Location = new System.Drawing.Point(6, 16);
-            this.decryptInProgressDescLbl.Name = "decryptInProgressDescLbl";
-            this.decryptInProgressDescLbl.Size = new System.Drawing.Size(38, 26);
-            this.decryptInProgressDescLbl.TabIndex = 0;
-            this.decryptInProgressDescLbl.Text = "[desc]\r\n[line 2]";
-            // 
-            // saveBtn
-            // 
-            this.saveBtn.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.saveBtn.Location = new System.Drawing.Point(612, 544);
-            this.saveBtn.Name = "saveBtn";
-            this.saveBtn.Size = new System.Drawing.Size(75, 23);
-            this.saveBtn.TabIndex = 15;
-            this.saveBtn.Text = "Save";
-            this.saveBtn.UseVisualStyleBackColor = true;
-            this.saveBtn.Click += new System.EventHandler(this.saveBtn_Click);
-            // 
-            // cancelBtn
-            // 
-            this.cancelBtn.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.cancelBtn.DialogResult = System.Windows.Forms.DialogResult.Cancel;
-            this.cancelBtn.Location = new System.Drawing.Point(713, 544);
-            this.cancelBtn.Name = "cancelBtn";
-            this.cancelBtn.Size = new System.Drawing.Size(75, 23);
-            this.cancelBtn.TabIndex = 16;
-            this.cancelBtn.Text = "Cancel";
-            this.cancelBtn.UseVisualStyleBackColor = true;
-            this.cancelBtn.Click += new System.EventHandler(this.cancelBtn_Click);
-			// 
-			// audibleLocaleLbl
-			// 
-			this.audibleLocaleLbl.AutoSize = true;
-			this.audibleLocaleLbl.Location = new System.Drawing.Point(7, 98);
-			this.audibleLocaleLbl.Name = "audibleLocaleLbl";
-			this.audibleLocaleLbl.Size = new System.Drawing.Size(77, 13);
-			this.audibleLocaleLbl.TabIndex = 6;
-			this.audibleLocaleLbl.Text = "Audible Locale";
-			// 
-			// audibleLocaleCb
-			// 
-			this.audibleLocaleCb.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-			this.audibleLocaleCb.FormattingEnabled = true;
-			this.audibleLocaleCb.Items.AddRange(new object[] {
-			"us",
-			"uk",
-			"germany",
-			"france",
-			"canada"});
-			this.audibleLocaleCb.Location = new System.Drawing.Point(90, 95);
-			this.audibleLocaleCb.Name = "audibleLocaleCb";
-			this.audibleLocaleCb.Size = new System.Drawing.Size(121, 21);
-			this.audibleLocaleCb.TabIndex = 7;
-			// 
-			// SettingsDialog
-			// 
-			this.AcceptButton = this.saveBtn;
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.CancelButton = this.cancelBtn;
-            this.ClientSize = new System.Drawing.Size(800, 579);
-			this.Controls.Add(this.audibleLocaleCb);
-			this.Controls.Add(this.audibleLocaleLbl);
-			this.Controls.Add(this.cancelBtn);
-            this.Controls.Add(this.saveBtn);
-            this.Controls.Add(this.decryptInProgressGb);
-            this.Controls.Add(this.downloadsInProgressGb);
-            this.Controls.Add(this.libationFilesGb);
-            this.Controls.Add(this.booksLocationDescLbl);
-            this.Controls.Add(this.decryptKeyDescLbl);
-            this.Controls.Add(this.settingsFileDescLbl);
-            this.Controls.Add(this.booksLocationSearchBtn);
-            this.Controls.Add(this.booksLocationTb);
-            this.Controls.Add(this.booksLocationLbl);
-            this.Controls.Add(this.decryptKeyTb);
-            this.Controls.Add(this.decryptKeyLbl);
-            this.Controls.Add(this.settingsFileTb);
-            this.Controls.Add(this.settingsFileLbl);
-            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow;
-            this.Name = "SettingsDialog";
-            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
-            this.Text = "Edit Settings";
-            this.Load += new System.EventHandler(this.SettingsDialog_Load);
-            this.libationFilesGb.ResumeLayout(false);
-            this.libationFilesGb.PerformLayout();
-            this.downloadsInProgressGb.ResumeLayout(false);
-            this.downloadsInProgressGb.PerformLayout();
-            this.decryptInProgressGb.ResumeLayout(false);
-            this.decryptInProgressGb.PerformLayout();
-            this.ResumeLayout(false);
-            this.PerformLayout();
-
-        }
-
-        #endregion
-
-        private System.Windows.Forms.Label settingsFileLbl;
-        private System.Windows.Forms.TextBox settingsFileTb;
-        private System.Windows.Forms.Label decryptKeyLbl;
-        private System.Windows.Forms.TextBox decryptKeyTb;
-        private System.Windows.Forms.Label booksLocationLbl;
-        private System.Windows.Forms.TextBox booksLocationTb;
-        private System.Windows.Forms.Button booksLocationSearchBtn;
-        private System.Windows.Forms.Label settingsFileDescLbl;
-        private System.Windows.Forms.Label decryptKeyDescLbl;
-        private System.Windows.Forms.Label booksLocationDescLbl;
-        private System.Windows.Forms.GroupBox libationFilesGb;
-        private System.Windows.Forms.Button libationFilesCustomBtn;
-        private System.Windows.Forms.TextBox libationFilesCustomTb;
-        private System.Windows.Forms.RadioButton libationFilesCustomRb;
-        private System.Windows.Forms.RadioButton libationFilesMyDocsRb;
-        private System.Windows.Forms.RadioButton libationFilesRootRb;
-        private System.Windows.Forms.Label libationFilesDescLbl;
-        private System.Windows.Forms.GroupBox downloadsInProgressGb;
-        private System.Windows.Forms.Label downloadsInProgressDescLbl;
-        private System.Windows.Forms.RadioButton downloadsInProgressWinTempRb;
-        private System.Windows.Forms.RadioButton downloadsInProgressLibationFilesRb;
-        private System.Windows.Forms.GroupBox decryptInProgressGb;
-        private System.Windows.Forms.Label decryptInProgressDescLbl;
-        private System.Windows.Forms.RadioButton decryptInProgressLibationFilesRb;
-        private System.Windows.Forms.RadioButton decryptInProgressWinTempRb;
-        private System.Windows.Forms.Button saveBtn;
-        private System.Windows.Forms.Button cancelBtn;
-		private System.Windows.Forms.Label audibleLocaleLbl;
-		private System.Windows.Forms.ComboBox audibleLocaleCb;
-	}
-}

LibationWinForm/UNTESTED/Dialogs/SettingsDialog.cs

@@ -1,175 +0,0 @@
-using System;
-using System.IO;
-using System.Windows.Forms;
-using Dinah.Core;
-using FileManager;
-
-namespace LibationWinForm
-{
-	public partial class SettingsDialog : Form
-	{
-		Configuration config { get; } = Configuration.Instance;
-		Func<string, string> desc { get; } = Configuration.GetDescription;
-		string exeRoot { get; }
-		string myDocs { get; }
-
-		bool isFirstLoad;
-
-		public SettingsDialog()
-		{
-			InitializeComponent();
-			this.libationFilesCustomTb.TextChanged += (_, __) =>
-			{
-				if (!string.IsNullOrWhiteSpace(libationFilesCustomTb.Text))
-					this.libationFilesCustomRb.Checked = true;
-			};
-
-			exeRoot = Path.GetFullPath(Path.Combine(Path.GetDirectoryName(Exe.FileLocationOnDisk), "Libation"));
-			myDocs = Path.GetFullPath(Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments), "Libation"));
-		}
-
-		private void SettingsDialog_Load(object sender, EventArgs e)
-		{
-			isFirstLoad = string.IsNullOrWhiteSpace(config.Books);
-
-			this.settingsFileTb.Text = config.Filepath;
-			this.settingsFileDescLbl.Text = desc(nameof(config.Filepath));
-
-			this.decryptKeyTb.Text = config.DecryptKey;
-			this.decryptKeyDescLbl.Text = desc(nameof(config.DecryptKey));
-
-			this.booksLocationTb.Text
-				= !string.IsNullOrWhiteSpace(config.Books) 
-				? config.Books
-				: Path.GetDirectoryName(Exe.FileLocationOnDisk);
-			this.booksLocationDescLbl.Text = desc(nameof(config.Books));
-
-			this.audibleLocaleCb.Text
-				= !string.IsNullOrWhiteSpace(config.LocaleCountryCode)
-				? config.LocaleCountryCode
-				: "us";
-
-			libationFilesDescLbl.Text = desc(nameof(config.LibationFiles));
-			this.libationFilesRootRb.Text = "In the same folder that Libation is running from\r\n" + exeRoot;
-			this.libationFilesMyDocsRb.Text = "In My Documents\r\n" + myDocs;
-			if (config.LibationFiles == exeRoot)
-				libationFilesRootRb.Checked = true;
-			else if (config.LibationFiles == myDocs)
-				libationFilesMyDocsRb.Checked = true;
-			else
-			{
-				libationFilesCustomRb.Checked = true;
-				libationFilesCustomTb.Text = config.LibationFiles;
-			}
-
-			this.downloadsInProgressDescLbl.Text = desc(nameof(config.DownloadsInProgressEnum));
-			var winTempDownloadsInProgress = Path.Combine(config.WinTemp, "DownloadsInProgress");
-			this.downloadsInProgressWinTempRb.Text = "In your Windows temporary folder\r\n" + winTempDownloadsInProgress;
-			switch (config.DownloadsInProgressEnum)
-			{
-				case "LibationFiles":
-					downloadsInProgressLibationFilesRb.Checked = true;
-					break;
-				case "WinTemp":
-				default:
-					downloadsInProgressWinTempRb.Checked = true;
-					break;
-			}
-
-			this.decryptInProgressDescLbl.Text = desc(nameof(config.DecryptInProgressEnum));
-			var winTempDecryptInProgress = Path.Combine(config.WinTemp, "DecryptInProgress");
-			this.decryptInProgressWinTempRb.Text = "In your Windows temporary folder\r\n" + winTempDecryptInProgress;
-			switch (config.DecryptInProgressEnum)
-			{
-				case "LibationFiles":
-					decryptInProgressLibationFilesRb.Checked = true;
-					break;
-				case "WinTemp":
-				default:
-					decryptInProgressWinTempRb.Checked = true;
-					break;
-			}
-
-            libationFiles_Changed(this, null);
-		}
-
-		private void libationFiles_Changed(object sender, EventArgs e)
-		{
-			var libationFilesDir
-				= libationFilesRootRb.Checked ? exeRoot
-				: libationFilesMyDocsRb.Checked ? myDocs
-				: libationFilesCustomTb.Text;
-
-			var downloadsInProgress = Path.Combine(libationFilesDir, "DownloadsInProgress");
-			this.downloadsInProgressLibationFilesRb.Text = $"In your Libation Files (ie: program-created files)\r\n{downloadsInProgress}";
-
-			var decryptInProgress = Path.Combine(libationFilesDir, "DecryptInProgress");
-			this.decryptInProgressLibationFilesRb.Text = $"In your Libation Files (ie: program-created files)\r\n{decryptInProgress}";
-		}
-
-		private void booksLocationSearchBtn_Click(object sender, EventArgs e) => selectFolder("Search for books location", this.booksLocationTb);
-
-        private void libationFilesCustomBtn_Click(object sender, EventArgs e) => selectFolder("Search for Libation Files location", this.libationFilesCustomTb);
-
-		private static void selectFolder(string desc, TextBox textbox)
-        {
-            using var dialog = new FolderBrowserDialog { Description = desc, SelectedPath = "" };
-            dialog.ShowDialog();
-            if (!string.IsNullOrWhiteSpace(dialog.SelectedPath))
-                textbox.Text = dialog.SelectedPath;
-        }
-
-        private void saveBtn_Click(object sender, EventArgs e)
-        {
-            config.DecryptKey = this.decryptKeyTb.Text;
-
-            var pathsChanged = false;
-
-            if (!Directory.Exists(this.booksLocationTb.Text))
-                MessageBox.Show("Not saving change to Books location. This folder does not exist:\r\n" + this.booksLocationTb.Text);
-            else if (config.Books != this.booksLocationTb.Text)
-            {
-                pathsChanged = true;
-                config.Books = this.booksLocationTb.Text;
-            }
-
-			config.LocaleCountryCode = this.audibleLocaleCb.Text;
-
-            var libationDir
-                = libationFilesRootRb.Checked ? exeRoot
-                : libationFilesMyDocsRb.Checked ? myDocs
-                : libationFilesCustomTb.Text;
-            if (!Directory.Exists(libationDir))
-                MessageBox.Show("Not saving change to Libation Files location. This folder does not exist:\r\n" + libationDir);
-            else if (config.LibationFiles != libationDir)
-            {
-                pathsChanged = true;
-                config.LibationFiles = libationDir;
-            }
-
-            config.DownloadsInProgressEnum = downloadsInProgressLibationFilesRb.Checked ? "LibationFiles" : "WinTemp";
-            config.DecryptInProgressEnum = decryptInProgressLibationFilesRb.Checked ? "LibationFiles" : "WinTemp";
-
-            if (!isFirstLoad && pathsChanged)
-            {
-                var shutdownResult = MessageBox.Show(
-                    "You have changed a file path important for this program. All files will remain in their original location; nothing will be moved. It is highly recommended that you restart this program so these changes are handled correctly."
-                    + "\r\n"
-                    + "\r\nClose program?",
-                    "Restart program",
-                    MessageBoxButtons.YesNo,
-                    MessageBoxIcon.Exclamation,
-                    MessageBoxDefaultButton.Button1);
-                if (shutdownResult == DialogResult.Yes)
-                {
-                    Application.Exit();
-                }
-            }
-
-            this.DialogResult = DialogResult.OK;
-            this.Close();
-        }
-
-        private void cancelBtn_Click(object sender, EventArgs e) => this.Close();
-	}
-}

LibationWinForm/UNTESTED/Form1.Designer.cs

@@ -1,282 +0,0 @@
-namespace LibationWinForm
-{
-    partial class Form1
-    {
-        /// <summary>
-        /// Required designer variable.
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary>
-        /// Clean up any resources being used.
-        /// </summary>
-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing && (components != null))
-            {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
-        #region Windows Form Designer generated code
-
-        /// <summary>
-        /// Required method for Designer support - do not modify
-        /// the contents of this method with the code editor.
-        /// </summary>
-        private void InitializeComponent()
-        {
-            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Form1));
-            this.gridPanel = new System.Windows.Forms.Panel();
-            this.filterHelpBtn = new System.Windows.Forms.Button();
-            this.filterBtn = new System.Windows.Forms.Button();
-            this.filterSearchTb = new System.Windows.Forms.TextBox();
-            this.menuStrip1 = new System.Windows.Forms.MenuStrip();
-            this.importToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.scanLibraryToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.liberateToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.beginBookBackupsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.beginPdfBackupsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.quickFiltersToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.firstFilterIsDefaultToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.editQuickFiltersToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();
-            this.settingsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.statusStrip1 = new System.Windows.Forms.StatusStrip();
-            this.visibleCountLbl = new System.Windows.Forms.ToolStripStatusLabel();
-            this.springLbl = new System.Windows.Forms.ToolStripStatusLabel();
-            this.backupsCountsLbl = new System.Windows.Forms.ToolStripStatusLabel();
-            this.pdfsCountsLbl = new System.Windows.Forms.ToolStripStatusLabel();
-            this.addFilterBtn = new System.Windows.Forms.Button();
-            this.menuStrip1.SuspendLayout();
-            this.statusStrip1.SuspendLayout();
-            this.SuspendLayout();
-            // 
-            // gridPanel
-            // 
-            this.gridPanel.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-            this.gridPanel.Location = new System.Drawing.Point(12, 56);
-            this.gridPanel.Name = "gridPanel";
-            this.gridPanel.Size = new System.Drawing.Size(839, 386);
-            this.gridPanel.TabIndex = 5;
-            // 
-            // filterHelpBtn
-            // 
-            this.filterHelpBtn.Location = new System.Drawing.Point(12, 27);
-            this.filterHelpBtn.Name = "filterHelpBtn";
-            this.filterHelpBtn.Size = new System.Drawing.Size(22, 23);
-            this.filterHelpBtn.TabIndex = 3;
-            this.filterHelpBtn.Text = "?";
-            this.filterHelpBtn.UseVisualStyleBackColor = true;
-            this.filterHelpBtn.Click += new System.EventHandler(this.filterHelpBtn_Click);
-            // 
-            // filterBtn
-            // 
-            this.filterBtn.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.filterBtn.Location = new System.Drawing.Point(776, 27);
-            this.filterBtn.Name = "filterBtn";
-            this.filterBtn.Size = new System.Drawing.Size(75, 23);
-            this.filterBtn.TabIndex = 2;
-            this.filterBtn.Text = "Filter";
-            this.filterBtn.UseVisualStyleBackColor = true;
-            this.filterBtn.Click += new System.EventHandler(this.filterBtn_Click);
-            // 
-            // filterSearchTb
-            // 
-            this.filterSearchTb.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-            this.filterSearchTb.Location = new System.Drawing.Point(186, 29);
-            this.filterSearchTb.Name = "filterSearchTb";
-            this.filterSearchTb.Size = new System.Drawing.Size(584, 20);
-            this.filterSearchTb.TabIndex = 1;
-            this.filterSearchTb.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.filterSearchTb_KeyPress);
-            // 
-            // menuStrip1
-            // 
-            this.menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.importToolStripMenuItem,
-            this.liberateToolStripMenuItem,
-            this.quickFiltersToolStripMenuItem,
-            this.settingsToolStripMenuItem});
-            this.menuStrip1.Location = new System.Drawing.Point(0, 0);
-            this.menuStrip1.Name = "menuStrip1";
-            this.menuStrip1.Size = new System.Drawing.Size(863, 24);
-            this.menuStrip1.TabIndex = 0;
-            this.menuStrip1.Text = "menuStrip1";
-            // 
-            // importToolStripMenuItem
-            // 
-            this.importToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.scanLibraryToolStripMenuItem});
-            this.importToolStripMenuItem.Name = "importToolStripMenuItem";
-			this.importToolStripMenuItem.Size = new System.Drawing.Size(55, 20);
-			this.importToolStripMenuItem.Text = "&Import";
-            // 
-            // scanLibraryToolStripMenuItem
-            // 
-            this.scanLibraryToolStripMenuItem.Name = "scanLibraryToolStripMenuItem";
-			this.scanLibraryToolStripMenuItem.Size = new System.Drawing.Size(138, 22);
-			this.scanLibraryToolStripMenuItem.Text = "Scan &Library";
-            this.scanLibraryToolStripMenuItem.Click += new System.EventHandler(this.scanLibraryToolStripMenuItem_Click);
-            // 
-            // liberateToolStripMenuItem
-            // 
-            this.liberateToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.beginBookBackupsToolStripMenuItem,
-            this.beginPdfBackupsToolStripMenuItem});
-            this.liberateToolStripMenuItem.Name = "liberateToolStripMenuItem";
-            this.liberateToolStripMenuItem.Size = new System.Drawing.Size(61, 20);
-            this.liberateToolStripMenuItem.Text = "&Liberate";
-            // 
-            // beginBookBackupsToolStripMenuItem
-            // 
-            this.beginBookBackupsToolStripMenuItem.Name = "beginBookBackupsToolStripMenuItem";
-			this.beginBookBackupsToolStripMenuItem.Size = new System.Drawing.Size(248, 22);
-			this.beginBookBackupsToolStripMenuItem.Text = "Begin &Book and PDF Backups: {0}";
-			this.beginBookBackupsToolStripMenuItem.Click += new System.EventHandler(this.beginBookBackupsToolStripMenuItem_Click);
-            // 
-            // beginPdfBackupsToolStripMenuItem
-            // 
-            this.beginPdfBackupsToolStripMenuItem.Name = "beginPdfBackupsToolStripMenuItem";
-			this.beginPdfBackupsToolStripMenuItem.Size = new System.Drawing.Size(248, 22);
-			this.beginPdfBackupsToolStripMenuItem.Text = "Begin &PDF Only Backups: {0}";
-			this.beginPdfBackupsToolStripMenuItem.Click += new System.EventHandler(this.beginPdfBackupsToolStripMenuItem_Click);
-            // 
-            // quickFiltersToolStripMenuItem
-            // 
-            this.quickFiltersToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.firstFilterIsDefaultToolStripMenuItem,
-            this.editQuickFiltersToolStripMenuItem,
-            this.toolStripSeparator1});
-            this.quickFiltersToolStripMenuItem.Name = "quickFiltersToolStripMenuItem";
-            this.quickFiltersToolStripMenuItem.Size = new System.Drawing.Size(84, 20);
-            this.quickFiltersToolStripMenuItem.Text = "Quick &Filters";
-            // 
-            // firstFilterIsDefaultToolStripMenuItem
-            // 
-            this.firstFilterIsDefaultToolStripMenuItem.Name = "firstFilterIsDefaultToolStripMenuItem";
-            this.firstFilterIsDefaultToolStripMenuItem.Size = new System.Drawing.Size(256, 22);
-            this.firstFilterIsDefaultToolStripMenuItem.Text = "Start Libation with 1st filter &Default";
-            this.firstFilterIsDefaultToolStripMenuItem.Click += new System.EventHandler(this.FirstFilterIsDefaultToolStripMenuItem_Click);
-            // 
-            // editQuickFiltersToolStripMenuItem
-            // 
-            this.editQuickFiltersToolStripMenuItem.Name = "editQuickFiltersToolStripMenuItem";
-            this.editQuickFiltersToolStripMenuItem.Size = new System.Drawing.Size(256, 22);
-            this.editQuickFiltersToolStripMenuItem.Text = "&Edit quick filters";
-            this.editQuickFiltersToolStripMenuItem.Click += new System.EventHandler(this.EditQuickFiltersToolStripMenuItem_Click);
-            // 
-            // toolStripSeparator1
-            // 
-            this.toolStripSeparator1.Name = "toolStripSeparator1";
-            this.toolStripSeparator1.Size = new System.Drawing.Size(253, 6);
-            // 
-            // settingsToolStripMenuItem
-            // 
-            this.settingsToolStripMenuItem.Name = "settingsToolStripMenuItem";
-            this.settingsToolStripMenuItem.Size = new System.Drawing.Size(61, 20);
-            this.settingsToolStripMenuItem.Text = "&Settings";
-            this.settingsToolStripMenuItem.Click += new System.EventHandler(this.settingsToolStripMenuItem_Click);
-            // 
-            // statusStrip1
-            // 
-            this.statusStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.visibleCountLbl,
-            this.springLbl,
-            this.backupsCountsLbl,
-            this.pdfsCountsLbl});
-            this.statusStrip1.Location = new System.Drawing.Point(0, 445);
-            this.statusStrip1.Name = "statusStrip1";
-            this.statusStrip1.Size = new System.Drawing.Size(863, 22);
-            this.statusStrip1.TabIndex = 6;
-            this.statusStrip1.Text = "statusStrip1";
-            // 
-            // visibleCountLbl
-            // 
-            this.visibleCountLbl.Name = "visibleCountLbl";
-            this.visibleCountLbl.Size = new System.Drawing.Size(61, 17);
-            this.visibleCountLbl.Text = "Visible: {0}";
-            // 
-            // springLbl
-            // 
-            this.springLbl.Name = "springLbl";
-            this.springLbl.Size = new System.Drawing.Size(232, 17);
-            this.springLbl.Spring = true;
-            // 
-            // backupsCountsLbl
-            // 
-            this.backupsCountsLbl.Name = "backupsCountsLbl";
-            this.backupsCountsLbl.Size = new System.Drawing.Size(336, 17);
-            this.backupsCountsLbl.Text = "BACKUPS: No progress: {0}  Encrypted: {1}  Fully backed up: {2}";
-            // 
-            // pdfsCountsLbl
-            // 
-            this.pdfsCountsLbl.Name = "pdfsCountsLbl";
-            this.pdfsCountsLbl.Size = new System.Drawing.Size(219, 17);
-            this.pdfsCountsLbl.Text = "|  PDFs: NOT d/l\'ed: {0}  Downloaded: {1}";
-            // 
-            // addFilterBtn
-            // 
-            this.addFilterBtn.Location = new System.Drawing.Point(40, 27);
-            this.addFilterBtn.Name = "addFilterBtn";
-            this.addFilterBtn.Size = new System.Drawing.Size(140, 23);
-            this.addFilterBtn.TabIndex = 4;
-            this.addFilterBtn.Text = "Add To Quick Filters";
-            this.addFilterBtn.UseVisualStyleBackColor = true;
-            this.addFilterBtn.Click += new System.EventHandler(this.AddFilterBtn_Click);
-            // 
-            // Form1
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(863, 467);
-            this.Controls.Add(this.filterBtn);
-            this.Controls.Add(this.addFilterBtn);
-            this.Controls.Add(this.filterSearchTb);
-            this.Controls.Add(this.filterHelpBtn);
-            this.Controls.Add(this.statusStrip1);
-            this.Controls.Add(this.gridPanel);
-            this.Controls.Add(this.menuStrip1);
-            this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
-            this.MainMenuStrip = this.menuStrip1;
-            this.Name = "Form1";
-            this.Text = "Libation: Liberate your Library";
-            this.Load += new System.EventHandler(this.Form1_Load);
-            this.menuStrip1.ResumeLayout(false);
-            this.menuStrip1.PerformLayout();
-            this.statusStrip1.ResumeLayout(false);
-            this.statusStrip1.PerformLayout();
-            this.ResumeLayout(false);
-            this.PerformLayout();
-
-        }
-
-        #endregion
-        private System.Windows.Forms.Panel gridPanel;
-        private System.Windows.Forms.MenuStrip menuStrip1;
-        private System.Windows.Forms.ToolStripMenuItem importToolStripMenuItem;
-        private System.Windows.Forms.StatusStrip statusStrip1;
-        private System.Windows.Forms.ToolStripStatusLabel springLbl;
-        private System.Windows.Forms.ToolStripStatusLabel visibleCountLbl;
-        private System.Windows.Forms.ToolStripMenuItem liberateToolStripMenuItem;
-        private System.Windows.Forms.ToolStripStatusLabel backupsCountsLbl;
-        private System.Windows.Forms.ToolStripMenuItem beginBookBackupsToolStripMenuItem;
-        private System.Windows.Forms.ToolStripStatusLabel pdfsCountsLbl;
-        private System.Windows.Forms.ToolStripMenuItem beginPdfBackupsToolStripMenuItem;
-        private System.Windows.Forms.TextBox filterSearchTb;
-        private System.Windows.Forms.Button filterBtn;
-        private System.Windows.Forms.Button filterHelpBtn;
-        private System.Windows.Forms.ToolStripMenuItem settingsToolStripMenuItem;
-        private System.Windows.Forms.ToolStripMenuItem scanLibraryToolStripMenuItem;
-        private System.Windows.Forms.ToolStripMenuItem quickFiltersToolStripMenuItem;
-        private System.Windows.Forms.ToolStripMenuItem firstFilterIsDefaultToolStripMenuItem;
-        private System.Windows.Forms.Button addFilterBtn;
-        private System.Windows.Forms.ToolStripMenuItem editQuickFiltersToolStripMenuItem;
-        private System.Windows.Forms.ToolStripSeparator toolStripSeparator1;
-    }
-}
-

LibationWinForm/UNTESTED/ProductsGrid.Designer.cs

@@ -1,201 +0,0 @@
-namespace LibationWinForm
-{
-    partial class ProductsGrid
-    {
-        /// <summary> 
-        /// Required designer variable.
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary> 
-        /// Clean up any resources being used.
-        /// </summary>
-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing && (components != null))
-            {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
-        #region Component Designer generated code
-
-        /// <summary> 
-        /// Required method for Designer support - do not modify 
-        /// the contents of this method with the code editor.
-        /// </summary>
-        private void InitializeComponent()
-        {
-            this.components = new System.ComponentModel.Container();
-            this.gridEntryBindingSource = new System.Windows.Forms.BindingSource(this.components);
-            this.gridEntryDataGridView = new System.Windows.Forms.DataGridView();
-            this.dataGridViewImageColumn1 = new System.Windows.Forms.DataGridViewImageColumn();
-            this.dataGridViewTextBoxColumn1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.dataGridViewTextBoxColumn2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.dataGridViewTextBoxColumn3 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.dataGridViewTextBoxColumn4 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.dataGridViewTextBoxColumn5 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.dataGridViewTextBoxColumn6 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.dataGridViewTextBoxColumn7 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.dataGridViewTextBoxColumn8 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.dataGridViewTextBoxColumn9 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.dataGridViewTextBoxColumn10 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.dataGridViewTextBoxColumn11 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.dataGridViewTextBoxColumn12 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            ((System.ComponentModel.ISupportInitialize)(this.gridEntryBindingSource)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.gridEntryDataGridView)).BeginInit();
-            this.SuspendLayout();
-            // 
-            // gridEntryBindingSource
-            // 
-            this.gridEntryBindingSource.DataSource = typeof(LibationWinForm.GridEntry);
-            // 
-            // gridEntryDataGridView
-            // 
-            this.gridEntryDataGridView.AutoGenerateColumns = false;
-            this.gridEntryDataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
-            this.gridEntryDataGridView.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
-            this.dataGridViewImageColumn1,
-            this.dataGridViewTextBoxColumn1,
-            this.dataGridViewTextBoxColumn2,
-            this.dataGridViewTextBoxColumn3,
-            this.dataGridViewTextBoxColumn4,
-            this.dataGridViewTextBoxColumn5,
-            this.dataGridViewTextBoxColumn6,
-            this.dataGridViewTextBoxColumn7,
-            this.dataGridViewTextBoxColumn8,
-            this.dataGridViewTextBoxColumn9,
-            this.dataGridViewTextBoxColumn10,
-            this.dataGridViewTextBoxColumn11,
-            this.dataGridViewTextBoxColumn12});
-            this.gridEntryDataGridView.DataSource = this.gridEntryBindingSource;
-            this.gridEntryDataGridView.Location = new System.Drawing.Point(54, 58);
-            this.gridEntryDataGridView.Name = "gridEntryDataGridView";
-            this.gridEntryDataGridView.Size = new System.Drawing.Size(300, 220);
-            this.gridEntryDataGridView.TabIndex = 0;
-            // 
-            // dataGridViewImageColumn1
-            // 
-            this.dataGridViewImageColumn1.DataPropertyName = "Cover";
-            this.dataGridViewImageColumn1.HeaderText = "Cover";
-            this.dataGridViewImageColumn1.Name = "dataGridViewImageColumn1";
-            this.dataGridViewImageColumn1.ReadOnly = true;
-            // 
-            // dataGridViewTextBoxColumn1
-            // 
-            this.dataGridViewTextBoxColumn1.DataPropertyName = "Title";
-            this.dataGridViewTextBoxColumn1.HeaderText = "Title";
-            this.dataGridViewTextBoxColumn1.Name = "dataGridViewTextBoxColumn1";
-            this.dataGridViewTextBoxColumn1.ReadOnly = true;
-            // 
-            // dataGridViewTextBoxColumn2
-            // 
-            this.dataGridViewTextBoxColumn2.DataPropertyName = "Authors";
-            this.dataGridViewTextBoxColumn2.HeaderText = "Authors";
-            this.dataGridViewTextBoxColumn2.Name = "dataGridViewTextBoxColumn2";
-            this.dataGridViewTextBoxColumn2.ReadOnly = true;
-            // 
-            // dataGridViewTextBoxColumn3
-            // 
-            this.dataGridViewTextBoxColumn3.DataPropertyName = "Narrators";
-            this.dataGridViewTextBoxColumn3.HeaderText = "Narrators";
-            this.dataGridViewTextBoxColumn3.Name = "dataGridViewTextBoxColumn3";
-            this.dataGridViewTextBoxColumn3.ReadOnly = true;
-            // 
-            // dataGridViewTextBoxColumn4
-            // 
-            this.dataGridViewTextBoxColumn4.DataPropertyName = "Length";
-            this.dataGridViewTextBoxColumn4.HeaderText = "Length";
-            this.dataGridViewTextBoxColumn4.Name = "dataGridViewTextBoxColumn4";
-            this.dataGridViewTextBoxColumn4.ReadOnly = true;
-            // 
-            // dataGridViewTextBoxColumn5
-            // 
-            this.dataGridViewTextBoxColumn5.DataPropertyName = "Series";
-            this.dataGridViewTextBoxColumn5.HeaderText = "Series";
-            this.dataGridViewTextBoxColumn5.Name = "dataGridViewTextBoxColumn5";
-            this.dataGridViewTextBoxColumn5.ReadOnly = true;
-            // 
-            // dataGridViewTextBoxColumn6
-            // 
-            this.dataGridViewTextBoxColumn6.DataPropertyName = "Description";
-            this.dataGridViewTextBoxColumn6.HeaderText = "Description";
-            this.dataGridViewTextBoxColumn6.Name = "dataGridViewTextBoxColumn6";
-            this.dataGridViewTextBoxColumn6.ReadOnly = true;
-            // 
-            // dataGridViewTextBoxColumn7
-            // 
-            this.dataGridViewTextBoxColumn7.DataPropertyName = "Category";
-            this.dataGridViewTextBoxColumn7.HeaderText = "Category";
-            this.dataGridViewTextBoxColumn7.Name = "dataGridViewTextBoxColumn7";
-            this.dataGridViewTextBoxColumn7.ReadOnly = true;
-            // 
-            // dataGridViewTextBoxColumn8
-            // 
-            this.dataGridViewTextBoxColumn8.DataPropertyName = "Product_Rating";
-            this.dataGridViewTextBoxColumn8.HeaderText = "Product_Rating";
-            this.dataGridViewTextBoxColumn8.Name = "dataGridViewTextBoxColumn8";
-            this.dataGridViewTextBoxColumn8.ReadOnly = true;
-            // 
-            // dataGridViewTextBoxColumn9
-            // 
-            this.dataGridViewTextBoxColumn9.DataPropertyName = "Purchase_Date";
-            this.dataGridViewTextBoxColumn9.HeaderText = "Purchase_Date";
-            this.dataGridViewTextBoxColumn9.Name = "dataGridViewTextBoxColumn9";
-            this.dataGridViewTextBoxColumn9.ReadOnly = true;
-            // 
-            // dataGridViewTextBoxColumn10
-            // 
-            this.dataGridViewTextBoxColumn10.DataPropertyName = "My_Rating";
-            this.dataGridViewTextBoxColumn10.HeaderText = "My_Rating";
-            this.dataGridViewTextBoxColumn10.Name = "dataGridViewTextBoxColumn10";
-            this.dataGridViewTextBoxColumn10.ReadOnly = true;
-            // 
-            // dataGridViewTextBoxColumn11
-            // 
-            this.dataGridViewTextBoxColumn11.DataPropertyName = "Misc";
-            this.dataGridViewTextBoxColumn11.HeaderText = "Misc";
-            this.dataGridViewTextBoxColumn11.Name = "dataGridViewTextBoxColumn11";
-            this.dataGridViewTextBoxColumn11.ReadOnly = true;
-            // 
-            // dataGridViewTextBoxColumn12
-            // 
-            this.dataGridViewTextBoxColumn12.DataPropertyName = "Download_Status";
-            this.dataGridViewTextBoxColumn12.HeaderText = "Download_Status";
-            this.dataGridViewTextBoxColumn12.Name = "dataGridViewTextBoxColumn12";
-            this.dataGridViewTextBoxColumn12.ReadOnly = true;
-            // 
-            // ProductsGrid
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.Controls.Add(this.gridEntryDataGridView);
-            this.Name = "ProductsGrid";
-            this.Size = new System.Drawing.Size(434, 329);
-            ((System.ComponentModel.ISupportInitialize)(this.gridEntryBindingSource)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.gridEntryDataGridView)).EndInit();
-            this.ResumeLayout(false);
-
-        }
-
-        #endregion
-
-        private System.Windows.Forms.BindingSource gridEntryBindingSource;
-        private System.Windows.Forms.DataGridView gridEntryDataGridView;
-        private System.Windows.Forms.DataGridViewImageColumn dataGridViewImageColumn1;
-        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn1;
-        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn2;
-        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn3;
-        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn4;
-        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn5;
-        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn6;
-        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn7;
-        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn8;
-        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn9;
-        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn10;
-        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn11;
-        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn12;
-    }
-}

LibationWinForm/UNTESTED/ProductsGrid.cs

@@ -1,274 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Drawing;
-using System.Linq;
-using System.Windows.Forms;
-using ApplicationServices;
-using DataLayer;
-using Dinah.Core.Collections.Generic;
-using Dinah.Core.DataBinding;
-using Dinah.Core.Windows.Forms;
-
-namespace LibationWinForm
-{
-    // INSTRUCTIONS TO UPDATE DATA_GRID_VIEW
-    // - delete current DataGridView
-    // - view > other windows > data sources
-    // - refresh
-    // OR
-    // - Add New Data Source
-    //   Object. Next
-    //   LibationWinForm
-    //     AudibleDTO
-    //       GridEntry
-    // - go to Design view
-    // - click on Data Sources > ProductItem. drowdown: DataGridView
-    // - drag/drop ProductItem on design surface
-    public partial class ProductsGrid : UserControl
-	{
-		public event EventHandler<int> VisibleCountChanged;
-
-		private DataGridView dataGridView;
-		private LibationContext context;
-
-		public ProductsGrid()
-		{
-			InitializeComponent();
-
-			Disposed += (_, __) => context?.Dispose();
-
-			manageLiveImageUpdateSubscriptions();
-		}
-
-		private bool hasBeenDisplayed = false;
-        public void Display()
-        {
-            if (hasBeenDisplayed)
-                return;
-            hasBeenDisplayed = true;
-
-            dataGridView = gridEntryDataGridView;
-
-            dataGridView.Dock = DockStyle.Fill;
-            dataGridView.AllowUserToAddRows = false;
-            dataGridView.AllowUserToDeleteRows = false;
-            dataGridView.AutoGenerateColumns = false;
-            dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize;
-            dataGridView.DefaultCellStyle.WrapMode = DataGridViewTriState.True;
-            dataGridView.ReadOnly = true;
-            dataGridView.RowHeadersVisible = false;
-            // adjust height for 80x80 pictures.
-            // this must be done before databinding. or can alter later by iterating through rows
-            dataGridView.RowTemplate.Height = 82;
-            dataGridView.CellFormatting += replaceFormatted;
-            dataGridView.CellFormatting += hiddenFormatting;
-            // sorting breaks filters. must reapply filters after sorting
-            dataGridView.Sorted += (_, __) => filter();
-
-            { // add tag buttons
-                var editUserTagsButton = new DataGridViewButtonColumn { HeaderText = "Edit Tags" };
-                dataGridView.Columns.Add(editUserTagsButton);
-
-                // add image and handle click
-                dataGridView.CellPainting += paintEditTag_TextAndImage;
-                dataGridView.CellContentClick += dataGridView_GridButtonClick;
-            }
-
-            for (var i = dataGridView.ColumnCount - 1; i >= 0; i--)
-            {
-                DataGridViewColumn col = dataGridView.Columns[i];
-
-                // initial HeaderText is the lookup name from GridEntry class. any formatting below won't change this
-                col.Name = col.HeaderText;
-
-                if (!(col is DataGridViewImageColumn || col is DataGridViewButtonColumn))
-                    col.SortMode = DataGridViewColumnSortMode.Automatic;
-
-                col.HeaderText = col.HeaderText.Replace("_", " ");
-
-				col.Width = col.Name switch
-				{
-					nameof(GridEntry.Cover) => 80,
-					nameof(GridEntry.Title) => col.Width * 2,
-					nameof(GridEntry.Misc) => (int)(col.Width * 1.35),
-					var n when n.In(nameof(GridEntry.My_Rating), nameof(GridEntry.Product_Rating)) => col.Width + 8,
-					_ => col.Width
-				};
-            }
-
-
-			//
-			// transform into sorted GridEntry.s BEFORE binding
-			//
-			context = LibationContext.Create();
-			var lib = context.GetLibrary_Flat_WithTracking();
-
-			// if no data. hide all columns. return
-			if (!lib.Any())
-			{
-				for (var i = dataGridView.ColumnCount - 1; i >= 0; i--)
-					dataGridView.Columns.RemoveAt(i);
-				return;
-			}
-
-			var orderedGridEntries = lib
-                .Select(lb => new GridEntry(lb)).ToList()
-				// default load order
-				.OrderByDescending(ge => ge.Purchase_Date)
-                //// more advanced example: sort by author, then series, then title
-                //.OrderBy(ge => ge.Authors)
-                //    .ThenBy(ge => ge.Series)
-                //    .ThenBy(ge => ge.Title)
-                .ToList();
-
-            //
-            // BIND
-            //
-            gridEntryBindingSource.DataSource = orderedGridEntries.ToSortableBindingList();
-
-            //
-            // FILTER
-            //
-            filter();
-        }
-
-        private void paintEditTag_TextAndImage(object sender, DataGridViewCellPaintingEventArgs e)
-        {
-            // DataGridView Image for Button Column: https://stackoverflow.com/a/36253883
-
-            if (e.RowIndex < 0 || !(((DataGridView)sender).Columns[e.ColumnIndex] is DataGridViewButtonColumn))
-                return;
-
-
-            var gridEntry = getGridEntry(e.RowIndex);
-            var displayTags = gridEntry.TagsEnumerated.ToList();
-
-            if (displayTags.Any())
-                dataGridView.Rows[e.RowIndex].Cells[e.ColumnIndex].Value = string.Join("\r\n", displayTags);
-            else // no tags: use image
-            {
-                // clear tag text
-                dataGridView.Rows[e.RowIndex].Cells[e.ColumnIndex].Value = "";
-
-                // images from: icons8.com -- search: tags
-                var image = Properties.Resources.edit_tags_25x25;
-
-                e.Paint(e.CellBounds, DataGridViewPaintParts.All);
-
-                var w = image.Width;
-                var h = image.Height;
-                var x = e.CellBounds.Left + (e.CellBounds.Width - w) / 2;
-                var y = e.CellBounds.Top + (e.CellBounds.Height - h) / 2;
-
-                e.Graphics.DrawImage(image, new Rectangle(x, y, w, h));
-                e.Handled = true;
-            }
-        }
-
-        private void dataGridView_GridButtonClick(object sender, DataGridViewCellEventArgs e)
-        {
-            // handle grid button click: https://stackoverflow.com/a/13687844
-
-            if (e.RowIndex < 0)
-                return;
-            if (sender != dataGridView)
-                throw new Exception($"{nameof(dataGridView_GridButtonClick)} has incorrect sender ...somehow");
-            if (!(dataGridView.Columns[e.ColumnIndex] is DataGridViewButtonColumn))
-                return;
-
-            var liveGridEntry = getGridEntry(e.RowIndex);
-
-            // EditTagsDialog should display better-formatted title
-            liveGridEntry.TryGetFormatted(nameof(liveGridEntry.Title), out string value);
-
-            var editTagsForm = new EditTagsDialog(value, liveGridEntry.Tags);
-            if (editTagsForm.ShowDialog() != DialogResult.OK)
-                return;
-
-			var qtyChanges = context.UpdateTags(liveGridEntry.GetBook(), editTagsForm.NewTags);
-			if (qtyChanges == 0)
-                return;
-
-            // force a re-draw, and re-apply filters
-
-            // needed to update text colors
-            dataGridView.InvalidateRow(e.RowIndex);
-
-            filter();
-        }
-
-        #region Cell Formatting
-        private void replaceFormatted(object sender, DataGridViewCellFormattingEventArgs e)
-        {
-            var col = ((DataGridView)sender).Columns[e.ColumnIndex];
-            if (col is DataGridViewTextBoxColumn textCol && getGridEntry(e.RowIndex).TryGetFormatted(textCol.Name, out string value))
-                e.Value = value;
-        }
-
-        private void hiddenFormatting(object sender, DataGridViewCellFormattingEventArgs e)
-        {
-            var isHidden = getGridEntry(e.RowIndex).TagsEnumerated.Contains("hidden");
-
-            dataGridView.Rows[e.RowIndex].Cells[e.ColumnIndex].Style
-                = isHidden
-                ? new DataGridViewCellStyle { ForeColor = Color.LightGray }
-                : dataGridView.DefaultCellStyle;
-        }
-        #endregion
-
-        #region filter
-        string _filterSearchString;
-        private void filter() => Filter(_filterSearchString);
-        public void Filter(string searchString)
-        {
-            _filterSearchString = searchString;
-
-			if (dataGridView.Rows.Count == 0)
-				return;
-
-            var searchResults = SearchEngineCommands.Search(searchString);
-            var productIds = searchResults.Docs.Select(d => d.ProductId).ToList();
-
-            // https://stackoverflow.com/a/18942430
-            var currencyManager = (CurrencyManager)BindingContext[dataGridView.DataSource];
-            currencyManager.SuspendBinding();
-            {
-                for (var r = dataGridView.RowCount - 1; r >= 0; r--)
-                    dataGridView.Rows[r].Visible = productIds.Contains(getGridEntry(r).GetBook().AudibleProductId);
-            }
-            currencyManager.ResumeBinding();
-			VisibleCountChanged?.Invoke(this, dataGridView.AsEnumerable().Count(r => r.Visible));
-
-			var luceneSearchString_debug = searchResults.SearchString;
-        }
-		#endregion
-
-		#region live update newly downloaded and cached images
-		private void manageLiveImageUpdateSubscriptions()
-		{
-			FileManager.PictureStorage.PictureCached += crossThreadImageUpdate;
-			Disposed += (_, __) => FileManager.PictureStorage.PictureCached -= crossThreadImageUpdate;
-		}
-
-		private void crossThreadImageUpdate(object _, string pictureId)
-			=> dataGridView.UIThread(() => updateRowImage(pictureId));
-		private void updateRowImage(string pictureId)
-		{
-			var rowId = getRowId((ge) => ge.GetBook().PictureId == pictureId);
-			if (rowId > -1)
-				dataGridView.InvalidateRow(rowId);
-		}
-		#endregion
-
-		private GridEntry getGridEntry(int rowIndex) => (GridEntry)dataGridView.Rows[rowIndex].DataBoundItem;
-
-		private int getRowId(Func<GridEntry, bool> func)
-		{
-			for (var r = 0; r < dataGridView.RowCount; r++)
-				if (func(getGridEntry(r)))
-					return r;
-
-			return -1;
-		}
-	}
-}

LibationWinForm/UNTESTED/Program.cs

@@ -1,43 +0,0 @@
-using System;
-using System.Windows.Forms;
-
-namespace LibationWinForm
-{
-    static class Program
-    {
-        [STAThread]
-        static void Main()
-		{
-			Application.EnableVisualStyles();
-			Application.SetCompatibleTextRenderingDefault(false);
-
-			if (!createSettings())
-				return;
-
-			Application.Run(new Form1());
-		}
-
-		private static bool createSettings()
-		{
-			if (!string.IsNullOrWhiteSpace(FileManager.Configuration.Instance.Books))
-				return true;
-
-			var welcomeText = @"
-This appears to be your first time using Libation. Welcome.
-Please fill in a few settings on the following page. You can also change these settings later.
-
-After you make your selections, get started by importing your library.
-Go to Import > Scan Library
-".Trim();
-			MessageBox.Show(welcomeText, "Welcom to Libation", MessageBoxButtons.OK);
-			var dialogResult = new SettingsDialog().ShowDialog();
-			if (dialogResult != DialogResult.OK)
-			{
-				MessageBox.Show("Initial set up cancelled.", "Cancelled", MessageBoxButtons.OK, MessageBoxIcon.Warning);
-				return false;
-			}
-
-			return true;
-		}
-	}
-}

LibationWinForms/LibationWinForms.csproj

@@ -0,0 +1,69 @@
+<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
+
+  <PropertyGroup>
+    <OutputType>Library</OutputType>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <UseWindowsForms>true</UseWindowsForms>
+    <ApplicationIcon>libation.ico</ApplicationIcon>
+
+    <PublishTrimmed>true</PublishTrimmed>
+    <PublishReadyToRun>true</PublishReadyToRun>
+    <!-- <PublishSingleFile>true</PublishSingleFile> -->
+    <RuntimeIdentifier>win-x64</RuntimeIdentifier>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\FileLiberator\FileLiberator.csproj" />
+    <ProjectReference Include="..\WindowsDesktopUtilities\WindowsDesktopUtilities.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Compile Update="Properties\Resources.Designer.cs">
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Resources.resx</DependentUpon>
+    </Compile>
+    <Compile Update="UNTESTED\Dialogs\LibationFilesDialog.cs" />
+    <Compile Update="UNTESTED\Dialogs\LibationFilesDialog.Designer.cs">
+      <DependentUpon>LibationFilesDialog.cs</DependentUpon>
+    </Compile>
+    <Compile Update="UNTESTED\Dialogs\ScanAccountsDialog.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Update="UNTESTED\Dialogs\ScanAccountsDialog.Designer.cs">
+      <DependentUpon>ScanAccountsDialog.cs</DependentUpon>
+    </Compile>
+    <Compile Update="UNTESTED\Dialogs\SettingsDialog.cs" />
+    <Compile Update="UNTESTED\Dialogs\SettingsDialog.Designer.cs">
+      <DependentUpon>SettingsDialog.cs</DependentUpon>
+    </Compile>
+    <Compile Update="UNTESTED\Dialogs\IndexLibraryDialog.cs" />
+    <Compile Update="UNTESTED\Dialogs\IndexLibraryDialog.Designer.cs">
+      <DependentUpon>IndexLibraryDialog.cs</DependentUpon>
+    </Compile>
+    <Compile Update="UNTESTED\Dialogs\SetupDialog.cs" />
+    <Compile Update="UNTESTED\Dialogs\SetupDialog.Designer.cs">
+      <DependentUpon>SetupDialog.cs</DependentUpon>
+    </Compile>
+  </ItemGroup>
+
+  <ItemGroup>
+    <EmbeddedResource Update="Properties\Resources.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
+    <EmbeddedResource Update="UNTESTED\Dialogs\LibationFilesDialog.resx">
+      <DependentUpon>LibationFilesDialog.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Update="UNTESTED\Dialogs\ScanAccountsDialog.resx">
+      <DependentUpon>ScanAccountsDialog.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Update="UNTESTED\Dialogs\SettingsDialog.resx">
+      <DependentUpon>SettingsDialog.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Update="UNTESTED\Dialogs\SetupDialog.resx">
+      <DependentUpon>SetupDialog.cs</DependentUpon>
+    </EmbeddedResource>
+  </ItemGroup>
+
+</Project>

LibationWinForms/Properties/DataSources/LibationWinForm.GridEntry.datasource

@@ -6,5 +6,5 @@
     cause the file to be unrecognizable by the program.
 -->
 <GenericObjectDataSource DisplayName="GridEntry" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
-   <TypeInfo>WinFormsDesigner.GridEntry, LibationWinForm, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
+   <TypeInfo>LibationWinForms.GridEntry, LibationWinForms, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
 </GenericObjectDataSource>

LibationWinForms/Properties/Resources.Designer.cs

@@ -8,7 +8,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace LibationWinForm.Properties {
+namespace LibationWinForms.Properties {
     using System;
     
     
@@ -39,7 +39,7 @@ namespace LibationWinForm.Properties {
         internal static global::System.Resources.ResourceManager ResourceManager {
             get {
                 if (object.ReferenceEquals(resourceMan, null)) {
-                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("LibationWinForm.Properties.Resources", typeof(Resources).Assembly);
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("LibationWinForms.Properties.Resources", typeof(Resources).Assembly);
                     resourceMan = temp;
                 }
                 return resourceMan;
@@ -109,5 +109,95 @@ namespace LibationWinForm.Properties {
                 return ((System.Drawing.Bitmap)(obj));
             }
         }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap liberate_green {
+            get {
+                object obj = ResourceManager.GetObject("liberate_green", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap liberate_green_pdf_no {
+            get {
+                object obj = ResourceManager.GetObject("liberate_green_pdf_no", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap liberate_green_pdf_yes {
+            get {
+                object obj = ResourceManager.GetObject("liberate_green_pdf_yes", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap liberate_red {
+            get {
+                object obj = ResourceManager.GetObject("liberate_red", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap liberate_red_pdf_no {
+            get {
+                object obj = ResourceManager.GetObject("liberate_red_pdf_no", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap liberate_red_pdf_yes {
+            get {
+                object obj = ResourceManager.GetObject("liberate_red_pdf_yes", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap liberate_yellow {
+            get {
+                object obj = ResourceManager.GetObject("liberate_yellow", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap liberate_yellow_pdf_no {
+            get {
+                object obj = ResourceManager.GetObject("liberate_yellow_pdf_no", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap liberate_yellow_pdf_yes {
+            get {
+                object obj = ResourceManager.GetObject("liberate_yellow_pdf_yes", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
     }
 }

LibationWinForms/Properties/Resources.resx

@@ -133,4 +133,31 @@
   <data name="edit_tags_50x50" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\edit-tags-50x50.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="liberate_green" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\liberate_green.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="liberate_green_pdf_no" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\liberate_green_pdf_no.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="liberate_green_pdf_yes" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\liberate_green_pdf_yes.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="liberate_red" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\liberate_red.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="liberate_red_pdf_no" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\liberate_red_pdf_no.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="liberate_red_pdf_yes" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\liberate_red_pdf_yes.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="liberate_yellow" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\liberate_yellow.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="liberate_yellow_pdf_no" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\liberate_yellow_pdf_no.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="liberate_yellow_pdf_yes" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\liberate_yellow_pdf_yes.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
 </root>

LibationWinForms/Resources/_icon how to.txt

@@ -1,6 +1,6 @@
 how to create the app's icon
 ============================
-https://www.flaticon.com/free-icon/glass-with-wine_33529#term=wine&page=1&position=59
+orig from (no longer available) https://www.flaticon.com/free-icon/glass-with-wine_33529
 get this image, color=black, at each of these sizes: 16,32,64,128,256
 
 from this answer: https://stackoverflow.com/a/16922387