Prep for version release

Address issues in 263

Source/AaxDecrypter/NetworkFileStream.cs

@@ -217,40 +217,47 @@ namespace AaxDecrypter
 		{
 			var downloadPosition = WritePosition;
 			var nextFlush = downloadPosition + DATA_FLUSH_SZ;
-
 			var buff = new byte[DOWNLOAD_BUFF_SZ];
-			do
+
+			try
 			{
-				var bytesRead = _networkStream.Read(buff, 0, DOWNLOAD_BUFF_SZ);
-				_writeFile.Write(buff, 0, bytesRead);
-
-				downloadPosition += bytesRead;
-
-				if (downloadPosition > nextFlush)
+				do
 				{
-					_writeFile.Flush();
-					WritePosition = downloadPosition;
-					Update();
-					nextFlush = downloadPosition + DATA_FLUSH_SZ;
-					downloadedPiece.Set();
-				}
+					var bytesRead = _networkStream.Read(buff, 0, DOWNLOAD_BUFF_SZ);
+					_writeFile.Write(buff, 0, bytesRead);
 
-			} while (downloadPosition < ContentLength && !IsCancelled);
+					downloadPosition += bytesRead;
 
-			_writeFile.Close();
-			_networkStream.Close();
-			WritePosition = downloadPosition;
-			Update();
+					if (downloadPosition > nextFlush)
+					{
+						_writeFile.Flush();
+						WritePosition = downloadPosition;
+						Update();
+						nextFlush = downloadPosition + DATA_FLUSH_SZ;
+						downloadedPiece.Set();
+					}
 
-			downloadedPiece.Set();
-			downloadEnded.Set();
+				} while (downloadPosition < ContentLength && !IsCancelled);
 
-			if (!IsCancelled && WritePosition < ContentLength)
-				throw new WebException($"Downloaded size (0x{WritePosition:X10}) is less than {nameof(ContentLength)} (0x{ContentLength:X10}).");
+				_writeFile.Close();
+				_networkStream.Close();
+				WritePosition = downloadPosition;
+				Update();
 
-			if (WritePosition > ContentLength)
-				throw new WebException($"Downloaded size (0x{WritePosition:X10}) is greater than {nameof(ContentLength)} (0x{ContentLength:X10}).");
+				downloadedPiece.Set();
+				downloadEnded.Set();
 
+				if (!IsCancelled && WritePosition < ContentLength)
+					throw new WebException($"Downloaded size (0x{WritePosition:X10}) is less than {nameof(ContentLength)} (0x{ContentLength:X10}).");
+
+				if (WritePosition > ContentLength)
+					throw new WebException($"Downloaded size (0x{WritePosition:X10}) is greater than {nameof(ContentLength)} (0x{ContentLength:X10}).");
+			}
+			catch (Exception ex)
+			{
+				Serilog.Log.Error(ex, "An error was encountered while downloading {Uri}", Uri);
+				IsCancelled = true;
+			}
 		}
 
 		#endregion

Source/AppScaffolding/AppScaffolding.csproj

@@ -3,7 +3,7 @@
 
   <PropertyGroup>
     <TargetFramework>net6.0-windows</TargetFramework>
-    <Version>7.6.2.1</Version>
+    <Version>7.11.0.1</Version>
   </PropertyGroup>
 
   <ItemGroup>
@@ -15,6 +15,7 @@
   </ItemGroup>
 
   <ItemGroup>
+    <ProjectReference Include="..\ApplicationServices\ApplicationServices.csproj" />
     <ProjectReference Include="..\AudibleUtilities\AudibleUtilities.csproj" />
   </ItemGroup>
 

Source/AppScaffolding/LibationScaffolding.cs

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Reflection;
+using ApplicationServices;
 using AudibleUtilities;
 using Dinah.Core;
 using Dinah.Core.IO;
@@ -36,7 +37,8 @@ namespace AppScaffolding
 		public static Configuration RunPreConfigMigrations()
 		{
 			// must occur before access to Configuration instance
-			Migrations.migrate_to_v5_2_0__pre_config();
+			// // outdated. kept here as an example of what belongs in this area
+			// // Migrations.migrate_to_v5_2_0__pre_config();
 
 			//***********************************************//
 			//                                               //
@@ -57,6 +59,7 @@ namespace AppScaffolding
 			//
 
 			Migrations.migrate_to_v6_6_9(config);
+			Migrations.migrate_from_7_10_1(config);
 		}
 
 		public static void PopulateMissingConfigValues(Configuration config)
@@ -137,14 +140,19 @@ namespace AppScaffolding
 
 			if (!config.Exists(nameof(config.DownloadCoverArt)))
 				config.DownloadCoverArt = true;
+
+			if (!config.Exists(nameof(config.AutoDownloadEpisodes)))
+				config.AutoDownloadEpisodes = false;
 		}
 
-		/// <summary>Initialize logging. Run after migration</summary>
+		/// <summary>Initialize logging. Wire-up events. Run after migration</summary>
 		public static void RunPostMigrationScaffolding(Configuration config)
 		{
 			ensureSerilogConfig(config);
 			configureLogging(config);
 			logStartupState(config);
+
+			wireUpSystemEvents(config);
 		}
 
 		private static void ensureSerilogConfig(Configuration config)
@@ -250,18 +258,21 @@ namespace AppScaffolding
 
 		private static void logStartupState(Configuration config)
 		{
+#if DEBUG
+			var mode = "Debug";
+#else
+			var mode = "Release";
+#endif
+			if (System.Diagnostics.Debugger.IsAttached)
+				mode += " (Debugger attached)";
+
 			// begin logging session with a form feed
 			Log.Logger.Information("\r\n\f");
 			Log.Logger.Information("Begin. {@DebugInfo}", new
 			{
 				AppName = EntryAssembly.GetName().Name,
 				Version = BuildVersion.ToString(),
-#if DEBUG
-				Mode = "Debug",
-#else
-				Mode = "Release",
-#endif
-
+				Mode = mode,
 				LogLevel_Verbose_Enabled = Log.Logger.IsVerboseEnabled(),
 				LogLevel_Debug_Enabled = Log.Logger.IsDebugEnabled(),
 				LogLevel_Information_Enabled = Log.Logger.IsInformationEnabled(),
@@ -282,22 +293,26 @@ namespace AppScaffolding
 			});
 		}
 
-		public static (bool hasUpgrade, string zipUrl, string htmlUrl, string zipName) GetLatestRelease()
+		private static void wireUpSystemEvents(Configuration configuration)
 		{
-			(bool, string, string, string) isFalse = (false, null, null, null);
+			LibraryCommands.LibrarySizeChanged += (_, __) => SearchEngineCommands.FullReIndex();
+			LibraryCommands.BookUserDefinedItemCommitted += (_, books) => SearchEngineCommands.UpdateBooks(books);
+		}
 
+		public static UpgradeProperties GetLatestRelease()
+		{
 			// timed out
 			var latest = getLatestRelease(TimeSpan.FromSeconds(10));
 			if (latest is null)
-				return isFalse;
+				return null;
 
 			var latestVersionString = latest.TagName.Trim('v');
 			if (!Version.TryParse(latestVersionString, out var latestRelease))
-				return isFalse;
+				return null;
 
 			// we're up to date
 			if (latestRelease <= BuildVersion)
-				return isFalse;
+				return null;
 
 			// we have an update
 			var zip = latest.Assets.FirstOrDefault(a => a.BrowserDownloadUrl.EndsWith(".zip"));
@@ -310,7 +325,7 @@ namespace AppScaffolding
 				zipUrl
 			});
 
-			return (true, zipUrl, latest.HtmlUrl, zip.Name);
+			return new(zipUrl, latest.HtmlUrl, zip.Name, latestRelease);
 		}
 		private static Octokit.Release getLatestRelease(TimeSpan timeout)
 		{
@@ -341,41 +356,6 @@ namespace AppScaffolding
 
 	internal static class Migrations
 	{
-		#region migrate to v5.2.0
-		// get rid of meta-directories, combine DownloadsInProgressEnum and DecryptInProgressEnum => InProgress
-		public static void migrate_to_v5_2_0__pre_config()
-		{
-			{
-				var settingsKey = "DownloadsInProgressEnum";
-				if (UNSAFE_MigrationHelper.Settings_TryGet(settingsKey, out var value))
-				{
-					UNSAFE_MigrationHelper.Settings_Delete(settingsKey);
-					UNSAFE_MigrationHelper.Settings_Insert("InProgress", translatePath(value));
-				}
-			}
-
-			{
-				UNSAFE_MigrationHelper.Settings_Delete("DecryptInProgressEnum");
-			}
-
-			{ // appsettings.json
-				var appSettingsKey = UNSAFE_MigrationHelper.LIBATION_FILES_KEY;
-				if (UNSAFE_MigrationHelper.APPSETTINGS_TryGet(appSettingsKey, out var value))
-					UNSAFE_MigrationHelper.APPSETTINGS_Update(appSettingsKey, translatePath(value));
-			}
-		}
-
-		private static string translatePath(string path)
-			=> path switch
-			{
-				"AppDir" => @".\LibationFiles",
-				"MyDocs" => Path.GetFullPath(Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments), "LibationFiles")),
-				"UserProfile" => Path.GetFullPath(Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile), "Libation")),
-				"WinTemp" => Path.GetFullPath(Path.Combine(Path.GetTempPath(), "Libation")),
-				_ => path
-			};
-		#endregion
-
 		public static void migrate_to_v6_6_9(Configuration config)
 		{
 			var writeToPath = $"Serilog.WriteTo";
@@ -422,5 +402,28 @@ namespace AppScaffolding
 				UNSAFE_MigrationHelper.Settings_AddUniqueToArray("Serilog.Enrich", "WithExceptionDetails");
 			}
 		}
+
+		public static void migrate_from_7_10_1(Configuration config)
+		{
+			//This migration removes books and series with SERIES_ prefix that were created
+			//as a hack workaround in 7.10.1. Said workaround was removed in 7.10.2
+
+			var migrated = config.GetNonString<bool>(nameof(migrate_from_7_10_1));
+
+			if (migrated) return;
+
+			using var context = DbContexts.GetContext();
+
+			var booksToRemove = context.Books.Where(b => b.AudibleProductId.StartsWith("SERIES_")).ToArray();
+			var seriesToRemove = context.Series.Where(s => s.AudibleSeriesId.StartsWith("SERIES_")).ToArray();
+			var lbToRemove = context.LibraryBooks.Where(lb => booksToRemove.Any(b => b == lb.Book)).ToArray();
+
+			context.LibraryBooks.RemoveRange(lbToRemove);
+			context.Books.RemoveRange(booksToRemove);
+			context.Series.RemoveRange(seriesToRemove);
+
+			LibraryCommands.SaveContext(context);
+			config.SetObject(nameof(migrate_from_7_10_1), true);
+		}
 	}
 }

Source/AppScaffolding/UNSAFE_MigrationHelper.cs

@@ -17,8 +17,13 @@ namespace AppScaffolding
 	/// 
 	/// 
 	/// </summary>
-	internal static class UNSAFE_MigrationHelper
+	public static class UNSAFE_MigrationHelper
 	{
+		public static string SettingsDirectory
+			=> !APPSETTINGS_TryGet(LIBATION_FILES_KEY, out var value) || value is null
+			? null
+			: value;
+
 		#region appsettings.json
 		private static string APPSETTINGS_JSON { get; } = Path.Combine(Path.GetDirectoryName(System.Reflection.Assembly.GetEntryAssembly().Location), "appsettings.json");
 
@@ -87,19 +92,11 @@ namespace AppScaffolding
 			System.Threading.Thread.Sleep(100);
 		}
 		#endregion
-
 		#region Settings.json
 		public const string LIBATION_FILES_KEY = "LibationFiles";
 		private const string SETTINGS_JSON = "Settings.json";
 
-		public static string SettingsJsonPath
-		{
-			get
-			{
-				var success = APPSETTINGS_TryGet(LIBATION_FILES_KEY, out var value);
-				return !success || value is null ? null : Path.Combine(value, SETTINGS_JSON);
-			}
-		}
+		public static string SettingsJsonPath => SettingsDirectory is null ? null : Path.Combine(SettingsDirectory, SETTINGS_JSON);
 		public static bool SettingsJson_Exists => SettingsJsonPath is not null && File.Exists(SettingsJsonPath);
 
 		public static bool Settings_TryGet(string key, out string value)
@@ -267,5 +264,10 @@ namespace AppScaffolding
 			System.Threading.Thread.Sleep(100);
 		}
 		#endregion
+		#region LibationContext.db
+		public const string LIBATION_CONTEXT = "LibationContext.db";
+		public static string DatabaseFile => SettingsDirectory is null ? null : Path.Combine(SettingsDirectory, LIBATION_CONTEXT);
+		public static bool DatabaseFile_Exists => DatabaseFile is not null && File.Exists(DatabaseFile);
+		#endregion
 	}
 }

Source/AppScaffolding/UpgradeProperties.cs

@@ -0,0 +1,6 @@
+using System;
+
+namespace AppScaffolding
+{
+    public record UpgradeProperties(string ZipUrl, string HtmlUrl, string ZipName, Version LatestRelease);
+}

Source/ApplicationServices/DbContexts.cs

@@ -12,10 +12,10 @@ namespace ApplicationServices
 			=> LibationContext.Create(SqliteStorage.ConnectionString);
 
 		/// <summary>Use for full library querying. No lazy loading</summary>
-		public static List<LibraryBook> GetLibrary_Flat_NoTracking()
+		public static List<LibraryBook> GetLibrary_Flat_NoTracking(bool includeParents = false)
 		{
 			using var context = GetContext();
-			return context.GetLibrary_Flat_NoTracking();
+			return context.GetLibrary_Flat_NoTracking(includeParents);
 		}
 	}
 }

Source/ApplicationServices/LibraryCommands.cs

@@ -200,7 +200,7 @@ namespace ApplicationServices
             var libraryBookImporter = new LibraryBookImporter(context);
             var newCount = await Task.Run(() => libraryBookImporter.Import(importItems));
             logTime("importIntoDbAsync -- post Import()");
-            int qtyChanges = saveChanges(context);
+            int qtyChanges = SaveContext(context);
             logTime("importIntoDbAsync -- post SaveChanges");
 
 			// this is any changes at all to the database, not just new books
@@ -211,7 +211,7 @@ namespace ApplicationServices
             return newCount;
         }
 
-        private static int saveChanges(LibationContext context)
+        public static int SaveContext(LibationContext context)
 		{
 			try
 			{
@@ -253,11 +253,7 @@ namespace ApplicationServices
 		#endregion
 
 		// call this whenever books are added or removed from library
-		private static void finalizeLibrarySizeChange()
-		{
-			SearchEngineCommands.FullReIndex();
-			LibrarySizeChanged?.Invoke(null, null);
-		}
+		private static void finalizeLibrarySizeChange() => LibrarySizeChanged?.Invoke(null, null);
 
 		/// <summary>Occurs when the size of the library changes. ie: books are added or removed</summary>
 		public static event EventHandler LibrarySizeChanged;
@@ -265,9 +261,47 @@ namespace ApplicationServices
 		/// <summary>
 		/// Occurs when the size of the library does not change but book(s) details do. Especially when <see cref="UserDefinedItem.Tags"/>, <see cref="UserDefinedItem.BookStatus"/>, or <see cref="UserDefinedItem.PdfStatus"/> changed values are successfully persisted.
 		/// </summary>
-		public static event EventHandler BookUserDefinedItemCommitted;
+		public static event EventHandler<IEnumerable<Book>> BookUserDefinedItemCommitted;
 
 		#region Update book details
+		public static int UpdateBookStatus(this Book book, LiberatedStatus bookStatus)
+		{
+			book.UserDefinedItem.BookStatus = bookStatus;
+			return UpdateUserDefinedItem(book);
+		}
+		public static int UpdatePdfStatus(this Book book, LiberatedStatus pdfStatus)
+		{
+			book.UserDefinedItem.PdfStatus = pdfStatus;
+			return UpdateUserDefinedItem(book);
+		}
+		public static int UpdateBook(
+			this Book book,
+			string tags = null,
+			LiberatedStatus? bookStatus = null,
+			LiberatedStatus? pdfStatus = null)
+			=> UpdateBooks(tags, bookStatus, pdfStatus, book);
+		public static int UpdateBooks(
+			string tags = null,
+			LiberatedStatus? bookStatus = null,
+			LiberatedStatus? pdfStatus = null,
+			params Book[] books)
+        {
+			foreach (var book in books)
+			{
+				// blank tags are expected. null tags are not
+				if (tags is not null && book.UserDefinedItem.Tags != tags)
+					book.UserDefinedItem.Tags = tags;
+
+				if (bookStatus is not null && book.UserDefinedItem.BookStatus != bookStatus.Value)
+					book.UserDefinedItem.BookStatus = bookStatus.Value;
+
+				// even though PdfStatus is nullable, there's no case where we'd actually overwrite with null
+				if (pdfStatus is not null && book.UserDefinedItem.PdfStatus != pdfStatus.Value)
+					book.UserDefinedItem.PdfStatus = pdfStatus.Value;
+			}
+
+			return UpdateUserDefinedItem(books);
+		}
 		public static int UpdateUserDefinedItem(params Book[] books) => UpdateUserDefinedItem(books.ToList());
 		public static int UpdateUserDefinedItem(IEnumerable<Book> books)
 		{
@@ -283,23 +317,8 @@ namespace ApplicationServices
 					context.Attach(book.UserDefinedItem).State = Microsoft.EntityFrameworkCore.EntityState.Modified;
 
 				var qtyChanges = context.SaveChanges();
-				if (qtyChanges == 0)
-					return 0;
-
-				// semi-arbitrary. At some point it's more worth it to do a full re-index than to do one offs.
-				// I did not benchmark before choosing the number here
-				if (qtyChanges > 15)
-					SearchEngineCommands.FullReIndex();
-				else
-				{
-					foreach (var book in books)
-					{
-						SearchEngineCommands.UpdateLiberatedStatus(book);
-						SearchEngineCommands.UpdateBookTags(book);
-					}
-				}
-
-				BookUserDefinedItemCommitted?.Invoke(null, null);
+				if (qtyChanges > 0)
+					BookUserDefinedItemCommitted?.Invoke(null, books);
 
 				return qtyChanges;
 			}
@@ -322,7 +341,14 @@ namespace ApplicationServices
 
 		// below are queries, not commands. maybe I should make a LibraryQueries. except there's already one of those...
 
-		public record LibraryStats(int booksFullyBackedUp, int booksDownloadedOnly, int booksNoProgress, int booksError, int pdfsDownloaded, int pdfsNotDownloaded) { }
+		public record LibraryStats(int booksFullyBackedUp, int booksDownloadedOnly, int booksNoProgress, int booksError, int pdfsDownloaded, int pdfsNotDownloaded)
+		{
+			public int PendingBooks => booksNoProgress + booksDownloadedOnly;
+			public bool HasPendingBooks => PendingBooks > 0;
+
+			public bool HasBookResults => 0 < (booksFullyBackedUp + booksDownloadedOnly + booksNoProgress + booksError);
+			public bool HasPdfResults => 0 < (pdfsNotDownloaded + pdfsDownloaded);
+		}
 		public static LibraryStats GetCounts()
 		{
 			var libraryBooks = DbContexts.GetLibrary_Flat_NoTracking();

Source/ApplicationServices/SearchEngineCommands.cs

@@ -1,5 +1,7 @@
 using System;
+using System.Collections.Generic;
 using System.IO;
+using System.Linq;
 using DataLayer;
 using LibationSearchEngine;
 
@@ -7,51 +9,99 @@ namespace ApplicationServices
 {
 	public static class SearchEngineCommands
 	{
-		public static void FullReIndex(SearchEngine engine = null)
-		{
-			engine ??= new SearchEngine();
-			var library = DbContexts.GetLibrary_Flat_NoTracking();
-			engine.CreateNewIndex(library);
-		}
-
-		public static SearchResultSet Search(string searchString) => performSearchEngineFunc_safe(e =>
+		#region Search
+		public static SearchResultSet Search(string searchString) => performSafeQuery(e =>
 			e.Search(searchString)
 		);
 
-		public static void UpdateBookTags(Book book) => performSearchEngineAction_safe(e =>
-			e.UpdateTags(book.AudibleProductId, book.UserDefinedItem.Tags)
+		private static T performSafeQuery<T>(Func<SearchEngine, T> func)
+		{
+			var engine = new SearchEngine();
+			try
+			{
+				return func(engine);
+			}
+			catch (FileNotFoundException)
+			{
+				fullReIndex(engine);
+				return func(engine);
+			}
+		}
+		#endregion
+
+		public static event EventHandler SearchEngineUpdated;
+
+		#region Update
+		private static bool isUpdating;
+
+		public static void UpdateBooks(IEnumerable<Book> books)
+		{
+			// Semi-arbitrary. At some point it's more worth it to do a full re-index than to do one offs.
+			// I did not benchmark before choosing the number here
+			if (books.Count() > 15)
+				FullReIndex();
+			else
+			{
+				foreach (var book in books)
+				{
+					UpdateLiberatedStatus(book);
+					UpdateBookTags(book);
+				}
+			}
+		}
+
+		public static void FullReIndex() => performSafeCommand(e =>
+			fullReIndex(e)
 		);
 
-		public static void UpdateLiberatedStatus(Book book) => performSearchEngineAction_safe(e =>
+		internal static void UpdateLiberatedStatus(Book book) => performSafeCommand(e =>
 			e.UpdateLiberatedStatus(book)
 		);
 
-		private static void performSearchEngineAction_safe(Action<SearchEngine> action)
+		internal static void UpdateBookTags(Book book) => performSafeCommand(e =>
+			e.UpdateTags(book.AudibleProductId, book.UserDefinedItem.Tags)
+		);
+
+		private static void performSafeCommand(Action<SearchEngine> action)
 		{
-			var engine = new SearchEngine();
 			try
 			{
-				action(engine);
+				update(action);
 			}
 			catch (FileNotFoundException)
 			{
-				FullReIndex(engine);
-				action(engine);
+				fullReIndex(new SearchEngine());
+				update(action);
 			}
 		}
 
-		private static T performSearchEngineFunc_safe<T>(Func<SearchEngine, T> func)
+		private static void update(Action<SearchEngine> action)
 		{
-			var engine = new SearchEngine();
+			if (action is null)
+				return;
+
+			// support nesting incl recursion
+			var prevIsUpdating = isUpdating;
 			try
 			{
-				return func(engine);
+				isUpdating = true;
+
+				action(new SearchEngine());
+
+				if (!prevIsUpdating)
+					SearchEngineUpdated?.Invoke(null, null);
 			}
-			catch (FileNotFoundException)
+			finally
 			{
-				FullReIndex(engine);
-				return func(engine);
+				isUpdating = prevIsUpdating;
 			}
 		}
+
+		private static void fullReIndex(SearchEngine engine)
+		{
+			var library = DbContexts.GetLibrary_Flat_NoTracking();
+			engine.CreateNewIndex(library);
+		}
+		#endregion
 	}
 }

Source/AudibleUtilities/ApiExtended.cs

@@ -1,10 +1,14 @@
 using System;
 using System.Collections.Generic;
+using System.Globalization;
 using System.Linq;
+using System.Threading;
 using System.Threading.Tasks;
 using AudibleApi;
 using AudibleApi.Common;
 using Dinah.Core;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
 using Polly;
 using Polly.Retry;
 
@@ -118,31 +122,38 @@ namespace AudibleUtilities
 		private async Task<List<Item>> getItemsAsync(LibraryOptions libraryOptions, bool importEpisodes)
 		{
 			var items = new List<Item>();
-#if DEBUG
-//// this will not work for multi accounts
-//var library_json = "library.json";
-//library_json = System.IO.Path.GetFullPath(library_json);
-//if (System.IO.File.Exists(library_json))
-//{
-//    items = AudibleApi.Common.Converter.FromJson<List<Item>>(System.IO.File.ReadAllText(library_json));
-//}
-#endif
 
-			Serilog.Log.Logger.Debug("Begin initial library scan");
+			Serilog.Log.Logger.Debug("Beginning library scan.");
 
-			if (!items.Any())
-				items = await Api.GetAllLibraryItemsAsync(libraryOptions);
+			List<Task<List<Item>>> getChildEpisodesTasks = new();
 
-			Serilog.Log.Logger.Debug("Initial library scan complete. Begin episode scan");
+			int count = 0, maxConcurrentEpisodeScans = 5;
+			using SemaphoreSlim concurrencySemaphore = new(maxConcurrentEpisodeScans);
 
-			await manageEpisodesAsync(items, importEpisodes);
+			await foreach (var item in Api.GetLibraryItemAsyncEnumerable(libraryOptions))
+			{
+				if ((item.IsEpisodes || item.IsSeriesParent) && importEpisodes)
+				{
+					//Get child episodes asynchronously and await all at the end
+					getChildEpisodesTasks.Add(getChildEpisodesAsync(concurrencySemaphore, item));
+				}
+				else if (!item.IsEpisodes)
+					items.Add(item);
 
-			Serilog.Log.Logger.Debug("Episode scan complete");
+				count++;
+			}
+
+			Serilog.Log.Logger.Debug("Library scan complete. Found {count} books and series. Waiting on {getChildEpisodesTasksCount} series episode scans to complete.", count, getChildEpisodesTasks.Count);
+
+			//await and add all episides from all parents
+			foreach (var epList in await Task.WhenAll(getChildEpisodesTasks))
+				items.AddRange(epList);
+
+			Serilog.Log.Logger.Debug("Completed library scan.");
 
 #if DEBUG
-//System.IO.File.WriteAllText(library_json, AudibleApi.Common.Converter.ToJson(items));
+			//System.IO.File.WriteAllText(library_json, AudibleApi.Common.Converter.ToJson(items));
 #endif
-
 			var validators = new List<IValidator>();
 			validators.AddRange(getValidators());
 			foreach (var v in validators)
@@ -156,56 +167,75 @@ namespace AudibleUtilities
 		}
 
 		#region episodes and podcasts
-		private async Task manageEpisodesAsync(List<Item> items, bool importEpisodes)
+
+		private async Task<List<Item>> getChildEpisodesAsync(SemaphoreSlim concurrencySemaphore, Item parent)
 		{
-			// add podcasts and episodes to list. If fail, don't let it de-rail the rest of the import
+			await concurrencySemaphore.WaitAsync();
+
 			try
 			{
-				// get parents
-				var parents = items.Where(i => i.IsEpisodes).ToList();
-#if DEBUG
-//var parentsDebug = parents.Select(i => i.ToJson()).Aggregate((a, b) => $"{a}\r\n\r\n{b}");
-//System.IO.File.WriteAllText("parents.json", parentsDebug);
-#endif
+				Serilog.Log.Logger.Debug("Beginning episode scan for {parent}", parent);
 
-				if (!parents.Any())
-					return;
+				List<Item> children;
 
-				Serilog.Log.Logger.Information($"{parents.Count} series of shows/podcasts found");
-
-				// remove episode parents. even if the following stuff fails, these will still be removed from the collection
-				items.RemoveAll(i => i.IsEpisodes);
-
-				if (importEpisodes)
+				if (parent.IsEpisodes)
 				{
-					// add children
-					var children = await getEpisodesAsync(parents);
-					Serilog.Log.Logger.Information($"{children.Count} episodes of shows/podcasts found");
-					items.AddRange(children);
+					//The 'parent' is a single episode that was added to the library.
+					//Get the episode's parent and add it to the database.
+
+					Serilog.Log.Logger.Debug("Supplied Parent is an episode. Beginning parent scan for {parent}", parent);
+
+					children = new() { parent };
+
+					var parentAsins = parent.Relationships
+						.Where(r => r.RelationshipToProduct == RelationshipToProduct.Parent)
+						.Select(p => p.Asin);
+
+					var seriesParents = await Api.GetCatalogProductsAsync(parentAsins, CatalogOptions.ResponseGroupOptions.ALL_OPTIONS);
+
+					int numSeriesParents = seriesParents.Count(p => p.IsSeriesParent);
+					if (numSeriesParents != 1)
+					{
+						//There should only ever be 1 top-level parent per episode. If not, log
+						//and throw so we can figure out what to do about those special cases.
+						JsonSerializerSettings Settings = new()
+						{
+							MetadataPropertyHandling = MetadataPropertyHandling.Ignore,
+							DateParseHandling = DateParseHandling.None,
+							Converters =
+							{
+								new IsoDateTimeConverter { DateTimeStyles = DateTimeStyles.AssumeUniversal }
+							},
+						};
+						var ex = new ApplicationException($"Found {numSeriesParents} parents for {parent.Asin}");
+						Serilog.Log.Logger.Error(ex, $"Episode Product:\r\n{JsonConvert.SerializeObject(parent, Formatting.None, Settings)}");
+						throw ex;
+					}
+
+					var realParent = seriesParents.Single(p => p.IsSeriesParent);
+					realParent.PurchaseDate = parent.PurchaseDate;
+
+					Serilog.Log.Logger.Debug("Completed parent scan for {parent}", parent); 
+					parent = realParent;
 				}
-			}
-			catch (Exception ex)
-			{
-				Serilog.Log.Logger.Error(ex, "Error adding podcasts and episodes");
-			}
-		}
-
-		private async Task<List<Item>> getEpisodesAsync(List<Item> parents)
-		{
-			var results = new List<Item>();
-
-			foreach (var parent in parents)
-			{
-				var children = await getEpisodeChildrenAsync(parent);
-
-				// actual individual episode, not the parent of a series.
-				// for now I'm keeping it inside this method since it fits the work flow, incl. importEpisodes logic
-				if (!children.Any())
+				else
 				{
-					results.Add(parent);
-					continue;
+					children = await getEpisodeChildrenAsync(parent);
+					if (!children.Any())
+						return new();
 				}
 
+				//A series parent will always have exactly 1 Series
+				parent.Series = new Series[]
+				{
+					new Series
+					{
+						Asin = parent.Asin,
+						Sequence = "-1",
+						Title = parent.TitleWithSubtitle
+					}
+				};
+
 				foreach (var child in children)
 				{
 					// use parent's 'DateAdded'. DateAdded is just a convenience prop for: PurchaseDate.UtcDateTime
@@ -217,25 +247,22 @@ namespace AudibleUtilities
 						{
 							Asin = parent.Asin,
 							// This should properly be Single() not FirstOrDefault(), but FirstOrDefault is defensive for malformed data from audible
-							Sequence = parent.Relationships.FirstOrDefault(r => r.Asin == child.Asin).Sort.ToString(),
+							Sequence = parent.Relationships.FirstOrDefault(r => r.Asin == child.Asin)?.Sort?.ToString() ?? "0",
 							Title = parent.TitleWithSubtitle
 						}
 					};
-					// overload (read: abuse) IsEpisodes flag
-					child.Relationships = new Relationship[]
-					{
-						new Relationship
-						{
-							RelationshipToProduct = RelationshipToProduct.Child,
-							RelationshipType = RelationshipType.Episode
-						}
-					};
 				}
 
-				results.AddRange(children);
-			}
+				children.Add(parent);
 
-			return results;
+				Serilog.Log.Logger.Debug("Completed episode scan for {parent}", parent);
+
+				return children;
+			}
+			finally
+			{
+				concurrencySemaphore.Release();
+			}
 		}
 
 		private async Task<List<Item>> getEpisodeChildrenAsync(Item parent)
@@ -261,8 +288,8 @@ namespace AudibleUtilities
 				{
 					childrenBatch = await Api.GetCatalogProductsAsync(idBatch, CatalogOptions.ResponseGroupOptions.ALL_OPTIONS);
 #if DEBUG
-//var childrenBatchDebug = childrenBatch.Select(i => i.ToJson()).Aggregate((a, b) => $"{a}\r\n\r\n{b}");
-//System.IO.File.WriteAllText($"children of {parent.Asin}.json", childrenBatchDebug);
+					//var childrenBatchDebug = childrenBatch.Select(i => i.ToJson()).Aggregate((a, b) => $"{a}\r\n\r\n{b}");
+					//System.IO.File.WriteAllText($"children of {parent.Asin}.json", childrenBatchDebug);
 #endif
 				}
 				catch (Exception ex)
@@ -277,7 +304,7 @@ namespace AudibleUtilities
 					throw;
 				}
 
-				Serilog.Log.Logger.Debug($"Batch {i}: {childrenBatch.Count} results");
+				Serilog.Log.Logger.Debug($"Batch {i}: {childrenBatch.Count} results\t({{parent}})", parent);
 				// the service returned no results. probably indicates an error. stop running batches
 				if (!childrenBatch.Any())
 					break;
@@ -295,7 +322,7 @@ namespace AudibleUtilities
 			if (childrenIds.Count != results.Count)
 			{
 				var ex = new ApplicationException($"Mis-match: Children defined by parent={childrenIds.Count}. Children returned by batches={results.Count}");
-				Serilog.Log.Logger.Error(ex, "Quantity of series episodes defined by parent does not match quantity returned by batch fetching.");
+				Serilog.Log.Logger.Error(ex, "{parent} - Quantity of series episodes defined by parent does not match quantity returned by batch fetching.", parent);
 				throw ex;
 			}
 

Source/AudibleUtilities/AudibleUtilities.csproj

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

Source/DataLayer/DataLayer.csproj

@@ -12,7 +12,7 @@
   </PropertyGroup>
   
   <ItemGroup>
-    <PackageReference Include="Dinah.EntityFrameworkCore" Version="4.0.1.1" />
+    <PackageReference Include="Dinah.EntityFrameworkCore" Version="4.1.0.1" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="6.0.5">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
@@ -29,7 +29,7 @@
   </ItemGroup>
   
   <ItemGroup>
-    <None Update="appsettings.json">
+    <None Update="migrate.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
   </ItemGroup>

Source/DataLayer/EfClasses/Book.cs

@@ -16,8 +16,14 @@ namespace DataLayer
         }
     }
 
-    // enum will be easier than bool to extend later
-    public enum ContentType { Unknown = 0, Product = 1, Episode = 2 }
+    // enum will be easier than bool to extend later. 
+    public enum ContentType 
+    { 
+        Unknown = 0,
+        Product = 1,
+        Episode = 2,
+        Parent = 4,
+    }
 
     public class Book
     {

Source/DataLayer/EfClasses/Rating.cs

@@ -12,7 +12,7 @@ namespace DataLayer
         public float StoryRating { get; private set; }
 
         private Rating() { }
-        internal Rating(float overallRating, float performanceRating, float storyRating)
+        public Rating(float overallRating, float performanceRating, float storyRating)
         {
             OverallRating = overallRating;
             PerformanceRating = performanceRating;

Source/DataLayer/QueryObjects/BookQueries.cs

@@ -35,5 +35,15 @@ namespace DataLayer
                 .Include(b => b.SeriesLink).ThenInclude(sb => sb.Series)
                 .Include(b => b.ContributorsLink).ThenInclude(c => c.Contributor)
                 .Include(b => b.Category).ThenInclude(c => c.ParentCategory);
+
+        public static bool IsProduct(this Book book)
+            => book.ContentType is not ContentType.Episode and not ContentType.Parent;
+
+        public static bool IsEpisodeChild(this Book book)
+            => book.ContentType is ContentType.Episode;
+
+        public static bool IsEpisodeParent(this Book book)
+            => book.ContentType is ContentType.Parent;
+
     }
 }

Source/DataLayer/QueryObjects/LibraryBookQueries.cs

@@ -15,11 +15,13 @@ namespace DataLayer
 		//		.GetLibrary()
 		//		.ToList();
 
-		public static List<LibraryBook> GetLibrary_Flat_NoTracking(this LibationContext context)
+		public static List<LibraryBook> GetLibrary_Flat_NoTracking(this LibationContext context, bool includeParents = false)
             => context
                 .LibraryBooks
                 .AsNoTrackingWithIdentityResolution()
                 .GetLibrary()
+                .AsEnumerable()
+                .Where(lb => !lb.Book.IsEpisodeParent() || includeParents)
                 .ToList();
 
         public static LibraryBook GetLibraryBook_Flat_NoTracking(this LibationContext context, string productId)
@@ -40,5 +42,32 @@ namespace DataLayer
                 .Include(le => le.Book).ThenInclude(b => b.SeriesLink).ThenInclude(sb => sb.Series)
                 .Include(le => le.Book).ThenInclude(b => b.ContributorsLink).ThenInclude(c => c.Contributor)
                 .Include(le => le.Book).ThenInclude(b => b.Category).ThenInclude(c => c.ParentCategory);
+
+#nullable enable
+        public static LibraryBook? FindSeriesParent(this IEnumerable<LibraryBook> libraryBooks, LibraryBook seriesEpisode)
+        {
+            if (seriesEpisode.Book.SeriesLink is null) return null;
+
+            //Parent books will always have exactly 1 SeriesBook due to how
+            //they are imported in ApiExtended.getChildEpisodesAsync()
+            return libraryBooks.FirstOrDefault(
+                lb =>
+                lb.Book.IsEpisodeParent() &&
+                seriesEpisode.Book.SeriesLink.Any(
+                    s => s.Series.AudibleSeriesId == lb.Book.SeriesLink.Single().Series.AudibleSeriesId));
+        }
+#nullable disable
+
+        public static IEnumerable<LibraryBook> FindChildren(this IEnumerable<LibraryBook> bookList, LibraryBook parent)
+            => bookList
+            .Where(
+                lb => 
+                lb.Book.IsEpisodeChild() && 
+                lb.Book.SeriesLink?
+                    .Any(
+                        s => 
+                        s.Series.AudibleSeriesId == parent.Book.AudibleProductId
+                        ) == true
+                    ).ToList();
     }
 }

Source/DataLayer/appsettings.json

@@ -1,6 +0,0 @@
-{
-  "ConnectionStrings": {
-    "// this connection string is ONLY used for DataLayer's Migrations. this appsettings.json file is NOT used at all by application; it is overwritten":  "",
-    "LibationContext": "Data Source=LibationContext.db;Foreign Keys=False;"
-  }
-}

Source/DataLayer/migrate.json

@@ -0,0 +1,5 @@
+{
+  "ConnectionStrings": {
+    "LibationContext": "Data Source=LibationContext.db;Foreign Keys=False;"
+  }
+}

Source/DtoImporterService/BookImporter.cs

@@ -75,7 +75,7 @@ namespace DtoImporterService
 		{
 			var item = importItem.DtoItem;
 
-			var contentType = item.IsEpisodes ? DataLayer.ContentType.Episode : DataLayer.ContentType.Product;
+			var contentType = GetContentType(item);
 
 			// absence of authors is very rare, but possible
 			if (!item.Authors?.Any() ?? true)
@@ -184,5 +184,15 @@ namespace DtoImporterService
 				}
 			}
 		}
+
+		private static DataLayer.ContentType GetContentType(Item item)
+		{
+			if (item.IsEpisodes)
+				return DataLayer.ContentType.Episode;
+			else if (item.IsSeriesParent)
+				return DataLayer.ContentType.Parent;
+			else 
+				return DataLayer.ContentType.Product;			
+		}
 	}
 }

Source/FileLiberator/AudioDecodable.cs

@@ -4,7 +4,8 @@ namespace FileLiberator
 {
     public abstract class AudioDecodable : Processable
     {
-        public event EventHandler<Action<byte[]>> RequestCoverArt;
+        public delegate byte[] RequestCoverArtHandler(object sender, EventArgs eventArgs);
+        public event RequestCoverArtHandler RequestCoverArt;
         public event EventHandler<string> TitleDiscovered;
         public event EventHandler<string> AuthorsDiscovered;
         public event EventHandler<string> NarratorsDiscovered;
@@ -32,10 +33,10 @@ namespace FileLiberator
             NarratorsDiscovered?.Invoke(this, narrators);
 		}
 
-        protected void OnRequestCoverArt(Action<byte[]> setCoverArtDel)
+        protected byte[] OnRequestCoverArt()
 		{
             Serilog.Log.Logger.Debug("Event fired {@DebugInfo}", new { Name = nameof(RequestCoverArt) });
-            RequestCoverArt?.Invoke(this, setCoverArtDel);
+            return RequestCoverArt?.Invoke(this, new());
         }
 
         protected void OnCoverImageDiscovered(byte[] coverImage)

Source/FileLiberator/DownloadDecryptBook.cs

@@ -4,6 +4,7 @@ using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
 using AaxDecrypter;
+using ApplicationServices;
 using AudibleApi;
 using DataLayer;
 using Dinah.Core;
@@ -82,8 +83,7 @@ namespace FileLiberator
                 if (Configuration.Instance.DownloadCoverArt)
                     DownloadCoverArt(libraryBook);
 
-                libraryBook.Book.UserDefinedItem.BookStatus = LiberatedStatus.Liberated;
-                ApplicationServices.LibraryCommands.UpdateUserDefinedItem(libraryBook.Book);
+                libraryBook.Book.UpdateBookStatus(LiberatedStatus.Liberated);
 
                 return new StatusHandler();
             }
@@ -247,7 +247,7 @@ namespace FileLiberator
             if (e is not null)
                 OnCoverImageDiscovered(e);
             else if (Configuration.Instance.AllowLibationFixup)
-                OnRequestCoverArt(abDownloader.SetCoverArt);
+                abDownloader.SetCoverArt(OnRequestCoverArt());
         }
 
         /// <summary>Move new files to 'Books' directory</summary>

Source/FileLiberator/DownloadFile.cs

@@ -1,31 +0,0 @@
-using System;
-using System.Net.Http;
-using System.Threading.Tasks;
-using Dinah.Core.Net.Http;
-
-namespace FileLiberator
-{
-	// currently only used to download the .zip flies for upgrade
-	public class DownloadFile : Streamable
-	{
-		public async Task<string> PerformDownloadFileAsync(string downloadUrl, string proposedDownloadFilePath)
-		{
-			var client = new HttpClient();
-
-			var progress = new Progress<DownloadProgress>(OnStreamingProgressChanged);
-
-			OnStreamingBegin(proposedDownloadFilePath);
-
-			try
-			{
-				var actualDownloadedFilePath = await client.DownloadFileAsync(downloadUrl, proposedDownloadFilePath, progress);
-				OnFileCreated("Upgrade", actualDownloadedFilePath);
-				return actualDownloadedFilePath;
-			}
-			finally
-			{
-				OnStreamingCompleted(proposedDownloadFilePath);
-			}
-		}
-	}
-}

Source/FileLiberator/DownloadPdf.cs

@@ -4,6 +4,7 @@ using System.IO;
 using System.Linq;
 using System.Net.Http;
 using System.Threading.Tasks;
+using ApplicationServices;
 using DataLayer;
 using Dinah.Core.ErrorHandling;
 using Dinah.Core.Net.Http;
@@ -29,8 +30,7 @@ namespace FileLiberator
 				var actualDownloadedFilePath = await downloadPdfAsync(libraryBook, proposedDownloadFilePath);
 				var result = verifyDownload(actualDownloadedFilePath);
 
-				libraryBook.Book.UserDefinedItem.PdfStatus = result.IsSuccess ? LiberatedStatus.Liberated : LiberatedStatus.NotLiberated;
-				ApplicationServices.LibraryCommands.UpdateUserDefinedItem(libraryBook.Book);
+				libraryBook.Book.UpdatePdfStatus(result.IsSuccess ? LiberatedStatus.Liberated : LiberatedStatus.NotLiberated);
 
 				return result;
 			}

Source/FileLiberator/Processable.cs

@@ -29,7 +29,7 @@ namespace FileLiberator
         public IEnumerable<LibraryBook> GetValidLibraryBooks(IEnumerable<LibraryBook> library)
             => library.Where(libraryBook =>
                 Validate(libraryBook)
-                && (libraryBook.Book.ContentType != ContentType.Episode || LibationFileManager.Configuration.Instance.DownloadEpisodes)
+                && (!libraryBook.Book.IsEpisodeChild() || Configuration.Instance.DownloadEpisodes)
                 );
 
         public async Task<StatusHandler> ProcessSingleAsync(LibraryBook libraryBook, bool validate)

Source/FileManager/BackgroundFileSystem.cs

@@ -134,7 +134,8 @@ namespace FileManager
 
         private void AddPath(string path)
         {
-            if (!File.Exists(path)) return;
+            if (!File.Exists(path) && !Directory.Exists(path))
+                return;
             if (File.GetAttributes(path).HasFlag(FileAttributes.Directory))
                 AddUniqueFiles(FileUtility.SaferEnumerateFiles(path, SearchPattern, SearchOption));
             else

Source/Hangover/Form1.CLI.cs

@@ -0,0 +1,18 @@
+using AppScaffolding;
+
+namespace Hangover
+{
+    public partial class Form1
+    {
+        private void Load_cliTab()
+        {
+
+        }
+
+        private void cliTab_VisibleChanged(object sender, EventArgs e)
+        {
+            if (!databaseTab.Visible)
+                return;
+        }
+    }
+}

Source/Hangover/Form1.Database.cs

@@ -0,0 +1,140 @@
+using ApplicationServices;
+using AppScaffolding;
+using Microsoft.EntityFrameworkCore;
+
+namespace Hangover
+{
+    public partial class Form1
+    {
+        private string dbFile;
+
+        private void Load_databaseTab()
+        {
+            dbFile = UNSAFE_MigrationHelper.DatabaseFile;
+            if (dbFile is null)
+            {
+                databaseFileLbl.Text = $"Database file not found";
+                return;
+            }
+
+            databaseFileLbl.Text = $"Database file: {UNSAFE_MigrationHelper.DatabaseFile ?? "not found"}";
+        }
+
+        private void databaseTab_VisibleChanged(object sender, EventArgs e)
+        {
+            if (!databaseTab.Visible)
+                return;
+        }
+
+        private void sqlExecuteBtn_Click(object sender, EventArgs e)
+        {
+            ensureBackup();
+
+            sqlResultsTb.Clear();
+
+            try
+            {
+                var sql = sqlTb.Text.Trim();
+
+                #region // explanation
+                // Routing statements to non-query is a convenience.
+                // I went down the rabbit hole of full parsing and it's more trouble than it's worth. The parsing is easy due to available libraries. The edge cases of what to do next got too complex for slight gains.
+                // It's also not useful to take the extra effort to separate non-queries which don't return a row count. Eg: alter table, drop table
+                // My half-assed solution here won't even catch simple mistakes like this -- and that's ok
+                //   -- line 1 is a comment
+                //   delete from foo
+                #endregion
+                var lower = sql.ToLower();
+                if (lower.StartsWith("update") || lower.StartsWith("insert") || lower.StartsWith("delete"))
+                    nonQuery(sql);
+                else
+                    query(sql);
+            }
+            catch (Exception ex)
+            {
+                sqlResultsTb.Text = $"{ex.Message}\r\n{ex.StackTrace}";
+            }
+            finally
+            {
+                deleteUnneededBackups();
+            }
+        }
+
+        private string dbBackup;
+        private DateTime dbFileLastModified;
+        private void ensureBackup()
+        {
+            if (dbBackup is not null)
+                return;
+
+            dbFileLastModified = File.GetLastWriteTimeUtc(dbFile);
+
+            dbBackup
+                = Path.ChangeExtension(dbFile, "").TrimEnd('.')
+                + $"_backup_{DateTime.UtcNow:O}".Replace(':', '-').Replace('.', '-')
+                + Path.GetExtension(dbFile);
+            File.Copy(dbFile, dbBackup);
+        }
+
+        private void deleteUnneededBackups()
+        {
+            var newLastModified = File.GetLastWriteTimeUtc(dbFile);
+            if (dbFileLastModified == newLastModified)
+            {
+                File.Delete(dbBackup);
+                dbBackup = null;
+            }
+        }
+
+        void query(string sql)
+        {
+            // ef doesn't support truly generic queries. have to drop down to ado.net
+            using var context = DbContexts.GetContext();
+            using var conn = context.Database.GetDbConnection();
+            conn.Open();
+            using var cmd = conn.CreateCommand();
+            cmd.CommandText = sql;
+
+            var reader = cmd.ExecuteReader();
+            var results = 0;
+            var builder = new System.Text.StringBuilder();
+            var lines = 0;
+            while (reader.Read())
+            {
+                results++;
+
+                for (var i = 0; i < reader.FieldCount; i++)
+                    builder.Append(reader.GetValue(i) + "\t");
+                builder.AppendLine();
+
+                lines++;
+                if (lines % 10 == 0)
+                {
+                    sqlResultsTb.AppendText(builder.ToString());
+                    builder.Clear();
+                }
+            }
+
+            sqlResultsTb.AppendText(builder.ToString());
+            builder.Clear();
+
+            if (results == 0)
+                sqlResultsTb.Text = "[no results]";
+            else
+            {
+                sqlResultsTb.AppendText($"\r\n{results} result");
+                if (results != 1) sqlResultsTb.AppendText("s");
+            }
+        }
+
+        void nonQuery(string sql)
+        {
+            using var context = DbContexts.GetContext();
+            var results = context.Database.ExecuteSqlRaw(sql);
+
+            sqlResultsTb.AppendText($"{results} record");
+            if (results != 1) sqlResultsTb.AppendText("s");
+            sqlResultsTb.AppendText(" affected");
+        }
+    }
+}

Source/Hangover/Form1.Designer.cs

@@ -0,0 +1,158 @@
+namespace Hangover
+{
+    partial class Form1
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Form1));
+            this.tabControl1 = new System.Windows.Forms.TabControl();
+            this.databaseTab = new System.Windows.Forms.TabPage();
+            this.sqlExecuteBtn = new System.Windows.Forms.Button();
+            this.sqlResultsTb = new System.Windows.Forms.TextBox();
+            this.sqlTb = new System.Windows.Forms.TextBox();
+            this.sqlLbl = new System.Windows.Forms.Label();
+            this.databaseFileLbl = new System.Windows.Forms.Label();
+            this.cliTab = new System.Windows.Forms.TabPage();
+            this.tabControl1.SuspendLayout();
+            this.databaseTab.SuspendLayout();
+            this.SuspendLayout();
+            // 
+            // tabControl1
+            // 
+            this.tabControl1.Controls.Add(this.databaseTab);
+            this.tabControl1.Controls.Add(this.cliTab);
+            this.tabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.tabControl1.Location = new System.Drawing.Point(0, 0);
+            this.tabControl1.Name = "tabControl1";
+            this.tabControl1.SelectedIndex = 0;
+            this.tabControl1.Size = new System.Drawing.Size(800, 450);
+            this.tabControl1.TabIndex = 0;
+            // 
+            // databaseTab
+            // 
+            this.databaseTab.Controls.Add(this.sqlExecuteBtn);
+            this.databaseTab.Controls.Add(this.sqlResultsTb);
+            this.databaseTab.Controls.Add(this.sqlTb);
+            this.databaseTab.Controls.Add(this.sqlLbl);
+            this.databaseTab.Controls.Add(this.databaseFileLbl);
+            this.databaseTab.Location = new System.Drawing.Point(4, 24);
+            this.databaseTab.Name = "databaseTab";
+            this.databaseTab.Padding = new System.Windows.Forms.Padding(3);
+            this.databaseTab.Size = new System.Drawing.Size(792, 422);
+            this.databaseTab.TabIndex = 0;
+            this.databaseTab.Text = "Database";
+            this.databaseTab.UseVisualStyleBackColor = true;
+            // 
+            // sqlExecuteBtn
+            // 
+            this.sqlExecuteBtn.Location = new System.Drawing.Point(8, 153);
+            this.sqlExecuteBtn.Name = "sqlExecuteBtn";
+            this.sqlExecuteBtn.Size = new System.Drawing.Size(75, 23);
+            this.sqlExecuteBtn.TabIndex = 3;
+            this.sqlExecuteBtn.Text = "Execute";
+            this.sqlExecuteBtn.UseVisualStyleBackColor = true;
+            this.sqlExecuteBtn.Click += new System.EventHandler(this.sqlExecuteBtn_Click);
+            // 
+            // sqlResultsTb
+            // 
+            this.sqlResultsTb.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.sqlResultsTb.Location = new System.Drawing.Point(8, 182);
+            this.sqlResultsTb.Multiline = true;
+            this.sqlResultsTb.Name = "sqlResultsTb";
+            this.sqlResultsTb.ReadOnly = true;
+            this.sqlResultsTb.ScrollBars = System.Windows.Forms.ScrollBars.Both;
+            this.sqlResultsTb.Size = new System.Drawing.Size(776, 234);
+            this.sqlResultsTb.TabIndex = 4;
+            // 
+            // sqlTb
+            // 
+            this.sqlTb.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+            this.sqlTb.Location = new System.Drawing.Point(8, 48);
+            this.sqlTb.Multiline = true;
+            this.sqlTb.Name = "sqlTb";
+            this.sqlTb.ScrollBars = System.Windows.Forms.ScrollBars.Both;
+            this.sqlTb.Size = new System.Drawing.Size(778, 99);
+            this.sqlTb.TabIndex = 2;
+            // 
+            // sqlLbl
+            // 
+            this.sqlLbl.AutoSize = true;
+            this.sqlLbl.Location = new System.Drawing.Point(6, 30);
+            this.sqlLbl.Name = "sqlLbl";
+            this.sqlLbl.Size = new System.Drawing.Size(144, 15);
+            this.sqlLbl.TabIndex = 1;
+            this.sqlLbl.Text = "SQL (database command)";
+            // 
+            // databaseFileLbl
+            // 
+            this.databaseFileLbl.AutoSize = true;
+            this.databaseFileLbl.Location = new System.Drawing.Point(6, 3);
+            this.databaseFileLbl.Name = "databaseFileLbl";
+            this.databaseFileLbl.Size = new System.Drawing.Size(80, 15);
+            this.databaseFileLbl.TabIndex = 0;
+            this.databaseFileLbl.Text = "Database file: ";
+            // 
+            // cliTab
+            // 
+            this.cliTab.Location = new System.Drawing.Point(4, 24);
+            this.cliTab.Name = "cliTab";
+            this.cliTab.Size = new System.Drawing.Size(792, 422);
+            this.cliTab.TabIndex = 1;
+            this.cliTab.Text = "Command Line Interface";
+            this.cliTab.UseVisualStyleBackColor = true;
+            // 
+            // Form1
+            // 
+            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.tabControl1);
+            this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
+            this.Name = "Form1";
+            this.Text = "Hangover: Libation debug and recovery tool";
+            this.tabControl1.ResumeLayout(false);
+            this.databaseTab.ResumeLayout(false);
+            this.databaseTab.PerformLayout();
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+
+        private TabControl tabControl1;
+        private TabPage databaseTab;
+        private Label databaseFileLbl;
+        private TextBox sqlResultsTb;
+        private TextBox sqlTb;
+        private Label sqlLbl;
+        private Button sqlExecuteBtn;
+        private TabPage cliTab;
+    }
+}

Source/Hangover/Form1.cs

@@ -0,0 +1,16 @@
+namespace Hangover
+{
+    public partial class Form1 : Form
+    {
+        public Form1()
+        {
+            InitializeComponent();
+
+            databaseTab.VisibleChanged += databaseTab_VisibleChanged;
+            cliTab.VisibleChanged += cliTab_VisibleChanged;
+
+            Load_databaseTab();
+            Load_cliTab();
+        }
+    }
+}

Source/Hangover/Hangover.csproj

@@ -0,0 +1,46 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>WinExe</OutputType>
+    <TargetFramework>net6.0-windows</TargetFramework>
+    <UseWindowsForms>true</UseWindowsForms>
+    <ApplicationIcon>hangover.ico</ApplicationIcon>
+    <ImplicitUsings>enable</ImplicitUsings>
+
+    <PublishReadyToRun>true</PublishReadyToRun>
+    <RuntimeIdentifier>win-x64</RuntimeIdentifier>
+    <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
+    <AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
+  </PropertyGroup>
+
+  <!--
+  When LibationWinForms and Hangover output to the same dir, Hangover must build before LibationWinForms
+
+  VS > rt-clk solution > Properties
+  left: Project Dependencies
+  top: Projects: LibationWinForms
+  bottom: manually check Hangover
+
+  edit debug and release output paths
+  -->
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+    <OutputPath>..\LibationWinForms\bin\Debug</OutputPath>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
+    <OutputPath>..\LibationWinForms\bin\Release</OutputPath>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\ApplicationServices\ApplicationServices.csproj" />
+    <ProjectReference Include="..\AppScaffolding\AppScaffolding.csproj" />
+    <ProjectReference Include="..\FileLiberator\FileLiberator.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Compile Update="Form1.*.cs">
+      <DependentUpon>Form1.cs</DependentUpon>
+    </Compile>
+  </ItemGroup>
+
+</Project>

Source/Hangover/Program.cs

@@ -0,0 +1,17 @@
+namespace Hangover
+{
+    internal static class Program
+    {
+        /// <summary>
+        ///  The main entry point for the application.
+        /// </summary>
+        [STAThread]
+        static void Main()
+        {
+            // To customize application configuration such as set high DPI settings or default font,
+            // see https://aka.ms/applicationconfiguration.
+            ApplicationConfiguration.Initialize();
+            Application.Run(new Form1());
+        }
+    }
+}

Source/Libation.sln

@@ -38,6 +38,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibationSearchEngine", "Lib
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibationWinForms", "LibationWinForms\LibationWinForms.csproj", "{635F00E1-AAD1-45F7-BEB7-D909AD33B9F6}"
 	ProjectSection(ProjectDependencies) = postProject
+		{40C67036-C1A7-4FDF-AA83-8EC902E257F3} = {40C67036-C1A7-4FDF-AA83-8EC902E257F3}
 		{428163C3-D558-4914-B570-A92069521877} = {428163C3-D558-4914-B570-A92069521877}
 	EndProjectSection
 EndProject
@@ -65,6 +66,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FileManager.Tests", "_Tests
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibationFileManager.Tests", "_Tests\LibationFileManager.Tests\LibationFileManager.Tests.csproj", "{EB781571-8548-477E-82AD-FB9FAB548D2F}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Hangover", "Hangover\Hangover.csproj", "{40C67036-C1A7-4FDF-AA83-8EC902E257F3}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -143,6 +146,10 @@ Global
 		{EB781571-8548-477E-82AD-FB9FAB548D2F}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{EB781571-8548-477E-82AD-FB9FAB548D2F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{EB781571-8548-477E-82AD-FB9FAB548D2F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{40C67036-C1A7-4FDF-AA83-8EC902E257F3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{40C67036-C1A7-4FDF-AA83-8EC902E257F3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{40C67036-C1A7-4FDF-AA83-8EC902E257F3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{40C67036-C1A7-4FDF-AA83-8EC902E257F3}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -166,6 +173,7 @@ Global
 		{5B8FC827-BF58-4CB1-A59E-BDEB9C62A05E} = {67E66E82-5532-4440-AFB3-9FB1DF9DEF53}
 		{F2E04270-4551-41C4-99FF-E7125BED708C} = {67E66E82-5532-4440-AFB3-9FB1DF9DEF53}
 		{EB781571-8548-477E-82AD-FB9FAB548D2F} = {67E66E82-5532-4440-AFB3-9FB1DF9DEF53}
+		{40C67036-C1A7-4FDF-AA83-8EC902E257F3} = {8679CAC8-9164-4007-BDD2-F004810EDA14}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {615E00ED-BAEF-4E8E-A92A-9B82D87942A9}

Source/LibationCli/LibationCli.csproj

@@ -14,11 +14,13 @@
 
   <!--
   When LibationWinForms and LibationCli output to the same dir, LibationCli must build before LibationWinForms
-  
-  VS > rt-clik solution > Project Build Order...
-  Dependencies [tab]
-  Projects: LibationWinForms
-  manually check LibationCli
+
+  VS > rt-clk solution > Properties
+  left: Project Dependencies
+  top: Projects: LibationWinForms
+  bottom: manually check LibationCli
+
+  edit debug and release output paths
   -->
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
     <OutputPath>..\LibationWinForms\bin\Debug</OutputPath>
@@ -33,7 +35,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\ApplicationServices\ApplicationServices.csproj" />
     <ProjectReference Include="..\AppScaffolding\AppScaffolding.csproj" />
     <ProjectReference Include="..\FileLiberator\FileLiberator.csproj" />
   </ItemGroup>

Source/LibationCli/Options/_ProcessableOptionsBase.cs

@@ -9,7 +9,6 @@ using FileLiberator;
 
 namespace LibationCli
 {
-	// streamlined, non-Forms copy of ProcessorAutomationController
 	public abstract class ProcessableOptionsBase : OptionsBase
 	{
 		protected static TProcessable CreateProcessable<TProcessable>(EventHandler<LibraryBook> completedAction = null)

Source/LibationCli/Program.cs

@@ -27,7 +27,6 @@ namespace LibationCli
 			//                                               //
 			//***********************************************//
 			Setup.Initialize();
-			Setup.SubscribeToDatabaseEvents();
 
 			var types = Setup.LoadVerbs();
 

Source/LibationCli/Setup.cs

@@ -34,15 +34,15 @@ namespace LibationCli
 
 		private static void checkForUpdate()
 		{
-			var (hasUpgrade, zipUrl, htmlUrl, zipName) = LibationScaffolding.GetLatestRelease();
-			if (!hasUpgrade)
+			var upgradeProperties = LibationScaffolding.GetLatestRelease();
+			if (upgradeProperties is null)
 				return;
 
 			var origColor = Console.ForegroundColor;
 			try
 			{
 				Console.ForegroundColor = ConsoleColor.Red;
-				Console.WriteLine($"UPDATE AVAILABLE @ {zipUrl}");
+				Console.WriteLine($"UPDATE AVAILABLE @ {upgradeProperties.ZipUrl}");
 			}
 			finally
 			{
@@ -50,11 +50,6 @@ namespace LibationCli
 			}
 		}
 
-		public static void SubscribeToDatabaseEvents()
-		{
-			DataLayer.UserDefinedItem.ItemChanged += (sender, e) => ApplicationServices.LibraryCommands.UpdateUserDefinedItem(((DataLayer.UserDefinedItem)sender).Book);
-		}
-
 		public static Type[] LoadVerbs() => Assembly.GetExecutingAssembly()
 			.GetTypes()
 			.Where(t => t.GetCustomAttribute<VerbAttribute>() is not null)

Source/LibationFileManager/Configuration.cs

@@ -268,6 +268,13 @@ namespace LibationFileManager
             }
         }
 
+        [Description("Auto download episodes? Efter scan, download new books in 'checked' accounts.")]
+        public bool AutoDownloadEpisodes
+        {
+            get => persistentDictionary.GetNonString<bool>(nameof(AutoDownloadEpisodes));
+            set => persistentDictionary.SetNonString(nameof(AutoDownloadEpisodes), value);
+        }
+
         #region templates: custom file naming
 
         [Description("How to format the folders in which files will be saved")]
@@ -421,7 +428,7 @@ namespace LibationFileManager
                     return libationFilesPathCache;
 
                 // FIRST: must write here before SettingsFilePath in next step reads cache
-                libationFilesPathCache = getLiberationFilesSettingFromJson();
+                libationFilesPathCache = getLibationFilesSettingFromJson();
 
                 // SECOND. before setting to json file with SetWithJsonPath, PersistentDictionary must exist
                 persistentDictionary = new PersistentDictionary(SettingsFilePath);
@@ -443,7 +450,7 @@ namespace LibationFileManager
 
         private static string libationFilesPathCache;
 
-        private string getLiberationFilesSettingFromJson()
+        private string getLibationFilesSettingFromJson()
         {
             string startingContents = null;
             try
@@ -482,6 +489,14 @@ namespace LibationFileManager
         {
             libationFilesPathCache = null;
 
+            // ensure exists
+            if (!File.Exists(APPSETTINGS_JSON))
+            {
+                // getter creates new file, loads PersistentDictionary
+                var _ = LibationFiles;
+                System.Threading.Thread.Sleep(100);
+            }
+
             var startingContents = File.ReadAllText(APPSETTINGS_JSON);
             var jObj = JObject.Parse(startingContents);
 

Source/LibationFileManager/LibationFileManager.csproj

@@ -6,7 +6,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="6.0.0" />
-    <PackageReference Include="Serilog.Exceptions" Version="8.1.0" />
+    <PackageReference Include="Serilog.Exceptions" Version="8.2.0" />
   </ItemGroup>
 
   <ItemGroup>

Source/LibationSearchEngine/SearchEngine.cs

@@ -18,18 +18,11 @@ namespace LibationSearchEngine
     {
         public const Lucene.Net.Util.Version Version = Lucene.Net.Util.Version.LUCENE_30;
 
-        // not customizable. don't move to config
-        private static string SearchEngineDirectory { get; }
-            = new System.IO.DirectoryInfo(Configuration.Instance.LibationFiles).CreateSubdirectory("SearchEngine").FullName;
-
         public const string _ID_ = "_ID_";
         public const string TAGS = "tags";
         // special field for each book which includes all major parts of the book's metadata. enables non-targetting searching
         public const string ALL = "all";
 
-        // the workaround which allows displaying all books when query is empty
-        public const string ALL_QUERY = "*:*";
-
         #region index rules
         // common fields used in the "all" default search field
         public const string ALL_AUDIBLE_PRODUCT_ID = nameof(Book.AudibleProductId);
@@ -124,15 +117,16 @@ namespace LibationSearchEngine
                     [nameof(Book.IsAbridged)] = lb => lb.Book.IsAbridged,
                     ["Abridged"] = lb => lb.Book.IsAbridged,
 
-                    // this will only be evaluated at time of re-index. ie: state of files moved later will be out of sync until next re-index
                     ["IsLiberated"] = lb => isLiberated(lb.Book),
                     ["Liberated"] = lb => isLiberated(lb.Book),
                     ["LiberatedError"] = lb => liberatedError(lb.Book),
 
-                    ["Podcast"] = lb => lb.Book.ContentType == ContentType.Episode,
-                    ["IsPodcast"] = lb => lb.Book.ContentType == ContentType.Episode,
-                    ["Episode"] = lb => lb.Book.ContentType == ContentType.Episode,
-                    ["IsEpisode"] = lb => lb.Book.ContentType == ContentType.Episode,
+                    ["Podcast"] = lb => lb.Book.IsEpisodeChild(),
+                    ["Podcasts"] = lb => lb.Book.IsEpisodeChild(),
+                    ["IsPodcast"] = lb => lb.Book.IsEpisodeChild(),
+                    ["Episode"] = lb => lb.Book.IsEpisodeChild(),
+                    ["Episodes"] = lb => lb.Book.IsEpisodeChild(),
+                    ["IsEpisode"] = lb => lb.Book.IsEpisodeChild(),
                 }
                 );
 
@@ -182,18 +176,6 @@ namespace LibationSearchEngine
             foreach (var key in numberIndexRules.Keys)
                 yield return key;
         }
-
-        public static IEnumerable<string> GetSearchFields()
-        {
-            foreach (var key in idIndexRules.Keys)
-                yield return key;
-            foreach (var key in stringIndexRules.Keys)
-                yield return key;
-            foreach (var key in boolIndexRules.Keys)
-                yield return key;
-            foreach (var key in numberIndexRules.Keys)
-                yield return key;
-        }
 		#endregion
 
 		#region create and update index
@@ -290,6 +272,10 @@ namespace LibationSearchEngine
                 book.AudibleProductId,
                 d =>
                 {
+                    //
+                    // TODO: better synonym handling. This is too easy to mess up
+                    //
+
                     // fields are key value pairs. MULTIPLE FIELDS CAN POTENTIALLY HAVE THE SAME KEY.
                     // ie: must remove old before adding new else will create unwanted duplicates.
                     var v1 = isLiberated(book);
@@ -331,6 +317,9 @@ namespace LibationSearchEngine
         }
 		#endregion
 
+        // the workaround which allows displaying all books when query is empty
+        public const string ALL_QUERY = "*:*";
+
 		#region search
         public SearchResultSet Search(string searchString)
         {
@@ -345,7 +334,7 @@ namespace LibationSearchEngine
             return results;
         }
 
-        public static string FormatSearchQuery(string searchString)
+        internal static string FormatSearchQuery(string searchString)
         {
             if (string.IsNullOrWhiteSpace(searchString))
                 return ALL_QUERY;
@@ -491,5 +480,9 @@ namespace LibationSearchEngine
 		#endregion
 
 		private static Directory getIndex() => FSDirectory.Open(SearchEngineDirectory);
+
+        // not customizable. don't move to config
+        private static string SearchEngineDirectory { get; }
+            = new System.IO.DirectoryInfo(Configuration.Instance.LibationFiles).CreateSubdirectory("SearchEngine").FullName;
     }
 }

Source/LibationWinForms/BookLiberation/DownloadForm.Designer.cs

@@ -1,109 +0,0 @@
-using DataLayer;
-using System;
-
-namespace LibationWinForms.BookLiberation
-{
-    partial class DownloadForm
-    {
-        /// <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.filenameLbl = new System.Windows.Forms.Label();
-            this.progressBar1 = new System.Windows.Forms.ProgressBar();
-            this.progressLbl = new System.Windows.Forms.Label();
-            this.lastUpdateLbl = new System.Windows.Forms.Label();
-            this.SuspendLayout();
-            // 
-            // filenameLbl
-            // 
-            this.filenameLbl.AutoSize = true;
-            this.filenameLbl.Location = new System.Drawing.Point(12, 9);
-            this.filenameLbl.Name = "filenameLbl";
-            this.filenameLbl.Size = new System.Drawing.Size(52, 13);
-            this.filenameLbl.TabIndex = 0;
-            this.filenameLbl.Text = "[filename]";
-            // 
-            // progressBar1
-            // 
-            this.progressBar1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-            this.progressBar1.Location = new System.Drawing.Point(15, 67);
-            this.progressBar1.Name = "progressBar1";
-            this.progressBar1.Size = new System.Drawing.Size(877, 23);
-            this.progressBar1.TabIndex = 4;
-            // 
-            // progressLbl
-            // 
-            this.progressLbl.Location = new System.Drawing.Point(12, 36);
-            this.progressLbl.Name = "progressLbl";
-            this.progressLbl.Size = new System.Drawing.Size(173, 13);
-            this.progressLbl.TabIndex = 5;
-            this.progressLbl.Text = "[2,999,999,999] of [2,999,999,999]";
-            this.progressLbl.TextAlign = System.Drawing.ContentAlignment.TopRight;
-            // 
-            // lastUpdateLbl
-            // 
-            this.lastUpdateLbl.AutoSize = true;
-            this.lastUpdateLbl.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.lastUpdateLbl.ForeColor = System.Drawing.Color.DarkRed;
-            this.lastUpdateLbl.Location = new System.Drawing.Point(361, 36);
-            this.lastUpdateLbl.Name = "lastUpdateLbl";
-            this.lastUpdateLbl.Size = new System.Drawing.Size(81, 13);
-            this.lastUpdateLbl.TabIndex = 6;
-            this.lastUpdateLbl.Text = "Last updated";
-            this.lastUpdateLbl.Visible = false;
-            // 
-            // DownloadForm
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(904, 102);
-            this.Controls.Add(this.lastUpdateLbl);
-            this.Controls.Add(this.progressLbl);
-            this.Controls.Add(this.progressBar1);
-            this.Controls.Add(this.filenameLbl);
-            this.MaximizeBox = false;
-            this.MinimizeBox = false;
-            this.Name = "DownloadForm";
-            this.ShowIcon = false;
-            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
-            this.Text = "Downloading";
-            this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.DownloadForm_FormClosing);
-            this.Load += new System.EventHandler(this.DownloadForm_Load);
-            this.ResumeLayout(false);
-            this.PerformLayout();
-
-        }
-
-
-		#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;
-    }
-}

Source/LibationWinForms/BookLiberation/DownloadForm.cs

@@ -1,85 +0,0 @@
-using System;
-using System.Windows.Forms;
-using Dinah.Core.Net.Http;
-using Dinah.Core.Threading;
-using FileLiberator;
-
-namespace LibationWinForms.BookLiberation
-{
-	public partial class DownloadForm : Form
-	{
-		protected Streamable Streamable { get; private set; }
-		protected LogMe LogMe { get; private set; }
-		private SynchronizeInvoker Invoker { get; init; }
-
-		public DownloadForm()
-		{
-			//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();
-			InitializeComponent();
-
-			this.SetLibationIcon();
-			progressLbl.Text = "";
-			filenameLbl.Text = "";
-		}
-
-		public void RegisterFileLiberator(Streamable streamable, LogMe logMe = null)
-		{
-			if (streamable is null) return;
-			streamable.StreamingBegin += Streamable_StreamingBegin;
-			streamable.StreamingProgressChanged += Streamable_StreamingProgressChanged;
-			streamable.StreamingCompleted += (_, _) => this.UIThreadAsync(Close);
-			Streamable = streamable;
-			LogMe = logMe;
-		}
-
-
-		#region Streamable event handler overrides
-		public void Streamable_StreamingBegin(object sender, string beginString)
-		{
-			Invoker.UIThreadAsync(Show);
-			filenameLbl.UIThreadAsync(() => filenameLbl.Text = beginString);
-		}
-		public void Streamable_StreamingProgressChanged(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.UIThreadAsync(() => progressLbl.Text = $"{downloadProgress.BytesReceived:#,##0} of {downloadProgress.TotalBytesToReceive.Value:#,##0}");
-
-			var d = double.Parse(downloadProgress.BytesReceived.ToString()) / double.Parse(downloadProgress.TotalBytesToReceive.Value.ToString()) * 100.0;
-			var i = int.Parse(Math.Truncate(d).ToString());
-			progressBar1.UIThreadAsync(() => progressBar1.Value = i);
-
-			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.UIThreadAsync(() => lastUpdateLbl.Visible = lastDownloadProgress.AddSeconds(30) < DateTime.Now);
-			if (lastUpdateLbl.Visible)
-			{
-				var diff = DateTime.Now - lastDownloadProgress;
-				var min = (int)diff.TotalMinutes;
-				var minText = min > 0 ? $"{min}min " : "";
-
-				lastUpdateLbl.UIThreadAsync(() => lastUpdateLbl.Text = $"Frozen? Last download activity: {minText}{diff.Seconds}sec ago");
-			}
-		}
-		private void DownloadForm_FormClosing(object sender, FormClosingEventArgs e) => timer.Stop();
-		#endregion
-	}
-}

Source/LibationWinForms/BookLiberation/ProcessorAutomationController.cs

@@ -1,72 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using System.Windows.Forms;
-using FileLiberator;
-
-namespace LibationWinForms.BookLiberation
-{
-	// decouple serilog and form. include convenience factory method
-	public class LogMe
-	{
-		public event EventHandler<string> LogInfo;
-		public event EventHandler<string> LogErrorString;
-		public event EventHandler<(Exception, string)> LogError;
-
-		private LogMe()
-		{
-			LogInfo += (_, text) => Serilog.Log.Logger.Information($"Automated backup: {text}");
-			LogErrorString += (_, text) => Serilog.Log.Logger.Error(text);
-			LogError += (_, tuple) => Serilog.Log.Logger.Error(tuple.Item1, tuple.Item2 ?? "Automated backup: error");
-		}
-
-		public static LogMe RegisterForm<T>(T form) where T : ILogForm
-		{
-			var logMe = new LogMe();
-
-			if (form is null)
-				return logMe;
-
-			logMe.LogInfo += (_, text) => form?.WriteLine(text);
-
-			logMe.LogErrorString += (_, text) => form?.WriteLine(text);
-
-			logMe.LogError += (_, tuple) =>
-			{
-				form?.WriteLine(tuple.Item2 ?? "Automated backup: error");
-				form?.WriteLine("ERROR: " + tuple.Item1.Message);
-			};
-
-			return logMe;
-		}
-
-		public void Info(string text) => LogInfo?.Invoke(this, text);
-		public void Error(string text) => LogErrorString?.Invoke(this, text);
-		public void Error(Exception ex, string text = null) => LogError?.Invoke(this, (ex, text));
-	}
-
-	public static class ProcessorAutomationController
-	{
-		public static 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();
-		}
-	}
-}

Source/LibationWinForms/Dialogs/AccountsDialog.cs

@@ -124,7 +124,7 @@ namespace LibationWinForms.Dialogs
 			}
 			catch (Exception ex)
 			{
-				MessageBoxLib.ShowAdminAlert("Error attempting to save accounts", "Error saving accounts", ex);
+				MessageBoxLib.ShowAdminAlert(this, "Error attempting to save accounts", "Error saving accounts", ex);
 			}
 		}
 

Source/LibationWinForms/Dialogs/EditTemplateDialog.cs

@@ -46,7 +46,7 @@ namespace LibationWinForms.Dialogs
 
 			if (template is null)
 			{
-				MessageBoxLib.ShowAdminAlert($"Programming error. {nameof(EditTemplateDialog)} was not created correctly", "Edit template error", new NullReferenceException($"{nameof(template)} is null"));
+				MessageBoxLib.ShowAdminAlert(this, $"Programming error. {nameof(EditTemplateDialog)} was not created correctly", "Edit template error", new NullReferenceException($"{nameof(template)} is null"));
 				return;
 			}
 

Source/LibationWinForms/Dialogs/RemoveBooksDialog.Designer.cs

@@ -38,7 +38,7 @@ namespace LibationWinForms.Dialogs
 			this.authorsDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.miscDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.purchaseDateGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
-			this.gridEntryBindingSource = new LibationWinForms.SyncBindingSource(this.components);
+			this.gridEntryBindingSource = new LibationWinForms.GridView.SyncBindingSource(this.components);
 			this.btnRemoveBooks = new System.Windows.Forms.Button();
 			this.label1 = new System.Windows.Forms.Label();
 			((System.ComponentModel.ISupportInitialize)(this._dataGridView)).BeginInit();
@@ -176,7 +176,7 @@ namespace LibationWinForms.Dialogs
         #endregion
 
         private System.Windows.Forms.DataGridView _dataGridView;
-        private LibationWinForms.SyncBindingSource gridEntryBindingSource;
+        private LibationWinForms.GridView.SyncBindingSource gridEntryBindingSource;
         private System.Windows.Forms.Button btnRemoveBooks;
         private System.Windows.Forms.Label label1;
 		private System.Windows.Forms.DataGridViewCheckBoxColumn removeDataGridViewCheckBoxColumn;

Source/LibationWinForms/Dialogs/RemoveBooksDialog.cs

@@ -1,5 +1,4 @@
 using System;
-using System.Collections;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Data;
@@ -78,6 +77,7 @@ namespace LibationWinForms.Dialogs
 			catch (Exception ex)
 			{
 				MessageBoxLib.ShowAdminAlert(
+					this,
 					"Error scanning library. You may still manually select books to remove from Libation's library.",
 					"Error scanning library",
 					ex);
@@ -121,10 +121,8 @@ namespace LibationWinForms.Dialogs
 		}
 	}
 
-	internal class RemovableGridEntry : GridEntry
+	internal class RemovableGridEntry : GridView.LibraryBookEntry
 	{
-		private static readonly IComparer BoolComparer = new ObjectComparer<bool>();
-
 		private bool _remove = false;
 		public RemovableGridEntry(LibraryBook libraryBook) : base(libraryBook) { }
 
@@ -147,12 +145,5 @@ namespace LibationWinForms.Dialogs
 				return Remove;
 			return base.GetMemberValue(memberName);
 		}
-
-		public override IComparer GetMemberComparer(Type memberType)
-		{
-			if (memberType == typeof(bool))
-				return BoolComparer;
-			return base.GetMemberComparer(memberType);
-		}
 	}
 }

Source/LibationWinForms/Dialogs/SettingsDialog.cs

@@ -35,6 +35,7 @@ namespace LibationWinForms.Dialogs
 			this.showImportedStatsCb.Text = desc(nameof(config.ShowImportedStats));
 			this.importEpisodesCb.Text = desc(nameof(config.ImportEpisodes));
 			this.downloadEpisodesCb.Text = desc(nameof(config.DownloadEpisodes));
+			this.autoDownloadEpisodesCb.Text = desc(nameof(config.AutoDownloadEpisodes));
 
 			this.booksLocationDescLbl.Text = desc(nameof(config.Books));
 			this.inProgressDescLbl.Text = desc(nameof(config.InProgress));
@@ -80,6 +81,7 @@ namespace LibationWinForms.Dialogs
 			showImportedStatsCb.Checked = config.ShowImportedStats;
 			importEpisodesCb.Checked = config.ImportEpisodes;
 			downloadEpisodesCb.Checked = config.DownloadEpisodes;
+			autoDownloadEpisodesCb.Checked = config.AutoDownloadEpisodes;
 
 			lameTargetRb_CheckedChanged(this, e);
 			LameMatchSourceBRCbox_CheckedChanged(this, e);
@@ -204,6 +206,7 @@ namespace LibationWinForms.Dialogs
 			config.ShowImportedStats = showImportedStatsCb.Checked;
 			config.ImportEpisodes = importEpisodesCb.Checked;
 			config.DownloadEpisodes = downloadEpisodesCb.Checked;
+			config.AutoDownloadEpisodes = autoDownloadEpisodesCb.Checked;
 
 			config.InProgress = inProgressSelectControl.SelectedDirectory;
 

Source/LibationWinForms/Form1.BackupCounts.cs

@@ -6,6 +6,8 @@ namespace LibationWinForms
 {
 	public partial class Form1
 	{
+		private System.ComponentModel.BackgroundWorker updateCountsBw = new();
+
 		protected void Configure_BackupCounts()
 		{
 			// init formattable
@@ -16,22 +18,23 @@ namespace LibationWinForms
 			Load += setBackupCounts;
             LibraryCommands.LibrarySizeChanged += setBackupCounts;
             LibraryCommands.BookUserDefinedItemCommitted += setBackupCounts;
-        }
 
-		private System.ComponentModel.BackgroundWorker updateCountsBw;
+			updateCountsBw.DoWork += UpdateCountsBw_DoWork;
+			updateCountsBw.RunWorkerCompleted += exportMenuEnable;
+			updateCountsBw.RunWorkerCompleted += updateBottomBookNumbers;
+			updateCountsBw.RunWorkerCompleted += update_BeginBookBackups_menuItem;
+			updateCountsBw.RunWorkerCompleted += updateBottomPdfNumbers;
+			updateCountsBw.RunWorkerCompleted += udpate_BeginPdfOnlyBackups_menuItem;
+		}
+
 		private bool runBackupCountsAgain;
 
 		private void setBackupCounts(object _, object __)
 		{
 			runBackupCountsAgain = true;
 
-			if (updateCountsBw is not null)
-				return;
-
-			updateCountsBw = new System.ComponentModel.BackgroundWorker();
-			updateCountsBw.DoWork += UpdateCountsBw_DoWork;
-			updateCountsBw.RunWorkerCompleted += UpdateCountsBw_RunWorkerCompleted;
-			updateCountsBw.RunWorkerAsync();
+			if (!updateCountsBw.IsBusy)
+				updateCountsBw.RunWorkerAsync();
 		}
 
 		private void UpdateCountsBw_DoWork(object sender, System.ComponentModel.DoWorkEventArgs e)
@@ -39,87 +42,78 @@ namespace LibationWinForms
 			while (runBackupCountsAgain)
 			{
 				runBackupCountsAgain = false;
-
-				var libraryStats = LibraryCommands.GetCounts();
-				e.Result = libraryStats;
+				e.Result = LibraryCommands.GetCounts();
 			}
-			updateCountsBw = null;
 		}
 
-		private void UpdateCountsBw_RunWorkerCompleted(object sender, System.ComponentModel.RunWorkerCompletedEventArgs e)
+		private void exportMenuEnable(object _, System.ComponentModel.RunWorkerCompletedEventArgs e)
 		{
 			var libraryStats = e.Result as LibraryCommands.LibraryStats;
-
-			setBookBackupCounts(libraryStats);
-			setPdfBackupCounts(libraryStats);
+			exportLibraryToolStripMenuItem.Enabled = libraryStats.HasBookResults;
 		}
 
 		// this cannot be cleanly be FormattableToolStripMenuItem because of the optional "Errors" text
 		private const string backupsCountsLbl_Format = "BACKUPS: No progress: {0}  In process: {1}  Fully backed up: {2}";
 
-		private void setBookBackupCounts(LibraryCommands.LibraryStats libraryStats)
+		private void updateBottomBookNumbers(object _, System.ComponentModel.RunWorkerCompletedEventArgs e)
 		{
-			var pending = libraryStats.booksNoProgress + libraryStats.booksDownloadedOnly;
-			var hasResults = 0 < (libraryStats.booksFullyBackedUp + libraryStats.booksDownloadedOnly + libraryStats.booksNoProgress + libraryStats.booksError);
+			var libraryStats = e.Result as LibraryCommands.LibraryStats;
 
-			// enable/disable export
-			{
-				exportLibraryToolStripMenuItem.Enabled = hasResults;
-			}
-
-			// update bottom numbers
-			{
-				var formatString
-					= !hasResults ? "No books. Begin by importing your library"
-					: libraryStats.booksError > 0 ? backupsCountsLbl_Format + "  Errors: {3}"
-					: pending > 0 ? backupsCountsLbl_Format
-					: $"All {"book".PluralizeWithCount(libraryStats.booksFullyBackedUp)} backed up";
-				var statusStripText = string.Format(formatString,
-					libraryStats.booksNoProgress,
-					libraryStats.booksDownloadedOnly,
-					libraryStats.booksFullyBackedUp,
-					libraryStats.booksError);
-				statusStrip1.UIThreadAsync(() => backupsCountsLbl.Text = statusStripText);
-			}
-
-			// update 'begin book backups' menu item
-			{
-				var menuItemText
-					= pending > 0
-					? $"{pending} remaining"
-					: "All books have been liberated";
-				menuStrip1.UIThreadAsync(() =>
-				{
-					beginBookBackupsToolStripMenuItem.Format(menuItemText);
-					beginBookBackupsToolStripMenuItem.Enabled = pending > 0;
-				});
-			}
+			var formatString
+				= !libraryStats.HasBookResults ? "No books. Begin by importing your library"
+				: libraryStats.booksError > 0 ? backupsCountsLbl_Format + "  Errors: {3}"
+				: libraryStats.HasPendingBooks ? backupsCountsLbl_Format
+				: $"All {"book".PluralizeWithCount(libraryStats.booksFullyBackedUp)} backed up";
+			var statusStripText = string.Format(formatString,
+				libraryStats.booksNoProgress,
+				libraryStats.booksDownloadedOnly,
+				libraryStats.booksFullyBackedUp,
+				libraryStats.booksError);
+			statusStrip1.UIThreadAsync(() => backupsCountsLbl.Text = statusStripText);
 		}
-		private void setPdfBackupCounts(LibraryCommands.LibraryStats libraryStats)
-		{
-			// update bottom numbers
-			{
-				var hasResults = 0 < (libraryStats.pdfsNotDownloaded + libraryStats.pdfsDownloaded);
-				// don't need to assign the output of Format(). It just makes this logic cleaner
-				var statusStripText
-					= !hasResults ? ""
-					: libraryStats.pdfsNotDownloaded > 0 ? pdfsCountsLbl.Format(libraryStats.pdfsNotDownloaded, libraryStats.pdfsDownloaded)
-					: $"|  All {libraryStats.pdfsDownloaded} PDFs downloaded";
-				statusStrip1.UIThreadAsync(() => pdfsCountsLbl.Text = statusStripText);
-			}
 
-			// update 'begin pdf only backups' menu item
+		// update 'begin book backups' menu item
+		private void update_BeginBookBackups_menuItem(object _, System.ComponentModel.RunWorkerCompletedEventArgs e)
+		{
+			var libraryStats = e.Result as LibraryCommands.LibraryStats;
+
+			var menuItemText
+				= libraryStats.HasPendingBooks
+				? $"{libraryStats.PendingBooks} remaining"
+				: "All books have been liberated";
+			menuStrip1.UIThreadAsync(() =>
 			{
-				var menuItemText
-					= libraryStats.pdfsNotDownloaded > 0
-					? $"{libraryStats.pdfsNotDownloaded} remaining"
-					: "All PDFs have been downloaded";
-				menuStrip1.UIThreadAsync(() =>
-				{
-					beginPdfBackupsToolStripMenuItem.Format(menuItemText);
-					beginPdfBackupsToolStripMenuItem.Enabled = libraryStats.pdfsNotDownloaded > 0;
-				});
-			}
+				beginBookBackupsToolStripMenuItem.Format(menuItemText);
+				beginBookBackupsToolStripMenuItem.Enabled = libraryStats.HasPendingBooks;
+			});
+		}
+
+		private void updateBottomPdfNumbers(object _, System.ComponentModel.RunWorkerCompletedEventArgs e)
+		{
+			var libraryStats = e.Result as LibraryCommands.LibraryStats;
+
+			// don't need to assign the output of Format(). It just makes this logic cleaner
+			var statusStripText
+				= !libraryStats.HasPdfResults ? ""
+				: libraryStats.pdfsNotDownloaded > 0 ? pdfsCountsLbl.Format(libraryStats.pdfsNotDownloaded, libraryStats.pdfsDownloaded)
+				: $"|  All {libraryStats.pdfsDownloaded} PDFs downloaded";
+			statusStrip1.UIThreadAsync(() => pdfsCountsLbl.Text = statusStripText);
+		}
+
+		// update 'begin pdf only backups' menu item
+		private void udpate_BeginPdfOnlyBackups_menuItem(object _, System.ComponentModel.RunWorkerCompletedEventArgs e)
+		{
+			var libraryStats = e.Result as LibraryCommands.LibraryStats;
+
+			var menuItemText
+				= libraryStats.pdfsNotDownloaded > 0
+				? $"{libraryStats.pdfsNotDownloaded} remaining"
+				: "All PDFs have been downloaded";
+			menuStrip1.UIThreadAsync(() =>
+			{
+				beginPdfBackupsToolStripMenuItem.Format(menuItemText);
+				beginPdfBackupsToolStripMenuItem.Enabled = libraryStats.pdfsNotDownloaded > 0;
+			});
 		}
     }
 }

Source/LibationWinForms/Form1.Export.cs

@@ -40,7 +40,7 @@ namespace LibationWinForms
 			}
 			catch (Exception ex)
 			{
-				MessageBoxLib.ShowAdminAlert("Error attempting to export your library.", "Error exporting", ex);
+				MessageBoxLib.ShowAdminAlert(this, "Error attempting to export your library.", "Error exporting", ex);
 			}
 		}
 	}

Source/LibationWinForms/Form1.Filter.cs

@@ -30,7 +30,7 @@ namespace LibationWinForms
 
 			try
 			{
-				productsGrid.Filter(filterString);
+				productsDisplay.Filter(filterString);
 				lastGoodFilter = filterString;
 			}
 			catch (Exception ex)

Source/LibationWinForms/Form1.Liberate.cs

@@ -10,7 +10,7 @@ namespace LibationWinForms
 		private void Configure_Liberate() { }
 
 		//GetLibrary_Flat_NoTracking() may take a long time on a hugh library. so run in new thread 
-		private async void beginBookBackupsToolStripMenuItem_Click(object sender, EventArgs e)
+		private async void beginBookBackupsToolStripMenuItem_Click(object _ = null, EventArgs __ = null)
 		{
 			SetQueueCollapseState(false);
 			await Task.Run(() => processBookQueue1.AddDownloadDecrypt(ApplicationServices.DbContexts.GetLibrary_Flat_NoTracking()

Source/LibationWinForms/Form1.PictureStorage.cs

@@ -1,17 +0,0 @@
-using Dinah.Core.Drawing;
-using LibationFileManager;
-
-namespace LibationWinForms
-{
-    public partial class Form1
-    {
-        private void Configure_PictureStorage()
-        {
-            // init default/placeholder cover art
-            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));
-        }
-    }
-}

Source/LibationWinForms/Form1.ProcessQueue.cs

@@ -14,27 +14,15 @@ namespace LibationWinForms
 		int WidthChange = 0;
 		private void Configure_ProcessQueue()
 		{
-			productsGrid.LiberateClicked += ProductsGrid_LiberateClicked;
 			processBookQueue1.popoutBtn.Click += ProcessBookQueue1_PopOut;
 			var coppalseState = Configuration.Instance.GetNonString<bool>(nameof(splitContainer1.Panel2Collapsed));
 			WidthChange = splitContainer1.Panel2.Width + splitContainer1.SplitterWidth;
 			SetQueueCollapseState(coppalseState);
 		}
 
-		private void ProductsGrid_LiberateClicked(object sender, LibraryBook e)
+		private void ProductsDisplay_LiberateClicked(object sender, LibraryBook e)
 		{
-			if (e.Book.Audio_Exists())
-			{
-				// liberated: open explorer to file
-				var filePath = AudibleFileStorage.Audio.GetPath(e.Book.AudibleProductId);
-				if (!Go.To.File(filePath))
-				{
-					var suffix = string.IsNullOrWhiteSpace(filePath) ? "" : $":\r\n{filePath}";
-					MessageBox.Show($"File not found" + suffix);
-				}
-				return;
-			}
-			else if (e.Book.UserDefinedItem.BookStatus != LiberatedStatus.Liberated)
+			if (e.Book.UserDefinedItem.BookStatus != LiberatedStatus.Liberated)
 			{
 				SetQueueCollapseState(false);
 				processBookQueue1.AddDownloadDecrypt(e);
@@ -44,7 +32,16 @@ namespace LibationWinForms
 				SetQueueCollapseState(false);
 				processBookQueue1.AddDownloadPdf(e);
 			}
-			
+			else if (e.Book.Audio_Exists())
+			{
+				// liberated: open explorer to file
+				var filePath = AudibleFileStorage.Audio.GetPath(e.Book.AudibleProductId);
+				if (!Go.To.File(filePath))
+				{
+					var suffix = string.IsNullOrWhiteSpace(filePath) ? "" : $":\r\n{filePath}";
+					MessageBox.Show($"File not found" + suffix);
+				}
+			}
 		}
 
 		private void SetQueueCollapseState(bool collapsed)

Source/LibationWinForms/Form1.QuickFilters.cs

@@ -14,12 +14,6 @@ namespace LibationWinForms
 			Load += updateFiltersMenu;
 			QuickFilters.UseDefaultChanged += updateFirstFilterIsDefaultToolStripMenuItem;
 			QuickFilters.Updated += updateFiltersMenu;
-
-			productsGrid.InitialLoaded += (_, __) =>
-			{
-				if (QuickFilters.UseDefault)
-					performFilter(QuickFilters.Filters.FirstOrDefault());
-			};
 		}
 
 		private object quickFilterTag { get; } = new();
@@ -56,5 +50,11 @@ namespace LibationWinForms
 		private void addQuickFilterBtn_Click(object sender, EventArgs e) => QuickFilters.Add(this.filterSearchTb.Text);
 
 		private void editQuickFiltersToolStripMenuItem_Click(object sender, EventArgs e) => new EditQuickFilters().ShowDialog();
+
+		private void productsDisplay_InitialLoaded(object sender, EventArgs e)
+		{
+			if (QuickFilters.UseDefault)
+				performFilter(QuickFilters.Filters.FirstOrDefault());
+		}
 	}
 }

Source/LibationWinForms/Form1.ScanManual.cs

@@ -126,6 +126,7 @@ namespace LibationWinForms
 			catch (Exception ex)
 			{
 				MessageBoxLib.ShowAdminAlert(
+					this,
 					"Error importing library. Please try again. If this still happens after 2 or 3 tries, stop and contact administrator",
 					"Error importing library",
 					ex);

Source/LibationWinForms/Form1.VisibleBooks.cs

@@ -14,48 +14,36 @@ namespace LibationWinForms
 		{
 			// init formattable
 			visibleCountLbl.Format(0);
-			liberateVisibleToolStripMenuItem.Format(0);
-			liberateVisible2ToolStripMenuItem.Format(0);
-
-			// bottom-left visible count
-			productsGrid.VisibleCountChanged += (_, qty) => visibleCountLbl.Format(qty);
+			liberateVisibleToolStripMenuItem_VisibleBooksMenu.Format(0);
+			liberateVisibleToolStripMenuItem_LiberateMenu.Format(0);
 
 			// top menu strip
 			visibleBooksToolStripMenuItem.Format(0);
-			productsGrid.VisibleCountChanged += (_, qty) => {
-				visibleBooksToolStripMenuItem.Format(qty);
-				visibleBooksToolStripMenuItem.Enabled = qty > 0;
 
-				var notLiberatedCount = productsGrid.GetVisible().Count(lb => lb.Book.UserDefinedItem.BookStatus == DataLayer.LiberatedStatus.NotLiberated);
-			};
-
-			productsGrid.VisibleCountChanged += setLiberatedVisibleMenuItemAsync;
 			LibraryCommands.BookUserDefinedItemCommitted += setLiberatedVisibleMenuItemAsync;
 		}
-		private async void setLiberatedVisibleMenuItemAsync(object _, int __)
-			=> await Task.Run(setLiberatedVisibleMenuItem);
-		private async void setLiberatedVisibleMenuItemAsync(object _, EventArgs __)
+		private async void setLiberatedVisibleMenuItemAsync(object _, object __)
 			=> await Task.Run(setLiberatedVisibleMenuItem);
 		void setLiberatedVisibleMenuItem()
 		{
-			var notLiberated = productsGrid.GetVisible().Count(lb => lb.Book.UserDefinedItem.BookStatus == DataLayer.LiberatedStatus.NotLiberated);
+			var notLiberated = productsDisplay.GetVisible().Count(lb => lb.Book.UserDefinedItem.BookStatus == DataLayer.LiberatedStatus.NotLiberated);
 			this.UIThreadSync(() =>
 			{
 				if (notLiberated > 0)
 				{
-					liberateVisibleToolStripMenuItem.Format(notLiberated);
-					liberateVisibleToolStripMenuItem.Enabled = true;
+					liberateVisibleToolStripMenuItem_VisibleBooksMenu.Format(notLiberated);
+					liberateVisibleToolStripMenuItem_VisibleBooksMenu.Enabled = true;
 
-					liberateVisible2ToolStripMenuItem.Format(notLiberated);
-					liberateVisible2ToolStripMenuItem.Enabled = true;
+					liberateVisibleToolStripMenuItem_LiberateMenu.Format(notLiberated);
+					liberateVisibleToolStripMenuItem_LiberateMenu.Enabled = true;
 				}
 				else
 				{
-					liberateVisibleToolStripMenuItem.Text = "All visible books are liberated";
-					liberateVisibleToolStripMenuItem.Enabled = false;
+					liberateVisibleToolStripMenuItem_VisibleBooksMenu.Text = "All visible books are liberated";
+					liberateVisibleToolStripMenuItem_VisibleBooksMenu.Enabled = false;
 
-					liberateVisible2ToolStripMenuItem.Text = "All visible books are liberated";
-					liberateVisible2ToolStripMenuItem.Enabled = false;
+					liberateVisibleToolStripMenuItem_LiberateMenu.Text = "All visible books are liberated";
+					liberateVisibleToolStripMenuItem_LiberateMenu.Enabled = false;
 				}
 			});
 		}
@@ -63,7 +51,7 @@ namespace LibationWinForms
 		private async void liberateVisible(object sender, EventArgs e)
 		{
 			SetQueueCollapseState(false);
-			await Task.Run(() => processBookQueue1.AddDownloadDecrypt(productsGrid.GetVisible()));
+			await Task.Run(() => processBookQueue1.AddDownloadDecrypt(productsDisplay.GetVisible()));
 		}
 
 		private void replaceTagsToolStripMenuItem_Click(object sender, EventArgs e)
@@ -73,7 +61,7 @@ namespace LibationWinForms
 			if (result != DialogResult.OK)
 				return;
 
-			var visibleLibraryBooks = productsGrid.GetVisible();
+			var visibleLibraryBooks = productsDisplay.GetVisible();
 
 			var confirmationResult = MessageBoxLib.ShowConfirmationDialog(
 				visibleLibraryBooks,
@@ -95,7 +83,7 @@ namespace LibationWinForms
 			if (result != DialogResult.OK)
 				return;
 
-			var visibleLibraryBooks = productsGrid.GetVisible();
+			var visibleLibraryBooks = productsDisplay.GetVisible();
 
 			var confirmationResult = MessageBoxLib.ShowConfirmationDialog(
 				visibleLibraryBooks,
@@ -112,7 +100,7 @@ namespace LibationWinForms
 
 		private async void removeToolStripMenuItem_Click(object sender, EventArgs e)
 		{
-			var visibleLibraryBooks = productsGrid.GetVisible();
+			var visibleLibraryBooks = productsDisplay.GetVisible();
 
 			var confirmationResult = MessageBoxLib.ShowConfirmationDialog(
 				visibleLibraryBooks,
@@ -125,5 +113,20 @@ namespace LibationWinForms
 			var visibleIds = visibleLibraryBooks.Select(lb => lb.Book.AudibleProductId).ToList();
 			await LibraryCommands.RemoveBooksAsync(visibleIds);
 		}
+
+		private async void productsDisplay_VisibleCountChanged(object sender, int qty)
+		{
+			// bottom-left visible count
+			visibleCountLbl.Format(qty);
+
+			// top menu strip
+			visibleBooksToolStripMenuItem.Format(qty);
+			visibleBooksToolStripMenuItem.Enabled = qty > 0;
+
+			//Not used for anything?
+			var notLiberatedCount = productsDisplay.GetVisible().Count(lb => lb.Book.UserDefinedItem.BookStatus == DataLayer.LiberatedStatus.NotLiberated);
+			
+			await Task.Run(setLiberatedVisibleMenuItem);
+		}
 	}
 }

Source/LibationWinForms/Form1._NonUI.cs

@@ -0,0 +1,37 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using ApplicationServices;
+using Dinah.Core.Drawing;
+using LibationFileManager;
+
+namespace LibationWinForms
+{
+    public partial class Form1
+    {
+        private void Configure_NonUI()
+        {
+            // init default/placeholder cover art
+            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));
+            PictureStorage.SetDefaultImage(PictureSize.Native, Properties.Resources.default_cover_500x500.ToBytes(format));
+
+            // wire-up event to automatically download after scan.
+            // winforms only. this should NOT be allowed in cli
+            updateCountsBw.RunWorkerCompleted += (object sender, System.ComponentModel.RunWorkerCompletedEventArgs e) =>
+            {
+                if (!Configuration.Instance.AutoDownloadEpisodes)
+                    return;
+
+                var libraryStats = e.Result as LibraryCommands.LibraryStats;
+
+                if ((libraryStats.booksNoProgress + libraryStats.pdfsNotDownloaded) > 0)
+                    beginBookBackupsToolStripMenuItem_Click();
+            };
+        }
+    }
+}

Source/LibationWinForms/Form1.cs

@@ -12,24 +12,10 @@ namespace LibationWinForms
 {
 	public partial class Form1 : Form
 	{
-		private ProductsGrid productsGrid { get; }
-
 		public Form1()
 		{
 			InitializeComponent();
 
-			if (this.DesignMode)
-				return;
-
-			{
-				// I'd actually like these lines to be handled in the designer, but I'm currently getting this error when I try:
-				//   Failed to create component 'ProductsGrid'.  The error message follows:
-				//   'Microsoft.DotNet.DesignTools.Client.DesignToolsServerException: Object reference not set to an instance of an object.
-				// Since the designer's choking on it, I'm keeping it below the DesignMode check to be safe
-				productsGrid = new ProductsGrid { Dock = DockStyle.Fill };
-				gridPanel.Controls.Add(productsGrid);
-			}
-
 			// Pre-requisite:
 			// Before calling anything else, including subscribing to events, ensure database exists. If we wait and let it happen lazily, race conditions and errors are likely during new installs
 			using var _ = DbContexts.GetContext();
@@ -52,7 +38,6 @@ namespace LibationWinForms
 			// these should do nothing interesting yet (storing simple var, subscribe to events) and should never rely on each other for order.
 			// otherwise, order could be an issue.
 			// eg: if one of these init'd productsGrid, then another can't reliably subscribe to it
-			Configure_PictureStorage();
 			Configure_BackupCounts();
 			Configure_ScanAuto();
 			Configure_ScanNotification();
@@ -64,11 +49,13 @@ namespace LibationWinForms
 			Configure_Settings();
 			Configure_ProcessQueue();
 			Configure_Filter();
+			// misc which belongs in winforms app but doesn't have a UI element
+			Configure_NonUI();
 
 			// Configure_Grid(); // since it's just this, can keep here. If it needs more, then give grid it's own 'partial class Form1'
 			{
-				this.Load += (_, __) => productsGrid.Display();
-				LibraryCommands.LibrarySizeChanged += (_, __) => this.UIThreadAsync(() => productsGrid.Display());
+				this.Load += (_, __) => productsDisplay.Display();
+				LibraryCommands.LibrarySizeChanged += (_, __) => this.UIThreadAsync(() => productsDisplay.Display());
 			}
 		}
 

Source/LibationWinForms/Form1.resx

@@ -57,12 +57,48 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <metadata name="filterHelpBtn.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="filterBtn.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="filterSearchTb.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
   <metadata name="menuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>
   </metadata>
+  <metadata name="menuStrip1.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
   <metadata name="statusStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>132, 17</value>
   </metadata>
+  <metadata name="statusStrip1.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="addQuickFilterBtn.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="splitContainer1.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="panel1.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="productsDisplay.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="toggleQueueHideBtn.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="processBookQueue1.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="$this.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>

Source/LibationWinForms/GridView/AsyncNotifyPropertyChanged.cs

@@ -2,7 +2,7 @@
 using System.ComponentModel;
 using System.Runtime.CompilerServices;
 
-namespace LibationWinForms
+namespace LibationWinForms.GridView
 {
 	public abstract class AsyncNotifyPropertyChanged : SynchronizeInvoker, INotifyPropertyChanged
 	{

Source/LibationWinForms/GridView/DataGridViewImageButtonCell.cs

@@ -1,7 +1,7 @@
 using System.Drawing;
 using System.Windows.Forms;
 
-namespace LibationWinForms
+namespace LibationWinForms.GridView
 {
 	public class DataGridViewImageButtonCell : DataGridViewButtonCell
 	{

Source/LibationWinForms/GridView/DescriptionDisplay.Designer.cs

@@ -1,4 +1,4 @@
-namespace LibationWinForms
+namespace LibationWinForms.GridView
 {
 	partial class DescriptionDisplay
 	{

Source/LibationWinForms/GridView/DescriptionDisplay.cs

@@ -1,17 +1,15 @@
 using System;
-using System.ComponentModel;
 using System.Drawing;
-using System.Linq;
 using System.Runtime.InteropServices;
 using System.Windows.Forms;
 
-namespace LibationWinForms
+namespace LibationWinForms.GridView
 {
 	public partial class DescriptionDisplay : Form
 	{
 		private int borderThickness = 5;
 
-		public int BorderThickness 
+		public int BorderThickness
 		{
 			get => borderThickness;
 			set

Source/LibationWinForms/GridView/EditTagsDataGridViewImageButtonColumn.cs

@@ -1,7 +1,8 @@
-using System.Drawing;
+using Dinah.Core.Windows.Forms;
+using System.Drawing;
 using System.Windows.Forms;
 
-namespace LibationWinForms
+namespace LibationWinForms.GridView
 {
 	public class EditTagsDataGridViewImageButtonColumn : DataGridViewButtonColumn
 	{
@@ -18,6 +19,12 @@ namespace LibationWinForms
 
 		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)
 		{
+			if (rowIndex >= 0 && DataGridView.GetBoundItem<GridEntry>(rowIndex) is SeriesEntry)
+			{
+				base.Paint(graphics, clipBounds, cellBounds, rowIndex, elementState, null, null, null, cellStyle, advancedBorderStyle, DataGridViewPaintParts.Background | DataGridViewPaintParts.Border);
+				return;
+			}
+
 			var tagsString = (string)value;
 
 			var foreColor = tagsString?.Contains("hidden") == true ? HiddenForeColor : DataGridView.DefaultCellStyle.ForeColor;

Source/LibationWinForms/GridView/GridEntry.cs

@@ -0,0 +1,157 @@
+using DataLayer;
+using Dinah.Core;
+using Dinah.Core.DataBinding;
+using Dinah.Core.Drawing;
+using LibationFileManager;
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Drawing;
+using System.Linq;
+
+namespace LibationWinForms.GridView
+{
+	/// <summary>The View Model base for the DataGridView</summary>
+	public abstract class GridEntry : AsyncNotifyPropertyChanged, IMemberComparable
+	{
+		[Browsable(false)] public string AudibleProductId => Book.AudibleProductId;
+		[Browsable(false)] public LibraryBook LibraryBook { get; protected set; }
+		[Browsable(false)] public float SeriesIndex { get; protected set; }
+		[Browsable(false)] public string LongDescription { get; protected set; }
+		[Browsable(false)] public abstract DateTime DateAdded { get; }
+		[Browsable(false)] protected Book Book => LibraryBook.Book;
+
+		#region Model properties exposed to the view
+
+		public abstract LiberateButtonStatus Liberate { get; }
+		public Image Cover
+		{
+			get => _cover;
+			protected set
+			{
+				_cover = value;
+				NotifyPropertyChanged();
+			}
+		}
+		public string PurchaseDate { get; protected set; }
+		public string Series { get; protected set; }
+		public string Title { get; protected set; }
+		public string Length { get; protected set; }
+		public string Authors { get; protected set; }
+		public string Narrators { get; protected set; }
+		public string Category { get; protected set; }
+		public string Misc { get; protected set; }
+		public string Description { get; protected set; }
+		public string ProductRating { get; protected set; }
+		public string MyRating { get; protected set; }
+		public abstract string DisplayTags { get; }
+
+		#endregion
+
+		#region Sorting
+
+		public GridEntry() => _memberValues = CreateMemberValueDictionary();
+
+		// These methods are implementation of Dinah.Core.DataBinding.IMemberComparable
+		// Used by GridEntryBindingList for all sorting
+		public virtual object GetMemberValue(string memberName) => _memberValues[memberName]();
+		public IComparer GetMemberComparer(Type memberType) => _memberTypeComparers[memberType];
+		protected abstract Dictionary<string, Func<object>> CreateMemberValueDictionary();
+		private Dictionary<string, Func<object>> _memberValues { get; set; }
+
+		// 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(bool), new ObjectComparer<bool>() },
+			{ typeof(DateTime), new ObjectComparer<DateTime>() },
+			{ typeof(LiberateButtonStatus), new ObjectComparer<LiberateButtonStatus>() },
+		};
+
+		#endregion
+
+		#region Cover Art
+
+		private Image _cover;
+		protected void LoadCover()
+		{
+			// Get cover art. If it's default, subscribe to PictureCached
+			(bool isDefault, byte[] picture) = PictureStorage.GetPicture(new PictureDefinition(Book.PictureId, PictureSize._80x80));
+
+			if (isDefault)
+				PictureStorage.PictureCached += PictureStorage_PictureCached;
+
+			// Mutable property. Set the field so PropertyChanged isn't fired.
+			_cover = ImageReader.ToImage(picture);
+		}
+
+		private void PictureStorage_PictureCached(object sender, PictureCachedEventArgs e)
+		{
+			if (e.Definition.PictureId == Book.PictureId)
+			{
+				Cover = ImageReader.ToImage(e.Picture);
+				PictureStorage.PictureCached -= PictureStorage_PictureCached;
+			}
+		}
+
+		#endregion
+
+		#region Static library display functions		
+
+		/// <summary>This information should not change during <see cref="GridEntry"/> lifetime, so call only once.</summary>
+		protected static string GetDescriptionDisplay(Book book)
+		{
+			var doc = new HtmlAgilityPack.HtmlDocument();
+			doc.LoadHtml(book?.Description?.Replace("</p> ", "\r\n\r\n</p>") ?? "");
+			return doc.DocumentNode.InnerText.Trim();
+		}
+
+		protected static string TrimTextToWord(string text, int maxLength)
+		{
+			return
+				text.Length <= maxLength ?
+				text :
+				text.Substring(0, maxLength - 3) + "...";
+		}
+
+
+		/// <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>
+		protected static string GetMiscDisplay(LibraryBook libraryBook)
+		{
+			var details = new List<string>();
+
+			var locale = libraryBook.Book.Locale.DefaultIfNullOrWhiteSpace("[unknown]");
+			var acct = libraryBook.Account.DefaultIfNullOrWhiteSpace("[unknown]");
+
+			details.Add($"Account: {locale} - {acct}");
+
+			if (libraryBook.Book.HasPdf())
+				details.Add("Has PDF");
+			if (libraryBook.Book.IsAbridged)
+				details.Add("Abridged");
+			if (libraryBook.Book.DatePublished.HasValue)
+				details.Add($"Date pub'd: {libraryBook.Book.DatePublished.Value:MM/dd/yyyy}");
+			// this goes last since it's most likely to have a line-break
+			if (!string.IsNullOrWhiteSpace(libraryBook.Book.Publisher))
+				details.Add($"Pub: {libraryBook.Book.Publisher.Trim()}");
+
+			if (!details.Any())
+				return "[details not imported]";
+
+			return string.Join("\r\n", details);
+		}
+
+		#endregion
+
+		~GridEntry()
+		{
+			PictureStorage.PictureCached -= PictureStorage_PictureCached;
+		}
+	}
+}

Source/LibationWinForms/GridView/GridEntryBindingList.cs

@@ -0,0 +1,234 @@
+using ApplicationServices;
+using Dinah.Core.DataBinding;
+using LibationSearchEngine;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+
+namespace LibationWinForms.GridView
+{
+	/*
+	 * Allows filtering and sorting of the underlying BindingList<GridEntry>
+	 * by implementing IBindingListView and using SearchEngineCommands 
+	 * 
+	 * When filtering is applied, the filtered-out items are removed
+	 * from the base list and added to the private FilterRemoved list.
+	 * When filtering is removed, items in the FilterRemoved list are
+	 * added back to the base list.
+	 * 
+	 * Remove is overridden to ensure that removed items are removed from
+	 * the base list (visible items) as well as the FilterRemoved list.
+	 */
+	internal class GridEntryBindingList : BindingList<GridEntry>, IBindingListView
+	{
+		public GridEntryBindingList() : base(new List<GridEntry>()) { }
+		public GridEntryBindingList(IEnumerable<GridEntry> enumeration) : base(new List<GridEntry>(enumeration)) { }
+
+		/// <returns>All items in the list, including those filtered out.</returns>
+		public List<GridEntry> AllItems() => Items.Concat(FilterRemoved).ToList();
+		public bool SupportsFiltering => true;
+		public string Filter { get => FilterString; set => ApplyFilter(value); }
+
+		/// <summary>When true, itms will not be checked filtered by search criteria on item changed<summary>
+		public bool SuspendFilteringOnUpdate { get; set; }
+
+		protected MemberComparer<GridEntry> Comparer { get; } = new();
+		protected override bool SupportsSortingCore => true;
+		protected override bool SupportsSearchingCore => true;
+		protected override bool IsSortedCore => isSorted;
+		protected override PropertyDescriptor SortPropertyCore => propertyDescriptor;
+		protected override ListSortDirection SortDirectionCore => listSortDirection;
+
+		/// <summary> Items that were removed from the base list due to filtering </summary>
+		private readonly List<GridEntry> FilterRemoved = new();
+		private string FilterString;
+		private SearchResultSet SearchResults;
+		private bool isSorted;
+		private ListSortDirection listSortDirection;
+		private PropertyDescriptor propertyDescriptor;
+
+
+		#region Unused - Advanced Filtering
+		public bool SupportsAdvancedSorting => false;
+
+		//This ApplySort overload is only called if SupportsAdvancedSorting is true.
+		//Otherwise BindingList.ApplySort() is used
+		public void ApplySort(ListSortDescriptionCollection sorts) => throw new NotImplementedException();
+
+		public ListSortDescriptionCollection SortDescriptions => throw new NotImplementedException();
+		#endregion
+
+		public new void Remove(GridEntry entry)
+		{
+			FilterRemoved.Remove(entry);
+			base.Remove(entry);
+		}
+
+		private void ApplyFilter(string filterString)
+		{
+			if (filterString != FilterString)
+				RemoveFilter();
+
+			FilterString = filterString;
+			SearchResults = SearchEngineCommands.Search(filterString);
+
+			var booksFilteredIn = Items.BookEntries().Join(SearchResults.Docs, lbe => lbe.AudibleProductId, d => d.ProductId, (lbe, d) => (GridEntry)lbe);
+
+			//Find all series containing children that match the search criteria
+			var seriesFilteredIn = Items.SeriesEntries().Where(s => s.Children.Join(SearchResults.Docs, lbe => lbe.AudibleProductId, d => d.ProductId, (lbe, d) => lbe).Any());
+
+			var filteredOut = Items.Except(booksFilteredIn.Concat(seriesFilteredIn)).ToList();
+
+			foreach (var item in filteredOut)
+			{
+				FilterRemoved.Add(item);
+				base.Remove(item);
+			}
+		}
+
+		public void CollapseAll()
+		{
+			foreach (var series in Items.SeriesEntries().ToList())
+				CollapseItem(series);
+		}
+
+		public void ExpandAll()
+		{
+			foreach (var series in Items.SeriesEntries().ToList())
+				ExpandItem(series);
+		}
+
+		public void CollapseItem(SeriesEntry sEntry)
+		{
+			foreach (var episode in Items.BookEntries().Where(b => b.Parent == sEntry).ToList())
+			{
+				FilterRemoved.Add(episode);
+				base.Remove(episode);
+			}
+
+			sEntry.Liberate.Expanded = false;
+		}
+
+		public void ExpandItem(SeriesEntry sEntry)
+		{
+			var sindex = Items.IndexOf(sEntry);
+
+			foreach (var episode in FilterRemoved.BookEntries().Where(b => b.Parent == sEntry).ToList())
+			{
+				if (SearchResults is null || SearchResults.Docs.Any(d => d.ProductId == episode.AudibleProductId))
+				{
+					FilterRemoved.Remove(episode);
+					InsertItem(++sindex, episode);
+				}
+			}
+			sEntry.Liberate.Expanded = true;
+		}
+
+		public void RemoveFilter()
+		{
+			if (FilterString is null) return;
+
+			int visibleCount = Items.Count;
+
+			foreach (var item in FilterRemoved.ToList())
+			{
+				if (item is SeriesEntry || (item is LibraryBookEntry lbe && (lbe.Parent is null || lbe.Parent.Liberate.Expanded)))
+				{
+					FilterRemoved.Remove(item);
+					InsertItem(visibleCount++, item);
+				}
+			}
+
+			if (IsSortedCore)
+				Sort();
+			else
+			//No user sort is applied, so do default sorting by DateAdded, descending
+			{
+				Comparer.PropertyName = nameof(GridEntry.DateAdded);
+				Comparer.Direction = ListSortDirection.Descending;
+				Sort();
+			}
+
+			OnListChanged(new ListChangedEventArgs(ListChangedType.Reset, -1));
+
+			FilterString = null;
+			SearchResults = null;
+		}
+
+		protected override void ApplySortCore(PropertyDescriptor property, ListSortDirection direction)
+		{
+			Comparer.PropertyName = property.Name;
+			Comparer.Direction = direction;
+
+			Sort();
+
+			propertyDescriptor = property;
+			listSortDirection = direction;
+			isSorted = true;
+
+			OnListChanged(new ListChangedEventArgs(ListChangedType.Reset, -1));
+		}
+
+		protected void Sort()
+		{
+			var itemsList = (List<GridEntry>)Items;
+
+			var children = itemsList.BookEntries().Where(i => i.Parent is not null).ToList();
+
+			var sortedItems = itemsList.Except(children).OrderBy(ge => ge, Comparer).ToList();
+
+			itemsList.Clear();
+
+			//Only add parentless items at this stage. After these items are added in the
+			//correct sorting order, go back and add the children beneath their parents.
+			itemsList.AddRange(sortedItems);
+
+			foreach (var parent in children.Select(c => c.Parent).Distinct())
+			{
+				var pIndex = itemsList.IndexOf(parent);
+
+				//children should always be sorted by series index.
+				foreach (var c in children.Where(c => c.Parent == parent).OrderBy(c => c.SeriesIndex))
+					itemsList.Insert(++pIndex, c);
+			}
+		}
+
+		protected override void OnListChanged(ListChangedEventArgs e)
+		{
+			if (e.ListChangedType == ListChangedType.ItemChanged)
+			{
+				if (FilterString is not null && !SuspendFilteringOnUpdate && Items[e.NewIndex] is LibraryBookEntry lbItem)
+				{
+					SearchResults = SearchEngineCommands.Search(FilterString);
+					if (!SearchResults.Docs.Any(d => d.ProductId == lbItem.AudibleProductId))
+					{
+						FilterRemoved.Add(lbItem);
+						base.Remove(lbItem);
+						return;
+					}
+				}
+
+				if (isSorted && e.PropertyDescriptor == SortPropertyCore)
+				{
+					var item = Items[e.NewIndex];
+					Sort();
+					var newIndex = Items.IndexOf(item);
+
+					base.OnListChanged(new ListChangedEventArgs(ListChangedType.ItemMoved, newIndex, e.NewIndex));
+					return;
+				}
+			}
+			base.OnListChanged(e);
+		}
+
+		protected override void RemoveSortCore()
+		{
+			isSorted = false;
+			propertyDescriptor = base.SortPropertyCore;
+			listSortDirection = base.SortDirectionCore;
+
+			OnListChanged(new ListChangedEventArgs(ListChangedType.Reset, -1));
+		}
+	}
+}

Source/LibationWinForms/GridView/ImageDisplay.Designer.cs

@@ -1,4 +1,4 @@
-namespace LibationWinForms
+namespace LibationWinForms.GridView
 {
 	partial class ImageDisplay
 	{

Source/LibationWinForms/GridView/ImageDisplay.cs

@@ -1,11 +1,9 @@
-using FileLiberator;
-using LibationFileManager;
-using System;
+using System;
 using System.Drawing;
 using System.IO;
 using System.Windows.Forms;
 
-namespace LibationWinForms
+namespace LibationWinForms.GridView
 {
 	public partial class ImageDisplay : Form
 	{

Source/LibationWinForms/GridView/LiberateButtonStatus.cs

@@ -0,0 +1,28 @@
+using DataLayer;
+using System;
+
+namespace LibationWinForms.GridView
+{
+	public class LiberateButtonStatus : IComparable
+	{
+		public LiberatedStatus BookStatus { get; set; }
+		public LiberatedStatus? PdfStatus { get; set; }
+		public bool Expanded { get; set; }
+		public bool IsSeries { get; init; }
+
+		/// <summary>
+		/// Defines the Liberate column's sorting behavior
+		/// </summary>
+		public int CompareTo(object obj)
+		{
+			if (obj is not LiberateButtonStatus second) return -1;
+
+			if (IsSeries && !second.IsSeries) return -1;
+			else if (!IsSeries && second.IsSeries) return 1;
+			else if (IsSeries && second.IsSeries) return 0;
+			else if (BookStatus == LiberatedStatus.Liberated && second.BookStatus != LiberatedStatus.Liberated) return -1;
+			else if (BookStatus != LiberatedStatus.Liberated && second.BookStatus == LiberatedStatus.Liberated) return 1;
+			else return BookStatus.CompareTo(second.BookStatus);
+		}
+	}
+}

Source/LibationWinForms/GridView/LiberateDataGridViewImageButtonColumn.cs

@@ -1,10 +1,10 @@
-using System;
+using DataLayer;
+using Dinah.Core.Windows.Forms;
+using System;
 using System.Drawing;
 using System.Windows.Forms;
-using System.Linq;
-using DataLayer;
 
-namespace LibationWinForms
+namespace LibationWinForms.GridView
 {
 	public class LiberateDataGridViewImageButtonColumn : DataGridViewButtonColumn
 	{
@@ -16,19 +16,32 @@ namespace LibationWinForms
 
 	internal class LiberateDataGridViewImageButtonCell : DataGridViewImageButtonCell
 	{
+		private static readonly Color SERIES_BG_COLOR = Color.FromArgb(230, 255, 230);
 		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)
 		{
 			base.Paint(graphics, clipBounds, cellBounds, rowIndex, elementState, null, null, null, cellStyle, advancedBorderStyle, paintParts);
 
-			if (value is (LiberatedStatus, LiberatedStatus) or (LiberatedStatus, null))
+			if (value is LiberateButtonStatus status)
 			{
-				var (bookState, pdfState) = ((LiberatedStatus bookState, LiberatedStatus? pdfState))value;
+				if (rowIndex >= 0 && DataGridView.GetBoundItem<GridEntry>(rowIndex) is LibraryBookEntry lbEntry && lbEntry.Parent is not null)
+				{
+					DataGridView.Rows[rowIndex].DefaultCellStyle.BackColor = SERIES_BG_COLOR;
+				}
 
-				(string mouseoverText, Bitmap buttonImage) = GetLiberateDisplay(bookState, pdfState);
+				if (status.IsSeries)
+				{
+					DrawButtonImage(graphics, status.Expanded ? Properties.Resources.minus: Properties.Resources.plus, cellBounds);
 
-				DrawButtonImage(graphics, buttonImage, cellBounds);
+					ToolTipText = status.Expanded ? "Click to Collpase" : "Click to Expand";
+				}
+				else
+				{
+					(string mouseoverText, Bitmap buttonImage) = GetLiberateDisplay(status.BookStatus, status.PdfStatus);
 
-				ToolTipText = mouseoverText;
+					DrawButtonImage(graphics, buttonImage, cellBounds);
+
+					ToolTipText = mouseoverText;
+				}
 			}
 		}
 

Source/LibationWinForms/GridView/LibraryBookEntry.cs

@@ -0,0 +1,149 @@
+using ApplicationServices;
+using DataLayer;
+using Dinah.Core;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+
+namespace LibationWinForms.GridView
+{
+	/// <summary>The View Model for a LibraryBook that is ContentType.Product or ContentType.Episode</summary>
+	public class LibraryBookEntry : GridEntry
+	{
+		[Browsable(false)] public override DateTime DateAdded => LibraryBook.DateAdded;
+		[Browsable(false)] public SeriesEntry Parent { get; init; }
+
+		#region Model properties exposed to the view
+
+		private DateTime lastStatusUpdate = default;
+		private LiberatedStatus _bookStatus;
+		private LiberatedStatus? _pdfStatus;
+
+		public override LiberateButtonStatus Liberate
+		{
+			get
+			{
+				//Cache these statuses for faster sorting.
+				if ((DateTime.Now - lastStatusUpdate).TotalSeconds > 2)
+				{
+					_bookStatus = LibraryCommands.Liberated_Status(LibraryBook.Book);
+					_pdfStatus = LibraryCommands.Pdf_Status(LibraryBook.Book);
+					lastStatusUpdate = DateTime.Now;
+				}
+				return new LiberateButtonStatus { BookStatus = _bookStatus, PdfStatus = _pdfStatus, IsSeries = false };
+			}
+		}
+		public override string DisplayTags => string.Join("\r\n", Book.UserDefinedItem.TagsEnumerated);
+
+		#endregion
+
+		public LibraryBookEntry(LibraryBook libraryBook)
+		{
+			setLibraryBook(libraryBook);
+			LoadCover();
+		}
+
+		public void UpdateLibraryBook(LibraryBook libraryBook)
+		{
+			if (AudibleProductId != libraryBook.Book.AudibleProductId)
+				throw new Exception("Invalid grid entry update. IDs must match");
+
+			UserDefinedItem.ItemChanged -= UserDefinedItem_ItemChanged;
+			setLibraryBook(libraryBook);
+
+			NotifyPropertyChanged();
+		}
+
+		private void setLibraryBook(LibraryBook libraryBook)
+		{
+			LibraryBook = libraryBook;
+
+			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);
+			LongDescription = GetDescriptionDisplay(Book);
+			Description = TrimTextToWord(LongDescription, 62);
+			SeriesIndex = Book.SeriesLink.FirstOrDefault()?.Index ?? 0;
+
+			UserDefinedItem.ItemChanged += UserDefinedItem_ItemChanged;
+		}
+
+		#region detect changes to the model, update the view, and save to database.
+
+		/// <summary>
+		/// This event handler receives notifications from the model that it has changed.
+		/// Notify the view that it's changed.
+		/// </summary>
+		private void UserDefinedItem_ItemChanged(object sender, string itemName)
+		{
+			var udi = sender as UserDefinedItem;
+
+			if (udi.Book.AudibleProductId != Book.AudibleProductId)
+				return;
+
+			// UDI changed, possibly in a different context/view. Update this viewmodel. Call NotifyPropertyChanged to notify view.
+			// - This method responds to tons of incidental changes. Do not persist to db from here. Committing to db must be a volitional action by the caller, not incidental. Otherwise batch changes would be impossible; we would only have slow one-offs
+			// - Don't restrict notifying view to 'only if property changed'. This same book instance can get passed to a different view, then changed there. When the chain of events makes its way back here, the property is unchanged (because it's the same instance), but this view is out of sync. NotifyPropertyChanged will then update this view.
+			switch (itemName)
+			{
+				case nameof(udi.Tags):
+					Book.UserDefinedItem.Tags = udi.Tags;
+					NotifyPropertyChanged(nameof(DisplayTags));
+					break;
+				case nameof(udi.BookStatus):
+					Book.UserDefinedItem.BookStatus = udi.BookStatus;
+					_bookStatus = udi.BookStatus;
+					NotifyPropertyChanged(nameof(Liberate));
+					break;
+				case nameof(udi.PdfStatus):
+					Book.UserDefinedItem.PdfStatus = udi.PdfStatus;
+					_pdfStatus = udi.PdfStatus;
+					NotifyPropertyChanged(nameof(Liberate));
+					break;
+			}
+		}
+
+		/// <summary>Save edits to the database</summary>
+		public void Commit(string newTags, LiberatedStatus bookStatus, LiberatedStatus? pdfStatus)
+			// MVVM pass-through
+			=> Book.UpdateBook(newTags, bookStatus: bookStatus, pdfStatus: pdfStatus);
+
+		#endregion
+
+		#region Data Sorting
+
+		/// <summary>Create getters for all member object values by name </summary>
+		protected override Dictionary<string, Func<object>> CreateMemberValueDictionary() => new()
+		{
+			{ nameof(Title), () => Book.TitleSortable() },
+			{ nameof(Series), () => Book.SeriesSortable() },
+			{ 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 },
+			{ nameof(DateAdded), () => DateAdded },
+		};
+
+		#endregion
+
+		~LibraryBookEntry()
+		{
+			UserDefinedItem.ItemChanged -= UserDefinedItem_ItemChanged;
+		}
+	}
+}

Source/LibationWinForms/GridView/ProductsDisplay.Designer.cs

@@ -0,0 +1,64 @@
+namespace LibationWinForms.GridView
+{
+	partial class ProductsDisplay
+	{
+		/// <summary> 
+		/// Required designer variable.
+		/// </summary>
+		private System.ComponentModel.IContainer components = null;
+
+		/// <summary> 
+		/// Clean up any resources being used.
+		/// </summary>
+		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+		protected override void Dispose(bool disposing)
+		{
+			if (disposing && (components != null))
+			{
+				components.Dispose();
+			}
+			base.Dispose(disposing);
+		}
+
+		#region Component Designer generated code
+
+		/// <summary> 
+		/// Required method for Designer support - do not modify 
+		/// the contents of this method with the code editor.
+		/// </summary>
+		private void InitializeComponent()
+		{
+			this.productsGrid = new LibationWinForms.GridView.ProductsGrid();
+			this.SuspendLayout();
+			// 
+			// productsGrid
+			// 
+			this.productsGrid.AutoScroll = true;
+			this.productsGrid.Dock = System.Windows.Forms.DockStyle.Fill;
+			this.productsGrid.Location = new System.Drawing.Point(0, 0);
+			this.productsGrid.Name = "productsGrid";
+			this.productsGrid.Size = new System.Drawing.Size(1510, 380);
+			this.productsGrid.TabIndex = 0;
+			this.productsGrid.LiberateClicked += new LibationWinForms.GridView.LibraryBookEntryClickedEventHandler(this.productsGrid_LiberateClicked);
+			this.productsGrid.CoverClicked += new LibationWinForms.GridView.GridEntryClickedEventHandler(this.productsGrid_CoverClicked);
+			this.productsGrid.DetailsClicked += new LibationWinForms.GridView.LibraryBookEntryClickedEventHandler(this.productsGrid_DetailsClicked);
+			this.productsGrid.DescriptionClicked += new LibationWinForms.GridView.GridEntryRectangleClickedEventHandler(this.productsGrid_DescriptionClicked);
+			this.productsGrid.VisibleCountChanged += new System.EventHandler<int>(this.productsGrid_VisibleCountChanged);
+			// 
+			// ProductsDisplay
+			// 
+			this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
+			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+			this.Controls.Add(this.productsGrid);
+			this.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
+			this.Name = "ProductsDisplay";
+			this.Size = new System.Drawing.Size(1510, 380);
+			this.ResumeLayout(false);
+
+		}
+
+		#endregion
+
+		private GridView.ProductsGrid productsGrid;
+	}
+}

Source/LibationWinForms/GridView/ProductsDisplay.cs

@@ -0,0 +1,129 @@
+using ApplicationServices;
+using DataLayer;
+using FileLiberator;
+using LibationFileManager;
+using LibationWinForms.Dialogs;
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Linq;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace LibationWinForms.GridView
+{
+	public partial class ProductsDisplay : UserControl
+	{
+		/// <summary>Number of visible rows has changed</summary>
+		public event EventHandler<int> VisibleCountChanged;
+		public event EventHandler<LibraryBook> LiberateClicked;
+		public event EventHandler InitialLoaded;
+
+		private bool hasBeenDisplayed;
+
+		public ProductsDisplay()
+		{
+			InitializeComponent();
+		}
+
+		#region Button controls		
+
+		private ImageDisplay imageDisplay;
+		private async void productsGrid_CoverClicked(GridEntry liveGridEntry)
+		{
+			var picDefinition = new PictureDefinition(liveGridEntry.LibraryBook.Book.PictureLarge ?? liveGridEntry.LibraryBook.Book.PictureId, PictureSize.Native);
+			var picDlTask = Task.Run(() => PictureStorage.GetPictureSynchronously(picDefinition));
+
+			(_, byte[] initialImageBts) = PictureStorage.GetPicture(new PictureDefinition(liveGridEntry.LibraryBook.Book.PictureId, PictureSize._80x80));
+			var windowTitle = $"{liveGridEntry.Title} - Cover";
+
+			if (imageDisplay is null || imageDisplay.IsDisposed || !imageDisplay.Visible)
+			{
+				imageDisplay = new ImageDisplay();
+				imageDisplay.RestoreSizeAndLocation(Configuration.Instance);
+				imageDisplay.FormClosed += (_, _) => imageDisplay.SaveSizeAndLocation(Configuration.Instance);
+				imageDisplay.Show(this);
+			}
+
+			imageDisplay.BookSaveDirectory = AudibleFileStorage.Audio.GetDestinationDirectory(liveGridEntry.LibraryBook);
+			imageDisplay.PictureFileName = System.IO.Path.GetFileName(AudibleFileStorage.Audio.GetBooksDirectoryFilename(liveGridEntry.LibraryBook, ".jpg"));
+			imageDisplay.Text = windowTitle;
+			imageDisplay.CoverPicture = initialImageBts;
+			imageDisplay.CoverPicture = await picDlTask;
+		}
+
+		private void productsGrid_DescriptionClicked(GridEntry liveGridEntry, Rectangle cellRectangle)
+		{
+			var displayWindow = new DescriptionDisplay
+			{
+				SpawnLocation = PointToScreen(cellRectangle.Location + new Size(cellRectangle.Width, 0)),
+				DescriptionText = liveGridEntry.LongDescription,
+				BorderThickness = 2,
+			};
+
+			void CloseWindow(object o, EventArgs e)
+			{
+				displayWindow.Close();
+			}
+
+			productsGrid.Scroll += CloseWindow;
+			displayWindow.FormClosed += (_, _) => productsGrid.Scroll -= CloseWindow;
+			displayWindow.Show(this);
+		}
+
+		private void productsGrid_DetailsClicked(LibraryBookEntry liveGridEntry)
+		{
+			var bookDetailsForm = new BookDetailsDialog(liveGridEntry.LibraryBook);
+			if (bookDetailsForm.ShowDialog() == DialogResult.OK)
+				liveGridEntry.Commit(bookDetailsForm.NewTags, bookDetailsForm.BookLiberatedStatus, bookDetailsForm.PdfLiberatedStatus);
+		}
+
+		#endregion
+
+		#region UI display functions
+
+		public void Display()
+		{
+			try
+			{
+				// don't return early if lib size == 0. this will not update correctly if all books are removed
+				var lib = DbContexts.GetLibrary_Flat_NoTracking(includeParents: true);
+
+				if (!hasBeenDisplayed)
+				{
+					// bind
+					productsGrid.BindToGrid(lib);
+					hasBeenDisplayed = true;
+					InitialLoaded?.Invoke(this, new());
+				}
+				else
+					productsGrid.UpdateGrid(lib);
+			}
+			catch (Exception ex)
+			{
+				Serilog.Log.Error(ex, "Error displaying library in {0}", nameof(ProductsDisplay));
+			}
+		}
+
+		#endregion
+
+		#region Filter
+
+		public void Filter(string searchString)
+			=> productsGrid.Filter(searchString);
+
+		#endregion
+
+		internal List<LibraryBook> GetVisible() => productsGrid.GetVisibleBooks().ToList();
+
+		private void productsGrid_VisibleCountChanged(object sender, int count)
+		{
+			VisibleCountChanged?.Invoke(this, count);
+		}
+
+		private void productsGrid_LiberateClicked(LibraryBookEntry liveGridEntry)
+		{
+			LiberateClicked?.Invoke(this, liveGridEntry.LibraryBook);
+		}
+	}
+}

Source/LibationWinForms/GridView/ProductsDisplay.resx

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

Source/LibationWinForms/GridView/ProductsGrid.Designer.cs

@@ -1,4 +1,4 @@
-namespace LibationWinForms
+namespace LibationWinForms.GridView
 {
 	partial class ProductsGrid
 	{
@@ -29,10 +29,9 @@
 		private void InitializeComponent()
 		{
 			this.components = new System.ComponentModel.Container();
-			System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
-			this.gridEntryBindingSource = new LibationWinForms.SyncBindingSource(this.components);
+			System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
 			this.gridEntryDataGridView = new System.Windows.Forms.DataGridView();
-			this.liberateGVColumn = new LibationWinForms.LiberateDataGridViewImageButtonColumn();
+			this.liberateGVColumn = new LibationWinForms.GridView.LiberateDataGridViewImageButtonColumn();
 			this.coverGVColumn = new System.Windows.Forms.DataGridViewImageColumn();
 			this.titleGVColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.authorsGVColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -45,16 +44,13 @@
 			this.purchaseDateGVColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.myRatingGVColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.miscGVColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
-			this.tagAndDetailsGVColumn = new LibationWinForms.EditTagsDataGridViewImageButtonColumn();
+			this.tagAndDetailsGVColumn = new LibationWinForms.GridView.EditTagsDataGridViewImageButtonColumn();
 			this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components);
-			((System.ComponentModel.ISupportInitialize)(this.gridEntryBindingSource)).BeginInit();
+			this.syncBindingSource = new LibationWinForms.GridView.SyncBindingSource(this.components);
 			((System.ComponentModel.ISupportInitialize)(this.gridEntryDataGridView)).BeginInit();
+			((System.ComponentModel.ISupportInitialize)(this.syncBindingSource)).BeginInit();
 			this.SuspendLayout();
 			// 
-			// gridEntryBindingSource
-			// 
-			this.gridEntryBindingSource.DataSource = typeof(LibationWinForms.GridEntry);
-			// 
 			// gridEntryDataGridView
 			// 
 			this.gridEntryDataGridView.AllowUserToAddRows = false;
@@ -64,42 +60,40 @@
 			this.gridEntryDataGridView.AutoGenerateColumns = false;
 			this.gridEntryDataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
 			this.gridEntryDataGridView.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
-            this.liberateGVColumn,
-            this.coverGVColumn,
-            this.titleGVColumn,
-            this.authorsGVColumn,
-            this.narratorsGVColumn,
-            this.lengthGVColumn,
-            this.seriesGVColumn,
-            this.descriptionGVColumn,
-            this.categoryGVColumn,
-            this.productRatingGVColumn,
-            this.purchaseDateGVColumn,
-            this.myRatingGVColumn,
-            this.miscGVColumn,
-            this.tagAndDetailsGVColumn});
+			this.liberateGVColumn,
+			this.coverGVColumn,
+			this.titleGVColumn,
+			this.authorsGVColumn,
+			this.narratorsGVColumn,
+			this.lengthGVColumn,
+			this.seriesGVColumn,
+			this.descriptionGVColumn,
+			this.categoryGVColumn,
+			this.productRatingGVColumn,
+			this.purchaseDateGVColumn,
+			this.myRatingGVColumn,
+			this.miscGVColumn,
+			this.tagAndDetailsGVColumn});
 			this.gridEntryDataGridView.ContextMenuStrip = this.contextMenuStrip1;
-			this.gridEntryDataGridView.DataSource = this.gridEntryBindingSource;
-			dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
-			dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Window;
-			dataGridViewCellStyle1.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point);
-			dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.ControlText;
-			dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-			dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-			dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-			this.gridEntryDataGridView.DefaultCellStyle = dataGridViewCellStyle1;
+			this.gridEntryDataGridView.DataSource = this.syncBindingSource;
+			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.gridEntryDataGridView.DefaultCellStyle = dataGridViewCellStyle2;
 			this.gridEntryDataGridView.Dock = System.Windows.Forms.DockStyle.Fill;
 			this.gridEntryDataGridView.Location = new System.Drawing.Point(0, 0);
-			this.gridEntryDataGridView.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
 			this.gridEntryDataGridView.Name = "gridEntryDataGridView";
 			this.gridEntryDataGridView.ReadOnly = true;
 			this.gridEntryDataGridView.RowHeadersVisible = false;
 			this.gridEntryDataGridView.RowTemplate.Height = 82;
 			this.gridEntryDataGridView.Size = new System.Drawing.Size(1510, 380);
 			this.gridEntryDataGridView.TabIndex = 0;
+			this.gridEntryDataGridView.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.DataGridView_CellContentClick);
 			this.gridEntryDataGridView.CellToolTipTextNeeded += new System.Windows.Forms.DataGridViewCellToolTipTextNeededEventHandler(this.gridEntryDataGridView_CellToolTipTextNeeded);
-			this.gridEntryDataGridView.ColumnDisplayIndexChanged += new System.Windows.Forms.DataGridViewColumnEventHandler(this.gridEntryDataGridView_ColumnDisplayIndexChanged);
-			this.gridEntryDataGridView.ColumnWidthChanged += new System.Windows.Forms.DataGridViewColumnEventHandler(this.gridEntryDataGridView_ColumnWidthChanged);
 			// 
 			// liberateGVColumn
 			// 
@@ -218,23 +212,27 @@
 			this.contextMenuStrip1.Name = "contextMenuStrip1";
 			this.contextMenuStrip1.Size = new System.Drawing.Size(61, 4);
 			// 
+			// syncBindingSource
+			// 
+			this.syncBindingSource.DataSource = typeof(LibationWinForms.GridView.GridEntry);
+			// 
 			// ProductsGrid
 			// 
 			this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
 			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+			this.AutoScroll = true;
 			this.Controls.Add(this.gridEntryDataGridView);
-			this.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
 			this.Name = "ProductsGrid";
 			this.Size = new System.Drawing.Size(1510, 380);
-			((System.ComponentModel.ISupportInitialize)(this.gridEntryBindingSource)).EndInit();
+			this.Load += new System.EventHandler(this.ProductsGrid_Load);
 			((System.ComponentModel.ISupportInitialize)(this.gridEntryDataGridView)).EndInit();
+			((System.ComponentModel.ISupportInitialize)(this.syncBindingSource)).EndInit();
 			this.ResumeLayout(false);
 
 		}
 
-		#endregion
 
-		private LibationWinForms.SyncBindingSource gridEntryBindingSource;
+		#endregion
 		private System.Windows.Forms.DataGridView gridEntryDataGridView;
 		private System.Windows.Forms.ContextMenuStrip contextMenuStrip1;
 		private LiberateDataGridViewImageButtonColumn liberateGVColumn;
@@ -251,5 +249,6 @@
 		private System.Windows.Forms.DataGridViewTextBoxColumn myRatingGVColumn;
 		private System.Windows.Forms.DataGridViewTextBoxColumn miscGVColumn;
 		private EditTagsDataGridViewImageButtonColumn tagAndDetailsGVColumn;
+		private SyncBindingSource syncBindingSource;
 	}
 }

Source/LibationWinForms/GridView/ProductsGrid.cs

@@ -0,0 +1,367 @@
+using DataLayer;
+using Dinah.Core.Windows.Forms;
+using LibationFileManager;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Windows.Forms;
+
+namespace LibationWinForms.GridView
+{
+	public delegate void GridEntryClickedEventHandler(GridEntry liveGridEntry);
+	public delegate void LibraryBookEntryClickedEventHandler(LibraryBookEntry liveGridEntry);
+	public delegate void GridEntryRectangleClickedEventHandler(GridEntry liveGridEntry, Rectangle cellRectangle);
+
+	public partial class ProductsGrid : UserControl
+	{
+		/// <summary>Number of visible rows has changed</summary>
+		public event EventHandler<int> VisibleCountChanged;
+		public event LibraryBookEntryClickedEventHandler LiberateClicked;
+		public event GridEntryClickedEventHandler CoverClicked;
+		public event LibraryBookEntryClickedEventHandler DetailsClicked;
+		public event GridEntryRectangleClickedEventHandler DescriptionClicked;
+		public new event EventHandler<ScrollEventArgs> Scroll;
+
+		private GridEntryBindingList bindingList;
+		internal IEnumerable<LibraryBook> GetVisibleBooks()
+			=> bindingList
+			.BookEntries()
+			.Select(lbe => lbe.LibraryBook);
+
+		public ProductsGrid()
+		{
+			InitializeComponent();
+			EnableDoubleBuffering();
+			gridEntryDataGridView.Scroll += (_, s) => Scroll?.Invoke(this, s);
+		}
+
+		private void EnableDoubleBuffering()
+		{
+			var propertyInfo = gridEntryDataGridView.GetType().GetProperty("DoubleBuffered", System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.NonPublic);
+
+			propertyInfo.SetValue(gridEntryDataGridView, true, null);
+		}
+
+		#region Button controls
+		private void DataGridView_CellContentClick(object sender, DataGridViewCellEventArgs e)
+		{
+			// handle grid button click: https://stackoverflow.com/a/13687844
+			if (e.RowIndex < 0)
+				return;
+
+			var entry = getGridEntry(e.RowIndex);
+			if (entry is LibraryBookEntry lbEntry)
+			{
+				if (e.ColumnIndex == liberateGVColumn.Index)
+					LiberateClicked?.Invoke(lbEntry);
+				else if (e.ColumnIndex == tagAndDetailsGVColumn.Index)
+					DetailsClicked?.Invoke(lbEntry);
+				else if (e.ColumnIndex == descriptionGVColumn.Index)
+					DescriptionClicked?.Invoke(lbEntry, gridEntryDataGridView.GetCellDisplayRectangle(e.ColumnIndex, e.RowIndex, false));
+				else if (e.ColumnIndex == coverGVColumn.Index)
+					CoverClicked?.Invoke(lbEntry);
+			}
+			else if (entry is SeriesEntry sEntry)
+			{
+				if (e.ColumnIndex == liberateGVColumn.Index)
+				{
+					if (sEntry.Liberate.Expanded)
+						bindingList.CollapseItem(sEntry);
+					else
+						bindingList.ExpandItem(sEntry);
+
+					sEntry.NotifyPropertyChanged(nameof(sEntry.Liberate));
+
+					VisibleCountChanged?.Invoke(this, bindingList.BookEntries().Count());
+				}
+				else if (e.ColumnIndex == descriptionGVColumn.Index)
+					DescriptionClicked?.Invoke(sEntry, gridEntryDataGridView.GetCellDisplayRectangle(e.ColumnIndex, e.RowIndex, false));
+				else if (e.ColumnIndex == coverGVColumn.Index)
+					CoverClicked?.Invoke(sEntry);
+			}
+		}
+
+		private GridEntry getGridEntry(int rowIndex) => gridEntryDataGridView.GetBoundItem<GridEntry>(rowIndex);
+
+		#endregion
+
+		#region UI display functions
+
+		internal void BindToGrid(List<LibraryBook> dbBooks)
+		{
+			var geList = dbBooks.Where(lb => lb.Book.IsProduct()).Select(b => new LibraryBookEntry(b)).Cast<GridEntry>().ToList();
+
+			var episodes = dbBooks.Where(lb => lb.Book.IsEpisodeChild());
+						
+			foreach (var parent in dbBooks.Where(lb => lb.Book.IsEpisodeParent()))
+			{
+				var seriesEpisodes = episodes.FindChildren(parent);
+
+				if (!seriesEpisodes.Any()) continue;
+
+				var seriesEntry = new SeriesEntry(parent, seriesEpisodes);
+
+				geList.Add(seriesEntry);
+				geList.AddRange(seriesEntry.Children);
+			}
+
+			bindingList = new GridEntryBindingList(geList.OrderByDescending(e => e.DateAdded));
+			bindingList.CollapseAll();
+			syncBindingSource.DataSource = bindingList;
+			VisibleCountChanged?.Invoke(this, bindingList.BookEntries().Count());
+		}
+
+		internal void UpdateGrid(List<LibraryBook> dbBooks)
+		{
+			#region Add new or update existing grid entries
+
+			//Remove filter prior to adding/updating boooks
+			string existingFilter = syncBindingSource.Filter;
+			Filter(null);
+
+			bindingList.SuspendFilteringOnUpdate = true;
+
+			//Add absent entries to grid, or update existing entry
+
+			var allEntries = bindingList.AllItems().BookEntries();
+			var seriesEntries = bindingList.AllItems().SeriesEntries().ToList();
+
+			foreach (var libraryBook in dbBooks.OrderBy(e => e.DateAdded))
+			{
+				var existingEntry = allEntries.FindByAsin(libraryBook.Book.AudibleProductId);
+
+				if (libraryBook.Book.IsProduct())
+					AddOrUpdateBook(libraryBook, existingEntry);
+				else if(libraryBook.Book.IsEpisodeChild()) 
+					AddOrUpdateEpisode(libraryBook, existingEntry, seriesEntries, dbBooks);				 
+			}	
+
+			bindingList.SuspendFilteringOnUpdate = false;
+
+			//Re-apply filter after adding new/updating existing books to capture any changes
+			Filter(existingFilter);
+
+			#endregion
+
+			// remove deleted from grid.
+			// note: actual deletion from db must still occur via the RemoveBook feature. deleting from audible will not trigger this
+			var removedBooks =
+				bindingList
+				.AllItems()
+				.BookEntries()
+				.ExceptBy(dbBooks.Select(lb => lb.Book.AudibleProductId), ge => ge.AudibleProductId);
+
+			//Remove books in series from their parents' Children list
+			foreach (var removed in removedBooks.Where(b => b.Parent is not null))
+			{
+				removed.Parent.Children.Remove(removed);
+				removed.Parent.NotifyPropertyChanged();
+			}
+
+			//Remove series that have no children
+			var removedSeries =
+				bindingList
+				.AllItems()
+				.EmptySeries();
+
+			foreach (var removed in removedBooks.Cast<GridEntry>().Concat(removedSeries))
+				//no need to re-filter for removed books
+				bindingList.Remove(removed);
+
+			VisibleCountChanged?.Invoke(this, bindingList.BookEntries().Count());
+		}
+
+		private void AddOrUpdateBook(LibraryBook book, LibraryBookEntry existingBookEntry)
+		{
+			if (existingBookEntry is null)
+				// Add the new product to top
+				bindingList.Insert(0, new LibraryBookEntry(book));
+			else
+				// update existing
+				existingBookEntry.UpdateLibraryBook(book);
+		}
+
+		private void AddOrUpdateEpisode(LibraryBook episodeBook, LibraryBookEntry existingEpisodeEntry, List<SeriesEntry> seriesEntries, IEnumerable<LibraryBook> dbBooks)
+		{
+			if (existingEpisodeEntry is null)
+			{
+				LibraryBookEntry episodeEntry;
+				var seriesEntry = seriesEntries.FindSeriesParent(episodeBook);
+
+				if (seriesEntry is null)
+				{
+					//Series doesn't exist yet, so create and add it
+					var seriesBook = dbBooks.FindSeriesParent(episodeBook);
+
+					if (seriesBook is null)
+					{
+						//This should be impossible because the importer ensures every episode has a parent.
+						var ex = new ApplicationException($"Episode's series parent not found in database.");
+						var seriesLinks = string.Join("\r\n", episodeBook.Book.SeriesLink?.Select(sb => $"{nameof(sb.Series.Name)}={sb.Series.Name}, {nameof(sb.Series.AudibleSeriesId)}={sb.Series.AudibleSeriesId}"));
+						Serilog.Log.Logger.Error(ex, "Episode={episodeBook}, Series: {seriesLinks}", episodeBook, seriesLinks);
+						throw ex;
+					}
+
+					seriesEntry = new SeriesEntry(seriesBook, episodeBook);
+					seriesEntries.Add(seriesEntry);
+
+					episodeEntry = seriesEntry.Children[0];
+					seriesEntry.Liberate.Expanded = true;
+					bindingList.Insert(0, seriesEntry);
+				}
+				else
+				{
+					//Series exists. Create and add episode child then update the SeriesEntry
+					episodeEntry = new(episodeBook) { Parent = seriesEntry };
+					seriesEntry.Children.Add(episodeEntry);
+					var seriesBook = dbBooks.Single(lb => lb.Book.AudibleProductId == seriesEntry.LibraryBook.Book.AudibleProductId);
+					seriesEntry.UpdateSeries(seriesBook);
+				}
+
+				//Add episode to the grid beneath the parent
+				int seriesIndex = bindingList.IndexOf(seriesEntry);
+				bindingList.Insert(seriesIndex + 1, episodeEntry);
+
+				if (seriesEntry.Liberate.Expanded)
+					bindingList.ExpandItem(seriesEntry);
+				else
+					bindingList.CollapseItem(seriesEntry);
+
+				seriesEntry.NotifyPropertyChanged();
+
+			}
+			else
+				existingEpisodeEntry.UpdateLibraryBook(episodeBook);
+		}
+
+		#endregion
+
+		#region Filter
+
+		public void Filter(string searchString)
+		{
+			int visibleCount = bindingList.Count;
+
+			if (string.IsNullOrEmpty(searchString))
+				syncBindingSource.RemoveFilter();
+			else
+				syncBindingSource.Filter = searchString;
+
+			if (visibleCount != bindingList.Count)
+				VisibleCountChanged?.Invoke(this, bindingList.BookEntries().Count());
+
+		}
+
+		#endregion
+
+		#region Column Customizations
+
+		private void ProductsGrid_Load(object sender, EventArgs e)
+		{
+			//https://stackoverflow.com/a/4498512/3335599
+			if (System.ComponentModel.LicenseManager.UsageMode == System.ComponentModel.LicenseUsageMode.Designtime) return;
+
+			gridEntryDataGridView.ColumnWidthChanged += gridEntryDataGridView_ColumnWidthChanged;
+			gridEntryDataGridView.ColumnDisplayIndexChanged += gridEntryDataGridView_ColumnDisplayIndexChanged;
+
+			contextMenuStrip1.Items.Add(new ToolStripLabel("Show / Hide Columns"));
+			contextMenuStrip1.Items.Add(new ToolStripSeparator());
+
+			//Restore Grid Display Settings
+			var config = Configuration.Instance;
+			var gridColumnsVisibilities = config.GridColumnsVisibilities;
+			var gridColumnsWidths = config.GridColumnsWidths;
+			var displayIndices = config.GridColumnsDisplayIndices;
+
+			var cmsKiller = new ContextMenuStrip();
+
+			foreach (DataGridViewColumn column in gridEntryDataGridView.Columns)
+			{
+				var itemName = column.DataPropertyName;
+				var visible = gridColumnsVisibilities.GetValueOrDefault(itemName, true);
+
+				var menuItem = new ToolStripMenuItem()
+				{
+					Text = column.HeaderText,
+					Checked = visible,
+					Tag = itemName
+				};
+				menuItem.Click += HideMenuItem_Click;
+				contextMenuStrip1.Items.Add(menuItem);
+
+				column.Width = gridColumnsWidths.GetValueOrDefault(itemName, column.Width);
+				column.MinimumWidth = 10;
+				column.HeaderCell.ContextMenuStrip = contextMenuStrip1;
+				column.Visible = visible;
+
+				//Setting a default ContextMenuStrip will allow the columns to handle the
+				//Show() event so it is not passed up to the _dataGridView.ContextMenuStrip.
+				//This allows the ContextMenuStrip to be shown if right-clicking in the gray
+				//background of _dataGridView but not shown if right-clicking inside cells.
+				column.ContextMenuStrip = cmsKiller;
+			}
+
+			//We must set DisplayIndex properties in ascending order
+			foreach (var itemName in displayIndices.OrderBy(i => i.Value).Select(i => i.Key))
+			{
+				var column = gridEntryDataGridView.Columns
+					.Cast<DataGridViewColumn>()
+					.Single(c => c.DataPropertyName == itemName);
+
+				column.DisplayIndex = displayIndices.GetValueOrDefault(itemName, column.Index);
+			}
+		}
+
+		private void HideMenuItem_Click(object sender, EventArgs e)
+		{
+			var menuItem = sender as ToolStripMenuItem;
+			var propertyName = menuItem.Tag as string;
+
+			var column = gridEntryDataGridView.Columns
+				.Cast<DataGridViewColumn>()
+				.FirstOrDefault(c => c.DataPropertyName == propertyName);
+
+			if (column != null)
+			{
+				var visible = menuItem.Checked;
+				menuItem.Checked = !visible;
+				column.Visible = !visible;
+
+				var config = Configuration.Instance;
+
+				var dictionary = config.GridColumnsVisibilities;
+				dictionary[propertyName] = column.Visible;
+				config.GridColumnsVisibilities = dictionary;
+			}
+		}
+
+		private void gridEntryDataGridView_ColumnDisplayIndexChanged(object sender, DataGridViewColumnEventArgs e)
+		{
+			var config = Configuration.Instance;
+
+			var dictionary = config.GridColumnsDisplayIndices;
+			dictionary[e.Column.DataPropertyName] = e.Column.DisplayIndex;
+			config.GridColumnsDisplayIndices = dictionary;
+		}
+
+		private void gridEntryDataGridView_CellToolTipTextNeeded(object sender, DataGridViewCellToolTipTextNeededEventArgs e)
+		{
+			if (e.ColumnIndex == descriptionGVColumn.Index)
+				e.ToolTipText = "Click to see full description";
+			else if (e.ColumnIndex == coverGVColumn.Index)
+				e.ToolTipText = "Click to see full size";
+		}
+
+		private void gridEntryDataGridView_ColumnWidthChanged(object sender, DataGridViewColumnEventArgs e)
+		{
+			var config = Configuration.Instance;
+
+			var dictionary = config.GridColumnsWidths;
+			dictionary[e.Column.DataPropertyName] = e.Column.Width;
+		}
+
+		#endregion
+	}
+}

Source/LibationWinForms/GridView/ProductsGrid.resx

@@ -57,13 +57,16 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <metadata name="gridEntryBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+  <metadata name="contextMenuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>171, 17</value>
+  </metadata>
+  <metadata name="syncBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>
   </metadata>
-  <metadata name="contextMenuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>197, 17</value>
+  <metadata name="bindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>326, 17</value>
   </metadata>
-  <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>81</value>
+  <metadata name="bindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>326, 17</value>
   </metadata>
 </root>

Source/LibationWinForms/GridView/QueryExtensions.cs

@@ -0,0 +1,36 @@
+using DataLayer;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace LibationWinForms.GridView
+{
+#nullable enable
+	internal static class QueryExtensions
+	{
+		public static IEnumerable<LibraryBookEntry> BookEntries(this IEnumerable<GridEntry> gridEntries)
+			=> gridEntries.OfType<LibraryBookEntry>();
+
+		public static IEnumerable<SeriesEntry> SeriesEntries(this IEnumerable<GridEntry> gridEntries)
+			=> gridEntries.OfType<SeriesEntry>();
+
+		public static T? FindByAsin<T>(this IEnumerable<T> gridEntries, string audibleProductID) where T : GridEntry
+			=> gridEntries.FirstOrDefault(i => i.AudibleProductId == audibleProductID);
+
+		public static IEnumerable<SeriesEntry> EmptySeries(this IEnumerable<GridEntry> gridEntries)
+			=> gridEntries.SeriesEntries().Where(i => i.Children.Count == 0);
+
+		public static SeriesEntry? FindSeriesParent(this IEnumerable<GridEntry> gridEntries, LibraryBook seriesEpisode)
+		{
+			if (seriesEpisode.Book.SeriesLink is null) return null;
+
+			//Parent books will always have exactly 1 SeriesBook due to how
+			//they are imported in ApiExtended.getChildEpisodesAsync()
+			return gridEntries.SeriesEntries().FirstOrDefault(
+				lb =>
+				seriesEpisode.Book.SeriesLink.Any(
+					s => s.Series.AudibleSeriesId == lb.LibraryBook.Book.SeriesLink.Single().Series.AudibleSeriesId));
+		}
+	}
+#nullable disable
+}

Source/LibationWinForms/GridView/SeriesEntry.cs

@@ -0,0 +1,91 @@
+using DataLayer;
+using Dinah.Core;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+
+namespace LibationWinForms.GridView
+{
+	/// <summary>The View Model for a LibraryBook that is ContentType.Parent</summary>
+	public class SeriesEntry : GridEntry
+	{
+		[Browsable(false)] public List<LibraryBookEntry> Children { get; }
+		[Browsable(false)] public override DateTime DateAdded => Children.Max(c => c.DateAdded);
+
+		#region Model properties exposed to the view
+
+		public override LiberateButtonStatus Liberate { get; }
+		public override string DisplayTags { get; } = string.Empty;
+
+		#endregion
+
+		private SeriesEntry(LibraryBook parent)
+		{
+			Liberate = new LiberateButtonStatus { IsSeries = true };
+			SeriesIndex = -1;
+			LibraryBook = parent;
+			LoadCover();
+		}
+
+		public SeriesEntry(LibraryBook parent, IEnumerable<LibraryBook> children) : this(parent)
+		{
+			Children = children
+				.Select(c => new LibraryBookEntry(c) { Parent = this })
+				.OrderBy(c => c.SeriesIndex)
+				.ToList();
+			UpdateSeries(parent);
+		}
+
+		public SeriesEntry(LibraryBook parent, LibraryBook child) : this(parent)
+		{
+			Children = new() { new LibraryBookEntry(child) { Parent = this } };
+			UpdateSeries(parent);
+		}
+
+		public void UpdateSeries(LibraryBook parent)
+		{
+			LibraryBook = parent;
+
+			Title = Book.Title;
+			Series = Book.SeriesNames();
+			MyRating = Book.UserDefinedItem.Rating?.ToStarString()?.DefaultIfNullOrWhiteSpace("");
+			PurchaseDate = Children.Min(c => c.LibraryBook.DateAdded).ToString("d");
+			ProductRating = Book.Rating?.ToStarString()?.DefaultIfNullOrWhiteSpace("");
+			Authors = Book.AuthorNames();
+			Narrators = Book.NarratorNames();
+			Category = string.Join(" > ", Book.CategoriesNames());
+			Misc = GetMiscDisplay(LibraryBook);
+			LongDescription = GetDescriptionDisplay(Book);
+			Description = TrimTextToWord(LongDescription, 62);
+
+			int bookLenMins = Children.Sum(c => c.LibraryBook.Book.LengthInMinutes);
+			Length = bookLenMins == 0 ? "" : $"{bookLenMins / 60} hr {bookLenMins % 60} min";
+
+			NotifyPropertyChanged();
+		}
+
+		#region Data Sorting
+
+		/// <summary>Create getters for all member object values by name</summary>
+		protected override Dictionary<string, Func<object>> CreateMemberValueDictionary() => new()
+		{
+			{ nameof(Title), () => Book.TitleSortable() },
+			{ nameof(Series), () => Book.SeriesSortable() },
+			{ nameof(Length), () => Children.Sum(c => c.LibraryBook.Book.LengthInMinutes) },
+			{ nameof(MyRating), () => Book.UserDefinedItem.Rating.FirstScore() },
+			{ nameof(PurchaseDate), () => Children.Min(c => c.LibraryBook.DateAdded) },
+			{ nameof(ProductRating), () => Book.Rating.FirstScore() },
+			{ nameof(Authors), () => Authors },
+			{ nameof(Narrators), () => Narrators },
+			{ nameof(Description), () => Description },
+			{ nameof(Category), () => Category },
+			{ nameof(Misc), () => Misc },
+			{ nameof(DisplayTags), () => string.Empty },
+			{ nameof(Liberate), () => Liberate },
+			{ nameof(DateAdded), () => DateAdded },
+		};
+
+		#endregion
+	}
+}

Source/LibationWinForms/GridView/SyncBindingSource.cs

@@ -0,0 +1,29 @@
+using System.ComponentModel;
+using System.Threading;
+using System.Windows.Forms;
+
+// https://stackoverflow.com/a/32886415
+namespace LibationWinForms.GridView
+{
+	public class SyncBindingSource : BindingSource
+	{
+		private SynchronizationContext syncContext { get; }
+
+		public SyncBindingSource() : base()
+			=> syncContext = SynchronizationContext.Current;
+		public SyncBindingSource(IContainer container) : base(container)
+			=> syncContext = SynchronizationContext.Current;
+		public SyncBindingSource(object dataSource, string dataMember) : base(dataSource, dataMember)
+			=> syncContext = SynchronizationContext.Current;
+
+		public override bool SupportsFiltering => true;
+
+		protected override void OnListChanged(ListChangedEventArgs e)
+		{
+			if (syncContext is not null)
+				syncContext.Send(_ => base.OnListChanged(e), null);
+			else
+				base.OnListChanged(e);
+		}
+	}
+}

Source/LibationWinForms/LibationWinForms.csproj

@@ -28,6 +28,7 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="Autoupdater.NET.Official" Version="1.7.0" />
     <PackageReference Include="Dinah.Core.WindowsDesktop" Version="4.2.2.1" />
   </ItemGroup>
 

Source/LibationWinForms/MessageBoxLib.cs

@@ -4,22 +4,27 @@ using System.Linq;
 using System.Windows.Forms;
 using DataLayer;
 using Dinah.Core.Logging;
+using Dinah.Core.Threading;
 using LibationWinForms.Dialogs;
 using Serilog;
 
 namespace LibationWinForms
 {
-    public static class MessageBoxLib
+	public static class MessageBoxLib
 	{
 		/// <summary>
 		/// Logs error. Displays a message box dialog with specified text and caption.
 		/// </summary>
+		/// <param name="synchronizeInvoke">Form calling this method.</param>
 		/// <param name="text">The text to display in the message box.</param>
 		/// <param name="caption">The text to display in the title bar of the message box.</param>
-		/// <param name="exception">Exception to log</param>
-		/// <returns>One of the System.Windows.Forms.DialogResult values.</returns>
-		public static DialogResult ShowAdminAlert(string text, string caption, Exception exception)
+		/// <param name="exception">Exception to log.</param>
+		public static void ShowAdminAlert(System.ComponentModel.ISynchronizeInvoke owner, string text, string caption, Exception exception)
 		{
+			// for development and debugging, show me what broke!
+			if (System.Diagnostics.Debugger.IsAttached)
+				throw exception;
+
 			try
 			{
 				Serilog.Log.Logger.Error(exception, "Alert admin error: {@DebugText}", new { text, caption });
@@ -27,10 +32,22 @@ namespace LibationWinForms
 			catch { }
 
 			using var form = new MessageBoxAlertAdminDialog(text, caption, exception);
-			return form.ShowDialog();
+
+			if (owner is not null)
+			{
+				try
+				{
+					owner.UIThreadSync(() => form.ShowDialog());
+					return;
+				}
+				catch { }
+			}
+
+			// synchronizeInvoke is null or previous attempt failed. final try
+			form.ShowDialog();
 		}
 
-		public static void VerboseLoggingWarning_ShowIfTrue()
+        public static void VerboseLoggingWarning_ShowIfTrue()
 		{
 			// when turning on debug (and especially Verbose) to share logs, some privacy settings may not be obscured
 			if (Log.Logger.IsVerboseEnabled())

Source/LibationWinForms/ProcessQueue/ILogForm.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace LibationWinForms.BookLiberation
+namespace LibationWinForms.ProcessQueue
 {
 	public interface ILogForm
 	{

Source/LibationWinForms/ProcessQueue/LogMe.cs

@@ -0,0 +1,59 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace LibationWinForms.ProcessQueue
+{
+	// 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 static ILogForm LogForm;
+		public static LogMe RegisterForm<T>(T form) where T : ILogForm
+		{
+			var logMe = new LogMe();
+
+			if (form is null)
+				return logMe;
+
+			LogForm = form;
+
+			logMe.LogInfo += LogMe_LogInfo;
+			logMe.LogErrorString += LogMe_LogErrorString;
+			logMe.LogError += LogMe_LogError;
+
+			return logMe;
+		}
+
+		private static async void LogMe_LogError(object sender, (Exception, string) tuple)
+		{
+			await Task.Run(() => LogForm?.WriteLine(tuple.Item2 ?? "Automated backup: error"));
+			await Task.Run(() => LogForm?.WriteLine("ERROR: " + tuple.Item1.Message));
+		}
+
+		private static async void LogMe_LogErrorString(object sender, string text)
+		{
+			await Task.Run(() => LogForm?.WriteLine(text));
+		}
+
+		private static async void LogMe_LogInfo(object sender, string text)
+		{
+			await Task.Run(() => LogForm?.WriteLine(text));
+		}
+
+		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));
+	}
+}

Source/LibationWinForms/ProcessQueue/ProcessBook.cs

@@ -1,9 +1,4 @@
-using DataLayer;
-using Dinah.Core;
-using FileLiberator;
-using LibationFileManager;
-using LibationWinForms.BookLiberation;
-using System;
+using System;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Drawing;
@@ -11,6 +6,11 @@ using System.Linq;
 using System.Runtime.CompilerServices;
 using System.Threading.Tasks;
 using System.Windows.Forms;
+using ApplicationServices;
+using DataLayer;
+using Dinah.Core;
+using FileLiberator;
+using LibationFileManager;
 
 namespace LibationWinForms.ProcessQueue
 {
@@ -60,7 +60,6 @@ namespace LibationWinForms.ProcessQueue
 		private Processable CurrentProcessable => _currentProcessable ??= Processes.Dequeue().Invoke();
 		private Processable NextProcessable() => _currentProcessable = null;
 		private Processable _currentProcessable;
-		private Func<byte[]> GetCoverArtDelegate;
 		private readonly Queue<Func<Processable>> Processes = new();
 		private readonly LogMe Logger;
 
@@ -132,7 +131,6 @@ namespace LibationWinForms.ProcessQueue
 				{
 					ProcessBookResult.Success => ProcessBookStatus.Completed,
 					ProcessBookResult.Cancelled => ProcessBookStatus.Cancelled,
-					ProcessBookResult.FailedRetry => ProcessBookStatus.Queued,
 					_ => ProcessBookStatus.Failed,
 				};
 			}
@@ -233,11 +231,14 @@ namespace LibationWinForms.ProcessQueue
 			BookText = $"{title}\r\nBy {authorNames}\r\nNarrated by {narratorNames}";
 		}
 
-		public void AudioDecodable_RequestCoverArt(object sender, Action<byte[]> setCoverArtDelegate)
+		private byte[] AudioDecodable_RequestCoverArt(object sender, EventArgs e)
 		{
-			byte[] coverData = GetCoverArtDelegate();
-			setCoverArtDelegate(coverData);
+			byte[] coverData = PictureStorage
+				.GetPictureSynchronously(
+				new PictureDefinition(LibraryBook.Book.PictureId, PictureSize._500x500));
+
 			AudioDecodable_CoverImageDiscovered(this, coverData);
+			return coverData;
 		}
 
 		private void AudioDecodable_CoverImageDiscovered(object sender, byte[] coverArt)
@@ -274,11 +275,6 @@ namespace LibationWinForms.ProcessQueue
 
 			Logger.Info($"{Environment.NewLine}{((Processable)sender).Name} Step, Begin: {libraryBook.Book}");
 
-			GetCoverArtDelegate = () => PictureStorage.GetPictureSynchronously(
-						new PictureDefinition(
-							libraryBook.Book.PictureId,
-							PictureSize._500x500));
-
 			title = libraryBook.Book.Title;
 			authorNames = libraryBook.Book.AuthorNames();
 			narratorNames = libraryBook.Book.NarratorNames();
@@ -287,7 +283,6 @@ namespace LibationWinForms.ProcessQueue
 
 		private async void Processable_Completed(object sender, LibraryBook libraryBook)
 		{
-
 			Logger.Info($"{((Processable)sender).Name} Step, Completed: {libraryBook.Book}");
 			UnlinkProcessable((Processable)sender);
 
@@ -355,8 +350,7 @@ $@"  Title: {libraryBook.Book.Title}
 
 			if (dialogResult == SkipResult)
 			{
-				libraryBook.Book.UserDefinedItem.BookStatus = LiberatedStatus.Error;
-				ApplicationServices.LibraryCommands.UpdateUserDefinedItem(libraryBook.Book);
+				libraryBook.Book.UpdateBookStatus(LiberatedStatus.Error);
 
 				Logger.Info($"Error. Skip: [{libraryBook.Book.AudibleProductId}] {libraryBook.Book.Title}");
 

Source/LibationWinForms/ProcessQueue/ProcessBookControl.cs

@@ -72,8 +72,8 @@ namespace LibationWinForms.ProcessQueue
 					Status = ProcessBookStatus.Cancelled;
 					break;
 				case ProcessBookResult.FailedRetry:
-					statusText = "Queued";
-					Status = ProcessBookStatus.Queued;
+					statusText = "Error, will retry later";
+					Status = ProcessBookStatus.Failed;
 					break;
 				case ProcessBookResult.FailedSkip:
 					statusText = "Error, Skippping";

Source/LibationWinForms/ProcessQueue/ProcessQueueControl.Designer.cs

@@ -51,9 +51,9 @@
 			this.logEntryColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.panel4 = new System.Windows.Forms.Panel();
 			this.panel2 = new System.Windows.Forms.Panel();
+			this.logCopyBtn = new System.Windows.Forms.Button();
 			this.clearLogBtn = new System.Windows.Forms.Button();
 			this.counterTimer = new System.Windows.Forms.Timer(this.components);
-			this.logCopyBtn = new System.Windows.Forms.Button();
 			this.statusStrip1.SuspendLayout();
 			this.tabControl1.SuspendLayout();
 			this.tabPage1.SuspendLayout();
@@ -264,10 +264,21 @@
 			this.panel2.Size = new System.Drawing.Size(390, 25);
 			this.panel2.TabIndex = 1;
 			// 
+			// logCopyBtn
+			// 
+			this.logCopyBtn.Dock = System.Windows.Forms.DockStyle.Left;
+			this.logCopyBtn.Location = new System.Drawing.Point(0, 0);
+			this.logCopyBtn.Name = "logCopyBtn";
+			this.logCopyBtn.Size = new System.Drawing.Size(57, 23);
+			this.logCopyBtn.TabIndex = 1;
+			this.logCopyBtn.Text = "Copy";
+			this.logCopyBtn.UseVisualStyleBackColor = true;
+			this.logCopyBtn.Click += new System.EventHandler(this.LogCopyBtn_Click);
+			// 
 			// clearLogBtn
 			// 
-			this.clearLogBtn.Dock = System.Windows.Forms.DockStyle.Left;
-			this.clearLogBtn.Location = new System.Drawing.Point(0, 0);
+			this.clearLogBtn.Dock = System.Windows.Forms.DockStyle.Right;
+			this.clearLogBtn.Location = new System.Drawing.Point(328, 0);
 			this.clearLogBtn.Name = "clearLogBtn";
 			this.clearLogBtn.Size = new System.Drawing.Size(60, 23);
 			this.clearLogBtn.TabIndex = 0;
@@ -280,17 +291,6 @@
 			this.counterTimer.Interval = 950;
 			this.counterTimer.Tick += new System.EventHandler(this.CounterTimer_Tick);
 			// 
-			// logCopyBtn
-			// 
-			this.logCopyBtn.Dock = System.Windows.Forms.DockStyle.Right;
-			this.logCopyBtn.Location = new System.Drawing.Point(331, 0);
-			this.logCopyBtn.Name = "logCopyBtn";
-			this.logCopyBtn.Size = new System.Drawing.Size(57, 23);
-			this.logCopyBtn.TabIndex = 1;
-			this.logCopyBtn.Text = "Copy";
-			this.logCopyBtn.UseVisualStyleBackColor = true;
-			this.logCopyBtn.Click += new System.EventHandler(this.LogCopyBtn_Click);
-			// 
 			// ProcessQueueControl
 			// 
 			this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);