New feature: auto-library updating

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

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

AaxDecrypter/AaxDecrypter.csproj

@@ -1,12 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\..\AAXClean\AAXClean.csproj" />
-    <ProjectReference Include="..\..\Dinah.Core\Dinah.Core\Dinah.Core.csproj" />
-  </ItemGroup>
-
-</Project>

AaxDecrypter/AaxcDownloadConverter.cs

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

AaxDecrypter/DownloadLicense.cs

@@ -1,27 +0,0 @@
-using AAXClean;
-using Dinah.Core;
-
-namespace AaxDecrypter
-{
-    public class DownloadLicense
-    {
-        public string DownloadUrl { get; }
-        public string AudibleKey { get; }
-        public string AudibleIV { get; }
-        public string UserAgent { get; }
-        public ChapterInfo ChapterInfo { get; set; }
-
-        public DownloadLicense(string downloadUrl, string audibleKey, string audibleIV, string userAgent)
-        {
-            ArgumentValidator.EnsureNotNullOrEmpty(downloadUrl, nameof(downloadUrl));
-            ArgumentValidator.EnsureNotNullOrEmpty(audibleKey, nameof(audibleKey));
-            ArgumentValidator.EnsureNotNullOrEmpty(audibleIV, nameof(audibleIV));
-            ArgumentValidator.EnsureNotNullOrEmpty(userAgent, nameof(userAgent));
-
-            DownloadUrl = downloadUrl;
-            AudibleKey = audibleKey;
-            AudibleIV = audibleIV;
-            UserAgent = userAgent;
-        }
-    }
-}

AaxDecrypter/NFO.cs

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

ApplicationServices/ApplicationServices.csproj

@@ -1,20 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="CsvHelper" Version="27.1.1" />
-    <PackageReference Include="NPOI" Version="2.5.3" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\..\audible api\AudibleApi\AudibleApiDTOs\AudibleApiDTOs.csproj" />
-    <ProjectReference Include="..\..\audible api\AudibleApi\AudibleApi\AudibleApi.csproj" />
-    <ProjectReference Include="..\DtoImporterService\DtoImporterService.csproj" />
-    <ProjectReference Include="..\InternalUtilities\InternalUtilities.csproj" />
-    <ProjectReference Include="..\LibationSearchEngine\LibationSearchEngine.csproj" />
-  </ItemGroup>
-
-</Project>

ApplicationServices/DbContexts.cs

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

ApplicationServices/LibraryCommands.cs

@@ -1,298 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using AudibleApi;
-using DataLayer;
-using Dinah.Core;
-using DtoImporterService;
-using InternalUtilities;
-using Serilog;
-
-namespace ApplicationServices
-{
-	// subtly different from DataLayer.LiberatedStatus
-	// - DataLayer.LiberatedStatus: has no concept of partially downloaded
-	// - ApplicationServices.LiberatedState: has no concept of Error/skipped
-	public enum LiberatedState { NotDownloaded, PartialDownload, Liberated }
-
-	public enum PdfState { NoPdf, Downloaded, NotDownloaded }
-
-	public static class LibraryCommands
-	{
-		private static LibraryOptions.ResponseGroupOptions LibraryResponseGroups = LibraryOptions.ResponseGroupOptions.ALL_OPTIONS;
-
-		public static async Task<List<LibraryBook>> FindInactiveBooks(Func<Account, ILoginCallback> loginCallbackFactoryFunc, List<LibraryBook> existingLibrary, params Account[] accounts)
-        {
-			//These are the minimum response groups required for the
-			//library scanner to pass all validation and filtering.
-			LibraryResponseGroups = 
-				LibraryOptions.ResponseGroupOptions.ProductAttrs |
-				LibraryOptions.ResponseGroupOptions.ProductDesc | 
-				LibraryOptions.ResponseGroupOptions.Relationships;
-
-			if (accounts is null || accounts.Length == 0)
-				return new List<LibraryBook>();
-
-			try
-			{
-				var libraryItems = await scanAccountsAsync(loginCallbackFactoryFunc, accounts);
-				Log.Logger.Information($"GetAllLibraryItems: Total count {libraryItems.Count}");
-
-				var missingBookList = existingLibrary.Where(b => !libraryItems.Any(i => i.DtoItem.Asin == b.Book.AudibleProductId)).ToList();
-
-				return missingBookList;
-			}
-			catch (AudibleApi.Authentication.LoginFailedException lfEx)
-			{
-				lfEx.SaveFiles(FileManager.Configuration.Instance.LibationFiles);
-
-				// nuget Serilog.Exceptions would automatically log custom properties
-				//   However, it comes with a scary warning when used with EntityFrameworkCore which I'm not yet ready to implement:
-				//   https://github.com/RehanSaeed/Serilog.Exceptions
-				// work-around: use 3rd param. don't just put exception object in 3rd param -- info overload: stack trace, etc
-				Log.Logger.Error(lfEx, "Error scanning library. Login failed. {@DebugInfo}", new
-				{
-					lfEx.RequestUrl,
-					ResponseStatusCodeNumber = (int)lfEx.ResponseStatusCode,
-					ResponseStatusCodeDesc = lfEx.ResponseStatusCode,
-					lfEx.ResponseInputFields,
-					lfEx.ResponseBodyFilePaths
-				});
-				throw;
-			}
-			catch (Exception ex)
-			{
-				Log.Logger.Error(ex, "Error importing library");
-				throw;
-			}
-            finally
-            {
-				LibraryResponseGroups = LibraryOptions.ResponseGroupOptions.ALL_OPTIONS;
-            }
-		}
-		#region FULL LIBRARY scan and import
-		public static async Task<(int totalCount, int newCount)> ImportAccountAsync(Func<Account, ILoginCallback> loginCallbackFactoryFunc, params Account[] accounts)
-		{
-			if (accounts is null || accounts.Length == 0)
-				return (0, 0);
-
-			try
-			{
-				var importItems = await scanAccountsAsync(loginCallbackFactoryFunc, accounts);
-
-				var totalCount = importItems.Count;
-				Log.Logger.Information($"GetAllLibraryItems: Total count {totalCount}");
-
-				var newCount = await importIntoDbAsync(importItems);
-				Log.Logger.Information($"Import: New count {newCount}");
-
-				await Task.Run(() => SearchEngineCommands.FullReIndex());
-				Log.Logger.Information("FullReIndex: success");
-
-				return (totalCount, newCount);
-			}
-			catch (AudibleApi.Authentication.LoginFailedException lfEx)
-			{
-				lfEx.SaveFiles(FileManager.Configuration.Instance.LibationFiles);
-
-				// nuget Serilog.Exceptions would automatically log custom properties
-				//   However, it comes with a scary warning when used with EntityFrameworkCore which I'm not yet ready to implement:
-				//   https://github.com/RehanSaeed/Serilog.Exceptions
-				// work-around: use 3rd param. don't just put exception object in 3rd param -- info overload: stack trace, etc
-				Log.Logger.Error(lfEx, "Error importing library. Login failed. {@DebugInfo}", new
-				{
-					lfEx.RequestUrl,
-					ResponseStatusCodeNumber = (int)lfEx.ResponseStatusCode,
-					ResponseStatusCodeDesc = lfEx.ResponseStatusCode,
-					lfEx.ResponseInputFields,
-					lfEx.ResponseBodyFilePaths
-				});
-				throw;
-			}
-			catch (Exception ex)
-			{
-				Log.Logger.Error(ex, "Error importing library");
-				throw;
-			}
-		}
-
-		private static async Task<List<ImportItem>> scanAccountsAsync(Func<Account, ILoginCallback> loginCallbackFactoryFunc, Account[] accounts)
-		{
-			var tasks = new List<Task<List<ImportItem>>>();
-			foreach (var account in accounts)
-			{
-				var callback = loginCallbackFactoryFunc(account);
-
-				// get APIs in serial, esp b/c of logins
-				var api = await AudibleApiActions.GetApiAsync(callback, account);
-
-				// add scanAccountAsync as a TASK: do not await
-				tasks.Add(scanAccountAsync(api, account));
-			}
-
-			// import library in parallel
-			var arrayOfLists = await Task.WhenAll(tasks);
-			var importItems = arrayOfLists.SelectMany(a => a).ToList();
-			return importItems;
-		}
-
-		private static async Task<List<ImportItem>> scanAccountAsync(Api api, Account account)
-		{
-			ArgumentValidator.EnsureNotNull(account, nameof(account));
-
-			Log.Logger.Information("ImportLibraryAsync. {@DebugInfo}", new
-			{
-				Account = account?.MaskedLogEntry ?? "[null]"
-			});
-
-			var dtoItems = await AudibleApiActions.GetLibraryValidatedAsync(api, LibraryResponseGroups);
-			return dtoItems.Select(d => new ImportItem { DtoItem = d, AccountId = account.AccountId, LocaleName = account.Locale?.Name }).ToList();
-		}
-
-		private static async Task<int> importIntoDbAsync(List<ImportItem> importItems)
-		{
-			using var context = DbContexts.GetContext();
-			var libraryImporter = new LibraryImporter(context);
-			var newCount = await Task.Run(() => libraryImporter.Import(importItems));
-			context.SaveChanges();
-
-			return newCount;
-		}
-		#endregion
-
-		#region Update book details
-		public static int UpdateUserDefinedItem(Book book, string newTags, LiberatedStatus bookStatus, LiberatedStatus? pdfStatus)
-		{
-			try
-			{
-				using var context = DbContexts.GetContext();
-
-				var udi = book.UserDefinedItem;
-
-				var tagsChanged = udi.Tags != newTags;
-				var bookStatusChanged = udi.BookStatus != bookStatus;
-				var pdfStatusChanged = udi.PdfStatus != pdfStatus;
-
-				if (!tagsChanged && !bookStatusChanged && !pdfStatusChanged)
-					return 0;
-
-				udi.Tags = newTags;
-				udi.BookStatus = bookStatus;
-				udi.PdfStatus = pdfStatus;
-
-				// Attach() NoTracking entities before SaveChanges()
-				context.Attach(udi).State = Microsoft.EntityFrameworkCore.EntityState.Modified;
-				var qtyChanges = context.SaveChanges();
-
-				if (qtyChanges == 0)
-					return 0;
-
-				if (tagsChanged)
-					SearchEngineCommands.UpdateBookTags(book);
-				if (bookStatusChanged || pdfStatusChanged)
-					SearchEngineCommands.UpdateLiberatedStatus(book);
-
-				return qtyChanges;
-			}
-			catch (Exception ex)
-			{
-				Log.Logger.Error(ex, "Error updating tags");
-				throw;
-			}
-		}
-
-		public static int UpdateBook(LibraryBook libraryBook, LiberatedStatus liberatedStatus)
-		{
-			try
-			{
-				using var context = DbContexts.GetContext();
-
-				var udi = libraryBook.Book.UserDefinedItem;
-
-				if (udi.BookStatus == liberatedStatus)
-					return 0;
-
-				// Attach() NoTracking entities before SaveChanges()
-				udi.BookStatus = liberatedStatus;
-				context.Attach(udi).State = Microsoft.EntityFrameworkCore.EntityState.Modified;
-				var qtyChanges = context.SaveChanges();
-				if (qtyChanges > 0)
-					SearchEngineCommands.UpdateLiberatedStatus(libraryBook.Book);
-
-				return qtyChanges;
-			}
-			catch (Exception ex)
-			{
-				Log.Logger.Error(ex, "Error updating tags");
-				throw;
-			}
-		}
-
-		public static int UpdatePdf(LibraryBook libraryBook, LiberatedStatus liberatedStatus)
-		{
-			try
-			{
-				using var context = DbContexts.GetContext();
-
-				var udi = libraryBook.Book.UserDefinedItem;
-
-				if (udi.PdfStatus == liberatedStatus)
-					return 0;
-
-				// Attach() NoTracking entities before SaveChanges()
-				udi.PdfStatus = liberatedStatus;
-				context.Attach(udi).State = Microsoft.EntityFrameworkCore.EntityState.Modified;
-				var qtyChanges = context.SaveChanges();
-
-				return qtyChanges;
-			}
-			catch (Exception ex)
-			{
-				Log.Logger.Error(ex, "Error updating tags");
-				throw;
-			}
-		}
-		#endregion
-
-		// below are queries, not commands. maybe I should make a LibraryQueries. except there's already one of those...
-
-		public static LiberatedState Liberated_Status(Book book)
-			=> book.Audio_Exists ? LiberatedState.Liberated
-			: FileManager.AudibleFileStorage.AaxcExists(book.AudibleProductId) ? LiberatedState.PartialDownload
-			: LiberatedState.NotDownloaded;
-
-		public static PdfState Pdf_Status(Book book)
-			=> !book.Supplements.Any() ? PdfState.NoPdf
-			: book.PDF_Exists ? PdfState.Downloaded
-			: PdfState.NotDownloaded;
-
-		public record LibraryStats(int booksFullyBackedUp, int booksDownloadedOnly, int booksNoProgress, int pdfsDownloaded, int pdfsNotDownloaded) { }
-		public static LibraryStats GetCounts()
-		{
-			var libraryBooks = DbContexts.GetContext().GetLibrary_Flat_NoTracking();
-
-			var results = libraryBooks
-				.AsParallel()
-				.Select(lb => Liberated_Status(lb.Book))
-				.ToList();
-			var booksFullyBackedUp = results.Count(r => r == LiberatedState.Liberated);
-			var booksDownloadedOnly = results.Count(r => r == LiberatedState.PartialDownload);
-			var booksNoProgress = results.Count(r => r == LiberatedState.NotDownloaded);
-
-			Log.Logger.Information("Book counts. {@DebugInfo}", new { total = results.Count, booksFullyBackedUp, booksDownloadedOnly, booksNoProgress });
-
-			var boolResults = libraryBooks
-				.AsParallel()
-				.Where(lb => lb.Book.Supplements.Any())
-				.Select(lb => Pdf_Status(lb.Book))
-				.ToList();
-			var pdfsDownloaded = boolResults.Count(r => r == PdfState.Downloaded);
-			var pdfsNotDownloaded = boolResults.Count(r => r == PdfState.NotDownloaded);
-
-			Log.Logger.Information("PDF counts. {@DebugInfo}", new { total = boolResults.Count, pdfsDownloaded, pdfsNotDownloaded });
-
-			return new(booksFullyBackedUp, booksDownloadedOnly, booksNoProgress, pdfsDownloaded, pdfsNotDownloaded);
-		}
-	}
-}

DataLayer/Configurations/LibraryBookConfig.cs

@@ -1,18 +0,0 @@
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Metadata.Builders;
-
-namespace DataLayer.Configurations
-{
-    internal class LibraryBookConfig : IEntityTypeConfiguration<LibraryBook>
-    {
-        public void Configure(EntityTypeBuilder<LibraryBook> entity)
-        {
-            entity.HasKey(b => b.BookId);
-
-            entity
-                .HasOne(le => le.Book)
-                .WithOne()
-                .HasForeignKey<LibraryBook>(le => le.BookId);
-        }
-    }
-}

DataLayer/EfClasses/SeriesBook.cs

@@ -1,40 +0,0 @@
-using Dinah.Core;
-
-namespace DataLayer
-{
-    public class SeriesBook
-    {
-        internal int SeriesId { get; private set; }
-        internal int BookId { get; private set; }
-
-        /// <summary>
-        /// <para>"index" not "order". This is both for sequence and display</para>
-        /// <para>Float allows for in-between books. eg: 2.5</para>
-        /// <para>To show 2 editions as the same book in a series, give them the same index</para>
-        /// <para>null IS NOT the same as 0. Some series call a book "book 0"</para>
-        /// </summary>
-        public float? Index { get; private set; }
-
-        public Series Series { get; private set; }
-        public Book Book { get; private set; }
-
-        private SeriesBook() { }
-        internal SeriesBook(Series series, Book book, float? index = null)
-        {
-            ArgumentValidator.EnsureNotNull(series, nameof(series));
-            ArgumentValidator.EnsureNotNull(book, nameof(book));
-
-            Series = series;
-            Book = book;
-            Index = index;
-        }
-
-        public void UpdateIndex(float? index)
-        {
-            if (index.HasValue)
-                Index = index.Value;
-        }
-
-		public override string ToString() => $"Series={Series} Book={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);
-        }
-    }
-}

DataLayer/Utilities/LocalDatabaseInfo.cs

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

DataLayer/_HowTo- EF Core.txt

@@ -1,57 +0,0 @@
-FOR QUICK MIGRATION INSTRUCTIONS:
-_DB_NOTES.txt
-
-
-HOW TO CREATE: EF CORE PROJECT
-==============================
-example is for sqlite but the same works with MsSql
-
-
-nuget
-Microsoft.EntityFrameworkCore.Tools (needed for using Package Manager Console)
-Microsoft.EntityFrameworkCore.Sqlite
-
-MIGRATIONS
-  require core, not standard
-  this can be a problem b/c standard and framework can only reference standard, not core
-TO USE MIGRATIONS (core and/or standard)
-  add to csproj
-    <PropertyGroup>
-      <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
-    </PropertyGroup>
-TO USE MIGRATIONS AS *BOTH* CORE AND STANDARD
-  edit csproj
-    pluralize this xml tag
-      from: TargetFramework
-      to: TargetFrameworks
-    inside of TargetFrameworks
-      from: netstandard2.1
-      to: netcoreapp3.1;netstandard2.1
-
-run. error
-SQLite Error 1: 'no such table: Blogs'.
-
-set project "Set as StartUp Project"
-
-Tools >> Nuget Package Manager >> Package Manager Console
-default project: Examples\SQLite_NETCore2_0
-
-PM> add-migration InitialCreate
-PM> Update-Database
-
-if add-migration xyz throws and error, don't take the error msg at face value. try again with add-migration xyz -verbose
-
-new sqlite .db file created: Copy always/Copy if newer
-or copy .db file to destination
-
-relative:
-   optionsBuilder.UseSqlite("Data Source=blogging.db");
-absolute  (use fwd slashes):
-   optionsBuilder.UseSqlite("Data Source=C:/foo/bar/blogging.db");
-
-
-REFERENCE ARTICLES
-------------------
-https://docs.microsoft.com/en-us/ef/core/get-started/netcore/new-db-sqlite
-https://carlos.mendible.com/2016/07/11/step-by-step-dotnet-core-and-entity-framework-core/
-https://www.benday.com/2017/12/19/ef-core-2-0-migrations-without-hard-coded-connection-strings/

Documentation/Advanced.md

@@ -0,0 +1,79 @@
+## [Download Libation](https://github.com/rmcrackan/Libation/releases/latest)
+
+### If you found this useful, tell a friend. If you found this REALLY useful, you can click here to [PalPal.me](https://paypal.me/mcrackan?locale.x=en_us)
+...or just tell more friends. As long as I'm maintaining this software, it will remain **free** and **open source**.
+
+
+
+# Advanced: Table of Contents
+
+- [Files and folders](#files-and-folders)
+- [Linux and Mac (unofficial)](#linux-and-mac)
+- [Settings](#settings)
+- [Custom File Naming](#custom-file-naming)
+- [Command Line Interface](#command-line-interface)
+
+
+
+### Files and folders
+
+To make upgrades and reinstalls easier, Libation separates all of its responsibilities to a few different folders. If you don't want to mess with this stuff: ignore it. Read on if you like a little more control over your files.
+
+* In Libation's initial folder are the files that make up the program. Since nothing else is here, just copy new files here to upgrade the program. Delete this folder to delete Libation.
+
+* In a separate folder, Libation keeps track of all of the files it creates like settings and downloaded images. After an upgrade, Libation might think that's its being run for the first time. Just click ADVANCED SETUP and point to this folder. Libation will reload your library and settings.
+
+* The last important folder is the "books location." This is where Libation looks for your downloaded and decrypted books. This is how it knows which books still need to be downloaded. The Audible id must be somewhere in the book's file or folder name for Libation to detect your downloaded book.
+
+### Linux and Mac
+
+Although Libation only currently officially supports Windows, some users have had success with WINE. ([Linux](https://github.com/rmcrackan/Libation/issues/28#issuecomment-890594158), [OSX Crossover and WINE](https://github.com/rmcrackan/Libation/issues/150#issuecomment-1004918592))
+
+### 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.
+
+### Custom File Naming
+
+In Settings, on the Download/Decrypt tab, you can specify the format in which you want your files to be named. As you edit these templates, a live example will be shown. Parameters are listed for folders, files, and files split by chapter including an explanation of what each naming option means. For instance: you can use template `<title short> - <ch# 0> of <ch count> - <ch title>` to create the file `A Study in Scarlet - 04 of 10 - A Flight for Life.m4b`.
+
+These templates apply to GUI and CLI.
+
+### 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
+  libationcli export -p "C:\foo\bar\my.csv" --csv
+  libationcli export -p "C:\foo\bar\my.csv" -c
+  libationcli export -p "C:\foo\bar\my.xlsx" --xlsx
+  libationcli export -p "C:\foo\bar\my.xlsx" -x
+```

Documentation/GettingStarted.md

@@ -0,0 +1,138 @@
+## [Download Libation](https://github.com/rmcrackan/Libation/releases/latest)
+
+### If you found this useful, tell a friend. If you found this REALLY useful, you can click here to [PalPal.me](https://paypal.me/mcrackan?locale.x=en_us)
+...or just tell more friends. As long as I'm maintaining this software, it will remain **free** and **open source**.
+
+
+
+# Getting started: Table of Contents
+
+- [Download Libation](#download-libation-1)
+- [Installation](#installation)
+- [Create Accounts](#create-accounts)
+- [Import your library](#import-your-library)
+- [Download your books -- DRM-free!](#download-your-books----drm-free)
+- [Download PDF attachments](#download-pdf-attachments)
+- [Details of downloaded files](#details-of-downloaded-files)
+- [Export your library](#export-your-library)
+
+
+
+### [Download Libation](https://github.com/rmcrackan/Libation/releases)
+
+### Installation
+
+To install Libation, extract the zip file to a folder, for example `C:\Libation`, and then run Libation.exe from that folder to begin the configuration process and configure your account(s).
+
+### Create Accounts
+
+Create your account(s):
+
+![Create your accounts, menu](images/v40_accounts.png)
+
+New locale options include many more regions including old audible accounts which pre-date the amazon acquisition
+
+![Choose your account locales](images/v40_locales.png)
+
+### Import your library
+
+Be default, Libation will periodically scan the accounts you added above with a checkbox next to them. Nothing for you to do. You can also scan manually.
+
+Select Import > Scan Library:
+
+![Import step 1](images/Import1.png)
+
+Or if you have multiple accounts, you'll get to choose whether to scan all accounts or just the ones you select:
+
+![Import which accounts](images/v40_import.png)
+
+If this is a new installation, or you're scanning an account you haven't scanned before, you'll be prompted to enter your password for the Audible account.
+
+![Login password](images/alt-login1.png)
+
+Enter the password and click Submit. Audible will prompt you with a CAPTCHA image. 
+
+![Login captcha](images/alt-login2.png)
+
+Enter the CAPTCHA answer characters and click Submit. If all has gone well, Libation will start scanning the account. 
+
+In rare instances, the Captcha image/response will fail in an endless loop. If this happens, delete the problem account, and then click Save. Re-add the account and click Save again. Now try to scan the account again. This time, instead of typing your password, click the link that says "Or click here". This will open the Audible External Login dialog shown below.
+
+![Login alternative setup](images/alt-login3.png)
+
+You can either copy the URL shown and paste it into your browser or launch the browser directly by clicking Launch in Browser. Audible will display its standard login page. Login, including answering the CAPTCHA on the next page. In some cases, you might have to approve the login from the email account associated with that login, but once the login is successful, you'll see an error message.
+
+![Login alternative login result](images/alt-login4.png)
+
+This actually means you've successfully logged in. Copy the entire URL shown in your browser and return to Libation. Paste that URL into the text box at the bottom of the Audible External Login window and click Submit.
+
+You'll see this window while it's scanning:
+
+![Import step 2](images/Import2.png)
+
+Success! We see how many new titles are imported:
+
+![Import step 3](images/Import3.png)
+
+### Download your books -- DRM-free!
+
+Automatically download some or all of your audible books. This shows you how much of your library is not yet downloaded and decrypted:
+
+The stoplights will tell you a title's status:
+
+* Green: downloaded and decrypted
+* Yellow: downloaded but still encrypted with DRM
+* Red: not downloaded
+* PDF icon without arrow: downloaded
+* PDF with arrow: not downloaded
+
+Or hover over the button to see the status.
+
+![Liberate book step 1](images/LiberateBook1.png)
+
+Select Liberate > Begin Book Backups
+
+You can also click on the stop light to download only that title and its PDF
+
+![Liberate book step 2](images/LiberateBook2.png)
+
+First the original book with DRM is downloaded
+
+![Liberate book step 3](images/LiberateBook3.png)
+
+Then it's decrypted so you can use it on any device you choose. The very first time you decrypt a book, this step will take a while. Every other book will go much faster. The first time, Libation has to figure out the special decryption key which allows your personal books to be unlocked.
+
+![Liberate book step 4](images/LiberateBook4.png)
+
+And voila! If you have multiple books not yet liberated, Libation will automatically move on to the next.
+
+![Liberate book step 5](images/LiberateBook5.png)
+
+The Audible id must be somewhere in the book's file or folder name for Libation to detect your downloaded book.
+
+### Download PDF attachments
+
+For books which include PDF downloads, Libation can download these for you as well and will attempt to store them with the book. "Book backup" will already download an available PDF. This additional option is useful when Audible adds a PDF to your book after you've already backed it up.
+
+Select Liberate > Begin PDF Backups
+
+![PDF download step 2](images/PdfDownload2.png)
+
+The downloads work just like with books, only with no additional decryption needed.
+
+![PDF download step 3](images/PdfDownload3.png)
+
+### Details of downloaded files
+
+![Post download](images/PostDownload.png)
+
+When you set up Libation, you'll specify a Books directory. Libation looks inside that directory and all subdirectories to look for files or folders with each library book's audible id. This way, organization is completely up to you. When you download + decrypt a book, you get several files
+
+* .m4b: your audiobook in m4b format. This is the most pure version of your audiobook and retains the highest quality. Now that it's decrypted, you can play it on any audio player and put it on any device. If you'd like, you can also use 3rd party tools to turn it into an mp3. The freedom to do what you want with your files was the original inspiration for Libation.
+* .cue: this is a file which logs where chapter breaks occur. Many tools are able to use this if you want to split your book into files along chapter lines.
+
+### Export your library
+
+![Export](images/Export.png)
+
+Export your library to Excel, CSV, or JSON

Documentation/SearchingAndFiltering.md

@@ -0,0 +1,79 @@
+## [Download Libation](https://github.com/rmcrackan/Libation/releases/latest)
+
+### If you found this useful, tell a friend. If you found this REALLY useful, you can click here to [PalPal.me](https://paypal.me/mcrackan?locale.x=en_us)
+...or just tell more friends. As long as I'm maintaining this software, it will remain **free** and **open source**.
+
+
+
+# Searching and filtering: Table of Contents
+
+- [Tags](#tags)
+- [Searches](#searches)
+- [Search examples](#search-examples)
+- [Filters](#filters)
+
+
+
+### Tags
+
+To add tags to a title, click the tags button
+
+![Tags step 1](images/Tags1.png)
+
+Add as many tags as you'd like. Tags are separated by a space. Each tag can contain letters, numbers, and underscores
+
+![Tags step 2](images/Tags2.png)
+
+Tags are saved non-case specific for easy search. There is one special tag "hidden" which will also grey-out the book
+
+![Tags step 3](images/Tags3.png)
+
+To edit tags, just click the button again.
+
+### Searches
+
+Libation's advanced searching is built on the powerful Lucene search engine. Simple searches are effortless and powerful searches are simple. To search, just type and click Filter or press enter
+
+* Type anything in the search box to search common fields: title, authors, narrators, and the book's audible id
+* Use Lucene's "Query Parser Syntax" for advanced searching.
+    * Easy tutorial: http://www.lucenetutorial.com/lucene-query-syntax.html
+    * Full official guide: https://lucene.apache.org/core/2_9_4/queryparsersyntax.html
+* Tons of search fields, specific to audiobooks
+* Synonyms so you don't have to memorize magic words. Eg: author and author**s** will both work
+* Click [?] button for a full list of search fields and synonyms ![Filter options](images/FilterOptions.png)
+* Search by tag like \[this\]
+* When tags have an underscore you can use part of the tag. This is useful for quick categories. The below examples make this more clear.
+
+### Search examples
+
+Search for anything with the word potter
+
+![Search example: potter](images/SearchExamplePotter.png)
+
+If you only want to see Harry Potter
+
+![Search example: "harry potter"](images/SearchExampleHarryPotter.png)
+
+If you only want to see potter except for Harry Potter. You can also use "-" instead of "NOT"
+
+![Search example: "potter NOT harry"](images/SearchExamplePotterNotHarry.png)
+![Search example: "potter -harry"](images/SearchExamplePotterNotHarry2.png)
+
+To see only books written by Neil Gaiman where he also narrates his own book. (If you don't include AND, you'll see everything written by Neil Gaiman and also all books in your library which are self-narrated.)
+
+![Search example: author:gaiman AND authornarrated](images/SearchExampleGaimanAuthorNarrated.png)
+
+I tagged autobiographies as auto_bio and biographies written by someone else as bio. I can get only autobiographies with \[auto_bio\] or get both by searching \[bio\]
+
+![Search example: \[bio\]](images/SearchExampleBio.png)
+![Search example: \[auto_bio\]](images/SearchExampleAutoBio.png)
+
+### Filters
+
+If you have a search you want to save, click Add To Quick Filters to save it in your Quick Filters list. To use it again, select it from the Quick Filters list.
+
+To edit this list go to Quick Filters > Edit quick filters. Here you can re-order the list, delete filters, double-click a filter to edit it, or double-click the bottom blank box to add a new filter.
+
+Check "Quick Filters > Start Libation with 1st filter Default" to have your top filter automatically applied when Libation starts. In this top example, I want to always start without these: at books I've tagged hidden, books I've tagged as free_audible_originals, and books which I have rated.
+
+![default filters](images/FiltersDefault.png)

DtoImporterService/ContributorImporter.cs

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

DtoImporterService/DtoImporterService.csproj

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

DtoImporterService/LibraryImporter.cs

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

DtoImporterService/SeriesImporter.cs

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

FileLiberator/ConvertToMp3.cs

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

FileLiberator/DownloadDecryptBook.cs

@@ -1,228 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Threading.Tasks;
-using AaxDecrypter;
-using AudibleApi;
-using DataLayer;
-using Dinah.Core;
-using Dinah.Core.ErrorHandling;
-using Dinah.Core.Net.Http;
-using FileManager;
-
-namespace FileLiberator
-{
-    public class DownloadDecryptBook : IAudioDecodable
-    {
-
-		private AaxcDownloadConverter aaxcDownloader;
-
-		public event EventHandler<TimeSpan> StreamingTimeRemaining;
-		public event EventHandler<Action<byte[]>> RequestCoverArt;
-		public event EventHandler<string> TitleDiscovered;
-		public event EventHandler<string> AuthorsDiscovered;
-		public event EventHandler<string> NarratorsDiscovered;
-		public event EventHandler<byte[]> CoverImageDiscovered;
-		public event EventHandler<string> StreamingBegin;
-		public event EventHandler<DownloadProgress> StreamingProgressChanged;
-		public event EventHandler<string> StreamingCompleted;
-		public event EventHandler<LibraryBook> Begin;
-		public event EventHandler<string> StatusUpdate;
-		public event EventHandler<LibraryBook> Completed;
-
-		public async Task<StatusHandler> ProcessAsync(LibraryBook libraryBook)
-        {
-            Begin?.Invoke(this, libraryBook);
-
-            try
-            {
-                if (libraryBook.Book.Audio_Exists)
-                    return new StatusHandler { "Cannot find decrypt. Final audio file already exists" };
-
-                var outputAudioFilename = await aaxToM4bConverterDecryptAsync(AudibleFileStorage.DownloadsInProgress, AudibleFileStorage.DecryptInProgress, libraryBook);
-
-                // decrypt failed
-                if (outputAudioFilename is null)
-                    return new StatusHandler { "Decrypt failed" };
-
-                // moves files and returns dest dir
-                _ = moveFilesToBooksDir(libraryBook.Book, outputAudioFilename);
-
-                // only need to update if success. if failure, it will remain at 0 == NotLiberated
-                ApplicationServices.LibraryCommands.UpdateBook(libraryBook, LiberatedStatus.Liberated);
-
-                return new StatusHandler();
-            }
-            finally
-            {
-                Completed?.Invoke(this, libraryBook);
-            }
-        }
-
-        private async Task<string> aaxToM4bConverterDecryptAsync(string cacheDir, string destinationDir, LibraryBook libraryBook)
-        {
-            StreamingBegin?.Invoke(this, $"Begin decrypting {libraryBook}");
-
-            try
-            {
-                validate(libraryBook);
-
-                var api = await InternalUtilities.AudibleApiActions.GetApiAsync(libraryBook.Account, libraryBook.Book.Locale);
-
-                var contentLic = await api.GetDownloadLicenseAsync(libraryBook.Book.AudibleProductId);
-
-                var aaxcDecryptDlLic = new DownloadLicense
-                    (
-                    contentLic?.ContentMetadata?.ContentUrl?.OfflineUrl,
-                    contentLic?.Voucher?.Key,
-                    contentLic?.Voucher?.Iv,
-                    Resources.UserAgent
-                    );
-
-                if (Configuration.Instance.AllowLibationFixup)
-                {
-                    aaxcDecryptDlLic.ChapterInfo = new AAXClean.ChapterInfo();
-
-                    foreach (var chap in contentLic.ContentMetadata?.ChapterInfo?.Chapters)
-                        aaxcDecryptDlLic.ChapterInfo.AddChapter(chap.Title, TimeSpan.FromMilliseconds(chap.LengthMs));
-                }
-
-
-                var format = Configuration.Instance.DecryptToLossy ? OutputFormat.Mp3 : OutputFormat.Mp4a;
-
-                var extension = format switch
-                {
-                    OutputFormat.Mp4a => "m4b",
-                    OutputFormat.Mp3 => "mp3",
-                    _ => throw new NotImplementedException(),
-                };
-
-                var outFileName = Path.Combine(destinationDir, $"{PathLib.ToPathSafeString(libraryBook.Book.Title)} [{libraryBook.Book.AudibleProductId}].{extension}");
-
-
-                aaxcDownloader = new AaxcDownloadConverter(outFileName, cacheDir, aaxcDecryptDlLic, format) { AppName = "Libation" };
-                aaxcDownloader.DecryptProgressUpdate += (s, progress) => StreamingProgressChanged?.Invoke(this, progress);
-                aaxcDownloader.DecryptTimeRemaining += (s, remaining) => StreamingTimeRemaining?.Invoke(this, remaining);
-                aaxcDownloader.RetrievedCoverArt += AaxcDownloader_RetrievedCoverArt;
-                aaxcDownloader.RetrievedTags += aaxcDownloader_RetrievedTags;
-
-                // REAL WORK DONE HERE
-                var success = await Task.Run(() => aaxcDownloader.Run());
-
-                // decrypt failed
-                if (!success)
-                    return null;
-
-                return outFileName;
-            }
-            finally
-            {
-                StreamingCompleted?.Invoke(this, $"Completed downloading and decrypting {libraryBook.Book.Title}");
-            }
-        }
-
-
-		private void AaxcDownloader_RetrievedCoverArt(object sender, byte[] e)
-        {
-            if (e is null && Configuration.Instance.AllowLibationFixup)
-            {
-                RequestCoverArt?.Invoke(this, aaxcDownloader.SetCoverArt);
-            }
-
-            if (e is not null)
-            {
-                CoverImageDiscovered?.Invoke(this, e);
-            }
-        }
-
-        private void aaxcDownloader_RetrievedTags(object sender, AAXClean.AppleTags e)
-        {
-            TitleDiscovered?.Invoke(this, e.TitleSansUnabridged);
-            AuthorsDiscovered?.Invoke(this, e.FirstAuthor ?? "[unknown]");
-            NarratorsDiscovered?.Invoke(this, e.Narrator ?? "[unknown]");           
-        }
-
-        private static string moveFilesToBooksDir(Book product, string outputAudioFilename)
-        {
-            // create final directory. move each file into it. MOVE AUDIO FILE LAST
-            // new dir: safetitle_limit50char + " [" + productId + "]"
-
-            var destinationDir = AudibleFileStorage.Audio.GetDestDir(product.Title, product.AudibleProductId);
-            Directory.CreateDirectory(destinationDir);
-
-            var sortedFiles = getProductFilesSorted(product, outputAudioFilename);
-
-            var musicFileExt = Path.GetExtension(outputAudioFilename).Trim('.');
-
-            // audio filename: safetitle_limit50char + " [" + productId + "]." + audio_ext
-            var audioFileName = FileUtility.GetValidFilename(destinationDir, product.Title, musicFileExt, product.AudibleProductId);
-
-            foreach (var f in sortedFiles)
-            {
-                var dest
-                    = AudibleFileStorage.Audio.IsFileTypeMatch(f)
-                    ? audioFileName
-                    // non-audio filename: safetitle_limit50char + " [" + productId + "][" + audio_ext +"]." + non_audio_ext
-                    : FileUtility.GetValidFilename(destinationDir, product.Title, f.Extension, product.AudibleProductId, musicFileExt);
-
-                if (Path.GetExtension(dest).Trim('.').ToLower() == "cue")
-                    Cue.UpdateFileName(f, audioFileName);
-
-                File.Move(f.FullName, dest);
-            }
-
-            AudibleFileStorage.Audio.Refresh();
-
-            return destinationDir;
-        }
-
-        private static List<FileInfo> getProductFilesSorted(Book product, string outputAudioFilename)
-        {
-            // files are: temp path\author\[asin].ext
-            var m4bDir = new FileInfo(outputAudioFilename).Directory;
-            var files = m4bDir
-                .EnumerateFiles()
-                .Where(f => f.Name.ContainsInsensitive(product.AudibleProductId))
-                .ToList();
-
-            // move audio files to the end of the collection so these files are moved last
-            var musicFiles = files.Where(f => AudibleFileStorage.Audio.IsFileTypeMatch(f));
-            var sortedFiles = files
-                .Except(musicFiles)
-                .Concat(musicFiles)
-                .ToList();
-
-            return sortedFiles;
-        }
-
-        private static void validate(LibraryBook libraryBook)
-		{
-			string errorString(string field)
-				=> $"{errorTitle()}\r\nCannot download book. {field} is not known. Try re-importing the account which owns this book.";
-
-			string errorTitle()
-			{
-				var title
-					= (libraryBook.Book.Title.Length > 53)
-					? $"{libraryBook.Book.Title.Truncate(50)}..."
-					: libraryBook.Book.Title;
-				var errorBookTitle = $"{title} [{libraryBook.Book.AudibleProductId}]";
-				return errorBookTitle;
-			};
-
-			if (string.IsNullOrWhiteSpace(libraryBook.Account))
-				throw new Exception(errorString("Account"));
-
-			if (string.IsNullOrWhiteSpace(libraryBook.Book.Locale))
-				throw new Exception(errorString("Locale"));
-		}
-
-        public bool Validate(LibraryBook libraryBook) => !libraryBook.Book.Audio_Exists;
-
-        public void Cancel()
-        {
-            aaxcDownloader?.Cancel();
-        }
-    }
-}

FileLiberator/DownloadFile.cs

@@ -1,36 +0,0 @@
-using System;
-using System.Net.Http;
-using System.Threading.Tasks;
-using Dinah.Core.Net.Http;
-
-namespace FileLiberator
-{
-	// currently only used to download the .zip flies for upgrade
-	public class DownloadFile : IStreamable
-	{
-		public event EventHandler<string> StreamingBegin;
-		public event EventHandler<DownloadProgress> StreamingProgressChanged;
-		public event EventHandler<string> StreamingCompleted;
-		public event EventHandler<TimeSpan> StreamingTimeRemaining;
-
-		public async Task<string> PerformDownloadFileAsync(string downloadUrl, string proposedDownloadFilePath)
-		{
-			var client = new HttpClient();
-
-			var progress = new Progress<DownloadProgress>();
-			progress.ProgressChanged += (_, e) => StreamingProgressChanged?.Invoke(this, e);
-
-			StreamingBegin?.Invoke(this, proposedDownloadFilePath);
-
-			try
-			{
-				var actualDownloadedFilePath = await client.DownloadFileAsync(downloadUrl, proposedDownloadFilePath, progress);
-				return actualDownloadedFilePath;
-			}
-			finally
-			{
-				StreamingCompleted?.Invoke(this, proposedDownloadFilePath);
-			}
-		}
-	}
-}

FileLiberator/DownloadPdf.cs

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

FileLiberator/DownloadableBase.cs

@@ -1,66 +0,0 @@
-using System;
-using System.Threading.Tasks;
-using DataLayer;
-using Dinah.Core.ErrorHandling;
-using Dinah.Core.Net.Http;
-
-namespace FileLiberator
-{
-	public abstract class DownloadableBase : IProcessable
-	{
-		public event EventHandler<LibraryBook> Begin;
-		public event EventHandler<LibraryBook> Completed;
-
-		public event EventHandler<string> StreamingBegin;
-		public event EventHandler<DownloadProgress> StreamingProgressChanged;
-		public event EventHandler<string> StreamingCompleted;
-
-		public event EventHandler<string> StatusUpdate;
-		public event EventHandler<TimeSpan> StreamingTimeRemaining;
-
-		protected void Invoke_StatusUpdate(string message) => StatusUpdate?.Invoke(this, message);
-
-        public abstract bool Validate(LibraryBook libraryBook);
-
-        public abstract Task<StatusHandler> ProcessItemAsync(LibraryBook libraryBook);
-
-		// do NOT use ConfigureAwait(false) on ProcessAsync()
-		// often calls events which prints to forms in the UI context
-		public async Task<StatusHandler> ProcessAsync(LibraryBook libraryBook)
-        {
-            Begin?.Invoke(this, libraryBook);
-
-            try
-            {
-                return await ProcessItemAsync(libraryBook);
-            }
-            finally
-            {
-                Completed?.Invoke(this, libraryBook);
-            }
-        }
-
-		protected static Task<AudibleApi.Api> GetApiAsync(LibraryBook libraryBook)
-			=> InternalUtilities.AudibleApiActions.GetApiAsync(libraryBook.Account, libraryBook.Book.Locale);
-
-		protected async Task<string> PerformDownloadAsync(string proposedDownloadFilePath, Func<Progress<DownloadProgress>, Task<string>> func)
-		{
-			var progress = new Progress<DownloadProgress>();
-			progress.ProgressChanged += (_, e) => StreamingProgressChanged?.Invoke(this, e);
-
-			StreamingBegin?.Invoke(this, proposedDownloadFilePath);
-
-			try
-			{
-				var result = await func(progress);
-				StatusUpdate?.Invoke(this, result);
-
-				return result;
-			}
-			finally
-			{
-				StreamingCompleted?.Invoke(this, proposedDownloadFilePath);
-			}
-		}
-	}
-}

FileLiberator/FileLiberator.csproj

@@ -1,16 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\..\Dinah.Core\Dinah.Core\Dinah.Core.csproj" />
-    <ProjectReference Include="..\AaxDecrypter\AaxDecrypter.csproj" />
-    <ProjectReference Include="..\ApplicationServices\ApplicationServices.csproj" />
-    <ProjectReference Include="..\DataLayer\DataLayer.csproj" />
-    <ProjectReference Include="..\FileManager\FileManager.csproj" />
-    <ProjectReference Include="..\InternalUtilities\InternalUtilities.csproj" />
-  </ItemGroup>
-
-</Project>

FileLiberator/IAudioDecodable.cs

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

FileLiberator/IProcessable.cs

@@ -1,23 +0,0 @@
-using System;
-using System.Threading.Tasks;
-using DataLayer;
-using Dinah.Core.ErrorHandling;
-
-namespace FileLiberator
-{
-    public interface IProcessable : IStreamable
-    {
-        event EventHandler<LibraryBook> Begin;
-
-        /// <summary>General string message to display. DON'T rely on this for success, failure, or control logic</summary>
-        event EventHandler<string> StatusUpdate;
-
-        event EventHandler<LibraryBook> Completed;
-
-		/// <returns>True == Valid</returns>
-		bool Validate(LibraryBook libraryBook);
-
-        /// <returns>True == success</returns>
-        Task<StatusHandler> ProcessAsync(LibraryBook libraryBook);
-    }
-}

FileLiberator/IProcessableExt.cs

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

FileLiberator/IStreamable.cs

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

FileManager/AudibleFileStorage.cs

@@ -1,147 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Text.RegularExpressions;
-using Dinah.Core;
-using Dinah.Core.Collections.Generic;
-
-namespace FileManager
-{
-    public enum FileType { Unknown, Audio, AAXC, PDF }
-
-	public abstract class AudibleFileStorage : Enumeration<AudibleFileStorage>
-	{
-		protected abstract string[] Extensions { get; }
-		public abstract string StorageDirectory { get; }
-
-		public static string DownloadsInProgress => Directory.CreateDirectory(Path.Combine(Configuration.Instance.InProgress, "DownloadsInProgress")).FullName;
-        public static string DecryptInProgress => Directory.CreateDirectory(Path.Combine(Configuration.Instance.InProgress, "DecryptInProgress")).FullName;
-
-        public static string PdfStorageDirectory => BooksDirectory;
-
-		private static AaxcFileStorage AAXC { get; } = new AaxcFileStorage();
-        public static bool AaxcExists(string productId) => AAXC.Exists(productId);
-
-		#region static
-		public static AudioFileStorage Audio { get; } = new AudioFileStorage();
-
-        public static string BooksDirectory
-        {
-            get
-            {
-                if (string.IsNullOrWhiteSpace(Configuration.Instance.Books))
-                    Configuration.Instance.Books = Path.Combine(Configuration.UserProfile, "Books");
-                return Directory.CreateDirectory(Configuration.Instance.Books).FullName;
-            }
-        }
-
-        internal static BackgroundFileSystem BookDirectoryFiles { get; set; }
-        #endregion
-
-        #region instance
-        public FileType FileType => (FileType)Value;
-
-		protected IEnumerable<string> extensions_noDots { get; }
-        private string extAggr { get; }
-
-        protected AudibleFileStorage(FileType fileType) : base((int)fileType, fileType.ToString())
-		{
-			extensions_noDots = Extensions.Select(ext => ext.Trim('.')).ToList();
-			extAggr = extensions_noDots.Aggregate((a, b) => $"{a}|{b}");
-            BookDirectoryFiles ??= new BackgroundFileSystem(BooksDirectory, "*.*", SearchOption.AllDirectories);
-        }
-
-        protected string GetFilePath(string productId)
-        {
-            var cachedFile = FilePathCache.GetPath(productId, FileType);
-            if (cachedFile != null)
-                return cachedFile;
-
-            string regexPattern = $@"{productId}.*?\.({extAggr})$";
-            string firstOrNull;
-
-            if (StorageDirectory == BooksDirectory)
-            {
-                //If user changed the BooksDirectory, reinitialize.
-                if (StorageDirectory != BookDirectoryFiles.RootDirectory)
-				{
-                    lock (BookDirectoryFiles)
-                    {
-                        if (StorageDirectory != BookDirectoryFiles.RootDirectory)
-                        {
-                            BookDirectoryFiles = new BackgroundFileSystem(StorageDirectory, "*.*", SearchOption.AllDirectories);
-                        }
-                    }
-				}
-
-                firstOrNull = BookDirectoryFiles.FindFile(regexPattern, RegexOptions.IgnoreCase);
-            }
-            else
-            {
-                firstOrNull =
-                    Directory
-                    .EnumerateFiles(StorageDirectory, "*.*", SearchOption.AllDirectories)
-                    .FirstOrDefault(s => Regex.IsMatch(s, regexPattern, RegexOptions.IgnoreCase));
-            }
-
-			if (firstOrNull is null)
-				return null;
-
-			FilePathCache.Upsert(productId, FileType, firstOrNull);
-			return firstOrNull;
-        }
-        #endregion
-    }
-
-    public class AudioFileStorage : AudibleFileStorage
-    {
-        protected override string[] Extensions { get; } = new[] { "m4b", "mp3", "aac", "mp4", "m4a", "ogg", "flac" };
-
-        // we always want to use the latest config value, therefore
-        // - DO use 'get' arrow "=>"
-        // - do NOT use assign "="
-        public override string StorageDirectory => BooksDirectory;
-
-        public AudioFileStorage() : base(FileType.Audio) { }
-
-        public void Refresh() => BookDirectoryFiles.RefreshFiles();
-
-        public string GetDestDir(string title, string asin)
-        {
-            // to prevent the paths from getting too long, we don't need after the 1st ":" for the folder
-            var underscoreIndex = title.IndexOf(':');
-            var titleDir
-                = underscoreIndex < 4
-                ? title
-                : title.Substring(0, underscoreIndex);
-            var finalDir = FileUtility.GetValidFilename(StorageDirectory, titleDir, null, asin);
-            return finalDir;
-        }
-
-        public bool IsFileTypeMatch(FileInfo fileInfo)
-            => extensions_noDots.ContainsInsensative(fileInfo.Extension.Trim('.'));
-
-        public string GetPath(string productId) => GetFilePath(productId);
-    }
-
-    public class AaxcFileStorage : AudibleFileStorage
-    {
-        protected override string[] Extensions { get; } = new[] { "aaxc" };
-
-        // we always want to use the latest config value, therefore
-        // - DO use 'get' arrow "=>"
-        // - do NOT use assign "="
-        public override string StorageDirectory => DownloadsInProgress;
-
-        public AaxcFileStorage() : base(FileType.AAXC) { }
-
-        /// <summary>
-        /// Example for full books:
-        /// Search recursively in _books directory. Full book exists if either are true
-        /// - a directory name has the product id and an audio file is immediately inside
-        /// - any audio filename contains the product id
-        /// </summary>
-        public bool Exists(string productId) => GetFilePath(productId) != null;
-    }
-}

FileManager/FileManager.csproj

@@ -1,17 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="5.0.0" />
-    <PackageReference Include="Octokit" Version="0.50.0" />
-    <PackageReference Include="Polly" Version="7.2.2" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\..\Dinah.Core\Dinah.Core\Dinah.Core.csproj" />
-  </ItemGroup>
-
-</Project>

FileManager/FilePathCache.cs

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

FileManager/FileUtility.cs

@@ -1,52 +0,0 @@
-using System;
-using System.IO;
-
-namespace FileManager
-{
-    public static class FileUtility
-    {
-        public static string GetValidFilename(string dirFullPath, string filename, string extension, params string[] metadataSuffixes)
-        {
-            if (string.IsNullOrWhiteSpace(dirFullPath))
-                throw new ArgumentException($"{nameof(dirFullPath)} may not be null or whitespace", nameof(dirFullPath));
-
-            // file max length = 255. dir max len = 247
-
-            // sanitize
-            filename = GetAsciiTag(filename);
-            // manage length
-            if (filename.Length > 50)
-                filename = filename.Substring(0, 50) + "[...]";
-
-            // append id. it is 10 or 14 char in the common cases
-            if (metadataSuffixes != null && metadataSuffixes.Length > 0)
-                filename += " [" + string.Join("][", metadataSuffixes) + "]";
-
-            // this method may also be used for directory names, so no guarantee of extension
-            if (!string.IsNullOrWhiteSpace(extension))
-                extension = '.' + extension.Trim('.');
-
-            // ensure uniqueness
-            var fullfilename = Path.Combine(dirFullPath, filename + extension);
-            var i = 0;
-            while (File.Exists(fullfilename))
-                fullfilename = Path.Combine(dirFullPath, filename + $" ({++i})" + extension);
-
-            return fullfilename;
-        }
-
-        public static string GetAsciiTag(string property)
-        {
-            if (property == null)
-                return "";
-
-            // omit characters which are invalid. EXCEPTION: change colon to underscore
-            property = property.Replace(':', '_');
-
-            // GetInvalidFileNameChars contains everything in GetInvalidPathChars plus ':', '*', '?', '\\', '/'
-            foreach (var ch in Path.GetInvalidFileNameChars())
-                property = property.Replace(ch.ToString(), "");
-            return property;
-        }
-    }
-}

InternalUtilities/AudibleApiActions.cs

@@ -1,104 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using AudibleApi;
-using AudibleApiDTOs;
-using Dinah.Core;
-using Polly;
-using Polly.Retry;
-
-namespace InternalUtilities
-{
-	public static class AudibleApiActions
-	{
-		/// <summary>USE THIS from within Libation. It wraps the call with correct JSONPath</summary>
-		public static Task<Api> GetApiAsync(string username, string localeName, ILoginCallback loginCallback = null)
-		{
-			Serilog.Log.Logger.Information("GetApiAsync. {@DebugInfo}", new
-			{
-				Username = 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);
-		}
-
-		private static AsyncRetryPolicy policy { get; }
-			= Policy.Handle<Exception>()
-			// 2 retries == 3 total
-			.RetryAsync(2);
-
-		public static Task<List<Item>> GetLibraryValidatedAsync(Api api, 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));
-		}
-
-		private static async Task<List<Item>> getItemsAsync(Api api, LibraryOptions.ResponseGroupOptions responseGroups)
-		{
-			var items = await api.GetAllLibraryItemsAsync(responseGroups);
-
-			// remove episode parents
-			items.RemoveAll(i => i.IsEpisodes);
-
-			#region // episode handling. doesn't quite work
-			//				// add individual/children episodes
-			//				var childIds = items
-			//					.Where(i => i.Episodes)
-			//					.SelectMany(ep => ep.Relationships)
-			//					.Where(r => r.RelationshipToProduct == AudibleApiDTOs.RelationshipToProduct.Child && r.RelationshipType == AudibleApiDTOs.RelationshipType.Episode)
-			//					.Select(c => c.Asin)
-			//					.ToList();
-			//				foreach (var childId in childIds)
-			//				{
-			//					var bookResult = await api.GetLibraryBookAsync(childId, AudibleApi.LibraryOptions.ResponseGroupOptions.ALL_OPTIONS);
-			//					var bookItem = AudibleApiDTOs.LibraryDtoV10.FromJson(bookResult.ToString()).Item;
-			//					items.Add(bookItem);
-			//				}
-			#endregion
-
-			var validators = new List<IValidator>();
-			validators.AddRange(getValidators());
-			foreach (var v in validators)
-			{
-				var exceptions = v.Validate(items);
-				if (exceptions != null && exceptions.Any())
-					throw new AggregateException(exceptions);
-			}
-
-			return items;
-		}
-
-		private static List<IValidator> getValidators()
-		{
-			var type = typeof(IValidator);
-			var types = AppDomain.CurrentDomain.GetAssemblies()
-				.SelectMany(s => s.GetTypes())
-				.Where(p => type.IsAssignableFrom(p) && !p.IsInterface);
-
-			return types.Select(t => Activator.CreateInstance(t) as IValidator).ToList();
-		}
-	}
-}

InternalUtilities/InternalUtilities.csproj

@@ -1,12 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\..\audible api\AudibleApi\AudibleApi\AudibleApi.csproj" />
-    <ProjectReference Include="..\FileManager\FileManager.csproj" />
-  </ItemGroup>
-
-</Project>

Libation.sln

@@ -1,256 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.28803.156
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "_Solution Items", "_Solution Items", "{03C8835F-936C-4AF7-87AE-FF92BDBE8B9B}"
-	ProjectSection(SolutionItems) = preProject
-		__TODO.txt = __TODO.txt
-		_DB_NOTES.txt = _DB_NOTES.txt
-		REFERENCE.txt = REFERENCE.txt
-	EndProjectSection
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "5 Domain Utilities (db aware)", "5 Domain Utilities (db aware)", "{41CDCC73-9B81-49DD-9570-C54406E852AF}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "6 Application", "6 Application", "{8679CAC8-9164-4007-BDD2-F004810EDA14}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "1 Core Libraries", "1 Core Libraries", "{43E3ACB3-E0BC-4370-8DBB-E3720C8C8FD1}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "4 Domain (db)", "4 Domain (db)", "{751093DD-5DBA-463E-ADBE-E05FAFB6983E}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "2 Utilities (domain ignorant)", "2 Utilities (domain ignorant)", "{7FBBB086-0807-4998-85BF-6D1A49C8AD05}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AaxDecrypter", "AaxDecrypter\AaxDecrypter.csproj", "{8BD8E012-F44F-4EE2-A234-D66C14D5FE4B}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FileManager", "FileManager\FileManager.csproj", "{1AE65B61-9C05-4C80-ABFF-48F16E22FDF1}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DataLayer", "DataLayer\DataLayer.csproj", "{59A10DF3-63EC-43F1-A3BF-4000CFA118D2}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FileLiberator", "FileLiberator\FileLiberator.csproj", "{393B5B27-D15C-4F77-9457-FA14BA8F3C73}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "InternalUtilities", "InternalUtilities\InternalUtilities.csproj", "{06882742-27A6-4347-97D9-56162CEC9C11}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "3 Domain Internal Utilities (db ignorant)", "3 Domain Internal Utilities (db ignorant)", "{F0CBB7A7-D3FB-41FF-8F47-CF3F6A592249}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibationSearchEngine", "LibationSearchEngine\LibationSearchEngine.csproj", "{2E1F5DB4-40CC-4804-A893-5DCE0193E598}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "0 Tests", "0 Tests", "{38E6C6D9-963A-4C5B-89F4-F2F14885ADFD}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "0 Demos and Examples", "0 Demos and Examples", "{F61184E7-2426-4A13-ACEF-5689928E2CE2}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Dinah.Core.Demos", "..\Dinah.Core\_Demos\Dinah.Core.Demos\Dinah.Core.Demos.csproj", "{9F1AA3DE-962F-469B-82B2-46F93491389B}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Dinah.Core.Tests", "..\Dinah.Core\_Tests\Dinah.Core.Tests\Dinah.Core.Tests.csproj", "{E874D000-AD3A-4629-AC65-7219C2C7C1F0}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestCommon", "..\Dinah.Core\_Tests\TestCommon\TestCommon.csproj", "{FF12ADA0-8975-4E67-B6EA-4AC82E0C8994}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GitAllRepos", "..\GitAllRepos\GitAllRepos\GitAllRepos.csproj", "{AD1FDDC9-8D2A-436A-8EED-91FD74E7C7B4}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AudibleApi", "..\audible api\AudibleApi\AudibleApi\AudibleApi.csproj", "{7EA01F9C-E579-4B01-A3B9-733B49DD0B60}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AudibleApi.Tests", "..\audible api\AudibleApi\_Tests\AudibleApi.Tests\AudibleApi.Tests.csproj", "{111420E2-D4F0-4068-B46A-C4B6DCC823DC}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibationWinForms", "LibationWinForms\LibationWinForms.csproj", "{635F00E1-AAD1-45F7-BEB7-D909AD33B9F6}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WinFormsDesigner", "WinFormsDesigner\WinFormsDesigner.csproj", "{0807616A-A77A-4B08-A65A-1582B09E114B}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Dinah.Core", "..\Dinah.Core\Dinah.Core\Dinah.Core.csproj", "{9E951521-2587-4FC6-AD26-FAA9179FB6C4}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Dinah.EntityFrameworkCore", "..\Dinah.Core\Dinah.EntityFrameworkCore\Dinah.EntityFrameworkCore.csproj", "{1255D9BA-CE6E-42E4-A253-6376540B9661}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LuceneNet303r2", "..\LuceneNet303r2\LuceneNet303r2\LuceneNet303r2.csproj", "{35803735-B669-4090-9681-CC7F7FABDC71}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LuceneNet303r2.Tests", "..\LuceneNet303r2\LuceneNet303r2.Tests\LuceneNet303r2.Tests.csproj", "{5A7681A5-60D9-480B-9AC7-63E0812A2548}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DtoImporterService", "DtoImporterService\DtoImporterService.csproj", "{401865F5-1942-4713-B230-04544C0A97B0}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AudibleApiDTOs", "..\audible api\AudibleApi\AudibleApiDTOs\AudibleApiDTOs.csproj", "{C03C5D65-3B7F-453B-972F-23950B7E0604}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AudibleApiDTOs.Tests", "..\audible api\AudibleApi\_Tests\AudibleApiDTOs.Tests\AudibleApiDTOs.Tests.csproj", "{6069D7F6-BEA0-4917-AFD4-4EB680CB0EDD}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AudibleApiClientExample", "..\audible api\AudibleApi\_Demos\AudibleApiClientExample\AudibleApiClientExample.csproj", "{282EEE16-F569-47E1-992F-C6DB8AEC7AA6}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ApplicationServices", "ApplicationServices\ApplicationServices.csproj", "{B95650EA-25F0-449E-BA5D-99126BC5D730}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Dinah.Core.WindowsDesktop", "..\Dinah.Core\Dinah.Core.WindowsDesktop\Dinah.Core.WindowsDesktop.csproj", "{059CE32C-9AD6-45E9-A166-790DFFB0B730}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibationLauncher", "LibationLauncher\LibationLauncher.csproj", "{F3B04A3A-20C8-4582-A54A-715AF6A5D859}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "0 Libation Tests", "0 Libation Tests", "{67E66E82-5532-4440-AFB3-9FB1DF9DEF53}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "InternalUtilities.Tests", "_Tests\InternalUtilities.Tests\InternalUtilities.Tests.csproj", "{8447C956-B03E-4F59-9DD4-877793B849D9}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibationSearchEngine.Tests", "_Tests\LibationSearchEngine.Tests\LibationSearchEngine.Tests.csproj", "{C5B21768-C7C9-4FCB-AC1E-187B223D5A98}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Dinah.EntityFrameworkCore.Tests", "..\Dinah.Core\_Tests\Dinah.EntityFrameworkCore.Tests\Dinah.EntityFrameworkCore.Tests.csproj", "{6F5131A0-09AE-4707-B82B-5E53CB74688E}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AAXClean", "..\AAXClean\AAXClean.csproj", "{94BEB7CC-511D-45AB-9F09-09BE858EE486}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Hoopla", "Hoopla\Hoopla.csproj", "{D8F56E5A-3E65-41A6-B7E7-C4515A264B1F}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{8BD8E012-F44F-4EE2-A234-D66C14D5FE4B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8BD8E012-F44F-4EE2-A234-D66C14D5FE4B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8BD8E012-F44F-4EE2-A234-D66C14D5FE4B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8BD8E012-F44F-4EE2-A234-D66C14D5FE4B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{1AE65B61-9C05-4C80-ABFF-48F16E22FDF1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1AE65B61-9C05-4C80-ABFF-48F16E22FDF1}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1AE65B61-9C05-4C80-ABFF-48F16E22FDF1}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{1AE65B61-9C05-4C80-ABFF-48F16E22FDF1}.Release|Any CPU.Build.0 = Release|Any CPU
-		{59A10DF3-63EC-43F1-A3BF-4000CFA118D2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{59A10DF3-63EC-43F1-A3BF-4000CFA118D2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{59A10DF3-63EC-43F1-A3BF-4000CFA118D2}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{59A10DF3-63EC-43F1-A3BF-4000CFA118D2}.Release|Any CPU.Build.0 = Release|Any CPU
-		{393B5B27-D15C-4F77-9457-FA14BA8F3C73}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{393B5B27-D15C-4F77-9457-FA14BA8F3C73}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{393B5B27-D15C-4F77-9457-FA14BA8F3C73}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{393B5B27-D15C-4F77-9457-FA14BA8F3C73}.Release|Any CPU.Build.0 = Release|Any CPU
-		{06882742-27A6-4347-97D9-56162CEC9C11}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{06882742-27A6-4347-97D9-56162CEC9C11}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{06882742-27A6-4347-97D9-56162CEC9C11}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{06882742-27A6-4347-97D9-56162CEC9C11}.Release|Any CPU.Build.0 = Release|Any CPU
-		{2E1F5DB4-40CC-4804-A893-5DCE0193E598}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2E1F5DB4-40CC-4804-A893-5DCE0193E598}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2E1F5DB4-40CC-4804-A893-5DCE0193E598}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{2E1F5DB4-40CC-4804-A893-5DCE0193E598}.Release|Any CPU.Build.0 = Release|Any CPU
-		{9F1AA3DE-962F-469B-82B2-46F93491389B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9F1AA3DE-962F-469B-82B2-46F93491389B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9F1AA3DE-962F-469B-82B2-46F93491389B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{9F1AA3DE-962F-469B-82B2-46F93491389B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E874D000-AD3A-4629-AC65-7219C2C7C1F0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E874D000-AD3A-4629-AC65-7219C2C7C1F0}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E874D000-AD3A-4629-AC65-7219C2C7C1F0}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E874D000-AD3A-4629-AC65-7219C2C7C1F0}.Release|Any CPU.Build.0 = Release|Any CPU
-		{FF12ADA0-8975-4E67-B6EA-4AC82E0C8994}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{FF12ADA0-8975-4E67-B6EA-4AC82E0C8994}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FF12ADA0-8975-4E67-B6EA-4AC82E0C8994}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{FF12ADA0-8975-4E67-B6EA-4AC82E0C8994}.Release|Any CPU.Build.0 = Release|Any CPU
-		{AD1FDDC9-8D2A-436A-8EED-91FD74E7C7B4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{AD1FDDC9-8D2A-436A-8EED-91FD74E7C7B4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{AD1FDDC9-8D2A-436A-8EED-91FD74E7C7B4}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{AD1FDDC9-8D2A-436A-8EED-91FD74E7C7B4}.Release|Any CPU.Build.0 = Release|Any CPU
-		{7EA01F9C-E579-4B01-A3B9-733B49DD0B60}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7EA01F9C-E579-4B01-A3B9-733B49DD0B60}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7EA01F9C-E579-4B01-A3B9-733B49DD0B60}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{7EA01F9C-E579-4B01-A3B9-733B49DD0B60}.Release|Any CPU.Build.0 = Release|Any CPU
-		{111420E2-D4F0-4068-B46A-C4B6DCC823DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{111420E2-D4F0-4068-B46A-C4B6DCC823DC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{111420E2-D4F0-4068-B46A-C4B6DCC823DC}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{111420E2-D4F0-4068-B46A-C4B6DCC823DC}.Release|Any CPU.Build.0 = Release|Any CPU
-		{635F00E1-AAD1-45F7-BEB7-D909AD33B9F6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{635F00E1-AAD1-45F7-BEB7-D909AD33B9F6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{635F00E1-AAD1-45F7-BEB7-D909AD33B9F6}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{635F00E1-AAD1-45F7-BEB7-D909AD33B9F6}.Release|Any CPU.Build.0 = Release|Any CPU
-		{0807616A-A77A-4B08-A65A-1582B09E114B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0807616A-A77A-4B08-A65A-1582B09E114B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0807616A-A77A-4B08-A65A-1582B09E114B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{0807616A-A77A-4B08-A65A-1582B09E114B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{9E951521-2587-4FC6-AD26-FAA9179FB6C4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9E951521-2587-4FC6-AD26-FAA9179FB6C4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9E951521-2587-4FC6-AD26-FAA9179FB6C4}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{9E951521-2587-4FC6-AD26-FAA9179FB6C4}.Release|Any CPU.Build.0 = Release|Any CPU
-		{1255D9BA-CE6E-42E4-A253-6376540B9661}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1255D9BA-CE6E-42E4-A253-6376540B9661}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1255D9BA-CE6E-42E4-A253-6376540B9661}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{1255D9BA-CE6E-42E4-A253-6376540B9661}.Release|Any CPU.Build.0 = Release|Any CPU
-		{35803735-B669-4090-9681-CC7F7FABDC71}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{35803735-B669-4090-9681-CC7F7FABDC71}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{35803735-B669-4090-9681-CC7F7FABDC71}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{35803735-B669-4090-9681-CC7F7FABDC71}.Release|Any CPU.Build.0 = Release|Any CPU
-		{5A7681A5-60D9-480B-9AC7-63E0812A2548}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5A7681A5-60D9-480B-9AC7-63E0812A2548}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5A7681A5-60D9-480B-9AC7-63E0812A2548}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{5A7681A5-60D9-480B-9AC7-63E0812A2548}.Release|Any CPU.Build.0 = Release|Any CPU
-		{401865F5-1942-4713-B230-04544C0A97B0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{401865F5-1942-4713-B230-04544C0A97B0}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{401865F5-1942-4713-B230-04544C0A97B0}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{401865F5-1942-4713-B230-04544C0A97B0}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C03C5D65-3B7F-453B-972F-23950B7E0604}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C03C5D65-3B7F-453B-972F-23950B7E0604}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C03C5D65-3B7F-453B-972F-23950B7E0604}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C03C5D65-3B7F-453B-972F-23950B7E0604}.Release|Any CPU.Build.0 = Release|Any CPU
-		{6069D7F6-BEA0-4917-AFD4-4EB680CB0EDD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6069D7F6-BEA0-4917-AFD4-4EB680CB0EDD}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6069D7F6-BEA0-4917-AFD4-4EB680CB0EDD}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{6069D7F6-BEA0-4917-AFD4-4EB680CB0EDD}.Release|Any CPU.Build.0 = Release|Any CPU
-		{282EEE16-F569-47E1-992F-C6DB8AEC7AA6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{282EEE16-F569-47E1-992F-C6DB8AEC7AA6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{282EEE16-F569-47E1-992F-C6DB8AEC7AA6}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{282EEE16-F569-47E1-992F-C6DB8AEC7AA6}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B95650EA-25F0-449E-BA5D-99126BC5D730}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{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
-		{059CE32C-9AD6-45E9-A166-790DFFB0B730}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{059CE32C-9AD6-45E9-A166-790DFFB0B730}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{059CE32C-9AD6-45E9-A166-790DFFB0B730}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{059CE32C-9AD6-45E9-A166-790DFFB0B730}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F3B04A3A-20C8-4582-A54A-715AF6A5D859}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F3B04A3A-20C8-4582-A54A-715AF6A5D859}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F3B04A3A-20C8-4582-A54A-715AF6A5D859}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F3B04A3A-20C8-4582-A54A-715AF6A5D859}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8447C956-B03E-4F59-9DD4-877793B849D9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8447C956-B03E-4F59-9DD4-877793B849D9}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8447C956-B03E-4F59-9DD4-877793B849D9}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8447C956-B03E-4F59-9DD4-877793B849D9}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C5B21768-C7C9-4FCB-AC1E-187B223D5A98}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C5B21768-C7C9-4FCB-AC1E-187B223D5A98}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C5B21768-C7C9-4FCB-AC1E-187B223D5A98}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C5B21768-C7C9-4FCB-AC1E-187B223D5A98}.Release|Any CPU.Build.0 = Release|Any CPU
-		{6F5131A0-09AE-4707-B82B-5E53CB74688E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6F5131A0-09AE-4707-B82B-5E53CB74688E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6F5131A0-09AE-4707-B82B-5E53CB74688E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{6F5131A0-09AE-4707-B82B-5E53CB74688E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{94BEB7CC-511D-45AB-9F09-09BE858EE486}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{94BEB7CC-511D-45AB-9F09-09BE858EE486}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{94BEB7CC-511D-45AB-9F09-09BE858EE486}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{94BEB7CC-511D-45AB-9F09-09BE858EE486}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D8F56E5A-3E65-41A6-B7E7-C4515A264B1F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{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
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{8BD8E012-F44F-4EE2-A234-D66C14D5FE4B} = {7FBBB086-0807-4998-85BF-6D1A49C8AD05}
-		{1AE65B61-9C05-4C80-ABFF-48F16E22FDF1} = {7FBBB086-0807-4998-85BF-6D1A49C8AD05}
-		{59A10DF3-63EC-43F1-A3BF-4000CFA118D2} = {751093DD-5DBA-463E-ADBE-E05FAFB6983E}
-		{393B5B27-D15C-4F77-9457-FA14BA8F3C73} = {41CDCC73-9B81-49DD-9570-C54406E852AF}
-		{06882742-27A6-4347-97D9-56162CEC9C11} = {F0CBB7A7-D3FB-41FF-8F47-CF3F6A592249}
-		{2E1F5DB4-40CC-4804-A893-5DCE0193E598} = {41CDCC73-9B81-49DD-9570-C54406E852AF}
-		{9F1AA3DE-962F-469B-82B2-46F93491389B} = {F61184E7-2426-4A13-ACEF-5689928E2CE2}
-		{E874D000-AD3A-4629-AC65-7219C2C7C1F0} = {38E6C6D9-963A-4C5B-89F4-F2F14885ADFD}
-		{FF12ADA0-8975-4E67-B6EA-4AC82E0C8994} = {38E6C6D9-963A-4C5B-89F4-F2F14885ADFD}
-		{AD1FDDC9-8D2A-436A-8EED-91FD74E7C7B4} = {38E6C6D9-963A-4C5B-89F4-F2F14885ADFD}
-		{7EA01F9C-E579-4B01-A3B9-733B49DD0B60} = {7FBBB086-0807-4998-85BF-6D1A49C8AD05}
-		{111420E2-D4F0-4068-B46A-C4B6DCC823DC} = {38E6C6D9-963A-4C5B-89F4-F2F14885ADFD}
-		{635F00E1-AAD1-45F7-BEB7-D909AD33B9F6} = {8679CAC8-9164-4007-BDD2-F004810EDA14}
-		{0807616A-A77A-4B08-A65A-1582B09E114B} = {8679CAC8-9164-4007-BDD2-F004810EDA14}
-		{9E951521-2587-4FC6-AD26-FAA9179FB6C4} = {43E3ACB3-E0BC-4370-8DBB-E3720C8C8FD1}
-		{1255D9BA-CE6E-42E4-A253-6376540B9661} = {43E3ACB3-E0BC-4370-8DBB-E3720C8C8FD1}
-		{35803735-B669-4090-9681-CC7F7FABDC71} = {7FBBB086-0807-4998-85BF-6D1A49C8AD05}
-		{5A7681A5-60D9-480B-9AC7-63E0812A2548} = {38E6C6D9-963A-4C5B-89F4-F2F14885ADFD}
-		{401865F5-1942-4713-B230-04544C0A97B0} = {41CDCC73-9B81-49DD-9570-C54406E852AF}
-		{C03C5D65-3B7F-453B-972F-23950B7E0604} = {7FBBB086-0807-4998-85BF-6D1A49C8AD05}
-		{6069D7F6-BEA0-4917-AFD4-4EB680CB0EDD} = {38E6C6D9-963A-4C5B-89F4-F2F14885ADFD}
-		{282EEE16-F569-47E1-992F-C6DB8AEC7AA6} = {F61184E7-2426-4A13-ACEF-5689928E2CE2}
-		{B95650EA-25F0-449E-BA5D-99126BC5D730} = {41CDCC73-9B81-49DD-9570-C54406E852AF}
-		{059CE32C-9AD6-45E9-A166-790DFFB0B730} = {43E3ACB3-E0BC-4370-8DBB-E3720C8C8FD1}
-		{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}
-		{6F5131A0-09AE-4707-B82B-5E53CB74688E} = {38E6C6D9-963A-4C5B-89F4-F2F14885ADFD}
-		{94BEB7CC-511D-45AB-9F09-09BE858EE486} = {7FBBB086-0807-4998-85BF-6D1A49C8AD05}
-		{D8F56E5A-3E65-41A6-B7E7-C4515A264B1F} = {7FBBB086-0807-4998-85BF-6D1A49C8AD05}
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {615E00ED-BAEF-4E8E-A92A-9B82D87942A9}
-	EndGlobalSection
-EndGlobal

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.5.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/BookLiberation/AudioConvertForm.cs

@@ -1,24 +0,0 @@
-using DataLayer;
-using System;
-
-namespace LibationWinForms.BookLiberation
-{
-	class AudioConvertForm : AudioDecodeForm
-	{
-		#region AudioDecodeForm overrides
-		public override string DecodeActionName => "Converting";
-		#endregion
-
-		#region IProcessable event handler overrides
-		public override void OnBegin(object sender, LibraryBook libraryBook)
-		{
-			LogMe.Info($"Convert Step, Begin: {libraryBook.Book}");
-
-			base.OnBegin(sender, libraryBook);
-		}
-		public override void OnCompleted(object sender, LibraryBook libraryBook)
-			=> LogMe.Info($"Convert Step, Completed: {libraryBook.Book}{Environment.NewLine}");
-
-		#endregion
-	}
-}

LibationWinForms/BookLiberation/AudioDecodeForm.cs

@@ -1,92 +0,0 @@
-using DataLayer;
-using Dinah.Core.Net.Http;
-using Dinah.Core.Windows.Forms;
-using LibationWinForms.BookLiberation.BaseForms;
-using System;
-
-namespace LibationWinForms.BookLiberation
-{
-	public partial class AudioDecodeForm : LiberationBaseForm
-	{
-		public virtual string DecodeActionName { get; } = "Decoding";
-		public AudioDecodeForm() => InitializeComponent();
-
-		private Func<byte[]> GetCoverArtDelegate;
-
-		// book info
-		private string title;
-		private string authorNames;
-		private string narratorNames;
-
-		#region IProcessable event handler overrides
-		public override void OnBegin(object sender, LibraryBook libraryBook)
-		{
-			GetCoverArtDelegate = () => FileManager.PictureStorage.GetPictureSynchronously(
-						new FileManager.PictureDefinition(
-							libraryBook.Book.PictureId,
-							FileManager.PictureSize._500x500));
-
-			//Set default values from library
-			OnTitleDiscovered(sender, libraryBook.Book.Title);
-			OnAuthorsDiscovered(sender, string.Join(", ", libraryBook.Book.Authors));
-			OnNarratorsDiscovered(sender, string.Join(", ", libraryBook.Book.NarratorNames));
-			OnCoverImageDiscovered(sender,
-					FileManager.PictureStorage.GetPicture(
-						new FileManager.PictureDefinition(
-							libraryBook.Book.PictureId,
-							FileManager.PictureSize._80x80)).bytes);
-		}
-		#endregion
-
-		#region IStreamable event handler overrides
-		public override void OnStreamingProgressChanged(object sender, DownloadProgress downloadProgress)
-		{
-			if (!downloadProgress.ProgressPercentage.HasValue)
-				return;
-
-			if (downloadProgress.ProgressPercentage == 0)
-				updateRemainingTime(0);
-			else
-				progressBar1.UIThread(() => progressBar1.Value = (int)downloadProgress.ProgressPercentage);
-		}
-
-		public override void OnStreamingTimeRemaining(object sender, TimeSpan timeRemaining)
-			=> updateRemainingTime((int)timeRemaining.TotalSeconds);
-
-		#endregion
-
-		#region IAudioDecodable event handlers
-		public override void OnRequestCoverArt(object sender, Action<byte[]> setCoverArtDelegate)
-			=> setCoverArtDelegate(GetCoverArtDelegate?.Invoke());
-
-		public override void OnTitleDiscovered(object sender, string title)
-		{
-			this.UIThread(() => this.Text = DecodeActionName + " " + title);
-			this.title = title;
-			updateBookInfo();
-		}
-
-		public override void OnAuthorsDiscovered(object sender, string authors)
-		{
-			authorNames = authors;
-			updateBookInfo();
-		}
-
-		public override void OnNarratorsDiscovered(object sender, string narrators)
-		{
-			narratorNames = narrators;
-			updateBookInfo();
-		}
-
-		public override void OnCoverImageDiscovered(object sender, byte[] coverArt) 
-			=> pictureBox1.UIThread(() => 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}");
-
-		private void updateRemainingTime(int remaining)
-			=> remainingTimeLbl.UIThread(() => remainingTimeLbl.Text = $"ETA:\r\n{remaining} sec");
-	}
-}

LibationWinForms/BookLiberation/AudioDecryptForm.cs

@@ -1,24 +0,0 @@
-using DataLayer;
-using System;
-
-namespace LibationWinForms.BookLiberation
-{
-	class AudioDecryptForm : AudioDecodeForm
-	{
-		#region AudioDecodeForm overrides
-		public override string DecodeActionName => "Decrypting";
-		#endregion
-
-		#region IProcessable event handler overrides
-		public override void OnBegin(object sender, LibraryBook libraryBook)
-		{
-			LogMe.Info($"Download & Decrypt Step, Begin: {libraryBook.Book}");
-
-			base.OnBegin(sender, libraryBook);
-		}
-		public override void OnCompleted(object sender, LibraryBook libraryBook)
-			=> LogMe.Info($"Download & Decrypt Step, Completed: {libraryBook.Book}{Environment.NewLine}");
-
-		#endregion
-	}
-}

LibationWinForms/BookLiberation/BaseForms/LiberationBaseForm.cs

@@ -1,160 +0,0 @@
-using DataLayer;
-using Dinah.Core.Net.Http;
-using Dinah.Core.Threading;
-using FileLiberator;
-using System;
-using System.Windows.Forms;
-
-namespace LibationWinForms.BookLiberation.BaseForms
-{
-	public class LiberationBaseForm : Form
-	{
-		protected IStreamable Streamable { get; private set; }
-		protected LogMe LogMe { get; private set; }
-		private SynchronizeInvoker Invoker { get; init; } 
-
-		public LiberationBaseForm()
-		{
-			//SynchronizationContext.Current will be null until the process contains a Form.
-			//If this is the first form created, it will not exist until after execution
-			//reaches inside the constructor (after base class has been initialized).
-			Invoker = new SynchronizeInvoker();
-		}
-
-		public void RegisterFileLiberator(IStreamable streamable, LogMe logMe = null)
-		{
-			if (streamable is null) return;
-
-			Streamable = streamable;
-			LogMe = logMe;
-
-			Subscribe(streamable);
-
-			if (Streamable is IProcessable processable)
-				Subscribe(processable);
-			if (Streamable is IAudioDecodable audioDecodable)
-				Subscribe(audioDecodable);
-		}
-
-		#region Event Subscribers and Unsubscribers
-		private void Subscribe(IStreamable streamable)
-		{
-			UnsubscribeStreamable(this, EventArgs.Empty);
-
-			streamable.StreamingBegin += OnStreamingBeginShow;
-			streamable.StreamingBegin += OnStreamingBegin;
-			streamable.StreamingProgressChanged += OnStreamingProgressChanged;
-			streamable.StreamingTimeRemaining += OnStreamingTimeRemaining;
-			streamable.StreamingCompleted += OnStreamingCompleted;
-			streamable.StreamingCompleted += OnStreamingCompletedClose;
-
-			Disposed += UnsubscribeStreamable;
-		}
-		private void Subscribe(IProcessable processable)
-		{
-			UnsubscribeProcessable(this, null);
-
-			processable.Begin += OnBegin;
-			processable.StatusUpdate += OnStatusUpdate;
-			processable.Completed += OnCompleted;
-
-			//The form is created on IProcessable.Begin and we
-			//dispose of it on IProcessable.Completed
-			processable.Completed += OnCompletedDispose;
-
-			//Don't unsubscribe from Dispose because it fires when
-			//IStreamable.StreamingCompleted closes the form, and
-			//the IProcessable events need to live past that event.
-			processable.Completed += UnsubscribeProcessable;
-		}
-		private void Subscribe(IAudioDecodable audioDecodable)
-		{
-			UnsubscribeAudioDecodable(this, EventArgs.Empty);
-
-			audioDecodable.RequestCoverArt += OnRequestCoverArt;
-			audioDecodable.TitleDiscovered += OnTitleDiscovered;
-			audioDecodable.AuthorsDiscovered += OnAuthorsDiscovered;
-			audioDecodable.NarratorsDiscovered += OnNarratorsDiscovered;
-			audioDecodable.CoverImageDiscovered += OnCoverImageDiscovered;
-
-			Disposed += UnsubscribeAudioDecodable;
-		}
-		private void UnsubscribeStreamable(object sender, EventArgs e)
-		{
-			Disposed -= UnsubscribeStreamable;
-
-			Streamable.StreamingBegin -= OnStreamingBeginShow;
-			Streamable.StreamingBegin -= OnStreamingBegin;
-			Streamable.StreamingProgressChanged -= OnStreamingProgressChanged;
-			Streamable.StreamingTimeRemaining -= OnStreamingTimeRemaining;
-			Streamable.StreamingCompleted -= OnStreamingCompleted;
-			Streamable.StreamingCompleted -= OnStreamingCompletedClose;
-		}
-		private void UnsubscribeProcessable(object sender, LibraryBook e)
-		{
-			if (Streamable is not IProcessable processable)
-				return;
-
-			processable.Completed -= UnsubscribeProcessable;
-			processable.Completed -= OnCompletedDispose;
-			processable.Completed -= OnCompleted;
-			processable.StatusUpdate -= OnStatusUpdate;
-			processable.Begin -= OnBegin;
-		}
-		private void UnsubscribeAudioDecodable(object sender, EventArgs e)
-		{
-			if (Streamable is not IAudioDecodable audioDecodable)
-				return;
-
-			Disposed -= UnsubscribeAudioDecodable;
-			audioDecodable.RequestCoverArt -= OnRequestCoverArt;
-			audioDecodable.TitleDiscovered -= OnTitleDiscovered;
-			audioDecodable.AuthorsDiscovered -= OnAuthorsDiscovered;
-			audioDecodable.NarratorsDiscovered -= OnNarratorsDiscovered;
-			audioDecodable.CoverImageDiscovered -= OnCoverImageDiscovered;
-
-			audioDecodable.Cancel();
-		}
-		#endregion
-
-		#region Form creation and disposal handling
-
-		/// <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);
-
-		/// <summary>
-		/// If StreamingBegin is fired from a worker thread, the window will be created on that
-		/// worker thread. We need to make certain that we show the window on the UI thread (same 
-		/// thread that created form), otherwise the renderer will be on a worker thread which 
-		/// 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);
-		
-		#endregion
-
-		#region IStreamable event handlers
-		public virtual void OnStreamingBegin(object sender, string beginString) { }
-		public virtual void OnStreamingProgressChanged(object sender, DownloadProgress downloadProgress) { }
-		public virtual void OnStreamingTimeRemaining(object sender, TimeSpan timeRemaining) { }
-		public virtual void OnStreamingCompleted(object sender, string completedString) { }
-		#endregion
-
-		#region IProcessable event handlers
-		public virtual void OnBegin(object sender, LibraryBook libraryBook) { }
-		public virtual void OnStatusUpdate(object sender, string statusUpdate) { }
-		public virtual void OnCompleted(object sender, LibraryBook libraryBook) { }
-		#endregion
-
-		#region IAudioDecodable event handlers
-		public virtual void OnRequestCoverArt(object sender, Action<byte[]> setCoverArtDelegate) { }
-		public virtual void OnTitleDiscovered(object sender, string title) { }
-		public virtual void OnAuthorsDiscovered(object sender, string authors) { }
-		public virtual void OnNarratorsDiscovered(object sender, string narrators) { }
-		public virtual void OnCoverImageDiscovered(object sender, byte[] coverArt) { }
-		#endregion
-	}
-}

LibationWinForms/BookLiberation/PdfDownloadForm.cs

@@ -1,10 +0,0 @@
-using DataLayer;
-
-namespace LibationWinForms.BookLiberation
-{
-	internal class PdfDownloadForm : DownloadForm
-	{
-		public override void OnBegin(object sender, LibraryBook libraryBook) => LogMe.Info($"PDF Step, Begin: {libraryBook.Book}");
-		public override void OnCompleted(object sender, LibraryBook libraryBook) => LogMe.Info($"PDF Step, Completed: {libraryBook.Book}");
-	}
-}

LibationWinForms/Dialogs/IndexLibraryDialog.Designer.cs

@@ -1,65 +0,0 @@
-namespace LibationWinForms.Dialogs
-{
-	partial class IndexLibraryDialog
-	{
-		/// <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.label1 = new System.Windows.Forms.Label();
-			this.SuspendLayout();
-			// 
-			// label1
-			// 
-			this.label1.AutoSize = true;
-			this.label1.Location = new System.Drawing.Point(28, 24);
-			this.label1.Name = "label1";
-			this.label1.Size = new System.Drawing.Size(263, 13);
-			this.label1.TabIndex = 0;
-			this.label1.Text = "Scanning Audible library. This may take a few minutes";
-			// 
-			// IndexLibraryDialog
-			// 
-			this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-			this.ClientSize = new System.Drawing.Size(440, 63);
-			this.Controls.Add(this.label1);
-			this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
-			this.MaximizeBox = false;
-			this.MinimizeBox = false;
-			this.Name = "IndexLibraryDialog";
-			this.ShowIcon = false;
-			this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
-			this.Text = "Scan Library";
-			this.ResumeLayout(false);
-			this.PerformLayout();
-
-		}
-
-		#endregion
-
-		private System.Windows.Forms.Label label1;
-	}
-}

LibationWinForms/Dialogs/IndexLibraryDialog.cs

@@ -1,49 +0,0 @@
-using ApplicationServices;
-using InternalUtilities;
-using LibationWinForms.Login;
-using System;
-using System.Linq;
-using System.Windows.Forms;
-
-namespace LibationWinForms.Dialogs
-{
-	public partial class IndexLibraryDialog : Form
-	{
-		private Account[] _accounts { get; }
-
-		public int NewBooksAdded { get; private set; }
-		public int TotalBooksProcessed { get; private set; }
-
-		public IndexLibraryDialog(params Account[] accounts)
-		{
-			_accounts = accounts;
-			InitializeComponent();
-			this.Shown += IndexLibraryDialog_Shown;
-		}
-
-		private async void IndexLibraryDialog_Shown(object sender, EventArgs e)
-		{
-			if (_accounts != null && _accounts.Length > 0)
-			{
-				this.label1.Text
-					= (_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.";
-
-				try
-				{
-					(TotalBooksProcessed, NewBooksAdded) = await LibraryCommands.ImportAccountAsync((account) => new WinformResponder(account), _accounts);
-				}
-				catch (Exception ex)
-				{
-					MessageBoxAlertAdmin.Show(
-						"Error importing library. Please try again. If this still happens after 2 or 3 tries, stop and contact administrator",
-						"Error importing library",
-						ex);
-				}
-			}
-
-			this.Close();
-		}
-	}
-}

LibationWinForms/Dialogs/RemoveBooksDialog.Designer.cs

@@ -1,189 +0,0 @@
-
-namespace LibationWinForms.Dialogs
-{
-    partial class RemoveBooksDialog
-    {
-        /// <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.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) 
-            | 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.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();
-
-        }
-
-        #endregion
-
-        private System.Windows.Forms.DataGridView _dataGridView;
-        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;
-    }
-}

LibationWinForms/Dialogs/SettingsDialog.Designer.cs

@@ -1,251 +0,0 @@
-namespace LibationWinForms.Dialogs
-{
-	partial class SettingsDialog
-	{
-		/// <summary>
-		/// Required designer variable.
-		/// </summary>
-		private System.ComponentModel.IContainer components = null;
-
-		/// <summary>
-		/// Clean up any resources being used.
-		/// </summary>
-		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-		protected override void Dispose(bool disposing)
-		{
-			if (disposing && (components != null))
-			{
-				components.Dispose();
-			}
-			base.Dispose(disposing);
-		}
-
-		#region Windows Form Designer generated code
-
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent()
-		{
-			this.booksLocationDescLbl = new System.Windows.Forms.Label();
-			this.inProgressDescLbl = new System.Windows.Forms.Label();
-			this.saveBtn = new System.Windows.Forms.Button();
-			this.cancelBtn = new System.Windows.Forms.Button();
-			this.advancedSettingsGb = new System.Windows.Forms.GroupBox();
-			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.booksGb.SuspendLayout();
-			this.SuspendLayout();
-			// 
-			// booksLocationDescLbl
-			// 
-			this.booksLocationDescLbl.AutoSize = true;
-			this.booksLocationDescLbl.Location = new System.Drawing.Point(7, 19);
-			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.Text = "[book desc]";
-			// 
-			// inProgressDescLbl
-			// 
-			this.inProgressDescLbl.AutoSize = true;
-			this.inProgressDescLbl.Location = new System.Drawing.Point(8, 127);
-			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.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.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.Text = "Save";
-			this.saveBtn.UseVisualStyleBackColor = true;
-			this.saveBtn.Click += new System.EventHandler(this.saveBtn_Click);
-			// 
-			// cancelBtn
-			// 
-			this.cancelBtn.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-			this.cancelBtn.DialogResult = System.Windows.Forms.DialogResult.Cancel;
-			this.cancelBtn.Location = new System.Drawing.Point(832, 419);
-			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.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) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-			this.advancedSettingsGb.Controls.Add(this.convertLossyRb);
-			this.advancedSettingsGb.Controls.Add(this.convertLosslessRb);
-			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.TabStop = false;
-			this.advancedSettingsGb.Text = "Advanced settings for control freaks";
-			// 
-			// convertLossyRb
-			// 
-			this.convertLossyRb.AutoSize = true;
-			this.convertLossyRb.Location = new System.Drawing.Point(7, 88);
-			this.convertLossyRb.Name = "convertLossyRb";
-			this.convertLossyRb.Size = new System.Drawing.Size(242, 19);
-			this.convertLossyRb.TabIndex = 0;
-			this.convertLossyRb.Text = "Download my books as .MP3 files (Lossy)";
-			this.convertLossyRb.UseVisualStyleBackColor = true;
-			// 
-			// convertLosslessRb
-			// 
-			this.convertLosslessRb.AutoSize = true;
-			this.convertLosslessRb.Checked = true;
-			this.convertLosslessRb.Location = new System.Drawing.Point(7, 63);
-			this.convertLosslessRb.Name = "convertLosslessRb";
-			this.convertLosslessRb.Size = new System.Drawing.Size(327, 19);
-			this.convertLosslessRb.TabIndex = 0;
-			this.convertLosslessRb.TabStop = true;
-			this.convertLosslessRb.Text = "Download my books as .M4B files (Lossless Mp4a format)";
-			this.convertLosslessRb.UseVisualStyleBackColor = true;
-			// 
-			// inProgressSelectControl
-			// 
-			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.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);
-			// 
-			// 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.Text = "Open log folder";
-			this.logsBtn.UseVisualStyleBackColor = true;
-			this.logsBtn.Click += new System.EventHandler(this.logsBtn_Click);
-			// 
-			// booksSelectControl
-			// 
-			this.booksSelectControl.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-			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;
-			// 
-			// booksGb
-			// 
-			this.booksGb.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-			this.booksGb.Controls.Add(this.booksSelectControl);
-			this.booksGb.Controls.Add(this.booksLocationDescLbl);
-			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.TabStop = false;
-			this.booksGb.Text = "Books location";
-			// 
-			// loggingLevelLbl
-			// 
-			this.loggingLevelLbl.AutoSize = true;
-			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.Text = "Logging level";
-			// 
-			// loggingLevelCb
-			// 
-			this.loggingLevelCb.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-			this.loggingLevelCb.FormattingEnabled = true;
-			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;
-			// 
-			// SettingsDialog
-			// 
-			this.AcceptButton = this.saveBtn;
-			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.Controls.Add(this.logsBtn);
-			this.Controls.Add(this.loggingLevelCb);
-			this.Controls.Add(this.loggingLevelLbl);
-			this.Controls.Add(this.booksGb);
-			this.Controls.Add(this.advancedSettingsGb);
-			this.Controls.Add(this.cancelBtn);
-			this.Controls.Add(this.saveBtn);
-			this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow;
-			this.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
-			this.Name = "SettingsDialog";
-			this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
-			this.Text = "Edit Settings";
-			this.Load += new System.EventHandler(this.SettingsDialog_Load);
-			this.advancedSettingsGb.ResumeLayout(false);
-			this.advancedSettingsGb.PerformLayout();
-			this.booksGb.ResumeLayout(false);
-			this.booksGb.PerformLayout();
-			this.ResumeLayout(false);
-			this.PerformLayout();
-
-		}
-
-		#endregion
-		private System.Windows.Forms.Label booksLocationDescLbl;
-		private System.Windows.Forms.Label inProgressDescLbl;
-		private System.Windows.Forms.Button saveBtn;
-		private System.Windows.Forms.Button cancelBtn;
-		private System.Windows.Forms.GroupBox advancedSettingsGb;
-        private System.Windows.Forms.CheckBox allowLibationFixupCbox;
-		private DirectoryOrCustomSelectControl booksSelectControl;
-		private DirectorySelectControl inProgressSelectControl;
-        private System.Windows.Forms.RadioButton convertLossyRb;
-        private System.Windows.Forms.RadioButton convertLosslessRb;
-		private System.Windows.Forms.GroupBox booksGb;
-		private System.Windows.Forms.Button logsBtn;
-		private System.Windows.Forms.Label loggingLevelLbl;
-		private System.Windows.Forms.ComboBox loggingLevelCb;
-	}
-}

LibationWinForms/Dialogs/SettingsDialog.cs

@@ -1,124 +0,0 @@
-using Dinah.Core;
-using FileManager;
-using System;
-using System.Linq;
-using System.IO;
-using System.Windows.Forms;
-
-namespace LibationWinForms.Dialogs
-{
-	public partial class SettingsDialog : Form
-	{
-		private Configuration config { get; } = Configuration.Instance;
-		private Func<string, string> desc { get; } = Configuration.GetDescription;
-
-		public SettingsDialog() => InitializeComponent();
-
-		private void SettingsDialog_Load(object sender, EventArgs e)
-		{
-			if (this.DesignMode)
-				return;
-
-			{
-				loggingLevelCb.Items.Clear();
-				foreach (var level in Enum<Serilog.Events.LogEventLevel>.GetValues())
-					loggingLevelCb.Items.Add(level);
-				loggingLevelCb.SelectedItem = config.LogLevel;
-			}
-
-			this.booksLocationDescLbl.Text = desc(nameof(config.Books));
-			this.inProgressDescLbl.Text = desc(nameof(config.InProgress));
-
-			booksSelectControl.SetSearchTitle("books location");
-			booksSelectControl.SetDirectoryItems(
-				new()
-				{
-					Configuration.KnownDirectories.UserProfile,
-					Configuration.KnownDirectories.AppDir,
-					Configuration.KnownDirectories.MyDocs
-				},
-				Configuration.KnownDirectories.UserProfile,
-				"Books");
-			booksSelectControl.SelectDirectory(config.Books);
-
-			allowLibationFixupCbox.Checked = config.AllowLibationFixup;
-			convertLosslessRb.Checked = !config.DecryptToLossy;
-			convertLossyRb.Checked = config.DecryptToLossy;
-
-			allowLibationFixupCbox_CheckedChanged(this, e);
-
-			inProgressSelectControl.SetDirectoryItems(new()
-			{
-				Configuration.KnownDirectories.WinTemp,
-				Configuration.KnownDirectories.UserProfile,
-				Configuration.KnownDirectories.AppDir,
-				Configuration.KnownDirectories.MyDocs,
-				Configuration.KnownDirectories.LibationFiles
-			}, Configuration.KnownDirectories.WinTemp);
-			inProgressSelectControl.SelectDirectory(config.InProgress);
-		}
-
-		private void allowLibationFixupCbox_CheckedChanged(object sender, EventArgs e)
-		{
-			convertLosslessRb.Enabled = allowLibationFixupCbox.Checked;
-			convertLossyRb.Enabled = allowLibationFixupCbox.Checked;
-
-			if (!allowLibationFixupCbox.Checked)
-			{
-				convertLosslessRb.Checked = true;
-			}
-		}
-
-		private void logsBtn_Click(object sender, EventArgs e) => Go.To.Folder(Configuration.Instance.LibationFiles);
-
-		private void saveBtn_Click(object sender, EventArgs e)
-		{
-			var newBooks = booksSelectControl.SelectedDirectory;
-
-			if (string.IsNullOrWhiteSpace(newBooks))
-			{
-				MessageBox.Show("Cannot set Books Location to blank", "Location is blank", MessageBoxButtons.OK, MessageBoxIcon.Error);
-				return;
-			}
-
-			if (!Directory.Exists(newBooks))
-			{
-				if (booksSelectControl.SelectedDirectoryIsCustom)
-				{
-					MessageBox.Show($"Not saving change to Books location. This folder does not exist:\r\n{newBooks}", "Folder does not exist", MessageBoxButtons.OK, MessageBoxIcon.Error);
-					return;
-				}
-
-				if (booksSelectControl.SelectedDirectoryIsKnown)
-					Directory.CreateDirectory(newBooks);
-			}
-
-			config.Books = newBooks;
-
-			{
-				var logLevelOld = config.LogLevel;
-				var logLevelNew = (Serilog.Events.LogEventLevel)loggingLevelCb.SelectedItem;
-
-				config.LogLevel = logLevelNew;
-
-				// only warn if changed during this time. don't want to warn every time user happens to change settings while level is verbose
-				if (logLevelOld != logLevelNew)
-					MessageBoxVerboseLoggingWarning.ShowIfTrue();
-			}
-
-			config.AllowLibationFixup = allowLibationFixupCbox.Checked;
-			config.DecryptToLossy = convertLossyRb.Checked;
-
-			config.InProgress = inProgressSelectControl.SelectedDirectory;
-
-			this.DialogResult = DialogResult.OK;
-			this.Close();
-		}
-
-		private void cancelBtn_Click(object sender, EventArgs e)
-		{
-			this.DialogResult = DialogResult.Cancel;
-			this.Close();
-		}
-	}
-}

LibationWinForms/Form1.Designer.cs

@@ -1,402 +0,0 @@
-namespace LibationWinForms
-{
-	partial class Form1
-	{
-		/// <summary>
-		/// Required designer variable.
-		/// </summary>
-		private System.ComponentModel.IContainer components = null;
-
-		/// <summary>
-		/// Clean up any resources being used.
-		/// </summary>
-		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-		protected override void Dispose(bool disposing)
-		{
-			if (disposing && (components != null))
-			{
-				components.Dispose();
-			}
-			base.Dispose(disposing);
-		}
-
-		#region Windows Form Designer generated code
-
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent()
-		{
-			System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Form1));
-			this.gridPanel = new System.Windows.Forms.Panel();
-			this.filterHelpBtn = new System.Windows.Forms.Button();
-			this.filterBtn = new System.Windows.Forms.Button();
-			this.filterSearchTb = new System.Windows.Forms.TextBox();
-			this.menuStrip1 = new System.Windows.Forms.MenuStrip();
-			this.importToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.noAccountsYetAddAccountToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.scanLibraryToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.scanLibraryOfAllAccountsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.scanLibraryOfSomeAccountsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.removeLibraryBooksToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.removeAllAccountsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.removeSomeAccountsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.liberateToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.beginBookBackupsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.beginPdfBackupsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.convertAllM4bToMp3ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.exportToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.exportLibraryToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.quickFiltersToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.firstFilterIsDefaultToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.editQuickFiltersToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();
-			this.settingsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.accountsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.basicSettingsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.statusStrip1 = new System.Windows.Forms.StatusStrip();
-			this.visibleCountLbl = new System.Windows.Forms.ToolStripStatusLabel();
-			this.springLbl = new System.Windows.Forms.ToolStripStatusLabel();
-			this.backupsCountsLbl = new System.Windows.Forms.ToolStripStatusLabel();
-			this.pdfsCountsLbl = new System.Windows.Forms.ToolStripStatusLabel();
-			this.addFilterBtn = new System.Windows.Forms.Button();
-			this.menuStrip1.SuspendLayout();
-			this.statusStrip1.SuspendLayout();
-			this.SuspendLayout();
-			// 
-			// gridPanel
-			// 
-			this.gridPanel.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-			this.gridPanel.Location = new System.Drawing.Point(14, 65);
-			this.gridPanel.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
-			this.gridPanel.Name = "gridPanel";
-			this.gridPanel.Size = new System.Drawing.Size(979, 445);
-			this.gridPanel.TabIndex = 5;
-			// 
-			// filterHelpBtn
-			// 
-			this.filterHelpBtn.Location = new System.Drawing.Point(14, 31);
-			this.filterHelpBtn.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
-			this.filterHelpBtn.Name = "filterHelpBtn";
-			this.filterHelpBtn.Size = new System.Drawing.Size(26, 27);
-			this.filterHelpBtn.TabIndex = 3;
-			this.filterHelpBtn.Text = "?";
-			this.filterHelpBtn.UseVisualStyleBackColor = true;
-			this.filterHelpBtn.Click += new System.EventHandler(this.filterHelpBtn_Click);
-			// 
-			// filterBtn
-			// 
-			this.filterBtn.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-			this.filterBtn.Location = new System.Drawing.Point(905, 31);
-			this.filterBtn.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
-			this.filterBtn.Name = "filterBtn";
-			this.filterBtn.Size = new System.Drawing.Size(88, 27);
-			this.filterBtn.TabIndex = 2;
-			this.filterBtn.Text = "Filter";
-			this.filterBtn.UseVisualStyleBackColor = true;
-			this.filterBtn.Click += new System.EventHandler(this.filterBtn_Click);
-			// 
-			// filterSearchTb
-			// 
-			this.filterSearchTb.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-			this.filterSearchTb.Location = new System.Drawing.Point(217, 33);
-			this.filterSearchTb.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
-			this.filterSearchTb.Name = "filterSearchTb";
-			this.filterSearchTb.Size = new System.Drawing.Size(681, 23);
-			this.filterSearchTb.TabIndex = 1;
-			this.filterSearchTb.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.filterSearchTb_KeyPress);
-			// 
-			// menuStrip1
-			// 
-			this.menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.importToolStripMenuItem,
-            this.liberateToolStripMenuItem,
-            this.exportToolStripMenuItem,
-            this.quickFiltersToolStripMenuItem,
-            this.settingsToolStripMenuItem});
-			this.menuStrip1.Location = new System.Drawing.Point(0, 0);
-			this.menuStrip1.Name = "menuStrip1";
-			this.menuStrip1.Padding = new System.Windows.Forms.Padding(7, 2, 0, 2);
-			this.menuStrip1.Size = new System.Drawing.Size(1007, 24);
-			this.menuStrip1.TabIndex = 0;
-			this.menuStrip1.Text = "menuStrip1";
-			// 
-			// importToolStripMenuItem
-			// 
-			this.importToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.noAccountsYetAddAccountToolStripMenuItem,
-            this.scanLibraryToolStripMenuItem,
-            this.scanLibraryOfAllAccountsToolStripMenuItem,
-            this.scanLibraryOfSomeAccountsToolStripMenuItem,
-            this.removeLibraryBooksToolStripMenuItem});
-			this.importToolStripMenuItem.Name = "importToolStripMenuItem";
-			this.importToolStripMenuItem.Size = new System.Drawing.Size(55, 20);
-			this.importToolStripMenuItem.Text = "&Import";
-			// 
-			// noAccountsYetAddAccountToolStripMenuItem
-			// 
-			this.noAccountsYetAddAccountToolStripMenuItem.Name = "noAccountsYetAddAccountToolStripMenuItem";
-			this.noAccountsYetAddAccountToolStripMenuItem.Size = new System.Drawing.Size(247, 22);
-			this.noAccountsYetAddAccountToolStripMenuItem.Text = "No accounts yet. A&dd Account...";
-			this.noAccountsYetAddAccountToolStripMenuItem.Click += new System.EventHandler(this.noAccountsYetAddAccountToolStripMenuItem_Click);
-			// 
-			// scanLibraryToolStripMenuItem
-			// 
-			this.scanLibraryToolStripMenuItem.Name = "scanLibraryToolStripMenuItem";
-			this.scanLibraryToolStripMenuItem.Size = new System.Drawing.Size(247, 22);
-			this.scanLibraryToolStripMenuItem.Text = "Scan &Library";
-			this.scanLibraryToolStripMenuItem.Click += new System.EventHandler(this.scanLibraryToolStripMenuItem_Click);
-			// 
-			// scanLibraryOfAllAccountsToolStripMenuItem
-			// 
-			this.scanLibraryOfAllAccountsToolStripMenuItem.Name = "scanLibraryOfAllAccountsToolStripMenuItem";
-			this.scanLibraryOfAllAccountsToolStripMenuItem.Size = new System.Drawing.Size(247, 22);
-			this.scanLibraryOfAllAccountsToolStripMenuItem.Text = "Scan Library of &All Accounts";
-			this.scanLibraryOfAllAccountsToolStripMenuItem.Click += new System.EventHandler(this.scanLibraryOfAllAccountsToolStripMenuItem_Click);
-			// 
-			// scanLibraryOfSomeAccountsToolStripMenuItem
-			// 
-			this.scanLibraryOfSomeAccountsToolStripMenuItem.Name = "scanLibraryOfSomeAccountsToolStripMenuItem";
-			this.scanLibraryOfSomeAccountsToolStripMenuItem.Size = new System.Drawing.Size(247, 22);
-			this.scanLibraryOfSomeAccountsToolStripMenuItem.Text = "Scan Library of &Some Accounts...";
-			this.scanLibraryOfSomeAccountsToolStripMenuItem.Click += new System.EventHandler(this.scanLibraryOfSomeAccountsToolStripMenuItem_Click);
-			// 
-			// removeLibraryBooksToolStripMenuItem
-			// 
-			this.removeLibraryBooksToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.removeAllAccountsToolStripMenuItem,
-            this.removeSomeAccountsToolStripMenuItem});
-			this.removeLibraryBooksToolStripMenuItem.Name = "removeLibraryBooksToolStripMenuItem";
-			this.removeLibraryBooksToolStripMenuItem.Size = new System.Drawing.Size(247, 22);
-			this.removeLibraryBooksToolStripMenuItem.Text = "Remove Library Books";
-			// 
-			// removeAllAccountsToolStripMenuItem
-			// 
-			this.removeAllAccountsToolStripMenuItem.Name = "removeAllAccountsToolStripMenuItem";
-			this.removeAllAccountsToolStripMenuItem.Size = new System.Drawing.Size(157, 22);
-			this.removeAllAccountsToolStripMenuItem.Text = "All Accounts";
-			this.removeAllAccountsToolStripMenuItem.Click += new System.EventHandler(this.removeAllAccountsToolStripMenuItem_Click);
-			// 
-			// removeSomeAccountsToolStripMenuItem
-			// 
-			this.removeSomeAccountsToolStripMenuItem.Name = "removeSomeAccountsToolStripMenuItem";
-			this.removeSomeAccountsToolStripMenuItem.Size = new System.Drawing.Size(157, 22);
-			this.removeSomeAccountsToolStripMenuItem.Text = "Some Accounts";
-			this.removeSomeAccountsToolStripMenuItem.Click += new System.EventHandler(this.removeSomeAccountsToolStripMenuItem_Click);
-			// 
-			// liberateToolStripMenuItem
-			// 
-			this.liberateToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.beginBookBackupsToolStripMenuItem,
-            this.beginPdfBackupsToolStripMenuItem,
-            this.convertAllM4bToMp3ToolStripMenuItem});
-			this.liberateToolStripMenuItem.Name = "liberateToolStripMenuItem";
-			this.liberateToolStripMenuItem.Size = new System.Drawing.Size(61, 20);
-			this.liberateToolStripMenuItem.Text = "&Liberate";
-			// 
-			// beginBookBackupsToolStripMenuItem
-			// 
-			this.beginBookBackupsToolStripMenuItem.Name = "beginBookBackupsToolStripMenuItem";
-			this.beginBookBackupsToolStripMenuItem.Size = new System.Drawing.Size(284, 22);
-			this.beginBookBackupsToolStripMenuItem.Text = "Begin &Book and PDF Backups: {0}";
-			this.beginBookBackupsToolStripMenuItem.Click += new System.EventHandler(this.beginBookBackupsToolStripMenuItem_Click);
-			// 
-			// beginPdfBackupsToolStripMenuItem
-			// 
-			this.beginPdfBackupsToolStripMenuItem.Name = "beginPdfBackupsToolStripMenuItem";
-			this.beginPdfBackupsToolStripMenuItem.Size = new System.Drawing.Size(284, 22);
-			this.beginPdfBackupsToolStripMenuItem.Text = "Begin &PDF Only Backups: {0}";
-			this.beginPdfBackupsToolStripMenuItem.Click += new System.EventHandler(this.beginPdfBackupsToolStripMenuItem_Click);
-			// 
-			// convertAllM4bToMp3ToolStripMenuItem
-			// 
-			this.convertAllM4bToMp3ToolStripMenuItem.Name = "convertAllM4bToMp3ToolStripMenuItem";
-			this.convertAllM4bToMp3ToolStripMenuItem.Size = new System.Drawing.Size(284, 22);
-			this.convertAllM4bToMp3ToolStripMenuItem.Text = "Convert all M4b to Mp3 [Long-running]";
-			this.convertAllM4bToMp3ToolStripMenuItem.Visible = true;
-			this.convertAllM4bToMp3ToolStripMenuItem.Click += new System.EventHandler(this.convertAllM4bToMp3ToolStripMenuItem_Click);
-			// 
-			// exportToolStripMenuItem
-			// 
-			this.exportToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.exportLibraryToolStripMenuItem});
-			this.exportToolStripMenuItem.Name = "exportToolStripMenuItem";
-			this.exportToolStripMenuItem.Size = new System.Drawing.Size(53, 20);
-			this.exportToolStripMenuItem.Text = "E&xport";
-			// 
-			// exportLibraryToolStripMenuItem
-			// 
-			this.exportLibraryToolStripMenuItem.Name = "exportLibraryToolStripMenuItem";
-			this.exportLibraryToolStripMenuItem.Size = new System.Drawing.Size(156, 22);
-			this.exportLibraryToolStripMenuItem.Text = "E&xport Library...";
-			this.exportLibraryToolStripMenuItem.Click += new System.EventHandler(this.exportLibraryToolStripMenuItem_Click);
-			// 
-			// quickFiltersToolStripMenuItem
-			// 
-			this.quickFiltersToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.firstFilterIsDefaultToolStripMenuItem,
-            this.editQuickFiltersToolStripMenuItem,
-            this.toolStripSeparator1});
-			this.quickFiltersToolStripMenuItem.Name = "quickFiltersToolStripMenuItem";
-			this.quickFiltersToolStripMenuItem.Size = new System.Drawing.Size(84, 20);
-			this.quickFiltersToolStripMenuItem.Text = "Quick &Filters";
-			// 
-			// firstFilterIsDefaultToolStripMenuItem
-			// 
-			this.firstFilterIsDefaultToolStripMenuItem.Name = "firstFilterIsDefaultToolStripMenuItem";
-			this.firstFilterIsDefaultToolStripMenuItem.Size = new System.Drawing.Size(256, 22);
-			this.firstFilterIsDefaultToolStripMenuItem.Text = "Start Libation with 1st filter &Default";
-			this.firstFilterIsDefaultToolStripMenuItem.Click += new System.EventHandler(this.FirstFilterIsDefaultToolStripMenuItem_Click);
-			// 
-			// editQuickFiltersToolStripMenuItem
-			// 
-			this.editQuickFiltersToolStripMenuItem.Name = "editQuickFiltersToolStripMenuItem";
-			this.editQuickFiltersToolStripMenuItem.Size = new System.Drawing.Size(256, 22);
-			this.editQuickFiltersToolStripMenuItem.Text = "&Edit quick filters...";
-			this.editQuickFiltersToolStripMenuItem.Click += new System.EventHandler(this.EditQuickFiltersToolStripMenuItem_Click);
-			// 
-			// toolStripSeparator1
-			// 
-			this.toolStripSeparator1.Name = "toolStripSeparator1";
-			this.toolStripSeparator1.Size = new System.Drawing.Size(253, 6);
-			// 
-			// settingsToolStripMenuItem
-			// 
-			this.settingsToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.accountsToolStripMenuItem,
-            this.basicSettingsToolStripMenuItem});
-			this.settingsToolStripMenuItem.Name = "settingsToolStripMenuItem";
-			this.settingsToolStripMenuItem.Size = new System.Drawing.Size(61, 20);
-			this.settingsToolStripMenuItem.Text = "&Settings";
-			// 
-			// accountsToolStripMenuItem
-			// 
-			this.accountsToolStripMenuItem.Name = "accountsToolStripMenuItem";
-			this.accountsToolStripMenuItem.Size = new System.Drawing.Size(133, 22);
-			this.accountsToolStripMenuItem.Text = "&Accounts...";
-			this.accountsToolStripMenuItem.Click += new System.EventHandler(this.accountsToolStripMenuItem_Click);
-			// 
-			// basicSettingsToolStripMenuItem
-			// 
-			this.basicSettingsToolStripMenuItem.Name = "basicSettingsToolStripMenuItem";
-			this.basicSettingsToolStripMenuItem.Size = new System.Drawing.Size(133, 22);
-			this.basicSettingsToolStripMenuItem.Text = "&Settings...";
-			this.basicSettingsToolStripMenuItem.Click += new System.EventHandler(this.basicSettingsToolStripMenuItem_Click);
-			// 
-			// statusStrip1
-			// 
-			this.statusStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.visibleCountLbl,
-            this.springLbl,
-            this.backupsCountsLbl,
-            this.pdfsCountsLbl});
-			this.statusStrip1.Location = new System.Drawing.Point(0, 517);
-			this.statusStrip1.Name = "statusStrip1";
-			this.statusStrip1.Padding = new System.Windows.Forms.Padding(1, 0, 16, 0);
-			this.statusStrip1.Size = new System.Drawing.Size(1007, 22);
-			this.statusStrip1.TabIndex = 6;
-			this.statusStrip1.Text = "statusStrip1";
-			// 
-			// visibleCountLbl
-			// 
-			this.visibleCountLbl.Name = "visibleCountLbl";
-			this.visibleCountLbl.Size = new System.Drawing.Size(53, 17);
-			this.visibleCountLbl.Text = "Visible: 0";
-			// 
-			// springLbl
-			// 
-			this.springLbl.Name = "springLbl";
-			this.springLbl.Size = new System.Drawing.Size(517, 17);
-			this.springLbl.Spring = true;
-			// 
-			// backupsCountsLbl
-			// 
-			this.backupsCountsLbl.Name = "backupsCountsLbl";
-			this.backupsCountsLbl.Size = new System.Drawing.Size(218, 17);
-			this.backupsCountsLbl.Text = "[Calculating backed up book quantities]";
-			// 
-			// pdfsCountsLbl
-			// 
-			this.pdfsCountsLbl.Name = "pdfsCountsLbl";
-			this.pdfsCountsLbl.Size = new System.Drawing.Size(171, 17);
-			this.pdfsCountsLbl.Text = "|  [Calculating backed up PDFs]";
-			// 
-			// addFilterBtn
-			// 
-			this.addFilterBtn.Location = new System.Drawing.Point(47, 31);
-			this.addFilterBtn.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
-			this.addFilterBtn.Name = "addFilterBtn";
-			this.addFilterBtn.Size = new System.Drawing.Size(163, 27);
-			this.addFilterBtn.TabIndex = 4;
-			this.addFilterBtn.Text = "Add To Quick Filters";
-			this.addFilterBtn.UseVisualStyleBackColor = true;
-			this.addFilterBtn.Click += new System.EventHandler(this.AddFilterBtn_Click);
-			// 
-			// Form1
-			// 
-			this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
-			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-			this.ClientSize = new System.Drawing.Size(1007, 539);
-			this.Controls.Add(this.filterBtn);
-			this.Controls.Add(this.addFilterBtn);
-			this.Controls.Add(this.filterSearchTb);
-			this.Controls.Add(this.filterHelpBtn);
-			this.Controls.Add(this.statusStrip1);
-			this.Controls.Add(this.gridPanel);
-			this.Controls.Add(this.menuStrip1);
-			this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
-			this.MainMenuStrip = this.menuStrip1;
-			this.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();
-			this.statusStrip1.ResumeLayout(false);
-			this.statusStrip1.PerformLayout();
-			this.ResumeLayout(false);
-			this.PerformLayout();
-
-		}
-
-		#endregion
-
-		private System.Windows.Forms.Panel gridPanel;
-		private System.Windows.Forms.MenuStrip menuStrip1;
-		private System.Windows.Forms.ToolStripMenuItem importToolStripMenuItem;
-		private System.Windows.Forms.StatusStrip statusStrip1;
-		private System.Windows.Forms.ToolStripStatusLabel springLbl;
-		private System.Windows.Forms.ToolStripStatusLabel visibleCountLbl;
-		private System.Windows.Forms.ToolStripMenuItem liberateToolStripMenuItem;
-		private System.Windows.Forms.ToolStripStatusLabel backupsCountsLbl;
-		private System.Windows.Forms.ToolStripMenuItem beginBookBackupsToolStripMenuItem;
-		private System.Windows.Forms.ToolStripStatusLabel pdfsCountsLbl;
-		private System.Windows.Forms.ToolStripMenuItem beginPdfBackupsToolStripMenuItem;
-		private System.Windows.Forms.TextBox filterSearchTb;
-		private System.Windows.Forms.Button filterBtn;
-		private System.Windows.Forms.Button filterHelpBtn;
-		private System.Windows.Forms.ToolStripMenuItem settingsToolStripMenuItem;
-		private System.Windows.Forms.ToolStripMenuItem scanLibraryToolStripMenuItem;
-		private System.Windows.Forms.ToolStripMenuItem quickFiltersToolStripMenuItem;
-		private System.Windows.Forms.ToolStripMenuItem firstFilterIsDefaultToolStripMenuItem;
-		private System.Windows.Forms.Button addFilterBtn;
-		private System.Windows.Forms.ToolStripMenuItem editQuickFiltersToolStripMenuItem;
-		private System.Windows.Forms.ToolStripSeparator toolStripSeparator1;
-		private System.Windows.Forms.ToolStripMenuItem basicSettingsToolStripMenuItem;
-		private System.Windows.Forms.ToolStripMenuItem accountsToolStripMenuItem;
-		private System.Windows.Forms.ToolStripMenuItem scanLibraryOfAllAccountsToolStripMenuItem;
-		private System.Windows.Forms.ToolStripMenuItem scanLibraryOfSomeAccountsToolStripMenuItem;
-		private System.Windows.Forms.ToolStripMenuItem noAccountsYetAddAccountToolStripMenuItem;
-		private System.Windows.Forms.ToolStripMenuItem exportToolStripMenuItem;
-		private System.Windows.Forms.ToolStripMenuItem exportLibraryToolStripMenuItem;
-        private System.Windows.Forms.ToolStripMenuItem convertAllM4bToMp3ToolStripMenuItem;
-        private System.Windows.Forms.ToolStripMenuItem removeLibraryBooksToolStripMenuItem;
-        private System.Windows.Forms.ToolStripMenuItem removeAllAccountsToolStripMenuItem;
-        private System.Windows.Forms.ToolStripMenuItem removeSomeAccountsToolStripMenuItem;
-	}
-}

LibationWinForms/Form1.cs

@@ -1,491 +0,0 @@
-using ApplicationServices;
-using DataLayer;
-using Dinah.Core;
-using Dinah.Core.Drawing;
-using Dinah.Core.Windows.Forms;
-using FileManager;
-using InternalUtilities;
-using LibationWinForms.Dialogs;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using System.Windows.Forms;
-
-namespace LibationWinForms
-{
-	public partial class Form1 : Form
-	{
-		private string beginBookBackupsToolStripMenuItem_format { get; }
-		private string beginPdfBackupsToolStripMenuItem_format { get; }
-
-		public Form1()
-		{
-			InitializeComponent();
-
-			// back up string formats
-			beginBookBackupsToolStripMenuItem_format = beginBookBackupsToolStripMenuItem.Text;
-			beginPdfBackupsToolStripMenuItem_format = beginPdfBackupsToolStripMenuItem.Text;
-
-			if (this.DesignMode)
-				return;
-
-			// independent UI updates
-			this.Load += setBackupCountsAsync;
-			this.Load += (_, __) => RestoreSizeAndLocation();
-			this.Load += (_, __) => RefreshImportMenu();
-
-			var format = System.Drawing.Imaging.ImageFormat.Jpeg;
-			PictureStorage.SetDefaultImage(PictureSize._80x80, Properties.Resources.default_cover_80x80.ToBytes(format));
-			PictureStorage.SetDefaultImage(PictureSize._300x300, Properties.Resources.default_cover_300x300.ToBytes(format));
-			PictureStorage.SetDefaultImage(PictureSize._500x500, Properties.Resources.default_cover_500x500.ToBytes(format));
-		}
-
-		private void Form1_Load(object sender, EventArgs e)
-		{
-			if (this.DesignMode)
-				return;
-
-			reloadGrid();
-
-			// also applies filter. ONLY call AFTER loading grid
-			loadInitialQuickFilterState();
-			
-		}
-
-		private void Form1_FormClosing(object sender, FormClosingEventArgs e)
-		{
-			SaveSizeAndLocation();
-		}
-
-		private void RestoreSizeAndLocation()
-		{
-			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;
-		}
-
-		#region reload grid
-		private bool isProcessingGridSelect = false;
-		private void reloadGrid()
-		{
-			// suppressed filter while init'ing UI
-			var prev_isProcessingGridSelect = isProcessingGridSelect;
-			isProcessingGridSelect = true;
-			setGrid();
-			isProcessingGridSelect = prev_isProcessingGridSelect;
-
-			// UI init complete. now we can apply filter
-			doFilter(lastGoodFilter);
-		}
-
-		private ProductsGrid currProductsGrid;
-		private void setGrid()
-		{
-			SuspendLayout();
-			{
-				if (currProductsGrid != null)
-				{
-					gridPanel.Controls.Remove(currProductsGrid);
-					currProductsGrid.VisibleCountChanged -= setVisibleCount;
-					currProductsGrid.BackupCountsChanged -= setBackupCountsAsync;
-					currProductsGrid.Dispose();
-				}
-
-				currProductsGrid = new ProductsGrid { Dock = DockStyle.Fill };
-				currProductsGrid.VisibleCountChanged += setVisibleCount;
-				currProductsGrid.BackupCountsChanged += setBackupCountsAsync;
-				gridPanel.UIThread(() => gridPanel.Controls.Add(currProductsGrid));
-				currProductsGrid.Display();
-			}
-			ResumeLayout();
-		}
-		#endregion
-
-		#region bottom: qty books visible
-		private void setVisibleCount(object _, int qty) => visibleCountLbl.Text = string.Format("Visible: {0}", qty);
-		#endregion
-
-		#region bottom: backup counts
-		private async void setBackupCountsAsync(object _, object __)
-		{
-			LibraryCommands.LibraryStats libraryStats = null;
-			await Task.Run(() => libraryStats = LibraryCommands.GetCounts());
-
-			setBookBackupCounts(libraryStats.booksFullyBackedUp, libraryStats.booksDownloadedOnly, libraryStats.booksNoProgress);
-			setPdfBackupCounts(libraryStats.pdfsDownloaded, libraryStats.pdfsNotDownloaded);
-		}
-		private void setBookBackupCounts(int booksFullyBackedUp, int booksDownloadedOnly, int booksNoProgress)
-		{
-			var backupsCountsLbl_Format = "BACKUPS: No progress: {0}  Encrypted: {1}  Fully backed up: {2}";
-
-			// enable/disable export
-			var hasResults = 0 < (booksFullyBackedUp + booksDownloadedOnly + booksNoProgress);
-			exportLibraryToolStripMenuItem.Enabled = hasResults;
-
-			// update bottom numbers
-			var pending = booksNoProgress + booksDownloadedOnly;
-			var statusStripText
-				= !hasResults ? "No books. Begin by importing your library"
-				: pending > 0 ? string.Format(backupsCountsLbl_Format, booksNoProgress, booksDownloadedOnly, booksFullyBackedUp)
-				: $"All {"book".PluralizeWithCount(booksFullyBackedUp)} backed up";
-
-			// update menu item
-			var menuItemText
-				= pending > 0
-				? $"{pending} remaining"
-				: "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));
-		}
-		private void setPdfBackupCounts(int pdfsDownloaded, int pdfsNotDownloaded)
-		{
-			var pdfsCountsLbl_Format = "|  PDFs: NOT d/l\'ed: {0}  Downloaded: {1}";
-
-			// update bottom numbers
-			var hasResults = 0 < (pdfsNotDownloaded + pdfsDownloaded);
-			var statusStripText
-				= !hasResults ? ""
-				: pdfsNotDownloaded > 0 ? string.Format(pdfsCountsLbl_Format, pdfsNotDownloaded, pdfsDownloaded)
-				: $"|  All {pdfsDownloaded} PDFs downloaded";
-
-			// update menu item
-			var menuItemText
-				= pdfsNotDownloaded > 0
-				? $"{pdfsNotDownloaded} remaining"
-				: "All PDFs have been downloaded";
-
-			// update UI
-			statusStrip1.UIThread(() => pdfsCountsLbl.Text = statusStripText);
-			menuStrip1.UIThread(() => beginPdfBackupsToolStripMenuItem.Enabled = pdfsNotDownloaded > 0);
-			menuStrip1.UIThread(() => beginPdfBackupsToolStripMenuItem.Text = string.Format(beginPdfBackupsToolStripMenuItem_format, menuItemText));
-		}
-		#endregion
-
-		#region filter
-		private void filterHelpBtn_Click(object sender, EventArgs e) => new SearchSyntaxDialog().ShowDialog();
-
-		private void AddFilterBtn_Click(object sender, EventArgs e)
-		{
-			QuickFilters.Add(this.filterSearchTb.Text);
-			UpdateFilterDropDown();
-		}
-
-		private void filterSearchTb_KeyPress(object sender, KeyPressEventArgs e)
-		{
-			if (e.KeyChar == (char)Keys.Return)
-			{
-				doFilter();
-
-				// silence the 'ding'
-				e.Handled = true;
-			}
-		}
-		private void filterBtn_Click(object sender, EventArgs e) => doFilter();
-
-		private string lastGoodFilter = "";
-		private void doFilter(string filterString)
-		{
-			this.filterSearchTb.Text = filterString;
-			doFilter();
-		}
-		private void doFilter()
-		{
-			if (isProcessingGridSelect || currProductsGrid == null)
-				return;
-
-			try
-			{
-				currProductsGrid.Filter(filterSearchTb.Text);
-				lastGoodFilter = filterSearchTb.Text;
-			}
-			catch (Exception ex)
-			{
-				MessageBox.Show($"Bad filter string:\r\n\r\n{ex.Message}", "Bad filter string", MessageBoxButtons.OK, MessageBoxIcon.Error);
-
-				// re-apply last good filter
-				doFilter(lastGoodFilter);
-			}
-		}
-		#endregion
-
-		#region Import menu
-		public void RefreshImportMenu()
-		{
-			using var persister = AudibleApiStorage.GetAccountsSettingsPersister();
-			var count = persister.AccountsSettings.Accounts.Count;
-
-			noAccountsYetAddAccountToolStripMenuItem.Visible = count == 0;
-			scanLibraryToolStripMenuItem.Visible = count == 1;
-			scanLibraryOfAllAccountsToolStripMenuItem.Visible = count > 1;
-			scanLibraryOfSomeAccountsToolStripMenuItem.Visible = count > 1;
-
-			removeLibraryBooksToolStripMenuItem.Visible = count != 0;
-
-			if (count == 1)
-			{
-				removeLibraryBooksToolStripMenuItem.Click += removeThisAccountToolStripMenuItem_Click;
-			}
-
-			removeSomeAccountsToolStripMenuItem.Visible = count > 1;
-			removeAllAccountsToolStripMenuItem.Visible = count > 1;
-		}
-
-		private void noAccountsYetAddAccountToolStripMenuItem_Click(object sender, EventArgs e)
-		{
-			MessageBox.Show("To load your Audible library, come back here to the Import menu after adding your account");
-			new AccountsDialog(this).ShowDialog();
-		}
-
-		private void scanLibraryToolStripMenuItem_Click(object sender, EventArgs e)
-		{
-			using var persister = AudibleApiStorage.GetAccountsSettingsPersister();
-			var firstAccount = persister.AccountsSettings.GetAll().FirstOrDefault();
-			scanLibraries(firstAccount);
-		}
-
-		private void scanLibraryOfAllAccountsToolStripMenuItem_Click(object sender, EventArgs e)
-		{
-			using var persister = AudibleApiStorage.GetAccountsSettingsPersister();
-			var allAccounts = persister.AccountsSettings.GetAll();
-			scanLibraries(allAccounts);
-		}
-
-		private void scanLibraryOfSomeAccountsToolStripMenuItem_Click(object sender, EventArgs e)
-		{
-			using var scanAccountsDialog = new ScanAccountsDialog(this);
-
-			if (scanAccountsDialog.ShowDialog() != DialogResult.OK)
-				return;
-
-			if (!scanAccountsDialog.CheckedAccounts.Any())
-				return;
-
-			scanLibraries(scanAccountsDialog.CheckedAccounts);
-		}
-
-		private void removeThisAccountToolStripMenuItem_Click(object sender, EventArgs e)
-		{
-			using var persister = AudibleApiStorage.GetAccountsSettingsPersister();
-			var firstAccount = persister.AccountsSettings.GetAll().FirstOrDefault();
-			scanLibrariesRemovedBooks(firstAccount);
-		}
-
-		private void removeAllAccountsToolStripMenuItem_Click(object sender, EventArgs e)
-		{
-			using var persister = AudibleApiStorage.GetAccountsSettingsPersister();
-			var allAccounts = persister.AccountsSettings.GetAll();
-			scanLibrariesRemovedBooks(allAccounts.ToArray());
-		}
-
-		private void removeSomeAccountsToolStripMenuItem_Click(object sender, EventArgs e)
-		{
-			using var scanAccountsDialog = new ScanAccountsDialog(this);
-
-			if (scanAccountsDialog.ShowDialog() != DialogResult.OK)
-				return;
-
-			if (!scanAccountsDialog.CheckedAccounts.Any())
-				return;
-
-			scanLibrariesRemovedBooks(scanAccountsDialog.CheckedAccounts.ToArray());
-		}
-
-		private void scanLibrariesRemovedBooks(params Account[] accounts)
-		{
-			using var dialog = new RemoveBooksDialog(accounts);
-			dialog.ShowDialog();
-
-			if (dialog.BooksRemoved)
-				reloadGrid();
-		}
-
-		private void scanLibraries(IEnumerable<Account> accounts) => scanLibraries(accounts.ToArray());
-		private void scanLibraries(params Account[] accounts)
-		{
-			using var dialog = new IndexLibraryDialog(accounts);
-			dialog.ShowDialog();
-
-			var totalProcessed = dialog.TotalBooksProcessed;
-			var newAdded = dialog.NewBooksAdded;
-
-			MessageBox.Show($"Total processed: {totalProcessed}\r\nNew: {newAdded}");
-
-			if (totalProcessed > 0)
-				reloadGrid();
-		}
-		#endregion
-
-		#region liberate menu
-		private async void beginBookBackupsToolStripMenuItem_Click(object sender, EventArgs e)
-			=> await BookLiberation.ProcessorAutomationController.BackupAllBooksAsync(updateGridRow);
-
-		private async void beginPdfBackupsToolStripMenuItem_Click(object sender, EventArgs e)
-			=> await BookLiberation.ProcessorAutomationController.BackupAllPdfsAsync(updateGridRow);
-
-		private async void convertAllM4bToMp3ToolStripMenuItem_Click(object sender, EventArgs e)
-			=> await BookLiberation.ProcessorAutomationController.ConvertAllBooksAsync();
-
-		private void updateGridRow(object _, LibraryBook libraryBook) => currProductsGrid.RefreshRow(libraryBook.Book.AudibleProductId);
-		#endregion
-
-		#region Export menu
-		private void exportLibraryToolStripMenuItem_Click(object sender, EventArgs e)
-		{
-			try
-			{
-				var saveFileDialog = new SaveFileDialog
-				{
-					Title = "Where to export Library",
-					Filter = "Excel Workbook (*.xlsx)|*.xlsx|CSV files (*.csv)|*.csv|JSON files (*.json)|*.json" // + "|All files (*.*)|*.*"
-				};
-
-				if (saveFileDialog.ShowDialog() != DialogResult.OK)
-					return;
-
-				// FilterIndex is 1-based, NOT 0-based
-				switch (saveFileDialog.FilterIndex)
-				{
-					case 1: // xlsx
-					default:
-						LibraryExporter.ToXlsx(saveFileDialog.FileName);
-						break;
-					case 2: // csv
-						LibraryExporter.ToCsv(saveFileDialog.FileName);
-						break;
-					case 3: // json
-						LibraryExporter.ToJson(saveFileDialog.FileName);
-						break;
-				}
-
-				MessageBox.Show("Library exported to:\r\n" + saveFileDialog.FileName);
-			}
-			catch (Exception ex)
-			{
-				MessageBoxAlertAdmin.Show("Error attempting to export your library.", "Error exporting", ex);
-			}
-		}
-		#endregion
-
-		#region quick filters menu
-		private void loadInitialQuickFilterState()
-		{
-			// set inital state. do once only
-			firstFilterIsDefaultToolStripMenuItem.Checked = QuickFilters.UseDefault;
-
-			// load default filter. do once only
-			if (QuickFilters.UseDefault)
-				doFilter(QuickFilters.Filters.FirstOrDefault());
-
-			// do after every save
-			UpdateFilterDropDown();
-		}
-
-		private void FirstFilterIsDefaultToolStripMenuItem_Click(object sender, EventArgs e)
-		{
-			firstFilterIsDefaultToolStripMenuItem.Checked = !firstFilterIsDefaultToolStripMenuItem.Checked;
-			QuickFilters.UseDefault = firstFilterIsDefaultToolStripMenuItem.Checked;
-		}
-
-		private object quickFilterTag { get; } = new object();
-		public void UpdateFilterDropDown()
-		{
-			// remove old
-			for (var i = quickFiltersToolStripMenuItem.DropDownItems.Count - 1; i >= 0; i--)
-			{
-				var menuItem = quickFiltersToolStripMenuItem.DropDownItems[i];
-				if (menuItem.Tag == quickFilterTag)
-					quickFiltersToolStripMenuItem.DropDownItems.Remove(menuItem);
-			}
-
-			// re-populate
-			var index = 0;
-			foreach (var filter in QuickFilters.Filters)
-			{
-				var menuItem = new ToolStripMenuItem
-				{
-					Tag = quickFilterTag,
-					Text = $"&{++index}: {filter}"
-				};
-				menuItem.Click += (_, __) => doFilter(filter);
-				quickFiltersToolStripMenuItem.DropDownItems.Add(menuItem);
-			}
-		}
-
-		private void EditQuickFiltersToolStripMenuItem_Click(object sender, EventArgs e) => new EditQuickFilters(this).ShowDialog();
-		#endregion
-
-		#region settings menu
-		private void accountsToolStripMenuItem_Click(object sender, EventArgs e) => new AccountsDialog(this).ShowDialog();
-
-		private void basicSettingsToolStripMenuItem_Click(object sender, EventArgs e) => new SettingsDialog().ShowDialog();
-		#endregion
-
-	}
-}

LibationWinForms/GridEntry.cs

@@ -1,204 +0,0 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Drawing;
-using System.Linq;
-using ApplicationServices;
-using DataLayer;
-using Dinah.Core.DataBinding;
-using Dinah.Core;
-using Dinah.Core.Drawing;
-
-namespace LibationWinForms
-{
-	internal class GridEntry : AsyncNotifyPropertyChanged, IMemberComparable
-	{
-		#region implementation properties
-		// hide from public fields from Data Source GUI with [Browsable(false)]
-
-		[Browsable(false)]
-		public string AudibleProductId => Book.AudibleProductId;
-		[Browsable(false)]
-		public LibraryBook LibraryBook { get; }
-
-		#endregion
-
-		private Book Book => LibraryBook.Book;
-		private Image _cover;
-
-		public GridEntry(LibraryBook libraryBook)
-		{
-			LibraryBook = libraryBook;
-			_memberValues = CreateMemberValueDictionary();
-
-			//Get cover art. If it's default, subscribe to PictureCached
-			{
-				(bool isDefault, byte[] picture) = FileManager.PictureStorage.GetPicture(new FileManager.PictureDefinition(Book.PictureId, FileManager.PictureSize._80x80));
-
-				if (isDefault)
-					FileManager.PictureStorage.PictureCached += PictureStorage_PictureCached;
-
-				//Mutable property. Set the field so PropertyChanged isn't fired.
-				_cover = ImageReader.ToImage(picture);
-			}
-
-			//Immutable properties
-			{
-				Title = Book.Title;
-				Series = Book.SeriesNames;
-				Length = Book.LengthInMinutes == 0 ? "" : $"{Book.LengthInMinutes / 60} hr {Book.LengthInMinutes % 60} min";
-				MyRating = Book.UserDefinedItem.Rating?.ToStarString()?.DefaultIfNullOrWhiteSpace("");
-				PurchaseDate = libraryBook.DateAdded.ToString("d");
-				ProductRating = Book.Rating?.ToStarString()?.DefaultIfNullOrWhiteSpace("");
-				Authors = Book.AuthorNames;
-				Narrators = Book.NarratorNames;
-				Category = string.Join(" > ", Book.CategoriesNames);
-				Misc = GetMiscDisplay(libraryBook);
-				Description = GetDescriptionDisplay(Book);
-			}
-
-			//DisplayTags and Liberate properties are live.
-		}
-
-		private void PictureStorage_PictureCached(object sender, FileManager.PictureCachedEventArgs e)
-		{
-			if (e.Definition.PictureId == Book.PictureId)
-			{
-				Cover = ImageReader.ToImage(e.Picture);
-				FileManager.PictureStorage.PictureCached -= PictureStorage_PictureCached;
-			}
-		}
-
-		#region Data Source properties
-
-		public Image Cover
-		{
-			get
-			{
-				return _cover;
-			}
-			private set
-			{
-				_cover = value;
-				NotifyPropertyChanged();
-			}
-		}
-
-		public string ProductRating { get; }
-		public string PurchaseDate { get; }
-		public string MyRating { get; }
-		public string Series { get; }
-		public string Title { get; }
-		public string Length { get; }
-		public string Authors { get; }
-		public string Narrators { get; }
-		public string Category { get; }
-		public string Misc { get; }
-		public string Description { get; }
-		public string DisplayTags => string.Join("\r\n", Book.UserDefinedItem.TagsEnumerated);
-		public (LiberatedState, PdfState) Liberate => (LibraryCommands.Liberated_Status(Book), LibraryCommands.Pdf_Status(Book));
-		#endregion
-
-		#region Data Sorting
-
-		private Dictionary<string, Func<object>> _memberValues { get; }
-
-		/// <summary>
-		/// Create getters for all member object values by name
-		/// </summary>
-		private Dictionary<string, Func<object>> CreateMemberValueDictionary() => new()
-		{
-			{ nameof(Title), () => GetSortName(Book.Title) },
-			{ nameof(Series), () => GetSortName(Book.SeriesNames) },
-			{ nameof(Length), () => Book.LengthInMinutes },
-			{ nameof(MyRating), () => Book.UserDefinedItem.Rating.FirstScore },
-			{ nameof(PurchaseDate), () => LibraryBook.DateAdded },
-			{ nameof(ProductRating), () => Book.Rating.FirstScore },
-			{ nameof(Authors), () => Authors },
-			{ nameof(Narrators), () => Narrators },
-			{ nameof(Description), () => Description },
-			{ nameof(Category), () => Category },
-			{ nameof(Misc), () => Misc },
-			{ nameof(DisplayTags), () => DisplayTags },
-			{ nameof(Liberate), () => Liberate.Item1 }
-		};
-
-		// Instantiate comparers for every exposed member object type.
-		private static readonly Dictionary<Type, IComparer> _memberTypeComparers = new()
-		{
-			{ typeof(string), new ObjectComparer<string>() },
-			{ typeof(int), new ObjectComparer<int>() },
-			{ typeof(float), new ObjectComparer<float>() },
-			{ typeof(DateTime), new ObjectComparer<DateTime>() },
-			{ typeof(LiberatedState), new ObjectComparer<LiberatedState>() },
-		};
-
-		public virtual object GetMemberValue(string memberName) => _memberValues[memberName]();
-		public virtual IComparer GetMemberComparer(Type memberType) => _memberTypeComparers[memberType];
-
-		private static readonly string[] _sortPrefixIgnores = { "the", "a", "an" };
-		private static string GetSortName(string unformattedName)
-		{
-			var sortName = unformattedName
-				.Replace("|", "")
-				.Replace(":", "")
-				.ToLowerInvariant()
-				.Trim();
-
-			if (_sortPrefixIgnores.Any(prefix => sortName.StartsWith(prefix + " ")))
-				sortName = sortName.Substring(sortName.IndexOf(" ") + 1).TrimStart();
-
-			return sortName;
-		}
-
-		#endregion
-
-		#region Static library display functions
-		
-		/// <summary>
-		/// This information should not change during <see cref="GridEntry"/> lifetime, so call only once.
-		/// </summary>
-		private static string GetDescriptionDisplay(Book book)
-		{
-			var doc = new HtmlAgilityPack.HtmlDocument();
-			doc.LoadHtml(book.Description);
-			var noHtml = doc.DocumentNode.InnerText;
-			return
-				noHtml.Length < 63 ?
-				noHtml :
-				noHtml.Substring(0, 60) + "...";
-		}
-
-		/// <summary>
-		/// This information should not change during <see cref="GridEntry"/> lifetime, so call only once.
-		/// Maximum of 5 text rows will fit in 80-pixel row height.
-		/// </summary>
-		private static string GetMiscDisplay(LibraryBook libraryBook)
-		{
-			var details = new List<string>();
-
-			var locale = libraryBook.Book.Locale.DefaultIfNullOrWhiteSpace("[unknown]");
-			var acct = libraryBook.Account.DefaultIfNullOrWhiteSpace("[unknown]");
-
-			details.Add($"Account: {locale} - {acct}");
-
-			if (libraryBook.Book.HasPdf)
-				details.Add("Has PDF");
-			if (libraryBook.Book.IsAbridged)
-				details.Add("Abridged");
-			if (libraryBook.Book.DatePublished.HasValue)
-				details.Add($"Date pub'd: {libraryBook.Book.DatePublished.Value:MM/dd/yyyy}");
-			// this goes last since it's most likely to have a line-break
-			if (!string.IsNullOrWhiteSpace(libraryBook.Book.Publisher))
-				details.Add($"Pub: {libraryBook.Book.Publisher.Trim()}");
-
-			if (!details.Any())
-				return "[details not imported]";
-
-			return string.Join("\r\n", details);
-		}
-
-		#endregion
-	}
-}

LibationWinForms/LibationWinForms.csproj

@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <OutputType>Library</OutputType>
-    <TargetFramework>net5.0-windows</TargetFramework>
-    <UseWindowsForms>true</UseWindowsForms>
-    <ApplicationIcon>libation.ico</ApplicationIcon>
-
-    <PublishTrimmed>true</PublishTrimmed>
-    <PublishReadyToRun>true</PublishReadyToRun>
-    <RuntimeIdentifier>win-x64</RuntimeIdentifier>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\..\Dinah.Core\Dinah.Core.WindowsDesktop\Dinah.Core.WindowsDesktop.csproj" />
-    <ProjectReference Include="..\FileLiberator\FileLiberator.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Compile Update="Properties\Resources.Designer.cs">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Resources.resx</DependentUpon>
-    </Compile>
-  </ItemGroup>
-
-  <ItemGroup>
-    <EmbeddedResource Update="Properties\Resources.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-    </EmbeddedResource>
-  </ItemGroup>
-
-</Project>

README.md

@@ -7,26 +7,35 @@
 
 # Table of Contents
 
-1. [Audible audiobook manager](#audible-audiobook-manager)
+- [Audible audiobook manager](#audible-audiobook-manager)
     - [The good](#the-good)
     - [The bad](#the-bad)
     - [The ugly](#the-ugly)
-2. [Getting started](#getting-started)
-    - [Create Accounts](#create-accounts)
-    - [Import your library](#import-your-library)
-    - [Download your books -- DRM-free!](#download-your-books----drm-free)
-    - [Download PDF attachments](#download-pdf-attachments)
-    - [Details of downloaded files](#details-of-downloaded-files)
-    - [Export your library](#export-your-library)
-3. [Searching and filtering](#searching-and-filtering)
-    - [Tags](#tags)
-    - [Searches](#searches)
-    - [Search examples](#search-examples)
-    - [Filters](#filters)
-4. [Advanced](#advanced)
-    - [Files and folders](#files-and-folders)
-    - [Linux and Mac (unofficial)](#linux-and-mac)
-    - [Settings](#settings)
+- [Getting started](Documentation/GettingStarted.md)
+    - [Download Libation](Documentation/GettingStarted.md#download-libation-1)
+    - [Installation](Documentation/GettingStarted.md#installation)
+    - [Create Accounts](Documentation/GettingStarted.md#create-accounts)
+    - [Import your library](Documentation/GettingStarted.md#import-your-library)
+    - [Download your books -- DRM-free!](Documentation/GettingStarted.md#download-your-books----drm-free)
+    - [Download PDF attachments](Documentation/GettingStarted.md#download-pdf-attachments)
+    - [Details of downloaded files](Documentation/GettingStarted.md#details-of-downloaded-files)
+    - [Export your library](Documentation/GettingStarted.md#export-your-library)
+- [Searching and filtering](Documentation/SearchingAndFiltering.md)
+    - [Tags](Documentation/SearchingAndFiltering.md#tags)
+    - [Searches](Documentation/SearchingAndFiltering.md#searches)
+    - [Search examples](Documentation/SearchingAndFiltering.md#search-examples)
+    - [Filters](Documentation/SearchingAndFiltering.md#filters)
+- [Advanced](Documentation/Advanced.md)
+    - [Files and folders](Documentation/Advanced.md#files-and-folders)
+    - [Linux and Mac (unofficial)](Documentation/Advanced.md#linux-and-mac)
+    - [Settings](Documentation/Advanced.md#settings)
+    - [Custom File Naming](Documentation/Advanced.md#custom-file-naming)
+    - [Command Line Interface](Documentation/Advanced.md#command-line-interface)
+
+## Getting started
+
+* [Download](https://github.com/rmcrackan/Libation/releases/latest)
+* [Step-by-step walk-through](Documentation/GettingStarted.md)
 
 ## Audible audiobook manager
 
@@ -46,7 +55,6 @@
 ### The bad
 
 * Windows only
-* Several known speed/performance issues
 * Large file size
 * Made by a programmer, not a designer so the goals are function rather than beauty. And it shows
 
@@ -59,185 +67,3 @@
 Disclaimer: I've made every good-faith effort to include nothing insecure, malicious, anti-privacy, or destructive. That said: use at your own risk.
 
 I made this for myself and I want to share it with the great programming and audible/audiobook communiites which have been so generous with their time and help.
-
-## Getting started
-
-#### [Download Libation](https://github.com/rmcrackan/Libation/releases)
-
-### Create Accounts
-
-Create your account(s):
-
-![Create your accounts, menu](images/v40_accounts.png)
-
-New locale options include many more regions including old audible accounts which pre-date the amazon acquisition
-
-![Choose your account locales](images/v40_locales.png)
-
-### Import your library
-
-Select Import > Scan Library:
-
-![Import step 1](images/Import1.png)
-
-Or if you have multiple accounts, you'll get to choose whether to scan all accounts or just the ones you select:
-
-![Import which accounts](images/v40_import.png)
-
-You'll see this window while it's scanning:
-
-![Import step 2](images/Import2.png)
-
-Success! We see how many new titles are imported:
-
-![Import step 3](images/Import3.png)
-
-### Download your books -- DRM-free!
-
-Automatically download some or all of your audible books. This shows you how much of your library is not yet downloaded and decrypted:
-
-The stoplights will tell you a title's status:
-
-* Green: downloaded and decrypted
-* Yellow: downloaded but still encrypted with DRM
-* Red: not downloaded
-* PDF icon without arrow: downloaded
-* PDF with arrow: not downloaded
-
-Or hover over the button to see the status.
-
-![Liberate book step 1](images/LiberateBook1.png)
-
-Select Liberate > Begin Book Backups
-
-You can also click on the stop light to download only that title and its PDF
-
-![Liberate book step 2](images/LiberateBook2.png)
-
-First the original book with DRM is downloaded
-
-![Liberate book step 3](images/LiberateBook3.png)
-
-Then it's decrypted so you can use it on any device you choose. The very first time you decrypt a book, this step will take a while. Every other book will go much faster. The first time, Libation has to figure out the special decryption key which allows your personal books to be unlocked.
-
-![Liberate book step 4](images/LiberateBook4.png)
-
-And voila! If you have multiple books not yet liberated, Libation will automatically move on to the next.
-
-![Liberate book step 5](images/LiberateBook5.png)
-
-The Audible id must be somewhere in the book's file or folder name for Libation to detect your downloaded book.
-
-### Download PDF attachments
-
-For books which include PDF downloads, Libation can download these for you as well and will attempt to store them with the book. "Book backup" will already download an available PDF. This additional option is useful when Audible adds a PDF to your book after you've already backed it up.
-
-Select Liberate > Begin PDF Backups
-
-![PDF download step 2](images/PdfDownload2.png)
-
-The downloads work just like with books, only with no additional decryption needed.
-
-![PDF download step 3](images/PdfDownload3.png)
-
-### Details of downloaded files
-
-![Post download](images/PostDownload.png)
-
-When you set up Libation, you'll specify a Books directory. Libation looks inside that directory and all subdirectories to look for files or folders with each library book's audible id. This way, organization is completely up to you. When you download + decrypt a book, you get several files
-
-* .m4b: your audiobook in m4b format. This is the most pure version of your audiobook and retains the highest quality. Now that it's decrypted, you can play it on any audio player and put it on any device. If you'd like, you can also use 3rd party tools to turn it into an mp3. The freedom to do what you want with your files was the original inspiration for Libation.
-* .cue: this is a file which logs where chapter breaks occur. Many tools are able to use this if you want to split your book into files along chapter lines.
-* .nfo: This is just some general info about the book and includes some technical stats about the audiofile.
-
-### Export your library
-
-![Export](images/Export.png)
-
-Export your library to Excel, CSV, or JSON
-
-## Searching and filtering
-
-### Tags
-
-To add tags to a title, click the tags button
-
-![Tags step 1](images/Tags1.png)
-
-Add as many tags as you'd like. Tags are separated by a space. Each tag can contain letters, numbers, and underscores
-
-![Tags step 2](images/Tags2.png)
-
-Tags are saved non-case specific for easy search. There is one special tag "hidden" which will also grey-out the book
-
-![Tags step 3](images/Tags3.png)
-
-To edit tags, just click the button again.
-
-### Searches
-
-Libation's advanced searching is built on the powerful Lucene search engine. Simple searches are effortless and powerful searches are simple. To search, just type and click Filter or press enter
-
-* Type anything in the search box to search common fields: title, authors, narrators, and the book's audible id
-* Use Lucene's "Query Parser Syntax" for advanced searching.
-    * Easy tutorial: http://www.lucenetutorial.com/lucene-query-syntax.html
-    * Full official guide: https://lucene.apache.org/core/2_9_4/queryparsersyntax.html
-* Tons of search fields, specific to audiobooks
-* Synonyms so you don't have to memorize magic words. Eg: author and author**s** will both work
-* Click [?] button for a full list of search fields and synonyms ![Filter options](images/FilterOptions.png)
-* Search by tag like \[this\]
-* When tags have an underscore you can use part of the tag. This is useful for quick categories. The below examples make this more clear.
-
-### Search examples
-
-Search for anything with the word potter
-
-![Search example: potter](images/SearchExamplePotter.png)
-
-If you only want to see Harry Potter
-
-![Search example: "harry potter"](images/SearchExampleHarryPotter.png)
-
-If you only want to see potter except for Harry Potter. You can also use "-" instead of "NOT"
-
-![Search example: "potter NOT harry"](images/SearchExamplePotterNotHarry.png)
-![Search example: "potter -harry"](images/SearchExamplePotterNotHarry2.png)
-
-To see only books written by Neil Gaiman where he also narrates his own book. (If you don't include AND, you'll see everything written by Neil Gaiman and also all books in your library which are self-narrated.)
-
-![Search example: author:gaiman AND authornarrated](images/SearchExampleGaimanAuthorNarrated.png)
-
-I tagged autobiographies as auto_bio and biographies written by someone else as bio. I can get only autobiographies with \[auto_bio\] or get both by searching \[bio\]
-
-![Search example: \[bio\]](images/SearchExampleBio.png)
-![Search example: \[auto_bio\]](images/SearchExampleAutoBio.png)
-
-### Filters
-
-If you have a search you want to save, click Add To Quick Filters to save it in your Quick Filters list. To use it again, select it from the Quick Filters list.
-
-To edit this list go to Quick Filters > Edit quick filters. Here you can re-order the list, delete filters, double-click a filter to edit it, or double-click the bottom blank box to add a new filter.
-
-Check "Quick Filters > Start Libation with 1st filter Default" to have your top filter automatically applied when Libation starts. In this top example, I want to always start without these: at books I've tagged hidden, books I've tagged as free_audible_originals, and books which I have rated.
-
-![default filters](images/FiltersDefault.png)
-
-## Advanced
-
-### Files and folders
-
-To make upgrades and reinstalls easier, Libation separates all of its responsibilities to a few different folders. If you don't want to mess with this stuff: ignore it. Read on if you like a little more control over your files.
-
-* In Libation's initial folder are the files that make up the program. Since nothing else is here, just copy new files here to upgrade the program. Delete this folder to delete Libation.
-
-* In a separate folder, Libation keeps track of all of the files it creates like settings and downloaded images. After an upgrade, Libation might think that's its being run for the first time. Just click ADVANCED SETUP and point to this folder. Libation will reload your library and settings.
-
-* The last important folder is the "books location." This is where Libation looks for your downloaded and decrypted books. This is how it knows which books still need to be downloaded. The Audible id must be somewhere in the book's file or folder name for Libation to detect your downloaded book.
-
-### Linux and Mac
-
-Although Libation only currently officially supports Windows, [some users](https://github.com/rmcrackan/Libation/issues/28#issuecomment-890594158) have had success with WINE.
-
-### 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.

REFERENCE.txt

@@ -1,91 +0,0 @@
--- begin VERSIONING ---------------------------------------------------------------------------------------------------------------------
-https://github.com/rmcrackan/Libation/releases
-
-v3.1.8 : Experimental: add Australia to locale options
-v3.1.7 : Improved logging
-v3.1.6 : Bugfix: some series indexes/sequences formats cause library not to import
-v3.1.5 : Bugfix: some series indexes/sequences could cause library not to import
-v3.1.4 : Bugfix: IsAuthorNarrated was returning no books
-v3.1.3 : fix weirdness with build number
-v3.1.2 : minor bug fixes
-v3.1.1 : Check if upgrade available on github
-v3.1.0 : FIRST PUBLIC RELEASE
-v3.1-beta.11 : Improved configuration and settings file management. Configurable logging
-v3.1-beta.10 : New feature: clicking Liberate button on a liberated item navigates to that audio file
-v3.1-beta.9 : New feature: liberate individual book
-v3.1-beta.8 : Bugfix: decrypt file conflict
-v3.1-beta.7 : Bugfix: decrypt book with no author
-v3.1-beta.6 : Improved logging
-v3.1-beta.5 : Improved importing
-v3.1-beta.4 : Added beta-specific logging
-v3.1-beta.3 : fixed known performance issue: Full-screen grid is slow to respond loading when books aren't liberated
-v3.1-beta.2 : fixed known performance issue: Tag add/edit
-v3.1-beta.1 : RELEASE TO BETA
-v3.0.3 : Switch to SQLite. No longer relies on LocalDB, which must be installed separately
-v3.0.2 : Final using LocalDB
-v3.0.1 : Legacy inAudible wire-up code is still present but is commented out. All future check-ins are not guaranteed to have inAudible wire-up code
-v3.0 : This version is fully powered by the Audible API. Legacy scraping code is still present but is commented out. All future check-ins are not guaranteed to have any scraping code
-v2 : new library page scraping. still chrome cookies. all decryption is handled natively. no inAudible dependency
-v1 : old library ajax scraping. wish list scraping. chrome cookies. directly call local inAudible. .net framework
--- end VERSIONING ---------------------------------------------------------------------------------------------------------------------
-
--- begin HOW TO PUBLISH ---------------------------------------------------------------------------------------------------------------------
-OPTION 1: UI
-rt-clk project project > Publish...
-click Publish
-
-OPTION 2: cmd line
-change dir to folder containing project
-  cd C:\[full...path]\Libation\LibationWinForms
-this will use the parameters specified in csproj
-dotnet publish -c Release
-
-OPTION 3: cmd line, custom
-open csproj
-remove: PublishTrimmed, PublishReadyToRun, RuntimeIdentifier
-run customized publish. examples:
-publish all platforms
-  dotnet publish -c Release
-publish win64 platform only
-  dotnet publish -r win-x64 -c Release
-publish win64 platform, single-file
-  dotnet publish -r win-x64 -c Release
--- end HOW TO PUBLISH ---------------------------------------------------------------------------------------------------------------------
-
--- begin IMAGES/ICONS ---------------------------------------------------------------------------------------------------------------------
-edit tags icon images from:
-  icons8.com
-  search: tags
-
-'edit' icon: https://www.iconfinder.com/icons/383147/edit_icon
--- end IMAGES/ICONS ---------------------------------------------------------------------------------------------------------------------
-
--- begin AUDIBLE DETAILS ---------------------------------------------------------------------------------------------------------------------
-alternate book id (eg BK_RAND_006061) is called 'sku' , 'sku_lite' , 'prod_id' , 'product_id' in different parts of the site
--- end AUDIBLE DETAILS ---------------------------------------------------------------------------------------------------------------------
-
--- begin SOLUTION LAYOUT ---------------------------------------------------------------------------------------------------------------------
-do NOT combine jsons for
-- audible-scraped persistence: library, book details
-- libation-generated persistence: FileLocations.json
-- user-defined persistence: BookTags.json
--- end SOLUTION LAYOUT ---------------------------------------------------------------------------------------------------------------------
-
--- begin EF CORE ---------------------------------------------------------------------------------------------------------------------
-transaction notes
------------------
-// https://msdn.microsoft.com/en-us/data/dn456843.aspx
-// Rollback is called by transaction Dispose(). No need to call it explicitly
-  using var dbContext = new LibationContext();
-  using var dbContextTransaction = dbContext.Database.BeginTransaction();
-  refreshAction(dbContext, productItems);
-  dbContext.SaveChanges();
-  dbContextTransaction.Commit();
-
-aggregate root is transactional boundary
-  // //context.Database.CurrentTransaction
-  //var dbTransaction = Microsoft.EntityFrameworkCore.Storage.DbContextTransactionExtensions.GetDbTransaction(context.Database.CurrentTransaction);
-  // // test with and without : using TransactionScope scope = new TransactionScope();
-  //System.Transactions.Transaction.Current.TransactionCompleted += (sender, e) => { };
-  // also : https://docs.microsoft.com/en-us/dotnet/api/system.transactions.transaction.enlistvolatile
--- end EF CORE ---------------------------------------------------------------------------------------------------------------------

Source/AaxDecrypter/AaxDecrypter.csproj

@@ -0,0 +1,16 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net6.0-windows</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="AAXClean" Version="0.4.6" />
+    <PackageReference Include="AAXClean.Codecs" Version="0.2.7" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\FileManager\FileManager.csproj" />
+  </ItemGroup>
+
+</Project>

Source/AaxDecrypter/AaxcDownloadConvertBase.cs

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

Source/AaxDecrypter/AaxcDownloadMultiConverter.cs

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

Source/AaxDecrypter/AaxcDownloadSingleConverter.cs

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

Source/AaxDecrypter/AudiobookDownloadBase.cs

@@ -0,0 +1,184 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using Dinah.Core;
+using Dinah.Core.Net.Http;
+using Dinah.Core.StepRunner;
+using FileManager;
+
+namespace AaxDecrypter
+{
+	public enum OutputFormat { M4b, Mp3 }
+
+	public abstract class AudiobookDownloadBase
+	{
+		public event EventHandler<string> RetrievedTitle;
+		public event EventHandler<string> RetrievedAuthors;
+		public event EventHandler<string> RetrievedNarrators;
+		public event EventHandler<byte[]> RetrievedCoverArt;
+		public event EventHandler<DownloadProgress> DecryptProgressUpdate;
+		public event EventHandler<TimeSpan> DecryptTimeRemaining;
+		public event EventHandler<string> FileCreated;
+
+		protected bool IsCanceled { get; set; }
+		
+		protected string OutputFileName { get; private set; }
+		protected DownloadOptions DownloadOptions { get; }
+		protected NetworkFileStream InputFileStream => (nfsPersister ??= OpenNetworkFileStream()).NetworkFileStream;
+
+		// Don't give the property a 'set'. This should have to be an obvious choice; not accidental
+		protected void SetOutputFileName(string newOutputFileName) => OutputFileName = newOutputFileName;
+
+		protected abstract StepSequence Steps { get; }
+		private NetworkFileStreamPersister nfsPersister;
+
+		private string jsonDownloadState { get; }
+		public string TempFilePath { get; }
+
+		protected AudiobookDownloadBase(string outFileName, string cacheDirectory, DownloadOptions dlLic)
+		{
+			OutputFileName = ArgumentValidator.EnsureNotNullOrWhiteSpace(outFileName, nameof(outFileName));
+
+			var outDir = Path.GetDirectoryName(OutputFileName);
+			if (!Directory.Exists(outDir))
+				throw new DirectoryNotFoundException($"Directory does not exist: {nameof(outDir)}");
+
+			if (!Directory.Exists(cacheDirectory))
+				throw new DirectoryNotFoundException($"Directory does not exist: {nameof(cacheDirectory)}");
+
+			jsonDownloadState = Path.Combine(cacheDirectory, Path.GetFileName(Path.ChangeExtension(OutputFileName, ".json")));
+			TempFilePath = Path.ChangeExtension(jsonDownloadState, ".aaxc");
+
+			DownloadOptions = ArgumentValidator.EnsureNotNull(dlLic, nameof(dlLic));
+
+			// delete file after validation is complete
+			FileUtility.SaferDelete(OutputFileName);
+		}
+
+		public abstract void Cancel();
+
+		public virtual void SetCoverArt(byte[] coverArt)
+		{
+			if (coverArt is not null)
+				OnRetrievedCoverArt(coverArt);
+		}
+
+		public bool Run()
+		{
+			var (IsSuccess, Elapsed) = Steps.Run();
+
+			if (!IsSuccess)
+				Serilog.Log.Logger.Error("Conversion failed");
+
+			return IsSuccess;
+		}
+
+		protected void OnRetrievedTitle(string title)
+			=> RetrievedTitle?.Invoke(this, title);
+		protected void OnRetrievedAuthors(string authors)
+			=> RetrievedAuthors?.Invoke(this, authors);
+		protected void OnRetrievedNarrators(string narrators)
+			=> RetrievedNarrators?.Invoke(this, narrators);
+
+		protected void OnRetrievedCoverArt(byte[] coverArt)
+			=> RetrievedCoverArt?.Invoke(this, coverArt);
+
+		protected void OnDecryptProgressUpdate(DownloadProgress downloadProgress) 
+			=> DecryptProgressUpdate?.Invoke(this, downloadProgress);
+		protected void OnDecryptTimeRemaining(TimeSpan timeRemaining)
+			=> DecryptTimeRemaining?.Invoke(this, timeRemaining);
+		protected void OnFileCreated(string path)
+			=> FileCreated?.Invoke(this, path);
+
+		protected void CloseInputFileStream()
+		{
+			nfsPersister?.NetworkFileStream?.Close();
+			nfsPersister?.Dispose();
+		}
+
+		protected bool Step_CreateCue()
+		{
+			if (!DownloadOptions.CreateCueSheet) return true;
+
+			// not a critical step. its failure should not prevent future steps from running
+			try
+			{
+				var path = Path.ChangeExtension(OutputFileName, ".cue");
+				path = FileUtility.GetValidFilename(path);
+				File.WriteAllText(path, Cue.CreateContents(Path.GetFileName(OutputFileName), DownloadOptions.ChapterInfo));
+				OnFileCreated(path);
+			}
+			catch (Exception ex)
+			{
+				Serilog.Log.Logger.Error(ex, $"{nameof(Step_CreateCue)}. FAILED");
+			}
+			return !IsCanceled;
+		}
+
+		protected bool Step_Cleanup()
+		{
+			bool success = !IsCanceled;
+			if (success)
+			{
+				FileUtility.SaferDelete(jsonDownloadState);
+
+				if (DownloadOptions.AudibleKey is not null && 
+					DownloadOptions.AudibleIV is not null && 
+					DownloadOptions.RetainEncryptedFile)
+				{
+					string aaxPath = Path.ChangeExtension(TempFilePath, ".aax");
+					FileUtility.SaferMove(TempFilePath, aaxPath);
+
+					//Write aax decryption key
+					string keyPath = Path.ChangeExtension(aaxPath, ".key");
+					FileUtility.SaferDelete(keyPath);
+					File.WriteAllText(keyPath, $"Key={DownloadOptions.AudibleKey}\r\nIV={DownloadOptions.AudibleIV}");
+
+					OnFileCreated(aaxPath);
+					OnFileCreated(keyPath);
+				}
+				else
+					FileUtility.SaferDelete(TempFilePath);
+			}
+			else
+			{
+				FileUtility.SaferDelete(OutputFileName);
+			}
+
+
+			return success;
+		}
+
+		private NetworkFileStreamPersister OpenNetworkFileStream()
+		{
+			if (!File.Exists(jsonDownloadState))
+				return NewNetworkFilePersister();
+
+			try
+			{
+				var nfsp = new NetworkFileStreamPersister(jsonDownloadState);
+				// If More than ~1 hour has elapsed since getting the download url, it will expire.
+				// The new url will be to the same file.
+				nfsp.NetworkFileStream.SetUriForSameFile(new Uri(DownloadOptions.DownloadUrl));
+				return nfsp;
+			}
+			catch
+			{
+				FileUtility.SaferDelete(jsonDownloadState);
+				FileUtility.SaferDelete(TempFilePath);
+				return NewNetworkFilePersister();
+			}
+		}
+
+		private NetworkFileStreamPersister NewNetworkFilePersister()
+		{
+			var headers = new System.Net.WebHeaderCollection
+			{
+				{ "User-Agent", DownloadOptions.UserAgent }
+			};
+
+			var networkFileStream = new NetworkFileStream(TempFilePath, new Uri(DownloadOptions.DownloadUrl), 0, headers);
+			return new NetworkFileStreamPersister(networkFileStream, jsonDownloadState);
+		}
+	}
+}

Source/AaxDecrypter/Cue.cs

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

Source/AaxDecrypter/DownloadOptions.cs

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

Source/AaxDecrypter/MultiConvertFileProperties.cs

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

Source/AaxDecrypter/NetworkFileStream.cs

@@ -83,7 +83,7 @@ namespace AaxDecrypter
         private FileStream _readFile { get; }
         private Stream _networkStream { get; set; }
         private bool hasBegunDownloading { get; set; }
-        private bool isCancelled { get; set; }
+        public bool IsCancelled { get; private set; }
         private EventWaitHandle downloadEnded { get; set; } 
         private EventWaitHandle downloadedPiece { get; set; } 
 
@@ -193,9 +193,6 @@ namespace AaxDecrypter
             if (response.StatusCode != HttpStatusCode.PartialContent)
                 throw new WebException($"Server at {Uri.Host} responded with unexpected status code: {response.StatusCode}.");
 
-            if (response.Headers.GetValues("Accept-Ranges").FirstOrDefault(r => r.EqualsInsensitive("bytes")) is null)
-                throw new WebException($"Server at {Uri.Host} does not support Http ranges");
-
             //Content length is the length of the range request, and it is only equal
             //to the complete file length if requesting Range: bytes=0-
             if (WritePosition == 0)
@@ -238,7 +235,7 @@ namespace AaxDecrypter
                     downloadedPiece.Set();
                 }
 
-            } while (downloadPosition < ContentLength && !isCancelled);
+            } while (downloadPosition < ContentLength && !IsCancelled);
 
             _writeFile.Close();
             _networkStream.Close();
@@ -248,7 +245,7 @@ namespace AaxDecrypter
             downloadedPiece.Set();
             downloadEnded.Set();
 
-            if (!isCancelled && WritePosition < ContentLength)
+            if (!IsCancelled && WritePosition < ContentLength)
                 throw new WebException($"Downloaded size (0x{WritePosition:X10}) is less than {nameof(ContentLength)} (0x{ContentLength:X10}).");
 
             if (WritePosition > ContentLength)
@@ -421,12 +418,12 @@ namespace AaxDecrypter
         /// <param name="requiredPosition">The minimum required flished data length in <see cref="SaveFilePath"/>.</param>
         private void WaitToPosition(long requiredPosition)
 		{
-            while (requiredPosition > WritePosition && !isCancelled && hasBegunDownloading && !downloadedPiece.WaitOne(1000)) ;
+            while (requiredPosition > WritePosition && !IsCancelled && hasBegunDownloading && !downloadedPiece.WaitOne(1000)) ;
         }
 
         public override void Close()
         {
-            isCancelled = true;
+            IsCancelled = true;
 
             while (downloadEnded is not null && !downloadEnded.WaitOne(1000)) ;
 

Source/AaxDecrypter/UnencryptedAudiobookDownloader.cs

@@ -0,0 +1,76 @@
+using System;
+using System.Threading;
+using Dinah.Core.Net.Http;
+using Dinah.Core.StepRunner;
+using FileManager;
+
+namespace AaxDecrypter
+{
+	public class UnencryptedAudiobookDownloader : AudiobookDownloadBase
+	{
+		protected override StepSequence Steps { get; }
+
+		public UnencryptedAudiobookDownloader(string outFileName, string cacheDirectory, DownloadOptions dlLic)
+			: base(outFileName, cacheDirectory, dlLic)
+		{
+			Steps = new StepSequence
+			{
+				Name = "Download Mp3 Audiobook",
+
+				["Step 1: Get Mp3 Metadata"] = Step_GetMetadata,
+				["Step 2: Download Audiobook"] = Step_DownloadAudiobookAsSingleFile,
+				["Step 3: Create Cue"] = Step_CreateCue,
+				["Step 4: Cleanup"] = Step_Cleanup,
+			};
+		}
+
+		public override void Cancel()
+		{
+			IsCanceled = true;
+			CloseInputFileStream();
+		}
+
+		protected bool Step_GetMetadata()
+		{
+			OnRetrievedCoverArt(null);
+
+			return !IsCanceled;
+		}
+
+		private bool Step_DownloadAudiobookAsSingleFile()
+		{
+			DateTime startTime = DateTime.Now;
+
+			// MUST put InputFileStream.Length first, because it starts background downloader.
+
+			while (InputFileStream.Length > InputFileStream.WritePosition && !InputFileStream.IsCancelled) 
+			{
+				var rate = InputFileStream.WritePosition / (DateTime.Now - startTime).TotalSeconds;
+
+				var estTimeRemaining = (InputFileStream.Length - InputFileStream.WritePosition) / rate;
+
+				if (double.IsNormal(estTimeRemaining))
+					OnDecryptTimeRemaining(TimeSpan.FromSeconds(estTimeRemaining));
+
+				var progressPercent = (double)InputFileStream.WritePosition / InputFileStream.Length;
+
+				OnDecryptProgressUpdate(
+					new DownloadProgress
+					{
+						ProgressPercentage = 100 * progressPercent,
+						BytesReceived = (long)(InputFileStream.Length * progressPercent),
+						TotalBytesToReceive = InputFileStream.Length
+					});
+				Thread.Sleep(200);
+			}
+
+			CloseInputFileStream();
+
+			var realOutputFileName = FileUtility.SaferMoveToValidPath(InputFileStream.SaveFilePath, OutputFileName);
+			SetOutputFileName(realOutputFileName);
+			OnFileCreated(realOutputFileName);
+
+			return !IsCanceled;
+		}
+	}
+}

Source/AppScaffolding/AppScaffolding.csproj

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

Source/AppScaffolding/LibationScaffolding.cs

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