Bug fix: podcast episodes with no title cause library import failure

* new ext method to simplify api access in file liberator

AaxDecrypter/AaxDecrypter.csproj

@@ -5,8 +5,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="AAXClean" Version="0.1.1" />
-    <PackageReference Include="Dinah.Core" Version="1.0.5.2" />
+    <PackageReference Include="AAXClean" Version="0.1.9" />
+    <PackageReference Include="Dinah.Core" Version="1.1.0.1" />
   </ItemGroup>
 
 </Project>

AaxDecrypter/AaxcDownloadConverter.cs

@@ -83,8 +83,7 @@ namespace AaxDecrypter
             }
 
             var speedup = (int)(aaxFile.Duration.TotalSeconds / (long)Elapsed.TotalSeconds);
-            Console.WriteLine("Speedup is " + speedup + "x realtime.");
-            Console.WriteLine("Done");
+            Serilog.Log.Logger.Information($"Speedup is {speedup}x realtime.");
             return true;
         }
 
@@ -145,7 +144,7 @@ namespace AaxDecrypter
             if (File.Exists(outputFileName))
                 FileExt.SafeDelete(outputFileName);
 
-            FileStream outFile = File.OpenWrite(outputFileName);
+            FileStream outFile = File.Open(outputFileName, FileMode.OpenOrCreate, FileAccess.ReadWrite);
 
             aaxFile.SetDecryptionKey(downloadLicense.AudibleKey, downloadLicense.AudibleIV);
 

AppScaffolding/AppScaffolding.csproj

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

AppScaffolding/LibationScaffolding.cs

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

AppScaffolding/UNSAFE_MigrationHelper.cs

@@ -6,7 +6,7 @@ using Dinah.Core;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 
-namespace LibationLauncher
+namespace AppScaffolding
 {
 	/// <summary>
 	/// 
@@ -20,7 +20,7 @@ namespace LibationLauncher
 	internal static class UNSAFE_MigrationHelper
 	{
 		#region appsettings.json
-		private const string APPSETTINGS_JSON = "appsettings.json";
+		private static string APPSETTINGS_JSON { get; } = Path.Combine(Path.GetDirectoryName(System.Reflection.Assembly.GetEntryAssembly().Location), "appsettings.json");
 
 		public static bool APPSETTINGS_Json_Exists => File.Exists(APPSETTINGS_JSON);
 

ApplicationServices/LibraryCommands.cs

@@ -8,6 +8,7 @@ using Dinah.Core;
 using DtoImporterService;
 using InternalUtilities;
 using Serilog;
+using static DtoImporterService.PerfLogger;
 
 namespace ApplicationServices
 {
@@ -15,13 +16,15 @@ namespace ApplicationServices
 	{
 		private static LibraryOptions.ResponseGroupOptions LibraryResponseGroups = LibraryOptions.ResponseGroupOptions.ALL_OPTIONS;
 
-		public static async Task<List<LibraryBook>> FindInactiveBooks(Func<Account, ILoginCallback> loginCallbackFactoryFunc, List<LibraryBook> existingLibrary, params Account[] accounts)
-        {
+		public static async Task<List<LibraryBook>> FindInactiveBooks(Func<Account, Task<ApiExtended>> apiExtendedfunc, List<LibraryBook> existingLibrary, params Account[] accounts)
+		{
+			logRestart();
+
 			//These are the minimum response groups required for the
 			//library scanner to pass all validation and filtering.
-			LibraryResponseGroups = 
+			LibraryResponseGroups =
 				LibraryOptions.ResponseGroupOptions.ProductAttrs |
-				LibraryOptions.ResponseGroupOptions.ProductDesc | 
+				LibraryOptions.ResponseGroupOptions.ProductDesc |
 				LibraryOptions.ResponseGroupOptions.Relationships;
 
 			if (accounts is null || accounts.Length == 0)
@@ -29,8 +32,12 @@ namespace ApplicationServices
 
 			try
 			{
-				var libraryItems = await scanAccountsAsync(loginCallbackFactoryFunc, accounts);
-				Log.Logger.Information($"GetAllLibraryItems: Total count {libraryItems.Count}");
+				logTime($"pre {nameof(scanAccountsAsync)} all");
+				var libraryItems = await scanAccountsAsync(apiExtendedfunc, accounts);
+				logTime($"post {nameof(scanAccountsAsync)} all");
+
+				var totalCount = libraryItems.Count;
+				Log.Logger.Information($"GetAllLibraryItems: Total count {totalCount}");
 
 				var missingBookList = existingLibrary.Where(b => !libraryItems.Any(i => i.DtoItem.Asin == b.Book.AudibleProductId)).ToList();
 
@@ -56,30 +63,39 @@ namespace ApplicationServices
 			}
 			catch (Exception ex)
 			{
-				Log.Logger.Error(ex, "Error importing library");
+				Log.Logger.Error(ex, "Error scanning library");
 				throw;
 			}
-            finally
-            {
+			finally
+			{
 				LibraryResponseGroups = LibraryOptions.ResponseGroupOptions.ALL_OPTIONS;
-            }
+				stop();
+				var putBreakPointHere = logOutput;
+			}
 		}
 
 		#region FULL LIBRARY scan and import
-		public static async Task<(int totalCount, int newCount)> ImportAccountAsync(Func<Account, ILoginCallback> loginCallbackFactoryFunc, params Account[] accounts)
+		public static async Task<(int totalCount, int newCount)> ImportAccountAsync(Func<Account, Task<ApiExtended>> apiExtendedfunc, params Account[] accounts)
 		{
+			logRestart();
+
 			if (accounts is null || accounts.Length == 0)
 				return (0, 0);
 
 			try
 			{
-				var importItems = await scanAccountsAsync(loginCallbackFactoryFunc, accounts);
+				logTime($"pre {nameof(scanAccountsAsync)} all");
+				var importItems = await scanAccountsAsync(apiExtendedfunc, accounts);
+				logTime($"post {nameof(scanAccountsAsync)} all");
 
 				var totalCount = importItems.Count;
 				Log.Logger.Information($"GetAllLibraryItems: Total count {totalCount}");
 
+				Log.Logger.Information("Begin long-running import");
+				logTime($"pre {nameof(importIntoDbAsync)}");
 				var newCount = await importIntoDbAsync(importItems);
-				Log.Logger.Information($"Import: New count {newCount}");
+				logTime($"post {nameof(importIntoDbAsync)}");
+				Log.Logger.Information($"Import complete. New count {newCount}");
 
 				return (totalCount, newCount);
 			}
@@ -106,20 +122,23 @@ namespace ApplicationServices
 				Log.Logger.Error(ex, "Error importing library");
 				throw;
 			}
+			finally
+			{
+				stop();
+				var putBreakPointHere = logOutput;
+			}
 		}
 
-		private static async Task<List<ImportItem>> scanAccountsAsync(Func<Account, ILoginCallback> loginCallbackFactoryFunc, Account[] accounts)
+		private static async Task<List<ImportItem>> scanAccountsAsync(Func<Account, Task<ApiExtended>> apiExtendedfunc, Account[] accounts)
 		{
 			var tasks = new List<Task<List<ImportItem>>>();
 			foreach (var account in accounts)
 			{
-				var callback = loginCallbackFactoryFunc(account);
-
-				// get APIs in serial, esp b/c of logins
-				var api = await AudibleApiActions.GetApiAsync(callback, account);
+				// get APIs in serial b/c of logins. do NOT move inside of parallel (Task.WhenAll)
+				var apiExtended = await apiExtendedfunc(account);
 
 				// add scanAccountAsync as a TASK: do not await
-				tasks.Add(scanAccountAsync(api, account));
+				tasks.Add(scanAccountAsync(apiExtended, account));
 			}
 
 			// import library in parallel
@@ -128,7 +147,7 @@ namespace ApplicationServices
 			return importItems;
 		}
 
-		private static async Task<List<ImportItem>> scanAccountAsync(Api api, Account account)
+		private static async Task<List<ImportItem>> scanAccountAsync(ApiExtended apiExtended, Account account)
 		{
 			ArgumentValidator.EnsureNotNull(account, nameof(account));
 
@@ -137,19 +156,28 @@ namespace ApplicationServices
 				Account = account?.MaskedLogEntry ?? "[null]"
 			});
 
-			var dtoItems = await AudibleApiActions.GetLibraryValidatedAsync(api, LibraryResponseGroups);
+			logTime($"pre scanAccountAsync {account.AccountName}");
+
+			var dtoItems = await apiExtended.GetLibraryValidatedAsync(LibraryResponseGroups);
+
+			logTime($"post scanAccountAsync {account.AccountName} qty: {dtoItems.Count}");
+
 			return dtoItems.Select(d => new ImportItem { DtoItem = d, AccountId = account.AccountId, LocaleName = account.Locale?.Name }).ToList();
 		}
 
 		private static async Task<int> importIntoDbAsync(List<ImportItem> importItems)
 		{
+			logTime("importIntoDbAsync -- pre db");
 			using var context = DbContexts.GetContext();
-			var libraryImporter = new LibraryImporter(context);
+			var libraryImporter = new LibraryBookImporter(context);
 			var newCount = await Task.Run(() => libraryImporter.Import(importItems));
+			logTime("importIntoDbAsync -- post Import()");
 			var qtyChanges = context.SaveChanges();
+			logTime("importIntoDbAsync -- post SaveChanges");
 
 			if (qtyChanges > 0)
 				await Task.Run(() => finalizeLibrarySizeChange());
+			logTime("importIntoDbAsync -- post finalizeLibrarySizeChange");
 
 			return newCount;
 		}
@@ -215,15 +243,14 @@ namespace ApplicationServices
 		}
 		#endregion
 
+		// must be here instead of in db layer due to AaxcExists
 		public static LiberatedStatus Liberated_Status(Book book)
-			=> book.Audio_Exists ? LiberatedStatus.Liberated
+			=> book.Audio_Exists ? book.UserDefinedItem.BookStatus
 			: FileManager.AudibleFileStorage.AaxcExists(book.AudibleProductId) ? LiberatedStatus.PartialDownload
 			: LiberatedStatus.NotLiberated;
 
-		public static LiberatedStatus? Pdf_Status(Book book)
-			=> !book.HasPdf ? null
-			: book.PDF_Exists ? LiberatedStatus.Liberated
-			: LiberatedStatus.NotLiberated;
+		// exists here for feature predictability. It makes sense for this to be where Liberated_Status is
+		public static LiberatedStatus? Pdf_Status(Book book) => book.UserDefinedItem.PdfStatus;
 
 		// below are queries, not commands. maybe I should make a LibraryQueries. except there's already one of those...
 

DataLayer/Configurations/LibraryBookConfig.cs

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

DataLayer/DataLayer.csproj

@@ -12,13 +12,13 @@
   </PropertyGroup>
   
   <ItemGroup>
-    <PackageReference Include="Dinah.EntityFrameworkCore" Version="1.0.2.2" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="5.0.9">
+    <PackageReference Include="Dinah.EntityFrameworkCore" Version="1.0.5.2" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="5.0.10">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="5.0.9" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="5.0.9">
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="5.0.10" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="5.0.10">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

DataLayer/EfClasses/Book.cs

@@ -30,8 +30,6 @@ namespace DataLayer
         public string Description { get; private set; }
         public int LengthInMinutes { get; private set; }
         public ContentType ContentType { get; private set; }
-
-        // immutable-ish. should be immutable. mutability is necessary for v3 => v4 upgrades
         public string Locale { get; private set; }
 
         // mutable
@@ -57,22 +55,10 @@ namespace DataLayer
         public UserDefinedItem UserDefinedItem { get; private set; }
 
         // UserDefinedItem convenience properties
-        public bool Audio_Exists
-        {
-            get
-            {
-                var status = UserDefinedItem?.BookStatus;
-                return status.HasValue && status.Value != LiberatedStatus.NotLiberated;
-            }
-        }
-        public bool PDF_Exists
-        {
-            get
-            {
-                var status = UserDefinedItem?.PdfStatus;
-                return (status.HasValue && status.Value == LiberatedStatus.Liberated);
-            }
-        }
+        /// <summary>True if IsLiberated or Error. False if NotLiberated</summary>
+        public bool Audio_Exists => UserDefinedItem.BookStatus != LiberatedStatus.NotLiberated;
+        /// <summary>True if exists and IsLiberated. Else false</summary>
+        public bool PDF_Exists => UserDefinedItem.PdfStatus == LiberatedStatus.Liberated;
 
         // is owned, not optional 1:1
         /// <summary>The product's aggregate community rating</summary>
@@ -90,7 +76,8 @@ namespace DataLayer
             ContentType contentType,
 			IEnumerable<Contributor> authors,
 			IEnumerable<Contributor> narrators,
-			Category category, string localeName)
+			Category category,
+            string localeName)
         {
             // validate
             ArgumentValidator.EnsureNotNull(audibleProductId, nameof(audibleProductId));
@@ -113,7 +100,7 @@ namespace DataLayer
 
             // simple assigns
             Title = title.Trim();
-            Description = description.Trim();
+            Description = description?.Trim();
             LengthInMinutes = lengthInMinutes;
             ContentType = contentType;
 
@@ -272,10 +259,6 @@ namespace DataLayer
 			Category = category;
         }
 
-        // needed for v3 => v4 upgrade
-        public void UpdateLocale(string localeName)
-            => Locale ??= localeName;
-
         public override string ToString() => $"[{AudibleProductId}] {Title}";
 	}
 }

DataLayer/EfClasses/LibraryBook.cs

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

DataLayer/QueryObjects/GenericPaging.cs

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

DtoImporterService/BookImporter.cs

@@ -19,13 +19,13 @@ namespace DtoImporterService
 			new ContributorImporter(DbContext).Import(importItems);
 			new SeriesImporter(DbContext).Import(importItems);
 			new CategoryImporter(DbContext).Import(importItems);
-
+			
 			// get distinct
-			var productIds = importItems.Select(i => i.DtoItem.ProductId).ToList();
-
+			var productIds = importItems.Select(i => i.DtoItem.ProductId).Distinct().ToList();
+			
 			// load db existing => .Local
 			loadLocal_books(productIds);
-
+			
 			// upsert
 			var qtyNew = upsertBooks(importItems);
 			return qtyNew;
@@ -33,12 +33,30 @@ namespace DtoImporterService
 
 		private void loadLocal_books(List<string> productIds)
 		{
-			var localProductIds = DbContext.Books.Local.Select(b => b.AudibleProductId);
+			// if this context has already loaded books, don't need to reload them. vestige from when context was long-lived. in practice, we now typically use a fresh context. this is quick though so no harm in leaving it.
+			var localProductIds = DbContext.Books.Local.Select(b => b.AudibleProductId).ToList();
 			var remainingProductIds = productIds
-				.Distinct()
 				.Except(localProductIds)
 				.ToList();
 
+			#region // explanation of DbContext.Books.GetBooks(b => remainingProductIds.Contains(b.AudibleProductId)).ToList();
+			/*
+			articles suggest loading to Local with
+			    context.Books.Load();
+			we want Books and associated fields
+			    context.Books.GetBooks(b => remainingProductIds.Contains(b.AudibleProductId)).ToList();
+			this is emulating Load() but with also getting associated fields
+
+			from: Microsoft.EntityFrameworkCore.EntityFrameworkQueryableExtensions
+			// Summary:
+			//     Enumerates the query. When using Entity Framework, this causes the results of
+			//     the query to be loaded into the associated context. This is equivalent to calling
+			//     ToList and then throwing away the list (without the overhead of actually creating
+			//     the list).
+			public static void Load<TSource>([NotNullAttribute] this IQueryable<TSource> source); 
+			*/
+			#endregion
+
 			// GetBooks() eager loads Series, category, et al
 			if (remainingProductIds.Any())
 				DbContext.Books.GetBooks(b => remainingProductIds.Contains(b.AudibleProductId)).ToList();
@@ -137,9 +155,6 @@ namespace DtoImporterService
 			book.PictureId = item.PictureId;
 			book.UpdateProductRating(item.Product_OverallStars, item.Product_PerformanceStars, item.Product_StoryStars);
 
-			// needed during v3 => v4 migration
-			book.UpdateLocale(importItem.LocaleName);
-
 			// important to update user-specific info. this will have changed if user has rated/reviewed the book since last library import
 			book.UserDefinedItem.UpdateRating(item.MyUserRating_Overall, item.MyUserRating_Performance, item.MyUserRating_Story);
 

DtoImporterService/CategoryImporter.cs

@@ -35,7 +35,7 @@ namespace DtoImporterService
 
 		private void loadLocal_categories(List<string> categoryIds)
 		{
-			var localIds = DbContext.Categories.Local.Select(c => c.AudibleCategoryId);
+			var localIds = DbContext.Categories.Local.Select(c => c.AudibleCategoryId).ToList();
 			var remainingCategoryIds = categoryIds
 				.Distinct()
 				.Except(localIds)

DtoImporterService/ContributorImporter.cs

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

DtoImporterService/ImportItem.cs

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

DtoImporterService/LibraryBookImporter.cs

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

DtoImporterService/PerfLogger.cs

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

FileLiberator/ConvertToMp3.cs

@@ -14,7 +14,6 @@ namespace FileLiberator
 {
     public class ConvertToMp3 : IAudioDecodable
     {
-
         private Mp4File m4bBook;
 
 		public event EventHandler<TimeSpan> StreamingTimeRemaining;
@@ -30,7 +29,22 @@ namespace FileLiberator
 		public event EventHandler<string> StatusUpdate;
 		public event EventHandler<LibraryBook> Completed;
 
-        private long fileSize;
+        public ConvertToMp3()
+        {
+            RequestCoverArt += (o, e) => Serilog.Log.Logger.Debug("Event fired {@DebugInfo}", new { Name = nameof(RequestCoverArt) });
+            TitleDiscovered += (o, e) => Serilog.Log.Logger.Debug("Event fired {@DebugInfo}", new { Name = nameof(TitleDiscovered), Title = e });
+            AuthorsDiscovered += (o, e) => Serilog.Log.Logger.Debug("Event fired {@DebugInfo}", new { Name = nameof(AuthorsDiscovered), Authors = e });
+            NarratorsDiscovered += (o, e) => Serilog.Log.Logger.Debug("Event fired {@DebugInfo}", new { Name = nameof(NarratorsDiscovered), Narrators = e });
+            CoverImageDiscovered += (o, e) => Serilog.Log.Logger.Debug("Event fired {@DebugInfo}", new { Name = nameof(CoverImageDiscovered), CoverImageBytes = e?.Length });
+
+            StreamingBegin += (o, e) => Serilog.Log.Logger.Information("Event fired {@DebugInfo}", new { Name = nameof(StreamingBegin), Message = e });
+            StreamingCompleted += (o, e) => Serilog.Log.Logger.Information("Event fired {@DebugInfo}", new { Name = nameof(StreamingCompleted), Message = e });
+
+            Begin += (o, e) => Serilog.Log.Logger.Information("Event fired {@DebugInfo}", new { Name = nameof(Begin), Book = e.LogFriendly() });
+            Completed += (o, e) => Serilog.Log.Logger.Information("Event fired {@DebugInfo}", new { Name = nameof(Completed), Book = e.LogFriendly() });
+        }
+
+		private long fileSize;
 		private string Mp3FileName(string m4bPath) => m4bPath is null ? string.Empty : PathLib.ReplaceExtension(m4bPath, ".mp3");
 
         public void Cancel() => m4bBook?.Cancel();

FileLiberator/DownloadDecryptBook.cs

@@ -15,7 +15,6 @@ namespace FileLiberator
 {
     public class DownloadDecryptBook : IAudioDecodable
     {
-
         private AaxcDownloadConverter aaxcDownloader;
 
         public event EventHandler<TimeSpan> StreamingTimeRemaining;
@@ -31,6 +30,21 @@ namespace FileLiberator
         public event EventHandler<string> StatusUpdate;
         public event EventHandler<LibraryBook> Completed;
 
+        public DownloadDecryptBook()
+        {
+            RequestCoverArt += (o, e) => Serilog.Log.Logger.Debug("Event fired {@DebugInfo}", new { Name = nameof(RequestCoverArt) });
+            TitleDiscovered += (o, e) => Serilog.Log.Logger.Debug("Event fired {@DebugInfo}", new { Name = nameof(TitleDiscovered), Title = e });
+            AuthorsDiscovered += (o, e) => Serilog.Log.Logger.Debug("Event fired {@DebugInfo}", new { Name = nameof(AuthorsDiscovered), Authors = e });
+            NarratorsDiscovered += (o, e) => Serilog.Log.Logger.Debug("Event fired {@DebugInfo}", new { Name = nameof(NarratorsDiscovered), Narrators = e });
+            CoverImageDiscovered += (o, e) => Serilog.Log.Logger.Debug("Event fired {@DebugInfo}", new { Name = nameof(CoverImageDiscovered), CoverImageBytes = e?.Length });
+
+            StreamingBegin += (o, e) => Serilog.Log.Logger.Information("Event fired {@DebugInfo}", new { Name = nameof(StreamingBegin), Message = e });
+            StreamingCompleted += (o, e) => Serilog.Log.Logger.Information("Event fired {@DebugInfo}", new { Name = nameof(StreamingCompleted), Message = e });
+
+            Begin += (o, e) => Serilog.Log.Logger.Information("Event fired {@DebugInfo}", new { Name = nameof(Begin), Book = e.LogFriendly() });
+            Completed += (o, e) => Serilog.Log.Logger.Information("Event fired {@DebugInfo}", new { Name = nameof(Completed), Book = e.LogFriendly() });
+        }
+
         public async Task<StatusHandler> ProcessAsync(LibraryBook libraryBook)
         {
             Begin?.Invoke(this, libraryBook);
@@ -70,8 +84,7 @@ namespace FileLiberator
             {
                 validate(libraryBook);
 
-                var api = await InternalUtilities.AudibleApiActions.GetApiAsync(libraryBook.Account, libraryBook.Book.Locale);
-
+                var api = await libraryBook.GetApiAsync();
                 var contentLic = await api.GetDownloadLicenseAsync(libraryBook.Book.AudibleProductId);
 
                 var aaxcDecryptDlLic = new DownloadLicense
@@ -79,7 +92,7 @@ namespace FileLiberator
                     contentLic?.ContentMetadata?.ContentUrl?.OfflineUrl,
                     contentLic?.Voucher?.Key,
                     contentLic?.Voucher?.Iv,
-                    Resources.UserAgent
+                    Resources.USER_AGENT
                     );
 
                 if (Configuration.Instance.AllowLibationFixup)

FileLiberator/DownloadFile.cs

@@ -13,6 +13,12 @@ namespace FileLiberator
 		public event EventHandler<string> StreamingCompleted;
 		public event EventHandler<TimeSpan> StreamingTimeRemaining;
 
+		public DownloadFile()
+		{
+			StreamingBegin += (o, e) => Serilog.Log.Logger.Information("Event fired {@DebugInfo}", new { Name = nameof(StreamingBegin), Message = e });
+			StreamingCompleted += (o, e) => Serilog.Log.Logger.Information("Event fired {@DebugInfo}", new { Name = nameof(StreamingCompleted), Message = e });
+		}
+
 		public async Task<string> PerformDownloadFileAsync(string downloadUrl, string proposedDownloadFilePath)
 		{
 			var client = new HttpClient();

FileLiberator/DownloadPdf.cs

@@ -17,6 +17,15 @@ namespace FileLiberator
 			=> !string.IsNullOrWhiteSpace(getdownloadUrl(libraryBook))
 			&& !libraryBook.Book.PDF_Exists;
 
+		public DownloadPdf()
+		{
+			StreamingBegin += (o, e) => Serilog.Log.Logger.Information("Event fired {@DebugInfo}", new { Name = nameof(StreamingBegin), Message = e });
+			StreamingCompleted += (o, e) => Serilog.Log.Logger.Information("Event fired {@DebugInfo}", new { Name = nameof(StreamingCompleted), Message = e });
+
+			Begin += (o, e) => Serilog.Log.Logger.Information("Event fired {@DebugInfo}", new { Name = nameof(Begin), Book = e.LogFriendly() });
+			Completed += (o, e) => Serilog.Log.Logger.Information("Event fired {@DebugInfo}", new { Name = nameof(Completed), Book = e.LogFriendly() });
+		}
+
 		public override async Task<StatusHandler> ProcessItemAsync(LibraryBook libraryBook)
 		{
 			var proposedDownloadFilePath = getProposedDownloadFilePath(libraryBook);
@@ -50,7 +59,7 @@ namespace FileLiberator
 
 		private async Task<string> downloadPdfAsync(LibraryBook libraryBook, string proposedDownloadFilePath)
 		{
-			var api = await GetApiAsync(libraryBook);
+			var api = await libraryBook.GetApiAsync();
 			var downloadUrl = await api.GetPdfDownloadLinkAsync(libraryBook.Book.AudibleProductId);
 
 			var client = new HttpClient();

FileLiberator/DownloadableBase.cs

@@ -40,9 +40,6 @@ namespace FileLiberator
             }
         }
 
-		protected static Task<AudibleApi.Api> GetApiAsync(LibraryBook libraryBook)
-			=> InternalUtilities.AudibleApiActions.GetApiAsync(libraryBook.Account, libraryBook.Book.Locale);
-
 		protected async Task<string> PerformDownloadAsync(string proposedDownloadFilePath, Func<Progress<DownloadProgress>, Task<string>> func)
 		{
 			var progress = new Progress<DownloadProgress>();

FileLiberator/UtilityExtensions.cs

@@ -0,0 +1,26 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using DataLayer;
+using Dinah.Core;
+
+namespace FileLiberator
+{
+	public static class UtilityExtensions
+	{
+		public static (string id, string title, string locale, string account) LogFriendly(this LibraryBook libraryBook)
+			=> (
+			id: libraryBook.Book.AudibleProductId,
+			title: libraryBook.Book.Title,
+			locale: libraryBook.Book.Locale,
+			account: libraryBook.Account.ToMask()
+			);
+
+		public static async Task<AudibleApi.Api> GetApiAsync(this LibraryBook libraryBook)
+		{
+			var apiExtended = await InternalUtilities.ApiExtended.CreateAsync(libraryBook.Account, libraryBook.Book.Locale);
+			return apiExtended.Api;
+		}
+	}
+}

FileManager/Configuration.cs

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

FileManager/FileManager.csproj

@@ -5,9 +5,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Dinah.Core" Version="1.0.5.2" />
+    <PackageReference Include="Dinah.Core" Version="1.1.0.1" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="5.0.0" />
-    <PackageReference Include="Octokit" Version="0.50.0" />
     <PackageReference Include="Polly" Version="7.2.2" />
   </ItemGroup>
 

FileManager/PersistentDictionary.cs

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

InternalUtilities/ApiExtended.cs

@@ -10,36 +10,95 @@ using Polly.Retry;
 
 namespace InternalUtilities
 {
-	public static class AudibleApiActions
+	/// <summary>USE THIS from within Libation. It wraps the call with correct JSONPath</summary>
+	public class ApiExtended
 	{
-		/// <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)
+		public Api Api { get; private set; }
+
+		private ApiExtended(Api api) => Api = api;
+
+		/// <summary>Get api from existing tokens else login with 'eager' choice. External browser url is provided. Response can be external browser login or continuing with native api callbacks.</summary>
+		public static async Task<ApiExtended> CreateAsync(Account account, ILoginChoiceEager loginChoiceEager)
 		{
-			Serilog.Log.Logger.Information("GetApiAsync. {@DebugInfo}", new
+			Serilog.Log.Logger.Information("{@DebugInfo}", new
+			{
+				LoginType = nameof(ILoginChoiceEager),
+				Account = account?.MaskedLogEntry ?? "[null]",
+				LocaleName = account?.Locale?.Name
+			});
+
+			var api = await EzApiCreator.GetApiAsync(
+				loginChoiceEager,
+				account.Locale,
+				AudibleApiStorage.AccountsSettingsFile,
+				account.GetIdentityTokensJsonPath());
+			return new ApiExtended(api);
+		}
+
+		/// <summary>Get api from existing tokens else login with native api callbacks.</summary>
+		public static async Task<ApiExtended> CreateAsync(Account account, ILoginCallback loginCallback)
+		{
+			Serilog.Log.Logger.Information("{@DebugInfo}", new
+			{
+				LoginType = nameof(ILoginCallback),
+				Account = account?.MaskedLogEntry ?? "[null]",
+				LocaleName = account?.Locale?.Name
+			});
+
+			var api = await EzApiCreator.GetApiAsync(
+				loginCallback,
+				account.Locale,
+				AudibleApiStorage.AccountsSettingsFile,
+				account.GetIdentityTokensJsonPath());
+			return new ApiExtended(api);
+		}
+
+		/// <summary>Get api from existing tokens else login with external browser</summary>
+		public static async Task<ApiExtended> CreateAsync(Account account, ILoginExternal loginExternal)
+		{
+			Serilog.Log.Logger.Information("{@DebugInfo}", new
+			{
+				LoginType = nameof(ILoginExternal),
+				Account = account?.MaskedLogEntry ?? "[null]",
+				LocaleName = account?.Locale?.Name
+			});
+
+			var api = await EzApiCreator.GetApiAsync(
+				loginExternal,
+				account.Locale,
+				AudibleApiStorage.AccountsSettingsFile,
+				account.GetIdentityTokensJsonPath());
+			return new ApiExtended(api);
+		}
+
+		/// <summary>Get api from existing tokens. Assumes you have valid login tokens. Else exception</summary>
+		public static async Task<ApiExtended> CreateAsync(Account account)
+		{
+			ArgumentValidator.EnsureNotNull(account, nameof(account));
+			ArgumentValidator.EnsureNotNull(account.Locale, nameof(account.Locale));
+
+			Serilog.Log.Logger.Information("{@DebugInfo}", new
+			{
+				AccountMaskedLogEntry = account.MaskedLogEntry
+			});
+
+			return await CreateAsync(account.AccountId, account.Locale.Name);
+		}
+
+		/// <summary>Get api from existing tokens. Assumes you have valid login tokens. Else exception</summary>
+		public static async Task<ApiExtended> CreateAsync(string username, string localeName)
+		{
+			Serilog.Log.Logger.Information("{@DebugInfo}", new
 			{
 				Username = username.ToMask(),
 				LocaleName = localeName,
 			});
-			return EzApiCreator.GetApiAsync(
-				Localization.Get(localeName),
-				AudibleApiStorage.AccountsSettingsFile,
-				AudibleApiStorage.GetIdentityTokensJsonPath(username, localeName),
-				loginCallback);
-		}
 
-		/// <summary>USE THIS from within Libation. It wraps the call with correct JSONPath</summary>
-		public static Task<Api> GetApiAsync(ILoginCallback loginCallback, Account account)
-		{
-			Serilog.Log.Logger.Information("GetApiAsync. {@DebugInfo}", new
-			{
-				Account = account?.MaskedLogEntry ?? "[null]",
-				LocaleName = account?.Locale?.Name
-			});
-			return EzApiCreator.GetApiAsync(
-				account.Locale,
-				AudibleApiStorage.AccountsSettingsFile,
-				account.GetIdentityTokensJsonPath(),
-				loginCallback);
+			var api = await EzApiCreator.GetApiAsync(
+					Localization.Get(localeName),
+					AudibleApiStorage.AccountsSettingsFile,
+					AudibleApiStorage.GetIdentityTokensJsonPath(username, localeName));
+			return new ApiExtended(api);
 		}
 
 		private static AsyncRetryPolicy policy { get; }
@@ -47,24 +106,33 @@ namespace InternalUtilities
 			// 2 retries == 3 total
 			.RetryAsync(2);
 
-		public static Task<List<Item>> GetLibraryValidatedAsync(Api api, LibraryOptions.ResponseGroupOptions responseGroups = LibraryOptions.ResponseGroupOptions.ALL_OPTIONS)
+		public Task<List<Item>> GetLibraryValidatedAsync(LibraryOptions.ResponseGroupOptions responseGroups = LibraryOptions.ResponseGroupOptions.ALL_OPTIONS)
 		{
 			// bug on audible's side. the 1st time after a long absence, a query to get library will return without titles or authors. a subsequent identical query will be successful. this is true whether or tokens are refreshed
 			// worse, this 1st dummy call doesn't seem to help:
 			//    var page = await api.GetLibraryAsync(new AudibleApi.LibraryOptions { NumberOfResultPerPage = 1, PageNumber = 1, PurchasedAfter = DateTime.Now.AddYears(-20), ResponseGroups = AudibleApi.LibraryOptions.ResponseGroupOptions.ALL_OPTIONS });
 			// i don't want to incur the cost of making a full dummy call every time because it fails sometimes
-			return policy.ExecuteAsync(() => getItemsAsync(api, responseGroups));
+			return policy.ExecuteAsync(() => getItemsAsync(responseGroups));
 		}
 
-		private static async Task<List<Item>> getItemsAsync(Api api, LibraryOptions.ResponseGroupOptions responseGroups)
+		private async Task<List<Item>> getItemsAsync(LibraryOptions.ResponseGroupOptions responseGroups)
 		{
-			var items = await api.GetAllLibraryItemsAsync(responseGroups);
+			var items = new List<Item>();
 #if DEBUG
-//var itemsDebug = items.Select(i => i.ToJson()).Aggregate((a, b) => $"{a}\r\n\r\n{b}");
-//System.IO.File.WriteAllText("library.json", itemsDebug);
+//// this will not work for multi accounts
+//var library_json = "library.json";
+//if (System.IO.File.Exists(library_json))
+//{
+//    items = AudibleApi.Common.Converter.FromJson<List<Item>>(System.IO.File.ReadAllText(library_json));
+//}
+#endif
+			if (!items.Any())
+				items = await Api.GetAllLibraryItemsAsync(responseGroups);
+#if DEBUG
+//System.IO.File.WriteAllText("library.json", AudibleApi.Common.Converter.ToJson(items));
 #endif
 
-			await manageEpisodesAsync(api, items);
+			await manageEpisodesAsync(items);
 
 			var validators = new List<IValidator>();
 			validators.AddRange(getValidators());
@@ -79,7 +147,7 @@ namespace InternalUtilities
 		}
 
 		#region episodes and podcasts
-		private static async Task manageEpisodesAsync(Api api, List<Item> items)
+		private async Task manageEpisodesAsync(List<Item> items)
 		{
 			// add podcasts and episodes to list. If fail, don't let it de-rail the rest of the import
 			try
@@ -101,7 +169,7 @@ namespace InternalUtilities
 				items.RemoveAll(i => i.IsEpisodes);
 
 				// add children
-				var children = await getEpisodesAsync(api, parents);
+				var children = await getEpisodesAsync(parents);
 				Serilog.Log.Logger.Information($"{children.Count} episodes of shows/podcasts found");
 				items.AddRange(children);
 			}
@@ -111,13 +179,13 @@ namespace InternalUtilities
 			}
 		}
 
-		private static async Task<List<Item>> getEpisodesAsync(Api api, List<Item> parents)
+		private async Task<List<Item>> getEpisodesAsync(List<Item> parents)
 		{
 			var results = new List<Item>();
 
 			foreach (var parent in parents)
 			{
-				var children = await getEpisodeChildrenAsync(api, parent);
+				var children = await getEpisodeChildrenAsync(parent);
 
 				foreach (var child in children)
 				{
@@ -150,7 +218,7 @@ namespace InternalUtilities
 			return results;
 		}
 
-		private static async Task<List<Item>> getEpisodeChildrenAsync(Api api, Item parent)
+		private async Task<List<Item>> getEpisodeChildrenAsync(Item parent)
 		{
 			var childrenIds = parent.Relationships
 				.Where(r => r.RelationshipToProduct == RelationshipToProduct.Child && r.RelationshipType == RelationshipType.Episode)
@@ -171,7 +239,7 @@ namespace InternalUtilities
 				List<Item> childrenBatch;
 				try
 				{
-					childrenBatch = await api.GetCatalogProductsAsync(idBatch, CatalogOptions.ResponseGroupOptions.ALL_OPTIONS);
+					childrenBatch = await Api.GetCatalogProductsAsync(idBatch, CatalogOptions.ResponseGroupOptions.ALL_OPTIONS);
 #if DEBUG
 //var childrenBatchDebug = childrenBatch.Select(i => i.ToJson()).Aggregate((a, b) => $"{a}\r\n\r\n{b}");
 //System.IO.File.WriteAllText($"children of {parent.Asin}.json", childrenBatchDebug);
@@ -213,7 +281,7 @@ namespace InternalUtilities
 
 			return results;
 		}
-#endregion
+		#endregion
 
 		private static List<IValidator> getValidators()
 		{

InternalUtilities/AudibleApiValidators.cs

@@ -33,8 +33,10 @@ namespace InternalUtilities
 
 			if (items.Any(i => string.IsNullOrWhiteSpace(i.ProductId)))
 				exceptions.Add(new ArgumentException($"Collection contains item(s) with blank {nameof(Item.ProductId)}", nameof(items)));
-			if (items.Any(i => string.IsNullOrWhiteSpace(i.Title)))
-				exceptions.Add(new ArgumentException($"Collection contains item(s) with blank {nameof(Item.Title)}", nameof(items)));
+
+			// this can happen with podcast episodes
+			foreach (var i in items.Where(i => string.IsNullOrWhiteSpace(i.Title)))
+				i.Title = "[blank title]";
 
 			return exceptions;
 		}
@@ -76,9 +78,9 @@ namespace InternalUtilities
 
 			var distinct = items.GetSeriesDistinct();
 			if (distinct.Any(s => s.SeriesId is null))
-				exceptions.Add(new ArgumentException($"Collection contains {nameof(Item.Series)} with null {nameof(AudibleApi.Common.Series.SeriesId)}", nameof(items)));
+				exceptions.Add(new ArgumentException($"Collection contains {nameof(Item.Series)} with null {nameof(Series.SeriesId)}", nameof(items)));
 			if (distinct.Any(s => s.SeriesName is null))
-				exceptions.Add(new ArgumentException($"Collection contains {nameof(Item.Series)} with null {nameof(AudibleApi.Common.Series.SeriesName)}", nameof(items)));
+				exceptions.Add(new ArgumentException($"Collection contains {nameof(Item.Series)} with null {nameof(Series.SeriesName)}", nameof(items)));
 
 			return exceptions;
 		}

InternalUtilities/InternalUtilities.csproj

@@ -5,7 +5,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="AudibleApi" Version="1.1.1.1" />
+    <PackageReference Include="AudibleApi" Version="2.1.1.1" />
   </ItemGroup>
 
   <ItemGroup>

Libation.sln

@@ -36,13 +36,14 @@ EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibationSearchEngine", "LibationSearchEngine\LibationSearchEngine.csproj", "{2E1F5DB4-40CC-4804-A893-5DCE0193E598}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibationWinForms", "LibationWinForms\LibationWinForms.csproj", "{635F00E1-AAD1-45F7-BEB7-D909AD33B9F6}"
+	ProjectSection(ProjectDependencies) = postProject
+		{428163C3-D558-4914-B570-A92069521877} = {428163C3-D558-4914-B570-A92069521877}
+	EndProjectSection
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DtoImporterService", "DtoImporterService\DtoImporterService.csproj", "{401865F5-1942-4713-B230-04544C0A97B0}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ApplicationServices", "ApplicationServices\ApplicationServices.csproj", "{B95650EA-25F0-449E-BA5D-99126BC5D730}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibationLauncher", "LibationLauncher\LibationLauncher.csproj", "{F3B04A3A-20C8-4582-A54A-715AF6A5D859}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "_Tests", "_Tests", "{67E66E82-5532-4440-AFB3-9FB1DF9DEF53}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "InternalUtilities.Tests", "_Tests\InternalUtilities.Tests\InternalUtilities.Tests.csproj", "{8447C956-B03E-4F59-9DD4-877793B849D9}"
@@ -51,6 +52,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibationSearchEngine.Tests"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Hoopla", "Hoopla\Hoopla.csproj", "{D8F56E5A-3E65-41A6-B7E7-C4515A264B1F}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibationCli", "LibationCli\LibationCli.csproj", "{428163C3-D558-4914-B570-A92069521877}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AppScaffolding", "AppScaffolding\AppScaffolding.csproj", "{595E7C4D-506D-486D-98B7-5FDDF398D033}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -93,10 +98,6 @@ Global
 		{B95650EA-25F0-449E-BA5D-99126BC5D730}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{B95650EA-25F0-449E-BA5D-99126BC5D730}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{B95650EA-25F0-449E-BA5D-99126BC5D730}.Release|Any CPU.Build.0 = Release|Any CPU
-		{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
@@ -109,6 +110,14 @@ Global
 		{D8F56E5A-3E65-41A6-B7E7-C4515A264B1F}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{D8F56E5A-3E65-41A6-B7E7-C4515A264B1F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D8F56E5A-3E65-41A6-B7E7-C4515A264B1F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{428163C3-D558-4914-B570-A92069521877}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{428163C3-D558-4914-B570-A92069521877}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{428163C3-D558-4914-B570-A92069521877}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{428163C3-D558-4914-B570-A92069521877}.Release|Any CPU.Build.0 = Release|Any CPU
+		{595E7C4D-506D-486D-98B7-5FDDF398D033}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{595E7C4D-506D-486D-98B7-5FDDF398D033}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{595E7C4D-506D-486D-98B7-5FDDF398D033}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{595E7C4D-506D-486D-98B7-5FDDF398D033}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -123,10 +132,11 @@ Global
 		{635F00E1-AAD1-45F7-BEB7-D909AD33B9F6} = {8679CAC8-9164-4007-BDD2-F004810EDA14}
 		{401865F5-1942-4713-B230-04544C0A97B0} = {41CDCC73-9B81-49DD-9570-C54406E852AF}
 		{B95650EA-25F0-449E-BA5D-99126BC5D730} = {41CDCC73-9B81-49DD-9570-C54406E852AF}
-		{F3B04A3A-20C8-4582-A54A-715AF6A5D859} = {8679CAC8-9164-4007-BDD2-F004810EDA14}
 		{8447C956-B03E-4F59-9DD4-877793B849D9} = {67E66E82-5532-4440-AFB3-9FB1DF9DEF53}
 		{C5B21768-C7C9-4FCB-AC1E-187B223D5A98} = {67E66E82-5532-4440-AFB3-9FB1DF9DEF53}
 		{D8F56E5A-3E65-41A6-B7E7-C4515A264B1F} = {7FBBB086-0807-4998-85BF-6D1A49C8AD05}
+		{428163C3-D558-4914-B570-A92069521877} = {8679CAC8-9164-4007-BDD2-F004810EDA14}
+		{595E7C4D-506D-486D-98B7-5FDDF398D033} = {8679CAC8-9164-4007-BDD2-F004810EDA14}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {615E00ED-BAEF-4E8E-A92A-9B82D87942A9}

LibationCli/LibationCli.csproj

@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>net5.0</TargetFramework>
+
+    <PublishTrimmed>true</PublishTrimmed>
+    <PublishReadyToRun>true</PublishReadyToRun>
+    <RuntimeIdentifier>win-x64</RuntimeIdentifier>
+    <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
+    <AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
+  </PropertyGroup>
+
+  <!--
+  When LibationWinForms and LibationCli output to the same dir, LibationCli must build before LibationWinForms
+  
+  VS > rt-clik solution > Project Build Order...
+  Dependencies [tab]
+  Projects: LibationWinForms
+  manually check LibationCli
+  -->
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+    <OutputPath>..\LibationWinForms\bin\Debug</OutputPath>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
+    <OutputPath>..\LibationWinForms\bin\Release</OutputPath>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="CommandLineParser" Version="2.8.0" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\ApplicationServices\ApplicationServices.csproj" />
+    <ProjectReference Include="..\AppScaffolding\AppScaffolding.csproj" />
+    <ProjectReference Include="..\FileLiberator\FileLiberator.csproj" />
+  </ItemGroup>
+
+</Project>

LibationCli/Options/ConvertOptions.cs

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

LibationCli/Options/ExportOptions.cs

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

LibationCli/Options/LiberateOptions.cs

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

LibationCli/Options/ScanOptions.cs

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

LibationCli/Options/_OptionsBase.cs

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

LibationCli/Options/_ProcessableOptionsBase.cs

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

LibationCli/Program.cs

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

LibationCli/Setup.cs

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

LibationLauncher/LibationLauncher.csproj

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

LibationLauncher/Program.cs

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

LibationWinForms/AsyncNotifyPropertyChanged.cs

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

LibationWinForms/BookLiberation/AudioConvertForm.cs

@@ -1,10 +1,17 @@
 using DataLayer;
+using FileManager;
 using System;
 
 namespace LibationWinForms.BookLiberation
 {
 	class AudioConvertForm : AudioDecodeForm
 	{
+		public AudioConvertForm()
+		{
+			this.Load += (_, _) => this.RestoreSizeAndLocation(Configuration.Instance);
+			this.FormClosing += (_, _) => this.SaveSizeAndLocation(Configuration.Instance);
+		}
+
 		#region AudioDecodeForm overrides
 		public override string DecodeActionName => "Converting";
 		#endregion

LibationWinForms/BookLiberation/AudioDecodeForm.cs

@@ -1,8 +1,8 @@
-using DataLayer;
+using System;
+using DataLayer;
 using Dinah.Core.Net.Http;
-using Dinah.Core.Windows.Forms;
+using Dinah.Core.Threading;
 using LibationWinForms.BookLiberation.BaseForms;
-using System;
 
 namespace LibationWinForms.BookLiberation
 {
@@ -47,7 +47,7 @@ namespace LibationWinForms.BookLiberation
 			if (downloadProgress.ProgressPercentage == 0)
 				updateRemainingTime(0);
 			else
-				progressBar1.UIThread(() => progressBar1.Value = (int)downloadProgress.ProgressPercentage);
+				progressBar1.UIThreadAsync(() => progressBar1.Value = (int)downloadProgress.ProgressPercentage);
 		}
 
 		public override void OnStreamingTimeRemaining(object sender, TimeSpan timeRemaining)
@@ -61,7 +61,7 @@ namespace LibationWinForms.BookLiberation
 
 		public override void OnTitleDiscovered(object sender, string title)
 		{
-			this.UIThread(() => this.Text = DecodeActionName + " " + title);
+			this.UIThreadAsync(() => this.Text = DecodeActionName + " " + title);
 			this.title = title;
 			updateBookInfo();
 		}
@@ -79,14 +79,14 @@ namespace LibationWinForms.BookLiberation
 		}
 
 		public override void OnCoverImageDiscovered(object sender, byte[] coverArt) 
-			=> pictureBox1.UIThread(() => pictureBox1.Image = Dinah.Core.Drawing.ImageReader.ToImage(coverArt));
+			=> pictureBox1.UIThreadAsync(() => pictureBox1.Image = Dinah.Core.Drawing.ImageReader.ToImage(coverArt));
 		#endregion
 
 		// thread-safe UI updates
 		private void updateBookInfo()
-			=> bookInfoLbl.UIThread(() => bookInfoLbl.Text = $"{title}\r\nBy {authorNames}\r\nNarrated by {narratorNames}");
+			=> bookInfoLbl.UIThreadAsync(() => bookInfoLbl.Text = $"{title}\r\nBy {authorNames}\r\nNarrated by {narratorNames}");
 
 		private void updateRemainingTime(int remaining)
-			=> remainingTimeLbl.UIThread(() => remainingTimeLbl.Text = $"ETA:\r\n{remaining} sec");
+			=> remainingTimeLbl.UIThreadAsync(() => remainingTimeLbl.Text = $"ETA:\r\n{remaining} sec");
 	}
 }

LibationWinForms/BookLiberation/AudioDecryptForm.cs

@@ -1,10 +1,17 @@
 using DataLayer;
+using FileManager;
 using System;
 
 namespace LibationWinForms.BookLiberation
 {
 	class AudioDecryptForm : AudioDecodeForm
 	{
+		public AudioDecryptForm()
+		{
+			this.Load += (_, _) => this.RestoreSizeAndLocation(Configuration.Instance);
+			this.FormClosing += (_, _) => this.SaveSizeAndLocation(Configuration.Instance);
+		}
+
 		#region AudioDecodeForm overrides
 		public override string DecodeActionName => "Decrypting";
 		#endregion

LibationWinForms/BookLiberation/AutomatedBackupsForm.cs

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

LibationWinForms/BookLiberation/BaseForms/LiberationBaseForm.cs

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

LibationWinForms/BookLiberation/DownloadForm.cs

@@ -1,9 +1,8 @@
-using Dinah.Core.Net.Http;
-using Dinah.Core.Windows.Forms;
-using LibationWinForms.BookLiberation.BaseForms;
-using System;
-using System.Linq;
+using System;
 using System.Windows.Forms;
+using Dinah.Core.Net.Http;
+using Dinah.Core.Threading;
+using LibationWinForms.BookLiberation.BaseForms;
 
 namespace LibationWinForms.BookLiberation
 {
@@ -21,7 +20,7 @@ namespace LibationWinForms.BookLiberation
 		#region IStreamable event handler overrides
 		public override void OnStreamingBegin(object sender, string beginString)
 		{
-			filenameLbl.UIThread(() => filenameLbl.Text = beginString);
+			filenameLbl.UIThreadAsync(() => filenameLbl.Text = beginString);
 		}
 		public override void OnStreamingProgressChanged(object sender, DownloadProgress downloadProgress)
 		{
@@ -29,11 +28,11 @@ namespace LibationWinForms.BookLiberation
 			if (!downloadProgress.TotalBytesToReceive.HasValue || downloadProgress.TotalBytesToReceive.Value <= 0)
 				return;
 
-			progressLbl.UIThread(() => progressLbl.Text = $"{downloadProgress.BytesReceived:#,##0} of {downloadProgress.TotalBytesToReceive.Value:#,##0}");
+			progressLbl.UIThreadAsync(() => progressLbl.Text = $"{downloadProgress.BytesReceived:#,##0} of {downloadProgress.TotalBytesToReceive.Value:#,##0}");
 
 			var d = double.Parse(downloadProgress.BytesReceived.ToString()) / double.Parse(downloadProgress.TotalBytesToReceive.Value.ToString()) * 100.0;
 			var i = int.Parse(Math.Truncate(d).ToString());
-			progressBar1.UIThread(() => progressBar1.Value = i);
+			progressBar1.UIThreadAsync(() => progressBar1.Value = i);
 
 			lastDownloadProgress = DateTime.Now;
 		}
@@ -50,14 +49,14 @@ namespace LibationWinForms.BookLiberation
 		private void timer_Tick(object sender, EventArgs e)
 		{
 			// if no update in the last 30 seconds, display frozen label
-			lastUpdateLbl.UIThread(() => lastUpdateLbl.Visible = lastDownloadProgress.AddSeconds(30) < DateTime.Now);
+			lastUpdateLbl.UIThreadAsync(() => lastUpdateLbl.Visible = lastDownloadProgress.AddSeconds(30) < DateTime.Now);
 			if (lastUpdateLbl.Visible)
 			{
 				var diff = DateTime.Now - lastDownloadProgress;
 				var min = (int)diff.TotalMinutes;
 				var minText = min > 0 ? $"{min}min " : "";
 
-				lastUpdateLbl.UIThread(() => lastUpdateLbl.Text = $"Frozen? Last download activity: {minText}{diff.Seconds}sec ago");
+				lastUpdateLbl.UIThreadAsync(() => lastUpdateLbl.Text = $"Frozen? Last download activity: {minText}{diff.Seconds}sec ago");
 			}
 		}
 		private void DownloadForm_FormClosing(object sender, FormClosingEventArgs e) => timer.Stop();

LibationWinForms/BookLiberation/ProcessorAutomationController.cs

@@ -196,8 +196,6 @@ namespace LibationWinForms.BookLiberation
 
 		protected async Task<bool> ProcessOneAsync(LibraryBook libraryBook, bool validate)
 		{
-			string logMessage;
-
 			try
 			{
 				var statusHandler = await Processable.ProcessSingleAsync(libraryBook, validate);
@@ -207,18 +205,28 @@ namespace LibationWinForms.BookLiberation
 
 				foreach (var errorMessage in statusHandler.Errors)
 					LogMe.Error(errorMessage);
-
-				logMessage = statusHandler.Errors.Aggregate((a, b) => $"{a}\r\n{b}");
 			}
 			catch (Exception ex)
 			{
 				LogMe.Error(ex);
-
-				logMessage = ex.Message + "\r\n|\r\n" + ex.StackTrace;
 			}
 
+			return showRetry(libraryBook);
+		}
+
+		private bool showRetry(LibraryBook libraryBook)
+		{
 			LogMe.Error("ERROR. All books have not been processed. Most recent book: processing failed");
 
+			DialogResult? dialogResult = FileManager.Configuration.Instance.BadBook switch
+			{
+				FileManager.Configuration.BadBookAction.Abort => DialogResult.Abort,
+				FileManager.Configuration.BadBookAction.Retry => DialogResult.Retry,
+				FileManager.Configuration.BadBookAction.Ignore => DialogResult.Ignore,
+				FileManager.Configuration.BadBookAction.Ask => null,
+				_ => null
+			};
+
 			string details;
 			try
 			{
@@ -238,7 +246,8 @@ $@"  Title: {libraryBook.Book.Title}
 				details = "[Error retrieving details]";
 			}
 
-			var dialogResult = MessageBox.Show(string.Format(SkipDialogText, details), "Skip importing this book?", SkipDialogButtons, MessageBoxIcon.Question, SkipDialogDefaultButton);
+			// if null then ask user
+			dialogResult ??= MessageBox.Show(string.Format(SkipDialogText + "\r\n\r\nSee Settings to avoid this box in the future.", details), "Skip importing this book?", SkipDialogButtons, MessageBoxIcon.Question, SkipDialogDefaultButton);
 
 			if (dialogResult == DialogResult.Abort)
 				return false;
@@ -288,7 +297,7 @@ An error occurred while trying to process this book. Skip this book permanently?
 An error occurred while trying to process this book.
 {0}
 
-- ABORT: stop processing books.
+- ABORT: Stop processing books.
 
 - RETRY: retry this book later. Just skip it for now. Continue processing books. (Will try this book again later.)
 

LibationWinForms/Dialogs/IndexLibraryDialog.cs

@@ -32,7 +32,7 @@ namespace LibationWinForms.Dialogs
 
 				try
 				{
-					(TotalBooksProcessed, NewBooksAdded) = await LibraryCommands.ImportAccountAsync((account) => new WinformResponder(account), _accounts);
+					(TotalBooksProcessed, NewBooksAdded) = await LibraryCommands.ImportAccountAsync((account) => ApiExtended.CreateAsync(account, new WinformLoginChoiceEager(account)), _accounts);
 				}
 				catch (Exception ex)
 				{

LibationWinForms/Dialogs/Login/LoginCallbackDialog.Designer.cs

@@ -1,6 +1,6 @@
 namespace LibationWinForms.Dialogs.Login
 {
-	partial class AudibleLoginDialog
+	partial class LoginCallbackDialog
 	{
 		/// <summary>
 		/// Required designer variable.
@@ -38,25 +38,29 @@
 			// passwordLbl
 			// 
 			this.passwordLbl.AutoSize = true;
-			this.passwordLbl.Location = new System.Drawing.Point(12, 41);
+			this.passwordLbl.Location = new System.Drawing.Point(14, 47);
+			this.passwordLbl.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
 			this.passwordLbl.Name = "passwordLbl";
-			this.passwordLbl.Size = new System.Drawing.Size(53, 13);
+			this.passwordLbl.Size = new System.Drawing.Size(57, 15);
 			this.passwordLbl.TabIndex = 2;
 			this.passwordLbl.Text = "Password";
 			// 
 			// passwordTb
 			// 
-			this.passwordTb.Location = new System.Drawing.Point(71, 38);
+			this.passwordTb.Location = new System.Drawing.Point(83, 44);
+			this.passwordTb.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
 			this.passwordTb.Name = "passwordTb";
 			this.passwordTb.PasswordChar = '*';
-			this.passwordTb.Size = new System.Drawing.Size(200, 20);
+			this.passwordTb.Size = new System.Drawing.Size(233, 23);
 			this.passwordTb.TabIndex = 3;
 			// 
 			// submitBtn
 			// 
-			this.submitBtn.Location = new System.Drawing.Point(196, 64);
+			this.submitBtn.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+			this.submitBtn.Location = new System.Drawing.Point(229, 74);
+			this.submitBtn.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
 			this.submitBtn.Name = "submitBtn";
-			this.submitBtn.Size = new System.Drawing.Size(75, 23);
+			this.submitBtn.Size = new System.Drawing.Size(88, 27);
 			this.submitBtn.TabIndex = 4;
 			this.submitBtn.Text = "Submit";
 			this.submitBtn.UseVisualStyleBackColor = true;
@@ -65,36 +69,39 @@
 			// localeLbl
 			// 
 			this.localeLbl.AutoSize = true;
-			this.localeLbl.Location = new System.Drawing.Point(12, 9);
+			this.localeLbl.Location = new System.Drawing.Point(14, 10);
+			this.localeLbl.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
 			this.localeLbl.Name = "localeLbl";
-			this.localeLbl.Size = new System.Drawing.Size(59, 13);
+			this.localeLbl.Size = new System.Drawing.Size(61, 15);
 			this.localeLbl.TabIndex = 0;
 			this.localeLbl.Text = "Locale: {0}";
 			// 
 			// usernameLbl
 			// 
 			this.usernameLbl.AutoSize = true;
-			this.usernameLbl.Location = new System.Drawing.Point(12, 22);
+			this.usernameLbl.Location = new System.Drawing.Point(14, 25);
+			this.usernameLbl.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
 			this.usernameLbl.Name = "usernameLbl";
-			this.usernameLbl.Size = new System.Drawing.Size(75, 13);
+			this.usernameLbl.Size = new System.Drawing.Size(80, 15);
 			this.usernameLbl.TabIndex = 1;
 			this.usernameLbl.Text = "Username: {0}";
 			// 
-			// AudibleLoginDialog
+			// LoginCallbackDialog
 			// 
 			this.AcceptButton = this.submitBtn;
-			this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+			this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
 			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-			this.ClientSize = new System.Drawing.Size(283, 99);
+			this.ClientSize = new System.Drawing.Size(330, 114);
 			this.Controls.Add(this.usernameLbl);
 			this.Controls.Add(this.localeLbl);
 			this.Controls.Add(this.submitBtn);
 			this.Controls.Add(this.passwordLbl);
 			this.Controls.Add(this.passwordTb);
 			this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
+			this.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
 			this.MaximizeBox = false;
 			this.MinimizeBox = false;
-			this.Name = "AudibleLoginDialog";
+			this.Name = "LoginCallbackDialog";
 			this.ShowIcon = false;
 			this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
 			this.Text = "Audible Login";

LibationWinForms/Dialogs/Login/LoginCallbackDialog.cs

@@ -1,28 +1,25 @@
-using Dinah.Core;
-using InternalUtilities;
-using System;
-using System.Linq;
+using System;
 using System.Windows.Forms;
+using Dinah.Core;
+using InternalUtilities;
 
 namespace LibationWinForms.Dialogs.Login
 {
-	public partial class AudibleLoginDialog : Form
+	public partial class LoginCallbackDialog : Form
 	{
-		private string locale { get; }
 		private string accountId { get; }
 
 		public string Email { get; private set; }
 		public string Password { get; private set; }
 
-		public AudibleLoginDialog(Account account)
+		public LoginCallbackDialog(Account account)
 		{
 			InitializeComponent();
 
-			locale = account.Locale.Name;
 			accountId = account.AccountId;
 
 			// do not allow user to change login id here. if they do then jsonpath will fail
-			this.localeLbl.Text = string.Format(this.localeLbl.Text, locale);
+			this.localeLbl.Text = string.Format(this.localeLbl.Text, account.Locale.Name);
 			this.usernameLbl.Text = string.Format(this.usernameLbl.Text, accountId);
 		}
 

LibationWinForms/Dialogs/Login/LoginCallbackDialog.resx

@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
+<root>
   <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
     <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
     <xsd:element name="root" msdata:IsDataSet="true">

LibationWinForms/Dialogs/Login/LoginChoiceEagerDialog.Designer.cs

@@ -0,0 +1,161 @@
+namespace LibationWinForms.Dialogs.Login
+{
+	partial class LoginChoiceEagerDialog
+	{
+		/// <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.passwordLbl = new System.Windows.Forms.Label();
+			this.passwordTb = new System.Windows.Forms.TextBox();
+			this.submitBtn = new System.Windows.Forms.Button();
+			this.localeLbl = new System.Windows.Forms.Label();
+			this.usernameLbl = new System.Windows.Forms.Label();
+			this.externalLoginLink = new System.Windows.Forms.LinkLabel();
+			this.externalLoginLbl2 = new System.Windows.Forms.Label();
+			this.externalLoginLbl1 = new System.Windows.Forms.Label();
+			this.SuspendLayout();
+			// 
+			// passwordLbl
+			// 
+			this.passwordLbl.AutoSize = true;
+			this.passwordLbl.Location = new System.Drawing.Point(14, 47);
+			this.passwordLbl.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+			this.passwordLbl.Name = "passwordLbl";
+			this.passwordLbl.Size = new System.Drawing.Size(57, 15);
+			this.passwordLbl.TabIndex = 2;
+			this.passwordLbl.Text = "Password";
+			// 
+			// passwordTb
+			// 
+			this.passwordTb.Location = new System.Drawing.Point(83, 44);
+			this.passwordTb.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
+			this.passwordTb.Name = "passwordTb";
+			this.passwordTb.PasswordChar = '*';
+			this.passwordTb.Size = new System.Drawing.Size(233, 23);
+			this.passwordTb.TabIndex = 3;
+			// 
+			// submitBtn
+			// 
+			this.submitBtn.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+			this.submitBtn.Location = new System.Drawing.Point(293, 176);
+			this.submitBtn.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
+			this.submitBtn.Name = "submitBtn";
+			this.submitBtn.Size = new System.Drawing.Size(88, 27);
+			this.submitBtn.TabIndex = 7;
+			this.submitBtn.Text = "Submit";
+			this.submitBtn.UseVisualStyleBackColor = true;
+			this.submitBtn.Click += new System.EventHandler(this.submitBtn_Click);
+			// 
+			// localeLbl
+			// 
+			this.localeLbl.AutoSize = true;
+			this.localeLbl.Location = new System.Drawing.Point(14, 10);
+			this.localeLbl.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+			this.localeLbl.Name = "localeLbl";
+			this.localeLbl.Size = new System.Drawing.Size(61, 15);
+			this.localeLbl.TabIndex = 0;
+			this.localeLbl.Text = "Locale: {0}";
+			// 
+			// usernameLbl
+			// 
+			this.usernameLbl.AutoSize = true;
+			this.usernameLbl.Location = new System.Drawing.Point(14, 25);
+			this.usernameLbl.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+			this.usernameLbl.Name = "usernameLbl";
+			this.usernameLbl.Size = new System.Drawing.Size(80, 15);
+			this.usernameLbl.TabIndex = 1;
+			this.usernameLbl.Text = "Username: {0}";
+			// 
+			// externalLoginLink
+			// 
+			this.externalLoginLink.AutoSize = true;
+			this.externalLoginLink.Location = new System.Drawing.Point(14, 93);
+			this.externalLoginLink.Name = "externalLoginLink";
+			this.externalLoginLink.Size = new System.Drawing.Size(107, 15);
+			this.externalLoginLink.TabIndex = 4;
+			this.externalLoginLink.TabStop = true;
+			this.externalLoginLink.Text = "Or click here to log";
+			this.externalLoginLink.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.externalLoginLink_LinkClicked);
+			// 
+			// externalLoginLbl2
+			// 
+			this.externalLoginLbl2.AutoSize = true;
+			this.externalLoginLbl2.Location = new System.Drawing.Point(14, 108);
+			this.externalLoginLbl2.Name = "externalLoginLbl2";
+			this.externalLoginLbl2.Size = new System.Drawing.Size(352, 45);
+			this.externalLoginLbl2.TabIndex = 6;
+			this.externalLoginLbl2.Text = "This more advanced login is recommended if you\'re experiencing\r\nerrors logging in" +
+    " the conventional way above or if you\'re not\r\ncomfortable typing your password h" +
+    "ere.";
+			// 
+			// externalLoginLbl1
+			// 
+			this.externalLoginLbl1.AutoSize = true;
+			this.externalLoginLbl1.Location = new System.Drawing.Point(83, 93);
+			this.externalLoginLbl1.Name = "externalLoginLbl1";
+			this.externalLoginLbl1.Size = new System.Drawing.Size(158, 15);
+			this.externalLoginLbl1.TabIndex = 5;
+			this.externalLoginLbl1.Text = "to log in using your browser.";
+			// 
+			// LoginChoiceEagerDialog
+			// 
+			this.AcceptButton = this.submitBtn;
+			this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
+			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+			this.ClientSize = new System.Drawing.Size(394, 216);
+			this.Controls.Add(this.externalLoginLbl2);
+			this.Controls.Add(this.externalLoginLbl1);
+			this.Controls.Add(this.externalLoginLink);
+			this.Controls.Add(this.usernameLbl);
+			this.Controls.Add(this.localeLbl);
+			this.Controls.Add(this.submitBtn);
+			this.Controls.Add(this.passwordLbl);
+			this.Controls.Add(this.passwordTb);
+			this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
+			this.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
+			this.MaximizeBox = false;
+			this.MinimizeBox = false;
+			this.Name = "LoginChoiceEagerDialog";
+			this.ShowIcon = false;
+			this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
+			this.Text = "Audible Login";
+			this.ResumeLayout(false);
+			this.PerformLayout();
+
+		}
+
+		#endregion
+
+		private System.Windows.Forms.Label passwordLbl;
+		private System.Windows.Forms.TextBox passwordTb;
+		private System.Windows.Forms.Button submitBtn;
+		private System.Windows.Forms.Label localeLbl;
+		private System.Windows.Forms.Label usernameLbl;
+		private System.Windows.Forms.LinkLabel externalLoginLink;
+		private System.Windows.Forms.Label externalLoginLbl2;
+		private System.Windows.Forms.Label externalLoginLbl1;
+	}
+}

LibationWinForms/Dialogs/Login/LoginChoiceEagerDialog.cs

@@ -0,0 +1,47 @@
+using System;
+using System.Windows.Forms;
+using Dinah.Core;
+using InternalUtilities;
+
+namespace LibationWinForms.Dialogs.Login
+{
+	public partial class LoginChoiceEagerDialog : Form
+	{
+		private string accountId { get; }
+
+		public AudibleApi.LoginMethod LoginMethod { get; private set; }
+
+		public string Email { get; private set; }
+		public string Password { get; private set; }
+
+		public LoginChoiceEagerDialog(Account account)
+		{
+			InitializeComponent();
+
+			accountId = account.AccountId;
+
+			// do not allow user to change login id here. if they do then jsonpath will fail
+			this.localeLbl.Text = string.Format(this.localeLbl.Text, account.Locale.Name);
+			this.usernameLbl.Text = string.Format(this.usernameLbl.Text, accountId);
+		}
+
+		private void externalLoginLink_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
+		{
+			LoginMethod = AudibleApi.LoginMethod.External;
+			DialogResult = DialogResult.OK;
+			this.Close();
+		}
+
+		private void submitBtn_Click(object sender, EventArgs e)
+		{
+			Email = accountId;
+			Password = this.passwordTb.Text;
+
+			Serilog.Log.Logger.Information("Submit button clicked: {@DebugInfo}", new { email = Email?.ToMask(), passwordLength = Password.Length });
+
+			LoginMethod = AudibleApi.LoginMethod.Api;
+			DialogResult = DialogResult.OK;
+			// Close() not needed for AcceptButton
+		}
+	}
+}

LibationWinForms/Dialogs/Login/LoginChoiceEagerDialog.resx

@@ -0,0 +1,60 @@
+<root>
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>

LibationWinForms/Dialogs/Login/LoginExternalDialog.Designer.cs

@@ -0,0 +1,179 @@
+namespace LibationWinForms.Dialogs.Login
+{
+	partial class LoginExternalDialog
+	{
+		/// <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(LoginExternalDialog));
+			this.submitBtn = new System.Windows.Forms.Button();
+			this.localeLbl = new System.Windows.Forms.Label();
+			this.usernameLbl = new System.Windows.Forms.Label();
+			this.loginUrlLbl = new System.Windows.Forms.Label();
+			this.loginUrlTb = new System.Windows.Forms.TextBox();
+			this.copyBtn = new System.Windows.Forms.Button();
+			this.launchBrowserBtn = new System.Windows.Forms.Button();
+			this.instructionsLbl = new System.Windows.Forms.Label();
+			this.responseUrlTb = new System.Windows.Forms.TextBox();
+			this.SuspendLayout();
+			// 
+			// submitBtn
+			// 
+			this.submitBtn.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+			this.submitBtn.Location = new System.Drawing.Point(665, 400);
+			this.submitBtn.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
+			this.submitBtn.Name = "submitBtn";
+			this.submitBtn.Size = new System.Drawing.Size(88, 27);
+			this.submitBtn.TabIndex = 8;
+			this.submitBtn.Text = "Submit";
+			this.submitBtn.UseVisualStyleBackColor = true;
+			this.submitBtn.Click += new System.EventHandler(this.submitBtn_Click);
+			// 
+			// localeLbl
+			// 
+			this.localeLbl.AutoSize = true;
+			this.localeLbl.Location = new System.Drawing.Point(14, 10);
+			this.localeLbl.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+			this.localeLbl.Name = "localeLbl";
+			this.localeLbl.Size = new System.Drawing.Size(61, 15);
+			this.localeLbl.TabIndex = 0;
+			this.localeLbl.Text = "Locale: {0}";
+			// 
+			// usernameLbl
+			// 
+			this.usernameLbl.AutoSize = true;
+			this.usernameLbl.Location = new System.Drawing.Point(14, 25);
+			this.usernameLbl.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+			this.usernameLbl.Name = "usernameLbl";
+			this.usernameLbl.Size = new System.Drawing.Size(80, 15);
+			this.usernameLbl.TabIndex = 1;
+			this.usernameLbl.Text = "Username: {0}";
+			// 
+			// loginUrlLbl
+			// 
+			this.loginUrlLbl.AutoSize = true;
+			this.loginUrlLbl.Location = new System.Drawing.Point(14, 61);
+			this.loginUrlLbl.Name = "loginUrlLbl";
+			this.loginUrlLbl.Size = new System.Drawing.Size(180, 15);
+			this.loginUrlLbl.TabIndex = 2;
+			this.loginUrlLbl.Text = "Paste this URL into your browser:";
+			// 
+			// loginUrlTb
+			// 
+			this.loginUrlTb.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.loginUrlTb.Location = new System.Drawing.Point(14, 79);
+			this.loginUrlTb.Multiline = true;
+			this.loginUrlTb.Name = "loginUrlTb";
+			this.loginUrlTb.ReadOnly = true;
+			this.loginUrlTb.ScrollBars = System.Windows.Forms.ScrollBars.Both;
+			this.loginUrlTb.Size = new System.Drawing.Size(739, 92);
+			this.loginUrlTb.TabIndex = 3;
+			// 
+			// copyBtn
+			// 
+			this.copyBtn.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+			this.copyBtn.Location = new System.Drawing.Point(14, 177);
+			this.copyBtn.Name = "copyBtn";
+			this.copyBtn.Size = new System.Drawing.Size(165, 23);
+			this.copyBtn.TabIndex = 4;
+			this.copyBtn.Text = "Copy URL to clipboard";
+			this.copyBtn.UseVisualStyleBackColor = true;
+			this.copyBtn.Click += new System.EventHandler(this.copyBtn_Click);
+			// 
+			// launchBrowserBtn
+			// 
+			this.launchBrowserBtn.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+			this.launchBrowserBtn.Location = new System.Drawing.Point(588, 177);
+			this.launchBrowserBtn.Name = "launchBrowserBtn";
+			this.launchBrowserBtn.Size = new System.Drawing.Size(165, 23);
+			this.launchBrowserBtn.TabIndex = 5;
+			this.launchBrowserBtn.Text = "Launch in browser";
+			this.launchBrowserBtn.UseVisualStyleBackColor = true;
+			this.launchBrowserBtn.Click += new System.EventHandler(this.launchBrowserBtn_Click);
+			// 
+			// instructionsLbl
+			// 
+			this.instructionsLbl.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+			this.instructionsLbl.AutoSize = true;
+			this.instructionsLbl.Location = new System.Drawing.Point(14, 203);
+			this.instructionsLbl.Name = "instructionsLbl";
+			this.instructionsLbl.Size = new System.Drawing.Size(436, 90);
+			this.instructionsLbl.TabIndex = 6;
+			this.instructionsLbl.Text = resources.GetString("instructionsLbl.Text");
+			// 
+			// responseUrlTb
+			// 
+			this.responseUrlTb.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+			this.responseUrlTb.Location = new System.Drawing.Point(14, 296);
+			this.responseUrlTb.Multiline = true;
+			this.responseUrlTb.Name = "responseUrlTb";
+			this.responseUrlTb.ScrollBars = System.Windows.Forms.ScrollBars.Both;
+			this.responseUrlTb.Size = new System.Drawing.Size(739, 98);
+			this.responseUrlTb.TabIndex = 7;
+			// 
+			// LoginExternalDialog
+			// 
+			this.AcceptButton = this.submitBtn;
+			this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
+			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+			this.ClientSize = new System.Drawing.Size(766, 440);
+			this.Controls.Add(this.responseUrlTb);
+			this.Controls.Add(this.instructionsLbl);
+			this.Controls.Add(this.launchBrowserBtn);
+			this.Controls.Add(this.copyBtn);
+			this.Controls.Add(this.loginUrlTb);
+			this.Controls.Add(this.loginUrlLbl);
+			this.Controls.Add(this.usernameLbl);
+			this.Controls.Add(this.localeLbl);
+			this.Controls.Add(this.submitBtn);
+			this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
+			this.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
+			this.MaximizeBox = false;
+			this.MinimizeBox = false;
+			this.Name = "LoginExternalDialog";
+			this.ShowIcon = false;
+			this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
+			this.Text = "Audible External Login";
+			this.ResumeLayout(false);
+			this.PerformLayout();
+
+		}
+
+		#endregion
+		private System.Windows.Forms.Button submitBtn;
+		private System.Windows.Forms.Label localeLbl;
+		private System.Windows.Forms.Label usernameLbl;
+		private System.Windows.Forms.Label loginUrlLbl;
+		private System.Windows.Forms.TextBox loginUrlTb;
+		private System.Windows.Forms.Button copyBtn;
+		private System.Windows.Forms.Button launchBrowserBtn;
+		private System.Windows.Forms.Label instructionsLbl;
+		private System.Windows.Forms.TextBox responseUrlTb;
+	}
+}

LibationWinForms/Dialogs/Login/LoginExternalDialog.cs

@@ -0,0 +1,42 @@
+using System;
+using System.Windows.Forms;
+using Dinah.Core;
+using InternalUtilities;
+
+namespace LibationWinForms.Dialogs.Login
+{
+	public partial class LoginExternalDialog : Form
+	{
+		public string ResponseUrl { get; private set; }
+
+		public LoginExternalDialog(Account account, string loginUrl)
+		{
+			InitializeComponent();
+
+			// do not allow user to change login id here. if they do then jsonpath will fail
+			this.localeLbl.Text = string.Format(this.localeLbl.Text, account.Locale.Name);
+			this.usernameLbl.Text = string.Format(this.usernameLbl.Text, account.AccountId);
+
+			this.loginUrlTb.Text = loginUrl;
+		}
+
+		private void copyBtn_Click(object sender, EventArgs e) => Clipboard.SetText(this.loginUrlTb.Text);
+
+		private void launchBrowserBtn_Click(object sender, EventArgs e) => Go.To.Url(this.loginUrlTb.Text);
+
+		private void submitBtn_Click(object sender, EventArgs e)
+		{
+			ResponseUrl = this.responseUrlTb.Text?.Trim();
+
+			Serilog.Log.Logger.Information("Submit button clicked: {@DebugInfo}", new { ResponseUrl });
+			if (!Uri.TryCreate(ResponseUrl, UriKind.Absolute, out var result))
+			{
+				MessageBox.Show("Invalid response URL");
+				return;
+			}
+
+			DialogResult = DialogResult.OK;
+			// Close() not needed for AcceptButton
+		}
+	}
+}

LibationWinForms/Dialogs/Login/LoginExternalDialog.resx

@@ -0,0 +1,68 @@
+<root>
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="instructionsLbl.Text" xml:space="preserve">
+    <value>Login with your Amazon/Audible credentials.
+After login is complete, your browser will show you an error page similar to:
+     Looking for Something?
+     We're sorry. The Web address you entered is not a functioning page on our site
+Don't worry -- this is ACTUALLY A SUCCESSFUL LOGIN.
+Copy the current url from your browser's address bar and paste it here:</value>
+  </data>
+</root>

LibationWinForms/Dialogs/Login/WinformLoginBase.cs

@@ -0,0 +1,15 @@
+using System;
+
+namespace LibationWinForms.Dialogs.Login
+{
+	public abstract class WinformLoginBase
+	{
+		/// <returns>True if ShowDialog's DialogResult == OK</returns>
+		protected static bool ShowDialog(System.Windows.Forms.Form dialog)
+		{
+			var result = dialog.ShowDialog();
+			Serilog.Log.Logger.Debug("{@DebugInfo}", new { DialogResult = result });
+			return result == System.Windows.Forms.DialogResult.OK;
+		}
+	}
+}

LibationWinForms/Dialogs/Login/WinformLoginCallback.cs

@@ -1,16 +1,15 @@
-using AudibleApi;
+using System;
+using AudibleApi;
 using InternalUtilities;
 using LibationWinForms.Dialogs.Login;
-using System;
-using System.Linq;
 
 namespace LibationWinForms.Login
 {
-	public class WinformResponder : ILoginCallback
+	public class WinformLoginCallback : WinformLoginBase, ILoginCallback
 	{
 		private Account _account { get; }
 
-		public WinformResponder(Account account)
+		public WinformLoginCallback(Account account)
 		{
 			_account = Dinah.Core.ArgumentValidator.EnsureNotNull(account, nameof(account));
 		}
@@ -18,7 +17,7 @@ namespace LibationWinForms.Login
 		public string Get2faCode()
 		{
 			using var dialog = new _2faCodeDialog();
-			if (showDialog(dialog))
+			if (ShowDialog(dialog))
 				return dialog.Code;
 			return null;
 		}
@@ -26,7 +25,7 @@ namespace LibationWinForms.Login
 		public string GetCaptchaAnswer(byte[] captchaImage)
 		{
 			using var dialog = new CaptchaDialog(captchaImage);
-			if (showDialog(dialog))
+			if (ShowDialog(dialog))
 				return dialog.Answer;
 			return null;
 		}
@@ -34,15 +33,15 @@ namespace LibationWinForms.Login
 		public (string name, string value) GetMfaChoice(MfaConfig mfaConfig)
 		{
 			using var dialog = new MfaDialog(mfaConfig);
-			if (showDialog(dialog))
+			if (ShowDialog(dialog))
 				return (dialog.SelectedName, dialog.SelectedValue);
 			return (null, null);
 		}
 
 		public (string email, string password) GetLogin()
 		{
-			using var dialog = new AudibleLoginDialog(_account);
-			if (showDialog(dialog))
+			using var dialog = new LoginCallbackDialog(_account);
+			if (ShowDialog(dialog))
 				return (dialog.Email, dialog.Password);
 			return (null, null);
 		}
@@ -50,15 +49,7 @@ namespace LibationWinForms.Login
 		public void ShowApprovalNeeded()
 		{
 			using var dialog = new ApprovalNeededDialog();
-			showDialog(dialog);
-		}
-
-		/// <returns>True if ShowDialog's DialogResult == OK</returns>
-		private static bool showDialog(System.Windows.Forms.Form dialog)
-		{
-			var result = dialog.ShowDialog();
-			Serilog.Log.Logger.Debug("{@DebugInfo}", new { DialogResult = result });
-			return result == System.Windows.Forms.DialogResult.OK;
+			ShowDialog(dialog);
 		}
 	}
 }

LibationWinForms/Dialogs/Login/WinformLoginChoiceEager.cs

@@ -0,0 +1,43 @@
+using System;
+using AudibleApi;
+using InternalUtilities;
+using LibationWinForms.Dialogs.Login;
+
+namespace LibationWinForms.Login
+{
+	public class WinformLoginChoiceEager : WinformLoginBase, ILoginChoiceEager
+	{
+		public ILoginCallback LoginCallback { get; private set; }
+
+		private Account _account { get; }
+
+		public WinformLoginChoiceEager(Account account)
+		{
+			_account = Dinah.Core.ArgumentValidator.EnsureNotNull(account, nameof(account));
+			LoginCallback = new WinformLoginCallback(_account);
+		}
+
+		public ChoiceOut Start(ChoiceIn choiceIn)
+		{
+			using var dialog = new LoginChoiceEagerDialog(_account);
+
+			if (!ShowDialog(dialog))
+				return null;
+
+			switch (dialog.LoginMethod)
+			{
+				case LoginMethod.Api:
+					return ChoiceOut.WithApi(dialog.Email, dialog.Password);
+				case LoginMethod.External:
+				{
+					using var externalDialog = new LoginExternalDialog(_account, choiceIn.LoginUrl);
+					return ShowDialog(externalDialog)
+						? ChoiceOut.External(externalDialog.ResponseUrl)
+						: null;
+				}
+				default:
+					throw new Exception($"Unknown {nameof(LoginMethod)} value");
+			}
+		}
+	}
+}

LibationWinForms/Dialogs/RemoveBooksDialog.Designer.cs

@@ -29,147 +29,147 @@ namespace LibationWinForms.Dialogs
         /// </summary>
         private void InitializeComponent()
         {
-            this.components = new System.ComponentModel.Container();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
-            this._dataGridView = new System.Windows.Forms.DataGridView();
-            this.removeDataGridViewCheckBoxColumn = new System.Windows.Forms.DataGridViewCheckBoxColumn();
-            this.coverDataGridViewImageColumn = new System.Windows.Forms.DataGridViewImageColumn();
-            this.titleDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.authorsDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.miscDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.purchaseDateGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.gridEntryBindingSource = new System.Windows.Forms.BindingSource(this.components);
-            this.btnRemoveBooks = new System.Windows.Forms.Button();
-            this.label1 = new System.Windows.Forms.Label();
-            ((System.ComponentModel.ISupportInitialize)(this._dataGridView)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.gridEntryBindingSource)).BeginInit();
-            this.SuspendLayout();
-            // 
-            // _dataGridView
-            // 
-            this._dataGridView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+			this.components = new System.ComponentModel.Container();
+			System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
+			this._dataGridView = new System.Windows.Forms.DataGridView();
+			this.removeDataGridViewCheckBoxColumn = new System.Windows.Forms.DataGridViewCheckBoxColumn();
+			this.coverDataGridViewImageColumn = new System.Windows.Forms.DataGridViewImageColumn();
+			this.titleDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.authorsDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.miscDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.purchaseDateGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.gridEntryBindingSource = new System.Windows.Forms.BindingSource(this.components);
+			this.btnRemoveBooks = new System.Windows.Forms.Button();
+			this.label1 = new System.Windows.Forms.Label();
+			((System.ComponentModel.ISupportInitialize)(this._dataGridView)).BeginInit();
+			((System.ComponentModel.ISupportInitialize)(this.gridEntryBindingSource)).BeginInit();
+			this.SuspendLayout();
+			// 
+			// _dataGridView
+			// 
+			this._dataGridView.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._dataGridView.AutoGenerateColumns = false;
-            this._dataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
-            this._dataGridView.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
+			this._dataGridView.AutoGenerateColumns = false;
+			this._dataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+			this._dataGridView.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
             this.removeDataGridViewCheckBoxColumn,
             this.coverDataGridViewImageColumn,
             this.titleDataGridViewTextBoxColumn,
             this.authorsDataGridViewTextBoxColumn,
             this.miscDataGridViewTextBoxColumn,
             this.purchaseDateGridViewTextBoxColumn});
-            this._dataGridView.DataSource = this.gridEntryBindingSource;
-            dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
-            dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Window;
-            dataGridViewCellStyle2.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point);
-            dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.ControlText;
-            dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this._dataGridView.DefaultCellStyle = dataGridViewCellStyle2;
-            this._dataGridView.Location = new System.Drawing.Point(0, 0);
-            this._dataGridView.Name = "_dataGridView";
-            this._dataGridView.RowHeadersVisible = false;
-            this._dataGridView.RowTemplate.Height = 82;
-            this._dataGridView.Size = new System.Drawing.Size(800, 409);
-            this._dataGridView.TabIndex = 0;
-            // 
-            // removeDataGridViewCheckBoxColumn
-            // 
-            this.removeDataGridViewCheckBoxColumn.DataPropertyName = "Remove";
-            this.removeDataGridViewCheckBoxColumn.FalseValue = "False";
-            this.removeDataGridViewCheckBoxColumn.Frozen = true;
-            this.removeDataGridViewCheckBoxColumn.HeaderText = "Remove";
-            this.removeDataGridViewCheckBoxColumn.MinimumWidth = 60;
-            this.removeDataGridViewCheckBoxColumn.Name = "removeDataGridViewCheckBoxColumn";
-            this.removeDataGridViewCheckBoxColumn.Resizable = System.Windows.Forms.DataGridViewTriState.False;
-            this.removeDataGridViewCheckBoxColumn.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
-            this.removeDataGridViewCheckBoxColumn.TrueValue = "True";
-            this.removeDataGridViewCheckBoxColumn.Width = 60;
-            // 
-            // coverDataGridViewImageColumn
-            // 
-            this.coverDataGridViewImageColumn.DataPropertyName = "Cover";
-            this.coverDataGridViewImageColumn.HeaderText = "Cover";
-            this.coverDataGridViewImageColumn.MinimumWidth = 80;
-            this.coverDataGridViewImageColumn.Name = "coverDataGridViewImageColumn";
-            this.coverDataGridViewImageColumn.ReadOnly = true;
-            this.coverDataGridViewImageColumn.Resizable = System.Windows.Forms.DataGridViewTriState.False;
-            this.coverDataGridViewImageColumn.Width = 80;
-            // 
-            // titleDataGridViewTextBoxColumn
-            // 
-            this.titleDataGridViewTextBoxColumn.DataPropertyName = "Title";
-            this.titleDataGridViewTextBoxColumn.HeaderText = "Title";
-            this.titleDataGridViewTextBoxColumn.Name = "titleDataGridViewTextBoxColumn";
-            this.titleDataGridViewTextBoxColumn.ReadOnly = true;
-            this.titleDataGridViewTextBoxColumn.Width = 200;
-            // 
-            // authorsDataGridViewTextBoxColumn
-            // 
-            this.authorsDataGridViewTextBoxColumn.DataPropertyName = "Authors";
-            this.authorsDataGridViewTextBoxColumn.HeaderText = "Authors";
-            this.authorsDataGridViewTextBoxColumn.Name = "authorsDataGridViewTextBoxColumn";
-            this.authorsDataGridViewTextBoxColumn.ReadOnly = true;
-            // 
-            // miscDataGridViewTextBoxColumn
-            // 
-            this.miscDataGridViewTextBoxColumn.DataPropertyName = "Misc";
-            this.miscDataGridViewTextBoxColumn.HeaderText = "Misc";
-            this.miscDataGridViewTextBoxColumn.Name = "miscDataGridViewTextBoxColumn";
-            this.miscDataGridViewTextBoxColumn.ReadOnly = true;
-            this.miscDataGridViewTextBoxColumn.Width = 150;
-            // 
-            // purchaseDateGridViewTextBoxColumn
-            // 
-            this.purchaseDateGridViewTextBoxColumn.DataPropertyName = "PurchaseDate";
-            this.purchaseDateGridViewTextBoxColumn.HeaderText = "Purchase Date";
-            this.purchaseDateGridViewTextBoxColumn.Name = "purchaseDateGridViewTextBoxColumn";
-            this.purchaseDateGridViewTextBoxColumn.ReadOnly = true;
-            this.purchaseDateGridViewTextBoxColumn.Resizable = System.Windows.Forms.DataGridViewTriState.False;
-            // 
-            // gridEntryBindingSource
-            // 
-            this.gridEntryBindingSource.AllowNew = false;
-            this.gridEntryBindingSource.DataSource = typeof(LibationWinForms.Dialogs.RemovableGridEntry);
-            // 
-            // btnRemoveBooks
-            // 
-            this.btnRemoveBooks.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.btnRemoveBooks.Location = new System.Drawing.Point(570, 419);
-            this.btnRemoveBooks.Name = "btnRemoveBooks";
-            this.btnRemoveBooks.Size = new System.Drawing.Size(218, 23);
-            this.btnRemoveBooks.TabIndex = 1;
-            this.btnRemoveBooks.Text = "Remove Selected Books from Libation";
-            this.btnRemoveBooks.UseVisualStyleBackColor = true;
-            this.btnRemoveBooks.Click += new System.EventHandler(this.btnRemoveBooks_Click);
-            // 
-            // label1
-            // 
-            this.label1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
-            this.label1.AutoSize = true;
-            this.label1.Location = new System.Drawing.Point(12, 423);
-            this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(178, 15);
-            this.label1.TabIndex = 2;
-            this.label1.Text = "{0} book{1} selected for removal.";
-            // 
-            // RemoveBooksDialog
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(800, 450);
-            this.Controls.Add(this.label1);
-            this.Controls.Add(this.btnRemoveBooks);
-            this.Controls.Add(this._dataGridView);
-            this.Name = "RemoveBooksDialog";
-            this.Text = "RemoveBooksDialog";
-            this.Shown += new System.EventHandler(this.RemoveBooksDialog_Shown);
-            ((System.ComponentModel.ISupportInitialize)(this._dataGridView)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.gridEntryBindingSource)).EndInit();
-            this.ResumeLayout(false);
-            this.PerformLayout();
+			this._dataGridView.DataSource = this.gridEntryBindingSource;
+			dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+			dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Window;
+			dataGridViewCellStyle1.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point);
+			dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.ControlText;
+			dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+			dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+			dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+			this._dataGridView.DefaultCellStyle = dataGridViewCellStyle1;
+			this._dataGridView.Location = new System.Drawing.Point(0, 0);
+			this._dataGridView.Name = "_dataGridView";
+			this._dataGridView.RowHeadersVisible = false;
+			this._dataGridView.RowTemplate.Height = 82;
+			this._dataGridView.Size = new System.Drawing.Size(730, 409);
+			this._dataGridView.TabIndex = 0;
+			// 
+			// removeDataGridViewCheckBoxColumn
+			// 
+			this.removeDataGridViewCheckBoxColumn.DataPropertyName = "Remove";
+			this.removeDataGridViewCheckBoxColumn.FalseValue = "False";
+			this.removeDataGridViewCheckBoxColumn.Frozen = true;
+			this.removeDataGridViewCheckBoxColumn.HeaderText = "Remove";
+			this.removeDataGridViewCheckBoxColumn.MinimumWidth = 80;
+			this.removeDataGridViewCheckBoxColumn.Name = "removeDataGridViewCheckBoxColumn";
+			this.removeDataGridViewCheckBoxColumn.Resizable = System.Windows.Forms.DataGridViewTriState.False;
+			this.removeDataGridViewCheckBoxColumn.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
+			this.removeDataGridViewCheckBoxColumn.TrueValue = "True";
+			this.removeDataGridViewCheckBoxColumn.Width = 80;
+			// 
+			// coverDataGridViewImageColumn
+			// 
+			this.coverDataGridViewImageColumn.DataPropertyName = "Cover";
+			this.coverDataGridViewImageColumn.HeaderText = "Cover";
+			this.coverDataGridViewImageColumn.MinimumWidth = 80;
+			this.coverDataGridViewImageColumn.Name = "coverDataGridViewImageColumn";
+			this.coverDataGridViewImageColumn.ReadOnly = true;
+			this.coverDataGridViewImageColumn.Resizable = System.Windows.Forms.DataGridViewTriState.False;
+			this.coverDataGridViewImageColumn.Width = 80;
+			// 
+			// titleDataGridViewTextBoxColumn
+			// 
+			this.titleDataGridViewTextBoxColumn.DataPropertyName = "Title";
+			this.titleDataGridViewTextBoxColumn.HeaderText = "Title";
+			this.titleDataGridViewTextBoxColumn.Name = "titleDataGridViewTextBoxColumn";
+			this.titleDataGridViewTextBoxColumn.ReadOnly = true;
+			this.titleDataGridViewTextBoxColumn.Width = 200;
+			// 
+			// authorsDataGridViewTextBoxColumn
+			// 
+			this.authorsDataGridViewTextBoxColumn.DataPropertyName = "Authors";
+			this.authorsDataGridViewTextBoxColumn.HeaderText = "Authors";
+			this.authorsDataGridViewTextBoxColumn.Name = "authorsDataGridViewTextBoxColumn";
+			this.authorsDataGridViewTextBoxColumn.ReadOnly = true;
+			// 
+			// miscDataGridViewTextBoxColumn
+			// 
+			this.miscDataGridViewTextBoxColumn.DataPropertyName = "Misc";
+			this.miscDataGridViewTextBoxColumn.HeaderText = "Misc";
+			this.miscDataGridViewTextBoxColumn.Name = "miscDataGridViewTextBoxColumn";
+			this.miscDataGridViewTextBoxColumn.ReadOnly = true;
+			this.miscDataGridViewTextBoxColumn.Width = 150;
+			// 
+			// purchaseDateGridViewTextBoxColumn
+			// 
+			this.purchaseDateGridViewTextBoxColumn.DataPropertyName = "PurchaseDate";
+			this.purchaseDateGridViewTextBoxColumn.HeaderText = "Purchase Date";
+			this.purchaseDateGridViewTextBoxColumn.Name = "purchaseDateGridViewTextBoxColumn";
+			this.purchaseDateGridViewTextBoxColumn.ReadOnly = true;
+			this.purchaseDateGridViewTextBoxColumn.Resizable = System.Windows.Forms.DataGridViewTriState.False;
+			// 
+			// gridEntryBindingSource
+			// 
+			this.gridEntryBindingSource.AllowNew = false;
+			this.gridEntryBindingSource.DataSource = typeof(LibationWinForms.Dialogs.RemovableGridEntry);
+			// 
+			// btnRemoveBooks
+			// 
+			this.btnRemoveBooks.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+			this.btnRemoveBooks.Location = new System.Drawing.Point(500, 419);
+			this.btnRemoveBooks.Name = "btnRemoveBooks";
+			this.btnRemoveBooks.Size = new System.Drawing.Size(218, 23);
+			this.btnRemoveBooks.TabIndex = 1;
+			this.btnRemoveBooks.Text = "Remove Selected Books from Libation";
+			this.btnRemoveBooks.UseVisualStyleBackColor = true;
+			this.btnRemoveBooks.Click += new System.EventHandler(this.btnRemoveBooks_Click);
+			// 
+			// label1
+			// 
+			this.label1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+			this.label1.AutoSize = true;
+			this.label1.Location = new System.Drawing.Point(12, 423);
+			this.label1.Name = "label1";
+			this.label1.Size = new System.Drawing.Size(178, 15);
+			this.label1.TabIndex = 2;
+			this.label1.Text = "{0} book{1} selected for removal.";
+			// 
+			// RemoveBooksDialog
+			// 
+			this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
+			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+			this.ClientSize = new System.Drawing.Size(730, 450);
+			this.Controls.Add(this.label1);
+			this.Controls.Add(this.btnRemoveBooks);
+			this.Controls.Add(this._dataGridView);
+			this.Name = "RemoveBooksDialog";
+			this.Text = "RemoveBooksDialog";
+			this.Shown += new System.EventHandler(this.RemoveBooksDialog_Shown);
+			((System.ComponentModel.ISupportInitialize)(this._dataGridView)).EndInit();
+			((System.ComponentModel.ISupportInitialize)(this.gridEntryBindingSource)).EndInit();
+			this.ResumeLayout(false);
+			this.PerformLayout();
 
         }
 
@@ -179,11 +179,11 @@ namespace LibationWinForms.Dialogs
         private System.Windows.Forms.BindingSource gridEntryBindingSource;
         private System.Windows.Forms.Button btnRemoveBooks;
         private System.Windows.Forms.Label label1;
-        private System.Windows.Forms.DataGridViewCheckBoxColumn removeDataGridViewCheckBoxColumn;
-        private System.Windows.Forms.DataGridViewImageColumn coverDataGridViewImageColumn;
-        private System.Windows.Forms.DataGridViewTextBoxColumn titleDataGridViewTextBoxColumn;
-        private System.Windows.Forms.DataGridViewTextBoxColumn authorsDataGridViewTextBoxColumn;
-        private System.Windows.Forms.DataGridViewTextBoxColumn miscDataGridViewTextBoxColumn;
-        private System.Windows.Forms.DataGridViewTextBoxColumn purchaseDateGridViewTextBoxColumn;
-    }
+		private System.Windows.Forms.DataGridViewCheckBoxColumn removeDataGridViewCheckBoxColumn;
+		private System.Windows.Forms.DataGridViewImageColumn coverDataGridViewImageColumn;
+		private System.Windows.Forms.DataGridViewTextBoxColumn titleDataGridViewTextBoxColumn;
+		private System.Windows.Forms.DataGridViewTextBoxColumn authorsDataGridViewTextBoxColumn;
+		private System.Windows.Forms.DataGridViewTextBoxColumn miscDataGridViewTextBoxColumn;
+		private System.Windows.Forms.DataGridViewTextBoxColumn purchaseDateGridViewTextBoxColumn;
+	}
 }

LibationWinForms/Dialogs/RemoveBooksDialog.cs

@@ -1,6 +1,7 @@
 using ApplicationServices;
 using DataLayer;
 using Dinah.Core.DataBinding;
+using FileManager;
 using InternalUtilities;
 using LibationWinForms.Login;
 using System;
@@ -28,9 +29,14 @@ namespace LibationWinForms.Dialogs
 			_accounts = accounts;
 
 			InitializeComponent();
+
+			this.Load += (_, _) => this.RestoreSizeAndLocation(Configuration.Instance);
+			this.FormClosing += (_, _) => this.SaveSizeAndLocation(Configuration.Instance);
+
 			_labelFormat = label1.Text;
 
-			_dataGridView.CellContentClick += (s, e) => _dataGridView.CommitEdit(DataGridViewDataErrorContexts.Commit);
+			_dataGridView.CellContentClick += (_, _) => _dataGridView.CommitEdit(DataGridViewDataErrorContexts.Commit);
+			_dataGridView.CellValueChanged += (_, _) => UpdateSelection();
 			_dataGridView.BindingContextChanged += _dataGridView_BindingContextChanged;
 
 			var orderedGridEntries = _libraryBooks
@@ -56,9 +62,9 @@ namespace LibationWinForms.Dialogs
 				return;
 			try
 			{
-				var removedBooks = await LibraryCommands.FindInactiveBooks((account) => new WinformResponder(account), _libraryBooks, _accounts);
+				var removedBooks = await LibraryCommands.FindInactiveBooks((account) => ApiExtended.CreateAsync(account, new WinformLoginChoiceEager(account)), _libraryBooks, _accounts);
 
-				var removable = _removableGridEntries.Where(rge => removedBooks.Any(rb => rb.Book.AudibleProductId == rge.AudibleProductId));
+				var removable = _removableGridEntries.Where(rge => removedBooks.Any(rb => rb.Book.AudibleProductId == rge.AudibleProductId)).ToList();
 
 				if (!removable.Any())
 					return;

LibationWinForms/Dialogs/RemoveBooksDialog.resx

@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root> 
+<root>
   <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
     <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
     <xsd:element name="root" msdata:IsDataSet="true">
@@ -58,4 +57,7 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <metadata name="gridEntryBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
 </root>

LibationWinForms/Dialogs/SettingsDialog.Designer.cs

@@ -33,16 +33,24 @@
 			this.saveBtn = new System.Windows.Forms.Button();
 			this.cancelBtn = new System.Windows.Forms.Button();
 			this.advancedSettingsGb = new System.Windows.Forms.GroupBox();
+			this.badBookGb = new System.Windows.Forms.GroupBox();
+			this.badBookIgnoreRb = new System.Windows.Forms.RadioButton();
+			this.badBookRetryRb = new System.Windows.Forms.RadioButton();
+			this.badBookAbortRb = new System.Windows.Forms.RadioButton();
+			this.badBookAskRb = new System.Windows.Forms.RadioButton();
+			this.decryptAndConvertGb = new System.Windows.Forms.GroupBox();
+			this.allowLibationFixupCbox = new System.Windows.Forms.CheckBox();
 			this.convertLossyRb = new System.Windows.Forms.RadioButton();
 			this.convertLosslessRb = new System.Windows.Forms.RadioButton();
 			this.inProgressSelectControl = new LibationWinForms.Dialogs.DirectorySelectControl();
-			this.allowLibationFixupCbox = new System.Windows.Forms.CheckBox();
 			this.logsBtn = new System.Windows.Forms.Button();
 			this.booksSelectControl = new LibationWinForms.Dialogs.DirectoryOrCustomSelectControl();
 			this.booksGb = new System.Windows.Forms.GroupBox();
 			this.loggingLevelLbl = new System.Windows.Forms.Label();
 			this.loggingLevelCb = new System.Windows.Forms.ComboBox();
 			this.advancedSettingsGb.SuspendLayout();
+			this.badBookGb.SuspendLayout();
+			this.decryptAndConvertGb.SuspendLayout();
 			this.booksGb.SuspendLayout();
 			this.SuspendLayout();
 			// 
@@ -53,27 +61,27 @@
 			this.booksLocationDescLbl.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
 			this.booksLocationDescLbl.Name = "booksLocationDescLbl";
 			this.booksLocationDescLbl.Size = new System.Drawing.Size(69, 15);
-			this.booksLocationDescLbl.TabIndex = 2;
+			this.booksLocationDescLbl.TabIndex = 1;
 			this.booksLocationDescLbl.Text = "[book desc]";
 			// 
 			// inProgressDescLbl
 			// 
 			this.inProgressDescLbl.AutoSize = true;
-			this.inProgressDescLbl.Location = new System.Drawing.Point(8, 127);
+			this.inProgressDescLbl.Location = new System.Drawing.Point(8, 149);
 			this.inProgressDescLbl.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
 			this.inProgressDescLbl.Name = "inProgressDescLbl";
 			this.inProgressDescLbl.Size = new System.Drawing.Size(43, 45);
-			this.inProgressDescLbl.TabIndex = 1;
+			this.inProgressDescLbl.TabIndex = 15;
 			this.inProgressDescLbl.Text = "[desc]\r\n[line 2]\r\n[line 3]";
 			// 
 			// 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(714, 419);
+			this.saveBtn.Location = new System.Drawing.Point(714, 445);
 			this.saveBtn.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
 			this.saveBtn.Name = "saveBtn";
 			this.saveBtn.Size = new System.Drawing.Size(88, 27);
-			this.saveBtn.TabIndex = 4;
+			this.saveBtn.TabIndex = 17;
 			this.saveBtn.Text = "Save";
 			this.saveBtn.UseVisualStyleBackColor = true;
 			this.saveBtn.Click += new System.EventHandler(this.saveBtn_Click);
@@ -82,40 +90,122 @@
 			// 
 			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(832, 419);
+			this.cancelBtn.Location = new System.Drawing.Point(832, 445);
 			this.cancelBtn.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
 			this.cancelBtn.Name = "cancelBtn";
 			this.cancelBtn.Size = new System.Drawing.Size(88, 27);
-			this.cancelBtn.TabIndex = 5;
+			this.cancelBtn.TabIndex = 18;
 			this.cancelBtn.Text = "Cancel";
 			this.cancelBtn.UseVisualStyleBackColor = true;
 			this.cancelBtn.Click += new System.EventHandler(this.cancelBtn_Click);
 			// 
 			// advancedSettingsGb
 			// 
-			this.advancedSettingsGb.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+			this.advancedSettingsGb.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.advancedSettingsGb.Controls.Add(this.convertLossyRb);
-			this.advancedSettingsGb.Controls.Add(this.convertLosslessRb);
+			this.advancedSettingsGb.Controls.Add(this.badBookGb);
+			this.advancedSettingsGb.Controls.Add(this.decryptAndConvertGb);
 			this.advancedSettingsGb.Controls.Add(this.inProgressSelectControl);
-			this.advancedSettingsGb.Controls.Add(this.allowLibationFixupCbox);
 			this.advancedSettingsGb.Controls.Add(this.inProgressDescLbl);
 			this.advancedSettingsGb.Location = new System.Drawing.Point(12, 176);
 			this.advancedSettingsGb.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
 			this.advancedSettingsGb.Name = "advancedSettingsGb";
 			this.advancedSettingsGb.Padding = new System.Windows.Forms.Padding(4, 3, 4, 3);
-			this.advancedSettingsGb.Size = new System.Drawing.Size(908, 232);
-			this.advancedSettingsGb.TabIndex = 5;
+			this.advancedSettingsGb.Size = new System.Drawing.Size(908, 258);
+			this.advancedSettingsGb.TabIndex = 6;
 			this.advancedSettingsGb.TabStop = false;
 			this.advancedSettingsGb.Text = "Advanced settings for control freaks";
 			// 
+			// badBookGb
+			// 
+			this.badBookGb.Controls.Add(this.badBookIgnoreRb);
+			this.badBookGb.Controls.Add(this.badBookRetryRb);
+			this.badBookGb.Controls.Add(this.badBookAbortRb);
+			this.badBookGb.Controls.Add(this.badBookAskRb);
+			this.badBookGb.Location = new System.Drawing.Point(372, 22);
+			this.badBookGb.Name = "badBookGb";
+			this.badBookGb.Size = new System.Drawing.Size(529, 124);
+			this.badBookGb.TabIndex = 11;
+			this.badBookGb.TabStop = false;
+			this.badBookGb.Text = "[bad book desc]";
+			// 
+			// badBookIgnoreRb
+			// 
+			this.badBookIgnoreRb.AutoSize = true;
+			this.badBookIgnoreRb.Location = new System.Drawing.Point(6, 97);
+			this.badBookIgnoreRb.Name = "badBookIgnoreRb";
+			this.badBookIgnoreRb.Size = new System.Drawing.Size(94, 19);
+			this.badBookIgnoreRb.TabIndex = 15;
+			this.badBookIgnoreRb.TabStop = true;
+			this.badBookIgnoreRb.Text = "[ignore desc]";
+			this.badBookIgnoreRb.UseVisualStyleBackColor = true;
+			// 
+			// badBookRetryRb
+			// 
+			this.badBookRetryRb.AutoSize = true;
+			this.badBookRetryRb.Location = new System.Drawing.Point(6, 72);
+			this.badBookRetryRb.Name = "badBookRetryRb";
+			this.badBookRetryRb.Size = new System.Drawing.Size(84, 19);
+			this.badBookRetryRb.TabIndex = 14;
+			this.badBookRetryRb.TabStop = true;
+			this.badBookRetryRb.Text = "[retry desc]";
+			this.badBookRetryRb.UseVisualStyleBackColor = true;
+			// 
+			// badBookAbortRb
+			// 
+			this.badBookAbortRb.AutoSize = true;
+			this.badBookAbortRb.Location = new System.Drawing.Point(6, 47);
+			this.badBookAbortRb.Name = "badBookAbortRb";
+			this.badBookAbortRb.Size = new System.Drawing.Size(88, 19);
+			this.badBookAbortRb.TabIndex = 13;
+			this.badBookAbortRb.TabStop = true;
+			this.badBookAbortRb.Text = "[abort desc]";
+			this.badBookAbortRb.UseVisualStyleBackColor = true;
+			// 
+			// badBookAskRb
+			// 
+			this.badBookAskRb.AutoSize = true;
+			this.badBookAskRb.Location = new System.Drawing.Point(6, 22);
+			this.badBookAskRb.Name = "badBookAskRb";
+			this.badBookAskRb.Size = new System.Drawing.Size(77, 19);
+			this.badBookAskRb.TabIndex = 12;
+			this.badBookAskRb.TabStop = true;
+			this.badBookAskRb.Text = "[ask desc]";
+			this.badBookAskRb.UseVisualStyleBackColor = true;
+			// 
+			// decryptAndConvertGb
+			// 
+			this.decryptAndConvertGb.Controls.Add(this.allowLibationFixupCbox);
+			this.decryptAndConvertGb.Controls.Add(this.convertLossyRb);
+			this.decryptAndConvertGb.Controls.Add(this.convertLosslessRb);
+			this.decryptAndConvertGb.Location = new System.Drawing.Point(7, 22);
+			this.decryptAndConvertGb.Name = "decryptAndConvertGb";
+			this.decryptAndConvertGb.Size = new System.Drawing.Size(359, 124);
+			this.decryptAndConvertGb.TabIndex = 7;
+			this.decryptAndConvertGb.TabStop = false;
+			this.decryptAndConvertGb.Text = "Decrypt and convert";
+			// 
+			// allowLibationFixupCbox
+			// 
+			this.allowLibationFixupCbox.AutoSize = true;
+			this.allowLibationFixupCbox.Checked = true;
+			this.allowLibationFixupCbox.CheckState = System.Windows.Forms.CheckState.Checked;
+			this.allowLibationFixupCbox.Location = new System.Drawing.Point(6, 22);
+			this.allowLibationFixupCbox.Name = "allowLibationFixupCbox";
+			this.allowLibationFixupCbox.Size = new System.Drawing.Size(262, 19);
+			this.allowLibationFixupCbox.TabIndex = 8;
+			this.allowLibationFixupCbox.Text = "Allow Libation to fix up audiobook metadata";
+			this.allowLibationFixupCbox.UseVisualStyleBackColor = true;
+			this.allowLibationFixupCbox.CheckedChanged += new System.EventHandler(this.allowLibationFixupCbox_CheckedChanged);
+			// 
 			// convertLossyRb
 			// 
 			this.convertLossyRb.AutoSize = true;
-			this.convertLossyRb.Location = new System.Drawing.Point(7, 88);
+			this.convertLossyRb.Location = new System.Drawing.Point(6, 81);
 			this.convertLossyRb.Name = "convertLossyRb";
 			this.convertLossyRb.Size = new System.Drawing.Size(242, 19);
-			this.convertLossyRb.TabIndex = 0;
+			this.convertLossyRb.TabIndex = 10;
 			this.convertLossyRb.Text = "Download my books as .MP3 files (Lossy)";
 			this.convertLossyRb.UseVisualStyleBackColor = true;
 			// 
@@ -123,10 +213,10 @@
 			// 
 			this.convertLosslessRb.AutoSize = true;
 			this.convertLosslessRb.Checked = true;
-			this.convertLosslessRb.Location = new System.Drawing.Point(7, 63);
+			this.convertLosslessRb.Location = new System.Drawing.Point(6, 56);
 			this.convertLosslessRb.Name = "convertLosslessRb";
 			this.convertLosslessRb.Size = new System.Drawing.Size(327, 19);
-			this.convertLosslessRb.TabIndex = 0;
+			this.convertLosslessRb.TabIndex = 9;
 			this.convertLosslessRb.TabStop = true;
 			this.convertLosslessRb.Text = "Download my books as .M4B files (Lossless Mp4a format)";
 			this.convertLosslessRb.UseVisualStyleBackColor = true;
@@ -135,30 +225,17 @@
 			// 
 			this.inProgressSelectControl.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
-			this.inProgressSelectControl.Location = new System.Drawing.Point(10, 175);
+			this.inProgressSelectControl.Location = new System.Drawing.Point(7, 197);
 			this.inProgressSelectControl.Name = "inProgressSelectControl";
 			this.inProgressSelectControl.Size = new System.Drawing.Size(552, 52);
-			this.inProgressSelectControl.TabIndex = 2;
-			// 
-			// allowLibationFixupCbox
-			// 
-			this.allowLibationFixupCbox.AutoSize = true;
-			this.allowLibationFixupCbox.Checked = true;
-			this.allowLibationFixupCbox.CheckState = System.Windows.Forms.CheckState.Checked;
-			this.allowLibationFixupCbox.Location = new System.Drawing.Point(7, 22);
-			this.allowLibationFixupCbox.Name = "allowLibationFixupCbox";
-			this.allowLibationFixupCbox.Size = new System.Drawing.Size(262, 19);
-			this.allowLibationFixupCbox.TabIndex = 0;
-			this.allowLibationFixupCbox.Text = "Allow Libation to fix up audiobook metadata";
-			this.allowLibationFixupCbox.UseVisualStyleBackColor = true;
-			this.allowLibationFixupCbox.CheckedChanged += new System.EventHandler(this.allowLibationFixupCbox_CheckedChanged);
+			this.inProgressSelectControl.TabIndex = 16;
 			// 
 			// logsBtn
 			// 
 			this.logsBtn.Location = new System.Drawing.Point(262, 147);
 			this.logsBtn.Name = "logsBtn";
 			this.logsBtn.Size = new System.Drawing.Size(132, 23);
-			this.logsBtn.TabIndex = 4;
+			this.logsBtn.TabIndex = 5;
 			this.logsBtn.Text = "Open log folder";
 			this.logsBtn.UseVisualStyleBackColor = true;
 			this.logsBtn.Click += new System.EventHandler(this.logsBtn_Click);
@@ -170,7 +247,7 @@
 			this.booksSelectControl.Location = new System.Drawing.Point(7, 37);
 			this.booksSelectControl.Name = "booksSelectControl";
 			this.booksSelectControl.Size = new System.Drawing.Size(895, 87);
-			this.booksSelectControl.TabIndex = 1;
+			this.booksSelectControl.TabIndex = 2;
 			// 
 			// booksGb
 			// 
@@ -181,7 +258,7 @@
 			this.booksGb.Location = new System.Drawing.Point(12, 12);
 			this.booksGb.Name = "booksGb";
 			this.booksGb.Size = new System.Drawing.Size(908, 129);
-			this.booksGb.TabIndex = 1;
+			this.booksGb.TabIndex = 0;
 			this.booksGb.TabStop = false;
 			this.booksGb.Text = "Books location";
 			// 
@@ -191,7 +268,7 @@
 			this.loggingLevelLbl.Location = new System.Drawing.Point(12, 150);
 			this.loggingLevelLbl.Name = "loggingLevelLbl";
 			this.loggingLevelLbl.Size = new System.Drawing.Size(78, 15);
-			this.loggingLevelLbl.TabIndex = 2;
+			this.loggingLevelLbl.TabIndex = 3;
 			this.loggingLevelLbl.Text = "Logging level";
 			// 
 			// loggingLevelCb
@@ -201,7 +278,7 @@
 			this.loggingLevelCb.Location = new System.Drawing.Point(96, 147);
 			this.loggingLevelCb.Name = "loggingLevelCb";
 			this.loggingLevelCb.Size = new System.Drawing.Size(129, 23);
-			this.loggingLevelCb.TabIndex = 3;
+			this.loggingLevelCb.TabIndex = 4;
 			// 
 			// SettingsDialog
 			// 
@@ -209,7 +286,7 @@
 			this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
 			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
 			this.CancelButton = this.cancelBtn;
-			this.ClientSize = new System.Drawing.Size(933, 462);
+			this.ClientSize = new System.Drawing.Size(933, 488);
 			this.Controls.Add(this.logsBtn);
 			this.Controls.Add(this.loggingLevelCb);
 			this.Controls.Add(this.loggingLevelLbl);
@@ -225,6 +302,10 @@
 			this.Load += new System.EventHandler(this.SettingsDialog_Load);
 			this.advancedSettingsGb.ResumeLayout(false);
 			this.advancedSettingsGb.PerformLayout();
+			this.badBookGb.ResumeLayout(false);
+			this.badBookGb.PerformLayout();
+			this.decryptAndConvertGb.ResumeLayout(false);
+			this.decryptAndConvertGb.PerformLayout();
 			this.booksGb.ResumeLayout(false);
 			this.booksGb.PerformLayout();
 			this.ResumeLayout(false);
@@ -247,5 +328,11 @@
 		private System.Windows.Forms.Button logsBtn;
 		private System.Windows.Forms.Label loggingLevelLbl;
 		private System.Windows.Forms.ComboBox loggingLevelCb;
+		private System.Windows.Forms.GroupBox decryptAndConvertGb;
+		private System.Windows.Forms.GroupBox badBookGb;
+		private System.Windows.Forms.RadioButton badBookRetryRb;
+		private System.Windows.Forms.RadioButton badBookAbortRb;
+		private System.Windows.Forms.RadioButton badBookAskRb;
+		private System.Windows.Forms.RadioButton badBookIgnoreRb;
 	}
 }

LibationWinForms/Dialogs/SettingsDialog.cs

@@ -56,6 +56,21 @@ namespace LibationWinForms.Dialogs
 				Configuration.KnownDirectories.LibationFiles
 			}, Configuration.KnownDirectories.WinTemp);
 			inProgressSelectControl.SelectDirectory(config.InProgress);
+
+			badBookGb.Text = desc(nameof(config.BadBook));
+			badBookAskRb.Text = Configuration.BadBookAction.Ask.GetDescription();
+			badBookAbortRb.Text = Configuration.BadBookAction.Abort.GetDescription();
+			badBookRetryRb.Text = Configuration.BadBookAction.Retry.GetDescription();
+			badBookIgnoreRb.Text = Configuration.BadBookAction.Ignore.GetDescription();
+			var rb = config.BadBook switch
+			{
+				Configuration.BadBookAction.Ask => this.badBookAskRb,
+				Configuration.BadBookAction.Abort => this.badBookAbortRb,
+				Configuration.BadBookAction.Retry => this.badBookRetryRb,
+				Configuration.BadBookAction.Ignore => this.badBookIgnoreRb,
+				_ => this.badBookAskRb
+			};
+			rb.Checked = true;
 		}
 
 		private void allowLibationFixupCbox_CheckedChanged(object sender, EventArgs e)
@@ -111,6 +126,13 @@ namespace LibationWinForms.Dialogs
 
 			config.InProgress = inProgressSelectControl.SelectedDirectory;
 
+			config.BadBook
+				= badBookAskRb.Checked ? Configuration.BadBookAction.Ask
+				: badBookAbortRb.Checked ? Configuration.BadBookAction.Abort
+				: badBookRetryRb.Checked ? Configuration.BadBookAction.Retry
+				: badBookIgnoreRb.Checked ? Configuration.BadBookAction.Ignore
+				: Configuration.BadBookAction.Ask;
+
 			this.DialogResult = DialogResult.OK;
 			this.Close();
 		}

LibationWinForms/Dialogs/SettingsDialog.resx

@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
+<root>
   <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
     <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
     <xsd:element name="root" msdata:IsDataSet="true">

LibationWinForms/Form1.Designer.cs

@@ -353,7 +353,6 @@
 			this.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
 			this.Name = "Form1";
 			this.Text = "Libation: Liberate your Library";
-			this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.Form1_FormClosing);
 			this.Load += new System.EventHandler(this.Form1_Load);
 			this.menuStrip1.ResumeLayout(false);
 			this.menuStrip1.PerformLayout();

LibationWinForms/Form1.cs

@@ -3,10 +3,9 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Windows.Forms;
 using ApplicationServices;
-using DataLayer;
 using Dinah.Core;
 using Dinah.Core.Drawing;
-using Dinah.Core.Windows.Forms;
+using Dinah.Core.Threading;
 using FileManager;
 using InternalUtilities;
 using LibationWinForms.Dialogs;
@@ -30,8 +29,9 @@ namespace LibationWinForms
 				return;
 
 			// independent UI updates
-			this.Load += restoreSizeAndLocation;
+			this.Load += (_, _) => this.RestoreSizeAndLocation(Configuration.Instance);
 			this.Load += RefreshImportMenu;
+			this.FormClosing += (_, _) => this.SaveSizeAndLocation(Configuration.Instance);
 			LibraryCommands.LibrarySizeChanged += reloadGridAndUpdateBottomNumbers;
 			LibraryCommands.BookUserDefinedItemCommitted += setBackupCounts;
 
@@ -54,91 +54,16 @@ namespace LibationWinForms
 			loadInitialQuickFilterState();
 		}
 
-		private void Form1_FormClosing(object sender, FormClosingEventArgs e)
-		{
-			SaveSizeAndLocation();
-		}
-
-		private void restoreSizeAndLocation(object _ = null, object __ = null)
-		{
-			var config = Configuration.Instance;
-
-			var width = config.MainFormWidth;
-			var height = config.MainFormHeight;
-
-			// too small -- something must have gone wrong. use defaults
-			if (width < 25 || height < 25)
-			{
-				width = 1023;
-				height = 578;
-			}
-
-			// Fit to the current screen size in case the screen resolution changed since the size was last persisted
-			if (width > Screen.PrimaryScreen.WorkingArea.Width)
-				width = Screen.PrimaryScreen.WorkingArea.Width;
-			if (height > Screen.PrimaryScreen.WorkingArea.Height)
-				height = Screen.PrimaryScreen.WorkingArea.Height;
-
-			var x = config.MainFormX;
-			var y = config.MainFormY;
-
-			var rect = new System.Drawing.Rectangle(x, y, width, height);
-
-			// is proposed rect on a screen?
-			if (Screen.AllScreens.Any(screen => screen.WorkingArea.Contains(rect)))
-			{
-				this.StartPosition = FormStartPosition.Manual;
-				this.DesktopBounds = rect;
-			}
-			else
-			{
-				this.StartPosition = FormStartPosition.WindowsDefaultLocation;
-				this.Size = rect.Size;
-			}
-
-			// FINAL: for Maximized: start normal state, set size and location, THEN set max state
-			this.WindowState = config.MainFormIsMaximized ? FormWindowState.Maximized : FormWindowState.Normal;
-		}
-
-		private void SaveSizeAndLocation()
-		{
-			System.Drawing.Point location;
-			System.Drawing.Size size;
-
-			// save location and size if the state is normal
-			if (this.WindowState == FormWindowState.Normal)
-			{
-				location = this.Location;
-				size = this.Size;
-			}
-			else
-			{
-				// save the RestoreBounds if the form is minimized or maximized
-				location = this.RestoreBounds.Location;
-				size = this.RestoreBounds.Size;
-			}
-
-			var config = Configuration.Instance;
-
-			config.MainFormX = location.X;
-			config.MainFormY = location.Y;
-
-			config.MainFormWidth = size.Width;
-			config.MainFormHeight = size.Height;
-
-			config.MainFormIsMaximized = this.WindowState == FormWindowState.Maximized;
-		}
-
 		private void reloadGridAndUpdateBottomNumbers(object _ = null, object __ = null)
 		{
 			// suppressed filter while init'ing UI
 			var prev_isProcessingGridSelect = isProcessingGridSelect;
 			isProcessingGridSelect = true;
-			setGrid();
+			this.UIThreadSync(() => setGrid());
 			isProcessingGridSelect = prev_isProcessingGridSelect;
 
 			// UI init complete. now we can apply filter
-			doFilter(lastGoodFilter);
+			this.UIThreadAsync(() => doFilter(lastGoodFilter));
 
 			setBackupCounts(null, null);
 		}
@@ -158,7 +83,7 @@ namespace LibationWinForms
 
 				currProductsGrid = new ProductsGrid { Dock = DockStyle.Fill };
 				currProductsGrid.VisibleCountChanged += setVisibleCount;
-				gridPanel.UIThread(() => gridPanel.Controls.Add(currProductsGrid));
+				gridPanel.UIThreadSync(() => gridPanel.Controls.Add(currProductsGrid));
 				currProductsGrid.Display();
 			}
 			ResumeLayout();
@@ -229,9 +154,9 @@ namespace LibationWinForms
 				: "All books have been liberated";
 
 			// update UI
-			statusStrip1.UIThread(() => backupsCountsLbl.Text = statusStripText);
-			menuStrip1.UIThread(() => beginBookBackupsToolStripMenuItem.Enabled = pending > 0);
-			menuStrip1.UIThread(() => beginBookBackupsToolStripMenuItem.Text = string.Format(beginBookBackupsToolStripMenuItem_format, menuItemText));
+			statusStrip1.UIThreadAsync(() => backupsCountsLbl.Text = statusStripText);
+			menuStrip1.UIThreadAsync(() => beginBookBackupsToolStripMenuItem.Enabled = pending > 0);
+			menuStrip1.UIThreadAsync(() => beginBookBackupsToolStripMenuItem.Text = string.Format(beginBookBackupsToolStripMenuItem_format, menuItemText));
 		}
 		private void setPdfBackupCounts(LibraryCommands.LibraryStats libraryStats)
 		{
@@ -251,9 +176,9 @@ namespace LibationWinForms
 				: "All PDFs have been downloaded";
 
 			// update UI
-			statusStrip1.UIThread(() => pdfsCountsLbl.Text = statusStripText);
-			menuStrip1.UIThread(() => beginPdfBackupsToolStripMenuItem.Enabled = libraryStats.pdfsNotDownloaded > 0);
-			menuStrip1.UIThread(() => beginPdfBackupsToolStripMenuItem.Text = string.Format(beginPdfBackupsToolStripMenuItem_format, menuItemText));
+			statusStrip1.UIThreadAsync(() => pdfsCountsLbl.Text = statusStripText);
+			menuStrip1.UIThreadAsync(() => beginPdfBackupsToolStripMenuItem.Enabled = libraryStats.pdfsNotDownloaded > 0);
+			menuStrip1.UIThreadAsync(() => beginPdfBackupsToolStripMenuItem.Text = string.Format(beginPdfBackupsToolStripMenuItem_format, menuItemText));
 		}
 		#endregion
 

LibationWinForms/FormSaveExtension.cs

@@ -0,0 +1,89 @@
+using FileManager;
+using System.Drawing;
+using System.Linq;
+using System.Windows.Forms;
+
+namespace LibationWinForms
+{
+	public static class FormSaveExtension
+	{
+		public static void RestoreSizeAndLocation(this Form form, Configuration config)
+		{
+			FormSizeAndPosition savedState = config.GetNonString<FormSizeAndPosition>(form.Name);
+
+			if (savedState is null)
+				return;
+
+			// too small -- something must have gone wrong. use defaults
+			if (savedState.Width < 25 || savedState.Height < 25)
+			{
+				savedState.Width = form.Width;
+				savedState.Height = form.Height;
+			}
+
+			// Fit to the current screen size in case the screen resolution changed since the size was last persisted
+			if (savedState.Width > Screen.PrimaryScreen.WorkingArea.Width)
+				savedState.Width = Screen.PrimaryScreen.WorkingArea.Width;
+			if (savedState.Height > Screen.PrimaryScreen.WorkingArea.Height)
+				savedState.Height = Screen.PrimaryScreen.WorkingArea.Height;
+
+			var x = savedState.X;
+			var y = savedState.Y;
+
+			var rect = new Rectangle(x, y, savedState.Width, savedState.Height);
+
+			// is proposed rect on a screen?
+			if (Screen.AllScreens.Any(screen => screen.WorkingArea.Contains(rect)))
+			{
+				form.StartPosition = FormStartPosition.Manual;
+				form.DesktopBounds = rect;
+			}
+			else
+			{
+				form.StartPosition = FormStartPosition.WindowsDefaultLocation;
+				form.Size = rect.Size;
+			}
+
+			// FINAL: for Maximized: start normal state, set size and location, THEN set max state
+			form.WindowState = savedState.IsMaximized ? FormWindowState.Maximized : FormWindowState.Normal;
+		}
+
+		public static void SaveSizeAndLocation(this Form form, Configuration config)
+		{
+			Point location;
+			Size size;
+			var saveState = new FormSizeAndPosition();
+
+			// save location and size if the state is normal
+			if (form.WindowState == FormWindowState.Normal)
+			{
+				location = form.Location;
+				size = form.Size;
+			}
+			else
+			{
+				// save the RestoreBounds if the form is minimized or maximized
+				location = form.RestoreBounds.Location;
+				size = form.RestoreBounds.Size;
+			}
+
+			saveState.X = location.X;
+			saveState.Y = location.Y;
+
+			saveState.Width = size.Width;
+			saveState.Height = size.Height;
+
+			saveState.IsMaximized = form.WindowState == FormWindowState.Maximized;
+
+			config.SetObject(form.Name, saveState);
+		}
+	}
+	class FormSizeAndPosition
+	{
+		public int X;
+		public int Y;
+		public int Height;
+		public int Width;
+		public bool IsMaximized;
+	}
+}

LibationWinForms/LibationWinForms.csproj

@@ -2,22 +2,39 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <OutputType>Library</OutputType>
+    <OutputType>WinExe</OutputType>
     <TargetFramework>net5.0-windows</TargetFramework>
     <UseWindowsForms>true</UseWindowsForms>
     <ApplicationIcon>libation.ico</ApplicationIcon>
+    <AssemblyName>Libation</AssemblyName>
 
     <PublishTrimmed>true</PublishTrimmed>
     <PublishReadyToRun>true</PublishReadyToRun>
     <RuntimeIdentifier>win-x64</RuntimeIdentifier>
+    <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
+    <AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
+    <StartupObject />
+
+    <!-- Version is now in AppScaffolding.csproj -->
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <!--
+    HACK FOR COMPILER BUG  2021-09-14. Hopefully will be fixed in future versions
+    - Not using SatelliteResourceLanguages will load all language packs: works
+    - Specifying 'en' semicolon 1 more should load 1 language pack: works
+    - Specifying only 'en' should load no language packs: broken, still loads all
+    -->
+    <SatelliteResourceLanguages>en;es</SatelliteResourceLanguages>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Dinah.Core.WindowsDesktop" Version="1.0.2.1" />
+    <PackageReference Include="Dinah.Core.WindowsDesktop" Version="1.1.0.2" />
   </ItemGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\ApplicationServices\ApplicationServices.csproj" />
+    <ProjectReference Include="..\AppScaffolding\AppScaffolding.csproj" />
     <ProjectReference Include="..\FileLiberator\FileLiberator.csproj" />
   </ItemGroup>
 

LibationWinForms/ProductsGrid.cs

@@ -80,7 +80,10 @@ namespace LibationWinForms
 			{
 				var filePath = FileManager.AudibleFileStorage.Audio.GetPath(libraryBook.Book.AudibleProductId);
 				if (!Go.To.File(filePath))
-					MessageBox.Show($"File not found:\r\n{filePath}");
+				{
+					var suffix = string.IsNullOrWhiteSpace(filePath) ? "" : $":\r\n{filePath}";
+					MessageBox.Show($"File not found" + suffix);
+				}
 				return;
 			}
 

LibationWinForms/Program.cs

@@ -0,0 +1,318 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Windows.Forms;
+using AudibleApi.Authorization;
+using DataLayer;
+using Dinah.Core;
+using FileManager;
+using InternalUtilities;
+using LibationWinForms.Dialogs;
+using Microsoft.EntityFrameworkCore;
+using Newtonsoft.Json.Linq;
+using Serilog;
+
+namespace LibationWinForms
+{
+	static class Program
+	{
+		[System.Runtime.InteropServices.DllImport("kernel32.dll", SetLastError = true)]
+		[return: System.Runtime.InteropServices.MarshalAs(System.Runtime.InteropServices.UnmanagedType.Bool)]
+		static extern bool AllocConsole();
+
+		[STAThread]
+		static void Main()
+		{
+			//// Uncomment to see Console. Must be called before anything writes to Console.
+			//// Only use while debugging. Acts erratically in the wild
+			//AllocConsole();
+
+			Application.SetHighDpiMode(HighDpiMode.SystemAware);
+			Application.EnableVisualStyles();
+			Application.SetCompatibleTextRenderingDefault(false);
+
+			//***********************************************//
+			//                                               //
+			//   do not use Configuration before this line   //
+			//                                               //
+			//***********************************************//
+			// Migrations which must occur before configuration is loaded for the first time. Usually ones which alter the Configuration
+			var config = AppScaffolding.LibationScaffolding.RunPreConfigMigrations();
+
+			RunInstaller(config);
+
+			// most migrations go in here
+			AppScaffolding.LibationScaffolding.RunPostConfigMigrations();
+
+			// migrations which require Forms or are long-running
+			RunWindowsOnlyMigrations(config);
+
+			MessageBoxVerboseLoggingWarning.ShowIfTrue();
+
+#if !DEBUG
+			checkForUpdate();
+#endif
+
+			AppScaffolding.LibationScaffolding.RunPostMigrationScaffolding();
+
+			Application.Run(new Form1());
+		}
+
+		private static void RunInstaller(Configuration config)
+		{
+			// all returns should be preceded by either:
+			// - if config.LibationSettingsAreValid
+			// - error message, Exit()
+
+			if (config.LibationSettingsAreValid)
+				return;
+
+			var defaultLibationFilesDir = Configuration.UserProfile;
+
+			// check for existing settigns in default location
+			var defaultSettingsFile = Path.Combine(defaultLibationFilesDir, "Settings.json");
+			if (Configuration.SettingsFileIsValid(defaultSettingsFile))
+				config.SetLibationFiles(defaultLibationFilesDir);
+
+			if (config.LibationSettingsAreValid)
+				return;
+
+			static void CancelInstallation()
+			{
+				MessageBox.Show("Initial set up cancelled.", "Cancelled", MessageBoxButtons.OK, MessageBoxIcon.Warning);
+				Application.Exit();
+				Environment.Exit(0);
+			}
+
+			var setupDialog = new SetupDialog();
+			if (setupDialog.ShowDialog() != DialogResult.OK)
+			{
+				CancelInstallation();
+				return;
+			}
+
+			if (setupDialog.IsNewUser)
+				config.SetLibationFiles(defaultLibationFilesDir);
+			else if (setupDialog.IsReturningUser)
+			{
+				var libationFilesDialog = new LibationFilesDialog();
+
+				if (libationFilesDialog.ShowDialog() != DialogResult.OK)
+				{
+					CancelInstallation();
+					return;
+				}
+
+				config.SetLibationFiles(libationFilesDialog.SelectedDirectory);
+				if (config.LibationSettingsAreValid)
+					return;
+
+				// path did not result in valid settings
+				var continueResult = MessageBox.Show(
+					$"No valid settings were found at this location.\r\nWould you like to create a new install settings in this folder?\r\n\r\n{libationFilesDialog.SelectedDirectory}",
+					"New install?",
+					MessageBoxButtons.YesNo,
+					MessageBoxIcon.Question);
+
+				if (continueResult != DialogResult.Yes)
+				{
+					CancelInstallation();
+					return;
+				}
+			}
+
+			// if 'new user' was clicked, or if 'returning user' chose new install: show basic settings dialog
+			config.Books ??= Path.Combine(defaultLibationFilesDir, "Books");
+			config.InProgress ??= Configuration.WinTemp;
+			config.AllowLibationFixup = true;
+			config.DecryptToLossy = false;
+
+			if (new SettingsDialog().ShowDialog() != DialogResult.OK)
+			{
+				CancelInstallation();
+				return;
+			}
+
+			if (config.LibationSettingsAreValid)
+				return;
+
+			CancelInstallation();
+		}
+
+		private static void RunWindowsOnlyMigrations(Configuration config)
+		{
+			// only supported in winforms. don't move to app scaffolding
+			migrate_to_v5_0_0(config);
+
+			// long running. won't get a chance to finish in cli. don't move to app scaffolding
+			migrate_to_v5_5_0(config);
+		}
+
+		#region migrate to v5.0.0 re-register device if device info not in settings
+		private static void migrate_to_v5_0_0(Configuration config)
+		{
+			if (!config.Exists(nameof(config.AllowLibationFixup)))
+				config.AllowLibationFixup = true;
+
+			if (!File.Exists(AudibleApiStorage.AccountsSettingsFile))
+				return;
+
+			var accountsPersister = AudibleApiStorage.GetAccountsSettingsPersister();
+
+			var accounts = accountsPersister?.AccountsSettings?.Accounts;
+			if (accounts is null)
+				return;
+
+			foreach (var account in accounts)
+			{
+				var identity = account?.IdentityTokens;
+
+				if (identity is null)
+					continue;
+
+				if (!string.IsNullOrWhiteSpace(identity.DeviceType) &&
+					!string.IsNullOrWhiteSpace(identity.DeviceSerialNumber) &&
+					!string.IsNullOrWhiteSpace(identity.AmazonAccountId))
+					continue;
+
+				var authorize = new Authorize(identity.Locale);
+
+				try
+				{
+					authorize.DeregisterAsync(identity.ExistingAccessToken, identity.Cookies.ToKeyValuePair()).GetAwaiter().GetResult();
+					identity.Invalidate();
+
+					// re-registers device
+					ApiExtended.CreateAsync(account, new Login.WinformLoginChoiceEager(account)).GetAwaiter().GetResult();
+				}
+                catch
+                {
+					// Don't care if it fails
+                }
+			}
+		}
+		#endregion
+
+		#region migrate to v5.5.0. FilePaths.json => db. long running. fire and forget
+		private static void migrate_to_v5_5_0(Configuration config)
+			=> new System.Threading.Thread(() => migrate_to_v5_5_0_thread(config)) { IsBackground = true }.Start();
+		private static void migrate_to_v5_5_0_thread(Configuration config)
+		{
+			try
+			{
+				var filePaths = Path.Combine(config.LibationFiles, "FilePaths.json");
+				if (!File.Exists(filePaths))
+					return;
+
+				var fileLocations = Path.Combine(config.LibationFiles, "FileLocations.json");
+				if (!File.Exists(fileLocations))
+					File.Copy(filePaths, fileLocations);
+
+				// files to be deleted at the end
+				var libhackFilesToDelete = new List<string>();
+				// .libhack files => errors
+				var libhackFiles = Directory.EnumerateDirectories(config.Books, "*.libhack", SearchOption.AllDirectories);
+
+				using var context = ApplicationServices.DbContexts.GetContext();
+				context.Books.Load();
+
+				var jArr = JArray.Parse(File.ReadAllText(filePaths));
+
+				foreach (var jToken in jArr)
+				{
+					var asinToken = jToken["Id"];
+					var fileTypeToken = jToken["FileType"];
+					var pathToken = jToken["Path"];
+					if (asinToken is null || fileTypeToken is null || pathToken is null ||
+						asinToken.Type != JTokenType.String || fileTypeToken.Type != JTokenType.Integer || pathToken.Type != JTokenType.String)
+						continue;
+
+					var asin = asinToken.Value<string>();
+					var fileType = (FileType)fileTypeToken.Value<int>();
+					var path = pathToken.Value<string>();
+
+					if (fileType == FileType.Unknown || fileType == FileType.AAXC)
+						continue;
+
+					var book = context.Books.Local.FirstOrDefault(b => b.AudibleProductId == asin);
+					if (book is null)
+						continue;
+
+					// assign these strings and enums/ints unconditionally. EFCore will only update if changed
+					if (fileType == FileType.PDF)
+						book.UserDefinedItem.PdfStatus = LiberatedStatus.Liberated;
+
+					if (fileType == FileType.Audio)
+					{
+						var lhack = libhackFiles.FirstOrDefault(f => f.ContainsInsensitive(asin));
+						if (lhack is null)
+							book.UserDefinedItem.BookStatus = LiberatedStatus.Liberated;
+						else
+						{
+							book.UserDefinedItem.BookStatus = LiberatedStatus.Error;
+							libhackFilesToDelete.Add(lhack);
+						}
+					}
+				}
+
+				context.SaveChanges();
+
+				// only do this after save changes
+				foreach (var libhackFile in libhackFilesToDelete)
+					File.Delete(libhackFile);
+
+				File.Delete(filePaths);
+			}
+			catch (Exception ex)
+			{
+				Log.Logger.Error(ex, "Error attempting to insert FilePaths into db");
+			}
+		}
+		#endregion
+
+		private static void checkForUpdate()
+		{
+			string zipUrl;
+			string htmlUrl;
+			string zipName;
+			try
+			{
+				bool hasUpgrade;
+				(hasUpgrade, zipUrl, htmlUrl, zipName) = AppScaffolding.LibationScaffolding.GetLatestRelease();
+
+				if (!hasUpgrade)
+					return;
+			}
+			catch (Exception ex)
+			{
+				MessageBoxAlertAdmin.Show("Error checking for update", "Error checking for update", ex);
+				return;
+			}
+
+			if (zipUrl is null)
+			{
+				MessageBox.Show(htmlUrl, "New version available");
+				return;
+			}
+
+			var result = MessageBox.Show($"New version available @ {htmlUrl}\r\nDownload the zip file?", "New version available", MessageBoxButtons.YesNo, MessageBoxIcon.Question);
+			if (result != DialogResult.Yes)
+				return;
+
+			using var fileSelector = new SaveFileDialog { FileName = zipName, Filter = "Zip Files (*.zip)|*.zip|All files (*.*)|*.*" };
+			if (fileSelector.ShowDialog() != DialogResult.OK)
+				return;
+			var selectedPath = fileSelector.FileName;
+
+			try
+			{
+				LibationWinForms.BookLiberation.ProcessorAutomationController.DownloadFile(zipUrl, selectedPath, true);
+			}
+			catch (Exception ex)
+			{
+				MessageBoxAlertAdmin.Show("Error downloading update", "Error downloading update", ex);
+			}
+		}
+	}
+}

README.md

@@ -27,6 +27,7 @@
     - [Files and folders](#files-and-folders)
     - [Linux and Mac (unofficial)](#linux-and-mac)
     - [Settings](#settings)
+    - [Command Line Interface](#command-line-interface)
 
 ## Audible audiobook manager
 
@@ -241,3 +242,49 @@ Although Libation only currently officially supports Windows, [some users](https
 ### Settings
 
 * Allow Libation to fix up audiobook metadata. After decrypting a title, Libation attempts to fix details like chapters and cover art. Some power users and/or control freaks prefer to manage this themselves. By unchecking this setting, Libation will only decrypt the book and will leave metadata as-is, warts and all.
+
+### Command Line Interface
+
+Libationcli.exe allows limited access to Libation's functionalities as a CLI.
+
+Warnings about relying solely on on the CLI:
+* CLI will not perform any upgrades.
+* It will show that there is an upgrade, but that will likely scroll by too fast to notice.
+* It will not perform all post-upgrade migrations. Some migrations are only be possible by launching GUI.
+
+```
+help
+  libationcli --help
+  
+verb-specific help
+  libationcli scan --help
+  
+scan all libraries
+  libationcli scan
+scan only libraries for specific accounts
+  libationcli scan nickname1 nickname2
+  
+convert all m4b files to mp3
+  libationcli convert
+  
+liberate all books and pdfs
+  libationcli liberate
+liberate pdfs only
+  libationcli liberate --pdf
+  libationcli liberate -p
+  
+export library to file
+  libationcli export --path "C:\foo\bar\my.json" --json
+  libationcli export -p "C:\foo\bar\my.json" -j
+```
+
+Currently logs are written to Console and to file. This means they'll be printed in the CLI. To disable, find this in Settings.json and delete the 3 lines after `"WriteTo": [`
+
+```
+  "Serilog": {
+    "MinimumLevel": "Information",
+    "WriteTo": [
+      {
+        "Name": "Console"
+      },
+```

_DB_NOTES.txt

@@ -6,7 +6,7 @@ Startup project: DataLayer
 since we have mult contexts, must use -context:
     Add-Migration MyComment -context LibationContext
     Update-Database -context LibationContext
-Startup project: reset to prev. eg: LibationLauncher
+Startup project: reset to prev. eg: LibationWinForms
 
 
 Migrations, detailed

_Tests/InternalUtilities.Tests/InternalUtilities.Tests.csproj

@@ -10,8 +10,8 @@
     <PackageReference Include="FluentAssertions" Version="6.1.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.11.0" />
     <PackageReference Include="Moq" Version="4.16.1" />
-    <PackageReference Include="MSTest.TestAdapter" Version="2.2.6" />
-    <PackageReference Include="MSTest.TestFramework" Version="2.2.6" />
+    <PackageReference Include="MSTest.TestAdapter" Version="2.2.7" />
+    <PackageReference Include="MSTest.TestFramework" Version="2.2.7" />
     <PackageReference Include="coverlet.collector" Version="3.1.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

_Tests/LibationSearchEngine.Tests/LibationSearchEngine.Tests.csproj

@@ -10,8 +10,8 @@
     <PackageReference Include="FluentAssertions" Version="6.1.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.11.0" />
     <PackageReference Include="Moq" Version="4.16.1" />
-    <PackageReference Include="MSTest.TestAdapter" Version="2.2.6" />
-    <PackageReference Include="MSTest.TestFramework" Version="2.2.6" />
+    <PackageReference Include="MSTest.TestAdapter" Version="2.2.7" />
+    <PackageReference Include="MSTest.TestFramework" Version="2.2.7" />
     <PackageReference Include="coverlet.collector" Version="3.1.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

__README - COLLABORATORS.txt

@@ -30,7 +30,7 @@ STRUCTURE
 * 5 Domain Utilities (db aware)
   This is often where database, domain-ignorant util.s, and non-database capabilities come together to provide the domain-conscious access points
 * 6 Application
-  UI and application launcher
+  GUI, CLI, and shared scaffolding
 
 
 CODING GUIDELINES