book liberation status Error:

* show system error icon in grid instead of stoplight * list error count in bottom right #s * SearchEngine bool: LiberatedError
Add readme to help/annoy collaborators
2026-01-05 04:18:22 -05:00 · 2021-08-27 17:01:00 -04:00 · 2021-08-27 15:14:42 -04:00 · 2021-08-27 14:07:06 -04:00 · 2021-08-27 11:16:13 -04:00 · 2021-08-26 16:09:37 -04:00
34 changed files with 163 additions and 205 deletions
--- a/AaxDecrypter/AaxDecrypter.csproj
+++ b/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>
--- a/ApplicationServices/ApplicationServices.csproj
+++ b/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>

--- a/ApplicationServices/LibraryCommands.cs
+++ b/ApplicationServices/LibraryCommands.cs
@@ -178,8 +178,6 @@ namespace ApplicationServices
 		}
 		#endregion

-		// below are queries, not commands. maybe I should make a LibraryQueries. except there's already one of those...
-
 		public static LiberatedStatus Liberated_Status(Book book)
 			=> book.Audio_Exists ? LiberatedStatus.Liberated
 			: FileManager.AudibleFileStorage.AaxcExists(book.AudibleProductId) ? LiberatedStatus.PartialDownload
@@ -190,7 +188,9 @@ namespace ApplicationServices
 			: book.PDF_Exists ? LiberatedStatus.Liberated
 			: LiberatedStatus.NotLiberated;

-		public record LibraryStats(int booksFullyBackedUp, int booksDownloadedOnly, int booksNoProgress, int pdfsDownloaded, int pdfsNotDownloaded) { }
+		// below are queries, not commands. maybe I should make a LibraryQueries. except there's already one of those...
+
+		public record LibraryStats(int booksFullyBackedUp, int booksDownloadedOnly, int booksNoProgress, int booksError, int pdfsDownloaded, int pdfsNotDownloaded) { }
 		public static LibraryStats GetCounts()
 		{
 			var libraryBooks = DbContexts.GetContext().GetLibrary_Flat_NoTracking();
@@ -202,8 +202,9 @@ namespace ApplicationServices
 			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()
@@ -215,7 +216,7 @@ namespace ApplicationServices

 			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);
 		}
 	}
 }
--- a/DataLayer/DataLayer.csproj
+++ b/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>
  
--- a/DtoImporterService/BookImporter.cs
+++ b/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;

--- a/DtoImporterService/CategoryImporter.cs
+++ b/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;

--- a/DtoImporterService/ContributorImporter.cs
+++ b/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;

--- a/DtoImporterService/DtoImporterService.csproj
+++ b/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>
--- a/DtoImporterService/LibraryImporter.cs
+++ b/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;

--- a/DtoImporterService/SeriesImporter.cs
+++ b/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;

--- a/FileLiberator/DownloadDecryptBook.cs
+++ b/FileLiberator/DownloadDecryptBook.cs
@@ -175,7 +175,6 @@ namespace FileLiberator
                File.Move(f.FullName, dest);

                movedAudioFile |= AudibleFileStorage.Audio.IsFileTypeMatch(f);
-
            }

            AudibleFileStorage.Audio.Refresh();
--- a/FileLiberator/DownloadPdf.cs
+++ b/FileLiberator/DownloadPdf.cs
@@ -20,8 +20,8 @@ namespace FileLiberator
 		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);

 			libraryBook.Book.UserDefinedItem.PdfStatus = result.IsSuccess ? LiberatedStatus.Liberated : LiberatedStatus.NotLiberated;

@@ -48,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);
@@ -57,10 +57,12 @@ namespace FileLiberator
 			var actualDownloadedFilePath = await PerformDownloadAsync(
 				proposedDownloadFilePath,
 				(p) => client.DownloadFileAsync(downloadUrl, proposedDownloadFilePath, p));
+
+			return actualDownloadedFilePath;
 		}

-		private static StatusHandler verifyDownload(LibraryBook libraryBook)
-			=> !libraryBook.Book.PDF_Exists
+		private static StatusHandler verifyDownload(string actualDownloadedFilePath)
+			=> !File.Exists(actualDownloadedFilePath)
 			? new StatusHandler { "Downloaded PDF cannot be found" }
 			: new StatusHandler();
 	}
--- a/FileLiberator/FileLiberator.csproj
+++ b/FileLiberator/FileLiberator.csproj
@@ -5,7 +5,6 @@
  </PropertyGroup>

  <ItemGroup>
-    <ProjectReference Include="..\..\Dinah.Core\Dinah.Core\Dinah.Core.csproj" />
    <ProjectReference Include="..\AaxDecrypter\AaxDecrypter.csproj" />
    <ProjectReference Include="..\DataLayer\DataLayer.csproj" />
    <ProjectReference Include="..\FileManager\FileManager.csproj" />
--- a/FileManager/FileManager.csproj
+++ b/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>
--- a/InternalUtilities/AudibleApiActions.cs
+++ b/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
--- a/InternalUtilities/AudibleApiValidators.cs
+++ b/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;
 		}
--- a/InternalUtilities/ImportItem.cs
+++ b/InternalUtilities/ImportItem.cs
@@ -1,5 +1,5 @@
 using System;
-using AudibleApiDTOs;
+using AudibleApi.Common;

 namespace InternalUtilities
 {
--- a/InternalUtilities/InternalUtilities.csproj
+++ b/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>

--- a/Libation.sln
+++ b/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,56 +35,22 @@ 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("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Hoopla", "Hoopla\Hoopla.csproj", "{D8F56E5A-3E65-41A6-B7E7-C4515A264B1F}"
@@ -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
--- a/LibationLauncher/LibationLauncher.csproj
+++ b/LibationLauncher/LibationLauncher.csproj
@@ -13,7 +13,7 @@
    <!-- <PublishSingleFile>true</PublishSingleFile> -->
    <RuntimeIdentifier>win-x64</RuntimeIdentifier>

-    <Version>5.5.5.1</Version>
+    <Version>5.5.9.1</Version>
  </PropertyGroup>

  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
--- a/LibationLauncher/UNSAFE_MigrationHelper.cs
+++ b/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
--- a/LibationSearchEngine/LibationSearchEngine.csproj
+++ b/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>
--- a/LibationSearchEngine/LuceneExtensions.cs
+++ b/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:
--- a/LibationWinForms/Dialogs/BookDetailsDialog.Designer.cs
+++ b/LibationWinForms/Dialogs/BookDetailsDialog.Designer.cs
@@ -99,7 +99,7 @@
 			this.detailsTb.ReadOnly = true;
 			this.detailsTb.ScrollBars = System.Windows.Forms.ScrollBars.Both;
 			this.detailsTb.Size = new System.Drawing.Size(484, 202);
-			this.detailsTb.TabIndex = 0;
+			this.detailsTb.TabIndex = 1;
 			// 
 			// tagsGb
 			// 
@@ -110,7 +110,7 @@
 			this.tagsGb.Location = new System.Drawing.Point(12, 220);
 			this.tagsGb.Name = "tagsGb";
 			this.tagsGb.Size = new System.Drawing.Size(570, 73);
-			this.tagsGb.TabIndex = 1;
+			this.tagsGb.TabIndex = 0;
 			this.tagsGb.TabStop = false;
 			this.tagsGb.Text = "Edit Tags";
 			// 
--- a/LibationWinForms/Dialogs/BookDetailsDialog.cs
+++ b/LibationWinForms/Dialogs/BookDetailsDialog.cs
@@ -77,7 +77,6 @@ Purchase Date: {_libraryBook.DateAdded.ToString("d")}
 				if (status == LiberatedStatus.Error)
 					this.bookLiberatedCb.Items.Add(new liberatedComboBoxItem { Status = LiberatedStatus.Error, Text = "Error" });

-
 				setDefaultComboBox(this.bookLiberatedCb, status);
 			}

--- a/LibationWinForms/Form1.cs
+++ b/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
--- a/LibationWinForms/GridEntry.cs
+++ b/LibationWinForms/GridEntry.cs
@@ -132,14 +132,15 @@ namespace LibationWinForms

 		private void Commit()
 		{
-			//We don't want LiberatedStatus.PartialDownload to be a persistent  status.
-			var bookStatus = Book.UserDefinedItem.BookStatus;
-			var saveStatus = bookStatus == LiberatedStatus.PartialDownload ? LiberatedStatus.NotLiberated : bookStatus;
+			// 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 = bookStatus;
+			Book.UserDefinedItem.BookStatus = displayStatus;

 			Refilter?.Invoke();
 		}
@@ -176,6 +177,7 @@ namespace LibationWinForms
 			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));
--- a/LibationWinForms/LibationWinForms.csproj
+++ b/LibationWinForms/LibationWinForms.csproj
@@ -13,7 +13,10 @@
  </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>
--- a/LibationWinForms/LiberateDataGridViewImageButtonColumn.cs
+++ b/LibationWinForms/LiberateDataGridViewImageButtonColumn.cs
@@ -35,12 +35,14 @@ namespace LibationWinForms

 		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"),
-				LiberatedStatus.Error => ("Book downloaded ERROR", "red"),
 				_ => throw new Exception("Unexpected liberation state")
 			};

--- a/_Tests/InternalUtilities.Tests/AccountTests.cs
+++ b/_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);
        }
    }

--- a/_Tests/InternalUtilities.Tests/InternalUtilities.Tests.csproj
+++ b/_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>

--- a/_Tests/LibationSearchEngine.Tests/LibationSearchEngine.Tests.csproj
+++ b/_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>

--- a/_Tests/LibationSearchEngine.Tests/SearchEngineTests.cs
+++ b/_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
 {
--- a/COLLABORATORS.txt
+++ b/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
Author	SHA1	Message	Date
Robert McRackan	e723467ca6	book liberation status Error: * show system error icon in grid instead of stoplight * list error count in bottom right #s * SearchEngine bool: LiberatedError	2021-08-27 17:01:00 -04:00
Robert McRackan	722c33bf61	Add readme to help/annoy collaborators	2021-08-27 15:14:42 -04:00
Robert McRackan	f080215cbb	Book details dialog: tags should get initial focus	2021-08-27 14:07:06 -04:00
Robert McRackan	d5c74d629f	update dependencies	2021-08-27 11:16:13 -04:00
Robert McRackan	d12c246f6d	version increm	2021-08-26 16:09:37 -04:00
Robert McRackan	8969c216af	comments	2021-08-26 16:08:26 -04:00
Robert McRackan	9a4903f0dd	Bug fix: after successful pdf download, this state wasn't being saved	2021-08-26 15:53:33 -04:00
Robert McRackan	3eda498a5e	new AudibleApi nuget no longer relies on external json and js files which caused issues	2021-08-26 12:51:55 -04:00
Robert McRackan	8af7f28f04	(hopefully) final nuget pkg: Dinah.Core.WindowsDesktop	2021-08-26 12:49:37 -04:00
Robert McRackan	d9d7dfe1f7	update depandecies	2021-08-26 12:48:05 -04:00
Robert McRackan	b9c4d11946	remove TestCommon	2021-08-25 17:07:26 -04:00
Robert McRackan	68a5d7a58d	nuget. done until I can figure out how to build .net5-windows nuget from github actions	2021-08-25 16:24:02 -04:00
Robert McRackan	4d69b222c5	nuget: Dinah.EntityFrameworkCore	2021-08-25 15:55:31 -04:00
Robert McRackan	42f94e7f6c	more nuget migration	2021-08-25 15:33:09 -04:00
Robert McRackan	381d52be72	Better audible api to reduce captcha occurances	2021-08-24 13:42:14 -04:00