incr ver for new liberation status handling

Make sure DataGridView updates the display immediately after Details are changed.

AaxDecrypter/AaxcDownloadConverter.cs

@@ -1,48 +1,45 @@
 using AAXClean;
 using Dinah.Core;
-using Dinah.Core.Diagnostics;
 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 enum OutputFormat { Mp4a,  Mp3 }
     public class AaxcDownloadConverter
     {
         public event EventHandler<AppleTags> RetrievedTags;
         public event EventHandler<byte[]> RetrievedCoverArt;
-        public event EventHandler<int> DecryptProgressUpdate;
+        public event EventHandler<DownloadProgress> DecryptProgressUpdate;
         public event EventHandler<TimeSpan> DecryptTimeRemaining;
-        public string AppName { get; set; } = nameof(AaxcDownloadConverter);
-        public string OutputFileName { get; private set; }
 
+        public string AppName { get; set; } = nameof(AaxcDownloadConverter);
+
+        private string outputFileName { get; }
         private string cacheDir { get; }
         private DownloadLicense downloadLicense { get; }
         private AaxFile aaxFile;
-        private byte[] coverArt;
         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 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);
+            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 (File.Exists(outputFileName))
+                File.Delete(outputFileName);
 
             if (!Directory.Exists(cacheDirectory))
                 throw new ArgumentNullException(nameof(cacheDirectory), "Directory does not exist");
@@ -63,11 +60,15 @@ namespace AaxDecrypter
             };
         }
 
+        /// <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;
 
-            this.coverArt = coverArt;
+            aaxFile?.AppleTags.SetCoverArt(coverArt);
+
             RetrievedCoverArt?.Invoke(this, coverArt);
         }
 
@@ -96,7 +97,7 @@ namespace AaxDecrypter
                 try
                 {
                     nfsPersister = new NetworkFileStreamPersister(jsonDownloadState);
-                    //If More thaan ~1 hour has elapsed since getting the download url, it will expire.
+                    //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));
                 }
@@ -111,39 +112,44 @@ namespace AaxDecrypter
             {
                 nfsPersister = NewNetworkFilePersister();
             }
-            nfsPersister.NetworkFileStream.BeginDownloading();
 
             aaxFile = new AaxFile(nfsPersister.NetworkFileStream);
-            coverArt = aaxFile.AppleTags.Cover;
 
             RetrievedTags?.Invoke(this, aaxFile.AppleTags);
-            RetrievedCoverArt?.Invoke(this, coverArt);
+            RetrievedCoverArt?.Invoke(this, aaxFile.AppleTags.Cover);
 
             return !isCanceled;
         }
         private NetworkFileStreamPersister NewNetworkFilePersister()
         {
-            var headers = new System.Net.WebHeaderCollection();
-            headers.Add("User-Agent", downloadLicense.UserAgent);
+			var headers = new System.Net.WebHeaderCollection
+			{
+				{ "User-Agent", downloadLicense.UserAgent }
+			};
 
-            NetworkFileStream networkFileStream = new NetworkFileStream(tempFile, new Uri(downloadLicense.DownloadUrl), 0, headers);
+			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, 0);
+            DecryptProgressUpdate?.Invoke(this, zeroProgress);
 
-            if (File.Exists(OutputFileName))
-                FileExt.SafeDelete(OutputFileName);
+            if (File.Exists(outputFileName))
+                FileExt.SafeDelete(outputFileName);
 
-            FileStream outFile = File.OpenWrite(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;
 
@@ -151,21 +157,9 @@ namespace AaxDecrypter
 
             downloadLicense.ChapterInfo = aaxFile.Chapters;
 
-            if (decryptionResult == ConversionResult.NoErrorsDetected
-                && coverArt is not null
-                && OutputFormat == OutputFormat.Mp4a)
-            {
-                //This handles a special case where the aaxc file doesn't contain cover art and
-                //Libation downloaded it instead (Animal Farm). Currently only works for Mp4a files.
-                using var decryptedBook = new Mp4File(OutputFileName, FileAccess.ReadWrite);
-                decryptedBook.AppleTags?.SetCoverArt(coverArt);
-                decryptedBook.Save();
-                decryptedBook.Close();
-            }
-
             nfsPersister.Dispose();
 
-            DecryptProgressUpdate?.Invoke(this, 0);
+            DecryptProgressUpdate?.Invoke(this, zeroProgress);
 
             return decryptionResult == ConversionResult.NoErrorsDetected && !isCanceled;
         }
@@ -181,7 +175,13 @@ namespace AaxDecrypter
 
             double progressPercent = 100 * e.ProcessPosition.TotalSeconds / duration.TotalSeconds;
 
-            DecryptProgressUpdate?.Invoke(this, (int)progressPercent);
+            DecryptProgressUpdate?.Invoke(this,
+                new DownloadProgress 
+                {
+                    ProgressPercentage = progressPercent,
+                    BytesReceived = (long)(nfsPersister.NetworkFileStream.Length * progressPercent),
+                    TotalBytesToReceive = nfsPersister.NetworkFileStream.Length
+                });
         }
 
         public bool Step3_CreateCue()
@@ -189,7 +189,7 @@ namespace AaxDecrypter
             // 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));
+                File.WriteAllText(PathLib.ReplaceExtension(outputFileName, ".cue"), Cue.CreateContents(Path.GetFileName(outputFileName), downloadLicense.ChapterInfo));
             }
             catch (Exception ex)
             {
@@ -203,7 +203,7 @@ namespace AaxDecrypter
             // 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));
+                File.WriteAllText(PathLib.ReplaceExtension(outputFileName, ".nfo"), NFO.CreateContents(AppName, aaxFile, downloadLicense.ChapterInfo));
             }
             catch (Exception ex)
             {
@@ -223,6 +223,9 @@ namespace AaxDecrypter
         {
             isCanceled = true;
             aaxFile?.Cancel();
+            aaxFile?.Dispose();
+            nfsPersister?.NetworkFileStream?.Close();
+            nfsPersister?.Dispose();
         }
     }
 }

AaxDecrypter/NFO.cs

@@ -5,7 +5,7 @@ namespace AaxDecrypter
 {
     public static class NFO
     {
-        public static string CreateContents(string ripper, AAXClean.Mp4File aaxcTagLib, ChapterInfo chapters)
+        public static string CreateContents(string ripper, Mp4File aaxcTagLib, ChapterInfo chapters)
         {
             var _hours = (int)aaxcTagLib.Duration.TotalHours;
             var myDuration
@@ -30,7 +30,7 @@ namespace AaxDecrypter
                 + "\r\n"
                 + "Media Information\r\n"
                 + "======================\r\n"
-                + " Source Format:          Audible AAX\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"

AaxDecrypter/NetworkFileStream.cs

@@ -6,7 +6,6 @@ using System.IO;
 using System.Linq;
 using System.Net;
 using System.Threading;
-using System.Threading.Tasks;
 
 namespace AaxDecrypter
 {
@@ -27,7 +26,7 @@ namespace AaxDecrypter
 
         public CookieCollection GetCookies()
         {
-            return base.GetCookies(Uri);
+            return GetCookies(Uri);
         }
     }
 
@@ -79,15 +78,14 @@ namespace AaxDecrypter
         #endregion
 
         #region Private Properties
-
         private HttpWebRequest HttpRequest { get; set; }
         private FileStream _writeFile { get; }
         private FileStream _readFile { get; }
         private Stream _networkStream { get; set; }
         private bool hasBegunDownloading { get; set; }
         private bool isCancelled { get; set; }
-        private bool finishedDownloading { get; set; }
-        private Action downloadThreadCompleteCallback { get; set; }
+        private EventWaitHandle downloadEnded { get; set; } 
+        private EventWaitHandle downloadedPiece { get; set; } 
 
         #endregion
 
@@ -147,7 +145,7 @@ namespace AaxDecrypter
         private void Update()
         {
             RequestHeaders = HttpRequest.Headers;
-            Updated?.Invoke(this, new EventArgs());
+            Updated?.Invoke(this, EventArgs.Empty);
         }
 
         /// <summary>
@@ -160,8 +158,8 @@ namespace AaxDecrypter
 
             if (uriToSameFile.Host != Uri.Host)
                 throw new ArgumentException($"New uri to the same file must have the same host.\r\n Old Host :{Uri.Host}\r\nNew Host: {uriToSameFile.Host}");
-            if (hasBegunDownloading && !finishedDownloading)
-                throw new Exception("Cannot change Uri during a download operation.");
+            if (hasBegunDownloading)
+                throw new InvalidOperationException("Cannot change Uri after download has started.");
 
             Uri = uriToSameFile;
             HttpRequest = WebRequest.CreateHttp(Uri);
@@ -176,25 +174,27 @@ namespace AaxDecrypter
         /// <summary>
         /// Begins downloading <see cref="Uri"/> to <see cref="SaveFilePath"/> in a background thread.
         /// </summary>
-        public void BeginDownloading()
+        private void BeginDownloading()
         {
+            downloadEnded = new EventWaitHandle(false, EventResetMode.ManualReset);
+
             if (ContentLength != 0 && WritePosition == ContentLength)
             {
                 hasBegunDownloading = true;
-                finishedDownloading = true;
+                downloadEnded.Set();
                 return;
             }
 
             if (ContentLength != 0 && WritePosition > ContentLength)
-                throw new Exception($"Specified write position (0x{WritePosition:X10}) is larger than the file size.");
+                throw new WebException($"Specified write position (0x{WritePosition:X10}) is larger than  {nameof(ContentLength)} (0x{ContentLength:X10}).");
 
             var response = HttpRequest.GetResponse() as HttpWebResponse;
 
             if (response.StatusCode != HttpStatusCode.PartialContent)
-                throw new Exception($"Server at {Uri.Host} responded with unexpected status code: {response.StatusCode}.");
+                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 Exception($"Server at {Uri.Host} does not support Http ranges");
+                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-
@@ -202,10 +202,12 @@ namespace AaxDecrypter
                 ContentLength = response.ContentLength;
 
             _networkStream = response.GetResponseStream();
+            downloadedPiece = new EventWaitHandle(false, EventResetMode.AutoReset);
 
             //Download the file in the background.
-            Thread downloadThread = new Thread(() => DownloadFile());
-            downloadThread.Start();
+            new Thread(() => DownloadFile())
+            { IsBackground = true }
+            .Start();
 
             hasBegunDownloading = true;
             return;
@@ -216,13 +218,13 @@ namespace AaxDecrypter
         /// </summary>
         private void DownloadFile()
         {
-            long downloadPosition = WritePosition;
-            long nextFlush = downloadPosition + DATA_FLUSH_SZ;
+            var downloadPosition = WritePosition;
+            var nextFlush = downloadPosition + DATA_FLUSH_SZ;
 
-            byte[] buff = new byte[DOWNLOAD_BUFF_SZ];
+            var buff = new byte[DOWNLOAD_BUFF_SZ];
             do
             {
-                int bytesRead = _networkStream.Read(buff, 0, DOWNLOAD_BUFF_SZ);
+                var bytesRead = _networkStream.Read(buff, 0, DOWNLOAD_BUFF_SZ);
                 _writeFile.Write(buff, 0, bytesRead);
 
                 downloadPosition += bytesRead;
@@ -233,23 +235,25 @@ namespace AaxDecrypter
                     WritePosition = downloadPosition;
                     Update();
                     nextFlush = downloadPosition + DATA_FLUSH_SZ;
+                    downloadedPiece.Set();
                 }
 
             } while (downloadPosition < ContentLength && !isCancelled);
 
             _writeFile.Close();
+            _networkStream.Close();
             WritePosition = downloadPosition;
             Update();
-            _networkStream.Close();
+
+            downloadedPiece.Set();
+            downloadEnded.Set();
 
             if (!isCancelled && WritePosition < ContentLength)
-                throw new Exception("File download ended before finishing.");
+                throw new WebException($"Downloaded size (0x{WritePosition:X10}) is less than {nameof(ContentLength)} (0x{ContentLength:X10}).");
 
             if (WritePosition > ContentLength)
-                throw new Exception("Downloaded file is larger than expected.");
+                throw new WebException($"Downloaded size (0x{WritePosition:X10}) is greater than {nameof(ContentLength)} (0x{ContentLength:X10}).");
 
-            finishedDownloading = true;
-            downloadThreadCompleteCallback?.Invoke();
         }
 
         #endregion
@@ -330,9 +334,7 @@ namespace AaxDecrypter
                 var result = new WebHeaderCollection();
 
                 foreach (var kvp in jObj)
-                {
                     result.Add(kvp.Key, kvp.Value.Value<string>());
-                }
 
                 return result;
             }
@@ -341,8 +343,8 @@ namespace AaxDecrypter
 
             public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
             {
-                JObject jObj = new JObject();
-                Type type = value.GetType();
+                var jObj = new JObject();
+                var type = value.GetType();
                 var headers = value as WebHeaderCollection;
                 var jHeaders = headers.AllKeys.Select(k => new JProperty(k, headers[k]));
                 jObj.Add(jHeaders);
@@ -364,13 +366,21 @@ namespace AaxDecrypter
         public override bool CanWrite => false;
 
         [JsonIgnore]
-        public override long Length => ContentLength;
+        public override long Length
+        {
+            get
+            {
+                if (!hasBegunDownloading)
+                    BeginDownloading();
+                return ContentLength;
+            }
+        }
 
         [JsonIgnore]
         public override long Position { get => _readFile.Position; set => Seek(value, SeekOrigin.Begin); }
 
         [JsonIgnore]
-        public override bool CanTimeout => base.CanTimeout;
+        public override bool CanTimeout => false;
 
         [JsonIgnore]
         public override int ReadTimeout { get => base.ReadTimeout; set => base.ReadTimeout = value; }
@@ -387,63 +397,39 @@ namespace AaxDecrypter
             if (!hasBegunDownloading)
                 BeginDownloading();
 
-            long toRead = Math.Min(count, Length - Position);
-            long requiredPosition = Position + toRead;
-
-            //read operation will block until file contains enough data
-            //to fulfil the request, or until cancelled.
-            while (requiredPosition > WritePosition && !isCancelled)
-                Thread.Sleep(2);
-
+            var toRead = Math.Min(count, Length - Position);
+            WaitToPosition(Position + toRead);
             return _readFile.Read(buffer, offset, count);
         }
 
         public override long Seek(long offset, SeekOrigin origin)
         {
-            long newPosition;
+            var newPosition = origin switch
+			{
+				SeekOrigin.Current => Position + offset,
+				SeekOrigin.End => ContentLength + offset,
+				_ => offset,
+			};
 
-            switch (origin)
-            {
-                case SeekOrigin.Current:
-                    newPosition = Position + offset;
-                    break;
-                case SeekOrigin.End:
-                    newPosition = ContentLength + offset;
-                    break;
-                default:
-                    newPosition = offset;
-                    break;
-            }
-            ReadToPosition(newPosition);
-
-            _readFile.Position = newPosition;
-            return newPosition;
+            WaitToPosition(newPosition);
+            return _readFile.Position = newPosition;
         }
 
         /// <summary>
-        /// Ensures that the file has downloaded to at least <paramref name="neededPosition"/>, then returns.
+        /// Blocks until the file has downloaded to at least <paramref name="requiredPosition"/>, then returns.
         /// </summary>
-        /// <param name="neededPosition">The minimum required data length in <see cref="SaveFilePath"/>.</param>
-        private void ReadToPosition(long neededPosition)
-        {
-            byte[] buff = new byte[DOWNLOAD_BUFF_SZ];
-            do
-            {
-                Read(buff, 0, DOWNLOAD_BUFF_SZ);
-            } while (neededPosition > WritePosition);
+        /// <param name="requiredPosition">The minimum required flished data length in <see cref="SaveFilePath"/>.</param>
+        private void WaitToPosition(long requiredPosition)
+		{
+            while (requiredPosition > WritePosition && !isCancelled && hasBegunDownloading && !downloadedPiece.WaitOne(1000)) ;
         }
+
         public override void Close()
         {
             isCancelled = true;
-            downloadThreadCompleteCallback = CloseAction;
 
-            //ensure that close will run even if called after callback was fired.
-            if (finishedDownloading)
-                CloseAction();
+            while (downloadEnded is not null && !downloadEnded.WaitOne(1000)) ;
 
-        }
-        private void CloseAction()
-        {
             _readFile.Close();
             _writeFile.Close();
             _networkStream?.Close();
@@ -451,5 +437,10 @@ namespace AaxDecrypter
         }
 
         #endregion
+        ~NetworkFileStream()
+        {
+            downloadEnded?.Close();
+            downloadedPiece?.Close();
+        }
     }
 }

ApplicationServices/LibraryCommands.cs

@@ -11,8 +11,67 @@ 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)
@@ -41,7 +100,8 @@ namespace ApplicationServices
 				//   However, it comes with a scary warning when used with EntityFrameworkCore which I'm not yet ready to implement:
 				//   https://github.com/RehanSaeed/Serilog.Exceptions
 				// work-around: use 3rd param. don't just put exception object in 3rd param -- info overload: stack trace, etc
-				Log.Logger.Error(lfEx, "Error importing library. Login failed. {@DebugInfo}", new {
+				Log.Logger.Error(lfEx, "Error importing library. Login failed. {@DebugInfo}", new
+				{
 					lfEx.RequestUrl,
 					ResponseStatusCodeNumber = (int)lfEx.ResponseStatusCode,
 					ResponseStatusCodeDesc = lfEx.ResponseStatusCode,
@@ -86,7 +146,7 @@ namespace ApplicationServices
 				Account = account?.MaskedLogEntry ?? "[null]"
 			});
 
-			var dtoItems = await AudibleApiActions.GetLibraryValidatedAsync(api);
+			var dtoItems = await AudibleApiActions.GetLibraryValidatedAsync(api, LibraryResponseGroups);
 			return dtoItems.Select(d => new ImportItem { DtoItem = d, AccountId = account.AccountId, LocaleName = account.Locale?.Name }).ToList();
 		}
 
@@ -99,17 +159,39 @@ namespace ApplicationServices
 
 			return newCount;
 		}
+		#endregion
 
-		public static int UpdateTags(this LibationContext context, Book book, string newTags)
+		#region Update book details
+		public static int UpdateUserDefinedItem(Book book, string newTags, LiberatedStatus bookStatus, LiberatedStatus? pdfStatus)
 		{
 			try
 			{
-				book.UserDefinedItem.Tags = newTags;
+				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)
+				if (qtyChanges == 0)
+					return 0;
+
+				if (tagsChanged)
 					SearchEngineCommands.UpdateBookTags(book);
+				if (bookStatusChanged || pdfStatusChanged)
+					SearchEngineCommands.UpdateLiberatedStatus(book);
 
 				return qtyChanges;
 			}
@@ -119,5 +201,98 @@ namespace ApplicationServices
 				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);
+		}
 	}
 }

ApplicationServices/LibraryExporter.cs

@@ -88,6 +88,12 @@ namespace ApplicationServices
 
 		[Name("My Libation Tags")]
 		public string MyLibationTags { get; set; }
+
+		[Name("Book Liberation Status")]
+		public string BookStatus { get; set; }
+
+		[Name("PDF Liberation Status")]
+		public string PdfStatus { get; set; }
 	}
 	public static class LibToDtos
 	{
@@ -116,7 +122,9 @@ namespace ApplicationServices
 				MyRatingOverall = a.Book.UserDefinedItem.Rating.OverallRating,
 				MyRatingPerformance = a.Book.UserDefinedItem.Rating.PerformanceRating,
 				MyRatingStory = a.Book.UserDefinedItem.Rating.StoryRating,
-				MyLibationTags = a.Book.UserDefinedItem.Tags
+				MyLibationTags = a.Book.UserDefinedItem.Tags,
+				BookStatus = a.Book.UserDefinedItem.BookStatus.ToString(),
+				PdfStatus = a.Book.UserDefinedItem.PdfStatus.ToString()
 			}).ToList();
 	}
 	public static class LibraryExporter
@@ -187,7 +195,9 @@ namespace ApplicationServices
 				nameof (ExportDto.MyRatingOverall),
 				nameof (ExportDto.MyRatingPerformance),
 				nameof (ExportDto.MyRatingStory),
-				nameof (ExportDto.MyLibationTags)
+				nameof (ExportDto.MyLibationTags),
+				nameof (ExportDto.BookStatus),
+				nameof (ExportDto.PdfStatus)
 			};
 			var col = 0;
 			foreach (var c in columns)
@@ -249,6 +259,8 @@ namespace ApplicationServices
 				col = createCell(row, col, dto.MyRatingStory);
 
 				row.CreateCell(col++).SetCellValue(dto.MyLibationTags);
+				row.CreateCell(col++).SetCellValue(dto.BookStatus);
+				row.CreateCell(col++).SetCellValue(dto.PdfStatus);
 
 				rowIndex++;
 			}

ApplicationServices/SearchEngineCommands.cs

@@ -7,10 +7,10 @@ namespace ApplicationServices
 {
 	public static class SearchEngineCommands
 	{
-		public static void FullReIndex()
+		public static void FullReIndex(SearchEngine engine = null)
 		{
-			var engine = new SearchEngine(DbContexts.GetContext());
-			engine.CreateNewIndex();
+			engine ??= new SearchEngine();
+			engine.CreateNewIndex(DbContexts.GetContext());
 		}
 
 		public static SearchResultSet Search(string searchString) => performSearchEngineFunc_safe(e =>
@@ -21,34 +21,34 @@ namespace ApplicationServices
 			e.UpdateTags(book.AudibleProductId, book.UserDefinedItem.Tags)
 		);
 
-		public static void UpdateIsLiberated(Book book) => performSearchEngineAction_safe(e =>
-			e.UpdateIsLiberated(book.AudibleProductId)
+		public static void UpdateLiberatedStatus(Book book) => performSearchEngineAction_safe(e =>
+			e.UpdateLiberatedStatus(book)
 		);
 
 		private static void performSearchEngineAction_safe(Action<SearchEngine> action)
 		{
-			var engine = new SearchEngine(DbContexts.GetContext());
+			var engine = new SearchEngine();
 			try
 			{
 				action(engine);
 			}
 			catch (FileNotFoundException)
 			{
-				FullReIndex();
+				FullReIndex(engine);
 				action(engine);
 			}
 		}
 
 		private static T performSearchEngineFunc_safe<T>(Func<SearchEngine, T> action)
 		{
-			var engine = new SearchEngine(DbContexts.GetContext());
+			var engine = new SearchEngine();
 			try
 			{
 				return action(engine);
 			}
 			catch (FileNotFoundException)
 			{
-				FullReIndex();
+				FullReIndex(engine);
 				return action(engine);
 			}
 		}

DataLayer/EfClasses/Book.cs

@@ -51,6 +51,24 @@ namespace DataLayer
         // is owned, not optional 1:1
         public UserDefinedItem UserDefinedItem { get; private set; }
 
+        // UserDefinedItem convenience properties
+        public bool Audio_Exists
+        {
+            get
+            {
+                var status = UserDefinedItem?.BookStatus;
+                return status.HasValue && status.Value != LiberatedStatus.NotLiberated;
+            }
+        }
+        public bool PDF_Exists
+        {
+            get
+            {
+                var status = UserDefinedItem?.PdfStatus;
+                return (status.HasValue && status.Value == LiberatedStatus.Liberated);
+            }
+        }
+
         // is owned, not optional 1:1
         /// <summary>The product's aggregate community rating</summary>
         public Rating Rating { get; private set; } = new Rating(0, 0, 0);
@@ -88,8 +106,8 @@ namespace DataLayer
 			Category = category;
 
             // simple assigns
-            Title = title;
-            Description = description;
+            Title = title.Trim();
+            Description = description.Trim();
             LengthInMinutes = lengthInMinutes;
 
             // assigns with biz logic
@@ -220,8 +238,11 @@ namespace DataLayer
 
             ArgumentValidator.EnsureNotNullOrWhiteSpace(url, nameof(url));
 
-            if (!_supplements.Any(s => url.EqualsInsensitive(url)))
-                _supplements.Add(new Supplement(this, url));
+            if (_supplements.Any(s => url.EqualsInsensitive(url)))
+                return;
+
+            _supplements.Add(new Supplement(this, url));
+            UserDefinedItem.PdfStatus ??= LiberatedStatus.NotLiberated;
         }
         #endregion
 

DataLayer/EfClasses/BookContributor.cs

@@ -2,6 +2,8 @@
 
 namespace DataLayer
 {
+    public enum Role { Author = 1, Narrator = 2, Publisher = 3 }
+
     public class BookContributor
     {
         internal int BookId { get; private set; }

DataLayer/EfClasses/Role.cs

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

DataLayer/EfClasses/UserDefinedItem.cs

@@ -6,6 +6,17 @@ using Dinah.Core;
 
 namespace DataLayer
 {
+    /// <summary>
+    /// Do not track in-process state. In-process state is determined by the presence of temp file.
+    /// </summary>
+    public enum LiberatedStatus
+    {
+        NotLiberated = 0,
+        Liberated = 1,
+        /// <summary>Error occurred during liberation. Don't retry</summary>
+        Error = 2
+    }
+
     public class UserDefinedItem
     {
         internal int BookId { get; private set; }
@@ -22,6 +33,7 @@ namespace DataLayer
 			Tags = FileManager.TagsPersistence.GetTags(book.AudibleProductId);
 		}
 
+        #region Tags
         private string _tags = "";
         public string Tags
         {
@@ -71,14 +83,22 @@ namespace DataLayer
             return string.Join(" ", unique);
         }
         #endregion
+        #endregion
 
+        #region Rating
         // owned: not an optional one-to-one
         /// <summary>The user's individual book rating</summary>
         public Rating Rating { get; private set; } = new Rating(0, 0, 0);
 
         public void UpdateRating(float overallRating, float performanceRating, float storyRating)
             => Rating.Update(overallRating, performanceRating, storyRating);
+        #endregion
 
-		public override string ToString() => $"{Book} {Rating} {Tags}";
+        #region LiberatedStatuses
+        public LiberatedStatus BookStatus { get; set; }
+        public LiberatedStatus? PdfStatus { get; set; }
+        #endregion
+
+        public override string ToString() => $"{Book} {Rating} {Tags}";
 	}
 }

DataLayer/Migrations/20210727180408_AddLiberatedStatus.Designer.cs

@@ -0,0 +1,390 @@
+// <auto-generated />
+using System;
+using DataLayer;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+
+namespace DataLayer.Migrations
+{
+    [DbContext(typeof(LibationContext))]
+    [Migration("20210727180408_AddLiberatedStatus")]
+    partial class AddLiberatedStatus
+    {
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("ProductVersion", "5.0.5");
+
+            modelBuilder.Entity("DataLayer.Book", b =>
+                {
+                    b.Property<int>("BookId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("AudibleProductId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("CategoryId")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<DateTime?>("DatePublished")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("IsAbridged")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("LengthInMinutes")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Locale")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("PictureId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Title")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("BookId");
+
+                    b.HasIndex("AudibleProductId");
+
+                    b.HasIndex("CategoryId");
+
+                    b.ToTable("Books");
+                });
+
+            modelBuilder.Entity("DataLayer.BookContributor", b =>
+                {
+                    b.Property<int>("BookId")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("ContributorId")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("Role")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<byte>("Order")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("BookId", "ContributorId", "Role");
+
+                    b.HasIndex("BookId");
+
+                    b.HasIndex("ContributorId");
+
+                    b.ToTable("BookContributor");
+                });
+
+            modelBuilder.Entity("DataLayer.Category", b =>
+                {
+                    b.Property<int>("CategoryId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("AudibleCategoryId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int?>("ParentCategoryCategoryId")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("CategoryId");
+
+                    b.HasIndex("AudibleCategoryId");
+
+                    b.HasIndex("ParentCategoryCategoryId");
+
+                    b.ToTable("Categories");
+
+                    b.HasData(
+                        new
+                        {
+                            CategoryId = -1,
+                            AudibleCategoryId = "",
+                            Name = ""
+                        });
+                });
+
+            modelBuilder.Entity("DataLayer.Contributor", b =>
+                {
+                    b.Property<int>("ContributorId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("AudibleContributorId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("ContributorId");
+
+                    b.HasIndex("Name");
+
+                    b.ToTable("Contributors");
+
+                    b.HasData(
+                        new
+                        {
+                            ContributorId = -1,
+                            Name = ""
+                        });
+                });
+
+            modelBuilder.Entity("DataLayer.LibraryBook", b =>
+                {
+                    b.Property<int>("BookId")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Account")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("DateAdded")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("BookId");
+
+                    b.ToTable("Library");
+                });
+
+            modelBuilder.Entity("DataLayer.Series", b =>
+                {
+                    b.Property<int>("SeriesId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("AudibleSeriesId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("SeriesId");
+
+                    b.HasIndex("AudibleSeriesId");
+
+                    b.ToTable("Series");
+                });
+
+            modelBuilder.Entity("DataLayer.SeriesBook", b =>
+                {
+                    b.Property<int>("SeriesId")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("BookId")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<float?>("Index")
+                        .HasColumnType("REAL");
+
+                    b.HasKey("SeriesId", "BookId");
+
+                    b.HasIndex("BookId");
+
+                    b.HasIndex("SeriesId");
+
+                    b.ToTable("SeriesBook");
+                });
+
+            modelBuilder.Entity("DataLayer.Book", b =>
+                {
+                    b.HasOne("DataLayer.Category", "Category")
+                        .WithMany()
+                        .HasForeignKey("CategoryId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.OwnsOne("DataLayer.Rating", "Rating", b1 =>
+                        {
+                            b1.Property<int>("BookId")
+                                .HasColumnType("INTEGER");
+
+                            b1.Property<float>("OverallRating")
+                                .HasColumnType("REAL");
+
+                            b1.Property<float>("PerformanceRating")
+                                .HasColumnType("REAL");
+
+                            b1.Property<float>("StoryRating")
+                                .HasColumnType("REAL");
+
+                            b1.HasKey("BookId");
+
+                            b1.ToTable("Books");
+
+                            b1.WithOwner()
+                                .HasForeignKey("BookId");
+                        });
+
+                    b.OwnsMany("DataLayer.Supplement", "Supplements", b1 =>
+                        {
+                            b1.Property<int>("SupplementId")
+                                .ValueGeneratedOnAdd()
+                                .HasColumnType("INTEGER");
+
+                            b1.Property<int>("BookId")
+                                .HasColumnType("INTEGER");
+
+                            b1.Property<string>("Url")
+                                .HasColumnType("TEXT");
+
+                            b1.HasKey("SupplementId");
+
+                            b1.HasIndex("BookId");
+
+                            b1.ToTable("Supplement");
+
+                            b1.WithOwner("Book")
+                                .HasForeignKey("BookId");
+
+                            b1.Navigation("Book");
+                        });
+
+                    b.OwnsOne("DataLayer.UserDefinedItem", "UserDefinedItem", b1 =>
+                        {
+                            b1.Property<int>("BookId")
+                                .HasColumnType("INTEGER");
+
+                            b1.Property<string>("BookLocation")
+                                .HasColumnType("TEXT");
+
+                            b1.Property<int>("BookStatus")
+                                .HasColumnType("INTEGER");
+
+                            b1.Property<int?>("PdfStatus")
+                                .HasColumnType("INTEGER");
+
+                            b1.Property<string>("Tags")
+                                .HasColumnType("TEXT");
+
+                            b1.HasKey("BookId");
+
+                            b1.ToTable("UserDefinedItem");
+
+                            b1.WithOwner("Book")
+                                .HasForeignKey("BookId");
+
+                            b1.OwnsOne("DataLayer.Rating", "Rating", b2 =>
+                                {
+                                    b2.Property<int>("UserDefinedItemBookId")
+                                        .HasColumnType("INTEGER");
+
+                                    b2.Property<float>("OverallRating")
+                                        .HasColumnType("REAL");
+
+                                    b2.Property<float>("PerformanceRating")
+                                        .HasColumnType("REAL");
+
+                                    b2.Property<float>("StoryRating")
+                                        .HasColumnType("REAL");
+
+                                    b2.HasKey("UserDefinedItemBookId");
+
+                                    b2.ToTable("UserDefinedItem");
+
+                                    b2.WithOwner()
+                                        .HasForeignKey("UserDefinedItemBookId");
+                                });
+
+                            b1.Navigation("Book");
+
+                            b1.Navigation("Rating");
+                        });
+
+                    b.Navigation("Category");
+
+                    b.Navigation("Rating");
+
+                    b.Navigation("Supplements");
+
+                    b.Navigation("UserDefinedItem");
+                });
+
+            modelBuilder.Entity("DataLayer.BookContributor", b =>
+                {
+                    b.HasOne("DataLayer.Book", "Book")
+                        .WithMany("ContributorsLink")
+                        .HasForeignKey("BookId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("DataLayer.Contributor", "Contributor")
+                        .WithMany("BooksLink")
+                        .HasForeignKey("ContributorId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Book");
+
+                    b.Navigation("Contributor");
+                });
+
+            modelBuilder.Entity("DataLayer.Category", b =>
+                {
+                    b.HasOne("DataLayer.Category", "ParentCategory")
+                        .WithMany()
+                        .HasForeignKey("ParentCategoryCategoryId");
+
+                    b.Navigation("ParentCategory");
+                });
+
+            modelBuilder.Entity("DataLayer.LibraryBook", b =>
+                {
+                    b.HasOne("DataLayer.Book", "Book")
+                        .WithOne()
+                        .HasForeignKey("DataLayer.LibraryBook", "BookId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Book");
+                });
+
+            modelBuilder.Entity("DataLayer.SeriesBook", b =>
+                {
+                    b.HasOne("DataLayer.Book", "Book")
+                        .WithMany("SeriesLink")
+                        .HasForeignKey("BookId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("DataLayer.Series", "Series")
+                        .WithMany("BooksLink")
+                        .HasForeignKey("SeriesId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Book");
+
+                    b.Navigation("Series");
+                });
+
+            modelBuilder.Entity("DataLayer.Book", b =>
+                {
+                    b.Navigation("ContributorsLink");
+
+                    b.Navigation("SeriesLink");
+                });
+
+            modelBuilder.Entity("DataLayer.Contributor", b =>
+                {
+                    b.Navigation("BooksLink");
+                });
+
+            modelBuilder.Entity("DataLayer.Series", b =>
+                {
+                    b.Navigation("BooksLink");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}

DataLayer/Migrations/20210727180408_AddLiberatedStatus.cs

@@ -0,0 +1,44 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+namespace DataLayer.Migrations
+{
+    public partial class AddLiberatedStatus : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<string>(
+                name: "BookLocation",
+                table: "UserDefinedItem",
+                type: "TEXT",
+                nullable: true);
+
+            migrationBuilder.AddColumn<int>(
+                name: "BookStatus",
+                table: "UserDefinedItem",
+                type: "INTEGER",
+                nullable: false,
+                defaultValue: 0);
+
+            migrationBuilder.AddColumn<int>(
+                name: "PdfStatus",
+                table: "UserDefinedItem",
+                type: "INTEGER",
+                nullable: true);
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "BookLocation",
+                table: "UserDefinedItem");
+
+            migrationBuilder.DropColumn(
+                name: "BookStatus",
+                table: "UserDefinedItem");
+
+            migrationBuilder.DropColumn(
+                name: "PdfStatus",
+                table: "UserDefinedItem");
+        }
+    }
+}

DataLayer/Migrations/20210821012137_RemoveUdiBookLocation.Designer.cs

@@ -0,0 +1,387 @@
+// <auto-generated />
+using System;
+using DataLayer;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+
+namespace DataLayer.Migrations
+{
+    [DbContext(typeof(LibationContext))]
+    [Migration("20210821012137_RemoveUdiBookLocation")]
+    partial class RemoveUdiBookLocation
+    {
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("ProductVersion", "5.0.5");
+
+            modelBuilder.Entity("DataLayer.Book", b =>
+                {
+                    b.Property<int>("BookId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("AudibleProductId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("CategoryId")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<DateTime?>("DatePublished")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("IsAbridged")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("LengthInMinutes")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Locale")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("PictureId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Title")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("BookId");
+
+                    b.HasIndex("AudibleProductId");
+
+                    b.HasIndex("CategoryId");
+
+                    b.ToTable("Books");
+                });
+
+            modelBuilder.Entity("DataLayer.BookContributor", b =>
+                {
+                    b.Property<int>("BookId")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("ContributorId")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("Role")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<byte>("Order")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("BookId", "ContributorId", "Role");
+
+                    b.HasIndex("BookId");
+
+                    b.HasIndex("ContributorId");
+
+                    b.ToTable("BookContributor");
+                });
+
+            modelBuilder.Entity("DataLayer.Category", b =>
+                {
+                    b.Property<int>("CategoryId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("AudibleCategoryId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int?>("ParentCategoryCategoryId")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("CategoryId");
+
+                    b.HasIndex("AudibleCategoryId");
+
+                    b.HasIndex("ParentCategoryCategoryId");
+
+                    b.ToTable("Categories");
+
+                    b.HasData(
+                        new
+                        {
+                            CategoryId = -1,
+                            AudibleCategoryId = "",
+                            Name = ""
+                        });
+                });
+
+            modelBuilder.Entity("DataLayer.Contributor", b =>
+                {
+                    b.Property<int>("ContributorId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("AudibleContributorId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("ContributorId");
+
+                    b.HasIndex("Name");
+
+                    b.ToTable("Contributors");
+
+                    b.HasData(
+                        new
+                        {
+                            ContributorId = -1,
+                            Name = ""
+                        });
+                });
+
+            modelBuilder.Entity("DataLayer.LibraryBook", b =>
+                {
+                    b.Property<int>("BookId")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Account")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("DateAdded")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("BookId");
+
+                    b.ToTable("Library");
+                });
+
+            modelBuilder.Entity("DataLayer.Series", b =>
+                {
+                    b.Property<int>("SeriesId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("AudibleSeriesId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("SeriesId");
+
+                    b.HasIndex("AudibleSeriesId");
+
+                    b.ToTable("Series");
+                });
+
+            modelBuilder.Entity("DataLayer.SeriesBook", b =>
+                {
+                    b.Property<int>("SeriesId")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("BookId")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<float?>("Index")
+                        .HasColumnType("REAL");
+
+                    b.HasKey("SeriesId", "BookId");
+
+                    b.HasIndex("BookId");
+
+                    b.HasIndex("SeriesId");
+
+                    b.ToTable("SeriesBook");
+                });
+
+            modelBuilder.Entity("DataLayer.Book", b =>
+                {
+                    b.HasOne("DataLayer.Category", "Category")
+                        .WithMany()
+                        .HasForeignKey("CategoryId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.OwnsOne("DataLayer.Rating", "Rating", b1 =>
+                        {
+                            b1.Property<int>("BookId")
+                                .HasColumnType("INTEGER");
+
+                            b1.Property<float>("OverallRating")
+                                .HasColumnType("REAL");
+
+                            b1.Property<float>("PerformanceRating")
+                                .HasColumnType("REAL");
+
+                            b1.Property<float>("StoryRating")
+                                .HasColumnType("REAL");
+
+                            b1.HasKey("BookId");
+
+                            b1.ToTable("Books");
+
+                            b1.WithOwner()
+                                .HasForeignKey("BookId");
+                        });
+
+                    b.OwnsMany("DataLayer.Supplement", "Supplements", b1 =>
+                        {
+                            b1.Property<int>("SupplementId")
+                                .ValueGeneratedOnAdd()
+                                .HasColumnType("INTEGER");
+
+                            b1.Property<int>("BookId")
+                                .HasColumnType("INTEGER");
+
+                            b1.Property<string>("Url")
+                                .HasColumnType("TEXT");
+
+                            b1.HasKey("SupplementId");
+
+                            b1.HasIndex("BookId");
+
+                            b1.ToTable("Supplement");
+
+                            b1.WithOwner("Book")
+                                .HasForeignKey("BookId");
+
+                            b1.Navigation("Book");
+                        });
+
+                    b.OwnsOne("DataLayer.UserDefinedItem", "UserDefinedItem", b1 =>
+                        {
+                            b1.Property<int>("BookId")
+                                .HasColumnType("INTEGER");
+
+                            b1.Property<int>("BookStatus")
+                                .HasColumnType("INTEGER");
+
+                            b1.Property<int?>("PdfStatus")
+                                .HasColumnType("INTEGER");
+
+                            b1.Property<string>("Tags")
+                                .HasColumnType("TEXT");
+
+                            b1.HasKey("BookId");
+
+                            b1.ToTable("UserDefinedItem");
+
+                            b1.WithOwner("Book")
+                                .HasForeignKey("BookId");
+
+                            b1.OwnsOne("DataLayer.Rating", "Rating", b2 =>
+                                {
+                                    b2.Property<int>("UserDefinedItemBookId")
+                                        .HasColumnType("INTEGER");
+
+                                    b2.Property<float>("OverallRating")
+                                        .HasColumnType("REAL");
+
+                                    b2.Property<float>("PerformanceRating")
+                                        .HasColumnType("REAL");
+
+                                    b2.Property<float>("StoryRating")
+                                        .HasColumnType("REAL");
+
+                                    b2.HasKey("UserDefinedItemBookId");
+
+                                    b2.ToTable("UserDefinedItem");
+
+                                    b2.WithOwner()
+                                        .HasForeignKey("UserDefinedItemBookId");
+                                });
+
+                            b1.Navigation("Book");
+
+                            b1.Navigation("Rating");
+                        });
+
+                    b.Navigation("Category");
+
+                    b.Navigation("Rating");
+
+                    b.Navigation("Supplements");
+
+                    b.Navigation("UserDefinedItem");
+                });
+
+            modelBuilder.Entity("DataLayer.BookContributor", b =>
+                {
+                    b.HasOne("DataLayer.Book", "Book")
+                        .WithMany("ContributorsLink")
+                        .HasForeignKey("BookId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("DataLayer.Contributor", "Contributor")
+                        .WithMany("BooksLink")
+                        .HasForeignKey("ContributorId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Book");
+
+                    b.Navigation("Contributor");
+                });
+
+            modelBuilder.Entity("DataLayer.Category", b =>
+                {
+                    b.HasOne("DataLayer.Category", "ParentCategory")
+                        .WithMany()
+                        .HasForeignKey("ParentCategoryCategoryId");
+
+                    b.Navigation("ParentCategory");
+                });
+
+            modelBuilder.Entity("DataLayer.LibraryBook", b =>
+                {
+                    b.HasOne("DataLayer.Book", "Book")
+                        .WithOne()
+                        .HasForeignKey("DataLayer.LibraryBook", "BookId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Book");
+                });
+
+            modelBuilder.Entity("DataLayer.SeriesBook", b =>
+                {
+                    b.HasOne("DataLayer.Book", "Book")
+                        .WithMany("SeriesLink")
+                        .HasForeignKey("BookId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("DataLayer.Series", "Series")
+                        .WithMany("BooksLink")
+                        .HasForeignKey("SeriesId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Book");
+
+                    b.Navigation("Series");
+                });
+
+            modelBuilder.Entity("DataLayer.Book", b =>
+                {
+                    b.Navigation("ContributorsLink");
+
+                    b.Navigation("SeriesLink");
+                });
+
+            modelBuilder.Entity("DataLayer.Contributor", b =>
+                {
+                    b.Navigation("BooksLink");
+                });
+
+            modelBuilder.Entity("DataLayer.Series", b =>
+                {
+                    b.Navigation("BooksLink");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}

DataLayer/Migrations/20210821012137_RemoveUdiBookLocation.cs

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

DataLayer/Migrations/LibationContextModelSnapshot.cs

@@ -253,6 +253,12 @@ namespace DataLayer.Migrations
                             b1.Property<int>("BookId")
                                 .HasColumnType("INTEGER");
 
+                            b1.Property<int>("BookStatus")
+                                .HasColumnType("INTEGER");
+
+                            b1.Property<int?>("PdfStatus")
+                                .HasColumnType("INTEGER");
+
                             b1.Property<string>("Tags")
                                 .HasColumnType("TEXT");
 

DataLayer/QueryObjects/BookQueries.cs

@@ -6,12 +6,14 @@ using Microsoft.EntityFrameworkCore;
 
 namespace DataLayer
 {
+    // only library importing should use tracking. All else should be NoTracking.
+    // only library importing should directly query Book. All else should use LibraryBook
     public static class BookQueries
     {
         public static Book GetBook_Flat_NoTracking(this LibationContext context, string productId)
             => context
                 .Books
-                .AsNoTracking()
+                .AsNoTrackingWithIdentityResolution()
                 .GetBook(productId);
 
         public static Book GetBook(this IQueryable<Book> books, string productId)
@@ -25,6 +27,7 @@ namespace DataLayer
                 .GetBooks()
                 .Where(predicate);
 
+        /// <summary>This is still IQueryable. YOU MUST CALL ToList() YOURSELF</summary>
         public static IQueryable<Book> GetBooks(this IQueryable<Book> books)
             => books
                 // owned items are always loaded. eg: book.UserDefinedItem, book.Supplements

DataLayer/QueryObjects/LibraryQueries.cs

@@ -4,27 +4,35 @@ using Microsoft.EntityFrameworkCore;
 
 namespace DataLayer
 {
+    // only library importing should use tracking. All else should be NoTracking.
+    // only library importing should directly query Book. All else should use LibraryBook
     public static class LibraryQueries
 	{
-		public static List<LibraryBook> GetLibrary_Flat_WithTracking(this LibationContext context)
-			=> context
-				.Library
-				.GetLibrary()
-				.ToList();
+        //// tracking is a bad idea for main grid. it prevents anything else from updating entities unless getting them from the grid
+		//public static List<LibraryBook> GetLibrary_Flat_WithTracking(this LibationContext context)
+		//	=> context
+		//		.Library
+		//		.GetLibrary()
+		//		.ToList();
 
 		public static List<LibraryBook> GetLibrary_Flat_NoTracking(this LibationContext context)
             => context
                 .Library
-                .AsNoTracking()
+                .AsNoTrackingWithIdentityResolution()
                 .GetLibrary()
                 .ToList();
 
         public static LibraryBook GetLibraryBook_Flat_NoTracking(this LibationContext context, string productId)
             => context
                 .Library
-                .AsNoTracking()
+                .AsNoTrackingWithIdentityResolution()
                 .GetLibraryBook(productId);
 
+        public static LibraryBook GetLibraryBook(this IQueryable<LibraryBook> library, string productId)
+            => library
+                .GetLibrary()
+                .SingleOrDefault(lb => lb.Book.AudibleProductId == productId);
+
         /// <summary>This is still IQueryable. YOU MUST CALL ToList() YOURSELF</summary>
         public static IQueryable<LibraryBook> GetLibrary(this IQueryable<LibraryBook> library)
             => library
@@ -32,10 +40,5 @@ namespace DataLayer
                 .Include(le => le.Book).ThenInclude(b => b.SeriesLink).ThenInclude(sb => sb.Series)
                 .Include(le => le.Book).ThenInclude(b => b.ContributorsLink).ThenInclude(c => c.Contributor)
                 .Include(le => le.Book).ThenInclude(b => b.Category).ThenInclude(c => c.ParentCategory);
-
-        public static LibraryBook GetLibraryBook(this IQueryable<LibraryBook> library, string productId)
-            => library
-                .GetLibrary()
-                .SingleOrDefault(le => le.Book.AudibleProductId == productId);
     }
 }

DtoImporterService/BookImporter.cs

@@ -67,9 +67,6 @@ namespace DtoImporterService
 		{
 			var item = importItem.DtoItem;
 
-			//Add any subtitle after the title title.
-			var title = item.Title + (!string.IsNullOrWhiteSpace(item.Subtitle) ? $": {item.Subtitle}" : "");
-
 			// absence of authors is very rare, but possible
 			if (!item.Authors?.Any() ?? true)
 				item.Authors = new[] { new Person { Name = "", Asin = null } };
@@ -105,7 +102,7 @@ namespace DtoImporterService
 
 			var book = DbContext.Books.Add(new Book(
 				new AudibleProductId(item.ProductId),
-				title,
+				item.TitleWithSubtitle,
 				item.Description,
 				item.LengthInMinutes,
 				authors,

FileLiberator/BackupBook.cs

@@ -1,57 +0,0 @@
-using System;
-using System.Threading.Tasks;
-using DataLayer;
-using Dinah.Core.ErrorHandling;
-using FileManager;
-
-namespace FileLiberator
-{
-    /// <summary>
-    /// Download DRM book and decrypt audiobook files
-    /// 
-    /// Processes:
-    /// Download: download aax file: the DRM encrypted audiobook
-    /// Decrypt: remove DRM encryption from audiobook. Store final book
-    /// Backup: perform all steps (downloaded, decrypt) still needed to get final book
-    /// </summary>
-    public class BackupBook : IProcessable
-    {
-        public event EventHandler<LibraryBook> Begin;
-        public event EventHandler<string> StatusUpdate;
-        public event EventHandler<LibraryBook> Completed;
-
-        public DownloadDecryptBook DecryptBook { get; } = new DownloadDecryptBook();
-		public DownloadPdf DownloadPdf { get; } = new DownloadPdf();
-
-		public bool Validate(LibraryBook libraryBook)
-            => !AudibleFileStorage.Audio.Exists(libraryBook.Book.AudibleProductId);
-
-		// do NOT use ConfigureAwait(false) on ProcessAsync()
-		// often calls events which prints to forms in the UI context
-		public async Task<StatusHandler> ProcessAsync(LibraryBook libraryBook)
-        {
-            Begin?.Invoke(this, libraryBook);
-
-            try
-			{
-				{
-					var statusHandler = await DecryptBook.TryProcessAsync(libraryBook);
-					if (statusHandler.HasErrors)
-						return statusHandler;
-				}
-
-				{
-					var statusHandler = await DownloadPdf.TryProcessAsync(libraryBook);
-					if (statusHandler.HasErrors)
-						return statusHandler;
-				}
-
-				return new StatusHandler();
-			}
-			finally
-            {
-                Completed?.Invoke(this, libraryBook);
-            }
-        }
-	}
-}

FileLiberator/ConvertToMp3.cs

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

FileLiberator/DownloadDecryptBook.cs

@@ -1,41 +1,43 @@
-using DataLayer;
-using Dinah.Core;
-using Dinah.Core.ErrorHandling;
-using FileManager;
-using System;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using System.Text;
 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 : IDecryptable
+    public class DownloadDecryptBook : IAudioDecodable
     {
-        public event EventHandler<Action<byte[]>> RequestCoverArt;
-        public event EventHandler<LibraryBook> Begin;
-        public event EventHandler<string> DecryptBegin;
-        public event EventHandler<string> TitleDiscovered;
-        public event EventHandler<string> AuthorsDiscovered;
-        public event EventHandler<string> NarratorsDiscovered;
-        public event EventHandler<byte[]> CoverImageFilepathDiscovered;
-        public event EventHandler<int> UpdateProgress;
-        public event EventHandler<TimeSpan> UpdateRemainingTime;
-        public event EventHandler<string> DecryptCompleted;
-        public event EventHandler<LibraryBook> Completed;
-        public event EventHandler<string> StatusUpdate;
 
-        private AaxcDownloadConverter aaxcDownloader;
-        public async Task<StatusHandler> ProcessAsync(LibraryBook libraryBook)
+		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 (AudibleFileStorage.Audio.Exists(libraryBook.Book.AudibleProductId))
+                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);
@@ -47,10 +49,12 @@ namespace FileLiberator
                 // moves files and returns dest dir
                 _ = moveFilesToBooksDir(libraryBook.Book, outputAudioFilename);
 
-                var finalAudioExists = AudibleFileStorage.Audio.Exists(libraryBook.Book.AudibleProductId);
-                if (!finalAudioExists)
+                if (!libraryBook.Book.Audio_Exists)
                     return new StatusHandler { "Cannot find final audio file after decryption" };
 
+                // only need to update if success. if failure, it will remain at 0 == NotLiberated
+                ApplicationServices.LibraryCommands.UpdateBook(libraryBook, LiberatedStatus.Liberated);
+
                 return new StatusHandler();
             }
             finally
@@ -61,7 +65,7 @@ namespace FileLiberator
 
         private async Task<string> aaxToM4bConverterDecryptAsync(string cacheDir, string destinationDir, LibraryBook libraryBook)
         {
-            DecryptBegin?.Invoke(this, $"Begin decrypting {libraryBook}");
+            StreamingBegin?.Invoke(this, $"Begin decrypting {libraryBook}");
 
             try
             {
@@ -73,9 +77,9 @@ namespace FileLiberator
 
                 var aaxcDecryptDlLic = new DownloadLicense
                     (
-                    contentLic.ContentMetadata?.ContentUrl?.OfflineUrl,
-                    contentLic.Voucher?.Key,
-                    contentLic.Voucher?.Iv,
+                    contentLic?.ContentMetadata?.ContentUrl?.OfflineUrl,
+                    contentLic?.Voucher?.Key,
+                    contentLic?.Voucher?.Iv,
                     Resources.UserAgent
                     );
 
@@ -97,12 +101,12 @@ namespace FileLiberator
                     _ => throw new NotImplementedException(),
                 };
 
-                 var proposedOutputFile = Path.Combine(destinationDir, $"{PathLib.ToPathSafeString(libraryBook.Book.Title)} [{libraryBook.Book.AudibleProductId}].{extension}");
+                var outFileName = Path.Combine(destinationDir, $"{PathLib.ToPathSafeString(libraryBook.Book.Title)} [{libraryBook.Book.AudibleProductId}].{extension}");
 
 
-                aaxcDownloader = new AaxcDownloadConverter(proposedOutputFile, cacheDir, aaxcDecryptDlLic, format) { AppName = "Libation" };
-                aaxcDownloader.DecryptProgressUpdate += (s, progress) => UpdateProgress?.Invoke(this, progress);
-                aaxcDownloader.DecryptTimeRemaining += (s, remaining) => UpdateRemainingTime?.Invoke(this, remaining);
+                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;
 
@@ -113,15 +117,16 @@ namespace FileLiberator
                 if (!success)
                     return null;
 
-                return aaxcDownloader.OutputFileName;
+                return outFileName;
             }
             finally
             {
-                DecryptCompleted?.Invoke(this, $"Completed downloading and decrypting {libraryBook.Book.Title}");
+                StreamingCompleted?.Invoke(this, $"Completed downloading and decrypting {libraryBook.Book.Title}");
             }
         }
 
-        private void AaxcDownloader_RetrievedCoverArt(object sender, byte[] e)
+
+		private void AaxcDownloader_RetrievedCoverArt(object sender, byte[] e)
         {
             if (e is null && Configuration.Instance.AllowLibationFixup)
             {
@@ -130,7 +135,7 @@ namespace FileLiberator
 
             if (e is not null)
             {
-                CoverImageFilepathDiscovered?.Invoke(this, e);
+                CoverImageDiscovered?.Invoke(this, e);
             }
         }
 
@@ -170,6 +175,8 @@ namespace FileLiberator
                 File.Move(f.FullName, dest);
             }
 
+            AudibleFileStorage.Audio.Refresh();
+
             return destinationDir;
         }
 
@@ -214,8 +221,7 @@ namespace FileLiberator
 				throw new Exception(errorString("Locale"));
 		}
 
-        public bool Validate(LibraryBook libraryBook)
-            => !AudibleFileStorage.Audio.Exists(libraryBook.Book.AudibleProductId);
+        public bool Validate(LibraryBook libraryBook) => !libraryBook.Book.Audio_Exists;
 
         public void Cancel()
         {

FileLiberator/DownloadFile.cs

@@ -5,22 +5,22 @@ using Dinah.Core.Net.Http;
 
 namespace FileLiberator
 {
-	// frustratingly copy pasta from DownloadableBase and DownloadPdf
 	// currently only used to download the .zip flies for upgrade
-	public class DownloadFile : IDownloadable
+	public class DownloadFile : IStreamable
 	{
-		public event EventHandler<string> DownloadBegin;
-		public event EventHandler<DownloadProgress> DownloadProgressChanged;
-		public event EventHandler<string> DownloadCompleted;
+		public event EventHandler<string> StreamingBegin;
+		public event EventHandler<DownloadProgress> StreamingProgressChanged;
+		public event EventHandler<string> StreamingCompleted;
+		public event EventHandler<TimeSpan> StreamingTimeRemaining;
 
 		public async Task<string> PerformDownloadFileAsync(string downloadUrl, string proposedDownloadFilePath)
 		{
 			var client = new HttpClient();
 
 			var progress = new Progress<DownloadProgress>();
-			progress.ProgressChanged += (_, e) => DownloadProgressChanged?.Invoke(this, e);
+			progress.ProgressChanged += (_, e) => StreamingProgressChanged?.Invoke(this, e);
 
-			DownloadBegin?.Invoke(this, proposedDownloadFilePath);
+			StreamingBegin?.Invoke(this, proposedDownloadFilePath);
 
 			try
 			{
@@ -29,7 +29,7 @@ namespace FileLiberator
 			}
 			finally
 			{
-				DownloadCompleted?.Invoke(this, proposedDownloadFilePath);
+				StreamingCompleted?.Invoke(this, proposedDownloadFilePath);
 			}
 		}
 	}

FileLiberator/DownloadPdf.cs

@@ -1,4 +1,6 @@
-using System.IO;
+using System;
+using System.Collections.Generic;
+using System.IO;
 using System.Linq;
 using System.Net.Http;
 using System.Threading.Tasks;
@@ -13,19 +15,19 @@ namespace FileLiberator
 	{
 		public override bool Validate(LibraryBook libraryBook)
 			=> !string.IsNullOrWhiteSpace(getdownloadUrl(libraryBook))
-			&& !AudibleFileStorage.PDF.Exists(libraryBook.Book.AudibleProductId);
+			&& !libraryBook.Book.PDF_Exists;
 
 		public override async Task<StatusHandler> ProcessItemAsync(LibraryBook libraryBook)
 		{
 			var proposedDownloadFilePath = getProposedDownloadFilePath(libraryBook);
 			await downloadPdfAsync(libraryBook, proposedDownloadFilePath);
-			return verifyDownload(libraryBook);
-		}
+			var result = verifyDownload(libraryBook);
 
-		private static StatusHandler verifyDownload(LibraryBook libraryBook)
-			=> !AudibleFileStorage.PDF.Exists(libraryBook.Book.AudibleProductId)
-			? new StatusHandler { "Downloaded PDF cannot be found" }
-			: new StatusHandler();
+			var liberatedStatus = result.IsSuccess ? LiberatedStatus.Liberated : LiberatedStatus.NotLiberated;
+			ApplicationServices.LibraryCommands.UpdatePdf(libraryBook, liberatedStatus);
+
+			return result;
+		}
 
 		private static string getProposedDownloadFilePath(LibraryBook libraryBook)
 		{
@@ -37,13 +39,16 @@ namespace FileLiberator
 				return Path.Combine(existingPath, Path.GetFileName(file));
 
 			var full = FileUtility.GetValidFilename(
-				AudibleFileStorage.PDF.StorageDirectory,
+				AudibleFileStorage.PdfStorageDirectory,
 				libraryBook.Book.Title,
 				Path.GetExtension(file),
 				libraryBook.Book.AudibleProductId);
 			return full;
 		}
 
+		private static string getdownloadUrl(LibraryBook libraryBook)
+			=> libraryBook?.Book?.Supplements?.FirstOrDefault()?.Url;
+
 		private async Task downloadPdfAsync(LibraryBook libraryBook, string proposedDownloadFilePath)
 		{
 			var api = await GetApiAsync(libraryBook);
@@ -55,7 +60,9 @@ namespace FileLiberator
 				(p) => client.DownloadFileAsync(downloadUrl, proposedDownloadFilePath, p));
 		}
 
-		private static string getdownloadUrl(LibraryBook libraryBook)
-			=> libraryBook?.Book?.Supplements?.FirstOrDefault()?.Url;
+		private static StatusHandler verifyDownload(LibraryBook libraryBook)
+			=> !libraryBook.Book.PDF_Exists
+			? new StatusHandler { "Downloaded PDF cannot be found" }
+			: new StatusHandler();
 	}
 }

FileLiberator/DownloadableBase.cs

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

FileLiberator/IAudioDecodable.cs

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

FileLiberator/IDecryptable.cs

@@ -1,20 +0,0 @@
-using System;
-
-namespace FileLiberator
-{
-    public interface IDecryptable : IProcessable
-    {
-        event EventHandler<string> DecryptBegin;
-
-        event EventHandler<Action<byte[]>> RequestCoverArt;
-        event EventHandler<string> TitleDiscovered;
-        event EventHandler<string> AuthorsDiscovered;
-        event EventHandler<string> NarratorsDiscovered;
-        event EventHandler<byte[]> CoverImageFilepathDiscovered;
-        event EventHandler<int> UpdateProgress;
-        event EventHandler<TimeSpan> UpdateRemainingTime;
-
-        event EventHandler<string> DecryptCompleted;
-        void Cancel();
-    }
-}

FileLiberator/IDownloadable.cs

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

FileLiberator/IDownloadableProcessable.cs

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

FileLiberator/IProcessable.cs

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

FileLiberator/IProcessableExt.cs

@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 using ApplicationServices;
@@ -22,27 +23,12 @@ namespace FileLiberator
             .GetLibrary_Flat_NoTracking()
             .Where(libraryBook => processable.Validate(libraryBook));
 
-        public static LibraryBook GetSingleLibraryBook(string productId)
+        public static async Task<StatusHandler> ProcessSingleAsync(this IProcessable processable, LibraryBook libraryBook, bool validate)
         {
-            using var context = DbContexts.GetContext();
-            var libraryBook = context
-                .Library
-                .GetLibrary()
-                .SingleOrDefault(lb => lb.Book.AudibleProductId == productId);
-            return libraryBook;
-        }
-
-        public static async Task<StatusHandler> ProcessSingleAsync(this IProcessable processable, LibraryBook libraryBook)
-        {
-            if (!processable.Validate(libraryBook))
+            if (validate && !processable.Validate(libraryBook))
                 return new StatusHandler { "Validation failed" };
 
-            return await processable.ProcessBookAsync_NoValidation(libraryBook);
-        }
-
-        public static async Task<StatusHandler> ProcessBookAsync_NoValidation(this IProcessable processable, LibraryBook libraryBook)
-        {
-            Serilog.Log.Logger.Information("Begin " + nameof(ProcessBookAsync_NoValidation) + " {@DebugInfo}", new
+            Serilog.Log.Logger.Information("Begin " + nameof(ProcessSingleAsync) + " {@DebugInfo}", new
             {
                 libraryBook.Book.Title,
                 libraryBook.Book.AudibleProductId,

FileLiberator/IStreamable.cs

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

FileManager/AudibleFileStorage.cs

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

FileManager/BackgroundFileSystem.cs

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

FileManager/Configuration.cs

@@ -4,8 +4,12 @@ using System.ComponentModel;
 using System.IO;
 using System.Linq;
 using Dinah.Core;
+using Dinah.Core.Logging;
+using Microsoft.Extensions.Configuration;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
+using Serilog;
+using Serilog.Events;
 
 namespace FileManager
 {
@@ -34,28 +38,6 @@ namespace FileManager
 
         #region persistent configuration settings/values
 
-        #region // properties to test reflection
-        /*
-        // field should NOT be populated
-        public string TestField;
-        // int should NOT be populated
-        public int TestInt { get; set; }
-        // read-only should NOT be populated
-        public string TestGet { get; } // get only: should NOT get auto-populated
-        // set-only should NOT be populated
-        public string TestSet { private get; set; }
-
-        // get and set: SHOULD be auto-populated
-        public string TestGetSet { get; set; }
-        */
-        #endregion
-
-        // settings will be persisted when all are true
-        // - property (not field)
-        // - string
-        // - public getter
-        // - public setter
-
         // note: any potential file manager static ctors can't compensate if storage dir is changed at run time via settings. this is partly bad architecture. but the side effect is desirable. if changing LibationFiles location: restart app
 
         // default setting and directory creation occur in class responsible for files.
@@ -65,8 +47,12 @@ namespace FileManager
         private PersistentDictionary persistentDictionary;
 
         public object GetObject(string propertyName) => persistentDictionary.GetObject(propertyName);
-        public void SetObject(string propertyName, object newValue) => persistentDictionary.Set(propertyName, newValue);
-        public void SetWithJsonPath(string jsonPath, string propertyName, string newValue) => persistentDictionary.SetWithJsonPath(jsonPath, propertyName, newValue);
+        public void SetObject(string propertyName, object newValue) => persistentDictionary.SetNonString(propertyName, newValue);
+
+        /// <summary>WILL ONLY set if already present. WILL NOT create new</summary>
+        /// <returns>Value was changed</returns>
+        public bool SetWithJsonPath(string jsonPath, string propertyName, string newValue, bool suppressLogging = false)
+            => persistentDictionary.SetWithJsonPath(jsonPath, propertyName, newValue, suppressLogging);
 
         public string SettingsFilePath => Path.Combine(LibationFiles, "Settings.json");
 
@@ -83,11 +69,43 @@ namespace FileManager
 
         public bool Exists(string propertyName) => persistentDictionary.Exists(propertyName);
 
+        #region MainForm: X, Y, Width, Height, MainFormIsMaximized
+        public int MainFormX
+        {
+            get => persistentDictionary.GetNonString<int>(nameof(MainFormX));
+            set => persistentDictionary.SetNonString(nameof(MainFormX), value);
+        }
+
+        public int MainFormY
+        {
+            get => persistentDictionary.GetNonString<int>(nameof(MainFormY));
+            set => persistentDictionary.SetNonString(nameof(MainFormY), value);
+        }
+
+        public int MainFormWidth
+        {
+            get => persistentDictionary.GetNonString<int>(nameof(MainFormWidth));
+            set => persistentDictionary.SetNonString(nameof(MainFormWidth), value);
+        }
+
+        public int MainFormHeight
+        {
+            get => persistentDictionary.GetNonString<int>(nameof(MainFormHeight));
+            set => persistentDictionary.SetNonString(nameof(MainFormHeight), value);
+        }
+
+        public bool MainFormIsMaximized
+        {
+            get => persistentDictionary.GetNonString<bool>(nameof(MainFormIsMaximized));
+            set => persistentDictionary.SetNonString(nameof(MainFormIsMaximized), value);
+        }
+        #endregion
+
         [Description("Location for book storage. Includes destination of newly liberated books")]
         public string Books
         {
             get => persistentDictionary.GetString(nameof(Books));
-            set => persistentDictionary.Set(nameof(Books), value);
+            set => persistentDictionary.SetString(nameof(Books), value);
         }
 
         // temp/working dir(s) should be outside of dropbox
@@ -95,21 +113,21 @@ namespace FileManager
         public string InProgress
         {
             get => persistentDictionary.GetString(nameof(InProgress));
-            set => persistentDictionary.Set(nameof(InProgress), value);
+            set => persistentDictionary.SetString(nameof(InProgress), value);
         }
 
         [Description("Allow Libation for fix up audiobook metadata?")]
         public bool AllowLibationFixup
         {
-            get => persistentDictionary.Get<bool>(nameof(AllowLibationFixup));
-            set => persistentDictionary.Set(nameof(AllowLibationFixup), value);
+            get => persistentDictionary.GetNonString<bool>(nameof(AllowLibationFixup));
+            set => persistentDictionary.SetNonString(nameof(AllowLibationFixup), value);
         }
 
         [Description("Decrypt to lossy format?")]
         public bool DecryptToLossy
         {
-            get => persistentDictionary.Get<bool>(nameof(DecryptToLossy));
-            set => persistentDictionary.Set(nameof(DecryptToLossy), value);
+            get => persistentDictionary.GetNonString<bool>(nameof(DecryptToLossy));
+            set => persistentDictionary.SetNonString(nameof(DecryptToLossy), value);
         }
 
         #endregion
@@ -167,6 +185,63 @@ namespace FileManager
             // since it's a list, order matters and non-LibationFiles will be returned first
             var dirFunc = directoryOptionsPaths.FirstOrDefault(dirFunc => dirFunc.getPathFunc() == directory);
             return dirFunc == default ? KnownDirectories.None : dirFunc.directory;
+        }
+        #endregion
+
+        #region logging
+        private IConfigurationRoot configuration;
+        public void ConfigureLogging()
+        {
+            //// with code. also persists to Settings.json
+            //SetWithJsonPath("Serilog.WriteTo[1].Args", "path", logPath, true);
+            //// hack which achieves the same, in memory only
+            //configuration["Serilog:WriteTo:1:Args:path"] = logPath;
+
+            configuration = new ConfigurationBuilder()
+                .AddJsonFile(SettingsFilePath, optional: false, reloadOnChange: true)
+                .Build();
+            Log.Logger = new LoggerConfiguration()
+                .ReadFrom.Configuration(configuration)
+                .CreateLogger();
+        }
+
+        [Description("The importance of a log event")]
+        public LogEventLevel LogLevel
+        {
+            get
+            {
+                try
+                {
+                    var logLevelStr = persistentDictionary.GetStringFromJsonPath("Serilog", "MinimumLevel");
+                    var logLevelEnum = Enum<LogEventLevel>.Parse(logLevelStr);
+                    return logLevelEnum;
+                }
+                catch
+                {
+                    return LogEventLevel.Information;
+                }
+            }
+            set
+            {
+                var valueWasChanged = persistentDictionary.SetWithJsonPath("Serilog", "MinimumLevel", value.ToString());
+                if (!valueWasChanged)
+                {
+                    Log.Logger.Information("LogLevel.set attempt. No change");
+                    return;
+                }
+
+                configuration.Reload();
+
+                Log.Logger.Information("Updated LogLevel MinimumLevel. {@DebugInfo}", new
+                {
+                    LogLevel_Verbose_Enabled = Log.Logger.IsVerboseEnabled(),
+                    LogLevel_Debug_Enabled = Log.Logger.IsDebugEnabled(),
+                    LogLevel_Information_Enabled = Log.Logger.IsInformationEnabled(),
+                    LogLevel_Warning_Enabled = Log.Logger.IsWarningEnabled(),
+                    LogLevel_Error_Enabled = Log.Logger.IsErrorEnabled(),
+                    LogLevel_Fatal_Enabled = Log.Logger.IsFatalEnabled()
+                });
+            }
         }
 		#endregion
 
@@ -188,12 +263,19 @@ namespace FileManager
                 if (libationFilesPathCache is not null)
                     return libationFilesPathCache;
 
-                // must write here before SettingsFilePath in next step reads cache
+                // FIRST: must write here before SettingsFilePath in next step reads cache
                 libationFilesPathCache = getLiberationFilesSettingFromJson();
 
-                // load json values into memory. create settings if not exists
+                // SECOND. before setting to json file with SetWithJsonPath, PersistentDictionary must exist
                 persistentDictionary = new PersistentDictionary(SettingsFilePath);
 
+                // Config init in Program.ensureSerilogConfig() only happens when serilog setting is first created (prob on 1st run).
+                // This Set() enforces current LibationFiles every time we restart Libation or redirect LibationFiles
+                var logPath = Path.Combine(LibationFiles, "Log.log");
+                bool settingWasChanged = SetWithJsonPath("Serilog.WriteTo[1].Args", "path", logPath, true);
+                if (settingWasChanged)
+                    configuration?.Reload();
+
                 return libationFilesPathCache;
             }
         }
@@ -235,38 +317,27 @@ namespace FileManager
             return valueFinal;
         }
 
-        public bool TrySetLibationFiles(string directory)
+        public void SetLibationFiles(string directory)
         {
-            // this is WRONG. need to MOVE settings; not DELETE them
-
-            //// if moving from default, delete old settings file and dir (if empty)
-            //if (LibationFiles.EqualsInsensitive(AppDir))
-            //{
-            //    File.Delete(SettingsFilePath);
-            //    System.Threading.Thread.Sleep(100);
-            //    if (!Directory.EnumerateDirectories(AppDir).Any() && !Directory.EnumerateFiles(AppDir).Any())
-            //        Directory.Delete(AppDir);
-            //}
-
-
             libationFilesPathCache = null;
 
-
             var startingContents = File.ReadAllText(APPSETTINGS_JSON);
             var jObj = JObject.Parse(startingContents);
 
             jObj[LIBATION_FILES_KEY] = directory;
 
             var endingContents = JsonConvert.SerializeObject(jObj, Formatting.Indented);
-            if (startingContents != endingContents)
+            if (startingContents == endingContents)
+                return;
+
+            // now it's set in the file again but no settings have moved yet
+            File.WriteAllText(APPSETTINGS_JSON, endingContents);
+
+            try
             {
-                try { Serilog.Log.Logger.Information("Libation files changed {@DebugInfo}", new { APPSETTINGS_JSON, LIBATION_FILES_KEY, directory }); }
-                catch { }
-                File.WriteAllText(APPSETTINGS_JSON, endingContents);
+                Log.Logger.Information("Libation files changed {@DebugInfo}", new { APPSETTINGS_JSON, LIBATION_FILES_KEY, directory });
             }
-
-
-            return true;
+            catch { }
         }
         #endregion
     }

FileManager/FileManager.csproj

@@ -5,6 +5,7 @@
   </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>

FileManager/FilePathCache.cs

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

FileManager/PersistentDictionary.cs

@@ -47,7 +47,7 @@ namespace FileManager
             return stringCache[propertyName];
         }
 
-        public T Get<T>(string propertyName)
+        public T GetNonString<T>(string propertyName)
         {
             var obj = GetObject(propertyName);
             if (obj is null) return default;
@@ -68,10 +68,32 @@ namespace FileManager
             return objectCache[propertyName];
         }
 
+        public string GetStringFromJsonPath(string jsonPath, string propertyName) => GetStringFromJsonPath($"{jsonPath}.{propertyName}");
+        public string GetStringFromJsonPath(string jsonPath)
+        {
+            if (!stringCache.ContainsKey(jsonPath))
+            {
+                try
+                {
+                    var jObject = readFile();
+                    var token = jObject.SelectToken(jsonPath);
+                    if (token is null)
+                        return null;
+                    stringCache[jsonPath] = (string)token;
+                }
+                catch
+                {
+                    return null;
+                }
+            }
+
+            return stringCache[jsonPath];
+        }
+
         public bool Exists(string propertyName) => readFile().ContainsKey(propertyName);
 
         private object locker { get; } = new object();
-        public void Set(string propertyName, string newValue)
+        public void SetString(string propertyName, string newValue)
         {
             // only do this check in string cache, NOT object cache
             if (stringCache.ContainsKey(propertyName) && stringCache[propertyName] == newValue)
@@ -83,7 +105,7 @@ namespace FileManager
             writeFile(propertyName, newValue);
         }
 
-        public void Set(string propertyName, object newValue)
+        public void SetNonString(string propertyName, object newValue)
         {
             // set cache
             objectCache[propertyName] = newValue;
@@ -97,19 +119,6 @@ namespace FileManager
             if (IsReadOnly)
                 return;
 
-            try
-            {
-                var str = newValue?.ToString();
-                var formattedValue
-                    = str is null ? "[null]"
-                    : string.IsNullOrEmpty(str) ? "[empty]"
-                    : string.IsNullOrWhiteSpace(str) ? $"[whitespace. Length={str.Length}]"
-                    : str.Length > 100 ? $"[Length={str.Length}] {str[0..50]}...{str[^50..^0]}"
-                    : str;
-                Serilog.Log.Logger.Information($"Config changed. {propertyName}={formattedValue}");
-            }
-            catch { }
-
             // write new setting to file
             lock (locker)
             {
@@ -119,31 +128,80 @@ namespace FileManager
                 jObject[propertyName] = newValue;
                 var endContents = JsonConvert.SerializeObject(jObject, Formatting.Indented);
 
-                if (startContents != endContents)
-                    File.WriteAllText(Filepath, endContents);
+                if (startContents == endContents)
+                    return;
+                
+                File.WriteAllText(Filepath, endContents);
             }
+
+            try
+            {
+                var str = formatValueForLog(newValue?.ToString());
+                Serilog.Log.Logger.Information("Config changed. {@DebugInfo}", new { propertyName, newValue = str });
+            }
+            catch { }
         }
 
-        // special case: no caching. no logging
-        public void SetWithJsonPath(string jsonPath, string propertyName, string newValue)
+        /// <summary>WILL ONLY set if already present. WILL NOT create new</summary>
+        /// <returns>Value was changed</returns>
+        public bool SetWithJsonPath(string jsonPath, string propertyName, string newValue, bool suppressLogging = false)
         {
             if (IsReadOnly)
-                return;
+                return false;
+
+            var path = $"{jsonPath}.{propertyName}";
 
-            lock (locker)
             {
-                var jObject = readFile();
-                var token = jObject.SelectToken(jsonPath);
-                var oldValue = (string)token[propertyName];
+                // only do this check in string cache, NOT object cache
+                if (stringCache.ContainsKey(path) && stringCache[path] == newValue)
+                    return false;
 
-                if (oldValue != newValue)
+                // set cache
+                stringCache[path] = newValue;
+            }
+
+            try
+            {
+                lock (locker)
                 {
+                    var jObject = readFile();
+                    var token = jObject.SelectToken(jsonPath);
+                    if (token is null || token[propertyName] is null)
+                        return false;
+
+                    var oldValue = token.Value<string>(propertyName);
+                    if (oldValue == newValue)
+                        return false;
+
                     token[propertyName] = newValue;
                     File.WriteAllText(Filepath, JsonConvert.SerializeObject(jObject, Formatting.Indented));
                 }
             }
+            catch (Exception exDebug)
+            {
+                return false;
+            }
+
+            if (!suppressLogging)
+            {
+                try
+                {
+                    var str = formatValueForLog(newValue?.ToString());
+                    Serilog.Log.Logger.Information("Config changed. {@DebugInfo}", new { jsonPath, propertyName, newValue = str });
+                }
+                catch { }
+            }
+
+            return true;
         }
 
+        private static string formatValueForLog(string value)
+            => value is null ? "[null]"
+            : string.IsNullOrEmpty(value) ? "[empty]"
+            : string.IsNullOrWhiteSpace(value) ? $"[whitespace. Length={value.Length}]"
+            : value.Length > 100 ? $"[Length={value.Length}] {value[0..50]}...{value[^50..^0]}"
+            : value;
+
         private JObject readFile()
         {
             var settingsJsonContents = File.ReadAllText(Filepath);

FileManager/PictureStorage.cs

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

FileManager/TagsPersistence.cs

@@ -31,6 +31,9 @@ namespace FileManager
 		{
 			ensureCache();
 
+			if (!tagsCollection.Any())
+				return;
+
 			// on initial reload, there's a huge benefit to adding to cache individually then updating the file only once
 			foreach ((string productId, string tags) in tagsCollection)
 				cache[productId] = tags;

Hoopla/Hoopla.csproj

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

Hoopla/HooplaDownloader.newer.ps1

@@ -0,0 +1,847 @@
+<#
+.SYNOPSIS
+    Downloads, decrypts and repackages content from Hoopla
+
+.DESCRIPTION
+    Uses a HooplaDigital.com account to download DRM-free copies of ebooks, comics,
+    and/or audiobooks available on the platform. Content that is not already borrowed
+    on the account will be borrowed if slots are available. Content that is not borrowed
+    cannot be downloaded.
+
+    * E-Books are downloaded to epub files (most) or cbz (rare, picture books).
+    * Comic books are downloaded to cbz files.
+    * Audiobooks are downloaded to m4a files. (single file, and very little metadata available
+      from Hoopla, such as chapters)
+
+.PARAMETER Credential
+    Credential to use for logging into Hoopla site.
+    (Cannot be used with Username and Password parameters)
+
+.PARAMETER Username
+    Username to use for logging into Hoopla site.
+    (Cannot be used with Credential parameter)
+
+.PARAMETER Password
+    Password to use for logging into Hoopla site.
+    (Cannot be used with Credential parameter)
+
+.PARAMETER TitleId
+    Specifies one or more title IDs of content to download.
+
+.PARAMETER OutputFolder
+    Sets the output folder for downloaded content. Defaults to current directory.
+
+.PARAMETER PatronId
+    Override default patron id for Hoopla. (This is rarely required as most user accounts are only tied
+    to a single patron).
+
+.PARAMETER EpubZipBin
+    Specifies path to epubzip binary. Else look for one beside script, or in system path.
+
+.PARAMETER FfmpegBin
+    Specifies path to ffmpeg binary. Else look for one beside script, or in system path.
+
+.PARAMETER KeepDecryptedData
+    If set, don't delete the intermediary data after decryption, before final output file.
+    For ebooks, this is xml, images, and the manifest. For comics, it is images. For audiobooks,
+    it is mp4 ts files. This is typically only useful for development or troubleshooting.
+
+.PARAMETER KeepEncryptedData
+    If set, don't delete the encrypted data as downloaded from Hoopla's servers. This is typically
+    only useful for development or troubleshooting.
+
+.PARAMETER AllBorrowed
+    This parameter is deprecated. If TitleId is not set, it is implied that all borrowed titles will
+    be downloaded.
+
+.PARAMETER AudioBookForceSingleFile
+    If set, leave audiobook as single file, as if chapter data is not present.
+
+.EXAMPLE
+    .\Invoke-HooplaDownload.ps1 123456
+    Downloads Hoopla content with title id 123456
+
+.NOTES
+    Author: kabutops728 - My Anonamouse
+    Version: 2.9
+#>
+
+[CmdletBinding(DefaultParameterSetName='CredentialSingleTitle')]
+param(
+    [int64[]]
+    $TitleId,
+
+    [Parameter(Mandatory,ParameterSetName='CredentialSingleTitle')]
+    [Management.Automation.PSCredential]
+    $Credential,
+
+    [Parameter(Mandatory,ParameterSetName='UserPassSingleTitle')]
+    [string]
+    $Username,
+
+    [Parameter(Mandatory,ParameterSetName='UserPassSingleTitle')]
+    [string]
+    $Password,
+
+    [ValidateScript({Test-Path -LiteralPath $_ -IsValid -PathType Container})]
+    [string]$OutputFolder = $PSScriptRoot,
+
+    [int64]$PatronId,
+
+    [string]$EpubZipBin,
+
+    [string]$FfmpegBin,
+
+    [switch]$KeepDecryptedData,
+
+    [switch]$KeepEncryptedData,
+
+    [switch]$AudioBookForceSingleFile,
+
+    # Deprecated
+    [switch]$AllBorrowed
+)
+
+$USER_AGENT = 'Hoopla Android/4.27'
+
+$HEADERS = @{
+    'app' = 'ANDROID'
+    'app-version' = '4.27.1'
+    'device-module' = 'KFKAWI'
+    'device-version' = ''
+    'hoopla-verson' = '4.27.1'
+    'kids-mode' = 'false'
+    'os' = 'ANDROID'
+    'os-version' = '6.0.1'
+    'ws-api' = '2.1'
+    'Host' = 'hoopla-ws.hoopladigital.com'
+}
+
+$URL_HOOPLA_WS_BASE = 'https://hoopla-ws.hoopladigital.com'
+$URL_HOOPLA_LIC_BASE = 'https://hoopla-license2.hoopladigital.com'
+
+$COMIC_IMAGE_EXTS = @('.jpg','.png','.jpeg','.gif','.bmp','.tif','.tiff')
+
+enum HooplaKind
+{
+    EBOOK = 5
+    MUSIC = 6
+    MOVIE = 7
+    AUDIOBOOK = 8
+    TELEVISION = 9
+    COMIC = 10
+}
+
+$SUPPORTED_KINDS = @([HooplaKind]::EBOOK, [HooplaKind]::COMIC, [HooplaKind]::AUDIOBOOK)
+
+Function Connect-Hoopla
+{
+    param(
+        [Parameter(Mandatory)][Management.Automation.PSCredential]$Credential
+    )
+
+    $username = $Credential.UserName
+    $password = $Credential.GetNetworkCredential().Password
+
+    $res = Invoke-RestMethod -Uri "$URL_HOOPLA_WS_BASE/tokens" -Method Post -Headers $HEADERS -UserAgent $USER_AGENT -Body @{username = $username; password = $password}
+
+    if ($res.tokenStatus -ne 'SUCCESS')
+    {
+        throw $res.message
+    }
+
+    $res.token
+}
+
+Function Get-HooplaUsers
+{
+    param(
+        [Parameter(Mandatory)][string]$Token
+    )
+
+    $h = $HEADERS.Clone()
+    $h['Authorization'] = "Bearer $Token"
+
+    Invoke-RestMethod -Uri "$URL_HOOPLA_WS_BASE/users" -Method Get -Headers $h -UserAgent $USER_AGENT
+}
+
+Function Get-HooplaTitleInfo
+{
+    param(
+        [Parameter(Mandatory)][int64]$PatronId,
+        [Parameter(Mandatory)][string]$Token,
+        [Parameter(Mandatory)][int64]$TitleId
+    )
+
+    $h = $HEADERS.Clone()
+    $h['Authorization'] = "Bearer $Token"
+    $h['patron-id'] = $PatronId
+
+    Invoke-RestMethod -Uri "$URL_HOOPLA_WS_BASE/v2/titles/$TitleId" -Method Get -Headers $h -UserAgent $USER_AGENT
+}
+
+Function Get-HooplaBorrowsRemaining
+{
+    param(
+        [Parameter(Mandatory)][string]$UserId,
+        [Parameter(Mandatory)][int64]$PatronId,
+        [Parameter(Mandatory)][string]$Token
+    )
+
+    $h = $HEADERS.Clone()
+    $h['Authorization'] = "Bearer $Token"
+    $h['patron-id'] = $PatronId
+
+    Invoke-RestMethod -Uri "$URL_HOOPLA_WS_BASE/users/$UserId/patrons/$PatronId/borrows-remaining" -Method Get -Headers $h -UserAgent $USER_AGENT
+}
+
+Function Get-HooplaBorrowedTitles
+{
+    param(
+        [Parameter(Mandatory)][string]$UserId,
+        [Parameter(Mandatory)][int64]$PatronId,
+        [Parameter(Mandatory)][string]$Token
+    )
+
+    $h = $HEADERS.Clone()
+    $h['Authorization'] = "Bearer $Token"
+    $h['patron-id'] = $PatronId
+
+    Invoke-RestMethod -Uri "$URL_HOOPLA_WS_BASE/users/$UserId/borrowed-titles" -Method Get -Headers $h -UserAgent $USER_AGENT
+}
+
+Function Invoke-HooplaBorrow
+{
+    param(
+        [Parameter(Mandatory)][string]$UserId,
+        [Parameter(Mandatory)][int64]$PatronId,
+        [Parameter(Mandatory)][string]$Token,
+        [Parameter(Mandatory)][int64]$TitleId
+    )
+
+    $h = $HEADERS.Clone()
+    $h['Authorization'] = "Bearer $Token"
+    $h['patron-id'] = $PatronId
+
+    Invoke-RestMethod -Uri "$URL_HOOPLA_WS_BASE/users/$UserId/patrons/$PatronId/borrowed-titles/$TitleId" -Method Post -Headers $h -UserAgent $USER_AGENT
+}
+
+Function Invoke-HooplaZipDownload
+{
+    param(
+        [Parameter(Mandatory)][int64]$PatronId,
+        [Parameter(Mandatory)][string]$Token,
+        [Parameter(Mandatory)][int64]$CircId,
+        [Parameter(Mandatory)][ValidateScript({Test-Path -LiteralPath $_ -IsValid -PathType Leaf})][string]$OutFile
+    )
+
+    $h = $HEADERS.Clone()
+    $h['Authorization'] = "Bearer $Token"
+    $h['patron-id'] = $PatronId
+
+    $res = Invoke-WebRequest -Uri "$URL_HOOPLA_WS_BASE/patrons/downloads/$CircId/url" -Method Get -Headers $h -UserAgent $USER_AGENT -UseBasicParsing
+
+    if ($PSVersionTable.PSVersion.Major -ge 6)
+    {
+        Invoke-WebRequest -Uri $res.Headers['Location'][0] -Method Get -UseBasicParsing -OutFile $OutFile
+    }
+    else
+    {
+        Invoke-WebRequest -Uri $res.Headers['Location'] -Method Get -UseBasicParsing -OutFile $OutFile
+    }
+}
+
+Function Get-HooplaKey
+{
+    param(
+        [Parameter(Mandatory)][int64]$PatronId,
+        [Parameter(Mandatory)][string]$Token,
+        [Parameter(Mandatory)][int64]$CircId
+    )
+
+    $h = $HEADERS.Clone()
+    $h['Authorization'] = "Bearer $Token"
+    $h['patron-id'] = $PatronId
+
+    Invoke-RestMethod -Uri "$URL_HOOPLA_LIC_BASE/downloads/$CircId/key" -Method Get -Headers $h -UserAgent $USER_AGENT
+}
+
+Function Get-FileKeyKey
+{
+    param(
+        [Parameter(Mandatory)][int64]$CircId,
+        [Parameter(Mandatory)][DateTime]$Due,
+        [Parameter(Mandatory)][int64]$PatronId
+    )
+
+    $combined = '{0:yyyyMMddHHmmss}:{1}:{2}' -f $Due, $PatronId, $CircId
+
+    [Security.Cryptography.HashAlgorithm]::Create('SHA1').ComputeHash([Text.Encoding]::UTF8.GetBytes($combined)) | Select-Object -First 16
+}
+
+Function Decrypt-FileKey
+{
+    param(
+        [Parameter(Mandatory)][byte[]]$FileKeyEnc,
+        [Parameter(Mandatory)][byte[]]$FileKeyKey
+    )
+
+    $aesManaged = New-Object "System.Security.Cryptography.AesManaged"
+    $aesManaged.Mode = [Security.Cryptography.CipherMode]::ECB
+    $aesManaged.Padding = [Security.Cryptography.PaddingMode]::PKCS7
+    $aesManaged.BlockSize = 128
+    $aesManaged.KeySize = 128
+    $aesManaged.Key = $FileKeyKey
+
+    $decryptor = $aesManaged.CreateDecryptor();
+
+    $unencryptedData = $decryptor.TransformFinalBlock($FileKeyEnc, 0, $FileKeyEnc.Length);
+    $aesManaged.Dispose()
+
+    $unencryptedData
+}
+
+Function Decrypt-File
+{
+    param(
+        [Parameter(Mandatory)][byte[]]$FileKey,
+        [Parameter(Mandatory)][string]$MediaKey,
+        [Parameter(Mandatory)][string]$InputFileName,
+        [Parameter(Mandatory)][string]$OutputFileName
+    )
+
+    $aesManaged = New-Object "System.Security.Cryptography.AesManaged"
+    $aesManaged.Mode = [Security.Cryptography.CipherMode]::CBC
+    $aesManaged.Padding = [Security.Cryptography.PaddingMode]::PKCS7
+    $aesManaged.BlockSize = 128
+    $aesManaged.KeySize = 256
+    $aesManaged.Key = $FileKey
+    $aesManaged.IV = [Text.Encoding]::UTF8.GetBytes($MediaKey) | Select-Object -First 16
+
+
+    $fileStreamReader = New-Object -TypeName 'System.IO.FileStream' -ArgumentList $InputFileName, ([IO.FileMode]::Open), ([IO.FileShare]::Read)
+    $fileStreamWriter = New-Object -TypeName 'System.IO.FileStream' -ArgumentList $OutputFileName, ([IO.FileMode]::Create)
+
+    $FileStreamReader.Seek(0, [IO.SeekOrigin]::Begin) | Out-Null
+
+    $decryptor = $aesManaged.CreateDecryptor()
+    $cryptoStream = New-Object -TypeName 'System.Security.Cryptography.CryptoStream' -ArgumentList $fileStreamWriter, $decryptor, ([Security.Cryptography.CryptoStreamMode]::Write)
+    $fileStreamReader.CopyTo($cryptoStream)
+
+    $cryptoStream.FlushFinalBlock()
+    $cryptoStream.Close()
+    $fileStreamReader.Close()
+    $fileStreamWriter.Close()
+
+    $aesManaged.Dispose()
+}
+
+Function Test-Mp4
+{
+    param(
+        [Parameter(Mandatory, Position=0)]
+        [Alias('LiteralPath')]
+        [string]$Path
+    )
+
+    $fileStream = New-Object -TypeName 'System.IO.FileStream' -ArgumentList $Path, ([IO.FileMode]::Open), ([IO.FileShare]::Read)
+    $fileReader = New-Object -TypeName 'System.IO.BinaryReader' -ArgumentList $fileStream -ErrorAction Stop
+    $head = $fileReader.ReadBytes(8)
+    
+    $fileReader.Dispose()
+    $fileStream.Dispose()
+
+    return [Text.Encoding]::ASCII.GetString(($head | Select-Object -Skip 4)) -eq 'ftyp'
+}
+
+Function Remove-InvalidFileNameChars
+{
+    param(
+        [Parameter(Mandatory,Position=0,
+        ValueFromPipeline=$true,
+        ValueFromPipelineByPropertyName=$true)]
+      [String]$Name
+    )
+
+    $invalidChars = [IO.Path]::GetInvalidFileNameChars() -join ''
+    $re = "[{0}]" -f [RegEx]::Escape($invalidChars)
+    $Name -replace $re, '_'
+}
+
+Function Convert-HooplaDecryptedToEpub
+{
+    param(
+        [Parameter(Mandatory)][string]$InputFolder,
+        [Parameter(Mandatory)][string]$OutFolder
+    )
+
+    $container = [xml](Get-Content -LiteralPath (Join-Path -Path $InputFolder -ChildPath 'META-INF\container.xml') -Raw)
+    $rootFile = $container.container.rootfiles.rootfile | Select-Object -ExpandProperty Full-Path
+    $contentFile = (Join-Path -Path $InputFolder -ChildPath $rootFile).Trim()
+    $contentRoot = Get-Item -LiteralPath $contentFile | Select-Object -ExpandProperty Directory
+    $content = [xml](Get-Content -LiteralPath $contentFile)
+
+    $fileList = $content.package.manifest.item | Select-Object -ExpandProperty href | ForEach-Object -Process { (Join-Path -Path $contentRoot -ChildPath ([Web.HttpUtility]::UrlDecode($_))).Trim() }
+    $fileList += $contentFile
+    $fileList = $fileList | Sort-Object -Unique
+
+    $title = $content.package.metadata.title | Select-Object -First 1
+    if ($title.GetType() -ne [String])
+    {
+        $title = $content.package.metadata.title | Select-Object -First 1 | Select-Object -ExpandProperty '#text'
+    }
+
+    $author = $content.package.metadata.creator | Select-Object -First 1
+    if ($author.GetType() -ne [String])
+    {
+        $author = $content.package.metadata.creator | Select-Object -First 1 | Select-Object -ExpandProperty '#text'
+    }
+    
+    # Usually, content root is a subfolder of the input folder. But sometimes, they are the same. Make sure we declutter the input root if they differ, and always keep the mimetype file.
+    $mimeTypeFile = Join-Path -Path $InputFolder -ChildPath 'mimetype'
+
+    $extra = @(Get-ChildItem -LiteralPath $contentRoot -File -Recurse | Where-Object -FilterScript { ($_.FullName -notin $fileList) -and ($_.FullName -ne $mimeTypeFile) })
+    $extra += Get-ChildItem -LiteralPath $InputFolder -File | Where-Object -FilterScript { ($_.FullName -notin $fileList) -and ($_.FullName -ne $mimeTypeFile) }
+
+    $extra = $extra | Sort-Object -Property FullName -Unique
+    $extra | Remove-Item
+
+    $containerXmlFolder = Join-Path -Path $contentRoot.FullName -ChildPath 'META-INF'
+    $containerXmlPath = Join-Path -Path $containerXmlFolder -ChildPath 'container.xml'
+    if (!(Test-Path -LiteralPath $containerXmlPath -PathType Leaf))
+    {
+        New-Item -Path $containerXmlFolder -ItemType Directory -Force | Out-Null
+        $xml = @"
+<?xml version="1.0"?>
+<container version="1.0" xmlns="urn:oasis:names:tc:opendocument:xmlns:container">
+   <rootfiles>
+      <rootfile full-path="content.opf" media-type="application/oebps-package+xml"/>
+   </rootfiles>
+</container>
+
+"@
+        $xml | Out-File -LiteralPath $containerXmlPath -Encoding ascii
+    }
+
+    $finalFile = ('{0} - {1}.epub' -f $title, $author) | Remove-InvalidFileNameChars
+
+    Push-Location
+    Set-Location -LiteralPath $InputFolder
+
+    $finalFileFullPath = (Join-Path -Path $OutFolder -ChildPath $finalFile)
+    if ($VerbosePreference -eq 'Continue')
+    {
+        & $EpubZipBin $finalFileFullPath
+    }
+    else
+    {
+        & $EpubZipBin $finalFileFullPath >$null 2>&1
+    }
+    Pop-Location
+
+    Get-Item -LiteralPath $finalFileFullPath
+}
+
+Function Convert-HooplaDecryptedToCbz
+{
+    param(
+        [Parameter(Mandatory)][string]$InputFolder,
+        [Parameter(Mandatory)][string]$OutFolder,
+        [Parameter(Mandatory)][string]$Name
+    )
+
+    $fileName = $Name | Remove-InvalidFileNameChars
+    $tempOutFile = Join-Path -Path $OutFolder -ChildPath "$fileName.zip"
+    $finalOutFile = Join-Path -Path $OutFolder -ChildPath "$fileName.cbz"
+
+    Compress-Archive -Path (
+        Get-ChildItem -LiteralPath $InputFolder | Where-Object -FilterScript { $_.Extension -in $COMIC_IMAGE_EXTS } | Select-Object -ExpandProperty FullName
+    ) -CompressionLevel Fastest -DestinationPath $tempOutFile
+
+    Rename-Item -LiteralPath $tempOutFile -NewName $finalOutFile
+
+    Get-Item $finalOutFile
+}
+
+Function Convert-HooplaDecryptedToM4a
+{
+    param(
+        [Parameter(Mandatory)][string]$InputFolder,
+        [Parameter(Mandatory)][string]$OutFolder,
+        [Parameter(Mandatory)][string]$Name,
+        [Parameter(Mandatory)][string]$Title,
+        [Parameter(Mandatory)][string]$Author,
+        [Parameter(Mandatory)][int]$Year,
+        [string]$Subtitle,
+        [object]$ChapterData
+        
+    )
+
+    if ($Author)
+    {
+        $baseFileName = ('{0} - {1}' -f $Name, $Author) | Remove-InvalidFileNameChars
+    }
+    else
+    {
+        $baseFileName = $Name | Remove-InvalidFileNameChars
+    }
+
+    $finalOutFile = Join-Path -Path $OutFolder -ChildPath ('{0}.m4a' -f $baseFileName)
+    $inFile = Get-ChildItem -LiteralPath $InputFolder -Filter '*.m3u8' | Select-Object -First 1 | Select-Object -ExpandProperty FullName
+
+    Push-Location
+    Set-Location $InputFolder
+    $ffArgs = @(
+        '-y',
+        '-i', $infile,
+        '-metadata', ('title="{0}"' -f $Title),
+        '-metadata', ('year="{0}"'  -f $Year),
+        '-metadata', ('author="{0}"'  -f $Author),
+        '-metadata', 'genre="Audiobook"'
+    )
+
+    if ($Subtitle)
+    {
+        $ffArgs += '-metadata', ('subtitle="{0}"' -f $Subtitle)
+    }
+
+    $ffArgs += @(
+        '-c:a', 'copy',
+        $finalOutFile
+    )
+
+    if ($VerbosePreference -eq 'Continue')
+    {
+        & $FfmpegBin @ffArgs
+        #& $FfmpegBin -y -i $inFile -metadata "title=`"$Title`"" -metadata "year=`"$Year`"" -metadata "author=`"$Author`"" -metadata "genre=`"Audiobook`"" '-c:a' copy $finalOutFile
+    }
+    else
+    {
+        & $FfmpegBin @ffArgs >$null 2>&1
+        #& $FfmpegBin -y -i $inFile -metadata "title=`"$Title`"" -metadata "year=`"$Year`"" -metadata "author=`"$Author`"" -metadata "genre=`"Audiobook`"" '-c:a' copy $finalOutFile >$null 2>&1
+    }
+
+    if ($ChapterData -and (!$AudioBookForceSingleFile))
+    {
+        $outDir = New-Item -Path (Join-Path -Path $OutFolder -ChildPath $baseFileName) -ItemType Directory
+        $chapterCount = $ChapterData | Select-Object -ExpandProperty chapter | Measure-Object -Maximum | Select-Object -ExpandProperty Maximum
+        $ChapterData | ForEach-Object -Process {
+            $ffArgs = @(
+                '-y',
+                '-i', $finalOutFile,
+                '-ss', $_.start,
+                '-t', $_.duration,
+                '-metadata', ('title="{0}"' -f $_.title),
+                '-metadata', ('album="{0}"' -f $Title),
+                '-metadata', ('year="{0}"'  -f $Year),
+                '-metadata', ('author="{0}"'  -f $Author),
+                '-metadata', 'genre="Audiobook"'
+                '-metadata', ('track={0}/{1}' -f $_.ordinal, $chapterCount)
+            )
+
+            if ($Subtitle)
+            {
+                $ffArgs += '-metadata', ('subtitle="{0}"' -f $Subtitle)
+            }
+
+            $ffArgs += @(
+                '-c', 'copy',
+                (Join-Path -Path $outDir.FullName -ChildPath ('{0} - {1} - {2}.m4a' -f $baseFileName, $_.ordinal, ($_.title | Remove-InvalidFileNameChars)))
+            )
+
+            if ($VerbosePreference -eq 'Continue')
+            {
+                & $FfmpegBin @ffArgs
+            }
+            else
+            {
+                & $FfmpegBin @ffArgs >$null 2>&1
+            }
+        }
+
+        Remove-Item $finalOutFile
+        $finalOutFile = $outDir
+    }
+
+    Pop-Location
+
+    Get-Item $finalOutFile
+}
+
+if (!$Credential)
+{
+    $ssPassword = ConvertTo-SecureString $Password -AsPlainText -Force
+    $Credential = New-Object -TypeName 'System.Management.Automation.PSCredential' -ArgumentList $Username, $ssPassword
+}
+
+if ((!$AllBorrowed) -and ($null -eq $TitleId))
+{
+    Write-Warning 'No -TitleId specified. All currently-borrowed titles will be downloaded.'
+    $AllBorrowed = $true
+}
+
+$AppExtension = ''
+if (($PSVersionTable.PSVersion -lt '6.0') -or $IsWindows)
+{
+    $AppExtension = '.exe'
+}
+
+$cmd = ''
+if ($EpubZipBin)
+{
+    $cmd = Get-Command -Name $EpubZipBin -ErrorAction SilentlyContinue
+    if (!$cmd)
+    {
+        Write-Warning "Epubzip binary specified was not found ($EpubZipBin). Will try to use alternate version if available."
+    }
+}
+
+if (!$cmd)
+{
+    $cmd = Get-Command -Name (Join-Path -Path $PSScriptRoot -ChildPath "epubzip$AppExtension") -ErrorAction SilentlyContinue
+    if (!$cmd)
+    {
+        $cmd = Get-Command -Name "epubzip$AppExtension" -ErrorAction SilentlyContinue
+        if (!$cmd)
+        {
+            Write-Warning "Epubzip binary not found ($EpubZipBin). If you are downloading ebooks (rather than comics or audiobooks), you may wish to download the binary from https://github.com/dino-/epub-tools/releases, specify a different path with -EpubZipBin, or specify -KeepDecryptedData so that you can manually pack afterward."
+        }
+    }
+
+    $EpubZipBin = $cmd.Source
+}
+
+Write-Verbose ('Using epubzip bin: "{0}"' -f $EpubZipBin)
+
+$cmd = ''
+if ($FfmpegBin)
+{
+    $cmd = Get-Command -Name $FfmpegBin -ErrorAction SilentlyContinue
+    if (!$cmd)
+    {
+        Write-Warning "FFMpeg binary specified was not found ($FfmpegBin). Will try to use alternate version if available."
+    }
+}
+
+if (!$cmd)
+{
+    $cmd = Get-Command -Name (Join-Path -Path $PSScriptRoot -ChildPath "ffmpeg$AppExtension") -ErrorAction SilentlyContinue
+    if (!$cmd)
+    {
+        $cmd = Get-Command -Name "ffmpeg$AppExtension" -ErrorAction SilentlyContinue
+        if (!$cmd)
+        {
+            Write-Warning "FFmpeg binary not found. If you are downloading audiobooks (rather than ebooks or comics), you may wish to download the binary from https://ffmpeg.zeranoe.com/builds/, specify a different path with -FfmpegBin, or specify -KeepDecryptedData so that you can manually convert afterward."
+        }
+    }
+
+    $FfmpegBin = $cmd.Source
+}
+
+Write-Verbose ('Using ffpmeg bin: "{0}"' -f $FfmpegBin)
+
+if (!(Test-Path -LiteralPath $OutputFolder -PathType Container))
+{
+    Write-Warning "Output folder doesn't exist. Creating."
+    New-Item -Path $OutputFolder -ItemType Directory | Out-Null
+}
+
+$OutputFolder = Get-Item -LiteralPath $OutputFolder | Select-Object -ExpandProperty $_.FullName
+
+$token = Connect-Hoopla -Credential $Credential
+Write-Verbose "Logged in. Received token $($token -replace '\-.*', '-****-****-****-************')"
+
+$users = Get-HooplaUsers $token
+Write-Verbose "Found $($users.patrons.Count) patrons"
+
+$userId = $users.id
+if (!$PatronId)
+{
+    if ($users.patrons.Count -eq 0)
+    {
+        throw "No patrons found on account. Account may not be correctly set up with library."
+    }
+    elseif ($users.patrons.Count -gt 1)
+    {
+        Write-Warning (
+            "Multiple patrons found on account. Using first one, {0} ({1}). You can specify -PatronId to override" -f $users.patrons[0].id, $users.patrons[0].libraryName
+        )
+    }
+
+    $PatronId = $users.patrons[0].id
+    Write-Verbose "Using PatronId $PatronId"
+}
+
+$borrowedRaw = Get-HooplaBorrowedTitles -Token $token -UserId $userId -PatronId $PatronId
+$borrowed = $borrowedRaw | Where-Object -FilterScript { $_.kind.id -in $SUPPORTED_KINDS }
+Write-Verbose "Found $($borrowed.Count) ($($borrowedRaw.Count)) titles already borrowed"
+$toDownload = @()
+
+if ($AllBorrowed)
+{
+    $toDownload = $borrowed
+}
+else
+{
+    $toDownload = $borrowed | Where-Object -FilterScript { $_.id -in $TitleId }
+
+    $allBorrowedTitles = $borrowed | Select-Object -ExpandProperty id
+    $toBorrow = $TitleId | Where-Object -FilterScript { $_ -notin $allBorrowedTitles }
+    
+    if ($toBorrow)
+    {
+        $borrowsRemainingData = Get-HooplaBorrowsRemaining -UserId $userId -PatronId $PatronId -Token $token
+        Write-Host $borrowsRemainingData.borrowsRemainingMessage
+
+        $borrowsRemaining = $borrowsRemainingData.borrowsRemaining
+
+        $toBorrow | ForEach-Object -Process {
+            Write-Host "Title $_ is not already borrowed or is not a supported kind. Looking up data about it."
+            $titleInfo = Get-HooplaTitleInfo -PatronId $PatronId -Token $token -TitleId $_
+            if ($titleInfo.kind.id -in $SUPPORTED_KINDS)
+            {
+                if ((--$borrowsRemaining) -le 0)
+                {
+                    Write-Warning "Title $_ ($($titleInfo.Title)) not borrowed already, but we're out of remaining borrows allowed. Skipping..."
+                }
+                else
+                {
+                    Write-Host "Borrowing title $_ ($($titleInfo.Title))..."
+                    $res = Invoke-HooplaBorrow -UserId $userId -PatronId $PatronId -Token $token -TitleId $titleInfo.id
+                    Write-Host "Response: $($res.message)"
+                    $newToDownload = $res.titles | Where-Object -FilterScript { $_.id -eq $titleInfo.id }
+                    if ($newToDownload)
+                    {
+                        $toDownload += $newToDownload
+                    }
+                    else
+                    {
+                        Write-Warning "Failed to borrow title $_ ($($titleInfo.Title))..."
+                    }
+                }
+            }
+            else
+            {
+                Write-Warning "Title $_ is not a supported kind ($($titleInfo.kind.name)). Skipping..."
+            }
+        }
+    } 
+}
+
+$tempFolder = [IO.Path]::GetTempPath()
+
+$now = Get-Date
+
+$toDownload | ForEach-Object -Process {
+    $info = $_
+    $contentKind = [HooplaKind]$_.kind.id
+    if ($_.contents.mediaType)
+    {
+        $contentKind = [HooplaKind]$_.contents.mediaType
+    }
+    $contents = $info.contents
+    $circId = $contents.circId
+    $mediaKey = $contents.mediaKey
+    $dueUnix = [Math]::Truncate($info.contents.due / 1000)
+    $due = (New-Object DateTime 1970, 1, 1, 0, 0, 0, ([DateTimeKind]::Utc)).AddSeconds($dueUnix)
+
+    $circFileName = (Join-Path -Path $tempFolder -ChildPath "$($circId).zip")
+
+    Invoke-HooplaZipDownload -PatronId $patronId -Token $token -CircId $circId -OutFile $circFileName
+    $keyData = Get-HooplaKey -PatronId $patronId -Token $token -CircId $circId
+
+    $fileKeyKey = Get-FileKeyKey -CircId $circId -Due $due -PatronId $patronId
+    $fileKey = Decrypt-FileKey -FileKeyEnc ([Convert]::FromBase64String($keyData."$mediaKey")) -FileKeyKey $fileKeyKey
+
+    $encDir = Join-Path -Path $tempFolder -ChildPath ('enc-{0}-{1:yyyyMMddHHmmss}' -f $circId, $now)
+    New-Item -Path $encDir -ItemType Directory | Out-Null
+    Expand-Archive -LiteralPath $circFileName -DestinationPath $encDir
+
+    Remove-Item -LiteralPath $circFileName
+
+    $decDir = Join-Path -Path $tempFolder -ChildPath ('dec-{0}-{1:yyyyMMddHHmmss}' -f $circId, $now)
+    New-Item -Path $decDir -ItemType Directory | Out-Null
+
+    $activity = 'Decrypting Content ({0})' -f $_.title
+    Write-Progress -Activity $activity -PercentComplete 0
+    $zipFiles = Get-ChildItem $encDir -Recurse -File
+    $decDone = 0
+    $decTotal = $zipFiles.Count
+    $zipFiles | ForEach-Object -Process {
+        $outFile = $_.FullName.Replace($encDir, $decDir)
+        $outDir = $_.DirectoryName.Replace($encDir, $decDir)
+        
+        if (!(Test-Path -LiteralPath $outDir))
+        {
+            New-Item -Path $outDir -ItemType Directory -Force | Out-Null
+        }
+
+        if (($contentKind -eq [HooplaKind]::AUDIOBOOK) -and ($_.Extension -eq '.m3u8'))
+        {
+            $lines = Get-Content -LiteralPath $_.FullName | Where-Object -FilterScript {$_ -notmatch '^#EXT-X-KEY'}
+            # Out-File doesn't support utf8 w/o BOM
+            [IO.File]::WriteAllLines($outFile, $lines)
+            return
+        }
+
+        if ($_.Length)
+        {
+            # Hack. Some ebooks contain audio files that download as unencrypted
+            if (($_.Extension -eq '.m4a') -and (Test-Mp4 -LiteralPath $_.FullName))
+            {
+                Write-Verbose -Message ('Coping unencrypted {0}' -f $_.FullName)
+                Copy-Item -LiteralPath $_.FullName -Destination $outFile
+            }
+            else
+            {
+                Write-Verbose -Message ('Decrypting {0}' -f $_.FullName)
+                Decrypt-File -FileKey $fileKey -MediaKey $mediaKey -InputFileName $_.FullName -OutputFileName $outFile
+            }
+        }
+        else
+        {
+            Write-Verbose -Message ('Writing empty file {0}' -f $_.FullName)
+            '' | Out-File -LiteralPath $outFile
+        }
+
+        Write-Progress -Activity $activity -PercentComplete ((++$decDone) / $decTotal * 100)
+    }
+    Write-Progress -Activity $activity -Completed
+
+    switch ($contentKind)
+    {
+        ([HooplaKind]::EBOOK) {
+            Convert-HooplaDecryptedToEpub -InputFolder $decDir -OutFolder $OutputFolder
+        }
+
+        ([HooplaKind]::COMIC) {
+            $title = $contents.title
+            $subtitle = $contents.subtitle
+            $name = $title
+            if ($subtitle) {
+                $name += ", $subtitle"
+            }
+            Convert-HooplaDecryptedToCbz -InputFolder $decDir -OutFolder $OutputFolder -Name $name
+        }
+
+        ([HooplaKind]::AUDIOBOOK) {
+            Convert-HooplaDecryptedToM4a -InputFolder $decDir -OutFolder $OutputFolder -Name $info.title -Title $info.title `
+                -Year $info.year -Author $info.artist.name -Subtitle $contents.subtitle -ChapterData $contents.chapters
+        }
+    }    
+
+    if (!$KeepDecryptedData)
+    {
+        Remove-Item -LiteralPath $decDir -Recurse
+    }
+    else
+    {
+        Write-Host ('Decrypted data for {0} ({1}) stored in {2}' -f $_.id, $_.title, $decDir)
+    }
+
+    if (!$KeepEncryptedData)
+    {
+        Remove-Item -LiteralPath $encDir -Recurse
+    }
+}
+

Hoopla/_README.txt

@@ -0,0 +1,13 @@
+From a Libation user about possibility of integrating Hoopla:
+
+I have a powershell script.  I didn't write it, and neither did the person that gave it to me.  It works most of the time (98%).  Some titles, it doesn't play well with, but does allow to keep the downloaded data, whether the decrypt was successful, or not, and then you can mess with the data, from there.
+
+If you run the script with no parameters, then all the books in your library will download, and decrypt into the same directory as the script, into a folder named Completed.
+
+If you run the script with the command:
+  '.\HooplaDownloader.newer.ps1 -KeepDecryptedData'
+then it will, and will notify you, when complete, where it was stored.
+
+There is a parameter to download a specific titleID#, whether it's in your library, or not, but I've not played with it that far, as the method to accomplish it still reserves it to your library, and then proceeds as normal.  I can tell you, if it's a "trial and error concern", the title will not be removed from your library, after you run the script, whether it succeeds or not.  So, if it fails, you can retry, or try the  -KeepDecryptedData option.  I received no documentation for it, which is why I'm telling you as much as I know about using it.
+
+[ see HooplaDownloader.newer.ps1 ]

Hoopla/temp.cs

@@ -0,0 +1,9 @@
+using System;
+
+namespace Hoopla
+{
+	public class temp
+	{
+		// placeholder
+	}
+}

InternalUtilities/AudibleApiActions.cs

@@ -47,18 +47,18 @@ namespace InternalUtilities
 			// 2 retries == 3 total
 			.RetryAsync(2);
 
-		public static Task<List<Item>> GetLibraryValidatedAsync(Api api)
+		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));
+			return policy.ExecuteAsync(() => getItemsAsync(api, responseGroups));
 		}
 
-		private static async Task<List<Item>> getItemsAsync(Api api)
+		private static async Task<List<Item>> getItemsAsync(Api api, LibraryOptions.ResponseGroupOptions responseGroups)
 		{
-			var items = await api.GetAllLibraryItemsAsync();
+			var items = await api.GetAllLibraryItemsAsync(responseGroups);
 
 			// remove episode parents
 			items.RemoveAll(i => i.IsEpisodes);

Libation.sln

@@ -74,8 +74,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ApplicationServices", "Appl
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Dinah.Core.WindowsDesktop", "..\Dinah.Core\Dinah.Core.WindowsDesktop\Dinah.Core.WindowsDesktop.csproj", "{059CE32C-9AD6-45E9-A166-790DFFB0B730}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WindowsDesktopUtilities", "WindowsDesktopUtilities\WindowsDesktopUtilities.csproj", "{E7EFD64D-6630-4426-B09C-B6862A92E3FD}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibationLauncher", "LibationLauncher\LibationLauncher.csproj", "{F3B04A3A-20C8-4582-A54A-715AF6A5D859}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "0 Libation Tests", "0 Libation Tests", "{67E66E82-5532-4440-AFB3-9FB1DF9DEF53}"
@@ -88,6 +86,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Dinah.EntityFrameworkCore.T
 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
@@ -190,10 +190,6 @@ Global
 		{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
-		{E7EFD64D-6630-4426-B09C-B6862A92E3FD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E7EFD64D-6630-4426-B09C-B6862A92E3FD}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E7EFD64D-6630-4426-B09C-B6862A92E3FD}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E7EFD64D-6630-4426-B09C-B6862A92E3FD}.Release|Any CPU.Build.0 = Release|Any CPU
 		{F3B04A3A-20C8-4582-A54A-715AF6A5D859}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{F3B04A3A-20C8-4582-A54A-715AF6A5D859}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{F3B04A3A-20C8-4582-A54A-715AF6A5D859}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -214,6 +210,10 @@ Global
 		{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
@@ -243,12 +243,12 @@ Global
 		{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}
-		{E7EFD64D-6630-4426-B09C-B6862A92E3FD} = {F0CBB7A7-D3FB-41FF-8F47-CF3F6A592249}
 		{F3B04A3A-20C8-4582-A54A-715AF6A5D859} = {8679CAC8-9164-4007-BDD2-F004810EDA14}
 		{8447C956-B03E-4F59-9DD4-877793B849D9} = {67E66E82-5532-4440-AFB3-9FB1DF9DEF53}
 		{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}

LibationLauncher/LibationLauncher.csproj

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
@@ -13,7 +13,11 @@
     <!-- <PublishSingleFile>true</PublishSingleFile> -->
     <RuntimeIdentifier>win-x64</RuntimeIdentifier>
 
-    <Version>5.2.1.1</Version>
+    <Version>5.5.2.1</Version>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+    <DefineConstants>TRACE;DEBUG</DefineConstants>
   </PropertyGroup>
 
   <ItemGroup>

LibationLauncher/Program.cs

@@ -1,16 +1,18 @@
 using System;
+using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Windows.Forms;
-using AudibleApi;
 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.Extensions.Configuration;
-using Newtonsoft.Json;
+using Microsoft.EntityFrameworkCore;
 using Newtonsoft.Json.Linq;
 using Serilog;
 
@@ -18,9 +20,16 @@ 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);
@@ -44,12 +53,15 @@ namespace LibationLauncher
 
 			migrate_to_v5_0_0(config);
 			migrate_to_v5_2_0__post_config(config);
+			migrate_to_v5_5_0(config);
 
 			ensureSerilogConfig(config);
 			configureLogging(config);
-			checkForUpdate(config);
 			logStartupState(config);
 
+#if !DEBUG
+			checkForUpdate(config);
+#endif
 			Application.Run(new Form1());
 		}
 
@@ -74,7 +86,7 @@ namespace LibationLauncher
 			// check for existing settigns in default location
 			var defaultSettingsFile = Path.Combine(defaultLibationFilesDir, "Settings.json");
 			if (Configuration.SettingsFileIsValid(defaultSettingsFile))
-				config.TrySetLibationFiles(defaultLibationFilesDir);
+				config.SetLibationFiles(defaultLibationFilesDir);
 
 			if (config.LibationSettingsAreValid)
 				return;
@@ -87,7 +99,7 @@ namespace LibationLauncher
 			}
 
 			if (setupDialog.IsNewUser)
-				config.TrySetLibationFiles(defaultLibationFilesDir);
+				config.SetLibationFiles(defaultLibationFilesDir);
 			else if (setupDialog.IsReturningUser)
 			{
 				var libationFilesDialog = new LibationFilesDialog();
@@ -98,7 +110,7 @@ namespace LibationLauncher
 					return;
 				}
 
-				config.TrySetLibationFiles(libationFilesDialog.SelectedDirectory);
+				config.SetLibationFiles(libationFilesDialog.SelectedDirectory);
 				if (config.LibationSettingsAreValid)
 					return;
 
@@ -134,7 +146,7 @@ namespace LibationLauncher
 			CancelInstallation();
 		}
 
-		#region migrate_to_v5_0_0 re-register device if device info not in settings
+		#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)))
@@ -222,6 +234,83 @@ namespace LibationLauncher
 		}
 		#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)
@@ -257,7 +346,7 @@ namespace LibationLauncher
 								new JObject
 								{
 									// for this sink to work, a path must be provided. we override this below
-									{ "path", Path.Combine(Configuration.Instance.LibationFiles, "_Log.log") },
+									{ "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}"
@@ -276,38 +365,59 @@ namespace LibationLauncher
 			config.SetObject("Serilog", serilogObj);
 		}
 
+		// to restore original: Console.SetOut(origOut);
+		private static TextWriter origOut { get; } = Console.Out;
+
 		private static void configureLogging(Configuration config)
 		{
-			// override path. always use current libation files
-			var logPath = Path.Combine(Configuration.Instance.LibationFiles, "Log.log");
-			config.SetWithJsonPath("Serilog.WriteTo[1].Args", "path", logPath);
+			config.ConfigureLogging();
 
-			//// hack which achieves the same
-			//configuration["Serilog:WriteTo:1:Args:path"] = logPath;
-
-			// CONFIGURATION-DRIVEN (json)
-			var configuration = new ConfigurationBuilder()
-				.AddJsonFile(config.SettingsFilePath)
-				.Build();
-			Log.Logger = new LoggerConfiguration()
-				.ReadFrom.Configuration(configuration)
-				.CreateLogger();
-
-			//// MANUAL HARD CODED
-			//Log.Logger = new LoggerConfiguration()
-			//  // requires: using Dinah.Core.Logging;
-			//	.Enrich.WithCaller()
-			//	.MinimumLevel.Information()
-			//	.WriteTo.File(logPath,
-			//		rollingInterval: RollingInterval.Month,
-			//		outputTemplate: code_outputTemplate)
-			//	.CreateLogger();
+			// 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;
@@ -316,7 +426,7 @@ namespace LibationLauncher
 			try
 			{
 				// timed out
-				var latest = getLatestRelease(TimeSpan.FromSeconds(30));
+				var latest = getLatestRelease(TimeSpan.FromSeconds(10));
 				if (latest is null)
 					return;
 
@@ -331,6 +441,13 @@ namespace LibationLauncher
 				// 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");
@@ -346,6 +463,11 @@ namespace LibationLauncher
 					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);
@@ -367,6 +489,8 @@ namespace LibationLauncher
 			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()
@@ -379,48 +503,6 @@ namespace LibationLauncher
 			return latest;
 		}
 
-		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(),
-
-				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(),
-			});
-
-			// when turning on debug (and especially Verbose) to share logs, some privacy settings may not be obscured
-			if (Log.Logger.IsVerboseEnabled())
-				MessageBox.Show(@"
-Warning: verbose logging is enabled.
-
-This should be used for debugging only. It creates many
-more logs and debug files, neither of which are as
-strictly anonomous.
-
-When you are finished debugging, it's highly recommended
-to set your debug MinimumLevel to Information and restart
-Libation.
-".Trim(), "Verbose logging enabled", MessageBoxButtons.OK, MessageBoxIcon.Warning);
-		}
-
 		private static Version BuildVersion => System.Reflection.Assembly.GetExecutingAssembly().GetName().Version;
 	}
 }

LibationSearchEngine/SearchEngine.cs

@@ -18,8 +18,6 @@ namespace LibationSearchEngine
     {
         public const Lucene.Net.Util.Version Version = Lucene.Net.Util.Version.LUCENE_30;
 
-        private LibationContext context { get; }
-
         // not customizable. don't move to config
         private static string SearchEngineDirectory { get; }
             = new System.IO.DirectoryInfo(Configuration.Instance.LibationFiles).CreateSubdirectory("SearchEngine").FullName;
@@ -32,8 +30,6 @@ namespace LibationSearchEngine
         // the workaround which allows displaying all books when query is empty
         public const string ALL_QUERY = "*:*";
 
-        public SearchEngine(LibationContext context) => this.context = context;
-
 		#region index rules
 		private static ReadOnlyDictionary<string, Func<LibraryBook, string>> idIndexRules { get; }
             = new ReadOnlyDictionary<string, Func<LibraryBook, string>>(
@@ -130,8 +126,9 @@ namespace LibationSearchEngine
                     ["Abridged"] = lb => lb.Book.IsAbridged,
 
                     // this will only be evaluated at time of re-index. ie: state of files moved later will be out of sync until next re-index
-                    ["IsLiberated"] = lb => isLiberated(lb.Book.AudibleProductId),
-                    ["Liberated"] = lb => isLiberated(lb.Book.AudibleProductId),
+                    ["IsLiberated"] = lb => isLiberated(lb.Book),
+                    ["Liberated"] = lb => isLiberated(lb.Book),
+                    ["LiberatedError"] = lb => liberatedError(lb.Book),
                 }
                 );
 
@@ -142,7 +139,8 @@ namespace LibationSearchEngine
             return authors.Intersect(narrators).Any();
         }
 
-        private static bool isLiberated(string id) => AudibleFileStorage.Audio.Exists(id);
+        private static bool isLiberated(Book book) => book.UserDefinedItem.BookStatus == LiberatedStatus.Liberated;
+        private static bool liberatedError(Book book) => book.UserDefinedItem.BookStatus == LiberatedStatus.Error;
 
         // use these common fields in the "all" default search field
         private static IEnumerable<Func<LibraryBook, string>> allFieldIndexRules { get; }
@@ -198,11 +196,10 @@ namespace LibationSearchEngine
         /// create new. ie: full re-index
         /// </summary>
         /// <param name="overwrite"></param>
-        public void CreateNewIndex(bool overwrite = true)
+        public void CreateNewIndex(LibationContext context, bool overwrite = true)
         {
-            // 300 products
-            // 1st run after app is started: 400ms
-            // subsequent runs: 200ms
+            //  300 titles:  200- 400 ms
+            // 1021 titles: 1777-2250 ms
             var sw = System.Diagnostics.Stopwatch.StartNew();
             var stamps = new List<long>();
             void log() => stamps.Add(sw.ElapsedMilliseconds);
@@ -232,7 +229,7 @@ namespace LibationSearchEngine
         }
 
 		/// <summary>Long running. Use await Task.Run(() => UpdateBook(productId))</summary>
-		public void UpdateBook(string productId)
+		public void UpdateBook(LibationContext context, string productId)
         {
             var libraryBook = context.GetLibraryBook_Flat_NoTracking(productId);
             var term = new Term(_ID_, productId);
@@ -301,18 +298,22 @@ namespace LibationSearchEngine
                 });
 
         // update single document entry
-        public void UpdateIsLiberated(string productId)
+        public void UpdateLiberatedStatus(Book book)
             => updateDocument(
-                productId,
+                book.AudibleProductId,
                 d =>
                 {
                     // fields are key value pairs. MULTIPLE FIELDS CAN POTENTIALLY HAVE THE SAME KEY.
                     // ie: must remove old before adding new else will create unwanted duplicates.
-                    var v = isLiberated(productId);
+                    var v1 = isLiberated(book);
                     d.RemoveField("IsLiberated");
-                    d.AddBool("IsLiberated", v);
+                    d.AddBool("IsLiberated", v1);
                     d.RemoveField("Liberated");
-                    d.AddBool("Liberated", v);
+                    d.AddBool("Liberated", v1);
+
+                    var v2 = liberatedError(book);
+                    d.RemoveField("LiberatedError");
+                    d.AddBool("LiberatedError", v2);
                 });
 
         private static void updateDocument(string productId, Action<Document> action)

LibationWinForms/AsyncNotifyPropertyChanged.cs

@@ -0,0 +1,14 @@
+using Dinah.Core.Threading;
+using System.ComponentModel;
+using System.Runtime.CompilerServices;
+
+namespace LibationWinForms
+{
+	public abstract class AsyncNotifyPropertyChanged : SynchronizeInvoker, INotifyPropertyChanged
+	{
+		public event PropertyChangedEventHandler PropertyChanged;
+
+		public void NotifyPropertyChanged([CallerMemberName] string propertyName = "")
+			=> this.UIThread(() => PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName)));
+	}
+}

LibationWinForms/BookLiberation/AudioConvertForm.cs

@@ -0,0 +1,24 @@
+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/AudioConvertForm.resx

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

LibationWinForms/BookLiberation/AudioDecodeForm.Designer.cs

@@ -1,6 +1,6 @@
 namespace LibationWinForms.BookLiberation
 {
-    partial class DecryptForm
+    partial class AudioDecodeForm
     {
         /// <summary>
         /// Required designer variable.
@@ -31,7 +31,6 @@
 			this.pictureBox1 = new System.Windows.Forms.PictureBox();
 			this.bookInfoLbl = new System.Windows.Forms.Label();
 			this.progressBar1 = new System.Windows.Forms.ProgressBar();
-			this.rtbLog = new System.Windows.Forms.RichTextBox();
 			this.remainingTimeLbl = new System.Windows.Forms.Label();
 			((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
 			this.SuspendLayout();
@@ -60,28 +59,16 @@
 			// 
 			this.progressBar1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
-			this.progressBar1.Location = new System.Drawing.Point(14, 607);
+			this.progressBar1.Location = new System.Drawing.Point(14, 143);
 			this.progressBar1.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
 			this.progressBar1.Name = "progressBar1";
 			this.progressBar1.Size = new System.Drawing.Size(611, 27);
 			this.progressBar1.TabIndex = 2;
 			// 
-			// rtbLog
-			// 
-			this.rtbLog.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.rtbLog.Location = new System.Drawing.Point(14, 136);
-			this.rtbLog.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
-			this.rtbLog.Name = "rtbLog";
-			this.rtbLog.Size = new System.Drawing.Size(678, 463);
-			this.rtbLog.TabIndex = 1;
-			this.rtbLog.Text = "";
-			// 
 			// remainingTimeLbl
 			// 
 			this.remainingTimeLbl.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-			this.remainingTimeLbl.Location = new System.Drawing.Point(632, 607);
+			this.remainingTimeLbl.Location = new System.Drawing.Point(632, 143);
 			this.remainingTimeLbl.Name = "remainingTimeLbl";
 			this.remainingTimeLbl.Size = new System.Drawing.Size(60, 31);
 			this.remainingTimeLbl.TabIndex = 3;
@@ -92,9 +79,8 @@
 			// 
 			this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
 			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-			this.ClientSize = new System.Drawing.Size(707, 647);
+			this.ClientSize = new System.Drawing.Size(707, 183);
 			this.Controls.Add(this.remainingTimeLbl);
-			this.Controls.Add(this.rtbLog);
 			this.Controls.Add(this.progressBar1);
 			this.Controls.Add(this.bookInfoLbl);
 			this.Controls.Add(this.pictureBox1);
@@ -102,8 +88,6 @@
 			this.Name = "DecryptForm";
 			this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
 			this.Text = "DecryptForm";
-			this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.DecryptForm_FormClosing);
-			this.Load += new System.EventHandler(this.DecryptForm_Load);
 			((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();
 			this.ResumeLayout(false);
 			this.PerformLayout();
@@ -115,7 +99,6 @@
         private System.Windows.Forms.PictureBox pictureBox1;
         private System.Windows.Forms.Label bookInfoLbl;
         private System.Windows.Forms.ProgressBar progressBar1;
-        private System.Windows.Forms.RichTextBox rtbLog;
         private System.Windows.Forms.Label remainingTimeLbl;
     }
 }

LibationWinForms/BookLiberation/AudioDecodeForm.cs

@@ -0,0 +1,92 @@
+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/AudioDecodeForm.resx

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

LibationWinForms/BookLiberation/AudioDecryptForm.cs

@@ -0,0 +1,24 @@
+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/AudioDecryptForm.resx

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

LibationWinForms/BookLiberation/AutomatedBackupsForm.cs

@@ -1,34 +1,35 @@
-using System;
+using Dinah.Core.Windows.Forms;
+using System;
+using System.Linq;
 using System.Windows.Forms;
-using Dinah.Core.Windows.Forms;
 
 namespace LibationWinForms.BookLiberation
 {
-    public partial class AutomatedBackupsForm : Form
-    {
-        public bool KeepGoingChecked => keepGoingCb.Checked;
+	public partial class AutomatedBackupsForm : Form
+	{
+		public bool KeepGoingChecked => keepGoingCb.Checked;
 
-        public bool KeepGoing => keepGoingCb.Enabled && keepGoingCb.Checked;
+		public bool KeepGoing => keepGoingCb.Enabled && keepGoingCb.Checked;
 
-        public AutomatedBackupsForm()
-        {
-            InitializeComponent();
-        }
+		public AutomatedBackupsForm()
+		{
+			InitializeComponent();
+		}
 
-        public void WriteLine(string text)
-        {
-            if (!IsDisposed)
-                logTb.UIThread(() => logTb.AppendText($"{DateTime.Now} {text}{Environment.NewLine}"));
-        }
+		public void WriteLine(string text)
+		{
+			if (!IsDisposed)
+				logTb.UIThread(() => logTb.AppendText($"{DateTime.Now} {text}{Environment.NewLine}"));
+		}
 
 		public void FinalizeUI()
-        {
-            keepGoingCb.Enabled = false;
+		{
+			keepGoingCb.Enabled = false;
 
-            if (!IsDisposed)
-                logTb.AppendText("");
-        }
+			if (!IsDisposed)
+				logTb.AppendText("");
+		}
 
-        private void AutomatedBackupsForm_FormClosing(object sender, FormClosingEventArgs e) => keepGoingCb.Checked = false;
-    }
+		private void AutomatedBackupsForm_FormClosing(object sender, FormClosingEventArgs e) => keepGoingCb.Checked = false;
+	}
 }

LibationWinForms/BookLiberation/AutomatedBackupsForm.resx

@@ -1,64 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
   <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
     <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
     <xsd:element name="root" msdata:IsDataSet="true">

LibationWinForms/BookLiberation/BaseForms/LiberationBaseForm.cs

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

@@ -1,76 +0,0 @@
-using System;
-using System.Windows.Forms;
-using Dinah.Core.Drawing;
-using Dinah.Core.IO;
-using Dinah.Core.Windows.Forms;
-
-namespace LibationWinForms.BookLiberation
-{
-    public partial class DecryptForm : Form
-    {
-		public DecryptForm()
-        {
-            InitializeComponent();
-        }
-
-        System.IO.TextWriter origOut { get; } = Console.Out;
-        private void DecryptForm_Load(object sender, EventArgs e)
-        {
-            // redirect Console.WriteLine to console, textbox
-            var multiLogger = new MultiTextWriter(
-                origOut,
-                new RichTextBoxTextWriter(this.rtbLog),
-                new SerilogTextWriter());
-            Console.SetOut(multiLogger);
-        }
-
-        private void DecryptForm_FormClosing(object sender, FormClosingEventArgs e)
-        {
-            // restore original
-            Console.SetOut(origOut);
-        }
-
-        // book info
-        string title;
-        string authorNames;
-        string narratorNames;
-
-        public void SetTitle(string title)
-        {
-            this.UIThread(() => this.Text = " Decrypting " + title);
-            this.title = title;
-            updateBookInfo();
-        }
-        public void SetAuthorNames(string authorNames)
-        {
-            this.authorNames = authorNames;
-            updateBookInfo();
-        }
-        public void SetNarratorNames(string narratorNames)
-        {
-            this.narratorNames = narratorNames;
-            updateBookInfo();
-        }
-
-        // thread-safe UI updates
-        private void updateBookInfo()
-            => bookInfoLbl.UIThread(() => bookInfoLbl.Text = $"{title}\r\nBy {authorNames}\r\nNarrated by {narratorNames}");
-
-        public void SetCoverImage(System.Drawing.Image coverImage)
-            => pictureBox1.UIThread(() => pictureBox1.Image = coverImage);
-
-        public void UpdateProgress(int percentage)
-        {
-            if (percentage == 0)
-                remainingTimeLbl.UIThread(() => remainingTimeLbl.Text = "ETA:\r\n0 sec");
-
-            else
-                progressBar1.UIThread(() => progressBar1.Value = percentage);
-        }
-
-        public void UpdateRemainingTime(TimeSpan remaining)
-        {
-            remainingTimeLbl.UIThread(() => remainingTimeLbl.Text = $"ETA:\r\n{(int)remaining.TotalSeconds} sec");
-        }
-    }
-}

LibationWinForms/BookLiberation/DownloadForm.Designer.cs

@@ -1,4 +1,7 @@
-namespace LibationWinForms.BookLiberation
+using DataLayer;
+using System;
+
+namespace LibationWinForms.BookLiberation
 {
     partial class DownloadForm
     {
@@ -95,9 +98,10 @@
 
         }
 
-        #endregion
 
-        private System.Windows.Forms.Label filenameLbl;
+		#endregion
+
+		private System.Windows.Forms.Label filenameLbl;
         private System.Windows.Forms.ProgressBar progressBar1;
         private System.Windows.Forms.Label progressLbl;
         private System.Windows.Forms.Label lastUpdateLbl;

LibationWinForms/BookLiberation/DownloadForm.cs

@@ -1,59 +1,66 @@
-using System;
-using System.Windows.Forms;
+using Dinah.Core.Net.Http;
 using Dinah.Core.Windows.Forms;
+using LibationWinForms.BookLiberation.BaseForms;
+using System;
+using System.Linq;
+using System.Windows.Forms;
 
 namespace LibationWinForms.BookLiberation
 {
-    public partial class DownloadForm : Form
-    {
-        public DownloadForm()
-        {
-            InitializeComponent();
+	public partial class DownloadForm : LiberationBaseForm
+	{
+		public DownloadForm()
+		{
+			InitializeComponent();
 
-            progressLbl.Text = "";
-            filenameLbl.Text = "";
-        }
+			progressLbl.Text = "";
+			filenameLbl.Text = "";
+		}
 
-        // thread-safe UI updates
-        public void UpdateFilename(string title) => filenameLbl.UIThread(() => filenameLbl.Text = title);
 
-        public void DownloadProgressChanged(long BytesReceived, long? TotalBytesToReceive)
-        {
-            // this won't happen with download file. it will happen with download string
-            if (!TotalBytesToReceive.HasValue || TotalBytesToReceive.Value <= 0)
-                return;
+		#region IStreamable event handler overrides
+		public override void OnStreamingBegin(object sender, string beginString)
+		{
+			filenameLbl.UIThread(() => filenameLbl.Text = beginString);
+		}
+		public override void OnStreamingProgressChanged(object sender, DownloadProgress downloadProgress)
+		{
+			// this won't happen with download file. it will happen with download string
+			if (!downloadProgress.TotalBytesToReceive.HasValue || downloadProgress.TotalBytesToReceive.Value <= 0)
+				return;
 
-            progressLbl.UIThread(() => progressLbl.Text = $"{BytesReceived:#,##0} of {TotalBytesToReceive.Value:#,##0}");
+			progressLbl.UIThread(() => progressLbl.Text = $"{downloadProgress.BytesReceived:#,##0} of {downloadProgress.TotalBytesToReceive.Value:#,##0}");
 
-            var d = double.Parse(BytesReceived.ToString()) / double.Parse(TotalBytesToReceive.Value.ToString()) * 100.0;
-            var i = int.Parse(Math.Truncate(d).ToString());
-            progressBar1.UIThread(() => progressBar1.Value = i);
+			var d = double.Parse(downloadProgress.BytesReceived.ToString()) / double.Parse(downloadProgress.TotalBytesToReceive.Value.ToString()) * 100.0;
+			var i = int.Parse(Math.Truncate(d).ToString());
+			progressBar1.UIThread(() => progressBar1.Value = i);
 
-            lastDownloadProgress = DateTime.Now;
-        }
+			lastDownloadProgress = DateTime.Now;
+		}
+		#endregion
 
-        #region timer
-        private Timer timer { get; } = new Timer { Interval = 1000 };
-        private void DownloadForm_Load(object sender, EventArgs e)
-        {
-            timer.Tick += new EventHandler(timer_Tick);
-            timer.Start();
-        }
-        private DateTime lastDownloadProgress = DateTime.Now;
-        private void timer_Tick(object sender, EventArgs e)
-        {
-            // if no update in the last 30 seconds, display frozen label
-            lastUpdateLbl.UIThread(() => lastUpdateLbl.Visible = lastDownloadProgress.AddSeconds(30) < DateTime.Now);
-            if (lastUpdateLbl.Visible)
-            {
-                var diff = DateTime.Now - lastDownloadProgress;
-                var min = (int)diff.TotalMinutes;
-                var minText = min > 0 ? $"{min}min " : "";
+		#region timer
+		private Timer timer { get; } = new Timer { Interval = 1000 };
+		private void DownloadForm_Load(object sender, EventArgs e)
+		{
+			timer.Tick += new EventHandler(timer_Tick);
+			timer.Start();
+		}
+		private DateTime lastDownloadProgress = DateTime.Now;
+		private void timer_Tick(object sender, EventArgs e)
+		{
+			// if no update in the last 30 seconds, display frozen label
+			lastUpdateLbl.UIThread(() => lastUpdateLbl.Visible = lastDownloadProgress.AddSeconds(30) < DateTime.Now);
+			if (lastUpdateLbl.Visible)
+			{
+				var diff = DateTime.Now - lastDownloadProgress;
+				var min = (int)diff.TotalMinutes;
+				var minText = min > 0 ? $"{min}min " : "";
 
-                lastUpdateLbl.UIThread(() => lastUpdateLbl.Text = $"Frozen? Last download activity: {minText}{diff.Seconds}sec ago");
-            }
-        }
-        private void DownloadForm_FormClosing(object sender, FormClosingEventArgs e) => timer.Stop();
-        #endregion
-    }
+				lastUpdateLbl.UIThread(() => lastUpdateLbl.Text = $"Frozen? Last download activity: {minText}{diff.Seconds}sec ago");
+			}
+		}
+		private void DownloadForm_FormClosing(object sender, FormClosingEventArgs e) => timer.Stop();
+		#endregion
+	}
 }

LibationWinForms/BookLiberation/DownloadForm.resx

@@ -1,64 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
   <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
     <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
     <xsd:element name="root" msdata:IsDataSet="true">

LibationWinForms/BookLiberation/PdfDownloadForm.cs

@@ -0,0 +1,10 @@
+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/BookLiberation/PdfDownloadForm.resx

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

LibationWinForms/BookLiberation/ProcessorAutomationController.cs

@@ -1,493 +1,293 @@
-using System;
+using DataLayer;
+using Dinah.Core;
+using FileLiberator;
+using LibationWinForms.BookLiberation.BaseForms;
+using System;
 using System.Linq;
 using System.Threading.Tasks;
 using System.Windows.Forms;
-using DataLayer;
-using Dinah.Core.ErrorHandling;
-using Dinah.Core.Windows.Forms;
-using FileLiberator;
 
 namespace LibationWinForms.BookLiberation
 {
-    // decouple serilog and form. include convenience factory method
-    public class LogMe
-    {
-        public event EventHandler<string> LogInfo;
-        public event EventHandler<string> LogErrorString;
-        public event EventHandler<(Exception, string)> LogError;
-
-        private LogMe()
-        {
-            LogInfo += (_, text) => Serilog.Log.Logger.Information($"Automated backup: {text}");
-            LogErrorString += (_, text) => Serilog.Log.Logger.Error(text);
-            LogError += (_, tuple) => Serilog.Log.Logger.Error(tuple.Item1, tuple.Item2 ?? "Automated backup: error");
-        }
-
-        public static LogMe RegisterForm(AutomatedBackupsForm form = null)
-        {
-            var logMe = new LogMe();
-
-            if (form is null)
-                return logMe;
-
-            logMe.LogInfo += (_, text) => form?.WriteLine(text);
-
-            logMe.LogErrorString += (_, text) => form?.WriteLine(text);
-
-            logMe.LogError += (_, tuple) =>
-            {
-                form?.WriteLine(tuple.Item2 ?? "Automated backup: error");
-                form?.WriteLine("ERROR: " + tuple.Item1.Message);
-            };
-
-            return logMe;
-        }
-
-        public void Info(string text) => LogInfo?.Invoke(this, text);
-        public void Error(string text) => LogErrorString?.Invoke(this, text);
-        public void Error(Exception ex, string text = null) => LogError?.Invoke(this, (ex, text));
-    }
-
-    public static class ProcessorAutomationController
-    {
-        public static async Task BackupSingleBookAsync(string productId, EventHandler<LibraryBook> completedAction = null)
-        {
-            Serilog.Log.Logger.Information("Begin " + nameof(BackupSingleBookAsync) + " {@DebugInfo}", new { productId });
-
-            var backupBook = getWiredUpBackupBook(completedAction);
-           
-            (Action unsubscribeEvents, LogMe logMe) = attachToBackupsForm(backupBook);
-
-            var libraryBook = IProcessableExt.GetSingleLibraryBook(productId);
-            // continue even if libraryBook is null. we'll display even that in the processing box
-            await new BackupSingle(logMe, backupBook, libraryBook).RunBackupAsync();
-
-            unsubscribeEvents();
-        }
-
-        public static async Task BackupAllBooksAsync(EventHandler<LibraryBook> completedAction = null)
-        {
-            Serilog.Log.Logger.Information("Begin " + nameof(BackupAllBooksAsync));
-
-            var backupBook = getWiredUpBackupBook(completedAction);
-            var automatedBackupsForm = new AutomatedBackupsForm();
-
-            (Action unsubscribeEvents, LogMe logMe) = attachToBackupsForm(backupBook, automatedBackupsForm);
-
-            await new BackupLoop(logMe, backupBook, automatedBackupsForm).RunBackupAsync();
-
-            unsubscribeEvents();
-        }
-
-        private static BackupBook getWiredUpBackupBook(EventHandler<LibraryBook> completedAction)
-        {
-            var backupBook = new BackupBook();
-
-            backupBook.DecryptBook.Begin += (_, l) => wireUpEvents(backupBook.DecryptBook, l);
-            backupBook.DownloadPdf.Begin += (_, __) => wireUpEvents(backupBook.DownloadPdf);
-
-            // must occur before completedAction. A common use case is:
-            // - filter by -liberated
-            // - liberate only that book
-            //   completedAction is to refresh grid
-            // - want to see that book disappear from grid
-            // also for this to work, updateIsLiberated can NOT be async
-            backupBook.DecryptBook.Completed += updateIsLiberated;
-            backupBook.DownloadPdf.Completed += updateIsLiberated;
-
-            if (completedAction != null)
-            {
-                backupBook.DecryptBook.Completed += completedAction;
-                backupBook.DownloadPdf.Completed += completedAction;
-            }
-
-            return backupBook;
-        }
-
-        private static void updateIsLiberated(object sender, LibraryBook e) => ApplicationServices.SearchEngineCommands.UpdateIsLiberated(e.Book);
-
-        private static (Action unsubscribeEvents, LogMe) attachToBackupsForm(BackupBook backupBook, AutomatedBackupsForm automatedBackupsForm = null)
-        {
-            #region create logger
-            var logMe = LogMe.RegisterForm(automatedBackupsForm);
-            #endregion
-
-            #region define how model actions will affect form behavior
-            void statusUpdate(object _, string str) => logMe.Info("- " + str);
-            void decryptBookBegin(object _, LibraryBook libraryBook) => logMe.Info($"Decrypt Step, Begin: {libraryBook.Book}");
-            // extra line after book is completely finished
-            void decryptBookCompleted(object _, LibraryBook libraryBook) => logMe.Info($"Decrypt Step, Completed: {libraryBook.Book}{Environment.NewLine}");
-            void downloadPdfBegin(object _, LibraryBook libraryBook) => logMe.Info($"PDF Step, Begin: {libraryBook.Book}");
-            // extra line after book is completely finished
-            void downloadPdfCompleted(object _, LibraryBook libraryBook) => logMe.Info($"PDF Step, Completed: {libraryBook.Book}{Environment.NewLine}");
-            #endregion
-
-            #region subscribe new form to model's events
-            backupBook.DecryptBook.Begin += decryptBookBegin;
-            backupBook.DecryptBook.StatusUpdate += statusUpdate;
-            backupBook.DecryptBook.Completed += decryptBookCompleted;
-            backupBook.DownloadPdf.Begin += downloadPdfBegin;
-            backupBook.DownloadPdf.StatusUpdate += statusUpdate;
-            backupBook.DownloadPdf.Completed += downloadPdfCompleted;
-            #endregion
-
-            #region when form closes, unsubscribe from model's events
-            // unsubscribe so disposed forms aren't still trying to receive notifications
-            Action unsubscribe = () =>
-            {
-                backupBook.DecryptBook.Begin -= decryptBookBegin;
-                backupBook.DecryptBook.StatusUpdate -= statusUpdate;
-                backupBook.DecryptBook.Completed -= decryptBookCompleted;
-                backupBook.DownloadPdf.Begin -= downloadPdfBegin;
-                backupBook.DownloadPdf.StatusUpdate -= statusUpdate;
-                backupBook.DownloadPdf.Completed -= downloadPdfCompleted;
-            };
-            #endregion
-
-            return (unsubscribe, logMe);
-        }
-
-        public static async Task BackupAllPdfsAsync(EventHandler<LibraryBook> completedAction = null)
-        {
-            Serilog.Log.Logger.Information("Begin " + nameof(BackupAllPdfsAsync));
-
-            var downloadPdf = getWiredUpDownloadPdf(completedAction);
-
-            (AutomatedBackupsForm automatedBackupsForm, LogMe logMe) = attachToBackupsForm(downloadPdf);
-            await new BackupLoop(logMe, downloadPdf, automatedBackupsForm).RunBackupAsync();
-        }
-
-        private static DownloadPdf getWiredUpDownloadPdf(EventHandler<LibraryBook> completedAction)
-        {
-            var downloadPdf = new DownloadPdf();
-
-            downloadPdf.Begin += (_, __) => wireUpEvents(downloadPdf);
-
-            if (completedAction != null)
-                downloadPdf.Completed += completedAction;
-
-            return downloadPdf;
-        }
-
-        public static void DownloadFile(string url, string destination, bool showDownloadCompletedDialog = false)
-        {
-            var downloadDialog = new DownloadForm();
-            downloadDialog.UpdateFilename(destination);
-            downloadDialog.Show();
-
-            new System.Threading.Thread(() => {
-                var downloadFile = new DownloadFile();
-
-                downloadFile.DownloadProgressChanged += (_, progress) => downloadDialog.UIThread(() =>
-                    downloadDialog.DownloadProgressChanged(progress.BytesReceived, progress.TotalBytesToReceive)
-                    );
-                downloadFile.DownloadCompleted += (_, __) => downloadDialog.UIThread(() =>
-                {
-                    downloadDialog.Close();
-                    if (showDownloadCompletedDialog)
-                        MessageBox.Show("File downloaded");
-                });
-
-                downloadFile.PerformDownloadFileAsync(url, destination).GetAwaiter().GetResult();
-            }).Start();
-        }
-
-        // subscribed to Begin event because a new form should be created+processed+closed on each iteration
-        private static void wireUpEvents(IDownloadableProcessable downloadable)
-        {
-            #region create form
-            var downloadDialog = new DownloadForm();
-            #endregion
-
-            // extra complexity for wiring up download form:
-            // case 1: download is needed
-            //   dialog created. subscribe to events
-            //   downloadable.DownloadBegin fires. shows dialog
-            //   downloadable.DownloadCompleted fires. closes dialog. which fires FormClosing, FormClosed, Disposed
-            //   Disposed unsubscribe from events
-            // case 2: download is not needed
-            //   dialog created. subscribe to events
-            //   dialog is never shown nor closed
-            //   downloadable.Completed fires. disposes dialog and unsubscribes from events
-
-            #region define how model actions will affect form behavior
-            void downloadBegin(object _, string str)
-            {
-                downloadDialog.UpdateFilename(str);
-                downloadDialog.Show();
-            }
-
-            // close form on DOWNLOAD completed, not final Completed. Else for BackupBook this form won't close until DECRYPT is also complete
-            void fileDownloadCompleted(object _, string __) => downloadDialog.Close();
-
-            void downloadProgressChanged(object _, Dinah.Core.Net.Http.DownloadProgress progress)
-                => downloadDialog.DownloadProgressChanged(progress.BytesReceived, progress.TotalBytesToReceive);
-
-            void unsubscribe(object _ = null, EventArgs __ = null)
-            {
-                downloadable.DownloadBegin -= downloadBegin;
-                downloadable.DownloadCompleted -= fileDownloadCompleted;
-                downloadable.DownloadProgressChanged -= downloadProgressChanged;
-                downloadable.Completed -= dialogDispose;
-            }
-
-            // unless we dispose, if the form is created but un-used/never-shown then weird UI stuff can happen
-            // also, since event unsubscribe occurs on FormClosing and an unused form is never closed, then the events will never be unsubscribed
-            void dialogDispose(object _, object __)
-            {
-                if (!downloadDialog.IsDisposed)
-                    downloadDialog.Dispose();
-            }
-            #endregion
-
-            #region subscribe new form to model's events
-            downloadable.DownloadBegin += downloadBegin;
-            downloadable.DownloadCompleted += fileDownloadCompleted;
-            downloadable.DownloadProgressChanged += downloadProgressChanged;
-            downloadable.Completed += dialogDispose;
-            #endregion
-
-            #region when form closes, unsubscribe from model's events
-            // unsubscribe so disposed forms aren't still trying to receive notifications
-            // FormClosing is more UI safe but won't fire unless the form is shown and closed
-            //   if form was shown, Disposed will fire for FormClosing, FormClosed, and Disposed
-            //   if not shown, it will still fire for Disposed
-            downloadDialog.Disposed += unsubscribe;
-            #endregion
-        }
-
-        // subscribed to Begin event because a new form should be created+processed+closed on each iteration
-        private static void wireUpEvents(IDecryptable decryptBook, LibraryBook libraryBook)
-        {
-            #region create form
-            var decryptDialog = new DecryptForm();
-            #endregion
-
-            #region Set initially displayed book properties from library info.
-            decryptDialog.SetTitle(libraryBook.Book.Title);
-            decryptDialog.SetAuthorNames(string.Join(", ", libraryBook.Book.Authors));
-            decryptDialog.SetNarratorNames(string.Join(", ", libraryBook.Book.NarratorNames));
-            decryptDialog.SetCoverImage(
-                WindowsDesktopUtilities.WinAudibleImageServer.GetImage(
-                    libraryBook.Book.PictureId,
-                    FileManager.PictureSize._80x80
-                    ));
-            #endregion
-
-            #region define how model actions will affect form behavior
-            void decryptBegin(object _, string __) => decryptDialog.Show();
-
-            void titleDiscovered(object _, string title) => decryptDialog.SetTitle(title);
-            void authorsDiscovered(object _, string authors) => decryptDialog.SetAuthorNames(authors);
-            void narratorsDiscovered(object _, string narrators) => decryptDialog.SetNarratorNames(narrators);
-            void coverImageFilepathDiscovered(object _, byte[] coverBytes) => decryptDialog.SetCoverImage(Dinah.Core.Drawing.ImageReader.ToImage(coverBytes));
-            void updateProgress(object _, int percentage) => decryptDialog.UpdateProgress(percentage);
-            void updateRemainingTime(object _, TimeSpan remaining) => decryptDialog.UpdateRemainingTime(remaining);
-            void decryptCompleted(object _, string __) => decryptDialog.Close();
-           
-            void requestCoverArt(object _, Action<byte[]> setCoverArtDelegate)
-            {
-                var picDef = new FileManager.PictureDefinition(libraryBook.Book.PictureId, FileManager.PictureSize._500x500);
-                (bool isDefault, byte[] picture) = FileManager.PictureStorage.GetPicture(picDef);
-
-                if (isDefault)
-                {
-                    void pictureCached(object _, string pictureId)
-                    {
-                        if (pictureId == libraryBook.Book.PictureId)
-                        {
-                            FileManager.PictureStorage.PictureCached -= pictureCached;
-
-                            var picDef = new FileManager.PictureDefinition(libraryBook.Book.PictureId, FileManager.PictureSize._500x500);
-                            (_, picture) = FileManager.PictureStorage.GetPicture(picDef);
-
-                            setCoverArtDelegate(picture);
-                        }
-                    };
-                    FileManager.PictureStorage.PictureCached += pictureCached;
-                }
-                else
-                    setCoverArtDelegate(picture);
-            }
-            #endregion
-
-            #region subscribe new form to model's events
-            decryptBook.DecryptBegin += decryptBegin;
-
-            decryptBook.TitleDiscovered += titleDiscovered;
-            decryptBook.AuthorsDiscovered += authorsDiscovered;
-            decryptBook.NarratorsDiscovered += narratorsDiscovered;
-            decryptBook.CoverImageFilepathDiscovered += coverImageFilepathDiscovered;
-            decryptBook.UpdateProgress += updateProgress;
-            decryptBook.UpdateRemainingTime += updateRemainingTime;
-            decryptBook.RequestCoverArt += requestCoverArt;
-
-            decryptBook.DecryptCompleted += decryptCompleted;
-            #endregion
-
-            #region when form closes, unsubscribe from model's events
-            // unsubscribe so disposed forms aren't still trying to receive notifications
-            decryptDialog.FormClosing += (_, __) =>
-            {
-                decryptBook.DecryptBegin -= decryptBegin;
-
-                decryptBook.TitleDiscovered -= titleDiscovered;
-                decryptBook.AuthorsDiscovered -= authorsDiscovered;
-                decryptBook.NarratorsDiscovered -= narratorsDiscovered;
-                decryptBook.CoverImageFilepathDiscovered -= coverImageFilepathDiscovered;
-                decryptBook.UpdateProgress -= updateProgress;
-                decryptBook.UpdateRemainingTime -= updateRemainingTime;
-                decryptBook.RequestCoverArt -= requestCoverArt;
-
-                decryptBook.DecryptCompleted -= decryptCompleted;
-                decryptBook.Cancel();
-            };
-            #endregion
-        }
-        
-        private static (AutomatedBackupsForm, LogMe) attachToBackupsForm(IDownloadableProcessable downloadable)
-        {
-            #region create form and logger
-            var automatedBackupsForm = new AutomatedBackupsForm();
-            var logMe = LogMe.RegisterForm(automatedBackupsForm);
-            #endregion
-
-            #region define how model actions will affect form behavior
-            void begin(object _, LibraryBook libraryBook) => logMe.Info($"Begin: {libraryBook.Book}");
-            void statusUpdate(object _, string str) => logMe.Info("- " + str);
-            // extra line after book is completely finished
-            void completed(object _, LibraryBook libraryBook) => logMe.Info($"Completed: {libraryBook.Book}{Environment.NewLine}");
-            #endregion
-
-            #region subscribe new form to model's events
-            downloadable.Begin += begin;
-            downloadable.StatusUpdate += statusUpdate;
-            downloadable.Completed += completed;
-            #endregion
-
-            #region when form closes, unsubscribe from model's events
-            // unsubscribe so disposed forms aren't still trying to receive notifications
-            automatedBackupsForm.FormClosing += (_, __) =>
-            {
-                downloadable.Begin -= begin;
-                downloadable.StatusUpdate -= statusUpdate;
-                downloadable.Completed -= completed;
-            };
-            #endregion
-
-            return (automatedBackupsForm, logMe);
-        }
-    }
-
-    abstract class BackupRunner
-    {
-        protected LogMe LogMe { get; }
-        protected IProcessable Processable { get; }
-        protected AutomatedBackupsForm AutomatedBackupsForm { get; }
-
-        protected BackupRunner(LogMe logMe, IProcessable processable, AutomatedBackupsForm automatedBackupsForm = null)
-        {
-            LogMe = logMe;
-            Processable = processable;
-            AutomatedBackupsForm = automatedBackupsForm;
-        }
-
-        protected abstract Task RunAsync();
-
-        protected abstract string SkipDialogText { get; }
-        protected abstract MessageBoxButtons SkipDialogButtons { get; }
-        protected abstract DialogResult CreateSkipFileResult { get; }
-
-        public async Task RunBackupAsync()
-        {
-            AutomatedBackupsForm?.Show();
-
-            try
-            {
-                await RunAsync();
-            }
-            catch (Exception ex)
-            {
-                LogMe.Error(ex);
-            }
-
-            AutomatedBackupsForm?.FinalizeUI();
-            LogMe.Info("DONE");
-        }
-
-        protected async Task<bool> ProcessOneAsync(Func<LibraryBook, Task<StatusHandler>> func, LibraryBook libraryBook)
-        {
-            string logMessage;
-
-            try
-            {
-                var statusHandler = await func(libraryBook);
-
-                if (statusHandler.IsSuccess)
-                    return true;
-
-                foreach (var errorMessage in statusHandler.Errors)
-                    LogMe.Error(errorMessage);
-
-                logMessage = statusHandler.Errors.Aggregate((a, b) => $"{a}\r\n{b}");
-            }
-            catch (Exception ex)
-            {
-                LogMe.Error(ex);
-
-                logMessage = ex.Message + "\r\n|\r\n" + ex.StackTrace;
-            }
-
-            LogMe.Error("ERROR. All books have not been processed. Most recent book: processing failed");
-
-            var dialogResult = MessageBox.Show(SkipDialogText, "Skip importing this book?", SkipDialogButtons, MessageBoxIcon.Question);
-
-            if (dialogResult == DialogResult.Abort)
-                return false;
-
-            if (dialogResult == CreateSkipFileResult)
-            {
-                var path = FileManager.AudibleFileStorage.Audio.CreateSkipFile(libraryBook.Book.Title, libraryBook.Book.AudibleProductId, logMessage);
-                LogMe.Info($@"
-Created new 'skip' file
-  [{libraryBook.Book.AudibleProductId}] {libraryBook.Book.Title}
-  {path}
-".Trim());
-            }
-
-            return true;
-        }
-    }
-    class BackupSingle : BackupRunner
-    {
-        private LibraryBook _libraryBook { get; }
-
-        protected override string SkipDialogText => @"
+	// decouple serilog and form. include convenience factory method
+	public class LogMe
+	{
+		public event EventHandler<string> LogInfo;
+		public event EventHandler<string> LogErrorString;
+		public event EventHandler<(Exception, string)> LogError;
+
+		private LogMe()
+		{
+			LogInfo += (_, text) => Serilog.Log.Logger.Information($"Automated backup: {text}");
+			LogErrorString += (_, text) => Serilog.Log.Logger.Error(text);
+			LogError += (_, tuple) => Serilog.Log.Logger.Error(tuple.Item1, tuple.Item2 ?? "Automated backup: error");
+		}
+
+		public static LogMe RegisterForm(AutomatedBackupsForm form = null)
+		{
+			var logMe = new LogMe();
+
+			if (form is null)
+				return logMe;
+
+			logMe.LogInfo += (_, text) => form?.WriteLine(text);
+
+			logMe.LogErrorString += (_, text) => form?.WriteLine(text);
+
+			logMe.LogError += (_, tuple) =>
+			{
+				form?.WriteLine(tuple.Item2 ?? "Automated backup: error");
+				form?.WriteLine("ERROR: " + tuple.Item1.Message);
+			};
+
+			return logMe;
+		}
+
+		public void Info(string text) => LogInfo?.Invoke(this, text);
+		public void Error(string text) => LogErrorString?.Invoke(this, text);
+		public void Error(Exception ex, string text = null) => LogError?.Invoke(this, (ex, text));
+	}
+
+	public static class ProcessorAutomationController
+	{
+		public static async Task BackupSingleBookAsync(LibraryBook libraryBook, EventHandler<LibraryBook> completedAction = null)
+		{
+			Serilog.Log.Logger.Information($"Begin {nameof(BackupSingleBookAsync)} {{@DebugInfo}}", new { libraryBook?.Book?.AudibleProductId });
+
+			var logMe = LogMe.RegisterForm();
+			var backupBook = CreateBackupBook(completedAction, logMe);
+
+			// continue even if libraryBook is null. we'll display even that in the processing box
+			await new BackupSingle(logMe, backupBook, libraryBook).RunBackupAsync();
+		}
+
+		public static async Task BackupAllBooksAsync(EventHandler<LibraryBook> completedAction = null)
+		{
+			Serilog.Log.Logger.Information("Begin " + nameof(BackupAllBooksAsync));
+
+			var automatedBackupsForm = new AutomatedBackupsForm();
+			var logMe = LogMe.RegisterForm(automatedBackupsForm);
+			var backupBook = CreateBackupBook(completedAction, logMe);
+
+			await new BackupLoop(logMe, backupBook, automatedBackupsForm).RunBackupAsync();
+		}
+
+		public static async Task ConvertAllBooksAsync()
+		{
+			Serilog.Log.Logger.Information("Begin " + nameof(ConvertAllBooksAsync));
+
+			var automatedBackupsForm = new AutomatedBackupsForm();
+			var logMe = LogMe.RegisterForm(automatedBackupsForm);
+
+			var convertBook = CreateProcessable<ConvertToMp3, AudioConvertForm>(logMe);
+
+			await new BackupLoop(logMe, convertBook, automatedBackupsForm).RunBackupAsync();
+		}
+
+		public static async Task BackupAllPdfsAsync(EventHandler<LibraryBook> completedAction = null)
+		{
+			Serilog.Log.Logger.Information("Begin " + nameof(BackupAllPdfsAsync));
+
+			var automatedBackupsForm = new AutomatedBackupsForm();
+			var logMe = LogMe.RegisterForm(automatedBackupsForm);
+
+			var downloadPdf = CreateProcessable<DownloadPdf, PdfDownloadForm>(logMe, completedAction);
+
+			await new BackupLoop(logMe, downloadPdf, automatedBackupsForm).RunBackupAsync();
+		}
+
+		private static IProcessable CreateBackupBook(EventHandler<LibraryBook> completedAction, LogMe logMe)
+		{
+			var downloadPdf = CreateProcessable<DownloadPdf, PdfDownloadForm>(logMe);
+
+			//Chain pdf download on DownloadDecryptBook.Completed
+			async void onDownloadDecryptBookCompleted(object sender, LibraryBook e)
+			{
+				await downloadPdf.TryProcessAsync(e);
+				completedAction(sender, e);
+			}
+
+			var downloadDecryptBook = CreateProcessable<DownloadDecryptBook, AudioDecryptForm>(logMe, onDownloadDecryptBookCompleted);
+			return downloadDecryptBook;
+		}
+
+		public static void DownloadFile(string url, string destination, bool showDownloadCompletedDialog = false)
+		{
+			Serilog.Log.Logger.Information($"Begin {nameof(DownloadFile)} for {url}");
+
+			void onDownloadFileStreamingCompleted(object sender, string savedFile)
+			{
+				Serilog.Log.Logger.Information($"Completed {nameof(DownloadFile)} for {url}. Saved to {savedFile}");
+
+				if (showDownloadCompletedDialog)
+					MessageBox.Show($"File downloaded to:{Environment.NewLine}{Environment.NewLine}{savedFile}");
+			}
+
+			var downloadFile = new DownloadFile();
+			var downloadForm = new DownloadForm();
+			downloadForm.RegisterFileLiberator(downloadFile);
+			downloadFile.StreamingCompleted += onDownloadFileStreamingCompleted;
+
+			async void runDownload() => await downloadFile.PerformDownloadFileAsync(url, destination);
+			new Task(runDownload).Start();
+		}
+
+		/// <summary>
+		/// Create a new <see cref="IProcessable"/> and links it to a new <see cref="LiberationBaseForm"/>.
+		/// </summary>
+		/// <typeparam name="TProcessable">The <see cref="IProcessable"/> derived type to create.</typeparam>
+		/// <typeparam name="TForm">The <see cref="LiberationBaseForm"/> derived Form to create on <see cref="IProcessable.Begin"/>, Show on <see cref="IStreamable.StreamingBegin"/>, Close on <see cref="IStreamable.StreamingCompleted"/>, and Dispose on <see cref="IProcessable.Completed"/> </typeparam>
+		/// <param name="logMe">The logger</param>
+		/// <param name="completedAction">An additional event handler to handle <see cref="IProcessable.Completed"/></param>
+		/// <returns>A new <see cref="IProcessable"/> of type <typeparamref name="TProcessable"/></returns>
+		private static TProcessable CreateProcessable<TProcessable, TForm>(LogMe logMe, EventHandler<LibraryBook> completedAction = null)
+			where TForm : LiberationBaseForm, new()
+			where TProcessable : IProcessable, new()
+		{
+			var strProc = new TProcessable();
+
+			strProc.Begin += (sender, libraryBook) =>
+			{
+				var processForm = new TForm();
+				processForm.RegisterFileLiberator(strProc, logMe);
+				processForm.OnBegin(sender, libraryBook);
+			};
+
+			strProc.Completed += completedAction;
+
+			return strProc;
+		}
+	}
+
+	internal abstract class BackupRunner
+	{
+		protected LogMe LogMe { get; }
+		protected IProcessable Processable { get; }
+		protected AutomatedBackupsForm AutomatedBackupsForm { get; }
+
+		protected BackupRunner(LogMe logMe, IProcessable processable, AutomatedBackupsForm automatedBackupsForm = null)
+		{
+			LogMe = logMe;
+			Processable = processable;
+			AutomatedBackupsForm = automatedBackupsForm;
+		}
+
+		protected abstract Task RunAsync();
+		protected abstract string SkipDialogText { get; }
+		protected abstract MessageBoxButtons SkipDialogButtons { get; }
+		protected abstract MessageBoxDefaultButton SkipDialogDefaultButton { get; }
+		protected abstract DialogResult SkipResult { get; }
+
+		public async Task RunBackupAsync()
+		{
+			AutomatedBackupsForm?.Show();
+
+			try
+			{
+				await RunAsync();
+			}
+			catch (Exception ex)
+			{
+				LogMe.Error(ex);
+			}
+
+			AutomatedBackupsForm?.FinalizeUI();
+			LogMe.Info("DONE");
+		}
+
+		protected async Task<bool> ProcessOneAsync(LibraryBook libraryBook, bool validate)
+		{
+			string logMessage;
+
+			try
+			{
+				var statusHandler = await Processable.ProcessSingleAsync(libraryBook, validate);
+
+				if (statusHandler.IsSuccess)
+					return true;
+
+				foreach (var errorMessage in statusHandler.Errors)
+					LogMe.Error(errorMessage);
+
+				logMessage = statusHandler.Errors.Aggregate((a, b) => $"{a}\r\n{b}");
+			}
+			catch (Exception ex)
+			{
+				LogMe.Error(ex);
+
+				logMessage = ex.Message + "\r\n|\r\n" + ex.StackTrace;
+			}
+
+			LogMe.Error("ERROR. All books have not been processed. Most recent book: processing failed");
+
+			string details;
+			try
+			{
+				static string trunc(string str)
+					=> string.IsNullOrWhiteSpace(str) ? "[empty]"
+					: (str.Length > 50) ? $"{str.Truncate(47)}..."
+					: str;
+
+				details =
+$@"  Title: {libraryBook.Book.Title}
+  ID: {libraryBook.Book.AudibleProductId}
+  Author: {trunc(libraryBook.Book.AuthorNames)}
+  Narr: {trunc(libraryBook.Book.NarratorNames)}";
+			}
+			catch
+			{
+				details = "[Error retrieving details]";
+			}
+
+			var dialogResult = MessageBox.Show(string.Format(SkipDialogText, details), "Skip importing this book?", SkipDialogButtons, MessageBoxIcon.Question, SkipDialogDefaultButton);
+
+			if (dialogResult == DialogResult.Abort)
+				return false;
+
+			if (dialogResult == SkipResult)
+			{
+				ApplicationServices.LibraryCommands.UpdateBook(libraryBook, LiberatedStatus.Error);
+				LogMe.Info($"Error. Skip: [{libraryBook.Book.AudibleProductId}] {libraryBook.Book.Title}");
+			}
+
+			return true;
+		}
+	}
+
+	internal class BackupSingle : BackupRunner
+	{
+		private LibraryBook _libraryBook { get; }
+
+		protected override string SkipDialogText => @"
 An error occurred while trying to process this book. Skip this book permanently?
+{0}
 
 - Click YES to skip this book permanently.
 
 - Click NO to skip the book this time only. We'll try again later.
 ".Trim();
-        protected override MessageBoxButtons SkipDialogButtons => MessageBoxButtons.YesNo;
-        protected override DialogResult CreateSkipFileResult => DialogResult.Yes;
+		protected override MessageBoxButtons SkipDialogButtons => MessageBoxButtons.YesNo;
+		protected override MessageBoxDefaultButton SkipDialogDefaultButton => MessageBoxDefaultButton.Button2;
+		protected override DialogResult SkipResult => DialogResult.Yes;
 
-        public BackupSingle(LogMe logMe, IProcessable processable, LibraryBook libraryBook)
-            : base(logMe, processable)
-        {
-            _libraryBook = libraryBook;
-        }
+		public BackupSingle(LogMe logMe, IProcessable processable, LibraryBook libraryBook)
+			: base(logMe, processable)
+		{
+			_libraryBook = libraryBook;
+		}
 
-        protected override async Task RunAsync()
-        {
-            if (_libraryBook is not null)
-                await ProcessOneAsync(Processable.ProcessSingleAsync, _libraryBook);
-        }
-    }
-    class BackupLoop : BackupRunner
-    {
-        protected override string SkipDialogText => @"
-An error occurred while trying to process this book
+		protected override async Task RunAsync()
+		{
+			if (_libraryBook is not null)
+				await ProcessOneAsync(_libraryBook, validate: true);
+		}
+	}
+
+	internal class BackupLoop : BackupRunner
+	{
+		protected override string SkipDialogText => @"
+An error occurred while trying to process this book.
+{0}
 
 - ABORT: stop processing books.
 
@@ -495,33 +295,34 @@ An error occurred while trying to process this book
 
 - IGNORE: Permanently ignore this book. Continue processing books. (Will not try this book again later.)
 ".Trim();
-        protected override MessageBoxButtons SkipDialogButtons => MessageBoxButtons.AbortRetryIgnore;
-        protected override DialogResult CreateSkipFileResult => DialogResult.Ignore;
+		protected override MessageBoxButtons SkipDialogButtons => MessageBoxButtons.AbortRetryIgnore;
+		protected override MessageBoxDefaultButton SkipDialogDefaultButton => MessageBoxDefaultButton.Button1;
+		protected override DialogResult SkipResult => DialogResult.Ignore;
 
-        public BackupLoop(LogMe logMe, IProcessable processable, AutomatedBackupsForm automatedBackupsForm)
-            : base(logMe, processable, automatedBackupsForm) { }
+		public BackupLoop(LogMe logMe, IProcessable processable, AutomatedBackupsForm automatedBackupsForm)
+			: base(logMe, processable, automatedBackupsForm) { }
 
-        protected override async Task RunAsync()
-        {
-            // support for 'skip this time only' requires state. iterators provide this state for free. therefore: use foreach/iterator here
-            foreach (var libraryBook in Processable.GetValidLibraryBooks())
-            {
-                var keepGoing = await ProcessOneAsync(Processable.ProcessBookAsync_NoValidation, libraryBook);
-                if (!keepGoing)
-                    return;
+		protected override async Task RunAsync()
+		{
+			// support for 'skip this time only' requires state. iterators provide this state for free. therefore: use foreach/iterator here
+			foreach (var libraryBook in Processable.GetValidLibraryBooks())
+			{
+				var keepGoing = await ProcessOneAsync(libraryBook, validate: false);
+				if (!keepGoing)
+					return;
 
-                if (AutomatedBackupsForm.IsDisposed)
-                    break;
+				if (AutomatedBackupsForm.IsDisposed)
+					break;
 
-                if (!AutomatedBackupsForm.KeepGoing)
-                {
-                    if (!AutomatedBackupsForm.KeepGoingChecked)
-                        LogMe.Info("'Keep going' is unchecked");
-                    return;
-                }
-            }
+				if (!AutomatedBackupsForm.KeepGoing)
+				{
+					if (!AutomatedBackupsForm.KeepGoingChecked)
+						LogMe.Info("'Keep going' is unchecked");
+					return;
+				}
+			}
 
-            LogMe.Info("Done. All books have been processed");
-        }
-    }
+			LogMe.Info("Done. All books have been processed");
+		}
+	}
 }

LibationWinForms/DataGridViewImageButtonCell.cs

@@ -0,0 +1,18 @@
+using System.Drawing;
+using System.Windows.Forms;
+
+namespace LibationWinForms
+{
+	public class DataGridViewImageButtonCell : DataGridViewButtonCell
+	{
+		protected void DrawButtonImage(Graphics graphics, Image image, Rectangle cellBounds)
+		{
+			var w = image.Width;
+			var h = image.Height;
+			var x = cellBounds.Left + (cellBounds.Width - w) / 2;
+			var y = cellBounds.Top + (cellBounds.Height - h) / 2;
+
+			graphics.DrawImage(image, new Rectangle(x, y, w, h));
+		}
+	}
+}

LibationWinForms/Dialogs/AccountsDialog.cs

@@ -1,21 +1,21 @@
-using System;
+using AudibleApi;
+using InternalUtilities;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Windows.Forms;
-using AudibleApi;
-using InternalUtilities;
 
 namespace LibationWinForms.Dialogs
 {
 	public partial class AccountsDialog : Form
 	{
-		const string COL_Delete = nameof(DeleteAccount);
-		const string COL_LibraryScan = nameof(LibraryScan);
-		const string COL_AccountId = nameof(AccountId);
-		const string COL_AccountName = nameof(AccountName);
-		const string COL_Locale = nameof(Locale);
+		private const string COL_Delete = nameof(DeleteAccount);
+		private const string COL_LibraryScan = nameof(LibraryScan);
+		private const string COL_AccountId = nameof(AccountId);
+		private const string COL_AccountName = nameof(AccountName);
+		private const string COL_Locale = nameof(Locale);
 
-		Form1 _parent { get; }
+		private Form1 _parent { get; }
 
 		public AccountsDialog(Form1 parent)
 		{
@@ -100,7 +100,7 @@ namespace LibationWinForms.Dialogs
 			this.Close();
 		}
 
-		class AccountDto
+		private class AccountDto
 		{
 			public string AccountId { get; set; }
 			public string AccountName { get; set; }

LibationWinForms/Dialogs/AccountsDialog.resx

@@ -1,64 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
   <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
     <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
     <xsd:element name="root" msdata:IsDataSet="true">

LibationWinForms/Dialogs/BookDetailsDialog.Designer.cs

@@ -0,0 +1,237 @@
+namespace LibationWinForms.Dialogs
+{
+    partial class BookDetailsDialog
+    {
+        /// <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.saveBtn = new System.Windows.Forms.Button();
+			this.newTagsTb = new System.Windows.Forms.TextBox();
+			this.tagsDescLbl = new System.Windows.Forms.Label();
+			this.coverPb = new System.Windows.Forms.PictureBox();
+			this.detailsTb = new System.Windows.Forms.TextBox();
+			this.tagsGb = new System.Windows.Forms.GroupBox();
+			this.cancelBtn = new System.Windows.Forms.Button();
+			this.liberatedGb = new System.Windows.Forms.GroupBox();
+			this.pdfLiberatedCb = new System.Windows.Forms.ComboBox();
+			this.pdfLiberatedLbl = new System.Windows.Forms.Label();
+			this.bookLiberatedCb = new System.Windows.Forms.ComboBox();
+			this.bookLiberatedLbl = new System.Windows.Forms.Label();
+			this.liberatedDescLbl = new System.Windows.Forms.Label();
+			((System.ComponentModel.ISupportInitialize)(this.coverPb)).BeginInit();
+			this.tagsGb.SuspendLayout();
+			this.liberatedGb.SuspendLayout();
+			this.SuspendLayout();
+			// 
+			// 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(376, 427);
+			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 = 3;
+			this.saveBtn.Text = "Save";
+			this.saveBtn.UseVisualStyleBackColor = true;
+			this.saveBtn.Click += new System.EventHandler(this.saveBtn_Click);
+			// 
+			// newTagsTb
+			// 
+			this.newTagsTb.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+			this.newTagsTb.Location = new System.Drawing.Point(7, 40);
+			this.newTagsTb.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
+			this.newTagsTb.Name = "newTagsTb";
+			this.newTagsTb.ScrollBars = System.Windows.Forms.ScrollBars.Both;
+			this.newTagsTb.Size = new System.Drawing.Size(556, 23);
+			this.newTagsTb.TabIndex = 1;
+			// 
+			// tagsDescLbl
+			// 
+			this.tagsDescLbl.AutoSize = true;
+			this.tagsDescLbl.Location = new System.Drawing.Point(7, 19);
+			this.tagsDescLbl.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+			this.tagsDescLbl.Name = "tagsDescLbl";
+			this.tagsDescLbl.Size = new System.Drawing.Size(458, 15);
+			this.tagsDescLbl.TabIndex = 0;
+			this.tagsDescLbl.Text = "Tags are separated by a space. Each tag can contain letters, numbers, and undersc" +
+    "ores";
+			// 
+			// coverPb
+			// 
+			this.coverPb.Location = new System.Drawing.Point(12, 12);
+			this.coverPb.Name = "coverPb";
+			this.coverPb.Size = new System.Drawing.Size(80, 80);
+			this.coverPb.TabIndex = 3;
+			this.coverPb.TabStop = false;
+			// 
+			// detailsTb
+			// 
+			this.detailsTb.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.detailsTb.Location = new System.Drawing.Point(98, 12);
+			this.detailsTb.Multiline = true;
+			this.detailsTb.Name = "detailsTb";
+			this.detailsTb.ReadOnly = true;
+			this.detailsTb.ScrollBars = System.Windows.Forms.ScrollBars.Both;
+			this.detailsTb.Size = new System.Drawing.Size(484, 202);
+			this.detailsTb.TabIndex = 0;
+			// 
+			// tagsGb
+			// 
+			this.tagsGb.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+			this.tagsGb.Controls.Add(this.tagsDescLbl);
+			this.tagsGb.Controls.Add(this.newTagsTb);
+			this.tagsGb.Location = new System.Drawing.Point(12, 220);
+			this.tagsGb.Name = "tagsGb";
+			this.tagsGb.Size = new System.Drawing.Size(570, 73);
+			this.tagsGb.TabIndex = 1;
+			this.tagsGb.TabStop = false;
+			this.tagsGb.Text = "Edit Tags";
+			// 
+			// cancelBtn
+			// 
+			this.cancelBtn.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+			this.cancelBtn.Location = new System.Drawing.Point(494, 427);
+			this.cancelBtn.Name = "cancelBtn";
+			this.cancelBtn.Size = new System.Drawing.Size(88, 27);
+			this.cancelBtn.TabIndex = 4;
+			this.cancelBtn.Text = "Cancel";
+			this.cancelBtn.UseVisualStyleBackColor = true;
+			this.cancelBtn.Click += new System.EventHandler(this.cancelBtn_Click);
+			// 
+			// liberatedGb
+			// 
+			this.liberatedGb.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+			this.liberatedGb.Controls.Add(this.pdfLiberatedCb);
+			this.liberatedGb.Controls.Add(this.pdfLiberatedLbl);
+			this.liberatedGb.Controls.Add(this.bookLiberatedCb);
+			this.liberatedGb.Controls.Add(this.bookLiberatedLbl);
+			this.liberatedGb.Controls.Add(this.liberatedDescLbl);
+			this.liberatedGb.Location = new System.Drawing.Point(12, 299);
+			this.liberatedGb.Name = "liberatedGb";
+			this.liberatedGb.Size = new System.Drawing.Size(570, 122);
+			this.liberatedGb.TabIndex = 2;
+			this.liberatedGb.TabStop = false;
+			this.liberatedGb.Text = "Liberated status: Whether the book/pdf has been downloaded";
+			// 
+			// pdfLiberatedCb
+			// 
+			this.pdfLiberatedCb.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+			this.pdfLiberatedCb.FormattingEnabled = true;
+			this.pdfLiberatedCb.Location = new System.Drawing.Point(244, 86);
+			this.pdfLiberatedCb.Name = "pdfLiberatedCb";
+			this.pdfLiberatedCb.Size = new System.Drawing.Size(121, 23);
+			this.pdfLiberatedCb.TabIndex = 4;
+			// 
+			// pdfLiberatedLbl
+			// 
+			this.pdfLiberatedLbl.AutoSize = true;
+			this.pdfLiberatedLbl.Location = new System.Drawing.Point(210, 89);
+			this.pdfLiberatedLbl.Name = "pdfLiberatedLbl";
+			this.pdfLiberatedLbl.Size = new System.Drawing.Size(28, 15);
+			this.pdfLiberatedLbl.TabIndex = 3;
+			this.pdfLiberatedLbl.Text = "PDF";
+			// 
+			// bookLiberatedCb
+			// 
+			this.bookLiberatedCb.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+			this.bookLiberatedCb.FormattingEnabled = true;
+			this.bookLiberatedCb.Location = new System.Drawing.Point(47, 86);
+			this.bookLiberatedCb.Name = "bookLiberatedCb";
+			this.bookLiberatedCb.Size = new System.Drawing.Size(121, 23);
+			this.bookLiberatedCb.TabIndex = 2;
+			// 
+			// bookLiberatedLbl
+			// 
+			this.bookLiberatedLbl.AutoSize = true;
+			this.bookLiberatedLbl.Location = new System.Drawing.Point(7, 89);
+			this.bookLiberatedLbl.Name = "bookLiberatedLbl";
+			this.bookLiberatedLbl.Size = new System.Drawing.Size(34, 15);
+			this.bookLiberatedLbl.TabIndex = 1;
+			this.bookLiberatedLbl.Text = "Book";
+			// 
+			// liberatedDescLbl
+			// 
+			this.liberatedDescLbl.AutoSize = true;
+			this.liberatedDescLbl.Location = new System.Drawing.Point(20, 31);
+			this.liberatedDescLbl.Name = "liberatedDescLbl";
+			this.liberatedDescLbl.Size = new System.Drawing.Size(312, 30);
+			this.liberatedDescLbl.TabIndex = 0;
+			this.liberatedDescLbl.Text = "To download again next time: change to Not Downloaded\r\nTo not download: change to" +
+    " Downloaded";
+			// 
+			// BookDetailsDialog
+			// 
+			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(594, 466);
+			this.Controls.Add(this.liberatedGb);
+			this.Controls.Add(this.cancelBtn);
+			this.Controls.Add(this.tagsGb);
+			this.Controls.Add(this.detailsTb);
+			this.Controls.Add(this.coverPb);
+			this.Controls.Add(this.saveBtn);
+			this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
+			this.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
+			this.MaximizeBox = false;
+			this.MinimizeBox = false;
+			this.Name = "BookDetailsDialog";
+			this.ShowIcon = false;
+			this.ShowInTaskbar = false;
+			this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
+			this.Text = "Book Details";
+			((System.ComponentModel.ISupportInitialize)(this.coverPb)).EndInit();
+			this.tagsGb.ResumeLayout(false);
+			this.tagsGb.PerformLayout();
+			this.liberatedGb.ResumeLayout(false);
+			this.liberatedGb.PerformLayout();
+			this.ResumeLayout(false);
+			this.PerformLayout();
+
+        }
+
+        #endregion
+        private System.Windows.Forms.Button saveBtn;
+        private System.Windows.Forms.TextBox newTagsTb;
+        private System.Windows.Forms.Label tagsDescLbl;
+		private System.Windows.Forms.PictureBox coverPb;
+		private System.Windows.Forms.TextBox detailsTb;
+		private System.Windows.Forms.GroupBox tagsGb;
+		private System.Windows.Forms.Button cancelBtn;
+		private System.Windows.Forms.GroupBox liberatedGb;
+		private System.Windows.Forms.ComboBox pdfLiberatedCb;
+		private System.Windows.Forms.Label pdfLiberatedLbl;
+		private System.Windows.Forms.ComboBox bookLiberatedCb;
+		private System.Windows.Forms.Label bookLiberatedLbl;
+		private System.Windows.Forms.Label liberatedDescLbl;
+	}
+}

LibationWinForms/Dialogs/BookDetailsDialog.cs

@@ -0,0 +1,131 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Windows.Forms;
+using DataLayer;
+using Dinah.Core;
+
+namespace LibationWinForms.Dialogs
+{
+	public partial class BookDetailsDialog : Form
+	{
+		public class liberatedComboBoxItem
+		{
+			public LiberatedStatus Status { get; set; }
+			public string Text { get; set; }
+			public override string ToString() => Text;
+		}
+
+		public string NewTags { get; private set; }
+		public LiberatedStatus BookLiberatedStatus { get; private set; }
+		public LiberatedStatus? PdfLiberatedStatus { get; private set; }
+
+		private LibraryBook _libraryBook { get; }
+		private Book Book => _libraryBook.Book;
+
+		public BookDetailsDialog()
+		{
+			InitializeComponent();
+		}
+		public BookDetailsDialog(LibraryBook libraryBook) : this()
+		{
+			_libraryBook = ArgumentValidator.EnsureNotNull(libraryBook, nameof(libraryBook));
+			initDetails();
+			initTags();
+			initLiberated();
+		}
+		// 1st draft: lazily cribbed from GridEntry.ctor()
+		private void initDetails()
+		{
+			this.Text = Book.Title;
+
+			(var isDefault, var picture) = FileManager.PictureStorage.GetPicture(new FileManager.PictureDefinition(Book.PictureId, FileManager.PictureSize._80x80));
+			this.coverPb.Image = Dinah.Core.Drawing.ImageReader.ToImage(picture);
+
+			var t = @$"
+Title: {Book.Title}
+Author(s): {Book.AuthorNames}
+Narrator(s): {Book.NarratorNames}
+Length: {(Book.LengthInMinutes == 0 ? "" : $"{Book.LengthInMinutes / 60} hr {Book.LengthInMinutes % 60} min")}
+Category: {string.Join(" > ", Book.CategoriesNames)}
+Purchase Date: {_libraryBook.DateAdded.ToString("d")}
+".Trim();
+
+			if (!string.IsNullOrWhiteSpace(Book.SeriesNames))
+				t += $"\r\nSeries: {Book.SeriesNames}";
+
+			var bookRating = Book.Rating?.ToStarString();
+			if (!string.IsNullOrWhiteSpace(bookRating))
+				t += $"\r\nBook Rating:\r\n{bookRating}";
+
+			var myRating = Book.UserDefinedItem.Rating?.ToStarString();
+			if (!string.IsNullOrWhiteSpace(myRating))
+				t += $"\r\nMy Rating:\r\n{myRating}";
+
+			this.detailsTb.Text = t;
+		}
+		private void initTags() => this.newTagsTb.Text = Book.UserDefinedItem.Tags;
+		private void initLiberated()
+		{
+			{
+				var status = Book.UserDefinedItem.BookStatus;
+
+				this.bookLiberatedCb.Items.Add(new liberatedComboBoxItem { Status = LiberatedStatus.Liberated, Text = "Downloaded" });
+				this.bookLiberatedCb.Items.Add(new liberatedComboBoxItem { Status = LiberatedStatus.NotLiberated, Text = "Not Downloaded" });
+
+				// this should only appear if is already an error. User should not be able to set status to error, only away from error
+				if (status == LiberatedStatus.Error)
+					this.bookLiberatedCb.Items.Add(new liberatedComboBoxItem { Status = LiberatedStatus.Error, Text = "Error" });
+
+
+				setDefaultComboBox(this.bookLiberatedCb, status);
+			}
+
+			{
+				var status = Book.UserDefinedItem.PdfStatus;
+
+				if (status is null)
+					this.pdfLiberatedCb.Enabled = false;
+				else
+				{
+					this.pdfLiberatedCb.Items.Add(new liberatedComboBoxItem { Status = LiberatedStatus.Liberated, Text = "Downloaded" });
+					this.pdfLiberatedCb.Items.Add(new liberatedComboBoxItem { Status = LiberatedStatus.NotLiberated, Text = "Not Downloaded" });
+
+					setDefaultComboBox(this.pdfLiberatedCb, status);
+				}
+			}
+		}
+		private static void setDefaultComboBox(ComboBox comboBox, LiberatedStatus? status)
+		{
+			if (!status.HasValue)
+			{
+				comboBox.SelectedIndex = 0;
+				return;
+			}
+
+			var item = comboBox.Items.Cast<liberatedComboBoxItem>().SingleOrDefault(item => item.Status == status.Value);
+			if (item is not null)
+				comboBox.SelectedItem = item;
+			else
+				comboBox.SelectedIndex = 0;
+		}
+
+		private void saveBtn_Click(object sender, EventArgs e)
+		{
+			NewTags = this.newTagsTb.Text;
+
+			BookLiberatedStatus = ((liberatedComboBoxItem)this.bookLiberatedCb.SelectedItem).Status;
+
+			if (this.pdfLiberatedCb.Enabled)
+				PdfLiberatedStatus = ((liberatedComboBoxItem)this.pdfLiberatedCb.SelectedItem).Status;
+
+			this.DialogResult = DialogResult.OK;
+		}
+
+		private void cancelBtn_Click(object sender, EventArgs e)
+		{
+			this.DialogResult = DialogResult.Cancel;
+			this.Close();
+		}
+	}
+}

LibationWinForms/Dialogs/DirectoryOrCustomSelectControl.Designer.cs

@@ -49,7 +49,7 @@ namespace LibationWinForms.Dialogs
 			// customDirectoryRb
 			// 
 			this.customDirectoryRb.AutoSize = true;
-			this.customDirectoryRb.Location = new System.Drawing.Point(2, 56);
+			this.customDirectoryRb.Location = new System.Drawing.Point(2, 62);
 			this.customDirectoryRb.Name = "customDirectoryRb";
 			this.customDirectoryRb.Size = new System.Drawing.Size(14, 13);
 			this.customDirectoryRb.TabIndex = 2;
@@ -60,7 +60,7 @@ namespace LibationWinForms.Dialogs
 			// 
 			this.customTb.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
-			this.customTb.Location = new System.Drawing.Point(22, 52);
+			this.customTb.Location = new System.Drawing.Point(22, 58);
 			this.customTb.Name = "customTb";
 			this.customTb.Size = new System.Drawing.Size(588, 23);
 			this.customTb.TabIndex = 3;
@@ -68,7 +68,7 @@ namespace LibationWinForms.Dialogs
 			// customBtn
 			// 
 			this.customBtn.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-			this.customBtn.Location = new System.Drawing.Point(616, 52);
+			this.customBtn.Location = new System.Drawing.Point(616, 58);
 			this.customBtn.Name = "customBtn";
 			this.customBtn.Size = new System.Drawing.Size(41, 27);
 			this.customBtn.TabIndex = 4;
@@ -82,7 +82,7 @@ namespace LibationWinForms.Dialogs
             | System.Windows.Forms.AnchorStyles.Right)));
 			this.directorySelectControl.Location = new System.Drawing.Point(23, 0);
 			this.directorySelectControl.Name = "directorySelectControl";
-			this.directorySelectControl.Size = new System.Drawing.Size(635, 46);
+			this.directorySelectControl.Size = new System.Drawing.Size(635, 52);
 			this.directorySelectControl.TabIndex = 5;
 			// 
 			// DirectoryOrCustomSelectControl
@@ -95,7 +95,7 @@ namespace LibationWinForms.Dialogs
 			this.Controls.Add(this.customDirectoryRb);
 			this.Controls.Add(this.knownDirectoryRb);
 			this.Name = "DirectoryOrCustomSelectControl";
-			this.Size = new System.Drawing.Size(660, 81);
+			this.Size = new System.Drawing.Size(660, 87);
 			this.Load += new System.EventHandler(this.DirectoryOrCustomSelectControl_Load);
 			this.ResumeLayout(false);
 			this.PerformLayout();

LibationWinForms/Dialogs/DirectoryOrCustomSelectControl.cs

@@ -1,9 +1,8 @@
-using System;
-using System.Collections.Generic;
+using FileManager;
+using System;
 using System.Linq;
+using System.Collections.Generic;
 using System.Windows.Forms;
-using Dinah.Core;
-using FileManager;
 
 namespace LibationWinForms.Dialogs
 {
@@ -58,7 +57,7 @@ namespace LibationWinForms.Dialogs
 				= knownDir != Configuration.KnownDirectories.None
 				// this could be a well known dir which isn't an option in this particular dropdown. This will always be true of LibationFiles
 				&& this.directorySelectControl.SelectDirectory(knownDir);
-			
+
 			customDirectoryRb.Checked = !isKnown;
 			knownDirectoryRb.Checked = isKnown;
 			this.customTb.Text = isKnown ? "" : customDir;

LibationWinForms/Dialogs/DirectoryOrCustomSelectControl.resx

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

LibationWinForms/Dialogs/DirectorySelectControl.Designer.cs

@@ -30,7 +30,7 @@ namespace LibationWinForms.Dialogs
 		private void InitializeComponent()
 		{
 			this.directoryComboBox = new System.Windows.Forms.ComboBox();
-			this.label1 = new System.Windows.Forms.Label();
+			this.textBox1 = new System.Windows.Forms.TextBox();
 			this.SuspendLayout();
 			// 
 			// directoryComboBox
@@ -45,23 +45,24 @@ namespace LibationWinForms.Dialogs
 			this.directoryComboBox.TabIndex = 0;
 			this.directoryComboBox.SelectedIndexChanged += new System.EventHandler(this.directoryComboBox_SelectedIndexChanged);
 			// 
-			// label1
+			// textBox1
 			// 
-			this.label1.AutoSize = true;
-			this.label1.Location = new System.Drawing.Point(0, 26);
-			this.label1.Name = "label1";
-			this.label1.Size = new System.Drawing.Size(97, 15);
-			this.label1.TabIndex = 1;
-			this.label1.Text = "Select a directory";
+			this.textBox1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+			this.textBox1.Location = new System.Drawing.Point(0, 29);
+			this.textBox1.Name = "textBox1";
+			this.textBox1.ReadOnly = true;
+			this.textBox1.Size = new System.Drawing.Size(647, 23);
+			this.textBox1.TabIndex = 1;
 			// 
 			// DirectorySelectControl
 			// 
 			this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
 			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-			this.Controls.Add(this.label1);
+			this.Controls.Add(this.textBox1);
 			this.Controls.Add(this.directoryComboBox);
 			this.Name = "DirectorySelectControl";
-			this.Size = new System.Drawing.Size(647, 46);
+			this.Size = new System.Drawing.Size(647, 52);
 			this.Load += new System.EventHandler(this.DirectorySelectControl_Load);
 			this.ResumeLayout(false);
 			this.PerformLayout();
@@ -71,6 +72,6 @@ namespace LibationWinForms.Dialogs
 		#endregion
 
 		private System.Windows.Forms.ComboBox directoryComboBox;
-		private System.Windows.Forms.Label label1;
+		private System.Windows.Forms.TextBox textBox1;
 	}
 }

LibationWinForms/Dialogs/DirectorySelectControl.cs

@@ -1,9 +1,9 @@
-using System;
+using Dinah.Core;
+using FileManager;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Windows.Forms;
-using Dinah.Core;
-using FileManager;
 
 namespace LibationWinForms.Dialogs
 {
@@ -13,7 +13,7 @@ namespace LibationWinForms.Dialogs
 		{
 			public string Description { get; }
 			public Configuration.KnownDirectories Value { get; }
-			private DirectorySelectControl _parentControl;
+			private readonly DirectorySelectControl _parentControl;
 
 			public string FullPath => _parentControl.AddSubDirectoryToPath(Configuration.GetKnownDirectoryPath(Value));
 
@@ -107,6 +107,6 @@ namespace LibationWinForms.Dialogs
 
 		}
 
-		private void directoryComboBox_SelectedIndexChanged(object sender, EventArgs e) => this.label1.Text = selectedItem.UiDisplayPath;
+		private void directoryComboBox_SelectedIndexChanged(object sender, EventArgs e) => this.textBox1.Text = selectedItem.UiDisplayPath;
 	}
 }

LibationWinForms/Dialogs/DirectorySelectControl.resx

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

LibationWinForms/Dialogs/EditQuickFilters.cs

@@ -1,101 +1,100 @@
-using System;
+using FileManager;
+using System;
 using System.Linq;
 using System.Windows.Forms;
-using FileManager;
 
 namespace LibationWinForms.Dialogs
 {
 	public partial class EditQuickFilters : Form
-    {
-        const string BLACK_UP_POINTING_TRIANGLE = "\u25B2";
-        const string BLACK_DOWN_POINTING_TRIANGLE = "\u25BC";
+	{
+		private const string BLACK_UP_POINTING_TRIANGLE = "\u25B2";
+		private const string BLACK_DOWN_POINTING_TRIANGLE = "\u25BC";
+		private const string COL_Original = nameof(Original);
+		private const string COL_Delete = nameof(Delete);
+		private const string COL_Filter = nameof(Filter);
+		private const string COL_MoveUp = nameof(MoveUp);
+		private const string COL_MoveDown = nameof(MoveDown);
 
-        const string COL_Original = nameof(Original);
-        const string COL_Delete = nameof(Delete);
-        const string COL_Filter = nameof(Filter);
-        const string COL_MoveUp = nameof(MoveUp);
-        const string COL_MoveDown = nameof(MoveDown);
+		private Form1 _parent { get; }
 
-        Form1 _parent { get; }
+		public EditQuickFilters(Form1 parent)
+		{
+			_parent = parent;
 
-        public EditQuickFilters(Form1 parent)
-        {
-            _parent = parent;
+			InitializeComponent();
 
-            InitializeComponent();
+			dataGridView1.Columns[COL_Filter].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill;
 
-            dataGridView1.Columns[COL_Filter].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill;
+			populateGridValues();
+		}
 
-            populateGridValues();
-        }
+		private void populateGridValues()
+		{
+			var filters = QuickFilters.Filters;
+			if (!filters.Any())
+				return;
 
-        private void populateGridValues()
-        {
-            var filters = QuickFilters.Filters;
-            if (!filters.Any())
-                return;
+			foreach (var filter in filters)
+				dataGridView1.Rows.Add(filter, "X", filter, BLACK_UP_POINTING_TRIANGLE, BLACK_DOWN_POINTING_TRIANGLE);
+		}
 
-            foreach (var filter in filters)
-                dataGridView1.Rows.Add(filter, "X", filter, BLACK_UP_POINTING_TRIANGLE, BLACK_DOWN_POINTING_TRIANGLE);
-        }
+		private void dataGridView1_DefaultValuesNeeded(object sender, DataGridViewRowEventArgs e)
+		{
+			e.Row.Cells[COL_Delete].Value = "X";
+			e.Row.Cells[COL_MoveUp].Value = BLACK_UP_POINTING_TRIANGLE;
+			e.Row.Cells[COL_MoveDown].Value = BLACK_DOWN_POINTING_TRIANGLE;
+		}
 
-        private void dataGridView1_DefaultValuesNeeded(object sender, DataGridViewRowEventArgs e)
-        {
-            e.Row.Cells[COL_Delete].Value = "X";
-            e.Row.Cells[COL_MoveUp].Value = BLACK_UP_POINTING_TRIANGLE;
-            e.Row.Cells[COL_MoveDown].Value = BLACK_DOWN_POINTING_TRIANGLE;
-        }
+		private void saveBtn_Click(object sender, EventArgs e)
+		{
+			var list = dataGridView1.Rows
+				.OfType<DataGridViewRow>()
+				.Select(r => r.Cells[COL_Filter].Value?.ToString())
+				.ToList();
+			QuickFilters.ReplaceAll(list);
 
-        private void saveBtn_Click(object sender, EventArgs e)
-        {
-            var list = dataGridView1.Rows
-                .OfType<DataGridViewRow>()
-                .Select(r => r.Cells[COL_Filter].Value?.ToString())
-                .ToList();
-            QuickFilters.ReplaceAll(list);
+			_parent.UpdateFilterDropDown();
+			this.DialogResult = DialogResult.OK;
+			this.Close();
+		}
 
-            _parent.UpdateFilterDropDown();
-            this.DialogResult = DialogResult.OK;
-            this.Close();
-        }
+		private void cancelBtn_Click(object sender, EventArgs e)
+		{
+			this.DialogResult = DialogResult.Cancel;
+			this.Close();
+		}
 
-        private void cancelBtn_Click(object sender, EventArgs e)
-        {
-            this.DialogResult = DialogResult.Cancel;
-            this.Close();
-        }
+		private void DataGridView1_CellContentClick(object sender, DataGridViewCellEventArgs e)
+		{
+			var dgv = (DataGridView)sender;
 
-        private void DataGridView1_CellContentClick(object sender, DataGridViewCellEventArgs e)
-        {
-            var dgv = (DataGridView)sender;
-
-            var col = dgv.Columns[e.ColumnIndex];
-            if (col is DataGridViewButtonColumn && e.RowIndex >= 0)
-            {
-                var row = dgv.Rows[e.RowIndex];
-                switch (col.Name)
-                {
-                    case COL_Delete:
-                        // if final/edit row: do nothing
-                        if (e.RowIndex < dgv.RowCount - 1)
-                            dgv.Rows.Remove(row);
-                        break;
-                    case COL_MoveUp:
-                        // if top: do nothing
-                        if (e.RowIndex < 1)
-                            break;
-                        dgv.Rows.Remove(row);
-                        dgv.Rows.Insert(e.RowIndex - 1, row);
-                        break;
-                    case COL_MoveDown:
-                        // if final/edit row or bottom filter row: do nothing
-                        if (e.RowIndex >= dgv.RowCount - 2)
-                            break;
-                        dgv.Rows.Remove(row);
-                        dgv.Rows.Insert(e.RowIndex + 1, row);
-                        break;
-                }
-            }
-        }
-    }
+			var col = dgv.Columns[e.ColumnIndex];
+			if (col is DataGridViewButtonColumn && e.RowIndex >= 0)
+			{
+				var row = dgv.Rows[e.RowIndex];
+				switch (col.Name)
+				{
+					case COL_Delete:
+						// if final/edit row: do nothing
+						if (e.RowIndex < dgv.RowCount - 1)
+							dgv.Rows.Remove(row);
+						break;
+					case COL_MoveUp:
+						// if top: do nothing
+						if (e.RowIndex < 1)
+							break;
+						dgv.Rows.Remove(row);
+						dgv.Rows.Insert(e.RowIndex - 1, row);
+						break;
+					case COL_MoveDown:
+						// if final/edit row or bottom filter row: do nothing
+						if (e.RowIndex >= dgv.RowCount - 2)
+							break;
+						dgv.Rows.Remove(row);
+						dgv.Rows.Insert(e.RowIndex + 1, row);
+						break;
+				}
+			}
+		}
+	}
 }

LibationWinForms/Dialogs/EditQuickFilters.resx

@@ -1,64 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
   <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
     <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
     <xsd:element name="root" msdata:IsDataSet="true">

LibationWinForms/Dialogs/EditTagsDialog.Designer.cs

@@ -1,91 +0,0 @@
-namespace LibationWinForms.Dialogs
-{
-    partial class EditTagsDialog
-    {
-        /// <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.SaveBtn = new System.Windows.Forms.Button();
-            this.newTagsTb = new System.Windows.Forms.TextBox();
-            this.label1 = new System.Windows.Forms.Label();
-            this.SuspendLayout();
-            // 
-            // SaveBtn
-            // 
-            this.SaveBtn.Location = new System.Drawing.Point(396, 25);
-            this.SaveBtn.Name = "SaveBtn";
-            this.SaveBtn.Size = new System.Drawing.Size(75, 23);
-            this.SaveBtn.TabIndex = 1;
-            this.SaveBtn.Text = "Save";
-            this.SaveBtn.UseVisualStyleBackColor = true;
-            this.SaveBtn.Click += new System.EventHandler(this.SaveBtn_Click);
-            // 
-            // newTagsTb
-            // 
-            this.newTagsTb.Location = new System.Drawing.Point(12, 27);
-            this.newTagsTb.Name = "newTagsTb";
-            this.newTagsTb.ScrollBars = System.Windows.Forms.ScrollBars.Both;
-            this.newTagsTb.Size = new System.Drawing.Size(375, 20);
-            this.newTagsTb.TabIndex = 0;
-            // 
-            // label1
-            // 
-            this.label1.AutoSize = true;
-            this.label1.Location = new System.Drawing.Point(12, 9);
-            this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(424, 13);
-            this.label1.TabIndex = 2;
-            this.label1.Text = "Tags are separated by a space. Each tag can contain letters, numbers, and undersc" +
-    "ores";
-            // 
-            // EditTagsDialog
-            // 
-            this.AcceptButton = this.SaveBtn;
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(483, 60);
-            this.Controls.Add(this.label1);
-            this.Controls.Add(this.newTagsTb);
-            this.Controls.Add(this.SaveBtn);
-            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
-            this.MaximizeBox = false;
-            this.MinimizeBox = false;
-            this.Name = "EditTagsDialog";
-            this.ShowIcon = false;
-            this.ShowInTaskbar = false;
-            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
-            this.Text = "Edit Tags";
-            this.ResumeLayout(false);
-            this.PerformLayout();
-
-        }
-
-        #endregion
-        private System.Windows.Forms.Button SaveBtn;
-        private System.Windows.Forms.TextBox newTagsTb;
-        private System.Windows.Forms.Label label1;
-    }
-}

LibationWinForms/Dialogs/EditTagsDialog.cs

@@ -1,27 +0,0 @@
-using System;
-using System.Windows.Forms;
-
-namespace LibationWinForms.Dialogs
-{
-    public partial class EditTagsDialog : Form
-    {
-        public string NewTags { get; private set; }
-
-        public EditTagsDialog()
-        {
-            InitializeComponent();
-        }
-        public EditTagsDialog(string title, string rawTags) : this()
-        {
-            this.Text = $"Edit Tags - {title}";
-
-            this.newTagsTb.Text = rawTags;
-        }
-
-        private void SaveBtn_Click(object sender, EventArgs e)
-        {
-            NewTags = this.newTagsTb.Text;
-            DialogResult = DialogResult.OK;
-        }
-    }
-}

LibationWinForms/Dialogs/EditTagsDialog.resx

@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-</root>

LibationWinForms/Dialogs/IndexLibraryDialog.cs

@@ -1,8 +1,9 @@
-using System;
-using System.Windows.Forms;
-using ApplicationServices;
+using ApplicationServices;
 using InternalUtilities;
 using LibationWinForms.Login;
+using System;
+using System.Linq;
+using System.Windows.Forms;
 
 namespace LibationWinForms.Dialogs
 {

LibationWinForms/Dialogs/IndexLibraryDialog.resx

@@ -1,64 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
   <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
     <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
     <xsd:element name="root" msdata:IsDataSet="true">

LibationWinForms/Dialogs/LibationFilesDialog.Designer.cs

@@ -75,14 +75,14 @@
             | System.Windows.Forms.AnchorStyles.Right)));
 			this.libationFilesSelectControl.Location = new System.Drawing.Point(14, 28);
 			this.libationFilesSelectControl.Name = "libationFilesSelectControl";
-			this.libationFilesSelectControl.Size = new System.Drawing.Size(909, 81);
+			this.libationFilesSelectControl.Size = new System.Drawing.Size(909, 87);
 			this.libationFilesSelectControl.TabIndex = 1;
 			// 
 			// LibationFilesDialog
 			// 
 			this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
 			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-			this.ClientSize = new System.Drawing.Size(933, 158);
+			this.ClientSize = new System.Drawing.Size(933, 164);
 			this.Controls.Add(this.libationFilesSelectControl);
 			this.Controls.Add(this.cancelBtn);
 			this.Controls.Add(this.saveBtn);

LibationWinForms/Dialogs/LibationFilesDialog.cs

@@ -1,6 +1,7 @@
-using System;
+using FileManager;
+using System;
+using System.Linq;
 using System.Windows.Forms;
-using FileManager;
 
 namespace LibationWinForms.Dialogs
 {

LibationWinForms/Dialogs/LibationFilesDialog.resx

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

LibationWinForms/Dialogs/Login/ApprovalNeededDialog.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Linq;
 using System.Windows.Forms;
 
 namespace LibationWinForms.Dialogs.Login
@@ -12,6 +13,8 @@ namespace LibationWinForms.Dialogs.Login
 
 		private void approvedBtn_Click(object sender, EventArgs e)
 		{
+			Serilog.Log.Logger.Information("Submit button clicked");
+
 			DialogResult = DialogResult.OK;
 		}
 	}

LibationWinForms/Dialogs/Login/ApprovalNeededDialog.resx

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

LibationWinForms/Dialogs/Login/AudibleLoginDialog.cs

@@ -1,6 +1,8 @@
-using System;
-using System.Windows.Forms;
+using Dinah.Core;
 using InternalUtilities;
+using System;
+using System.Linq;
+using System.Windows.Forms;
 
 namespace LibationWinForms.Dialogs.Login
 {
@@ -29,6 +31,8 @@ namespace LibationWinForms.Dialogs.Login
 			Email = accountId;
 			Password = this.passwordTb.Text;
 
+			Serilog.Log.Logger.Information("Submit button clicked: {@DebugInfo}", new { email = Email?.ToMask(), passwordLength = Password.Length });
+
 			DialogResult = DialogResult.OK;
 			// Close() not needed for AcceptButton
 		}

LibationWinForms/Dialogs/Login/AudibleLoginDialog.resx

@@ -1,64 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
   <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
     <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
     <xsd:element name="root" msdata:IsDataSet="true">

LibationWinForms/Dialogs/Login/CaptchaDialog.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Linq;
 using System.Drawing;
 using System.IO;
 using System.Windows.Forms;
@@ -26,6 +27,8 @@ namespace LibationWinForms.Dialogs.Login
 		{
 			Answer = this.answerTb.Text;
 
+			Serilog.Log.Logger.Information("Submit button clicked: {@DebugInfo}", new { Answer });
+
 			DialogResult = DialogResult.OK;
 			// Close() not needed for AcceptButton
 		}

LibationWinForms/Dialogs/Login/CaptchaDialog.resx

@@ -1,64 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
   <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
     <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
     <xsd:element name="root" msdata:IsDataSet="true">

LibationWinForms/Dialogs/Login/MfaDialog.cs

@@ -1,11 +1,5 @@
 using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Windows.Forms;
 
 namespace LibationWinForms.Dialogs.Login
@@ -14,49 +8,79 @@ namespace LibationWinForms.Dialogs.Login
 	{
 		private RadioButton[] radioButtons { get; }
 
+		private AudibleApi.MfaConfig _mfaConfig { get; }
+
 		public MfaDialog(AudibleApi.MfaConfig mfaConfig)
 		{
 			InitializeComponent();
 
+			_mfaConfig = mfaConfig;
+
 			radioButtons = new[] { this.radioButton1, this.radioButton2, this.radioButton3 };
 
 			// optional string settings
 			if (!string.IsNullOrWhiteSpace(mfaConfig.Title))
 				this.Text = mfaConfig.Title;
-			setOptional(this.radioButton1, mfaConfig.Button1Text);
-			setOptional(this.radioButton2, mfaConfig.Button2Text);
-			setOptional(this.radioButton3, mfaConfig.Button3Text);
 
-			// mandatory values
-			radioButton1.Name = mfaConfig.Button1Name;
-			radioButton1.Tag = mfaConfig.Button1Value;
+			setRadioButton(0, this.radioButton1);
+			setRadioButton(1, this.radioButton2);
+			setRadioButton(2, this.radioButton3);
 
-			radioButton2.Name = mfaConfig.Button2Name;
-			radioButton2.Tag = mfaConfig.Button2Value;
-
-			radioButton3.Name = mfaConfig.Button3Name;
-			radioButton3.Tag = mfaConfig.Button3Value;
+			Serilog.Log.Logger.Information("{@DebugInfo}", new
+			{
+				paramButtonCount = mfaConfig.Buttons.Count,
+				visibleRadioButtonCount = radioButtons.Count(rb => rb.Visible)
+			});
 		}
 
-		private static void setOptional(RadioButton radioButton, string text)
+		private void setRadioButton(int pos, RadioButton rb)
 		{
-			if (!string.IsNullOrWhiteSpace(text))
-				radioButton.Text = text;
+			if (_mfaConfig.Buttons.Count <= pos)
+			{
+				rb.Checked = false;
+				rb.Enabled = false;
+				rb.Visible = false;
+				return;
+			}
+
+			var btn = _mfaConfig.Buttons[pos];
+
+			// optional
+			if (!string.IsNullOrWhiteSpace(btn.Text))
+				rb.Text = btn.Text;
+
+			// mandatory values
+			rb.Name = btn.Name;
+			rb.Tag = btn.Value;
 		}
 
 		public string SelectedName { get; private set; }
 		public string SelectedValue { get; private set; }
 		private void submitBtn_Click(object sender, EventArgs e)
 		{
-			Serilog.Log.Logger.Debug("RadioButton states: {@DebugInfo}", new {
+			var selected = radioButtons.FirstOrDefault(rb => rb.Checked);
+
+			Serilog.Log.Logger.Information("Submit button clicked: {@DebugInfo}", new
+			{
+				rb1_visible = radioButton1.Visible,
 				rb1_checked = radioButton1.Checked,
-				r21_checked = radioButton2.Checked,
-				rb3_checked = radioButton3.Checked
+
+				rb2_visible = radioButton2.Visible,
+				rb2_checked = radioButton2.Checked,
+
+				rb3_visible = radioButton3.Visible,
+				rb3_checked = radioButton3.Checked,
+
+				isSelected = selected is not null,
+				name = selected?.Name,
+				value = selected?.Tag
 			});
 
-			var selected = radioButtons.Single(rb => rb.Checked);
-
-			Serilog.Log.Logger.Debug("Selected: {@DebugInfo}", new { isSelected = selected is not null, name = selected?.Name, value = selected?.Tag });
+			if (selected is null)
+			{
+				MessageBox.Show("No MFA option selected", "None selected", MessageBoxButtons.OK, MessageBoxIcon.Error);
+				return;
+			}
 
 			SelectedName = selected.Name;
 			SelectedValue = (string)selected.Tag;

LibationWinForms/Dialogs/Login/MfaDialog.resx

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

LibationWinForms/Dialogs/Login/WinformResponder.cs

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

LibationWinForms/Dialogs/Login/_2faCodeDialog.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Linq;
 using System.Windows.Forms;
 
 namespace LibationWinForms.Dialogs.Login
@@ -14,7 +15,10 @@ namespace LibationWinForms.Dialogs.Login
 
 		private void submitBtn_Click(object sender, EventArgs e)
 		{
-			Code = this.codeTb.Text;
+			Code = this.codeTb.Text.Trim();
+
+			Serilog.Log.Logger.Information("Submit button clicked: {@DebugInfo}", new { Code });
+
 			DialogResult = DialogResult.OK;
 		}
 	}

LibationWinForms/Dialogs/Login/_2faCodeDialog.resx

@@ -1,64 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
   <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
     <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
     <xsd:element name="root" msdata:IsDataSet="true">

LibationWinForms/Dialogs/MessageBoxAlertAdminDialog.cs

@@ -1,7 +1,8 @@
-using System;
+using Dinah.Core;
+using System;
+using System.Linq;
 using System.Drawing;
 using System.Windows.Forms;
-using Dinah.Core;
 
 namespace LibationWinForms.Dialogs
 {