book liberation status Error:

* show system error icon in grid instead of stoplight
* list error count in bottom right #s
* SearchEngine bool: LiberatedError

AaxDecrypter/AaxDecrypter.csproj

@@ -4,9 +4,12 @@
     <TargetFramework>net5.0</TargetFramework>
   </PropertyGroup>
 
+  <ItemGroup>
+    <PackageReference Include="Dinah.Core" Version="1.0.5.1" />
+  </ItemGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\..\AAXClean\AAXClean.csproj" />
-    <ProjectReference Include="..\..\Dinah.Core\Dinah.Core\Dinah.Core.csproj" />
   </ItemGroup>
 
 </Project>

AaxDecrypter/AaxcDownloadConverter.cs

@@ -224,6 +224,8 @@ namespace AaxDecrypter
             isCanceled = true;
             aaxFile?.Cancel();
             aaxFile?.Dispose();
+            nfsPersister?.NetworkFileStream?.Close();
+            nfsPersister?.Dispose();
         }
     }
 }

AaxDecrypter/NetworkFileStream.cs

@@ -241,9 +241,12 @@ namespace AaxDecrypter
             } while (downloadPosition < ContentLength && !isCancelled);
 
             _writeFile.Close();
+            _networkStream.Close();
             WritePosition = downloadPosition;
             Update();
-            _networkStream.Close();
+
+            downloadedPiece.Set();
+            downloadEnded.Set();
 
             if (!isCancelled && WritePosition < ContentLength)
                 throw new WebException($"Downloaded size (0x{WritePosition:X10}) is less than {nameof(ContentLength)} (0x{ContentLength:X10}).");
@@ -251,7 +254,6 @@ namespace AaxDecrypter
             if (WritePosition > ContentLength)
                 throw new WebException($"Downloaded size (0x{WritePosition:X10}) is greater than {nameof(ContentLength)} (0x{ContentLength:X10}).");
 
-            downloadEnded.Set();
         }
 
         #endregion

ApplicationServices/ApplicationServices.csproj

@@ -6,14 +6,11 @@
 
   <ItemGroup>
     <PackageReference Include="CsvHelper" Version="27.1.1" />
-    <PackageReference Include="NPOI" Version="2.5.3" />
+    <PackageReference Include="NPOI" Version="2.5.4" />
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\audible api\AudibleApi\AudibleApiDTOs\AudibleApiDTOs.csproj" />
-    <ProjectReference Include="..\..\audible api\AudibleApi\AudibleApi\AudibleApi.csproj" />
     <ProjectReference Include="..\DtoImporterService\DtoImporterService.csproj" />
-    <ProjectReference Include="..\InternalUtilities\InternalUtilities.csproj" />
     <ProjectReference Include="..\LibationSearchEngine\LibationSearchEngine.csproj" />
   </ItemGroup>
 

ApplicationServices/LibraryCommands.cs

@@ -11,13 +11,6 @@ using Serilog;
 
 namespace ApplicationServices
 {
-	// subtly different from DataLayer.LiberatedStatus
-	// - DataLayer.LiberatedStatus: has no concept of partially downloaded
-	// - ApplicationServices.LiberatedState: has no concept of Error/skipped
-	public enum LiberatedState { NotDownloaded, PartialDownload, Liberated }
-
-	public enum PdfState { NoPdf, Downloaded, NotDownloaded }
-
 	public static class LibraryCommands
 	{
 		private static LibraryOptions.ResponseGroupOptions LibraryResponseGroups = LibraryOptions.ResponseGroupOptions.ALL_OPTIONS;
@@ -162,101 +155,42 @@ namespace ApplicationServices
 		#endregion
 
 		#region Update book details
-		public static int UpdateTags(Book book, string newTags)
+	
+		public static int UpdateUserDefinedItem(Book book)
 		{
 			try
 			{
 				using var context = DbContexts.GetContext();
 
-				var udi = book.UserDefinedItem;
-
-				if (udi.Tags == newTags)
-					return 0;
-
 				// Attach() NoTracking entities before SaveChanges()
-				udi.Tags = newTags;
-				context.Attach(udi).State = Microsoft.EntityFrameworkCore.EntityState.Modified;
-				var qtyChanges = context.SaveChanges();
-
-				if (qtyChanges > 0)
-					SearchEngineCommands.UpdateBookTags(book);
-
-				return qtyChanges;
-			}
-			catch (Exception ex)
-			{
-				Log.Logger.Error(ex, "Error updating tags");
-				throw;
-			}
-		}
-
-		public static int UpdateBook(LibraryBook libraryBook, LiberatedStatus liberatedStatus, string finalAudioPath)
-		{
-			try
-			{
-				using var context = DbContexts.GetContext();
-
-				var udi = libraryBook.Book.UserDefinedItem;
-
-				if (udi.BookStatus == liberatedStatus && udi.BookLocation == finalAudioPath)
-					return 0;
-
-				// Attach() NoTracking entities before SaveChanges()
-				udi.BookStatus = liberatedStatus;
-				udi.BookLocation = finalAudioPath;
-				context.Attach(udi).State = Microsoft.EntityFrameworkCore.EntityState.Modified;
+				context.Attach(book.UserDefinedItem).State = Microsoft.EntityFrameworkCore.EntityState.Modified;
 				var qtyChanges = context.SaveChanges();
 				if (qtyChanges > 0)
-					SearchEngineCommands.UpdateLiberatedStatus(libraryBook.Book);
+					SearchEngineCommands.UpdateLiberatedStatus(book);
 
 				return qtyChanges;
 			}
 			catch (Exception ex)
 			{
-				Log.Logger.Error(ex, "Error updating tags");
-				throw;
-			}
-		}
-
-		public static int UpdatePdf(LibraryBook libraryBook, LiberatedStatus liberatedStatus)
-		{
-			try
-			{
-				using var context = DbContexts.GetContext();
-
-				var udi = libraryBook.Book.UserDefinedItem;
-
-				if (udi.PdfStatus == liberatedStatus)
-					return 0;
-
-				// Attach() NoTracking entities before SaveChanges()
-				udi.PdfStatus = liberatedStatus;
-				context.Attach(udi).State = Microsoft.EntityFrameworkCore.EntityState.Modified;
-				var qtyChanges = context.SaveChanges();
-
-				return qtyChanges;
-			}
-			catch (Exception ex)
-			{
-				Log.Logger.Error(ex, "Error updating tags");
+				Log.Logger.Error(ex, $"Error updating {nameof(book.UserDefinedItem)}");
 				throw;
 			}
 		}
 		#endregion
 
+		public static LiberatedStatus Liberated_Status(Book book)
+			=> book.Audio_Exists ? LiberatedStatus.Liberated
+			: FileManager.AudibleFileStorage.AaxcExists(book.AudibleProductId) ? LiberatedStatus.PartialDownload
+			: LiberatedStatus.NotLiberated;
+
+		public static LiberatedStatus? Pdf_Status(Book book)
+			=> !book.HasPdf ? null
+			: book.PDF_Exists ? LiberatedStatus.Liberated
+			: LiberatedStatus.NotLiberated;
+
 		// below are queries, not commands. maybe I should make a LibraryQueries. except there's already one of those...
 
-		public static LiberatedState Liberated_Status(Book book)
-			=> TransitionalFileLocator.Audio_Exists(book) ? LiberatedState.Liberated
-			: TransitionalFileLocator.AAXC_Exists(book) ? LiberatedState.PartialDownload
-			: LiberatedState.NotDownloaded;
-
-		public static PdfState Pdf_Status(Book book)
-			=> !book.Supplements.Any() ? PdfState.NoPdf
-			: TransitionalFileLocator.PDF_Exists(book) ? PdfState.Downloaded
-			: PdfState.NotDownloaded;
-
-		public record LibraryStats(int booksFullyBackedUp, int booksDownloadedOnly, int booksNoProgress, int pdfsDownloaded, int pdfsNotDownloaded) { }
+		public record LibraryStats(int booksFullyBackedUp, int booksDownloadedOnly, int booksNoProgress, int booksError, int pdfsDownloaded, int pdfsNotDownloaded) { }
 		public static LibraryStats GetCounts()
 		{
 			var libraryBooks = DbContexts.GetContext().GetLibrary_Flat_NoTracking();
@@ -265,23 +199,24 @@ namespace ApplicationServices
 				.AsParallel()
 				.Select(lb => Liberated_Status(lb.Book))
 				.ToList();
-			var booksFullyBackedUp = results.Count(r => r == LiberatedState.Liberated);
-			var booksDownloadedOnly = results.Count(r => r == LiberatedState.PartialDownload);
-			var booksNoProgress = results.Count(r => r == LiberatedState.NotDownloaded);
+			var booksFullyBackedUp = results.Count(r => r == LiberatedStatus.Liberated);
+			var booksDownloadedOnly = results.Count(r => r == LiberatedStatus.PartialDownload);
+			var booksNoProgress = results.Count(r => r == LiberatedStatus.NotLiberated);
+			var booksError = results.Count(r => r == LiberatedStatus.Error);
 
-			Log.Logger.Information("Book counts. {@DebugInfo}", new { total = results.Count, booksFullyBackedUp, booksDownloadedOnly, booksNoProgress });
+			Log.Logger.Information("Book counts. {@DebugInfo}", new { total = results.Count, booksFullyBackedUp, booksDownloadedOnly, booksNoProgress, booksError });
 
 			var boolResults = libraryBooks
 				.AsParallel()
-				.Where(lb => lb.Book.Supplements.Any())
+				.Where(lb => lb.Book.HasPdf)
 				.Select(lb => Pdf_Status(lb.Book))
 				.ToList();
-			var pdfsDownloaded = boolResults.Count(r => r == PdfState.Downloaded);
-			var pdfsNotDownloaded = boolResults.Count(r => r == PdfState.NotDownloaded);
+			var pdfsDownloaded = boolResults.Count(r => r == LiberatedStatus.Liberated);
+			var pdfsNotDownloaded = boolResults.Count(r => r == LiberatedStatus.NotLiberated);
 
 			Log.Logger.Information("PDF counts. {@DebugInfo}", new { total = boolResults.Count, pdfsDownloaded, pdfsNotDownloaded });
 
-			return new(booksFullyBackedUp, booksDownloadedOnly, booksNoProgress, pdfsDownloaded, pdfsNotDownloaded);
+			return new(booksFullyBackedUp, booksDownloadedOnly, booksNoProgress, booksError, pdfsDownloaded, pdfsNotDownloaded);
 		}
 	}
 }

ApplicationServices/LibraryExporter.cs

@@ -47,8 +47,8 @@ namespace ApplicationServices
 		[Name("Publisher")]
 		public string Publisher { get; set; }
 
-		[Name("Pdf url")]
-		public string PdfUrl { get; set; }
+		[Name("Has PDF")]
+		public bool HasPdf { get; set; }
 
 		[Name("Series Names")]
 		public string SeriesNames { get; set; }
@@ -92,9 +92,6 @@ namespace ApplicationServices
 		[Name("Book Liberation Status")]
 		public string BookStatus { get; set; }
 
-		[Name("Book File Location")]
-		public string BookLocation { get; set; }
-
 		[Name("PDF Liberation Status")]
 		public string PdfStatus { get; set; }
 	}
@@ -112,7 +109,7 @@ namespace ApplicationServices
 				NarratorNames = a.Book.NarratorNames,
 				LengthInMinutes = a.Book.LengthInMinutes,
 				Publisher = a.Book.Publisher,
-				PdfUrl = a.Book.Supplements?.FirstOrDefault()?.Url,
+				HasPdf = a.Book.HasPdf,
 				SeriesNames = a.Book.SeriesNames,
 				SeriesOrder = a.Book.SeriesLink.Any() ? a.Book.SeriesLink?.Select(sl => $"{sl.Index} : {sl.Series.Name}").Aggregate((a, b) => $"{a}, {b}") : "",
 				CommunityRatingOverall = a.Book.Rating?.OverallRating,
@@ -127,7 +124,6 @@ namespace ApplicationServices
 				MyRatingStory = a.Book.UserDefinedItem.Rating.StoryRating,
 				MyLibationTags = a.Book.UserDefinedItem.Tags,
 				BookStatus = a.Book.UserDefinedItem.BookStatus.ToString(),
-				BookLocation = a.Book.UserDefinedItem.BookLocation,
 				PdfStatus = a.Book.UserDefinedItem.PdfStatus.ToString()
 			}).ToList();
 	}
@@ -186,7 +182,7 @@ namespace ApplicationServices
 				nameof (ExportDto.NarratorNames),
 				nameof (ExportDto.LengthInMinutes),
 				nameof (ExportDto.Publisher),
-				nameof (ExportDto.PdfUrl),
+				nameof (ExportDto.HasPdf),
 				nameof (ExportDto.SeriesNames),
 				nameof (ExportDto.SeriesOrder),
 				nameof (ExportDto.CommunityRatingOverall),
@@ -201,7 +197,6 @@ namespace ApplicationServices
 				nameof (ExportDto.MyRatingStory),
 				nameof (ExportDto.MyLibationTags),
 				nameof (ExportDto.BookStatus),
-				nameof (ExportDto.BookLocation),
 				nameof (ExportDto.PdfStatus)
 			};
 			var col = 0;
@@ -239,7 +234,7 @@ namespace ApplicationServices
 				row.CreateCell(col++).SetCellValue(dto.NarratorNames);
 				row.CreateCell(col++).SetCellValue(dto.LengthInMinutes);
 				row.CreateCell(col++).SetCellValue(dto.Publisher);
-				row.CreateCell(col++).SetCellValue(dto.PdfUrl);
+				row.CreateCell(col++).SetCellValue(dto.HasPdf);
 				row.CreateCell(col++).SetCellValue(dto.SeriesNames);
 				row.CreateCell(col++).SetCellValue(dto.SeriesOrder);
 
@@ -265,7 +260,6 @@ namespace ApplicationServices
 
 				row.CreateCell(col++).SetCellValue(dto.MyLibationTags);
 				row.CreateCell(col++).SetCellValue(dto.BookStatus);
-				row.CreateCell(col++).SetCellValue(dto.BookLocation);
 				row.CreateCell(col++).SetCellValue(dto.PdfStatus);
 
 				rowIndex++;

ApplicationServices/TransitionalFileLocator.cs

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

DataLayer/DataLayer.csproj

@@ -12,19 +12,19 @@
   </PropertyGroup>
   
   <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="5.0.5">
+    <PackageReference Include="Dinah.EntityFrameworkCore" Version="1.0.2.2" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="5.0.9">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="5.0.5" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="5.0.5">
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="5.0.9" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="5.0.9">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
   </ItemGroup>
   
   <ItemGroup>
-    <ProjectReference Include="..\..\Dinah.Core\Dinah.EntityFrameworkCore\Dinah.EntityFrameworkCore.csproj" />
     <ProjectReference Include="..\FileManager\FileManager.csproj" />
   </ItemGroup>
   

DataLayer/EfClasses/Book.cs

@@ -51,6 +51,24 @@ namespace DataLayer
         // is owned, not optional 1:1
         public UserDefinedItem UserDefinedItem { get; private set; }
 
+        // UserDefinedItem convenience properties
+        public bool Audio_Exists
+        {
+            get
+            {
+                var status = UserDefinedItem?.BookStatus;
+                return status.HasValue && status.Value != LiberatedStatus.NotLiberated;
+            }
+        }
+        public bool PDF_Exists
+        {
+            get
+            {
+                var status = UserDefinedItem?.PdfStatus;
+                return (status.HasValue && status.Value == LiberatedStatus.Liberated);
+            }
+        }
+
         // is owned, not optional 1:1
         /// <summary>The product's aggregate community rating</summary>
         public Rating Rating { get; private set; } = new Rating(0, 0, 0);

DataLayer/EfClasses/UserDefinedItem.cs

@@ -14,7 +14,11 @@ namespace DataLayer
         NotLiberated = 0,
         Liberated = 1,
         /// <summary>Error occurred during liberation. Don't retry</summary>
-        Error = 2
+        Error = 2,
+
+        /// <summary>Application-state only. Not a valid persistence state.</summary>
+        PartialDownload = 0x1000
+
     }
 
     public class UserDefinedItem
@@ -38,7 +42,15 @@ namespace DataLayer
         public string Tags
         {
             get => _tags;
-            set => _tags = sanitize(value);
+            set
+            {
+                var newTags = sanitize(value);
+                if (_tags != newTags)
+                {
+                    _tags = newTags;
+                    ItemChanged?.Invoke(this, nameof(Tags));
+                }
+            }
 		}
 
 		public IEnumerable<string> TagsEnumerated => Tags == "" ? new string[0] : Tags.Split(null as char[], StringSplitOptions.RemoveEmptyEntries);
@@ -94,12 +106,39 @@ namespace DataLayer
             => Rating.Update(overallRating, performanceRating, storyRating);
         #endregion
 
-        #region LiberatedStatuses and book file location
-        public LiberatedStatus BookStatus { get; set; }
-        public string BookLocation { get; set; }
-        public LiberatedStatus? PdfStatus { get; set; }
-        #endregion
+        #region LiberatedStatuses
 
+        private LiberatedStatus _bookStatus;
+        private LiberatedStatus? _pdfStatus;
+        public LiberatedStatus BookStatus
+        {
+            get => _bookStatus;
+            set
+            {
+                if (_bookStatus != value)
+				{
+                    _bookStatus = value;
+                    ItemChanged?.Invoke(this, nameof(BookStatus));
+                }
+            }
+        }
+        public LiberatedStatus? PdfStatus
+        {
+            get => _pdfStatus;
+            set
+            {
+                if (_pdfStatus != value)
+                {
+                    _pdfStatus = value;
+                    ItemChanged?.Invoke(this, nameof(PdfStatus));
+                }
+            }
+        }
+        #endregion
+        /// <summary>
+        /// Occurs when <see cref="Tags"/>, <see cref="BookStatus"/>, or <see cref="PdfStatus"/> values change.
+        /// </summary>
+        public static event EventHandler<string> ItemChanged;
         public override string ToString() => $"{Book} {Rating} {Tags}";
 	}
 }

DataLayer/Migrations/20210821012137_RemoveUdiBookLocation.Designer.cs

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

DataLayer/Migrations/20210821012137_RemoveUdiBookLocation.cs

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

DataLayer/Migrations/LibationContextModelSnapshot.cs

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

DtoImporterService/BookImporter.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using AudibleApiDTOs;
+using AudibleApi.Common;
 using DataLayer;
 using InternalUtilities;
 
@@ -120,8 +120,8 @@ namespace DtoImporterService
 
 			book.UpdateBookDetails(item.IsAbridged, item.DatePublished);
 
-			if (!string.IsNullOrWhiteSpace(item.SupplementUrl))
-				book.AddSupplementDownloadUrl(item.SupplementUrl);
+			if (item.PdfUrl is not null)
+				book.AddSupplementDownloadUrl(item.PdfUrl.ToString());
 
 			return book;
 		}

DtoImporterService/CategoryImporter.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using AudibleApiDTOs;
+using AudibleApi.Common;
 using DataLayer;
 using InternalUtilities;
 

DtoImporterService/ContributorImporter.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using AudibleApiDTOs;
+using AudibleApi.Common;
 using DataLayer;
 using InternalUtilities;
 

DtoImporterService/DtoImporterService.csproj

@@ -5,7 +5,6 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\audible api\AudibleApi\AudibleApiDTOs\AudibleApiDTOs.csproj" />
     <ProjectReference Include="..\DataLayer\DataLayer.csproj" />
     <ProjectReference Include="..\InternalUtilities\InternalUtilities.csproj" />
   </ItemGroup>

DtoImporterService/LibraryImporter.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using AudibleApiDTOs;
+using AudibleApi.Common;
 using DataLayer;
 using InternalUtilities;
 

DtoImporterService/SeriesImporter.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using AudibleApiDTOs;
+using AudibleApi.Common;
 using DataLayer;
 using InternalUtilities;
 
@@ -29,7 +29,7 @@ namespace DtoImporterService
 			return qtyNew;
 		}
 
-		private void loadLocal_series(List<AudibleApiDTOs.Series> series)
+		private void loadLocal_series(List<AudibleApi.Common.Series> series)
 		{
 			var seriesIds = series.Select(s => s.SeriesId).ToList();
 			var localIds = DbContext.Series.Local.Select(s => s.AudibleSeriesId).ToList();
@@ -42,7 +42,7 @@ namespace DtoImporterService
 				DbContext.Series.Where(s => remainingSeriesIds.Contains(s.AudibleSeriesId)).ToList();
 		}
 
-		private int upsertSeries(List<AudibleApiDTOs.Series> requestedSeries)
+		private int upsertSeries(List<AudibleApi.Common.Series> requestedSeries)
 		{
 			var qtyNew = 0;
 

FileLiberator/ConvertToMp3.cs

@@ -37,7 +37,7 @@ namespace FileLiberator
 
         public bool Validate(LibraryBook libraryBook)
         {
-            var path = ApplicationServices.TransitionalFileLocator.Audio_GetPath(libraryBook.Book);
+            var path = AudibleFileStorage.Audio.GetPath(libraryBook.Book.AudibleProductId);
             return path?.ToLower()?.EndsWith(".m4b") == true && !File.Exists(Mp3FileName(path));
         }
 
@@ -49,7 +49,7 @@ namespace FileLiberator
 
             try
             {
-                var m4bPath = ApplicationServices.TransitionalFileLocator.Audio_GetPath(libraryBook.Book);
+                var m4bPath = AudibleFileStorage.Audio.GetPath(libraryBook.Book.AudibleProductId);
                 m4bBook = new Mp4File(m4bPath, FileAccess.Read);
                 m4bBook.ConversionProgressUpdate += M4bBook_ConversionProgressUpdate;
 

FileLiberator/DownloadDecryptBook.cs

@@ -16,28 +16,28 @@ namespace FileLiberator
     public class DownloadDecryptBook : IAudioDecodable
     {
 
-		private AaxcDownloadConverter aaxcDownloader;
+        private AaxcDownloadConverter aaxcDownloader;
 
-		public event EventHandler<TimeSpan> StreamingTimeRemaining;
-		public event EventHandler<Action<byte[]>> RequestCoverArt;
-		public event EventHandler<string> TitleDiscovered;
-		public event EventHandler<string> AuthorsDiscovered;
-		public event EventHandler<string> NarratorsDiscovered;
-		public event EventHandler<byte[]> CoverImageDiscovered;
-		public event EventHandler<string> StreamingBegin;
-		public event EventHandler<DownloadProgress> StreamingProgressChanged;
-		public event EventHandler<string> StreamingCompleted;
-		public event EventHandler<LibraryBook> Begin;
-		public event EventHandler<string> StatusUpdate;
-		public event EventHandler<LibraryBook> Completed;
+        public event EventHandler<TimeSpan> StreamingTimeRemaining;
+        public event EventHandler<Action<byte[]>> RequestCoverArt;
+        public event EventHandler<string> TitleDiscovered;
+        public event EventHandler<string> AuthorsDiscovered;
+        public event EventHandler<string> NarratorsDiscovered;
+        public event EventHandler<byte[]> CoverImageDiscovered;
+        public event EventHandler<string> StreamingBegin;
+        public event EventHandler<DownloadProgress> StreamingProgressChanged;
+        public event EventHandler<string> StreamingCompleted;
+        public event EventHandler<LibraryBook> Begin;
+        public event EventHandler<string> StatusUpdate;
+        public event EventHandler<LibraryBook> Completed;
 
-		public async Task<StatusHandler> ProcessAsync(LibraryBook libraryBook)
+        public async Task<StatusHandler> ProcessAsync(LibraryBook libraryBook)
         {
             Begin?.Invoke(this, libraryBook);
 
             try
             {
-                if (ApplicationServices.TransitionalFileLocator.Audio_Exists(libraryBook.Book))
+                if (libraryBook.Book.Audio_Exists)
                     return new StatusHandler { "Cannot find decrypt. Final audio file already exists" };
 
                 var outputAudioFilename = await aaxToM4bConverterDecryptAsync(AudibleFileStorage.DownloadsInProgress, AudibleFileStorage.DecryptInProgress, libraryBook);
@@ -47,14 +47,12 @@ namespace FileLiberator
                     return new StatusHandler { "Decrypt failed" };
 
                 // moves files and returns dest dir
-                _ = moveFilesToBooksDir(libraryBook.Book, outputAudioFilename);
+                var moveResults = MoveFilesToBooksDir(libraryBook.Book, outputAudioFilename);
 
-                var finalAudioExists = ApplicationServices.TransitionalFileLocator.Audio_Exists(libraryBook.Book);
-                if (!finalAudioExists)
+                if (!moveResults.movedAudioFile)
                     return new StatusHandler { "Cannot find final audio file after decryption" };
 
-                // only need to update if success. if failure, it will remain at 0 == NotLiberated
-                ApplicationServices.LibraryCommands.UpdateBook(libraryBook, LiberatedStatus.Liberated, outputAudioFilename);
+                libraryBook.Book.UserDefinedItem.BookStatus = LiberatedStatus.Liberated;
 
                 return new StatusHandler();
             }
@@ -127,7 +125,7 @@ namespace FileLiberator
         }
 
 
-		private void AaxcDownloader_RetrievedCoverArt(object sender, byte[] e)
+        private void AaxcDownloader_RetrievedCoverArt(object sender, byte[] e)
         {
             if (e is null && Configuration.Instance.AllowLibationFixup)
             {
@@ -144,10 +142,10 @@ namespace FileLiberator
         {
             TitleDiscovered?.Invoke(this, e.TitleSansUnabridged);
             AuthorsDiscovered?.Invoke(this, e.FirstAuthor ?? "[unknown]");
-            NarratorsDiscovered?.Invoke(this, e.Narrator ?? "[unknown]");           
+            NarratorsDiscovered?.Invoke(this, e.Narrator ?? "[unknown]");
         }
 
-        private static string moveFilesToBooksDir(Book product, string outputAudioFilename)
+        private static (string destinationDir, bool movedAudioFile) MoveFilesToBooksDir(Book product, string outputAudioFilename)
         {
             // create final directory. move each file into it. MOVE AUDIO FILE LAST
             // new dir: safetitle_limit50char + " [" + productId + "]"
@@ -162,6 +160,7 @@ namespace FileLiberator
             // audio filename: safetitle_limit50char + " [" + productId + "]." + audio_ext
             var audioFileName = FileUtility.GetValidFilename(destinationDir, product.Title, musicFileExt, product.AudibleProductId);
 
+            bool movedAudioFile = false;
             foreach (var f in sortedFiles)
             {
                 var dest
@@ -174,11 +173,13 @@ namespace FileLiberator
                     Cue.UpdateFileName(f, audioFileName);
 
                 File.Move(f.FullName, dest);
+
+                movedAudioFile |= AudibleFileStorage.Audio.IsFileTypeMatch(f);
             }
 
             AudibleFileStorage.Audio.Refresh();
 
-            return destinationDir;
+            return (destinationDir, movedAudioFile);
         }
 
         private static List<FileInfo> getProductFilesSorted(Book product, string outputAudioFilename)
@@ -201,29 +202,28 @@ namespace FileLiberator
         }
 
         private static void validate(LibraryBook libraryBook)
-		{
-			string errorString(string field)
-				=> $"{errorTitle()}\r\nCannot download book. {field} is not known. Try re-importing the account which owns this book.";
+        {
+            string errorString(string field)
+                => $"{errorTitle()}\r\nCannot download book. {field} is not known. Try re-importing the account which owns this book.";
 
-			string errorTitle()
-			{
-				var title
-					= (libraryBook.Book.Title.Length > 53)
-					? $"{libraryBook.Book.Title.Truncate(50)}..."
-					: libraryBook.Book.Title;
-				var errorBookTitle = $"{title} [{libraryBook.Book.AudibleProductId}]";
-				return errorBookTitle;
-			};
+            string errorTitle()
+            {
+                var title
+                    = (libraryBook.Book.Title.Length > 53)
+                    ? $"{libraryBook.Book.Title.Truncate(50)}..."
+                    : libraryBook.Book.Title;
+                var errorBookTitle = $"{title} [{libraryBook.Book.AudibleProductId}]";
+                return errorBookTitle;
+            };
 
-			if (string.IsNullOrWhiteSpace(libraryBook.Account))
-				throw new Exception(errorString("Account"));
+            if (string.IsNullOrWhiteSpace(libraryBook.Account))
+                throw new Exception(errorString("Account"));
 
-			if (string.IsNullOrWhiteSpace(libraryBook.Book.Locale))
-				throw new Exception(errorString("Locale"));
-		}
+            if (string.IsNullOrWhiteSpace(libraryBook.Book.Locale))
+                throw new Exception(errorString("Locale"));
+        }
 
-        public bool Validate(LibraryBook libraryBook)
-            => !ApplicationServices.TransitionalFileLocator.Audio_Exists(libraryBook.Book);
+        public bool Validate(LibraryBook libraryBook) => !libraryBook.Book.Audio_Exists;
 
         public void Cancel()
         {

FileLiberator/DownloadPdf.cs

@@ -15,16 +15,15 @@ namespace FileLiberator
 	{
 		public override bool Validate(LibraryBook libraryBook)
 			=> !string.IsNullOrWhiteSpace(getdownloadUrl(libraryBook))
-			&& !ApplicationServices.TransitionalFileLocator.PDF_Exists(libraryBook.Book);
+			&& !libraryBook.Book.PDF_Exists;
 
 		public override async Task<StatusHandler> ProcessItemAsync(LibraryBook libraryBook)
 		{
 			var proposedDownloadFilePath = getProposedDownloadFilePath(libraryBook);
-			await downloadPdfAsync(libraryBook, proposedDownloadFilePath);
-			var result = verifyDownload(libraryBook);
+			var actualDownloadedFilePath = await downloadPdfAsync(libraryBook, proposedDownloadFilePath);
+			var result = verifyDownload(actualDownloadedFilePath);
 
-			var liberatedStatus = result.IsSuccess ? LiberatedStatus.Liberated : LiberatedStatus.NotLiberated;
-			ApplicationServices.LibraryCommands.UpdatePdf(libraryBook, liberatedStatus);
+			libraryBook.Book.UserDefinedItem.PdfStatus = result.IsSuccess ? LiberatedStatus.Liberated : LiberatedStatus.NotLiberated;
 
 			return result;
 		}
@@ -32,14 +31,14 @@ namespace FileLiberator
 		private static string getProposedDownloadFilePath(LibraryBook libraryBook)
 		{
 			// if audio file exists, get it's dir. else return base Book dir
-			var existingPath = Path.GetDirectoryName(ApplicationServices.TransitionalFileLocator.Audio_GetPath(libraryBook.Book));
+			var existingPath = Path.GetDirectoryName(AudibleFileStorage.Audio.GetPath(libraryBook.Book.AudibleProductId));
 			var file = getdownloadUrl(libraryBook);
 
 			if (existingPath != null)
 				return Path.Combine(existingPath, Path.GetFileName(file));
 
 			var full = FileUtility.GetValidFilename(
-				AudibleFileStorage.PDF.StorageDirectory,
+				AudibleFileStorage.PdfStorageDirectory,
 				libraryBook.Book.Title,
 				Path.GetExtension(file),
 				libraryBook.Book.AudibleProductId);
@@ -49,7 +48,7 @@ namespace FileLiberator
 		private static string getdownloadUrl(LibraryBook libraryBook)
 			=> libraryBook?.Book?.Supplements?.FirstOrDefault()?.Url;
 
-		private async Task downloadPdfAsync(LibraryBook libraryBook, string proposedDownloadFilePath)
+		private async Task<string> downloadPdfAsync(LibraryBook libraryBook, string proposedDownloadFilePath)
 		{
 			var api = await GetApiAsync(libraryBook);
 			var downloadUrl = await api.GetPdfDownloadLinkAsync(libraryBook.Book.AudibleProductId);
@@ -58,10 +57,12 @@ namespace FileLiberator
 			var actualDownloadedFilePath = await PerformDownloadAsync(
 				proposedDownloadFilePath,
 				(p) => client.DownloadFileAsync(downloadUrl, proposedDownloadFilePath, p));
+
+			return actualDownloadedFilePath;
 		}
 
-		private static StatusHandler verifyDownload(LibraryBook libraryBook)
-			=> !ApplicationServices.TransitionalFileLocator.PDF_Exists(libraryBook.Book)
+		private static StatusHandler verifyDownload(string actualDownloadedFilePath)
+			=> !File.Exists(actualDownloadedFilePath)
 			? new StatusHandler { "Downloaded PDF cannot be found" }
 			: new StatusHandler();
 	}

FileLiberator/FileLiberator.csproj

@@ -5,9 +5,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\Dinah.Core\Dinah.Core\Dinah.Core.csproj" />
     <ProjectReference Include="..\AaxDecrypter\AaxDecrypter.csproj" />
-    <ProjectReference Include="..\ApplicationServices\ApplicationServices.csproj" />
     <ProjectReference Include="..\DataLayer\DataLayer.csproj" />
     <ProjectReference Include="..\FileManager\FileManager.csproj" />
     <ProjectReference Include="..\InternalUtilities\InternalUtilities.csproj" />

FileLiberator/IProcessableExt.cs

@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
-using ApplicationServices;
 using DataLayer;
 using Dinah.Core;
 using Dinah.Core.ErrorHandling;
@@ -18,10 +17,8 @@ namespace FileLiberator
 
 
         // when used in foreach: stateful. deferred execution
-        public static IEnumerable<LibraryBook> GetValidLibraryBooks(this IProcessable processable)
-            => DbContexts.GetContext()
-            .GetLibrary_Flat_NoTracking()
-            .Where(libraryBook => processable.Validate(libraryBook));
+        public static IEnumerable<LibraryBook> GetValidLibraryBooks(this IProcessable processable, IEnumerable<LibraryBook> library)
+            => library.Where(libraryBook => processable.Validate(libraryBook));
 
         public static async Task<StatusHandler> ProcessSingleAsync(this IProcessable processable, LibraryBook libraryBook, bool validate)
         {

FileManager/AudibleFileStorage.cs

@@ -15,14 +15,16 @@ namespace FileManager
 		protected abstract string[] Extensions { get; }
 		public abstract string StorageDirectory { get; }
 
+		public static string DownloadsInProgress => Directory.CreateDirectory(Path.Combine(Configuration.Instance.InProgress, "DownloadsInProgress")).FullName;
+        public static string DecryptInProgress => Directory.CreateDirectory(Path.Combine(Configuration.Instance.InProgress, "DecryptInProgress")).FullName;
+
+        public static string PdfStorageDirectory => BooksDirectory;
+
+		private static AaxcFileStorage AAXC { get; } = new AaxcFileStorage();
+        public static bool AaxcExists(string productId) => AAXC.Exists(productId);
+
 		#region static
 		public static AudioFileStorage Audio { get; } = new AudioFileStorage();
-		public static AudibleFileStorage AAXC { get; } = new AaxcFileStorage();
-		public static AudibleFileStorage PDF { get; } = new PdfFileStorage();
-
-		public static string DownloadsInProgress => Directory.CreateDirectory(Path.Combine(Configuration.Instance.InProgress, "DownloadsInProgress")).FullName;
-
-        public static string DecryptInProgress => Directory.CreateDirectory(Path.Combine(Configuration.Instance.InProgress, "DecryptInProgress")).FullName;
 
         public static string BooksDirectory
         {
@@ -34,13 +36,13 @@ namespace FileManager
             }
         }
 
-        private static BackgroundFileSystem BookDirectoryFiles { get; set; }
+        internal static BackgroundFileSystem BookDirectoryFiles { get; set; }
         #endregion
 
         #region instance
         public FileType FileType => (FileType)Value;
 
-		private IEnumerable<string> extensions_noDots { get; }
+		protected IEnumerable<string> extensions_noDots { get; }
         private string extAggr { get; }
 
         protected AudibleFileStorage(FileType fileType) : base((int)fileType, fileType.ToString())
@@ -50,39 +52,25 @@ namespace FileManager
             BookDirectoryFiles ??= new BackgroundFileSystem(BooksDirectory, "*.*", SearchOption.AllDirectories);
         }
 
-        public void Refresh()
-        {
-            BookDirectoryFiles.RefreshFiles();
-        }
-
-        /// <summary>
-        /// Example for full books:
-        /// Search recursively in _books directory. Full book exists if either are true
-        /// - a directory name has the product id and an audio file is immediately inside
-        /// - any audio filename contains the product id
-        /// </summary>
-        public bool Exists(string productId) => GetPath(productId) != null;
-
-        public string GetPath(string productId)
+        protected string GetFilePath(string productId)
         {
             var cachedFile = FilePathCache.GetPath(productId, FileType);
             if (cachedFile != null)
                 return cachedFile;
 
-            string storageDir = StorageDirectory;
             string regexPattern = $@"{productId}.*?\.({extAggr})$";
             string firstOrNull;
 
-            if (storageDir == BooksDirectory)
+            if (StorageDirectory == BooksDirectory)
             {
                 //If user changed the BooksDirectory, reinitialize.
-                if (storageDir != BookDirectoryFiles.RootDirectory)
+                if (StorageDirectory != BookDirectoryFiles.RootDirectory)
 				{
                     lock (BookDirectoryFiles)
                     {
-                        if (storageDir != BookDirectoryFiles.RootDirectory)
+                        if (StorageDirectory != BookDirectoryFiles.RootDirectory)
                         {
-                            BookDirectoryFiles = new BackgroundFileSystem(storageDir, "*.*", SearchOption.AllDirectories);
+                            BookDirectoryFiles = new BackgroundFileSystem(StorageDirectory, "*.*", SearchOption.AllDirectories);
                         }
                     }
 				}
@@ -93,7 +81,7 @@ namespace FileManager
             {
                 firstOrNull =
                     Directory
-                    .EnumerateFiles(storageDir, "*.*", SearchOption.AllDirectories)
+                    .EnumerateFiles(StorageDirectory, "*.*", SearchOption.AllDirectories)
                     .FirstOrDefault(s => Regex.IsMatch(s, regexPattern, RegexOptions.IgnoreCase));
             }
 
@@ -103,6 +91,21 @@ namespace FileManager
 			FilePathCache.Upsert(productId, FileType, firstOrNull);
 			return firstOrNull;
         }
+        #endregion
+    }
+
+    public class AudioFileStorage : AudibleFileStorage
+    {
+        protected override string[] Extensions { get; } = new[] { "m4b", "mp3", "aac", "mp4", "m4a", "ogg", "flac" };
+
+        // we always want to use the latest config value, therefore
+        // - DO use 'get' arrow "=>"
+        // - do NOT use assign "="
+        public override string StorageDirectory => BooksDirectory;
+
+        public AudioFileStorage() : base(FileType.Audio) { }
+
+        public void Refresh() => BookDirectoryFiles.RefreshFiles();
 
         public string GetDestDir(string title, string asin)
         {
@@ -118,32 +121,8 @@ namespace FileManager
 
         public bool IsFileTypeMatch(FileInfo fileInfo)
             => extensions_noDots.ContainsInsensative(fileInfo.Extension.Trim('.'));
-        #endregion
-    }
 
-    public class AudioFileStorage : AudibleFileStorage
-    {
-        public const string SKIP_FILE_EXT = "libhack";
-
-        protected override string[] Extensions { get; } = new[] { "m4b", "mp3", "aac", "mp4", "m4a", "ogg", "flac", SKIP_FILE_EXT };
-
-        // we always want to use the latest config value, therefore
-        // - DO use 'get' arrow "=>"
-        // - do NOT use assign "="
-        public override string StorageDirectory => BooksDirectory;
-
-        public AudioFileStorage() : base(FileType.Audio) { }
-
-        public string CreateSkipFile(string title, string asin, string contents = null)
-        {
-            var destinationDir = GetDestDir(title, asin);
-            Directory.CreateDirectory(destinationDir);
-
-            var path = FileUtility.GetValidFilename(destinationDir, title, SKIP_FILE_EXT, asin);
-            File.WriteAllText(path, contents ?? string.Empty);
-
-            return path;
-        }
+        public string GetPath(string productId) => GetFilePath(productId);
     }
 
     public class AaxcFileStorage : AudibleFileStorage
@@ -156,17 +135,13 @@ namespace FileManager
         public override string StorageDirectory => DownloadsInProgress;
 
         public AaxcFileStorage() : base(FileType.AAXC) { }
-    }
 
-    public class PdfFileStorage : AudibleFileStorage
-    {
-        protected override string[] Extensions { get; } = new[] { "pdf", "zip" };
-
-        // we always want to use the latest config value, therefore
-        // - DO use 'get' arrow "=>"
-        // - do NOT use assign "="
-        public override string StorageDirectory => BooksDirectory;
-
-        public PdfFileStorage() : base(FileType.PDF) { }
+        /// <summary>
+        /// Example for full books:
+        /// Search recursively in _books directory. Full book exists if either are true
+        /// - a directory name has the product id and an audio file is immediately inside
+        /// - any audio filename contains the product id
+        /// </summary>
+        public bool Exists(string productId) => GetFilePath(productId) != null;
     }
 }

FileManager/BackgroundFileSystem.cs

@@ -9,7 +9,14 @@ using System.Threading.Tasks;
 
 namespace FileManager
 {
-    class BackgroundFileSystem
+    /// <summary>
+    /// Tracks actual locations of files. This is especially useful for clicking button to navigate to the book's files.
+    /// 
+    /// Note: this is no longer how Libation manages "Liberated" state. That is not statefully managed in the database.
+    /// This paradigm is what allows users to manually choose to not download books. Also allows them to manually toggle
+    /// this state and download again.
+    /// </summary>
+    internal class BackgroundFileSystem
     {
         public string RootDirectory { get; private set; }
         public string SearchPattern { get; private set; }

FileManager/FileManager.csproj

@@ -5,13 +5,10 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="Dinah.Core" Version="1.0.5.1" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="5.0.0" />
     <PackageReference Include="Octokit" Version="0.50.0" />
     <PackageReference Include="Polly" Version="7.2.2" />
   </ItemGroup>
 
-  <ItemGroup>
-    <ProjectReference Include="..\..\Dinah.Core\Dinah.Core\Dinah.Core.csproj" />
-  </ItemGroup>
-
 </Project>

FileManager/FilePathCache.cs

@@ -9,6 +9,7 @@ namespace FileManager
 {
 	public static class FilePathCache
     {
+		private const string FILENAME = "FileLocations.json";
         internal class CacheEntry
         {
             public string Id { get; set; }
@@ -18,7 +19,7 @@ namespace FileManager
 
 		private static Cache<CacheEntry> cache { get; } = new Cache<CacheEntry>();
 
-		private static string jsonFile => Path.Combine(Configuration.Instance.LibationFiles, "FilePaths.json");
+		private static string jsonFile => Path.Combine(Configuration.Instance.LibationFiles, FILENAME);
 
         static FilePathCache()
         {
@@ -84,7 +85,7 @@ namespace FileManager
 					try { resave(); }
 					catch (IOException ex)
 					{
-						Serilog.Log.Logger.Error(ex, "Error saving FilePaths.json");
+						Serilog.Log.Logger.Error(ex, $"Error saving {FILENAME}");
 						throw;
 					}
 				}

InternalUtilities/AudibleApiActions.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 using AudibleApi;
-using AudibleApiDTOs;
+using AudibleApi.Common;
 using Dinah.Core;
 using Polly;
 using Polly.Retry;
@@ -68,13 +68,13 @@ namespace InternalUtilities
 			//				var childIds = items
 			//					.Where(i => i.Episodes)
 			//					.SelectMany(ep => ep.Relationships)
-			//					.Where(r => r.RelationshipToProduct == AudibleApiDTOs.RelationshipToProduct.Child && r.RelationshipType == AudibleApiDTOs.RelationshipType.Episode)
+			//					.Where(r => r.RelationshipToProduct == AudibleApi.Common.RelationshipToProduct.Child && r.RelationshipType == AudibleApi.Common.RelationshipType.Episode)
 			//					.Select(c => c.Asin)
 			//					.ToList();
 			//				foreach (var childId in childIds)
 			//				{
 			//					var bookResult = await api.GetLibraryBookAsync(childId, AudibleApi.LibraryOptions.ResponseGroupOptions.ALL_OPTIONS);
-			//					var bookItem = AudibleApiDTOs.LibraryDtoV10.FromJson(bookResult.ToString()).Item;
+			//					var bookItem = AudibleApi.Common.LibraryDtoV10.FromJson(bookResult.ToString()).Item;
 			//					items.Add(bookItem);
 			//				}
 			#endregion

InternalUtilities/AudibleApiValidators.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using AudibleApiDTOs;
+using AudibleApi.Common;
 
 namespace InternalUtilities
 {
@@ -76,9 +76,9 @@ namespace InternalUtilities
 
 			var distinct = items.GetSeriesDistinct();
 			if (distinct.Any(s => s.SeriesId is null))
-				exceptions.Add(new ArgumentException($"Collection contains {nameof(Item.Series)} with null {nameof(AudibleApiDTOs.Series.SeriesId)}", nameof(items)));
+				exceptions.Add(new ArgumentException($"Collection contains {nameof(Item.Series)} with null {nameof(AudibleApi.Common.Series.SeriesId)}", nameof(items)));
 			if (distinct.Any(s => s.SeriesName is null))
-				exceptions.Add(new ArgumentException($"Collection contains {nameof(Item.Series)} with null {nameof(AudibleApiDTOs.Series.SeriesName)}", nameof(items)));
+				exceptions.Add(new ArgumentException($"Collection contains {nameof(Item.Series)} with null {nameof(AudibleApi.Common.Series.SeriesName)}", nameof(items)));
 
 			return exceptions;
 		}

InternalUtilities/ImportItem.cs

@@ -1,5 +1,5 @@
 using System;
-using AudibleApiDTOs;
+using AudibleApi.Common;
 
 namespace InternalUtilities
 {

InternalUtilities/InternalUtilities.csproj

@@ -5,7 +5,10 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\audible api\AudibleApi\AudibleApi\AudibleApi.csproj" />
+    <PackageReference Include="AudibleApi" Version="1.0.6.2" />
+  </ItemGroup>
+
+  <ItemGroup>
     <ProjectReference Include="..\FileManager\FileManager.csproj" />
   </ItemGroup>
 

Libation.sln

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

LibationLauncher/LibationLauncher.csproj

@@ -13,7 +13,7 @@
     <!-- <PublishSingleFile>true</PublishSingleFile> -->
     <RuntimeIdentifier>win-x64</RuntimeIdentifier>
 
-    <Version>5.5.0.12</Version>
+    <Version>5.5.9.1</Version>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">

LibationLauncher/Program.cs

@@ -5,13 +5,14 @@ using System.Linq;
 using System.Windows.Forms;
 using AudibleApi.Authorization;
 using DataLayer;
-using Microsoft.EntityFrameworkCore;
+using Dinah.Core;
 using Dinah.Core.IO;
 using Dinah.Core.Logging;
 using FileManager;
 using InternalUtilities;
 using LibationWinForms;
 using LibationWinForms.Dialogs;
+using Microsoft.EntityFrameworkCore;
 using Newtonsoft.Json.Linq;
 using Serilog;
 
@@ -52,7 +53,7 @@ namespace LibationLauncher
 
 			migrate_to_v5_0_0(config);
 			migrate_to_v5_2_0__post_config(config);
-			//migrate_to_v5_4_1(config);// comment out until after vacation
+			migrate_to_v5_5_0(config);
 
 			ensureSerilogConfig(config);
 			configureLogging(config);
@@ -233,25 +234,26 @@ namespace LibationLauncher
 		}
 		#endregion
 
-		#region migrate to v5.4.1 see comment
-		// this 'migration' is a bit different. it intentionally runs each time Libation is started. its job will be fulfilled when I eventually
-		// implement the portion which removes FilePaths.json, at which time this method will be a proper migration
-		//
-		// I'm iterating through safe steps toward getting rid of the live scanner except to track audiobook files as a convenience
-		// such as clicking the stop light to open its location. live scanning will be replaced with state tracking in the database.
-
-		// FilePaths.json => db. long running. fire and forget
-		private static void migrate_to_v5_4_1(Configuration config)
-			=> new System.Threading.Thread(() => migrate_to_v5_4_1_thread(config)) { IsBackground = true }.Start();
-		private static void migrate_to_v5_4_1_thread(Configuration config)
+		#region migrate to v5.5.0. FilePaths.json => db. long running. fire and forget
+		private static void migrate_to_v5_5_0(Configuration config)
+			=> new System.Threading.Thread(() => migrate_to_v5_5_0_thread(config)) { IsBackground = true }.Start();
+		private static void migrate_to_v5_5_0_thread(Configuration config)
 		{
-			var debugStopwatch = System.Diagnostics.Stopwatch.StartNew();
 			try
 			{
 				var filePaths = Path.Combine(config.LibationFiles, "FilePaths.json");
 				if (!File.Exists(filePaths))
 					return;
 
+				var fileLocations = Path.Combine(config.LibationFiles, "FileLocations.json");
+				if (!File.Exists(fileLocations))
+					File.Copy(filePaths, fileLocations);
+
+				// files to be deleted at the end
+				var libhackFilesToDelete = new List<string>();
+				// .libhack files => errors
+				var libhackFiles = Directory.EnumerateDirectories(config.Books, "*.libhack", SearchOption.AllDirectories);
+
 				using var context = ApplicationServices.DbContexts.GetContext();
 				context.Books.Load();
 
@@ -283,19 +285,29 @@ namespace LibationLauncher
 
 					if (fileType == FileType.Audio)
 					{
-						book.UserDefinedItem.BookStatus = LiberatedStatus.Liberated;
-						book.UserDefinedItem.BookLocation = path;
+						var lhack = libhackFiles.FirstOrDefault(f => f.ContainsInsensitive(asin));
+						if (lhack is null)
+							book.UserDefinedItem.BookStatus = LiberatedStatus.Liberated;
+						else
+						{
+							book.UserDefinedItem.BookStatus = LiberatedStatus.Error;
+							libhackFilesToDelete.Add(lhack);
+						}
 					}
 				}
 
 				context.SaveChanges();
+
+				// only do this after save changes
+				foreach (var libhackFile in libhackFilesToDelete)
+					File.Delete(libhackFile);
+
+				File.Delete(filePaths);
 			}
 			catch (Exception ex)
 			{
 				Log.Logger.Error(ex, "Error attempting to insert FilePaths into db");
 			}
-			debugStopwatch.Stop();
-			var debugTotal = debugStopwatch.Elapsed;
 		}
 		#endregion
 

LibationLauncher/UNSAFE_MigrationHelper.cs

@@ -8,7 +8,15 @@ using Newtonsoft.Json.Linq;
 
 namespace LibationLauncher
 {
-	/// <summary>for migrations only. directly manipulatings settings files without going through domain logic</summary>
+	/// <summary>
+	/// 
+	/// 
+	///      directly manipulates settings files without going through domain logic.
+	///      
+	///      for migrations only. use with caution.
+	/// 
+	/// 
+	/// </summary>
 	internal static class UNSAFE_MigrationHelper
 	{
 		#region appsettings.json

LibationSearchEngine/LibationSearchEngine.csproj

@@ -9,7 +9,10 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\LuceneNet303r2\LuceneNet303r2\LuceneNet303r2.csproj" />
+    <PackageReference Include="LuceneNet303r2" Version="3.0.3.2" />
+  </ItemGroup>
+
+  <ItemGroup>
     <ProjectReference Include="..\DataLayer\DataLayer.csproj" />
     <ProjectReference Include="..\FileManager\FileManager.csproj" />
   </ItemGroup>

LibationSearchEngine/LuceneExtensions.cs

@@ -9,24 +9,24 @@ using Lucene.Net.Search;
 namespace LibationSearchEngine
 {
     // field names are case specific and, due to StandardAnalyzer, content is case INspecific
-    public static class LuceneExtensions
+    internal static class LuceneExtensions
     {
-        public static void AddRaw(this Document document, string name, string value)
+        internal static void AddRaw(this Document document, string name, string value)
             => document.Add(new Field(name, value, Field.Store.YES, Field.Index.NOT_ANALYZED));
 
-        public static void AddAnalyzed(this Document document, string name, string value)
+        internal static void AddAnalyzed(this Document document, string name, string value)
         {
             if (value != null)
                 document.Add(new Field(name.ToLowerInvariant(), value, Field.Store.YES, Field.Index.ANALYZED));
         }
 
-        public static void AddNotAnalyzed(this Document document, string name, string value)
+        internal static void AddNotAnalyzed(this Document document, string name, string value)
             => document.Add(new Field(name.ToLowerInvariant(), value, Field.Store.YES, Field.Index.NOT_ANALYZED));
 
-        public static void AddBool(this Document document, string name, bool value)
+        internal static void AddBool(this Document document, string name, bool value)
             => document.Add(new Field(name.ToLowerInvariant(), value.ToString(), Field.Store.YES, Field.Index.ANALYZED_NO_NORMS));
 
-        public static Query GetQuery(this Analyzer analyzer, string defaultField, string searchString)
+        internal static Query GetQuery(this Analyzer analyzer, string defaultField, string searchString)
             => new QueryParser(SearchEngine.Version, defaultField.ToLowerInvariant(), analyzer).Parse(searchString);
 
         // put all numbers, including dates, into this format:

LibationSearchEngine/SearchEngine.cs

@@ -107,14 +107,14 @@ namespace LibationSearchEngine
             = new ReadOnlyDictionary<string, Func<LibraryBook, bool>>(
                 new Dictionary<string, Func<LibraryBook, bool>>
                 {
-                    ["HasDownloads"] = lb => lb.Book.Supplements.Any(),
-                    ["HasDownload"] = lb => lb.Book.Supplements.Any(),
-                    ["Downloads"] = lb => lb.Book.Supplements.Any(),
-                    ["Download"] = lb => lb.Book.Supplements.Any(),
-                    ["HasPDFs"] = lb => lb.Book.Supplements.Any(),
-                    ["HasPDF"] = lb => lb.Book.Supplements.Any(),
-                    ["PDFs"] = lb => lb.Book.Supplements.Any(),
-                    ["PDF"] = lb => lb.Book.Supplements.Any(),
+                    ["HasDownloads"] = lb => lb.Book.HasPdf,
+                    ["HasDownload"] = lb => lb.Book.HasPdf,
+                    ["Downloads"] = lb => lb.Book.HasPdf,
+                    ["Download"] = lb => lb.Book.HasPdf,
+                    ["HasPDFs"] = lb => lb.Book.HasPdf,
+                    ["HasPDF"] = lb => lb.Book.HasPdf,
+                    ["PDFs"] = lb => lb.Book.HasPdf,
+                    ["PDF"] = lb => lb.Book.HasPdf,
 
                     ["IsRated"] = lb => lb.Book.UserDefinedItem.Rating.OverallRating > 0f,
                     ["Rated"] = lb => lb.Book.UserDefinedItem.Rating.OverallRating > 0f,
@@ -139,9 +139,7 @@ namespace LibationSearchEngine
             return authors.Intersect(narrators).Any();
         }
 
-        private static bool isLiberated(Book book)
-            => book.UserDefinedItem.BookStatus == LiberatedStatus.Liberated
-            || AudibleFileStorage.Audio.Exists(book.AudibleProductId);
+        private static bool isLiberated(Book book) => book.UserDefinedItem.BookStatus == LiberatedStatus.Liberated;
         private static bool liberatedError(Book book) => book.UserDefinedItem.BookStatus == LiberatedStatus.Error;
 
         // use these common fields in the "all" default search field

LibationWinForms/AsyncNotifyPropertyChanged.cs

@@ -1,6 +1,6 @@
-using System.ComponentModel;
+using Dinah.Core.Threading;
+using System.ComponentModel;
 using System.Runtime.CompilerServices;
-using System.Threading;
 
 namespace LibationWinForms
 {
@@ -8,9 +8,7 @@ namespace LibationWinForms
 	{
 		public event PropertyChangedEventHandler PropertyChanged;
 
-		public AsyncNotifyPropertyChanged() { }
-
-		protected void NotifyPropertyChanged([CallerMemberName] string propertyName = "")
-			=>BeginInvoke(PropertyChanged, new object[] { this, new PropertyChangedEventArgs(propertyName) });
+		public void NotifyPropertyChanged([CallerMemberName] string propertyName = "")
+			=> this.UIThread(() => PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName)));
 	}
 }

LibationWinForms/BookLiberation/AudioDecodeForm.cs

@@ -39,7 +39,6 @@ namespace LibationWinForms.BookLiberation
 		#endregion
 
 		#region IStreamable event handler overrides
-		public override void OnStreamingBegin(object sender, string beginString) { }
 		public override void OnStreamingProgressChanged(object sender, DownloadProgress downloadProgress)
 		{
 			if (!downloadProgress.ProgressPercentage.HasValue)
@@ -54,7 +53,6 @@ namespace LibationWinForms.BookLiberation
 		public override void OnStreamingTimeRemaining(object sender, TimeSpan timeRemaining)
 			=> updateRemainingTime((int)timeRemaining.TotalSeconds);
 
-		public override void OnStreamingCompleted(object sender, string completedString) { }
 		#endregion
 
 		#region IAudioDecodable event handlers

LibationWinForms/BookLiberation/BaseForms/LiberationBaseForm.cs

@@ -1,6 +1,6 @@
 using DataLayer;
 using Dinah.Core.Net.Http;
-using Dinah.Core.Windows.Forms;
+using Dinah.Core.Threading;
 using FileLiberator;
 using System;
 using System.Windows.Forms;
@@ -48,7 +48,7 @@ namespace LibationWinForms.BookLiberation.BaseForms
 			streamable.StreamingCompleted += OnStreamingCompleted;
 			streamable.StreamingCompleted += OnStreamingCompletedClose;
 
-			FormClosed += UnsubscribeStreamable;
+			Disposed += UnsubscribeStreamable;
 		}
 		private void Subscribe(IProcessable processable)
 		{
@@ -81,7 +81,7 @@ namespace LibationWinForms.BookLiberation.BaseForms
 		}
 		private void UnsubscribeStreamable(object sender, EventArgs e)
 		{
-			FormClosed -= UnsubscribeStreamable;
+			Disposed -= UnsubscribeStreamable;
 
 			Streamable.StreamingBegin -= OnStreamingBeginShow;
 			Streamable.StreamingBegin -= OnStreamingBegin;
@@ -122,8 +122,8 @@ namespace LibationWinForms.BookLiberation.BaseForms
 		/// <summary>
 		/// If the form was shown using Show (not ShowDialog), Form.Close calls Form.Dispose
 		/// </summary>
-		private void OnStreamingCompletedClose(object sender, string completedString) => this.UIThread(() => Close());
-		private void OnCompletedDispose(object sender, LibraryBook e) => this.UIThread(() => Dispose());
+		private void OnStreamingCompletedClose(object sender, string completedString) => this.UIThread(Close);
+		private void OnCompletedDispose(object sender, LibraryBook e) => this.UIThread(Dispose);
 
 		/// <summary>
 		/// If StreamingBegin is fired from a worker thread, the window will be created on that
@@ -132,7 +132,7 @@ namespace LibationWinForms.BookLiberation.BaseForms
 		/// could cause it to freeze. Form.BeginInvoke won't work until the form is created 
 		/// (ie. shown) because Control doesn't get a window handle until it is Shown.
 		/// </summary>
-		private void OnStreamingBeginShow(object sender, string beginString) => Invoker.Invoke(Show);
+		private void OnStreamingBeginShow(object sender, string beginString) => Invoker.UIThread(Show);
 		
 		#endregion
 

LibationWinForms/BookLiberation/ProcessorAutomationController.cs

@@ -50,24 +50,24 @@ namespace LibationWinForms.BookLiberation
 
 	public static class ProcessorAutomationController
 	{
-		public static async Task BackupSingleBookAsync(LibraryBook libraryBook, EventHandler<LibraryBook> completedAction = null)
+		public static async Task BackupSingleBookAsync(LibraryBook libraryBook)
 		{
 			Serilog.Log.Logger.Information($"Begin {nameof(BackupSingleBookAsync)} {{@DebugInfo}}", new { libraryBook?.Book?.AudibleProductId });
 
 			var logMe = LogMe.RegisterForm();
-			var backupBook = CreateBackupBook(completedAction, logMe);
+			var backupBook = CreateBackupBook(logMe);
 
 			// continue even if libraryBook is null. we'll display even that in the processing box
 			await new BackupSingle(logMe, backupBook, libraryBook).RunBackupAsync();
 		}
 
-		public static async Task BackupAllBooksAsync(EventHandler<LibraryBook> completedAction = null)
+		public static async Task BackupAllBooksAsync()
 		{
 			Serilog.Log.Logger.Information("Begin " + nameof(BackupAllBooksAsync));
 
 			var automatedBackupsForm = new AutomatedBackupsForm();
 			var logMe = LogMe.RegisterForm(automatedBackupsForm);
-			var backupBook = CreateBackupBook(completedAction, logMe);
+			var backupBook = CreateBackupBook(logMe);
 
 			await new BackupLoop(logMe, backupBook, automatedBackupsForm).RunBackupAsync();
 		}
@@ -84,19 +84,19 @@ namespace LibationWinForms.BookLiberation
 			await new BackupLoop(logMe, convertBook, automatedBackupsForm).RunBackupAsync();
 		}
 
-		public static async Task BackupAllPdfsAsync(EventHandler<LibraryBook> completedAction = null)
+		public static async Task BackupAllPdfsAsync()
 		{
 			Serilog.Log.Logger.Information("Begin " + nameof(BackupAllPdfsAsync));
 
 			var automatedBackupsForm = new AutomatedBackupsForm();
 			var logMe = LogMe.RegisterForm(automatedBackupsForm);
 
-			var downloadPdf = CreateProcessable<DownloadPdf, PdfDownloadForm>(logMe, completedAction);
+			var downloadPdf = CreateProcessable<DownloadPdf, PdfDownloadForm>(logMe);
 
 			await new BackupLoop(logMe, downloadPdf, automatedBackupsForm).RunBackupAsync();
 		}
 
-		private static IProcessable CreateBackupBook(EventHandler<LibraryBook> completedAction, LogMe logMe)
+		private static IProcessable CreateBackupBook(LogMe logMe)
 		{
 			var downloadPdf = CreateProcessable<DownloadPdf, PdfDownloadForm>(logMe);
 
@@ -104,7 +104,6 @@ namespace LibationWinForms.BookLiberation
 			async void onDownloadDecryptBookCompleted(object sender, LibraryBook e)
 			{
 				await downloadPdf.TryProcessAsync(e);
-				completedAction(sender, e);
 			}
 
 			var downloadDecryptBook = CreateProcessable<DownloadDecryptBook, AudioDecryptForm>(logMe, onDownloadDecryptBookCompleted);
@@ -176,7 +175,7 @@ namespace LibationWinForms.BookLiberation
 		protected abstract string SkipDialogText { get; }
 		protected abstract MessageBoxButtons SkipDialogButtons { get; }
 		protected abstract MessageBoxDefaultButton SkipDialogDefaultButton { get; }
-		protected abstract DialogResult CreateSkipFileResult { get; }
+		protected abstract DialogResult SkipResult { get; }
 
 		public async Task RunBackupAsync()
 		{
@@ -244,15 +243,10 @@ $@"  Title: {libraryBook.Book.Title}
 			if (dialogResult == DialogResult.Abort)
 				return false;
 
-			if (dialogResult == CreateSkipFileResult)
+			if (dialogResult == SkipResult)
 			{
-				ApplicationServices.LibraryCommands.UpdateBook(libraryBook, LiberatedStatus.Error, null);
-				var path = FileManager.AudibleFileStorage.Audio.CreateSkipFile(libraryBook.Book.Title, libraryBook.Book.AudibleProductId, logMessage);
-				LogMe.Info($@"
-Created new 'skip' file
-  [{libraryBook.Book.AudibleProductId}] {libraryBook.Book.Title}
-  {path}
-".Trim());
+				libraryBook.Book.UserDefinedItem.BookStatus = LiberatedStatus.Error;
+				LogMe.Info($"Error. Skip: [{libraryBook.Book.AudibleProductId}] {libraryBook.Book.Title}");
 			}
 
 			return true;
@@ -273,7 +267,7 @@ An error occurred while trying to process this book. Skip this book permanently?
 ".Trim();
 		protected override MessageBoxButtons SkipDialogButtons => MessageBoxButtons.YesNo;
 		protected override MessageBoxDefaultButton SkipDialogDefaultButton => MessageBoxDefaultButton.Button2;
-		protected override DialogResult CreateSkipFileResult => DialogResult.Yes;
+		protected override DialogResult SkipResult => DialogResult.Yes;
 
 		public BackupSingle(LogMe logMe, IProcessable processable, LibraryBook libraryBook)
 			: base(logMe, processable)
@@ -302,7 +296,7 @@ An error occurred while trying to process this book.
 ".Trim();
 		protected override MessageBoxButtons SkipDialogButtons => MessageBoxButtons.AbortRetryIgnore;
 		protected override MessageBoxDefaultButton SkipDialogDefaultButton => MessageBoxDefaultButton.Button1;
-		protected override DialogResult CreateSkipFileResult => DialogResult.Ignore;
+		protected override DialogResult SkipResult => DialogResult.Ignore;
 
 		public BackupLoop(LogMe logMe, IProcessable processable, AutomatedBackupsForm automatedBackupsForm)
 			: base(logMe, processable, automatedBackupsForm) { }
@@ -310,7 +304,7 @@ An error occurred while trying to process this book.
 		protected override async Task RunAsync()
 		{
 			// support for 'skip this time only' requires state. iterators provide this state for free. therefore: use foreach/iterator here
-			foreach (var libraryBook in Processable.GetValidLibraryBooks())
+			foreach (var libraryBook in Processable.GetValidLibraryBooks(ApplicationServices.DbContexts.GetContext().GetLibrary_Flat_NoTracking()))
 			{
 				var keepGoing = await ProcessOneAsync(libraryBook, validate: false);
 				if (!keepGoing)

LibationWinForms/DataGridViewImageButtonCell.cs

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

LibationWinForms/DataGridViewImageButtonColumn.cs

@@ -1,50 +0,0 @@
-using System.Drawing;
-using System.Windows.Forms;
-
-namespace LibationWinForms
-{
-	public abstract class DataGridViewImageButtonColumn : DataGridViewButtonColumn
-	{
-		private DataGridViewImageButtonCell _cellTemplate;
-		public override DataGridViewCell CellTemplate
-		{
-			get => GetCellTemplate();
-			set
-			{
-				if (value is DataGridViewImageButtonCell cellTemplate)
-					_cellTemplate = cellTemplate;
-			}
-		}
-
-		protected abstract DataGridViewImageButtonCell NewCell();
-
-		private DataGridViewImageButtonCell GetCellTemplate()
-		{
-			if (_cellTemplate is null)
-				return NewCell();
-			else
-				return _cellTemplate;
-		}
-
-		public override object Clone()
-		{
-			var clone = (DataGridViewImageButtonColumn)base.Clone();
-			clone._cellTemplate = _cellTemplate;
-
-			return clone;
-		}
-	}
-
-	public class DataGridViewImageButtonCell : DataGridViewButtonCell
-	{
-		protected void DrawButtonImage(Graphics graphics, Image image, Rectangle cellBounds)
-		{
-			var w = image.Width;
-			var h = image.Height;
-			var x = cellBounds.Left + (cellBounds.Width - w) / 2;
-			var y = cellBounds.Top + (cellBounds.Height - h) / 2;
-
-			graphics.DrawImage(image, new Rectangle(x, y, w, h));
-		}
-	}
-}

LibationWinForms/Dialogs/BookDetailsDialog.Designer.cs

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

LibationWinForms/Dialogs/BookDetailsDialog.cs

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

LibationWinForms/Dialogs/BookDetailsDialog.resx

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

LibationWinForms/EditTagsDataGridViewImageButtonColumn.cs

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

LibationWinForms/Form1.cs

@@ -50,7 +50,6 @@ namespace LibationWinForms
 
 			// also applies filter. ONLY call AFTER loading grid
 			loadInitialQuickFilterState();
-			
 		}
 
 		private void Form1_FormClosing(object sender, FormClosingEventArgs e)
@@ -172,26 +171,26 @@ namespace LibationWinForms
 		#region bottom: backup counts
 		private async void setBackupCountsAsync(object _, object __)
 		{
-			LibraryCommands.LibraryStats libraryStats = null;
-			await Task.Run(() => libraryStats = LibraryCommands.GetCounts());
+			var libraryStats = await Task.Run(() => LibraryCommands.GetCounts());
 
-			setBookBackupCounts(libraryStats.booksFullyBackedUp, libraryStats.booksDownloadedOnly, libraryStats.booksNoProgress);
-			setPdfBackupCounts(libraryStats.pdfsDownloaded, libraryStats.pdfsNotDownloaded);
+			setBookBackupCounts(libraryStats);
+			setPdfBackupCounts(libraryStats);
 		}
-		private void setBookBackupCounts(int booksFullyBackedUp, int booksDownloadedOnly, int booksNoProgress)
+		private void setBookBackupCounts(LibraryCommands.LibraryStats libraryStats)
 		{
 			var backupsCountsLbl_Format = "BACKUPS: No progress: {0}  Encrypted: {1}  Fully backed up: {2}";
 
 			// enable/disable export
-			var hasResults = 0 < (booksFullyBackedUp + booksDownloadedOnly + booksNoProgress);
+			var hasResults = 0 < (libraryStats.booksFullyBackedUp + libraryStats.booksDownloadedOnly + libraryStats.booksNoProgress + libraryStats.booksError);
 			exportLibraryToolStripMenuItem.Enabled = hasResults;
 
 			// update bottom numbers
-			var pending = booksNoProgress + booksDownloadedOnly;
+			var pending = libraryStats.booksNoProgress + libraryStats.booksDownloadedOnly;
 			var statusStripText
 				= !hasResults ? "No books. Begin by importing your library"
-				: pending > 0 ? string.Format(backupsCountsLbl_Format, booksNoProgress, booksDownloadedOnly, booksFullyBackedUp)
-				: $"All {"book".PluralizeWithCount(booksFullyBackedUp)} backed up";
+				: libraryStats.booksError > 0 ? string.Format(backupsCountsLbl_Format + "  Errors: {3}", libraryStats.booksNoProgress, libraryStats.booksDownloadedOnly, libraryStats.booksFullyBackedUp, libraryStats.booksError)
+				: pending > 0 ? string.Format(backupsCountsLbl_Format, libraryStats.booksNoProgress, libraryStats.booksDownloadedOnly, libraryStats.booksFullyBackedUp)
+				: $"All {"book".PluralizeWithCount(libraryStats.booksFullyBackedUp)} backed up";
 
 			// update menu item
 			var menuItemText
@@ -204,26 +203,26 @@ namespace LibationWinForms
 			menuStrip1.UIThread(() => beginBookBackupsToolStripMenuItem.Enabled = pending > 0);
 			menuStrip1.UIThread(() => beginBookBackupsToolStripMenuItem.Text = string.Format(beginBookBackupsToolStripMenuItem_format, menuItemText));
 		}
-		private void setPdfBackupCounts(int pdfsDownloaded, int pdfsNotDownloaded)
+		private void setPdfBackupCounts(LibraryCommands.LibraryStats libraryStats)
 		{
 			var pdfsCountsLbl_Format = "|  PDFs: NOT d/l\'ed: {0}  Downloaded: {1}";
 
 			// update bottom numbers
-			var hasResults = 0 < (pdfsNotDownloaded + pdfsDownloaded);
+			var hasResults = 0 < (libraryStats.pdfsNotDownloaded + libraryStats.pdfsDownloaded);
 			var statusStripText
 				= !hasResults ? ""
-				: pdfsNotDownloaded > 0 ? string.Format(pdfsCountsLbl_Format, pdfsNotDownloaded, pdfsDownloaded)
-				: $"|  All {pdfsDownloaded} PDFs downloaded";
+				: libraryStats.pdfsNotDownloaded > 0 ? string.Format(pdfsCountsLbl_Format, libraryStats.pdfsNotDownloaded, libraryStats.pdfsDownloaded)
+				: $"|  All {libraryStats.pdfsDownloaded} PDFs downloaded";
 
 			// update menu item
 			var menuItemText
-				= pdfsNotDownloaded > 0
-				? $"{pdfsNotDownloaded} remaining"
+				= libraryStats.pdfsNotDownloaded > 0
+				? $"{libraryStats.pdfsNotDownloaded} remaining"
 				: "All PDFs have been downloaded";
 
 			// update UI
 			statusStrip1.UIThread(() => pdfsCountsLbl.Text = statusStripText);
-			menuStrip1.UIThread(() => beginPdfBackupsToolStripMenuItem.Enabled = pdfsNotDownloaded > 0);
+			menuStrip1.UIThread(() => beginPdfBackupsToolStripMenuItem.Enabled = libraryStats.pdfsNotDownloaded > 0);
 			menuStrip1.UIThread(() => beginPdfBackupsToolStripMenuItem.Text = string.Format(beginPdfBackupsToolStripMenuItem_format, menuItemText));
 		}
 		#endregion
@@ -384,15 +383,14 @@ namespace LibationWinForms
 
 		#region liberate menu
 		private async void beginBookBackupsToolStripMenuItem_Click(object sender, EventArgs e)
-			=> await BookLiberation.ProcessorAutomationController.BackupAllBooksAsync(updateGridRow);
+			=> await BookLiberation.ProcessorAutomationController.BackupAllBooksAsync();
 
 		private async void beginPdfBackupsToolStripMenuItem_Click(object sender, EventArgs e)
-			=> await BookLiberation.ProcessorAutomationController.BackupAllPdfsAsync(updateGridRow);
+			=> await BookLiberation.ProcessorAutomationController.BackupAllPdfsAsync();
 
 		private async void convertAllM4bToMp3ToolStripMenuItem_Click(object sender, EventArgs e)
 			=> await BookLiberation.ProcessorAutomationController.ConvertAllBooksAsync();
 
-		private void updateGridRow(object _, LibraryBook libraryBook) => currProductsGrid.RefreshRow(libraryBook.Book.AudibleProductId);
 		#endregion
 
 		#region Export menu

LibationWinForms/GridEntry.cs

@@ -7,10 +7,14 @@ using System.Linq;
 using ApplicationServices;
 using DataLayer;
 using Dinah.Core.DataBinding;
+using Dinah.Core;
 using Dinah.Core.Drawing;
 
 namespace LibationWinForms
 {
+	/// <summary>
+	/// The View Model for a LibraryBook
+	/// </summary>
 	internal class GridEntry : AsyncNotifyPropertyChanged, IMemberComparable
 	{
 		#region implementation properties
@@ -25,12 +29,15 @@ namespace LibationWinForms
 
 		private Book Book => LibraryBook.Book;
 		private Image _cover;
+		private Action Refilter { get; }
 
-		public GridEntry(LibraryBook libraryBook)
+		public GridEntry(LibraryBook libraryBook, Action refilterOnChanged = null)
 		{
 			LibraryBook = libraryBook;
+			Refilter = refilterOnChanged;
 			_memberValues = CreateMemberValueDictionary();
 
+
 			//Get cover art. If it's default, subscribe to PictureCached
 			{
 				(bool isDefault, byte[] picture) = FileManager.PictureStorage.GetPicture(new FileManager.PictureDefinition(Book.PictureId, FileManager.PictureSize._80x80));
@@ -47,9 +54,9 @@ namespace LibationWinForms
 				Title = Book.Title;
 				Series = Book.SeriesNames;
 				Length = Book.LengthInMinutes == 0 ? "" : $"{Book.LengthInMinutes / 60} hr {Book.LengthInMinutes % 60} min";
-				MyRating = ValueOrDefault(Book.UserDefinedItem.Rating?.ToStarString(), "");
+				MyRating = Book.UserDefinedItem.Rating?.ToStarString()?.DefaultIfNullOrWhiteSpace("");
 				PurchaseDate = libraryBook.DateAdded.ToString("d");
-				ProductRating = ValueOrDefault(Book.Rating?.ToStarString(), "");
+				ProductRating = Book.Rating?.ToStarString()?.DefaultIfNullOrWhiteSpace("");
 				Authors = Book.AuthorNames;
 				Narrators = Book.NarratorNames;
 				Category = string.Join(" > ", Book.CategoriesNames);
@@ -57,7 +64,7 @@ namespace LibationWinForms
 				Description = GetDescriptionDisplay(Book);
 			}
 
-			//DisplayTags and Liberate properties are live.
+			UserDefinedItem.ItemChanged += UserDefinedItem_ItemChanged;
 		}
 
 		private void PictureStorage_PictureCached(object sender, FileManager.PictureCachedEventArgs e)
@@ -69,8 +76,78 @@ namespace LibationWinForms
 			}
 		}
 
-		#region Data Source properties
+		#region detect changes to the model, update the view, and save to database.
 
+		/// <summary>
+		/// This event handler receives notifications from the model that it has changed.
+		/// Save to the database and notify the view that it's changed.
+		/// </summary>
+		private void UserDefinedItem_ItemChanged(object sender, string itemName)
+		{
+			var udi = sender as UserDefinedItem;
+
+			if (udi.Book.AudibleProductId != Book.AudibleProductId)
+				return;
+
+			switch (itemName)
+			{
+				case nameof(udi.Tags):
+					{
+						Book.UserDefinedItem.Tags = udi.Tags;
+						NotifyPropertyChanged(nameof(DisplayTags));
+					}
+					break;
+				case nameof(udi.BookStatus):
+					{
+						Book.UserDefinedItem.BookStatus = udi.BookStatus;
+						NotifyPropertyChanged(nameof(Liberate));
+					}
+					break;
+				case nameof(udi.PdfStatus):
+					{
+						Book.UserDefinedItem.PdfStatus = udi.PdfStatus;
+						NotifyPropertyChanged(nameof(Liberate));
+					}
+					break;
+			}
+
+			if (!suspendCommit)
+				Commit();
+		}
+		private bool suspendCommit = false;
+
+		/// <summary>
+		/// Begin editing the model, suspending commits until <see cref="EndEdit"/> is called.
+		/// </summary>
+		public void BeginEdit() => suspendCommit = true;
+
+		/// <summary>
+		/// Save all edits to the database.
+		/// </summary>
+		public void EndEdit()
+		{
+			Commit();
+			suspendCommit = false;
+		}
+
+		private void Commit()
+		{
+			// We don't want LiberatedStatus.PartialDownload to be a persistent status.
+			// If display/icon status is PartialDownload then save NotLiberated to db then restore PartialDownload for display
+			var displayStatus = Book.UserDefinedItem.BookStatus;
+			var saveStatus = displayStatus == LiberatedStatus.PartialDownload ? LiberatedStatus.NotLiberated : displayStatus;
+			Book.UserDefinedItem.BookStatus = saveStatus;
+
+			LibraryCommands.UpdateUserDefinedItem(Book);
+
+			Book.UserDefinedItem.BookStatus = displayStatus;
+
+			Refilter?.Invoke();
+		}
+
+		#endregion	
+
+		#region Model properties exposed to the view
 		public Image Cover
 		{
 			get
@@ -95,8 +172,23 @@ namespace LibationWinForms
 		public string Category { get; }
 		public string Misc { get; }
 		public string Description { get; }
-		public string DisplayTags => string.Join("\r\n", Book.UserDefinedItem.TagsEnumerated);
-		public (LiberatedState, PdfState) Liberate => (LibraryCommands.Liberated_Status(Book), LibraryCommands.Pdf_Status(Book));
+		public string DisplayTags
+		{
+			get => string.Join("\r\n", Book.UserDefinedItem.TagsEnumerated);
+			set => Book.UserDefinedItem.Tags = value;
+		}
+		// these 2 values being in 1 field is the trick behind getting the liberated+pdf 'stoplight' icon to draw. See: LiberateDataGridViewImageButtonCell.Paint
+		public (LiberatedStatus BookStatus, LiberatedStatus? PdfStatus) Liberate
+		{
+			get => (LibraryCommands.Liberated_Status(LibraryBook.Book), LibraryCommands.Pdf_Status(LibraryBook.Book));
+			
+			set
+			{
+				LibraryBook.Book.UserDefinedItem.BookStatus = value.BookStatus;
+				LibraryBook.Book.UserDefinedItem.PdfStatus = value.PdfStatus;
+			}
+		}
+
 		#endregion
 
 		#region Data Sorting
@@ -120,7 +212,7 @@ namespace LibationWinForms
 			{ nameof(Category), () => Category },
 			{ nameof(Misc), () => Misc },
 			{ nameof(DisplayTags), () => DisplayTags },
-			{ nameof(Liberate), () => Liberate.Item1 }
+			{ nameof(Liberate), () => Liberate.BookStatus }
 		};
 
 		// Instantiate comparers for every exposed member object type.
@@ -130,7 +222,7 @@ namespace LibationWinForms
 			{ typeof(int), new ObjectComparer<int>() },
 			{ typeof(float), new ObjectComparer<float>() },
 			{ typeof(DateTime), new ObjectComparer<DateTime>() },
-			{ typeof(LiberatedState), new ObjectComparer<LiberatedState>() },
+			{ typeof(LiberatedStatus), new ObjectComparer<LiberatedStatus>() },
 		};
 
 		public virtual object GetMemberValue(string memberName) => _memberValues[memberName]();
@@ -154,37 +246,7 @@ namespace LibationWinForms
 		#endregion
 
 		#region Static library display functions
-
-		public static (string mouseoverText, Bitmap buttonImage) GetLiberateDisplay(LiberatedState liberatedStatus, PdfState pdfStatus)
-		{
-			(string libState, string image_lib) = liberatedStatus switch
-			{
-				LiberatedState.Liberated => ("Liberated", "green"),
-				LiberatedState.PartialDownload => ("File has been at least\r\npartially downloaded", "yellow"),
-				LiberatedState.NotDownloaded => ("Book NOT downloaded", "red"),
-				_ => throw new Exception("Unexpected liberation state")
-			};
-
-			(string pdfState, string image_pdf) = pdfStatus switch
-			{
-				PdfState.Downloaded => ("\r\nPDF downloaded", "_pdf_yes"),
-				PdfState.NotDownloaded => ("\r\nPDF NOT downloaded", "_pdf_no"),
-				PdfState.NoPdf => ("", ""),
-				_ => throw new Exception("Unexpected PDF state")
-			};
-
-			var mouseoverText = libState + pdfState;
-
-			if (liberatedStatus == LiberatedState.NotDownloaded ||
-				liberatedStatus == LiberatedState.PartialDownload ||
-				pdfStatus == PdfState.NotDownloaded)
-				mouseoverText += "\r\nClick to complete";
-
-			var buttonImage = (Bitmap)Properties.Resources.ResourceManager.GetObject($"liberate_{image_lib}{image_pdf}");
-
-			return (mouseoverText, buttonImage);
-		}
-
+		
 		/// <summary>
 		/// This information should not change during <see cref="GridEntry"/> lifetime, so call only once.
 		/// </summary>
@@ -207,8 +269,8 @@ namespace LibationWinForms
 		{
 			var details = new List<string>();
 
-			var locale = ValueOrDefault(libraryBook.Book.Locale, "[unknown]");
-			var acct = ValueOrDefault(libraryBook.Account, "[unknown]");
+			var locale = libraryBook.Book.Locale.DefaultIfNullOrWhiteSpace("[unknown]");
+			var acct = libraryBook.Account.DefaultIfNullOrWhiteSpace("[unknown]");
 
 			details.Add($"Account: {locale} - {acct}");
 
@@ -228,10 +290,12 @@ namespace LibationWinForms
 			return string.Join("\r\n", details);
 		}
 
-		//Maybe add to Dinah StringExtensions?
-		private static string ValueOrDefault(string value, string defaultValue)
-			=> string.IsNullOrWhiteSpace(value) ? defaultValue : value;
-
 		#endregion
+
+		~GridEntry()
+		{
+			UserDefinedItem.ItemChanged -= UserDefinedItem_ItemChanged;
+			FileManager.PictureStorage.PictureCached -= PictureStorage_PictureCached;
+		}
 	}
 }

LibationWinForms/LibationWinForms.csproj

@@ -13,7 +13,11 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\Dinah.Core\Dinah.Core.WindowsDesktop\Dinah.Core.WindowsDesktop.csproj" />
+    <PackageReference Include="Dinah.Core.WindowsDesktop" Version="1.0.2.1" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\ApplicationServices\ApplicationServices.csproj" />
     <ProjectReference Include="..\FileLiberator\FileLiberator.csproj" />
   </ItemGroup>
 

LibationWinForms/LiberateDataGridViewImageButtonColumn.cs

@@ -3,13 +3,16 @@ using System;
 using System.Drawing;
 using System.Windows.Forms;
 using System.Linq;
+using DataLayer;
 
 namespace LibationWinForms
 {
-	public class LiberateDataGridViewImageButtonColumn : DataGridViewImageButtonColumn
+	public class LiberateDataGridViewImageButtonColumn : DataGridViewButtonColumn
 	{
-		protected override DataGridViewImageButtonCell NewCell()
-			=> new LiberateDataGridViewImageButtonCell();
+		public LiberateDataGridViewImageButtonColumn()
+		{
+			CellTemplate = new LiberateDataGridViewImageButtonCell();
+		}
 	}
 
 	internal class LiberateDataGridViewImageButtonCell : DataGridViewImageButtonCell
@@ -18,14 +21,50 @@ namespace LibationWinForms
 		{
 			base.Paint(graphics, clipBounds, cellBounds, rowIndex, elementState, null, null, null, cellStyle, advancedBorderStyle, paintParts);
 
-			if (value is (LiberatedState liberatedState, PdfState pdfState))
+			if (value is (LiberatedStatus, LiberatedStatus) or (LiberatedStatus, null))
 			{
-				(string mouseoverText, Bitmap buttonImage) = GridEntry.GetLiberateDisplay(liberatedState, pdfState);
+				var (bookState, pdfState) = ((LiberatedStatus bookState, LiberatedStatus? pdfState))value;
+
+				(string mouseoverText, Bitmap buttonImage) = GetLiberateDisplay(bookState, pdfState);
 
 				DrawButtonImage(graphics, buttonImage, cellBounds);
 
 				ToolTipText = mouseoverText;
 			}
 		}
+
+		private static (string mouseoverText, Bitmap buttonImage) GetLiberateDisplay(LiberatedStatus liberatedStatus, LiberatedStatus? pdfStatus)
+		{
+			if (liberatedStatus == LiberatedStatus.Error)
+				return ("Book downloaded ERROR", SystemIcons.Error.ToBitmap());
+
+			(string libState, string image_lib) = liberatedStatus switch
+			{
+				LiberatedStatus.Liberated => ("Liberated", "green"),
+				LiberatedStatus.PartialDownload => ("File has been at least\r\npartially downloaded", "yellow"),
+				LiberatedStatus.NotLiberated => ("Book NOT downloaded", "red"),
+				_ => throw new Exception("Unexpected liberation state")
+			};
+
+			(string pdfState, string image_pdf) = pdfStatus switch
+			{
+				LiberatedStatus.Liberated => ("\r\nPDF downloaded", "_pdf_yes"),
+				LiberatedStatus.NotLiberated => ("\r\nPDF NOT downloaded", "_pdf_no"),
+				LiberatedStatus.Error => ("\r\nPDF downloaded ERROR", "_pdf_no"),
+				null => ("", ""),
+				_ => throw new Exception("Unexpected PDF state")
+			};
+
+			var mouseoverText = libState + pdfState;
+
+			if (liberatedStatus == LiberatedStatus.NotLiberated ||
+				liberatedStatus == LiberatedStatus.PartialDownload ||
+				pdfStatus == LiberatedStatus.NotLiberated)
+				mouseoverText += "\r\nClick to complete";
+
+			var buttonImage = (Bitmap)Properties.Resources.ResourceManager.GetObject($"liberate_{image_lib}{image_pdf}");
+
+			return (mouseoverText, buttonImage);
+		}
 	}
 }

LibationWinForms/ProductsGrid.Designer.cs

@@ -92,7 +92,7 @@
             this.gridEntryDataGridView.ReadOnly = true;
             this.gridEntryDataGridView.RowHeadersVisible = false;
             this.gridEntryDataGridView.RowTemplate.Height = 82;
-            this.gridEntryDataGridView.Size = new System.Drawing.Size(1505, 380);
+            this.gridEntryDataGridView.Size = new System.Drawing.Size(1510, 380);
             this.gridEntryDataGridView.TabIndex = 0;
             // 
             // dataGridViewImageButtonBoxColumn1
@@ -103,7 +103,7 @@
             this.dataGridViewImageButtonBoxColumn1.ReadOnly = true;
             this.dataGridViewImageButtonBoxColumn1.Resizable = System.Windows.Forms.DataGridViewTriState.False;
             this.dataGridViewImageButtonBoxColumn1.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
-            this.dataGridViewImageButtonBoxColumn1.Width = 70;
+            this.dataGridViewImageButtonBoxColumn1.Width = 75;
             // 
             // dataGridViewImageColumn1
             // 
@@ -200,7 +200,7 @@
             // dataGridViewImageButtonBoxColumn2
             // 
             this.dataGridViewImageButtonBoxColumn2.DataPropertyName = "DisplayTags";
-            this.dataGridViewImageButtonBoxColumn2.HeaderText = "Edit Tags";
+            this.dataGridViewImageButtonBoxColumn2.HeaderText = "Tags and Details";
             this.dataGridViewImageButtonBoxColumn2.Name = "dataGridViewImageButtonBoxColumn2";
             this.dataGridViewImageButtonBoxColumn2.ReadOnly = true;
             this.dataGridViewImageButtonBoxColumn2.Resizable = System.Windows.Forms.DataGridViewTriState.False;
@@ -213,7 +213,7 @@
             this.Controls.Add(this.gridEntryDataGridView);
             this.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.Name = "ProductsGrid";
-            this.Size = new System.Drawing.Size(1505, 380);
+            this.Size = new System.Drawing.Size(1510, 380);
             ((System.ComponentModel.ISupportInitialize)(this.gridEntryBindingSource)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.gridEntryDataGridView)).EndInit();
             this.ResumeLayout(false);

LibationWinForms/ProductsGrid.cs

@@ -67,7 +67,7 @@ namespace LibationWinForms
 					await Liberate_Click(liveGridEntry);
 					break;
 				case nameof(liveGridEntry.DisplayTags):
-					EditTags_Click(liveGridEntry);
+					Details_Click(liveGridEntry);
 					break;
 			}
 		}
@@ -77,30 +77,32 @@ namespace LibationWinForms
 			var libraryBook = liveGridEntry.LibraryBook;
 
 			// liberated: open explorer to file
-			if (TransitionalFileLocator.Audio_Exists(libraryBook.Book))
+			if (libraryBook.Book.Audio_Exists)
 			{
-				var filePath = TransitionalFileLocator.Audio_GetPath(libraryBook.Book);
+				var filePath = FileManager.AudibleFileStorage.Audio.GetPath(libraryBook.Book.AudibleProductId);
 				if (!Go.To.File(filePath))
 					MessageBox.Show($"File not found:\r\n{filePath}");
 				return;
 			}
 
 			// else: liberate
-			await BookLiberation.ProcessorAutomationController.BackupSingleBookAsync(libraryBook, (_, __) => RefreshRow(libraryBook.Book.AudibleProductId));
+			await BookLiberation.ProcessorAutomationController.BackupSingleBookAsync(libraryBook);
 		}
 
-		private void EditTags_Click(GridEntry liveGridEntry)
+		private void Details_Click(GridEntry liveGridEntry)
 		{
-			var bookDetailsForm = new BookDetailsDialog(liveGridEntry.Title, liveGridEntry.LibraryBook.Book.UserDefinedItem.Tags);
+			var bookDetailsForm = new BookDetailsDialog(liveGridEntry.LibraryBook);
 			if (bookDetailsForm.ShowDialog() != DialogResult.OK)
 				return;
 
-			var qtyChanges = LibraryCommands.UpdateTags(liveGridEntry.LibraryBook.Book, bookDetailsForm.NewTags);
-			if (qtyChanges == 0)
-				return;
+			liveGridEntry.BeginEdit();
 
-			//Re-apply filters
-			Filter();
+			liveGridEntry.DisplayTags = bookDetailsForm.NewTags;
+			liveGridEntry.Liberate = (bookDetailsForm.BookLiberatedStatus, bookDetailsForm.PdfLiberatedStatus);
+
+			liveGridEntry.EndEdit();
+
+			BackupCountsChanged?.Invoke(this, EventArgs.Empty);
 		}
 
 		#endregion
@@ -129,7 +131,7 @@ namespace LibationWinForms
 			}
 
 			var orderedGridEntries = lib
-				.Select(lb => new GridEntry(lb)).ToList()
+				.Select(lb => new GridEntry(lb, Filter)).ToList()
 				// default load order
 				.OrderByDescending(ge => (DateTime)ge.GetMemberValue(nameof(ge.PurchaseDate)))
 				//// more advanced example: sort by author, then series, then title
@@ -147,19 +149,6 @@ namespace LibationWinForms
 			BackupCountsChanged?.Invoke(this, EventArgs.Empty);
 		}
 
-		public void RefreshRow(string productId)
-		{
-			var rowIndex = getRowIndex((ge) => ge.AudibleProductId == productId);
-
-			// update cells incl Liberate button text
-			_dataGridView.InvalidateRow(rowIndex);
-
-			// needed in case filtering by -IsLiberated and it gets changed to Liberated. want to immediately show the change
-			Filter();
-
-			BackupCountsChanged?.Invoke(this, EventArgs.Empty);
-		}
-
 		#endregion
 
 		#region Filter
@@ -192,10 +181,7 @@ namespace LibationWinForms
 		#endregion
 
 		#region DataGridView Macro
-
-		private int getRowIndex(Func<GridEntry, bool> func) => _dataGridView.GetRowIdOfBoundItem(func);
 		private GridEntry getGridEntry(int rowIndex) => _dataGridView.GetBoundItem<GridEntry>(rowIndex);
-
 		#endregion
 	}
 }

LibationWinForms/Properties/Resources.Designer.cs

@@ -90,6 +90,26 @@ namespace LibationWinForms.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap edit_25x25 {
+            get {
+                object obj = ResourceManager.GetObject("edit_25x25", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap edit_64x64 {
+            get {
+                object obj = ResourceManager.GetObject("edit_64x64", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>

LibationWinForms/Properties/Resources.resx

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

LibationWinForms/SynchronizeInvoker.cs

@@ -1,122 +0,0 @@
-using System;
-using System.ComponentModel;
-using System.Threading;
-
-namespace LibationWinForms
-{
-	public class SynchronizeInvoker : ISynchronizeInvoke
-	{
-		public bool InvokeRequired => Thread.CurrentThread.ManagedThreadId != InstanceThreadId;
-		private int InstanceThreadId { get; set; } = Thread.CurrentThread.ManagedThreadId;
-		private SynchronizationContext SyncContext { get; } = SynchronizationContext.Current;
-
-		public SynchronizeInvoker()
-		{
-			if (SyncContext is null)
-				throw new NullReferenceException($"Could not capture a current {nameof(SynchronizationContext)}");
-		}
-
-		public IAsyncResult BeginInvoke(Action action) => BeginInvoke(action, null);
-		public IAsyncResult BeginInvoke(Delegate method) => BeginInvoke(method, null);
-		public IAsyncResult BeginInvoke(Delegate method, object[] args)
-		{
-			var tme = new ThreadMethodEntry(method, args);
-
-			if (InvokeRequired)
-			{
-				SyncContext.Post(OnSendOrPostCallback, tme);
-			}
-			else
-			{
-				tme.Complete();
-				tme.CompletedSynchronously = true;
-			}
-			return tme;
-		}
-
-		public object EndInvoke(IAsyncResult result)
-		{
-			if (result is not ThreadMethodEntry crossThread)
-				throw new ArgumentException($"{nameof(result)} was not returned by {nameof(SynchronizeInvoker)}.{nameof(BeginInvoke)}");
-
-			if (!crossThread.IsCompleted) 
-				crossThread.AsyncWaitHandle.WaitOne();
-
-			return crossThread.ReturnValue;
-		}
-
-		public object Invoke(Action action) => Invoke(action, null);
-		public object Invoke(Delegate method) => Invoke(method, null);
-		public object Invoke(Delegate method, object[] args)
-		{
-			var tme = new ThreadMethodEntry(method, args);
-
-			if (InvokeRequired)
-			{
-				SyncContext.Send(OnSendOrPostCallback, tme);
-			}
-			else
-			{
-				tme.Complete();
-				tme.CompletedSynchronously = true;
-			}
-
-			return tme.ReturnValue;
-		}
-
-		/// <summary>
-		/// This callback executes on the SynchronizationContext thread.
-		/// </summary>
-		private static void OnSendOrPostCallback(object asyncArgs)
-		{
-			var e = asyncArgs as ThreadMethodEntry;
-			e.Complete();
-		}
-
-		private class ThreadMethodEntry : IAsyncResult
-		{
-			public object AsyncState => null;
-			public bool CompletedSynchronously { get; internal set; }
-			public bool IsCompleted { get; private set; }
-			public object ReturnValue { get; private set; }
-			public WaitHandle AsyncWaitHandle => completedEvent;
-
-			private Delegate method;
-			private object[] args;
-			private ManualResetEvent completedEvent;
-
-			public ThreadMethodEntry(Delegate method, object[] args)
-			{
-				this.method = method;
-				this.args = args;
-				completedEvent = new ManualResetEvent(initialState: false);				
-			}
-
-			public void Complete()
-			{
-				try
-				{
-					switch (method)
-					{
-						case Action actiton:
-							actiton();
-							break;
-						default:
-							ReturnValue = method.DynamicInvoke(args);
-							break;
-					}
-				}
-				finally
-				{
-					IsCompleted = true;
-					completedEvent.Set();
-				}
-			}
-
-			~ThreadMethodEntry()
-			{
-				completedEvent.Close();
-			}
-		}
-	}
-}

REFERENCE.txt

@@ -52,11 +52,13 @@ publish win64 platform, single-file
   dotnet publish -r win-x64 -c Release
 -- end HOW TO PUBLISH ---------------------------------------------------------------------------------------------------------------------
 
--- begin IMAGES ---------------------------------------------------------------------------------------------------------------------
+-- begin IMAGES/ICONS ---------------------------------------------------------------------------------------------------------------------
 edit tags icon images from:
   icons8.com
   search: tags
--- end IMAGES ---------------------------------------------------------------------------------------------------------------------
+
+'edit' icon: https://www.iconfinder.com/icons/383147/edit_icon
+-- end IMAGES/ICONS ---------------------------------------------------------------------------------------------------------------------
 
 -- begin AUDIBLE DETAILS ---------------------------------------------------------------------------------------------------------------------
 alternate book id (eg BK_RAND_006061) is called 'sku' , 'sku_lite' , 'prod_id' , 'product_id' in different parts of the site
@@ -65,7 +67,7 @@ alternate book id (eg BK_RAND_006061) is called 'sku' , 'sku_lite' , 'prod_id' ,
 -- begin SOLUTION LAYOUT ---------------------------------------------------------------------------------------------------------------------
 do NOT combine jsons for
 - audible-scraped persistence: library, book details
-- libation-generated persistence: FilePaths.json
+- libation-generated persistence: FileLocations.json
 - user-defined persistence: BookTags.json
 -- end SOLUTION LAYOUT ---------------------------------------------------------------------------------------------------------------------
 

_Tests/InternalUtilities.Tests/AccountTests.cs

@@ -18,11 +18,6 @@ using Moq;
 using Moq.Protected;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
-using TestAudibleApiCommon;
-using TestCommon;
-using static AuthorizationShared.Shared;
-using static AuthorizationShared.Shared.AccessTokenTemporality;
-using static TestAudibleApiCommon.ComputedTestValues;
 
 namespace AccountsTests
 {
@@ -429,7 +424,7 @@ namespace AccountsTests
             var exists = accountsSettings.Upsert("cng", "us");
             exists.AccountName.Should().Be("foo");
 
-            orig.Should().IsSameOrEqualTo(exists);
+            orig.Should().BeSameAs(exists);
         }
     }
 

_Tests/InternalUtilities.Tests/InternalUtilities.Tests.csproj

@@ -7,18 +7,18 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.4" />
-    <PackageReference Include="MSTest.TestAdapter" Version="2.2.3" />
-    <PackageReference Include="MSTest.TestFramework" Version="2.2.3" />
-    <PackageReference Include="coverlet.collector" Version="3.0.3">
+    <PackageReference Include="FluentAssertions" Version="6.1.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.11.0" />
+    <PackageReference Include="Moq" Version="4.16.1" />
+    <PackageReference Include="MSTest.TestAdapter" Version="2.2.6" />
+    <PackageReference Include="MSTest.TestFramework" Version="2.2.6" />
+    <PackageReference Include="coverlet.collector" Version="3.1.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\..\audible api\AudibleApi\_Tests\AudibleApi.Tests\AudibleApi.Tests.csproj" />
-    <ProjectReference Include="..\..\..\Dinah.Core\_Tests\TestCommon\TestCommon.csproj" />
     <ProjectReference Include="..\..\InternalUtilities\InternalUtilities.csproj" />
   </ItemGroup>
 

_Tests/LibationSearchEngine.Tests/LibationSearchEngine.Tests.csproj

@@ -7,17 +7,18 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.4" />
-    <PackageReference Include="MSTest.TestAdapter" Version="2.2.3" />
-    <PackageReference Include="MSTest.TestFramework" Version="2.2.3" />
-    <PackageReference Include="coverlet.collector" Version="3.0.3">
+    <PackageReference Include="FluentAssertions" Version="6.1.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.11.0" />
+    <PackageReference Include="Moq" Version="4.16.1" />
+    <PackageReference Include="MSTest.TestAdapter" Version="2.2.6" />
+    <PackageReference Include="MSTest.TestFramework" Version="2.2.6" />
+    <PackageReference Include="coverlet.collector" Version="3.1.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\..\Dinah.Core\_Tests\TestCommon\TestCommon.csproj" />
     <ProjectReference Include="..\..\LibationSearchEngine\LibationSearchEngine.csproj" />
   </ItemGroup>
 

_Tests/LibationSearchEngine.Tests/SearchEngineTests.cs

@@ -16,7 +16,6 @@ using Moq;
 using Moq.Protected;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
-using TestCommon;
 
 namespace SearchEngineTests
 {

__README - COLLABORATORS.txt

@@ -0,0 +1,55 @@
+Thank you for looking at the code for Libation. Here are some guidelines and expectations for contributors.
+
+
+IDEALS
+
+* Libation has always been and will always be free and open source.
+* I work on this as time permits; this is part of the reason Libation is free. I work as much or as little as I feel like. You should feel empowered to do likewise.
+* I welcome collaboration, ideas, and helpful criticism. At the end of the day though, the final call is mine. If you disagree, you're welcome to fork the repo. (git terminology is weird. I didn't want to tell you to go fork yourself, but here we are.)
+* I believe deeply in respecting user privacy.
+  - As little personally identifiable info is retained as possible. Log files even contain masked user names.
+  - Passwords are never stored; only tokens are.
+  - Passwords are never displayed or logged. Metadata is allowed. Eg: logging debug info like password length can be useful to identify nulls or blank fields.
+  - Nothing is transmitted back to me unless explicitly initiated by the user. So far this isn't done at all, but I could imagine a future feature where the user could choose to transmit log files.
+  - The rules are looser for Verbose mode logging and the user is appropriately warned.
+* Elephant in the room: piracy. It's impossible to remove DRM without addressing this. I 100% do not endorse or condone piracy. I believe in personal choice and personal responsibility. The user should have the choice of how to access, use, store, manipulate, and backup the content they have purchased. It is their responsibility how they handle this freedom.
+
+
+STRUCTURE
+
+* Folders in the solution are numbered. Eg: "4 Domain (db)"
+* All projects should only refer to other projects in the same folder or to projects in folders with smaller numbers.
+* 1 Core Libraries
+  This is code which has roughly equivilent priority and knowledge as the BCL. In practice, if code is this universal then it doesn't live here long and is instead moved into Dinah.Core.
+* 2 Utilities (domain ignorant)
+  Stand-alone libraries with no knowledge of anything having to do with Libation or other programs. In theory any of these should be able to one day be converted to a nuget pkg
+* 3 Domain Internal Utilities (db ignorant)
+  Can have knowledge of Libation concepts. Cannot access the database.
+* 4 Domain (db)
+  All database access
+* 5 Domain Utilities (db aware)
+  This is often where database, domain-ignorant util.s, and non-database capabilities come together to provide the domain-conscious access points
+* 6 Application
+  UI and application launcher
+
+
+CODING GUIDELINES
+
+* Follow existing coding style when possible
+* No changing things just to be 'cleaner'. You can clean up as you go but 'style wars' serve no one and do not enhance the product. If you go through and change all the namespaces for consistency, I'm going to reject the PR
+* I have no tabs vs spaces preference. Do whichever one you want
+
+
+IDIOSYNCRASIES
+
+* Libation has been a labor of love for years. This passion project has also been a 'forever project' and thus a place to test out new technologies, styles, and ideas. Consistency is not guaranteed. Legacy code is a certainty.
+* WinFormsDesigner is not used directly and you will likely have no reason to bother with it. Even though all win forms _functionality_ has been re-implemented in .netcore, last I checked there were still a small number of edge cases not yet implemented in the .netcore based _designer_. WinFormsDesigner is .NET Framework which supports all old designer features.
+
+
+BEING NOTIFIED OF CHANGES
+
+If you're interested in being notified of changes, I recommend subscribing to the github rss feeds:
+
+https://github.com/rmcrackan/Dinah.Core/commits/master.atom
+https://github.com/rmcrackan/AudibleApi/commits/master.atom
+https://github.com/rmcrackan/Libation/commits/master.atom