incr ver for new liberation status handling

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

AaxDecrypter/AaxcDownloadConverter.cs

@@ -1,32 +1,27 @@
 using AAXClean;
 using Dinah.Core;
-using Dinah.Core.Diagnostics;
 using Dinah.Core.IO;
-using Dinah.Core.Logging;
+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);
 
         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; }
@@ -65,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);
         }
 
@@ -98,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));
                 }
@@ -113,13 +112,11 @@ 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;
         }
@@ -136,8 +133,14 @@ namespace AaxDecrypter
 
         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);
@@ -147,7 +150,6 @@ namespace AaxDecrypter
             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;
 
@@ -155,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;
         }
@@ -185,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()
@@ -227,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()) { IsBackground = true };
-            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

@@ -20,6 +20,57 @@ namespace ApplicationServices
 
 	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)
 		{
@@ -95,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();
 		}
 
@@ -111,7 +162,7 @@ namespace ApplicationServices
 		#endregion
 
 		#region Update book details
-		public static int UpdateTags(Book book, string newTags)
+		public static int UpdateUserDefinedItem(Book book, string newTags, LiberatedStatus bookStatus, LiberatedStatus? pdfStatus)
 		{
 			try
 			{
@@ -119,16 +170,28 @@ namespace ApplicationServices
 
 				var udi = book.UserDefinedItem;
 
-				if (udi.Tags == newTags)
+				var tagsChanged = udi.Tags != newTags;
+				var bookStatusChanged = udi.BookStatus != bookStatus;
+				var pdfStatusChanged = udi.PdfStatus != pdfStatus;
+
+				if (!tagsChanged && !bookStatusChanged && !pdfStatusChanged)
 					return 0;
 
-				// Attach() NoTracking entities before SaveChanges()
 				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;
 			}
@@ -139,7 +202,7 @@ namespace ApplicationServices
 			}
 		}
 
-		public static int UpdateBook(LibraryBook libraryBook, LiberatedStatus liberatedStatus, string finalAudioPath)
+		public static int UpdateBook(LibraryBook libraryBook, LiberatedStatus liberatedStatus)
 		{
 			try
 			{
@@ -147,12 +210,11 @@ namespace ApplicationServices
 
 				var udi = libraryBook.Book.UserDefinedItem;
 
-				if (udi.BookStatus == liberatedStatus && udi.BookLocation == finalAudioPath)
+				if (udi.BookStatus == liberatedStatus)
 					return 0;
 
 				// Attach() NoTracking entities before SaveChanges()
 				udi.BookStatus = liberatedStatus;
-				udi.BookLocation = finalAudioPath;
 				context.Attach(udi).State = Microsoft.EntityFrameworkCore.EntityState.Modified;
 				var qtyChanges = context.SaveChanges();
 				if (qtyChanges > 0)
@@ -196,13 +258,13 @@ namespace ApplicationServices
 		// 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)
-			=> TransitionalFileLocator.Audio_Exists(book) ? LiberatedState.Liberated
-			: TransitionalFileLocator.AAXC_Exists(book) ? LiberatedState.PartialDownload
+			=> 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
-			: TransitionalFileLocator.PDF_Exists(book) ? PdfState.Downloaded
+			: book.PDF_Exists ? PdfState.Downloaded
 			: PdfState.NotDownloaded;
 
 		public record LibraryStats(int booksFullyBackedUp, int booksDownloadedOnly, int booksNoProgress, int pdfsDownloaded, int 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/TransitionalFileLocator.cs

@@ -1,46 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using DataLayer;
-using FileManager;
-
-namespace ApplicationServices
-{
-	public static class TransitionalFileLocator
-	{
-		public static string Audio_GetPath(Book book)
-		{
-			var loc = book?.UserDefinedItem?.BookLocation ?? "";
-			if (File.Exists(loc))
-				return loc;
-
-			return AudibleFileStorage.Audio.GetPath(book.AudibleProductId);
-		}
-
-		public static bool PDF_Exists(Book book)
-		{
-			var status = book?.UserDefinedItem?.PdfStatus;
-			if (status.HasValue && status.Value == LiberatedStatus.Liberated)
-				return true;
-
-			return AudibleFileStorage.PDF.Exists(book.AudibleProductId);
-		}
-
-		public static bool Audio_Exists(Book book)
-		{
-			var status = book?.UserDefinedItem?.BookStatus;
-			// true since Error == libhack
-			if (status.HasValue && status.Value != LiberatedStatus.NotLiberated)
-				return true;
-
-			return AudibleFileStorage.Audio.Exists(book.AudibleProductId);
-		}
-
-		public static bool AAXC_Exists(Book book)
-		{
-			// this one will actually stay the same. centralizing helps with organization in the interim though
-			return AudibleFileStorage.AAXC.Exists(book.AudibleProductId);
-		}
-	}
-}

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);

DataLayer/EfClasses/UserDefinedItem.cs

@@ -94,9 +94,8 @@ namespace DataLayer
             => Rating.Update(overallRating, performanceRating, storyRating);
         #endregion
 
-        #region LiberatedStatuses and book file location
+        #region LiberatedStatuses
         public LiberatedStatus BookStatus { get; set; }
-        public string BookLocation { get; set; }
         public LiberatedStatus? PdfStatus { get; set; }
         #endregion
 

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,9 +253,6 @@ namespace DataLayer.Migrations
                             b1.Property<int>("BookId")
                                 .HasColumnType("INTEGER");
 
-                            b1.Property<string>("BookLocation")
-                                .HasColumnType("TEXT");
-
                             b1.Property<int>("BookStatus")
                                 .HasColumnType("INTEGER");
 

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 DownloadDecryptBook { get; } = new DownloadDecryptBook();
-		public DownloadPdf DownloadPdf { get; } = new DownloadPdf();
-
-		public bool Validate(LibraryBook libraryBook)
-            => !ApplicationServices.TransitionalFileLocator.Audio_Exists(libraryBook.Book);
-
-		// 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 DownloadDecryptBook.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

@@ -3,6 +3,7 @@ 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;
@@ -11,31 +12,32 @@ using System.Threading.Tasks;
 
 namespace FileLiberator
 {
-    public class ConvertToMp3 : IDecryptable
+    public class ConvertToMp3 : IAudioDecodable
     {
-        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> Begin;
-        public event EventHandler<LibraryBook> Completed;
-
-        public event EventHandler<string> StatusUpdate;
-        public event EventHandler<Action<byte[]>> RequestCoverArt;
 
         private Mp4File m4bBook;
 
-        private string Mp3FileName(string m4bPath) => m4bPath is null ? string.Empty : PathLib.ReplaceExtension(m4bPath, ".mp3");
+		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 = ApplicationServices.TransitionalFileLocator.Audio_GetPath(libraryBook.Book);
+            var path = AudibleFileStorage.Audio.GetPath(libraryBook.Book.AudibleProductId);
             return path?.ToLower()?.EndsWith(".m4b") == true && !File.Exists(Mp3FileName(path));
         }
 
@@ -43,19 +45,20 @@ namespace FileLiberator
         {
             Begin?.Invoke(this, libraryBook);
 
-            DecryptBegin?.Invoke(this, $"Begin converting {libraryBook} to mp3");
+            StreamingBegin?.Invoke(this, $"Begin converting {libraryBook} to mp3");
 
             try
             {
-                var m4bPath = ApplicationServices.TransitionalFileLocator.Audio_GetPath(libraryBook.Book);
-
+                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);
-                CoverImageFilepathDiscovered?.Invoke(this, m4bBook.AppleTags.Cover);
+                CoverImageDiscovered?.Invoke(this, m4bBook.AppleTags.Cover);
 
                 using var mp3File = File.OpenWrite(Path.GetTempFileName());
 
@@ -76,7 +79,7 @@ namespace FileLiberator
             }
             finally
             {
-                DecryptCompleted?.Invoke(this, $"Completed converting to mp3: {libraryBook.Book.Title}");
+                StreamingCompleted?.Invoke(this, $"Completed converting to mp3: {libraryBook.Book.Title}");
                 Completed?.Invoke(this, libraryBook);
             }
         }
@@ -88,11 +91,17 @@ namespace FileLiberator
             double estTimeRemaining = remainingSecsToProcess / e.ProcessSpeed;
 
             if (double.IsNormal(estTimeRemaining))
-                UpdateRemainingTime?.Invoke(this, TimeSpan.FromSeconds(estTimeRemaining));
+                StreamingTimeRemaining?.Invoke(this, TimeSpan.FromSeconds(estTimeRemaining));
 
             double progressPercent = 100 * e.ProcessPosition.TotalSeconds / duration.TotalSeconds;
 
-            UpdateProgress?.Invoke(this, (int)progressPercent);
+            StreamingProgressChanged?.Invoke(this,
+                new DownloadProgress
+                {
+                    ProgressPercentage = progressPercent,
+                    BytesReceived = (long)(fileSize * progressPercent),
+                    TotalBytesToReceive = fileSize
+                });
         }
     }
 }

FileLiberator/DownloadDecryptBook.cs

@@ -8,33 +8,36 @@ 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 (ApplicationServices.TransitionalFileLocator.Audio_Exists(libraryBook.Book))
+                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);
@@ -46,12 +49,11 @@ namespace FileLiberator
                 // moves files and returns dest dir
                 _ = moveFilesToBooksDir(libraryBook.Book, outputAudioFilename);
 
-                var finalAudioExists = ApplicationServices.TransitionalFileLocator.Audio_Exists(libraryBook.Book);
-                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, outputAudioFilename);
+                ApplicationServices.LibraryCommands.UpdateBook(libraryBook, LiberatedStatus.Liberated);
 
                 return new StatusHandler();
             }
@@ -63,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
             {
@@ -103,8 +105,8 @@ namespace FileLiberator
 
 
                 aaxcDownloader = new AaxcDownloadConverter(outFileName, cacheDir, aaxcDecryptDlLic, format) { AppName = "Libation" };
-                aaxcDownloader.DecryptProgressUpdate += (s, progress) => UpdateProgress?.Invoke(this, progress);
-                aaxcDownloader.DecryptTimeRemaining += (s, remaining) => UpdateRemainingTime?.Invoke(this, remaining);
+                aaxcDownloader.DecryptProgressUpdate += (s, progress) => StreamingProgressChanged?.Invoke(this, progress);
+                aaxcDownloader.DecryptTimeRemaining += (s, remaining) => StreamingTimeRemaining?.Invoke(this, remaining);
                 aaxcDownloader.RetrievedCoverArt += AaxcDownloader_RetrievedCoverArt;
                 aaxcDownloader.RetrievedTags += aaxcDownloader_RetrievedTags;
 
@@ -119,11 +121,12 @@ namespace FileLiberator
             }
             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)
             {
@@ -132,7 +135,7 @@ namespace FileLiberator
 
             if (e is not null)
             {
-                CoverImageFilepathDiscovered?.Invoke(this, e);
+                CoverImageDiscovered?.Invoke(this, e);
             }
         }
 
@@ -218,8 +221,7 @@ namespace FileLiberator
 				throw new Exception(errorString("Locale"));
 		}
 
-        public bool Validate(LibraryBook libraryBook)
-            => !ApplicationServices.TransitionalFileLocator.Audio_Exists(libraryBook.Book);
+        public bool Validate(LibraryBook libraryBook) => !libraryBook.Book.Audio_Exists;
 
         public void Cancel()
         {

FileLiberator/DownloadFile.cs

@@ -6,20 +6,21 @@ using Dinah.Core.Net.Http;
 namespace FileLiberator
 {
 	// 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
 			{
@@ -28,7 +29,7 @@ namespace FileLiberator
 			}
 			finally
 			{
-				DownloadCompleted?.Invoke(this, proposedDownloadFilePath);
+				StreamingCompleted?.Invoke(this, proposedDownloadFilePath);
 			}
 		}
 	}

FileLiberator/DownloadPdf.cs

@@ -15,7 +15,7 @@ namespace FileLiberator
 	{
 		public override bool Validate(LibraryBook libraryBook)
 			=> !string.IsNullOrWhiteSpace(getdownloadUrl(libraryBook))
-			&& !ApplicationServices.TransitionalFileLocator.PDF_Exists(libraryBook.Book);
+			&& !libraryBook.Book.PDF_Exists;
 
 		public override async Task<StatusHandler> ProcessItemAsync(LibraryBook libraryBook)
 		{
@@ -32,14 +32,14 @@ namespace FileLiberator
 		private static string getProposedDownloadFilePath(LibraryBook libraryBook)
 		{
 			// if audio file exists, get it's dir. else return base Book dir
-			var existingPath = Path.GetDirectoryName(ApplicationServices.TransitionalFileLocator.Audio_GetPath(libraryBook.Book));
+			var existingPath = Path.GetDirectoryName(AudibleFileStorage.Audio.GetPath(libraryBook.Book.AudibleProductId));
 			var file = getdownloadUrl(libraryBook);
 
 			if (existingPath != null)
 				return Path.Combine(existingPath, Path.GetFileName(file));
 
 			var full = FileUtility.GetValidFilename(
-				AudibleFileStorage.PDF.StorageDirectory,
+				AudibleFileStorage.PdfStorageDirectory,
 				libraryBook.Book.Title,
 				Path.GetExtension(file),
 				libraryBook.Book.AudibleProductId);
@@ -61,7 +61,7 @@ namespace FileLiberator
 		}
 
 		private static StatusHandler verifyDownload(LibraryBook libraryBook)
-			=> !ApplicationServices.TransitionalFileLocator.PDF_Exists(libraryBook.Book)
+			=> !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

@@ -23,17 +23,12 @@ namespace FileLiberator
             .GetLibrary_Flat_NoTracking()
             .Where(libraryBook => processable.Validate(libraryBook));
 
-        public static async Task<StatusHandler> ProcessSingleAsync(this IProcessable processable, LibraryBook libraryBook)
+        public static async Task<StatusHandler> ProcessSingleAsync(this IProcessable processable, LibraryBook libraryBook, bool validate)
         {
-            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

@@ -15,14 +15,16 @@ namespace FileManager
 		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
         {
@@ -34,49 +36,44 @@ namespace FileManager
             }
         }
 
-        private static BackgroundFileSystem BookDirectoryFiles { get; } = new BackgroundFileSystem();
+        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);
         }
 
-        public void Refresh()
-        {
-            BookDirectoryFiles.RefreshFiles();
-        }
-
-        /// <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;
 
-            string storageDir = StorageDirectory;
             string regexPattern = $@"{productId}.*?\.({extAggr})$";
             string firstOrNull;
 
-            if (storageDir == BooksDirectory)
+            if (StorageDirectory == BooksDirectory)
             {
                 //If user changed the BooksDirectory, reinitialize.
-                if (storageDir != BookDirectoryFiles.RootDirectory)
-                    BookDirectoryFiles.Init(storageDir, "*.*", SearchOption.AllDirectories);
+                if (StorageDirectory != BookDirectoryFiles.RootDirectory)
+				{
+                    lock (BookDirectoryFiles)
+                    {
+                        if (StorageDirectory != BookDirectoryFiles.RootDirectory)
+                        {
+                            BookDirectoryFiles = new BackgroundFileSystem(StorageDirectory, "*.*", SearchOption.AllDirectories);
+                        }
+                    }
+				}
 
                 firstOrNull = BookDirectoryFiles.FindFile(regexPattern, RegexOptions.IgnoreCase);
             }
@@ -84,7 +81,7 @@ namespace FileManager
             {
                 firstOrNull =
                     Directory
-                    .EnumerateFiles(storageDir, "*.*", SearchOption.AllDirectories)
+                    .EnumerateFiles(StorageDirectory, "*.*", SearchOption.AllDirectories)
                     .FirstOrDefault(s => Regex.IsMatch(s, regexPattern, RegexOptions.IgnoreCase));
             }
 
@@ -94,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)
         {
@@ -109,32 +121,8 @@ 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";
-
-        protected 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
@@ -147,17 +135,13 @@ namespace FileManager
         public override string StorageDirectory => DownloadsInProgress;
 
         public AaxcFileStorage() : base(FileType.AAXC) { }
-    }
 
-    public class PdfFileStorage : AudibleFileStorage
-    {
-        protected 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

@@ -9,7 +9,14 @@ using System.Threading.Tasks;
 
 namespace FileManager
 {
-    class BackgroundFileSystem
+    /// <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; }
@@ -18,7 +25,16 @@ namespace FileManager
         private FileSystemWatcher fileSystemWatcher { get; set; }
         private BlockingCollection<FileSystemEventArgs> directoryChangesEvents { get; set; }
         private Task backgroundScanner { get; set; }
-        private List<string> fsCache { 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)
         {
@@ -30,8 +46,6 @@ namespace FileManager
 
         public void RefreshFiles()
         {
-            if (fsCache is null) return;
-
             lock (fsCache)
             {
                 fsCache.Clear();
@@ -39,19 +53,12 @@ namespace FileManager
             }
         }
 
-        public void Init(string rootDirectory, string searchPattern, SearchOption searchOptions)
+        private void Init()
         {
-            RootDirectory = rootDirectory;
-            SearchPattern = searchPattern;
-            SearchOption = searchOptions;
+            Stop();
 
-            //Calling CompleteAdding() will cause background scanner to terminate.
-            directoryChangesEvents?.CompleteAdding();
-            fsCache?.Clear();
-            directoryChangesEvents?.Dispose();
-            fileSystemWatcher?.Dispose();
-
-            fsCache = Directory.EnumerateFiles(RootDirectory, SearchPattern, SearchOption).ToList();
+            lock (fsCache)
+                fsCache.AddRange(Directory.EnumerateFiles(RootDirectory, SearchPattern, SearchOption));
 
             directoryChangesEvents = new BlockingCollection<FileSystemEventArgs>();
             fileSystemWatcher = new FileSystemWatcher(RootDirectory);
@@ -62,28 +69,31 @@ namespace FileManager
             fileSystemWatcher.IncludeSubdirectories = true;
             fileSystemWatcher.EnableRaisingEvents = true;
 
-            //Wait for background scanner to terminate before reinitializing.
-            backgroundScanner?.Wait();
             backgroundScanner = new Task(BackgroundScanner);
             backgroundScanner.Start();
         }
+        private void Stop()
+        {
+            //Stop raising events
+            fileSystemWatcher?.Dispose();
 
-        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);
+            //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)
         {
-            Init(RootDirectory, SearchPattern, SearchOption);
+            Stop();
+            Init();
         }
 
         private void FileSystemWatcher_Changed(object sender, FileSystemEventArgs e)
@@ -95,28 +105,26 @@ namespace FileManager
         private void BackgroundScanner()
         {
             while (directoryChangesEvents.TryTake(out FileSystemEventArgs change, -1))
-                UpdateLocalCache(change);
+            {
+                lock (fsCache)
+                    UpdateLocalCache(change);
+            }
         }
 
-        private void UpdateLocalCache(FileSystemEventArgs change) 
+        private void UpdateLocalCache(FileSystemEventArgs change)
         {
-            lock (fsCache)
+            if (change.ChangeType == WatcherChangeTypes.Deleted)
             {
-                if (change.ChangeType == WatcherChangeTypes.Deleted)
-                {
-                    RemovePath(change.FullPath);
-                }
-                else if (change.ChangeType == WatcherChangeTypes.Created)
-                {
-                    AddPath(change.FullPath);
-                }
-                else if (change.ChangeType == WatcherChangeTypes.Renamed)
-                {
-                    var renameChange = change as RenamedEventArgs;
-
-                    RemovePath(renameChange.OldFullPath);
-                    AddPath(renameChange.FullPath);
-                }
+                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);
             }
         }
 
@@ -135,6 +143,21 @@ namespace FileManager
             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/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; }
@@ -18,7 +19,7 @@ namespace FileManager
 
 		private static Cache<CacheEntry> cache { get; } = new Cache<CacheEntry>();
 
-		private static string jsonFile => Path.Combine(Configuration.Instance.LibationFiles, "FilePaths.json");
+		private static string jsonFile => Path.Combine(Configuration.Instance.LibationFiles, FILENAME);
 
         static FilePathCache()
         {
@@ -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/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);
 		}
 	}
-}
+}

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.4.8.1</Version>
+    <Version>5.5.2.1</Version>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+    <DefineConstants>TRACE;DEBUG</DefineConstants>
   </PropertyGroup>
 
   <ItemGroup>

LibationLauncher/Program.cs

@@ -3,17 +3,16 @@ using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Windows.Forms;
-using AudibleApi;
 using AudibleApi.Authorization;
 using DataLayer;
-using Microsoft.EntityFrameworkCore;
+using Dinah.Core;
 using Dinah.Core.IO;
 using Dinah.Core.Logging;
 using FileManager;
 using InternalUtilities;
 using LibationWinForms;
 using LibationWinForms.Dialogs;
-using Newtonsoft.Json;
+using Microsoft.EntityFrameworkCore;
 using Newtonsoft.Json.Linq;
 using Serilog;
 
@@ -54,13 +53,15 @@ namespace LibationLauncher
 
 			migrate_to_v5_0_0(config);
 			migrate_to_v5_2_0__post_config(config);
-			//migrate_to_v5_4_1(config);// comment out until after vacation
+			migrate_to_v5_5_0(config);
 
 			ensureSerilogConfig(config);
 			configureLogging(config);
 			logStartupState(config);
-			checkForUpdate(config);
 
+#if !DEBUG
+			checkForUpdate(config);
+#endif
 			Application.Run(new Form1());
 		}
 
@@ -233,25 +234,26 @@ namespace LibationLauncher
 		}
 		#endregion
 
-		#region migrate to v5.4.1 see comment
-		// this 'migration' is a bit different. it intentionally runs each time Libation is started. its job will be fulfilled when I eventually
-		// implement the portion which removes FilePaths.json, at which time this method will be a proper migration
-		//
-		// I'm iterating through safe steps toward getting rid of the live scanner except to track audiobook files as a convenience
-		// such as clicking the stop light to open its location. live scanning will be replaced with state tracking in the database.
-
-		// FilePaths.json => db. long running. fire and forget
-		private static void migrate_to_v5_4_1(Configuration config)
-			=> new System.Threading.Thread(() => migrate_to_v5_4_1_thread(config)) { IsBackground = true }.Start();
-		private static void migrate_to_v5_4_1_thread(Configuration config)
+		#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)
 		{
-			var debugStopwatch = System.Diagnostics.Stopwatch.StartNew();
 			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();
 
@@ -283,19 +285,29 @@ namespace LibationLauncher
 
 					if (fileType == FileType.Audio)
 					{
-						book.UserDefinedItem.BookStatus = LiberatedStatus.Liberated;
-						book.UserDefinedItem.BookLocation = path;
+						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");
 			}
-			debugStopwatch.Stop();
-			var debugTotal = debugStopwatch.Elapsed;
 		}
 		#endregion
 

LibationSearchEngine/SearchEngine.cs

@@ -139,9 +139,7 @@ namespace LibationSearchEngine
             return authors.Intersect(narrators).Any();
         }
 
-        private static bool isLiberated(Book book)
-            => book.UserDefinedItem.BookStatus == LiberatedStatus.Liberated
-            || AudibleFileStorage.Audio.Exists(book.AudibleProductId);
+        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

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

@@ -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/BookLiberation/AudioDecodeForm.Designer.cs

@@ -1,6 +1,6 @@
 namespace LibationWinForms.BookLiberation
 {
-    partial class DecryptForm
+    partial class AudioDecodeForm
     {
         /// <summary>
         /// Required designer variable.

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,54 +0,0 @@
-using System;
-using System.Windows.Forms;
-using Dinah.Core.Windows.Forms;
-
-namespace LibationWinForms.BookLiberation
-{
-    public partial class DecryptForm : Form
-    {
-		public DecryptForm() => InitializeComponent();
-
-        // book info
-        private string title;
-        private string authorNames;
-        private string narratorNames;
-
-        public void SetTitle(string actionName, string title)
-        {
-            this.UIThread(() => this.Text = actionName + " " + 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)
-                updateRemainingTime(0);
-            else
-                progressBar1.UIThread(() => progressBar1.Value = percentage);
-        }
-
-        public void UpdateRemainingTime(TimeSpan remaining)
-            => updateRemainingTime((int)remaining.TotalSeconds);
-
-        private void updateRemainingTime(int remaining)
-            => remainingTimeLbl.UIThread(() => remainingTimeLbl.Text = $"ETA:\r\n{remaining} 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,505 +1,264 @@
-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;
-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;
+	// 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");
-        }
+		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();
+		public static LogMe RegisterForm(AutomatedBackupsForm form = null)
+		{
+			var logMe = new LogMe();
 
-            if (form is null)
-                return logMe;
+			if (form is null)
+				return logMe;
 
-            logMe.LogInfo += (_, text) => form?.WriteLine(text);
+			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 backup single {@DebugInfo}", new { libraryBook?.Book?.AudibleProductId });
-
-            var backupBook = getWiredUpBackupBook(completedAction);
-           
-            (Action unsubscribeEvents, LogMe logMe) = attachToBackupsForm(backupBook);
-
-            // 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();
-        }
-
-        public static async Task ConvertAllBooksAsync()
-        {
-            Serilog.Log.Logger.Information("Begin " + nameof(ConvertAllBooksAsync));
-
-            var convertBook = new ConvertToMp3();
-            convertBook.Begin += (_, l) => wireUpEvents(convertBook, l, "Converting");
-
-            var automatedBackupsForm = new AutomatedBackupsForm();
-
-            var logMe = LogMe.RegisterForm(automatedBackupsForm);
-
-            void statusUpdate(object _, string str) => logMe.Info("- " + str);
-            void convertBookBegin(object _, LibraryBook libraryBook) => logMe.Info($"Convert Step, Begin: {libraryBook.Book}");
-            void convertBookCompleted(object _, LibraryBook libraryBook) => logMe.Info($"Convert Step, Completed: {libraryBook.Book}{Environment.NewLine}");
-            convertBook.Begin += convertBookBegin;
-            convertBook.StatusUpdate += statusUpdate;
-            convertBook.Completed += convertBookCompleted;
-
-            await new BackupLoop(logMe, convertBook, automatedBackupsForm).RunBackupAsync();
-
-            convertBook.Begin -= convertBookBegin;
-            convertBook.StatusUpdate -= statusUpdate;
-            convertBook.Completed -= convertBookCompleted;
-        }
-
-        private static BackupBook getWiredUpBackupBook(EventHandler<LibraryBook> completedAction)
-        {
-            var backupBook = new BackupBook();
-
-            backupBook.DownloadDecryptBook.Begin += (_, l) => wireUpEvents(backupBook.DownloadDecryptBook, l);
-            backupBook.DownloadPdf.Begin += (_, __) => wireUpEvents(backupBook.DownloadPdf);
-
-            if (completedAction != null)
-            {
-                backupBook.DownloadDecryptBook.Completed += completedAction;
-                backupBook.DownloadPdf.Completed += completedAction;
-            }
-
-            return backupBook;
-        }
-
-        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.DownloadDecryptBook.Begin += decryptBookBegin;
-            backupBook.DownloadDecryptBook.StatusUpdate += statusUpdate;
-            backupBook.DownloadDecryptBook.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.DownloadDecryptBook.Begin -= decryptBookBegin;
-                backupBook.DownloadDecryptBook.StatusUpdate -= statusUpdate;
-                backupBook.DownloadDecryptBook.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();
-            })
-            { IsBackground = true }
-            .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, string actionName = "Decrypting")
-        {
-            #region create form
-            var decryptDialog = new DecryptForm();
-            #endregion
-
-            #region Set initially displayed book properties from library info.
-            decryptDialog.SetTitle(actionName, 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(actionName, 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");
-
-            string details;
-            try
-            {
-                static string trunc(string str)
-                    => string.IsNullOrWhiteSpace(str) ? "[empty]"
-                    : (str.Length > 50) ? $"{str.Truncate(47)}..."
-                    : str;
-
-                details =
+			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]";
-            }
+			}
+			catch
+			{
+				details = "[Error retrieving details]";
+			}
 
-            var dialogResult = MessageBox.Show(string.Format(SkipDialogText, details), "Skip importing this book?", SkipDialogButtons, MessageBoxIcon.Question);
+			var dialogResult = MessageBox.Show(string.Format(SkipDialogText, details), "Skip importing this book?", SkipDialogButtons, MessageBoxIcon.Question, SkipDialogDefaultButton);
 
-            if (dialogResult == DialogResult.Abort)
-                return false;
+			if (dialogResult == DialogResult.Abort)
+				return false;
 
-            if (dialogResult == CreateSkipFileResult)
-            {
-                ApplicationServices.LibraryCommands.UpdateBook(libraryBook, LiberatedStatus.Error, null);
-                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());
-            }
+			if (dialogResult == SkipResult)
+			{
+				ApplicationServices.LibraryCommands.UpdateBook(libraryBook, LiberatedStatus.Error);
+				LogMe.Info($"Error. Skip: [{libraryBook.Book.AudibleProductId}] {libraryBook.Book.Title}");
+			}
 
-            return true;
-        }
-    }
-    class BackupSingle : BackupRunner
-    {
-        private LibraryBook _libraryBook { get; }
+			return true;
+		}
+	}
 
-        protected override string SkipDialogText => @"
+	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}
 
@@ -507,24 +266,26 @@ An error occurred while trying to process this book. 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 => @"
+		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}
 
@@ -534,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

@@ -28,64 +28,210 @@
         /// </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" +
+			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";
-            // 
-            // 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();
+			// 
+			// 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.Button saveBtn;
         private System.Windows.Forms.TextBox newTagsTb;
-        private System.Windows.Forms.Label label1;
-    }
+        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

@@ -1,27 +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 string NewTags { get; private set; }
+	public partial class BookDetailsDialog : Form
+	{
+		public class liberatedComboBoxItem
+		{
+			public LiberatedStatus Status { get; set; }
+			public string Text { get; set; }
+			public override string ToString() => Text;
+		}
 
-        public BookDetailsDialog()
-        {
-            InitializeComponent();
-        }
-        public BookDetailsDialog(string title, string rawTags) : this()
-        {
-            this.Text = $"Edit Tags - {title}";
+		public string NewTags { get; private set; }
+		public LiberatedStatus BookLiberatedStatus { get; private set; }
+		public LiberatedStatus? PdfLiberatedStatus { get; private set; }
 
-            this.newTagsTb.Text = rawTags;
-        }
+		private LibraryBook _libraryBook { get; }
+		private Book Book => _libraryBook.Book;
 
-        private void SaveBtn_Click(object sender, EventArgs e)
-        {
-            NewTags = this.newTagsTb.Text;
-            DialogResult = DialogResult.OK;
-        }
-    }
+		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/BookDetailsDialog.resx

@@ -1,64 +1,4 @@
-<?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.
-    -->
+<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/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.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));
 

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/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.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

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,7 +1,8 @@
-using System;
-using System.Windows.Forms;
-using Dinah.Core;
+using Dinah.Core;
 using InternalUtilities;
+using System;
+using System.Linq;
+using System.Windows.Forms;
 
 namespace LibationWinForms.Dialogs.Login
 {

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;

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,7 +8,7 @@ namespace LibationWinForms.Dialogs.Login
 	{
 		private RadioButton[] radioButtons { get; }
 
-		AudibleApi.MfaConfig _mfaConfig { get; }
+		private AudibleApi.MfaConfig _mfaConfig { get; }
 
 		public MfaDialog(AudibleApi.MfaConfig mfaConfig)
 		{
@@ -32,7 +26,8 @@ namespace LibationWinForms.Dialogs.Login
 			setRadioButton(1, this.radioButton2);
 			setRadioButton(2, this.radioButton3);
 
-			Serilog.Log.Logger.Information("{@DebugInfo}", new {
+			Serilog.Log.Logger.Information("{@DebugInfo}", new
+			{
 				paramButtonCount = mfaConfig.Buttons.Count,
 				visibleRadioButtonCount = radioButtons.Count(rb => rb.Visible)
 			});
@@ -65,7 +60,8 @@ namespace LibationWinForms.Dialogs.Login
 		{
 			var selected = radioButtons.FirstOrDefault(rb => rb.Checked);
 
-			Serilog.Log.Logger.Information("Submit button clicked: {@DebugInfo}", new {
+			Serilog.Log.Logger.Information("Submit button clicked: {@DebugInfo}", new
+			{
 				rb1_visible = radioButton1.Visible,
 				rb1_checked = radioButton1.Checked,
 

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
 {

LibationWinForms/Dialogs/Login/_2faCodeDialog.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Linq;
 using System.Windows.Forms;
 
 namespace LibationWinForms.Dialogs.Login

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
 {

LibationWinForms/Dialogs/MessageBoxAlertAdminDialog.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/RemoveBooksDialog.Designer.cs

@@ -0,0 +1,189 @@
+
+namespace LibationWinForms.Dialogs
+{
+    partial class RemoveBooksDialog
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            this.components = new System.ComponentModel.Container();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
+            this._dataGridView = new System.Windows.Forms.DataGridView();
+            this.removeDataGridViewCheckBoxColumn = new System.Windows.Forms.DataGridViewCheckBoxColumn();
+            this.coverDataGridViewImageColumn = new System.Windows.Forms.DataGridViewImageColumn();
+            this.titleDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.authorsDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.miscDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.purchaseDateGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.gridEntryBindingSource = new System.Windows.Forms.BindingSource(this.components);
+            this.btnRemoveBooks = new System.Windows.Forms.Button();
+            this.label1 = new System.Windows.Forms.Label();
+            ((System.ComponentModel.ISupportInitialize)(this._dataGridView)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.gridEntryBindingSource)).BeginInit();
+            this.SuspendLayout();
+            // 
+            // _dataGridView
+            // 
+            this._dataGridView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+            this._dataGridView.AutoGenerateColumns = false;
+            this._dataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+            this._dataGridView.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
+            this.removeDataGridViewCheckBoxColumn,
+            this.coverDataGridViewImageColumn,
+            this.titleDataGridViewTextBoxColumn,
+            this.authorsDataGridViewTextBoxColumn,
+            this.miscDataGridViewTextBoxColumn,
+            this.purchaseDateGridViewTextBoxColumn});
+            this._dataGridView.DataSource = this.gridEntryBindingSource;
+            dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+            dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Window;
+            dataGridViewCellStyle2.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point);
+            dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.ControlText;
+            dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this._dataGridView.DefaultCellStyle = dataGridViewCellStyle2;
+            this._dataGridView.Location = new System.Drawing.Point(0, 0);
+            this._dataGridView.Name = "_dataGridView";
+            this._dataGridView.RowHeadersVisible = false;
+            this._dataGridView.RowTemplate.Height = 82;
+            this._dataGridView.Size = new System.Drawing.Size(800, 409);
+            this._dataGridView.TabIndex = 0;
+            // 
+            // removeDataGridViewCheckBoxColumn
+            // 
+            this.removeDataGridViewCheckBoxColumn.DataPropertyName = "Remove";
+            this.removeDataGridViewCheckBoxColumn.FalseValue = "False";
+            this.removeDataGridViewCheckBoxColumn.Frozen = true;
+            this.removeDataGridViewCheckBoxColumn.HeaderText = "Remove";
+            this.removeDataGridViewCheckBoxColumn.MinimumWidth = 60;
+            this.removeDataGridViewCheckBoxColumn.Name = "removeDataGridViewCheckBoxColumn";
+            this.removeDataGridViewCheckBoxColumn.Resizable = System.Windows.Forms.DataGridViewTriState.False;
+            this.removeDataGridViewCheckBoxColumn.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
+            this.removeDataGridViewCheckBoxColumn.TrueValue = "True";
+            this.removeDataGridViewCheckBoxColumn.Width = 60;
+            // 
+            // coverDataGridViewImageColumn
+            // 
+            this.coverDataGridViewImageColumn.DataPropertyName = "Cover";
+            this.coverDataGridViewImageColumn.HeaderText = "Cover";
+            this.coverDataGridViewImageColumn.MinimumWidth = 80;
+            this.coverDataGridViewImageColumn.Name = "coverDataGridViewImageColumn";
+            this.coverDataGridViewImageColumn.ReadOnly = true;
+            this.coverDataGridViewImageColumn.Resizable = System.Windows.Forms.DataGridViewTriState.False;
+            this.coverDataGridViewImageColumn.Width = 80;
+            // 
+            // titleDataGridViewTextBoxColumn
+            // 
+            this.titleDataGridViewTextBoxColumn.DataPropertyName = "Title";
+            this.titleDataGridViewTextBoxColumn.HeaderText = "Title";
+            this.titleDataGridViewTextBoxColumn.Name = "titleDataGridViewTextBoxColumn";
+            this.titleDataGridViewTextBoxColumn.ReadOnly = true;
+            this.titleDataGridViewTextBoxColumn.Width = 200;
+            // 
+            // authorsDataGridViewTextBoxColumn
+            // 
+            this.authorsDataGridViewTextBoxColumn.DataPropertyName = "Authors";
+            this.authorsDataGridViewTextBoxColumn.HeaderText = "Authors";
+            this.authorsDataGridViewTextBoxColumn.Name = "authorsDataGridViewTextBoxColumn";
+            this.authorsDataGridViewTextBoxColumn.ReadOnly = true;
+            // 
+            // miscDataGridViewTextBoxColumn
+            // 
+            this.miscDataGridViewTextBoxColumn.DataPropertyName = "Misc";
+            this.miscDataGridViewTextBoxColumn.HeaderText = "Misc";
+            this.miscDataGridViewTextBoxColumn.Name = "miscDataGridViewTextBoxColumn";
+            this.miscDataGridViewTextBoxColumn.ReadOnly = true;
+            this.miscDataGridViewTextBoxColumn.Width = 150;
+            // 
+            // purchaseDateGridViewTextBoxColumn
+            // 
+            this.purchaseDateGridViewTextBoxColumn.DataPropertyName = "PurchaseDate";
+            this.purchaseDateGridViewTextBoxColumn.HeaderText = "Purchase Date";
+            this.purchaseDateGridViewTextBoxColumn.Name = "purchaseDateGridViewTextBoxColumn";
+            this.purchaseDateGridViewTextBoxColumn.ReadOnly = true;
+            this.purchaseDateGridViewTextBoxColumn.Resizable = System.Windows.Forms.DataGridViewTriState.False;
+            // 
+            // gridEntryBindingSource
+            // 
+            this.gridEntryBindingSource.AllowNew = false;
+            this.gridEntryBindingSource.DataSource = typeof(LibationWinForms.Dialogs.RemovableGridEntry);
+            // 
+            // btnRemoveBooks
+            // 
+            this.btnRemoveBooks.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this.btnRemoveBooks.Location = new System.Drawing.Point(570, 419);
+            this.btnRemoveBooks.Name = "btnRemoveBooks";
+            this.btnRemoveBooks.Size = new System.Drawing.Size(218, 23);
+            this.btnRemoveBooks.TabIndex = 1;
+            this.btnRemoveBooks.Text = "Remove Selected Books from Libation";
+            this.btnRemoveBooks.UseVisualStyleBackColor = true;
+            this.btnRemoveBooks.Click += new System.EventHandler(this.btnRemoveBooks_Click);
+            // 
+            // label1
+            // 
+            this.label1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+            this.label1.AutoSize = true;
+            this.label1.Location = new System.Drawing.Point(12, 423);
+            this.label1.Name = "label1";
+            this.label1.Size = new System.Drawing.Size(178, 15);
+            this.label1.TabIndex = 2;
+            this.label1.Text = "{0} book{1} selected for removal.";
+            // 
+            // RemoveBooksDialog
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(800, 450);
+            this.Controls.Add(this.label1);
+            this.Controls.Add(this.btnRemoveBooks);
+            this.Controls.Add(this._dataGridView);
+            this.Name = "RemoveBooksDialog";
+            this.Text = "RemoveBooksDialog";
+            this.Shown += new System.EventHandler(this.RemoveBooksDialog_Shown);
+            ((System.ComponentModel.ISupportInitialize)(this._dataGridView)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.gridEntryBindingSource)).EndInit();
+            this.ResumeLayout(false);
+            this.PerformLayout();
+
+        }
+
+        #endregion
+
+        private System.Windows.Forms.DataGridView _dataGridView;
+        private System.Windows.Forms.BindingSource gridEntryBindingSource;
+        private System.Windows.Forms.Button btnRemoveBooks;
+        private System.Windows.Forms.Label label1;
+        private System.Windows.Forms.DataGridViewCheckBoxColumn removeDataGridViewCheckBoxColumn;
+        private System.Windows.Forms.DataGridViewImageColumn coverDataGridViewImageColumn;
+        private System.Windows.Forms.DataGridViewTextBoxColumn titleDataGridViewTextBoxColumn;
+        private System.Windows.Forms.DataGridViewTextBoxColumn authorsDataGridViewTextBoxColumn;
+        private System.Windows.Forms.DataGridViewTextBoxColumn miscDataGridViewTextBoxColumn;
+        private System.Windows.Forms.DataGridViewTextBoxColumn purchaseDateGridViewTextBoxColumn;
+    }
+}

LibationWinForms/Dialogs/RemoveBooksDialog.cs

@@ -0,0 +1,171 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Linq;
+using System.Windows.Forms;
+using ApplicationServices;
+using DataLayer;
+using Dinah.Core.DataBinding;
+using InternalUtilities;
+using LibationWinForms.Login;
+
+namespace LibationWinForms.Dialogs
+{
+	public partial class RemoveBooksDialog : Form
+	{
+		public bool BooksRemoved { get; private set; }
+
+		private Account[] _accounts { get; }
+		private readonly List<LibraryBook> _libraryBooks;
+		private readonly SortableBindingList<RemovableGridEntry> _removableGridEntries;
+		private readonly string _labelFormat;
+		private int SelectedCount => SelectedEntries?.Count() ?? 0;
+		private IEnumerable<RemovableGridEntry> SelectedEntries => _removableGridEntries?.Where(b => b.Remove);
+
+		public RemoveBooksDialog(params Account[] accounts)
+		{
+			_libraryBooks = DbContexts.GetContext().GetLibrary_Flat_NoTracking();
+			_accounts = accounts;
+
+			InitializeComponent();
+			_labelFormat = label1.Text;
+
+			_dataGridView.CellContentClick += (s, e) => _dataGridView.CommitEdit(DataGridViewDataErrorContexts.Commit);
+			_dataGridView.CellValueChanged += DataGridView1_CellValueChanged;
+			_dataGridView.BindingContextChanged += (s, e) => UpdateSelection();
+
+			var orderedGridEntries = _libraryBooks
+				.Select(lb => new RemovableGridEntry(lb))
+				.OrderByDescending(ge => (DateTime)ge.GetMemberValue(nameof(ge.PurchaseDate)))
+				.ToList();
+
+			_removableGridEntries = new SortableBindingList<RemovableGridEntry>(orderedGridEntries);
+			gridEntryBindingSource.DataSource = _removableGridEntries;
+
+			_dataGridView.Enabled = false;
+		}
+
+		private void DataGridView1_CellValueChanged(object sender, DataGridViewCellEventArgs e)
+		{
+			if (e.ColumnIndex == 0)
+				UpdateSelection();
+		}
+
+		private async void RemoveBooksDialog_Shown(object sender, EventArgs e)
+		{
+			if (_accounts == null || _accounts.Length == 0)
+				return;
+			try
+			{
+				var rmovedBooks = await LibraryCommands.FindInactiveBooks((account) => new WinformResponder(account), _libraryBooks, _accounts);
+
+				var removable = _removableGridEntries.Where(rge => rmovedBooks.Any(rb => rb.Book.AudibleProductId == rge.AudibleProductId));
+
+				if (!removable.Any())
+					return;
+
+				foreach (var r in removable)
+					r.Remove = true;
+
+				UpdateSelection();
+			}
+			catch (Exception ex)
+			{
+				MessageBoxAlertAdmin.Show(
+					"Error scanning library. You may still manually select books to remove from Libation's library.",
+					"Error scanning library",
+					ex);
+			}
+			finally
+			{
+				_dataGridView.Enabled = true;
+			}
+		}
+
+		private void btnRemoveBooks_Click(object sender, EventArgs e)
+		{
+			var selectedBooks = SelectedEntries.ToList();
+
+			if (selectedBooks.Count == 0) return;
+
+			string titles = string.Join("\r\n", selectedBooks.Select(rge => "-" + rge.Title));
+
+			string thisThese = selectedBooks.Count > 1 ? "these" : "this";
+			string bookBooks = selectedBooks.Count > 1 ? "books" : "book";
+
+			var result = MessageBox.Show(
+				this,
+				$"Are you sure you want to remove {thisThese} {selectedBooks.Count} {bookBooks} from Libation's library?\r\n\r\n{titles}",
+				"Remove books from Libation?",
+				MessageBoxButtons.YesNo,
+				MessageBoxIcon.Question,
+				MessageBoxDefaultButton.Button1);
+
+			if (result == DialogResult.Yes)
+			{
+				using var context = DbContexts.GetContext();
+
+				var libBooks = context.GetLibrary_Flat_NoTracking();
+
+				var removeLibraryBooks = libBooks.Where(lb => selectedBooks.Any(rge => rge.AudibleProductId == lb.Book.AudibleProductId)).ToList();
+
+				context.Library.RemoveRange(removeLibraryBooks);
+				context.SaveChanges();
+
+				foreach (var rEntry in selectedBooks)
+					_removableGridEntries.Remove(rEntry);
+
+				BooksRemoved = removeLibraryBooks.Count > 0;
+
+				UpdateSelection();
+			}
+		}
+		private void UpdateSelection()
+		{
+			_dataGridView.Sort(_dataGridView.Columns[0], ListSortDirection.Descending);
+			var selectedCount = SelectedCount;
+			label1.Text = string.Format(_labelFormat, selectedCount, selectedCount != 1 ? "s" : string.Empty);
+			btnRemoveBooks.Enabled = selectedCount > 0;
+		}
+	}
+
+	internal class RemovableGridEntry : GridEntry
+	{
+		private static readonly IComparer BoolComparer = new ObjectComparer<bool>();
+
+		private bool _remove = false;
+		public RemovableGridEntry(LibraryBook libraryBook) : base(libraryBook) { }
+
+		public bool Remove
+		{
+			get
+			{
+				return _remove;
+			}
+			set
+			{
+				if (_remove != value)
+				{
+					_remove = value;
+					NotifyPropertyChanged();
+				}
+			}
+		}
+
+		public override object GetMemberValue(string memberName)
+		{
+			if (memberName == nameof(Remove))
+				return Remove;
+			return base.GetMemberValue(memberName);
+		}
+
+		public override IComparer GetMemberComparer(Type memberType)
+		{
+			if (memberType == typeof(bool))
+				return BoolComparer;
+			return base.GetMemberComparer(memberType);
+		}
+	}
+}

LibationWinForms/Dialogs/RemoveBooksDialog.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=5.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>

LibationWinForms/Dialogs/ScanAccountsDialog.cs

@@ -1,10 +1,8 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
+using InternalUtilities;
+using System;
 using System.Linq;
-using System.Threading.Tasks;
+using System.Collections.Generic;
 using System.Windows.Forms;
-using InternalUtilities;
 
 namespace LibationWinForms.Dialogs
 {
@@ -12,7 +10,7 @@ namespace LibationWinForms.Dialogs
 	{
 		public List<Account> CheckedAccounts { get; } = new List<Account>();
 
-		Form1 _parent { get; }
+		private Form1 _parent { get; }
 
 		public ScanAccountsDialog(Form1 parent)
 		{
@@ -21,7 +19,7 @@ namespace LibationWinForms.Dialogs
 			InitializeComponent();
 		}
 
-		class listItem
+		private class listItem
 		{
 			public Account Account { get; set; }
 			public string Text { get; set; }

LibationWinForms/Dialogs/ScanAccountsDialog.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/SearchSyntaxDialog.cs

@@ -1,20 +1,21 @@
 using System;
+using System.Linq;
 using System.Windows.Forms;
 
 namespace LibationWinForms.Dialogs
 {
-    public partial class SearchSyntaxDialog : Form
-    {
-        public SearchSyntaxDialog()
-        {
-            InitializeComponent();
+	public partial class SearchSyntaxDialog : Form
+	{
+		public SearchSyntaxDialog()
+		{
+			InitializeComponent();
 
-            label2.Text += "\r\n\r\n" + string.Join("\r\n", LibationSearchEngine.SearchEngine.GetSearchStringFields());
-            label3.Text += "\r\n\r\n" + string.Join("\r\n", LibationSearchEngine.SearchEngine.GetSearchNumberFields());
-            label4.Text += "\r\n\r\n" + string.Join("\r\n", LibationSearchEngine.SearchEngine.GetSearchBoolFields());
-            label5.Text += "\r\n\r\n" + string.Join("\r\n", LibationSearchEngine.SearchEngine.GetSearchIdFields());
-        }
+			label2.Text += "\r\n\r\n" + string.Join("\r\n", LibationSearchEngine.SearchEngine.GetSearchStringFields());
+			label3.Text += "\r\n\r\n" + string.Join("\r\n", LibationSearchEngine.SearchEngine.GetSearchNumberFields());
+			label4.Text += "\r\n\r\n" + string.Join("\r\n", LibationSearchEngine.SearchEngine.GetSearchBoolFields());
+			label5.Text += "\r\n\r\n" + string.Join("\r\n", LibationSearchEngine.SearchEngine.GetSearchIdFields());
+		}
 
-        private void CloseBtn_Click(object sender, EventArgs e) => this.Close();
-    }
+		private void CloseBtn_Click(object sender, EventArgs e) => this.Close();
+	}
 }

LibationWinForms/Dialogs/SearchSyntaxDialog.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/SettingsDialog.cs

@@ -1,15 +1,16 @@
-using System;
+using Dinah.Core;
+using FileManager;
+using System;
+using System.Linq;
 using System.IO;
 using System.Windows.Forms;
-using Dinah.Core;
-using FileManager;
 
 namespace LibationWinForms.Dialogs
 {
 	public partial class SettingsDialog : Form
 	{
-		Configuration config { get; } = Configuration.Instance;
-		Func<string, string> desc { get; } = Configuration.GetDescription;
+		private Configuration config { get; } = Configuration.Instance;
+		private Func<string, string> desc { get; } = Configuration.GetDescription;
 
 		public SettingsDialog() => InitializeComponent();
 
@@ -57,13 +58,13 @@ namespace LibationWinForms.Dialogs
 			inProgressSelectControl.SelectDirectory(config.InProgress);
 		}
 
-        private void allowLibationFixupCbox_CheckedChanged(object sender, EventArgs e)
-        {
+		private void allowLibationFixupCbox_CheckedChanged(object sender, EventArgs e)
+		{
 			convertLosslessRb.Enabled = allowLibationFixupCbox.Checked;
 			convertLossyRb.Enabled = allowLibationFixupCbox.Checked;
 
 			if (!allowLibationFixupCbox.Checked)
-            {
+			{
 				convertLosslessRb.Checked = true;
 			}
 		}

LibationWinForms/Dialogs/SettingsDialog.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/SetupDialog.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Linq;
 using System.Windows.Forms;
 
 namespace LibationWinForms.Dialogs

LibationWinForms/Dialogs/SetupDialog.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/EditTagsDataGridViewImageButtonColumn.cs

@@ -0,0 +1,41 @@
+using System.Drawing;
+using System.Windows.Forms;
+
+namespace LibationWinForms
+{
+	public class EditTagsDataGridViewImageButtonColumn : DataGridViewButtonColumn
+	{
+		public EditTagsDataGridViewImageButtonColumn()
+		{
+			CellTemplate = new EditTagsDataGridViewImageButtonCell();
+		}
+	}
+
+	internal class EditTagsDataGridViewImageButtonCell : DataGridViewImageButtonCell
+	{
+		private static readonly Image ButtonImage = Properties.Resources.edit_25x25;
+		private static readonly Color HiddenForeColor = Color.LightGray;
+
+		protected override void Paint(Graphics graphics, Rectangle clipBounds, Rectangle cellBounds, int rowIndex, DataGridViewElementStates elementState, object value, object formattedValue, string errorText, DataGridViewCellStyle cellStyle, DataGridViewAdvancedBorderStyle advancedBorderStyle, DataGridViewPaintParts paintParts)
+		{
+			var tagsString = (string)value;
+
+			var foreColor = tagsString?.Contains("hidden") == true ? HiddenForeColor : DataGridView.DefaultCellStyle.ForeColor;
+
+			if (DataGridView.Rows[rowIndex].DefaultCellStyle.ForeColor != foreColor)
+			{
+				DataGridView.Rows[rowIndex].DefaultCellStyle.ForeColor = foreColor;
+			}
+
+			if (tagsString?.Length == 0)
+			{
+				base.Paint(graphics, clipBounds, cellBounds, rowIndex, elementState, null, null, null, cellStyle, advancedBorderStyle, paintParts);
+				DrawButtonImage(graphics, ButtonImage, cellBounds);
+			}
+			else
+			{
+				base.Paint(graphics, clipBounds, cellBounds, rowIndex, elementState, value, formattedValue, errorText, cellStyle, advancedBorderStyle, paintParts);
+			}
+		}
+	}
+}

LibationWinForms/Form1.Designer.cs

@@ -39,6 +39,9 @@
 			this.scanLibraryToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
 			this.scanLibraryOfAllAccountsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
 			this.scanLibraryOfSomeAccountsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.removeLibraryBooksToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.removeAllAccountsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.removeSomeAccountsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
 			this.liberateToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
 			this.beginBookBackupsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
 			this.beginPdfBackupsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
@@ -128,7 +131,8 @@
             this.noAccountsYetAddAccountToolStripMenuItem,
             this.scanLibraryToolStripMenuItem,
             this.scanLibraryOfAllAccountsToolStripMenuItem,
-            this.scanLibraryOfSomeAccountsToolStripMenuItem});
+            this.scanLibraryOfSomeAccountsToolStripMenuItem,
+            this.removeLibraryBooksToolStripMenuItem});
 			this.importToolStripMenuItem.Name = "importToolStripMenuItem";
 			this.importToolStripMenuItem.Size = new System.Drawing.Size(55, 20);
 			this.importToolStripMenuItem.Text = "&Import";
@@ -161,6 +165,29 @@
 			this.scanLibraryOfSomeAccountsToolStripMenuItem.Text = "Scan Library of &Some Accounts...";
 			this.scanLibraryOfSomeAccountsToolStripMenuItem.Click += new System.EventHandler(this.scanLibraryOfSomeAccountsToolStripMenuItem_Click);
 			// 
+			// removeLibraryBooksToolStripMenuItem
+			// 
+			this.removeLibraryBooksToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.removeAllAccountsToolStripMenuItem,
+            this.removeSomeAccountsToolStripMenuItem});
+			this.removeLibraryBooksToolStripMenuItem.Name = "removeLibraryBooksToolStripMenuItem";
+			this.removeLibraryBooksToolStripMenuItem.Size = new System.Drawing.Size(247, 22);
+			this.removeLibraryBooksToolStripMenuItem.Text = "Remove Library Books";
+			// 
+			// removeAllAccountsToolStripMenuItem
+			// 
+			this.removeAllAccountsToolStripMenuItem.Name = "removeAllAccountsToolStripMenuItem";
+			this.removeAllAccountsToolStripMenuItem.Size = new System.Drawing.Size(157, 22);
+			this.removeAllAccountsToolStripMenuItem.Text = "All Accounts";
+			this.removeAllAccountsToolStripMenuItem.Click += new System.EventHandler(this.removeAllAccountsToolStripMenuItem_Click);
+			// 
+			// removeSomeAccountsToolStripMenuItem
+			// 
+			this.removeSomeAccountsToolStripMenuItem.Name = "removeSomeAccountsToolStripMenuItem";
+			this.removeSomeAccountsToolStripMenuItem.Size = new System.Drawing.Size(157, 22);
+			this.removeSomeAccountsToolStripMenuItem.Text = "Some Accounts";
+			this.removeSomeAccountsToolStripMenuItem.Click += new System.EventHandler(this.removeSomeAccountsToolStripMenuItem_Click);
+			// 
 			// liberateToolStripMenuItem
 			// 
 			this.liberateToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
@@ -190,7 +217,7 @@
 			this.convertAllM4bToMp3ToolStripMenuItem.Name = "convertAllM4bToMp3ToolStripMenuItem";
 			this.convertAllM4bToMp3ToolStripMenuItem.Size = new System.Drawing.Size(284, 22);
 			this.convertAllM4bToMp3ToolStripMenuItem.Text = "Convert all M4b to Mp3 [Long-running]";
-			this.convertAllM4bToMp3ToolStripMenuItem.Visible = false;
+			this.convertAllM4bToMp3ToolStripMenuItem.Visible = true;
 			this.convertAllM4bToMp3ToolStripMenuItem.Click += new System.EventHandler(this.convertAllM4bToMp3ToolStripMenuItem_Click);
 			// 
 			// exportToolStripMenuItem
@@ -277,26 +304,26 @@
 			// visibleCountLbl
 			// 
 			this.visibleCountLbl.Name = "visibleCountLbl";
-			this.visibleCountLbl.Size = new System.Drawing.Size(61, 17);
-			this.visibleCountLbl.Text = "Visible: {0}";
+			this.visibleCountLbl.Size = new System.Drawing.Size(53, 17);
+			this.visibleCountLbl.Text = "Visible: 0";
 			// 
 			// springLbl
 			// 
 			this.springLbl.Name = "springLbl";
-			this.springLbl.Size = new System.Drawing.Size(375, 17);
+			this.springLbl.Size = new System.Drawing.Size(517, 17);
 			this.springLbl.Spring = true;
 			// 
 			// backupsCountsLbl
 			// 
 			this.backupsCountsLbl.Name = "backupsCountsLbl";
-			this.backupsCountsLbl.Size = new System.Drawing.Size(336, 17);
-			this.backupsCountsLbl.Text = "BACKUPS: No progress: {0}  Encrypted: {1}  Fully backed up: {2}";
+			this.backupsCountsLbl.Size = new System.Drawing.Size(218, 17);
+			this.backupsCountsLbl.Text = "[Calculating backed up book quantities]";
 			// 
 			// pdfsCountsLbl
 			// 
 			this.pdfsCountsLbl.Name = "pdfsCountsLbl";
-			this.pdfsCountsLbl.Size = new System.Drawing.Size(218, 17);
-			this.pdfsCountsLbl.Text = "|  PDFs: NOT d/l\'ed: {0}  Downloaded: {1}";
+			this.pdfsCountsLbl.Size = new System.Drawing.Size(171, 17);
+			this.pdfsCountsLbl.Text = "|  [Calculating backed up PDFs]";
 			// 
 			// addFilterBtn
 			// 
@@ -368,5 +395,8 @@
 		private System.Windows.Forms.ToolStripMenuItem exportToolStripMenuItem;
 		private System.Windows.Forms.ToolStripMenuItem exportLibraryToolStripMenuItem;
         private System.Windows.Forms.ToolStripMenuItem convertAllM4bToMp3ToolStripMenuItem;
-    }
+        private System.Windows.Forms.ToolStripMenuItem removeLibraryBooksToolStripMenuItem;
+        private System.Windows.Forms.ToolStripMenuItem removeAllAccountsToolStripMenuItem;
+        private System.Windows.Forms.ToolStripMenuItem removeSomeAccountsToolStripMenuItem;
+	}
 }

LibationWinForms/Form1.cs

@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using System.Windows.Forms;
-using ApplicationServices;
+using ApplicationServices;
 using DataLayer;
 using Dinah.Core;
 using Dinah.Core.Drawing;
@@ -11,332 +6,368 @@ using Dinah.Core.Windows.Forms;
 using FileManager;
 using InternalUtilities;
 using LibationWinForms.Dialogs;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using System.Windows.Forms;
 
 namespace LibationWinForms
 {
-    public partial class Form1 : Form
-    {
-        private string backupsCountsLbl_Format { get; }
-        private string pdfsCountsLbl_Format { get; }
-		private string visibleCountLbl_Format { get; }
-
+	public partial class Form1 : Form
+	{
 		private string beginBookBackupsToolStripMenuItem_format { get; }
 		private string beginPdfBackupsToolStripMenuItem_format { get; }
 
 		public Form1()
-        {
-            InitializeComponent();
-
-            // back up string formats
-            backupsCountsLbl_Format = backupsCountsLbl.Text;
-            pdfsCountsLbl_Format = pdfsCountsLbl.Text;
-            visibleCountLbl_Format = visibleCountLbl.Text;
-
-			beginBookBackupsToolStripMenuItem_format = beginBookBackupsToolStripMenuItem.Text;
-            beginPdfBackupsToolStripMenuItem_format = beginPdfBackupsToolStripMenuItem.Text;
-
-            // after backing up formats: can set default/temp visible text
-            backupsCountsLbl.Text = "[Calculating backed up book quantities]";
-            pdfsCountsLbl.Text = "[Calculating backed up PDFs]";
-			setVisibleCount(null, 0);
-
-            if (this.DesignMode)
-                return;
-
-            // independent UI updates
-            this.Load += setBackupCountsAsync;
-            this.Load += (_, __) => RestoreSizeAndLocation();
-            this.Load += (_, __) => RefreshImportMenu();
-
-            // start background service
-            this.Load += (_, __) => startBackgroundImageDownloader();
-        }
-
-        private static void startBackgroundImageDownloader()
-        {
-            // load default/missing cover images. this will also initiate the background image downloader
-            var format = System.Drawing.Imaging.ImageFormat.Jpeg;
-            PictureStorage.SetDefaultImage(PictureSize._80x80, Properties.Resources.default_cover_80x80.ToBytes(format));
-            PictureStorage.SetDefaultImage(PictureSize._300x300, Properties.Resources.default_cover_300x300.ToBytes(format));
-            PictureStorage.SetDefaultImage(PictureSize._500x500, Properties.Resources.default_cover_500x500.ToBytes(format));
-        }
-
-        private void Form1_Load(object sender, EventArgs e)
 		{
-            if (this.DesignMode)
-                return;
+			InitializeComponent();
 
-            reloadGrid();
-            
-            // also applies filter. ONLY call AFTER loading grid
-            loadInitialQuickFilterState();
-        }
+			// back up string formats
+			beginBookBackupsToolStripMenuItem_format = beginBookBackupsToolStripMenuItem.Text;
+			beginPdfBackupsToolStripMenuItem_format = beginPdfBackupsToolStripMenuItem.Text;
 
-        private void Form1_FormClosing(object sender, FormClosingEventArgs e)
-        {
-            SaveSizeAndLocation();
-        }
+			if (this.DesignMode)
+				return;
+
+			// independent UI updates
+			this.Load += setBackupCountsAsync;
+			this.Load += (_, __) => RestoreSizeAndLocation();
+			this.Load += (_, __) => RefreshImportMenu();
+
+			var format = System.Drawing.Imaging.ImageFormat.Jpeg;
+			PictureStorage.SetDefaultImage(PictureSize._80x80, Properties.Resources.default_cover_80x80.ToBytes(format));
+			PictureStorage.SetDefaultImage(PictureSize._300x300, Properties.Resources.default_cover_300x300.ToBytes(format));
+			PictureStorage.SetDefaultImage(PictureSize._500x500, Properties.Resources.default_cover_500x500.ToBytes(format));
+		}
+
+		private void Form1_Load(object sender, EventArgs e)
+		{
+			if (this.DesignMode)
+				return;
+
+			reloadGrid();
+
+			// also applies filter. ONLY call AFTER loading grid
+			loadInitialQuickFilterState();
+			
+		}
+
+		private void Form1_FormClosing(object sender, FormClosingEventArgs e)
+		{
+			SaveSizeAndLocation();
+		}
 
 		private void RestoreSizeAndLocation()
 		{
-            var config = Configuration.Instance;
+			var config = Configuration.Instance;
 
-            var width = config.MainFormWidth;
-            var height = config.MainFormHeight;
+			var width = config.MainFormWidth;
+			var height = config.MainFormHeight;
 
-            // too small -- something must have gone wrong. use defaults
-            if (width < 25 || height < 25)
-            {
-                width = 1023;
-                height = 578;
-            }
+			// too small -- something must have gone wrong. use defaults
+			if (width < 25 || height < 25)
+			{
+				width = 1023;
+				height = 578;
+			}
 
-            // Fit to the current screen size in case the screen resolution changed since the size was last persisted
-            if (width > Screen.PrimaryScreen.WorkingArea.Width)
-                width = Screen.PrimaryScreen.WorkingArea.Width;
-            if (height > Screen.PrimaryScreen.WorkingArea.Height)
-                height = Screen.PrimaryScreen.WorkingArea.Height;
+			// Fit to the current screen size in case the screen resolution changed since the size was last persisted
+			if (width > Screen.PrimaryScreen.WorkingArea.Width)
+				width = Screen.PrimaryScreen.WorkingArea.Width;
+			if (height > Screen.PrimaryScreen.WorkingArea.Height)
+				height = Screen.PrimaryScreen.WorkingArea.Height;
 
-            var x = config.MainFormX;
-            var y = config.MainFormY;
+			var x = config.MainFormX;
+			var y = config.MainFormY;
 
-            var rect = new System.Drawing.Rectangle(x, y, width, height);
+			var rect = new System.Drawing.Rectangle(x, y, width, height);
 
-            // is proposed rect on a screen?
-            if (Screen.AllScreens.Any(screen => screen.WorkingArea.Contains(rect)))
-            {
-                this.StartPosition = FormStartPosition.Manual;
-                this.DesktopBounds = rect;
-            }
-            else
-            {
-                this.StartPosition = FormStartPosition.WindowsDefaultLocation;
-                this.Size = rect.Size;
-            }
+			// is proposed rect on a screen?
+			if (Screen.AllScreens.Any(screen => screen.WorkingArea.Contains(rect)))
+			{
+				this.StartPosition = FormStartPosition.Manual;
+				this.DesktopBounds = rect;
+			}
+			else
+			{
+				this.StartPosition = FormStartPosition.WindowsDefaultLocation;
+				this.Size = rect.Size;
+			}
 
-            // FINAL: for Maximized: start normal state, set size and location, THEN set max state
-            this.WindowState = config.MainFormIsMaximized ? FormWindowState.Maximized : FormWindowState.Normal;
-        }
+			// FINAL: for Maximized: start normal state, set size and location, THEN set max state
+			this.WindowState = config.MainFormIsMaximized ? FormWindowState.Maximized : FormWindowState.Normal;
+		}
 
-        private void SaveSizeAndLocation()
-        {
-            System.Drawing.Point location;
-            System.Drawing.Size size;
+		private void SaveSizeAndLocation()
+		{
+			System.Drawing.Point location;
+			System.Drawing.Size size;
 
-            // save location and size if the state is normal
-            if (this.WindowState == FormWindowState.Normal)
-            {
-                location = this.Location;
-                size = this.Size;
-            }
-            else
-            {
-                // save the RestoreBounds if the form is minimized or maximized
-                location = this.RestoreBounds.Location;
-                size = this.RestoreBounds.Size;
-            }
-            
-            var config = Configuration.Instance;
+			// save location and size if the state is normal
+			if (this.WindowState == FormWindowState.Normal)
+			{
+				location = this.Location;
+				size = this.Size;
+			}
+			else
+			{
+				// save the RestoreBounds if the form is minimized or maximized
+				location = this.RestoreBounds.Location;
+				size = this.RestoreBounds.Size;
+			}
 
-            config.MainFormX = location.X;
-            config.MainFormY = location.Y;
+			var config = Configuration.Instance;
 
-            config.MainFormWidth = size.Width;
-            config.MainFormHeight = size.Height;
+			config.MainFormX = location.X;
+			config.MainFormY = location.Y;
 
-            config.MainFormIsMaximized = this.WindowState == FormWindowState.Maximized;
-        }
+			config.MainFormWidth = size.Width;
+			config.MainFormHeight = size.Height;
 
-        #region reload grid
-        bool isProcessingGridSelect = false;
-        private void reloadGrid()
-        {
-            // suppressed filter while init'ing UI
-            var prev_isProcessingGridSelect = isProcessingGridSelect;
-            isProcessingGridSelect = true;
-            setGrid();
-            isProcessingGridSelect = prev_isProcessingGridSelect;
+			config.MainFormIsMaximized = this.WindowState == FormWindowState.Maximized;
+		}
 
-            // UI init complete. now we can apply filter
-            doFilter(lastGoodFilter);
-        }
+		#region reload grid
+		private bool isProcessingGridSelect = false;
+		private void reloadGrid()
+		{
+			// suppressed filter while init'ing UI
+			var prev_isProcessingGridSelect = isProcessingGridSelect;
+			isProcessingGridSelect = true;
+			setGrid();
+			isProcessingGridSelect = prev_isProcessingGridSelect;
 
-        ProductsGrid currProductsGrid;
-        private void setGrid()
-        {
-            SuspendLayout();
-            {
-                if (currProductsGrid != null)
-                {
-                    gridPanel.Controls.Remove(currProductsGrid);
-                    currProductsGrid.VisibleCountChanged -= setVisibleCount;
-                    currProductsGrid.BackupCountsChanged -= setBackupCountsAsync;
-                    currProductsGrid.Dispose();
-                }
+			// UI init complete. now we can apply filter
+			doFilter(lastGoodFilter);
+		}
 
-                currProductsGrid = new ProductsGrid { Dock = DockStyle.Fill };
-                currProductsGrid.VisibleCountChanged += setVisibleCount;
-                currProductsGrid.BackupCountsChanged += setBackupCountsAsync;
-                gridPanel.UIThread(() => gridPanel.Controls.Add(currProductsGrid));
-                currProductsGrid.Display();
-            }
-            ResumeLayout();
-        }
-        #endregion
+		private ProductsGrid currProductsGrid;
+		private void setGrid()
+		{
+			SuspendLayout();
+			{
+				if (currProductsGrid != null)
+				{
+					gridPanel.Controls.Remove(currProductsGrid);
+					currProductsGrid.VisibleCountChanged -= setVisibleCount;
+					currProductsGrid.BackupCountsChanged -= setBackupCountsAsync;
+					currProductsGrid.Dispose();
+				}
 
-        #region bottom: qty books visible
-        private void setVisibleCount(object _, int qty) => visibleCountLbl.Text = string.Format(visibleCountLbl_Format, qty);
-        #endregion
+				currProductsGrid = new ProductsGrid { Dock = DockStyle.Fill };
+				currProductsGrid.VisibleCountChanged += setVisibleCount;
+				currProductsGrid.BackupCountsChanged += setBackupCountsAsync;
+				gridPanel.UIThread(() => gridPanel.Controls.Add(currProductsGrid));
+				currProductsGrid.Display();
+			}
+			ResumeLayout();
+		}
+		#endregion
 
-        #region bottom: backup counts
-        private async void setBackupCountsAsync(object _, object __)
-        {
-            LibraryCommands.LibraryStats libraryStats = null;
-            await Task.Run(() => libraryStats = LibraryCommands.GetCounts());
+		#region bottom: qty books visible
+		private void setVisibleCount(object _, int qty) => visibleCountLbl.Text = string.Format("Visible: {0}", qty);
+		#endregion
 
-            setBookBackupCounts(libraryStats.booksFullyBackedUp, libraryStats.booksDownloadedOnly, libraryStats.booksNoProgress);
-            setPdfBackupCounts(libraryStats.pdfsDownloaded, libraryStats.pdfsNotDownloaded);
-        }
-        private void setBookBackupCounts(int booksFullyBackedUp, int booksDownloadedOnly, int booksNoProgress)
-        {
-            // enable/disable export
-            var hasResults = 0 < (booksFullyBackedUp + booksDownloadedOnly + booksNoProgress);
-            exportLibraryToolStripMenuItem.Enabled = hasResults;
+		#region bottom: backup counts
+		private async void setBackupCountsAsync(object _, object __)
+		{
+			LibraryCommands.LibraryStats libraryStats = null;
+			await Task.Run(() => libraryStats = LibraryCommands.GetCounts());
 
-            // update bottom numbers
-            var pending = booksNoProgress + booksDownloadedOnly;
-            var statusStripText
-                = !hasResults ? "No books. Begin by importing your library"
-                : pending > 0 ? string.Format(backupsCountsLbl_Format, booksNoProgress, booksDownloadedOnly, booksFullyBackedUp)
-                : $"All {"book".PluralizeWithCount(booksFullyBackedUp)} backed up";
+			setBookBackupCounts(libraryStats.booksFullyBackedUp, libraryStats.booksDownloadedOnly, libraryStats.booksNoProgress);
+			setPdfBackupCounts(libraryStats.pdfsDownloaded, libraryStats.pdfsNotDownloaded);
+		}
+		private void setBookBackupCounts(int booksFullyBackedUp, int booksDownloadedOnly, int booksNoProgress)
+		{
+			var backupsCountsLbl_Format = "BACKUPS: No progress: {0}  Encrypted: {1}  Fully backed up: {2}";
 
-            // update menu item
-            var menuItemText
-                = pending > 0
-                ? $"{pending} remaining"
-                : "All books have been liberated";
+			// enable/disable export
+			var hasResults = 0 < (booksFullyBackedUp + booksDownloadedOnly + booksNoProgress);
+			exportLibraryToolStripMenuItem.Enabled = hasResults;
 
-            // update UI
-            statusStrip1.UIThread(() => backupsCountsLbl.Text = statusStripText);
-            menuStrip1.UIThread(() => beginBookBackupsToolStripMenuItem.Enabled = pending > 0);
-            menuStrip1.UIThread(() => beginBookBackupsToolStripMenuItem.Text = string.Format(beginBookBackupsToolStripMenuItem_format, menuItemText));
-        }
-        private void setPdfBackupCounts(int pdfsDownloaded, int pdfsNotDownloaded)
-        {
-            // update bottom numbers
-            var hasResults = 0 < (pdfsNotDownloaded + pdfsDownloaded);
-            var statusStripText
-                = !hasResults ? ""
-                : pdfsNotDownloaded > 0 ? string.Format(pdfsCountsLbl_Format, pdfsNotDownloaded, pdfsDownloaded)
-                : $"|  All {pdfsDownloaded} PDFs downloaded";
+			// update bottom numbers
+			var pending = booksNoProgress + booksDownloadedOnly;
+			var statusStripText
+				= !hasResults ? "No books. Begin by importing your library"
+				: pending > 0 ? string.Format(backupsCountsLbl_Format, booksNoProgress, booksDownloadedOnly, booksFullyBackedUp)
+				: $"All {"book".PluralizeWithCount(booksFullyBackedUp)} backed up";
 
-            // update menu item
-            var menuItemText
-                = pdfsNotDownloaded > 0
-                ? $"{pdfsNotDownloaded} remaining"
-                : "All PDFs have been downloaded";
+			// update menu item
+			var menuItemText
+				= pending > 0
+				? $"{pending} remaining"
+				: "All books have been liberated";
 
-            // update UI
-            statusStrip1.UIThread(() => pdfsCountsLbl.Text = statusStripText);
-            menuStrip1.UIThread(() => beginPdfBackupsToolStripMenuItem.Enabled = pdfsNotDownloaded > 0);
-            menuStrip1.UIThread(() => beginPdfBackupsToolStripMenuItem.Text = string.Format(beginPdfBackupsToolStripMenuItem_format, menuItemText));
-        }
-        #endregion
+			// update UI
+			statusStrip1.UIThread(() => backupsCountsLbl.Text = statusStripText);
+			menuStrip1.UIThread(() => beginBookBackupsToolStripMenuItem.Enabled = pending > 0);
+			menuStrip1.UIThread(() => beginBookBackupsToolStripMenuItem.Text = string.Format(beginBookBackupsToolStripMenuItem_format, menuItemText));
+		}
+		private void setPdfBackupCounts(int pdfsDownloaded, int pdfsNotDownloaded)
+		{
+			var pdfsCountsLbl_Format = "|  PDFs: NOT d/l\'ed: {0}  Downloaded: {1}";
 
-        #region filter
-        private void filterHelpBtn_Click(object sender, EventArgs e) => new SearchSyntaxDialog().ShowDialog();
+			// update bottom numbers
+			var hasResults = 0 < (pdfsNotDownloaded + pdfsDownloaded);
+			var statusStripText
+				= !hasResults ? ""
+				: pdfsNotDownloaded > 0 ? string.Format(pdfsCountsLbl_Format, pdfsNotDownloaded, pdfsDownloaded)
+				: $"|  All {pdfsDownloaded} PDFs downloaded";
 
-        private void AddFilterBtn_Click(object sender, EventArgs e)
-        {
-            QuickFilters.Add(this.filterSearchTb.Text);
-            UpdateFilterDropDown();
-        }
+			// update menu item
+			var menuItemText
+				= pdfsNotDownloaded > 0
+				? $"{pdfsNotDownloaded} remaining"
+				: "All PDFs have been downloaded";
 
-        private void filterSearchTb_KeyPress(object sender, KeyPressEventArgs e)
-        {
-            if (e.KeyChar == (char)Keys.Return)
-            {
-                doFilter();
+			// update UI
+			statusStrip1.UIThread(() => pdfsCountsLbl.Text = statusStripText);
+			menuStrip1.UIThread(() => beginPdfBackupsToolStripMenuItem.Enabled = pdfsNotDownloaded > 0);
+			menuStrip1.UIThread(() => beginPdfBackupsToolStripMenuItem.Text = string.Format(beginPdfBackupsToolStripMenuItem_format, menuItemText));
+		}
+		#endregion
 
-                // silence the 'ding'
-                e.Handled = true;
-            }
-        }
-        private void filterBtn_Click(object sender, EventArgs e) => doFilter();
+		#region filter
+		private void filterHelpBtn_Click(object sender, EventArgs e) => new SearchSyntaxDialog().ShowDialog();
 
-        string lastGoodFilter = "";
-        private void doFilter(string filterString)
-        {
-            this.filterSearchTb.Text = filterString;
-            doFilter();
-        }
-        private void doFilter()
-        {
-            if (isProcessingGridSelect || currProductsGrid == null)
-                return;
+		private void AddFilterBtn_Click(object sender, EventArgs e)
+		{
+			QuickFilters.Add(this.filterSearchTb.Text);
+			UpdateFilterDropDown();
+		}
 
-            try
-            {
-                currProductsGrid.Filter(filterSearchTb.Text);
-                lastGoodFilter = filterSearchTb.Text;
-            }
-            catch (Exception ex)
-            {
-                MessageBox.Show($"Bad filter string:\r\n\r\n{ex.Message}", "Bad filter string", MessageBoxButtons.OK, MessageBoxIcon.Error);
+		private void filterSearchTb_KeyPress(object sender, KeyPressEventArgs e)
+		{
+			if (e.KeyChar == (char)Keys.Return)
+			{
+				doFilter();
 
-                // re-apply last good filter
-                doFilter(lastGoodFilter);
-            }
-        }
-        #endregion
+				// silence the 'ding'
+				e.Handled = true;
+			}
+		}
+		private void filterBtn_Click(object sender, EventArgs e) => doFilter();
 
-        #region Import menu
-        public void RefreshImportMenu()
-        {
-            using var persister = AudibleApiStorage.GetAccountsSettingsPersister();
-            var count = persister.AccountsSettings.Accounts.Count;
+		private string lastGoodFilter = "";
+		private void doFilter(string filterString)
+		{
+			this.filterSearchTb.Text = filterString;
+			doFilter();
+		}
+		private void doFilter()
+		{
+			if (isProcessingGridSelect || currProductsGrid == null)
+				return;
 
-            noAccountsYetAddAccountToolStripMenuItem.Visible = count == 0;
-            scanLibraryToolStripMenuItem.Visible = count == 1;
-            scanLibraryOfAllAccountsToolStripMenuItem.Visible = count > 1;
-            scanLibraryOfSomeAccountsToolStripMenuItem.Visible = count > 1;
-        }
+			try
+			{
+				currProductsGrid.Filter(filterSearchTb.Text);
+				lastGoodFilter = filterSearchTb.Text;
+			}
+			catch (Exception ex)
+			{
+				MessageBox.Show($"Bad filter string:\r\n\r\n{ex.Message}", "Bad filter string", MessageBoxButtons.OK, MessageBoxIcon.Error);
 
-        private void noAccountsYetAddAccountToolStripMenuItem_Click(object sender, EventArgs e)
-        {
-            MessageBox.Show("To load your Audible library, come back here to the Import menu after adding your account");
-            new AccountsDialog(this).ShowDialog();
-        }
+				// re-apply last good filter
+				doFilter(lastGoodFilter);
+			}
+		}
+		#endregion
 
-        private void scanLibraryToolStripMenuItem_Click(object sender, EventArgs e)
-        {
-            using var persister = AudibleApiStorage.GetAccountsSettingsPersister();
-            var firstAccount = persister.AccountsSettings.GetAll().FirstOrDefault();
-            scanLibraries(firstAccount);
-        }
+		#region Import menu
+		public void RefreshImportMenu()
+		{
+			using var persister = AudibleApiStorage.GetAccountsSettingsPersister();
+			var count = persister.AccountsSettings.Accounts.Count;
 
-        private void scanLibraryOfAllAccountsToolStripMenuItem_Click(object sender, EventArgs e)
-        {
-            using var persister = AudibleApiStorage.GetAccountsSettingsPersister();
-            var allAccounts = persister.AccountsSettings.GetAll();
-            scanLibraries(allAccounts);
-        }
+			noAccountsYetAddAccountToolStripMenuItem.Visible = count == 0;
+			scanLibraryToolStripMenuItem.Visible = count == 1;
+			scanLibraryOfAllAccountsToolStripMenuItem.Visible = count > 1;
+			scanLibraryOfSomeAccountsToolStripMenuItem.Visible = count > 1;
 
-        private void scanLibraryOfSomeAccountsToolStripMenuItem_Click(object sender, EventArgs e)
-        {
-            using var scanAccountsDialog = new ScanAccountsDialog(this);
+			removeLibraryBooksToolStripMenuItem.Visible = count != 0;
 
-            if (scanAccountsDialog.ShowDialog() != DialogResult.OK)
-                return;
+			if (count == 1)
+			{
+				removeLibraryBooksToolStripMenuItem.Click += removeThisAccountToolStripMenuItem_Click;
+			}
 
-            if (!scanAccountsDialog.CheckedAccounts.Any())
-                return;
+			removeSomeAccountsToolStripMenuItem.Visible = count > 1;
+			removeAllAccountsToolStripMenuItem.Visible = count > 1;
+		}
 
-            scanLibraries(scanAccountsDialog.CheckedAccounts);
-        }
+		private void noAccountsYetAddAccountToolStripMenuItem_Click(object sender, EventArgs e)
+		{
+			MessageBox.Show("To load your Audible library, come back here to the Import menu after adding your account");
+			new AccountsDialog(this).ShowDialog();
+		}
 
-        private void scanLibraries(IEnumerable<Account> accounts) => scanLibraries(accounts.ToArray());
-        private void scanLibraries(params Account[] accounts)
+		private void scanLibraryToolStripMenuItem_Click(object sender, EventArgs e)
+		{
+			using var persister = AudibleApiStorage.GetAccountsSettingsPersister();
+			var firstAccount = persister.AccountsSettings.GetAll().FirstOrDefault();
+			scanLibraries(firstAccount);
+		}
+
+		private void scanLibraryOfAllAccountsToolStripMenuItem_Click(object sender, EventArgs e)
+		{
+			using var persister = AudibleApiStorage.GetAccountsSettingsPersister();
+			var allAccounts = persister.AccountsSettings.GetAll();
+			scanLibraries(allAccounts);
+		}
+
+		private void scanLibraryOfSomeAccountsToolStripMenuItem_Click(object sender, EventArgs e)
+		{
+			using var scanAccountsDialog = new ScanAccountsDialog(this);
+
+			if (scanAccountsDialog.ShowDialog() != DialogResult.OK)
+				return;
+
+			if (!scanAccountsDialog.CheckedAccounts.Any())
+				return;
+
+			scanLibraries(scanAccountsDialog.CheckedAccounts);
+		}
+
+		private void removeThisAccountToolStripMenuItem_Click(object sender, EventArgs e)
+		{
+			using var persister = AudibleApiStorage.GetAccountsSettingsPersister();
+			var firstAccount = persister.AccountsSettings.GetAll().FirstOrDefault();
+			scanLibrariesRemovedBooks(firstAccount);
+		}
+
+		private void removeAllAccountsToolStripMenuItem_Click(object sender, EventArgs e)
+		{
+			using var persister = AudibleApiStorage.GetAccountsSettingsPersister();
+			var allAccounts = persister.AccountsSettings.GetAll();
+			scanLibrariesRemovedBooks(allAccounts.ToArray());
+		}
+
+		private void removeSomeAccountsToolStripMenuItem_Click(object sender, EventArgs e)
+		{
+			using var scanAccountsDialog = new ScanAccountsDialog(this);
+
+			if (scanAccountsDialog.ShowDialog() != DialogResult.OK)
+				return;
+
+			if (!scanAccountsDialog.CheckedAccounts.Any())
+				return;
+
+			scanLibrariesRemovedBooks(scanAccountsDialog.CheckedAccounts.ToArray());
+		}
+
+		private void scanLibrariesRemovedBooks(params Account[] accounts)
+		{
+			using var dialog = new RemoveBooksDialog(accounts);
+			dialog.ShowDialog();
+
+			if (dialog.BooksRemoved)
+				reloadGrid();
+		}
+
+		private void scanLibraries(IEnumerable<Account> accounts) => scanLibraries(accounts.ToArray());
+		private void scanLibraries(params Account[] accounts)
 		{
 			using var dialog = new IndexLibraryDialog(accounts);
 			dialog.ShowDialog();
@@ -348,112 +379,113 @@ namespace LibationWinForms
 
 			if (totalProcessed > 0)
 				reloadGrid();
-        }
-        #endregion
+		}
+		#endregion
 
-        #region liberate menu
-        private async void beginBookBackupsToolStripMenuItem_Click(object sender, EventArgs e)
-            => await BookLiberation.ProcessorAutomationController.BackupAllBooksAsync(updateGridRow);
+		#region liberate menu
+		private async void beginBookBackupsToolStripMenuItem_Click(object sender, EventArgs e)
+			=> await BookLiberation.ProcessorAutomationController.BackupAllBooksAsync(updateGridRow);
 
-        private async void beginPdfBackupsToolStripMenuItem_Click(object sender, EventArgs e)
-            => await BookLiberation.ProcessorAutomationController.BackupAllPdfsAsync(updateGridRow);
+		private async void beginPdfBackupsToolStripMenuItem_Click(object sender, EventArgs e)
+			=> await BookLiberation.ProcessorAutomationController.BackupAllPdfsAsync(updateGridRow);
 
-        private async void convertAllM4bToMp3ToolStripMenuItem_Click(object sender, EventArgs e)
-            => await BookLiberation.ProcessorAutomationController.ConvertAllBooksAsync();
+		private async void convertAllM4bToMp3ToolStripMenuItem_Click(object sender, EventArgs e)
+			=> await BookLiberation.ProcessorAutomationController.ConvertAllBooksAsync();
 
-        private void updateGridRow(object _, LibraryBook libraryBook) => currProductsGrid.RefreshRow(libraryBook.Book.AudibleProductId);
-        #endregion
+		private void updateGridRow(object _, LibraryBook libraryBook) => currProductsGrid.RefreshRow(libraryBook.Book.AudibleProductId);
+		#endregion
 
-        #region Export menu
-        private void exportLibraryToolStripMenuItem_Click(object sender, EventArgs e)
-        {
-            try
-            {
-                var saveFileDialog = new SaveFileDialog
-                {
-                    Title = "Where to export Library",
-                    Filter = "Excel Workbook (*.xlsx)|*.xlsx|CSV files (*.csv)|*.csv|JSON files (*.json)|*.json" // + "|All files (*.*)|*.*"
-                };
+		#region Export menu
+		private void exportLibraryToolStripMenuItem_Click(object sender, EventArgs e)
+		{
+			try
+			{
+				var saveFileDialog = new SaveFileDialog
+				{
+					Title = "Where to export Library",
+					Filter = "Excel Workbook (*.xlsx)|*.xlsx|CSV files (*.csv)|*.csv|JSON files (*.json)|*.json" // + "|All files (*.*)|*.*"
+				};
 
-                if (saveFileDialog.ShowDialog() != DialogResult.OK)
-                    return;
+				if (saveFileDialog.ShowDialog() != DialogResult.OK)
+					return;
 
-                // FilterIndex is 1-based, NOT 0-based
-                switch (saveFileDialog.FilterIndex)
-                {
-                    case 1: // xlsx
-                    default:
-                        LibraryExporter.ToXlsx(saveFileDialog.FileName);
-                        break;
-                    case 2: // csv
-                        LibraryExporter.ToCsv(saveFileDialog.FileName);
-                        break;
-                    case 3: // json
-                        LibraryExporter.ToJson(saveFileDialog.FileName);
-                        break;
-                }
+				// FilterIndex is 1-based, NOT 0-based
+				switch (saveFileDialog.FilterIndex)
+				{
+					case 1: // xlsx
+					default:
+						LibraryExporter.ToXlsx(saveFileDialog.FileName);
+						break;
+					case 2: // csv
+						LibraryExporter.ToCsv(saveFileDialog.FileName);
+						break;
+					case 3: // json
+						LibraryExporter.ToJson(saveFileDialog.FileName);
+						break;
+				}
 
-                MessageBox.Show("Library exported to:\r\n" + saveFileDialog.FileName);
-            }
-            catch (Exception ex)
-            {
-                MessageBoxAlertAdmin.Show("Error attempting to export your library.", "Error exporting", ex);
-            }
-        }
-        #endregion
+				MessageBox.Show("Library exported to:\r\n" + saveFileDialog.FileName);
+			}
+			catch (Exception ex)
+			{
+				MessageBoxAlertAdmin.Show("Error attempting to export your library.", "Error exporting", ex);
+			}
+		}
+		#endregion
 
-        #region quick filters menu
-        private void loadInitialQuickFilterState()
-        {
-            // set inital state. do once only
-            firstFilterIsDefaultToolStripMenuItem.Checked = QuickFilters.UseDefault;
+		#region quick filters menu
+		private void loadInitialQuickFilterState()
+		{
+			// set inital state. do once only
+			firstFilterIsDefaultToolStripMenuItem.Checked = QuickFilters.UseDefault;
 
-            // load default filter. do once only
-            if (QuickFilters.UseDefault)
-                doFilter(QuickFilters.Filters.FirstOrDefault());
+			// load default filter. do once only
+			if (QuickFilters.UseDefault)
+				doFilter(QuickFilters.Filters.FirstOrDefault());
 
-            // do after every save
-            UpdateFilterDropDown();
-        }
+			// do after every save
+			UpdateFilterDropDown();
+		}
 
-        private void FirstFilterIsDefaultToolStripMenuItem_Click(object sender, EventArgs e)
-        {
-            firstFilterIsDefaultToolStripMenuItem.Checked = !firstFilterIsDefaultToolStripMenuItem.Checked;
-            QuickFilters.UseDefault = firstFilterIsDefaultToolStripMenuItem.Checked;
-        }
+		private void FirstFilterIsDefaultToolStripMenuItem_Click(object sender, EventArgs e)
+		{
+			firstFilterIsDefaultToolStripMenuItem.Checked = !firstFilterIsDefaultToolStripMenuItem.Checked;
+			QuickFilters.UseDefault = firstFilterIsDefaultToolStripMenuItem.Checked;
+		}
 
-        object quickFilterTag { get; } = new object();
-        public void UpdateFilterDropDown()
-        {
-            // remove old
-            for (var i = quickFiltersToolStripMenuItem.DropDownItems.Count - 1; i >= 0; i--)
-            {
-                var menuItem = quickFiltersToolStripMenuItem.DropDownItems[i];
-                if (menuItem.Tag == quickFilterTag)
-                    quickFiltersToolStripMenuItem.DropDownItems.Remove(menuItem);
-            }
+		private object quickFilterTag { get; } = new object();
+		public void UpdateFilterDropDown()
+		{
+			// remove old
+			for (var i = quickFiltersToolStripMenuItem.DropDownItems.Count - 1; i >= 0; i--)
+			{
+				var menuItem = quickFiltersToolStripMenuItem.DropDownItems[i];
+				if (menuItem.Tag == quickFilterTag)
+					quickFiltersToolStripMenuItem.DropDownItems.Remove(menuItem);
+			}
 
-            // re-populate
-            var index = 0;
-            foreach (var filter in QuickFilters.Filters)
-            {
-                var menuItem = new ToolStripMenuItem
-                {
-                    Tag = quickFilterTag,
-                    Text = $"&{++index}: {filter}"
-                };
-                menuItem.Click += (_, __) => doFilter(filter);
-                quickFiltersToolStripMenuItem.DropDownItems.Add(menuItem);
-            }
-        }
+			// re-populate
+			var index = 0;
+			foreach (var filter in QuickFilters.Filters)
+			{
+				var menuItem = new ToolStripMenuItem
+				{
+					Tag = quickFilterTag,
+					Text = $"&{++index}: {filter}"
+				};
+				menuItem.Click += (_, __) => doFilter(filter);
+				quickFiltersToolStripMenuItem.DropDownItems.Add(menuItem);
+			}
+		}
 
-        private void EditQuickFiltersToolStripMenuItem_Click(object sender, EventArgs e) => new EditQuickFilters(this).ShowDialog();
-        #endregion
+		private void EditQuickFiltersToolStripMenuItem_Click(object sender, EventArgs e) => new EditQuickFilters(this).ShowDialog();
+		#endregion
 
-        #region settings menu
-        private void accountsToolStripMenuItem_Click(object sender, EventArgs e) => new AccountsDialog(this).ShowDialog();
+		#region settings menu
+		private void accountsToolStripMenuItem_Click(object sender, EventArgs e) => new AccountsDialog(this).ShowDialog();
 
-        private void basicSettingsToolStripMenuItem_Click(object sender, EventArgs e) => new SettingsDialog().ShowDialog();
-        #endregion
-    }
+		private void basicSettingsToolStripMenuItem_Click(object sender, EventArgs e) => new SettingsDialog().ShowDialog();
+		#endregion
+
+	}
 }

LibationWinForms/GridEntry.cs

@@ -1,87 +1,144 @@
 using System;
+using System.Collections;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Drawing;
 using System.Linq;
 using ApplicationServices;
 using DataLayer;
+using Dinah.Core.DataBinding;
+using Dinah.Core;
+using Dinah.Core.Drawing;
 
 namespace LibationWinForms
 {
-	internal class GridEntry
+	internal class GridEntry : AsyncNotifyPropertyChanged, IMemberComparable
 	{
-		private LibraryBook libraryBook { get; }
-		private Book book => libraryBook.Book;
-
-		public Book GetBook() => book;
-		public LibraryBook GetLibraryBook() => libraryBook;
-
-		public GridEntry(LibraryBook libraryBook) => this.libraryBook = libraryBook;
-
+		#region implementation properties
 		// hide from public fields from Data Source GUI with [Browsable(false)]
 
 		[Browsable(false)]
-		public string AudibleProductId => book.AudibleProductId;
+		public string AudibleProductId => Book.AudibleProductId;
 		[Browsable(false)]
-		public string Tags => book.UserDefinedItem.Tags;
-		[Browsable(false)]
-		public IEnumerable<string> TagsEnumerated => book.UserDefinedItem.TagsEnumerated;
-		[Browsable(false)]
-		public string PictureId => book.PictureId;
-		[Browsable(false)]
-		public LiberatedState Liberated_Status => LibraryCommands.Liberated_Status(book);
-		[Browsable(false)]
-		public PdfState Pdf_Status => LibraryCommands.Pdf_Status(book);
+		public LibraryBook LibraryBook { get; }
 
-		// displayValues is what gets displayed
-		// the value that gets returned from the property is the cell's value
-		// this allows for the value to be sorted one way and displayed another
-		// eg:
-		//   orig title: The Computer
-		//   formatReplacement: The Computer
-		//   value for sorting: Computer
-		private Dictionary<string, string> displayValues { get; } = new Dictionary<string, string>();
-		public bool TryDisplayValue(string key, out string value) => displayValues.TryGetValue(key, out value);
+		#endregion
 
-		public Image Cover =>
-			WindowsDesktopUtilities.WinAudibleImageServer.GetImage(book.PictureId, FileManager.PictureSize._80x80);
+		private Book Book => LibraryBook.Book;
+		private Image _cover;
 
-		public string Title
+		public GridEntry(LibraryBook libraryBook)
 		{
-			get
+			LibraryBook = libraryBook;
+			_memberValues = CreateMemberValueDictionary();
+
+			//Get cover art. If it's default, subscribe to PictureCached
 			{
-				displayValues[nameof(Title)] = book.Title;
-				return getSortName(book.Title);
+				(bool isDefault, byte[] picture) = FileManager.PictureStorage.GetPicture(new FileManager.PictureDefinition(Book.PictureId, FileManager.PictureSize._80x80));
+
+				if (isDefault)
+					FileManager.PictureStorage.PictureCached += PictureStorage_PictureCached;
+
+				//Mutable property. Set the field so PropertyChanged isn't fired.
+				_cover = ImageReader.ToImage(picture);
+			}
+
+			//Immutable properties
+			{
+				Title = Book.Title;
+				Series = Book.SeriesNames;
+				Length = Book.LengthInMinutes == 0 ? "" : $"{Book.LengthInMinutes / 60} hr {Book.LengthInMinutes % 60} min";
+				MyRating = Book.UserDefinedItem.Rating?.ToStarString()?.DefaultIfNullOrWhiteSpace("");
+				PurchaseDate = libraryBook.DateAdded.ToString("d");
+				ProductRating = Book.Rating?.ToStarString()?.DefaultIfNullOrWhiteSpace("");
+				Authors = Book.AuthorNames;
+				Narrators = Book.NarratorNames;
+				Category = string.Join(" > ", Book.CategoriesNames);
+				Misc = GetMiscDisplay(libraryBook);
+				Description = GetDescriptionDisplay(Book);
+			}
+
+			//DisplayTags and Liberate properties are live.
+		}
+
+		private void PictureStorage_PictureCached(object sender, FileManager.PictureCachedEventArgs e)
+		{
+			if (e.Definition.PictureId == Book.PictureId)
+			{
+				Cover = ImageReader.ToImage(e.Picture);
+				FileManager.PictureStorage.PictureCached -= PictureStorage_PictureCached;
 			}
 		}
 
-		public string Authors => book.AuthorNames;
-		public string Narrators => book.NarratorNames;
+		#region Data Source properties
 
-		public int Length
+		public Image Cover
 		{
 			get
 			{
-				displayValues[nameof(Length)]
-					= book.LengthInMinutes == 0
-					? ""
-					: $"{book.LengthInMinutes / 60} hr {book.LengthInMinutes % 60} min";
-
-				return book.LengthInMinutes;
+				return _cover;
 			}
-		}
-
-		public string Series
-		{
-			get
+			private set
 			{
-				displayValues[nameof(Series)] = book.SeriesNames;
-				return getSortName(book.SeriesNames);
+				_cover = value;
+				NotifyPropertyChanged();
 			}
 		}
 
-		private static string[] sortPrefixIgnores { get; } = new[] { "the", "a", "an" };
-		private static string getSortName(string unformattedName)
+		public string ProductRating { get; }
+		public string PurchaseDate { get; }
+		public string MyRating { get; }
+		public string Series { get; }
+		public string Title { get; }
+		public string Length { get; }
+		public string Authors { get; }
+		public string Narrators { get; }
+		public string Category { get; }
+		public string Misc { get; }
+		public string Description { get; }
+		public string DisplayTags => string.Join("\r\n", Book.UserDefinedItem.TagsEnumerated);
+		public (LiberatedState, PdfState) Liberate => (LibraryCommands.Liberated_Status(Book), LibraryCommands.Pdf_Status(Book));
+		#endregion
+
+		#region Data Sorting
+
+		private Dictionary<string, Func<object>> _memberValues { get; }
+
+		/// <summary>
+		/// Create getters for all member object values by name
+		/// </summary>
+		private Dictionary<string, Func<object>> CreateMemberValueDictionary() => new()
+		{
+			{ nameof(Title), () => GetSortName(Book.Title) },
+			{ nameof(Series), () => GetSortName(Book.SeriesNames) },
+			{ nameof(Length), () => Book.LengthInMinutes },
+			{ nameof(MyRating), () => Book.UserDefinedItem.Rating.FirstScore },
+			{ nameof(PurchaseDate), () => LibraryBook.DateAdded },
+			{ nameof(ProductRating), () => Book.Rating.FirstScore },
+			{ nameof(Authors), () => Authors },
+			{ nameof(Narrators), () => Narrators },
+			{ nameof(Description), () => Description },
+			{ nameof(Category), () => Category },
+			{ nameof(Misc), () => Misc },
+			{ nameof(DisplayTags), () => DisplayTags },
+			{ nameof(Liberate), () => Liberate.Item1 }
+		};
+
+		// Instantiate comparers for every exposed member object type.
+		private static readonly Dictionary<Type, IComparer> _memberTypeComparers = new()
+		{
+			{ typeof(string), new ObjectComparer<string>() },
+			{ typeof(int), new ObjectComparer<int>() },
+			{ typeof(float), new ObjectComparer<float>() },
+			{ typeof(DateTime), new ObjectComparer<DateTime>() },
+			{ typeof(LiberatedState), new ObjectComparer<LiberatedState>() },
+		};
+
+		public virtual object GetMemberValue(string memberName) => _memberValues[memberName]();
+		public virtual IComparer GetMemberComparer(Type memberType) => _memberTypeComparers[memberType];
+
+		private static readonly string[] _sortPrefixIgnores = { "the", "a", "an" };
+		private static string GetSortName(string unformattedName)
 		{
 			var sortName = unformattedName
 				.Replace("|", "")
@@ -89,110 +146,59 @@ namespace LibationWinForms
 				.ToLowerInvariant()
 				.Trim();
 
-			if (sortPrefixIgnores.Any(prefix => sortName.StartsWith(prefix + " ")))
+			if (_sortPrefixIgnores.Any(prefix => sortName.StartsWith(prefix + " ")))
 				sortName = sortName.Substring(sortName.IndexOf(" ") + 1).TrimStart();
 
 			return sortName;
 		}
 
-		private string descriptionCache = null;
-		public string Description
-		{
-			get
-			{
-				// HtmlAgilityPack is expensive. cache results
-				if (descriptionCache is null)
-				{
-					if (book.Description is null)
-						descriptionCache = "";
-					else
-					{
-						var doc = new HtmlAgilityPack.HtmlDocument();
-						doc.LoadHtml(book.Description);
-						var noHtml = doc.DocumentNode.InnerText;
-						descriptionCache
-							= noHtml.Length < 63
-							? noHtml
-							: noHtml.Substring(0, 60) + "...";
-					}
-				}
+		#endregion
 
-				return descriptionCache;
-			}
+		#region Static library display functions
+		
+		/// <summary>
+		/// This information should not change during <see cref="GridEntry"/> lifetime, so call only once.
+		/// </summary>
+		private static string GetDescriptionDisplay(Book book)
+		{
+			var doc = new HtmlAgilityPack.HtmlDocument();
+			doc.LoadHtml(book.Description);
+			var noHtml = doc.DocumentNode.InnerText;
+			return
+				noHtml.Length < 63 ?
+				noHtml :
+				noHtml.Substring(0, 60) + "...";
 		}
 
-		public string Category => string.Join(" > ", book.CategoriesNames);
-
-		// star ratings retain numeric value but display star text. this is needed because just using star text doesn't sort correctly:
-		// - star
-		// - star star
-		// - star 1/2
-
-		public string Product_Rating
+		/// <summary>
+		/// This information should not change during <see cref="GridEntry"/> lifetime, so call only once.
+		/// Maximum of 5 text rows will fit in 80-pixel row height.
+		/// </summary>
+		private static string GetMiscDisplay(LibraryBook libraryBook)
 		{
-			get
-			{
-				displayValues[nameof(Product_Rating)] = starString(book.Rating);
-				return firstScore(book.Rating);
-			}
+			var details = new List<string>();
+
+			var locale = libraryBook.Book.Locale.DefaultIfNullOrWhiteSpace("[unknown]");
+			var acct = libraryBook.Account.DefaultIfNullOrWhiteSpace("[unknown]");
+
+			details.Add($"Account: {locale} - {acct}");
+
+			if (libraryBook.Book.HasPdf)
+				details.Add("Has PDF");
+			if (libraryBook.Book.IsAbridged)
+				details.Add("Abridged");
+			if (libraryBook.Book.DatePublished.HasValue)
+				details.Add($"Date pub'd: {libraryBook.Book.DatePublished.Value:MM/dd/yyyy}");
+			// this goes last since it's most likely to have a line-break
+			if (!string.IsNullOrWhiteSpace(libraryBook.Book.Publisher))
+				details.Add($"Pub: {libraryBook.Book.Publisher.Trim()}");
+
+			if (!details.Any())
+				return "[details not imported]";
+
+			return string.Join("\r\n", details);
 		}
 
-		public string Purchase_Date
-		{
-			get
-			{
-				displayValues[nameof(Purchase_Date)] = libraryBook.DateAdded.ToString("d");
-				return libraryBook.DateAdded.ToString("yyyy-MM-dd HH:mm:ss");
-			}
-		}
-
-        public string My_Rating
-        {
-            get
-            {
-                displayValues[nameof(My_Rating)] = starString(book.UserDefinedItem.Rating);
-                return firstScore(book.UserDefinedItem.Rating);
-            }
-        }
-
-        private string starString(Rating rating)
-            => (rating?.FirstScore != null && rating?.FirstScore > 0f)
-            ? rating?.ToStarString()
-            : "";
-        private string firstScore(Rating rating) => rating?.FirstScore.ToString("0.0");
-
-        // max 5 text rows
-        public string Misc
-        {
-            get
-            {
-                var details = new List<string>();
-
-				var locale
-					= string.IsNullOrWhiteSpace(book.Locale)
-					? "[unknown]"
-					: book.Locale;
-				var acct
-					= string.IsNullOrWhiteSpace(libraryBook.Account)
-					? "[unknown]"
-					: libraryBook.Account;
-				details.Add($"Account: {locale} - {acct}");
-
-                if (book.HasPdf)
-                    details.Add("Has PDF");
-                if (book.IsAbridged)
-                    details.Add("Abridged");
-                if (book.DatePublished.HasValue)
-                    details.Add($"Date pub'd: {book.DatePublished.Value:MM/dd/yyyy}");
-                // this goes last since it's most likely to have a line-break
-                if (!string.IsNullOrWhiteSpace(book.Publisher))
-                    details.Add($"Pub: {book.Publisher.Trim()}");
-
-				if (!details.Any())
-                    return "[details not imported]";
-
-                return string.Join("\r\n", details);
-            }
-        }
-    }
+		#endregion
+	}
 }

LibationWinForms/LibationWinForms.csproj

@@ -1,4 +1,5 @@
-<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
+<?xml version="1.0" encoding="utf-8"?>
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <OutputType>Library</OutputType>
@@ -12,8 +13,8 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <ProjectReference Include="..\..\Dinah.Core\Dinah.Core.WindowsDesktop\Dinah.Core.WindowsDesktop.csproj" />
     <ProjectReference Include="..\FileLiberator\FileLiberator.csproj" />
-    <ProjectReference Include="..\WindowsDesktopUtilities\WindowsDesktopUtilities.csproj" />
   </ItemGroup>
 
   <ItemGroup>