update release notes

AaxDecrypter/UNTESTED/AaxToM4bConverter.cs

@@ -105,7 +105,9 @@ namespace AaxDecrypter
                 getASCIITag(tags.author),
                 getASCIITag(tags.title) + ".m4b"
                 );
-            SetOutputFilename(defaultFilename);
+
+			// set default name
+			SetOutputFilename(defaultFilename);
 
             await Task.Run(() => saveCover(inputFileName));
         }
@@ -162,6 +164,9 @@ namespace AaxDecrypter
             if (Path.GetExtension(outputFileName) != ".m4b")
                 outputFileName = outputFileWithNewExt(".m4b");
 
+			if (File.Exists(outputFileName))
+				File.Delete(outputFileName);
+
             outDir = Path.GetDirectoryName(outputFileName);
         }
 
@@ -280,8 +285,9 @@ namespace AaxDecrypter
             return exitCode;
         }
 
-        // temp file names for steps 3, 4, 5
-        string tempChapsPath => Path.Combine(outDir, "tempChaps.mp4");
+		// temp file names for steps 3, 4, 5
+        string tempChapsGuid { get; } = Guid.NewGuid().ToString().ToUpper().Replace("-", "");
+        string tempChapsPath => Path.Combine(outDir, $"tempChaps_{tempChapsGuid}.mp4");
         string mp4_file => outputFileWithNewExt(".mp4");
         string ff_txt_file => mp4_file + ".ff.txt";
 

DataLayer/DataLayer.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp3.0;netstandard2.1</TargetFrameworks>
+    <TargetFrameworks>netcoreapp3.1;netstandard2.1</TargetFrameworks>
   </PropertyGroup>
 
   <PropertyGroup>
@@ -12,13 +12,13 @@
   </PropertyGroup>
   
   <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="3.0.1">
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="3.1.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="3.0.1" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="3.0.1" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="3.0.1">
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="3.1.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="3.1.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="3.1.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

DataLayer/UNTESTED/EfClasses/Book.cs

@@ -123,16 +123,10 @@ namespace DataLayer
             ArgumentValidator.EnsureEnumerableNotNullOrEmpty(newContributors, nameof(newContributors));
 
             // the edge cases of doing local-loaded vs remote-only got weird. just load it
-            if (_contributorsLink == null)
-            {
-                ArgumentValidator.EnsureNotNull(context, nameof(context));
-                if (!context.Entry(this).IsKeySet)
-                    throw new InvalidOperationException("Could not add contributors");
+            if (_contributorsLink is null)
+				getEntry(context).Collection(s => s.ContributorsLink).Load();
 
-                context.Entry(this).Collection(s => s.ContributorsLink).Load();
-            }
-
-            var roleContributions = getContributions(role);
+			var roleContributions = getContributions(role);
             var isIdentical = roleContributions.Select(c => c.Contributor).SequenceEqual(newContributors);
             if (isIdentical)
                 return;
@@ -140,7 +134,8 @@ namespace DataLayer
             _contributorsLink.RemoveWhere(bc => bc.Role == role);
             addNewContributors(newContributors, role);
         }
-        private void addNewContributors(IEnumerable<Contributor> newContributors, Role role)
+
+		private void addNewContributors(IEnumerable<Contributor> newContributors, Role role)
         {
             byte order = 0;
             var newContributionsEnum = newContributors.Select(c => new BookContributor(this, c, role, order++));
@@ -155,6 +150,18 @@ namespace DataLayer
                 .ToList();
         #endregion
 
+		private Microsoft.EntityFrameworkCore.ChangeTracking.EntityEntry<Book> getEntry(DbContext context)
+		{
+			ArgumentValidator.EnsureNotNull(context, nameof(context));
+
+			var entry = context.Entry(this);
+
+			if (!entry.IsKeySet)
+				throw new InvalidOperationException("Could not load a valid Book from database");
+
+			return entry;
+		}
+
         #region series
         private HashSet<SeriesBook> _seriesLink;
         public IEnumerable<SeriesBook> SeriesLink => _seriesLink?.ToList();
@@ -186,16 +193,10 @@ namespace DataLayer
 
             // our add() is conditional upon what's already included in the collection.
             // therefore if not loaded, a trip is required. might as well just load it
-            if (_seriesLink == null)
-            {
-                ArgumentValidator.EnsureNotNull(context, nameof(context));
-                if (!context.Entry(this).IsKeySet)
-                    throw new InvalidOperationException("Could not add series");
+            if (_seriesLink is null)
+				getEntry(context).Collection(s => s.SeriesLink).Load();
 
-                context.Entry(this).Collection(s => s.SeriesLink).Load();
-            }
-
-            var singleSeriesBook = _seriesLink.SingleOrDefault(sb => sb.Series == series);
+			var singleSeriesBook = _seriesLink.SingleOrDefault(sb => sb.Series == series);
             if (singleSeriesBook == null)
                 _seriesLink.Add(new SeriesBook(series, this, index));
             else
@@ -211,8 +212,7 @@ namespace DataLayer
         public void AddSupplementDownloadUrl(string url)
         {
             // supplements are owned by Book, so no need to Load():
-            // OwnsMany: "Can only ever appear on navigation properties of other entity types.
-            //  Are automatically loaded, and can only be tracked by a DbContext alongside their owner."
+            //  Are automatically loaded, and can only be tracked by a DbContext alongside their owner.
 
             ArgumentValidator.EnsureNotNullOrWhiteSpace(url, nameof(url));
 
@@ -232,19 +232,12 @@ namespace DataLayer
         }
 
         public void UpdateCategory(Category category, DbContext context = null)
-        {
-            // since category is never null, nullity means it hasn't been loaded. non null means we're correctly loaded. just overwrite
-            if (Category != null)
-            {
-                Category = category;
-                return;
-            }
+		{
+			// since category is never null, nullity means it hasn't been loaded
+			if (Category is null)
+				getEntry(context).Reference(s => s.Category).Load();
 
-            if (context == null)
-                throw new Exception("need context");
-            
-            context.Entry(this).Reference(s => s.Category).Load();
-            Category = category;
+			Category = category;
         }
 
 		public override string ToString() => $"[{AudibleProductId}] {Title}";

DataLayer/UNTESTED/LibationContext.cs

@@ -64,7 +64,8 @@ namespace DataLayer
 				.Entity<Contributor>()
 				.HasData(Contributor.GetEmpty());
 
-            // views are now supported via "query types" (instead of "entity types"): https://docs.microsoft.com/en-us/ef/core/modeling/query-types
-        }
-    }
+			// views are now supported via "keyless entity types" (instead of "entity types" or the prev "query types"):
+			// https://docs.microsoft.com/en-us/ef/core/modeling/keyless-entity-types
+		}
+	}
 }

DataLayer/UNTESTED/TagPersistenceInterceptor.cs

@@ -4,7 +4,6 @@ using System.Linq;
 using Dinah.Core.Collections.Generic;
 using Dinah.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.ChangeTracking;
 
 namespace DataLayer
 {
@@ -14,25 +13,18 @@ namespace DataLayer
 
         public void Executing(DbContext context)
 		{
-			// persist tags:
-			var modifiedEntities = context
+			var tagsCollection
+				= context
 				.ChangeTracker
 				.Entries()
-				.Where(p => p.State.In(EntityState.Modified, EntityState.Added))
-				.ToList();
-
-			persistTags(modifiedEntities);
-		}
-
-		private static void persistTags(List<EntityEntry> modifiedEntities)
-		{
-			var tagSets = modifiedEntities
+				.Where(e => e.State.In(EntityState.Modified, EntityState.Added))
 				.Select(e => e.Entity as UserDefinedItem)
-				// filter by null but NOT by blank. blank is the valid way to show the absence of tags
-				.Where(a => a != null)
+				.Where(udi => udi != null)
+				// do NOT filter out entires with blank tags. blank is the valid way to show the absence of tags
+				.Select(t => (t.Book.AudibleProductId, t.Tags))
 				.ToList();
-			foreach (var t in tagSets)
-				FileManager.TagsPersistence.Save(t.Book.AudibleProductId, t.Tags);
+
+			FileManager.TagsPersistence.Save(tagsCollection);
 		}
 	}
 }

DataLayer/_HowTo- EF Core.txt

@@ -7,15 +7,22 @@ nuget
 Microsoft.EntityFrameworkCore.Tools (needed for using Package Manager Console)
 Microsoft.EntityFrameworkCore.Sqlite
 
-MIGRATIONS require standard, not core
-using standard instead of core. edit 3 things in csproj
-1of3: pluralize xml TargetFramework tag to TargetFrameworks
-2of2: TargetFrameworks from: netstandard2.1
-to: netcoreapp3.0;netstandard2.1
-3of3: add
-  <PropertyGroup>
-    <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
-  </PropertyGroup>
+MIGRATIONS
+  require core, not standard
+  this can be a problem b/c standard and framework can only reference standard, not core
+TO USE MIGRATIONS (core and/or standard)
+  add to csproj
+    <PropertyGroup>
+      <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
+    </PropertyGroup>
+TO USE MIGRATIONS AS *BOTH* CORE AND STANDARD
+  edit csproj
+    pluralize this xml tag
+      from: TargetFramework
+      to: TargetFrameworks
+    inside of TargetFrameworks
+      from: netstandard2.1
+      to: netcoreapp3.1;netstandard2.1
 
 run. error
 SQLite Error 1: 'no such table: Blogs'.

DataLayer/appsettings.json

@@ -3,7 +3,10 @@
     "LibationContext_sqlserver": "Server=(LocalDb)\\MSSQLLocalDB;Database=DataLayer.LibationContext;Integrated Security=true;",
     "LibationContext": "Data Source=LibationContext.db;Foreign Keys=False;",
 
-    "// on windows sqlite paths accept windows and/or unix slashes": "",
+    "// sqlite notes": "",
+    "// absolute path example": "Data Source=C:/foo/bar/sample.db",
+    "// relative path example": "Data Source=sample.db",
+    "// on windows: sqlite paths accept windows and/or unix slashes": "",
     "MyTestContext": "Data Source=%DESKTOP%/sample.db"
   }
 }

FileLiberator/UNTESTED/BackupBook.cs

@@ -17,9 +17,9 @@ namespace FileLiberator
     /// </summary>
     public class BackupBook : IProcessable
     {
-        public event EventHandler<string> Begin;
+        public event EventHandler<LibraryBook> Begin;
         public event EventHandler<string> StatusUpdate;
-        public event EventHandler<string> Completed;
+        public event EventHandler<LibraryBook> Completed;
 
         public DownloadBook DownloadBook { get; } = new DownloadBook();
         public DecryptBook DecryptBook { get; } = new DecryptBook();
@@ -32,10 +32,7 @@ namespace FileLiberator
 		// often calls events which prints to forms in the UI context
 		public async Task<StatusHandler> ProcessAsync(LibraryBook libraryBook)
         {
-			var productId = libraryBook.Book.AudibleProductId;
-            var displayMessage = $"[{productId}] {libraryBook.Book.Title}";
-
-            Begin?.Invoke(this, displayMessage);
+            Begin?.Invoke(this, libraryBook);
 
             try
 			{
@@ -61,7 +58,7 @@ namespace FileLiberator
 			}
 			finally
             {
-                Completed?.Invoke(this, displayMessage);
+                Completed?.Invoke(this, libraryBook);
             }
         }
 	}

FileLiberator/UNTESTED/DecryptBook.cs

@@ -21,7 +21,7 @@ namespace FileLiberator
     /// </summary>
     public class DecryptBook : IDecryptable
     {
-        public event EventHandler<string> Begin;
+        public event EventHandler<LibraryBook> Begin;
         public event EventHandler<string> StatusUpdate;
         public event EventHandler<string> DecryptBegin;
 
@@ -32,7 +32,7 @@ namespace FileLiberator
         public event EventHandler<int> UpdateProgress;
 
         public event EventHandler<string> DecryptCompleted;
-        public event EventHandler<string> Completed;
+        public event EventHandler<LibraryBook> Completed;
 
         public bool Validate(LibraryBook libraryBook)
             => AudibleFileStorage.AAX.Exists(libraryBook.Book.AudibleProductId)
@@ -42,9 +42,7 @@ namespace FileLiberator
 		// often calls events which prints to forms in the UI context
 		public async Task<StatusHandler> ProcessAsync(LibraryBook libraryBook)
         {
-            var displayMessage = $"[{libraryBook.Book.AudibleProductId}] {libraryBook.Book.Title}";
-
-            Begin?.Invoke(this, displayMessage);
+            Begin?.Invoke(this, libraryBook);
 
             try
             {
@@ -76,7 +74,7 @@ namespace FileLiberator
             }
             finally
             {
-                Completed?.Invoke(this, displayMessage);
+                Completed?.Invoke(this, libraryBook);
             }
         }
 
@@ -94,17 +92,16 @@ namespace FileLiberator
                 NarratorsDiscovered?.Invoke(this, converter.tags.narrator);
                 CoverImageFilepathDiscovered?.Invoke(this, converter.coverBytes);
 
+				// override default which was set in CreateAsync
                 converter.SetOutputFilename(proposedOutputFile);
                 converter.DecryptProgressUpdate += (s, progress) => UpdateProgress?.Invoke(this, progress);
 
                 // REAL WORK DONE HERE
                 var success = await Task.Run(() => converter.Run());
 
+                // decrypt failed
                 if (!success)
-                {
-                    Console.WriteLine("decrypt failed");
                     return null;
-                }
 
                 Configuration.Instance.DecryptKey = converter.decryptKey;
 
@@ -117,46 +114,58 @@ namespace FileLiberator
         }
 
         private static void moveFilesToBooksDir(Book product, string outputAudioFilename)
-        {
-            // files are: temp path\author\[asin].ext
-            var m4bDir = new FileInfo(outputAudioFilename).Directory;
-            var files = m4bDir
-                .EnumerateFiles()
-                .Where(f => f.Name.ContainsInsensitive(product.AudibleProductId))
-                .ToList();
+		{
+			// create final directory. move each file into it. MOVE AUDIO FILE LAST
+			// new dir: safetitle_limit50char + " [" + productId + "]"
 
-            // create final directory. move each file into it. MOVE AUDIO FILE LAST
-            // new dir: safetitle_limit50char + " [" + productId + "]"
+			var destinationDir = getDestDir(product);
+			Directory.CreateDirectory(destinationDir);
 
-            // to prevent the paths from getting too long, we don't need after the 1st ":" for the folder
-            var underscoreIndex = product.Title.IndexOf(':');
-            var titleDir = (underscoreIndex < 4) ? product.Title : product.Title.Substring(0, underscoreIndex);
-            var finalDir = FileUtility.GetValidFilename(AudibleFileStorage.BooksDirectory, titleDir, null, product.AudibleProductId);
-            Directory.CreateDirectory(finalDir);
+			var sortedFiles = getProductFilesSorted(product, outputAudioFilename);
 
-            // move audio files to the end of the collection so these files are moved last
-            var musicFiles = files.Where(f => AudibleFileStorage.Audio.IsFileTypeMatch(f));
-            files = files
-                .Except(musicFiles)
-                .Concat(musicFiles)
-                .ToList();
+			var musicFileExt = Path.GetExtension(outputAudioFilename).Trim('.');
 
-            var musicFileExt = musicFiles
-                .Select(f => f.Extension)
-                .Distinct()
-                .Single()
-                .Trim('.');
+			foreach (var f in sortedFiles)
+			{
+				var dest = AudibleFileStorage.Audio.IsFileTypeMatch(f)
+					// audio filename: safetitle_limit50char + " [" + productId + "]." + audio_ext
+					? FileUtility.GetValidFilename(destinationDir, product.Title, musicFileExt, product.AudibleProductId)
+					// non-audio filename: safetitle_limit50char + " [" + productId + "][" + audio_ext +"]." + non_audio_ext
+					: FileUtility.GetValidFilename(destinationDir, product.Title, f.Extension, product.AudibleProductId, musicFileExt);
 
-            foreach (var f in files)
-            {
-                var dest = AudibleFileStorage.Audio.IsFileTypeMatch(f)
-                    // audio filename: safetitle_limit50char + " [" + productId + "]." + audio_ext
-                    ? FileUtility.GetValidFilename(finalDir, product.Title, musicFileExt, product.AudibleProductId)
-                    // non-audio filename: safetitle_limit50char + " [" + productId + "][" + audio_ext +"]." + non_audio_ext
-                    : FileUtility.GetValidFilename(finalDir, product.Title, f.Extension, product.AudibleProductId, musicFileExt);
+				File.Move(f.FullName, dest);
+			}
+		}
 
-                File.Move(f.FullName, dest);
-            }
-        }
-    }
+		private static string getDestDir(Book product)
+		{
+			// to prevent the paths from getting too long, we don't need after the 1st ":" for the folder
+			var underscoreIndex = product.Title.IndexOf(':');
+			var titleDir
+				= underscoreIndex < 4
+				? product.Title
+				: product.Title.Substring(0, underscoreIndex);
+			var finalDir = FileUtility.GetValidFilename(AudibleFileStorage.BooksDirectory, titleDir, null, product.AudibleProductId);
+			return finalDir;
+		}
+
+		private static List<FileInfo> getProductFilesSorted(Book product, string outputAudioFilename)
+		{
+			// files are: temp path\author\[asin].ext
+			var m4bDir = new FileInfo(outputAudioFilename).Directory;
+			var files = m4bDir
+				.EnumerateFiles()
+				.Where(f => f.Name.ContainsInsensitive(product.AudibleProductId))
+				.ToList();
+
+			// move audio files to the end of the collection so these files are moved last
+			var musicFiles = files.Where(f => AudibleFileStorage.Audio.IsFileTypeMatch(f));
+			var sortedFiles = files
+				.Except(musicFiles)
+				.Concat(musicFiles)
+				.ToList();
+
+			return sortedFiles;
+		}
+	}
 }

FileLiberator/UNTESTED/DownloadBook.cs

@@ -44,6 +44,14 @@ namespace FileLiberator
 				tempAaxFilename,
 				(p) => api.DownloadAaxWorkaroundAsync(libraryBook.Book.AudibleProductId, tempAaxFilename, p));
 
+			// if bad file download, a 0-33 byte file will be created
+			System.Threading.Thread.Sleep(100);
+			if (new FileInfo(actualFilePath).Length < 100)
+			{
+				File.Delete(actualFilePath);
+				throw new Exception("Error downloading file");
+			}
+
 			return actualFilePath;
 		}
 

FileLiberator/UNTESTED/DownloadableBase.cs

@@ -8,8 +8,8 @@ namespace FileLiberator
 {
 	public abstract class DownloadableBase : IDownloadable
 	{
-		public event EventHandler<string> Begin;
-		public event EventHandler<string> Completed;
+		public event EventHandler<LibraryBook> Begin;
+		public event EventHandler<LibraryBook> Completed;
 
 		public event EventHandler<string> DownloadBegin;
 		public event EventHandler<DownloadProgress> DownloadProgressChanged;
@@ -26,9 +26,7 @@ namespace FileLiberator
 		// often calls events which prints to forms in the UI context
 		public async Task<StatusHandler> ProcessAsync(LibraryBook libraryBook)
         {
-            var displayMessage = $"[{libraryBook.Book.AudibleProductId}] {libraryBook.Book.Title}";
-
-            Begin?.Invoke(this, displayMessage);
+            Begin?.Invoke(this, libraryBook);
 
             try
             {
@@ -36,7 +34,7 @@ namespace FileLiberator
             }
             finally
             {
-                Completed?.Invoke(this, displayMessage);
+                Completed?.Invoke(this, libraryBook);
             }
         }
 

FileLiberator/UNTESTED/IDownloadable.cs

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

FileLiberator/UNTESTED/IProcessable.cs

@@ -7,12 +7,12 @@ namespace FileLiberator
 {
     public interface IProcessable
     {
-        event EventHandler<string> Begin;
+        event EventHandler<LibraryBook> Begin;
 
         /// <summary>General string message to display. DON'T rely on this for success, failure, or control logic</summary>
         event EventHandler<string> StatusUpdate;
 
-        event EventHandler<string> Completed;
+        event EventHandler<LibraryBook> Completed;
 
 		/// <returns>True == Valid</returns>
 		bool Validate(LibraryBook libraryBook);

FileLiberator/UNTESTED/IProcessableExt.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Linq;
 using System.Threading.Tasks;
 using DataLayer;
 using Dinah.Core.ErrorHandling;
@@ -17,19 +18,42 @@ namespace FileLiberator
         /// <returns>Returns either the status handler from the process, or null if all books have been processed</returns>
         public static async Task<StatusHandler> ProcessFirstValidAsync(this IProcessable processable)
         {
-            var libraryBook = processable.GetNextValid();
+            var libraryBook = processable.getNextValidBook();
             if (libraryBook == null)
                 return null;
 
-			// this should never happen. check anyway. ProcessFirstValidAsync returning null is the signal that we're done. we can't let another IProcessable accidentally send this commans
-			var status = await processable.ProcessAsync(libraryBook);
+            return await processBookAsync(processable, libraryBook);
+        }
+
+        /// <summary>Process the first valid product. Create default context</summary>
+        /// <returns>Returns either the status handler from the process, or null if all books have been processed</returns>
+        public static async Task<StatusHandler> ProcessSingleAsync(this IProcessable processable, string productId)
+        {
+            using var context = LibationContext.Create();
+            var libraryBook = context
+                .Library
+                .GetLibrary()
+                .SingleOrDefault(lb => lb.Book.AudibleProductId == productId);
+
+            if (libraryBook == null)
+                return null;
+            if (!processable.Validate(libraryBook))
+                return new StatusHandler { "Validation failed" };
+
+            return await processBookAsync(processable, libraryBook);
+        }
+
+        private static async Task<StatusHandler> processBookAsync(IProcessable processable, LibraryBook libraryBook)
+        {
+            // this should never happen. check anyway. ProcessFirstValidAsync returning null is the signal that we're done. we can't let another IProcessable accidentally send this command
+            var status = await processable.ProcessAsync(libraryBook);
             if (status == null)
                 throw new Exception("Processable should never return a null status");
 
             return status;
         }
 
-        public static LibraryBook GetNextValid(this IProcessable processable)
+        private static LibraryBook getNextValidBook(this IProcessable processable)
         {
             var libraryBooks = LibraryQueries.GetLibrary_Flat_NoTracking();
 
@@ -38,7 +62,7 @@ namespace FileLiberator
                     return libraryBook;
 
             return null;
-        }
+        }   
 
 		public static async Task<StatusHandler> TryProcessAsync(this IProcessable processable, LibraryBook libraryBook)
 			=> processable.Validate(libraryBook)

FileManager/FileManager.csproj

@@ -5,7 +5,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Polly" Version="7.1.1" />
+    <PackageReference Include="Polly" Version="7.2.0" />
   </ItemGroup>
 
   <ItemGroup>

FileManager/UNTESTED/Configuration.cs

@@ -141,10 +141,10 @@ namespace FileManager
         private static string getNonDevelopmentDir(string path)
         {
             // examples:
-            // \Libation\Core2_0\bin\Debug\netcoreapp3.0
+            // \Libation\Core2_0\bin\Debug\netcoreapp3.1
             // \Libation\StndLib\bin\Debug\netstandard2.1
             // \Libation\MyWnfrm\bin\Debug
-            // \Libation\Core2_0\bin\Release\netcoreapp3.0
+            // \Libation\Core2_0\bin\Release\netcoreapp3.1
             // \Libation\StndLib\bin\Release\netstandard2.1
             // \Libation\MyWnfrm\bin\Release
 

FileManager/UNTESTED/FilePathCache.cs

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

FileManager/UNTESTED/TagsPersistence.cs

@@ -27,11 +27,13 @@ namespace FileManager
 			= Policy.Handle<Exception>()
 			.WaitAndRetry(new[] { TimeSpan.FromMilliseconds(100) });
 
-        public static void Save(string productId, string tags)
+		public static void Save(IEnumerable<(string productId, string tags)> tagsCollection)
 		{
 			ensureCache();
 
-			cache[productId] = tags;
+			// on initial reload, there's a huge benefit to adding to cache individually then updating the file only once
+			foreach ((string productId, string tags) in tagsCollection)
+				cache[productId] = tags;
 
 			lock (locker)
 				policy.Execute(() => File.WriteAllText(TagsFile, JsonConvert.SerializeObject(cache, Formatting.Indented)));

LibationWinForm/LibationWinForm.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <UseWindowsForms>true</UseWindowsForms>
     <ApplicationIcon>libation.ico</ApplicationIcon>
     <AssemblyName>Libation</AssemblyName>

LibationWinForm/Properties/DataSources/LibationWinForm.GridEntry.datasource

@@ -6,5 +6,5 @@
     cause the file to be unrecognizable by the program.
 -->
 <GenericObjectDataSource DisplayName="GridEntry" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
-   <TypeInfo>WinFormsDesigner.GridEntry, LibationWinForm, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
+   <TypeInfo>LibationWinForm.GridEntry, LibationWinForm, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
 </GenericObjectDataSource>

LibationWinForm/UNTESTED/BookLiberation/AutomatedBackupsForm.cs

@@ -6,7 +6,18 @@ namespace LibationWinForm.BookLiberation
 {
     public partial class AutomatedBackupsForm : Form
     {
-        public bool KeepGoingIsChecked => keepGoingCb.Checked;
+        public bool KeepGoingVisible
+        {
+            get => keepGoingCb.Visible;
+            set => keepGoingCb.Visible = value;
+        }
+
+        public bool KeepGoingChecked => keepGoingCb.Checked;
+
+        public bool KeepGoing
+            => keepGoingCb.Visible
+            && keepGoingCb.Enabled
+            && keepGoingCb.Checked;
 
         public AutomatedBackupsForm()
         {

LibationWinForm/UNTESTED/BookLiberation/DecryptForm.cs

@@ -8,12 +8,6 @@ namespace LibationWinForm.BookLiberation
 {
     public partial class DecryptForm : Form
     {
-		class SerilogTextWriter : System.IO.TextWriter
-		{
-			public override System.Text.Encoding Encoding => System.Text.Encoding.ASCII;
-			public override void WriteLine(string value) => Serilog.Log.Logger.Debug(value);
-		}
-
 		public DecryptForm()
         {
             InitializeComponent();
@@ -23,8 +17,10 @@ namespace LibationWinForm.BookLiberation
         private void DecryptForm_Load(object sender, EventArgs e)
         {
             // redirect Console.WriteLine to console, textbox
-            var controlWriter = new RichTextBoxTextWriter(this.rtbLog);
-            var multiLogger = new MultiTextWriter(origOut, controlWriter, new SerilogTextWriter());
+            var multiLogger = new MultiTextWriter(
+                origOut,
+                new RichTextBoxTextWriter(this.rtbLog),
+                new SerilogTextWriter());
             Console.SetOut(multiLogger);
         }
 

LibationWinForm/UNTESTED/BookLiberation/ProcessorAutomationController.Examples.cs

@@ -1,65 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using DataLayer;
-using Dinah.Core.ErrorHandling;
-using FileLiberator;
-
-namespace LibationWinForm.BookLiberation
-{
-    public class BookLiberatorControllerExamples
-    {
-        async Task BackupBookAsync(string productId)
-        {
-			using var context = LibationContext.Create();
-
-            var libraryBook = context
-                .Library
-                .GetLibrary()
-                .SingleOrDefault(lb => lb.Book.AudibleProductId == productId);
-
-            if (libraryBook == null)
-                return;
-
-            var backupBook = new BackupBook();
-            backupBook.DownloadBook.Completed += SetBackupCountsAsync;
-            backupBook.DecryptBook.Completed += SetBackupCountsAsync;
-            await ProcessValidateLibraryBookAsync(backupBook, libraryBook);
-		}
-
-		static async Task<StatusHandler> ProcessValidateLibraryBookAsync(IProcessable processable, LibraryBook libraryBook)
-		{
-			if (!processable.Validate(libraryBook))
-				return new StatusHandler { "Validation failed" };
-			return await processable.ProcessAsync(libraryBook);
-		}
-
-		// Download First Book (Download encrypted/DRM file)
-		async Task DownloadFirstBookAsync()
-        {
-            var downloadBook = ProcessorAutomationController.GetWiredUpDownloadBook();
-            downloadBook.Completed += SetBackupCountsAsync;
-            await downloadBook.ProcessFirstValidAsync();
-        }
-
-        // Decrypt First Book (Remove DRM from downloaded file)
-        async Task DecryptFirstBookAsync()
-        {
-            var decryptBook = ProcessorAutomationController.GetWiredUpDecryptBook();
-            decryptBook.Completed += SetBackupCountsAsync;
-            await decryptBook.ProcessFirstValidAsync();
-        }
-
-        // Backup First Book (Decrypt a non-liberated book. Download if needed)
-        async Task BackupFirstBookAsync()
-        {
-            var backupBook = ProcessorAutomationController.GetWiredUpBackupBook();
-            backupBook.DownloadBook.Completed += SetBackupCountsAsync;
-            backupBook.DecryptBook.Completed += SetBackupCountsAsync;
-            await backupBook.ProcessFirstValidAsync();
-        }
-
-        async void SetBackupCountsAsync(object obj, string str) => throw new NotImplementedException();
-    }
-}

LibationWinForm/UNTESTED/BookLiberation/ProcessorAutomationController.cs

@@ -1,5 +1,7 @@
 using System;
 using System.Threading.Tasks;
+using DataLayer;
+using Dinah.Core.ErrorHandling;
 using FileLiberator;
 
 namespace LibationWinForm.BookLiberation
@@ -12,37 +14,38 @@ namespace LibationWinForm.BookLiberation
         // 1) we can't forget to do it
         // 2) we can't accidentally do it mult times becaues we lost track of complexity
         //
-        public static BackupBook GetWiredUpBackupBook()
+        public static BackupBook GetWiredUpBackupBook(EventHandler<LibraryBook> completedAction = null)
         {
             var backupBook = new BackupBook();
 
-            backupBook.DownloadBook.Begin += (_, __) => wireUpDownloadable(backupBook.DownloadBook);
-            backupBook.DecryptBook.Begin += (_, __) => wireUpDecryptable(backupBook.DecryptBook);
-			backupBook.DownloadPdf.Begin += (_, __) => wireUpDecryptable(backupBook.DecryptBook);
+            backupBook.DownloadBook.Begin += (_, __) => wireUpEvents(backupBook.DownloadBook);
+            backupBook.DecryptBook.Begin += (_, __) => wireUpEvents(backupBook.DecryptBook);
+			backupBook.DownloadPdf.Begin += (_, __) => wireUpEvents(backupBook.DownloadPdf);
 
-			return backupBook;
+            if (completedAction != null)
+            {
+                backupBook.DownloadBook.Completed += completedAction;
+                backupBook.DecryptBook.Completed += completedAction;
+                backupBook.DownloadPdf.Completed += completedAction;
+            }
+
+            return backupBook;
         }
-        public static DecryptBook GetWiredUpDecryptBook()
-        {
-            var decryptBook = new DecryptBook();
-            decryptBook.Begin += (_, __) => wireUpDecryptable(decryptBook);
-            return decryptBook;
-        }
-        public static DownloadBook GetWiredUpDownloadBook()
-        {
-            var downloadBook = new DownloadBook();
-            downloadBook.Begin += (_, __) => wireUpDownloadable(downloadBook);
-            return downloadBook;
-        }
-        public static DownloadPdf GetWiredUpDownloadPdf()
+
+        public static DownloadPdf GetWiredUpDownloadPdf(EventHandler<LibraryBook> completedAction = null)
         {
             var downloadPdf = new DownloadPdf();
-            downloadPdf.Begin += (_, __) => wireUpDownloadable(downloadPdf);
+
+            downloadPdf.Begin += (_, __) => wireUpEvents(downloadPdf);
+
+            if (completedAction != null)
+                downloadPdf.Completed += completedAction;
+
             return downloadPdf;
         }
 
         // subscribed to Begin event because a new form should be created+processed+closed on each iteration
-        private static void wireUpDownloadable(IDownloadable downloadable)
+        private static void wireUpEvents(IDownloadable downloadable)
         {
             #region create form
             var downloadDialog = new DownloadForm();
@@ -82,7 +85,7 @@ namespace LibationWinForm.BookLiberation
 
             // unless we dispose, if the form is created but un-used/never-shown then weird UI stuff can happen
             // also, since event unsubscribe occurs on FormClosing and an unused form is never closed, then the events will never be unsubscribed
-            void dialogDispose(object _, string __)
+            void dialogDispose(object _, object __)
             {
                 if (!downloadDialog.IsDisposed)
                     downloadDialog.Dispose();
@@ -106,7 +109,7 @@ namespace LibationWinForm.BookLiberation
         }
 
         // subscribed to Begin event because a new form should be created+processed+closed on each iteration
-        private static void wireUpDecryptable(IDecryptable decryptBook)
+        private static void wireUpEvents(IDecryptable decryptBook)
         {
             #region create form
             var decryptDialog = new DecryptForm();
@@ -153,17 +156,23 @@ namespace LibationWinForm.BookLiberation
             #endregion
         }
 
-        public static async Task RunAutomaticDownload(IDownloadable downloadable)
+        public static async Task RunAutomaticDownloadAsync(IDownloadable downloadable)
+        {
+            AutomatedBackupsForm automatedBackupsForm = attachToBackupsForm(downloadable);
+            await runBackupLoopAsync(downloadable, automatedBackupsForm);
+        }
+
+        private static AutomatedBackupsForm attachToBackupsForm(IDownloadable downloadable)
         {
             #region create form
             var automatedBackupsForm = new AutomatedBackupsForm();
             #endregion
 
             #region define how model actions will affect form behavior
-            void begin(object _, string str) => automatedBackupsForm.AppendText("Begin: " + str);
+            void begin(object _, LibraryBook libraryBook) => automatedBackupsForm.AppendText($"Begin: {libraryBook.Book}");
             void statusUpdate(object _, string str) => automatedBackupsForm.AppendText("- " + str);
             // extra line after book is completely finished
-            void completed(object _, string str) => automatedBackupsForm.AppendText("Completed: " + str + Environment.NewLine);
+            void completed(object _, LibraryBook libraryBook) => automatedBackupsForm.AppendText($"Completed: {libraryBook.Book}{Environment.NewLine}");
             #endregion
 
             #region subscribe new form to model's events
@@ -182,42 +191,55 @@ namespace LibationWinForm.BookLiberation
             };
             #endregion
 
-            await runBackupLoop(downloadable, automatedBackupsForm);
+            return automatedBackupsForm;
         }
 
-        public static async Task RunAutomaticBackup(BackupBook backupBook)
+        public static async Task RunAutomaticBackupAsync(BackupBook backupBook)
+        {
+            var automatedBackupsForm = attachToBackupsForm(backupBook);
+            await runBackupLoopAsync(backupBook, automatedBackupsForm);
+        }
+
+        public static async Task RunSingleBackupAsync(BackupBook backupBook, string productId)
+        {
+            var automatedBackupsForm = attachToBackupsForm(backupBook);
+            automatedBackupsForm.KeepGoingVisible = false;
+            await runSingleBackupAsync(backupBook, automatedBackupsForm, productId);
+        }
+
+        private static AutomatedBackupsForm attachToBackupsForm(BackupBook backupBook)
         {
             #region create form
             var automatedBackupsForm = new AutomatedBackupsForm();
             #endregion
 
             #region define how model actions will affect form behavior
-            void downloadBookBegin(object _, string str) => automatedBackupsForm.AppendText("DownloadStep_Begin: " + str);
+            void downloadBookBegin(object _, LibraryBook libraryBook) => automatedBackupsForm.AppendText($"Download Step, Begin: {libraryBook.Book}");
             void statusUpdate(object _, string str) => automatedBackupsForm.AppendText("- " + str);
-            void downloadBookCompleted(object _, string str) => automatedBackupsForm.AppendText("DownloadStep_Completed: " + str);
-            void decryptBookBegin(object _, string str) => automatedBackupsForm.AppendText("DecryptStep_Begin: " + str);
+            void downloadBookCompleted(object _, LibraryBook libraryBook) => automatedBackupsForm.AppendText($"Download Step, Completed: {libraryBook.Book}");
+            void decryptBookBegin(object _, LibraryBook libraryBook) => automatedBackupsForm.AppendText($"Decrypt Step, Begin: {libraryBook.Book}");
             // extra line after book is completely finished
-            void decryptBookCompleted(object _, string str) => automatedBackupsForm.AppendText("DecryptStep_Completed: " + str + Environment.NewLine);
-			void downloadPdfBegin(object _, string str) => automatedBackupsForm.AppendText("PdfStep_Begin: " + str);
-			// extra line after book is completely finished
-			void downloadPdfCompleted(object _, string str) => automatedBackupsForm.AppendText("PdfStep_Completed: " + str + Environment.NewLine);
-			#endregion
+            void decryptBookCompleted(object _, LibraryBook libraryBook) => automatedBackupsForm.AppendText($"Decrypt Step, Completed: {libraryBook.Book}{Environment.NewLine}");
+            void downloadPdfBegin(object _, LibraryBook libraryBook) => automatedBackupsForm.AppendText($"PDF Step, Begin: {libraryBook.Book}");
+            // extra line after book is completely finished
+            void downloadPdfCompleted(object _, LibraryBook libraryBook) => automatedBackupsForm.AppendText($"PDF Step, Completed: {libraryBook.Book}{Environment.NewLine}");
+            #endregion
 
-			#region subscribe new form to model's events
-			backupBook.DownloadBook.Begin += downloadBookBegin;
+            #region subscribe new form to model's events
+            backupBook.DownloadBook.Begin += downloadBookBegin;
             backupBook.DownloadBook.StatusUpdate += statusUpdate;
             backupBook.DownloadBook.Completed += downloadBookCompleted;
             backupBook.DecryptBook.Begin += decryptBookBegin;
             backupBook.DecryptBook.StatusUpdate += statusUpdate;
             backupBook.DecryptBook.Completed += decryptBookCompleted;
-			backupBook.DownloadPdf.Begin += downloadPdfBegin;
-			backupBook.DownloadPdf.StatusUpdate += statusUpdate;
-			backupBook.DownloadPdf.Completed += downloadPdfCompleted;
-			#endregion
+            backupBook.DownloadPdf.Begin += downloadPdfBegin;
+            backupBook.DownloadPdf.StatusUpdate += statusUpdate;
+            backupBook.DownloadPdf.Completed += downloadPdfCompleted;
+            #endregion
 
-			#region when form closes, unsubscribe from model's events
-			// unsubscribe so disposed forms aren't still trying to receive notifications
-			automatedBackupsForm.FormClosing += (_, __) =>
+            #region when form closes, unsubscribe from model's events
+            // unsubscribe so disposed forms aren't still trying to receive notifications
+            automatedBackupsForm.FormClosing += (_, __) =>
             {
                 backupBook.DownloadBook.Begin -= downloadBookBegin;
                 backupBook.DownloadBook.StatusUpdate -= statusUpdate;
@@ -225,48 +247,29 @@ namespace LibationWinForm.BookLiberation
                 backupBook.DecryptBook.Begin -= decryptBookBegin;
                 backupBook.DecryptBook.StatusUpdate -= statusUpdate;
                 backupBook.DecryptBook.Completed -= decryptBookCompleted;
-				backupBook.DownloadPdf.Begin -= downloadPdfBegin;
-				backupBook.DownloadPdf.StatusUpdate -= statusUpdate;
-				backupBook.DownloadPdf.Completed -= downloadPdfCompleted;
-			};
+                backupBook.DownloadPdf.Begin -= downloadPdfBegin;
+                backupBook.DownloadPdf.StatusUpdate -= statusUpdate;
+                backupBook.DownloadPdf.Completed -= downloadPdfCompleted;
+            };
             #endregion
 
-            await runBackupLoop(backupBook, automatedBackupsForm);
+            return automatedBackupsForm;
         }
 
         // automated backups looper feels like a composible IProcessable: logic, UI, begin + process child + end
         // however the process step doesn't follow the pattern: Validate(product) + Process(product)
-        private static async Task runBackupLoop(IProcessable processable, AutomatedBackupsForm automatedBackupsForm)
+        private static async Task runBackupLoopAsync(IProcessable processable, AutomatedBackupsForm automatedBackupsForm)
         {
             automatedBackupsForm.Show();
 
             try
             {
-                do
+                var shouldContinue = true;
+                while (shouldContinue)
                 {
                     var statusHandler = await processable.ProcessFirstValidAsync();
-
-                    if (statusHandler == null)
-                    {
-                        automatedBackupsForm.AppendText("Done. All books have been processed");
-                        break;
-                    }
-
-                    if (statusHandler.HasErrors)
-                    {
-                        automatedBackupsForm.AppendText("ERROR. All books have not been processed. Most recent valid book: processing failed");
-                        foreach (var errorMessage in statusHandler.Errors)
-                            automatedBackupsForm.AppendText(errorMessage);
-                        break;
-                    }
-
-                    if (!automatedBackupsForm.KeepGoingIsChecked)
-                    {
-                        automatedBackupsForm.AppendText("'Keep going' is unchecked");
-                        break;
-                    }
+                    shouldContinue = validateStatus(statusHandler, automatedBackupsForm);
                 }
-                while (automatedBackupsForm.KeepGoingIsChecked);
             }
             catch (Exception ex)
             {
@@ -275,5 +278,48 @@ namespace LibationWinForm.BookLiberation
 
             automatedBackupsForm.FinalizeUI();
         }
+
+        private static async Task runSingleBackupAsync(IProcessable processable, AutomatedBackupsForm automatedBackupsForm, string productId)
+        {
+            automatedBackupsForm.Show();
+
+            try
+            {
+                var statusHandler = await processable.ProcessSingleAsync(productId);
+                validateStatus(statusHandler, automatedBackupsForm);
+            }
+            catch (Exception ex)
+            {
+                automatedBackupsForm.AppendError(ex);
+            }
+
+            automatedBackupsForm.FinalizeUI();
+        }
+
+        private static bool validateStatus(StatusHandler statusHandler, AutomatedBackupsForm automatedBackupsForm)
+        {
+            if (statusHandler == null)
+            {
+                automatedBackupsForm.AppendText("Done. All books have been processed");
+                return false;
+            }
+
+            if (statusHandler.HasErrors)
+            {
+                automatedBackupsForm.AppendText("ERROR. All books have not been processed. Most recent valid book: processing failed");
+                foreach (var errorMessage in statusHandler.Errors)
+                    automatedBackupsForm.AppendText(errorMessage);
+                return false;
+            }
+
+            if (!automatedBackupsForm.KeepGoing)
+            {
+                if (automatedBackupsForm.KeepGoingVisible && !automatedBackupsForm.KeepGoingChecked)
+                    automatedBackupsForm.AppendText("'Keep going' is unchecked");
+                return false;
+            }
+
+            return true;
+        }
     }
 }

LibationWinForm/UNTESTED/Form1.cs

@@ -59,7 +59,7 @@ namespace LibationWinForm
                 backupsCountsLbl.Text = "[Calculating backed up book quantities]";
                 pdfsCountsLbl.Text = "[Calculating backed up PDFs]";
 
-                setBackupCounts();
+                setBackupCounts(null, null);
             }
         }
 
@@ -86,44 +86,34 @@ namespace LibationWinForm
                 {
                     gridPanel.Controls.Remove(currProductsGrid);
                     currProductsGrid.VisibleCountChanged -= setVisibleCount;
+                    currProductsGrid.BackupCountsChanged -= setBackupCounts;
                     currProductsGrid.Dispose();
                 }
 
                 currProductsGrid = new ProductsGrid { Dock = DockStyle.Fill };
                 currProductsGrid.VisibleCountChanged += setVisibleCount;
+                currProductsGrid.BackupCountsChanged += setBackupCounts;
                 gridPanel.Controls.Add(currProductsGrid);
                 currProductsGrid.Display();
             }
             ResumeLayout();
         }
-		#endregion
+        #endregion
 
         #region bottom: qty books visible
         private void setVisibleCount(object _, int qty) => visibleCountLbl.Text = string.Format(visibleCountLbl_Format, qty);
-		#endregion
+        #endregion
 
-		#region bottom: backup counts
-		private void setBackupCounts()
+        #region bottom: backup counts
+        private void setBackupCounts(object _, object __)
         {
             var books = LibraryQueries.GetLibrary_Flat_NoTracking()
                 .Select(sp => sp.Book)
                 .ToList();
 
-			// will often fail once if book has been moved while libation is closed. just retry once for now
-			// fix actual issue later
-			//   FilePathCache.GetPath() :: inMemoryCache.SingleOrDefault(i => i.Id == id && i.FileType == type)
-			try
-			{
-				setBookBackupCounts(books);
-				setPdfBackupCounts(books);
-			}
-			catch (Exception ex)
-			{
-				System.Threading.Thread.Sleep(100);
-				setBookBackupCounts(books);
-				setPdfBackupCounts(books);
-			}
-        }
+			setBookBackupCounts(books);
+			setPdfBackupCounts(books);
+		}
         enum AudioFileState { full, aax, none }
         private void setBookBackupCounts(IEnumerable<Book> books)
         {
@@ -187,8 +177,8 @@ namespace LibationWinForm
         }
         #endregion
 
-		#region filter
-		private void filterHelpBtn_Click(object sender, EventArgs e) => new Dialogs.SearchSyntaxDialog().ShowDialog();
+        #region filter
+        private void filterHelpBtn_Click(object sender, EventArgs e) => new Dialogs.SearchSyntaxDialog().ShowDialog();
 
         private void AddFilterBtn_Click(object sender, EventArgs e)
         {
@@ -245,33 +235,25 @@ namespace LibationWinForm
 
 			MessageBox.Show($"Total processed: {totalProcessed}\r\nNew: {newAdded}");
 
-			// update backup counts if we have new library items
-			if (newAdded > 0)
-				setBackupCounts();
-
 			if (totalProcessed > 0)
 				reloadGrid();
 		}
-		#endregion
-
-		#region liberate menu
-		private void setBackupCounts(object _, string __) => setBackupCounts();
+        #endregion
 
+        #region liberate menu
         private async void beginBookBackupsToolStripMenuItem_Click(object sender, EventArgs e)
         {
-            var backupBook = BookLiberation.ProcessorAutomationController.GetWiredUpBackupBook();
-            backupBook.DownloadBook.Completed += setBackupCounts;
-            backupBook.DecryptBook.Completed += setBackupCounts;
-			backupBook.DownloadPdf.Completed += setBackupCounts;
-			await BookLiberation.ProcessorAutomationController.RunAutomaticBackup(backupBook);
+            var backupBook = BookLiberation.ProcessorAutomationController.GetWiredUpBackupBook(updateGridRow);
+			await BookLiberation.ProcessorAutomationController.RunAutomaticBackupAsync(backupBook);
         }
 
         private async void beginPdfBackupsToolStripMenuItem_Click(object sender, EventArgs e)
         {
-            var downloadPdf = BookLiberation.ProcessorAutomationController.GetWiredUpDownloadPdf();
-            downloadPdf.Completed += setBackupCounts;
-            await BookLiberation.ProcessorAutomationController.RunAutomaticDownload(downloadPdf);
+            var downloadPdf = BookLiberation.ProcessorAutomationController.GetWiredUpDownloadPdf(updateGridRow);
+            await BookLiberation.ProcessorAutomationController.RunAutomaticDownloadAsync(downloadPdf);
         }
+
+        private void updateGridRow(object _, LibraryBook libraryBook) => currProductsGrid.RefreshRow(libraryBook.Book.AudibleProductId);
         #endregion
 
         #region quick filters menu

LibationWinForm/UNTESTED/GridEntry.cs

@@ -26,15 +26,54 @@ namespace LibationWinForm
 		[Browsable(false)]
 		public IEnumerable<string> TagsEnumerated => book.UserDefinedItem.TagsEnumerated;
 
-		// formatReplacements is what gets displayed
+		[Browsable(false)]
+		public string Download_Status
+		{
+			get
+			{
+				var print
+					= FileManager.AudibleFileStorage.Audio.Exists(book.AudibleProductId) ? "Liberated"
+					: FileManager.AudibleFileStorage.AAX.Exists(book.AudibleProductId) ? "DRM"
+					: "NOT d/l'ed";
+
+				if (!book.Supplements.Any())
+					return print;
+
+				print += "\r\n";
+
+				var downloadStatuses = book.Supplements
+					.Select(d => FileManager.AudibleFileStorage.PDF.Exists(book.AudibleProductId))
+					// break delayed execution right now!
+					.ToList();
+				var count = downloadStatuses.Count;
+				if (count == 1)
+				{
+					print += downloadStatuses[0]
+						? "PDF d/l'ed"
+						: "PDF NOT d/l'ed";
+				}
+				else
+				{
+					var downloadedCount = downloadStatuses.Count(s => s);
+					print
+						+= downloadedCount == count ? $"{count} PDFs d/l'ed"
+						: downloadedCount == 0 ? $"{count} PDFs NOT d/l'ed"
+						: $"{downloadedCount} of {count} PDFs d/l'ed";
+				}
+
+				return print;
+			}
+		}
+
+		// displayValues is what gets displayed
 		// the value that gets returned from the property is the cell's value
 		// this allows for the value to be sorted one way and displayed another
 		// eg:
 		//   orig title: The Computer
 		//   formatReplacement: The Computer
 		//   value for sorting: Computer
-		private Dictionary<string, string> formatReplacements { get; } = new Dictionary<string, string>();
-		public bool TryGetFormatted(string key, out string value) => formatReplacements.TryGetValue(key, out value);
+		private Dictionary<string, string> displayValues { get; } = new Dictionary<string, string>();
+		public bool TryDisplayValue(string key, out string value) => displayValues.TryGetValue(key, out value);
 
 		public Image Cover =>
 			WindowsDesktopUtilities.WinAudibleImageServer.GetImage(book.PictureId, FileManager.PictureSize._80x80);
@@ -43,16 +82,8 @@ namespace LibationWinForm
 		{
 			get
 			{
-				formatReplacements[nameof(Title)] = book.Title;
-
-				var sortName = book.Title
-					.Replace("|", "")
-					.Replace(":", "")
-					.ToLowerInvariant();
-				if (sortName.StartsWith("the ") || sortName.StartsWith("a ") || sortName.StartsWith("an "))
-					sortName = sortName.Substring(sortName.IndexOf(" ") + 1);
-
-				return sortName;
+				displayValues[nameof(Title)] = book.Title;
+				return getSortName(book.Title);
 			}
 		}
 
@@ -63,7 +94,7 @@ namespace LibationWinForm
 		{
 			get
 			{
-				formatReplacements[nameof(Length)]
+				displayValues[nameof(Length)]
 					= book.LengthInMinutes == 0
 					? ""
 					: $"{book.LengthInMinutes / 60} hr {book.LengthInMinutes % 60} min";
@@ -72,7 +103,29 @@ namespace LibationWinForm
 			}
 		}
 
-		public string Series => book.SeriesNames;
+		public string Series
+		{
+			get
+			{
+				displayValues[nameof(Series)] = book.SeriesNames;
+				return getSortName(book.SeriesNames);
+			}
+		}
+
+		private static string[] sortPrefixIgnores { get; } = new[] { "the", "a", "an" };
+		private static string getSortName(string unformattedName)
+		{
+			var sortName = unformattedName
+				.Replace("|", "")
+				.Replace(":", "")
+				.ToLowerInvariant()
+				.Trim();
+
+			if (sortPrefixIgnores.Any(prefix => sortName.StartsWith(prefix + " ")))
+				sortName = sortName.Substring(sortName.IndexOf(" ") + 1).TrimStart();
+
+			return sortName;
+		}
 
 		private string descriptionCache = null;
 		public string Description
@@ -111,7 +164,7 @@ namespace LibationWinForm
 		{
 			get
 			{
-				formatReplacements[nameof(Product_Rating)] = starString(book.Rating);
+				displayValues[nameof(Product_Rating)] = starString(book.Rating);
 				return firstScore(book.Rating);
 			}
 		}
@@ -120,7 +173,7 @@ namespace LibationWinForm
 		{
 			get
 			{
-				formatReplacements[nameof(Purchase_Date)] = libraryBook.DateAdded.ToString("d");
+				displayValues[nameof(Purchase_Date)] = libraryBook.DateAdded.ToString("d");
 				return libraryBook.DateAdded.ToString("yyyy-MM-dd HH:mm:ss");
 			}
 		}
@@ -129,7 +182,7 @@ namespace LibationWinForm
         {
             get
             {
-                formatReplacements[nameof(My_Rating)] = starString(book.UserDefinedItem.Rating);
+                displayValues[nameof(My_Rating)] = starString(book.UserDefinedItem.Rating);
                 return firstScore(book.UserDefinedItem.Rating);
             }
         }
@@ -162,43 +215,5 @@ namespace LibationWinForm
                 return string.Join("\r\n", details);
             }
         }
-
-        public string Download_Status
-        {
-            get
-            {
-                var print
-                    = FileManager.AudibleFileStorage.Audio.Exists(book.AudibleProductId) ? "Liberated"
-                    : FileManager.AudibleFileStorage.AAX.Exists(book.AudibleProductId) ? "DRM"
-                    : "NOT d/l'ed";
-
-                if (!book.Supplements.Any())
-                    return print;
-
-                print += "\r\n";
-                
-                var downloadStatuses = book.Supplements
-                    .Select(d => FileManager.AudibleFileStorage.PDF.Exists(book.AudibleProductId))
-                    // break delayed execution right now!
-                    .ToList();
-                var count = downloadStatuses.Count;
-                if (count == 1)
-                {
-                    print += downloadStatuses[0]
-                        ? "PDF d/l'ed"
-                        : "PDF NOT d/l'ed";
-                }
-                else
-                {
-                    var downloadedCount = downloadStatuses.Count(s => s);
-                    print
-                        += downloadedCount == count ? $"{count} PDFs d/l'ed"
-                        : downloadedCount == 0 ? $"{count} PDFs NOT d/l'ed"
-                        : $"{downloadedCount} of {count} PDFs d/l'ed";
-                }
-
-                return print;
-            }
-        }
     }
 }

LibationWinForm/UNTESTED/ProductsGrid.Designer.cs

@@ -1,201 +1,191 @@
 namespace LibationWinForm
 {
-    partial class ProductsGrid
-    {
-        /// <summary> 
-        /// Required designer variable.
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
+	partial class ProductsGrid
+	{
+		/// <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);
-        }
+		/// <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
+		#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.components = new System.ComponentModel.Container();
-            this.gridEntryBindingSource = new System.Windows.Forms.BindingSource(this.components);
-            this.gridEntryDataGridView = new System.Windows.Forms.DataGridView();
-            this.dataGridViewImageColumn1 = new System.Windows.Forms.DataGridViewImageColumn();
-            this.dataGridViewTextBoxColumn1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.dataGridViewTextBoxColumn2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.dataGridViewTextBoxColumn3 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.dataGridViewTextBoxColumn4 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.dataGridViewTextBoxColumn5 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.dataGridViewTextBoxColumn6 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.dataGridViewTextBoxColumn7 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.dataGridViewTextBoxColumn8 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.dataGridViewTextBoxColumn9 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.dataGridViewTextBoxColumn10 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.dataGridViewTextBoxColumn11 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.dataGridViewTextBoxColumn12 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            ((System.ComponentModel.ISupportInitialize)(this.gridEntryBindingSource)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.gridEntryDataGridView)).BeginInit();
-            this.SuspendLayout();
-            // 
-            // gridEntryBindingSource
-            // 
-            this.gridEntryBindingSource.DataSource = typeof(LibationWinForm.GridEntry);
-            // 
-            // gridEntryDataGridView
-            // 
-            this.gridEntryDataGridView.AutoGenerateColumns = false;
-            this.gridEntryDataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
-            this.gridEntryDataGridView.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
-            this.dataGridViewImageColumn1,
-            this.dataGridViewTextBoxColumn1,
-            this.dataGridViewTextBoxColumn2,
-            this.dataGridViewTextBoxColumn3,
-            this.dataGridViewTextBoxColumn4,
-            this.dataGridViewTextBoxColumn5,
-            this.dataGridViewTextBoxColumn6,
-            this.dataGridViewTextBoxColumn7,
-            this.dataGridViewTextBoxColumn8,
-            this.dataGridViewTextBoxColumn9,
-            this.dataGridViewTextBoxColumn10,
-            this.dataGridViewTextBoxColumn11,
-            this.dataGridViewTextBoxColumn12});
-            this.gridEntryDataGridView.DataSource = this.gridEntryBindingSource;
-            this.gridEntryDataGridView.Location = new System.Drawing.Point(54, 58);
-            this.gridEntryDataGridView.Name = "gridEntryDataGridView";
-            this.gridEntryDataGridView.Size = new System.Drawing.Size(300, 220);
-            this.gridEntryDataGridView.TabIndex = 0;
-            // 
-            // dataGridViewImageColumn1
-            // 
-            this.dataGridViewImageColumn1.DataPropertyName = "Cover";
-            this.dataGridViewImageColumn1.HeaderText = "Cover";
-            this.dataGridViewImageColumn1.Name = "dataGridViewImageColumn1";
-            this.dataGridViewImageColumn1.ReadOnly = true;
-            // 
-            // dataGridViewTextBoxColumn1
-            // 
-            this.dataGridViewTextBoxColumn1.DataPropertyName = "Title";
-            this.dataGridViewTextBoxColumn1.HeaderText = "Title";
-            this.dataGridViewTextBoxColumn1.Name = "dataGridViewTextBoxColumn1";
-            this.dataGridViewTextBoxColumn1.ReadOnly = true;
-            // 
-            // dataGridViewTextBoxColumn2
-            // 
-            this.dataGridViewTextBoxColumn2.DataPropertyName = "Authors";
-            this.dataGridViewTextBoxColumn2.HeaderText = "Authors";
-            this.dataGridViewTextBoxColumn2.Name = "dataGridViewTextBoxColumn2";
-            this.dataGridViewTextBoxColumn2.ReadOnly = true;
-            // 
-            // dataGridViewTextBoxColumn3
-            // 
-            this.dataGridViewTextBoxColumn3.DataPropertyName = "Narrators";
-            this.dataGridViewTextBoxColumn3.HeaderText = "Narrators";
-            this.dataGridViewTextBoxColumn3.Name = "dataGridViewTextBoxColumn3";
-            this.dataGridViewTextBoxColumn3.ReadOnly = true;
-            // 
-            // dataGridViewTextBoxColumn4
-            // 
-            this.dataGridViewTextBoxColumn4.DataPropertyName = "Length";
-            this.dataGridViewTextBoxColumn4.HeaderText = "Length";
-            this.dataGridViewTextBoxColumn4.Name = "dataGridViewTextBoxColumn4";
-            this.dataGridViewTextBoxColumn4.ReadOnly = true;
-            // 
-            // dataGridViewTextBoxColumn5
-            // 
-            this.dataGridViewTextBoxColumn5.DataPropertyName = "Series";
-            this.dataGridViewTextBoxColumn5.HeaderText = "Series";
-            this.dataGridViewTextBoxColumn5.Name = "dataGridViewTextBoxColumn5";
-            this.dataGridViewTextBoxColumn5.ReadOnly = true;
-            // 
-            // dataGridViewTextBoxColumn6
-            // 
-            this.dataGridViewTextBoxColumn6.DataPropertyName = "Description";
-            this.dataGridViewTextBoxColumn6.HeaderText = "Description";
-            this.dataGridViewTextBoxColumn6.Name = "dataGridViewTextBoxColumn6";
-            this.dataGridViewTextBoxColumn6.ReadOnly = true;
-            // 
-            // dataGridViewTextBoxColumn7
-            // 
-            this.dataGridViewTextBoxColumn7.DataPropertyName = "Category";
-            this.dataGridViewTextBoxColumn7.HeaderText = "Category";
-            this.dataGridViewTextBoxColumn7.Name = "dataGridViewTextBoxColumn7";
-            this.dataGridViewTextBoxColumn7.ReadOnly = true;
-            // 
-            // dataGridViewTextBoxColumn8
-            // 
-            this.dataGridViewTextBoxColumn8.DataPropertyName = "Product_Rating";
-            this.dataGridViewTextBoxColumn8.HeaderText = "Product_Rating";
-            this.dataGridViewTextBoxColumn8.Name = "dataGridViewTextBoxColumn8";
-            this.dataGridViewTextBoxColumn8.ReadOnly = true;
-            // 
-            // dataGridViewTextBoxColumn9
-            // 
-            this.dataGridViewTextBoxColumn9.DataPropertyName = "Purchase_Date";
-            this.dataGridViewTextBoxColumn9.HeaderText = "Purchase_Date";
-            this.dataGridViewTextBoxColumn9.Name = "dataGridViewTextBoxColumn9";
-            this.dataGridViewTextBoxColumn9.ReadOnly = true;
-            // 
-            // dataGridViewTextBoxColumn10
-            // 
-            this.dataGridViewTextBoxColumn10.DataPropertyName = "My_Rating";
-            this.dataGridViewTextBoxColumn10.HeaderText = "My_Rating";
-            this.dataGridViewTextBoxColumn10.Name = "dataGridViewTextBoxColumn10";
-            this.dataGridViewTextBoxColumn10.ReadOnly = true;
-            // 
-            // dataGridViewTextBoxColumn11
-            // 
-            this.dataGridViewTextBoxColumn11.DataPropertyName = "Misc";
-            this.dataGridViewTextBoxColumn11.HeaderText = "Misc";
-            this.dataGridViewTextBoxColumn11.Name = "dataGridViewTextBoxColumn11";
-            this.dataGridViewTextBoxColumn11.ReadOnly = true;
-            // 
-            // dataGridViewTextBoxColumn12
-            // 
-            this.dataGridViewTextBoxColumn12.DataPropertyName = "Download_Status";
-            this.dataGridViewTextBoxColumn12.HeaderText = "Download_Status";
-            this.dataGridViewTextBoxColumn12.Name = "dataGridViewTextBoxColumn12";
-            this.dataGridViewTextBoxColumn12.ReadOnly = true;
-            // 
-            // ProductsGrid
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.Controls.Add(this.gridEntryDataGridView);
-            this.Name = "ProductsGrid";
-            this.Size = new System.Drawing.Size(434, 329);
-            ((System.ComponentModel.ISupportInitialize)(this.gridEntryBindingSource)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.gridEntryDataGridView)).EndInit();
-            this.ResumeLayout(false);
+		/// <summary> 
+		/// Required method for Designer support - do not modify 
+		/// the contents of this method with the code editor.
+		/// </summary>
+		private void InitializeComponent()
+		{
+			this.components = new System.ComponentModel.Container();
+			this.gridEntryBindingSource = new System.Windows.Forms.BindingSource(this.components);
+			this.gridEntryDataGridView = new System.Windows.Forms.DataGridView();
+			this.dataGridViewImageColumn1 = new System.Windows.Forms.DataGridViewImageColumn();
+			this.dataGridViewTextBoxColumn1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.dataGridViewTextBoxColumn2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.dataGridViewTextBoxColumn3 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.dataGridViewTextBoxColumn4 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.dataGridViewTextBoxColumn5 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.dataGridViewTextBoxColumn6 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.dataGridViewTextBoxColumn7 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.dataGridViewTextBoxColumn8 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.dataGridViewTextBoxColumn9 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.dataGridViewTextBoxColumn10 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.dataGridViewTextBoxColumn11 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			((System.ComponentModel.ISupportInitialize)(this.gridEntryBindingSource)).BeginInit();
+			((System.ComponentModel.ISupportInitialize)(this.gridEntryDataGridView)).BeginInit();
+			this.SuspendLayout();
+			// 
+			// gridEntryBindingSource
+			// 
+			this.gridEntryBindingSource.DataSource = typeof(LibationWinForm.GridEntry);
+			// 
+			// gridEntryDataGridView
+			// 
+			this.gridEntryDataGridView.AutoGenerateColumns = false;
+			this.gridEntryDataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+			this.gridEntryDataGridView.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
+			this.dataGridViewImageColumn1,
+			this.dataGridViewTextBoxColumn1,
+			this.dataGridViewTextBoxColumn2,
+			this.dataGridViewTextBoxColumn3,
+			this.dataGridViewTextBoxColumn4,
+			this.dataGridViewTextBoxColumn5,
+			this.dataGridViewTextBoxColumn6,
+			this.dataGridViewTextBoxColumn7,
+			this.dataGridViewTextBoxColumn8,
+			this.dataGridViewTextBoxColumn9,
+			this.dataGridViewTextBoxColumn10,
+			this.dataGridViewTextBoxColumn11});
+			this.gridEntryDataGridView.DataSource = this.gridEntryBindingSource;
+			this.gridEntryDataGridView.Location = new System.Drawing.Point(54, 58);
+			this.gridEntryDataGridView.Name = "gridEntryDataGridView";
+			this.gridEntryDataGridView.Size = new System.Drawing.Size(300, 220);
+			this.gridEntryDataGridView.TabIndex = 0;
+			// 
+			// dataGridViewImageColumn1
+			// 
+			this.dataGridViewImageColumn1.DataPropertyName = "Cover";
+			this.dataGridViewImageColumn1.HeaderText = "Cover";
+			this.dataGridViewImageColumn1.Name = "dataGridViewImageColumn1";
+			this.dataGridViewImageColumn1.ReadOnly = true;
+			// 
+			// dataGridViewTextBoxColumn1
+			// 
+			this.dataGridViewTextBoxColumn1.DataPropertyName = "Title";
+			this.dataGridViewTextBoxColumn1.HeaderText = "Title";
+			this.dataGridViewTextBoxColumn1.Name = "dataGridViewTextBoxColumn1";
+			this.dataGridViewTextBoxColumn1.ReadOnly = true;
+			// 
+			// dataGridViewTextBoxColumn2
+			// 
+			this.dataGridViewTextBoxColumn2.DataPropertyName = "Authors";
+			this.dataGridViewTextBoxColumn2.HeaderText = "Authors";
+			this.dataGridViewTextBoxColumn2.Name = "dataGridViewTextBoxColumn2";
+			this.dataGridViewTextBoxColumn2.ReadOnly = true;
+			// 
+			// dataGridViewTextBoxColumn3
+			// 
+			this.dataGridViewTextBoxColumn3.DataPropertyName = "Narrators";
+			this.dataGridViewTextBoxColumn3.HeaderText = "Narrators";
+			this.dataGridViewTextBoxColumn3.Name = "dataGridViewTextBoxColumn3";
+			this.dataGridViewTextBoxColumn3.ReadOnly = true;
+			// 
+			// dataGridViewTextBoxColumn4
+			// 
+			this.dataGridViewTextBoxColumn4.DataPropertyName = "Length";
+			this.dataGridViewTextBoxColumn4.HeaderText = "Length";
+			this.dataGridViewTextBoxColumn4.Name = "dataGridViewTextBoxColumn4";
+			this.dataGridViewTextBoxColumn4.ReadOnly = true;
+			// 
+			// dataGridViewTextBoxColumn5
+			// 
+			this.dataGridViewTextBoxColumn5.DataPropertyName = "Series";
+			this.dataGridViewTextBoxColumn5.HeaderText = "Series";
+			this.dataGridViewTextBoxColumn5.Name = "dataGridViewTextBoxColumn5";
+			this.dataGridViewTextBoxColumn5.ReadOnly = true;
+			// 
+			// dataGridViewTextBoxColumn6
+			// 
+			this.dataGridViewTextBoxColumn6.DataPropertyName = "Description";
+			this.dataGridViewTextBoxColumn6.HeaderText = "Description";
+			this.dataGridViewTextBoxColumn6.Name = "dataGridViewTextBoxColumn6";
+			this.dataGridViewTextBoxColumn6.ReadOnly = true;
+			// 
+			// dataGridViewTextBoxColumn7
+			// 
+			this.dataGridViewTextBoxColumn7.DataPropertyName = "Category";
+			this.dataGridViewTextBoxColumn7.HeaderText = "Category";
+			this.dataGridViewTextBoxColumn7.Name = "dataGridViewTextBoxColumn7";
+			this.dataGridViewTextBoxColumn7.ReadOnly = true;
+			// 
+			// dataGridViewTextBoxColumn8
+			// 
+			this.dataGridViewTextBoxColumn8.DataPropertyName = "Product_Rating";
+			this.dataGridViewTextBoxColumn8.HeaderText = "Product_Rating";
+			this.dataGridViewTextBoxColumn8.Name = "dataGridViewTextBoxColumn8";
+			this.dataGridViewTextBoxColumn8.ReadOnly = true;
+			// 
+			// dataGridViewTextBoxColumn9
+			// 
+			this.dataGridViewTextBoxColumn9.DataPropertyName = "Purchase_Date";
+			this.dataGridViewTextBoxColumn9.HeaderText = "Purchase_Date";
+			this.dataGridViewTextBoxColumn9.Name = "dataGridViewTextBoxColumn9";
+			this.dataGridViewTextBoxColumn9.ReadOnly = true;
+			// 
+			// dataGridViewTextBoxColumn10
+			// 
+			this.dataGridViewTextBoxColumn10.DataPropertyName = "My_Rating";
+			this.dataGridViewTextBoxColumn10.HeaderText = "My_Rating";
+			this.dataGridViewTextBoxColumn10.Name = "dataGridViewTextBoxColumn10";
+			this.dataGridViewTextBoxColumn10.ReadOnly = true;
+			// 
+			// dataGridViewTextBoxColumn11
+			// 
+			this.dataGridViewTextBoxColumn11.DataPropertyName = "Misc";
+			this.dataGridViewTextBoxColumn11.HeaderText = "Misc";
+			this.dataGridViewTextBoxColumn11.Name = "dataGridViewTextBoxColumn11";
+			this.dataGridViewTextBoxColumn11.ReadOnly = true;
+			// 
+			// ProductsGrid
+			// 
+			this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+			this.Controls.Add(this.gridEntryDataGridView);
+			this.Name = "ProductsGrid";
+			this.Size = new System.Drawing.Size(434, 329);
+			((System.ComponentModel.ISupportInitialize)(this.gridEntryBindingSource)).EndInit();
+			((System.ComponentModel.ISupportInitialize)(this.gridEntryDataGridView)).EndInit();
+			this.ResumeLayout(false);
 
-        }
+		}
 
-        #endregion
+		#endregion
 
-        private System.Windows.Forms.BindingSource gridEntryBindingSource;
-        private System.Windows.Forms.DataGridView gridEntryDataGridView;
-        private System.Windows.Forms.DataGridViewImageColumn dataGridViewImageColumn1;
-        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn1;
-        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn2;
-        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn3;
-        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn4;
-        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn5;
-        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn6;
-        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn7;
-        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn8;
-        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn9;
-        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn10;
-        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn11;
-        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn12;
-    }
+		private System.Windows.Forms.BindingSource gridEntryBindingSource;
+		private System.Windows.Forms.DataGridView gridEntryDataGridView;
+		private System.Windows.Forms.DataGridViewImageColumn dataGridViewImageColumn1;
+		private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn1;
+		private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn2;
+		private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn3;
+		private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn4;
+		private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn5;
+		private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn6;
+		private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn7;
+		private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn8;
+		private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn9;
+		private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn10;
+		private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn11;
+	}
 }

LibationWinForm/UNTESTED/ProductsGrid.cs

@@ -25,30 +25,32 @@ namespace LibationWinForm
     // - click on Data Sources > ProductItem. drowdown: DataGridView
     // - drag/drop ProductItem on design surface
     public partial class ProductsGrid : UserControl
-	{
-		public event EventHandler<int> VisibleCountChanged;
+    {
+        public event EventHandler<int> VisibleCountChanged;
+        public event EventHandler BackupCountsChanged;
+
+        private const string EDIT_TAGS = "Edit Tags";
+        private const string LIBERATE = "Liberate";
+
+        // alias
+        private DataGridView dataGridView => gridEntryDataGridView;
 
-		private DataGridView dataGridView;
 		private LibationContext context;
 
 		public ProductsGrid()
 		{
 			InitializeComponent();
-
+            formatDataGridView();
+            addLiberateButtons();
+            addEditTagsButtons();
+            formatColumns();
 			Disposed += (_, __) => context?.Dispose();
 
 			manageLiveImageUpdateSubscriptions();
 		}
 
-		private bool hasBeenDisplayed = false;
-        public void Display()
+        private void formatDataGridView()
         {
-            if (hasBeenDisplayed)
-                return;
-            hasBeenDisplayed = true;
-
-            dataGridView = gridEntryDataGridView;
-
             dataGridView.Dock = DockStyle.Fill;
             dataGridView.AllowUserToAddRows = false;
             dataGridView.AllowUserToDeleteRows = false;
@@ -57,26 +59,179 @@ namespace LibationWinForm
             dataGridView.DefaultCellStyle.WrapMode = DataGridViewTriState.True;
             dataGridView.ReadOnly = true;
             dataGridView.RowHeadersVisible = false;
+
             // adjust height for 80x80 pictures.
             // this must be done before databinding. or can alter later by iterating through rows
             dataGridView.RowTemplate.Height = 82;
             dataGridView.CellFormatting += replaceFormatted;
             dataGridView.CellFormatting += hiddenFormatting;
+
             // sorting breaks filters. must reapply filters after sorting
             dataGridView.Sorted += (_, __) => filter();
+        }
 
-            { // add tag buttons
-                var editUserTagsButton = new DataGridViewButtonColumn { HeaderText = "Edit Tags" };
-                dataGridView.Columns.Add(editUserTagsButton);
+        #region format text cells. ie: not buttons
+        private void replaceFormatted(object sender, DataGridViewCellFormattingEventArgs e)
+        {
+            var col = ((DataGridView)sender).Columns[e.ColumnIndex];
+            if (col is DataGridViewTextBoxColumn textCol && GetGridEntry(e.RowIndex).TryDisplayValue(textCol.Name, out string value))
+                e.Value = value;
+        }
 
-                // add image and handle click
-                dataGridView.CellPainting += paintEditTag_TextAndImage;
-                dataGridView.CellContentClick += dataGridView_GridButtonClick;
+        private void hiddenFormatting(object sender, DataGridViewCellFormattingEventArgs e)
+        {
+            var dgv = (DataGridView)sender;
+            // no action needed for buttons
+            if (e.RowIndex < 0 || dgv.Columns[e.ColumnIndex] is DataGridViewButtonColumn)
+                return;
+
+            var isHidden = GetGridEntry(e.RowIndex).TagsEnumerated.Contains("hidden");
+
+            dgv.Rows[e.RowIndex].Cells[e.ColumnIndex].Style
+                = isHidden
+                ? new DataGridViewCellStyle { ForeColor = Color.LightGray }
+                : dgv.DefaultCellStyle;
+        }
+        #endregion
+
+        #region liberation buttons
+        private void addLiberateButtons()
+        {
+            dataGridView.Columns.Insert(0, new DataGridViewButtonColumn { HeaderText = LIBERATE });
+
+            dataGridView.CellPainting += liberate_Paint;
+            dataGridView.CellContentClick += liberate_Click;
+        }
+
+        private void liberate_Paint(object sender, DataGridViewCellPaintingEventArgs e)
+        {
+            var dgv = (DataGridView)sender;
+
+            if (!isColumnValid(dgv, e.RowIndex, e.ColumnIndex, LIBERATE))
+                return;
+
+            dgv.Rows[e.RowIndex].Cells[e.ColumnIndex].Value = GetGridEntry(e.RowIndex).Download_Status;
+        }
+
+        private async void liberate_Click(object sender, DataGridViewCellEventArgs e)
+        {
+            var dgv = (DataGridView)sender;
+
+            if (!isColumnValid(dgv, e.RowIndex, e.ColumnIndex, LIBERATE))
+                return;
+            
+            var productId = GetGridEntry(e.RowIndex).GetBook().AudibleProductId;
+
+            // if liberated, open explorer to file
+            if (FileManager.AudibleFileStorage.Audio.Exists(productId))
+            {
+                var filePath = FileManager.AudibleFileStorage.Audio.GetPath(productId);
+                System.Diagnostics.Process.Start("explorer.exe", $"/select, \"{filePath}\"");
             }
+            // else liberate
+            else
+            {
+                var backupBook = BookLiberation.ProcessorAutomationController.GetWiredUpBackupBook((_, __) => RefreshRow(productId));
+                await BookLiberation.ProcessorAutomationController.RunSingleBackupAsync(backupBook, productId);
+            }
+        }
+        #endregion
 
+        public void RefreshRow(string productId)
+        {
+            var rowId = GetRowId((ge) => ge.GetBook().AudibleProductId == productId);
+
+            // update cells incl Liberate button text
+            dataGridView.InvalidateRow(rowId);
+
+            BackupCountsChanged?.Invoke(this, EventArgs.Empty);
+        }
+
+        #region tag buttons
+        private void addEditTagsButtons()
+        {
+            dataGridView.Columns.Add(new DataGridViewButtonColumn { HeaderText = EDIT_TAGS });
+
+            dataGridView.CellPainting += editTags_Paint;
+            dataGridView.CellContentClick += editTags_Click;
+        }
+
+        private void editTags_Paint(object sender, DataGridViewCellPaintingEventArgs e)
+        {
+            // DataGridView Image for Button Column: https://stackoverflow.com/a/36253883
+
+            var dgv = (DataGridView)sender;
+
+            if (!isColumnValid(dgv, e.RowIndex, e.ColumnIndex, EDIT_TAGS))
+                return;
+
+            var displayTags = GetGridEntry(e.RowIndex).TagsEnumerated.ToList();
+
+            var cell = dgv.Rows[e.RowIndex].Cells[e.ColumnIndex];
+
+            if (displayTags.Any())
+                cell.Value = string.Join("\r\n", displayTags);
+            else // no tags: use image
+            {
+                // clear tag text
+                cell.Value = "";
+
+                var image = Properties.Resources.edit_tags_25x25;
+
+                e.Paint(e.CellBounds, DataGridViewPaintParts.All);
+
+                var w = image.Width;
+                var h = image.Height;
+                var x = e.CellBounds.Left + (e.CellBounds.Width - w) / 2;
+                var y = e.CellBounds.Top + (e.CellBounds.Height - h) / 2;
+
+                e.Graphics.DrawImage(image, new Rectangle(x, y, w, h));
+                e.Handled = true;
+            }
+        }
+
+        private void editTags_Click(object sender, DataGridViewCellEventArgs e)
+        {
+            // handle grid button click: https://stackoverflow.com/a/13687844
+
+            var dgv = (DataGridView)sender;
+
+            if (!isColumnValid(dgv, e.RowIndex, e.ColumnIndex, EDIT_TAGS))
+                return;
+
+            var liveGridEntry = GetGridEntry(e.RowIndex);
+
+            // EditTagsDialog should display better-formatted title
+            liveGridEntry.TryDisplayValue(nameof(liveGridEntry.Title), out string value);
+
+            var editTagsForm = new EditTagsDialog(value, liveGridEntry.Tags);
+            if (editTagsForm.ShowDialog() != DialogResult.OK)
+                return;
+
+			var qtyChanges = context.UpdateTags(liveGridEntry.GetBook(), editTagsForm.NewTags);
+			if (qtyChanges == 0)
+                return;
+
+            // force a re-draw, and re-apply filters
+
+            // needed to update text colors
+            dgv.InvalidateRow(e.RowIndex);
+
+            filter();
+        }
+        #endregion
+
+        private static bool isColumnValid(DataGridView dgv, int rowIndex, int colIndex, string colName)
+        {
+            var col = dgv.Columns[colIndex];
+            return rowIndex >= 0 && col.HeaderText == colName && col is DataGridViewButtonColumn;
+        }
+
+        private void formatColumns()
+        {
             for (var i = dataGridView.ColumnCount - 1; i >= 0; i--)
             {
-                DataGridViewColumn col = dataGridView.Columns[i];
+                var col = dataGridView.Columns[i];
 
                 // initial HeaderText is the lookup name from GridEntry class. any formatting below won't change this
                 col.Name = col.HeaderText;
@@ -86,35 +241,59 @@ namespace LibationWinForm
 
                 col.HeaderText = col.HeaderText.Replace("_", " ");
 
-				col.Width = col.Name switch
-				{
-					nameof(GridEntry.Cover) => 80,
-					nameof(GridEntry.Title) => col.Width * 2,
-					nameof(GridEntry.Misc) => (int)(col.Width * 1.35),
-					var n when n.In(nameof(GridEntry.My_Rating), nameof(GridEntry.Product_Rating)) => col.Width + 8,
-					_ => col.Width
-				};
+                col.Width = col.Name switch
+                {
+                    nameof(GridEntry.Cover) => 80,
+                    nameof(GridEntry.Title) => col.Width * 2,
+                    nameof(GridEntry.Misc) => (int)(col.Width * 1.35),
+                    var n when n.In(nameof(GridEntry.My_Rating), nameof(GridEntry.Product_Rating)) => col.Width + 8,
+                    _ => col.Width
+                };
+            }
+        }
+
+		#region live update newly downloaded and cached images
+		private void manageLiveImageUpdateSubscriptions()
+		{
+			FileManager.PictureStorage.PictureCached += crossThreadImageUpdate;
+			Disposed += (_, __) => FileManager.PictureStorage.PictureCached -= crossThreadImageUpdate;
+		}
+
+		private void crossThreadImageUpdate(object _, string pictureId)
+			=> dataGridView.UIThread(() => updateRowImage(pictureId));
+		private void updateRowImage(string pictureId)
+		{
+			var rowId = GetRowId((ge) => ge.GetBook().PictureId == pictureId);
+			if (rowId > -1)
+				dataGridView.InvalidateRow(rowId);
+		}
+		#endregion
+
+		private bool hasBeenDisplayed = false;
+        public void Display()
+        {
+            if (hasBeenDisplayed)
+                return;
+            hasBeenDisplayed = true;
+
+            //
+            // transform into sorted GridEntry.s BEFORE binding
+            //
+            context = LibationContext.Create();
+            var lib = context.GetLibrary_Flat_WithTracking();
+
+            // if no data. hide all columns. return
+            if (!lib.Any())
+            {
+                for (var i = dataGridView.ColumnCount - 1; i >= 0; i--)
+                    dataGridView.Columns.RemoveAt(i);
+                return;
             }
 
-
-			//
-			// transform into sorted GridEntry.s BEFORE binding
-			//
-			context = LibationContext.Create();
-			var lib = context.GetLibrary_Flat_WithTracking();
-
-			// if no data. hide all columns. return
-			if (!lib.Any())
-			{
-				for (var i = dataGridView.ColumnCount - 1; i >= 0; i--)
-					dataGridView.Columns.RemoveAt(i);
-				return;
-			}
-
-			var orderedGridEntries = lib
+            var orderedGridEntries = lib
                 .Select(lb => new GridEntry(lb)).ToList()
-				// default load order
-				.OrderByDescending(ge => ge.Purchase_Date)
+                // default load order
+                .OrderByDescending(ge => ge.Purchase_Date)
                 //// more advanced example: sort by author, then series, then title
                 //.OrderBy(ge => ge.Authors)
                 //    .ThenBy(ge => ge.Series)
@@ -130,92 +309,10 @@ namespace LibationWinForm
             // FILTER
             //
             filter();
+
+            BackupCountsChanged?.Invoke(this, EventArgs.Empty);
         }
 
-        private void paintEditTag_TextAndImage(object sender, DataGridViewCellPaintingEventArgs e)
-        {
-            // DataGridView Image for Button Column: https://stackoverflow.com/a/36253883
-
-            if (e.RowIndex < 0 || !(((DataGridView)sender).Columns[e.ColumnIndex] is DataGridViewButtonColumn))
-                return;
-
-
-            var gridEntry = getGridEntry(e.RowIndex);
-            var displayTags = gridEntry.TagsEnumerated.ToList();
-
-            if (displayTags.Any())
-                dataGridView.Rows[e.RowIndex].Cells[e.ColumnIndex].Value = string.Join("\r\n", displayTags);
-            else // no tags: use image
-            {
-                // clear tag text
-                dataGridView.Rows[e.RowIndex].Cells[e.ColumnIndex].Value = "";
-
-                // images from: icons8.com -- search: tags
-                var image = Properties.Resources.edit_tags_25x25;
-
-                e.Paint(e.CellBounds, DataGridViewPaintParts.All);
-
-                var w = image.Width;
-                var h = image.Height;
-                var x = e.CellBounds.Left + (e.CellBounds.Width - w) / 2;
-                var y = e.CellBounds.Top + (e.CellBounds.Height - h) / 2;
-
-                e.Graphics.DrawImage(image, new Rectangle(x, y, w, h));
-                e.Handled = true;
-            }
-        }
-
-        private void dataGridView_GridButtonClick(object sender, DataGridViewCellEventArgs e)
-        {
-            // handle grid button click: https://stackoverflow.com/a/13687844
-
-            if (e.RowIndex < 0)
-                return;
-            if (sender != dataGridView)
-                throw new Exception($"{nameof(dataGridView_GridButtonClick)} has incorrect sender ...somehow");
-            if (!(dataGridView.Columns[e.ColumnIndex] is DataGridViewButtonColumn))
-                return;
-
-            var liveGridEntry = getGridEntry(e.RowIndex);
-
-            // EditTagsDialog should display better-formatted title
-            liveGridEntry.TryGetFormatted(nameof(liveGridEntry.Title), out string value);
-
-            var editTagsForm = new EditTagsDialog(value, liveGridEntry.Tags);
-            if (editTagsForm.ShowDialog() != DialogResult.OK)
-                return;
-
-			var qtyChanges = context.UpdateTags(liveGridEntry.GetBook(), editTagsForm.NewTags);
-			if (qtyChanges == 0)
-                return;
-
-            // force a re-draw, and re-apply filters
-
-            // needed to update text colors
-            dataGridView.InvalidateRow(e.RowIndex);
-
-            filter();
-        }
-
-        #region Cell Formatting
-        private void replaceFormatted(object sender, DataGridViewCellFormattingEventArgs e)
-        {
-            var col = ((DataGridView)sender).Columns[e.ColumnIndex];
-            if (col is DataGridViewTextBoxColumn textCol && getGridEntry(e.RowIndex).TryGetFormatted(textCol.Name, out string value))
-                e.Value = value;
-        }
-
-        private void hiddenFormatting(object sender, DataGridViewCellFormattingEventArgs e)
-        {
-            var isHidden = getGridEntry(e.RowIndex).TagsEnumerated.Contains("hidden");
-
-            dataGridView.Rows[e.RowIndex].Cells[e.ColumnIndex].Style
-                = isHidden
-                ? new DataGridViewCellStyle { ForeColor = Color.LightGray }
-                : dataGridView.DefaultCellStyle;
-        }
-        #endregion
-
         #region filter
         string _filterSearchString;
         private void filter() => Filter(_filterSearchString);
@@ -234,41 +331,17 @@ namespace LibationWinForm
             currencyManager.SuspendBinding();
             {
                 for (var r = dataGridView.RowCount - 1; r >= 0; r--)
-                    dataGridView.Rows[r].Visible = productIds.Contains(getGridEntry(r).GetBook().AudibleProductId);
+                    dataGridView.Rows[r].Visible = productIds.Contains(GetGridEntry(r).GetBook().AudibleProductId);
             }
             currencyManager.ResumeBinding();
 			VisibleCountChanged?.Invoke(this, dataGridView.AsEnumerable().Count(r => r.Visible));
 
 			var luceneSearchString_debug = searchResults.SearchString;
         }
-		#endregion
+        #endregion
 
-		#region live update newly downloaded and cached images
-		private void manageLiveImageUpdateSubscriptions()
-		{
-			FileManager.PictureStorage.PictureCached += crossThreadImageUpdate;
-			Disposed += (_, __) => FileManager.PictureStorage.PictureCached -= crossThreadImageUpdate;
-		}
+        private int GetRowId(Func<GridEntry, bool> func) => dataGridView.GetRowIdOfBoundItem(func);
 
-		private void crossThreadImageUpdate(object _, string pictureId)
-			=> dataGridView.UIThread(() => updateRowImage(pictureId));
-		private void updateRowImage(string pictureId)
-		{
-			var rowId = getRowId((ge) => ge.GetBook().PictureId == pictureId);
-			if (rowId > -1)
-				dataGridView.InvalidateRow(rowId);
-		}
-		#endregion
-
-		private GridEntry getGridEntry(int rowIndex) => (GridEntry)dataGridView.Rows[rowIndex].DataBoundItem;
-
-		private int getRowId(Func<GridEntry, bool> func)
-		{
-			for (var r = 0; r < dataGridView.RowCount; r++)
-				if (func(getGridEntry(r)))
-					return r;
-
-			return -1;
-		}
+        private GridEntry GetGridEntry(int rowIndex) => dataGridView.GetBoundItem<GridEntry>(rowIndex);
 	}
 }

REFERENCE.txt

@@ -1,6 +1,9 @@
 -- begin VERSIONING ---------------------------------------------------------------------------------------------------------------------
 https://github.com/rmcrackan/Libation/releases
 
+v3.1-beta.10 : New feature: clicking Liberate button on a liberated item navigates to that audio file
+v3.1-beta.9 : New feature: liberate individual book
+v3.1-beta.8 : Bugfix: decrypt file conflict
 v3.1-beta.7 : Bugfix: decrypt book with no author
 v3.1-beta.6 : Improved logging
 v3.1-beta.5 : Improved importing
@@ -39,6 +42,12 @@ publish win64 platform, single-file
   dotnet publish -r win-x64 -c Release /p:PublishSingleFile=true
 -- end HOW TO PUBLISH ---------------------------------------------------------------------------------------------------------------------
 
+-- begin IMAGES ---------------------------------------------------------------------------------------------------------------------
+edit tags icon images from:
+  icons8.com
+  search: tags
+-- end IMAGES ---------------------------------------------------------------------------------------------------------------------
+
 -- begin AUDIBLE DETAILS ---------------------------------------------------------------------------------------------------------------------
 alternate book id (eg BK_RAND_006061) is called 'sku' , 'sku_lite' , 'prod_id' , 'product_id' in different parts of the site
 -- end AUDIBLE DETAILS ---------------------------------------------------------------------------------------------------------------------

WinFormsDesigner/Dialogs/IndexLibraryDialog.Designer.cs

@@ -1,4 +1,4 @@
-namespace LibationWinForm_Framework.Dialogs
+namespace WinFormsDesigner.Dialogs
 {
 	partial class IndexLibraryDialog
 	{

WinFormsDesigner/Dialogs/IndexLibraryDialog.cs

@@ -8,7 +8,7 @@ using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Forms;
 
-namespace LibationWinForm_Framework.Dialogs
+namespace WinFormsDesigner.Dialogs
 {
 	public partial class IndexLibraryDialog : Form
 	{

WinFormsDesigner/Dialogs/Login/AudibleLoginDialog.Designer.cs

@@ -1,4 +1,4 @@
-namespace LibationWinForm_Framework.Dialogs.Login
+namespace WinFormsDesigner.Dialogs.Login
 {
 	partial class AudibleLoginDialog
 	{

WinFormsDesigner/Dialogs/Login/AudibleLoginDialog.cs

@@ -8,7 +8,7 @@ using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Forms;
 
-namespace LibationWinForm_Framework.Dialogs.Login
+namespace WinFormsDesigner.Dialogs.Login
 {
 	public partial class AudibleLoginDialog : Form
 	{

WinFormsDesigner/Dialogs/Login/CaptchaDialog.Designer.cs

@@ -1,4 +1,4 @@
-namespace LibationWinForm_Framework.Dialogs.Login
+namespace WinFormsDesigner.Dialogs.Login
 {
 	partial class CaptchaDialog
 	{

WinFormsDesigner/Dialogs/Login/CaptchaDialog.cs

@@ -8,7 +8,7 @@ using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Forms;
 
-namespace LibationWinForm_Framework.Dialogs.Login
+namespace WinFormsDesigner.Dialogs.Login
 {
 	public partial class CaptchaDialog : Form
 	{

WinFormsDesigner/GridEntry.cs

@@ -12,6 +12,9 @@ namespace WinFormsDesigner
         [Browsable(false)]
         public IEnumerable<string> TagsEnumerated { get; set; }
 
+		[Browsable(false)]
+		public string Download_Status { get; set; }
+
 		public Image Cover { get; set; }
 		public string Title { get; set; }
 		public string Authors { get; set; }
@@ -24,6 +27,5 @@ namespace WinFormsDesigner
 		public DateTime? Purchase_Date { get; set; }
 		public string My_Rating { get; set; }
         public string Misc { get; set; }
-		public string Download_Status { get; set; }
 	}
 }

WinFormsDesigner/ProductsGrid.Designer.cs

@@ -28,35 +28,34 @@
         /// </summary>
         private void InitializeComponent()
         {
-            this.components = new System.ComponentModel.Container();
-            this.gridEntryBindingSource = new System.Windows.Forms.BindingSource(this.components);
-            this.gridEntryDataGridView = new System.Windows.Forms.DataGridView();
-            this.dataGridViewImageColumn1 = new System.Windows.Forms.DataGridViewImageColumn();
-            this.dataGridViewTextBoxColumn1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.dataGridViewTextBoxColumn2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.dataGridViewTextBoxColumn3 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.dataGridViewTextBoxColumn4 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.dataGridViewTextBoxColumn5 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.dataGridViewTextBoxColumn6 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.dataGridViewTextBoxColumn7 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.dataGridViewTextBoxColumn8 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.dataGridViewTextBoxColumn9 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.dataGridViewTextBoxColumn10 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.dataGridViewTextBoxColumn11 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.dataGridViewTextBoxColumn12 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            ((System.ComponentModel.ISupportInitialize)(this.gridEntryBindingSource)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.gridEntryDataGridView)).BeginInit();
-            this.SuspendLayout();
-            // 
-            // gridEntryBindingSource
-            // 
-            this.gridEntryBindingSource.DataSource = typeof(WinFormsDesigner.GridEntry);
-            // 
-            // gridEntryDataGridView
-            // 
-            this.gridEntryDataGridView.AutoGenerateColumns = false;
-            this.gridEntryDataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
-            this.gridEntryDataGridView.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
+			this.components = new System.ComponentModel.Container();
+			this.gridEntryBindingSource = new System.Windows.Forms.BindingSource(this.components);
+			this.gridEntryDataGridView = new System.Windows.Forms.DataGridView();
+			this.dataGridViewImageColumn1 = new System.Windows.Forms.DataGridViewImageColumn();
+			this.dataGridViewTextBoxColumn1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.dataGridViewTextBoxColumn2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.dataGridViewTextBoxColumn3 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.dataGridViewTextBoxColumn4 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.dataGridViewTextBoxColumn5 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.dataGridViewTextBoxColumn6 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.dataGridViewTextBoxColumn7 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.dataGridViewTextBoxColumn8 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.dataGridViewTextBoxColumn9 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.dataGridViewTextBoxColumn10 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.dataGridViewTextBoxColumn11 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			((System.ComponentModel.ISupportInitialize)(this.gridEntryBindingSource)).BeginInit();
+			((System.ComponentModel.ISupportInitialize)(this.gridEntryDataGridView)).BeginInit();
+			this.SuspendLayout();
+			// 
+			// gridEntryBindingSource
+			// 
+			this.gridEntryBindingSource.DataSource = typeof(WinFormsDesigner.GridEntry);
+			// 
+			// gridEntryDataGridView
+			// 
+			this.gridEntryDataGridView.AutoGenerateColumns = false;
+			this.gridEntryDataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+			this.gridEntryDataGridView.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
             this.dataGridViewImageColumn1,
             this.dataGridViewTextBoxColumn1,
             this.dataGridViewTextBoxColumn2,
@@ -68,134 +67,125 @@
             this.dataGridViewTextBoxColumn8,
             this.dataGridViewTextBoxColumn9,
             this.dataGridViewTextBoxColumn10,
-            this.dataGridViewTextBoxColumn11,
-            this.dataGridViewTextBoxColumn12});
-            this.gridEntryDataGridView.DataSource = this.gridEntryBindingSource;
-            this.gridEntryDataGridView.Location = new System.Drawing.Point(54, 58);
-            this.gridEntryDataGridView.Name = "gridEntryDataGridView";
-            this.gridEntryDataGridView.Size = new System.Drawing.Size(300, 220);
-            this.gridEntryDataGridView.TabIndex = 0;
-            // 
-            // dataGridViewImageColumn1
-            // 
-            this.dataGridViewImageColumn1.DataPropertyName = "Cover";
-            this.dataGridViewImageColumn1.HeaderText = "Cover";
-            this.dataGridViewImageColumn1.Name = "dataGridViewImageColumn1";
-            this.dataGridViewImageColumn1.ReadOnly = true;
-            // 
-            // dataGridViewTextBoxColumn1
-            // 
-            this.dataGridViewTextBoxColumn1.DataPropertyName = "Title";
-            this.dataGridViewTextBoxColumn1.HeaderText = "Title";
-            this.dataGridViewTextBoxColumn1.Name = "dataGridViewTextBoxColumn1";
-            this.dataGridViewTextBoxColumn1.ReadOnly = true;
-            // 
-            // dataGridViewTextBoxColumn2
-            // 
-            this.dataGridViewTextBoxColumn2.DataPropertyName = "Authors";
-            this.dataGridViewTextBoxColumn2.HeaderText = "Authors";
-            this.dataGridViewTextBoxColumn2.Name = "dataGridViewTextBoxColumn2";
-            this.dataGridViewTextBoxColumn2.ReadOnly = true;
-            // 
-            // dataGridViewTextBoxColumn3
-            // 
-            this.dataGridViewTextBoxColumn3.DataPropertyName = "Narrators";
-            this.dataGridViewTextBoxColumn3.HeaderText = "Narrators";
-            this.dataGridViewTextBoxColumn3.Name = "dataGridViewTextBoxColumn3";
-            this.dataGridViewTextBoxColumn3.ReadOnly = true;
-            // 
-            // dataGridViewTextBoxColumn4
-            // 
-            this.dataGridViewTextBoxColumn4.DataPropertyName = "Length";
-            this.dataGridViewTextBoxColumn4.HeaderText = "Length";
-            this.dataGridViewTextBoxColumn4.Name = "dataGridViewTextBoxColumn4";
-            this.dataGridViewTextBoxColumn4.ReadOnly = true;
-            // 
-            // dataGridViewTextBoxColumn5
-            // 
-            this.dataGridViewTextBoxColumn5.DataPropertyName = "Series";
-            this.dataGridViewTextBoxColumn5.HeaderText = "Series";
-            this.dataGridViewTextBoxColumn5.Name = "dataGridViewTextBoxColumn5";
-            this.dataGridViewTextBoxColumn5.ReadOnly = true;
-            // 
-            // dataGridViewTextBoxColumn6
-            // 
-            this.dataGridViewTextBoxColumn6.DataPropertyName = "Description";
-            this.dataGridViewTextBoxColumn6.HeaderText = "Description";
-            this.dataGridViewTextBoxColumn6.Name = "dataGridViewTextBoxColumn6";
-            this.dataGridViewTextBoxColumn6.ReadOnly = true;
-            // 
-            // dataGridViewTextBoxColumn7
-            // 
-            this.dataGridViewTextBoxColumn7.DataPropertyName = "Category";
-            this.dataGridViewTextBoxColumn7.HeaderText = "Category";
-            this.dataGridViewTextBoxColumn7.Name = "dataGridViewTextBoxColumn7";
-            this.dataGridViewTextBoxColumn7.ReadOnly = true;
-            // 
-            // dataGridViewTextBoxColumn8
-            // 
-            this.dataGridViewTextBoxColumn8.DataPropertyName = "Product_Rating";
-            this.dataGridViewTextBoxColumn8.HeaderText = "Product_Rating";
-            this.dataGridViewTextBoxColumn8.Name = "dataGridViewTextBoxColumn8";
-            this.dataGridViewTextBoxColumn8.ReadOnly = true;
-            // 
-            // dataGridViewTextBoxColumn9
-            // 
-            this.dataGridViewTextBoxColumn9.DataPropertyName = "Purchase_Date";
-            this.dataGridViewTextBoxColumn9.HeaderText = "Purchase_Date";
-            this.dataGridViewTextBoxColumn9.Name = "dataGridViewTextBoxColumn9";
-            this.dataGridViewTextBoxColumn9.ReadOnly = true;
-            // 
-            // dataGridViewTextBoxColumn10
-            // 
-            this.dataGridViewTextBoxColumn10.DataPropertyName = "My_Rating";
-            this.dataGridViewTextBoxColumn10.HeaderText = "My_Rating";
-            this.dataGridViewTextBoxColumn10.Name = "dataGridViewTextBoxColumn10";
-            this.dataGridViewTextBoxColumn10.ReadOnly = true;
-            // 
-            // dataGridViewTextBoxColumn11
-            // 
-            this.dataGridViewTextBoxColumn11.DataPropertyName = "Misc";
-            this.dataGridViewTextBoxColumn11.HeaderText = "Misc";
-            this.dataGridViewTextBoxColumn11.Name = "dataGridViewTextBoxColumn11";
-            this.dataGridViewTextBoxColumn11.ReadOnly = true;
-            // 
-            // dataGridViewTextBoxColumn12
-            // 
-            this.dataGridViewTextBoxColumn12.DataPropertyName = "Download_Status";
-            this.dataGridViewTextBoxColumn12.HeaderText = "Download_Status";
-            this.dataGridViewTextBoxColumn12.Name = "dataGridViewTextBoxColumn12";
-            this.dataGridViewTextBoxColumn12.ReadOnly = true;
-            // 
-            // ProductsGrid
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.Controls.Add(this.gridEntryDataGridView);
-            this.Name = "ProductsGrid";
-            this.Size = new System.Drawing.Size(434, 329);
-            ((System.ComponentModel.ISupportInitialize)(this.gridEntryBindingSource)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.gridEntryDataGridView)).EndInit();
-            this.ResumeLayout(false);
+            this.dataGridViewTextBoxColumn11});
+			this.gridEntryDataGridView.DataSource = this.gridEntryBindingSource;
+			this.gridEntryDataGridView.Location = new System.Drawing.Point(54, 58);
+			this.gridEntryDataGridView.Name = "gridEntryDataGridView";
+			this.gridEntryDataGridView.Size = new System.Drawing.Size(300, 220);
+			this.gridEntryDataGridView.TabIndex = 0;
+			// 
+			// dataGridViewImageColumn1
+			// 
+			this.dataGridViewImageColumn1.DataPropertyName = "Cover";
+			this.dataGridViewImageColumn1.HeaderText = "Cover";
+			this.dataGridViewImageColumn1.Name = "dataGridViewImageColumn1";
+			this.dataGridViewImageColumn1.ReadOnly = true;
+			// 
+			// dataGridViewTextBoxColumn1
+			// 
+			this.dataGridViewTextBoxColumn1.DataPropertyName = "Title";
+			this.dataGridViewTextBoxColumn1.HeaderText = "Title";
+			this.dataGridViewTextBoxColumn1.Name = "dataGridViewTextBoxColumn1";
+			this.dataGridViewTextBoxColumn1.ReadOnly = true;
+			// 
+			// dataGridViewTextBoxColumn2
+			// 
+			this.dataGridViewTextBoxColumn2.DataPropertyName = "Authors";
+			this.dataGridViewTextBoxColumn2.HeaderText = "Authors";
+			this.dataGridViewTextBoxColumn2.Name = "dataGridViewTextBoxColumn2";
+			this.dataGridViewTextBoxColumn2.ReadOnly = true;
+			// 
+			// dataGridViewTextBoxColumn3
+			// 
+			this.dataGridViewTextBoxColumn3.DataPropertyName = "Narrators";
+			this.dataGridViewTextBoxColumn3.HeaderText = "Narrators";
+			this.dataGridViewTextBoxColumn3.Name = "dataGridViewTextBoxColumn3";
+			this.dataGridViewTextBoxColumn3.ReadOnly = true;
+			// 
+			// dataGridViewTextBoxColumn4
+			// 
+			this.dataGridViewTextBoxColumn4.DataPropertyName = "Length";
+			this.dataGridViewTextBoxColumn4.HeaderText = "Length";
+			this.dataGridViewTextBoxColumn4.Name = "dataGridViewTextBoxColumn4";
+			this.dataGridViewTextBoxColumn4.ReadOnly = true;
+			// 
+			// dataGridViewTextBoxColumn5
+			// 
+			this.dataGridViewTextBoxColumn5.DataPropertyName = "Series";
+			this.dataGridViewTextBoxColumn5.HeaderText = "Series";
+			this.dataGridViewTextBoxColumn5.Name = "dataGridViewTextBoxColumn5";
+			this.dataGridViewTextBoxColumn5.ReadOnly = true;
+			// 
+			// dataGridViewTextBoxColumn6
+			// 
+			this.dataGridViewTextBoxColumn6.DataPropertyName = "Description";
+			this.dataGridViewTextBoxColumn6.HeaderText = "Description";
+			this.dataGridViewTextBoxColumn6.Name = "dataGridViewTextBoxColumn6";
+			this.dataGridViewTextBoxColumn6.ReadOnly = true;
+			// 
+			// dataGridViewTextBoxColumn7
+			// 
+			this.dataGridViewTextBoxColumn7.DataPropertyName = "Category";
+			this.dataGridViewTextBoxColumn7.HeaderText = "Category";
+			this.dataGridViewTextBoxColumn7.Name = "dataGridViewTextBoxColumn7";
+			this.dataGridViewTextBoxColumn7.ReadOnly = true;
+			// 
+			// dataGridViewTextBoxColumn8
+			// 
+			this.dataGridViewTextBoxColumn8.DataPropertyName = "Product_Rating";
+			this.dataGridViewTextBoxColumn8.HeaderText = "Product_Rating";
+			this.dataGridViewTextBoxColumn8.Name = "dataGridViewTextBoxColumn8";
+			this.dataGridViewTextBoxColumn8.ReadOnly = true;
+			// 
+			// dataGridViewTextBoxColumn9
+			// 
+			this.dataGridViewTextBoxColumn9.DataPropertyName = "Purchase_Date";
+			this.dataGridViewTextBoxColumn9.HeaderText = "Purchase_Date";
+			this.dataGridViewTextBoxColumn9.Name = "dataGridViewTextBoxColumn9";
+			this.dataGridViewTextBoxColumn9.ReadOnly = true;
+			// 
+			// dataGridViewTextBoxColumn10
+			// 
+			this.dataGridViewTextBoxColumn10.DataPropertyName = "My_Rating";
+			this.dataGridViewTextBoxColumn10.HeaderText = "My_Rating";
+			this.dataGridViewTextBoxColumn10.Name = "dataGridViewTextBoxColumn10";
+			this.dataGridViewTextBoxColumn10.ReadOnly = true;
+			// 
+			// dataGridViewTextBoxColumn11
+			// 
+			this.dataGridViewTextBoxColumn11.DataPropertyName = "Misc";
+			this.dataGridViewTextBoxColumn11.HeaderText = "Misc";
+			this.dataGridViewTextBoxColumn11.Name = "dataGridViewTextBoxColumn11";
+			this.dataGridViewTextBoxColumn11.ReadOnly = true;
+			// 
+			// ProductsGrid
+			// 
+			this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+			this.Controls.Add(this.gridEntryDataGridView);
+			this.Name = "ProductsGrid";
+			this.Size = new System.Drawing.Size(434, 329);
+			((System.ComponentModel.ISupportInitialize)(this.gridEntryBindingSource)).EndInit();
+			((System.ComponentModel.ISupportInitialize)(this.gridEntryDataGridView)).EndInit();
+			this.ResumeLayout(false);
 
         }
 
         #endregion
 
         private System.Windows.Forms.BindingSource gridEntryBindingSource;
-        private System.Windows.Forms.DataGridView gridEntryDataGridView;
-        private System.Windows.Forms.DataGridViewImageColumn dataGridViewImageColumn1;
-        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn1;
-        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn2;
-        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn3;
-        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn4;
-        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn5;
-        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn6;
-        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn7;
-        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn8;
-        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn9;
-        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn10;
-        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn11;
-        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn12;
-    }
+		private System.Windows.Forms.DataGridView gridEntryDataGridView;
+		private System.Windows.Forms.DataGridViewImageColumn dataGridViewImageColumn1;
+		private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn1;
+		private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn2;
+		private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn3;
+		private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn4;
+		private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn5;
+		private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn6;
+		private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn7;
+		private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn8;
+		private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn9;
+		private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn10;
+		private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn11;
+	}
 }

WinFormsDesigner/Properties/DataSources/WinFormsDesigner.GridEntry.datasource

@@ -6,5 +6,5 @@
     cause the file to be unrecognizable by the program.
 -->
 <GenericObjectDataSource DisplayName="GridEntry" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
-   <TypeInfo>LibationWinForm.ProductGrids.GridEntry, LibationWinForm, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
+   <TypeInfo>WinFormsDesigner.GridEntry, WinFormsDesigner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
 </GenericObjectDataSource>

WinFormsDesigner/WinFormsDesigner.csproj

@@ -166,7 +166,7 @@
     <EmbeddedResource Include="ProductsGrid.resx">
       <DependentUpon>ProductsGrid.cs</DependentUpon>
     </EmbeddedResource>
-    <None Include="Properties\DataSources\LibationWinForm_Framework.ProductGrids.GridEntry.datasource" />
+    <None Include="Properties\DataSources\WinFormsDesigner.GridEntry.datasource" />
   </ItemGroup>
   <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

WindowsDesktopUtilities/WindowsDesktopUtilities.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Library</OutputType>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <UseWindowsForms>true</UseWindowsForms>
     <ApplicationIcon />
     <StartupObject />

_Demos/ffmpeg decrypt/ffmpeg decrypt.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <RootNamespace>ffmpeg_decrypt</RootNamespace>
     <UseWindowsForms>true</UseWindowsForms>
   </PropertyGroup>

_Demos/inAudibleLite/Form1.cs

@@ -5,7 +5,9 @@ using System.Threading.Tasks;
 using System.Windows.Forms;
 using AaxDecrypter;
 using Dinah.Core.IO;
+using Dinah.Core.Logging;
 using Dinah.Core.Windows.Forms;
+using Serilog;
 
 namespace inAudibleLite
 {
@@ -23,18 +25,44 @@ namespace inAudibleLite
 			InitializeComponent();
 			this.btnConvert.Enabled = false;
 
-			initLogging();
+			initSerilog();
+			redirectWriteLine();
 		}
 
-		private void initLogging()
+		private static void initSerilog()
+		{
+			// default. for reference. output example:
+			// 2019-11-26 08:48:40.224 -05:00 [DBG] Begin Libation
+			var default_outputTemplate = "{Timestamp:yyyy-MM-dd HH:mm:ss.fff zzz} [{Level:u3}] {Message:lj}{NewLine}{Exception}";
+			// with class and method info. output example:
+			// 2019-11-26 08:48:40.224 -05:00 [DBG] (at LibationWinForm.Program.init()) Begin Libation
+			var code_outputTemplate = "{Timestamp:yyyy-MM-dd HH:mm:ss.fff zzz} [{Level:u3}] (at {Caller}) {Message:lj}{NewLine}{Exception}";
+
+
+			var logPath = Path.Combine(Path.GetTempPath(), "Log.log");
+
+			Log.Logger = new LoggerConfiguration()
+				.Enrich.WithCaller()
+				.MinimumLevel.Debug()
+				.WriteTo.File(logPath,
+					rollingInterval: RollingInterval.Month,
+					outputTemplate: code_outputTemplate)
+				.CreateLogger();
+
+			Log.Logger.Debug("Begin Libation");
+
+			// .Here() captures debug info via System.Runtime.CompilerServices attributes. Warning: expensive
+			//var withLineNumbers_outputTemplate = "[{Timestamp:HH:mm:ss} {Level}] {SourceContext}{NewLine}{Message}{NewLine}in method {MemberName} at {FilePath}:{LineNumber}{NewLine}{Exception}{NewLine}";
+			//Log.Logger.Here().Debug("Begin Libation. Debug with line numbers");
+		}
+
+		private void redirectWriteLine()
 		{
 			// redirect Console.WriteLine to console, log file, textbox
-			var origOut = Console.Out;
-			var controlWriter = new RichTextBoxTextWriter(this.rtbLog);
-			var tempPath = Path.GetTempPath();
-			var logger1 = new FileLogger(Path.Combine(tempPath, APP_NAME));
-			var logger2 = new FileLoggerTextWriter(logger1);
-			var multiLogger = new MultiTextWriter(origOut, controlWriter, logger2);
+			var multiLogger = new MultiTextWriter(
+				Console.Out,
+				new RichTextBoxTextWriter(this.rtbLog),
+				new SerilogTextWriter());
 			Console.SetOut(multiLogger);
 		}
 

_Demos/inAudibleLite/inAudibleLite.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <UseWindowsForms>true</UseWindowsForms>
   </PropertyGroup>