incr ver

Bug fixes and UI tweak

.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
   ```
 ---

Documentation/NamingTemplates.md

@@ -46,9 +46,12 @@ These tags will be replaced in the template with the audiobook's values.
 |\<series\>|All series to which the book belongs (if any)|[Series List](#series-list-formatters)|
 |\<first series\>|First series|[Series](#series-formatters)|
 |\<series#\>|Number order in series (alias for \<first series[{#}]\>|[Number](#number-formatters)|
-|\<bitrate\>|File's original bitrate (Kbps)|[Number](#number-formatters)|
-|\<samplerate\>|File's original audio sample rate|[Number](#number-formatters)|
-|\<channels\>|Number of audio channels|[Number](#number-formatters)|
+|\<bitrate\>|Bitrate (kbps) of the last downloaded audiobook|[Number](#number-formatters)|
+|\<samplerate\>|Sample rate (Hz) of the last downloaded audiobook|[Number](#number-formatters)|
+|\<channels\>|Number of audio channels in the last downloaded audiobook|[Number](#number-formatters)|
+|\<codec\>|Audio codec of the last downloaded audiobook|[Text](#text-formatters)|
+|\<file version\>|Audible's file version number of the last downloaded audiobook|[Text](#text-formatters)|
+|\<libation version\>|Libation version used during last download of the audiobook|[Text](#text-formatters)|
 |\<account\>|Audible account of this book|[Text](#text-formatters)|
 |\<account nickname\>|Audible account nickname of this book|[Text](#text-formatters)|
 |\<locale\>|Region/country|[Text](#text-formatters)|

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" />
+	  <PackageReference Include="AAXClean.Codecs" Version="2.0.2.2" />
 	</ItemGroup>
 
 	<ItemGroup>

Source/AaxDecrypter/AaxcDownloadConvertBase.cs

@@ -1,18 +1,21 @@
 using AAXClean;
 using System;
+using System.IO;
+using System.Linq;
 using System.Threading.Tasks;
 
+#nullable enable
 namespace AaxDecrypter
 {	
 	public abstract class AaxcDownloadConvertBase : AudiobookDownloadBase
 	{
-		public event EventHandler<AppleTags> RetrievedMetadata;
+		public event EventHandler<AppleTags>? RetrievedMetadata;
 
-		protected Mp4File AaxFile { get; private set; }
-		protected Mp4Operation AaxConversion { get; set; }
+		public Mp4File? AaxFile { get; private set; }
+		protected Mp4Operation? AaxConversion { get; set; }
 
-		protected AaxcDownloadConvertBase(string outFileName, string cacheDirectory, IDownloadOptions dlOptions)
-			: base(outFileName, cacheDirectory, dlOptions) { }
+		protected AaxcDownloadConvertBase(string outDirectory, string cacheDirectory, IDownloadOptions dlOptions)
+			: base(outDirectory, cacheDirectory, dlOptions) { }
 
 		/// <summary>Setting cover art by this method will insert the art into the audiobook metadata</summary>
 		public override void SetCoverArt(byte[] coverArt)
@@ -24,32 +27,58 @@ 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)
+			if (DownloadOptions.DecryptionKeys is not KeyData[] keys || keys.Length == 0)
+				throw new InvalidOperationException($"{nameof(DownloadOptions.DecryptionKeys)} cannot be null or empty for a '{DownloadOptions.InputType}' file.");
+			else 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 = keys.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}");
+
+				keys[0] = keys[kidIndex];
+				var keyId = keys[kidIndex].KeyPart1;
+				var key = keys[kidIndex].KeyPart2 ?? throw new InvalidOperationException($"{nameof(DownloadOptions.DecryptionKeys)} for '{DownloadOptions.InputType}' must have a non-null decryption key (KeyPart2).");
+				dash.SetDecryptionKey(keyId, key);
+				WriteKeyFile($"KeyId={Convert.ToHexString(keyId)}{Environment.NewLine}Key={Convert.ToHexString(key)}");
 				return dash;
 			}
 			else if (DownloadOptions.InputType is FileType.Aax)
 			{
 				var aax = new AaxFile(InputFileStream);
-				aax.SetDecryptionKey(DownloadOptions.AudibleKey);
+				var key = keys[0].KeyPart1;
+				aax.SetDecryptionKey(keys[0].KeyPart1);
+				WriteKeyFile($"ActivationBytes={Convert.ToHexString(key)}");
 				return aax;
 			}
 			else if (DownloadOptions.InputType is FileType.Aaxc)
 			{
 				var aax = new AaxFile(InputFileStream);
-				aax.SetDecryptionKey(DownloadOptions.AudibleKey, DownloadOptions.AudibleIV);
+				var key = keys[0].KeyPart1;
+				var iv = keys[0].KeyPart2 ?? throw new InvalidOperationException($"{nameof(DownloadOptions.DecryptionKeys)} for '{DownloadOptions.InputType}' must have a non-null initialization vector (KeyPart2).");
+				aax.SetDecryptionKey(keys[0].KeyPart1, iv);
+				WriteKeyFile($"Key={Convert.ToHexString(key)}{Environment.NewLine}IV={Convert.ToHexString(iv)}");
 				return aax;
 			}
 			else throw new InvalidOperationException($"{nameof(DownloadOptions.InputType)} of '{DownloadOptions.InputType}' is unknown.");
+
+			void WriteKeyFile(string contents)
+			{
+				var keyFile = Path.Combine(Path.ChangeExtension(InputFileStream.SaveFilePath, ".key"));
+				File.WriteAllText(keyFile, contents + Environment.NewLine);
+				OnTempFileCreated(new(keyFile));
+			}
 		}
 
 		protected bool Step_GetMetadata()
@@ -101,11 +130,11 @@ namespace AaxDecrypter
 					AaxFile.AppleTags.AppleListBox.EditOrAddFreeformTag(tagDomain, "PART", part.ToString());
 			}
 
-			OnInitialized();
 			OnRetrievedTitle(AaxFile.AppleTags.TitleSansUnabridged);
-			OnRetrievedAuthors(AaxFile.AppleTags.FirstAuthor ?? "[unknown]");
-			OnRetrievedNarrators(AaxFile.AppleTags.Narrator ?? "[unknown]");
+			OnRetrievedAuthors(AaxFile.AppleTags.FirstAuthor);
+			OnRetrievedNarrators(AaxFile.AppleTags.Narrator);
 			OnRetrievedCoverArt(AaxFile.AppleTags.Cover);
+			OnInitialized();
 
 			return !IsCanceled;
 		}

Source/AaxDecrypter/AaxcDownloadMultiConverter.cs

@@ -5,20 +5,20 @@ using System;
 using System.IO;
 using System.Threading.Tasks;
 
+#nullable enable
 namespace AaxDecrypter
 {
 	public class AaxcDownloadMultiConverter : AaxcDownloadConvertBase
 	{
 		private static readonly TimeSpan minChapterLength = TimeSpan.FromSeconds(3);
-		private FileStream workingFileStream;
+		private FileStream? workingFileStream;
 
-		public AaxcDownloadMultiConverter(string outFileName, string cacheDirectory, IDownloadOptions dlOptions)
-			: base(outFileName, cacheDirectory, dlOptions)
+		public AaxcDownloadMultiConverter(string outDirectory, string cacheDirectory, IDownloadOptions dlOptions)
+			: base(outDirectory, cacheDirectory, dlOptions)
 		{
 			AsyncSteps.Name = $"Download, Convert Aaxc To {DownloadOptions.OutputFormat}, and Split";
 			AsyncSteps["Step 1: Get Aaxc Metadata"] = () => Task.Run(Step_GetMetadata);
 			AsyncSteps["Step 2: Download Decrypted Audiobook"] = Step_DownloadAndDecryptAudiobookAsync;
-			AsyncSteps["Step 3: Download Clips and Bookmarks"] = Step_DownloadClipsBookmarksAsync;
 		}
 
 		protected override void OnInitialized()
@@ -59,6 +59,7 @@ That naming may not be desirable for everyone, but it's an easy change to instea
 		 */
 		protected async override Task<bool> Step_DownloadAndDecryptAudiobookAsync()
 		{
+			if (AaxFile is null) return false;
 			var chapters = DownloadOptions.ChapterInfo.Chapters;
 
 			// Ensure split files are at least minChapterLength in duration.
@@ -83,10 +84,10 @@ That naming may not be desirable for everyone, but it's an easy change to instea
 
 			try
 			{
-				await (AaxConversion = decryptMultiAsync(splitChapters));
+				await (AaxConversion = decryptMultiAsync(AaxFile, splitChapters));
 
 				if (AaxConversion.IsCompletedSuccessfully)
-					await moveMoovToBeginning(workingFileStream?.Name);
+					await moveMoovToBeginning(AaxFile, workingFileStream?.Name);
 
 				return AaxConversion.IsCompletedSuccessfully;
 			}
@@ -97,17 +98,17 @@ That naming may not be desirable for everyone, but it's an easy change to instea
 			}
 		}
 
-		private Mp4Operation decryptMultiAsync(ChapterInfo splitChapters)
+		private Mp4Operation decryptMultiAsync(Mp4File aaxFile, ChapterInfo splitChapters)
 		{
 			var chapterCount = 0;
 			return
 				DownloadOptions.OutputFormat == OutputFormat.M4b
-				? AaxFile.ConvertToMultiMp4aAsync
+				? aaxFile.ConvertToMultiMp4aAsync
 				(
 					splitChapters,
 					newSplitCallback => newSplit(++chapterCount, splitChapters, newSplitCallback)
 				)
-				: AaxFile.ConvertToMultiMp3Async
+				: aaxFile.ConvertToMultiMp3Async
 				(
 					splitChapters,
 					newSplitCallback => newSplit(++chapterCount, splitChapters, newSplitCallback),
@@ -116,33 +117,32 @@ That naming may not be desirable for everyone, but it's an easy change to instea
 
 			void newSplit(int currentChapter, ChapterInfo splitChapters, INewSplitCallback newSplitCallback)
 			{
+				moveMoovToBeginning(aaxFile, workingFileStream?.Name).GetAwaiter().GetResult();
+				var newTempFile = GetNewTempFilePath(DownloadOptions.OutputFormat.ToString());
 				MultiConvertFileProperties props = new()
 				{
-					OutputFileName = OutputFileName,
+					OutputFileName = newTempFile.FilePath,
 					PartsPosition = currentChapter,
 					PartsTotal = splitChapters.Count,
-					Title = newSplitCallback?.Chapter?.Title,
+					Title = newSplitCallback.Chapter?.Title,
 				};
 
-				moveMoovToBeginning(workingFileStream?.Name).GetAwaiter().GetResult();
-
 				newSplitCallback.OutputFile = workingFileStream = createOutputFileStream(props);
 				newSplitCallback.TrackTitle = DownloadOptions.GetMultipartTitle(props);
 				newSplitCallback.TrackNumber = currentChapter;
 				newSplitCallback.TrackCount = splitChapters.Count;
 
-				OnFileCreated(workingFileStream.Name);
+				OnTempFileCreated(newTempFile with { PartProperties = props });
 			}
 
 			FileStream createOutputFileStream(MultiConvertFileProperties multiConvertFileProperties)
 			{
-				var fileName = DownloadOptions.GetMultipartFileName(multiConvertFileProperties);
-				FileUtility.SaferDelete(fileName);
-				return File.Open(fileName, FileMode.OpenOrCreate, FileAccess.ReadWrite);
+				FileUtility.SaferDelete(multiConvertFileProperties.OutputFileName);
+				return File.Open(multiConvertFileProperties.OutputFileName, FileMode.OpenOrCreate, FileAccess.ReadWrite);
 			}
 		}
 
-		private Mp4Operation moveMoovToBeginning(string filename)
+		private Mp4Operation moveMoovToBeginning(Mp4File aaxFile, string? filename)
 		{
 			if (DownloadOptions.OutputFormat is OutputFormat.M4b
 				&& DownloadOptions.MoveMoovToBeginning
@@ -151,7 +151,7 @@ That naming may not be desirable for everyone, but it's an easy change to instea
 			{
 				return Mp4File.RelocateMoovAsync(filename);
 			}
-			else return Mp4Operation.FromCompleted(AaxFile);
+			else return Mp4Operation.FromCompleted(aaxFile);
 		}
 	}
 }

Source/AaxDecrypter/AaxcDownloadSingleConverter.cs

@@ -6,13 +6,16 @@ using System;
 using System.IO;
 using System.Threading.Tasks;
 
+#nullable enable
 namespace AaxDecrypter
 {
 	public class AaxcDownloadSingleConverter : AaxcDownloadConvertBase
 	{
 		private readonly AverageSpeed averageSpeed = new();
-		public AaxcDownloadSingleConverter(string outFileName, string cacheDirectory, IDownloadOptions dlOptions)
-			: base(outFileName, cacheDirectory, dlOptions)
+		private TempFile? outputTempFile;
+
+		public AaxcDownloadSingleConverter(string outDirectory, string cacheDirectory, IDownloadOptions dlOptions)
+			: base(outDirectory, cacheDirectory, dlOptions)
 		{
 			var step = 1;
 
@@ -21,7 +24,6 @@ namespace AaxDecrypter
 			AsyncSteps[$"Step {step++}: Download Decrypted Audiobook"] = Step_DownloadAndDecryptAudiobookAsync;
 			if (DownloadOptions.MoveMoovToBeginning && DownloadOptions.OutputFormat is OutputFormat.M4b)
 				AsyncSteps[$"Step {step++}: Move moov atom to beginning"] = Step_MoveMoov;
-			AsyncSteps[$"Step {step++}: Download Clips and Bookmarks"] = Step_DownloadClipsBookmarksAsync;
 			AsyncSteps[$"Step {step++}: Create Cue"] = Step_CreateCueAsync;
 		}
 
@@ -39,14 +41,16 @@ namespace AaxDecrypter
 
 		protected async override Task<bool> Step_DownloadAndDecryptAudiobookAsync()
 		{
-			FileUtility.SaferDelete(OutputFileName);
+			if (AaxFile is null) return false;
+			outputTempFile = GetNewTempFilePath(DownloadOptions.OutputFormat.ToString());
+			FileUtility.SaferDelete(outputTempFile.FilePath);
 
-			using var outputFile = File.Open(OutputFileName, FileMode.OpenOrCreate, FileAccess.ReadWrite);
-			OnFileCreated(OutputFileName);
+			using var outputFile = File.Open(outputTempFile.FilePath, FileMode.OpenOrCreate, FileAccess.ReadWrite);
+			OnTempFileCreated(outputTempFile);
 
 			try
 			{
-				await (AaxConversion = decryptAsync(outputFile));				
+				await (AaxConversion = decryptAsync(AaxFile, outputFile));				
 
 				return AaxConversion.IsCompletedSuccessfully;
 			}
@@ -58,14 +62,15 @@ namespace AaxDecrypter
 
 		private async Task<bool> Step_MoveMoov()
 		{
-			AaxConversion = Mp4File.RelocateMoovAsync(OutputFileName);
+			if (outputTempFile is null) return false;
+			AaxConversion = Mp4File.RelocateMoovAsync(outputTempFile.FilePath);
 			AaxConversion.ConversionProgressUpdate += AaxConversion_MoovProgressUpdate;
 			await AaxConversion;
 			AaxConversion.ConversionProgressUpdate -= AaxConversion_MoovProgressUpdate;
 			return AaxConversion.IsCompletedSuccessfully;
 		}
 
-		private void AaxConversion_MoovProgressUpdate(object sender, ConversionProgressEventArgs e)
+		private void AaxConversion_MoovProgressUpdate(object? sender, ConversionProgressEventArgs e)
 		{
 			averageSpeed.AddPosition(e.ProcessPosition.TotalSeconds);
 
@@ -84,20 +89,20 @@ namespace AaxDecrypter
 				});
 		}
 
-		private Mp4Operation decryptAsync(Stream outputFile)
+		private Mp4Operation decryptAsync(Mp4File aaxFile, Stream outputFile)
 			=> DownloadOptions.OutputFormat == OutputFormat.Mp3
-			? AaxFile.ConvertToMp3Async
+			? aaxFile.ConvertToMp3Async
 			(
 				outputFile,
 				DownloadOptions.LameConfig,
 				DownloadOptions.ChapterInfo
 			)
 			: DownloadOptions.FixupFile
-			? AaxFile.ConvertToMp4aAsync
+			? aaxFile.ConvertToMp4aAsync
 			(
 				outputFile,
 				DownloadOptions.ChapterInfo
 			)
-			: AaxFile.ConvertToMp4aAsync(outputFile);
+			: aaxFile.ConvertToMp4aAsync(outputFile);
 	}
 }

Source/AaxDecrypter/AudiobookDownloadBase.cs

@@ -6,55 +6,50 @@ using System;
 using System.IO;
 using System.Threading.Tasks;
 
+#nullable enable
 namespace AaxDecrypter
 {
 	public enum OutputFormat { M4b, Mp3 }
 
 	public abstract class AudiobookDownloadBase
 	{
-		public event EventHandler<string> RetrievedTitle;
-		public event EventHandler<string> RetrievedAuthors;
-		public event EventHandler<string> RetrievedNarrators;
-		public event EventHandler<byte[]> RetrievedCoverArt;
-		public event EventHandler<DownloadProgress> DecryptProgressUpdate;
-		public event EventHandler<TimeSpan> DecryptTimeRemaining;
-		public event EventHandler<string> FileCreated;
+		public event EventHandler<string?>? RetrievedTitle;
+		public event EventHandler<string?>? RetrievedAuthors;
+		public event EventHandler<string?>? RetrievedNarrators;
+		public event EventHandler<byte[]?>? RetrievedCoverArt;
+		public event EventHandler<DownloadProgress>? DecryptProgressUpdate;
+		public event EventHandler<TimeSpan>? DecryptTimeRemaining;
+		public event EventHandler<TempFile>? TempFileCreated;
 
 		public bool IsCanceled { get; protected set; }
 		protected AsyncStepSequence AsyncSteps { get; } = new();
-		protected string OutputFileName { get; }
+		protected string OutputDirectory { get; }
 		public IDownloadOptions DownloadOptions { get; }
-		protected NetworkFileStream InputFileStream => nfsPersister.NetworkFileStream;
+		protected NetworkFileStream InputFileStream => NfsPersister.NetworkFileStream;
 		protected virtual long InputFilePosition => InputFileStream.Position;
 		private bool downloadFinished;
 
-		private readonly NetworkFileStreamPersister nfsPersister;
+		private NetworkFileStreamPersister? m_nfsPersister;
+		private NetworkFileStreamPersister NfsPersister => m_nfsPersister ??= OpenNetworkFileStream();
 		private readonly DownloadProgress zeroProgress;
 		private readonly string jsonDownloadState;
 		private readonly string tempFilePath;
 
-		protected AudiobookDownloadBase(string outFileName, string cacheDirectory, IDownloadOptions dlOptions)
-		{
-			OutputFileName = ArgumentValidator.EnsureNotNullOrWhiteSpace(outFileName, nameof(outFileName));
+		protected AudiobookDownloadBase(string outDirectory, string cacheDirectory, IDownloadOptions dlOptions)
+		{			
+			OutputDirectory = ArgumentValidator.EnsureNotNullOrWhiteSpace(outDirectory, nameof(outDirectory));
+			DownloadOptions = ArgumentValidator.EnsureNotNull(dlOptions, nameof(dlOptions));
+			DownloadOptions.DownloadSpeedChanged += (_, speed) => InputFileStream.SpeedLimit = speed;
 
-			var outDir = Path.GetDirectoryName(OutputFileName);
-			if (!Directory.Exists(outDir))
-				Directory.CreateDirectory(outDir);
+			if (!Directory.Exists(OutputDirectory))
+				Directory.CreateDirectory(OutputDirectory);
 
 			if (!Directory.Exists(cacheDirectory))
 				Directory.CreateDirectory(cacheDirectory);
 
-			jsonDownloadState = Path.Combine(cacheDirectory, Path.GetFileName(Path.ChangeExtension(OutputFileName, ".json")));
+			jsonDownloadState = Path.Combine(cacheDirectory, $"{DownloadOptions.AudibleProductId}.json");
 			tempFilePath = Path.ChangeExtension(jsonDownloadState, ".aaxc");
 
-			DownloadOptions = ArgumentValidator.EnsureNotNull(dlOptions, nameof(dlOptions));
-			DownloadOptions.DownloadSpeedChanged += (_, speed) => InputFileStream.SpeedLimit = speed;
-
-			// delete file after validation is complete
-			FileUtility.SaferDelete(OutputFileName);
-
-			nfsPersister = OpenNetworkFileStream();
-
 			zeroProgress = new DownloadProgress
 			{
 				BytesReceived = 0,
@@ -65,19 +60,30 @@ namespace AaxDecrypter
 			OnDecryptProgressUpdate(zeroProgress);
 		}
 
+		protected TempFile GetNewTempFilePath(string extension)
+		{
+			extension = FileUtility.GetStandardizedExtension(extension);
+			var path = Path.Combine(OutputDirectory, Guid.NewGuid().ToString("N") + extension);
+			return new(path, extension);
+		}
+
 		public async Task<bool> RunAsync()
 		{
 			await InputFileStream.BeginDownloadingAsync();
 			var progressTask = Task.Run(reportProgress);
 
-			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,54 +121,52 @@ 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) { }
-
-		protected void OnRetrievedTitle(string title)
+		protected void OnRetrievedTitle(string? title)
 			=> RetrievedTitle?.Invoke(this, title);
-		protected void OnRetrievedAuthors(string authors)
+		protected void OnRetrievedAuthors(string? authors)
 			=> RetrievedAuthors?.Invoke(this, authors);
-		protected void OnRetrievedNarrators(string narrators)
+		protected void OnRetrievedNarrators(string? narrators)
 			=> RetrievedNarrators?.Invoke(this, narrators);
-		protected void OnRetrievedCoverArt(byte[] coverArt)
+		protected void OnRetrievedCoverArt(byte[]? coverArt)
 			=> RetrievedCoverArt?.Invoke(this, coverArt);
 		protected void OnDecryptProgressUpdate(DownloadProgress downloadProgress)
 			=> DecryptProgressUpdate?.Invoke(this, downloadProgress);
 		protected void OnDecryptTimeRemaining(TimeSpan timeRemaining)
 			=> DecryptTimeRemaining?.Invoke(this, timeRemaining);
-		protected void OnFileCreated(string path)
-			=> FileCreated?.Invoke(this, path);
+		public void OnTempFileCreated(TempFile path)
+			=> TempFileCreated?.Invoke(this, path);
 
 		protected virtual void FinalizeDownload()
 		{
-			nfsPersister?.Dispose();
+			NfsPersister.Dispose();
 			downloadFinished = true;
 		}
 
-		protected async Task<bool> Step_DownloadClipsBookmarksAsync()
-		{
-			if (!IsCanceled && DownloadOptions.DownloadClipsBookmarks)
-			{
-				var recordsFile = await DownloadOptions.SaveClipsAndBookmarksAsync(OutputFileName);
-
-				if (File.Exists(recordsFile))
-					OnFileCreated(recordsFile);
-			}
-			return !IsCanceled;
-		}
-
 		protected async Task<bool> Step_CreateCueAsync()
 		{
 			if (!DownloadOptions.CreateCueSheet) return !IsCanceled;
 
+			if (DownloadOptions.ChapterInfo.Count <= 1)
+			{
+				Serilog.Log.Logger.Information($"Skipped creating .cue because book has no chapters.");
+				return !IsCanceled;
+			}
+
 			// not a critical step. its failure should not prevent future steps from running
 			try
 			{
-				var path = Path.ChangeExtension(OutputFileName, ".cue");
-				await File.WriteAllTextAsync(path, Cue.CreateContents(Path.GetFileName(OutputFileName), DownloadOptions.ChapterInfo));
-				OnFileCreated(path);
+				var tempFile = GetNewTempFilePath(".cue");
+				await File.WriteAllTextAsync(tempFile.FilePath, Cue.CreateContents(Path.GetFileName(tempFile.FilePath), DownloadOptions.ChapterInfo));
+				OnTempFileCreated(tempFile);
 			}
 			catch (Exception ex)
 			{
@@ -171,53 +175,9 @@ namespace AaxDecrypter
 			return !IsCanceled;
 		}
 
-		private async Task<bool> CleanupAsync()
-		{
-			if (IsCanceled) return false;
-
-			FileUtility.SaferDelete(jsonDownloadState);
-
-			if (!string.IsNullOrEmpty(DownloadOptions.AudibleKey) &&
-				DownloadOptions.RetainEncryptedFile &&
-				DownloadOptions.InputType is AAXClean.FileType fileType)
-			{
-				//Write aax decryption key
-				string keyPath = Path.ChangeExtension(tempFilePath, ".key");
-				FileUtility.SaferDelete(keyPath);
-				string aaxPath;
-
-				if (fileType is AAXClean.FileType.Aax)
-				{
-					await File.WriteAllTextAsync(keyPath, $"ActivationBytes={DownloadOptions.AudibleKey}");
-					aaxPath = Path.ChangeExtension(tempFilePath, ".aax");
-				}
-				else if (fileType is AAXClean.FileType.Aaxc)
-				{
-					await File.WriteAllTextAsync(keyPath, $"Key={DownloadOptions.AudibleKey}{Environment.NewLine}IV={DownloadOptions.AudibleIV}");
-					aaxPath = Path.ChangeExtension(tempFilePath, ".aaxc");
-				}
-				else if (fileType is AAXClean.FileType.Dash)
-				{
-					await File.WriteAllTextAsync(keyPath, $"KeyId={DownloadOptions.AudibleKey}{Environment.NewLine}Key={DownloadOptions.AudibleIV}");
-					aaxPath = Path.ChangeExtension(tempFilePath, ".dash");
-				}
-				else
-					throw new InvalidOperationException($"Unknown file type: {fileType}");
-
-				FileUtility.SaferMove(tempFilePath, aaxPath);
-
-				OnFileCreated(aaxPath);
-				OnFileCreated(keyPath);
-			}
-			else
-				FileUtility.SaferDelete(tempFilePath);
-
-			return !IsCanceled;
-		}
-
 		private NetworkFileStreamPersister OpenNetworkFileStream()
 		{
-			NetworkFileStreamPersister nfsp = default;
+			NetworkFileStreamPersister? nfsp = default;
 			try
 			{
 				if (!File.Exists(jsonDownloadState))
@@ -238,8 +198,14 @@ namespace AaxDecrypter
 			}
 			finally
 			{
-				nfsp.NetworkFileStream.RequestHeaders["User-Agent"] = DownloadOptions.UserAgent;
-				nfsp.NetworkFileStream.SpeedLimit = DownloadOptions.DownloadSpeedBps;
+				//nfsp will only be null when an unhandled exception occurs. Let the caller handle it.
+				if (nfsp is not null)
+				{
+					nfsp.NetworkFileStream.RequestHeaders["User-Agent"] = DownloadOptions.UserAgent;
+					nfsp.NetworkFileStream.SpeedLimit = DownloadOptions.DownloadSpeedBps;
+					OnTempFileCreated(new(tempFilePath, DownloadOptions.InputType.ToString()));
+					OnTempFileCreated(new(jsonDownloadState));
+				}
 			}
 
 			NetworkFileStreamPersister newNetworkFilePersister()

Source/AaxDecrypter/IDownloadOptions.cs

@@ -1,40 +1,54 @@
 using AAXClean;
 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; }
-        bool RetainEncryptedFile { get; }
         bool StripUnabridged { get; }
         bool CreateCueSheet { get; }
-        bool DownloadClipsBookmarks { get; }
         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; }
-        string GetMultipartFileName(MultiConvertFileProperties props);
         string GetMultipartTitle(MultiConvertFileProperties props);
-        Task<string> SaveClipsAndBookmarksAsync(string fileName);
         public FileType? InputType { get; }
     }
 }

Source/AaxDecrypter/NetworkFileStream.cs

@@ -61,9 +61,6 @@ namespace AaxDecrypter
 
 		#region Constants
 
-		//Size of each range request. Android app uses 64MB chunks.
-		private const int RANGE_REQUEST_SZ = 64 * 1024 * 1024;
-
 		//Download memory buffer size
 		private const int DOWNLOAD_BUFF_SZ = 8 * 1024;
 
@@ -103,6 +100,12 @@ namespace AaxDecrypter
 				Position = WritePosition
 			};
 
+			if (_writeFile.Length < WritePosition)
+			{
+				_writeFile.Dispose();
+				throw new InvalidDataException($"{SaveFilePath} file length is shorter than {WritePosition}");
+			}
+
 			_readFile = new FileStream(SaveFilePath, FileMode.Open, FileAccess.Read, FileShare.ReadWrite);
 
 			SetUriForSameFile(uri);
@@ -113,14 +116,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);
 				}
 			}
@@ -161,7 +166,7 @@ namespace AaxDecrypter
 
 			//Initiate connection with the first request block and
 			//get the total content length before returning.
-			using var client = new HttpClient();
+			var client = new HttpClient();
 			var response = await RequestNextByteRangeAsync(client);
 
 			if (ContentLength != 0 && ContentLength != response.FileSize)
@@ -170,38 +175,59 @@ namespace AaxDecrypter
 			ContentLength = response.FileSize;
 
 			_downloadedPiece = new EventWaitHandle(false, EventResetMode.AutoReset);
-			//Hand off the open request to the downloader to download and write data to file.
-			DownloadTask = Task.Run(() => DownloadLoopInternal(response), _cancellationSource.Token);
+			//Hand off the client and the open request to the downloader to download and write data to file.
+			DownloadTask = Task.Run(() => DownloadLoopInternal(client , response), _cancellationSource.Token);
 		}
 
-		private async Task DownloadLoopInternal(BlockResponse initialResponse)
+		private async Task DownloadLoopInternal(HttpClient client, BlockResponse blockResponse)
 		{
-			await DownloadToFile(initialResponse);
-			initialResponse.Dispose();
-
 			try
 			{
-				using var client = new HttpClient();
+				long startPosition = WritePosition;
+
 				while (WritePosition < ContentLength && !IsCancelled)
 				{
-					using var response = await RequestNextByteRangeAsync(client);
-					await DownloadToFile(response);
+					try
+					{
+						await DownloadToFile(blockResponse);
+					}
+					catch (HttpIOException e)
+						when (e.HttpRequestError is HttpRequestError.ResponseEnded
+								&& WritePosition != startPosition
+								&& WritePosition < ContentLength && !IsCancelled)
+					{
+						Serilog.Log.Logger.Debug($"The download connection ended before the file completed downloading all 0x{ContentLength:X10} bytes");
+
+						//the download made *some* progress since the last attempt.
+						//Try again to complete the download from where it left off.
+						//Make sure to rewind file to last flush position.
+						_writeFile.Position = startPosition = WritePosition;
+						blockResponse.Dispose();
+						blockResponse = await RequestNextByteRangeAsync(client);
+
+						Serilog.Log.Logger.Debug($"Resuming the file download starting at position 0x{WritePosition:X10}.");
+					}
 				}
 			}
 			finally
 			{
-				_writeFile.Close();
+				_writeFile.Dispose();
+				blockResponse.Dispose();
+				client.Dispose();
 			}
 		}
 
 		private async Task<BlockResponse> RequestNextByteRangeAsync(HttpClient client)
 		{
-			var request = new HttpRequestMessage(HttpMethod.Get, Uri);
+			using var request = new HttpRequestMessage(HttpMethod.Get, Uri);
+
+			//Just in case it snuck in the saved json (Issue #1232)
+			RequestHeaders.Remove("Range");
 
 			foreach (var header in RequestHeaders)
 				request.Headers.Add(header.Key, header.Value);
 
-			request.Headers.Add("Range", $"bytes={WritePosition}-{WritePosition + RANGE_REQUEST_SZ - 1}");
+			request.Headers.Add("Range", $"bytes={WritePosition}-");
 
 			var response = await client.SendAsync(request, HttpCompletionOption.ResponseHeadersRead, _cancellationSource.Token);
 
@@ -226,7 +252,7 @@ namespace AaxDecrypter
 		private async Task DownloadToFile(BlockResponse block)
 		{
 			var endPosition = WritePosition + block.BlockSize;
-			var networkStream = await block.Response.Content.ReadAsStreamAsync(_cancellationSource.Token);
+			using var networkStream = await block.Response.Content.ReadAsStreamAsync(_cancellationSource.Token);
 
 			var downloadPosition = WritePosition;
 			var nextFlush = downloadPosition + DATA_FLUSH_SZ;
@@ -259,11 +285,11 @@ namespace AaxDecrypter
 
 					if (SpeedLimit >= MIN_BYTES_PER_SECOND && bytesReadSinceThrottle > SpeedLimit / THROTTLE_FREQUENCY)
 					{
-						var delayMS = (int)(startTime.AddSeconds(1d / THROTTLE_FREQUENCY) - DateTime.Now).TotalMilliseconds;
+						var delayMS = (int)(startTime.AddSeconds(1d / THROTTLE_FREQUENCY) - DateTime.UtcNow).TotalMilliseconds;
 						if (delayMS > 0)
 							await Task.Delay(delayMS, _cancellationSource.Token);
 
-						startTime = DateTime.Now;
+						startTime = DateTime.UtcNow;
 						bytesReadSinceThrottle = 0;
 					}
 
@@ -286,9 +312,8 @@ namespace AaxDecrypter
 			}
 			finally
 			{
-				networkStream.Close();
 				_downloadedPiece.Set();
-				OnUpdate();
+				OnUpdate(waitForWrite: true);
 			}
 		}
 
@@ -385,7 +410,7 @@ namespace AaxDecrypter
 				_cancellationSource?.Dispose();
 				_readFile.Dispose();
 				_writeFile.Dispose();
-				OnUpdate();
+				OnUpdate(waitForWrite: true);
 			}
 
 			disposed = true;

Source/AaxDecrypter/TempFile.cs

@@ -0,0 +1,17 @@
+using FileManager;
+
+#nullable enable
+namespace AaxDecrypter;
+
+public record TempFile
+{
+	public LongPath FilePath { get; init; }
+	public string Extension { get; }
+	public MultiConvertFileProperties? PartProperties { get; init; }
+	public TempFile(LongPath filePath, string? extension = null)
+	{
+		FilePath = filePath;
+		extension ??= System.IO.Path.GetExtension(filePath);
+		Extension = FileUtility.GetStandardizedExtension(extension).ToLowerInvariant();
+	}
+}

Source/AaxDecrypter/UnencryptedAudiobookDownloader.cs

@@ -1,5 +1,4 @@
 using FileManager;
-using System;
 using System.Threading.Tasks;
 
 namespace AaxDecrypter
@@ -8,20 +7,12 @@ namespace AaxDecrypter
 	{
 		protected override long InputFilePosition => InputFileStream.WritePosition;
 
-		public UnencryptedAudiobookDownloader(string outFileName, string cacheDirectory, IDownloadOptions dlLic)
-			: base(outFileName, cacheDirectory, dlLic)
+		public UnencryptedAudiobookDownloader(string outDirectory, string cacheDirectory, IDownloadOptions dlLic)
+			: base(outDirectory, cacheDirectory, dlLic)
 		{
 			AsyncSteps.Name = "Download Unencrypted Audiobook";
 			AsyncSteps["Step 1: Download Audiobook"] = Step_DownloadAndDecryptAudiobookAsync;
-			AsyncSteps["Step 2: Download Clips and Bookmarks"] = Step_DownloadClipsBookmarksAsync;
-			AsyncSteps["Step 3: Create Cue"] = Step_CreateCueAsync;
-		}
-
-		public override Task CancelAsync()
-		{
-			IsCanceled = true;
-			FinalizeDownload();
-			return Task.CompletedTask;
+			AsyncSteps["Step 2: Create Cue"] = Step_CreateCueAsync;
 		}
 
 		protected override async Task<bool> Step_DownloadAndDecryptAudiobookAsync()
@@ -33,8 +24,9 @@ namespace AaxDecrypter
 			else
 			{
 				FinalizeDownload();
-				FileUtility.SaferMove(InputFileStream.SaveFilePath, OutputFileName);
-				OnFileCreated(OutputFileName);
+				var tempFile = GetNewTempFilePath(DownloadOptions.OutputFormat.ToString());
+				FileUtility.SaferMove(InputFileStream.SaveFilePath, tempFile.FilePath);
+				OnTempFileCreated(tempFile);
 				return true;
 			}
 		}

Source/AppScaffolding/AppScaffolding.csproj

@@ -2,15 +2,14 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>net9.0</TargetFramework>
-    <Version>12.3.0.1</Version>
+    <Version>12.4.11.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="6.0.0" />
-    <PackageReference Include="Serilog.Sinks.ZipFile" Version="3.1.1" />
+    <PackageReference Include="Serilog.Sinks.File" Version="7.0.0" />
   </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));
@@ -521,8 +521,8 @@ namespace ApplicationServices
                         udi.UpdateRating(rating.OverallRating, rating.PerformanceRating, rating.StoryRating);
 				});
 
-        public static int UpdateBookStatus(this LibraryBook lb, LiberatedStatus bookStatus, Version libationVersion)
-            => lb.UpdateUserDefinedItem(udi => { udi.BookStatus = bookStatus; udi.SetLastDownloaded(libationVersion); });
+        public static int UpdateBookStatus(this LibraryBook lb, LiberatedStatus bookStatus, Version? libationVersion, AudioFormat audioFormat, string audioVersion)
+            => lb.UpdateUserDefinedItem(udi => { udi.BookStatus = bookStatus; udi.SetLastDownloaded(libationVersion, audioFormat, audioVersion); });
 
         public static int UpdateBookStatus(this LibraryBook libraryBook, LiberatedStatus bookStatus)
             => libraryBook.UpdateUserDefinedItem(udi => udi.BookStatus = bookStatus);

Source/ApplicationServices/LibraryExporter.cs

@@ -4,8 +4,8 @@ using System.Linq;
 using CsvHelper;
 using CsvHelper.Configuration.Attributes;
 using DataLayer;
+using Newtonsoft.Json;
 using NPOI.XSSF.UserModel;
-using Serilog;
 
 namespace ApplicationServices
 {
@@ -104,9 +104,6 @@ namespace ApplicationServices
 		[Name("Content Type")]
 		public string ContentType { get; set; }
 
-        [Name("Audio Format")]
-		public string AudioFormat { get; set; }
-
 		[Name("Language")]
         public string Language { get; set; }
 
@@ -118,7 +115,29 @@ namespace ApplicationServices
 
 		[Name("IsFinished")]
         public bool IsFinished { get; set; }
-    }
+
+		[Name("IsSpatial")]
+		public bool IsSpatial { get; set; }
+
+		[Name("Last Downloaded File Version")]
+		public string LastDownloadedFileVersion { get; set; }
+
+		[Ignore /* csv ignore */]
+		public AudioFormat LastDownloadedFormat { get; set; }
+
+		[Name("Last Downloaded Codec"), JsonIgnore]
+		public string CodecString => LastDownloadedFormat?.CodecString ?? "";
+
+		[Name("Last Downloaded Sample rate"), JsonIgnore]
+		public int? SampleRate => LastDownloadedFormat?.SampleRate;
+
+		[Name("Last Downloaded Audio Channels"), JsonIgnore]
+		public int? ChannelCount => LastDownloadedFormat?.ChannelCount;
+
+		[Name("Last Downloaded Bitrate"), JsonIgnore]
+		public int? BitRate => LastDownloadedFormat?.BitRate;
+	}
+
 	public static class LibToDtos
 	{
 		public static List<ExportDto> ToDtos(this IEnumerable<LibraryBook> library)
@@ -138,26 +157,30 @@ namespace ApplicationServices
 				HasPdf = a.Book.HasPdf(),
 				SeriesNames = a.Book.SeriesNames(),
 				SeriesOrder = a.Book.SeriesLink.Any() ? a.Book.SeriesLink?.Select(sl => $"{sl.Order} : {sl.Series.Name}").Aggregate((a, b) => $"{a}, {b}") : "",
-				CommunityRatingOverall = a.Book.Rating?.OverallRating,
-				CommunityRatingPerformance = a.Book.Rating?.PerformanceRating,
-				CommunityRatingStory = a.Book.Rating?.StoryRating,
+				CommunityRatingOverall = a.Book.Rating?.OverallRating.ZeroIsNull(),
+				CommunityRatingPerformance = a.Book.Rating?.PerformanceRating.ZeroIsNull(),
+				CommunityRatingStory = a.Book.Rating?.StoryRating.ZeroIsNull(),
 				PictureId = a.Book.PictureId,
 				IsAbridged = a.Book.IsAbridged,
 				DatePublished = a.Book.DatePublished,
 				CategoriesNames = string.Join("; ", a.Book.LowestCategoryNames()),
-				MyRatingOverall = a.Book.UserDefinedItem.Rating.OverallRating,
-				MyRatingPerformance = a.Book.UserDefinedItem.Rating.PerformanceRating,
-				MyRatingStory = a.Book.UserDefinedItem.Rating.StoryRating,
+				MyRatingOverall = a.Book.UserDefinedItem.Rating.OverallRating.ZeroIsNull(),
+				MyRatingPerformance = a.Book.UserDefinedItem.Rating.PerformanceRating.ZeroIsNull(),
+				MyRatingStory = a.Book.UserDefinedItem.Rating.StoryRating.ZeroIsNull(),
 				MyLibationTags = a.Book.UserDefinedItem.Tags,
 				BookStatus = a.Book.UserDefinedItem.BookStatus.ToString(),
 				PdfStatus = a.Book.UserDefinedItem.PdfStatus.ToString(),
 				ContentType = a.Book.ContentType.ToString(),
-				AudioFormat = a.Book.AudioFormat.ToString(),
 				Language = a.Book.Language,
 				LastDownloaded = a.Book.UserDefinedItem.LastDownloaded,
 				LastDownloadedVersion = a.Book.UserDefinedItem.LastDownloadedVersion?.ToString() ?? "",
-                IsFinished = a.Book.UserDefinedItem.IsFinished
-            }).ToList();
+				IsFinished = a.Book.UserDefinedItem.IsFinished,
+				IsSpatial = a.Book.IsSpatial,
+				LastDownloadedFileVersion = a.Book.UserDefinedItem.LastDownloadedFileVersion ?? "",
+				LastDownloadedFormat = a.Book.UserDefinedItem.LastDownloadedFormat
+			}).ToList();
+
+		private static float? ZeroIsNull(this float value) => value is 0 ? null : value;
 	}
 	public static class LibraryExporter
 	{
@@ -166,7 +189,6 @@ namespace ApplicationServices
 			var dtos = DbContexts.GetLibrary_Flat_NoTracking().ToDtos();
 			if (!dtos.Any())
 				return;
-
 			using var writer = new System.IO.StreamWriter(saveFilePath);
 			using var csv = new CsvWriter(writer, System.Globalization.CultureInfo.CurrentCulture);
 
@@ -178,7 +200,7 @@ namespace ApplicationServices
 		public static void ToJson(string saveFilePath)
 		{
 			var dtos = DbContexts.GetLibrary_Flat_NoTracking().ToDtos();
-			var json = Newtonsoft.Json.JsonConvert.SerializeObject(dtos, Newtonsoft.Json.Formatting.Indented);
+			var json = JsonConvert.SerializeObject(dtos, Formatting.Indented);
 			System.IO.File.WriteAllText(saveFilePath, json);
 		}
 
@@ -228,11 +250,16 @@ namespace ApplicationServices
 				nameof(ExportDto.BookStatus),
 				nameof(ExportDto.PdfStatus),
 				nameof(ExportDto.ContentType),
-				nameof(ExportDto.AudioFormat),
                 nameof(ExportDto.Language),
                 nameof(ExportDto.LastDownloaded),
                 nameof(ExportDto.LastDownloadedVersion),
-                nameof(ExportDto.IsFinished)
+                nameof(ExportDto.IsFinished),
+                nameof(ExportDto.IsSpatial),
+                nameof(ExportDto.LastDownloadedFileVersion),
+                nameof(ExportDto.CodecString),
+                nameof(ExportDto.SampleRate),
+                nameof(ExportDto.ChannelCount),
+                nameof(ExportDto.BitRate)
             };
 			var col = 0;
 			foreach (var c in columns)
@@ -253,15 +280,10 @@ namespace ApplicationServices
 			foreach (var dto in dtos)
 			{
 				col = 0;
-
-				row = sheet.CreateRow(rowIndex);
+				row = sheet.CreateRow(rowIndex++);
 
 				row.CreateCell(col++).SetCellValue(dto.Account);
-
-				var dateCell = row.CreateCell(col++);
-				dateCell.CellStyle = dateStyle;
-				dateCell.SetCellValue(dto.DateAdded);
-
+				row.CreateCell(col++).SetCellValue(dto.DateAdded).CellStyle = dateStyle;
 				row.CreateCell(col++).SetCellValue(dto.AudibleProductId);
 				row.CreateCell(col++).SetCellValue(dto.Locale);
 				row.CreateCell(col++).SetCellValue(dto.Title);
@@ -274,57 +296,46 @@ namespace ApplicationServices
 				row.CreateCell(col++).SetCellValue(dto.HasPdf);
 				row.CreateCell(col++).SetCellValue(dto.SeriesNames);
 				row.CreateCell(col++).SetCellValue(dto.SeriesOrder);
-
-				col = createCell(row, col, dto.CommunityRatingOverall);
-				col = createCell(row, col, dto.CommunityRatingPerformance);
-				col = createCell(row, col, dto.CommunityRatingStory);
-
+				row.CreateCell(col++).SetCellValue(dto.CommunityRatingOverall);
+				row.CreateCell(col++).SetCellValue(dto.CommunityRatingPerformance);
+				row.CreateCell(col++).SetCellValue(dto.CommunityRatingStory);
 				row.CreateCell(col++).SetCellValue(dto.PictureId);
 				row.CreateCell(col++).SetCellValue(dto.IsAbridged);
-
-				var datePubCell = row.CreateCell(col++);
-				datePubCell.CellStyle = dateStyle;
-				if (dto.DatePublished.HasValue)
-					datePubCell.SetCellValue(dto.DatePublished.Value);
-				else
-					datePubCell.SetCellValue("");
-
+				row.CreateCell(col++).SetCellValue(dto.DatePublished).CellStyle = dateStyle;
 				row.CreateCell(col++).SetCellValue(dto.CategoriesNames);
-
-				col = createCell(row, col, dto.MyRatingOverall);
-				col = createCell(row, col, dto.MyRatingPerformance);
-				col = createCell(row, col, dto.MyRatingStory);
-
+				row.CreateCell(col++).SetCellValue(dto.MyRatingOverall);
+				row.CreateCell(col++).SetCellValue(dto.MyRatingPerformance);
+				row.CreateCell(col++).SetCellValue(dto.MyRatingStory);
 				row.CreateCell(col++).SetCellValue(dto.MyLibationTags);
 				row.CreateCell(col++).SetCellValue(dto.BookStatus);
 				row.CreateCell(col++).SetCellValue(dto.PdfStatus);
 				row.CreateCell(col++).SetCellValue(dto.ContentType);
-                row.CreateCell(col++).SetCellValue(dto.AudioFormat);
-                row.CreateCell(col++).SetCellValue(dto.Language);
-
-				if (dto.LastDownloaded.HasValue)
-				{
-					dateCell = row.CreateCell(col);
-					dateCell.CellStyle = dateStyle;
-					dateCell.SetCellValue(dto.LastDownloaded.Value);
-				}
-
-                row.CreateCell(++col).SetCellValue(dto.LastDownloadedVersion);
-                row.CreateCell(++col).SetCellValue(dto.IsFinished);
-
-                rowIndex++;
+				row.CreateCell(col++).SetCellValue(dto.Language);
+				row.CreateCell(col++).SetCellValue(dto.LastDownloaded).CellStyle = dateStyle;
+				row.CreateCell(col++).SetCellValue(dto.LastDownloadedVersion);
+				row.CreateCell(col++).SetCellValue(dto.IsFinished);
+				row.CreateCell(col++).SetCellValue(dto.IsSpatial);
+				row.CreateCell(col++).SetCellValue(dto.LastDownloadedFileVersion);
+				row.CreateCell(col++).SetCellValue(dto.CodecString);
+				row.CreateCell(col++).SetCellValue(dto.SampleRate);
+				row.CreateCell(col++).SetCellValue(dto.ChannelCount);
+				row.CreateCell(col++).SetCellValue(dto.BitRate);
 			}
 
 			using var fileData = new System.IO.FileStream(saveFilePath, System.IO.FileMode.Create);
 			workbook.Write(fileData);
 		}
-		private static int createCell(NPOI.SS.UserModel.IRow row, int col, float? nullableFloat)
-		{
-			if (nullableFloat.HasValue)
-				row.CreateCell(col++).SetCellValue(nullableFloat.Value);
-			else
-				row.CreateCell(col++).SetCellValue("");
-			return col;
-		}
+
+		private static NPOI.SS.UserModel.ICell SetCellValue(this NPOI.SS.UserModel.ICell cell, DateTime? nullableDate)
+			=> nullableDate.HasValue ? cell.SetCellValue(nullableDate.Value)
+			: cell.SetCellType(NPOI.SS.UserModel.CellType.Numeric);
+
+		private static NPOI.SS.UserModel.ICell SetCellValue(this NPOI.SS.UserModel.ICell cell, int? nullableInt)
+			=> nullableInt.HasValue ? cell.SetCellValue(nullableInt.Value)
+			: cell.SetCellType(NPOI.SS.UserModel.CellType.Numeric);
+
+		private static NPOI.SS.UserModel.ICell SetCellValue(this NPOI.SS.UserModel.ICell cell, float? nullableFloat)
+			=> nullableFloat.HasValue ? cell.SetCellValue(nullableFloat.Value)
+			: cell.SetCellType(NPOI.SS.UserModel.CellType.Numeric);
 	}
 }

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

@@ -5,8 +5,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="AudibleApi" Version="9.4.0.1" />
-    <PackageReference Include="Google.Protobuf" Version="3.30.2" />
+    <PackageReference Include="AudibleApi" Version="9.4.2.1" />
+    <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/AudioFormat.cs

@@ -0,0 +1,70 @@
+#nullable enable
+using Newtonsoft.Json;
+
+namespace DataLayer;
+
+public enum Codec : byte
+{
+	Unknown,
+	Mp3,
+	AAC_LC,
+	xHE_AAC,
+	EC_3,
+	AC_4
+}
+
+public class AudioFormat
+{
+	public static AudioFormat Default => new(Codec.Unknown, 0, 0, 0);
+	[JsonIgnore]
+	public bool IsDefault => Codec is Codec.Unknown && BitRate == 0 && SampleRate == 0 && ChannelCount == 0;
+	[JsonIgnore]
+	public Codec Codec { get; set; }
+	public int SampleRate { get; set; }
+	public int ChannelCount { get; set; }
+	public int BitRate { get; set; }
+
+	public AudioFormat(Codec codec, int bitRate, int sampleRate, int channelCount)
+	{
+		Codec = codec;
+		BitRate = bitRate;
+		SampleRate = sampleRate;
+		ChannelCount = channelCount;
+	}
+
+	public string CodecString => Codec switch
+	{
+		Codec.Mp3 => "mp3",
+		Codec.AAC_LC => "AAC-LC",
+		Codec.xHE_AAC => "xHE-AAC",
+		Codec.EC_3 => "EC-3",
+		Codec.AC_4 => "AC-4",
+		Codec.Unknown or _ => "[Unknown]",
+	};
+
+	//Property     | Start | Num  |   Max   | Current Max |
+	//             |  Bit  | Bits |  Value  | Value Used  |
+	//-----------------------------------------------------
+	//Codec	       |   35  |   4  |      15 |         5   |
+	//BitRate      |   23  |  12  |   4_095 |       768   |
+	//SampleRate   |    5  |  18  | 262_143 |    48_000   |
+	//ChannelCount |    0  |   5  |      31 |         6   |
+	public long Serialize() =>
+		((long)Codec << 35) |
+		((long)BitRate << 23) |
+		((long)SampleRate << 5) |
+		(long)ChannelCount;
+
+	public static AudioFormat Deserialize(long value)
+	{
+		var codec = (Codec)((value >> 35) & 15);
+		var bitRate = (int)((value >> 23) & 4_095);
+		var sampleRate = (int)((value >> 5) & 262_143);
+		var channelCount = (int)(value & 31);
+		return new AudioFormat(codec, bitRate, sampleRate, channelCount);
+	}
+
+	public override string ToString()
+		=> IsDefault ? "[Unknown Audio Format]"
+		: $"{CodecString} ({ChannelCount}ch | {SampleRate:N0}Hz | {BitRate}kbps)";
+}

Source/DataLayer/Configurations/BookConfig.cs

@@ -13,13 +13,11 @@ namespace DataLayer.Configurations
 
             entity.OwnsOne(b => b.Rating);
 
-            entity.Property(nameof(Book._audioFormat));
             //
             // CRUCIAL: ignore unmapped collections, even get-only
             //
             entity.Ignore(nameof(Book.Authors));
             entity.Ignore(nameof(Book.Narrators));
-            entity.Ignore(nameof(Book.AudioFormat));
             entity.Ignore(nameof(Book.TitleWithSubtitle));
             entity.Ignore(b => b.Categories);
 
@@ -51,6 +49,11 @@ namespace DataLayer.Configurations
                     b_udi
                         .Property(udi => udi.LastDownloadedVersion)
                         .HasConversion(ver => ver.ToString(), str => Version.Parse(str));
+                    b_udi
+                        .Property(udi => udi.LastDownloadedFormat)
+                        .HasConversion(af => af.Serialize(), str => AudioFormat.Deserialize(str));
+
+					b_udi.Property(udi => udi.LastDownloadedFileVersion);
 
                     // owns it 1:1, store in same table
                     b_udi.OwnsOne(udi => udi.Rating);

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/EfClasses/AudioFormat.cs

@@ -1,65 +0,0 @@
-using System;
-
-namespace DataLayer
-{
-    internal enum AudioFormatEnum : long
-    {
-        //Defining the enum this way ensures that when comparing:
-        //LC_128_44100_stereo > LC_64_44100_stereo > LC_64_22050_stereo > LC_64_22050_stereo
-        //This matches how audible interprets these codecs when specifying quality using AudibleApi.DownloadQuality
-        //I've never seen mono formats.
-        Unknown = 0,
-        LC_32_22050_stereo = (32L << 18) | (22050 << 2) | 2,
-        LC_64_22050_stereo = (64L << 18) | (22050 << 2) | 2,
-        LC_64_44100_stereo = (64L << 18) | (44100 << 2) | 2,
-        LC_128_44100_stereo = (128L << 18) | (44100 << 2) | 2,
-		AAX_22_32 = LC_32_22050_stereo,
-		AAX_22_64 = LC_64_22050_stereo,
-		AAX_44_64 = LC_64_44100_stereo,
-		AAX_44_128 = LC_128_44100_stereo
-	}
-
-    public class AudioFormat : IComparable<AudioFormat>, IComparable
-    {
-        internal int AudioFormatID { get; private set; }
-        public int Bitrate { get; private init; }
-        public int SampleRate { get; private init; }
-        public int Channels { get; private init; }
-        public bool IsValid => Bitrate != 0 && SampleRate != 0 && Channels != 0;
-
-        public static AudioFormat FromString(string formatStr)
-        {
-            if (Enum.TryParse(formatStr, ignoreCase: true, out AudioFormatEnum enumVal))
-                return FromEnum(enumVal);
-            return FromEnum(AudioFormatEnum.Unknown);
-        }
-
-        internal static AudioFormat FromEnum(AudioFormatEnum enumVal)
-        {
-            var val = (long)enumVal;
-
-            return new()
-            {
-                Bitrate = (int)(val >> 18),
-                SampleRate = (int)(val >> 2) & ushort.MaxValue,
-                Channels = (int)(val & 3)
-            };
-        }
-        internal AudioFormatEnum ToEnum()
-        {
-            var val = (AudioFormatEnum)(((long)Bitrate << 18) | ((long)SampleRate << 2) | (long)Channels);
-
-            return Enum.IsDefined(val) ?
-                val : AudioFormatEnum.Unknown;
-        }
-
-        public override string ToString()
-            => IsValid ?
-            $"{Bitrate} Kbps, {SampleRate / 1000d:F1} kHz, {(Channels == 2 ? "Stereo" : Channels)}" :
-            "Unknown";
-
-        public int CompareTo(AudioFormat other) => ToEnum().CompareTo(other.ToEnum());
-
-        public int CompareTo(object obj) => CompareTo(obj as AudioFormat);
-    }
-}

Source/DataLayer/EfClasses/Book.cs

@@ -43,16 +43,13 @@ namespace DataLayer
         public ContentType ContentType { get; private set; }
         public string Locale { get; private set; }
 
-        internal AudioFormatEnum _audioFormat;
-
-        public AudioFormat AudioFormat { get => AudioFormat.FromEnum(_audioFormat); set => _audioFormat = value.ToEnum(); }
-
         // mutable
         public string PictureId { get; set; }
         public string PictureLarge { get; set; }
 
         // book details
         public bool IsAbridged { get; private set; }
+        public bool IsSpatial { get; private set; }
         public DateTime? DatePublished { get; private set; }
         public string Language { get; private set; }
 
@@ -240,10 +237,11 @@ namespace DataLayer
         public void UpdateProductRating(float overallRating, float performanceRating, float storyRating)
             => Rating.Update(overallRating, performanceRating, storyRating);
 
-        public void UpdateBookDetails(bool isAbridged, DateTime? datePublished, string language)
+        public void UpdateBookDetails(bool isAbridged, bool? isSpatial, DateTime? datePublished, string language)
         {
             // don't overwrite with default values
             IsAbridged |= isAbridged;
+            IsSpatial = isSpatial ?? IsSpatial;
             DatePublished = datePublished ?? DatePublished;
             Language = language?.FirstCharToUpper() ?? Language;
         }

Source/DataLayer/EfClasses/UserDefinedItem.cs

@@ -24,24 +24,52 @@ namespace DataLayer
     {
         internal int BookId { get; private set; }
         public Book Book { get; private set; }
-        public DateTime? LastDownloaded { get; private set; }
-        public Version LastDownloadedVersion { get; private set; }
+		/// <summary>
+		/// Date the audio file was last downloaded.
+		/// </summary>
+		public DateTime? LastDownloaded { get; private set; }
+		/// <summary>
+		/// Version of Libation used the last time the audio file was downloaded.
+		/// </summary>
+		public Version LastDownloadedVersion { get; private set; }
+		/// <summary>
+		/// Audio format of the last downloaded audio file.
+		/// </summary>
+		public AudioFormat LastDownloadedFormat { get; private set; }
+		/// <summary>
+		/// Version of the audio file that was last downloaded.
+		/// </summary>
+		public string LastDownloadedFileVersion { get; private set; }
 
-        public void SetLastDownloaded(Version version)
+        public void SetLastDownloaded(Version libationVersion, AudioFormat audioFormat, string audioVersion)
         {
-            if (LastDownloadedVersion != version)
+            if (LastDownloadedVersion != libationVersion)
             {
-                LastDownloadedVersion = version;
+                LastDownloadedVersion = libationVersion;
 				OnItemChanged(nameof(LastDownloadedVersion));
 			}
+            if (LastDownloadedFormat != audioFormat)
+            {
+                LastDownloadedFormat = audioFormat;
+				OnItemChanged(nameof(LastDownloadedFormat));
+			}
+            if (LastDownloadedFileVersion != audioVersion)
+            {
+				LastDownloadedFileVersion = audioVersion;
+				OnItemChanged(nameof(LastDownloadedFileVersion));
+			}
 
-            if (version is null)
+            if (libationVersion is null)
+            {
                 LastDownloaded = null;
+                LastDownloadedFormat = null;
+                LastDownloadedFileVersion = null;
+            }
             else
             {
-				LastDownloaded = DateTime.Now;
+                LastDownloaded = DateTime.Now;
                 OnItemChanged(nameof(LastDownloaded));
-			}
+            }
 		}
 
 		private UserDefinedItem() { }

Source/DataLayer/LibationContextFactory.cs

@@ -1,5 +1,6 @@
 using Dinah.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Diagnostics;
 
 namespace DataLayer
 {
@@ -7,6 +8,7 @@ namespace DataLayer
     {
         protected override LibationContext CreateNewInstance(DbContextOptions<LibationContext> options) => new LibationContext(options);
         protected override void UseDatabaseEngine(DbContextOptionsBuilder optionsBuilder, string connectionString)
-            => optionsBuilder.UseSqlite(connectionString, ob => ob.UseQuerySplittingBehavior(QuerySplittingBehavior.SplitQuery));
+            => optionsBuilder.ConfigureWarnings(w => w.Ignore(RelationalEventId.PendingModelChangesWarning))
+            .UseSqlite(connectionString, ob => ob.UseQuerySplittingBehavior(QuerySplittingBehavior.SplitQuery));
     }
 }

Source/DataLayer/Migrations/20250725074123_AddAudioFormatData.Designer.cs

@@ -0,0 +1,474 @@
+// <auto-generated />
+using System;
+using DataLayer;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+
+#nullable disable
+
+namespace DataLayer.Migrations
+{
+    [DbContext(typeof(LibationContext))]
+    [Migration("20250725074123_AddAudioFormatData")]
+    partial class AddAudioFormatData
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder.HasAnnotation("ProductVersion", "9.0.7");
+
+            modelBuilder.Entity("CategoryCategoryLadder", b =>
+                {
+                    b.Property<int>("_categoriesCategoryId")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("_categoryLaddersCategoryLadderId")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("_categoriesCategoryId", "_categoryLaddersCategoryLadderId");
+
+                    b.HasIndex("_categoryLaddersCategoryLadderId");
+
+                    b.ToTable("CategoryCategoryLadder");
+                });
+
+            modelBuilder.Entity("DataLayer.Book", b =>
+                {
+                    b.Property<int>("BookId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("AudibleProductId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("ContentType")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<DateTime?>("DatePublished")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("IsAbridged")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("IsSpatial")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Language")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("LengthInMinutes")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Locale")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("PictureId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("PictureLarge")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Subtitle")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Title")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("BookId");
+
+                    b.HasIndex("AudibleProductId");
+
+                    b.ToTable("Books");
+                });
+
+            modelBuilder.Entity("DataLayer.BookCategory", b =>
+                {
+                    b.Property<int>("BookId")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("CategoryLadderId")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("BookId", "CategoryLadderId");
+
+                    b.HasIndex("BookId");
+
+                    b.HasIndex("CategoryLadderId");
+
+                    b.ToTable("BookCategory");
+                });
+
+            modelBuilder.Entity("DataLayer.BookContributor", b =>
+                {
+                    b.Property<int>("BookId")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("ContributorId")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("Role")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<byte>("Order")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("BookId", "ContributorId", "Role");
+
+                    b.HasIndex("BookId");
+
+                    b.HasIndex("ContributorId");
+
+                    b.ToTable("BookContributor");
+                });
+
+            modelBuilder.Entity("DataLayer.Category", b =>
+                {
+                    b.Property<int>("CategoryId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("AudibleCategoryId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("CategoryId");
+
+                    b.HasIndex("AudibleCategoryId");
+
+                    b.ToTable("Categories");
+                });
+
+            modelBuilder.Entity("DataLayer.CategoryLadder", b =>
+                {
+                    b.Property<int>("CategoryLadderId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("CategoryLadderId");
+
+                    b.ToTable("CategoryLadders");
+                });
+
+            modelBuilder.Entity("DataLayer.Contributor", b =>
+                {
+                    b.Property<int>("ContributorId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("AudibleContributorId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("ContributorId");
+
+                    b.HasIndex("Name");
+
+                    b.ToTable("Contributors");
+
+                    b.HasData(
+                        new
+                        {
+                            ContributorId = -1,
+                            Name = ""
+                        });
+                });
+
+            modelBuilder.Entity("DataLayer.LibraryBook", b =>
+                {
+                    b.Property<int>("BookId")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("AbsentFromLastScan")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Account")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("DateAdded")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("BookId");
+
+                    b.ToTable("LibraryBooks");
+                });
+
+            modelBuilder.Entity("DataLayer.Series", b =>
+                {
+                    b.Property<int>("SeriesId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("AudibleSeriesId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("SeriesId");
+
+                    b.HasIndex("AudibleSeriesId");
+
+                    b.ToTable("Series");
+                });
+
+            modelBuilder.Entity("DataLayer.SeriesBook", b =>
+                {
+                    b.Property<int>("SeriesId")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("BookId")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Order")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("SeriesId", "BookId");
+
+                    b.HasIndex("BookId");
+
+                    b.HasIndex("SeriesId");
+
+                    b.ToTable("SeriesBook");
+                });
+
+            modelBuilder.Entity("CategoryCategoryLadder", b =>
+                {
+                    b.HasOne("DataLayer.Category", null)
+                        .WithMany()
+                        .HasForeignKey("_categoriesCategoryId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("DataLayer.CategoryLadder", null)
+                        .WithMany()
+                        .HasForeignKey("_categoryLaddersCategoryLadderId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("DataLayer.Book", b =>
+                {
+                    b.OwnsOne("DataLayer.Rating", "Rating", b1 =>
+                        {
+                            b1.Property<int>("BookId")
+                                .HasColumnType("INTEGER");
+
+                            b1.Property<float>("OverallRating")
+                                .HasColumnType("REAL");
+
+                            b1.Property<float>("PerformanceRating")
+                                .HasColumnType("REAL");
+
+                            b1.Property<float>("StoryRating")
+                                .HasColumnType("REAL");
+
+                            b1.HasKey("BookId");
+
+                            b1.ToTable("Books");
+
+                            b1.WithOwner()
+                                .HasForeignKey("BookId");
+                        });
+
+                    b.OwnsMany("DataLayer.Supplement", "Supplements", b1 =>
+                        {
+                            b1.Property<int>("SupplementId")
+                                .ValueGeneratedOnAdd()
+                                .HasColumnType("INTEGER");
+
+                            b1.Property<int>("BookId")
+                                .HasColumnType("INTEGER");
+
+                            b1.Property<string>("Url")
+                                .HasColumnType("TEXT");
+
+                            b1.HasKey("SupplementId");
+
+                            b1.HasIndex("BookId");
+
+                            b1.ToTable("Supplement");
+
+                            b1.WithOwner("Book")
+                                .HasForeignKey("BookId");
+
+                            b1.Navigation("Book");
+                        });
+
+                    b.OwnsOne("DataLayer.UserDefinedItem", "UserDefinedItem", b1 =>
+                        {
+                            b1.Property<int>("BookId")
+                                .HasColumnType("INTEGER");
+
+                            b1.Property<int>("BookStatus")
+                                .HasColumnType("INTEGER");
+
+                            b1.Property<bool>("IsFinished")
+                                .HasColumnType("INTEGER");
+
+                            b1.Property<DateTime?>("LastDownloaded")
+                                .HasColumnType("TEXT");
+
+                            b1.Property<string>("LastDownloadedFileVersion")
+                                .HasColumnType("TEXT");
+
+                            b1.Property<long?>("LastDownloadedFormat")
+                                .HasColumnType("INTEGER");
+
+                            b1.Property<string>("LastDownloadedVersion")
+                                .HasColumnType("TEXT");
+
+                            b1.Property<int?>("PdfStatus")
+                                .HasColumnType("INTEGER");
+
+                            b1.Property<string>("Tags")
+                                .HasColumnType("TEXT");
+
+                            b1.HasKey("BookId");
+
+                            b1.ToTable("UserDefinedItem", (string)null);
+
+                            b1.WithOwner("Book")
+                                .HasForeignKey("BookId");
+
+                            b1.OwnsOne("DataLayer.Rating", "Rating", b2 =>
+                                {
+                                    b2.Property<int>("UserDefinedItemBookId")
+                                        .HasColumnType("INTEGER");
+
+                                    b2.Property<float>("OverallRating")
+                                        .HasColumnType("REAL");
+
+                                    b2.Property<float>("PerformanceRating")
+                                        .HasColumnType("REAL");
+
+                                    b2.Property<float>("StoryRating")
+                                        .HasColumnType("REAL");
+
+                                    b2.HasKey("UserDefinedItemBookId");
+
+                                    b2.ToTable("UserDefinedItem");
+
+                                    b2.WithOwner()
+                                        .HasForeignKey("UserDefinedItemBookId");
+                                });
+
+                            b1.Navigation("Book");
+
+                            b1.Navigation("Rating");
+                        });
+
+                    b.Navigation("Rating");
+
+                    b.Navigation("Supplements");
+
+                    b.Navigation("UserDefinedItem");
+                });
+
+            modelBuilder.Entity("DataLayer.BookCategory", b =>
+                {
+                    b.HasOne("DataLayer.Book", "Book")
+                        .WithMany("CategoriesLink")
+                        .HasForeignKey("BookId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("DataLayer.CategoryLadder", "CategoryLadder")
+                        .WithMany("BooksLink")
+                        .HasForeignKey("CategoryLadderId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Book");
+
+                    b.Navigation("CategoryLadder");
+                });
+
+            modelBuilder.Entity("DataLayer.BookContributor", b =>
+                {
+                    b.HasOne("DataLayer.Book", "Book")
+                        .WithMany("ContributorsLink")
+                        .HasForeignKey("BookId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("DataLayer.Contributor", "Contributor")
+                        .WithMany("BooksLink")
+                        .HasForeignKey("ContributorId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Book");
+
+                    b.Navigation("Contributor");
+                });
+
+            modelBuilder.Entity("DataLayer.LibraryBook", b =>
+                {
+                    b.HasOne("DataLayer.Book", "Book")
+                        .WithOne()
+                        .HasForeignKey("DataLayer.LibraryBook", "BookId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Book");
+                });
+
+            modelBuilder.Entity("DataLayer.SeriesBook", b =>
+                {
+                    b.HasOne("DataLayer.Book", "Book")
+                        .WithMany("SeriesLink")
+                        .HasForeignKey("BookId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("DataLayer.Series", "Series")
+                        .WithMany("BooksLink")
+                        .HasForeignKey("SeriesId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Book");
+
+                    b.Navigation("Series");
+                });
+
+            modelBuilder.Entity("DataLayer.Book", b =>
+                {
+                    b.Navigation("CategoriesLink");
+
+                    b.Navigation("ContributorsLink");
+
+                    b.Navigation("SeriesLink");
+                });
+
+            modelBuilder.Entity("DataLayer.CategoryLadder", b =>
+                {
+                    b.Navigation("BooksLink");
+                });
+
+            modelBuilder.Entity("DataLayer.Contributor", b =>
+                {
+                    b.Navigation("BooksLink");
+                });
+
+            modelBuilder.Entity("DataLayer.Series", b =>
+                {
+                    b.Navigation("BooksLink");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}

Source/DataLayer/Migrations/20250725074123_AddAudioFormatData.cs

@@ -0,0 +1,48 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace DataLayer.Migrations
+{
+    /// <inheritdoc />
+    public partial class AddAudioFormatData : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.RenameColumn(
+                name: "_audioFormat",
+                table: "Books",
+                newName: "IsSpatial");
+
+            migrationBuilder.AddColumn<string>(
+                name: "LastDownloadedFileVersion",
+                table: "UserDefinedItem",
+                type: "TEXT",
+                nullable: true);
+
+            migrationBuilder.AddColumn<long>(
+                name: "LastDownloadedFormat",
+                table: "UserDefinedItem",
+                type: "INTEGER",
+                nullable: true);
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "LastDownloadedFileVersion",
+                table: "UserDefinedItem");
+
+            migrationBuilder.DropColumn(
+                name: "LastDownloadedFormat",
+                table: "UserDefinedItem");
+
+            migrationBuilder.RenameColumn(
+                name: "IsSpatial",
+                table: "Books",
+                newName: "_audioFormat");
+        }
+    }
+}

Source/DataLayer/Migrations/LibationContextModelSnapshot.cs

@@ -15,7 +15,7 @@ namespace DataLayer.Migrations
         protected override void BuildModel(ModelBuilder modelBuilder)
         {
 #pragma warning disable 612, 618
-            modelBuilder.HasAnnotation("ProductVersion", "8.0.5");
+            modelBuilder.HasAnnotation("ProductVersion", "9.0.7");
 
             modelBuilder.Entity("CategoryCategoryLadder", b =>
                 {
@@ -53,6 +53,9 @@ namespace DataLayer.Migrations
                     b.Property<bool>("IsAbridged")
                         .HasColumnType("INTEGER");
 
+                    b.Property<bool>("IsSpatial")
+                        .HasColumnType("INTEGER");
+
                     b.Property<string>("Language")
                         .HasColumnType("TEXT");
 
@@ -74,9 +77,6 @@ namespace DataLayer.Migrations
                     b.Property<string>("Title")
                         .HasColumnType("TEXT");
 
-                    b.Property<long>("_audioFormat")
-                        .HasColumnType("INTEGER");
-
                     b.HasKey("BookId");
 
                     b.HasIndex("AudibleProductId");
@@ -318,6 +318,12 @@ namespace DataLayer.Migrations
                             b1.Property<DateTime?>("LastDownloaded")
                                 .HasColumnType("TEXT");
 
+                            b1.Property<string>("LastDownloadedFileVersion")
+                                .HasColumnType("TEXT");
+
+                            b1.Property<long?>("LastDownloadedFormat")
+                                .HasColumnType("INTEGER");
+
                             b1.Property<string>("LastDownloadedVersion")
                                 .HasColumnType("TEXT");
 

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/DtoImporterService/BookImporter.cs

@@ -137,8 +137,6 @@ namespace DtoImporterService
 				book.ReplacePublisher(publisher);
 			}
 
-            book.UpdateBookDetails(item.IsAbridged, item.DatePublished, item.Language);
-
             if (item.PdfUrl is not null)
 				book.AddSupplementDownloadUrl(item.PdfUrl.ToString());
 
@@ -154,9 +152,6 @@ namespace DtoImporterService
 			// Update the book titles, since formatting can change
 			book.UpdateTitle(item.Title, item.Subtitle);
 
-			var codec = item.AvailableCodecs?.Max(f => AudioFormat.FromString(f.EnhancedCodec)) ?? new AudioFormat();
-			book.AudioFormat = codec;
-
 			// set/update book-specific info which may have changed
 			if (item.PictureId is not null)
 				book.PictureId = item.PictureId;
@@ -169,8 +164,9 @@ namespace DtoImporterService
 
             // 2023-02-01
             // updateBook must update language on books which were imported before the migration which added language.
-            // Can eventually delete this
-            book.UpdateBookDetails(item.IsAbridged, item.DatePublished, item.Language);
+            // 2025-07-30
+            // updateBook must update isSpatial on books which were imported before the migration which added isSpatial.
+            book.UpdateBookDetails(item.IsAbridged, item.AssetDetails?.Any(a => a.IsSpatial), item.DatePublished, item.Language);
 
             book.UpdateProductRating(
 				(float)(item.Rating?.OverallDistribution?.AverageRating ?? 0),

Source/FileLiberator/AudioDecodable.cs

@@ -19,21 +19,24 @@ namespace FileLiberator
         protected void OnTitleDiscovered(object _, string title)
 		{
             Serilog.Log.Logger.Debug("Event fired {@DebugInfo}", new { Name = nameof(TitleDiscovered), Title = title });
-            TitleDiscovered?.Invoke(this, title);
+            if (title != null)
+                TitleDiscovered?.Invoke(this, title);
 		}
 
         protected void OnAuthorsDiscovered(string authors) => OnAuthorsDiscovered(null, authors);
         protected void OnAuthorsDiscovered(object _, string authors)
 		{
             Serilog.Log.Logger.Debug("Event fired {@DebugInfo}", new { Name = nameof(AuthorsDiscovered), Authors = authors });
-            AuthorsDiscovered?.Invoke(this, authors);
+			if (authors != null)
+				AuthorsDiscovered?.Invoke(this, authors);
 		}
 
         protected void OnNarratorsDiscovered(string narrators) => OnNarratorsDiscovered(null, narrators);
         protected void OnNarratorsDiscovered(object _, string narrators)
 		{
             Serilog.Log.Logger.Debug("Event fired {@DebugInfo}", new { Name = nameof(NarratorsDiscovered), Narrators = narrators });
-            NarratorsDiscovered?.Invoke(this, narrators);
+			if (narrators != null)
+				NarratorsDiscovered?.Invoke(this, narrators);
 		}
 
         protected byte[] OnRequestCoverArt()

Source/FileLiberator/AudioFileStorageExt.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using AaxDecrypter;
 using DataLayer;
 using LibationFileManager;
 using LibationFileManager.Templates;
@@ -34,24 +35,17 @@ namespace FileLiberator
 			return Templates.Folder.GetFilename(libraryBook.ToDto(), AudibleFileStorage.BooksDirectory, "");
 		}
 
-		/// <summary>
-		/// DownloadDecryptBook:
-		/// Path: in progress directory.
-		/// File name: final file name.
-		/// </summary>
-		public static string GetInProgressFilename(this AudioFileStorage _, LibraryBook libraryBook, string extension)
-			=> Templates.File.GetFilename(libraryBook.ToDto(), AudibleFileStorage.DecryptInProgressDirectory, extension, returnFirstExisting: true);
-
 		/// <summary>
 		/// PDF: audio file does not exist
 		/// </summary>
-		public static string GetBooksDirectoryFilename(this AudioFileStorage _, LibraryBook libraryBook, string extension)
-			=> Templates.File.GetFilename(libraryBook.ToDto(), AudibleFileStorage.BooksDirectory, extension);
+		public static string GetBooksDirectoryFilename(this AudioFileStorage _, LibraryBook libraryBook, string extension, bool returnFirstExisting = false)
+			=> Templates.File.GetFilename(libraryBook.ToDto(), AudibleFileStorage.BooksDirectory, extension, returnFirstExisting: returnFirstExisting);
 
 		/// <summary>
 		/// PDF: audio file already exists
 		/// </summary>
-		public static string GetCustomDirFilename(this AudioFileStorage _, LibraryBook libraryBook, string dirFullPath, string extension)
-			=> Templates.File.GetFilename(libraryBook.ToDto(), dirFullPath, extension);
+		public static string GetCustomDirFilename(this AudioFileStorage _, LibraryBook libraryBook, string dirFullPath, string extension, MultiConvertFileProperties partProperties = null, bool returnFirstExisting = false)
+			=> partProperties is null ? Templates.File.GetFilename(libraryBook.ToDto(), dirFullPath, extension, returnFirstExisting: returnFirstExisting)
+			: Templates.ChapterFile.GetFilename(libraryBook.ToDto(), partProperties, dirFullPath, extension, returnFirstExisting: returnFirstExisting);
 	}
 }

Source/FileLiberator/AudioFormatDecoder.cs

@@ -0,0 +1,242 @@
+using AAXClean;
+using DataLayer;
+using FileManager;
+using Mpeg4Lib.Boxes;
+using Mpeg4Lib.Util;
+using NAudio.Lame.ID3;
+using System;
+using System.Collections.Generic;
+using System.IO;
+
+#nullable enable
+namespace AaxDecrypter;
+
+/// <summary> Read audio codec, bitrate, sample rate, and channel count from MP4 and MP3 audio files. </summary>
+internal static class AudioFormatDecoder
+{
+	public static AudioFormat FromMpeg4(string filename)
+	{
+		using var fileStream = File.Open(filename, FileMode.Open, FileAccess.Read, FileShare.Read);
+		return FromMpeg4(new Mp4File(fileStream));
+	}
+
+	public static AudioFormat FromMpeg4(Mp4File mp4File)
+	{
+		Codec codec;
+		if (mp4File.AudioSampleEntry.Dac4 is not null)
+		{
+			codec = Codec.AC_4;
+		}
+		else if (mp4File.AudioSampleEntry.Dec3 is not null)
+		{
+			codec = Codec.EC_3;
+		}
+		else if (mp4File.AudioSampleEntry.Esds is EsdsBox esds)
+		{
+			var objectType = esds.ES_Descriptor.DecoderConfig.AudioSpecificConfig.AudioObjectType;
+			codec
+				= objectType == 2 ? Codec.AAC_LC
+				: objectType == 42 ? Codec.xHE_AAC
+				: Codec.Unknown;
+		}
+		else
+			return AudioFormat.Default;
+
+		var bitrate = (int)Math.Round(mp4File.AverageBitrate / 1024d);
+
+		return new AudioFormat(codec, bitrate, mp4File.TimeScale, mp4File.AudioChannels);
+	}
+
+	public static AudioFormat FromMpeg3(LongPath mp3Filename)
+	{
+		using var mp3File = File.Open(mp3Filename, FileMode.Open, FileAccess.Read, FileShare.Read);
+		if (Id3Header.Create(mp3File) is Id3Header id3header)
+			id3header.SeekForwardToPosition(mp3File, mp3File.Position + id3header.Size);
+		else
+		{
+			Serilog.Log.Logger.Debug("File appears not to have ID3 tags.");
+			mp3File.Position = 0;
+		}
+
+		if (!SeekToFirstKeyFrame(mp3File))
+		{
+			Serilog.Log.Logger.Warning("Invalid frame sync read from file at end of ID3 tag.");
+			return AudioFormat.Default;
+		}
+
+		var mpegSize = mp3File.Length - mp3File.Position;
+		if (mpegSize < 64)
+		{
+			Serilog.Log.Logger.Warning("Remaining file length is too short to contain any mp3 frames. {@File}", mp3Filename);
+			return AudioFormat.Default;
+		}
+
+		#region read first mp3 frame header
+		//https://www.codeproject.com/Articles/8295/MPEG-Audio-Frame-Header#VBRIHeader
+		var reader = new BitReader(mp3File.ReadBlock(4));
+		reader.Position = 11; //Skip frame header magic bits
+		var versionId = (Version)reader.Read(2);
+		var layerDesc = (Layer)reader.Read(2);
+
+		if (layerDesc is not Layer.Layer_3)
+		{
+			Serilog.Log.Logger.Warning("Could not read mp3 data from {@layerVersion} file.", layerDesc.ToString());
+			return AudioFormat.Default;
+		}
+
+		if (versionId is Version.Reserved)
+		{
+			Serilog.Log.Logger.Warning("Mp3 data data cannot be read from a file with version = 'Reserved'");
+			return AudioFormat.Default;
+		}
+
+		var protectionBit = reader.ReadBool();
+		var bitrateIndex = reader.Read(4);
+		var freqIndex = reader.Read(2);
+		_ = reader.ReadBool();                  //Padding bit
+		_ = reader.ReadBool();                  //Private bit
+		var channelMode = reader.Read(2);
+		_ = reader.Read(2);                     //Mode extension
+		_ = reader.ReadBool();                  //Copyright
+		_ = reader.ReadBool();                  //Original
+		_ = reader.Read(2);                     //Emphasis
+		#endregion
+
+		//Read the sample rate,and channels from the first frame's header.
+		var sampleRate = Mp3SampleRateIndex[versionId][freqIndex];
+		var channelCount = channelMode == 3 ? 1 : 2;
+
+		//Try to read variable bitrate info from the first frame.
+		//Revert to fixed bitrate from frame header if not found.
+		var bitrate
+			= TryReadXingBitrate(out var br) ? br
+			: TryReadVbriBitrate(out br) ? br
+			: Mp3BitrateIndex[versionId][bitrateIndex];
+
+		return new AudioFormat(Codec.Mp3, bitrate, sampleRate, channelCount);
+
+		#region Variable bitrate header readers
+		bool TryReadXingBitrate(out int bitrate)
+		{
+			const int XingHeader = 0x58696e67;
+			const int InfoHeader = 0x496e666f;
+
+			var sideInfoSize = GetSideInfo(channelCount == 2, versionId) + (protectionBit ? 0 : 2);
+			mp3File.Position += sideInfoSize;
+
+			if (mp3File.ReadUInt32BE() is XingHeader or InfoHeader)
+			{
+				//Xing or Info header (common)
+				var flags = mp3File.ReadUInt32BE();
+				bool hasFramesField = (flags & 1) == 1;
+				bool hasBytesField = (flags & 2) == 2;
+
+				if (hasFramesField)
+				{
+					var numFrames = mp3File.ReadUInt32BE();
+					if (hasBytesField)
+					{
+						mpegSize = mp3File.ReadUInt32BE();
+					}
+
+					var samplesPerFrame = GetSamplesPerFrame(sampleRate);
+					var duration = samplesPerFrame * numFrames / sampleRate;
+					bitrate = (short)(mpegSize / duration / 1024 * 8);
+					return true;
+				}
+			}
+			else
+				mp3File.Position -= sideInfoSize + 4;
+
+			bitrate = 0;
+			return false;
+		}
+
+		bool TryReadVbriBitrate(out int bitrate)
+		{
+			const int VBRIHeader = 0x56425249;
+
+			mp3File.Position += 32;
+
+			if (mp3File.ReadUInt32BE() is VBRIHeader)
+			{
+				//VBRI header (rare)
+				_ = mp3File.ReadBlock(6);
+				mpegSize = mp3File.ReadUInt32BE();
+				var numFrames = mp3File.ReadUInt32BE();
+
+				var samplesPerFrame = GetSamplesPerFrame(sampleRate);
+				var duration = samplesPerFrame * numFrames / sampleRate;
+				bitrate = (short)(mpegSize / duration / 1024 * 8);
+				return true;
+			}
+			bitrate = 0;
+			return false;
+		}
+		#endregion
+	}
+
+	#region MP3 frame decoding helpers
+	private static bool SeekToFirstKeyFrame(Stream file)
+	{
+		//Frame headers begin with first 11 bits set.
+		const int MaxSeekBytes = 4096;
+		var maxPosition = Math.Min(file.Length, file.Position + MaxSeekBytes) - 2;
+
+		while (file.Position < maxPosition)
+		{
+			if (file.ReadByte() == 0xff)
+			{
+				if ((file.ReadByte() & 0xe0) == 0xe0)
+				{
+					file.Position -= 2;
+					return true;
+				}
+				file.Position--;
+			}
+		}
+		return false;
+	}
+
+	private enum Version
+	{
+		Version_2_5,
+		Reserved,
+		Version_2,
+		Version_1
+	}
+
+	private enum Layer
+	{
+		Reserved,
+		Layer_3,
+		Layer_2,
+		Layer_1
+	}
+
+	private static double GetSamplesPerFrame(int sampleRate) => sampleRate >= 32000 ? 1152 : 576;
+
+	private static byte GetSideInfo(bool stereo, Version version) => (stereo, version) switch
+	{
+		(true,  Version.Version_1)                        => 32,
+		(true,  Version.Version_2 or Version.Version_2_5) => 17,
+		(false, Version.Version_1)                        => 17,
+		(false, Version.Version_2 or Version.Version_2_5) =>  9,
+		_ => 0,
+	};
+
+	private static readonly Dictionary<Version, ushort[]> Mp3SampleRateIndex = new()
+	{
+		{ Version.Version_2_5, [11025, 12000,  8000] },
+		{ Version.Version_2,   [22050, 24000, 16000] },
+		{ Version.Version_1,   [44100, 48000, 32000] },
+	};
+
+	private static readonly Dictionary<Version, short[]> Mp3BitrateIndex = new()
+	{
+		{ Version.Version_2_5, [-1, 8,16,24,32,40,48,56, 64, 80, 96,112,128,144,160,-1]},
+		{ Version.Version_2,   [-1, 8,16,24,32,40,48,56, 64, 80, 96,112,128,144,160,-1]},
+		{ Version.Version_1,   [-1,32,40,48,56,64,80,96,112,128,160,192,224,256,320,-1]}
+	};
+	#endregion
+}

Source/FileLiberator/ConvertToMp3.cs

@@ -1,6 +1,7 @@
 using System;
 using System.IO;
 using System.Linq;
+using System.Threading;
 using System.Threading.Tasks;
 using AAXClean;
 using AAXClean.Codecs;
@@ -19,7 +20,13 @@ namespace FileLiberator
 		private readonly AaxDecrypter.AverageSpeed averageSpeed = new();
 		private static string Mp3FileName(string m4bPath) => Path.ChangeExtension(m4bPath ?? "", ".mp3");
 
-		public override Task CancelAsync() => Mp4Operation?.CancelAsync() ?? Task.CompletedTask;		
+		private CancellationTokenSource CancellationTokenSource { get; set; }
+		public override async Task CancelAsync()
+		{
+			await CancellationTokenSource.CancelAsync();
+			if (Mp4Operation is not null)
+				await Mp4Operation.CancelAsync();
+		}
 
 		public static bool ValidateMp3(LibraryBook libraryBook)
 		{
@@ -32,17 +39,29 @@ namespace FileLiberator
 		public override async Task<StatusHandler> ProcessAsync(LibraryBook libraryBook)
 		{
 			OnBegin(libraryBook);
+			var cancellationToken = (CancellationTokenSource = new()).Token;
 
 			try
 			{
-				var m4bPaths = AudibleFileStorage.Audio.GetPaths(libraryBook.Book.AudibleProductId);
+				var m4bPaths = AudibleFileStorage.Audio.GetPaths(libraryBook.Book.AudibleProductId)
+					.Where(m4bPath => File.Exists(m4bPath))
+					.Select(m4bPath => new { m4bPath, proposedMp3Path = Mp3FileName(m4bPath), m4bSize = new FileInfo(m4bPath).Length })
+					.Where(p => !File.Exists(p.proposedMp3Path))
+					.ToArray();
 
-				foreach (var m4bPath in m4bPaths)
+				long totalInputSize = m4bPaths.Sum(p => p.m4bSize);
+				long sizeOfCompletedFiles = 0L;
+				foreach (var entry in m4bPaths)
 				{
-					var proposedMp3Path = Mp3FileName(m4bPath);
-					if (File.Exists(proposedMp3Path) || !File.Exists(m4bPath)) continue;
+					cancellationToken.ThrowIfCancellationRequested();
+					if (File.Exists(entry.proposedMp3Path) || !File.Exists(entry.m4bPath))
+					{
+						sizeOfCompletedFiles += entry.m4bSize;
+						continue;
+					}
 
-					var m4bBook = await Task.Run(() => new Mp4File(m4bPath, FileAccess.Read));
+					using var m4bFileStream = File.Open(entry.m4bPath, FileMode.Open, FileAccess.Read, FileShare.Read);
+					var m4bBook = new Mp4File(m4bFileStream);
 
 					//AAXClean.Codecs only supports decoding AAC and E-AC-3 audio.
 					if (m4bBook.AudioSampleEntry.Esds is null && m4bBook.AudioSampleEntry.Dec3 is null)
@@ -69,74 +88,85 @@ namespace FileLiberator
 						lameConfig.ID3.Track = trackCount > 0 ? $"{trackNum}/{trackCount}" : trackNum.ToString();
 					}
 
-					using var mp3File = File.Open(Path.GetTempFileName(), FileMode.OpenOrCreate, FileAccess.ReadWrite);
+					long currentFileNumBytesProcessed = 0;
 					try
 					{
-						Mp4Operation = m4bBook.ConvertToMp3Async(mp3File, lameConfig, chapters);
-						Mp4Operation.ConversionProgressUpdate += M4bBook_ConversionProgressUpdate;
-						await Mp4Operation;
-
-						if (Mp4Operation.IsCanceled)
+						var tempPath = Path.GetTempFileName();
+						using (var mp3File = File.Open(tempPath, FileMode.OpenOrCreate, FileAccess.ReadWrite))
 						{
-							FileUtility.SaferDelete(mp3File.Name);
-							return new StatusHandler { "Cancelled" };
+							Mp4Operation = m4bBook.ConvertToMp3Async(mp3File, lameConfig, chapters);
+							Mp4Operation.ConversionProgressUpdate += m4bBook_ConversionProgressUpdate;
+							await Mp4Operation;
 						}
-						else
-						{
-							var realMp3Path
+
+						if (cancellationToken.IsCancellationRequested)
+							FileUtility.SaferDelete(tempPath);
+
+						cancellationToken.ThrowIfCancellationRequested();
+
+						var realMp3Path
 								= FileUtility.SaferMoveToValidPath(
-									mp3File.Name,
-									proposedMp3Path,
+									tempPath,
+									entry.proposedMp3Path,
 									Configuration.Instance.ReplacementCharacters,
 									extension: "mp3",
 									Configuration.Instance.OverwriteExisting);
 
-							SetFileTime(libraryBook, realMp3Path);
-							SetDirectoryTime(libraryBook, Path.GetDirectoryName(realMp3Path));
-
-							OnFileCreated(libraryBook, realMp3Path);
-						}
-					}
-					catch (Exception ex)
-					{
-						Serilog.Log.Error(ex, "AAXClean error");
-						return new StatusHandler { "Conversion failed" };
+						SetFileTime(libraryBook, realMp3Path);
+						SetDirectoryTime(libraryBook, Path.GetDirectoryName(realMp3Path));
+						OnFileCreated(libraryBook, realMp3Path);
 					}
 					finally
 					{
 						if (Mp4Operation is not null)
-							Mp4Operation.ConversionProgressUpdate -= M4bBook_ConversionProgressUpdate;
+							Mp4Operation.ConversionProgressUpdate -= m4bBook_ConversionProgressUpdate;
 
-						m4bBook.InputStream.Close();
-						mp3File.Close();
+						sizeOfCompletedFiles += entry.m4bSize;
+					}
+					void m4bBook_ConversionProgressUpdate(object sender, ConversionProgressEventArgs e)
+					{
+						currentFileNumBytesProcessed = (long)(e.FractionCompleted * entry.m4bSize);
+						var bytesCompleted = sizeOfCompletedFiles + currentFileNumBytesProcessed;
+						ConversionProgressUpdate(totalInputSize, bytesCompleted);
 					}
 				}
+				return new StatusHandler();
+			}
+			catch (Exception ex)
+			{
+				if (!cancellationToken.IsCancellationRequested)
+				{
+					Serilog.Log.Error(ex, "AAXClean error");
+					return new StatusHandler { "Conversion failed" };
+				}
+				return new StatusHandler { "Cancelled" };
 			}
 			finally
 			{
 				OnCompleted(libraryBook);
+				CancellationTokenSource.Dispose();
+				CancellationTokenSource = null;
 			}
-			return new StatusHandler();
 		}
 
-		private void M4bBook_ConversionProgressUpdate(object sender, ConversionProgressEventArgs e)
+		private void ConversionProgressUpdate(long totalInputSize, long bytesCompleted)
 		{
-			averageSpeed.AddPosition(e.ProcessPosition.TotalSeconds);
+			averageSpeed.AddPosition(bytesCompleted);
 
-			var remainingTimeToProcess = (e.EndTime - e.ProcessPosition).TotalSeconds;
-			var estTimeRemaining = remainingTimeToProcess / averageSpeed.Average;
+			var remainingBytes = (totalInputSize - bytesCompleted);
+			var estTimeRemaining = remainingBytes / averageSpeed.Average;
 
 			if (double.IsNormal(estTimeRemaining))
 				OnStreamingTimeRemaining(TimeSpan.FromSeconds(estTimeRemaining));
 
-			double progressPercent = 100 * e.FractionCompleted;
+			double progressPercent = 100 * bytesCompleted / totalInputSize;
 
 			OnStreamingProgressChanged(
 				new DownloadProgress
 				{
 					ProgressPercentage = progressPercent,
-					BytesReceived = (long)(e.ProcessPosition - e.StartTime).TotalSeconds,
-					TotalBytesToReceive = (long)(e.EndTime - e.StartTime).TotalSeconds
+					BytesReceived = bytesCompleted,
+					TotalBytesToReceive = totalInputSize
 				});
 		}
 	}

Source/FileLiberator/DownloadDecryptBook.cs

@@ -1,312 +1,512 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Threading.Tasks;
-using AaxDecrypter;
+using AaxDecrypter;
 using ApplicationServices;
 using AudibleApi.Common;
 using DataLayer;
 using Dinah.Core;
 using Dinah.Core.ErrorHandling;
+using Dinah.Core.Net.Http;
 using FileManager;
 using LibationFileManager;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
 
+#nullable enable
 namespace FileLiberator
 {
-    public class DownloadDecryptBook : AudioDecodable
-    {
-        public override string Name => "Download & Decrypt";
-        private AudiobookDownloadBase abDownloader;
+	public class DownloadDecryptBook : AudioDecodable
+	{
+		public override string Name => "Download & Decrypt";
+		private CancellationTokenSource? cancellationTokenSource;
+		private AudiobookDownloadBase? abDownloader;
 
-        public override bool Validate(LibraryBook libraryBook) => !libraryBook.Book.Audio_Exists();
+		public override bool Validate(LibraryBook libraryBook) => !libraryBook.Book.Audio_Exists();
+		public override async Task CancelAsync()
+		{
+			if (abDownloader is not null) await abDownloader.CancelAsync();
+			if (cancellationTokenSource is not null) await cancellationTokenSource.CancelAsync();
+		}
 
-        public override Task CancelAsync() => abDownloader?.CancelAsync() ?? Task.CompletedTask;
+		public override async Task<StatusHandler> ProcessAsync(LibraryBook libraryBook)
+		{
+			OnBegin(libraryBook);
+			cancellationTokenSource = new CancellationTokenSource();
+			var cancellationToken = cancellationTokenSource.Token;
 
-        public override async Task<StatusHandler> ProcessAsync(LibraryBook libraryBook)
-        {
-            var entries = new List<FilePathCache.CacheEntry>();
-            // these only work so minimally b/c CacheEntry is a record.
-            // in case of parallel decrypts, only capture the ones for this book id.
-            // if user somehow starts multiple decrypts of the same book in parallel: on their own head be it
-            void FilePathCache_Inserted(object sender, FilePathCache.CacheEntry e)
-            {
-                if (e.Id.EqualsInsensitive(libraryBook.Book.AudibleProductId))
-                    entries.Add(e);
-            }
-            void FilePathCache_Removed(object sender, FilePathCache.CacheEntry e)
-            {
-                if (e.Id.EqualsInsensitive(libraryBook.Book.AudibleProductId))
-                    entries.Remove(e);
-            }
+			try
+			{
+				if (libraryBook.Book.Audio_Exists())
+					return new StatusHandler { "Cannot find decrypt. Final audio file already exists" };
 
-            OnBegin(libraryBook);
+				DownloadValidation(libraryBook);
 
-            try
-            {
-                if (libraryBook.Book.Audio_Exists())
-                    return new StatusHandler { "Cannot find decrypt. Final audio file already exists" };
+				var api = await libraryBook.GetApiAsync();
+				using var downloadOptions = await DownloadOptions.InitiateDownloadAsync(api, Configuration.Instance, libraryBook, cancellationToken);
+				var result = await DownloadAudiobookAsync(api, downloadOptions, cancellationToken);
 
-                bool success = false;
-                try
-                {
-                    FilePathCache.Inserted += FilePathCache_Inserted;
-                    FilePathCache.Removed += FilePathCache_Removed;
+				if (!result.Success || getFirstAudioFile(result.ResultFiles) is not TempFile audioFile)
+				{
+					// decrypt failed. Delete all output entries but leave the cache files.
+					result.ResultFiles.ForEach(f => FileUtility.SaferDelete(f.FilePath));
+					cancellationToken.ThrowIfCancellationRequested();
+					return new StatusHandler { "Decrypt failed" };
+				}
 
-                    success = await downloadAudiobookAsync(libraryBook);
-                }
-                finally
-                {
-                    FilePathCache.Inserted -= FilePathCache_Inserted;
-                    FilePathCache.Removed -= FilePathCache_Removed;
-                }
+				if (Configuration.Instance.RetainAaxFile)
+				{
+					//Add the cached aaxc and key files to the entries list to be moved to the Books directory.
+					result.ResultFiles.AddRange(getAaxcFiles(result.CacheFiles));
+				}
 
-                // decrypt failed
-                if (!success || getFirstAudioFile(entries) == default)
-                {
-                    await Task.WhenAll(
-                        entries
-                        .Where(f => f.FileType != FileType.AAXC)
-                        .Select(f => Task.Run(() => FileUtility.SaferDelete(f.Path))));
+				//Set the last downloaded information on the book so that it can be used in the naming templates,
+				//but don't persist it until everything completes successfully (in the finally block)
+				var audioFormat = GetFileFormatInfo(downloadOptions, audioFile);
+				var audioVersion = downloadOptions.ContentMetadata.ContentReference.Version;
+				libraryBook.Book.UserDefinedItem.SetLastDownloaded(Configuration.LibationVersion, audioFormat, audioVersion);
 
-                    return
-                        abDownloader?.IsCanceled is true
-                        ? new StatusHandler { "Cancelled" }
-                        : new StatusHandler { "Decrypt failed" };
-                }
+				var finalStorageDir = getDestinationDirectory(libraryBook);
 
-                var finalStorageDir = getDestinationDirectory(libraryBook);
-
-                var moveFilesTask = Task.Run(() => moveFilesToBooksDir(libraryBook, entries));
-                Task[] finalTasks = new[]
-                {
-                    Task.Run(() => downloadCoverArt(libraryBook)),
-                    moveFilesTask,
-                    Task.Run(() => WindowsDirectory.SetCoverAsFolderIcon(libraryBook.Book.PictureId, finalStorageDir))
-                };
+				//post-download tasks done in parallel.
+				var moveFilesTask = Task.Run(() => MoveFilesToBooksDir(libraryBook, finalStorageDir, result.ResultFiles, cancellationToken));
+				Task[] finalTasks =
+				[
+					moveFilesTask,
+					Task.Run(() => DownloadCoverArt(finalStorageDir, downloadOptions, cancellationToken)),
+					Task.Run(() => DownloadRecordsAsync(api, finalStorageDir, downloadOptions, cancellationToken)),
+					Task.Run(() => DownloadMetadataAsync(api, finalStorageDir, downloadOptions, cancellationToken)),
+					Task.Run(() => WindowsDirectory.SetCoverAsFolderIcon(libraryBook.Book.PictureId, finalStorageDir, cancellationToken))
+				];
 
 				try
-                {
-                    await Task.WhenAll(finalTasks);
-                }
-                catch
-                {
-					//Swallow downloadCoverArt and SetCoverAsFolderIcon exceptions.
-                    //Only fail if the downloaded audio files failed to move to Books directory
-					if (moveFilesTask.IsFaulted)
-                    {
-                        throw;
-                    }
-                }
-                finally
-                {
-                    if (moveFilesTask.IsCompletedSuccessfully)
-                    {
-                        await Task.Run(() => libraryBook.UpdateBookStatus(LiberatedStatus.Liberated, Configuration.LibationVersion));
-
+				{
+					await Task.WhenAll(finalTasks);
+				}
+				catch when (!moveFilesTask.IsFaulted)
+				{
+					//Swallow DownloadCoverArt, DownloadRecordsAsync, DownloadMetadataAsync, and SetCoverAsFolderIcon exceptions.
+					//Only fail if the downloaded audio files failed to move to Books directory
+				}
+				finally
+				{
+					if (moveFilesTask.IsCompletedSuccessfully && !cancellationToken.IsCancellationRequested)
+					{
+						libraryBook.UpdateBookStatus(LiberatedStatus.Liberated, Configuration.LibationVersion, audioFormat, audioVersion);
 						SetDirectoryTime(libraryBook, finalStorageDir);
+						foreach (var cacheFile in result.CacheFiles.Where(f => File.Exists(f.FilePath)))
+						{
+							//Delete cache files only after the download/decrypt operation completes successfully.
+							FileUtility.SaferDelete(cacheFile.FilePath);
+						}
 					}
 				}
 
 				return new StatusHandler();
-            }
-            finally
-            {
-                OnCompleted(libraryBook);
-            }
-        }
-
-        private async Task<bool> downloadAudiobookAsync(LibraryBook libraryBook)
-        {
-            var config = Configuration.Instance;
-
-            downloadValidation(libraryBook);
-
-            var api = await libraryBook.GetApiAsync();
-
-            using var dlOptions = await DownloadOptions.InitiateDownloadAsync(api, libraryBook, config);
-            var outFileName = AudibleFileStorage.Audio.GetInProgressFilename(libraryBook, dlOptions.OutputFormat.ToString().ToLower());
-            var cacheDir = AudibleFileStorage.DownloadsInProgressDirectory;
-
-            if (dlOptions.DrmType is not DrmType.Adrm and not DrmType.Widevine)
-                abDownloader = new UnencryptedAudiobookDownloader(outFileName, cacheDir, dlOptions);
-            else
-            {
-                AaxcDownloadConvertBase converter
-                    = config.SplitFilesByChapter ?
-                    new AaxcDownloadMultiConverter(outFileName, cacheDir, dlOptions) :
-                    new AaxcDownloadSingleConverter(outFileName, cacheDir, dlOptions);
-
-                if (config.AllowLibationFixup)
-                    converter.RetrievedMetadata += Converter_RetrievedMetadata;
-
-                abDownloader = converter;
-            }
-
-            abDownloader.DecryptProgressUpdate += OnStreamingProgressChanged;
-            abDownloader.DecryptTimeRemaining += OnStreamingTimeRemaining;
-            abDownloader.RetrievedTitle += OnTitleDiscovered;
-            abDownloader.RetrievedAuthors += OnAuthorsDiscovered;
-            abDownloader.RetrievedNarrators += OnNarratorsDiscovered;
-            abDownloader.RetrievedCoverArt += AaxcDownloader_RetrievedCoverArt;
-            abDownloader.FileCreated += (_, path) => OnFileCreated(libraryBook, path);
-
-            // REAL WORK DONE HERE
-            var success = await abDownloader.RunAsync();
-
-			if (success && config.SaveMetadataToFile)
-            {
-                var metadataFile = LibationFileManager.Templates.Templates.File.GetFilename(dlOptions.LibraryBookDto, Path.GetDirectoryName(outFileName), ".metadata.json");
-
-                var item = await api.GetCatalogProductAsync(libraryBook.Book.AudibleProductId, AudibleApi.CatalogOptions.ResponseGroupOptions.ALL_OPTIONS);
-				item.SourceJson.Add(nameof(ContentMetadata.ChapterInfo), Newtonsoft.Json.Linq.JObject.FromObject(dlOptions.ContentMetadata.ChapterInfo));
-				item.SourceJson.Add(nameof(ContentMetadata.ContentReference), Newtonsoft.Json.Linq.JObject.FromObject(dlOptions.ContentMetadata.ContentReference));
-
-                File.WriteAllText(metadataFile, item.SourceJson.ToString());
-                OnFileCreated(libraryBook, metadataFile);
-            }
-			return success;
+			}
+			catch when (cancellationToken.IsCancellationRequested)
+			{
+				Serilog.Log.Logger.Information("Download/Decrypt was cancelled. {@Book}", libraryBook.LogFriendly());
+				return new StatusHandler { "Cancelled" };
+			}
+			finally
+			{
+				OnCompleted(libraryBook);
+				cancellationTokenSource.Dispose();
+				cancellationTokenSource = null;
+			}
 		}
 
-		private void Converter_RetrievedMetadata(object sender, AAXClean.AppleTags tags)
+		private record AudiobookDecryptResult(bool Success, List<TempFile> ResultFiles, List<TempFile> CacheFiles);
+
+		private async Task<AudiobookDecryptResult> DownloadAudiobookAsync(AudibleApi.Api api, DownloadOptions dlOptions, CancellationToken cancellationToken)
 		{
-            if (sender is not AaxcDownloadConvertBase converter || converter.DownloadOptions is not DownloadOptions options)
+			var outpoutDir = AudibleFileStorage.DecryptInProgressDirectory;
+			var cacheDir = AudibleFileStorage.DownloadsInProgressDirectory;
+			var result = new AudiobookDecryptResult(false, [], []);
+
+			try
+			{
+				if (dlOptions.DrmType is not DrmType.Adrm and not DrmType.Widevine)
+					abDownloader = new UnencryptedAudiobookDownloader(outpoutDir, cacheDir, dlOptions);
+				else
+				{
+					AaxcDownloadConvertBase converter
+						= dlOptions.Config.SplitFilesByChapter && dlOptions.ChapterInfo.Count > 1 ?
+						new AaxcDownloadMultiConverter(outpoutDir, cacheDir, dlOptions) :
+						new AaxcDownloadSingleConverter(outpoutDir, cacheDir, dlOptions);
+
+					if (dlOptions.Config.AllowLibationFixup)
+						converter.RetrievedMetadata += Converter_RetrievedMetadata;
+
+					abDownloader = converter;
+				}
+
+				abDownloader.DecryptProgressUpdate += OnStreamingProgressChanged;
+				abDownloader.DecryptTimeRemaining += OnStreamingTimeRemaining;
+				abDownloader.RetrievedTitle += OnTitleDiscovered;
+				abDownloader.RetrievedAuthors += OnAuthorsDiscovered;
+				abDownloader.RetrievedNarrators += OnNarratorsDiscovered;
+				abDownloader.RetrievedCoverArt += AaxcDownloader_RetrievedCoverArt;
+				abDownloader.TempFileCreated += AbDownloader_TempFileCreated;
+
+				// REAL WORK DONE HERE
+				bool success = await abDownloader.RunAsync();
+				return result with { Success = success };
+			}
+			catch (Exception ex)
+			{
+				if (!cancellationToken.IsCancellationRequested)
+					Serilog.Log.Logger.Error(ex, "Error downloading audiobook {@Book}", dlOptions.LibraryBook.LogFriendly());
+				//don't throw any exceptions so the caller can delete any temp files.
+				return result;
+			}
+			finally
+			{
+				OnStreamingProgressChanged(new() { ProgressPercentage = 100 });
+			}
+
+			void AbDownloader_TempFileCreated(object? sender, TempFile e)
+			{
+				if (Path.GetDirectoryName(e.FilePath) == outpoutDir)
+				{
+					result.ResultFiles.Add(e);
+				}
+				else if (Path.GetDirectoryName(e.FilePath) == cacheDir)
+				{
+					result.CacheFiles.Add(e);
+					// Notify that the aaxc file has been created so that
+					// the UI can know about partially-downloaded files
+					if (getFileType(e) is FileType.AAXC)
+						OnFileCreated(dlOptions.LibraryBook, e.FilePath);
+				}
+			}
+		}
+
+		#region Decryptor event handlers
+		private void Converter_RetrievedMetadata(object? sender, AAXClean.AppleTags tags)
+		{
+			if (sender is not AaxcDownloadConvertBase converter ||
+				converter.AaxFile is not AAXClean.Mp4File aaxFile ||
+				converter.DownloadOptions is not DownloadOptions options ||
+				options.ChapterInfo.Chapters is not List<AAXClean.Chapter> chapters)
 				return;
 
-            tags.Title ??= options.LibraryBookDto.TitleWithSubtitle;
-            tags.Album ??= tags.Title;
-            tags.Artist ??= string.Join("; ", options.LibraryBook.Book.Authors.Select(a => a.Name));
-            tags.AlbumArtists ??= tags.Artist;
+			#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 = 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 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));
+			tags.AlbumArtists ??= tags.Artist;
 			tags.Generes = string.Join(", ", options.LibraryBook.Book.LowestCategoryNames());
-            tags.ProductID ??= options.ContentMetadata.ContentReference.Sku;
-            tags.Comment ??= options.LibraryBook.Book.Description;
-            tags.LongDescription ??= tags.Comment;
-            tags.Publisher ??= options.LibraryBook.Book.Publisher;
+			tags.ProductID ??= options.ContentMetadata.ContentReference.Sku;
+			tags.Comment ??= options.LibraryBook.Book.Description;
+			tags.LongDescription ??= tags.Comment;
+			tags.Publisher ??= options.LibraryBook.Book.Publisher;
 			tags.Narrator ??= string.Join("; ", options.LibraryBook.Book.Narrators.Select(n => n.Name));
 			tags.Asin = options.LibraryBook.Book.AudibleProductId;
 			tags.Acr = options.ContentMetadata.ContentReference.Acr;
 			tags.Version = options.ContentMetadata.ContentReference.Version;
 			if (options.LibraryBook.Book.DatePublished is DateTime pubDate)
-            {
-                tags.Year ??= pubDate.Year.ToString();
-                tags.ReleaseDate ??= pubDate.ToString("dd-MMM-yyyy");
-            }
-        }
-
-        private static void downloadValidation(LibraryBook libraryBook)
-        {
-            string errorString(string field)
-                => $"{errorTitle()}\r\nCannot download book. {field} is not known. Try re-importing the account which owns this book.";
-
-            string errorTitle()
-            {
-                var title
-                    = (libraryBook.Book.TitleWithSubtitle.Length > 53)
-                    ? $"{libraryBook.Book.TitleWithSubtitle.Truncate(50)}..."
-                    : libraryBook.Book.TitleWithSubtitle;
-                var errorBookTitle = $"{title} [{libraryBook.Book.AudibleProductId}]";
-                return errorBookTitle;
-            };
-
-            if (string.IsNullOrWhiteSpace(libraryBook.Account))
-                throw new Exception(errorString("Account"));
-
-            if (string.IsNullOrWhiteSpace(libraryBook.Book.Locale))
-                throw new Exception(errorString("Locale"));
-        }
-
-        private void AaxcDownloader_RetrievedCoverArt(object _, byte[] e)
-        {
-            if (Configuration.Instance.AllowLibationFixup)
-            {
-                try
-                {
-                    e = OnRequestCoverArt();
-                    abDownloader.SetCoverArt(e);
-                }
-                catch (Exception ex)
-                {
-                    Serilog.Log.Logger.Error(ex, "Failed to retrieve cover art from server.");
-                }
-            }
-            
-            if (e is not null)
-                OnCoverImageDiscovered(e);
+			{
+				tags.Year ??= pubDate.Year.ToString();
+				tags.ReleaseDate ??= pubDate.ToString("dd-MMM-yyyy");
+			}
 		}
 
-        /// <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)
-        {
-            // create final directory. move each file into it
-            var destinationDir = getDestinationDirectory(libraryBook);
-
-			for (var i = 0; i < entries.Count; i++)
-            {
-                var entry = entries[i];
-
-                var realDest
-                    = FileUtility.SaferMoveToValidPath(
-                        entry.Path,
-                        Path.Combine(destinationDir, Path.GetFileName(entry.Path)),
-                        Configuration.Instance.ReplacementCharacters,
-                        overwrite: Configuration.Instance.OverwriteExisting);
-
-                SetFileTime(libraryBook, realDest);
-				FilePathCache.Insert(libraryBook.Book.AudibleProductId, realDest);
-
-                // 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 };
-            }
-
-			var cue = entries.FirstOrDefault(f => f.FileType == FileType.Cue);
-            if (cue != default)
-            {
-                Cue.UpdateFileName(cue.Path, getFirstAudioFile(entries).Path);
-				SetFileTime(libraryBook, cue.Path);
+		private void AaxcDownloader_RetrievedCoverArt(object? sender, byte[]? e)
+		{
+			if (Configuration.Instance.AllowLibationFixup && sender is AaxcDownloadConvertBase downloader)
+			{
+				try
+				{
+					e = OnRequestCoverArt();
+					downloader.SetCoverArt(e);
+				}
+				catch (Exception ex)
+				{
+					Serilog.Log.Logger.Error(ex, "Failed to retrieve cover art from server.");
+				}
 			}
 
-            AudibleFileStorage.Audio.Refresh();
-        }
+			if (e is not null)
+				OnCoverImageDiscovered(e);
+		}
+		#endregion
 
-        private static string getDestinationDirectory(LibraryBook libraryBook)
-        {
-			var destinationDir = AudibleFileStorage.Audio.GetDestinationDirectory(libraryBook);
-            if (!Directory.Exists(destinationDir))
-                Directory.CreateDirectory(destinationDir);
-            return destinationDir;
+		#region Validation
+
+		private static void DownloadValidation(LibraryBook libraryBook)
+		{
+			string errorString(string field)
+				=> $"{errorTitle()}\r\nCannot download book. {field} is not known. Try re-importing the account which owns this book.";
+
+			string errorTitle()
+			{
+				var title
+					= (libraryBook.Book.TitleWithSubtitle.Length > 53)
+					? $"{libraryBook.Book.TitleWithSubtitle.Truncate(50)}..."
+					: libraryBook.Book.TitleWithSubtitle;
+				var errorBookTitle = $"{title} [{libraryBook.Book.AudibleProductId}]";
+				return errorBookTitle;
+			};
+
+			if (string.IsNullOrWhiteSpace(libraryBook.Account))
+				throw new InvalidOperationException(errorString("Account"));
+
+			if (string.IsNullOrWhiteSpace(libraryBook.Book.Locale))
+				throw new InvalidOperationException(errorString("Locale"));
+		}
+		#endregion
+
+		#region Post-success routines
+		/// <summary>Read the audio format from the audio file's metadata.</summary>
+		public AudioFormat GetFileFormatInfo(DownloadOptions options, TempFile firstAudioFile)
+		{
+			try
+			{
+				return firstAudioFile.Extension.ToLowerInvariant() switch
+				{
+					".m4b" or ".m4a" or ".mp4" => GetMp4AudioFormat(),
+					".mp3" => AudioFormatDecoder.FromMpeg3(firstAudioFile.FilePath),
+					_ => AudioFormat.Default
+				};
+			}
+			catch (Exception ex)
+			{
+				//Failure to determine output audio format should not be considered a failure to download the book
+				Serilog.Log.Logger.Error(ex, "Error determining output audio format for {@Book}. File = '{@audioFile}'", options.LibraryBook, firstAudioFile);
+				return AudioFormat.Default;
+			}
+
+			AudioFormat GetMp4AudioFormat()
+				=> abDownloader is AaxcDownloadConvertBase converter && converter.AaxFile is AAXClean.Mp4File mp4File
+				? AudioFormatDecoder.FromMpeg4(mp4File)
+				: AudioFormatDecoder.FromMpeg4(firstAudioFile.FilePath);
 		}
 
-		private static FilePathCache.CacheEntry getFirstAudioFile(IEnumerable<FilePathCache.CacheEntry> entries)
-            => entries.FirstOrDefault(f => f.FileType == FileType.Audio);
+		/// <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 void MoveFilesToBooksDir(LibraryBook libraryBook, LongPath destinationDir, List<TempFile> entries, CancellationToken cancellationToken)
+		{
+			cancellationToken.ThrowIfCancellationRequested();
+			AverageSpeed averageSpeed = new();
 
-		private static void downloadCoverArt(LibraryBook libraryBook)
-        {
-			if (!Configuration.Instance.DownloadCoverArt) return;
+			var totalSizeToMove = entries.Sum(f => new FileInfo(f.FilePath).Length);
+			long totalBytesMoved = 0;
 
-            var coverPath = "[null]";
+			for (var i = 0; i < entries.Count; i++)
+			{
+				var entry = entries[i];
 
-            try
-            {
-                var destinationDir = getDestinationDirectory(libraryBook);
-                coverPath = AudibleFileStorage.Audio.GetBooksDirectoryFilename(libraryBook, ".jpg");
-                coverPath = Path.Combine(destinationDir, Path.GetFileName(coverPath));
+				var destFileName
+					= AudibleFileStorage.Audio.GetCustomDirFilename(
+						libraryBook,
+						destinationDir,
+						entry.Extension,
+						entry.PartProperties,
+						Configuration.Instance.OverwriteExisting);
 
-                if (File.Exists(coverPath))
-                    FileUtility.SaferDelete(coverPath);
+				var realDest
+					= FileUtility.SaferMoveToValidPath(
+						entry.FilePath,
+						destFileName,
+						Configuration.Instance.ReplacementCharacters,
+						entry.Extension,
+						Configuration.Instance.OverwriteExisting);
 
-                var picBytes = PictureStorage.GetPictureSynchronously(new(libraryBook.Book.PictureLarge ?? libraryBook.Book.PictureId, PictureSize.Native));
-                if (picBytes.Length > 0)
-                {
-                    File.WriteAllBytes(coverPath, picBytes);
-                    SetFileTime(libraryBook, coverPath);
-                }
-            }
-            catch (Exception ex)
-            {
-                //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 {libraryBook.Book.AudibleProductId} to {coverPath} catalog product.");
-            }
-        }
-    }
+				#region File Move Progress
+				totalBytesMoved += new FileInfo(realDest).Length;
+				averageSpeed.AddPosition(totalBytesMoved);
+				var estSecsRemaining = (totalSizeToMove - totalBytesMoved) / averageSpeed.Average;
+
+				if (double.IsNormal(estSecsRemaining))
+					OnStreamingTimeRemaining(TimeSpan.FromSeconds(estSecsRemaining));
+
+				OnStreamingProgressChanged(new DownloadProgress
+					{
+						ProgressPercentage = 100d * totalBytesMoved / totalSizeToMove,
+						BytesReceived = totalBytesMoved,
+						TotalBytesToReceive = totalSizeToMove
+					});
+				#endregion
+
+				// propagate corrected path for cue file (after this for-loop)
+				entries[i] = entry with { FilePath = realDest };
+
+				SetFileTime(libraryBook, realDest);
+				OnFileCreated(libraryBook, realDest);
+				cancellationToken.ThrowIfCancellationRequested();
+			}
+
+			if (entries.FirstOrDefault(f => getFileType(f) is FileType.Cue) is TempFile cue
+				&& getFirstAudioFile(entries)?.FilePath is LongPath audioFilePath)
+			{
+				Cue.UpdateFileName(cue.FilePath, audioFilePath);
+				SetFileTime(libraryBook, cue.FilePath);
+			}
+
+			cancellationToken.ThrowIfCancellationRequested();
+			AudibleFileStorage.Audio.Refresh();
+		}
+
+		private void DownloadCoverArt(LongPath destinationDir, DownloadOptions options, CancellationToken cancellationToken)
+		{
+			if (!options.Config.DownloadCoverArt) return;
+
+			var coverPath = "[null]";
+
+			try
+			{
+				coverPath
+					= AudibleFileStorage.Audio.GetCustomDirFilename(
+						options.LibraryBook,
+						destinationDir,
+						extension: ".jpg",
+						returnFirstExisting: Configuration.Instance.OverwriteExisting);
+
+				if (File.Exists(coverPath))
+					FileUtility.SaferDelete(coverPath);
+
+				var picBytes = PictureStorage.GetPictureSynchronously(new(options.LibraryBook.Book.PictureLarge ?? options.LibraryBook.Book.PictureId, PictureSize.Native), cancellationToken);
+				if (picBytes.Length > 0)
+				{
+					File.WriteAllBytes(coverPath, picBytes);
+					SetFileTime(options.LibraryBook, coverPath);
+					OnFileCreated(options.LibraryBook, coverPath);
+				}
+			}
+			catch (Exception ex)
+			{
+				//Failure to download cover art should not be considered a failure to download the book
+				if (!cancellationToken.IsCancellationRequested)
+					Serilog.Log.Logger.Error(ex, "Error downloading cover art for {@Book} to {@metadataFile}.", options.LibraryBook, coverPath);
+				throw;
+			}
+		}
+
+		public async Task DownloadRecordsAsync(AudibleApi.Api api, LongPath destinationDir, DownloadOptions options, CancellationToken cancellationToken)
+		{
+			if (!options.Config.DownloadClipsBookmarks) return;
+
+			var recordsPath = "[null]";
+			var format = options.Config.ClipsBookmarksFileFormat;
+			var formatExtension = FileUtility.GetStandardizedExtension(format.ToString().ToLowerInvariant());
+
+			try
+			{
+				recordsPath
+					= AudibleFileStorage.Audio.GetCustomDirFilename(
+						options.LibraryBook,
+						destinationDir,
+						extension: formatExtension,
+						returnFirstExisting: Configuration.Instance.OverwriteExisting);
+
+				if (File.Exists(recordsPath))
+					FileUtility.SaferDelete(recordsPath);
+
+				var records = await api.GetRecordsAsync(options.AudibleProductId);
+
+				switch (format)
+				{
+					case Configuration.ClipBookmarkFormat.CSV:
+						RecordExporter.ToCsv(recordsPath, records);
+						break;
+					case Configuration.ClipBookmarkFormat.Xlsx:
+						RecordExporter.ToXlsx(recordsPath, records);
+						break;
+					case Configuration.ClipBookmarkFormat.Json:
+						RecordExporter.ToJson(recordsPath, options.LibraryBook, records);
+						break;
+					default:
+						throw new NotSupportedException($"Unsupported record export format: {format}");
+				}
+
+				SetFileTime(options.LibraryBook, recordsPath);
+				OnFileCreated(options.LibraryBook, recordsPath);
+			}
+			catch (Exception ex)
+			{
+				//Failure to download records should not be considered a failure to download the book
+				if (!cancellationToken.IsCancellationRequested)
+					Serilog.Log.Logger.Error(ex, "Error downloading clips and bookmarks for {@Book} to {@recordsPath}.", options.LibraryBook, recordsPath);
+				throw;
+			}
+		}
+
+		private async Task DownloadMetadataAsync(AudibleApi.Api api, LongPath destinationDir, DownloadOptions options, CancellationToken cancellationToken)
+		{
+			if (!options.Config.SaveMetadataToFile) return;
+
+			string metadataPath = "[null]";
+
+			try
+			{
+				metadataPath
+					= AudibleFileStorage.Audio.GetCustomDirFilename(
+						options.LibraryBook,
+						destinationDir,
+						extension: ".metadata.json",
+						returnFirstExisting: Configuration.Instance.OverwriteExisting);
+
+				if (File.Exists(metadataPath))
+					FileUtility.SaferDelete(metadataPath);
+
+				var item = await api.GetCatalogProductAsync(options.LibraryBook.Book.AudibleProductId, AudibleApi.CatalogOptions.ResponseGroupOptions.ALL_OPTIONS);
+				item.SourceJson.Add(nameof(ContentMetadata.ChapterInfo), Newtonsoft.Json.Linq.JObject.FromObject(options.ContentMetadata.ChapterInfo));
+				item.SourceJson.Add(nameof(ContentMetadata.ContentReference), Newtonsoft.Json.Linq.JObject.FromObject(options.ContentMetadata.ContentReference));
+
+				cancellationToken.ThrowIfCancellationRequested();
+				File.WriteAllText(metadataPath, item.SourceJson.ToString());
+				SetFileTime(options.LibraryBook, metadataPath);
+				OnFileCreated(options.LibraryBook, metadataPath);
+			}
+			catch (Exception ex)
+			{
+				//Failure to download metadata should not be considered a failure to download the book
+				if (!cancellationToken.IsCancellationRequested)
+					Serilog.Log.Logger.Error(ex, "Error downloading metdatat of {@Book} to {@metadataFile}.", options.LibraryBook, metadataPath);
+				throw;
+			}
+		}
+		#endregion
+
+		#region Macros
+		private static string getDestinationDirectory(LibraryBook libraryBook)
+		{
+			var destinationDir = AudibleFileStorage.Audio.GetDestinationDirectory(libraryBook);
+			if (!Directory.Exists(destinationDir))
+				Directory.CreateDirectory(destinationDir);
+			return destinationDir;
+		}
+
+		private static FileType getFileType(TempFile file)
+			=> FileTypes.GetFileTypeFromPath(file.FilePath);
+		private static TempFile? getFirstAudioFile(IEnumerable<TempFile> entries)
+			=> entries.FirstOrDefault(f => File.Exists(f.FilePath) && getFileType(f) is FileType.Audio);
+		private static IEnumerable<TempFile> getAaxcFiles(IEnumerable<TempFile> entries)
+			=> entries.Where(f => File.Exists(f.FilePath) && (getFileType(f) is FileType.AAXC || f.Extension.Equals(".key", StringComparison.OrdinalIgnoreCase)));
+		#endregion
+	}
 }

Source/FileLiberator/DownloadOptions.Factory.cs

@@ -10,6 +10,7 @@ using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Net.Http;
+using System.Threading;
 using System.Threading.Tasks;
 
 #nullable enable
@@ -23,162 +24,109 @@ public partial class DownloadOptions
 	/// <summary>
 	/// Initiate an audiobook download from the audible api.
 	/// </summary>
-	public static async Task<DownloadOptions> InitiateDownloadAsync(Api api, LibraryBook libraryBook, Configuration config)
+	public static async Task<DownloadOptions> InitiateDownloadAsync(Api api, Configuration config, LibraryBook libraryBook, CancellationToken token)
 	{
-		var license = await ChooseContent(api, libraryBook, config);
-		var options = BuildDownloadOptions(libraryBook, config, license);
+		var license = await ChooseContent(api, libraryBook, config, token);
+		token.ThrowIfCancellationRequested();
 
-		return options;
+		//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).
+		var metadata = await api.GetContentMetadataAsync(libraryBook.Book.AudibleProductId);
+		if (metadata.ChapterInfo.RuntimeLengthMs == license.ContentMetadata.ChapterInfo.RuntimeLengthMs)
+			license.ContentMetadata.ChapterInfo = metadata.ChapterInfo;
+
+		token.ThrowIfCancellationRequested();
+		return BuildDownloadOptions(libraryBook, config, license);
 	}
 
-	private static async Task<ContentLicense> ChooseContent(Api api, LibraryBook libraryBook, Configuration config)
+	private class LicenseInfo
 	{
-		var cdm = await Cdm.GetCdmAsync();
+		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;
 
-		ContentLicense? contentLic = null;
-		ContentLicense? fallback = null;
-
-		if (cdm is null)
+		if (!config.UseWidevine || await Cdm.GetCdmAsync() is not Cdm cdm)
 		{
-			//Doesn't matter what the user chose. We can't get a CDM so we must fall back to AAX(C)
-			contentLic = await api.GetDownloadLicenseAsync(libraryBook.Book.AudibleProductId, dlQuality);
-		}
-		else
-		{
-			var spatial = config.FileDownloadQuality is Configuration.DownloadQuality.Spatial;
-			try
-				{
-				var codecChoice = config.SpatialAudioCodec switch
-				{
-					Configuration.SpatialCodec.EC_3 => Ec3Codec,
-					Configuration.SpatialCodec.AC_4 => Ac4Codec,
-					_ => throw new NotSupportedException($"Unknown value for {nameof(config.SpatialAudioCodec)}")
-				};
-				contentLic = await api.GetDownloadLicenseAsync(libraryBook.Book.AudibleProductId, dlQuality, ChapterTitlesType.Tree, DrmType.Widevine, spatial, codecChoice);
-			}
-			catch (Exception ex)
-			{
-				Serilog.Log.Logger.Error(ex, "Failed to request a Widevine license.");
-			}
-
-			if (contentLic is null)
-			{
-				//We failed to get a widevine license, so fall back to AAX(C)
-				contentLic = await api.GetDownloadLicenseAsync(libraryBook.Book.AudibleProductId, dlQuality);
-			}
-			else 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;
-				}
-			}
+			token.ThrowIfCancellationRequested();
+			var license = await api.GetDownloadLicenseAsync(libraryBook.Book.AudibleProductId, dlQuality);
+			return new LicenseInfo(license);
 		}
 
-		if (contentLic.DrmType == DrmType.Widevine && cdm is not null)
+		token.ThrowIfCancellationRequested();
+		try
 		{
-			try
-			{
-				using var client = new HttpClient();
-				var mpdResponse = await client.GetAsync(contentLic.LicenseResponse);
-				var dash = new MpegDash(mpdResponse.Content.ReadAsStream());
+			//try to request a widevine content license using the user's spatial audio settings
+			var codecChoice = config.SpatialAudioCodec is Configuration.SpatialCodec.AC_4 ? Ac4Codec : Ec3Codec;
 
-				if (!dash.TryGetUri(new Uri(contentLic.LicenseResponse), out var contentUri))
-					throw new InvalidDataException("Failed to get mpeg-dash content download url.");
+			var contentLic
+				= await api.GetDownloadLicenseAsync(
+					libraryBook.Book.AudibleProductId,
+					dlQuality,
+					ChapterTitlesType.Tree,
+					DrmType.Widevine,
+					config.RequestSpatial,
+					codecChoice);
 
-				contentLic.ContentMetadata.ContentUrl = new() { OfflineUrl = contentUri.ToString() };
+			if (contentLic.DrmType is not DrmType.Widevine)
+				return new LicenseInfo(contentLic);
 
-				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)
-				};
+			using var client = new HttpClient();
+			using var mpdResponse = await client.GetAsync(contentLic.LicenseResponse, token);
+			var dash = new MpegDash(mpdResponse.Content.ReadAsStream(token));
 
-			}
-			catch
-			{
-				if (fallback != null)
-					return fallback;
+			if (!dash.TryGetUri(new Uri(contentLic.LicenseResponse), out var contentUri))
+				throw new InvalidDataException("Failed to get mpeg-dash content download url.");
 
-				//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;
-			}
+			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 content license. Depending on the
+			//failure reason, users can potentially still download this audiobook
+			//by disabling the "Use Widevine DRM" feature.
+			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;
-
-		//Set the requested AudioFormat for use in file naming templates
-		libraryBook.Book.AudioFormat = AudioFormat.FromString(contentLic.ContentMetadata.ContentReference.ContentFormat);
-
-		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),
 		};
 
 		var titleConcat = config.CombineNestedChapterTitles ? ": " : null;
 		var chapters
-			= flattenChapters(contentLic.ContentMetadata.ChapterInfo.Chapters, titleConcat)
+			= flattenChapters(licInfo.ContentMetadata.ChapterInfo.Chapters, titleConcat)
 			.OrderBy(c => c.StartOffsetMs)
 			.ToList();
 
@@ -194,7 +142,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));
 		}
@@ -317,7 +265,7 @@ public partial class DownloadOptions
 			else if (titleConcat is null)
 			{
 				chaps.Add(c);
-				chaps.AddRange(flattenChapters(c.Chapters));
+				chaps.AddRange(flattenChapters(c.Chapters, titleConcat));
 			}
 			else
 			{
@@ -330,7 +278,7 @@ public partial class DownloadOptions
 				else
 					chaps.Add(c);
 
-				var children = flattenChapters(c.Chapters);
+				var children = flattenChapters(c.Chapters, titleConcat);
 
 				foreach (var child in children)
 					child.Title = $"{c.Title}{titleConcat}{child.Title}";
@@ -356,7 +304,4 @@ public partial class DownloadOptions
 			chapters.Remove(chapters[^1]);
 		}
 	}
-
-	static double RelativePercentDifference(long num1, long num2)
-		=> Math.Abs(num1 - num2) / (double)(num1 + num2);
 }

Source/FileLiberator/DownloadOptions.cs

@@ -3,88 +3,47 @@ using AAXClean;
 using Dinah.Core;
 using DataLayer;
 using LibationFileManager;
-using System.Threading.Tasks;
 using System;
 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 string GetMultipartFileName(MultiConvertFileProperties props)
-		{
-			var baseDir = Path.GetDirectoryName(props.OutputFileName);
-			var extension = Path.GetExtension(props.OutputFileName);
-			return Templates.ChapterFile.GetFilename(LibraryBookDto, props, baseDir, extension);
-		}
+		public bool StripUnabridged => Config.AllowLibationFixup && Config.StripUnabridged;
+		public bool CreateCueSheet => Config.CreateCueSheet;
+		public long DownloadSpeedBps => Config.DownloadSpeedLimit;
+		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 GetMultipartTitle(MultiConvertFileProperties props)
 			=> Templates.ChapterTitle.GetName(LibraryBookDto, props);
 
-		public async Task<string> SaveClipsAndBookmarksAsync(string fileName)
-		{
-			if (DownloadClipsBookmarks)
-			{
-				var format = config.ClipsBookmarksFileFormat;
-
-				var formatExtension = format.ToString().ToLowerInvariant();
-				var filePath = Path.ChangeExtension(fileName, formatExtension);
-
-				var api = await LibraryBook.GetApiAsync();
-				var records = await api.GetRecordsAsync(LibraryBook.Book.AudibleProductId);
-
-				switch(format)
-				{
-					case Configuration.ClipBookmarkFormat.CSV:
-						RecordExporter.ToCsv(filePath, records);
-						break;
-					case Configuration.ClipBookmarkFormat.Xlsx:
-						RecordExporter.ToXlsx(filePath, records);
-						break;
-					case Configuration.ClipBookmarkFormat.Json:
-						RecordExporter.ToJson(filePath, LibraryBook, records);
-						break;
-				}
-				return filePath;
-			}
-			return string.Empty;
-		}
-
-		private readonly Configuration config;
+		public Configuration Config { get; }
 		private readonly IDisposable cancellation;
 		public void Dispose()
 		{
@@ -92,13 +51,36 @@ 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();
 
 			cancellation =

Source/FileLiberator/UtilityExtensions.cs

@@ -5,6 +5,7 @@ using System.Threading.Tasks;
 using AudibleUtilities;
 using DataLayer;
 using Dinah.Core;
+using LibationFileManager;
 using LibationFileManager.Templates;
 
 #nullable enable
@@ -20,9 +21,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;
 		}
 
@@ -55,10 +62,13 @@ namespace FileLiberator
 				IsPodcastParent = libraryBook.Book.IsEpisodeParent(),
 				IsPodcast = libraryBook.Book.IsEpisodeChild() || libraryBook.Book.IsEpisodeParent(),
 
-				BitRate = libraryBook.Book.AudioFormat.Bitrate,
-				SampleRate = libraryBook.Book.AudioFormat.SampleRate,
-				Channels = libraryBook.Book.AudioFormat.Channels,
-				Language = libraryBook.Book.Language
+				Language = libraryBook.Book.Language,
+				Codec = libraryBook.Book.UserDefinedItem.LastDownloadedFormat?.CodecString,
+				BitRate = libraryBook.Book.UserDefinedItem.LastDownloadedFormat?.BitRate,
+				SampleRate = libraryBook.Book.UserDefinedItem.LastDownloadedFormat?.SampleRate,
+				Channels = libraryBook.Book.UserDefinedItem.LastDownloadedFormat?.ChannelCount,
+				LibationVersion = libraryBook.Book.UserDefinedItem.LastDownloadedVersion?.ToVersionString(),
+				FileVersion = libraryBook.Book.UserDefinedItem.LastDownloadedFileVersion
 			};
 		}
 

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/App.axaml

@@ -6,7 +6,30 @@
         <local:ViewLocator/>
     </Application.DataTemplates>
 
-    <Application.Styles>
-        <FluentTheme/>
-    </Application.Styles>
+	<Application.Styles>
+		<FluentTheme>
+			<FluentTheme.Palettes>
+				<ColorPaletteResources x:Key="Light" />
+				<ColorPaletteResources x:Key="Dark" />
+			</FluentTheme.Palettes>
+		</FluentTheme>
+
+		<Style Selector="TextBox[IsReadOnly=true]">
+			<Setter Property="Background" Value="{DynamicResource SystemChromeDisabledHighColor}" />
+			<Setter Property="CaretBrush" Value="{DynamicResource SystemControlTransparentBrush}" />
+			<Style Selector="^ /template/ Border#PART_BorderElement">
+				<Setter Property="Background" Value="{DynamicResource SystemChromeDisabledHighColor}" />
+			</Style>
+		</Style>
+		<Style Selector="Button">
+			<Setter Property="VerticalContentAlignment" Value="Center"/>
+			<Style Selector="^">
+				<Setter Property="Foreground" Value="{DynamicResource SystemChromeAltLowColor}" />
+			</Style>
+		</Style>
+		<Style Selector="ScrollBar">
+			<!-- It's called AutoHide, but this is really the mouseover shrink/expand. -->
+			<Setter Property="AllowAutoHide" Value="false"/>
+		</Style>
+	</Application.Styles>
 </Application>

Source/HangoverAvalonia/Controls/CheckedListBox.axaml

@@ -4,27 +4,16 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
 			 mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
              x:Class="HangoverAvalonia.Controls.CheckedListBox">
-	
-	<UserControl.Resources>
-		<RecyclePool x:Key="RecyclePool" />
-		<DataTemplate x:Key="queuedBook">
-			<CheckBox HorizontalAlignment="Stretch" Margin="10,0,0,0" Content="{Binding Item}" IsChecked="{Binding IsChecked, Mode=TwoWay}" />
-		</DataTemplate>
-		<RecyclingElementFactory x:Key="elementFactory" RecyclePool="{StaticResource RecyclePool}">
-			<RecyclingElementFactory.Templates>
-				<StaticResource x:Key="queuedBook" ResourceKey="queuedBook" />
-			</RecyclingElementFactory.Templates>
-		</RecyclingElementFactory>
-	</UserControl.Resources>
 
 	<ScrollViewer
-		Name="scroller"
 		HorizontalScrollBarVisibility="Disabled"
 		VerticalScrollBarVisibility="Auto">
-		<ItemsRepeater IsVisible="True"
-			VerticalCacheLength="1.2"
-			HorizontalCacheLength="1"
-			ItemsSource="{Binding CheckboxItems}"
-			ItemTemplate="{StaticResource elementFactory}" />
+		<ItemsControl ItemsSource="{Binding $parent[1].Items}">
+			<ItemsControl.ItemTemplate>
+				<DataTemplate>
+					<CheckBox HorizontalAlignment="Stretch" Margin="10,0,0,0" Content="{Binding Item}" IsChecked="{Binding IsChecked, Mode=TwoWay}" />
+				</DataTemplate>
+			</ItemsControl.ItemTemplate>
+		</ItemsControl>
 	</ScrollViewer>
 </UserControl>

Source/HangoverAvalonia/Controls/CheckedListBox.axaml.cs

@@ -2,103 +2,18 @@ using Avalonia;
 using Avalonia.Collections;
 using Avalonia.Controls;
 using HangoverAvalonia.ViewModels;
-using ReactiveUI;
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Linq;
 
-namespace HangoverAvalonia.Controls
+namespace HangoverAvalonia.Controls;
+
+public partial class CheckedListBox : UserControl
 {
-	public partial class CheckedListBox : UserControl
+	public static readonly StyledProperty<AvaloniaList<CheckBoxViewModel>> ItemsProperty =
+	AvaloniaProperty.Register<CheckedListBox, AvaloniaList<CheckBoxViewModel>>(nameof(Items));
+
+	public AvaloniaList<CheckBoxViewModel> Items { get => GetValue(ItemsProperty); set => SetValue(ItemsProperty, value); }
+
+	public CheckedListBox()
 	{
-		public event EventHandler<ItemCheckEventArgs> ItemCheck;
-
-		public static readonly StyledProperty<IEnumerable> ItemsProperty =
-		AvaloniaProperty.Register<CheckedListBox, IEnumerable>(nameof(Items));
-
-		public IEnumerable Items { get => GetValue(ItemsProperty); set => SetValue(ItemsProperty, value); }
-		private CheckedListBoxViewModel _viewModel = new();
-
-		public IEnumerable<object> CheckedItems =>
-			_viewModel
-			.CheckboxItems
-			.Where(i => i.IsChecked)
-			.Select(i => i.Item);
-
-		public void SetItemChecked(int i, bool isChecked) => _viewModel.CheckboxItems[i].IsChecked = isChecked;
-		public void SetItemChecked(object item, bool isChecked)
-		{
-			var obj = _viewModel.CheckboxItems.SingleOrDefault(i => i.Item == item);
-			if (obj is not null)
-				obj.IsChecked = isChecked;
-		}
-
-		public CheckedListBox()
-		{
-			InitializeComponent();
-			scroller.DataContext = _viewModel;
-			_viewModel.CheckedChanged += _viewModel_CheckedChanged;
-		}
-
-		private void _viewModel_CheckedChanged(object sender, CheckBoxViewModel e)
-		{
-			var args = new ItemCheckEventArgs { Item = e.Item, ItemIndex = _viewModel.CheckboxItems.IndexOf(e), IsChecked = e.IsChecked };
-			ItemCheck?.Invoke(this, args);
-		}
-
-		protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
-		{
-			if (change.Property.Name == nameof(Items) && Items != null)
-				_viewModel.SetItems(Items);
-			base.OnPropertyChanged(change);
-		}
-
-		public class CheckedListBoxViewModel : ViewModelBase
-		{
-			public event EventHandler<CheckBoxViewModel> CheckedChanged;
-			public AvaloniaList<CheckBoxViewModel> CheckboxItems { get; private set; }
-
-			public void SetItems(IEnumerable items)
-			{
-				UnsubscribeFromItems(CheckboxItems);
-				CheckboxItems = new(items.OfType<object>().Select(o => new CheckBoxViewModel { Item = o }));
-				SubscribeToItems(CheckboxItems);
-				this.RaisePropertyChanged(nameof(CheckboxItems));
-			}
-
-			private void SubscribeToItems(IEnumerable objects)
-			{
-				foreach (var i in objects.OfType<INotifyPropertyChanged>())
-					i.PropertyChanged += I_PropertyChanged;
-			}
-
-			private void UnsubscribeFromItems(AvaloniaList<CheckBoxViewModel> objects)
-			{
-				if (objects is null) return;
-
-				foreach (var i in objects)
-					i.PropertyChanged -= I_PropertyChanged;
-			}
-			private void I_PropertyChanged(object sender, PropertyChangedEventArgs e)
-			{
-				CheckedChanged?.Invoke(this, (CheckBoxViewModel)sender);
-			}
-		}
-		public class CheckBoxViewModel : ViewModelBase
-		{
-			private bool _isChecked;
-			public bool IsChecked { get => _isChecked; set => this.RaiseAndSetIfChanged(ref _isChecked, value); }
-			private object _bookText;
-			public object Item { get => _bookText; set => this.RaiseAndSetIfChanged(ref _bookText, value); }
-		}
-	}
-
-	public class ItemCheckEventArgs : EventArgs
-	{
-		public int ItemIndex { get; init; }
-		public bool IsChecked { get; init; }
-		public object Item { get; init; }
+		InitializeComponent();
 	}
 }

Source/HangoverAvalonia/HangoverAvalonia.csproj

@@ -71,13 +71,12 @@
 	</ItemGroup>
 	<ItemGroup>
 
-		<PackageReference Include="Avalonia" Version="11.2.8" />
-		<PackageReference Include="Avalonia.Desktop" Version="11.2.8" />
+		<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.2.8" />
-		<PackageReference Include="Avalonia.ReactiveUI" Version="11.2.8" />
-		<PackageReference Include="Avalonia.Controls.ItemsRepeater" Version="11.1.5" />
-		<PackageReference Include="Avalonia.Themes.Fluent" Version="11.2.8" />
+		<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/HangoverAvalonia/ViewModels/CheckBoxViewModel.cs

@@ -0,0 +1,11 @@
+using ReactiveUI;
+
+namespace HangoverAvalonia.ViewModels;
+
+public class CheckBoxViewModel : ViewModelBase
+{
+	private bool _isChecked;
+	public bool IsChecked { get => _isChecked; set => this.RaiseAndSetIfChanged(ref _isChecked, value); }
+	private object _bookText;
+	public object Item { get => _bookText; set => this.RaiseAndSetIfChanged(ref _bookText, value); }
+}

Source/HangoverAvalonia/ViewModels/MainVM.Deleted.cs

@@ -1,41 +1,8 @@
-using ApplicationServices;
-using DataLayer;
-using ReactiveUI;
-using System.Collections.Generic;
+namespace HangoverAvalonia.ViewModels;
 
-namespace HangoverAvalonia.ViewModels
+public partial class MainVM
 {
-	public partial class MainVM
-	{
-		private List<LibraryBook> _deletedBooks;
-		public List<LibraryBook> DeletedBooks { get => _deletedBooks; set => this.RaiseAndSetIfChanged(ref _deletedBooks, value); }
-		public string CheckedCountText => $"Checked : {_checkedBooksCount} of {_totalBooksCount}";
+	public TrashBinViewModel TrashBinViewModel { get; } = new();
 
-		private int _totalBooksCount = 0;
-		private int _checkedBooksCount = 0;
-		public int CheckedBooksCount
-		{
-			get => _checkedBooksCount;
-			set
-			{
-				if (_checkedBooksCount != value)
-				{
-					_checkedBooksCount = value;
-					this.RaisePropertyChanged(nameof(CheckedCountText));
-				}
-			}
-		}
-		private void Load_deletedVM()
-		{
-			reload();
-		}
-
-		public void reload()
-		{
-			DeletedBooks = DbContexts.GetContext().GetDeletedLibraryBooks();
-			_checkedBooksCount = 0;
-			_totalBooksCount = DeletedBooks.Count;
-			this.RaisePropertyChanged(nameof(CheckedCountText));
-		}
-	}
+	private void Load_deletedVM() { }
 }

Source/HangoverAvalonia/ViewModels/TrashBinViewModel.cs

@@ -0,0 +1,117 @@
+using ApplicationServices;
+using Avalonia.Collections;
+using DataLayer;
+using ReactiveUI;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace HangoverAvalonia.ViewModels;
+
+public class TrashBinViewModel : ViewModelBase, IDisposable
+{
+	public AvaloniaList<CheckBoxViewModel> DeletedBooks { get; }
+	public string CheckedCountText => $"Checked : {_checkedBooksCount} of {_totalBooksCount}";
+
+	private bool _controlsEnabled = true;
+	public bool ControlsEnabled { get => _controlsEnabled; set => this.RaiseAndSetIfChanged(ref _controlsEnabled, value); }
+
+	private bool? everythingChecked = false;
+	public bool? EverythingChecked
+	{
+		get => everythingChecked;
+		set
+		{
+			everythingChecked = value ?? false;
+
+			if (everythingChecked is true)
+				CheckAll();
+			else if (everythingChecked is false)
+				UncheckAll();
+		}
+	}
+
+	private int _totalBooksCount = 0;
+	private int _checkedBooksCount = -1;
+	public int CheckedBooksCount
+	{
+		get => _checkedBooksCount;
+		set
+		{
+			_checkedBooksCount = value;
+			this.RaisePropertyChanged(nameof(CheckedCountText));
+
+			everythingChecked
+				= _checkedBooksCount == 0 || _totalBooksCount == 0 ? false
+				: _checkedBooksCount == _totalBooksCount ? true
+				: null;
+
+			this.RaisePropertyChanged(nameof(EverythingChecked));
+		}
+	}
+
+	public IEnumerable<LibraryBook> CheckedBooks => DeletedBooks.Where(i => i.IsChecked).Select(i => i.Item).Cast<LibraryBook>();
+
+	public TrashBinViewModel()
+	{
+		DeletedBooks = new()
+		{
+			ResetBehavior = ResetBehavior.Remove
+		};
+
+		tracker = DeletedBooks.TrackItemPropertyChanged(CheckboxPropertyChanged);
+		Reload();
+	}
+
+	public void CheckAll()
+	{
+		foreach (var item in DeletedBooks)
+			item.IsChecked = true;
+	}
+
+	public void UncheckAll()
+	{
+		foreach (var item in DeletedBooks)
+			item.IsChecked = false;
+	}
+
+	public async Task RestoreCheckedAsync()
+	{
+		ControlsEnabled = false;
+		var qtyChanges = await Task.Run(CheckedBooks.RestoreBooks);
+		if (qtyChanges > 0)
+			Reload();
+		ControlsEnabled = true;
+	}
+
+	public async Task PermanentlyDeleteCheckedAsync()
+	{
+		ControlsEnabled = false;
+		var qtyChanges = await Task.Run(CheckedBooks.PermanentlyDeleteBooks);
+		if (qtyChanges > 0)
+			Reload();
+		ControlsEnabled = true;
+	}
+
+	public void Reload()
+	{
+		var deletedBooks = DbContexts.GetContext().GetDeletedLibraryBooks();
+
+		DeletedBooks.Clear();
+		DeletedBooks.AddRange(deletedBooks.Select(lb => new CheckBoxViewModel { Item = lb }));
+
+		_totalBooksCount = DeletedBooks.Count;
+		CheckedBooksCount = 0;
+	}
+
+	private IDisposable tracker;
+	private void CheckboxPropertyChanged(Tuple<object, PropertyChangedEventArgs> e)
+	{
+		if (e.Item2.PropertyName == nameof(CheckBoxViewModel.IsChecked))
+			CheckedBooksCount = DeletedBooks.Count(b => b.IsChecked);
+	}
+
+	public void Dispose() => tracker?.Dispose();
+}

Source/HangoverAvalonia/Views/MainWindow.Deleted.cs

@@ -1,40 +1,12 @@
-using ApplicationServices;
-using DataLayer;
-using HangoverAvalonia.Controls;
-using System.Linq;
+namespace HangoverAvalonia.Views;
 
-namespace HangoverAvalonia.Views
+public partial class MainWindow
 {
-	public partial class MainWindow
+	private void deletedTab_VisibleChanged(bool isVisible)
 	{
-		private void deletedTab_VisibleChanged(bool isVisible)
-		{
-			if (!isVisible)
-				return;
+		if (!isVisible)
+			return;
 
-			if (_viewModel.DeletedBooks.Count == 0)
-				_viewModel.reload();
-		}
-		public void Deleted_CheckedListBox_ItemCheck(object sender, ItemCheckEventArgs args)
-		{
-			_viewModel.CheckedBooksCount = deletedCbl.CheckedItems.Count();
-		}
-		public void Deleted_CheckAll_Click(object sender, Avalonia.Interactivity.RoutedEventArgs e)
-		{
-			foreach (var item in deletedCbl.Items)
-				deletedCbl.SetItemChecked(item, true);
-		}
-		public void Deleted_UncheckAll_Click(object sender, Avalonia.Interactivity.RoutedEventArgs e)
-		{
-			foreach (var item in deletedCbl.Items)
-				deletedCbl.SetItemChecked(item, false);
-		}
-		public void Deleted_Save_Click(object sender, Avalonia.Interactivity.RoutedEventArgs e)
-		{
-			var libraryBooksToRestore = deletedCbl.CheckedItems.Cast<LibraryBook>().ToList();
-			var qtyChanges = libraryBooksToRestore.RestoreBooks();
-			if (qtyChanges > 0)
-				_viewModel.reload();
-		}
+		_viewModel.TrashBinViewModel.Reload();
 	}
 }

Source/HangoverAvalonia/Views/MainWindow.axaml

@@ -15,13 +15,11 @@
 
 	<TabControl Name="tabControl1" Grid.Row="0">
 		<TabControl.Styles>
-			<Style Selector="ItemsPresenter#PART_ItemsPresenter">
-				<Setter Property="Height" Value="23"/>
+			<Style Selector="TabControl /template/ ItemsPresenter#PART_ItemsPresenter">
+				<Setter Property="Height" Value="33"/>
 			</Style>
-			<Style Selector="TabItem">
-				<Setter Property="MinHeight" Value="40"/>
-				<Setter Property="Height" Value="40"/>
-				<Setter Property="Padding" Value="8,2,8,5"/>
+			<Style Selector="TabItem /template/ Border#PART_LayoutRoot">
+				<Setter Property="Height" Value="33"/>
 			</Style>
 			<Style Selector="TabItem#Header TextBlock">
 				<Setter Property="MinHeight" Value="5"/>
@@ -51,6 +49,7 @@
 				
 				<TextBox
 					Margin="0,5,0,5"
+					AcceptsReturn="True"
 					Grid.Row="2" Text="{Binding SqlQuery, Mode=OneWayToSource}" />
 				
 				<Button
@@ -73,33 +72,58 @@
 			<TabItem.Header>
 				<TextBlock FontSize="14" VerticalAlignment="Center">Deleted Books</TextBlock>
 			</TabItem.Header>
-
 			<Grid
+				DataContext="{Binding TrashBinViewModel}"
 				RowDefinitions="Auto,*,Auto">
 
 				<TextBlock
 					Grid.Row="0"
 					Margin="5"
-					Text="To restore deleted book, check box and save" />
+					Text="Check books you want to permanently delete from or restore to Libation" />
 
 				<controls:CheckedListBox
 					Grid.Row="1"
 					Margin="5,0,5,0"
 					BorderThickness="1"
 					BorderBrush="Gray"
-					Name="deletedCbl"
+					IsEnabled="{Binding	ControlsEnabled}"
 					Items="{Binding DeletedBooks}" />
 
 				<Grid
 					Grid.Row="2"
 					Margin="5"
-					ColumnDefinitions="Auto,Auto,Auto,*">
+					ColumnDefinitions="Auto,Auto,*,Auto">
 
-					<Button Grid.Column="0" Margin="0,0,20,0" Content="Check All" Click="Deleted_CheckAll_Click" />
-					<Button Grid.Column="1" Margin="0,0,20,0" Content="Uncheck All" Click="Deleted_UncheckAll_Click" />
-					<TextBlock Grid.Column="2" VerticalAlignment="Center" Text="{Binding CheckedCountText}" />
-					<Button Grid.Column="3" HorizontalAlignment="Right" Content="Save" Click="Deleted_Save_Click" />
+					<CheckBox
+						IsEnabled="{Binding	ControlsEnabled}"
+						IsThreeState="True"
+						Margin="0,0,20,0"
+						IsChecked="{Binding EverythingChecked}"
+						Content="Everything" />
 
+					<TextBlock
+						Grid.Column="1"
+						VerticalAlignment="Center"
+						Text="{Binding CheckedCountText}" />
+
+					<Button
+						IsEnabled="{Binding	ControlsEnabled}"
+						Grid.Column="2"
+						Margin="0,0,20,0"
+						HorizontalAlignment="Right"
+						VerticalAlignment="Stretch"
+						VerticalContentAlignment="Center"
+						Content="Restore"
+						Command="{Binding RestoreCheckedAsync}"/>
+
+					<Button
+						IsEnabled="{Binding	ControlsEnabled}"
+						Grid.Column="3"
+						Command="{Binding PermanentlyDeleteCheckedAsync}" >
+						<TextBlock
+							TextAlignment="Center"
+							Text="Permanently Delete&#xa;from Libation" />
+					</Button>
 				</Grid>
 			</Grid>
 		</TabItem>

Source/HangoverAvalonia/Views/MainWindow.axaml.cs

@@ -18,7 +18,6 @@ namespace HangoverAvalonia.Views
 
 		public void OnLoad()
 		{
-			deletedCbl.ItemCheck += Deleted_CheckedListBox_ItemCheck;
 			databaseTab.PropertyChanged += (_, e) => { if (e.Property.Name == nameof(TabItem.IsSelected)) databaseTab_VisibleChanged(databaseTab.IsSelected); };
 			deletedTab.PropertyChanged += (_, e) => { if (e.Property.Name == nameof(TabItem.IsSelected)) deletedTab_VisibleChanged(deletedTab.IsSelected); };
 			cliTab.PropertyChanged += (_, e) => { if (e.Property.Name == nameof(TabItem.IsSelected)) cliTab_VisibleChanged(cliTab.IsSelected); };

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/CheckedListBox.axaml

@@ -5,26 +5,15 @@
 			 mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
              x:Class="LibationAvalonia.Controls.CheckedListBox">
 	
-	<UserControl.Resources>
-		<RecyclePool x:Key="RecyclePool" />
-		<DataTemplate x:Key="queuedBook">
-			<CheckBox HorizontalAlignment="Stretch" Margin="10,0,0,0" Content="{Binding Item}" IsChecked="{Binding IsChecked, Mode=TwoWay}" />
-		</DataTemplate>
-		<RecyclingElementFactory x:Key="elementFactory" RecyclePool="{StaticResource RecyclePool}">
-			<RecyclingElementFactory.Templates>
-				<StaticResource x:Key="queuedBook" ResourceKey="queuedBook" />
-			</RecyclingElementFactory.Templates>
-		</RecyclingElementFactory>
-	</UserControl.Resources>
-
 	<ScrollViewer
-		Name="scroller"
 		HorizontalScrollBarVisibility="Disabled"
 		VerticalScrollBarVisibility="Auto">
-		<ItemsRepeater IsVisible="True"
-			VerticalCacheLength="1.2"
-			HorizontalCacheLength="1"
-			ItemsSource="{Binding CheckboxItems}"
-			ItemTemplate="{StaticResource elementFactory}" />
+		<ItemsControl ItemsSource="{Binding $parent[1].Items}">
+			<ItemsControl.ItemTemplate>
+				<DataTemplate>
+					<CheckBox HorizontalAlignment="Stretch" Margin="10,0,0,0" Content="{Binding Item}" IsChecked="{Binding IsChecked, Mode=TwoWay}" />
+				</DataTemplate>
+			</ItemsControl.ItemTemplate>
+		</ItemsControl>
 	</ScrollViewer>
 </UserControl>

Source/LibationAvalonia/Controls/CheckedListBox.axaml.cs

@@ -12,24 +12,10 @@ namespace LibationAvalonia.Controls
 		AvaloniaProperty.Register<CheckedListBox, AvaloniaList<CheckBoxViewModel>>(nameof(Items));
 
 		public AvaloniaList<CheckBoxViewModel> Items { get => GetValue(ItemsProperty); set => SetValue(ItemsProperty, value); }
-		private CheckedListBoxViewModel _viewModel = new();
 
 		public CheckedListBox()
 		{
 			InitializeComponent();
-			scroller.DataContext = _viewModel;
-		}
-		protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
-		{
-			if (change.Property.Name == nameof(Items) && Items != null)
-				_viewModel.CheckboxItems = Items;
-			base.OnPropertyChanged(change);
-		}
-
-		private class CheckedListBoxViewModel : ViewModelBase
-		{
-			private AvaloniaList<CheckBoxViewModel> _checkboxItems;
-			public AvaloniaList<CheckBoxViewModel> CheckboxItems { get => _checkboxItems; set => this.RaiseAndSetIfChanged(ref _checkboxItems, value); }
 		}
 	}
 

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

@@ -43,14 +43,40 @@
 				<controls:WheelComboBox
 					Margin="5,0,0,0"
 					Grid.Column="1"
-					SelectionChanged="Quality_SelectionChanged"
 					ItemsSource="{CompiledBinding DownloadQualities}"
 					SelectedItem="{CompiledBinding FileDownloadQuality}"/>
 			</Grid>
 
-			<Grid ColumnDefinitions="*,Auto" Margin="0,5,0,0"
-				  IsEnabled="{CompiledBinding SpatialSelected}"
+
+			<Grid ColumnDefinitions="*,*">
+
+				<CheckBox
+					IsChecked="{CompiledBinding UseWidevine, Mode=TwoWay}"
+					IsCheckedChanged="UseWidevine_IsCheckedChanged"
+					ToolTip.Tip="{CompiledBinding UseWidevineTip}">
+					<TextBlock Text="{CompiledBinding UseWidevineText}" />
+				</CheckBox>
+				
+				<CheckBox
+					Grid.Column="1"
+					HorizontalAlignment="Right"
+					ToolTip.Tip="{CompiledBinding RequestSpatialTip}"
+					IsEnabled="{CompiledBinding UseWidevine}"
+					IsChecked="{CompiledBinding RequestSpatial, Mode=TwoWay}">
+					<TextBlock Text="{CompiledBinding RequestSpatialText}" />
+				</CheckBox>
+			</Grid>
+
+			<Grid ColumnDefinitions="*,Auto"
 				  ToolTip.Tip="{CompiledBinding SpatialAudioCodecTip}">
+				<Grid.IsEnabled>
+					<MultiBinding Converter="{x:Static BoolConverters.And}">
+						<MultiBinding.Bindings>
+							<CompiledBinding Path="UseWidevine"/>
+							<CompiledBinding Path="RequestSpatial"/>
+						</MultiBinding.Bindings>
+					</MultiBinding>
+				</Grid.IsEnabled>
 				
 				<TextBlock
 					VerticalAlignment="Center"
@@ -62,6 +88,11 @@
 					ItemsSource="{CompiledBinding SpatialAudioCodecs}"
 					SelectedItem="{CompiledBinding SpatialAudioCodec}"/>
 			</Grid>
+			
+			
+			
+			
+			
 
 			<CheckBox IsChecked="{CompiledBinding CreateCueSheet, Mode=TwoWay}">
 				<TextBlock Text="{CompiledBinding CreateCueSheetText}" />

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;
 
@@ -22,21 +23,40 @@ namespace LibationAvalonia.Controls.Settings
 			}
 		}
 
-
-		public async void Quality_SelectionChanged(object sender, SelectionChangedEventArgs e)
+		private async void UseWidevine_IsCheckedChanged(object sender, Avalonia.Interactivity.RoutedEventArgs e)
 		{
-			if (_viewModel.SpatialSelected)
+			if (sender is CheckBox cbox && cbox.IsChecked is true)
 			{
 				using var accounts = AudibleApiStorage.GetAccountsSettingsPersister();
 
 				if (!accounts.AccountsSettings.Accounts.Any(a => a.IdentityTokens.DeviceType == AudibleApi.Resources.DeviceType))
 				{
-					await MessageBox.Show(VisualRoot as Window,
-						"Your must remove account(s) from Libation and then re-add them to enable spatial audiobook downloads.",
-						"Spatial Audio Unavailable",
-						MessageBoxButtons.OK);
+					if (VisualRoot is Window parent)
+					{
+						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.YesNo,
+						MessageBoxIcon.Question,
+						MessageBoxDefaultButton.Button2);
 
-					_viewModel.FileDownloadQuality = _viewModel.DownloadQualities[1];
+						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;
@@ -60,7 +61,7 @@ namespace LibationAvalonia.Dialogs
 		private void Link_getlibation(object sender, Avalonia.Input.TappedEventArgs e) => Dinah.Core.Go.To.Url(AppScaffolding.LibationScaffolding.WebsiteUrl);
 
 		private void ViewReleaseNotes_Tapped(object sender, Avalonia.Input.TappedEventArgs e)
-			=> Dinah.Core.Go.To.Url($"{AppScaffolding.LibationScaffolding.RepositoryUrl}/releases/tag/v{AppScaffolding.LibationScaffolding.BuildVersion.ToString(3)}");
+			=> Dinah.Core.Go.To.Url($"{AppScaffolding.LibationScaffolding.RepositoryUrl}/releases/tag/v{AppScaffolding.LibationScaffolding.BuildVersion.ToVersionString()}");
 	}
 
 	public class AboutVM : ViewModelBase

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/BookDetailsDialog.axaml.cs

@@ -114,7 +114,6 @@ Title: {title}
 Author(s): {Book.AuthorNames()}
 Narrator(s): {Book.NarratorNames()}
 Length: {(Book.LengthInMinutes == 0 ? "" : $"{Book.LengthInMinutes / 60} hr {Book.LengthInMinutes % 60} min")}
-Audio Bitrate: {Book.AudioFormat}
 Category: {string.Join(", ", Book.LowestCategoryNames())}
 Purchase Date: {libraryBook.DateAdded:d}
 Language: {Book.Language}

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/EditQuickFilters.axaml

@@ -24,9 +24,8 @@
 			CanUserSortColumns="False"
 			AutoGenerateColumns="False"
 			IsReadOnly="False"
-			ItemsSource="{Binding Filters}"
+			ItemsSource="{CompiledBinding Filters}"
 			GridLinesVisibility="All">
-
 			<DataGrid.Columns>
 
 				<DataGridTemplateColumn Header="Delete">
@@ -38,7 +37,7 @@
 								VerticalAlignment="Stretch"
 								HorizontalAlignment="Stretch"
 								HorizontalContentAlignment="Center"
-								IsEnabled="{Binding !IsDefault}"
+								IsEnabled="{CompiledBinding !IsDefault}"
 								Click="DeleteButton_Clicked" />
 
 						</DataTemplate>
@@ -48,14 +47,13 @@
 				<DataGridTextColumn
     				Width="*"
 				    IsReadOnly="False"
-				    Binding="{Binding Name, Mode=TwoWay}"
+				    Binding="{CompiledBinding Name, Mode=TwoWay}"
 				    Header="Name"/>
 
-
 				<DataGridTextColumn
 					Width="*"
 					IsReadOnly="False"
-					Binding="{Binding FilterString, Mode=TwoWay}"
+					Binding="{CompiledBinding FilterString, Mode=TwoWay}"
 					Header="Filter"/>
 
 				<DataGridTemplateColumn Header="Move&#xa;Up">
@@ -67,16 +65,19 @@
 								VerticalAlignment="Stretch"
 								HorizontalAlignment="Stretch"
 								HorizontalContentAlignment="Center"
-								IsEnabled="{Binding !IsDefault}"
-								ToolTip.Tip="Export account authorization to audible-cli"
-								Click="MoveUpButton_Clicked" />
+								Click="MoveUpButton_Clicked">
+								<Button.IsEnabled>
+									<MultiBinding Converter="{x:Static BoolConverters.And}">
+										<CompiledBinding Path="!IsTop" />
+										<CompiledBinding Path="!IsDefault" />
+									</MultiBinding>
+								</Button.IsEnabled>
+							</Button>
 
 						</DataTemplate>
 					</DataGridTemplateColumn.CellTemplate>
 				</DataGridTemplateColumn>
-
-
-
+				
 				<DataGridTemplateColumn Header="Move&#xa;Down">
 					<DataGridTemplateColumn.CellTemplate>
 						<DataTemplate>
@@ -86,15 +87,18 @@
 								VerticalAlignment="Stretch"
 								HorizontalAlignment="Stretch"
 								HorizontalContentAlignment="Center"
-								IsEnabled="{Binding !IsDefault}"
-								ToolTip.Tip="Export account authorization to audible-cli"
-								Click="MoveDownButton_Clicked" />
+								Click="MoveDownButton_Clicked">
+								<Button.IsEnabled>
+									<MultiBinding Converter="{x:Static BoolConverters.And}">
+										<CompiledBinding Path="!IsBottom" />
+										<CompiledBinding Path="!IsDefault" />
+									</MultiBinding>
+								</Button.IsEnabled>
+							</Button>
 
 						</DataTemplate>
 					</DataGridTemplateColumn.CellTemplate>
 				</DataGridTemplateColumn>
-
-
 			</DataGrid.Columns>
 		</DataGrid>
 		<Grid

Source/LibationAvalonia/Dialogs/EditQuickFilters.axaml.cs

@@ -1,15 +1,15 @@
 using AudibleUtilities;
+using Avalonia.Collections;
 using Avalonia.Controls;
 using LibationFileManager;
 using ReactiveUI;
-using System.Collections.ObjectModel;
 using System.Linq;
 
 namespace LibationAvalonia.Dialogs
 {
 	public partial class EditQuickFilters : DialogWindow
 	{
-		public ObservableCollection<Filter> Filters { get; } = new();
+		public AvaloniaList<Filter> Filters { get; } = new();
 
 		public class Filter : ViewModels.ViewModelBase
 		{ 
@@ -17,11 +17,8 @@ namespace LibationAvalonia.Dialogs
             public string Name
             {
                 get => _name;
-                set
-                {
-                    this.RaiseAndSetIfChanged(ref _name, value);
-                }
-            }
+                set => this.RaiseAndSetIfChanged(ref _name, value);
+			}
 
             private string _filterString;
 			public string FilterString
@@ -35,6 +32,10 @@ namespace LibationAvalonia.Dialogs
 				}
 			}
 			public bool IsDefault { get; private set; } = true;
+			private bool _isTop;
+			private bool _isBottom;
+			public bool IsTop { get => _isTop; set => this.RaiseAndSetIfChanged(ref _isTop, value); }
+			public bool IsBottom { get => _isBottom; set => this.RaiseAndSetIfChanged(ref _isBottom, value); }
 
 			public QuickFilters.NamedFilter AsNamedFilter() => new(FilterString, Name);
 
@@ -44,12 +45,12 @@ namespace LibationAvalonia.Dialogs
 			InitializeComponent();
 			if (Design.IsDesignMode)
 			{
-				Filters = new ObservableCollection<Filter>([
-					new Filter { Name = "Filter 1", FilterString = "[filter1 string]" },
+				Filters = [
+					new Filter { Name = "Filter 1", FilterString = "[filter1 string]", IsTop = true },
 					new Filter { Name = "Filter 2", FilterString = "[filter2 string]" },
 					new Filter { Name = "Filter 3", FilterString = "[filter3 string]" },
-					new Filter { Name = "Filter 4", FilterString = "[filter4 string]" }
-					]);
+					new Filter { Name = "Filter 4", FilterString = "[filter4 string]", IsBottom = true },
+					new Filter()];
 				DataContext = this;
 				return;
 			}
@@ -65,6 +66,8 @@ namespace LibationAvalonia.Dialogs
 			ControlToFocusOnShow = this.FindControl<Button>(nameof(saveBtn));
 
 			var allFilters = QuickFilters.Filters.Select(f => new Filter { FilterString = f.Filter, Name = f.Name }).ToList();
+			allFilters[0].IsTop = true;
+			allFilters[^1].IsBottom = true;
 			allFilters.Add(new Filter());
 
 			foreach (var f in allFilters)
@@ -81,6 +84,7 @@ namespace LibationAvalonia.Dialogs
 			var newBlank = new Filter();
 			newBlank.PropertyChanged += Filter_PropertyChanged;
 			Filters.Insert(Filters.Count, newBlank);
+			ReIndexFilters();
 		}
 
 		protected override void SaveAndClose()
@@ -98,30 +102,54 @@ namespace LibationAvalonia.Dialogs
 
 				filter.PropertyChanged -= Filter_PropertyChanged;
 				Filters.Remove(filter);
+				ReIndexFilters();
 			}
 		}
 
 		public void MoveUpButton_Clicked(object sender, Avalonia.Interactivity.RoutedEventArgs e)
 		{
-			if (e.Source is Button btn && btn.DataContext is Filter filter)
-			{
-				var index = Filters.IndexOf(filter);
-				if (index < 1) return;
+			if (e.Source is not Button btn || btn.DataContext is not Filter filter || filter.IsDefault)
+				return;
 
-				Filters.Remove(filter);
-				Filters.Insert(index - 1, filter);
-			}
+			var oldIndex = Filters.IndexOf(filter);
+			if (oldIndex < 1) return;
+
+			var filterCount = Filters.Count(f => !f.IsDefault);
+
+			MoveFilter(oldIndex, oldIndex - 1, filterCount);
 		}
 
 		public void MoveDownButton_Clicked(object sender, Avalonia.Interactivity.RoutedEventArgs e)
 		{
-			if (e.Source is Button btn && btn.DataContext is Filter filter)
-			{
-				var index = Filters.IndexOf(filter);
-				if (index >= Filters.Count - 2) return;
+			if (e.Source is not Button btn || btn.DataContext is not Filter filter || filter.IsDefault)
+				return;
 
-				Filters.Remove(filter);
-				Filters.Insert(index + 1, filter);
+			var filterCount = Filters.Count(f => !f.IsDefault);
+			var oldIndex = Filters.IndexOf(filter);
+			if (oldIndex >= filterCount - 1) return;
+
+			MoveFilter(oldIndex, oldIndex + 1, filterCount);
+		}
+
+		private void MoveFilter(int oldIndex, int newIndex, int filterCount)
+		{
+			var filter = Filters[oldIndex];
+			Filters.RemoveAt(oldIndex);
+			Filters.Insert(newIndex, filter);
+
+			Filters[oldIndex].IsTop = oldIndex == 0;
+			Filters[newIndex].IsTop = newIndex == 0;
+			Filters[newIndex].IsBottom = newIndex == filterCount - 1;
+			Filters[oldIndex].IsBottom = oldIndex == filterCount - 1;
+		}
+
+		private void ReIndexFilters()
+		{
+			var filterCount = Filters.Count(f => !f.IsDefault);
+			for (int i = filterCount - 1; i >= 0; i--)
+			{
+				Filters[i].IsTop = i == 0;
+				Filters[i].IsBottom = i == filterCount - 1;
 			}
 		}
 	}

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 Grid.Column="0" Margin="5,0,5,0" VerticalAlignment="Top">				
-					<Image IsVisible="{Binding IsAsterisk}" Stretch="None" Source="/Assets/MBIcons/Asterisk.png"/>
-					<Image IsVisible="{Binding IsError}" Stretch="None" Source="/Assets/MBIcons/error.png"/>
-					<Image IsVisible="{Binding IsQuestion}" Stretch="None" Source="/Assets/MBIcons/Question.png"/>
-					<Image IsVisible="{Binding IsExclamation}" Stretch="None" Source="/Assets/MBIcons/Exclamation.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;