incr ver

Refactors, bug fixes, and performance improvements.

.github/ISSUE_TEMPLATE/bug_report.md

@@ -27,4 +27,4 @@ If applicable, add screenshots to help explain your problem.
 [e.g. Windows 10, Windows 11, Mac, Linux (State distribution)]
 
 **Log Files**  
-Attach your Libation log file here. Logs are typically in your `[user]\Libation` folder. (For example, on windows: `C:\my_username\Libation`) Also within Libation, on the first tab in Settings you can click the button 'Open log folder'
+Attach your Libation log file here. Logs are typically in your `[user]\Libation` folder. (For example, on windows: `C:\my_username\Libation`) Also within Libation, on the first tab in Settings you can click the button 'Open log folder'. If your user folder contains the file "LibationCrash.log", attach that also.

.github/workflows/build-windows.yml

@@ -15,6 +15,10 @@ on:
         description: "Skip running unit tests"
         required: false
         default: true
+      architecture:
+        type: string
+        description: "CPU architecture targeted by the build."
+        required: true
 
 env:
   DOTNET_CONFIGURATION: "Release"
@@ -22,8 +26,11 @@ env:
 
 jobs:
   build:
-    name: "${{ matrix.os }}-${{ matrix.release_name }}"
+    name: "${{ matrix.os }}-${{ matrix.release_name }}-${{ inputs.architecture }}"
     runs-on: windows-latest
+    env:
+      OUTPUT_NAME: "${{ matrix.os }}-${{ matrix.release_name }}-${{ inputs.architecture }}"
+      RUNTIME_ID: "win-${{ inputs.architecture }}"
     strategy:
       matrix:
         os: [Windows]
@@ -63,38 +70,42 @@ jobs:
         run: |
           dotnet publish `
               Libation${{ matrix.ui }}/Libation${{ matrix.ui }}.csproj `
+              --runtime ${{ env.RUNTIME_ID }} `
               --configuration ${{ env.DOTNET_CONFIGURATION }} `
-              --output bin/Publish/${{ matrix.os }}-${{ matrix.release_name }} `
+              --output bin/Publish/${{ env.OUTPUT_NAME }} `
               -p:PublishProfile=Libation${{ matrix.ui }}/Properties/PublishProfiles/${{ matrix.os }}Profile.pubxml
           dotnet publish `
               LoadByOS/${{ matrix.os }}ConfigApp/${{ matrix.os }}ConfigApp.csproj `
+              --runtime ${{ env.RUNTIME_ID }} `
               --configuration ${{ env.DOTNET_CONFIGURATION }} `
-              --output bin/Publish/${{ matrix.os }}-${{ matrix.release_name }} `
+              --output bin/Publish/${{ env.OUTPUT_NAME }} `
               -p:PublishProfile=LoadByOS/${{ matrix.os }}ConfigApp/PublishProfiles/${{ matrix.os }}Profile.pubxml
           dotnet publish `
               LibationCli/LibationCli.csproj `
+              --runtime ${{ env.RUNTIME_ID }} `
               --configuration ${{ env.DOTNET_CONFIGURATION }} `
-              --output bin/Publish/${{ matrix.os }}-${{ matrix.release_name }} `
+              --output bin/Publish/${{ env.OUTPUT_NAME }} `
               -p:DefineConstants="${{ matrix.release_name }}" `
               -p:PublishProfile=LibationCli/Properties/PublishProfiles/${{ matrix.os }}Profile.pubxml
           dotnet publish `
               Hangover${{ matrix.ui }}/Hangover${{ matrix.ui }}.csproj `
+              --runtime ${{ env.RUNTIME_ID }} `
               --configuration ${{ env.DOTNET_CONFIGURATION }} `
-              --output bin/Publish/${{ matrix.os }}-${{ matrix.release_name }} `
+              --output bin/Publish/${{ env.OUTPUT_NAME }} `
               -p:PublishProfile=Hangover${{ matrix.ui }}/Properties/PublishProfiles/${{ matrix.os }}Profile.pubxml
 
       - name: Zip artifact
         id: zip
         working-directory: ./Source/bin/Publish
         run: |
-          $bin_dir = "${{ matrix.os }}-${{ matrix.release_name }}\"
+          $bin_dir = "${{ env.OUTPUT_NAME }}\"
           $delfiles = @(
             "WindowsConfigApp.exe",
             "WindowsConfigApp.runtimeconfig.json",
             "WindowsConfigApp.deps.json"
             )
           foreach ($file in $delfiles){ if (test-path $bin_dir$file){ Remove-Item $bin_dir$file } }
-          $artifact="${{ matrix.prefix }}Libation.${{ steps.get_version.outputs.version }}-" + "${{ matrix.os }}".ToLower() + "-${{ matrix.release_name }}"
+          $artifact="${{ matrix.prefix }}Libation.${{ steps.get_version.outputs.version }}-" + "${{ matrix.os }}".ToLower() + "-${{ matrix.release_name }}-${{ inputs.architecture }}"
           "artifact=$artifact" >> $env:GITHUB_OUTPUT
           Compress-Archive -Path "${bin_dir}*" -DestinationPath "$artifact.zip"
 

.github/workflows/build.yml

@@ -18,10 +18,14 @@ on:
 
 jobs:
   windows:
+    strategy:
+      matrix:
+        architecture: [x64]
     uses: ./.github/workflows/build-windows.yml
     with:
       version_override: ${{ inputs.version_override }}
       run_unit_tests: ${{ inputs.run_unit_tests }}
+      architecture: ${{ matrix.architecture }}
 
   linux:
     strategy:

.releaseindex.json

@@ -1,10 +1,10 @@
 {
-  "WindowsClassic":          "Classic-Libation\\.\\d+\\.\\d+\\.\\d+-win(dows)?-classic\\.zip",
-  "WindowsAvalonia":         "Libation\\.\\d+\\.\\d+\\.\\d+-win(dows)?-chardonnay\\.zip",
-  "LinuxAvalonia":           "Libation\\.\\d+\\.\\d+\\.\\d+-linux-chardonnay-amd64\\.deb",
-  "LinuxAvalonia_RPM":       "Libation\\.\\d+\\.\\d+\\.\\d+-linux-chardonnay-amd64\\.rpm",
-  "MacOSAvalonia":           "Libation\\.\\d+\\.\\d+\\.\\d+-macOS-chardonnay-x64\\.tgz",
-  "LinuxAvalonia_Arm64":     "Libation\\.\\d+\\.\\d+\\.\\d+-linux-chardonnay-arm64\\.deb",
-  "LinuxAvalonia_Arm64_RPM": "Libation\\.\\d+\\.\\d+\\.\\d+-linux-chardonnay-arm64\\.rpm",
-  "MacOSAvalonia_Arm64":     "Libation\\.\\d+\\.\\d+\\.\\d+-macOS-chardonnay-arm64\\.tgz"
+  "WindowsClassic":          "Classic-Libation\\.\\d+\\.\\d+\\.\\d+(?:\\.\\d+)?-win(?:dows)?-classic-x64\\.zip",
+  "WindowsAvalonia":         "Libation\\.\\d+\\.\\d+\\.\\d+(?:\\.\\d+)?-win(?:dows)?-chardonnay-x64\\.zip",
+  "LinuxAvalonia":           "Libation\\.\\d+\\.\\d+\\.\\d+(?:\\.\\d+)?-linux-chardonnay-amd64\\.deb",
+  "LinuxAvalonia_RPM":       "Libation\\.\\d+\\.\\d+\\.\\d+(?:\\.\\d+)?-linux-chardonnay-amd64\\.rpm",
+  "MacOSAvalonia":           "Libation\\.\\d+\\.\\d+\\.\\d+(?:\\.\\d+)?-macOS-chardonnay-x64\\.tgz",
+  "LinuxAvalonia_Arm64":     "Libation\\.\\d+\\.\\d+\\.\\d+(?:\\.\\d+)?-linux-chardonnay-arm64\\.deb",
+  "LinuxAvalonia_Arm64_RPM": "Libation\\.\\d+\\.\\d+\\.\\d+(?:\\.\\d+)?-linux-chardonnay-arm64\\.rpm",
+  "MacOSAvalonia_Arm64":     "Libation\\.\\d+\\.\\d+\\.\\d+(?:\\.\\d+)?-macOS-chardonnay-arm64\\.tgz"
 }

Docker/liberate.sh

@@ -124,7 +124,7 @@ main() {
   init_config_file Settings.json
   
   info "loading settings"
-  update_settings Settings.json Books /data
+  update_settings Settings.json Books "${LIBATION_BOOKS_DIR:-/data}"
   update_settings Settings.json InProgress /tmp
 
   info "loading database"

Documentation/FrequentlyAskedQuestions.md

@@ -7,6 +7,10 @@
 
 # Frequently Asked Questions
 
+## Q: Where can I get help for my specific problem?
+
+**A:** [You can open an issue here](https://github.com/rmcrackan/Libation/issues) for bug reports, feature requests, or specialized help.
+
 ## Q: What's the difference between 'Classic' and 'Chardonnay'?
 
 **A:** First and most importantly: Classic and Chardonnay have the exact same features.

Documentation/GettingStarted.md

@@ -15,6 +15,7 @@
 - [Download PDF attachments](#download-pdf-attachments)
 - [Details of downloaded files](#details-of-downloaded-files)
 - [Export your library](#export-your-library)
+- [I still need help](#i-still-need-help)
 
 
 
@@ -148,3 +149,7 @@ When you set up Libation, you'll specify a Books directory. Libation looks insid
 ![Export](images/Export.png)
 
 Export your library to Excel, CSV, or JSON
+
+### I still need help
+
+[You can open an issue here](https://github.com/rmcrackan/Libation/issues) for bug reports, feature requests, or specialized help.

Documentation/InstallOnLinux.md

@@ -8,23 +8,23 @@
 
 [![Packaging status](https://repology.org/badge/vertical-allrepos/libation.svg)](https://repology.org/project/libation/versions)
 
-New Libation releases are automatically packed into `.deb` and `.rpm` package and are available from the Libation repository's releases page.
+New Libation releases are automatically packed into `.deb` and `.rpm` package and are available from the [Libation repository's releases page](https://github.com/rmcrackan/Libation/releases).
 
-Run this command in your terminal to download and install Libation, replacing the url with the latest Libation package url:
+Run these commands in your terminal to download and install Libation. **Make sure you replace** `X.X.X` with the latest Libation version and `ARCH` with your CPU's architechture (either `amd64` or `arm64`).
 
 ### Debian
   ```Console
-  wget -O libation.deb https://github.com/rmcrackan/Libation/releases/download/vX.X.X/Libation.X.X.X-linux-chardonnay.deb &&
+  wget -O libation.deb https://github.com/rmcrackan/Libation/releases/download/vX.X.X/Libation.X.X.X-linux-chardonnay-ARCH.deb
   sudo apt install ./libation.deb
   ```
 ### Redhat and CentOS
   ```Console
-  wget -O libation.rpm https://github.com/rmcrackan/Libation/releases/download/vX.X.X/Libation.X.X.X-linux-chardonnay.rpm &&
+  wget -O libation.rpm https://github.com/rmcrackan/Libation/releases/download/vX.X.X/Libation.X.X.X-linux-chardonnay-ARCH.rpm
   sudo yum install ./libation.rpm
   ```
 ### Fedora
   ```Console
-  wget -O libation.rpm https://github.com/rmcrackan/Libation/releases/download/vX.X.X/Libation.X.X.X-linux-chardonnay.rpm &&
+  wget -O libation.rpm https://github.com/rmcrackan/Libation/releases/download/vX.X.X/Libation.X.X.X-linux-chardonnay-ARCH.rpm
   sudo dnf5 install ./libation.rpm
   ```
 ---

README.md

@@ -22,6 +22,7 @@
     - [Download PDF attachments](Documentation/GettingStarted.md#download-pdf-attachments)
     - [Details of downloaded files](Documentation/GettingStarted.md#details-of-downloaded-files)
     - [Export your library](Documentation/GettingStarted.md#export-your-library)
+    - If you still need help, [you can open an issue here](https://github.com/rmcrackan/Libation/issues) for bug reports, feature requests, or specialized help.
 - [Searching and filtering](Documentation/SearchingAndFiltering.md)
     - [Tags](Documentation/SearchingAndFiltering.md#tags)
     - [Searches](Documentation/SearchingAndFiltering.md#searches)

Source/AaxDecrypter/AaxDecrypter.csproj

@@ -13,7 +13,7 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-	  <PackageReference Include="AAXClean.Codecs" Version="2.0.1.2" />
+	  <PackageReference Include="AAXClean.Codecs" Version="2.0.1.3" />
 	</ItemGroup>
 
 	<ItemGroup>

Source/AaxDecrypter/AaxcDownloadConvertBase.cs

@@ -1,5 +1,6 @@
 using AAXClean;
 using System;
+using System.Linq;
 using System.Threading.Tasks;
 
 namespace AaxDecrypter
@@ -8,7 +9,7 @@ namespace AaxDecrypter
 	{
 		public event EventHandler<AppleTags> RetrievedMetadata;
 
-		protected Mp4File AaxFile { get; private set; }
+		public Mp4File AaxFile { get; private set; }
 		protected Mp4Operation AaxConversion { get; set; }
 
 		protected AaxcDownloadConvertBase(string outFileName, string cacheDirectory, IDownloadOptions dlOptions)
@@ -24,29 +25,41 @@ namespace AaxDecrypter
 
 		public override async Task CancelAsync()
 		{
-			IsCanceled = true;
+			await base.CancelAsync();
 			await (AaxConversion?.CancelAsync() ?? Task.CompletedTask);
-			FinalizeDownload();
 		}
 
 		private Mp4File Open()
 		{
 			if (DownloadOptions.InputType is FileType.Dash)
 			{
+				//We may have multiple keys , so use the key whose key ID matches
+				//the dash files default Key ID.
+				var keyIds = DownloadOptions.DecryptionKeys.Select(k => new Guid(k.KeyPart1, bigEndian: true)).ToArray();
+
 				var dash = new DashFile(InputFileStream);
-				dash.SetDecryptionKey(DownloadOptions.AudibleKey, DownloadOptions.AudibleIV);
+				var kidIndex = Array.IndexOf(keyIds, dash.Tenc.DefaultKID);
+
+				if (kidIndex == -1)
+					throw new InvalidOperationException($"None of the {keyIds.Length} key IDs match the dash file's default KeyID of {dash.Tenc.DefaultKID}");
+
+				DownloadOptions.DecryptionKeys[0] = DownloadOptions.DecryptionKeys[kidIndex];
+				var keyId = DownloadOptions.DecryptionKeys[kidIndex].KeyPart1;
+				var key = DownloadOptions.DecryptionKeys[kidIndex].KeyPart2;
+
+				dash.SetDecryptionKey(keyId, key);
 				return dash;
 			}
 			else if (DownloadOptions.InputType is FileType.Aax)
 			{
 				var aax = new AaxFile(InputFileStream);
-				aax.SetDecryptionKey(DownloadOptions.AudibleKey);
+				aax.SetDecryptionKey(DownloadOptions.DecryptionKeys[0].KeyPart1);
 				return aax;
 			}
 			else if (DownloadOptions.InputType is FileType.Aaxc)
 			{
 				var aax = new AaxFile(InputFileStream);
-				aax.SetDecryptionKey(DownloadOptions.AudibleKey, DownloadOptions.AudibleIV);
+				aax.SetDecryptionKey(DownloadOptions.DecryptionKeys[0].KeyPart1, DownloadOptions.DecryptionKeys[0].KeyPart2);
 				return aax;
 			}
 			else throw new InvalidOperationException($"{nameof(DownloadOptions.InputType)} of '{DownloadOptions.InputType}' is unknown.");

Source/AaxDecrypter/AudiobookDownloadBase.cs

@@ -73,11 +73,16 @@ namespace AaxDecrypter
 			AsyncSteps[$"Cleanup"] = CleanupAsync;
 			(bool success, var elapsed) = await AsyncSteps.RunAsync();
 
+			//Stop the downloader so it doesn't keep running in the background.
+			if (!success)
+				nfsPersister.Dispose();
+
 			await progressTask;
 
 			var speedup = DownloadOptions.RuntimeLength / elapsed;
 			Serilog.Log.Information($"Speedup is {speedup:F0}x realtime.");
 
+			nfsPersister.Dispose();
 			return success;
 
 			async Task reportProgress()
@@ -115,7 +120,12 @@ namespace AaxDecrypter
 			}
 		}
 
-		public abstract Task CancelAsync();
+		public virtual Task CancelAsync()
+		{
+			IsCanceled = true;
+			FinalizeDownload();
+			return Task.CompletedTask;
+		}
 		protected abstract Task<bool> Step_DownloadAndDecryptAudiobookAsync();
 
 		public virtual void SetCoverArt(byte[] coverArt) { }
@@ -177,7 +187,7 @@ namespace AaxDecrypter
 
 			FileUtility.SaferDelete(jsonDownloadState);
 
-			if (!string.IsNullOrEmpty(DownloadOptions.AudibleKey) &&
+			if (DownloadOptions.DecryptionKeys != null &&
 				DownloadOptions.RetainEncryptedFile &&
 				DownloadOptions.InputType is AAXClean.FileType fileType)
 			{
@@ -188,22 +198,29 @@ namespace AaxDecrypter
 
 				if (fileType is AAXClean.FileType.Aax)
 				{
-					await File.WriteAllTextAsync(keyPath, $"ActivationBytes={DownloadOptions.AudibleKey}");
+					await File.WriteAllTextAsync(keyPath, $"ActivationBytes={Convert.ToHexString(DownloadOptions.DecryptionKeys[0].KeyPart1)}");
 					aaxPath = Path.ChangeExtension(tempFilePath, ".aax");
 				}
 				else if (fileType is AAXClean.FileType.Aaxc)
 				{
-					await File.WriteAllTextAsync(keyPath, $"Key={DownloadOptions.AudibleKey}{Environment.NewLine}IV={DownloadOptions.AudibleIV}");
+					await File.WriteAllTextAsync(keyPath,
+						$"Key={Convert.ToHexString(DownloadOptions.DecryptionKeys[0].KeyPart1)}{Environment.NewLine}" +
+						$"IV={Convert.ToHexString(DownloadOptions.DecryptionKeys[0].KeyPart2)}");
 					aaxPath = Path.ChangeExtension(tempFilePath, ".aaxc");
 				}
 				else if (fileType is AAXClean.FileType.Dash)
 				{
-					await File.WriteAllTextAsync(keyPath, $"KeyId={DownloadOptions.AudibleKey}{Environment.NewLine}Key={DownloadOptions.AudibleIV}");
+					await File.WriteAllTextAsync(keyPath,
+						$"KeyId={Convert.ToHexString(DownloadOptions.DecryptionKeys[0].KeyPart1)}{Environment.NewLine}" +
+						$"Key={Convert.ToHexString(DownloadOptions.DecryptionKeys[0].KeyPart2)}");
 					aaxPath = Path.ChangeExtension(tempFilePath, ".dash");
 				}
 				else
 					throw new InvalidOperationException($"Unknown file type: {fileType}");
 
+				if (tempFilePath != aaxPath)
+					FileUtility.SaferMove(tempFilePath, aaxPath);
+
 				OnFileCreated(aaxPath);
 				OnFileCreated(keyPath);
 			}

Source/AaxDecrypter/IDownloadOptions.cs

@@ -2,15 +2,35 @@
 using System;
 using System.Threading.Tasks;
 
+#nullable enable
 namespace AaxDecrypter
 {
-    public interface IDownloadOptions
+    public class KeyData
+    {
+        public byte[] KeyPart1 { get; }
+        public byte[]? KeyPart2 { get; }
+
+        public KeyData(byte[] keyPart1, byte[]? keyPart2 = null)
+        {
+            KeyPart1 = keyPart1;
+            KeyPart2 = keyPart2;
+        }
+
+        public KeyData(string keyPart1, string? keyPart2 = null)
+        {
+            ArgumentNullException.ThrowIfNull(keyPart1, nameof(keyPart1));
+            KeyPart1 = Convert.FromHexString(keyPart1);
+            if (keyPart2 != null)
+                KeyPart2 = Convert.FromHexString(keyPart2);
+        }
+	}    
+
+	public interface IDownloadOptions
     {
         event EventHandler<long> DownloadSpeedChanged;
         string DownloadUrl { get; }
         string UserAgent { get; }
-        string AudibleKey { get; }
-        string AudibleIV { get; }
+		KeyData[]? DecryptionKeys { get; }
         TimeSpan RuntimeLength { get; }
         OutputFormat OutputFormat { get; }
         bool TrimOutputToChapterLength { get; }
@@ -21,14 +41,14 @@ namespace AaxDecrypter
         long DownloadSpeedBps { get; }
         ChapterInfo ChapterInfo { get; }
         bool FixupFile { get; }
-		string AudibleProductId { get; }
-		string Title { get; }
-		string Subtitle { get; }
-		string Publisher { get; }
-		string Language { get; }
-		string SeriesName { get; }
+		string? AudibleProductId { get; }
+		string? Title { get; }
+		string? Subtitle { get; }
+		string? Publisher { get; }
+		string? Language { get; }
+		string? SeriesName { get; }
 		float? SeriesNumber { get; }
-		NAudio.Lame.LameConfig LameConfig { get; }
+		NAudio.Lame.LameConfig? LameConfig { get; }
         bool Downsample { get; }
         bool MatchSourceBitrate { get; }
         bool MoveMoovToBeginning { get; }

Source/AaxDecrypter/NetworkFileStream.cs

@@ -110,14 +110,16 @@ namespace AaxDecrypter
 		#region Downloader
 
 		/// <summary> Update the <see cref="Dinah.Core.IO.JsonFilePersister{T}"/>. </summary>
-		private void OnUpdate()
+		private void OnUpdate(bool waitForWrite = false)
 		{
 			try
 			{
-				if (DateTime.UtcNow > NextUpdateTime)
+				if (waitForWrite || DateTime.UtcNow > NextUpdateTime)
 				{
 					Updated?.Invoke(this, EventArgs.Empty);
 					//JsonFilePersister Will not allow update intervals shorter than 100 milliseconds
+					//If an update is called less than 100 ms since the last update, persister will
+					//sleep the thread until 100 ms has elapsed.
 					NextUpdateTime = DateTime.UtcNow.AddMilliseconds(110);
 				}
 			}
@@ -305,7 +307,7 @@ namespace AaxDecrypter
 			finally
 			{
 				_downloadedPiece.Set();
-				OnUpdate();
+				OnUpdate(waitForWrite: true);
 			}
 		}
 
@@ -402,7 +404,7 @@ namespace AaxDecrypter
 				_cancellationSource?.Dispose();
 				_readFile.Dispose();
 				_writeFile.Dispose();
-				OnUpdate();
+				OnUpdate(waitForWrite: true);
 			}
 
 			disposed = true;

Source/AaxDecrypter/UnencryptedAudiobookDownloader.cs

@@ -17,13 +17,6 @@ namespace AaxDecrypter
 			AsyncSteps["Step 3: Create Cue"] = Step_CreateCueAsync;
 		}
 
-		public override Task CancelAsync()
-		{
-			IsCanceled = true;
-			FinalizeDownload();
-			return Task.CompletedTask;
-		}
-
 		protected override async Task<bool> Step_DownloadAndDecryptAudiobookAsync()
 		{
 			await InputFileStream.DownloadTask;

Source/AppScaffolding/AppScaffolding.csproj

@@ -2,15 +2,14 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>net9.0</TargetFramework>
-    <Version>12.4.1.1</Version>
+    <Version>12.4.8.1</Version>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Octokit" Version="14.0.0" />
     <!-- Do not remove unused Serilog.Sinks -->
-    <!-- Only ZipFile sink is currently used. By user request (June 2024) others packages are included for experimental use. -->
+    <!-- Only File sink is currently used. By user request (June 2024) others packages are included for experimental use. -->
     <PackageReference Include="Serilog.Sinks.Console" Version="6.0.0" />
     <PackageReference Include="Serilog.Sinks.File" Version="7.0.0" />
-    <PackageReference Include="Serilog.Sinks.ZipFile" Version="3.1.1" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\ApplicationServices\ApplicationServices.csproj" />

Source/AppScaffolding/LibationScaffolding.cs

@@ -115,11 +115,22 @@ namespace AppScaffolding
 		{
 			if (config.GetObject("Serilog") is JObject serilog)
 			{
-				if (serilog["WriteTo"] is JArray sinks && sinks.FirstOrDefault(s => s["Name"].Value<string>() is "File") is JToken fileSink)
+				bool fileChanged = false;
+				if (serilog.SelectToken("$.WriteTo[?(@.Name == 'ZipFile')]", false) is JObject zipFileSink)
 				{
-					fileSink["Name"] = "ZipFile";
-					config.SetNonString(serilog.DeepClone(), "Serilog");
+					zipFileSink["Name"] = "File";
+					fileChanged = true;
 				}
+				var hooks = $"{nameof(LibationFileManager)}.{nameof(FileSinkHook)}, {nameof(LibationFileManager)}";
+				if (serilog.SelectToken("$.WriteTo[?(@.Name == 'File')].Args", false) is JObject fileSinkArgs
+					&& fileSinkArgs["hooks"]?.Value<string>() != hooks)
+				{
+					fileSinkArgs["hooks"] = hooks;
+					fileChanged = true;
+				}
+
+				if (fileChanged)
+					config.SetNonString(serilog.DeepClone(), "Serilog");
 				return;
 			}
 
@@ -129,17 +140,17 @@ namespace AppScaffolding
 				{ "WriteTo", new JArray
 					{
 						// ABOUT SINKS
-						// Only ZipFile sink is currently used. By user request (June 2024) others packages are included for experimental use.
+						// Only File sink is currently used. By user request (June 2024) others packages are included for experimental use.
 
 						// new JObject { {"Name", "Console" } }, // this has caused more problems than it's solved
 						new JObject
 						{
-							{ "Name", "ZipFile" },
+							{ "Name", "File" },
 							{ "Args",
 								new JObject
 								{
 									// for this sink to work, a path must be provided. we override this below
-									{ "path", Path.Combine(config.LibationFiles, "_Log.log") },
+									{ "path", Path.Combine(config.LibationFiles, "Log.log") },
 									{ "rollingInterval", "Month" },
 									// Serilog template formatting examples
 									// - default:                    "{Timestamp:yyyy-MM-dd HH:mm:ss.fff zzz} [{Level:u3}] {Message:lj}{NewLine}{Exception}"
@@ -274,7 +285,7 @@ namespace AppScaffolding
                 disableIPv6 = AppContext.TryGetSwitch("System.Net.DisableIPv6", out bool disableIPv6Value),
 			});
 
-            if (InteropFactory.InteropFunctionsType is null)
+			if (InteropFactory.InteropFunctionsType is null)
                 Serilog.Log.Logger.Warning("WARNING: OSInteropProxy.InteropFunctionsType is null");
         }
 
@@ -290,33 +301,24 @@ namespace AppScaffolding
 		public static UpgradeProperties GetLatestRelease()
 		{
 			// timed out
-			(var latest, var zip) = getLatestRelease(TimeSpan.FromSeconds(10));
+			(var version, var latest, var zip) = getLatestRelease(TimeSpan.FromSeconds(10));
 
-			if (latest is null || zip is null)
-				return null;
-
-			var latestVersionString = latest.TagName.Trim('v');
-			if (!Version.TryParse(latestVersionString, out var latestRelease))
-				return null;
-
-			// we're up to date
-			if (latestRelease <= BuildVersion)
+			if (version is null || latest is null || zip is null)
 				return null;
 
 			// we have an update
-
 			var zipUrl = zip?.BrowserDownloadUrl;
 
 			Log.Logger.Information("Update available: {@DebugInfo}", new
 			{
-				latestRelease = latestRelease.ToString(),
+				latestRelease = version.ToString(),
 				latest.HtmlUrl,
 				zipUrl
 			});
 
-			return new(zipUrl, latest.HtmlUrl, zip.Name, latestRelease, latest.Body);
+			return new(zipUrl, latest.HtmlUrl, zip.Name, version, latest.Body);
 		}
-		private static (Octokit.Release, Octokit.ReleaseAsset) getLatestRelease(TimeSpan timeout)
+		private static (Version releaseVersion, Octokit.Release, Octokit.ReleaseAsset) getLatestRelease(TimeSpan timeout)
 		{
 			try
 			{
@@ -330,15 +332,23 @@ namespace AppScaffolding
 			{
 				Log.Logger.Error(aggEx, "Checking for new version too often");
 			}
-			return (null, null);
+			return (null, null, null);
 		}
-		private static async System.Threading.Tasks.Task<(Octokit.Release, Octokit.ReleaseAsset)> getLatestRelease()
+		private static async System.Threading.Tasks.Task<(Version releaseVersion, Octokit.Release, Octokit.ReleaseAsset)> getLatestRelease()
 		{
 			const string ownerAccount = "rmcrackan";
 			const string repoName = "Libation";
 
 			var gitHubClient = new Octokit.GitHubClient(new Octokit.ProductHeaderValue(repoName));
 
+			//https://docs.github.com/en/rest/releases/releases?apiVersion=2022-11-28#get-the-latest-release
+			var latestRelease = await gitHubClient.Repository.Release.GetLatest(ownerAccount, repoName);
+
+			//Ensure that latest release is greater than the current version
+			var latestVersionString = latestRelease.TagName.Trim('v');
+			if (!Version.TryParse(latestVersionString, out var releaseVersion) || releaseVersion <= BuildVersion)
+				return (null, null, null);
+
 			//Download the release index
 			var bts = await gitHubClient.Repository.Content.GetRawContent(ownerAccount, repoName, ".releaseindex.json");
 			var releaseIndex = JObject.Parse(System.Text.Encoding.ASCII.GetString(bts));
@@ -356,10 +366,7 @@ namespace AppScaffolding
 
 			var regex = new System.Text.RegularExpressions.Regex(regexPattern, System.Text.RegularExpressions.RegexOptions.IgnoreCase);
 
-			//https://docs.github.com/en/rest/releases/releases?apiVersion=2022-11-28#get-the-latest-release
-			var latestRelease = await gitHubClient.Repository.Release.GetLatest(ownerAccount, repoName);
-
-			return (latestRelease, latestRelease?.Assets?.FirstOrDefault(a => regex.IsMatch(a.Name)));
+			return (releaseVersion, latestRelease, latestRelease?.Assets?.FirstOrDefault(a => regex.IsMatch(a.Name)));
 		}
 	}
 

Source/ApplicationServices/ApplicationServices.csproj

@@ -5,8 +5,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="CsvHelper" Version="33.0.1" />
-    <PackageReference Include="NPOI" Version="2.7.3" />
+    <PackageReference Include="CsvHelper" Version="33.1.0" />
+    <PackageReference Include="NPOI" Version="2.7.4" />
   </ItemGroup>
 
   <ItemGroup>

Source/ApplicationServices/LibraryCommands.cs

@@ -32,7 +32,7 @@ namespace ApplicationServices
             ScanEnd += (_, __) => Scanning = false;
         }
 
-        public static async Task<List<LibraryBook>> FindInactiveBooks(Func<Account, Task<ApiExtended>> apiExtendedfunc, IEnumerable<LibraryBook> existingLibrary, params Account[] accounts)
+        public static async Task<List<LibraryBook>> FindInactiveBooks(IEnumerable<LibraryBook> existingLibrary, params Account[] accounts)
         {
             logRestart();
 
@@ -58,7 +58,7 @@ namespace ApplicationServices
             try
             {
                 logTime($"pre {nameof(scanAccountsAsync)} all");
-                var libraryItems = await scanAccountsAsync(apiExtendedfunc, accounts, libraryOptions);
+                var libraryItems = await scanAccountsAsync(accounts, libraryOptions);
                 logTime($"post {nameof(scanAccountsAsync)} all");
 
                 var totalCount = libraryItems.Count;
@@ -101,7 +101,7 @@ namespace ApplicationServices
         }
 
         #region FULL LIBRARY scan and import
-        public static async Task<(int totalCount, int newCount)> ImportAccountAsync(Func<Account, Task<ApiExtended>> apiExtendedfunc, params Account[]? accounts)
+        public static async Task<(int totalCount, int newCount)> ImportAccountAsync(params Account[]? accounts)
         {
             logRestart();
 
@@ -131,7 +131,7 @@ namespace ApplicationServices
                         | LibraryOptions.ResponseGroupOptions.IsFinished,
 					ImageSizes = LibraryOptions.ImageSizeOptions._500 | LibraryOptions.ImageSizeOptions._1215
                 };
-                var importItems = await scanAccountsAsync(apiExtendedfunc, accounts, libraryOptions);
+                var importItems = await scanAccountsAsync(accounts, libraryOptions);
                 logTime($"post {nameof(scanAccountsAsync)} all");
 
                 var totalCount = importItems.Count;
@@ -262,7 +262,7 @@ namespace ApplicationServices
             return null;
         }
 
-		private static async Task<List<ImportItem>> scanAccountsAsync(Func<Account, Task<ApiExtended>> apiExtendedfunc, Account[] accounts, LibraryOptions libraryOptions)
+		private static async Task<List<ImportItem>> scanAccountsAsync(Account[] accounts, LibraryOptions libraryOptions)
         {
             var tasks = new List<Task<List<ImportItem>>>();
 
@@ -278,7 +278,7 @@ namespace ApplicationServices
                 try
                 {
                     // get APIs in serial b/c of logins. do NOT move inside of parallel (Task.WhenAll)
-                    var apiExtended = await apiExtendedfunc(account);
+                    var apiExtended = await ApiExtended.CreateAsync(account);
 
                     // add scanAccountAsync as a TASK: do not await
                     tasks.Add(scanAccountAsync(apiExtended, account, libraryOptions, archiver));

Source/AudibleUtilities/ApiExtended.cs

@@ -11,11 +11,13 @@ using Polly;
 using Polly.Retry;
 using System.Threading;
 
+#nullable enable
 namespace AudibleUtilities
 {
 	/// <summary>USE THIS from within Libation. It wraps the call with correct JSONPath</summary>
 	public class ApiExtended
 	{
+		public static Func<Account, ILoginChoiceEager>? LoginChoiceFactory { get; set; }
 		public Api Api { get; private set; }
 
 		private const int MaxConcurrency = 10;
@@ -24,52 +26,46 @@ namespace AudibleUtilities
 		private ApiExtended(Api api) => Api = api;
 
 		/// <summary>Get api from existing tokens else login with 'eager' choice. External browser url is provided. Response can be external browser login or continuing with native api callbacks.</summary>
-		public static async Task<ApiExtended> CreateAsync(Account account, ILoginChoiceEager loginChoiceEager)
-		{
-			Serilog.Log.Logger.Information("{@DebugInfo}", new
-			{
-				LoginType = nameof(ILoginChoiceEager),
-				Account = account?.MaskedLogEntry ?? "[null]",
-				LocaleName = account?.Locale?.Name
-			});
-
-			var api = await EzApiCreator.GetApiAsync(
-				loginChoiceEager,
-				account.Locale,
-				AudibleApiStorage.AccountsSettingsFile,
-				account.GetIdentityTokensJsonPath());
-			return new ApiExtended(api);
-		}
-
-		/// <summary>Get api from existing tokens. Assumes you have valid login tokens. Else exception</summary>
 		public static async Task<ApiExtended> CreateAsync(Account account)
 		{
 			ArgumentValidator.EnsureNotNull(account, nameof(account));
+			ArgumentValidator.EnsureNotNull(account.AccountId, nameof(account.AccountId));
 			ArgumentValidator.EnsureNotNull(account.Locale, nameof(account.Locale));
 
-			Serilog.Log.Logger.Information("{@DebugInfo}", new
+			try
 			{
-				AccountMaskedLogEntry = account.MaskedLogEntry
-			});
+				Serilog.Log.Logger.Information("{@DebugInfo}", new
+				{
+					AccountMaskedLogEntry = account.MaskedLogEntry
+				});
 
-			return await CreateAsync(account.AccountId, account.Locale.Name);
-		}
-
-		/// <summary>Get api from existing tokens. Assumes you have valid login tokens. Else exception</summary>
-		public static async Task<ApiExtended> CreateAsync(string username, string localeName)
-		{
-			Serilog.Log.Logger.Information("{@DebugInfo}", new
+				var api = await EzApiCreator.GetApiAsync(
+						account.Locale,
+						AudibleApiStorage.AccountsSettingsFile,
+						account.GetIdentityTokensJsonPath());
+				return new ApiExtended(api);
+			}
+			catch
 			{
-				Username = username.ToMask(),
-				LocaleName = localeName,
-			});
+				if (LoginChoiceFactory is null)
+					throw new InvalidOperationException($"The UI module must first set {nameof(LoginChoiceFactory)} before attempting to create the api");
 
-			var api = await EzApiCreator.GetApiAsync(
-					Localization.Get(localeName),
+				Serilog.Log.Logger.Information("{@DebugInfo}", new
+				{
+					LoginType = nameof(ILoginChoiceEager),
+					Account = account.MaskedLogEntry ?? "[null]",
+					LocaleName = account.Locale?.Name
+				});
+
+				var api = await EzApiCreator.GetApiAsync(
+					LoginChoiceFactory(account),
+					account.Locale,
 					AudibleApiStorage.AccountsSettingsFile,
-					AudibleApiStorage.GetIdentityTokensJsonPath(username, localeName));
-			return new ApiExtended(api);
-		}
+					account.GetIdentityTokensJsonPath());
+
+				return new ApiExtended(api);
+			}
+		}	
 
 		private static AsyncRetryPolicy policy { get; }
 			= Policy.Handle<Exception>()

Source/AudibleUtilities/AudibleUtilities.csproj

@@ -6,7 +6,7 @@
 
   <ItemGroup>
     <PackageReference Include="AudibleApi" Version="9.4.1.1" />
-    <PackageReference Include="Google.Protobuf" Version="3.30.2" />
+    <PackageReference Include="Google.Protobuf" Version="3.31.1" />
   </ItemGroup>
 
   <ItemGroup>

Source/AudibleUtilities/Widevine/Cdm.cs

@@ -55,7 +55,7 @@ public class WidevineKey
 		Type = (KeyType)type;
 		Key = key;
 	}
-	public override string ToString() => $"{Convert.ToHexString(Kid.ToByteArray()).ToLower()}:{Convert.ToHexString(Key).ToLower()}";
+	public override string ToString() => $"{Convert.ToHexString(Kid.ToByteArray(bigEndian: true)).ToLower()}:{Convert.ToHexString(Key).ToLower()}";
 }
 
 public partial class Cdm
@@ -192,7 +192,7 @@ public partial class Cdm
 					id = id.Append(new byte[16 - id.Length]);
 				}
 
-				keys[i] = new WidevineKey(new Guid(id), keyContainer.Type, keyBytes);
+				keys[i] = new WidevineKey(new Guid(id,bigEndian: true), keyContainer.Type, keyBytes);
 			}
 			return keys;
 		}

Source/DataLayer/DataLayer.csproj

@@ -12,12 +12,12 @@
   <ItemGroup>
     <PackageReference Include="Dinah.Core" Version="9.0.1.1" />
     <PackageReference Include="Dinah.EntityFrameworkCore" Version="9.0.0.1" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="9.0.4">
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="9.0.7">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="9.0.4" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="9.0.4">
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="9.0.7" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="9.0.7">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

Source/DataLayer/QueryObjects/LibraryBookQueries.cs

@@ -103,13 +103,11 @@ namespace DataLayer
                         ) == true
                     ).ToList();
 
-        public static IEnumerable<LibraryBook> UnLiberated(this IEnumerable<LibraryBook> bookList)
-            => bookList
-                .Where(
-                    lb =>
-                        !lb.AbsentFromLastScan &&
-                        (lb.Book.UserDefinedItem.BookStatus is LiberatedStatus.NotLiberated or LiberatedStatus.PartialDownload
-                        || lb.Book.UserDefinedItem.PdfStatus is LiberatedStatus.NotLiberated or LiberatedStatus.PartialDownload)
-                    );
+		public static bool NeedsPdfDownload(this LibraryBook libraryBook)
+			=> !libraryBook.AbsentFromLastScan && libraryBook.Book.UserDefinedItem.PdfStatus is LiberatedStatus.NotLiberated;
+		public static bool NeedsBookDownload(this LibraryBook libraryBook)
+			=> !libraryBook.AbsentFromLastScan && libraryBook.Book.UserDefinedItem.BookStatus is LiberatedStatus.NotLiberated or LiberatedStatus.PartialDownload;
+		public static IEnumerable<LibraryBook> UnLiberated(this IEnumerable<LibraryBook> bookList)
+            => bookList.Where(lb => lb.NeedsPdfDownload() || lb.NeedsBookDownload());
     }
 }

Source/FileLiberator/DownloadDecryptBook.cs

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using System.Threading;
 using System.Threading.Tasks;
 using AaxDecrypter;
 using ApplicationServices;
@@ -18,10 +19,15 @@ namespace FileLiberator
     {
         public override string Name => "Download & Decrypt";
         private AudiobookDownloadBase abDownloader;
+		private readonly CancellationTokenSource cancellationTokenSource = new();
 
-        public override bool Validate(LibraryBook libraryBook) => !libraryBook.Book.Audio_Exists();
-
-        public override Task CancelAsync() => abDownloader?.CancelAsync() ?? Task.CompletedTask;
+		public override bool Validate(LibraryBook libraryBook) => !libraryBook.Book.Audio_Exists();
+        public override async Task CancelAsync()
+        {
+            cancellationTokenSource.Cancel();
+            if (abDownloader is not null)
+				await abDownloader.CancelAsync();
+		}
 
         public override async Task<StatusHandler> ProcessAsync(LibraryBook libraryBook)
         {
@@ -41,8 +47,9 @@ namespace FileLiberator
             }
 
             OnBegin(libraryBook);
+            var cancellationToken = cancellationTokenSource.Token;
 
-            try
+			try
             {
                 if (libraryBook.Book.Audio_Exists())
                     return new StatusHandler { "Cannot find decrypt. Final audio file already exists" };
@@ -50,7 +57,7 @@ namespace FileLiberator
                 downloadValidation(libraryBook);
 				var api = await libraryBook.GetApiAsync();
                 var config = Configuration.Instance;
-				using var downloadOptions = await DownloadOptions.InitiateDownloadAsync(api, config, libraryBook);
+				using var downloadOptions = await DownloadOptions.InitiateDownloadAsync(api, config, libraryBook, cancellationToken);
 
                 bool success = false;
                 try
@@ -74,38 +81,32 @@ namespace FileLiberator
                         .Where(f => f.FileType != FileType.AAXC)
                         .Select(f => Task.Run(() => FileUtility.SaferDelete(f.Path))));
 
-                    return
-                        abDownloader?.IsCanceled is true
-                        ? new StatusHandler { "Cancelled" }
-                        : new StatusHandler { "Decrypt failed" };
+					cancellationToken.ThrowIfCancellationRequested();
+					return new StatusHandler { "Decrypt failed" };
                 }
 
                 var finalStorageDir = getDestinationDirectory(libraryBook);
 
-                var moveFilesTask = Task.Run(() => moveFilesToBooksDir(libraryBook, entries));
+                var moveFilesTask = Task.Run(() => moveFilesToBooksDir(libraryBook, entries, cancellationToken));
                 Task[] finalTasks =
                 [
-                    Task.Run(() => downloadCoverArt(downloadOptions)),
+                    Task.Run(() => downloadCoverArt(downloadOptions, cancellationToken)),
                     moveFilesTask,
-                    Task.Run(() => WindowsDirectory.SetCoverAsFolderIcon(libraryBook.Book.PictureId, finalStorageDir))
+                    Task.Run(() => WindowsDirectory.SetCoverAsFolderIcon(libraryBook.Book.PictureId, finalStorageDir, cancellationToken))
                 ];
 
 				try
                 {
-                    await Task.WhenAll(finalTasks);
-                }
-                catch
-                {
+					await Task.WhenAll(finalTasks);
+				}
+                catch when (!moveFilesTask.IsFaulted)
+				{
 					//Swallow downloadCoverArt and SetCoverAsFolderIcon exceptions.
-                    //Only fail if the downloaded audio files failed to move to Books directory
-					if (moveFilesTask.IsFaulted)
-                    {
-                        throw;
-                    }
-                }
-                finally
+					//Only fail if the downloaded audio files failed to move to Books directory
+				}
+				finally
                 {
-                    if (moveFilesTask.IsCompletedSuccessfully)
+                    if (moveFilesTask.IsCompletedSuccessfully && !cancellationToken.IsCancellationRequested)
                     {
                         await Task.Run(() => libraryBook.UpdateBookStatus(LiberatedStatus.Liberated, Configuration.LibationVersion));
 
@@ -114,8 +115,12 @@ namespace FileLiberator
 				}
 
 				return new StatusHandler();
-            }
-            finally
+			}
+			catch when (cancellationToken.IsCancellationRequested)
+			{
+				return new StatusHandler { "Cancelled" };
+			}
+			finally
             {
                 OnCompleted(libraryBook);
             }
@@ -171,6 +176,29 @@ namespace FileLiberator
             if (sender is not AaxcDownloadConvertBase converter || converter.DownloadOptions is not DownloadOptions options)
 				return;
 
+			#region Prevent erroneous truncation due to incorrect chapter info
+
+			//Sometimes the chapter info is not accurate. Since AAXClean trims audio
+			//files to the chapters start and end, if the last chapter's end time is
+			//before the end of the audio file, the file will be truncated to match
+			//the chapter. This is never desirable, so pad the last chapter to match
+			//the original audio length.
+
+			var fileDuration = converter.AaxFile.Duration;
+            if (options.Config.StripAudibleBrandAudio)
+                fileDuration -= TimeSpan.FromMilliseconds(options.ContentMetadata.ChapterInfo.BrandOutroDurationMs);
+
+            var durationDelta = fileDuration - options.ChapterInfo.EndOffset;
+			//Remove the last chapter and re-add it with the durationDelta that will
+            //make the chapter's end coincide with the end of the audio file.
+			var chapters = options.ChapterInfo.Chapters as List<AAXClean.Chapter>;
+			var lastChapter = chapters[^1];
+
+			chapters.Remove(lastChapter);
+			options.ChapterInfo.Add(lastChapter.Title, lastChapter.Duration + durationDelta);
+            
+            #endregion
+
 			tags.Title ??= options.LibraryBookDto.TitleWithSubtitle;
             tags.Album ??= tags.Title;
             tags.Artist ??= string.Join("; ", options.LibraryBook.Book.Authors.Select(a => a.Name));
@@ -234,16 +262,17 @@ namespace FileLiberator
 
         /// <summary>Move new files to 'Books' directory</summary>
         /// <returns>Return directory if audiobook file(s) were successfully created and can be located on disk. Else null.</returns>
-        private static void moveFilesToBooksDir(LibraryBook libraryBook, List<FilePathCache.CacheEntry> entries)
+        private static void moveFilesToBooksDir(LibraryBook libraryBook, List<FilePathCache.CacheEntry> entries, CancellationToken cancellationToken)
         {
             // create final directory. move each file into it
             var destinationDir = getDestinationDirectory(libraryBook);
+            cancellationToken.ThrowIfCancellationRequested();
 
 			for (var i = 0; i < entries.Count; i++)
             {
                 var entry = entries[i];
 
-                var realDest
+				var realDest
                     = FileUtility.SaferMoveToValidPath(
                         entry.Path,
                         Path.Combine(destinationDir, Path.GetFileName(entry.Path)),
@@ -255,7 +284,8 @@ namespace FileLiberator
 
                 // propagate corrected path. Must update cache with corrected path. Also want updated path for cue file (after this for-loop)
                 entries[i] = entry with { Path = realDest };
-            }
+                cancellationToken.ThrowIfCancellationRequested();
+			}
 
 			var cue = entries.FirstOrDefault(f => f.FileType == FileType.Cue);
             if (cue != default)
@@ -264,7 +294,8 @@ namespace FileLiberator
 				SetFileTime(libraryBook, cue.Path);
 			}
 
-            AudibleFileStorage.Audio.Refresh();
+			cancellationToken.ThrowIfCancellationRequested();
+			AudibleFileStorage.Audio.Refresh();
         }
 
         private static string getDestinationDirectory(LibraryBook libraryBook)
@@ -278,7 +309,7 @@ namespace FileLiberator
 		private static FilePathCache.CacheEntry getFirstAudioFile(IEnumerable<FilePathCache.CacheEntry> entries)
             => entries.FirstOrDefault(f => f.FileType == FileType.Audio);
 
-		private static void downloadCoverArt(DownloadOptions options)
+		private static void downloadCoverArt(DownloadOptions options, CancellationToken cancellationToken)
         {
 			if (!Configuration.Instance.DownloadCoverArt) return;
 
@@ -293,7 +324,7 @@ namespace FileLiberator
                 if (File.Exists(coverPath))
                     FileUtility.SaferDelete(coverPath);
 
-                var picBytes = PictureStorage.GetPictureSynchronously(new(options.LibraryBook.Book.PictureLarge ?? options.LibraryBook.Book.PictureId, PictureSize.Native));
+                var picBytes = PictureStorage.GetPictureSynchronously(new(options.LibraryBook.Book.PictureLarge ?? options.LibraryBook.Book.PictureId, PictureSize.Native), cancellationToken);
                 if (picBytes.Length > 0)
                 {
                     File.WriteAllBytes(coverPath, picBytes);
@@ -304,6 +335,7 @@ namespace FileLiberator
             {
                 //Failure to download cover art should not be considered a failure to download the book
                 Serilog.Log.Logger.Error(ex, $"Error downloading cover art of {options.LibraryBook.Book.AudibleProductId} to {coverPath} catalog product.");
+                throw;
             }
         }
     }

Source/FileLiberator/DownloadOptions.Factory.cs

@@ -11,6 +11,7 @@ using System.IO;
 using System.Linq;
 using System.Net.Http;
 using System.Text.RegularExpressions;
+using System.Threading;
 using System.Threading.Tasks;
 
 #nullable enable
@@ -24,11 +25,12 @@ public partial class DownloadOptions
 	/// <summary>
 	/// Initiate an audiobook download from the audible api.
 	/// </summary>
-	public static async Task<DownloadOptions> InitiateDownloadAsync(Api api, Configuration config, LibraryBook libraryBook)
+	public static async Task<DownloadOptions> InitiateDownloadAsync(Api api, Configuration config, LibraryBook libraryBook, CancellationToken token)
 	{
-		var license = await ChooseContent(api, libraryBook, config);
+		var license = await ChooseContent(api, libraryBook, config, token);
+		token.ThrowIfCancellationRequested();
 
-		//Come audiobooks will have incorrect chapters in the metadata returned from the license request,
+		//Some audiobooks will have incorrect chapters in the metadata returned from the license request,
 		//but the metadata returned by the content metadata endpoint will be correct. Call the content
 		//metadata endpoint and use its chapters. Only replace the license request chapters if the total
 		//lengths match (defensive against different audio formats having slightly different lengths).
@@ -36,31 +38,44 @@ public partial class DownloadOptions
 		if (metadata.ChapterInfo.RuntimeLengthMs == license.ContentMetadata.ChapterInfo.RuntimeLengthMs)
 			license.ContentMetadata.ChapterInfo = metadata.ChapterInfo;
 
-		var options = BuildDownloadOptions(libraryBook, config, license);
-
-		return options;
+		token.ThrowIfCancellationRequested();
+		return BuildDownloadOptions(libraryBook, config, license);
 	}
 
-	private static async Task<ContentLicense> ChooseContent(Api api, LibraryBook libraryBook, Configuration config)
+	private class LicenseInfo
+	{
+		public DrmType DrmType { get; }
+		public ContentMetadata ContentMetadata { get; set; }
+		public KeyData[]? DecryptionKeys { get; }
+		public LicenseInfo(ContentLicense license, IEnumerable<KeyData>? keys = null)
+		{
+			DrmType = license.DrmType;
+			ContentMetadata = license.ContentMetadata;
+			DecryptionKeys = keys?.ToArray() ?? ToKeys(license.Voucher);
+		}
+
+		private static KeyData[]? ToKeys(VoucherDtoV10? voucher)
+			=> voucher is null ? null : [new KeyData(voucher.Key, voucher.Iv)];
+	}
+
+	private static async Task<LicenseInfo> ChooseContent(Api api, LibraryBook libraryBook, Configuration config, CancellationToken token)
 	{
 		var dlQuality = config.FileDownloadQuality == Configuration.DownloadQuality.Normal ? DownloadQuality.Normal : DownloadQuality.High;
 
 		if (!config.UseWidevine || await Cdm.GetCdmAsync() is not Cdm cdm)
-			return await api.GetDownloadLicenseAsync(libraryBook.Book.AudibleProductId, dlQuality);
-
-		ContentLicense? contentLic = null, fallback = null;
+		{
+			token.ThrowIfCancellationRequested();
+			var license = await api.GetDownloadLicenseAsync(libraryBook.Book.AudibleProductId, dlQuality);
+			return new LicenseInfo(license);
+		}
 
+		token.ThrowIfCancellationRequested();
 		try
 		{
 			//try to request a widevine content license using the user's spatial audio settings
-			var codecChoice = config.SpatialAudioCodec switch
-			{
-				Configuration.SpatialCodec.EC_3 => Ec3Codec,
-				Configuration.SpatialCodec.AC_4 => Ac4Codec,
-				_ => throw new NotSupportedException($"Unknown value for {nameof(config.SpatialAudioCodec)}")
-			};
+			var codecChoice = config.SpatialAudioCodec is Configuration.SpatialCodec.AC_4 ? Ac4Codec : Ec3Codec;
 
-			contentLic
+			var contentLic
 				= await api.GetDownloadLicenseAsync(
 					libraryBook.Book.AudibleProductId,
 					dlQuality,
@@ -68,119 +83,50 @@ public partial class DownloadOptions
 					DrmType.Widevine,
 					config.RequestSpatial,
 					codecChoice);
+
+			if (contentLic.DrmType is not DrmType.Widevine)
+				return new LicenseInfo(contentLic);
+
+			using var client = new HttpClient();
+			using var mpdResponse = await client.GetAsync(contentLic.LicenseResponse, token);
+			var dash = new MpegDash(mpdResponse.Content.ReadAsStream(token));
+
+			if (!dash.TryGetUri(new Uri(contentLic.LicenseResponse), out var contentUri))
+				throw new InvalidDataException("Failed to get mpeg-dash content download url.");
+
+			contentLic.ContentMetadata.ContentUrl = new() { OfflineUrl = contentUri.ToString() };
+
+			using var session = cdm.OpenSession();
+			var challenge = session.GetLicenseChallenge(dash);
+			var licenseMessage = await api.WidevineDrmLicense(libraryBook.Book.AudibleProductId, challenge);
+			var keys = session.ParseLicense(licenseMessage);
+			return new LicenseInfo(contentLic, keys.Select(k => new KeyData(k.Kid.ToByteArray(bigEndian: true), k.Key)));
 		}
 		catch (Exception ex)
 		{
 			Serilog.Log.Logger.Error(ex, "Failed to request a Widevine license.");
-			//We failed to get a widevine license, so fall back to AAX(C)
-			return await api.GetDownloadLicenseAsync(libraryBook.Book.AudibleProductId, dlQuality);
+			//We failed to get a widevine content license. Depending on the
+			//failure reason, users can potentially still download this audiobook
+			//by disabling the "Use Widevine DRM" feature.
+			throw;
 		}
-
-		if (!contentLic.ContentMetadata.ContentReference.IsSpatial && contentLic.DrmType != DrmType.Adrm)
-		{
-			/*
-			We got a widevine license and we have a Cdm, but we still need to decide if we WANT the file
-			being delivered with widevine. This file is not "spatial", so it may be no better than the
-			audio in the Adrm files. All else being equal, we prefer Adrm files because they have more
-			build-in metadata and always AAC-LC, which is a codec playable by pretty much every device
-			in existence.
-
-			Unfortunately, there appears to be no way to determine which codec/quality combination we'll
-			get until we make the request and see what content gets delivered. For some books,
-			Widevine/High delivers 44.1 kHz / 128 kbps audio and Adrm/High delivers 22.05 kHz / 64 kbps.
-			In those cases, the Widevine content size is much larger. Other books will deliver the same
-			sample rate / bitrate for both Widevine and Adrm, the only difference being codec. Widevine
-			is usually xHE-AAC, but is sometimes AAC-LC. Adrm is always AAC-LC.
-
-			To decide which file we want, use this simple rule: if files are different codecs and
-			Widevine is significantly larger, use Widevine. Otherwise use ADRM.
-			*/
-
-			fallback = await api.GetDownloadLicenseAsync(libraryBook.Book.AudibleProductId, dlQuality);
-
-			var wvCr = contentLic.ContentMetadata.ContentReference;
-			var adrmCr = fallback.ContentMetadata.ContentReference;
-
-			if (wvCr.Codec == adrmCr.Codec ||
-				adrmCr.ContentSizeInBytes > wvCr.ContentSizeInBytes ||
-				RelativePercentDifference(adrmCr.ContentSizeInBytes, wvCr.ContentSizeInBytes) < 0.05)
-			{
-				contentLic = fallback;
-			}
-		}		
-
-		if (contentLic.DrmType == DrmType.Widevine)
-		{
-			try
-			{
-				using var client = new HttpClient();
-				using var mpdResponse = await client.GetAsync(contentLic.LicenseResponse);
-				var dash = new MpegDash(mpdResponse.Content.ReadAsStream());
-
-				if (!dash.TryGetUri(new Uri(contentLic.LicenseResponse), out var contentUri))
-					throw new InvalidDataException("Failed to get mpeg-dash content download url.");
-
-				contentLic.ContentMetadata.ContentUrl = new() { OfflineUrl = contentUri.ToString() };
-
-				using var session = cdm.OpenSession();
-				var challenge = session.GetLicenseChallenge(dash);
-				var licenseMessage = await api.WidevineDrmLicense(libraryBook.Book.AudibleProductId, challenge);
-				var keys = session.ParseLicense(licenseMessage);
-				contentLic.Voucher = new VoucherDtoV10()
-				{
-					Key = Convert.ToHexStringLower(keys[0].Kid.ToByteArray()),
-					Iv = Convert.ToHexStringLower(keys[0].Key)
-				};
-			}
-			catch
-			{
-				if (fallback != null)
-					return fallback;
-
-				//We won't have a fallback if the requested license is for a spatial audio file.
-				//Throw so that the user is aware that spatial audio exists and that they were not able to download it.
-				throw;
-			}
-		}
-		return contentLic;
 	}
 
 
-	private static DownloadOptions BuildDownloadOptions(LibraryBook libraryBook, Configuration config, ContentLicense contentLic)
+	private static DownloadOptions BuildDownloadOptions(LibraryBook libraryBook, Configuration config, LicenseInfo licInfo)
 	{
-		//If DrmType is not Adrm or Widevine, the delivered file is an unencrypted mp3.
-		var outputFormat
-			= contentLic.DrmType is not DrmType.Adrm and not DrmType.Widevine ||
-			(config.AllowLibationFixup && config.DecryptToLossy && contentLic.ContentMetadata.ContentReference.Codec != "ac-4")
-			? OutputFormat.Mp3
-			: OutputFormat.M4b;
-
 		long chapterStartMs
 			= config.StripAudibleBrandAudio
-			? contentLic.ContentMetadata.ChapterInfo.BrandIntroDurationMs
+			? licInfo.ContentMetadata.ChapterInfo.BrandIntroDurationMs
 			: 0;
 
-		AAXClean.FileType? inputType
-			= contentLic.DrmType is DrmType.Widevine ? AAXClean.FileType.Dash
-			: contentLic.DrmType is DrmType.Adrm && contentLic.Voucher?.Key.Length == 8 && contentLic.Voucher?.Iv == null ? AAXClean.FileType.Aax
-			: contentLic.DrmType is DrmType.Adrm && contentLic.Voucher?.Key.Length == 32 && contentLic.Voucher?.Iv.Length == 32 ? AAXClean.FileType.Aaxc
-			: null;
-
-		var dlOptions = new DownloadOptions(config, libraryBook, contentLic.ContentMetadata.ContentUrl?.OfflineUrl)
+		var dlOptions = new DownloadOptions(config, libraryBook, licInfo)
 		{
-			AudibleKey = contentLic.Voucher?.Key,
-			AudibleIV = contentLic.Voucher?.Iv,
-			InputType = inputType,
-			OutputFormat = outputFormat,
-			DrmType = contentLic.DrmType,
-			ContentMetadata = contentLic.ContentMetadata,
-			LameConfig = outputFormat == OutputFormat.Mp3 ? GetLameOptions(config) : null,
 			ChapterInfo = new AAXClean.ChapterInfo(TimeSpan.FromMilliseconds(chapterStartMs)),
-			RuntimeLength = TimeSpan.FromMilliseconds(contentLic.ContentMetadata.ChapterInfo.RuntimeLengthMs),
+			RuntimeLength = TimeSpan.FromMilliseconds(licInfo.ContentMetadata.ChapterInfo.RuntimeLengthMs),
 		};
 
-		dlOptions.LibraryBookDto.Codec = contentLic.ContentMetadata.ContentReference.Codec;
-		if (TryGetAudioInfo(contentLic.ContentMetadata.ContentUrl, out int? bitrate, out int? sampleRate, out int? channels))
+		if (TryGetAudioInfo(licInfo.ContentMetadata.ContentUrl, out int? bitrate, out int? sampleRate, out int? channels))
 		{
 			dlOptions.LibraryBookDto.BitRate = bitrate;
 			dlOptions.LibraryBookDto.SampleRate = sampleRate;
@@ -189,7 +135,7 @@ public partial class DownloadOptions
 
 		var titleConcat = config.CombineNestedChapterTitles ? ": " : null;
 		var chapters
-			= flattenChapters(contentLic.ContentMetadata.ChapterInfo.Chapters, titleConcat)
+			= flattenChapters(licInfo.ContentMetadata.ChapterInfo.Chapters, titleConcat)
 			.OrderBy(c => c.StartOffsetMs)
 			.ToList();
 
@@ -205,7 +151,7 @@ public partial class DownloadOptions
 				chapLenMs -= chapterStartMs;
 
 			if (config.StripAudibleBrandAudio && i == chapters.Count - 1)
-				chapLenMs -= contentLic.ContentMetadata.ChapterInfo.BrandOutroDurationMs;
+				chapLenMs -= licInfo.ContentMetadata.ChapterInfo.BrandOutroDurationMs;
 
 			dlOptions.ChapterInfo.AddChapter(chapter.Title, TimeSpan.FromMilliseconds(chapLenMs));
 		}

Source/FileLiberator/DownloadOptions.cs

@@ -9,47 +9,47 @@ using System.IO;
 using ApplicationServices;
 using LibationFileManager.Templates;
 
+#nullable enable
 namespace FileLiberator
 {
 	public partial class DownloadOptions : IDownloadOptions, IDisposable
 	{
-		public event EventHandler<long> DownloadSpeedChanged;
+		public event EventHandler<long>? DownloadSpeedChanged;
 		public LibraryBook LibraryBook { get; }
 		public LibraryBookDto LibraryBookDto { get; }
 		public string DownloadUrl { get; }
-		public string AudibleKey { get; init; }
-		public string AudibleIV { get; init; }
-		public TimeSpan RuntimeLength { get; init; }
-		public OutputFormat OutputFormat { get; init; }
-		public ChapterInfo ChapterInfo { get; init; }
+		public KeyData[]? DecryptionKeys { get; }
+		public required TimeSpan RuntimeLength { get; init; }
+		public OutputFormat OutputFormat { get; }
+		public required ChapterInfo ChapterInfo { get; init; }
 		public string Title => LibraryBook.Book.Title;
 		public string Subtitle => LibraryBook.Book.Subtitle;
 		public string Publisher => LibraryBook.Book.Publisher;
 		public string Language => LibraryBook.Book.Language;
-		public string AudibleProductId => LibraryBookDto.AudibleProductId;
-		public string SeriesName => LibraryBookDto.FirstSeries?.Name;
+		public string? AudibleProductId => LibraryBookDto.AudibleProductId;
+		public string? SeriesName => LibraryBookDto.FirstSeries?.Name;
 		public float? SeriesNumber => LibraryBookDto.FirstSeries?.Number;
-		public NAudio.Lame.LameConfig LameConfig { get; init; }
+		public NAudio.Lame.LameConfig? LameConfig { get; }
 		public string UserAgent => AudibleApi.Resources.Download_User_Agent;
-		public bool TrimOutputToChapterLength => config.AllowLibationFixup && config.StripAudibleBrandAudio;
-		public bool StripUnabridged => config.AllowLibationFixup && config.StripUnabridged;
-		public bool CreateCueSheet => config.CreateCueSheet;
-		public bool DownloadClipsBookmarks => config.DownloadClipsBookmarks;
-		public long DownloadSpeedBps => config.DownloadSpeedLimit;
-		public bool RetainEncryptedFile => config.RetainAaxFile;
-		public bool FixupFile => config.AllowLibationFixup;
-		public bool Downsample => config.AllowLibationFixup && config.LameDownsampleMono;
-		public bool MatchSourceBitrate => config.AllowLibationFixup && config.LameMatchSourceBR && config.LameTargetBitrate;
-		public bool MoveMoovToBeginning => config.MoveMoovToBeginning;
-		public AAXClean.FileType? InputType { get; init; }
-		public AudibleApi.Common.DrmType DrmType { get; init; }
-		public AudibleApi.Common.ContentMetadata ContentMetadata { get; init; }
+		public bool TrimOutputToChapterLength => Config.AllowLibationFixup && Config.StripAudibleBrandAudio;
+		public bool StripUnabridged => Config.AllowLibationFixup && Config.StripUnabridged;
+		public bool CreateCueSheet => Config.CreateCueSheet;
+		public bool DownloadClipsBookmarks => Config.DownloadClipsBookmarks;
+		public long DownloadSpeedBps => Config.DownloadSpeedLimit;
+		public bool RetainEncryptedFile => Config.RetainAaxFile;
+		public bool FixupFile => Config.AllowLibationFixup;
+		public bool Downsample => Config.AllowLibationFixup && Config.LameDownsampleMono;
+		public bool MatchSourceBitrate => Config.AllowLibationFixup && Config.LameMatchSourceBR && Config.LameTargetBitrate;
+		public bool MoveMoovToBeginning => Config.MoveMoovToBeginning;
+		public AAXClean.FileType? InputType { get; }
+		public AudibleApi.Common.DrmType DrmType { get; }
+		public AudibleApi.Common.ContentMetadata ContentMetadata { get; }
 
 		public string GetMultipartFileName(MultiConvertFileProperties props)
 		{
 			var baseDir = Path.GetDirectoryName(props.OutputFileName);
 			var extension = Path.GetExtension(props.OutputFileName);
-			return Templates.ChapterFile.GetFilename(LibraryBookDto, props, baseDir, extension);
+			return Templates.ChapterFile.GetFilename(LibraryBookDto, props, baseDir!, extension);
 		}
 
 		public string GetMultipartTitle(MultiConvertFileProperties props)
@@ -59,7 +59,7 @@ namespace FileLiberator
 		{
 			if (DownloadClipsBookmarks)
 			{
-				var format = config.ClipsBookmarksFileFormat;
+				var format = Config.ClipsBookmarksFileFormat;
 
 				var formatExtension = format.ToString().ToLowerInvariant();
 				var filePath = Path.ChangeExtension(fileName, formatExtension);
@@ -84,7 +84,7 @@ namespace FileLiberator
 			return string.Empty;
 		}
 
-		private readonly Configuration config;
+		public Configuration Config { get; }
 		private readonly IDisposable cancellation;
 		public void Dispose()
 		{
@@ -92,14 +92,38 @@ namespace FileLiberator
 			GC.SuppressFinalize(this);
 		}
 
-		private DownloadOptions(Configuration config, LibraryBook libraryBook, [System.Diagnostics.CodeAnalysis.NotNull] string downloadUrl)
+		private DownloadOptions(Configuration config, LibraryBook libraryBook, LicenseInfo licInfo)
 		{
-			this.config = ArgumentValidator.EnsureNotNull(config, nameof(config));
+			Config = ArgumentValidator.EnsureNotNull(config, nameof(config));
 			LibraryBook = ArgumentValidator.EnsureNotNull(libraryBook, nameof(libraryBook));
-			DownloadUrl = ArgumentValidator.EnsureNotNullOrEmpty(downloadUrl, nameof(downloadUrl));
-			// no null/empty check for key/iv. unencrypted files do not have them
 
+			ArgumentValidator.EnsureNotNull(licInfo, nameof(licInfo));
+
+			if (licInfo.ContentMetadata.ContentUrl.OfflineUrl is not string licUrl)
+				throw new InvalidDataException("Content license doesn't contain an offline Url");
+
+			DownloadUrl = licUrl;
+			DecryptionKeys = licInfo.DecryptionKeys;
+			DrmType = licInfo.DrmType;
+			ContentMetadata = licInfo.ContentMetadata;
+			InputType
+			= licInfo.DrmType is AudibleApi.Common.DrmType.Widevine ? AAXClean.FileType.Dash
+			: licInfo.DrmType is AudibleApi.Common.DrmType.Adrm && licInfo.DecryptionKeys?.Length == 1 && licInfo.DecryptionKeys[0].KeyPart1.Length == 4 && licInfo.DecryptionKeys[0].KeyPart2 is null ? AAXClean.FileType.Aax
+			: licInfo.DrmType is AudibleApi.Common.DrmType.Adrm && licInfo.DecryptionKeys?.Length == 1 && licInfo.DecryptionKeys[0].KeyPart1.Length == 16 && licInfo.DecryptionKeys[0].KeyPart2?.Length == 16 ? AAXClean.FileType.Aaxc
+			: null;
+
+			//If DrmType is not Adrm or Widevine, the delivered file is an unencrypted mp3.
+			OutputFormat
+				= licInfo.DrmType is not AudibleApi.Common.DrmType.Adrm and not AudibleApi.Common.DrmType.Widevine ||
+				(config.AllowLibationFixup && config.DecryptToLossy && licInfo.ContentMetadata.ContentReference.Codec != Ac4Codec)
+				? OutputFormat.Mp3
+				: OutputFormat.M4b;
+
+			LameConfig = OutputFormat == OutputFormat.Mp3 ? GetLameOptions(config) : null;
+
+			// no null/empty check for key/iv. unencrypted files do not have them
 			LibraryBookDto = LibraryBook.ToDto();
+			LibraryBookDto.Codec = licInfo.ContentMetadata.ContentReference.Codec;
 
 			cancellation =
 				config

Source/FileLiberator/UtilityExtensions.cs

@@ -20,9 +20,15 @@ namespace FileLiberator
 			account: libraryBook.Account.ToMask()
 			);
 
+		public static Func<Account, Task<ApiExtended>>? ApiExtendedFunc { get; set; }
+
 		public static async Task<AudibleApi.Api> GetApiAsync(this LibraryBook libraryBook)
 		{
-			var apiExtended = await ApiExtended.CreateAsync(libraryBook.Account, libraryBook.Book.Locale);
+			Account account;
+			using (var accounts = AudibleApiStorage.GetAccountsSettingsPersister())
+				account = accounts.AccountsSettings.GetAccount(libraryBook.Account, libraryBook.Book.Locale);
+
+			var apiExtended = await ApiExtended.CreateAsync(account);
 			return apiExtended.Api;
 		}
 

Source/FileManager/FileManager.csproj

@@ -6,7 +6,7 @@
 
   <ItemGroup>
     <PackageReference Include="Dinah.Core" Version="9.0.1.1" />
-    <PackageReference Include="Polly" Version="8.5.2" />
+    <PackageReference Include="Polly" Version="8.6.2" />
   </ItemGroup>
 
 	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">

Source/HangoverAvalonia/HangoverAvalonia.csproj

@@ -71,12 +71,12 @@
 	</ItemGroup>
 	<ItemGroup>
 
-		<PackageReference Include="Avalonia" Version="11.3.0" />
-		<PackageReference Include="Avalonia.Desktop" Version="11.3.0" />
+		<PackageReference Include="Avalonia" Version="11.3.2" />
+		<PackageReference Include="Avalonia.Desktop" Version="11.3.2" />
 		<!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
-		<PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.3.0" />
-		<PackageReference Include="Avalonia.ReactiveUI" Version="11.3.0" />
-		<PackageReference Include="Avalonia.Themes.Fluent" Version="11.3.0" />
+		<PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.3.2" />
+		<PackageReference Include="Avalonia.ReactiveUI" Version="11.3.2" />
+		<PackageReference Include="Avalonia.Themes.Fluent" Version="11.3.2" />
 	</ItemGroup>
 	<ItemGroup>
 		<ProjectReference Include="..\HangoverBase\HangoverBase.csproj" />

Source/LibationAvalonia/App.axaml.cs

@@ -16,6 +16,8 @@ using Dinah.Core;
 using LibationAvalonia.Themes;
 using Avalonia.Data.Core.Plugins;
 using System.Linq;
+using LibationUiBase.Forms;
+using Avalonia.Controls;
 
 #nullable enable
 namespace LibationAvalonia
@@ -42,6 +44,9 @@ namespace LibationAvalonia
 
 			if (ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop)
 			{
+				MessageBoxBase.ShowAsyncImpl = (owner, message, caption, buttons, icon, defaultButton, saveAndRestorePosition) =>
+					MessageBox.Show(owner as Window, message, caption, buttons, icon, defaultButton, saveAndRestorePosition);
+
 				// Avoid duplicate validations from both Avalonia and the CommunityToolkit. 
 				// More info: https://docs.avaloniaui.net/docs/guides/development-guides/data-validation#manage-validationplugins
 				DisableAvaloniaDataAnnotationValidation();

Source/LibationAvalonia/AvaloniaUtils.cs

@@ -4,6 +4,7 @@ using Avalonia.Markup.Xaml.MarkupExtensions;
 using Avalonia.Media.Imaging;
 using Avalonia.VisualTree;
 using LibationFileManager;
+using LibationUiBase.Forms;
 using System.Threading.Tasks;
 
 #nullable enable

Source/LibationAvalonia/Controls/DataGridCheckBoxColumnExt.cs

@@ -9,7 +9,7 @@ namespace LibationAvalonia.Controls
 		{
 			//Only SeriesEntry types have three-state checks, individual LibraryEntry books are binary.
 			var ele = base.GenerateEditingElementDirect(cell, dataItem) as CheckBox;
-			ele.IsThreeState = dataItem is ISeriesEntry;
+			ele.IsThreeState = dataItem is SeriesEntry;
 			return ele;
 		}
 	}

Source/LibationAvalonia/Controls/DataGridContextMenus.cs

@@ -34,11 +34,11 @@ namespace LibationAvalonia.Controls
 		private static void Cell_ContextRequested(object sender, ContextRequestedEventArgs e)
 		{
 			if (sender is DataGridCell cell &&
-				cell.DataContext is IGridEntry clickedEntry &&
+				cell.DataContext is GridEntry clickedEntry &&
 				OwningColumnProperty.GetValue(cell) is DataGridColumn column &&
 				OwningGridProperty.GetValue(column) is DataGrid grid)
 			{
-				var allSelected = grid.SelectedItems.OfType<IGridEntry>().ToArray();
+				var allSelected = grid.SelectedItems.OfType<GridEntry>().ToArray();
 				var clickedIndex = Array.IndexOf(allSelected, clickedEntry);
 				if (clickedIndex == -1)
 				{
@@ -101,7 +101,7 @@ namespace LibationAvalonia.Controls
 		private static string RemoveLineBreaks(string text)
 			=> text.Replace("\r\n", "").Replace('\r', ' ').Replace('\n', ' ');
 
-		private string GetRowClipboardContents(IGridEntry gridEntry)
+		private string GetRowClipboardContents(GridEntry gridEntry)
 		{
 			var contents = Grid.Columns.Where(c => c.IsVisible).OrderBy(c => c.DisplayIndex).Select(c => RemoveLineBreaks(GetCellValue(c, gridEntry))).ToArray();
 			return string.Join("\t", contents);
@@ -109,7 +109,7 @@ namespace LibationAvalonia.Controls
 
 		public required DataGrid Grid { get; init; }
 		public required DataGridColumn Column { get; init; }
-		public required IGridEntry[] GridEntries { get; init; }
+		public required GridEntry[] GridEntries { get; init; }
 		public required ContextMenu ContextMenu { get; init; }
 		public AvaloniaList<Control> ContextMenuItems
 			=> ContextMenu.ItemsSource as AvaloniaList<Control>;

Source/LibationAvalonia/Controls/DirectoryOrCustomSelectControl.axaml.cs

@@ -1,5 +1,6 @@
 using Avalonia;
 using Avalonia.Controls;
+using Avalonia.Platform.Storage;
 using Dinah.Core;
 using LibationFileManager;
 using ReactiveUI;
@@ -90,7 +91,7 @@ namespace LibationAvalonia.Controls
 
 			var selectedFolders = await (VisualRoot as Window).StorageProvider.OpenFolderPickerAsync(options);
 
-			directoryState.CustomDir = selectedFolders.SingleOrDefault()?.Path?.LocalPath ?? directoryState.CustomDir;
+			directoryState.CustomDir = selectedFolders.SingleOrDefault()?.TryGetLocalPath() ?? directoryState.CustomDir;
 		}
 
 		private void DirectoryOrCustomSelectControl_PropertyChanged(object sender, AvaloniaPropertyChangedEventArgs e)

Source/LibationAvalonia/Controls/Settings/Audio.axaml.cs

@@ -4,6 +4,7 @@ using LibationAvalonia.Dialogs;
 using LibationAvalonia.ViewModels.Settings;
 using LibationFileManager;
 using LibationFileManager.Templates;
+using LibationUiBase.Forms;
 using System.Linq;
 using System.Threading.Tasks;
 
@@ -31,10 +32,29 @@ namespace LibationAvalonia.Controls.Settings
 				if (!accounts.AccountsSettings.Accounts.Any(a => a.IdentityTokens.DeviceType == AudibleApi.Resources.DeviceType))
 				{
 					if (VisualRoot is Window parent)
-						await MessageBox.Show(parent,
-						"Your must remove account(s) from Libation and then re-add them to enable widwvine content.",
+					{
+						var choice = await MessageBox.Show(parent,
+						"In order to enable widevine content, Libation will need to log into your accounts again.\r\n\r\n" +
+						"Do you want Libation to clear your current account settings and prompt you to login before the next download?",
 						"Widevine Content Unavailable",
-						MessageBoxButtons.OK);
+						MessageBoxButtons.YesNo,
+						MessageBoxIcon.Question,
+						MessageBoxDefaultButton.Button2);
+
+						if (choice == DialogResult.Yes)
+						{
+							foreach (var account in accounts.AccountsSettings.Accounts.ToArray())
+							{
+								if (account.IdentityTokens.DeviceType != AudibleApi.Resources.DeviceType)
+								{
+									accounts.AccountsSettings.Delete(account);
+									var acc = accounts.AccountsSettings.Upsert(account.AccountId, account.Locale.Name);
+									acc.AccountName = account.AccountName;
+								}
+							}
+							return;
+						}
+					}
 
 					_viewModel.UseWidevine = false;
 				}

Source/LibationAvalonia/Controls/Settings/DownloadDecrypt.axaml.cs

@@ -3,6 +3,7 @@ using LibationAvalonia.Dialogs;
 using LibationAvalonia.ViewModels.Settings;
 using LibationFileManager;
 using LibationFileManager.Templates;
+using LibationUiBase.Forms;
 using System.Threading.Tasks;
 
 namespace LibationAvalonia.Controls.Settings

Source/LibationAvalonia/Controls/Settings/Important.axaml.cs

@@ -58,10 +58,5 @@ namespace LibationAvalonia.Controls.Settings
 			}
 			ThemeComboBox.SelectionChanged += ThemeComboBox_SelectionChanged;
 		}
-
-		public void OpenLogFolderButton_Click(object sender, Avalonia.Interactivity.RoutedEventArgs e)
-		{
-			Go.To.Folder(((LongPath)Configuration.Instance.LibationFiles).ShortPathName);
-		}
 	}
 }

Source/LibationAvalonia/Controls/ThemePreviewControl.axaml.cs

@@ -1,12 +1,10 @@
 using Avalonia.Controls;
-using Avalonia.Media.Imaging;
 using DataLayer;
 using Dinah.Core.ErrorHandling;
 using LibationAvalonia.ViewModels;
 using LibationFileManager;
-using NPOI.Util.Collections;
+using LibationUiBase.ProcessQueue;
 using System.Collections.Generic;
-using System.ComponentModel;
 using System.IO;
 using System.Linq;
 using System.Reflection;
@@ -38,11 +36,11 @@ public partial class ThemePreviewControl : UserControl
 			PictureStorage.SetDefaultImage(PictureSize._80x80, ms1.ToArray());
 		}
 
-		QueuedBook = new ProcessBookViewModel(sampleEntries[0], null) { Status = ProcessBookStatus.Queued };
-		WorkingBook = new ProcessBookViewModel(sampleEntries[0], null) { Status = ProcessBookStatus.Working };
-		CompletedBook = new ProcessBookViewModel(sampleEntries[0], null) { Status = ProcessBookStatus.Completed };
-		CancelledBook = new ProcessBookViewModel(sampleEntries[0], null) { Status = ProcessBookStatus.Cancelled };
-		FailedBook = new ProcessBookViewModel(sampleEntries[0], null) { Status = ProcessBookStatus.Failed };
+		QueuedBook = new ProcessBookViewModel(sampleEntries[0]) { Status = ProcessBookStatus.Queued };
+		WorkingBook = new ProcessBookViewModel(sampleEntries[0]) { Status = ProcessBookStatus.Working };
+		CompletedBook = new ProcessBookViewModel(sampleEntries[0]) { Status = ProcessBookStatus.Completed };
+		CancelledBook = new ProcessBookViewModel(sampleEntries[0]) { Status = ProcessBookStatus.Cancelled };
+		FailedBook = new ProcessBookViewModel(sampleEntries[0]) { Status = ProcessBookStatus.Failed };
 
 		//Set the current processable so that the empty queue doesn't try to advance.
 		QueuedBook.AddDownloadPdf();

Source/LibationAvalonia/Dialogs/AboutDialog.axaml.cs

@@ -3,6 +3,7 @@ using LibationAvalonia.Controls;
 using LibationAvalonia.ViewModels;
 using LibationFileManager;
 using LibationUiBase;
+using LibationUiBase.Forms;
 using ReactiveUI;
 using System;
 using System.Collections.Generic;

Source/LibationAvalonia/Dialogs/AccountsDialog.axaml.cs

@@ -3,6 +3,7 @@ using AudibleUtilities;
 using Avalonia.Collections;
 using Avalonia.Controls;
 using Avalonia.Platform.Storage;
+using LibationUiBase.Forms;
 using ReactiveUI;
 using System;
 using System.Collections.Generic;

Source/LibationAvalonia/Dialogs/BookRecordsDialog.axaml.cs

@@ -7,6 +7,7 @@ using Avalonia.Platform.Storage;
 using Avalonia.Threading;
 using DataLayer;
 using FileLiberator;
+using LibationUiBase.Forms;
 using ReactiveUI;
 using System;
 using System.Collections.Generic;

Source/LibationAvalonia/Dialogs/DialogWindow.cs

@@ -3,6 +3,7 @@ using Avalonia.Controls;
 using Avalonia.Controls.Primitives;
 using Avalonia.Styling;
 using LibationFileManager;
+using LibationUiBase.Forms;
 using System;
 using System.Threading.Tasks;
 

Source/LibationAvalonia/Dialogs/EditTemplateDialog.axaml.cs

@@ -6,6 +6,7 @@ using Avalonia.Styling;
 using Dinah.Core;
 using LibationFileManager;
 using LibationFileManager.Templates;
+using LibationUiBase.Forms;
 using ReactiveUI;
 using System;
 using System.IO;

Source/LibationAvalonia/Dialogs/ImageDisplayDialog.axaml.cs

@@ -1,5 +1,6 @@
 using Avalonia.Media.Imaging;
 using Avalonia.Platform.Storage;
+using LibationUiBase.Forms;
 using ReactiveUI;
 using System;
 using System.ComponentModel;

Source/LibationAvalonia/Dialogs/LibationFilesDialog.axaml.cs

@@ -1,4 +1,5 @@
 using LibationFileManager;
+using LibationUiBase.Forms;
 using System.Collections.Generic;
 
 namespace LibationAvalonia.Dialogs

Source/LibationAvalonia/Dialogs/Login/AvaloniaLoginCallback.cs

@@ -1,5 +1,7 @@
 using AudibleApi;
 using AudibleUtilities;
+using Avalonia.Threading;
+using LibationUiBase.Forms;
 using System.Threading.Tasks;
 
 namespace LibationAvalonia.Dialogs.Login
@@ -16,42 +18,46 @@ namespace LibationAvalonia.Dialogs.Login
 		}
 
 		public async Task<string> Get2faCodeAsync(string prompt)
-		{
-			var dialog = new _2faCodeDialog(prompt);
-			if (await dialog.ShowDialogAsync() is DialogResult.OK)
-				return dialog.Code;
-
-			return null;
-		}
+			=> await Dispatcher.UIThread.InvokeAsync(async () =>
+			{
+				var dialog = new _2faCodeDialog(prompt);
+				if (await dialog.ShowDialogAsync() is DialogResult.OK)
+					return dialog.Code;
+				return null;
+			});
 
 		public async Task<(string password, string guess)> GetCaptchaAnswerAsync(string password, byte[] captchaImage)
-		{
-			var dialog = new CaptchaDialog(password, captchaImage);
-			if (await dialog.ShowDialogAsync() is DialogResult.OK)
-				return (dialog.Password, dialog.Answer);
-			return (null, null);
-		}
+			=> await Dispatcher.UIThread.InvokeAsync(async () =>
+			{
+				var dialog = new CaptchaDialog(password, captchaImage);
+				if (await dialog.ShowDialogAsync() is DialogResult.OK)
+					return (dialog.Password, dialog.Answer);
+				return (null, null);
+			});
 
 		public async Task<(string name, string value)> GetMfaChoiceAsync(MfaConfig mfaConfig)
-		{
-			var dialog = new MfaDialog(mfaConfig);
-			if (await dialog.ShowDialogAsync() is DialogResult.OK)
-				return (dialog.SelectedName, dialog.SelectedValue);
-			return (null, null);
-		}
+			=> await Dispatcher.UIThread.InvokeAsync(async () =>
+			{
+				var dialog = new MfaDialog(mfaConfig);
+				if (await dialog.ShowDialogAsync() is DialogResult.OK)
+					return (dialog.SelectedName, dialog.SelectedValue);
+				return (null, null);
+			});
 
 		public async Task<(string email, string password)> GetLoginAsync()
-		{
-			var dialog = new LoginCallbackDialog(_account);
-			if (await dialog.ShowDialogAsync() is DialogResult.OK)
-				return (_account.AccountId, dialog.Password);
-			return (null, null);
-		}
+			=> await Dispatcher.UIThread.InvokeAsync(async () =>
+			{
+				var dialog = new LoginCallbackDialog(_account);
+				if (await dialog.ShowDialogAsync() is DialogResult.OK)
+					return (_account.AccountId, dialog.Password);
+				return (null, null);
+			});
 
 		public async Task ShowApprovalNeededAsync()
-		{
-			var dialog = new ApprovalNeededDialog();
-			await dialog.ShowDialogAsync();
-		}
+			=> await Dispatcher.UIThread.InvokeAsync(async () =>
+			{
+				var dialog = new ApprovalNeededDialog();
+				await dialog.ShowDialogAsync();
+			});
 	}
 }

Source/LibationAvalonia/Dialogs/Login/AvaloniaLoginChoiceEager.cs

@@ -1,6 +1,8 @@
 using AudibleApi;
 using AudibleUtilities;
+using Avalonia.Threading;
 using LibationFileManager;
+using LibationUiBase.Forms;
 using System;
 using System.Threading.Tasks;
 
@@ -9,10 +11,6 @@ namespace LibationAvalonia.Dialogs.Login
 {
 	public class AvaloniaLoginChoiceEager : ILoginChoiceEager
 	{
-		/// <summary>Convenience method. Recommended when wiring up Winforms to <see cref="ApplicationServices.LibraryCommands.ImportAccountAsync"/></summary>
-		public static async Task<ApiExtended> ApiExtendedFunc(Account account)
-			=> await ApiExtended.CreateAsync(account, new AvaloniaLoginChoiceEager(account));
-
 		public ILoginCallback LoginCallback { get; }
 
 		private readonly Account _account;
@@ -24,6 +22,9 @@ namespace LibationAvalonia.Dialogs.Login
 		}
 
 		public async Task<ChoiceOut?> StartAsync(ChoiceIn choiceIn)
+			=> await Dispatcher.UIThread.InvokeAsync(() => StartAsyncInternal(choiceIn));
+
+		private async Task<ChoiceOut?> StartAsyncInternal(ChoiceIn choiceIn)
 		{
 			if (Configuration.IsWindows && Environment.OSVersion.Version.Major >= 10)
 			{

Source/LibationAvalonia/Dialogs/Login/MfaDialog.axaml.cs

@@ -1,6 +1,7 @@
 using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Data;
+using LibationUiBase.Forms;
 using ReactiveUI;
 using System.Collections.Generic;
 using System.Linq;

Source/LibationAvalonia/Dialogs/Login/WebLoginDialog.axaml.cs

@@ -1,5 +1,6 @@
 using Avalonia.Controls;
 using Dinah.Core;
+using LibationUiBase.Forms;
 using System;
 
 namespace LibationAvalonia.Dialogs.Login

Source/LibationAvalonia/Dialogs/MessageBoxAlertAdminDialog.axaml.cs

@@ -1,6 +1,7 @@
 using Avalonia.Controls;
 using Dinah.Core;
 using FileManager;
+using LibationUiBase.Forms;
 using System;
 
 namespace LibationAvalonia.Dialogs

Source/LibationAvalonia/Dialogs/MessageBoxWindow.axaml

@@ -1,12 +1,13 @@
 <Window xmlns="https://github.com/avaloniaui"
 		xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
 		xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-		xmlns:vm="clr-namespace:LibationAvalonia.ViewModels"
+		xmlns:vm="clr-namespace:LibationAvalonia.ViewModels.Dialogs"
 		xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         mc:Ignorable="d" d:DesignWidth="265" d:DesignHeight="110"
 		MinWidth="265" MinHeight="110"
+		x:DataType="vm:MessageBoxViewModel"
         x:Class="LibationAvalonia.Dialogs.MessageBoxWindow"
-        Title="{Binding Caption}" ShowInTaskbar="True">
+        Title="{CompiledBinding Caption}" ShowInTaskbar="True">
 	
 	<Grid ColumnDefinitions="*" RowDefinitions="*,Auto">
 		
@@ -14,14 +15,22 @@
 			<StackPanel DockPanel.Dock="Top" Orientation="Horizontal"
 				VerticalAlignment="Top">
 			
-				<Panel Height="32" Width="32" Grid.Column="0" Margin="5,0,5,0" VerticalAlignment="Top">				
-					<Image IsVisible="{Binding IsAsterisk}" Stretch="Uniform" Source="/Assets/MBIcons/Asterisk_64.png"/>
-					<Image IsVisible="{Binding IsError}" Stretch="Uniform" Source="/Assets/MBIcons/Error_64.png"/>
-					<Image IsVisible="{Binding IsQuestion}" Stretch="Uniform" Source="/Assets/MBIcons/Question_64.png"/>
-					<Image IsVisible="{Binding IsExclamation}" Stretch="Uniform" Source="/Assets/MBIcons/Exclamation_64.png"/>
+				<Panel Height="32" Width="32" Grid.Column="0" Margin="5,0,5,0" VerticalAlignment="Top">
+					<Panel.IsVisible>
+						<MultiBinding Converter="{x:Static BoolConverters.Or}">
+							<CompiledBinding Path="IsAsterisk" />
+							<CompiledBinding Path="IsError" />
+							<CompiledBinding Path="IsQuestion" />
+							<CompiledBinding Path="IsExclamation" />
+						</MultiBinding>
+					</Panel.IsVisible>
+					<Image IsVisible="{CompiledBinding IsAsterisk}" Stretch="Uniform" Source="/Assets/MBIcons/Asterisk_64.png"/>
+					<Image IsVisible="{CompiledBinding IsError}" Stretch="Uniform" Source="/Assets/MBIcons/Error_64.png"/>
+					<Image IsVisible="{CompiledBinding IsQuestion}" Stretch="Uniform" Source="/Assets/MBIcons/Question_64.png"/>
+					<Image IsVisible="{CompiledBinding IsExclamation}" Stretch="Uniform" Source="/Assets/MBIcons/Exclamation_64.png"/>
 				</Panel>
 			
-				<TextBlock Margin="5,0,0,0" Name="messageTextBlock" MinHeight="45" MinWidth="193" TextWrapping="WrapWithOverflow" HorizontalAlignment="Left" VerticalAlignment="Top" FontSize="12" Text="{Binding Message}" />
+				<TextBlock Margin="5,0,0,0" Name="messageTextBlock" MinHeight="45" MinWidth="193" TextWrapping="WrapWithOverflow" HorizontalAlignment="Left" VerticalAlignment="Top" FontSize="12" Text="{CompiledBinding Message}" />
 
 			</StackPanel>
 		</DockPanel>
@@ -35,13 +44,13 @@
 			</DockPanel.Styles>
 			<StackPanel Orientation="Horizontal" HorizontalAlignment="Right" Margin="5" DockPanel.Dock="Bottom">
 				<Button Grid.Column="0" MinWidth="75" MinHeight="28" Name="Button1" Click="Button1_Click" Margin="5">
-					<TextBlock VerticalAlignment="Center" HorizontalAlignment="Center" Text="{Binding Button1Text}"/>
+					<TextBlock VerticalAlignment="Center" HorizontalAlignment="Center" Text="{CompiledBinding Button1Text}"/>
 				</Button>
-				<Button Grid.Column="1" IsVisible="{Binding HasButton2}" MinWidth="75" MinHeight="28" Name="Button2" Click="Button2_Click" Margin="5">
-					<TextBlock VerticalAlignment="Center" HorizontalAlignment="Center" Text="{Binding Button2Text}"/>
+				<Button Grid.Column="1" IsVisible="{CompiledBinding HasButton2}" MinWidth="75" MinHeight="28" Name="Button2" Click="Button2_Click" Margin="5">
+					<TextBlock VerticalAlignment="Center" HorizontalAlignment="Center" Text="{CompiledBinding Button2Text}"/>
 				</Button>
-				<Button Grid.Column="2" IsVisible="{Binding HasButton3}" MinWidth="75" MinHeight="28" Name="Button3" Click="Button3_Click" Margin="5">
-					<TextBlock VerticalAlignment="Center" HorizontalAlignment="Center" Text="{Binding Button3Text}"/>
+				<Button Grid.Column="2" IsVisible="{CompiledBinding HasButton3}" MinWidth="75" MinHeight="28" Name="Button3" Click="Button3_Click" Margin="5">
+					<TextBlock VerticalAlignment="Center" HorizontalAlignment="Center" Text="{CompiledBinding Button3Text}"/>
 				</Button>
 			</StackPanel>
 		</DockPanel>

Source/LibationAvalonia/Dialogs/MessageBoxWindow.axaml.cs

@@ -1,4 +1,5 @@
 using LibationAvalonia.ViewModels.Dialogs;
+using LibationUiBase.Forms;
 
 namespace LibationAvalonia.Dialogs
 {

Source/LibationAvalonia/Dialogs/ScanAccountsDialog.axaml.cs

@@ -1,6 +1,6 @@
 using AudibleUtilities;
 using Avalonia.Controls;
-using Avalonia.Interactivity;
+using LibationUiBase.Forms;
 using System.Collections;
 using System.Collections.Generic;
 using System.Linq;

Source/LibationAvalonia/Dialogs/SettingsDialog.axaml.cs

@@ -1,6 +1,7 @@
 using Avalonia.Controls;
 using LibationAvalonia.ViewModels.Settings;
 using LibationFileManager;
+using LibationUiBase.Forms;
 using System.Threading.Tasks;
 
 namespace LibationAvalonia.Dialogs

Source/LibationAvalonia/Dialogs/SetupDialog.axaml.cs

@@ -1,5 +1,6 @@
 using Avalonia.Controls;
 using LibationFileManager;
+using LibationUiBase.Forms;
 
 namespace LibationAvalonia.Dialogs
 {

Source/LibationAvalonia/Dialogs/ThemePickerDialog.axaml.cs

@@ -8,6 +8,7 @@ using System.Threading.Tasks;
 using System.Collections.Generic;
 using System.Linq;
 using Avalonia.Platform.Storage;
+using LibationUiBase.Forms;
 
 #nullable enable
 namespace LibationAvalonia.Dialogs;

Source/LibationAvalonia/Dialogs/UpgradeNotificationDialog.axaml.cs

@@ -1,6 +1,7 @@
 using AppScaffolding;
 using Avalonia.Controls;
 using Dinah.Core;
+using LibationUiBase.Forms;
 
 namespace LibationAvalonia.Dialogs
 {

Source/LibationAvalonia/LibationAvalonia.csproj

@@ -73,13 +73,13 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Avalonia.Controls.ColorPicker" Version="11.3.0" />
-		<PackageReference Include="Avalonia.Diagnostics" Version="11.3.0" Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'" />
-		<PackageReference Include="Avalonia" Version="11.3.0" />
-		<PackageReference Include="Avalonia.Controls.DataGrid" Version="11.3.0" />
-		<PackageReference Include="Avalonia.Desktop" Version="11.3.0" />
-		<PackageReference Include="Avalonia.ReactiveUI" Version="11.3.0" />
-		<PackageReference Include="Avalonia.Themes.Fluent" Version="11.3.0" />
+		<PackageReference Include="Avalonia.Controls.ColorPicker" Version="11.3.2" />
+		<PackageReference Include="Avalonia.Diagnostics" Version="11.3.2" Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'" />
+		<PackageReference Include="Avalonia" Version="11.3.2" />
+		<PackageReference Include="Avalonia.Controls.DataGrid" Version="11.3.2" />
+		<PackageReference Include="Avalonia.Desktop" Version="11.3.2" />
+		<PackageReference Include="Avalonia.ReactiveUI" Version="11.3.2" />
+		<PackageReference Include="Avalonia.Themes.Fluent" Version="11.3.2" />
 	</ItemGroup>
 
 	<ItemGroup>

Source/LibationAvalonia/MessageBox.cs

@@ -6,6 +6,7 @@ using DataLayer;
 using Dinah.Core.Logging;
 using LibationAvalonia.Dialogs;
 using LibationAvalonia.ViewModels.Dialogs;
+using LibationUiBase.Forms;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -13,92 +14,45 @@ using System.Threading.Tasks;
 
 namespace LibationAvalonia
 {
-	public enum DialogResult
-	{
-		None = 0,
-		OK = 1,
-		Cancel = 2,
-		Abort = 3,
-		Retry = 4,
-		Ignore = 5,
-		Yes = 6,
-		No = 7,
-		TryAgain = 10,
-		Continue = 11
-	}
-
-	public enum MessageBoxIcon
-	{
-		None = 0,
-		Error = 16,
-		Hand = 16,
-		Stop = 16,
-		Question = 32,
-		Exclamation = 48,
-		Warning = 48,
-		Asterisk = 64,
-		Information = 64
-	}
-
-	public enum MessageBoxButtons
-	{
-		OK,
-		OKCancel,
-		AbortRetryIgnore,
-		YesNoCancel,
-		YesNo,
-		RetryCancel,
-		CancelTryContinue
-	}
-
-	public enum MessageBoxDefaultButton
-	{
-		Button1,
-		Button2 = 256,
-		Button3 = 512,
-	}
 
 	public class MessageBox
 	{
-
 		public static Task<DialogResult> Show(string text, string caption, MessageBoxButtons buttons, MessageBoxIcon icon, MessageBoxDefaultButton defaultButton)
 			=> ShowCoreAsync(null, text, caption, buttons, icon, defaultButton);
 		public static Task<DialogResult> Show(string text, string caption, MessageBoxButtons buttons, MessageBoxIcon icon, bool saveAndRestorePosition = true)
-					=> ShowCoreAsync(null, text, caption, buttons, icon, MessageBoxDefaultButton.Button1, saveAndRestorePosition);
+			=> ShowCoreAsync(null, text, caption, buttons, icon, MessageBoxDefaultButton.Button1, saveAndRestorePosition);
 		public static Task<DialogResult> Show(string text, string caption, MessageBoxButtons buttons)
-					=> ShowCoreAsync(null, text, caption, buttons, MessageBoxIcon.None, MessageBoxDefaultButton.Button1);
+			=> ShowCoreAsync(null, text, caption, buttons, MessageBoxIcon.None, MessageBoxDefaultButton.Button1);
 		public static Task<DialogResult> Show(string text, string caption)
-				=> ShowCoreAsync(null, text, caption, MessageBoxButtons.OK, MessageBoxIcon.None, MessageBoxDefaultButton.Button1);
+			=> ShowCoreAsync(null, text, caption, MessageBoxButtons.OK, MessageBoxIcon.None, MessageBoxDefaultButton.Button1);
 		public static Task<DialogResult> Show(string text)
-				=> ShowCoreAsync(null, text, string.Empty, MessageBoxButtons.OK, MessageBoxIcon.None, MessageBoxDefaultButton.Button1);
-		public static Task<DialogResult> Show(Window owner, string text, string caption, MessageBoxButtons buttons, MessageBoxIcon icon, MessageBoxDefaultButton defaultButton)
-					=> ShowCoreAsync(owner, text, caption, buttons, icon, defaultButton);
-
+			=> ShowCoreAsync(null, text, string.Empty, MessageBoxButtons.OK, MessageBoxIcon.None, MessageBoxDefaultButton.Button1);
+		public static Task<DialogResult> Show(Window owner, string text, string caption, MessageBoxButtons buttons, MessageBoxIcon icon, MessageBoxDefaultButton defaultButton, bool saveAndRestorePosition = true)
+			=> ShowCoreAsync(owner, text, caption, buttons, icon, defaultButton, saveAndRestorePosition);
 		public static Task<DialogResult> Show(Window owner, string text, string caption, MessageBoxButtons buttons, MessageBoxIcon icon)
-					=> ShowCoreAsync(owner, text, caption, buttons, icon, MessageBoxDefaultButton.Button1);
+			=> ShowCoreAsync(owner, text, caption, buttons, icon, MessageBoxDefaultButton.Button1);
 		public static Task<DialogResult> Show(Window owner, string text, string caption, MessageBoxButtons buttons)
-				=> ShowCoreAsync(owner, text, caption, buttons, MessageBoxIcon.None, MessageBoxDefaultButton.Button1);
+			=> ShowCoreAsync(owner, text, caption, buttons, MessageBoxIcon.None, MessageBoxDefaultButton.Button1);
 		public static Task<DialogResult> Show(Window owner, string text, string caption)
-				=> ShowCoreAsync(owner, text, caption, MessageBoxButtons.OK, MessageBoxIcon.None, MessageBoxDefaultButton.Button1);
+			=> ShowCoreAsync(owner, text, caption, MessageBoxButtons.OK, MessageBoxIcon.None, MessageBoxDefaultButton.Button1);
 		public static Task<DialogResult> Show(Window owner, string text)
 			=> ShowCoreAsync(owner, text, string.Empty, MessageBoxButtons.OK, MessageBoxIcon.None, MessageBoxDefaultButton.Button1);
 
-
 		public static async Task VerboseLoggingWarning_ShowIfTrue()
 		{
 			// when turning on debug (and especially Verbose) to share logs, some privacy settings may not be obscured
 			if (Serilog.Log.Logger.IsVerboseEnabled())
-				await Show(@"
-Warning: verbose logging is enabled.
+				await Show("""
+				Warning: verbose logging is enabled.
 
-This should be used for debugging only. It creates many
-more logs and debug files, neither of which are as
-strictly anonymous.
+				This should be used for debugging only. It creates many
+				more logs and debug files, neither of which are as
+				strictly anonymous.
 
-When you are finished debugging, it's highly recommended
-to set your debug MinimumLevel to Information and restart
-Libation.
-".Trim(), "Verbose logging enabled", MessageBoxButtons.OK, MessageBoxIcon.Warning);
+				When you are finished debugging, it's highly recommended
+				to set your debug MinimumLevel to Information and restart
+				Libation.
+				""", "Verbose logging enabled", MessageBoxButtons.OK, MessageBoxIcon.Warning);
 		}
 
 		/// <summary>
@@ -138,7 +92,8 @@ Libation.
 		{
 			// for development and debugging, show me what broke!
 			if (System.Diagnostics.Debugger.IsAttached)
-				throw exception;
+				//Wrap the exception to preserve its stack trace.
+				throw new Exception("An unhandled exception was encountered", exception);
 
 			try
 			{
@@ -152,12 +107,12 @@ Libation.
 		}
 
 		private static async Task<DialogResult> ShowCoreAsync(Window owner, string message, string caption, MessageBoxButtons buttons, MessageBoxIcon icon, MessageBoxDefaultButton defaultButton, bool saveAndRestorePosition = true)
+		=> await Dispatcher.UIThread.InvokeAsync(async () =>
 		{
 			owner = owner?.IsLoaded is true ? owner : null;
-			var dialog = await Dispatcher.UIThread.InvokeAsync(() => CreateMessageBox(owner, message, caption, buttons, icon, defaultButton, saveAndRestorePosition));
-
+			var dialog = CreateMessageBox(owner, message, caption, buttons, icon, defaultButton, saveAndRestorePosition);
 			return await DisplayWindow(dialog, owner);
-		}
+		});
 
 		private static MessageBoxWindow CreateMessageBox(Window owner, string message, string caption, MessageBoxButtons buttons, MessageBoxIcon icon, MessageBoxDefaultButton defaultButton, bool saveAndRestorePosition = true)
 		{
@@ -175,7 +130,6 @@ Libation.
 			tbx.MinWidth = vm.TextBlockMinWidth;
 			tbx.Text = message;
 
-			
 			var thisScreen = owner.Screens?.ScreenFromVisual(owner);
 
 			var maxSize
@@ -229,6 +183,5 @@ Libation.
 				return await toDisplay.ShowDialog<DialogResult>(owner);
 			}
 		}
-
 	}
 }

Source/LibationAvalonia/ViewModels/AvaloniaEntryStatus.cs

@@ -1,20 +0,0 @@
-using Avalonia.Media.Imaging;
-using DataLayer;
-using LibationUiBase.GridView;
-using System;
-
-#nullable enable
-namespace LibationAvalonia.ViewModels
-{
-	public class AvaloniaEntryStatus : EntryStatus, IEntryStatus, IComparable
-	{
-		private AvaloniaEntryStatus(LibraryBook libraryBook) : base(libraryBook) { }
-		public static EntryStatus Create(LibraryBook libraryBook) => new AvaloniaEntryStatus(libraryBook);
-
-		protected override Bitmap LoadImage(byte[] picture)
-			=> AvaloniaUtils.TryLoadImageOrDefault(picture, LibationFileManager.PictureSize._80x80);
-
-		//Button icons are handled by LiberateStatusButton
-		protected override Bitmap? GetResourceImage(string rescName) => null;
-	}
-}

Source/LibationAvalonia/ViewModels/Dialogs/MessageBoxViewModel.cs

@@ -1,4 +1,5 @@
-using System;
+using LibationUiBase.Forms;
+using System;
 
 namespace LibationAvalonia.ViewModels.Dialogs
 {

Source/LibationAvalonia/ViewModels/MainVM.Filters.cs

@@ -4,6 +4,7 @@ using Avalonia.Controls;
 using Avalonia.Data;
 using Avalonia.Input;
 using LibationFileManager;
+using LibationUiBase.Forms;
 using ReactiveUI;
 using System;
 using System.Linq;
@@ -14,8 +15,10 @@ namespace LibationAvalonia.ViewModels
 {
 	partial class MainVM
 	{
-		private QuickFilters.NamedFilter? lastGoodFilter = new(string.Empty, null);
-		private QuickFilters.NamedFilter? _selectedNamedFilter = new(string.Empty, null);
+		private string lastGoodSearch = string.Empty;
+		private QuickFilters.NamedFilter? lastGoodFilter => new(lastGoodSearch, null);
+
+        private QuickFilters.NamedFilter? _selectedNamedFilter = new(string.Empty, null);
 		private bool _firstFilterIsDefault = true;
 
 		/// <summary> Library filterting query </summary>
@@ -64,15 +67,16 @@ namespace LibationAvalonia.ViewModels
 			try
 			{
 				await ProductsDisplay.Filter(tryFilter);
-				lastGoodFilter = namedFilter;
+                lastGoodSearch = namedFilter?.Filter ?? "";
 			}
 			catch (Exception ex)
 			{
 				Serilog.Log.Logger.Error(ex, "Error performing filtering. {@namedFilter} {@lastGoodFilter}", namedFilter, lastGoodFilter);
 				await MessageBox.Show($"Bad filter string: \"{tryFilter}\"\r\n\r\n{ex.Message}", "Bad filter string", MessageBoxButtons.OK, MessageBoxIcon.Error);
 
-				// re-apply last good filter
-				await PerformFilter(lastGoodFilter);
+                // re-apply last good filter
+                namedFilter = (namedFilter ?? new(string.Empty, null)) with { Filter = lastGoodSearch };
+                await PerformFilter(namedFilter);
 			}
 		}
 

Source/LibationAvalonia/ViewModels/MainVM.Import.cs

@@ -7,6 +7,7 @@ using System;
 using System.Linq;
 using System.Threading.Tasks;
 using Avalonia.Input;
+using LibationUiBase.Forms;
 
 #nullable enable
 namespace LibationAvalonia.ViewModels
@@ -201,7 +202,7 @@ namespace LibationAvalonia.ViewModels
 		{
 			try
 			{
-				var (totalProcessed, newAdded) = await LibraryCommands.ImportAccountAsync(LibationAvalonia.Dialogs.Login.AvaloniaLoginChoiceEager.ApiExtendedFunc, accounts);
+				var (totalProcessed, newAdded) = await Task.Run(() => LibraryCommands.ImportAccountAsync(accounts));
 
 				// this is here instead of ScanEnd so that the following is only possible when it's user-initiated, not automatic loop
 				if (Configuration.Instance.ShowImportedStats && newAdded > 0)

Source/LibationAvalonia/ViewModels/MainVM.Liberate.cs

@@ -4,6 +4,9 @@ using System;
 using System.Linq;
 using System.Threading.Tasks;
 using DataLayer;
+using LibationUiBase.Forms;
+using LibationUiBase;
+using System.Collections.Generic;
 
 #nullable enable
 namespace LibationAvalonia.ViewModels
@@ -12,19 +15,14 @@ namespace LibationAvalonia.ViewModels
 	{
 		public void Configure_Liberate() { }
 
-		public void BackupAllBooks()
+		public async Task BackupAllBooks()
 		{
 			try
 			{
-				setQueueCollapseState(false);
+				var unliberated = await Task.Run(() => DbContexts.GetLibrary_Flat_NoTracking().UnLiberated().ToArray());
 
-				Serilog.Log.Logger.Information("Begin backing up all library books");
-
-				ProcessQueue.AddDownloadDecrypt(
-					DbContexts
-					.GetLibrary_Flat_NoTracking()
-					.UnLiberated()
-					);
+				if (ProcessQueue.QueueDownloadDecrypt(unliberated))
+					setQueueCollapseState(false);
 			}
 			catch (Exception ex)
 			{
@@ -32,10 +30,10 @@ namespace LibationAvalonia.ViewModels
 			}
 		}
 
-		public void BackupAllPdfs()
+		public async Task BackupAllPdfs()
 		{
-			setQueueCollapseState(false);
-			ProcessQueue.AddDownloadPdf(DbContexts.GetLibrary_Flat_NoTracking().Where(lb => lb.Book.UserDefinedItem.PdfStatus is LiberatedStatus.NotLiberated));
+			if (ProcessQueue.QueueDownloadPdf(await Task.Run(() => DbContexts.GetLibrary_Flat_NoTracking())))
+				setQueueCollapseState(false);
 		}
 
 		public async Task ConvertAllToMp3Async()
@@ -48,12 +46,8 @@ namespace LibationAvalonia.ViewModels
 				"Convert all M4b => Mp3?",
 				MessageBoxButtons.YesNo,
 				MessageBoxIcon.Warning);
-			if (result == DialogResult.Yes)
-			{
+			if (result == DialogResult.Yes && ProcessQueue.QueueConvertToMp3(await Task.Run(() => DbContexts.GetLibrary_Flat_NoTracking())))
 				setQueueCollapseState(false);
-				ProcessQueue.AddConvertMp3(DbContexts.GetLibrary_Flat_NoTracking().Where(lb => lb.Book.UserDefinedItem.BookStatus is LiberatedStatus.Liberated && lb.Book.ContentType is ContentType.Product));
-			}
-			//Only Queue Liberated books for conversion.  This isn't a perfect filter, but it's better than nothing.
 		}
 
 		private void setQueueCollapseState(bool collapsed)

Source/LibationAvalonia/ViewModels/MainVM.ProcessQueue.cs

@@ -1,10 +1,11 @@
-using LibationFileManager;
-using System;
-using System.Linq;
-using DataLayer;
+using DataLayer;
 using Dinah.Core;
+using LibationFileManager;
+using LibationUiBase;
 using LibationUiBase.GridView;
 using ReactiveUI;
+using System;
+using System.Linq;
 
 #nullable enable
 namespace LibationAvalonia.ViewModels
@@ -37,50 +38,16 @@ namespace LibationAvalonia.ViewModels
 		{
 			try
 			{
-				if (libraryBooks.Length == 1)
+				if (ProcessQueue.QueueDownloadDecrypt(libraryBooks))
+					setQueueCollapseState(false);
+				else if (libraryBooks.Length == 1 && libraryBooks[0].Book.Audio_Exists())
 				{
-					var item = libraryBooks[0];
-
-					//Remove this item from the queue if it's already present and completed.
-					//Only do this when adding a single book at a time to prevent accidental
-					//extra downloads when queueing in batches.
-					ProcessQueue.RemoveCompleted(item);
-
-					if (item.Book.UserDefinedItem.BookStatus is LiberatedStatus.NotLiberated or LiberatedStatus.PartialDownload)
+					// liberated: open explorer to file
+					var filePath = AudibleFileStorage.Audio.GetPath(libraryBooks[0].Book.AudibleProductId);
+					if (!Go.To.File(filePath?.ShortPathName))
 					{
-						Serilog.Log.Logger.Information("Begin single book backup of {libraryBook}", item);
-						setQueueCollapseState(false);
-						ProcessQueue.AddDownloadDecrypt(item);
-					}
-					else if (item.Book.UserDefinedItem.PdfStatus is LiberatedStatus.NotLiberated)
-					{
-						Serilog.Log.Logger.Information("Begin single pdf backup of {libraryBook}", item);
-						setQueueCollapseState(false);
-						ProcessQueue.AddDownloadPdf(item);
-					}
-					else if (item.Book.Audio_Exists())
-					{
-						// liberated: open explorer to file
-						var filePath = AudibleFileStorage.Audio.GetPath(item.Book.AudibleProductId);
-
-						if (!Go.To.File(filePath?.ShortPathName))
-						{
-							var suffix = string.IsNullOrWhiteSpace(filePath) ? "" : $":\r\n{filePath}";
-							await MessageBox.Show($"File not found" + suffix);
-						}
-					}
-				}
-				else
-				{
-					var toLiberate
-						= libraryBooks
-						.Where(x => x.Book.UserDefinedItem.BookStatus is LiberatedStatus.NotLiberated or LiberatedStatus.PartialDownload || x.Book.UserDefinedItem.PdfStatus is LiberatedStatus.NotLiberated)
-						.ToArray();
-
-					if (toLiberate.Length > 0)
-					{
-						setQueueCollapseState(false);
-						ProcessQueue.AddDownloadDecrypt(toLiberate);
+						var suffix = string.IsNullOrWhiteSpace(filePath) ? "" : $":\r\n{filePath}";
+						await MessageBox.Show($"File not found" + suffix);
 					}
 				}
 			}
@@ -90,15 +57,14 @@ namespace LibationAvalonia.ViewModels
 			}
 		}
 
-		public void LiberateSeriesClicked(ISeriesEntry series)
+		public void LiberateSeriesClicked(SeriesEntry series)
 		{
 			try
 			{
-				setQueueCollapseState(false);
-
 				Serilog.Log.Logger.Information("Begin backing up all {series} episodes", series.LibraryBook);
 
-				ProcessQueue.AddDownloadDecrypt(series.Children.Select(c => c.LibraryBook).UnLiberated());
+				if (ProcessQueue.QueueDownloadDecrypt(series.Children.Select(c => c.LibraryBook).UnLiberated().ToArray()))
+					setQueueCollapseState(false);
 			}
 			catch (Exception ex)
 			{
@@ -110,13 +76,8 @@ namespace LibationAvalonia.ViewModels
 		{
 			try
 			{
-				var preLiberated = libraryBooks.Where(lb => lb.Book.UserDefinedItem.BookStatus is LiberatedStatus.Liberated).ToArray();
-				if (preLiberated.Length > 0)
-				{
-					Serilog.Log.Logger.Information("Begin convert {count} books to mp3", preLiberated.Length);
+				if (ProcessQueue.QueueConvertToMp3(libraryBooks))
 					setQueueCollapseState(false);
-					ProcessQueue.AddConvertMp3(preLiberated);
-				}
 			}
 			catch (Exception ex)
 			{

Source/LibationAvalonia/ViewModels/MainVM.ScanAuto.cs

@@ -5,6 +5,7 @@ using LibationFileManager;
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Threading.Tasks;
 
 #nullable enable
 namespace LibationAvalonia.ViewModels
@@ -27,7 +28,7 @@ namespace LibationAvalonia.ViewModels
 				// in autoScan, new books SHALL NOT show dialog
 				try
 				{
-					await LibraryCommands.ImportAccountAsync(LibationAvalonia.Dialogs.Login.AvaloniaLoginChoiceEager.ApiExtendedFunc, accounts);
+					await Task.Run(() => LibraryCommands.ImportAccountAsync(accounts));
 				}
 				catch (OperationCanceledException)
 				{

Source/LibationAvalonia/ViewModels/MainVM.VisibleBooks.cs

@@ -5,6 +5,9 @@ using DataLayer;
 using Avalonia.Threading;
 using LibationAvalonia.Dialogs;
 using ReactiveUI;
+using LibationUiBase.Forms;
+using System.Linq;
+using LibationUiBase;
 
 #nullable enable
 namespace LibationAvalonia.ViewModels
@@ -71,15 +74,8 @@ namespace LibationAvalonia.ViewModels
 		{
 			try
 			{
-				setQueueCollapseState(false);
-
-				Serilog.Log.Logger.Information("Begin backing up visible library books");
-
-				ProcessQueue.AddDownloadDecrypt(
-					ProductsDisplay
-					.GetVisibleBookEntries()
-					.UnLiberated()
-					);
+				if (ProcessQueue.QueueDownloadDecrypt(ProductsDisplay.GetVisibleBookEntries().UnLiberated().ToArray()))
+					setQueueCollapseState(false);
 			}
 			catch (Exception ex)
 			{

Source/LibationAvalonia/ViewModels/MainVM._NoUI.cs

@@ -1,5 +1,6 @@
 using LibationFileManager;
 using LibationUiBase;
+using System;
 using System.IO;
 
 #nullable enable
@@ -7,7 +8,7 @@ namespace LibationAvalonia.ViewModels
 {
 	partial class MainVM
 	{
-		private void Configure_NonUI()
+		public  static void Configure_NonUI()
 		{
 			using var ms1 = new MemoryStream();
 			App.OpenAsset("img-coverart-prod-unavailable_80x80.jpg").CopyTo(ms1);
@@ -23,6 +24,20 @@ namespace LibationAvalonia.ViewModels
 			PictureStorage.SetDefaultImage(PictureSize.Native, ms3.ToArray());
 
 			BaseUtil.SetLoadImageDelegate(AvaloniaUtils.TryLoadImageOrDefault);
+			BaseUtil.SetLoadResourceImageDelegate(LoadResourceImage);
+		}
+		private static Avalonia.Media.Imaging.Bitmap? LoadResourceImage(string resourceName)
+		{
+			try
+			{
+				using var stream = App.OpenAsset(resourceName);
+				return new Avalonia.Media.Imaging.Bitmap(stream);
+			}
+			catch (Exception ex)
+			{
+				Serilog.Log.Error(ex, "Failed to load resource image: {ResourceName}", resourceName);
+				return null;
+			}
 		}
 	}
 }

Source/LibationAvalonia/ViewModels/MainVM.cs

@@ -2,6 +2,7 @@
 using DataLayer;
 using LibationAvalonia.Views;
 using LibationFileManager;
+using LibationUiBase.ProcessQueue;
 using ReactiveUI;
 using System.Collections.Generic;
 using System.Threading.Tasks;

Source/LibationAvalonia/ViewModels/ProcessBookViewModel.cs

@@ -1,420 +0,0 @@
-using ApplicationServices;
-using AudibleApi;
-using AudibleApi.Common;
-using Avalonia.Media;
-using Avalonia.Media.Imaging;
-using Avalonia.Threading;
-using DataLayer;
-using Dinah.Core;
-using Dinah.Core.ErrorHandling;
-using FileLiberator;
-using LibationFileManager;
-using LibationUiBase;
-using ReactiveUI;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-
-#nullable enable
-namespace LibationAvalonia.ViewModels
-{
-	public enum ProcessBookResult
-	{
-		None,
-		Success,
-		Cancelled,
-		ValidationFail,
-		FailedRetry,
-		FailedSkip,
-		FailedAbort,
-		LicenseDenied,
-		LicenseDeniedPossibleOutage
-	}
-
-	public enum ProcessBookStatus
-	{
-		Queued,
-		Cancelled,
-		Working,
-		Completed,
-		Failed
-	}
-
-	/// <summary>
-	/// This is the viewmodel for queued processables
-	/// </summary>
-	public class ProcessBookViewModel : ViewModelBase
-	{
-		public event EventHandler? Completed;
-
-		public LibraryBook LibraryBook { get; private set; }
-
-		private ProcessBookResult _result = ProcessBookResult.None;
-		private ProcessBookStatus _status = ProcessBookStatus.Queued;
-		private string? _narrator;
-		private string? _author;
-		private string? _title;
-		private int _progress;
-		private string? _eta;
-		private Bitmap? _cover;
-
-		#region Properties exposed to the view
-		public ProcessBookResult Result { get => _result; set { this.RaiseAndSetIfChanged(ref _result, value); this.RaisePropertyChanged(nameof(StatusText)); } }
-		public ProcessBookStatus Status { get => _status; set { this.RaiseAndSetIfChanged(ref _status, value); this.RaisePropertyChanged(nameof(IsFinished)); this.RaisePropertyChanged(nameof(IsDownloading)); this.RaisePropertyChanged(nameof(Queued)); } }
-		public string? Narrator { get => _narrator; set => Dispatcher.UIThread.Invoke(() => this.RaiseAndSetIfChanged(ref _narrator, value)); }
-		public string? Author { get => _author; set => Dispatcher.UIThread.Invoke(() => this.RaiseAndSetIfChanged(ref _author, value)); }
-		public string? Title { get => _title; set => Dispatcher.UIThread.Invoke(() => this.RaiseAndSetIfChanged(ref _title, value)); }
-		public int Progress { get => _progress; private set => Dispatcher.UIThread.Invoke(() => this.RaiseAndSetIfChanged(ref _progress, value)); }
-		public string? ETA { get => _eta; private set => Dispatcher.UIThread.Invoke(() => this.RaiseAndSetIfChanged(ref _eta, value)); }
-		public Bitmap? Cover { get => _cover; private set => Dispatcher.UIThread.Invoke(() => this.RaiseAndSetIfChanged(ref _cover, value)); }
-		public bool IsFinished => Status is not ProcessBookStatus.Queued and not ProcessBookStatus.Working;
-		public bool IsDownloading => Status is ProcessBookStatus.Working;
-		public bool Queued => Status is ProcessBookStatus.Queued;
-
-		public string StatusText => Result switch
-		{
-			ProcessBookResult.Success => "Finished",
-			ProcessBookResult.Cancelled => "Cancelled",
-			ProcessBookResult.ValidationFail => "Validation fail",
-			ProcessBookResult.FailedRetry => "Error, will retry later",
-			ProcessBookResult.FailedSkip => "Error, Skipping",
-			ProcessBookResult.FailedAbort => "Error, Abort",
-			ProcessBookResult.LicenseDenied => "License Denied",
-			ProcessBookResult.LicenseDeniedPossibleOutage => "Possible Service Interruption",
-			_ => Status.ToString(),
-		};
-
-		#endregion
-
-		private TimeSpan TimeRemaining { set { ETA = $"ETA: {value:mm\\:ss}"; } }
-		private Processable CurrentProcessable => _currentProcessable ??= Processes.Dequeue().Invoke();
-		private Processable? NextProcessable() => _currentProcessable = null;
-		private Processable? _currentProcessable;
-		private readonly Queue<Func<Processable>> Processes = new();
-		private readonly LogMe Logger;
-
-		public ProcessBookViewModel(LibraryBook libraryBook, LogMe logme)
-		{
-			LibraryBook = libraryBook;
-			Logger = logme;
-
-			_title = LibraryBook.Book.TitleWithSubtitle;
-			_author = LibraryBook.Book.AuthorNames();
-			_narrator = LibraryBook.Book.NarratorNames();
-
-			(bool isDefault, byte[] picture) = PictureStorage.GetPicture(new PictureDefinition(LibraryBook.Book.PictureId, PictureSize._80x80));
-
-			if (isDefault)
-				PictureStorage.PictureCached += PictureStorage_PictureCached;
-
-			// Mutable property. Set the field so PropertyChanged isn't fired.
-			_cover = AvaloniaUtils.TryLoadImageOrDefault(picture, PictureSize._80x80);
-		}
-
-		private void PictureStorage_PictureCached(object? sender, PictureCachedEventArgs e)
-		{
-			if (e.Definition.PictureId == LibraryBook.Book.PictureId)
-			{
-				Cover = AvaloniaUtils.TryLoadImageOrDefault(e.Picture, PictureSize._80x80);
-				PictureStorage.PictureCached -= PictureStorage_PictureCached;
-			}
-		}
-
-		public async Task<ProcessBookResult> ProcessOneAsync()
-		{
-			string procName = CurrentProcessable.Name;
-			ProcessBookResult result = ProcessBookResult.None;
-			try
-			{
-				LinkProcessable(CurrentProcessable);
-
-				var statusHandler = await CurrentProcessable.ProcessSingleAsync(LibraryBook, validate: true);
-
-				if (statusHandler.IsSuccess)
-					result = ProcessBookResult.Success;
-				else if (statusHandler.Errors.Contains("Cancelled"))
-				{
-					Logger.Info($"{procName}:  Process was cancelled - {LibraryBook.Book}");
-					result = ProcessBookResult.Cancelled;
-				}
-				else if (statusHandler.Errors.Contains("Validation failed"))
-				{
-					Logger.Info($"{procName}:  Validation failed - {LibraryBook.Book}");
-					result = ProcessBookResult.ValidationFail;
-				}
-				else
-				{
-					foreach (var errorMessage in statusHandler.Errors)
-						Logger.Error($"{procName}:  {errorMessage}");
-				}
-			}
-			catch (ContentLicenseDeniedException ldex)
-			{
-				if (ldex.AYCL?.RejectionReason is null or RejectionReason.GenericError)
-				{
-					Logger.Info($"{procName}:  Content license was denied, but this error appears to be caused by a temporary interruption of service. - {LibraryBook.Book}");
-					result = ProcessBookResult.LicenseDeniedPossibleOutage;
-				}
-				else
-				{
-					Logger.Info($"{procName}:  Content license denied. Check your Audible account to see if you have access to this title. - {LibraryBook.Book}");
-					result = ProcessBookResult.LicenseDenied;
-				}
-			}
-			catch (Exception ex)
-			{
-				Logger.Error(ex, procName);
-			}
-			finally
-			{
-				if (result == ProcessBookResult.None)
-					result = await showRetry(LibraryBook);
-
-				var status = result switch
-				{
-					ProcessBookResult.Success => ProcessBookStatus.Completed,
-					ProcessBookResult.Cancelled => ProcessBookStatus.Cancelled,
-					_ => ProcessBookStatus.Failed,
-				};
-
-				await Dispatcher.UIThread.InvokeAsync(() => Status = status);
-			}
-
-			await Dispatcher.UIThread.InvokeAsync(() => Result = result);
-			return result;
-		}
-
-		public async Task CancelAsync()
-		{
-			try
-			{
-				if (CurrentProcessable is AudioDecodable audioDecodable)
-					await audioDecodable.CancelAsync();
-			}
-			catch (Exception ex)
-			{
-				Logger.Error(ex, $"{CurrentProcessable.Name}:  Error while cancelling");
-			}
-		}
-
-		public void AddDownloadPdf() => AddProcessable<DownloadPdf>();
-		public void AddDownloadDecryptBook() => AddProcessable<DownloadDecryptBook>();
-		public void AddConvertToMp3() => AddProcessable<ConvertToMp3>();
-
-		private void AddProcessable<T>() where T : Processable, new()
-		{
-			Processes.Enqueue(() => new T());
-		}
-
-		public override string ToString() => LibraryBook.ToString();
-
-		#region Subscribers and Unsubscribers
-
-		private void LinkProcessable(Processable processable)
-		{
-			processable.Begin += Processable_Begin;
-			processable.Completed += Processable_Completed;
-			processable.StreamingProgressChanged += Streamable_StreamingProgressChanged;
-			processable.StreamingTimeRemaining += Streamable_StreamingTimeRemaining;
-
-			if (processable is AudioDecodable audioDecodable)
-			{
-				audioDecodable.RequestCoverArt += AudioDecodable_RequestCoverArt;
-				audioDecodable.TitleDiscovered += AudioDecodable_TitleDiscovered;
-				audioDecodable.AuthorsDiscovered += AudioDecodable_AuthorsDiscovered;
-				audioDecodable.NarratorsDiscovered += AudioDecodable_NarratorsDiscovered;
-				audioDecodable.CoverImageDiscovered += AudioDecodable_CoverImageDiscovered;
-			}
-		}
-
-		private void UnlinkProcessable(Processable processable)
-		{
-			processable.Begin -= Processable_Begin;
-			processable.Completed -= Processable_Completed;
-			processable.StreamingProgressChanged -= Streamable_StreamingProgressChanged;
-			processable.StreamingTimeRemaining -= Streamable_StreamingTimeRemaining;
-
-			if (processable is AudioDecodable audioDecodable)
-			{
-				audioDecodable.RequestCoverArt -= AudioDecodable_RequestCoverArt;
-				audioDecodable.TitleDiscovered -= AudioDecodable_TitleDiscovered;
-				audioDecodable.AuthorsDiscovered -= AudioDecodable_AuthorsDiscovered;
-				audioDecodable.NarratorsDiscovered -= AudioDecodable_NarratorsDiscovered;
-				audioDecodable.CoverImageDiscovered -= AudioDecodable_CoverImageDiscovered;
-			}
-		}
-
-		#endregion
-
-		#region AudioDecodable event handlers
-
-		private void AudioDecodable_TitleDiscovered(object? sender, string title) => Title = title;
-
-		private void AudioDecodable_AuthorsDiscovered(object? sender, string authors) => Author = authors;
-
-		private void AudioDecodable_NarratorsDiscovered(object? sender, string narrators) => Narrator = narrators;
-
-
-		private byte[] AudioDecodable_RequestCoverArt(object? sender, EventArgs e)
-		{
-			var quality
-				= Configuration.Instance.FileDownloadQuality == Configuration.DownloadQuality.High && LibraryBook.Book.PictureLarge is not null
-				? new PictureDefinition(LibraryBook.Book.PictureLarge, PictureSize.Native)
-				: new PictureDefinition(LibraryBook.Book.PictureId, PictureSize._500x500);
-
-			byte[] coverData = PictureStorage.GetPictureSynchronously(quality);
-
-			AudioDecodable_CoverImageDiscovered(this, coverData);
-			return coverData;
-		}
-
-		private void AudioDecodable_CoverImageDiscovered(object? sender, byte[] coverArt)
-		{
-			using var ms = new System.IO.MemoryStream(coverArt);
-			Cover = new Avalonia.Media.Imaging.Bitmap(ms);
-		}
-
-		#endregion
-
-		#region Streamable event handlers
-		private void Streamable_StreamingTimeRemaining(object? sender, TimeSpan timeRemaining) => TimeRemaining = timeRemaining;
-
-
-		private void Streamable_StreamingProgressChanged(object? sender, Dinah.Core.Net.Http.DownloadProgress downloadProgress)
-		{
-			if (!downloadProgress.ProgressPercentage.HasValue)
-				return;
-
-			if (downloadProgress.ProgressPercentage == 0)
-				TimeRemaining = TimeSpan.Zero;
-			else
-				Progress = (int)downloadProgress.ProgressPercentage;
-		}
-
-		#endregion
-
-		#region Processable event handlers
-
-		private async void Processable_Begin(object? sender, LibraryBook libraryBook)
-		{
-			await Dispatcher.UIThread.InvokeAsync(() => Status = ProcessBookStatus.Working);
-
-			if (sender is Processable processable)
-				Logger.Info($"{Environment.NewLine}{processable.Name} Step, Begin: {libraryBook.Book}");
-
-			Title = libraryBook.Book.TitleWithSubtitle;
-			Author = libraryBook.Book.AuthorNames();
-			Narrator = libraryBook.Book.NarratorNames();
-		}
-
-		private async void Processable_Completed(object? sender, LibraryBook libraryBook)
-		{
-			if (sender is Processable processable)
-			{
-				Logger.Info($"{processable.Name} Step, Completed: {libraryBook.Book}");
-				UnlinkProcessable(processable);
-			}
-
-			if (Processes.Count == 0)
-			{
-				Completed?.Invoke(this, EventArgs.Empty);
-				return;
-			}
-
-			NextProcessable();
-			LinkProcessable(CurrentProcessable);
-
-			StatusHandler result;
-			try
-			{
-				result = await CurrentProcessable.ProcessSingleAsync(libraryBook, validate: true);
-			}
-			catch (Exception ex)
-			{
-				Serilog.Log.Logger.Error(ex, $"{nameof(Processable_Completed)} error");
-
-				result = new StatusHandler();
-				result.AddError($"{nameof(Processable_Completed)} error. See log for details. Error summary: {ex.Message}");
-			}
-
-			if (result.HasErrors)
-			{
-				foreach (var errorMessage in result.Errors.Where(e => e != "Validation failed"))
-					Logger.Error(errorMessage);
-
-				Completed?.Invoke(this, EventArgs.Empty);
-			}
-		}
-
-		#endregion
-
-		#region Failure Handler
-
-		private async Task<ProcessBookResult> showRetry(LibraryBook libraryBook)
-		{
-			Logger.Error("ERROR. All books have not been processed. Most recent book: processing failed");
-
-			DialogResult? dialogResult = Configuration.Instance.BadBook switch
-			{
-				Configuration.BadBookAction.Abort => DialogResult.Abort,
-				Configuration.BadBookAction.Retry => DialogResult.Retry,
-				Configuration.BadBookAction.Ignore => DialogResult.Ignore,
-				Configuration.BadBookAction.Ask => null,
-				_ => null
-			};
-
-			string details;
-			try
-			{
-				static string trunc(string str)
-					=> string.IsNullOrWhiteSpace(str) ? "[empty]"
-					: (str.Length > 50) ? $"{str.Truncate(47)}..."
-					: str;
-
-				details =
-	$@"  Title: {libraryBook.Book.TitleWithSubtitle}
-  ID: {libraryBook.Book.AudibleProductId}
-  Author: {trunc(libraryBook.Book.AuthorNames())}
-  Narr: {trunc(libraryBook.Book.NarratorNames())}";
-			}
-			catch
-			{
-				details = "[Error retrieving details]";
-			}
-
-			// if null then ask user
-			dialogResult ??= await MessageBox.Show(string.Format(SkipDialogText + "\r\n\r\nSee Settings to avoid this box in the future.", details), "Skip importing this book?", SkipDialogButtons, MessageBoxIcon.Question, SkipDialogDefaultButton);
-
-			if (dialogResult == DialogResult.Abort)
-				return ProcessBookResult.FailedAbort;
-
-			if (dialogResult == SkipResult)
-			{
-				libraryBook.UpdateBookStatus(LiberatedStatus.Error);
-
-				Logger.Info($"Error. Skip: [{libraryBook.Book.AudibleProductId}] {libraryBook.Book.TitleWithSubtitle}");
-
-				return ProcessBookResult.FailedSkip;
-			}
-
-			return ProcessBookResult.FailedRetry;
-		}
-
-		private static string SkipDialogText => @"
-An error occurred while trying to process this book.
-{0}
-
-- ABORT: Stop processing books.
-
-- RETRY: retry this book later. Just skip it for now. Continue processing books. (Will try this book again later.)
-
-- IGNORE: Permanently ignore this book. Continue processing books. (Will not try this book again later.)
-".Trim();
-		private static MessageBoxButtons SkipDialogButtons => MessageBoxButtons.AbortRetryIgnore;
-		private static MessageBoxDefaultButton SkipDialogDefaultButton => MessageBoxDefaultButton.Button1;
-		private static DialogResult SkipResult => DialogResult.Ignore;
-	}
-
-	#endregion
-}

Source/LibationAvalonia/ViewModels/ProcessQueueViewModel.cs

@@ -1,289 +0,0 @@
-using ApplicationServices;
-using Avalonia.Collections;
-using Avalonia.Controls;
-using Avalonia.Threading;
-using DataLayer;
-using LibationFileManager;
-using LibationUiBase;
-using ReactiveUI;
-using System;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Linq;
-using System.Threading.Tasks;
-
-#nullable enable
-namespace LibationAvalonia.ViewModels
-{
-
-	public class ProcessQueueViewModel : ViewModelBase, ILogForm
-	{
-		public ObservableCollection<LogEntry> LogEntries { get; } = new();
-		public AvaloniaList<ProcessBookViewModel> Items { get; } = new();
-		public TrackedQueue<ProcessBookViewModel> Queue { get; }
-		public ProcessBookViewModel? SelectedItem { get; set; }
-		public Task? QueueRunner { get; private set; }
-		public bool Running => !QueueRunner?.IsCompleted ?? false;
-
-		private readonly LogMe Logger;
-
-		public ProcessQueueViewModel()
-		{
-			Logger = LogMe.RegisterForm(this);
-			Queue = new(Items);
-			Queue.QueuededCountChanged += Queue_QueuededCountChanged;
-			Queue.CompletedCountChanged += Queue_CompletedCountChanged;
-
-			if (Design.IsDesignMode)
-				_ = Configuration.Instance.LibationFiles;
-
-			SpeedLimit = Configuration.Instance.DownloadSpeedLimit / 1024m / 1024;
-		}
-
-		private int _completedCount;
-		private int _errorCount;
-		private int _queuedCount;
-		private string? _runningTime;
-		private bool _progressBarVisible;
-		private decimal _speedLimit;
-
-		public int CompletedCount { get => _completedCount; private set => Dispatcher.UIThread.Invoke(() => { this.RaiseAndSetIfChanged(ref _completedCount, value); this.RaisePropertyChanged(nameof(AnyCompleted)); }); }
-		public int QueuedCount { get => _queuedCount; private set => Dispatcher.UIThread.Invoke(() => { this.RaiseAndSetIfChanged(ref _queuedCount, value); this.RaisePropertyChanged(nameof(AnyQueued)); }); }
-		public int ErrorCount { get => _errorCount; private set => Dispatcher.UIThread.Invoke(() => { this.RaiseAndSetIfChanged(ref _errorCount, value); this.RaisePropertyChanged(nameof(AnyErrors)); }); }
-		public string? RunningTime { get => _runningTime; set => Dispatcher.UIThread.Invoke(() => { this.RaiseAndSetIfChanged(ref _runningTime, value); }); }
-		public bool ProgressBarVisible { get => _progressBarVisible; set => Dispatcher.UIThread.Invoke(() => { this.RaiseAndSetIfChanged(ref _progressBarVisible, value); }); }
-		public bool AnyCompleted => CompletedCount > 0;
-		public bool AnyQueued => QueuedCount > 0;
-		public bool AnyErrors => ErrorCount > 0;
-		public double Progress => 100d * Queue.Completed.Count / Queue.Count;
-
-		public decimal SpeedLimit
-		{
-			get
-			{
-				return _speedLimit;
-			}
-			set
-			{
-				var newValue = Math.Min(999 * 1024 * 1024, (long)(value * 1024 * 1024));
-				var config = Configuration.Instance;
-				config.DownloadSpeedLimit = newValue;
-
-				_speedLimit
-					= config.DownloadSpeedLimit <= newValue ? value
-					: value == 0.01m ? config.DownloadSpeedLimit / 1024m / 1024
-					: 0;
-
-				config.DownloadSpeedLimit = (long)(_speedLimit * 1024 * 1024);
-
-				SpeedLimitIncrement = _speedLimit > 100 ? 10
-					: _speedLimit > 10 ? 1
-					: _speedLimit > 1 ? 0.1m
-					: 0.01m;
-
-				Dispatcher.UIThread.Invoke(() =>
-				   {
-					   this.RaisePropertyChanged(nameof(SpeedLimitIncrement));
-					   this.RaisePropertyChanged();
-				   });
-			}
-		}
-
-		public decimal SpeedLimitIncrement { get; private set; }
-
-		private void Queue_CompletedCountChanged(object? sender, int e)
-		{
-			int errCount = Queue.Completed.Count(p => p.Result is ProcessBookResult.FailedAbort or ProcessBookResult.FailedSkip or ProcessBookResult.FailedRetry or ProcessBookResult.ValidationFail);
-			int completeCount = Queue.Completed.Count(p => p.Result is ProcessBookResult.Success);
-
-			ErrorCount = errCount;
-			CompletedCount = completeCount;
-			Dispatcher.UIThread.Invoke(() => this.RaisePropertyChanged(nameof(Progress)));
-		}
-		private void Queue_QueuededCountChanged(object? sender, int cueCount)
-		{
-			QueuedCount = cueCount;
-			Dispatcher.UIThread.Invoke(() => this.RaisePropertyChanged(nameof(Progress)));
-		}
-
-		public void WriteLine(string text)
-		{
-			Dispatcher.UIThread.Invoke(() =>
-				LogEntries.Add(new()
-				{
-					LogDate = DateTime.Now,
-					LogMessage = text.Trim()
-				}));
-		}
-
-
-		#region Add Books to Queue
-
-		private bool isBookInQueue(LibraryBook libraryBook)
-		{
-			var entry = Queue.FirstOrDefault(b => b?.LibraryBook?.Book?.AudibleProductId == libraryBook.Book.AudibleProductId);
-			if (entry == null)
-				return false;
-			else if (entry.Status is ProcessBookStatus.Cancelled or ProcessBookStatus.Failed)
-				return !Queue.RemoveCompleted(entry);
-			else
-				return true;
-		}
-
-		public bool RemoveCompleted(LibraryBook libraryBook)
-			=> Queue.FirstOrDefault(b => b?.LibraryBook?.Book?.AudibleProductId == libraryBook.Book.AudibleProductId) is ProcessBookViewModel entry
-			&& entry.Status is ProcessBookStatus.Completed
-			&& Queue.RemoveCompleted(entry);
-
-		public void AddDownloadPdf(LibraryBook libraryBook)
-			=> AddDownloadPdf(new List<LibraryBook>() { libraryBook });
-
-		public void AddDownloadDecrypt(LibraryBook libraryBook)
-			=> AddDownloadDecrypt(new List<LibraryBook>() { libraryBook });
-
-		public void AddConvertMp3(LibraryBook libraryBook)
-			=> AddConvertMp3(new List<LibraryBook>() { libraryBook });
-
-		public void AddDownloadPdf(IEnumerable<LibraryBook> entries)
-		{
-			List<ProcessBookViewModel> procs = new();
-			foreach (var entry in entries)
-			{
-				if (isBookInQueue(entry))
-					continue;
-
-				ProcessBookViewModel pbook = new(entry, Logger);
-				pbook.AddDownloadPdf();
-				procs.Add(pbook);
-			}
-
-			Serilog.Log.Logger.Information("Queueing {count} books", procs.Count);
-			AddToQueue(procs);
-		}
-
-		public void AddDownloadDecrypt(IEnumerable<LibraryBook> entries)
-		{
-			List<ProcessBookViewModel> procs = new();
-			foreach (var entry in entries)
-			{
-				if (isBookInQueue(entry))
-					continue;
-
-				ProcessBookViewModel pbook = new(entry, Logger);
-				pbook.AddDownloadDecryptBook();
-				pbook.AddDownloadPdf();
-				procs.Add(pbook);
-			}
-
-			Serilog.Log.Logger.Information("Queueing {count} books", procs.Count);
-			AddToQueue(procs);
-		}
-
-		public void AddConvertMp3(IEnumerable<LibraryBook> entries)
-		{
-			List<ProcessBookViewModel> procs = new();
-			foreach (var entry in entries)
-			{
-				if (isBookInQueue(entry))
-					continue;
-
-				ProcessBookViewModel pbook = new(entry, Logger);
-				pbook.AddConvertToMp3();
-				procs.Add(pbook);
-			}
-
-			Serilog.Log.Logger.Information("Queueing {count} books", procs.Count);
-			AddToQueue(procs);
-		}
-
-		public void AddToQueue(IEnumerable<ProcessBookViewModel> pbook)
-		{
-			Dispatcher.UIThread.Invoke(() =>
-			{
-				Queue.Enqueue(pbook);
-				if (!Running)
-					QueueRunner = QueueLoop();
-			});
-		}
-
-		#endregion
-
-		DateTime StartingTime;
-		private async Task QueueLoop()
-		{
-			try
-			{
-				Serilog.Log.Logger.Information("Begin processing queue");
-
-				RunningTime = string.Empty;
-				ProgressBarVisible = true;
-				StartingTime = DateTime.Now;
-
-				using var counterTimer = new System.Threading.Timer(CounterTimer_Tick, null, 0, 500);
-
-				bool shownServiceOutageMessage = false;
-
-				while (Queue.MoveNext())
-				{
-					if (Queue.Current is not ProcessBookViewModel nextBook)
-					{
-						Serilog.Log.Logger.Information("Current queue item is empty.");
-						continue;
-					}
-
-					Serilog.Log.Logger.Information("Begin processing queued item. {item_LibraryBook}", nextBook.LibraryBook);
-
-					var result = await nextBook.ProcessOneAsync();
-
-					Serilog.Log.Logger.Information("Completed processing queued item: {item_LibraryBook}\r\nResult: {result}", nextBook.LibraryBook, result);
-
-					if (result == ProcessBookResult.ValidationFail)
-						Queue.ClearCurrent();
-					else if (result == ProcessBookResult.FailedAbort)
-						Queue.ClearQueue();
-					else if (result == ProcessBookResult.FailedSkip)
-						nextBook.LibraryBook.UpdateBookStatus(LiberatedStatus.Error);
-					else if (result == ProcessBookResult.LicenseDeniedPossibleOutage && !shownServiceOutageMessage)
-					{
-						await MessageBox.Show(@$"
-You were denied a content license for {nextBook.LibraryBook.Book.TitleWithSubtitle}
-
-This error appears to be caused by a temporary interruption of service that sometimes affects Libation's users. This type of error usually resolves itself in 1 to 2 days, and in the meantime you should still be able to access your books through Audible's website or app.
-",
-						"Possible Interruption of Service",
-						MessageBoxButtons.OK,
-						MessageBoxIcon.Asterisk);
-						shownServiceOutageMessage = true;
-					}
-				}
-				Serilog.Log.Logger.Information("Completed processing queue");
-
-				Queue_CompletedCountChanged(this, 0);
-				ProgressBarVisible = false;
-			}
-			catch (Exception ex)
-			{
-				Serilog.Log.Logger.Error(ex, "An error was encountered while processing queued items");
-			}
-		}
-
-		private void CounterTimer_Tick(object? state)
-		{
-			string timeToStr(TimeSpan time)
-			{
-				string minsSecs = $"{time:mm\\:ss}";
-				if (time.TotalHours >= 1)
-					return $"{time.TotalHours:F0}:{minsSecs}";
-				return minsSecs;
-			}
-			RunningTime = timeToStr(DateTime.Now - StartingTime);
-		}
-	}
-
-	public class LogEntry
-	{
-		public DateTime LogDate { get; init; }
-		public string LogDateString => LogDate.ToShortTimeString();
-		public string? LogMessage { get; init; }
-	}
-}

Source/LibationAvalonia/ViewModels/ProductsDisplayViewModel.cs

@@ -5,8 +5,8 @@ using Avalonia.Controls;
 using Avalonia.Threading;
 using DataLayer;
 using Dinah.Core.Collections.Generic;
-using LibationAvalonia.Dialogs.Login;
 using LibationFileManager;
+using LibationUiBase.Forms;
 using LibationUiBase.GridView;
 using ReactiveUI;
 using System;
@@ -26,9 +26,9 @@ namespace LibationAvalonia.ViewModels
 		public event EventHandler<int>? RemovableCountChanged;
 
 		/// <summary>Backing list of all grid entries</summary>
-		private readonly AvaloniaList<IGridEntry> SOURCE = new();
+		private readonly AvaloniaList<GridEntry> SOURCE = new();
 		/// <summary>Grid entries included in the filter set. If null, all grid entries are shown</summary>
-		private HashSet<IGridEntry>? FilteredInGridEntries;
+		private HashSet<GridEntry>? FilteredInGridEntries;
 		public string? FilterString { get; private set; }
 
 		private DataGridCollectionView? _gridEntries;
@@ -43,15 +43,15 @@ namespace LibationAvalonia.ViewModels
 
 		public List<LibraryBook> GetVisibleBookEntries()
 			=> FilteredInGridEntries?
-				.OfType<ILibraryBookEntry>()
+				.OfType<LibraryBookEntry>()
 				.Select(lbe => lbe.LibraryBook)
 				.ToList()
 			?? SOURCE
-				.OfType<ILibraryBookEntry>()
+				.OfType<LibraryBookEntry>()
 				.Select(lbe => lbe.LibraryBook)
 				.ToList();
 
-		private IEnumerable<ILibraryBookEntry> GetAllBookEntries()
+		private IEnumerable<LibraryBookEntry> GetAllBookEntries()
 			=> SOURCE
 			.BookEntries();
 
@@ -112,8 +112,8 @@ namespace LibationAvalonia.ViewModels
 			var sc = await Dispatcher.UIThread.InvokeAsync(() => AvaloniaSynchronizationContext.Current);
 			AvaloniaSynchronizationContext.SetSynchronizationContext(sc);
 
-			var geList = await LibraryBookEntry<AvaloniaEntryStatus>.GetAllProductsAsync(dbBooks);
-			var seriesEntries = await SeriesEntry<AvaloniaEntryStatus>.GetAllSeriesEntriesAsync(dbBooks);
+			var geList = await LibraryBookEntry.GetAllProductsAsync(dbBooks);
+			var seriesEntries = await SeriesEntry.GetAllSeriesEntriesAsync(dbBooks);
 
 			//Add all IGridEntries to the SOURCE list. Note that SOURCE has not yet been linked to the UI via
 			//the GridEntries property, so adding items to SOURCE will not trigger any refreshes or UI action.
@@ -147,8 +147,8 @@ namespace LibationAvalonia.ViewModels
 		private void GridEntries_CollectionChanged(object? sender = null, EventArgs? e = null)
 		{
 			var count
-				= FilteredInGridEntries?.OfType<ILibraryBookEntry>().Count()
-				?? SOURCE.OfType<ILibraryBookEntry>().Count();
+				= FilteredInGridEntries?.OfType<LibraryBookEntry>().Count()
+				?? SOURCE.OfType<LibraryBookEntry>().Count();
 
 			VisibleCountChanged?.Invoke(this, count);
 		}
@@ -223,9 +223,9 @@ namespace LibationAvalonia.ViewModels
 			GridEntries_CollectionChanged();
 		}
 
-		private void RemoveBooks(IEnumerable<ILibraryBookEntry> removedBooks, IEnumerable<ISeriesEntry> removedSeries)
+		private void RemoveBooks(IEnumerable<LibraryBookEntry> removedBooks, IEnumerable<SeriesEntry> removedSeries)
 		{
-			foreach (var removed in removedBooks.Cast<IGridEntry>().Concat(removedSeries).Where(b => b is not null).ToList())
+			foreach (var removed in removedBooks.Cast<GridEntry>().Concat(removedSeries).Where(b => b is not null).ToList())
 			{
 				if (GridEntries?.PassesFilter(removed) ?? false)
 					GridEntries.Remove(removed);
@@ -238,21 +238,21 @@ namespace LibationAvalonia.ViewModels
 			}
 		}
 
-		private void UpsertBook(LibraryBook book, ILibraryBookEntry? existingBookEntry)
+		private void UpsertBook(LibraryBook book, LibraryBookEntry? existingBookEntry)
 		{
 			if (existingBookEntry is null)
 				// Add the new product to top
-				SOURCE.Insert(0, new LibraryBookEntry<AvaloniaEntryStatus>(book));
+				SOURCE.Insert(0, new LibraryBookEntry(book));
 			else
 				// update existing
 				existingBookEntry.UpdateLibraryBook(book);
 		}
 
-		private void UpsertEpisode(LibraryBook episodeBook, ILibraryBookEntry? existingEpisodeEntry, List<ISeriesEntry> seriesEntries, IEnumerable<LibraryBook> dbBooks)
+		private void UpsertEpisode(LibraryBook episodeBook, LibraryBookEntry? existingEpisodeEntry, List<SeriesEntry> seriesEntries, IEnumerable<LibraryBook> dbBooks)
 		{
 			if (existingEpisodeEntry is null)
 			{
-				ILibraryBookEntry episodeEntry;
+				LibraryBookEntry episodeEntry;
 
 				var seriesEntry = seriesEntries.FindSeriesParent(episodeBook);
 
@@ -270,7 +270,7 @@ namespace LibationAvalonia.ViewModels
 						return;
 					}
 
-					seriesEntry = new SeriesEntry<AvaloniaEntryStatus>(seriesBook, episodeBook);
+					seriesEntry = new SeriesEntry(seriesBook, episodeBook);
 					seriesEntries.Add(seriesEntry);
 
 					episodeEntry = seriesEntry.Children[0];
@@ -280,7 +280,7 @@ namespace LibationAvalonia.ViewModels
 				else
 				{
 					//Series exists. Create and add episode child then update the SeriesEntry
-					episodeEntry = new LibraryBookEntry<AvaloniaEntryStatus>(episodeBook, seriesEntry);
+					episodeEntry = new LibraryBookEntry(episodeBook, seriesEntry);
 					seriesEntry.Children.Add(episodeEntry);
 					seriesEntry.Children.Sort((c1, c2) => c1.SeriesIndex.CompareTo(c2.SeriesIndex));
 					var seriesBook = dbBooks.Single(lb => lb.Book.AudibleProductId == seriesEntry.LibraryBook.Book.AudibleProductId);
@@ -307,7 +307,7 @@ namespace LibationAvalonia.ViewModels
 			}
 		}
 
-		public async Task ToggleSeriesExpanded(ISeriesEntry seriesEntry)
+		public async Task ToggleSeriesExpanded(SeriesEntry seriesEntry)
 		{
 			seriesEntry.Liberate.Expanded = !seriesEntry.Liberate.Expanded;
 
@@ -332,7 +332,7 @@ namespace LibationAvalonia.ViewModels
 
 		private bool CollectionFilter(object item)
 		{
-			if (item is ILibraryBookEntry lbe
+			if (item is LibraryBookEntry lbe
 				&& lbe.Liberate.IsEpisode
 				&& lbe.Parent?.Liberate?.Expanded != true)
 				return false;
@@ -431,7 +431,7 @@ namespace LibationAvalonia.ViewModels
 					.Select(lbe => lbe.LibraryBook)
 					.Where(lb => !lb.Book.HasLiberated());
 
-				var removedBooks = await LibraryCommands.FindInactiveBooks(AvaloniaLoginChoiceEager.ApiExtendedFunc, lib, accounts);
+				var removedBooks = await LibraryCommands.FindInactiveBooks(lib, accounts);
 
 				var removable = allBooks.Where(lbe => removedBooks.Any(rb => rb.Book.AudibleProductId == lbe.AudibleProductId)).ToList();
 
@@ -454,7 +454,7 @@ namespace LibationAvalonia.ViewModels
 
 		private void GridEntry_PropertyChanged(object? sender, PropertyChangedEventArgs? e)
 		{
-			if (e?.PropertyName == nameof(IGridEntry.Remove) && sender is ILibraryBookEntry)
+			if (e?.PropertyName == nameof(GridEntry.Remove) && sender is LibraryBookEntry)
 			{
 				int removeCount = GetAllBookEntries().Count(lbe => lbe.Remove is true);
 				RemovableCountChanged?.Invoke(this, removeCount);

Source/LibationAvalonia/ViewModels/RowComparer.cs

@@ -17,7 +17,7 @@ namespace LibationAvalonia.ViewModels
 		public RowComparer(DataGridColumn? column)
 		{
 			Column = column;
-			PropertyName = Column?.SortMemberPath ?? nameof(IGridEntry.DateAdded);
+			PropertyName = Column?.SortMemberPath ?? nameof(GridEntry.DateAdded);
 		}
 
 		//Avalonia doesn't expose the column's CurrentSortingState, so we must get it through reflection

Source/LibationAvalonia/ViewModels/Settings/ImportantSettingsVM.cs

@@ -57,7 +57,13 @@ namespace LibationAvalonia.ViewModels.Settings
 			config.GridFontScaleFactor = linearRangeToScaleFactor(GridFontScaleFactor);
 			config.GridScaleFactor = linearRangeToScaleFactor(GridScaleFactor);
 		}
-		public void OpenLogFolderButton() => Go.To.Folder(((LongPath)Configuration.Instance.LibationFiles).ShortPathName);
+		public void OpenLogFolderButton()
+		{
+			if (System.IO.File.Exists(LogFileFilter.LogFilePath))
+				Go.To.File(LogFileFilter.LogFilePath);
+			else
+				Go.To.Folder(((LongPath)Configuration.Instance.LibationFiles).ShortPathName);
+		}
 
 		public List<Configuration.KnownDirectories> KnownDirectories { get; } = new()
 		{

Source/LibationAvalonia/Views/LiberateStatusButton.axaml.cs

@@ -53,8 +53,8 @@ namespace LibationAvalonia.Views
 		private void LiberateStatusButton_DataContextChanged(object sender, EventArgs e)
 		{
 			//Force book status recheck when an entry is scrolled into view.
-			//This will force a recheck for a paprtially downloaded file.
-			var status = DataContext as ILibraryBookEntry;
+			//This will force a recheck for a partially downloaded file.
+			var status = DataContext as LibraryBookEntry;
 			status?.Liberate.Invalidate(nameof(status.Liberate.BookStatus));
 		}
 

Source/LibationAvalonia/Views/MainWindow.axaml.cs

@@ -7,6 +7,7 @@ using FileManager;
 using LibationAvalonia.Dialogs;
 using LibationAvalonia.ViewModels;
 using LibationFileManager;
+using LibationUiBase.Forms;
 using LibationUiBase.GridView;
 using ReactiveUI;
 using System;
@@ -21,6 +22,7 @@ namespace LibationAvalonia.Views
 		public MainWindow()
 		{
 			DataContext = new MainVM(this);
+			ApiExtended.LoginChoiceFactory = account => Dispatcher.UIThread.Invoke(() => new Dialogs.Login.AvaloniaLoginChoiceEager(account));
 
 			AudibleApiStorage.LoadError += AudibleApiStorage_LoadError;
 			InitializeComponent();
@@ -135,7 +137,7 @@ namespace LibationAvalonia.Views
 		}
 
 		public void ProductsDisplay_LiberateClicked(object _, LibraryBook[] libraryBook) => ViewModel.LiberateClicked(libraryBook);
-		public void ProductsDisplay_LiberateSeriesClicked(object _, ISeriesEntry series) => ViewModel.LiberateSeriesClicked(series);
+		public void ProductsDisplay_LiberateSeriesClicked(object _, SeriesEntry series) => ViewModel.LiberateSeriesClicked(series);
 		public void ProductsDisplay_ConvertToMp3Clicked(object _, LibraryBook[] libraryBook) => ViewModel.ConvertToMp3Clicked(libraryBook);
 
 		BookDetailsDialog bookDetailsForm;
@@ -164,20 +166,23 @@ namespace LibationAvalonia.Views
 		private void Configure_Upgrade()
 		{
 			setProgressVisible(false);
-#if !DEBUG
-			async System.Threading.Tasks.Task upgradeAvailable(LibationUiBase.UpgradeEventArgs e)
+#pragma warning disable CS8321 // Local function is declared but never used
+			async Task upgradeAvailable(LibationUiBase.UpgradeEventArgs e)
 			{
-				var notificationResult = await new Dialogs.UpgradeNotificationDialog(e.UpgradeProperties, e.CapUpgrade).ShowDialogAsync(this);
+				var notificationResult = await new UpgradeNotificationDialog(e.UpgradeProperties, e.CapUpgrade).ShowDialogAsync(this);
 
 				e.Ignore = notificationResult == DialogResult.Ignore;
 				e.InstallUpgrade = notificationResult == DialogResult.OK;
 			}
+#pragma warning restore CS8321 // Local function is declared but never used
 
 			var upgrader = new LibationUiBase.Upgrader();
-			upgrader.DownloadProgress += async (_, e) => await Avalonia.Threading.Dispatcher.UIThread.InvokeAsync(() => ViewModel.DownloadProgress = e.ProgressPercentage);
-			upgrader.DownloadBegin += async (_, _) => await Avalonia.Threading.Dispatcher.UIThread.InvokeAsync(() => setProgressVisible(true));
-			upgrader.DownloadCompleted += async (_, _) => await Avalonia.Threading.Dispatcher.UIThread.InvokeAsync(() => setProgressVisible(false));
+			upgrader.DownloadProgress += async (_, e) => await Dispatcher.UIThread.InvokeAsync(() => ViewModel.DownloadProgress = e.ProgressPercentage);
+			upgrader.DownloadBegin += async (_, _) => await Dispatcher.UIThread.InvokeAsync(() => setProgressVisible(true));
+			upgrader.DownloadCompleted += async (_, _) => await Dispatcher.UIThread.InvokeAsync(() => setProgressVisible(false));
+			upgrader.UpgradeFailed += async (_, message) => await Dispatcher.UIThread.InvokeAsync(() => { setProgressVisible(false); MessageBox.Show(this, message, "Upgrade Failed", MessageBoxButtons.OK, MessageBoxIcon.Error); });
 
+#if !DEBUG
 			Opened += async (_, _) => await upgrader.CheckForUpgradeAsync(upgradeAvailable);
 #endif
 		}

Source/LibationAvalonia/Views/ProcessBookControl.axaml

@@ -2,7 +2,7 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-			 xmlns:vm="clr-namespace:LibationAvalonia.ViewModels"
+			 xmlns:vm="clr-namespace:LibationUiBase.ProcessQueue;assembly=LibationUiBase"
 			 xmlns:views="clr-namespace:LibationAvalonia.Views"
 			 x:DataType="vm:ProcessBookViewModel"
              mc:Ignorable="d" d:DesignWidth="400" d:DesignHeight="87" MaxHeight="87" MinHeight="87" MinWidth="300"

Source/LibationAvalonia/Views/ProcessBookControl.axaml.cs

@@ -2,8 +2,8 @@ using ApplicationServices;
 using Avalonia;
 using Avalonia.Controls;
 using DataLayer;
-using LibationAvalonia.ViewModels;
 using LibationUiBase;
+using LibationUiBase.ProcessQueue;
 
 namespace LibationAvalonia.Views
 {
@@ -30,10 +30,8 @@ namespace LibationAvalonia.Views
 			if (Design.IsDesignMode)
 			{
 				using var context = DbContexts.GetContext();
-				DataContext = new ProcessBookViewModel(
-					context.GetLibraryBook_Flat_NoTracking("B017V4IM1G"),
-					LogMe.RegisterForm(default(ILogForm))
-					);
+				ViewModels.MainVM.Configure_NonUI();
+				DataContext = new ProcessBookViewModel(context.GetLibraryBook_Flat_NoTracking("B017V4IM1G"));
 				return;
 			}
 		}
@@ -43,7 +41,7 @@ namespace LibationAvalonia.Views
 		public void Cancel_Click(object sender, Avalonia.Interactivity.RoutedEventArgs e)
 			=> CancelButtonClicked?.Invoke(DataItem);
 		public void MoveFirst_Click(object sender, Avalonia.Interactivity.RoutedEventArgs e)
-			=> PositionButtonClicked?.Invoke(DataItem, QueuePosition.Fisrt);
+			=> PositionButtonClicked?.Invoke(DataItem, QueuePosition.First);
 		public void MoveUp_Click(object sender, Avalonia.Interactivity.RoutedEventArgs e)
 			=> PositionButtonClicked?.Invoke(DataItem, QueuePosition.OneUp);
 		public void MoveDown_Click(object sender, Avalonia.Interactivity.RoutedEventArgs e)

Source/LibationAvalonia/Views/ProcessQueueControl.axaml

@@ -34,7 +34,12 @@
 							HorizontalScrollBarVisibility="Disabled"
 							VerticalScrollBarVisibility="Auto"
 							AllowAutoHide="False">
-							<ItemsControl ItemsSource="{Binding Items}">
+							<ItemsControl ItemsSource="{Binding Queue}">
+								<ItemsControl.ItemsPanel>
+									<ItemsPanelTemplate>
+										<VirtualizingStackPanel />
+									</ItemsPanelTemplate>									
+								</ItemsControl.ItemsPanel>
 								<ItemsControl.ItemTemplate>
 									<DataTemplate>
 										<views:ProcessBookControl DataContext="{Binding}" />

Source/LibationAvalonia/Views/ProcessQueueControl.axaml.cs

@@ -1,10 +1,9 @@
 using ApplicationServices;
-using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Data.Converters;
 using DataLayer;
-using LibationAvalonia.ViewModels;
 using LibationUiBase;
+using LibationUiBase.ProcessQueue;
 using System;
 using System.Collections.Generic;
 using System.Globalization;
@@ -30,48 +29,49 @@ namespace LibationAvalonia.Views
 #if DEBUG
 			if (Design.IsDesignMode)
 			{
+				_ = LibationFileManager.Configuration.Instance.LibationFiles;
+				ViewModels.MainVM.Configure_NonUI();
 				var vm = new ProcessQueueViewModel();
-				var Logger = LogMe.RegisterForm(vm);
 				DataContext = vm;
 				using var context = DbContexts.GetContext();
 				List<ProcessBookViewModel> testList = new()
 				{
-					new ProcessBookViewModel(context.GetLibraryBook_Flat_NoTracking("B017V4IM1G"), Logger)
+					new ProcessBookViewModel(context.GetLibraryBook_Flat_NoTracking("B017V4IM1G"))
 					{
 						Result = ProcessBookResult.FailedAbort,
 						Status = ProcessBookStatus.Failed,
 					},
-					new ProcessBookViewModel(context.GetLibraryBook_Flat_NoTracking("B017V4IWVG"), Logger)
+					new ProcessBookViewModel(context.GetLibraryBook_Flat_NoTracking("B017V4IWVG"))
 					{
 						Result = ProcessBookResult.FailedSkip,
 						Status = ProcessBookStatus.Failed,
 					},
-					new ProcessBookViewModel(context.GetLibraryBook_Flat_NoTracking("B017V4JA2Q"), Logger)
+					new ProcessBookViewModel(context.GetLibraryBook_Flat_NoTracking("B017V4JA2Q"))
 					{
 						Result = ProcessBookResult.FailedRetry,
 						Status = ProcessBookStatus.Failed,
 					},
-					new ProcessBookViewModel(context.GetLibraryBook_Flat_NoTracking("B017V4NUPO"), Logger)
+					new ProcessBookViewModel(context.GetLibraryBook_Flat_NoTracking("B017V4NUPO"))
 					{
 						Result = ProcessBookResult.ValidationFail,
 						Status = ProcessBookStatus.Failed,
 					},
-					new ProcessBookViewModel(context.GetLibraryBook_Flat_NoTracking("B017V4NMX4"), Logger)
+					new ProcessBookViewModel(context.GetLibraryBook_Flat_NoTracking("B017V4NMX4"))
 					{
 						Result = ProcessBookResult.Cancelled,
 						Status = ProcessBookStatus.Cancelled,
 					},
-					new ProcessBookViewModel(context.GetLibraryBook_Flat_NoTracking("B017V4NOZ0"), Logger)
+					new ProcessBookViewModel(context.GetLibraryBook_Flat_NoTracking("B017V4NOZ0"))
 					{
 						Result = ProcessBookResult.Success,
 						Status = ProcessBookStatus.Completed,
 					},
-					new ProcessBookViewModel(context.GetLibraryBook_Flat_NoTracking("B017WJ5ZK6"), Logger)
+					new ProcessBookViewModel(context.GetLibraryBook_Flat_NoTracking("B017WJ5ZK6"))
 					{
 						Result = ProcessBookResult.None,
 						Status = ProcessBookStatus.Working,
 					},
-					new ProcessBookViewModel(context.GetLibraryBook_Flat_NoTracking("B017V4IM1G"), Logger)
+					new ProcessBookViewModel(context.GetLibraryBook_Flat_NoTracking("B017V4IM1G"))
 					{
 						Result = ProcessBookResult.None,
 						Status = ProcessBookStatus.Queued,

Source/LibationAvalonia/Views/ProductsDisplay.axaml

@@ -59,7 +59,7 @@
 					Width="75">
 
 					<DataGridTemplateColumn.CellTemplate>
-						<DataTemplate x:DataType="uibase:IGridEntry">
+						<DataTemplate x:DataType="uibase:GridEntry">
 							<CheckBox
 								HorizontalAlignment="Center"
 								IsThreeState="True"
@@ -70,7 +70,7 @@
 
 				<controls:DataGridTemplateColumnExt CanUserResize="False" CanUserSort="True" Header="Liberate" SortMemberPath="Liberate" ClipboardContentBinding="{Binding Liberate.ToolTip}">
 					<DataGridTemplateColumn.CellTemplate>
-						<DataTemplate x:DataType="uibase:IGridEntry">
+						<DataTemplate x:DataType="uibase:GridEntry">
 							<views:LiberateStatusButton
 								ToolTip.Tip="{CompiledBinding Liberate.ToolTip}"
 								BookStatus="{CompiledBinding Liberate.BookStatus}"
@@ -85,7 +85,7 @@
 
 				<controls:DataGridTemplateColumnExt CanUserResize="False" CanUserSort="False" Header="Cover" SortMemberPath="Cover" ClipboardContentBinding="{Binding LibraryBook.Book.PictureLarge}">
 					<DataGridTemplateColumn.CellTemplate>
-						<DataTemplate x:DataType="uibase:IGridEntry">
+						<DataTemplate x:DataType="uibase:GridEntry">
 							<Image Opacity="{CompiledBinding Liberate.Opacity}" Tapped="Cover_Click" Source="{CompiledBinding Cover}" ToolTip.Tip="Click to see full size" />
 						</DataTemplate>
 					</DataGridTemplateColumn.CellTemplate>
@@ -93,7 +93,7 @@
 
 				<controls:DataGridTemplateColumnExt Header="Title" MinWidth="10" Width="{Binding TitleWidth, Mode=TwoWay}" CanUserSort="True" SortMemberPath="Title" ClipboardContentBinding="{Binding Title}">
 					<DataGridTemplateColumn.CellTemplate>
-						<DataTemplate x:DataType="uibase:IGridEntry">
+						<DataTemplate x:DataType="uibase:GridEntry">
 							<Panel Opacity="{CompiledBinding Liberate.Opacity}">
 								<TextBlock Classes="h1" Text="{CompiledBinding Title}" />
 							</Panel>
@@ -103,7 +103,7 @@
 
 				<controls:DataGridTemplateColumnExt Header="Authors" MinWidth="10" Width="{Binding AuthorsWidth, Mode=TwoWay}" CanUserSort="True" SortMemberPath="Authors" ClipboardContentBinding="{Binding Authors}">
 					<DataGridTemplateColumn.CellTemplate>
-						<DataTemplate x:DataType="uibase:IGridEntry">
+						<DataTemplate x:DataType="uibase:GridEntry">
 							<Panel Opacity="{CompiledBinding Liberate.Opacity}">
 								<TextBlock Text="{CompiledBinding Authors}" />
 							</Panel>
@@ -113,7 +113,7 @@
 
 				<controls:DataGridTemplateColumnExt Header="Narrators" MinWidth="10" Width="{Binding NarratorsWidth, Mode=TwoWay}" CanUserSort="True" SortMemberPath="Narrators" ClipboardContentBinding="{Binding Narrators}">
 					<DataGridTemplateColumn.CellTemplate>
-						<DataTemplate x:DataType="uibase:IGridEntry">
+						<DataTemplate x:DataType="uibase:GridEntry">
 							<Panel Opacity="{CompiledBinding Liberate.Opacity}">
 								<TextBlock Text="{CompiledBinding Narrators}" />
 							</Panel>
@@ -123,7 +123,7 @@
 
 				<controls:DataGridTemplateColumnExt Header="Length" MinWidth="10" Width="{Binding LengthWidth, Mode=TwoWay}" CanUserSort="True" SortMemberPath="Length" ClipboardContentBinding="{Binding Length}">
 					<DataGridTemplateColumn.CellTemplate>
-						<DataTemplate x:DataType="uibase:IGridEntry">
+						<DataTemplate x:DataType="uibase:GridEntry">
 							<Panel Opacity="{CompiledBinding Liberate.Opacity}">
 								<TextBlock Text="{CompiledBinding Length}" />
 							</Panel>
@@ -133,7 +133,7 @@
 
 				<controls:DataGridTemplateColumnExt Header="Series" MinWidth="10" Width="{Binding SeriesWidth, Mode=TwoWay}" CanUserSort="True" SortMemberPath="Series" ClipboardContentBinding="{Binding Series}">
 					<DataGridTemplateColumn.CellTemplate>
-						<DataTemplate x:DataType="uibase:IGridEntry">
+						<DataTemplate x:DataType="uibase:GridEntry">
 							<Panel Opacity="{CompiledBinding Liberate.Opacity}">
 								<TextBlock Text="{CompiledBinding Series}" />
 							</Panel>
@@ -143,7 +143,7 @@
 
 				<controls:DataGridTemplateColumnExt Header="Series&#xA;Order" MinWidth="10" Width="{Binding SeriesOrderWidth, Mode=TwoWay}" CanUserSort="True" SortMemberPath="SeriesOrder" ClipboardContentBinding="{Binding Series}">
 					<DataGridTemplateColumn.CellTemplate>
-						<DataTemplate x:DataType="uibase:IGridEntry">
+						<DataTemplate x:DataType="uibase:GridEntry">
 							<Panel Opacity="{CompiledBinding Liberate.Opacity}">
 								<TextBlock Text="{CompiledBinding SeriesOrder}" HorizontalAlignment="Center" />
 							</Panel>
@@ -153,7 +153,7 @@
 
 				<controls:DataGridTemplateColumnExt Header="Description" MinWidth="10" Width="{Binding DescriptionWidth, Mode=TwoWay}" CanUserSort="True" SortMemberPath="Description" ClipboardContentBinding="{Binding Description}">
 					<DataGridTemplateColumn.CellTemplate>
-						<DataTemplate x:DataType="uibase:IGridEntry">
+						<DataTemplate x:DataType="uibase:GridEntry">
 							<Panel Opacity="{CompiledBinding Liberate.Opacity}" Tapped="Description_Click" ToolTip.Tip="Click to see full description" >
 								<TextBlock Text="{CompiledBinding Description}" VerticalAlignment="Top" />
 							</Panel>
@@ -163,7 +163,7 @@
 
 				<controls:DataGridTemplateColumnExt Header="Category" MinWidth="10" Width="{Binding CategoryWidth, Mode=TwoWay}" CanUserSort="True" SortMemberPath="Category" ClipboardContentBinding="{Binding Category}">
 					<DataGridTemplateColumn.CellTemplate>
-						<DataTemplate x:DataType="uibase:IGridEntry">
+						<DataTemplate x:DataType="uibase:GridEntry">
 							<Panel Opacity="{CompiledBinding Liberate.Opacity}">
 								<TextBlock Text="{CompiledBinding Category}" />
 							</Panel>
@@ -172,7 +172,7 @@
 				</controls:DataGridTemplateColumnExt>
 
 				<controls:DataGridMyRatingColumn
-					x:DataType="uibase:IGridEntry"
+					x:DataType="uibase:GridEntry"
 					Header="Product&#xA;Rating"
 					IsReadOnly="true"
 					MinWidth="10" Width="{Binding ProductRatingWidth, Mode=TwoWay}"
@@ -183,7 +183,7 @@
 
 				<controls:DataGridTemplateColumnExt Header="Purchase&#xA;Date" MinWidth="10" Width="{Binding PurchaseDateWidth, Mode=TwoWay}" CanUserSort="True" SortMemberPath="PurchaseDate" ClipboardContentBinding="{Binding PurchaseDate}">
 					<DataGridTemplateColumn.CellTemplate>
-						<DataTemplate x:DataType="uibase:IGridEntry">
+						<DataTemplate x:DataType="uibase:GridEntry">
 							<Panel Opacity="{CompiledBinding Liberate.Opacity}">
 								<TextBlock Text="{CompiledBinding PurchaseDate}" />
 							</Panel>
@@ -192,7 +192,7 @@
 				</controls:DataGridTemplateColumnExt>
 
 				<controls:DataGridMyRatingColumn
-					x:DataType="uibase:IGridEntry"
+					x:DataType="uibase:GridEntry"
 					Header="My Rating"
 					IsReadOnly="false"
 					MinWidth="10" Width="{Binding MyRatingWidth, Mode=TwoWay}"
@@ -203,7 +203,7 @@
 
 				<controls:DataGridTemplateColumnExt Header="Misc" MinWidth="10" Width="{Binding MiscWidth, Mode=TwoWay}" CanUserSort="True" SortMemberPath="Misc" ClipboardContentBinding="{Binding Misc}">
 					<DataGridTemplateColumn.CellTemplate>
-						<DataTemplate x:DataType="uibase:IGridEntry">
+						<DataTemplate x:DataType="uibase:GridEntry">
 							<Panel Opacity="{CompiledBinding Liberate.Opacity}">
 								<TextBlock Text="{CompiledBinding Misc}" TextWrapping="WrapWithOverflow" />
 							</Panel>
@@ -213,7 +213,7 @@
 				
 				<controls:DataGridTemplateColumnExt Header="Last&#xA;Download" MinWidth="10" Width="{Binding LastDownloadWidth, Mode=TwoWay}" CanUserSort="True" SortMemberPath="LastDownload" ClipboardContentBinding="{Binding LastDownload}">
 					<DataGridTemplateColumn.CellTemplate>
-						<DataTemplate x:DataType="uibase:IGridEntry">
+						<DataTemplate x:DataType="uibase:GridEntry">
 							<Panel Opacity="{CompiledBinding Liberate.Opacity}" ToolTip.Tip="{CompiledBinding LastDownload.ToolTipText}" DoubleTapped="Version_DoubleClick">
 								<TextBlock Text="{CompiledBinding LastDownload}" TextWrapping="WrapWithOverflow" />
 							</Panel>
@@ -223,7 +223,7 @@
 
 				<controls:DataGridTemplateColumnExt Header="Tags" MinWidth="10" Width="{Binding BookTagsWidth, Mode=TwoWay}" CanUserSort="True" SortMemberPath="BookTags" ClipboardContentBinding="{Binding BookTags}">
 					<DataGridTemplateColumn.CellTemplate>
-						<DataTemplate x:DataType="uibase:IGridEntry">
+						<DataTemplate x:DataType="uibase:GridEntry">
 							<Button
 								IsVisible="{CompiledBinding !Liberate.IsSeries}"
 								VerticalAlignment="Stretch"

Source/LibationAvalonia/Views/ProductsDisplay.axaml.cs

@@ -2,7 +2,6 @@ using ApplicationServices;
 using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Input.Platform;
-using Avalonia.Media;
 using Avalonia.Platform.Storage;
 using Avalonia.Styling;
 using DataLayer;
@@ -13,6 +12,7 @@ using LibationAvalonia.Dialogs;
 using LibationAvalonia.ViewModels;
 using LibationFileManager;
 using LibationFileManager.Templates;
+using LibationUiBase.Forms;
 using LibationUiBase.GridView;
 using ReactiveUI;
 using System;
@@ -26,7 +26,7 @@ namespace LibationAvalonia.Views
 	public partial class ProductsDisplay : UserControl
 	{
 		public event EventHandler<LibraryBook[]>? LiberateClicked;
-		public event EventHandler<ISeriesEntry>? LiberateSeriesClicked;
+		public event EventHandler<SeriesEntry>? LiberateSeriesClicked;
 		public event EventHandler<LibraryBook[]>? ConvertToMp3Clicked;
 		public event EventHandler<LibraryBook>? TagsButtonClicked;
 
@@ -102,7 +102,7 @@ namespace LibationAvalonia.Views
 
 		private void ProductsDisplay_LoadingRow(object sender, DataGridRowEventArgs e)
 		{
-			if (e.Row.DataContext is LibraryBookEntry<AvaloniaEntryStatus> entry && entry.Liberate.IsEpisode)
+			if (e.Row.DataContext is LibraryBookEntry entry && entry.Liberate.IsEpisode)
 				e.Row.DynamicResource(DataGridRow.BackgroundProperty, "SeriesEntryGridBackgroundBrush");
 			else
 				e.Row.DynamicResource(DataGridRow.BackgroundProperty, "SystemRegionColor");
@@ -173,10 +173,10 @@ namespace LibationAvalonia.Views
 			{
 				switch (column.SortMemberPath)
 				{
-					case nameof(IGridEntry.Liberate):
+					case nameof(GridEntry.Liberate):
 						column.Width = new DataGridLength(BaseLiberateWidth * scaleFactor);
 						break;
-					case nameof(IGridEntry.Cover):
+					case nameof(GridEntry.Cover):
 						column.Width = new DataGridLength(BaseCoverWidth * scaleFactor);
 						break;
 				}
@@ -220,7 +220,7 @@ namespace LibationAvalonia.Views
 
 			#region Liberate all Episodes (Single series only)
 
-			if (entries.Length == 1 && entries[0] is ISeriesEntry seriesEntry)
+			if (entries.Length == 1 && entries[0] is SeriesEntry seriesEntry)
 			{
 				args.ContextMenuItems.Add(new MenuItem()
 				{
@@ -253,7 +253,7 @@ namespace LibationAvalonia.Views
 			#endregion
 			#region Locate file (Single book only)
 
-			if (entries.Length == 1 && entries[0] is ILibraryBookEntry entry)
+			if (entries.Length == 1 && entries[0] is LibraryBookEntry entry)
 			{
 				args.ContextMenuItems.Add(new MenuItem
 				{
@@ -301,7 +301,7 @@ namespace LibationAvalonia.Views
 
 			#endregion
 			#region Liberate All (multiple books only)
-			if (entries.OfType<ILibraryBookEntry>().Count() > 1)
+			if (entries.OfType<LibraryBookEntry>().Count() > 1)
 			{
 				args.ContextMenuItems.Add(new MenuItem
 				{
@@ -325,7 +325,7 @@ namespace LibationAvalonia.Views
 
 			#endregion
 			#region Force Re-Download (Single book only)
-			if (entries.Length == 1 && entries[0] is ILibraryBookEntry entry4)
+			if (entries.Length == 1 && entries[0] is LibraryBookEntry entry4)
 			{
 				args.ContextMenuItems.Add(new MenuItem()
 				{
@@ -361,7 +361,7 @@ namespace LibationAvalonia.Views
 				}
 			}
 
-			if (entries.Length == 1 && entries[0] is ILibraryBookEntry entry2)
+			if (entries.Length == 1 && entries[0] is LibraryBookEntry entry2)
 			{
 				args.ContextMenuItems.Add(new MenuItem
 				{
@@ -391,7 +391,7 @@ namespace LibationAvalonia.Views
 			#endregion
 			#region View Bookmarks/Clips (Single book only)
 
-			if (entries.Length == 1 && entries[0] is ILibraryBookEntry entry3 && VisualRoot is Window window)
+			if (entries.Length == 1 && entries[0] is LibraryBookEntry entry3 && VisualRoot is Window window)
 			{
 				args.ContextMenuItems.Add(new MenuItem
 				{
@@ -447,7 +447,7 @@ namespace LibationAvalonia.Views
 			{
 				var itemName = column.SortMemberPath;
 
-				if (itemName == nameof(IGridEntry.Remove))
+				if (itemName == nameof(GridEntry.Remove))
 					continue;
 
 				menuItems.Add
@@ -536,7 +536,7 @@ namespace LibationAvalonia.Views
 			if (sender is not LiberateStatusButton button)
 				return;
 
-			if (button.DataContext is ISeriesEntry sEntry && _viewModel is not null)
+			if (button.DataContext is SeriesEntry sEntry && _viewModel is not null)
 			{
 				await _viewModel.ToggleSeriesExpanded(sEntry);
 
@@ -544,7 +544,7 @@ namespace LibationAvalonia.Views
 				//to the topright cell. Reset focus onto the clicked button's cell.
 				button.Focus();
 			}
-			else if (button.DataContext is ILibraryBookEntry lbEntry)
+			else if (button.DataContext is LibraryBookEntry lbEntry)
 			{
 				LiberateClicked?.Invoke(this, [lbEntry.LibraryBook]);
 			}
@@ -558,13 +558,13 @@ namespace LibationAvalonia.Views
 
 		public void Version_DoubleClick(object sender, Avalonia.Input.TappedEventArgs args)
 		{
-			if (sender is Control panel && panel.DataContext is ILibraryBookEntry lbe && lbe.LastDownload.IsValid)
+			if (sender is Control panel && panel.DataContext is LibraryBookEntry lbe && lbe.LastDownload.IsValid)
 				lbe.LastDownload.OpenReleaseUrl();
 		}
 
 		public void Cover_Click(object sender, Avalonia.Input.TappedEventArgs args)
 		{
-			if (sender is not Image tblock || tblock.DataContext is not IGridEntry gEntry)
+			if (sender is not Image tblock || tblock.DataContext is not GridEntry gEntry)
 				return;
 
 			if (imageDisplayDialog is null || !imageDisplayDialog.IsVisible)
@@ -605,7 +605,7 @@ namespace LibationAvalonia.Views
 
 		public void Description_Click(object sender, Avalonia.Input.TappedEventArgs args)
 		{
-			if (sender is Control tblock && tblock.DataContext is IGridEntry gEntry)
+			if (sender is Control tblock && tblock.DataContext is GridEntry gEntry)
 			{
 				var pt = tblock.PointToScreen(tblock.Bounds.TopRight);
 				var displayWindow = new DescriptionDisplayDialog
@@ -632,7 +632,7 @@ namespace LibationAvalonia.Views
 		{
 			var button = args.Source as Button;
 
-			if (button?.DataContext is ILibraryBookEntry lbEntry)
+			if (button?.DataContext is LibraryBookEntry lbEntry)
 			{
 				TagsButtonClicked?.Invoke(this, lbEntry.LibraryBook);
 			}

Source/LibationAvalonia/Walkthrough.cs

@@ -9,6 +9,7 @@ using Dinah.Core.StepRunner;
 using LibationAvalonia.Dialogs;
 using LibationAvalonia.Views;
 using LibationFileManager;
+using LibationUiBase.Forms;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;

Source/LibationCli/Options/ScanOptions.cs

@@ -32,7 +32,7 @@ namespace LibationCli
 				: $"Scanning Audible library: {_accounts.Length} accounts. This may take a few minutes per account.";
 			Console.WriteLine(intro);
 
-			var (TotalBooksProcessed, NewBooksAdded) = await LibraryCommands.ImportAccountAsync((a) => ApiExtended.CreateAsync(a), _accounts);
+			var (TotalBooksProcessed, NewBooksAdded) = await LibraryCommands.ImportAccountAsync(_accounts);
 
 			Console.WriteLine("Scan complete.");
 			Console.WriteLine($"Total processed: {TotalBooksProcessed}");

Source/LibationFileManager/Configuration.Logging.cs

@@ -1,6 +1,5 @@
 using System;
 using System.ComponentModel;
-using System.Linq;
 using Dinah.Core.Logging;
 using FileManager;
 using Microsoft.Extensions.Configuration;
@@ -10,7 +9,7 @@ using Serilog.Events;
 #nullable enable
 namespace LibationFileManager
 {
-    public partial class Configuration
+	public partial class Configuration
     {
         private IConfigurationRoot? configuration;
 
@@ -19,13 +18,14 @@ namespace LibationFileManager
             configuration = new ConfigurationBuilder()
                 .AddJsonFile(SettingsFilePath, optional: false, reloadOnChange: true)
                 .Build();
-            Log.Logger = new LoggerConfiguration()
-                .ReadFrom.Configuration(configuration)
-                .Destructure.ByTransforming<LongPath>(lp => lp.Path)
-                .CreateLogger();
-        }
+			Log.Logger = new LoggerConfiguration()
+				 .ReadFrom.Configuration(configuration)
+				 .Destructure.ByTransforming<LongPath>(lp => lp.Path)
+				 .Destructure.With<LogFileFilter>()
+                 .CreateLogger();
+		}
 
-        [Description("The importance of a log event")]
+		[Description("The importance of a log event")]
         public LogEventLevel LogLevel
         {
             get

Source/LibationFileManager/Configuration.PersistentSettings.cs

@@ -132,7 +132,7 @@ namespace LibationFileManager
 		public bool AllowLibationFixup { get => GetNonString(defaultValue: true); set => SetNonString(value); }
 
 		[Description("Create a cue sheet (.cue)")]
-		public bool CreateCueSheet { get => GetNonString(defaultValue: true); set => SetNonString(value); }
+		public bool CreateCueSheet { get => GetNonString(defaultValue: false); set => SetNonString(value); }
 
 		[Description("Retain the Aax file after successfully decrypting")]
 		public bool RetainAaxFile { get => GetNonString(defaultValue: false); set => SetNonString(value); }
@@ -257,7 +257,7 @@ namespace LibationFileManager
 		}
 
 		[Description("Use widevine DRM")]
-		public bool UseWidevine { get => GetNonString(defaultValue: true); set => SetNonString(value); }
+		public bool UseWidevine { get => GetNonString(defaultValue: false); set => SetNonString(value); }
 
 		[Description("Request Spatial Audio")]
 		public bool RequestSpatial { get => GetNonString(defaultValue: true); set => SetNonString(value); }

Source/LibationFileManager/LibationFileManager.csproj

@@ -5,7 +5,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="9.0.4" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="9.0.7" />
     <PackageReference Include="NameParserSharp" Version="1.5.0" />
     <PackageReference Include="Serilog.Exceptions" Version="8.4.0" />
   </ItemGroup>

Source/LibationFileManager/LogFileFilter.cs

@@ -0,0 +1,113 @@
+using Serilog.Core;
+using Serilog.Events;
+using Serilog.Sinks.File;
+using System;
+using System.Diagnostics.CodeAnalysis;
+using System.IO;
+using System.IO.Compression;
+using System.Linq;
+using System.Reflection;
+using System.Text;
+
+#nullable enable
+namespace LibationFileManager;
+
+/// <summary>
+/// Hooks the file sink to set the log file path for the LogFileFilter.
+/// </summary>
+public class FileSinkHook : FileLifecycleHooks
+{
+	public override Stream OnFileOpened(string path, Stream underlyingStream, Encoding encoding)
+	{
+		LogFileFilter.SetLogFilePath(path);
+		return base.OnFileOpened(path, underlyingStream, encoding);
+	}
+}
+
+
+/// <summary>
+/// Identify log entries which are to be written to files, and save them to a zip file.
+/// 
+/// Files are detected by pattern matching. If the logged type has properties named 'filename' and 'filedata' (case insensitive)
+/// with types string and byte[] respectively, the type is destructured and written to the log zip file.
+/// 
+/// The zip file's name will be derived from the active log file's name, with "_AdditionalFiles.zip" appended.
+/// </summary>
+public class LogFileFilter : IDestructuringPolicy
+{
+	private static readonly object lockObj = new();
+	public static string? ZipFilePath { get; private set; }
+	public static string? LogFilePath { get; private set; }
+	public static void SetLogFilePath(string? logFilePath)
+	{
+		lock(lockObj)
+		{
+			(LogFilePath, ZipFilePath)
+				= File.Exists(logFilePath) && Path.GetDirectoryName(logFilePath) is string logDir
+				? (logFilePath, Path.Combine(logDir, $"{Path.GetFileNameWithoutExtension(logFilePath)}_AdditionalFiles.zip"))
+				: (null, null);
+		}
+	}
+
+	private static bool TrySaveLogFile(ref string filename, byte[] fileData, CompressionLevel compression)
+	{
+		try
+		{
+			lock (lockObj)
+			{
+				if (string.IsNullOrEmpty(ZipFilePath))
+					return false;
+
+				using var archive = new ZipArchive(File.Open(ZipFilePath, FileMode.OpenOrCreate, FileAccess.ReadWrite, FileShare.ReadWrite), ZipArchiveMode.Update, false, Encoding.UTF8);
+				filename = GetUniqueEntryName(archive, filename);
+
+				var entry = archive.CreateEntry(filename, compression);
+				using var entryStream = entry.Open();
+				entryStream.Write(fileData);
+			}
+
+			return true;
+		}
+		catch
+		{
+			return false;
+		}
+	}
+
+	private static string GetUniqueEntryName(ZipArchive archive, string filename)
+	{
+		var entryFileName = filename;
+		for (int i = 1; archive.Entries.Any(e => e.Name == entryFileName); i++)
+		{
+			entryFileName = $"{Path.GetFileNameWithoutExtension(filename)}_({i++}){Path.GetExtension(filename)}";
+		}
+		return entryFileName;
+	}
+
+	public bool TryDestructure(object value, ILogEventPropertyValueFactory propertyValueFactory, [NotNullWhen(true)] out LogEventPropertyValue? result)
+	{
+		if (value?.GetType().GetProperties() is PropertyInfo[] properties && properties.Length >= 2
+			&& properties.FirstOrDefault(p => p.Name.Equals("filename", StringComparison.InvariantCultureIgnoreCase)) is PropertyInfo filenameProperty && filenameProperty.PropertyType == typeof(string)
+			&& properties.FirstOrDefault(p => p.Name.Equals("fileData", StringComparison.InvariantCultureIgnoreCase)) is PropertyInfo fileDataProperty && fileDataProperty.PropertyType == typeof(byte[]))
+		{
+			var filename = filenameProperty.GetValue(value) as string;
+			var fileData = fileDataProperty.GetValue(value) as byte[];
+
+			if (filename != null && fileData != null && fileData.Length > 0)
+			{
+				var compressionProperty = properties.FirstOrDefault(f => f.PropertyType == typeof(CompressionLevel));
+				var compression = compressionProperty?.GetValue(value) is CompressionLevel c ? c : CompressionLevel.Fastest;
+
+				result
+				= TrySaveLogFile(ref filename, fileData, compression)
+				? propertyValueFactory.CreatePropertyValue($"Log file '{filename}' saved in {ZipFilePath}")
+				: propertyValueFactory.CreatePropertyValue($"Log file '{filename}' could not be saved in {ZipFilePath ?? "<null_path>"}. File Contents = {Convert.ToBase64String(fileData)}");
+
+				return true;
+			}
+		}
+
+		result = null;
+		return false;
+	}
+}

Source/LibationFileManager/PictureStorage.cs

@@ -4,6 +4,7 @@ using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Net.Http;
+using System.Threading;
 using System.Threading.Tasks;
 
 #nullable enable
@@ -78,13 +79,13 @@ namespace LibationFileManager
 			}
 		}
 
-		public static string GetPicturePathSynchronously(PictureDefinition def)
+		public static string GetPicturePathSynchronously(PictureDefinition def, CancellationToken cancellationToken = default)
         {
-			GetPictureSynchronously(def);
+			GetPictureSynchronously(def, cancellationToken);
 			return getPath(def);
 		}
 
-		public static byte[] GetPictureSynchronously(PictureDefinition def)
+		public static byte[] GetPictureSynchronously(PictureDefinition def, CancellationToken cancellationToken = default)
 		{
 			lock (cacheLocker)
 			{
@@ -94,7 +95,7 @@ namespace LibationFileManager
 					var bytes
 						= File.Exists(path)
 						? File.ReadAllBytes(path)
-						: downloadBytes(def);
+						: downloadBytes(def, cancellationToken);
 					cache[def] = bytes;
 				}
 				return cache[def];
@@ -124,7 +125,7 @@ namespace LibationFileManager
 		}
 
 		private static HttpClient imageDownloadClient { get; } = new HttpClient();
-		private static byte[] downloadBytes(PictureDefinition def)
+		private static byte[] downloadBytes(PictureDefinition def, CancellationToken cancellationToken = default)
 		{
 			if (def.PictureId is null)
 				return GetDefaultImage(def.Size);
@@ -132,7 +133,7 @@ namespace LibationFileManager
 			try
 			{
 				var sizeStr = def.Size == PictureSize.Native ? "" : $"._SL{(int)def.Size}_";
-				var bytes = imageDownloadClient.GetByteArrayAsync("ht" + $"tps://images-na.ssl-images-amazon.com/images/I/{def.PictureId}{sizeStr}.jpg").Result;
+				var bytes = imageDownloadClient.GetByteArrayAsync("ht" + $"tps://images-na.ssl-images-amazon.com/images/I/{def.PictureId}{sizeStr}.jpg", cancellationToken).Result;
 
 				// save image file. make sure to not save default image
 				var path = getPath(def);

Source/LibationFileManager/WindowsDirectory.cs

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Text;
+using System.Threading;
 using System.Threading.Tasks;
 
 namespace LibationFileManager
@@ -10,7 +11,7 @@ namespace LibationFileManager
     public static class WindowsDirectory
     {
 
-        public static void SetCoverAsFolderIcon(string pictureId, string directory)
+        public static void SetCoverAsFolderIcon(string pictureId, string directory, CancellationToken cancellationToken)
         {
             try
             {
@@ -19,9 +20,8 @@ namespace LibationFileManager
                     return;
 
                 // get path of cover art in Images dir. Download first if not exists
-                var coverArtPath = PictureStorage.GetPicturePathSynchronously(new(pictureId, PictureSize._300x300));
-
-                InteropFactory.Create().SetFolderIcon(image: coverArtPath, directory: directory);
+                var coverArtPath = PictureStorage.GetPicturePathSynchronously(new(pictureId, PictureSize._300x300), cancellationToken);
+				InteropFactory.Create().SetFolderIcon(image: coverArtPath, directory: directory);
             }
             catch (Exception ex)
             {

Source/LibationUiBase/BaseUtil.cs

@@ -1,13 +1,35 @@
 using LibationFileManager;
 using System;
 
+#nullable enable
 namespace LibationUiBase
 {
 	public static class BaseUtil
 	{
 		/// <summary>A delegate that loads image bytes into the the UI framework's image format.</summary>
-		public static Func<byte[], PictureSize, object> LoadImage { get; private set; }
-		public static void SetLoadImageDelegate(Func<byte[], PictureSize, object> tryLoadImage)
-			=> LoadImage = tryLoadImage;
+		public static Func<byte[], PictureSize, object?> LoadImage => s_LoadImage ?? DefaultLoadImageImpl;
+
+		/// <summary>A delegate that loads a named resource into the the UI framework's image format.</summary>
+		public static Func<string, object?> LoadResourceImage => s_LoadResourceImage ?? DefaultLoadResourceImageImpl;
+
+		public static void SetLoadImageDelegate(Func<byte[], PictureSize, object?> tryLoadImage)
+			=> s_LoadImage = tryLoadImage;
+		public static void SetLoadResourceImageDelegate(Func<string, object?> tryLoadResourceImage)
+			=> s_LoadResourceImage = tryLoadResourceImage;
+
+		private static Func<byte[], PictureSize, object?>? s_LoadImage;
+		private static Func<string, object?>? s_LoadResourceImage;
+
+		private static object? DefaultLoadImageImpl(byte[] imageBytes, PictureSize size)
+		{
+			Serilog.Log.Error("{LoadImage} called without a delegate set. Picture size: {PictureSize}", nameof(LoadImage), size);
+			return null;
+		}
+
+		private static object? DefaultLoadResourceImageImpl(string resourceName)
+		{
+			Serilog.Log.Error("{LoadResourceImage} called without a delegate set. Resource name: {ResourceName}", nameof(LoadResourceImage), resourceName);
+			return null;
+		}
 	}
 }

Source/LibationUiBase/GridView/EntryStatus.cs

@@ -1,24 +1,16 @@
 using ApplicationServices;
 using DataLayer;
 using Dinah.Core;
-using Dinah.Core.Threading;
 using System;
 using System.Collections.Generic;
-using System.ComponentModel;
 
 namespace LibationUiBase.GridView
 {
-	public interface IEntryStatus
-	{
-		static abstract EntryStatus Create(LibraryBook libraryBook);
-	}
-
 	//This Class holds all book entry status info to help the grid properly render entries.
 	//The reason this info is in here instead of GridEntry is because all of this info is needed
 	//for the "Liberate" column's display and sorting functions.
-	public abstract class EntryStatus : SynchronizeInvoker, IComparable, INotifyPropertyChanged
+	public class EntryStatus : ReactiveObject, IComparable
 	{
-		public event PropertyChangedEventHandler PropertyChanged;
 		public LiberatedStatus? PdfStatus => LibraryCommands.Pdf_Status(Book);
 		public LiberatedStatus BookStatus
 		{
@@ -71,7 +63,7 @@ namespace LibationUiBase.GridView
 		private readonly bool isAbsent;
 		private static readonly Dictionary<string, object> iconCache = new();
 
-		protected EntryStatus(LibraryBook libraryBook)
+		internal EntryStatus(LibraryBook libraryBook)
 		{
 			Book = ArgumentValidator.EnsureNotNull(libraryBook, nameof(libraryBook)).Book;
 			isAbsent = libraryBook.AbsentFromLastScan is true;
@@ -79,11 +71,6 @@ namespace LibationUiBase.GridView
 			IsSeries = Book.ContentType is ContentType.Parent;
 		}
 
-		internal protected abstract object LoadImage(byte[] picture);
-		protected abstract object GetResourceImage(string rescName);
-		public void RaisePropertyChanged(PropertyChangedEventArgs args) => this.UIThreadSync(() => PropertyChanged?.Invoke(this, args));
-		public void RaisePropertyChanged(string propertyName) => RaisePropertyChanged(new PropertyChangedEventArgs(propertyName));
-
 		/// <summary>Refresh BookStatus (so partial download files are checked again in the filesystem) and raise PropertyChanged for property names.</summary>
 		public void Invalidate(params string[] properties)
 		{
@@ -104,7 +91,13 @@ namespace LibationUiBase.GridView
 			else if (!IsUnavailable && second.IsUnavailable) return -1;
 			else if (BookStatus == LiberatedStatus.Liberated && second.BookStatus != LiberatedStatus.Liberated) return -1;
 			else if (BookStatus != LiberatedStatus.Liberated && second.BookStatus == LiberatedStatus.Liberated) return 1;
-			else return BookStatus.CompareTo(second.BookStatus);
+
+			var statusCompare = BookStatus.CompareTo(second.BookStatus);
+			if (statusCompare != 0) return statusCompare;
+			else if (PdfStatus is null && second.PdfStatus is null) return 0;
+			else if (PdfStatus is null && second.PdfStatus is not null) return 1;
+			else if (PdfStatus is not null && second.PdfStatus is null) return -1;
+			else return PdfStatus.Value.CompareTo(second.PdfStatus.Value);
 		}
 
 		private object GetLiberateIcon()
@@ -176,7 +169,7 @@ namespace LibationUiBase.GridView
 		private object GetAndCacheResource(string rescName)
 		{
 			if (!iconCache.ContainsKey(rescName))
-				iconCache[rescName] = GetResourceImage(rescName);
+				iconCache[rescName] = BaseUtil.LoadResourceImage(rescName);
 			return iconCache[rescName];
 		}
 	}

Source/LibationUiBase/GridView/GridContextMenu.cs

@@ -29,17 +29,17 @@ public class GridContextMenu
 	public string ViewBookmarksText => $"View {Accelerator}Bookmarks/Clips";
 	public string ViewSeriesText => GridEntries[0].Liberate.IsSeries ? "View All Episodes in Series" : "View All Books in Series";
 
-	public bool LiberateEpisodesEnabled => GridEntries.OfType<ISeriesEntry>().Any(sEntry => sEntry.Children.Any(c => c.Liberate.BookStatus is LiberatedStatus.NotLiberated or LiberatedStatus.PartialDownload));
+	public bool LiberateEpisodesEnabled => GridEntries.OfType<SeriesEntry>().Any(sEntry => sEntry.Children.Any(c => c.Liberate.BookStatus is LiberatedStatus.NotLiberated or LiberatedStatus.PartialDownload));
 	public bool SetDownloadedEnabled => LibraryBookEntries.Any(ge => ge.Book.UserDefinedItem.BookStatus != LiberatedStatus.Liberated || ge.Liberate.IsSeries);
 	public bool SetNotDownloadedEnabled => LibraryBookEntries.Any(ge => ge.Book.UserDefinedItem.BookStatus != LiberatedStatus.NotLiberated || ge.Liberate.IsSeries);
 	public bool ConvertToMp3Enabled => LibraryBookEntries.Any(ge => ge.Book.UserDefinedItem.BookStatus is LiberatedStatus.Liberated);
 	public bool ReDownloadEnabled => LibraryBookEntries.Any(ge => ge.Book.UserDefinedItem.BookStatus is LiberatedStatus.Liberated);
 
-	private IGridEntry[] GridEntries { get; }
-	public ILibraryBookEntry[] LibraryBookEntries { get; }
+	private GridEntry[] GridEntries { get; }
+	public LibraryBookEntry[] LibraryBookEntries { get; }
 	public char Accelerator { get; }
 
-	public GridContextMenu(IGridEntry[] gridEntries, char accelerator)
+	public GridContextMenu(GridEntry[] gridEntries, char accelerator)
 	{
 		ArgumentNullException.ThrowIfNull(gridEntries, nameof(gridEntries));
 		ArgumentOutOfRangeException.ThrowIfZero(gridEntries.Length, $"{nameof(gridEntries)}.{nameof(gridEntries.Length)}");
@@ -48,9 +48,9 @@ public class GridContextMenu
 		Accelerator = accelerator;
 		LibraryBookEntries
 			= GridEntries
-			.OfType<ISeriesEntry>()
+			.OfType<SeriesEntry>()
 			.SelectMany(s => s.Children)
-			.Concat(GridEntries.OfType<ILibraryBookEntry>())
+			.Concat(GridEntries.OfType<LibraryBookEntry>())
 			.ToArray();
 	}
 

Source/LibationUiBase/GridView/GridEntry[TStatus].cs

@@ -1,7 +1,6 @@
 using ApplicationServices;
 using DataLayer;
 using Dinah.Core;
-using Dinah.Core.Threading;
 using FileLiberator;
 using LibationFileManager;
 using System;
@@ -9,7 +8,7 @@ using System.Collections;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Linq;
-using System.Runtime.CompilerServices;
+using System.Threading;
 using System.Threading.Tasks;
 
 namespace LibationUiBase.GridView
@@ -22,7 +21,7 @@ namespace LibationUiBase.GridView
 	}
 
 	/// <summary>The View Model base for the DataGridView</summary>
-	public abstract class GridEntry<TStatus> : SynchronizeInvoker, IGridEntry where TStatus : IEntryStatus
+	public abstract class GridEntry : ReactiveObject
 	{
 		[Browsable(false)] public string AudibleProductId => Book.AudibleProductId;
 		[Browsable(false)] public LibraryBook LibraryBook { get; protected set; }
@@ -101,7 +100,7 @@ namespace LibationUiBase.GridView
 			LibraryBook = libraryBook;
 
 			var expanded = Liberate?.Expanded ?? false;
-			Liberate = TStatus.Create(libraryBook);
+			Liberate = new EntryStatus(libraryBook);
 			Liberate.Expanded = expanded;
 
 			Title = Book.TitleWithSubtitle;
@@ -183,19 +182,6 @@ namespace LibationUiBase.GridView
 			}
 		}
 
-		private TRet RaiseAndSetIfChanged<TRet>(ref TRet backingField, TRet newValue, [CallerMemberName] string propertyName = null)
-		{
-			if (EqualityComparer<TRet>.Default.Equals(backingField, newValue)) return newValue;
-
-			backingField = newValue;
-			RaisePropertyChanged(new PropertyChangedEventArgs(propertyName));
-			return newValue;
-		}
-
-		public event PropertyChangedEventHandler PropertyChanged;
-		public void RaisePropertyChanged(PropertyChangedEventArgs args) => this.UIThreadSync(() => PropertyChanged?.Invoke(this, args));
-		public void RaisePropertyChanged(string propertyName) => RaisePropertyChanged(new PropertyChangedEventArgs(propertyName));
-
 		#endregion
 
 		#region Sorting
@@ -228,16 +214,16 @@ namespace LibationUiBase.GridView
 		// Instantiate comparers for every exposed member object type.
 		private static readonly Dictionary<Type, IComparer> memberTypeComparers = new()
 		{
-			{ typeof(RemoveStatus), new ObjectComparer<RemoveStatus>() },
-			{ typeof(string), new ObjectComparer<string>() },
-			{ typeof(int), new ObjectComparer<int>() },
-			{ typeof(float), new ObjectComparer<float>() },
-			{ typeof(bool), new ObjectComparer<bool>() },
-			{ typeof(Rating), new ObjectComparer<Rating>() },
-			{ typeof(DateTime), new ObjectComparer<DateTime>() },
-			{ typeof(EntryStatus), new ObjectComparer<EntryStatus>() },
-			{ typeof(SeriesOrder), new ObjectComparer<SeriesOrder>() },
-			{ typeof(LastDownloadStatus), new ObjectComparer<LastDownloadStatus>() },
+			{ typeof(RemoveStatus), Comparer<RemoveStatus>.Default },
+			{ typeof(string), Comparer<string>.Default },
+			{ typeof(int), Comparer <int>.Default },
+			{ typeof(float), Comparer<float >.Default },
+			{ typeof(bool), Comparer<bool>.Default },
+			{ typeof(Rating), Comparer<Rating>.Default },
+			{ typeof(DateTime), Comparer<DateTime>.Default },
+			{ typeof(EntryStatus), Comparer<EntryStatus>.Default },
+			{ typeof(SeriesOrder), Comparer<SeriesOrder>.Default },
+			{ typeof(LastDownloadStatus), Comparer<LastDownloadStatus>.Default },
 		};
 
 		#endregion
@@ -253,7 +239,7 @@ namespace LibationUiBase.GridView
 				PictureStorage.PictureCached += PictureStorage_PictureCached;
 
 			// Mutable property. Set the field so PropertyChanged isn't fired.
-			_lazyCover = new Lazy<object>(() => Liberate.LoadImage(picture));
+			_lazyCover = new Lazy<object>(() => BaseUtil.LoadImage(picture, PictureSize._80x80));
 		}
 
 		private void PictureStorage_PictureCached(object sender, PictureCachedEventArgs e)
@@ -267,7 +253,7 @@ namespace LibationUiBase.GridView
 			// logic validation
 			if (e.Definition.PictureId == Book.PictureId)
 			{
-				_lazyCover = new Lazy<object>(() => Liberate.LoadImage(e.Picture));
+				_lazyCover = new Lazy<object>(() => BaseUtil.LoadImage(e.Picture, PictureSize._80x80));
 				RaisePropertyChanged(nameof(Cover));
 				PictureStorage.PictureCached -= PictureStorage_PictureCached;
 			}
@@ -324,6 +310,35 @@ namespace LibationUiBase.GridView
 
 		#endregion
 
+		/// <summary>
+		/// Creates <see cref="GridEntry"/> for all non-episode books in an enumeration of <see cref="DataLayer.LibraryBook"/>.
+		/// </summary>
+		/// <remarks>Can be called from any thread, but requires the calling thread's <see cref="SynchronizationContext.Current"/> to be valid.</remarks>
+		public static  async Task<List<TEntry>> GetAllProductsAsync<TEntry>(IEnumerable<LibraryBook> libraryBooks, Func<LibraryBook, bool> includeIf, Func<LibraryBook, TEntry> factory)
+			where TEntry : GridEntry
+		{
+			var products = libraryBooks.Where(includeIf).ToArray();
+			if (products.Length == 0)
+				return [];
+
+			int parallelism = int.Max(1, Environment.ProcessorCount - 1);
+
+			(int batchSize, int rem) = int.DivRem(products.Length, parallelism);
+			if (rem != 0) batchSize++;
+
+			var syncContext = SynchronizationContext.Current;
+
+			//Asynchronously create a GridEntry for every book in the library
+			var tasks = products.Chunk(batchSize).Select(batch => Task.Run(() =>
+			{
+				SynchronizationContext.SetSynchronizationContext(syncContext);
+				return batch.Select(factory).OfType<TEntry>().ToArray();
+			}));
+
+			return (await Task.WhenAll(tasks)).SelectMany(a => a).ToList();
+		}
+
+
 		~GridEntry()
 		{
 			PictureStorage.PictureCached -= PictureStorage_PictureCached;

Source/LibationUiBase/GridView/IGridEntry.cs

@@ -1,34 +0,0 @@
-using DataLayer;
-using Dinah.Core.DataBinding;
-using System;
-using System.ComponentModel;
-
-namespace LibationUiBase.GridView
-{
-	public interface IGridEntry : IMemberComparable, INotifyPropertyChanged
-	{
-		EntryStatus Liberate { get; }
-		float SeriesIndex { get; }
-		string AudibleProductId { get; }
-		LibraryBook LibraryBook { get; }
-		Book Book { get; }
-		DateTime DateAdded { get; }
-		bool? Remove { get; set; }
-		string PurchaseDate { get; }
-		object Cover { get; }
-		string Length { get; }
-		LastDownloadStatus LastDownload { get; }
-		string Series { get; }
-		SeriesOrder SeriesOrder { get; }
-		string Title { get; }
-		string Authors { get; }
-		string Narrators { get; }
-		string Category { get; }
-		string Misc { get; }
-		string Description { get; }
-		Rating ProductRating { get; }
-		Rating MyRating { get; set; }
-		string BookTags { get; }
-		void UpdateLibraryBook(LibraryBook libraryBook);
-	}
-}

Source/LibationUiBase/GridView/ILibraryBookEntry.cs

@@ -1,7 +0,0 @@
-namespace LibationUiBase.GridView
-{
-	public interface ILibraryBookEntry : IGridEntry
-	{
-		ISeriesEntry Parent { get; }
-	}
-}

Source/LibationUiBase/GridView/ISeriesEntry.cs

@@ -1,11 +0,0 @@
-using System.Collections.Generic;
-
-namespace LibationUiBase.GridView
-{
-	public interface ISeriesEntry : IGridEntry
-	{
-		List<ILibraryBookEntry> Children { get; }
-		void ChildRemoveUpdate();
-		void RemoveChild(ILibraryBookEntry libraryBookEntry);
-	}
-}

Source/LibationUiBase/GridView/LibraryBookEntry.cs

@@ -0,0 +1,43 @@
+using DataLayer;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Threading.Tasks;
+
+namespace LibationUiBase.GridView
+{
+	/// <summary>The View Model for a LibraryBook that is ContentType.Product or ContentType.Episode</summary>
+	public class LibraryBookEntry : GridEntry
+	{
+		[Browsable(false)] public override DateTime DateAdded => LibraryBook.DateAdded;
+		[Browsable(false)] public SeriesEntry Parent { get; }
+
+		public override bool? Remove
+		{
+			get => remove;
+			set
+			{
+				remove = value ?? false;
+
+				Parent?.ChildRemoveUpdate();
+				RaisePropertyChanged(nameof(Remove));
+			}
+		}
+
+		public LibraryBookEntry(LibraryBook libraryBook, SeriesEntry parent = null)
+		{
+			Parent = parent;
+			UpdateLibraryBook(libraryBook);
+			LoadCover();
+		}
+
+		/// <summary>
+		/// Creates <see cref="LibraryBookEntry{TStatus}"/> for all non-episode books in an enumeration of <see cref="LibraryBook"/>.
+		/// </summary>
+		/// <remarks>Can be called from any thread, but requires the calling thread's <see cref="System.Threading.SynchronizationContext.Current"/> to be valid.</remarks>
+		public static async Task<List<GridEntry>> GetAllProductsAsync(IEnumerable<LibraryBook> libraryBooks)
+			=> await GetAllProductsAsync(libraryBooks, lb => lb.Book.IsProduct(), lb => new LibraryBookEntry(lb) as GridEntry);
+
+		protected override string GetBookTags() => string.Join("\r\n", Book.UserDefinedItem.TagsEnumerated);
+	}
+}

Source/LibationUiBase/GridView/LibraryBookEntry[TStatus].cs

@@ -1,65 +0,0 @@
-using DataLayer;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Threading.Tasks;
-using System.Threading;
-using System.Linq;
-
-namespace LibationUiBase.GridView
-{
-	/// <summary>The View Model for a LibraryBook that is ContentType.Product or ContentType.Episode</summary>
-	public class LibraryBookEntry<TStatus> : GridEntry<TStatus>, ILibraryBookEntry where TStatus : IEntryStatus
-	{
-		[Browsable(false)] public override DateTime DateAdded => LibraryBook.DateAdded;
-		[Browsable(false)] public ISeriesEntry Parent { get; }
-
-		public override bool? Remove
-		{
-			get => remove;
-			set
-			{
-				remove = value ?? false;
-
-				Parent?.ChildRemoveUpdate();
-				RaisePropertyChanged(nameof(Remove));
-			}
-		}
-
-		public LibraryBookEntry(LibraryBook libraryBook, ISeriesEntry parent = null)
-		{
-			Parent = parent;
-			UpdateLibraryBook(libraryBook);
-			LoadCover();
-		}
-
-		/// <summary>
-		/// Creates <see cref="LibraryBookEntry{TStatus}"/> for all non-episode books in an enumeration of <see cref="LibraryBook"/>.
-		/// </summary>
-		/// <remarks>Can be called from any thread, but requires the calling thread's <see cref="SynchronizationContext.Current"/> to be valid.</remarks>
-		public static async Task<List<IGridEntry>> GetAllProductsAsync(IEnumerable<LibraryBook> libraryBooks)
-		{
-			var products = libraryBooks.Where(lb => lb.Book.IsProduct()).ToArray();
-			if (products.Length == 0)
-				return [];
-
-			int parallelism = int.Max(1, Environment.ProcessorCount - 1);
-
-			(int batchSize, int rem) = int.DivRem(products.Length, parallelism);
-			if (rem != 0) batchSize++;
-
-			var syncContext = SynchronizationContext.Current;
-
-			//Asynchronously create an ILibraryBookEntry for every book in the library
-			var tasks = products.Chunk(batchSize).Select(batch => Task.Run(() =>
-			{
-				SynchronizationContext.SetSynchronizationContext(syncContext);
-				return batch.Select(lb => new LibraryBookEntry<TStatus>(lb) as IGridEntry);
-			}));
-
-			return (await Task.WhenAll(tasks)).SelectMany(a => a).ToList();
-		}
-
-		protected override string GetBookTags() => string.Join("\r\n", Book.UserDefinedItem.TagsEnumerated);
-	}
-}