Increment Version

New audio format features, bug fixes, and minor tweaks/improvements.

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)|

Source/AaxDecrypter/AaxDecrypter.csproj

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

Source/AaxDecrypter/AaxcDownloadConvertBase.cs

@@ -1,19 +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;
 
-		public 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)
@@ -25,18 +27,19 @@ 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 = DownloadOptions.DecryptionKeys.Select(k => new Guid(k.KeyPart1, bigEndian: true)).ToArray();
+				var keyIds = keys.Select(k => new Guid(k.KeyPart1, bigEndian: true)).ToArray();
 
 				var dash = new DashFile(InputFileStream);
 				var kidIndex = Array.IndexOf(keyIds, dash.Tenc.DefaultKID);
@@ -44,26 +47,38 @@ namespace AaxDecrypter
 				if (kidIndex == -1)
 					throw new InvalidOperationException($"None of the {keyIds.Length} key IDs match the dash file's default KeyID of {dash.Tenc.DefaultKID}");
 
-				DownloadOptions.DecryptionKeys[0] = DownloadOptions.DecryptionKeys[kidIndex];
-				var keyId = DownloadOptions.DecryptionKeys[kidIndex].KeyPart1;
-				var key = DownloadOptions.DecryptionKeys[kidIndex].KeyPart2;
-
+				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.DecryptionKeys[0].KeyPart1);
+				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.DecryptionKeys[0].KeyPart1, DownloadOptions.DecryptionKeys[0].KeyPart2);
+				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()
@@ -115,11 +130,11 @@ namespace AaxDecrypter
 					AaxFile.AppleTags.AppleListBox.EditOrAddFreeformTag(tagDomain, "PART", part.ToString());
 			}
 
-			OnInitialized();
 			OnRetrievedTitle(AaxFile.AppleTags.TitleSansUnabridged);
 			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,24 +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();
+				NfsPersister.Dispose();
 
 			await progressTask;
 
 			var speedup = DownloadOptions.RuntimeLength / elapsed;
 			Serilog.Log.Information($"Speedup is {speedup:F0}x realtime.");
 
-			nfsPersister.Dispose();
+			NfsPersister.Dispose();
 			return success;
 
 			async Task reportProgress()
@@ -120,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)
 			{
@@ -176,58 +175,9 @@ namespace AaxDecrypter
 			return !IsCanceled;
 		}
 
-		private async Task<bool> CleanupAsync()
-		{
-			if (IsCanceled) return false;
-
-			FileUtility.SaferDelete(jsonDownloadState);
-
-			if (DownloadOptions.DecryptionKeys != null &&
-				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={Convert.ToHexString(DownloadOptions.DecryptionKeys[0].KeyPart1)}");
-					aaxPath = Path.ChangeExtension(tempFilePath, ".aax");
-				}
-				else if (fileType is AAXClean.FileType.Aaxc)
-				{
-					await File.WriteAllTextAsync(keyPath,
-						$"Key={Convert.ToHexString(DownloadOptions.DecryptionKeys[0].KeyPart1)}{Environment.NewLine}" +
-						$"IV={Convert.ToHexString(DownloadOptions.DecryptionKeys[0].KeyPart2)}");
-					aaxPath = Path.ChangeExtension(tempFilePath, ".aaxc");
-				}
-				else if (fileType is AAXClean.FileType.Dash)
-				{
-					await File.WriteAllTextAsync(keyPath,
-						$"KeyId={Convert.ToHexString(DownloadOptions.DecryptionKeys[0].KeyPart1)}{Environment.NewLine}" +
-						$"Key={Convert.ToHexString(DownloadOptions.DecryptionKeys[0].KeyPart2)}");
-					aaxPath = Path.ChangeExtension(tempFilePath, ".dash");
-				}
-				else
-					throw new InvalidOperationException($"Unknown file type: {fileType}");
-
-				if (tempFilePath != aaxPath)
-					FileUtility.SaferMove(tempFilePath, aaxPath);
-
-				OnFileCreated(aaxPath);
-				OnFileCreated(keyPath);
-			}
-			else
-				FileUtility.SaferDelete(tempFilePath);
-
-			return !IsCanceled;
-		}
-
 		private NetworkFileStreamPersister OpenNetworkFileStream()
 		{
-			NetworkFileStreamPersister nfsp = default;
+			NetworkFileStreamPersister? nfsp = default;
 			try
 			{
 				if (!File.Exists(jsonDownloadState))
@@ -248,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,6 +1,5 @@
 using AAXClean;
 using System;
-using System.Threading.Tasks;
 
 #nullable enable
 namespace AaxDecrypter
@@ -33,11 +32,8 @@ namespace AaxDecrypter
 		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; }
@@ -52,9 +48,7 @@ namespace AaxDecrypter
         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

@@ -100,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);

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.4.7.1</Version>
+    <Version>12.4.10.2</Version>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Octokit" Version="14.0.0" />
     <!-- Do not remove unused Serilog.Sinks -->
-    <!-- Only ZipFile sink is currently used. By user request (June 2024) others packages are included for experimental use. -->
+    <!-- Only File sink is currently used. By user request (June 2024) others packages are included for experimental use. -->
     <PackageReference Include="Serilog.Sinks.Console" Version="6.0.0" />
     <PackageReference Include="Serilog.Sinks.File" Version="7.0.0" />
-    <PackageReference Include="Serilog.Sinks.ZipFile" Version="3.1.1" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\ApplicationServices\ApplicationServices.csproj" />

Source/AppScaffolding/LibationScaffolding.cs

@@ -115,11 +115,22 @@ namespace AppScaffolding
 		{
 			if (config.GetObject("Serilog") is JObject serilog)
 			{
-				if (serilog["WriteTo"] is JArray sinks && sinks.FirstOrDefault(s => s["Name"].Value<string>() is "File") is JToken fileSink)
+				bool fileChanged = false;
+				if (serilog.SelectToken("$.WriteTo[?(@.Name == 'ZipFile')]", false) is JObject zipFileSink)
 				{
-					fileSink["Name"] = "ZipFile";
-					config.SetNonString(serilog.DeepClone(), "Serilog");
+					zipFileSink["Name"] = "File";
+					fileChanged = true;
 				}
+				var hooks = $"{nameof(LibationFileManager)}.{nameof(FileSinkHook)}, {nameof(LibationFileManager)}";
+				if (serilog.SelectToken("$.WriteTo[?(@.Name == 'File')].Args", false) is JObject fileSinkArgs
+					&& fileSinkArgs["hooks"]?.Value<string>() != hooks)
+				{
+					fileSinkArgs["hooks"] = hooks;
+					fileChanged = true;
+				}
+
+				if (fileChanged)
+					config.SetNonString(serilog.DeepClone(), "Serilog");
 				return;
 			}
 
@@ -129,17 +140,17 @@ namespace AppScaffolding
 				{ "WriteTo", new JArray
 					{
 						// ABOUT SINKS
-						// Only ZipFile sink is currently used. By user request (June 2024) others packages are included for experimental use.
+						// Only File sink is currently used. By user request (June 2024) others packages are included for experimental use.
 
 						// new JObject { {"Name", "Console" } }, // this has caused more problems than it's solved
 						new JObject
 						{
-							{ "Name", "ZipFile" },
+							{ "Name", "File" },
 							{ "Args",
 								new JObject
 								{
 									// for this sink to work, a path must be provided. we override this below
-									{ "path", Path.Combine(config.LibationFiles, "_Log.log") },
+									{ "path", Path.Combine(config.LibationFiles, "Log.log") },
 									{ "rollingInterval", "Month" },
 									// Serilog template formatting examples
 									// - default:                    "{Timestamp:yyyy-MM-dd HH:mm:ss.fff zzz} [{Level:u3}] {Message:lj}{NewLine}{Exception}"
@@ -274,7 +285,7 @@ namespace AppScaffolding
                 disableIPv6 = AppContext.TryGetSwitch("System.Net.DisableIPv6", out bool disableIPv6Value),
 			});
 
-            if (InteropFactory.InteropFunctionsType is null)
+			if (InteropFactory.InteropFunctionsType is null)
                 Serilog.Log.Logger.Warning("WARNING: OSInteropProxy.InteropFunctionsType is null");
         }
 

Source/ApplicationServices/LibraryCommands.cs

@@ -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
 {
@@ -115,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)
@@ -135,16 +157,16 @@ 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(),
@@ -152,8 +174,13 @@ namespace ApplicationServices
 				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
 	{
@@ -162,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);
 
@@ -174,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);
 		}
 
@@ -227,7 +253,13 @@ namespace ApplicationServices
                 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)
@@ -248,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);
@@ -269,56 +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.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/AudibleUtilities.csproj

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

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,7 +13,6 @@ namespace DataLayer.Configurations
 
             entity.OwnsOne(b => b.Rating);
 
-            entity.Property(nameof(Book._audioFormat));
             //
             // CRUCIAL: ignore unmapped collections, even get-only
             //
@@ -50,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/EfClasses/Book.cs

@@ -43,18 +43,13 @@ namespace DataLayer
         public ContentType ContentType { get; private set; }
         public string Locale { get; private set; }
 
-		//This field is now unused, however, there is little sense in adding a
-		//database migration to remove an unused field. Leave it for compatibility.
-#pragma warning disable CS0649 // Field 'Book._audioFormat' is never assigned to, and will always have its default value 0
-		internal long _audioFormat;
-#pragma warning restore CS0649
-
         // 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; }
 
@@ -242,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 ?? false;
             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/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());
 
@@ -166,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/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,30 +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 _, LibraryBookDto libraryBook, string extension)
-			=> Templates.File.GetFilename(libraryBook, 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);
-		
-		/// <summary>
-		/// PDF: audio file does not exist
-		/// </summary>
-		public static string GetBooksDirectoryFilename(this AudioFileStorage _, LibraryBookDto dto, string extension)
-			=> Templates.File.GetFilename(dto, 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,174 +1,196 @@
-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" };
-
-                downloadValidation(libraryBook);
 				var api = await libraryBook.GetApiAsync();
-                var config = Configuration.Instance;
-				using var downloadOptions = await DownloadOptions.InitiateDownloadAsync(api, config, libraryBook);
+				using var downloadOptions = await DownloadOptions.InitiateDownloadAsync(api, 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(api, config, downloadOptions);
-                }
-                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 =
-                [
-                    Task.Run(() => downloadCoverArt(downloadOptions)),
-                    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(AudibleApi.Api api, Configuration config, DownloadOptions dlOptions)
-        {
-			var outFileName = AudibleFileStorage.Audio.GetInProgressFilename(dlOptions.LibraryBookDto, 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(dlOptions.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(dlOptions.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(dlOptions.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;
 
 			#region Prevent erroneous truncation due to incorrect chapter info
@@ -179,155 +201,312 @@ namespace FileLiberator
 			//the chapter. This is never desirable, so pad the last chapter to match
 			//the original audio length.
 
-			var fileDuration = converter.AaxFile.Duration;
-            if (options.Config.StripAudibleBrandAudio)
-                fileDuration -= TimeSpan.FromMilliseconds(options.ContentMetadata.ChapterInfo.BrandOutroDurationMs);
+			var fileDuration = aaxFile.Duration;
+			if (options.Config.StripAudibleBrandAudio)
+				fileDuration -= TimeSpan.FromMilliseconds(options.ContentMetadata.ChapterInfo.BrandOutroDurationMs);
 
-            var durationDelta = fileDuration - options.ChapterInfo.EndOffset;
+			var durationDelta = fileDuration - options.ChapterInfo.EndOffset;
 			//Remove the last chapter and re-add it with the durationDelta that will
-            //make the chapter's end coincide with the end of the audio file.
-			var chapters = options.ChapterInfo.Chapters as List<AAXClean.Chapter>;
+			//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
+			
+			#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.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(DownloadOptions options)
-        {
-			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(options.LibraryBook);
-                coverPath = AudibleFileStorage.Audio.GetBooksDirectoryFilename(options.LibraryBookDto, ".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(options.LibraryBook.Book.PictureLarge ?? options.LibraryBook.Book.PictureId, PictureSize.Native));
-                if (picBytes.Length > 0)
-                {
-                    File.WriteAllBytes(coverPath, picBytes);
-                    SetFileTime(options.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 {options.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,7 +10,7 @@ using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Net.Http;
-using System.Text.RegularExpressions;
+using System.Threading;
 using System.Threading.Tasks;
 
 #nullable enable
@@ -24,9 +24,10 @@ public partial class DownloadOptions
 	/// <summary>
 	/// Initiate an audiobook download from the audible api.
 	/// </summary>
-	public static async Task<DownloadOptions> InitiateDownloadAsync(Api api, Configuration config, LibraryBook libraryBook)
+	public static async Task<DownloadOptions> InitiateDownloadAsync(Api api, Configuration config, LibraryBook libraryBook, CancellationToken token)
 	{
-		var license = await ChooseContent(api, libraryBook, config);
+		var license = await ChooseContent(api, libraryBook, config, token);
+		token.ThrowIfCancellationRequested();
 
 		//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
@@ -36,9 +37,8 @@ public partial class DownloadOptions
 		if (metadata.ChapterInfo.RuntimeLengthMs == license.ContentMetadata.ChapterInfo.RuntimeLengthMs)
 			license.ContentMetadata.ChapterInfo = metadata.ChapterInfo;
 
-		var options = BuildDownloadOptions(libraryBook, config, license);
-
-		return options;
+		token.ThrowIfCancellationRequested();
+		return BuildDownloadOptions(libraryBook, config, license);
 	}
 
 	private class LicenseInfo
@@ -57,16 +57,18 @@ public partial class DownloadOptions
 			=> voucher is null ? null : [new KeyData(voucher.Key, voucher.Iv)];
 	}
 
-	private static async Task<LicenseInfo> ChooseContent(Api api, LibraryBook libraryBook, Configuration config)
+	private static async Task<LicenseInfo> ChooseContent(Api api, LibraryBook libraryBook, Configuration config, CancellationToken token)
 	{
 		var dlQuality = config.FileDownloadQuality == Configuration.DownloadQuality.Normal ? DownloadQuality.Normal : DownloadQuality.High;
 
 		if (!config.UseWidevine || await Cdm.GetCdmAsync() is not Cdm cdm)
 		{
+			token.ThrowIfCancellationRequested();
 			var license = await api.GetDownloadLicenseAsync(libraryBook.Book.AudibleProductId, dlQuality);
 			return new LicenseInfo(license);
 		}
 
+		token.ThrowIfCancellationRequested();
 		try
 		{
 			//try to request a widevine content license using the user's spatial audio settings
@@ -85,8 +87,8 @@ public partial class DownloadOptions
 				return new LicenseInfo(contentLic);
 
 			using var client = new HttpClient();
-			using var mpdResponse = await client.GetAsync(contentLic.LicenseResponse);
-			var dash = new MpegDash(mpdResponse.Content.ReadAsStream());
+			using var mpdResponse = await client.GetAsync(contentLic.LicenseResponse, token);
+			var dash = new MpegDash(mpdResponse.Content.ReadAsStream(token));
 
 			if (!dash.TryGetUri(new Uri(contentLic.LicenseResponse), out var contentUri))
 				throw new InvalidDataException("Failed to get mpeg-dash content download url.");
@@ -109,7 +111,6 @@ public partial class DownloadOptions
 		}
 	}
 
-
 	private static DownloadOptions BuildDownloadOptions(LibraryBook libraryBook, Configuration config, LicenseInfo licInfo)
 	{
 		long chapterStartMs
@@ -123,13 +124,6 @@ public partial class DownloadOptions
 			RuntimeLength = TimeSpan.FromMilliseconds(licInfo.ContentMetadata.ChapterInfo.RuntimeLengthMs),
 		};
 
-		if (TryGetAudioInfo(licInfo.ContentMetadata.ContentUrl, out int? bitrate, out int? sampleRate, out int? channels))
-		{
-			dlOptions.LibraryBookDto.BitRate = bitrate;
-			dlOptions.LibraryBookDto.SampleRate = sampleRate;
-			dlOptions.LibraryBookDto.Channels = channels;
-		}
-
 		var titleConcat = config.CombineNestedChapterTitles ? ": " : null;
 		var chapters
 			= flattenChapters(licInfo.ContentMetadata.ChapterInfo.Chapters, titleConcat)
@@ -156,43 +150,6 @@ public partial class DownloadOptions
 		return dlOptions;
 	}
 
-	/// <summary>
-	/// The most reliable way to get these audio file properties is from the filename itself.
-	/// Using AAXClean to read the metadata works well for everything except AC-4 bitrate.
-	/// </summary>
-	private static bool TryGetAudioInfo(ContentUrl? contentUrl, out int? bitrate, out int? sampleRate, out int? channels)
-	{
-		bitrate = sampleRate = channels = null;
-
-		if (contentUrl?.OfflineUrl is not string url || !Uri.TryCreate(url, default, out var uri))
-			return false;
-
-		var file = Path.GetFileName(uri.LocalPath);
-
-		var match = AdrmAudioProperties().Match(file);
-		if (match.Success)
-		{
-			bitrate = int.Parse(match.Groups[1].Value);
-			sampleRate = int.Parse(match.Groups[2].Value);
-			channels = int.Parse(match.Groups[3].Value);
-			return true;
-		}
-		else if ((match = WidevineAudioProperties().Match(file)).Success)
-		{
-			bitrate = int.Parse(match.Groups[2].Value);
-			sampleRate = int.Parse(match.Groups[1].Value) * 1000;
-			channels = match.Groups[3].Value switch
-			{
-				"ec3" => 6,
-				"ac4" => 3,
-				_ => null
-			};
-			return true;
-		}
-
-		return false;
-	}
-
 	public static LameConfig GetLameOptions(Configuration config)
 	{
 		LameConfig lameConfig = new()
@@ -347,12 +304,4 @@ public partial class DownloadOptions
 			chapters.Remove(chapters[^1]);
 		}
 	}
-
-	static double RelativePercentDifference(long num1, long num2)
-		=> Math.Abs(num1 - num2) / (double)(num1 + num2);
-
-	[GeneratedRegex(@".+_(\d+)_(\d+)-(\w+).mp4", RegexOptions.Singleline | RegexOptions.IgnoreCase)]
-	private static partial Regex WidevineAudioProperties();
-	[GeneratedRegex(@".+_lc_(\d+)_(\d+)_(\d+).aax", RegexOptions.Singleline | RegexOptions.IgnoreCase)]
-	private static partial Regex AdrmAudioProperties();
 }

Source/FileLiberator/DownloadOptions.cs

@@ -3,10 +3,8 @@ 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
@@ -31,12 +29,9 @@ namespace FileLiberator
 		public float? SeriesNumber => LibraryBookDto.FirstSeries?.Number;
 		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;
@@ -45,45 +40,9 @@ namespace FileLiberator
 		public AudibleApi.Common.DrmType DrmType { get; }
 		public AudibleApi.Common.ContentMetadata ContentMetadata { get; }
 
-		public string GetMultipartFileName(MultiConvertFileProperties props)
-		{
-			var baseDir = Path.GetDirectoryName(props.OutputFileName);
-			var extension = Path.GetExtension(props.OutputFileName);
-			return Templates.ChapterFile.GetFilename(LibraryBookDto, props, baseDir!, extension);
-		}
-
 		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;
-		}
-
 		public Configuration Config { get; }
 		private readonly IDisposable cancellation;
 		public void Dispose()
@@ -123,7 +82,6 @@ namespace FileLiberator
 
 			// no null/empty check for key/iv. unencrypted files do not have them
 			LibraryBookDto = LibraryBook.ToDto();
-			LibraryBookDto.Codec = licInfo.ContentMetadata.ContentReference.Codec;
 
 			cancellation =
 				config

Source/FileLiberator/UtilityExtensions.cs

@@ -61,7 +61,13 @@ namespace FileLiberator
 				IsPodcastParent = libraryBook.Book.IsEpisodeParent(),
 				IsPodcast = libraryBook.Book.IsEpisodeChild() || libraryBook.Book.IsEpisodeParent(),
 
-				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?.ToString(3),
+				FileVersion = libraryBook.Book.UserDefinedItem.LastDownloadedFileVersion
 			};
 		}
 

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/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

@@ -36,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/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/Login/AvaloniaLoginCallback.cs

@@ -1,5 +1,6 @@
 using AudibleApi;
 using AudibleUtilities;
+using Avalonia.Threading;
 using LibationUiBase.Forms;
 using System.Threading.Tasks;
 
@@ -17,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,5 +1,6 @@
 using AudibleApi;
 using AudibleUtilities;
+using Avalonia.Threading;
 using LibationFileManager;
 using LibationUiBase.Forms;
 using System;
@@ -21,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/SearchSyntaxDialog.axaml

@@ -2,71 +2,73 @@
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="650"
-		MinWidth="800" MinHeight="650"
-		MaxWidth="800" MaxHeight="650"
+		xmlns:dialogs="clr-namespace:LibationAvalonia.Dialogs"
+		x:DataType="dialogs:SearchSyntaxDialog"
+        mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="50"
+		MinWidth="500" MinHeight="650"
 		Width="800" Height="650"
         x:Class="LibationAvalonia.Dialogs.SearchSyntaxDialog"
         Title="Filter Options"
 		WindowStartupLocation="CenterOwner">
-
+	
 	<Grid
-		Margin="10,0,10,10"
-		RowDefinitions="Auto,Auto,*"
-		ColumnDefinitions="Auto,Auto,Auto,Auto">
+		RowDefinitions="Auto,*"
+		ColumnDefinitions="*,*,*,*">
 
 		<Grid.Styles>
+			<Style Selector="Grid > Grid">
+				<Setter Property="Margin" Value="10,0" />
+			</Style>
+			<Style Selector="Grid > TextBlock">
+				<Setter Property="TextWrapping" Value="Wrap" />
+			</Style>
 			<Style Selector="TextBlock">
 				<Setter Property="FontSize" Value="12" />
-				<Setter Property="Margin" Value="10" />
+				<Setter Property="Margin" Value="0,5" />
+			</Style>
+			<Style Selector="ListBox">
+				<Setter Property="Margin" Value="0,5,0,10"/>
+				<Style Selector="^ > ListBoxItem">
+					<Setter Property="Padding" Value="0"/>
+					<Style Selector="^ TextBlock">
+						<Setter Property="Margin" Value="8,1"/>
+					</Style>
+				</Style>
 			</Style>
 		</Grid.Styles>
 
-	    <TextBlock
-			Grid.Row="0"
-			Grid.Column="0"
+		<Grid
 			Grid.ColumnSpan="4"
-			Text="Full Lucene query syntax is supported&#xa;Fields with similar names are synomyns (eg: Author, Authors, AuthorNames)&#xa;&#xa;TAG FORMAT: [tagName]" />
-		
-	    <TextBlock
-			Grid.Row="1"
-			Grid.Column="0"
-			Text="STRING FIELDS" />
-		
-	    <TextBlock
-			Grid.Row="1"
-			Grid.Column="1"
-			Text="NUMBER FIELDS" />		
-		
-	    <TextBlock
-			Grid.Row="1"
-			Grid.Column="2"
-			Text="BOOLEAN (TRUE/FALSE) FIELDS" />		
-		
-	    <TextBlock
-			Grid.Row="1"
-			Grid.Column="3"
-			Text="ID FIELDS" />
-		
-	    <TextBlock
-			Grid.Row="2"
-			Grid.Column="0"
-			Text="{Binding StringFields}" />
-		
-	    <TextBlock
-			Grid.Row="2"
-			Grid.Column="1"
-			Text="{Binding NumberFields}" />		
-		
-	    <TextBlock
-			Grid.Row="2"
-			Grid.Column="2"
-			Text="{Binding BoolFields}" />		
-		
-	    <TextBlock
-			Grid.Row="2"
-			Grid.Column="3"
-			Text="{Binding IdFields}" />
-		
+			RowDefinitions="Auto,Auto">
+
+			<TextBlock
+				Text="Full Lucene query syntax is supported&#xa;Fields with similar names are synomyns (eg: Author, Authors, AuthorNames)" />
+
+			<TextBlock Grid.Row="1" Text="TAG FORMAT: [tagName]" />
+		</Grid>
+
+		<Grid Grid.Row="1" RowDefinitions="Auto,Auto,*">
+			<TextBlock Text="NUMBER FIELDS" />
+			<TextBlock Grid.Row="1" Text="{CompiledBinding StringUsage}" />
+			<ListBox Grid.Row="2" ItemsSource="{CompiledBinding StringFields}"/>
+		</Grid>
+
+		<Grid Grid.Row="1" Grid.Column="1" RowDefinitions="Auto,Auto,*">
+			<TextBlock Text="STRING FIELDS" />
+			<TextBlock Grid.Row="1" Text="{CompiledBinding NumberUsage}" />
+			<ListBox Grid.Row="2" ItemsSource="{CompiledBinding NumberFields}"/>
+		</Grid>
+
+		<Grid Grid.Row="1" Grid.Column="2" RowDefinitions="Auto,Auto,*">
+			<TextBlock Text="BOOLEAN (TRUE/FALSE) FIELDS" />
+			<TextBlock Grid.Row="1" Text="{CompiledBinding BoolUsage}" />
+			<ListBox Grid.Row="2" ItemsSource="{CompiledBinding BoolFields}"/>
+		</Grid>
+
+		<Grid Grid.Row="1" Grid.Column="3" RowDefinitions="Auto,Auto,*">
+			<TextBlock Text="ID FIELDS" />
+			<TextBlock Grid.Row="1" Text="{CompiledBinding IdUsage}" />
+			<ListBox Grid.Row="2" ItemsSource="{CompiledBinding IdFields}"/>
+		</Grid>		
 	</Grid>
 </Window>

Source/LibationAvalonia/Dialogs/SearchSyntaxDialog.axaml.cs

@@ -1,59 +1,55 @@
 using LibationSearchEngine;
+using System.Linq;
 
 namespace LibationAvalonia.Dialogs
 {
 	public partial class SearchSyntaxDialog : DialogWindow
 	{
-		public string StringFields { get; init; }
-		public string NumberFields { get; init; }
-		public string BoolFields { get; init; }
-		public string IdFields { get; init; }
+		public string StringUsage { get; }
+		public string NumberUsage { get; }
+		public string BoolUsage { get; }
+		public string IdUsage { get; }
+		public string[] StringFields { get; } = SearchEngine.FieldIndexRules.StringFieldNames.ToArray();
+		public string[] NumberFields { get; } = SearchEngine.FieldIndexRules.NumberFieldNames.ToArray();
+		public string[] BoolFields { get; } = SearchEngine.FieldIndexRules.BoolFieldNames.ToArray();
+		public string[] IdFields { get; } = SearchEngine.FieldIndexRules.IdFieldNames.ToArray();
+
 		public SearchSyntaxDialog()
 		{
 			InitializeComponent();
 
-			StringFields = @"
-Search for wizard of oz:
-     title:oz
-     title:""wizard of oz""
+			StringUsage = """
+			Search for wizard of oz:
+				 title:oz
+				 title:"wizard of oz"
+			""";
 
+			NumberUsage = """
+			Find books between 1-100 minutes long
+				 length:[1 TO 100]
+			Find books exactly 1 hr long
+				 length:60
+			Find books published from 2020-1-1 to
+			2023-12-31
+				 datepublished:[20200101 TO 20231231]
+			""";
 
-" + string.Join("\r\n", SearchEngine.FieldIndexRules.StringFieldNames);
+			BoolUsage = """
+			Find books that you haven't rated:
+				 -IsRated
+			""";
 
-			NumberFields = @"
-Find books between 1-100 minutes long
-     length:[1 TO 100]
-Find books exactly 1 hr long
-     length:60
-Find books published from 2020-1-1 to
-2023-12-31
-     datepublished:[20200101 TO 20231231]
+			IdUsage = """
+			Alice's Adventures in
+			  Wonderland (ID: B015D78L0U)
 
+				 id:B015D78L0U
 
-" + string.Join("\r\n", SearchEngine.FieldIndexRules.NumberFieldNames);
-
-			BoolFields = @"
-Find books that you haven't rated:
-     -IsRated
-
-
-" + string.Join("\r\n", SearchEngine.FieldIndexRules.BoolFieldNames);
-
-			IdFields = @"
-Alice's Adventures in
-  Wonderland (ID: B015D78L0U)
-
-     id:B015D78L0U
-
-All of these are synonyms
-for the ID field
-
-
-" + string.Join("\r\n", SearchEngine.FieldIndexRules.IdFieldNames);
-
+			All of these are synonyms
+			for the ID field
+			""";
 
 			DataContext = this;
-
 		}
 	}
 }

Source/LibationAvalonia/ViewModels/AvaloniaEntryStatus.cs

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

Source/LibationAvalonia/ViewModels/MainVM.Filters.cs

@@ -27,7 +27,6 @@ namespace LibationAvalonia.ViewModels
 		/// <summary> Indicates if the first quick filter is the default filter </summary>
 		public bool FirstFilterIsDefault { get => _firstFilterIsDefault; set => QuickFilters.UseDefault = this.RaiseAndSetIfChanged(ref _firstFilterIsDefault, value); }
 
-
 		private void Configure_Filters()
 		{
 			FirstFilterIsDefault = QuickFilters.UseDefault;
@@ -55,7 +54,7 @@ namespace LibationAvalonia.ViewModels
 		}
 
 		public void AddQuickFilterBtn() { if (SelectedNamedFilter != null) QuickFilters.Add(SelectedNamedFilter); }
-		public async Task FilterBtn() => await PerformFilter(SelectedNamedFilter);
+		public async Task FilterBtn(string filterString) => await PerformFilter(new(filterString, null));
 		public async Task FilterHelpBtn() => await new LibationAvalonia.Dialogs.SearchSyntaxDialog().ShowDialog(MainWindow);
 		public void ToggleFirstFilterIsDefault() => FirstFilterIsDefault = !FirstFilterIsDefault;
 		public async Task EditQuickFiltersAsync() => await new LibationAvalonia.Dialogs.EditQuickFilters().ShowDialog(MainWindow);

Source/LibationAvalonia/ViewModels/MainVM.Import.cs

@@ -202,7 +202,7 @@ namespace LibationAvalonia.ViewModels
 		{
 			try
 			{
-				var (totalProcessed, newAdded) = await LibraryCommands.ImportAccountAsync(accounts);
+				var (totalProcessed, newAdded) = await Task.Run(() => LibraryCommands.ImportAccountAsync(accounts));
 
 				// this is here instead of ScanEnd so that the following is only possible when it's user-initiated, not automatic loop
 				if (Configuration.Instance.ShowImportedStats && newAdded > 0)

Source/LibationAvalonia/ViewModels/MainVM.ProcessQueue.cs

@@ -57,7 +57,7 @@ namespace LibationAvalonia.ViewModels
 			}
 		}
 
-		public void LiberateSeriesClicked(ISeriesEntry series)
+		public void LiberateSeriesClicked(SeriesEntry series)
 		{
 			try
 			{

Source/LibationAvalonia/ViewModels/MainVM.ScanAuto.cs

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

Source/LibationAvalonia/ViewModels/MainVM._NoUI.cs

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

Source/LibationAvalonia/ViewModels/MainVM.cs

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

Source/LibationAvalonia/ViewModels/ProcessBookViewModel.cs

@@ -1,17 +0,0 @@
-using DataLayer;
-using LibationFileManager;
-using LibationUiBase;
-using LibationUiBase.ProcessQueue;
-
-#nullable enable
-namespace LibationAvalonia.ViewModels;
-
-public class ProcessBookViewModel : ProcessBookViewModelBase
-{
-
-	public ProcessBookViewModel(LibraryBook libraryBook, LogMe logme) : base(libraryBook, logme) { }
-
-	protected override object? LoadImageFromBytes(byte[] bytes, PictureSize pictureSize)
-		=> AvaloniaUtils.TryLoadImageOrDefault(bytes, pictureSize);
-
-}

Source/LibationAvalonia/ViewModels/ProcessQueueViewModel.cs

@@ -1,74 +0,0 @@
-using Avalonia.Collections;
-using Avalonia.Controls;
-using Avalonia.Threading;
-using DataLayer;
-using LibationFileManager;
-using LibationUiBase.ProcessQueue;
-using System;
-using System.Collections.ObjectModel;
-
-#nullable enable
-namespace LibationAvalonia.ViewModels;
-
-public record LogEntry(DateTime LogDate, string? LogMessage)
-{
-	public string LogDateString => LogDate.ToShortTimeString();
-}
-
-public class ProcessQueueViewModel : ProcessQueueViewModelBase
-{
-	public ProcessQueueViewModel() : base(CreateEmptyList())
-	{
-		Items = Queue.UnderlyingList as AvaloniaList<ProcessBookViewModelBase>
-			?? throw new ArgumentNullException(nameof(Queue.UnderlyingList));
-
-		SpeedLimit = Configuration.Instance.DownloadSpeedLimit / 1024m / 1024;
-	}
-
-	private decimal _speedLimit;
-	public decimal SpeedLimitIncrement { get; private set; }
-	public ObservableCollection<LogEntry> LogEntries { get; } = new();
-	public AvaloniaList<ProcessBookViewModelBase> Items { get; }
-
-	public decimal SpeedLimit
-	{
-		get
-		{
-			return _speedLimit;
-		}
-		set
-		{
-			var newValue = Math.Min(999 * 1024 * 1024, (long)(value * 1024 * 1024));
-			var config = Configuration.Instance;
-			config.DownloadSpeedLimit = newValue;
-
-			_speedLimit
-				= config.DownloadSpeedLimit <= newValue ? value
-				: value == 0.01m ? config.DownloadSpeedLimit / 1024m / 1024
-				: 0;
-
-			config.DownloadSpeedLimit = (long)(_speedLimit * 1024 * 1024);
-
-			SpeedLimitIncrement = _speedLimit > 100 ? 10
-				: _speedLimit > 10 ? 1
-				: _speedLimit > 1 ? 0.1m
-				: 0.01m;
-
-			RaisePropertyChanged(nameof(SpeedLimitIncrement));
-			RaisePropertyChanged(nameof(SpeedLimit));
-		}
-	}
-
-	public override void WriteLine(string text)
-		=> Dispatcher.UIThread.Invoke(() => LogEntries.Add(new(DateTime.Now, text.Trim())));
-
-	protected override ProcessBookViewModelBase CreateNewProcessBook(LibraryBook libraryBook)
-		=> new ProcessBookViewModel(libraryBook, Logger);
-
-	private static AvaloniaList<ProcessBookViewModelBase> CreateEmptyList()
-	{
-		if (Design.IsDesignMode)
-			_ = Configuration.Instance.LibationFiles;
-		return new AvaloniaList<ProcessBookViewModelBase>();
-	}
-}

Source/LibationAvalonia/ViewModels/ProductsDisplayViewModel.cs

@@ -26,9 +26,9 @@ namespace LibationAvalonia.ViewModels
 		public event EventHandler<int>? RemovableCountChanged;
 
 		/// <summary>Backing list of all grid entries</summary>
-		private readonly AvaloniaList<IGridEntry> SOURCE = new();
+		private readonly AvaloniaList<GridEntry> SOURCE = new();
 		/// <summary>Grid entries included in the filter set. If null, all grid entries are shown</summary>
-		private HashSet<IGridEntry>? FilteredInGridEntries;
+		private HashSet<GridEntry>? FilteredInGridEntries;
 		public string? FilterString { get; private set; }
 
 		private DataGridCollectionView? _gridEntries;
@@ -43,15 +43,15 @@ namespace LibationAvalonia.ViewModels
 
 		public List<LibraryBook> GetVisibleBookEntries()
 			=> FilteredInGridEntries?
-				.OfType<ILibraryBookEntry>()
+				.OfType<LibraryBookEntry>()
 				.Select(lbe => lbe.LibraryBook)
 				.ToList()
 			?? SOURCE
-				.OfType<ILibraryBookEntry>()
+				.OfType<LibraryBookEntry>()
 				.Select(lbe => lbe.LibraryBook)
 				.ToList();
 
-		private IEnumerable<ILibraryBookEntry> GetAllBookEntries()
+		private IEnumerable<LibraryBookEntry> GetAllBookEntries()
 			=> SOURCE
 			.BookEntries();
 
@@ -112,8 +112,8 @@ namespace LibationAvalonia.ViewModels
 			var sc = await Dispatcher.UIThread.InvokeAsync(() => AvaloniaSynchronizationContext.Current);
 			AvaloniaSynchronizationContext.SetSynchronizationContext(sc);
 
-			var geList = await LibraryBookEntry<AvaloniaEntryStatus>.GetAllProductsAsync(dbBooks);
-			var seriesEntries = await SeriesEntry<AvaloniaEntryStatus>.GetAllSeriesEntriesAsync(dbBooks);
+			var geList = await LibraryBookEntry.GetAllProductsAsync(dbBooks);
+			var seriesEntries = await SeriesEntry.GetAllSeriesEntriesAsync(dbBooks);
 
 			//Add all IGridEntries to the SOURCE list. Note that SOURCE has not yet been linked to the UI via
 			//the GridEntries property, so adding items to SOURCE will not trigger any refreshes or UI action.
@@ -147,8 +147,8 @@ namespace LibationAvalonia.ViewModels
 		private void GridEntries_CollectionChanged(object? sender = null, EventArgs? e = null)
 		{
 			var count
-				= FilteredInGridEntries?.OfType<ILibraryBookEntry>().Count()
-				?? SOURCE.OfType<ILibraryBookEntry>().Count();
+				= FilteredInGridEntries?.OfType<LibraryBookEntry>().Count()
+				?? SOURCE.OfType<LibraryBookEntry>().Count();
 
 			VisibleCountChanged?.Invoke(this, count);
 		}
@@ -223,9 +223,9 @@ namespace LibationAvalonia.ViewModels
 			GridEntries_CollectionChanged();
 		}
 
-		private void RemoveBooks(IEnumerable<ILibraryBookEntry> removedBooks, IEnumerable<ISeriesEntry> removedSeries)
+		private void RemoveBooks(IEnumerable<LibraryBookEntry> removedBooks, IEnumerable<SeriesEntry> removedSeries)
 		{
-			foreach (var removed in removedBooks.Cast<IGridEntry>().Concat(removedSeries).Where(b => b is not null).ToList())
+			foreach (var removed in removedBooks.Cast<GridEntry>().Concat(removedSeries).Where(b => b is not null).ToList())
 			{
 				if (GridEntries?.PassesFilter(removed) ?? false)
 					GridEntries.Remove(removed);
@@ -238,21 +238,21 @@ namespace LibationAvalonia.ViewModels
 			}
 		}
 
-		private void UpsertBook(LibraryBook book, ILibraryBookEntry? existingBookEntry)
+		private void UpsertBook(LibraryBook book, LibraryBookEntry? existingBookEntry)
 		{
 			if (existingBookEntry is null)
 				// Add the new product to top
-				SOURCE.Insert(0, new LibraryBookEntry<AvaloniaEntryStatus>(book));
+				SOURCE.Insert(0, new LibraryBookEntry(book));
 			else
 				// update existing
 				existingBookEntry.UpdateLibraryBook(book);
 		}
 
-		private void UpsertEpisode(LibraryBook episodeBook, ILibraryBookEntry? existingEpisodeEntry, List<ISeriesEntry> seriesEntries, IEnumerable<LibraryBook> dbBooks)
+		private void UpsertEpisode(LibraryBook episodeBook, LibraryBookEntry? existingEpisodeEntry, List<SeriesEntry> seriesEntries, IEnumerable<LibraryBook> dbBooks)
 		{
 			if (existingEpisodeEntry is null)
 			{
-				ILibraryBookEntry episodeEntry;
+				LibraryBookEntry episodeEntry;
 
 				var seriesEntry = seriesEntries.FindSeriesParent(episodeBook);
 
@@ -270,7 +270,7 @@ namespace LibationAvalonia.ViewModels
 						return;
 					}
 
-					seriesEntry = new SeriesEntry<AvaloniaEntryStatus>(seriesBook, episodeBook);
+					seriesEntry = new SeriesEntry(seriesBook, episodeBook);
 					seriesEntries.Add(seriesEntry);
 
 					episodeEntry = seriesEntry.Children[0];
@@ -280,7 +280,7 @@ namespace LibationAvalonia.ViewModels
 				else
 				{
 					//Series exists. Create and add episode child then update the SeriesEntry
-					episodeEntry = new LibraryBookEntry<AvaloniaEntryStatus>(episodeBook, seriesEntry);
+					episodeEntry = new LibraryBookEntry(episodeBook, seriesEntry);
 					seriesEntry.Children.Add(episodeEntry);
 					seriesEntry.Children.Sort((c1, c2) => c1.SeriesIndex.CompareTo(c2.SeriesIndex));
 					var seriesBook = dbBooks.Single(lb => lb.Book.AudibleProductId == seriesEntry.LibraryBook.Book.AudibleProductId);
@@ -307,7 +307,7 @@ namespace LibationAvalonia.ViewModels
 			}
 		}
 
-		public async Task ToggleSeriesExpanded(ISeriesEntry seriesEntry)
+		public async Task ToggleSeriesExpanded(SeriesEntry seriesEntry)
 		{
 			seriesEntry.Liberate.Expanded = !seriesEntry.Liberate.Expanded;
 
@@ -332,7 +332,7 @@ namespace LibationAvalonia.ViewModels
 
 		private bool CollectionFilter(object item)
 		{
-			if (item is ILibraryBookEntry lbe
+			if (item is LibraryBookEntry lbe
 				&& lbe.Liberate.IsEpisode
 				&& lbe.Parent?.Liberate?.Expanded != true)
 				return false;
@@ -454,7 +454,7 @@ namespace LibationAvalonia.ViewModels
 
 		private void GridEntry_PropertyChanged(object? sender, PropertyChangedEventArgs? e)
 		{
-			if (e?.PropertyName == nameof(IGridEntry.Remove) && sender is ILibraryBookEntry)
+			if (e?.PropertyName == nameof(GridEntry.Remove) && sender is LibraryBookEntry)
 			{
 				int removeCount = GetAllBookEntries().Count(lbe => lbe.Remove is true);
 				RemovableCountChanged?.Invoke(this, removeCount);
@@ -479,6 +479,7 @@ namespace LibationAvalonia.ViewModels
 		public DataGridLength MiscWidth { get => getColumnWidth("Misc", 140); set => setColumnWidth("Misc", value); }
 		public DataGridLength LastDownloadWidth { get => getColumnWidth("LastDownload", 100); set => setColumnWidth("LastDownload", value); }
 		public DataGridLength BookTagsWidth { get => getColumnWidth("BookTags", 100); set => setColumnWidth("BookTags", value); }
+		public DataGridLength IsSpatialWidth { get => getColumnWidth("IsSpatial", 100); set => setColumnWidth("IsSpatial", value); }
 
 		private static DataGridLength getColumnWidth(string columnName, double defaultWidth)
 			=> Configuration.Instance.GridColumnsWidths.TryGetValue(columnName, out var val)

Source/LibationAvalonia/ViewModels/RowComparer.cs

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

Source/LibationAvalonia/ViewModels/Settings/ImportantSettingsVM.cs

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

Source/LibationAvalonia/Views/LiberateStatusButton.axaml.cs

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

Source/LibationAvalonia/Views/MainWindow.axaml

@@ -191,10 +191,10 @@
 				<Button IsVisible="{CompiledBinding RemoveButtonsVisible}" Command="{CompiledBinding DoneRemovingBtn}" Content="Done Removing Books"/>
 			</StackPanel>
 				
-			<TextBox Grid.Column="1" Margin="10,0,0,0" Name="filterSearchTb" IsVisible="{CompiledBinding !RemoveButtonsVisible}" Text="{CompiledBinding SelectedNamedFilter.Filter, Mode=TwoWay}" KeyDown="filterSearchTb_KeyPress" />
+			<TextBox Grid.Column="1" Margin="10,0,0,0" Name="filterSearchTb" IsVisible="{CompiledBinding !RemoveButtonsVisible}" Text="{CompiledBinding SelectedNamedFilter.Filter, Mode=OneWay}" KeyDown="filterSearchTb_KeyPress" />
 
 			<StackPanel Grid.Column="2" Height="30" Orientation="Horizontal">
-				<Button Name="filterBtn" Command="{CompiledBinding FilterBtn}" VerticalAlignment="Stretch" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" Content="Filter"/>
+				<Button Name="filterBtn" Command="{CompiledBinding FilterBtn}" CommandParameter="{CompiledBinding #filterSearchTb.Text}" VerticalAlignment="Stretch" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" Content="Filter"/>
 				<Button Padding="2,6,2,6" VerticalAlignment="Stretch" Command="{CompiledBinding ToggleQueueHideBtn}">
 					<Path Stretch="Uniform" Fill="{DynamicResource IconFill}" Data="{StaticResource	LeftArrows}">
 						<Path.RenderTransform>

Source/LibationAvalonia/Views/MainWindow.axaml.cs

@@ -1,4 +1,5 @@
 using AudibleUtilities;
+using Avalonia.Controls;
 using Avalonia.Input;
 using Avalonia.ReactiveUI;
 using Avalonia.Threading;
@@ -21,8 +22,11 @@ namespace LibationAvalonia.Views
 	{
 		public MainWindow()
 		{
+			if (Design.IsDesignMode)
+				_ = Configuration.Instance.LibationFiles;
+
 			DataContext = new MainVM(this);
-			ApiExtended.LoginChoiceFactory = account => new Dialogs.Login.AvaloniaLoginChoiceEager(account);
+			ApiExtended.LoginChoiceFactory = account => Dispatcher.UIThread.Invoke(() => new Dialogs.Login.AvaloniaLoginChoiceEager(account));
 
 			AudibleApiStorage.LoadError += AudibleApiStorage_LoadError;
 			InitializeComponent();
@@ -137,7 +141,7 @@ namespace LibationAvalonia.Views
 		}
 
 		public void ProductsDisplay_LiberateClicked(object _, LibraryBook[] libraryBook) => ViewModel.LiberateClicked(libraryBook);
-		public void ProductsDisplay_LiberateSeriesClicked(object _, ISeriesEntry series) => ViewModel.LiberateSeriesClicked(series);
+		public void ProductsDisplay_LiberateSeriesClicked(object _, SeriesEntry series) => ViewModel.LiberateSeriesClicked(series);
 		public void ProductsDisplay_ConvertToMp3Clicked(object _, LibraryBook[] libraryBook) => ViewModel.ConvertToMp3Clicked(libraryBook);
 
 		BookDetailsDialog bookDetailsForm;
@@ -156,7 +160,7 @@ namespace LibationAvalonia.Views
 		{
 			if (e.Key == Key.Return)
 			{
-				await ViewModel.PerformFilter(ViewModel.SelectedNamedFilter);
+				await ViewModel.FilterBtn(filterSearchTb.Text);
 
 				// silence the 'ding'
 				e.Handled = true;

Source/LibationAvalonia/Views/ProcessBookControl.axaml

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

Source/LibationAvalonia/Views/ProcessBookControl.axaml.cs

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

Source/LibationAvalonia/Views/ProcessQueueControl.axaml

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

Source/LibationAvalonia/Views/ProcessQueueControl.axaml.cs

@@ -1,9 +1,7 @@
 using ApplicationServices;
-using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Data.Converters;
 using DataLayer;
-using LibationAvalonia.ViewModels;
 using LibationUiBase;
 using LibationUiBase.ProcessQueue;
 using System;
@@ -17,7 +15,7 @@ namespace LibationAvalonia.Views
 {
 	public partial class ProcessQueueControl : UserControl
 	{
-		private TrackedQueue<ProcessBookViewModelBase>? Queue => _viewModel?.Queue;
+		private TrackedQueue<ProcessBookViewModel>? Queue => _viewModel?.Queue;
 		private ProcessQueueViewModel? _viewModel => DataContext as ProcessQueueViewModel;
 
 		public ProcessQueueControl()
@@ -31,48 +29,49 @@ namespace LibationAvalonia.Views
 #if DEBUG
 			if (Design.IsDesignMode)
 			{
+				_ = LibationFileManager.Configuration.Instance.LibationFiles;
+				ViewModels.MainVM.Configure_NonUI();
 				var vm = new ProcessQueueViewModel();
-				var Logger = LogMe.RegisterForm(vm);
 				DataContext = vm;
 				using var context = DbContexts.GetContext();
 				List<ProcessBookViewModel> testList = new()
 				{
-					new ProcessBookViewModel(context.GetLibraryBook_Flat_NoTracking("B017V4IM1G"), Logger)
+					new ProcessBookViewModel(context.GetLibraryBook_Flat_NoTracking("B017V4IM1G"))
 					{
 						Result = ProcessBookResult.FailedAbort,
 						Status = ProcessBookStatus.Failed,
 					},
-					new ProcessBookViewModel(context.GetLibraryBook_Flat_NoTracking("B017V4IWVG"), Logger)
+					new ProcessBookViewModel(context.GetLibraryBook_Flat_NoTracking("B017V4IWVG"))
 					{
 						Result = ProcessBookResult.FailedSkip,
 						Status = ProcessBookStatus.Failed,
 					},
-					new ProcessBookViewModel(context.GetLibraryBook_Flat_NoTracking("B017V4JA2Q"), Logger)
+					new ProcessBookViewModel(context.GetLibraryBook_Flat_NoTracking("B017V4JA2Q"))
 					{
 						Result = ProcessBookResult.FailedRetry,
 						Status = ProcessBookStatus.Failed,
 					},
-					new ProcessBookViewModel(context.GetLibraryBook_Flat_NoTracking("B017V4NUPO"), Logger)
+					new ProcessBookViewModel(context.GetLibraryBook_Flat_NoTracking("B017V4NUPO"))
 					{
 						Result = ProcessBookResult.ValidationFail,
 						Status = ProcessBookStatus.Failed,
 					},
-					new ProcessBookViewModel(context.GetLibraryBook_Flat_NoTracking("B017V4NMX4"), Logger)
+					new ProcessBookViewModel(context.GetLibraryBook_Flat_NoTracking("B017V4NMX4"))
 					{
 						Result = ProcessBookResult.Cancelled,
 						Status = ProcessBookStatus.Cancelled,
 					},
-					new ProcessBookViewModel(context.GetLibraryBook_Flat_NoTracking("B017V4NOZ0"), Logger)
+					new ProcessBookViewModel(context.GetLibraryBook_Flat_NoTracking("B017V4NOZ0"))
 					{
 						Result = ProcessBookResult.Success,
 						Status = ProcessBookStatus.Completed,
 					},
-					new ProcessBookViewModel(context.GetLibraryBook_Flat_NoTracking("B017WJ5ZK6"), Logger)
+					new ProcessBookViewModel(context.GetLibraryBook_Flat_NoTracking("B017WJ5ZK6"))
 					{
 						Result = ProcessBookResult.None,
 						Status = ProcessBookStatus.Working,
 					},
-					new ProcessBookViewModel(context.GetLibraryBook_Flat_NoTracking("B017V4IM1G"), Logger)
+					new ProcessBookViewModel(context.GetLibraryBook_Flat_NoTracking("B017V4IM1G"))
 					{
 						Result = ProcessBookResult.None,
 						Status = ProcessBookStatus.Queued,

Source/LibationAvalonia/Views/ProductsDisplay.axaml

@@ -3,9 +3,11 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
 			 xmlns:views="clr-namespace:LibationAvalonia.Views"
+			 xmlns:vm="clr-namespace:LibationAvalonia.ViewModels"
 			 xmlns:uibase="clr-namespace:LibationUiBase.GridView;assembly=LibationUiBase"
 			 xmlns:controls="clr-namespace:LibationAvalonia.Controls"
              mc:Ignorable="d" d:DesignWidth="1560" d:DesignHeight="400"
+			 x:DataType="vm:ProductsDisplayViewModel"
              x:Class="LibationAvalonia.Views.ProductsDisplay">
 
 	<Grid>
@@ -15,7 +17,7 @@
 			ClipboardCopyMode="IncludeHeader"
 			GridLinesVisibility="All"
 			AutoGenerateColumns="False"
-			ItemsSource="{Binding GridEntries}"
+			ItemsSource="{CompiledBinding GridEntries}"
 			CanUserSortColumns="True" BorderThickness="3"
 			CanUserResizeColumns="True"
 			LoadingRow="ProductsDisplay_LoadingRow"
@@ -51,7 +53,7 @@
 				<DataGridTemplateColumn
 					CanUserSort="True"
 					CanUserResize="False"
-					IsVisible="{Binding RemoveColumnVisible}"
+					IsVisible="{CompiledBinding RemoveColumnVisible}"
 					PropertyChanged="RemoveColumn_PropertyChanged"
 					Header="Remove"
 					IsReadOnly="False"
@@ -59,7 +61,7 @@
 					Width="75">
 
 					<DataGridTemplateColumn.CellTemplate>
-						<DataTemplate x:DataType="uibase:IGridEntry">
+						<DataTemplate x:DataType="uibase:GridEntry">
 							<CheckBox
 								HorizontalAlignment="Center"
 								IsThreeState="True"
@@ -70,7 +72,7 @@
 
 				<controls:DataGridTemplateColumnExt CanUserResize="False" CanUserSort="True" Header="Liberate" SortMemberPath="Liberate" ClipboardContentBinding="{Binding Liberate.ToolTip}">
 					<DataGridTemplateColumn.CellTemplate>
-						<DataTemplate x:DataType="uibase:IGridEntry">
+						<DataTemplate x:DataType="uibase:GridEntry">
 							<views:LiberateStatusButton
 								ToolTip.Tip="{CompiledBinding Liberate.ToolTip}"
 								BookStatus="{CompiledBinding Liberate.BookStatus}"
@@ -83,17 +85,17 @@
 					</DataGridTemplateColumn.CellTemplate>
 				</controls:DataGridTemplateColumnExt>
 
-				<controls:DataGridTemplateColumnExt CanUserResize="False" CanUserSort="False" Header="Cover" SortMemberPath="Cover" ClipboardContentBinding="{Binding LibraryBook.Book.PictureLarge}">
+				<controls:DataGridTemplateColumnExt Header="Cover" CanUserResize="False" CanUserSort="False" SortMemberPath="Cover" ClipboardContentBinding="{Binding LibraryBook.Book.PictureLarge}">
 					<DataGridTemplateColumn.CellTemplate>
-						<DataTemplate x:DataType="uibase:IGridEntry">
+						<DataTemplate x:DataType="uibase:GridEntry">
 							<Image Opacity="{CompiledBinding Liberate.Opacity}" Tapped="Cover_Click" Source="{CompiledBinding Cover}" ToolTip.Tip="Click to see full size" />
 						</DataTemplate>
 					</DataGridTemplateColumn.CellTemplate>
 				</controls:DataGridTemplateColumnExt>
 
-				<controls:DataGridTemplateColumnExt Header="Title" MinWidth="10" Width="{Binding TitleWidth, Mode=TwoWay}" CanUserSort="True" SortMemberPath="Title" ClipboardContentBinding="{Binding Title}">
+				<controls:DataGridTemplateColumnExt Header="Title" MinWidth="10" Width="{CompiledBinding TitleWidth, Mode=TwoWay}" CanUserSort="True" SortMemberPath="Title" ClipboardContentBinding="{Binding Title}">
 					<DataGridTemplateColumn.CellTemplate>
-						<DataTemplate x:DataType="uibase:IGridEntry">
+						<DataTemplate x:DataType="uibase:GridEntry">
 							<Panel Opacity="{CompiledBinding Liberate.Opacity}">
 								<TextBlock Classes="h1" Text="{CompiledBinding Title}" />
 							</Panel>
@@ -101,9 +103,9 @@
 					</DataGridTemplateColumn.CellTemplate>
 				</controls:DataGridTemplateColumnExt>
 
-				<controls:DataGridTemplateColumnExt Header="Authors" MinWidth="10" Width="{Binding AuthorsWidth, Mode=TwoWay}" CanUserSort="True" SortMemberPath="Authors" ClipboardContentBinding="{Binding Authors}">
+				<controls:DataGridTemplateColumnExt Header="Authors" MinWidth="10" Width="{CompiledBinding AuthorsWidth, Mode=TwoWay}" CanUserSort="True" SortMemberPath="Authors" ClipboardContentBinding="{Binding Authors}">
 					<DataGridTemplateColumn.CellTemplate>
-						<DataTemplate x:DataType="uibase:IGridEntry">
+						<DataTemplate x:DataType="uibase:GridEntry">
 							<Panel Opacity="{CompiledBinding Liberate.Opacity}">
 								<TextBlock Text="{CompiledBinding Authors}" />
 							</Panel>
@@ -111,9 +113,9 @@
 					</DataGridTemplateColumn.CellTemplate>
 				</controls:DataGridTemplateColumnExt>
 
-				<controls:DataGridTemplateColumnExt Header="Narrators" MinWidth="10" Width="{Binding NarratorsWidth, Mode=TwoWay}" CanUserSort="True" SortMemberPath="Narrators" ClipboardContentBinding="{Binding Narrators}">
+				<controls:DataGridTemplateColumnExt Header="Narrators" MinWidth="10" Width="{CompiledBinding NarratorsWidth, Mode=TwoWay}" CanUserSort="True" SortMemberPath="Narrators" ClipboardContentBinding="{Binding Narrators}">
 					<DataGridTemplateColumn.CellTemplate>
-						<DataTemplate x:DataType="uibase:IGridEntry">
+						<DataTemplate x:DataType="uibase:GridEntry">
 							<Panel Opacity="{CompiledBinding Liberate.Opacity}">
 								<TextBlock Text="{CompiledBinding Narrators}" />
 							</Panel>
@@ -121,9 +123,9 @@
 					</DataGridTemplateColumn.CellTemplate>
 				</controls:DataGridTemplateColumnExt>
 
-				<controls:DataGridTemplateColumnExt Header="Length" MinWidth="10" Width="{Binding LengthWidth, Mode=TwoWay}" CanUserSort="True" SortMemberPath="Length" ClipboardContentBinding="{Binding Length}">
+				<controls:DataGridTemplateColumnExt Header="Length" MinWidth="10" Width="{CompiledBinding LengthWidth, Mode=TwoWay}" CanUserSort="True" SortMemberPath="Length" ClipboardContentBinding="{Binding Length}">
 					<DataGridTemplateColumn.CellTemplate>
-						<DataTemplate x:DataType="uibase:IGridEntry">
+						<DataTemplate x:DataType="uibase:GridEntry">
 							<Panel Opacity="{CompiledBinding Liberate.Opacity}">
 								<TextBlock Text="{CompiledBinding Length}" />
 							</Panel>
@@ -131,9 +133,9 @@
 					</DataGridTemplateColumn.CellTemplate>
 				</controls:DataGridTemplateColumnExt>
 
-				<controls:DataGridTemplateColumnExt Header="Series" MinWidth="10" Width="{Binding SeriesWidth, Mode=TwoWay}" CanUserSort="True" SortMemberPath="Series" ClipboardContentBinding="{Binding Series}">
+				<controls:DataGridTemplateColumnExt Header="Series" MinWidth="10" Width="{CompiledBinding SeriesWidth, Mode=TwoWay}" CanUserSort="True" SortMemberPath="Series" ClipboardContentBinding="{Binding Series}">
 					<DataGridTemplateColumn.CellTemplate>
-						<DataTemplate x:DataType="uibase:IGridEntry">
+						<DataTemplate x:DataType="uibase:GridEntry">
 							<Panel Opacity="{CompiledBinding Liberate.Opacity}">
 								<TextBlock Text="{CompiledBinding Series}" />
 							</Panel>
@@ -141,9 +143,9 @@
 					</DataGridTemplateColumn.CellTemplate>
 				</controls:DataGridTemplateColumnExt>
 
-				<controls:DataGridTemplateColumnExt Header="Series&#xA;Order" MinWidth="10" Width="{Binding SeriesOrderWidth, Mode=TwoWay}" CanUserSort="True" SortMemberPath="SeriesOrder" ClipboardContentBinding="{Binding Series}">
+				<controls:DataGridTemplateColumnExt Header="Series&#xA;Order" MinWidth="10" Width="{CompiledBinding SeriesOrderWidth, Mode=TwoWay}" CanUserSort="True" SortMemberPath="SeriesOrder" ClipboardContentBinding="{Binding Series}">
 					<DataGridTemplateColumn.CellTemplate>
-						<DataTemplate x:DataType="uibase:IGridEntry">
+						<DataTemplate x:DataType="uibase:GridEntry">
 							<Panel Opacity="{CompiledBinding Liberate.Opacity}">
 								<TextBlock Text="{CompiledBinding SeriesOrder}" HorizontalAlignment="Center" />
 							</Panel>
@@ -151,9 +153,9 @@
 					</DataGridTemplateColumn.CellTemplate>
 				</controls:DataGridTemplateColumnExt>
 
-				<controls:DataGridTemplateColumnExt Header="Description" MinWidth="10" Width="{Binding DescriptionWidth, Mode=TwoWay}" CanUserSort="True" SortMemberPath="Description" ClipboardContentBinding="{Binding Description}">
+				<controls:DataGridTemplateColumnExt Header="Description" MinWidth="10" Width="{CompiledBinding DescriptionWidth, Mode=TwoWay}" CanUserSort="True" SortMemberPath="Description" ClipboardContentBinding="{Binding Description}">
 					<DataGridTemplateColumn.CellTemplate>
-						<DataTemplate x:DataType="uibase:IGridEntry">
+						<DataTemplate x:DataType="uibase:GridEntry">
 							<Panel Opacity="{CompiledBinding Liberate.Opacity}" Tapped="Description_Click" ToolTip.Tip="Click to see full description" >
 								<TextBlock Text="{CompiledBinding Description}" VerticalAlignment="Top" />
 							</Panel>
@@ -161,9 +163,9 @@
 					</DataGridTemplateColumn.CellTemplate>
 				</controls:DataGridTemplateColumnExt>
 
-				<controls:DataGridTemplateColumnExt Header="Category" MinWidth="10" Width="{Binding CategoryWidth, Mode=TwoWay}" CanUserSort="True" SortMemberPath="Category" ClipboardContentBinding="{Binding Category}">
+				<controls:DataGridTemplateColumnExt Header="Category" MinWidth="10" Width="{CompiledBinding CategoryWidth, Mode=TwoWay}" CanUserSort="True" SortMemberPath="Category" ClipboardContentBinding="{Binding Category}">
 					<DataGridTemplateColumn.CellTemplate>
-						<DataTemplate x:DataType="uibase:IGridEntry">
+						<DataTemplate x:DataType="uibase:GridEntry">
 							<Panel Opacity="{CompiledBinding Liberate.Opacity}">
 								<TextBlock Text="{CompiledBinding Category}" />
 							</Panel>
@@ -172,7 +174,7 @@
 				</controls:DataGridTemplateColumnExt>
 
 				<controls:DataGridMyRatingColumn
-					x:DataType="uibase:IGridEntry"
+					x:DataType="uibase:GridEntry"
 					Header="Product&#xA;Rating"
 					IsReadOnly="true"
 					MinWidth="10" Width="{Binding ProductRatingWidth, Mode=TwoWay}"
@@ -181,9 +183,9 @@
 					ClipboardContentBinding="{CompiledBinding ProductRating}"
 					Binding="{CompiledBinding ProductRating}" />
 
-				<controls:DataGridTemplateColumnExt Header="Purchase&#xA;Date" MinWidth="10" Width="{Binding PurchaseDateWidth, Mode=TwoWay}" CanUserSort="True" SortMemberPath="PurchaseDate" ClipboardContentBinding="{Binding PurchaseDate}">
+				<controls:DataGridTemplateColumnExt Header="Purchase&#xA;Date" MinWidth="10" Width="{CompiledBinding PurchaseDateWidth, Mode=TwoWay}" CanUserSort="True" SortMemberPath="PurchaseDate" ClipboardContentBinding="{Binding PurchaseDate}">
 					<DataGridTemplateColumn.CellTemplate>
-						<DataTemplate x:DataType="uibase:IGridEntry">
+						<DataTemplate x:DataType="uibase:GridEntry">
 							<Panel Opacity="{CompiledBinding Liberate.Opacity}">
 								<TextBlock Text="{CompiledBinding PurchaseDate}" />
 							</Panel>
@@ -192,7 +194,7 @@
 				</controls:DataGridTemplateColumnExt>
 
 				<controls:DataGridMyRatingColumn
-					x:DataType="uibase:IGridEntry"
+					x:DataType="uibase:GridEntry"
 					Header="My Rating"
 					IsReadOnly="false"
 					MinWidth="10" Width="{Binding MyRatingWidth, Mode=TwoWay}"
@@ -201,9 +203,9 @@
 					ClipboardContentBinding="{CompiledBinding MyRating}"					
 					Binding="{CompiledBinding MyRating, Mode=TwoWay}" />
 
-				<controls:DataGridTemplateColumnExt Header="Misc" MinWidth="10" Width="{Binding MiscWidth, Mode=TwoWay}" CanUserSort="True" SortMemberPath="Misc" ClipboardContentBinding="{Binding Misc}">
+				<controls:DataGridTemplateColumnExt Header="Misc" MinWidth="10" Width="{CompiledBinding MiscWidth, Mode=TwoWay}" CanUserSort="True" SortMemberPath="Misc" ClipboardContentBinding="{Binding Misc}">
 					<DataGridTemplateColumn.CellTemplate>
-						<DataTemplate x:DataType="uibase:IGridEntry">
+						<DataTemplate x:DataType="uibase:GridEntry">
 							<Panel Opacity="{CompiledBinding Liberate.Opacity}">
 								<TextBlock Text="{CompiledBinding Misc}" TextWrapping="WrapWithOverflow" />
 							</Panel>
@@ -211,19 +213,29 @@
 					</DataGridTemplateColumn.CellTemplate>
 				</controls:DataGridTemplateColumnExt>
 				
-				<controls:DataGridTemplateColumnExt Header="Last&#xA;Download" MinWidth="10" Width="{Binding LastDownloadWidth, Mode=TwoWay}" CanUserSort="True" SortMemberPath="LastDownload" ClipboardContentBinding="{Binding LastDownload}">
+				<controls:DataGridTemplateColumnExt Header="Last&#xA;Download" MinWidth="10" Width="{CompiledBinding LastDownloadWidth, Mode=TwoWay}" CanUserSort="True" SortMemberPath="LastDownload" ClipboardContentBinding="{Binding LastDownload}">
 					<DataGridTemplateColumn.CellTemplate>
-						<DataTemplate x:DataType="uibase:IGridEntry">
+						<DataTemplate x:DataType="uibase:GridEntry">
 							<Panel Opacity="{CompiledBinding Liberate.Opacity}" ToolTip.Tip="{CompiledBinding LastDownload.ToolTipText}" DoubleTapped="Version_DoubleClick">
 								<TextBlock Text="{CompiledBinding LastDownload}" TextWrapping="WrapWithOverflow" />
 							</Panel>
 						</DataTemplate>
 					</DataGridTemplateColumn.CellTemplate>
 				</controls:DataGridTemplateColumnExt>
-
-				<controls:DataGridTemplateColumnExt Header="Tags" MinWidth="10" Width="{Binding BookTagsWidth, Mode=TwoWay}" CanUserSort="True" SortMemberPath="BookTags" ClipboardContentBinding="{Binding BookTags}">
+				
+				<controls:DataGridTemplateColumnExt Header="Is&#xA;Spatial" MinWidth="10" Width="{CompiledBinding IsSpatialWidth, Mode=TwoWay}" CanUserSort="True" SortMemberPath="IsSpatial" ClipboardContentBinding="{Binding IsSpatial}">
 					<DataGridTemplateColumn.CellTemplate>
-						<DataTemplate x:DataType="uibase:IGridEntry">
+						<DataTemplate x:DataType="uibase:GridEntry">
+							<Panel Opacity="{CompiledBinding Liberate.Opacity}" ToolTip.Tip="{CompiledBinding LastDownload.ToolTipText}">
+								<CheckBox IsChecked="{CompiledBinding IsSpatial}" IsEnabled="False" HorizontalAlignment="Center" VerticalAlignment="Center" />
+							</Panel>
+						</DataTemplate>
+					</DataGridTemplateColumn.CellTemplate>
+				</controls:DataGridTemplateColumnExt>
+
+				<controls:DataGridTemplateColumnExt Header="Tags" MinWidth="10" Width="{CompiledBinding BookTagsWidth, Mode=TwoWay}" CanUserSort="True" SortMemberPath="BookTags" ClipboardContentBinding="{Binding BookTags}">
+					<DataGridTemplateColumn.CellTemplate>
+						<DataTemplate x:DataType="uibase:GridEntry">
 							<Button
 								IsVisible="{CompiledBinding !Liberate.IsSeries}"
 								VerticalAlignment="Stretch"

Source/LibationAvalonia/Views/ProductsDisplay.axaml.cs

@@ -26,7 +26,7 @@ namespace LibationAvalonia.Views
 	public partial class ProductsDisplay : UserControl
 	{
 		public event EventHandler<LibraryBook[]>? LiberateClicked;
-		public event EventHandler<ISeriesEntry>? LiberateSeriesClicked;
+		public event EventHandler<SeriesEntry>? LiberateSeriesClicked;
 		public event EventHandler<LibraryBook[]>? ConvertToMp3Clicked;
 		public event EventHandler<LibraryBook>? TagsButtonClicked;
 
@@ -102,7 +102,7 @@ namespace LibationAvalonia.Views
 
 		private void ProductsDisplay_LoadingRow(object sender, DataGridRowEventArgs e)
 		{
-			if (e.Row.DataContext is LibraryBookEntry<AvaloniaEntryStatus> entry && entry.Liberate.IsEpisode)
+			if (e.Row.DataContext is LibraryBookEntry entry && entry.Liberate.IsEpisode)
 				e.Row.DynamicResource(DataGridRow.BackgroundProperty, "SeriesEntryGridBackgroundBrush");
 			else
 				e.Row.DynamicResource(DataGridRow.BackgroundProperty, "SystemRegionColor");
@@ -173,10 +173,10 @@ namespace LibationAvalonia.Views
 			{
 				switch (column.SortMemberPath)
 				{
-					case nameof(IGridEntry.Liberate):
+					case nameof(GridEntry.Liberate):
 						column.Width = new DataGridLength(BaseLiberateWidth * scaleFactor);
 						break;
-					case nameof(IGridEntry.Cover):
+					case nameof(GridEntry.Cover):
 						column.Width = new DataGridLength(BaseCoverWidth * scaleFactor);
 						break;
 				}
@@ -220,7 +220,7 @@ namespace LibationAvalonia.Views
 
 			#region Liberate all Episodes (Single series only)
 
-			if (entries.Length == 1 && entries[0] is ISeriesEntry seriesEntry)
+			if (entries.Length == 1 && entries[0] is SeriesEntry seriesEntry)
 			{
 				args.ContextMenuItems.Add(new MenuItem()
 				{
@@ -253,7 +253,7 @@ namespace LibationAvalonia.Views
 			#endregion
 			#region Locate file (Single book only)
 
-			if (entries.Length == 1 && entries[0] is ILibraryBookEntry entry)
+			if (entries.Length == 1 && entries[0] is LibraryBookEntry entry)
 			{
 				args.ContextMenuItems.Add(new MenuItem
 				{
@@ -301,7 +301,7 @@ namespace LibationAvalonia.Views
 
 			#endregion
 			#region Liberate All (multiple books only)
-			if (entries.OfType<ILibraryBookEntry>().Count() > 1)
+			if (entries.OfType<LibraryBookEntry>().Count() > 1)
 			{
 				args.ContextMenuItems.Add(new MenuItem
 				{
@@ -325,7 +325,7 @@ namespace LibationAvalonia.Views
 
 			#endregion
 			#region Force Re-Download (Single book only)
-			if (entries.Length == 1 && entries[0] is ILibraryBookEntry entry4)
+			if (entries.Length == 1 && entries[0] is LibraryBookEntry entry4)
 			{
 				args.ContextMenuItems.Add(new MenuItem()
 				{
@@ -361,7 +361,7 @@ namespace LibationAvalonia.Views
 				}
 			}
 
-			if (entries.Length == 1 && entries[0] is ILibraryBookEntry entry2)
+			if (entries.Length == 1 && entries[0] is LibraryBookEntry entry2)
 			{
 				args.ContextMenuItems.Add(new MenuItem
 				{
@@ -391,7 +391,7 @@ namespace LibationAvalonia.Views
 			#endregion
 			#region View Bookmarks/Clips (Single book only)
 
-			if (entries.Length == 1 && entries[0] is ILibraryBookEntry entry3 && VisualRoot is Window window)
+			if (entries.Length == 1 && entries[0] is LibraryBookEntry entry3 && VisualRoot is Window window)
 			{
 				args.ContextMenuItems.Add(new MenuItem
 				{
@@ -426,7 +426,6 @@ namespace LibationAvalonia.Views
 			productsGrid.ColumnDisplayIndexChanged += ProductsGrid_ColumnDisplayIndexChanged;
 
 			var config = Configuration.Instance;
-			var gridColumnsVisibilities = config.GridColumnsVisibilities;
 			var displayIndices = config.GridColumnsDisplayIndices;
 
 			var contextMenu = new ContextMenu();
@@ -447,7 +446,7 @@ namespace LibationAvalonia.Views
 			{
 				var itemName = column.SortMemberPath;
 
-				if (itemName == nameof(IGridEntry.Remove))
+				if (itemName == nameof(GridEntry.Remove))
 					continue;
 
 				menuItems.Add
@@ -464,7 +463,7 @@ namespace LibationAvalonia.Views
 				if (headerCell is not null)
 					headerCell.ContextMenu = contextMenu;
 
-				column.IsVisible = gridColumnsVisibilities.GetValueOrDefault(itemName, true);
+				column.IsVisible = config.GetColumnVisibility(itemName);
 			}
 
 			//We must set DisplayIndex properties in ascending order
@@ -536,7 +535,7 @@ namespace LibationAvalonia.Views
 			if (sender is not LiberateStatusButton button)
 				return;
 
-			if (button.DataContext is ISeriesEntry sEntry && _viewModel is not null)
+			if (button.DataContext is SeriesEntry sEntry && _viewModel is not null)
 			{
 				await _viewModel.ToggleSeriesExpanded(sEntry);
 
@@ -544,7 +543,7 @@ namespace LibationAvalonia.Views
 				//to the topright cell. Reset focus onto the clicked button's cell.
 				button.Focus();
 			}
-			else if (button.DataContext is ILibraryBookEntry lbEntry)
+			else if (button.DataContext is LibraryBookEntry lbEntry)
 			{
 				LiberateClicked?.Invoke(this, [lbEntry.LibraryBook]);
 			}
@@ -558,13 +557,13 @@ namespace LibationAvalonia.Views
 
 		public void Version_DoubleClick(object sender, Avalonia.Input.TappedEventArgs args)
 		{
-			if (sender is Control panel && panel.DataContext is ILibraryBookEntry lbe && lbe.LastDownload.IsValid)
+			if (sender is Control panel && panel.DataContext is LibraryBookEntry lbe && lbe.LastDownload.IsValid)
 				lbe.LastDownload.OpenReleaseUrl();
 		}
 
 		public void Cover_Click(object sender, Avalonia.Input.TappedEventArgs args)
 		{
-			if (sender is not Image tblock || tblock.DataContext is not IGridEntry gEntry)
+			if (sender is not Image tblock || tblock.DataContext is not GridEntry gEntry)
 				return;
 
 			if (imageDisplayDialog is null || !imageDisplayDialog.IsVisible)
@@ -605,7 +604,7 @@ namespace LibationAvalonia.Views
 
 		public void Description_Click(object sender, Avalonia.Input.TappedEventArgs args)
 		{
-			if (sender is Control tblock && tblock.DataContext is IGridEntry gEntry)
+			if (sender is Control tblock && tblock.DataContext is GridEntry gEntry)
 			{
 				var pt = tblock.PointToScreen(tblock.Bounds.TopRight);
 				var displayWindow = new DescriptionDisplayDialog
@@ -632,7 +631,7 @@ namespace LibationAvalonia.Views
 		{
 			var button = args.Source as Button;
 
-			if (button?.DataContext is ILibraryBookEntry lbEntry)
+			if (button?.DataContext is LibraryBookEntry lbEntry)
 			{
 				TagsButtonClicked?.Invoke(this, lbEntry.LibraryBook);
 			}

Source/LibationFileManager/Configuration.Logging.cs

@@ -1,31 +1,47 @@
 using System;
 using System.ComponentModel;
-using System.Linq;
 using Dinah.Core.Logging;
 using FileManager;
 using Microsoft.Extensions.Configuration;
 using Serilog;
 using Serilog.Events;
+using Serilog.Exceptions;
+using Serilog.Settings.Configuration;
 
 #nullable enable
 namespace LibationFileManager
 {
-    public partial class Configuration
+	public partial class Configuration
     {
         private IConfigurationRoot? configuration;
 
         public void ConfigureLogging()
         {
+            //pass explicit assemblies to the ConfigurationReaderOptions
+            //This is a workaround for the issue where serilog will try to load all
+            //Assemblies starting with "serilog" from the app folder, but it will fail
+            //if those assemblies are unreferenced.
+            //This was a problem when migrating from the ZipFile sink to the File sink.
+            //Upgrading users would still have the ZipFile sink dll in the program
+            //folder and serilog would try to load it, unsuccessfully.
+            //https://github.com/serilog/serilog-settings-configuration/issues/406
+            var readerOptions = new ConfigurationReaderOptions(
+                typeof(ILogger).Assembly,                                 // Serilog
+                typeof(LoggerEnrichmentConfigurationExtensions).Assembly, // Serilog.Exceptions
+                typeof(ConsoleLoggerConfigurationExtensions).Assembly,    // Serilog.Sinks.Console
+                typeof(FileLoggerConfigurationExtensions).Assembly);      // Serilog.Sinks.File
+
             configuration = new ConfigurationBuilder()
                 .AddJsonFile(SettingsFilePath, optional: false, reloadOnChange: true)
                 .Build();
-            Log.Logger = new LoggerConfiguration()
-                .ReadFrom.Configuration(configuration)
-                .Destructure.ByTransforming<LongPath>(lp => lp.Path)
-                .CreateLogger();
-        }
+			Log.Logger = new LoggerConfiguration()
+				 .ReadFrom.Configuration(configuration, readerOptions)
+				 .Destructure.ByTransforming<LongPath>(lp => lp.Path)
+				 .Destructure.With<LogFileFilter>()
+                 .CreateLogger();
+		}
 
-        [Description("The importance of a log event")]
+		[Description("The importance of a log event")]
         public LogEventLevel LogLevel
         {
             get

Source/LibationFileManager/Configuration.PersistentSettings.cs

@@ -179,12 +179,14 @@ namespace LibationFileManager
 		[Description("Lame target VBR quality [10,100]")]
 		public int LameVBRQuality { get => GetNonString(defaultValue: 2); set => SetNonString(value); }
 
-		private static readonly EquatableDictionary<string, bool> DefaultColumns = new(
-			new KeyValuePair<string, bool>[]
-			{
+		private static readonly EquatableDictionary<string, bool> DefaultColumns = new([
 			new ("SeriesOrder", false),
-			new ("LastDownload", false)
-			});
+			new ("LastDownload", false),
+			new ("IsSpatial", false)
+			]);
+		public bool GetColumnVisibility(string columnName)
+			=> GridColumnsVisibilities.TryGetValue(columnName, out var isVisible) ? isVisible
+			:DefaultColumns.GetValueOrDefault(columnName, true);
 
 		[Description("A Dictionary of GridView data property names and bool indicating its column's visibility in ProductsGrid")]
 		public Dictionary<string, bool> GridColumnsVisibilities { get => GetNonString(defaultValue: DefaultColumns).Clone(); set => SetNonString(value); }

Source/LibationFileManager/FilePathCache.cs

@@ -46,7 +46,9 @@ namespace LibationFileManager
 
 		public static List<(FileType fileType, LongPath path)> GetFiles(string id)
 		{
-			var matchingFiles = Cache.GetIdEntries(id);
+			List<CacheEntry> matchingFiles;
+			lock(locker)
+				matchingFiles = Cache.GetIdEntries(id);
 
 			bool cacheChanged = false;
 
@@ -68,7 +70,9 @@ namespace LibationFileManager
 
 		public static LongPath? GetFirstPath(string id, FileType type)
 		{
-			var matchingFiles = Cache.GetIdEntries(id).Where(e => e.FileType == type).ToList();
+			List<CacheEntry> matchingFiles;
+			lock (locker)
+				matchingFiles = Cache.GetIdEntries(id).Where(e => e.FileType == type).ToList();
 
 			bool cacheChanged = false;
 			try
@@ -96,7 +100,10 @@ namespace LibationFileManager
 
 		private static bool Remove(CacheEntry entry)
 		{
-			if (Cache.Remove(entry.Id, entry))
+			bool removed;
+			lock (locker)
+				removed = Cache.Remove(entry.Id, entry);
+			if (removed)
 			{
 				Removed?.Invoke(null, entry);
 				return true;
@@ -112,7 +119,8 @@ namespace LibationFileManager
 
 		public static void Insert(CacheEntry entry)
 		{
-			Cache.Add(entry.Id, entry);
+			lock(locker)
+				Cache.Add(entry.Id, entry);
 			Inserted?.Invoke(null, entry);
 			save();
 		}

Source/LibationFileManager/LogFileFilter.cs

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

Source/LibationFileManager/PictureStorage.cs

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

Source/LibationFileManager/Templates/LibraryBookDto.cs

@@ -34,6 +34,8 @@ public class BookDto
 	public DateTime FileDate { get; set; } = DateTime.Now;
 	public DateTime? DatePublished { get; set; }
 	public string? Language { get; set; }
+	public string? LibationVersion { get; set; }
+	public string? FileVersion { get; set; }
 }
 
 public class LibraryBookDto : BookDto

Source/LibationFileManager/Templates/TemplateEditor[T].cs

@@ -69,6 +69,9 @@ namespace LibationFileManager.Templates
 				Authors = [new("Arthur Conan Doyle", "B000AQ43GQ"), new("Stephen Fry - introductions", "B000APAGVS")],
 				Narrators = [new("Stephen Fry", null)],
 				Series = [new("Sherlock Holmes", 1, "B08376S3R2"), new("Some Other Series", 1, "B000000000")],
+				Codec = "AAC-LC",
+				LibationVersion = Configuration.LibationVersion?.ToString(3),
+				FileVersion = "36217811",
 				BitRate = 128,
 				SampleRate = 44100,
 				Channels = 2,

Source/LibationFileManager/Templates/TemplateTags.cs

@@ -36,10 +36,12 @@ namespace LibationFileManager.Templates
 		public static TemplateTags Series { get; } = new TemplateTags("series", "All series to which the book belongs (if any)");
 		public static TemplateTags FirstSeries { get; } = new TemplateTags("first series", "First series");
 		public static TemplateTags SeriesNumber { get; } = new TemplateTags("series#", "Number order in series (alias for <first series[{#}]>");
-		public static TemplateTags Bitrate { get; } = new TemplateTags("bitrate", "Audiobook's source bitrate");
-		public static TemplateTags SampleRate { get; } = new TemplateTags("samplerate", "Audiobook's source sample rate");
-		public static TemplateTags Channels { get; } = new TemplateTags("channels", "Audiobook's source audio channel count");
-		public static TemplateTags Codec { get; } = new TemplateTags("codec", "Audiobook's source codec");
+		public static TemplateTags Bitrate { get; } = new TemplateTags("bitrate", "Bitrate (kbps) of the last downloaded audiobook");
+		public static TemplateTags SampleRate { get; } = new TemplateTags("samplerate", "Sample rate (Hz) of the last downloaded audiobook");
+		public static TemplateTags Channels { get; } = new TemplateTags("channels", "Number of audio channels in the last downloaded audiobook");
+		public static TemplateTags Codec { get; } = new TemplateTags("codec", "Audio codec of the last downloaded audiobook");
+		public static TemplateTags FileVersion { get; } = new TemplateTags("file version", "Audible's file version number of the last downloaded audiobook");
+		public static TemplateTags LibationVersion { get; } = new TemplateTags("libation version", "Libation version used during last download of the audiobook");
 		public static TemplateTags Account { get; } = new TemplateTags("account", "Audible account of this book");
 		public static TemplateTags AccountNickname { get; } = new TemplateTags("account nickname", "Audible account nickname of this book");
 		public static TemplateTags Locale { get; } = new("locale", "Region/country");

Source/LibationFileManager/Templates/Templates.cs

@@ -287,6 +287,8 @@ namespace LibationFileManager.Templates
 			{ TemplateTags.SampleRate, lb => lb.SampleRate },
 			{ TemplateTags.Channels, lb => lb.Channels },
 			{ TemplateTags.Codec, lb => lb.Codec },
+			{ TemplateTags.FileVersion, lb => lb.FileVersion },
+			{ TemplateTags.LibationVersion, lb => lb.LibationVersion },
 		};
 
 		private static readonly List<TagCollection> chapterPropertyTags = new()
@@ -382,7 +384,7 @@ namespace LibationFileManager.Templates
 			public static string Name { get; } = "Folder Template";
 			public static string Description { get; } = Configuration.GetDescription(nameof(Configuration.FolderTemplate)) ?? "";
 			public static string DefaultTemplate { get; } = "<title short> [<id>]";
-			public static IEnumerable<TagCollection> TagCollections { get; } = [filePropertyTags, conditionalTags, folderConditionalTags];
+			public static IEnumerable<TagCollection> TagCollections { get; } = [filePropertyTags, audioFilePropertyTags, conditionalTags, folderConditionalTags];
 
 			public override IEnumerable<string> Errors
 				=> TemplateText?.Length >= 2 && Path.IsPathFullyQualified(TemplateText) ? base.Errors.Append(ERROR_FULL_PATH_IS_INVALID) : base.Errors;

Source/LibationFileManager/WindowsDirectory.cs

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

Source/LibationSearchEngine/SearchEngine.cs

@@ -50,6 +50,7 @@ namespace LibationSearchEngine
             { FieldType.Bool, lb => (lb.Book.UserDefinedItem.Rating.OverallRating > 0f).ToString(), "IsRated", "Rated" },
             { FieldType.Bool, lb => isAuthorNarrated(lb.Book).ToString(), "IsAuthorNarrated", "AuthorNarrated" },
             { FieldType.Bool, lb => lb.Book.IsAbridged.ToString(), nameof(Book.IsAbridged), "Abridged" },
+            { FieldType.Bool, lb => lb.Book.IsSpatial.ToString(), nameof(Book.IsSpatial), "Spatial" },
             { FieldType.Bool, lb => (lb.Book.UserDefinedItem.BookStatus == LiberatedStatus.Liberated).ToString(), "IsLiberated", "Liberated" },
             { FieldType.Bool, lb => (lb.Book.UserDefinedItem.BookStatus == LiberatedStatus.Error).ToString(), "LiberatedError" },
             { FieldType.Bool, lb => lb.Book.IsEpisodeChild().ToString(), "Podcast", "Podcasts", "IsPodcast", "Episode", "Episodes", "IsEpisode" },

Source/LibationUiBase/BaseUtil.cs

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

Source/LibationUiBase/GridView/EntryStatus.cs

@@ -1,22 +1,15 @@
 using ApplicationServices;
 using DataLayer;
 using Dinah.Core;
-using Dinah.Core.Threading;
 using System;
 using System.Collections.Generic;
-using System.ComponentModel;
 
 namespace LibationUiBase.GridView
 {
-	public interface IEntryStatus
-	{
-		static abstract EntryStatus Create(LibraryBook libraryBook);
-	}
-
 	//This Class holds all book entry status info to help the grid properly render entries.
 	//The reason this info is in here instead of GridEntry is because all of this info is needed
 	//for the "Liberate" column's display and sorting functions.
-	public abstract class EntryStatus : ReactiveObject, IComparable
+	public class EntryStatus : ReactiveObject, IComparable
 	{
 		public LiberatedStatus? PdfStatus => LibraryCommands.Pdf_Status(Book);
 		public LiberatedStatus BookStatus
@@ -70,7 +63,7 @@ namespace LibationUiBase.GridView
 		private readonly bool isAbsent;
 		private static readonly Dictionary<string, object> iconCache = new();
 
-		protected EntryStatus(LibraryBook libraryBook)
+		internal EntryStatus(LibraryBook libraryBook)
 		{
 			Book = ArgumentValidator.EnsureNotNull(libraryBook, nameof(libraryBook)).Book;
 			isAbsent = libraryBook.AbsentFromLastScan is true;
@@ -78,9 +71,6 @@ namespace LibationUiBase.GridView
 			IsSeries = Book.ContentType is ContentType.Parent;
 		}
 
-		internal protected abstract object LoadImage(byte[] picture);
-		protected abstract object GetResourceImage(string rescName);
-
 		/// <summary>Refresh BookStatus (so partial download files are checked again in the filesystem) and raise PropertyChanged for property names.</summary>
 		public void Invalidate(params string[] properties)
 		{
@@ -179,7 +169,7 @@ namespace LibationUiBase.GridView
 		private object GetAndCacheResource(string rescName)
 		{
 			if (!iconCache.ContainsKey(rescName))
-				iconCache[rescName] = GetResourceImage(rescName);
+				iconCache[rescName] = BaseUtil.LoadResourceImage(rescName);
 			return iconCache[rescName];
 		}
 	}

Source/LibationUiBase/GridView/GridContextMenu.cs

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

Source/LibationUiBase/GridView/GridEntry.cs

@@ -1,7 +1,6 @@
 using ApplicationServices;
 using DataLayer;
 using Dinah.Core;
-using Dinah.Core.Threading;
 using FileLiberator;
 using LibationFileManager;
 using System;
@@ -9,7 +8,7 @@ using System.Collections;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Linq;
-using System.Runtime.CompilerServices;
+using System.Threading;
 using System.Threading.Tasks;
 
 namespace LibationUiBase.GridView
@@ -22,7 +21,7 @@ namespace LibationUiBase.GridView
 	}
 
 	/// <summary>The View Model base for the DataGridView</summary>
-	public abstract class GridEntry<TStatus> : ReactiveObject, IGridEntry where TStatus : IEntryStatus
+	public abstract class GridEntry : ReactiveObject
 	{
 		[Browsable(false)] public string AudibleProductId => Book.AudibleProductId;
 		[Browsable(false)] public LibraryBook LibraryBook { get; protected set; }
@@ -49,7 +48,7 @@ namespace LibationUiBase.GridView
 		private Rating _productrating;
 		private string _bookTags;
 		private Rating _myRating;
-
+		private bool _isSpatial;
 		public abstract bool? Remove { get; set; }
 		public EntryStatus Liberate { get => _liberate; private set => RaiseAndSetIfChanged(ref _liberate, value); }
 		public string PurchaseDate { get => _purchasedate; protected set => RaiseAndSetIfChanged(ref _purchasedate, value); }
@@ -66,6 +65,7 @@ namespace LibationUiBase.GridView
 		public string Description { get => _description; private set => RaiseAndSetIfChanged(ref _description, value); }
 		public Rating ProductRating { get => _productrating; private set => RaiseAndSetIfChanged(ref _productrating, value); }
 		public string BookTags { get => _bookTags; private set => RaiseAndSetIfChanged(ref _bookTags, value); }
+		public bool IsSpatial { get => _isSpatial; protected set => RaiseAndSetIfChanged(ref _isSpatial, value); }
 
 		public Rating MyRating
 		{
@@ -101,7 +101,7 @@ namespace LibationUiBase.GridView
 			LibraryBook = libraryBook;
 
 			var expanded = Liberate?.Expanded ?? false;
-			Liberate = TStatus.Create(libraryBook);
+			Liberate = new EntryStatus(libraryBook);
 			Liberate.Expanded = expanded;
 
 			Title = Book.TitleWithSubtitle;
@@ -119,6 +119,7 @@ namespace LibationUiBase.GridView
 			Description = GetDescriptionDisplay(Book);
 			SeriesIndex = Book.SeriesLink.FirstOrDefault()?.Index ?? 0;
 			BookTags = GetBookTags();
+			IsSpatial = Book.IsSpatial;
 
 			UserDefinedItem.ItemChanged += UserDefinedItem_ItemChanged;
 		}
@@ -206,6 +207,7 @@ namespace LibationUiBase.GridView
 			nameof(BookTags) => BookTags ?? string.Empty,
 			nameof(Liberate) => Liberate,
 			nameof(DateAdded) => DateAdded,
+			nameof(IsSpatial) => IsSpatial,
 			_ => null
 		};
 
@@ -240,7 +242,7 @@ namespace LibationUiBase.GridView
 				PictureStorage.PictureCached += PictureStorage_PictureCached;
 
 			// Mutable property. Set the field so PropertyChanged isn't fired.
-			_lazyCover = new Lazy<object>(() => Liberate.LoadImage(picture));
+			_lazyCover = new Lazy<object>(() => BaseUtil.LoadImage(picture, PictureSize._80x80));
 		}
 
 		private void PictureStorage_PictureCached(object sender, PictureCachedEventArgs e)
@@ -254,7 +256,7 @@ namespace LibationUiBase.GridView
 			// logic validation
 			if (e.Definition.PictureId == Book.PictureId)
 			{
-				_lazyCover = new Lazy<object>(() => Liberate.LoadImage(e.Picture));
+				_lazyCover = new Lazy<object>(() => BaseUtil.LoadImage(e.Picture, PictureSize._80x80));
 				RaisePropertyChanged(nameof(Cover));
 				PictureStorage.PictureCached -= PictureStorage_PictureCached;
 			}
@@ -311,6 +313,35 @@ namespace LibationUiBase.GridView
 
 		#endregion
 
+		/// <summary>
+		/// Creates <see cref="GridEntry"/> for all non-episode books in an enumeration of <see cref="DataLayer.LibraryBook"/>.
+		/// </summary>
+		/// <remarks>Can be called from any thread, but requires the calling thread's <see cref="SynchronizationContext.Current"/> to be valid.</remarks>
+		public static  async Task<List<TEntry>> GetAllProductsAsync<TEntry>(IEnumerable<LibraryBook> libraryBooks, Func<LibraryBook, bool> includeIf, Func<LibraryBook, TEntry> factory)
+			where TEntry : GridEntry
+		{
+			var products = libraryBooks.Where(includeIf).ToArray();
+			if (products.Length == 0)
+				return [];
+
+			int parallelism = int.Max(1, Environment.ProcessorCount - 1);
+
+			(int batchSize, int rem) = int.DivRem(products.Length, parallelism);
+			if (rem != 0) batchSize++;
+
+			var syncContext = SynchronizationContext.Current;
+
+			//Asynchronously create a GridEntry for every book in the library
+			var tasks = products.Chunk(batchSize).Select(batch => Task.Run(() =>
+			{
+				SynchronizationContext.SetSynchronizationContext(syncContext);
+				return batch.Select(factory).OfType<TEntry>().ToArray();
+			}));
+
+			return (await Task.WhenAll(tasks)).SelectMany(a => a).ToList();
+		}
+
+
 		~GridEntry()
 		{
 			PictureStorage.PictureCached -= PictureStorage_PictureCached;

Source/LibationUiBase/GridView/IGridEntry.cs

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

Source/LibationUiBase/GridView/ILibraryBookEntry.cs

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

Source/LibationUiBase/GridView/ISeriesEntry.cs

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

Source/LibationUiBase/GridView/LastDownloadStatus.cs

@@ -6,6 +6,8 @@ namespace LibationUiBase.GridView
 	public class LastDownloadStatus : IComparable
 	{
 		public bool IsValid => LastDownloadedVersion is not null && LastDownloaded.HasValue;
+		public AudioFormat LastDownloadedFormat { get; }
+		public string LastDownloadedFileVersion { get; }
 		public Version LastDownloadedVersion { get; }
 		public DateTime? LastDownloaded { get; }
 		public string ToolTipText => IsValid ? $"Double click to open v{LastDownloadedVersion.ToString(3)} release notes" : "";
@@ -14,6 +16,8 @@ namespace LibationUiBase.GridView
 		public LastDownloadStatus(UserDefinedItem udi)
 		{
 			LastDownloadedVersion = udi.LastDownloadedVersion;
+			LastDownloadedFormat = udi.LastDownloadedFormat;
+			LastDownloadedFileVersion = udi.LastDownloadedFileVersion;
 			LastDownloaded = udi.LastDownloaded;
 		}
 
@@ -24,7 +28,13 @@ namespace LibationUiBase.GridView
 		}
 
 		public override string ToString()
-			=> IsValid ? $"{dateString()}\n\nLibation v{LastDownloadedVersion.ToString(3)}" : "";
+			=> IsValid ? $"""
+				{dateString()} {versionString()}
+				{LastDownloadedFormat}
+				Libation v{LastDownloadedVersion.ToString(3)}
+				""" : "";
+
+		private string versionString() => LastDownloadedFileVersion is string ver ? $"(File v.{ver})" : "";
 
 		//Call ToShortDateString to use current culture's date format.
 		private string dateString() => $"{LastDownloaded.Value.ToShortDateString()} {LastDownloaded.Value:HH:mm}";

Source/LibationUiBase/GridView/LibraryBookEntry.cs

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

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

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

Source/LibationUiBase/GridView/QueryExtensions.cs

@@ -10,19 +10,19 @@ namespace LibationUiBase.GridView
 #nullable enable
 	public static class QueryExtensions
 	{
-		public static IEnumerable<ILibraryBookEntry> BookEntries(this IEnumerable<IGridEntry> gridEntries)
-			=> gridEntries.OfType<ILibraryBookEntry>();
+		public static IEnumerable<LibraryBookEntry> BookEntries(this IEnumerable<GridEntry> gridEntries)
+			=> gridEntries.OfType<LibraryBookEntry>();
 
-		public static IEnumerable<ISeriesEntry> SeriesEntries(this IEnumerable<IGridEntry> gridEntries)
-			=> gridEntries.OfType<ISeriesEntry>();
+		public static IEnumerable<SeriesEntry> SeriesEntries(this IEnumerable<GridEntry> gridEntries)
+			=> gridEntries.OfType<SeriesEntry>();
 
-		public static T? FindByAsin<T>(this IEnumerable<T> gridEntries, string audibleProductID) where T : IGridEntry
+		public static T? FindByAsin<T>(this IEnumerable<T> gridEntries, string audibleProductID) where T : GridEntry
 			=> gridEntries.FirstOrDefault(i => i.AudibleProductId == audibleProductID);
 
-		public static IEnumerable<ISeriesEntry> EmptySeries(this IEnumerable<IGridEntry> gridEntries)
+		public static IEnumerable<SeriesEntry> EmptySeries(this IEnumerable<GridEntry> gridEntries)
 			=> gridEntries.SeriesEntries().Where(i => i.Children.Count == 0);
 
-		public static ISeriesEntry? FindSeriesParent(this IEnumerable<IGridEntry> gridEntries, LibraryBook seriesEpisode)
+		public static SeriesEntry? FindSeriesParent(this IEnumerable<GridEntry> gridEntries, LibraryBook seriesEpisode)
 		{
 			if (seriesEpisode.Book.SeriesLink is null) return null;
 
@@ -42,14 +42,14 @@ namespace LibationUiBase.GridView
 			}
 		}
 
-		public static bool SearchSetsDiffer(this HashSet<IGridEntry>? searchSet, HashSet<IGridEntry>? otherSet)
+		public static bool SearchSetsDiffer(this HashSet<GridEntry>? searchSet, HashSet<GridEntry>? otherSet)
 			=> searchSet is null != otherSet is null ||
 					(searchSet is not null &&
 					otherSet is not null &&
 					searchSet.Intersect(otherSet).Count() != searchSet.Count);
 
 		[return: NotNullIfNotNull(nameof(searchString))]
-		public static HashSet<IGridEntry>? FilterEntries(this IEnumerable<IGridEntry> entries, string? searchString)
+		public static HashSet<GridEntry>? FilterEntries(this IEnumerable<GridEntry> entries, string? searchString)
 		{
 			if (string.IsNullOrEmpty(searchString))
 				return null;
@@ -59,7 +59,7 @@ namespace LibationUiBase.GridView
 			var booksFilteredIn = entries.IntersectBy(searchResultSet.Docs.Select(d => d.ProductId), l => l.AudibleProductId);
 
 			//Find all series containing children that match the search criteria
-			var seriesFilteredIn = booksFilteredIn.OfType<ILibraryBookEntry>().Where(lbe => lbe.Parent is not null).Select(lbe => lbe.Parent).Distinct();
+			var seriesFilteredIn = booksFilteredIn.OfType<LibraryBookEntry>().Where(lbe => lbe.Parent is not null).Select(lbe => lbe.Parent).Distinct();
 
 			return booksFilteredIn.Concat(seriesFilteredIn).ToHashSet();
 		}

Source/LibationUiBase/GridView/RowComparerBase.cs

@@ -10,16 +10,16 @@ namespace LibationUiBase.GridView
 	/// are sorted by PropertyName while all episodes remain immediately beneath their parents and remain
 	/// sorted by series index, ascending.
 	/// </summary>
-	public abstract class RowComparerBase : IComparer, IComparer<IGridEntry>, IComparer<object>
+	public abstract class RowComparerBase : IComparer, IComparer<GridEntry>, IComparer<object>
 	{
 		public abstract string? PropertyName { get; set; }
 
 		public int Compare(object? x, object? y)
-			=> Compare(x as IGridEntry, y as IGridEntry);
+			=> Compare(x as GridEntry, y as GridEntry);
 
 		protected abstract ListSortDirection GetSortOrder();
 
-		private int InternalCompare(IGridEntry x, IGridEntry y)
+		private int InternalCompare(GridEntry x, GridEntry y)
 		{
 			var val1 = x.GetMemberValue(PropertyName);
 			var val2 = y.GetMemberValue(PropertyName);
@@ -32,7 +32,7 @@ namespace LibationUiBase.GridView
 				: compare;
 		}
 
-		public int Compare(IGridEntry? geA, IGridEntry? geB)
+		public int Compare(GridEntry? geA, GridEntry? geB)
 		{
 			if (geA is null && geB is not null) return -1;
 			if (geA is not null && geB is null) return 1;
@@ -40,12 +40,12 @@ namespace LibationUiBase.GridView
 
 			var sortDirection = GetSortOrder();
 
-			ISeriesEntry? parentA = null;
-			ISeriesEntry? parentB = null;
+			SeriesEntry? parentA = null;
+			SeriesEntry? parentB = null;
 
-			if (geA is ILibraryBookEntry lbA && lbA.Parent is ISeriesEntry seA)
+			if (geA is LibraryBookEntry lbA && lbA.Parent is SeriesEntry seA)
 				parentA = seA;
-			if (geB is ILibraryBookEntry lbB && lbB.Parent is ISeriesEntry seB)
+			if (geB is LibraryBookEntry lbB && lbB.Parent is SeriesEntry seB)
 				parentB = seB;
 
 			//both entries are children
@@ -59,7 +59,7 @@ namespace LibationUiBase.GridView
 					//and DateAdded, compare SeriesOrder instead..
 					return PropertyName switch
 					{
-						nameof(IGridEntry.DateAdded) or nameof(IGridEntry.PurchaseDate) => geA.SeriesOrder.CompareTo(geB.SeriesOrder),
+						nameof(GridEntry.DateAdded) or nameof(GridEntry.PurchaseDate) => geA.SeriesOrder.CompareTo(geB.SeriesOrder),
 						_ => InternalCompare(geA, geB),
 					};
 				}

Source/LibationUiBase/GridView/SeriesEntry.cs

@@ -0,0 +1,106 @@
+using DataLayer;
+using Dinah.Core.Collections.Generic;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace LibationUiBase.GridView
+{
+	/// <summary>The View Model for a LibraryBook that is ContentType.Parent</summary>
+	public class SeriesEntry : GridEntry
+	{
+		public List<LibraryBookEntry> Children { get; }
+		public override DateTime DateAdded => Children.Max(c => c.DateAdded);
+
+		private bool suspendCounting = false;
+		public void ChildRemoveUpdate()
+		{
+			if (suspendCounting) return;
+
+			var removeCount = Children.Count(c => c.Remove == true);
+
+			remove = removeCount == 0 ? false : removeCount == Children.Count ? true : null;
+			RaisePropertyChanged(nameof(Remove));
+		}
+
+		public override bool? Remove
+		{
+			get => remove;
+			set
+			{
+				remove = value ?? false;
+
+				suspendCounting = true;
+
+				foreach (var item in Children)
+					item.Remove = value;
+
+				suspendCounting = false;
+				RaisePropertyChanged(nameof(Remove));
+			}
+		}
+
+		public SeriesEntry(LibraryBook parent, LibraryBook child) : this(parent, new[] { child }) { }
+		public SeriesEntry(LibraryBook parent, IEnumerable<LibraryBook> children)
+		{
+			LastDownload = new();
+			SeriesIndex = -1;
+
+			Children = children
+				.Select(c => new LibraryBookEntry(c, this))
+				.OrderByDescending(c => c.SeriesOrder)
+				.ToList<LibraryBookEntry>();
+
+			UpdateLibraryBook(parent);
+			LoadCover();
+		}
+
+		/// <summary>
+		/// Creates <see cref="SeriesEntry{TStatus}"/> for all episodic series in an enumeration of <see cref="LibraryBook"/>.
+		/// </summary>
+		/// <remarks>Can be called from any thread, but requires the calling thread's <see cref="SynchronizationContext.Current"/> to be valid.</remarks>
+		public static async Task<List<SeriesEntry>> GetAllSeriesEntriesAsync(IEnumerable<LibraryBook> libraryBooks)
+		{
+			var seriesEntries = await GetAllProductsAsync(libraryBooks, lb => lb.Book.IsEpisodeParent(), lb => new SeriesEntry(lb, []));
+			var seriesDict = seriesEntries.ToDictionarySafe(s => s.AudibleProductId);
+			await GetAllProductsAsync(libraryBooks, lb => lb.Book.IsEpisodeChild(), CreateAndLinkEpisodeEntry);
+
+			//sort episodes by series order descending and update SeriesEntry
+			foreach (var series in seriesEntries)
+			{
+				series.Children.Sort((a, b) => -a.SeriesOrder.CompareTo(b.SeriesOrder));
+				series.UpdateLibraryBook(series.LibraryBook);
+			}
+
+			return seriesEntries.Where(s => s.Children.Count != 0).ToList();
+
+			//Create a LibraryBookEntry for an episode and link it to its series parent
+			LibraryBookEntry CreateAndLinkEpisodeEntry(LibraryBook episode)
+			{
+				foreach (var s in episode.Book.SeriesLink)
+				{
+					if (seriesDict.TryGetValue(s.Series.AudibleSeriesId, out var seriesParent))
+					{
+						var entry = new LibraryBookEntry(episode, seriesParent);
+						seriesParent.Children.Add(entry);
+						return entry;
+					}
+				}
+				return null;
+			}
+		}
+
+		public void RemoveChild(LibraryBookEntry lbe)
+		{
+			Children.Remove(lbe);
+			PurchaseDate = GetPurchaseDateString();
+			Length = GetBookLengthString();
+		}
+
+		protected override string GetBookTags() => null;
+		protected override int GetLengthInMinutes() => Children.Count == 0 ? 0 : Children.Sum(c => c.LibraryBook.Book.LengthInMinutes);
+		protected override DateTime GetPurchaseDate() => Children.Count == 0 ? default : Children.Min(c => c.LibraryBook.DateAdded);
+	}
+}

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

@@ -1,129 +0,0 @@
-using DataLayer;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace LibationUiBase.GridView
-{
-	/// <summary>The View Model for a LibraryBook that is ContentType.Parent</summary>
-	public class SeriesEntry<TStatus> : GridEntry<TStatus>, ISeriesEntry where TStatus : IEntryStatus
-	{
-		public List<ILibraryBookEntry> Children { get; }
-		public override DateTime DateAdded => Children.Max(c => c.DateAdded);
-
-		private bool suspendCounting = false;
-		public void ChildRemoveUpdate()
-		{
-			if (suspendCounting) return;
-
-			var removeCount = Children.Count(c => c.Remove == true);
-
-			remove = removeCount == 0 ? false : removeCount == Children.Count ? true : null;
-			RaisePropertyChanged(nameof(Remove));
-		}
-
-		public override bool? Remove
-		{
-			get => remove;
-			set
-			{
-				remove = value ?? false;
-
-				suspendCounting = true;
-
-				foreach (var item in Children)
-					item.Remove = value;
-
-				suspendCounting = false;
-				RaisePropertyChanged(nameof(Remove));
-			}
-		}
-
-		public SeriesEntry(LibraryBook parent, LibraryBook child) : this(parent, new[] { child }) { }
-		public SeriesEntry(LibraryBook parent, IEnumerable<LibraryBook> children)
-		{
-			LastDownload = new();
-			SeriesIndex = -1;
-
-			Children = children
-				.Select(c => new LibraryBookEntry<TStatus>(c, this))
-				.OrderByDescending(c => c.SeriesOrder)
-				.ToList<ILibraryBookEntry>();
-
-			UpdateLibraryBook(parent);
-			LoadCover();
-		}
-
-		/// <summary>
-		/// Creates <see cref="SeriesEntry{TStatus}"/> for all episodic series in an enumeration of <see cref="LibraryBook"/>.
-		/// </summary>
-		/// <remarks>Can be called from any thread, but requires the calling thread's <see cref="SynchronizationContext.Current"/> to be valid.</remarks>
-		public static async Task<List<ISeriesEntry>> GetAllSeriesEntriesAsync(IEnumerable<LibraryBook> libraryBooks)
-		{
-			var seriesBooks = libraryBooks.Where(lb => lb.Book.IsEpisodeParent()).ToArray();
-			var allEpisodes = libraryBooks.Where(lb => lb.Book.IsEpisodeChild()).ToArray();
-
-			var seriesEntries = new ISeriesEntry[seriesBooks.Length];
-			var seriesEpisodes = new ILibraryBookEntry[seriesBooks.Length][];
-
-			var syncContext = SynchronizationContext.Current;
-			var options = new ParallelOptions { MaxDegreeOfParallelism = int.Max(1, Environment.ProcessorCount - 1) };
-
-			//Asynchronously create an ILibraryBookEntry for every episode in the library
-			await Parallel.ForEachAsync(getAllEpisodes(), options,  createEpisodeEntry);
-
-			//Match all episode entries to their corresponding parents
-			for (int i = seriesEntries.Length - 1; i >= 0; i--)
-			{
-				var series = seriesEntries[i];
-
-				//Sort episodes by series order descending, then add them to their parent's entry
-				Array.Sort(seriesEpisodes[i], (a, b) => -a.SeriesOrder.CompareTo(b.SeriesOrder));
-				series.Children.AddRange(seriesEpisodes[i]);
-				series.UpdateLibraryBook(series.LibraryBook);
-			}
-
-			return seriesEntries.Where(s => s.Children.Count != 0).Cast<ISeriesEntry>().ToList();
-
-			//Create a LibraryBookEntry for a single episode
-			ValueTask createEpisodeEntry((int seriesIndex, int episodeIndex, LibraryBook episode) data, CancellationToken cancellationToken)
-			{
-				SynchronizationContext.SetSynchronizationContext(syncContext);
-				var parent = seriesEntries[data.seriesIndex];
-				seriesEpisodes[data.seriesIndex][data.episodeIndex] = new LibraryBookEntry<TStatus>(data.episode, parent);
-				return ValueTask.CompletedTask;
-			}
-
-			//Enumeration all series episodes, along with the index to its seriesEntries entry
-			//and an index to its seriesEpisodes entry
-			IEnumerable<(int seriesIndex, int episodeIndex, LibraryBook episode)> getAllEpisodes()
-			{
-				for (int i = 0; i < seriesBooks.Length; i++)
-				{
-					var series = seriesBooks[i];
-					var childEpisodes = allEpisodes.FindChildren(series);
-
-					SynchronizationContext.SetSynchronizationContext(syncContext);
-					seriesEntries[i] = new SeriesEntry<TStatus>(series, []);
-					seriesEpisodes[i] = new ILibraryBookEntry[childEpisodes.Count];
-
-					for (int j = 0; j < childEpisodes.Count; j++)
-						yield return (i, j, childEpisodes[j]);
-				}
-			}
-		}
-
-		public void RemoveChild(ILibraryBookEntry lbe)
-		{
-			Children.Remove(lbe);
-			PurchaseDate = GetPurchaseDateString();
-			Length = GetBookLengthString();
-		}
-
-		protected override string GetBookTags() => null;
-		protected override int GetLengthInMinutes() => Children.Count == 0 ? 0 : Children.Sum(c => c.LibraryBook.Book.LengthInMinutes);
-		protected override DateTime GetPurchaseDate() => Children.Count == 0 ? default : Children.Min(c => c.LibraryBook.DateAdded);
-	}
-}

Source/LibationUiBase/ILogForm.cs

@@ -1,7 +0,0 @@
-namespace LibationUiBase
-{
-	public interface ILogForm
-	{
-		void WriteLine(string text);
-	}
-}

Source/LibationUiBase/LogMe.cs

@@ -1,56 +0,0 @@
-using System;
-using System.Threading.Tasks;
-
-namespace LibationUiBase
-{
-	// decouple serilog and form. include convenience factory method
-	public class LogMe
-	{
-		public event EventHandler<string> LogInfo;
-		public event EventHandler<string> LogErrorString;
-		public event EventHandler<(Exception, string)> LogError;
-
-		private LogMe()
-		{
-			LogInfo += (_, text) => Serilog.Log.Logger.Information($"Automated backup: {text}");
-			LogErrorString += (_, text) => Serilog.Log.Logger.Error(text);
-			LogError += (_, tuple) => Serilog.Log.Logger.Error(tuple.Item1, tuple.Item2 ?? "Automated backup: error");
-		}
-		private static ILogForm LogForm;
-		public static LogMe RegisterForm<T>(T form) where T : ILogForm
-		{
-			var logMe = new LogMe();
-
-			if (form is null)
-				return logMe;
-
-			LogForm = form;
-
-			logMe.LogInfo += LogMe_LogInfo;
-			logMe.LogErrorString += LogMe_LogErrorString;
-			logMe.LogError += LogMe_LogError;
-
-			return logMe;
-		}
-
-		private static async void LogMe_LogError(object sender, (Exception, string) tuple)
-		{
-			await Task.Run(() => LogForm?.WriteLine(tuple.Item2 ?? "Automated backup: error"));
-			await Task.Run(() => LogForm?.WriteLine("ERROR: " + tuple.Item1.Message));
-		}
-
-		private static async void LogMe_LogErrorString(object sender, string text)
-		{
-			await Task.Run(() => LogForm?.WriteLine(text));
-		}
-
-		private static async void LogMe_LogInfo(object sender, string text)
-		{
-			await Task.Run(() => LogForm?.WriteLine(text));
-		}
-
-		public void Info(string text) => LogInfo?.Invoke(this, text);
-		public void Error(string text) => LogErrorString?.Invoke(this, text);
-		public void Error(Exception ex, string text = null) => LogError?.Invoke(this, (ex, text));
-	}
-}

Source/LibationUiBase/ProcessQueue/ProcessBookViewModel.cs

@@ -1,4 +1,4 @@
-using ApplicationServices;
+using ApplicationServices;
 using AudibleApi;
 using AudibleApi.Common;
 using DataLayer;
@@ -40,9 +40,8 @@ public enum ProcessBookStatus
 /// <summary>
 /// This is the viewmodel for queued processables
 /// </summary>
-public abstract class ProcessBookViewModelBase : ReactiveObject
+public class ProcessBookViewModel : ReactiveObject
 {
-	private readonly LogMe Logger;
 	public LibraryBook LibraryBook { get; protected set; }
 
 	private ProcessBookResult _result = ProcessBookResult.None;
@@ -84,6 +83,21 @@ public abstract class ProcessBookViewModelBase : ReactiveObject
 
 	#endregion
 
+	#region Process Queue Logging
+
+	public event EventHandler<string>? LogWritten;
+	private void OnLogWritten(string text) => LogWritten?.Invoke(this, text.Trim());
+
+	private void LogError(string? message, Exception? ex = null)
+	{
+		OnLogWritten(message ?? "Automated backup: error");
+		if (ex is not null)
+			OnLogWritten("ERROR: " + ex.Message);
+	}
+	private void LogInfo(string text) => OnLogWritten(text);
+
+	#endregion
+
 	protected Processable CurrentProcessable => _currentProcessable ??= Processes.Dequeue().Invoke();
 	protected void NextProcessable() => _currentProcessable = null;
 	private Processable? _currentProcessable;
@@ -91,10 +105,9 @@ public abstract class ProcessBookViewModelBase : ReactiveObject
 	/// <summary> A series of Processable actions to perform on this book </summary>
 	protected Queue<Func<Processable>> Processes { get; } = new();
 
-	protected ProcessBookViewModelBase(LibraryBook libraryBook, LogMe logme)
+	public ProcessBookViewModel(LibraryBook libraryBook)
 	{
 		LibraryBook = libraryBook;
-		Logger = logme;
 
 		_title = LibraryBook.Book.TitleWithSubtitle;
 		_author = LibraryBook.Book.AuthorNames();
@@ -106,15 +119,14 @@ public abstract class ProcessBookViewModelBase : ReactiveObject
 			PictureStorage.PictureCached += PictureStorage_PictureCached;
 
 		// Mutable property. Set the field so PropertyChanged isn't fired.
-		_cover = LoadImageFromBytes(picture, PictureSize._80x80);
+		_cover = BaseUtil.LoadImage(picture, PictureSize._80x80);
 	}
 
-	protected abstract object? LoadImageFromBytes(byte[] bytes, PictureSize pictureSize);
 	private void PictureStorage_PictureCached(object? sender, PictureCachedEventArgs e)
 	{
 		if (e.Definition.PictureId == LibraryBook.Book.PictureId)
 		{
-			Cover = LoadImageFromBytes(e.Picture, PictureSize._80x80);
+			Cover = BaseUtil.LoadImage(e.Picture, PictureSize._80x80);
 			PictureStorage.PictureCached -= PictureStorage_PictureCached;
 		}
 	}
@@ -133,36 +145,36 @@ public abstract class ProcessBookViewModelBase : ReactiveObject
 				result = ProcessBookResult.Success;
 			else if (statusHandler.Errors.Contains("Cancelled"))
 			{
-				Logger.Info($"{procName}:  Process was cancelled - {LibraryBook.Book}");
+				LogInfo($"{procName}:  Process was cancelled - {LibraryBook.Book}");
 				result = ProcessBookResult.Cancelled;
 			}
 			else if (statusHandler.Errors.Contains("Validation failed"))
 			{
-				Logger.Info($"{procName}:  Validation failed - {LibraryBook.Book}");
+				LogInfo($"{procName}:  Validation failed - {LibraryBook.Book}");
 				result = ProcessBookResult.ValidationFail;
 			}
 			else
 			{
 				foreach (var errorMessage in statusHandler.Errors)
-					Logger.Error($"{procName}:  {errorMessage}");
+					LogError($"{procName}:  {errorMessage}");
 			}
 		}
 		catch (ContentLicenseDeniedException ldex)
 		{
 			if (ldex.AYCL?.RejectionReason is null or RejectionReason.GenericError)
 			{
-				Logger.Info($"{procName}:  Content license was denied, but this error appears to be caused by a temporary interruption of service. - {LibraryBook.Book}");
+				LogInfo($"{procName}:  Content license was denied, but this error appears to be caused by a temporary interruption of service. - {LibraryBook.Book}");
 				result = ProcessBookResult.LicenseDeniedPossibleOutage;
 			}
 			else
 			{
-				Logger.Info($"{procName}:  Content license denied. Check your Audible account to see if you have access to this title. - {LibraryBook.Book}");
+				LogInfo($"{procName}:  Content license denied. Check your Audible account to see if you have access to this title. - {LibraryBook.Book}");
 				result = ProcessBookResult.LicenseDenied;
 			}
 		}
 		catch (Exception ex)
 		{
-			Logger.Error(ex, procName);
+			LogError(procName, ex);
 		}
 		finally
 		{
@@ -192,15 +204,15 @@ public abstract class ProcessBookViewModelBase : ReactiveObject
 		}
 		catch (Exception ex)
 		{
-			Logger.Error(ex, $"{CurrentProcessable.Name}:  Error while cancelling");
+			LogError($"{CurrentProcessable.Name}:  Error while cancelling", ex);
 		}
 	}
 
-	public ProcessBookViewModelBase AddDownloadPdf() => AddProcessable<DownloadPdf>();
-	public ProcessBookViewModelBase AddDownloadDecryptBook() => AddProcessable<DownloadDecryptBook>();
-	public ProcessBookViewModelBase AddConvertToMp3() => AddProcessable<ConvertToMp3>();
+	public ProcessBookViewModel AddDownloadPdf() => AddProcessable<DownloadPdf>();
+	public ProcessBookViewModel AddDownloadDecryptBook() => AddProcessable<DownloadDecryptBook>();
+	public ProcessBookViewModel AddConvertToMp3() => AddProcessable<ConvertToMp3>();
 
-	private ProcessBookViewModelBase AddProcessable<T>() where T : Processable, new()
+	private ProcessBookViewModel AddProcessable<T>() where T : Processable, new()
 	{
 		Processes.Enqueue(() => new T());
 		return this;
@@ -252,7 +264,7 @@ public abstract class ProcessBookViewModelBase : ReactiveObject
 	private void AudioDecodable_AuthorsDiscovered(object? sender, string authors) => Author = authors;
 	private void AudioDecodable_NarratorsDiscovered(object? sender, string narrators) => Narrator = narrators;
 	private void AudioDecodable_CoverImageDiscovered(object? sender, byte[] coverArt)
-		=> Cover = LoadImageFromBytes(coverArt, PictureSize._80x80);
+		=> Cover = BaseUtil.LoadImage(coverArt, PictureSize._80x80);
 
 	private byte[] AudioDecodable_RequestCoverArt(object? sender, EventArgs e)
 	{
@@ -292,7 +304,7 @@ public abstract class ProcessBookViewModelBase : ReactiveObject
 		Status = ProcessBookStatus.Working;
 
 		if (sender is Processable processable)
-			Logger.Info($"{Environment.NewLine}{processable.Name} Step, Begin: {libraryBook.Book}");
+			LogInfo($"{Environment.NewLine}{processable.Name} Step, Begin: {libraryBook.Book}");
 
 		Title = libraryBook.Book.TitleWithSubtitle;
 		Author = libraryBook.Book.AuthorNames();
@@ -303,7 +315,7 @@ public abstract class ProcessBookViewModelBase : ReactiveObject
 	{
 		if (sender is Processable processable)
 		{
-			Logger.Info($"{processable.Name} Step, Completed: {libraryBook.Book}");
+			LogInfo($"{processable.Name} Step, Completed: {libraryBook.Book}");
 			UnlinkProcessable(processable);
 		}
 
@@ -329,7 +341,7 @@ public abstract class ProcessBookViewModelBase : ReactiveObject
 		if (result.HasErrors)
 		{
 			foreach (var errorMessage in result.Errors.Where(e => e != "Validation failed"))
-				Logger.Error(errorMessage);
+				LogError(errorMessage);
 		}
 	}
 
@@ -340,7 +352,7 @@ public abstract class ProcessBookViewModelBase : ReactiveObject
 	protected async Task<ProcessBookResult> GetFailureActionAsync(LibraryBook libraryBook)
 	{
 		const DialogResult SkipResult = DialogResult.Ignore;
-		Logger.Error($"ERROR. All books have not been processed. Book failed: {libraryBook.Book}");
+		LogError($"ERROR. All books have not been processed. Book failed: {libraryBook.Book}");
 
 		DialogResult? dialogResult = Configuration.Instance.BadBook switch
 		{
@@ -353,7 +365,7 @@ public abstract class ProcessBookViewModelBase : ReactiveObject
 		if (dialogResult == SkipResult)
 		{
 			libraryBook.UpdateBookStatus(LiberatedStatus.Error);
-			Logger.Info($"Error. Skip: [{libraryBook.Book.AudibleProductId}] {libraryBook.Book.TitleWithSubtitle}");
+			LogInfo($"Error. Skip: [{libraryBook.Book.AudibleProductId}] {libraryBook.Book.TitleWithSubtitle}");
 		}
 
 		return dialogResult is SkipResult ? ProcessBookResult.FailedSkip
@@ -411,4 +423,4 @@ public abstract class ProcessBookViewModelBase : ReactiveObject
 	}
 
 	#endregion
-}
+}

Source/LibationUiBase/ProcessQueue/ProcessQueueViewModel.cs

@@ -1,30 +1,32 @@
-using DataLayer;
+using ApplicationServices;
+using DataLayer;
 using LibationUiBase.Forms;
 using System;
 using System.Collections.Generic;
+using System.Collections.ObjectModel;
 using System.Linq;
-using ApplicationServices;
 using System.Threading.Tasks;
 
 #nullable enable
 namespace LibationUiBase.ProcessQueue;
 
-public abstract class ProcessQueueViewModelBase : ReactiveObject, ILogForm
+public record LogEntry(DateTime LogDate, string LogMessage)
 {
-	public abstract void WriteLine(string text);
-	protected abstract ProcessBookViewModelBase CreateNewProcessBook(LibraryBook libraryBook);
+	public string LogDateString => LogDate.ToShortTimeString();
+}
 
-	public TrackedQueue<ProcessBookViewModelBase> Queue { get; }
+public class ProcessQueueViewModel : ReactiveObject
+{
+	public ObservableCollection<LogEntry> LogEntries { get; } = new();
+	public TrackedQueue<ProcessBookViewModel> Queue { get; } = new();
 	public Task? QueueRunner { get; private set; }
 	public bool Running => !QueueRunner?.IsCompleted ?? false;
-	protected LogMe Logger { get; }
 
-	public ProcessQueueViewModelBase(ICollection<ProcessBookViewModelBase>? underlyingList)
+	public ProcessQueueViewModel()
 	{
-		Logger = LogMe.RegisterForm(this);
-		Queue = new(underlyingList);
 		Queue.QueuedCountChanged += Queue_QueuedCountChanged;
 		Queue.CompletedCountChanged += Queue_CompletedCountChanged;
+		SpeedLimit = LibationFileManager.Configuration.Instance.DownloadSpeedLimit / 1024m / 1024;
 	}
 
 	private int _completedCount;
@@ -32,6 +34,7 @@ public abstract class ProcessQueueViewModelBase : ReactiveObject, ILogForm
 	private int _queuedCount;
 	private string? _runningTime;
 	private bool _progressBarVisible;
+	private decimal _speedLimit;
 
 	public int CompletedCount { get => _completedCount; private set { RaiseAndSetIfChanged(ref _completedCount, value); RaisePropertyChanged(nameof(AnyCompleted)); } }
 	public int QueuedCount { get => _queuedCount; private set { this.RaiseAndSetIfChanged(ref _queuedCount, value); RaisePropertyChanged(nameof(AnyQueued)); } }
@@ -42,6 +45,32 @@ public abstract class ProcessQueueViewModelBase : ReactiveObject, ILogForm
 	public bool AnyQueued => QueuedCount > 0;
 	public bool AnyErrors => ErrorCount > 0;
 	public double Progress => 100d * Queue.Completed.Count / Queue.Count;
+	public decimal SpeedLimitIncrement { get; private set; }
+	public decimal SpeedLimit
+	{
+		get => _speedLimit;
+		set
+		{
+			var newValue = Math.Min(999 * 1024 * 1024, (long)Math.Ceiling(value * 1024 * 1024));
+			var config = LibationFileManager.Configuration.Instance;
+			config.DownloadSpeedLimit = newValue;
+
+			_speedLimit
+				= config.DownloadSpeedLimit <= newValue ? value
+				: value == 0.01m ? config.DownloadSpeedLimit / 1024m / 1024
+				: 0;
+
+			config.DownloadSpeedLimit = (long)(_speedLimit * 1024 * 1024);
+
+			SpeedLimitIncrement = _speedLimit > 100 ? 10
+				: _speedLimit > 10 ? 1
+				: _speedLimit > 1 ? 0.1m
+				: 0.01m;
+
+			RaisePropertyChanged(nameof(SpeedLimitIncrement));
+			RaisePropertyChanged(nameof(SpeedLimit));
+		}
+	}
 
 	private void Queue_CompletedCountChanged(object? sender, int e)
 	{
@@ -59,6 +88,9 @@ public abstract class ProcessQueueViewModelBase : ReactiveObject, ILogForm
 		RaisePropertyChanged(nameof(Progress));
 	}
 
+	private void ProcessBook_LogWritten(object? sender, string logMessage)
+		=> Invoke(() => LogEntries.Add(new(DateTime.Now, logMessage.Trim())));
+
 	#region Add Books to Queue
 
 	public bool QueueDownloadPdf(IList<LibraryBook> libraryBooks)
@@ -79,6 +111,8 @@ public abstract class ProcessQueueViewModelBase : ReactiveObject, ILogForm
 		var preLiberated = libraryBooks.Where(lb => !lb.AbsentFromLastScan && lb.Book.UserDefinedItem.BookStatus is LiberatedStatus.Liberated && lb.Book.ContentType is DataLayer.ContentType.Product).ToArray();
 		if (preLiberated.Length > 0)
 		{
+			if (preLiberated.Length == 1)
+				RemoveCompleted(preLiberated[0]);
 			Serilog.Log.Logger.Information("Begin convert {count} books to mp3", preLiberated.Length);
 			AddConvertMp3(preLiberated);
 			return true;
@@ -124,47 +158,50 @@ public abstract class ProcessQueueViewModelBase : ReactiveObject, ILogForm
 	}
 
 	private bool IsBookInQueue(LibraryBook libraryBook)
-		=> Queue.FirstOrDefault(b => b?.LibraryBook?.Book?.AudibleProductId == libraryBook.Book.AudibleProductId) is not ProcessBookViewModelBase entry ? false
+		=> Queue.FirstOrDefault(b => b?.LibraryBook?.Book?.AudibleProductId == libraryBook.Book.AudibleProductId) is not ProcessBookViewModel entry ? false
 		: entry.Status is ProcessBookStatus.Cancelled or ProcessBookStatus.Failed ? !Queue.RemoveCompleted(entry)
 		: true;
 
 	private bool RemoveCompleted(LibraryBook libraryBook)
-		=> Queue.FirstOrDefault(b => b?.LibraryBook?.Book?.AudibleProductId == libraryBook.Book.AudibleProductId) is ProcessBookViewModelBase entry
+		=> Queue.FirstOrDefault(b => b?.LibraryBook?.Book?.AudibleProductId == libraryBook.Book.AudibleProductId) is ProcessBookViewModel entry
 		&& entry.Status is ProcessBookStatus.Completed
 		&& Queue.RemoveCompleted(entry);
 
-	private void AddDownloadPdf(IEnumerable<LibraryBook> entries)
+	private void AddDownloadPdf(IList<LibraryBook> entries)
 	{
 		var procs = entries.Where(e => !IsBookInQueue(e)).Select(Create).ToArray();
 		Serilog.Log.Logger.Information("Queueing {count} books for PDF-only download", procs.Length);
 		AddToQueue(procs);
 
-		ProcessBookViewModelBase Create(LibraryBook entry)
-			=> CreateNewProcessBook(entry).AddDownloadPdf();
+		ProcessBookViewModel Create(LibraryBook entry)
+			=> new ProcessBookViewModel(entry).AddDownloadPdf();
 	}
 
-	private void AddDownloadDecrypt(IEnumerable<LibraryBook> entries)
+	private void AddDownloadDecrypt(IList<LibraryBook> entries)
 	{
 		var procs = entries.Where(e => !IsBookInQueue(e)).Select(Create).ToArray();
 		Serilog.Log.Logger.Information("Queueing {count} books ofr download/decrypt", procs.Length);
 		AddToQueue(procs);
-		
-		ProcessBookViewModelBase Create(LibraryBook entry)
-			=> CreateNewProcessBook(entry).AddDownloadDecryptBook().AddDownloadPdf();
+
+		ProcessBookViewModel Create(LibraryBook entry)
+			=> new ProcessBookViewModel(entry).AddDownloadDecryptBook().AddDownloadPdf();
 	}
 
-	private void AddConvertMp3(IEnumerable<LibraryBook> entries)
+	private void AddConvertMp3(IList<LibraryBook> entries)
 	{
 		var procs = entries.Where(e => !IsBookInQueue(e)).Select(Create).ToArray();
 		Serilog.Log.Logger.Information("Queueing {count} books for mp3 conversion", procs.Length);
 		AddToQueue(procs);
 
-		ProcessBookViewModelBase Create(LibraryBook entry)
-			=> CreateNewProcessBook(entry).AddConvertToMp3();
+		ProcessBookViewModel Create(LibraryBook entry)
+			=> new ProcessBookViewModel(entry).AddConvertToMp3();
 	}
 
-	private void AddToQueue(IEnumerable<ProcessBookViewModelBase> pbook)
+	private void AddToQueue(IList<ProcessBookViewModel> pbook)
 	{
+		foreach (var book in pbook)
+			book.LogWritten += ProcessBook_LogWritten;
+
 		Queue.Enqueue(pbook);
 		if (!Running)
 			QueueRunner = Task.Run(QueueLoop);
@@ -187,7 +224,7 @@ public abstract class ProcessQueueViewModelBase : ReactiveObject, ILogForm
 
 			while (Queue.MoveNext())
 			{
-				if (Queue.Current is not ProcessBookViewModelBase nextBook)
+				if (Queue.Current is not ProcessBookViewModel nextBook)
 				{
 					Serilog.Log.Logger.Information("Current queue item is empty.");
 					continue;

Source/LibationUiBase/ReactiveObject.cs

@@ -7,8 +7,14 @@ using System.Runtime.CompilerServices;
 #nullable enable
 namespace LibationUiBase;
 
+/// <summary>
+/// ReactiveObject is the base object for ViewModel classes, and it implements INotifyPropertyChanging
+/// and INotifyPropertyChanged. Additionally
+/// object changes.
+/// </summary>
 public class ReactiveObject : SynchronizeInvoker, INotifyPropertyChanged, INotifyPropertyChanging
 {
+	// see also notes in Libation/Source/_ARCHITECTURE NOTES.txt :: MVVM
 	public event PropertyChangedEventHandler? PropertyChanged;
 	public event PropertyChangingEventHandler? PropertyChanging;
 

Source/LibationUiBase/SeriesView/AyceButton.cs

@@ -117,7 +117,7 @@ namespace LibationUiBase.SeriesView
 		}
 
 		private void DownloadButton_ButtonEnabled(object sender, EventArgs e)
-			=> OnPropertyChanged(nameof(Enabled));
+			=> RaisePropertyChanged(nameof(Enabled));
 
 		public override int CompareTo(object ob)
 		{

Source/LibationUiBase/SeriesView/SeriesButton.cs

@@ -1,8 +1,6 @@
 using AudibleApi.Common;
 using DataLayer;
-using Dinah.Core.Threading;
 using System;
-using System.ComponentModel;
 using System.Threading.Tasks;
 
 namespace LibationUiBase.SeriesView
@@ -10,11 +8,9 @@ namespace LibationUiBase.SeriesView
 	/// <summary>
 	/// base view model for the Series Viewer 'Availability' button column
 	/// </summary>
-	public abstract class SeriesButton : SynchronizeInvoker, IComparable, INotifyPropertyChanged
+	public abstract class SeriesButton : ReactiveObject, IComparable
 	{
-		public event PropertyChangedEventHandler PropertyChanged;
 		private bool inLibrary;
-
 		protected Item Item { get; }
 		public abstract string DisplayText { get; }
 		public abstract bool HasButtonAction { get; }
@@ -27,8 +23,8 @@ namespace LibationUiBase.SeriesView
 				if (inLibrary != value)
 				{
 					inLibrary = value;
-					OnPropertyChanged(nameof(InLibrary));
-					OnPropertyChanged(nameof(DisplayText));
+					RaisePropertyChanged(nameof(InLibrary));
+					RaisePropertyChanged(nameof(DisplayText));
 				}
 			}
 		}
@@ -41,9 +37,6 @@ namespace LibationUiBase.SeriesView
 
 		public abstract Task PerformClickAsync(LibraryBook accountBook);
 
-		protected void OnPropertyChanged(string propertyName)
-			=> Invoke(() => PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName)));
-
 		public override string ToString() => DisplayText;
 
 		public abstract int CompareTo(object ob);

Source/LibationUiBase/SeriesView/SeriesItem.cs

@@ -4,7 +4,6 @@ using AudibleApi.Common;
 using AudibleUtilities;
 using DataLayer;
 using Dinah.Core;
-using Dinah.Core.Threading;
 using FileLiberator;
 using LibationFileManager;
 using System.Collections.Generic;
@@ -15,7 +14,7 @@ using System.Threading.Tasks;
 
 namespace LibationUiBase.SeriesView
 {
-	public class SeriesItem : SynchronizeInvoker, INotifyPropertyChanged
+	public class SeriesItem : ReactiveObject
 	{
 		public object Cover { get; private set; }
 		public SeriesOrder Order { get; }
@@ -23,8 +22,6 @@ namespace LibationUiBase.SeriesView
 		public SeriesButton Button { get; }
 		public Item Item { get; }
 
-		public event PropertyChangedEventHandler PropertyChanged;
-
 		private SeriesItem(Item item, string order, bool inLibrary, bool inWishList)
 		{
 			Item = item;
@@ -42,10 +39,7 @@ namespace LibationUiBase.SeriesView
 		}
 
 		private void DownloadButton_PropertyChanged(object sender, PropertyChangedEventArgs e)
-			=> OnPropertyChanged(nameof(Button));
-
-		private void OnPropertyChanged(string propertyName)
-			=> Invoke(() => PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName)));
+			=> RaisePropertyChanged(nameof(Button));
 
 		private void LoadCover(string pictureId)
 		{
@@ -66,7 +60,7 @@ namespace LibationUiBase.SeriesView
 				{
 					Cover = BaseUtil.LoadImage(e.Picture, PictureSize._80x80);
 					PictureStorage.PictureCached -= PictureStorage_PictureCached;
-					OnPropertyChanged(nameof(Cover));
+					RaisePropertyChanged(nameof(Cover));
 				}
 			}
 		}

Source/LibationUiBase/SeriesView/WishlistButton.cs

@@ -22,14 +22,7 @@ namespace LibationUiBase.SeriesView
 		public override bool Enabled
 		{
 			get => instanceEnabled;
-			protected set
-			{
-				if (instanceEnabled != value)
-				{
-					instanceEnabled = value;
-					OnPropertyChanged(nameof(Enabled));
-				}
-			}
+			protected set => RaiseAndSetIfChanged(ref instanceEnabled, value);
 		}
 
 		private bool InWishList
@@ -40,8 +33,8 @@ namespace LibationUiBase.SeriesView
 				if (inWishList != value)
 				{
 					inWishList = value;
-					OnPropertyChanged(nameof(InWishList));
-					OnPropertyChanged(nameof(DisplayText));
+					RaisePropertyChanged(nameof(InWishList));
+					RaisePropertyChanged(nameof(DisplayText));
 				}
 			}
 		}

Source/LibationUiBase/TrackedQueue[T].cs

@@ -1,5 +1,7 @@
 using System;
+using System.Collections;
 using System.Collections.Generic;
+using System.Collections.Specialized;
 using System.Linq;
 
 #nullable enable
@@ -7,7 +9,7 @@ namespace LibationUiBase
 {
 	public enum QueuePosition
 	{
-		Fisrt,
+		First,
 		OneUp,
 		OneDown,
 		Last,
@@ -22,38 +24,21 @@ namespace LibationUiBase
 	 *   3) the pile of chain at your feet grows by 1 link (Completed)
 	 *   
 	 * The index is the link position from the first link you lifted to the
-	 * last one in the chain.
-	 * 
-	 * 
-	 * For this to work with Avalonia's ItemsRepeater, it must be an ObservableCollection
-	 * (not merely a Collection with INotifyCollectionChanged, INotifyPropertyChanged). 
-	 * So TrackedQueue maintains 2 copies of the list. The primary copy of the list is
-	 * split into Completed, Current and Queued and is used by ProcessQueue to keep track
-	 * of what's what. The secondary copy is a concatenation of primary's three sources
-	 * and is stored in ObservableCollection.Items.  When the primary list changes, the
-	 * secondary list is cleared and reset to match the primary. 
+	 * last one in the chain. 
 	 */
-	public class TrackedQueue<T> where T : class
+	public class TrackedQueue<T> : IReadOnlyCollection<T>, IList, INotifyCollectionChanged where T : class
 	{
 		public event EventHandler<int>? CompletedCountChanged;
 		public event EventHandler<int>? QueuedCountChanged;
+		public event NotifyCollectionChangedEventHandler? CollectionChanged;
 
 		public T? Current { get; private set; }
-
-		public IReadOnlyList<T> Queued => _queued;
 		public IReadOnlyList<T> Completed => _completed;
+		private List<T> Queued { get; } = new();
 
-		private readonly List<T> _queued = new();
 		private readonly List<T> _completed = new();
 		private readonly object lockObject = new();
-
-		private readonly ICollection<T>? _underlyingList;
-		public ICollection<T>? UnderlyingList => _underlyingList;
-
-		public TrackedQueue(ICollection<T>? underlyingList = null)
-		{
-			_underlyingList = underlyingList;
-		}
+		private int QueueStartIndex => Completed.Count + (Current is null ? 0 : 1);
 
 		public T this[int index]
 		{
@@ -61,17 +46,10 @@ namespace LibationUiBase
 			{
 				lock (lockObject)
 				{
-					if (index < _completed.Count)
-						return _completed[index];
-					index -= _completed.Count;
-
-					if (index == 0 && Current != null) return Current;
-
-					if (Current != null) index--;
-
-					if (index < _queued.Count) return _queued.ElementAt(index);
-
-					throw new IndexOutOfRangeException();
+					return index < Completed.Count ? Completed[index]
+						: index == Completed.Count && Current is not null ? Current
+						: index < Count ? Queued[index - QueueStartIndex]
+						: throw new IndexOutOfRangeException();
 				}
 			}
 		}
@@ -82,7 +60,7 @@ namespace LibationUiBase
 			{
 				lock (lockObject)
 				{
-					return _queued.Count + _completed.Count + (Current == null ? 0 : 1);
+					return QueueStartIndex + Queued.Count;
 				}
 			}
 		}
@@ -91,131 +69,117 @@ namespace LibationUiBase
 		{
 			lock (lockObject)
 			{
-				if (_completed.Contains(item))
-					return _completed.IndexOf(item);
-
-				if (Current == item) return _completed.Count;
-
-				if (_queued.Contains(item))
-					return _queued.IndexOf(item) + (Current is null ? 0 : 1);
-				return -1;
+				int index = _completed.IndexOf(item);
+				if (index < 0 && item == Current)
+					index = Completed.Count;
+				if (index < 0)
+				{
+					index = Queued.IndexOf(item);
+					if (index >= 0)
+						index += QueueStartIndex;
+				}
+				return index;
 			}
 		}
 
 		public bool RemoveQueued(T item)
 		{
-			bool itemsRemoved;
-			int queuedCount;
+			int queuedCount, queueIndex;
 
 			lock (lockObject)
 			{
-				itemsRemoved = _queued.Remove(item);
-				queuedCount = _queued.Count;
+				queueIndex = Queued.IndexOf(item);
+				if (queueIndex >= 0)
+					Queued.RemoveAt(queueIndex);
+				queuedCount = Queued.Count;
 			}
 
-			if (itemsRemoved)
+			if (queueIndex >= 0)
 			{
 				QueuedCountChanged?.Invoke(this, queuedCount);
-				RebuildSecondary();
+				CollectionChanged?.Invoke(this, new NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction.Remove, item, QueueStartIndex + queueIndex));
+				return true;
 			}
-			return itemsRemoved;
-		}
-
-		public void ClearCurrent()
-		{
-			lock (lockObject)
-				Current = null;
-			RebuildSecondary();
+			return false;
 		}
 
 		public bool RemoveCompleted(T item)
 		{
-			bool itemsRemoved;
-			int completedCount;
+			int completedCount, completedIndex;
 
 			lock (lockObject)
 			{
-				itemsRemoved = _completed.Remove(item);
+				completedIndex = _completed.IndexOf(item);
+				if (completedIndex >= 0)
+					_completed.RemoveAt(completedIndex);
 				completedCount = _completed.Count;
 			}
 
-			if (itemsRemoved)
+			if (completedIndex >= 0)
 			{
 				CompletedCountChanged?.Invoke(this, completedCount);
-				RebuildSecondary();
+				CollectionChanged?.Invoke(this, new NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction.Remove, item, completedIndex));
+				return true;
 			}
-			return itemsRemoved;
+			return false;
+		}
+
+		public void ClearCurrent()
+		{
+			T? current;
+			lock (lockObject)
+			{
+				current = Current;
+				Current = null;
+			}
+			CollectionChanged?.Invoke(this, new NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction.Remove, current, _completed.Count));
 		}
 
 		public void ClearQueue()
 		{
+			List<T> queuedItems;
 			lock (lockObject)
-				_queued.Clear();
+			{
+				queuedItems = Queued.ToList();
+				Queued.Clear();
+			}
 			QueuedCountChanged?.Invoke(this, 0);
-			RebuildSecondary();
+			CollectionChanged?.Invoke(this, new NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction.Remove, queuedItems, QueueStartIndex));
 		}
 
 		public void ClearCompleted()
 		{
+			List<T> completedItems;
 			lock (lockObject)
+			{
+				completedItems = _completed.ToList();
 				_completed.Clear();
+			}
 			CompletedCountChanged?.Invoke(this, 0);
-			RebuildSecondary();
-		}
-
-		public bool Any(Func<T, bool> predicate)
-		{
-			lock (lockObject)
-			{
-				return (Current != null && predicate(Current)) || _completed.Any(predicate) || _queued.Any(predicate);
-			}
-		}
-
-		public T? FirstOrDefault(Func<T, bool> predicate)
-		{
-			lock (lockObject)
-			{
-				return Current != null && predicate(Current) ? Current
-					: _completed.FirstOrDefault(predicate) is T completed ? completed
-					: _queued.FirstOrDefault(predicate);
-			}
+			CollectionChanged?.Invoke(this, new NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction.Remove, completedItems, 0));
 		}
 
 		public void MoveQueuePosition(T item, QueuePosition requestedPosition)
 		{
+			int oldIndex, newIndex;
 			lock (lockObject)
 			{
-				if (_queued.Count == 0 || !_queued.Contains(item)) return;
+				oldIndex = Queued.IndexOf(item);
+				newIndex = requestedPosition switch
+				{
+					QueuePosition.First => 0,
+					QueuePosition.OneUp => oldIndex - 1,
+					QueuePosition.OneDown => oldIndex + 1,
+					QueuePosition.Last or _ => Queued.Count - 1
+				};
 
-				if ((requestedPosition == QueuePosition.Fisrt || requestedPosition == QueuePosition.OneUp) && _queued[0] == item)
-					return;
-				if ((requestedPosition == QueuePosition.Last || requestedPosition == QueuePosition.OneDown) && _queued[^1] == item)
+				if (oldIndex < 0 || newIndex < 0 || newIndex >= Queued.Count || newIndex == oldIndex)
 					return;
 
-				int queueIndex = _queued.IndexOf(item);
-
-				if (requestedPosition == QueuePosition.OneUp)
-				{
-					_queued.RemoveAt(queueIndex);
-					_queued.Insert(queueIndex - 1, item);
-				}
-				else if (requestedPosition == QueuePosition.OneDown)
-				{
-					_queued.RemoveAt(queueIndex);
-					_queued.Insert(queueIndex + 1, item);
-				}
-				else if (requestedPosition == QueuePosition.Fisrt)
-				{
-					_queued.RemoveAt(queueIndex);
-					_queued.Insert(0, item);
-				}
-				else
-				{
-					_queued.RemoveAt(queueIndex);
-					_queued.Insert(_queued.Count, item);
-				}
+				Queued.RemoveAt(oldIndex);
+				Queued.Insert(newIndex, item);
 			}
-			RebuildSecondary();
+			CollectionChanged?.Invoke(this, new NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction.Move, item, QueueStartIndex + newIndex, QueueStartIndex + oldIndex));
 		}
 
 		public bool MoveNext()
@@ -232,15 +196,15 @@ namespace LibationUiBase
 						completedCount = _completed.Count;
 						completedChanged = true;
 					}
-					if (_queued.Count == 0)
+					if (Queued.Count == 0)
 					{
 						Current = null;
 						return false;
 					}
-					Current = _queued[0];
-					_queued.RemoveAt(0);
+					Current = Queued[0];
+					Queued.RemoveAt(0);
 
-					queuedCount = _queued.Count;
+					queuedCount = Queued.Count;
 					return true;
 				}
 			}
@@ -249,34 +213,48 @@ namespace LibationUiBase
 				if (completedChanged)
 					CompletedCountChanged?.Invoke(this, completedCount);
 				QueuedCountChanged?.Invoke(this, queuedCount);
-				RebuildSecondary();
 			}
 		}
 
-		public void Enqueue(IEnumerable<T> item)
+		public void Enqueue(IList<T> item)
 		{
 			int queueCount;
 			lock (lockObject)
 			{
-				_queued.AddRange(item);
-				queueCount = _queued.Count;
+				Queued.AddRange(item);
+				queueCount = Queued.Count;
 			}
-			foreach (var i in item)
-				_underlyingList?.Add(i);
 			QueuedCountChanged?.Invoke(this, queueCount);
-		}
-
-		private void RebuildSecondary()
-		{
-			_underlyingList?.Clear();
-			foreach (var item in GetAllItems())
-				_underlyingList?.Add(item);
+			CollectionChanged?.Invoke(this, new NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction.Add, item, QueueStartIndex + Queued.Count));
 		}
 
 		public IEnumerable<T> GetAllItems()
 		{
-			if (Current is null) return Completed.Concat(Queued);
-			return Completed.Concat(new List<T> { Current }).Concat(Queued);
+			lock (lockObject)
+			{
+				if (Current is null) return Completed.Concat(Queued);
+				return Completed.Concat([Current]).Concat(Queued);
+			}
 		}
+
+		public IEnumerator<T> GetEnumerator() => GetAllItems().GetEnumerator();
+		IEnumerator IEnumerable.GetEnumerator() => GetEnumerator();
+
+		#region IList interface implementation
+		object? IList.this[int index] { get => this[index]; set => throw new NotSupportedException(); }
+		public bool IsReadOnly => true;
+		public bool IsFixedSize => false;
+		public bool IsSynchronized => false;
+		public object SyncRoot => this;
+		public int IndexOf(object? value) => value is T t ? IndexOf(t) : -1;
+		public bool Contains(object? value) => IndexOf(value) >= 0;
+		//These aren't used by anything, but they are IList interface members and this class needs to be an IList for Avalonia
+		public int Add(object? value) => throw new NotSupportedException();
+		public void Clear() => throw new NotSupportedException();
+		public void Insert(int index, object? value) => throw new NotSupportedException();
+		public void Remove(object? value) => throw new NotSupportedException();
+		public void RemoveAt(int index) => throw new NotSupportedException();
+		public void CopyTo(Array array, int index) => throw new NotSupportedException();
+		#endregion
 	}
 }

Source/LibationWinForms/Dialogs/BookRecordsDialog.cs

@@ -250,12 +250,12 @@ namespace LibationWinForms.Dialogs
 			}
 		}
 
-		private class BookRecordEntry : GridView.AsyncNotifyPropertyChanged
+		private class BookRecordEntry : LibationUiBase.ReactiveObject
 		{
 			private const string DateFormat = "yyyy-MM-dd HH\\:mm";
 			private bool _ischecked;
 			public IRecord Record { get; }
-			public bool IsChecked { get => _ischecked; set { _ischecked = value; NotifyPropertyChanged(); } }
+			public bool IsChecked { get => _ischecked; set => RaiseAndSetIfChanged(ref _ischecked, value); }
 			public string Type => Record.GetType().Name;
 			public string Start => formatTimeSpan(Record.Start);
 			public string Created => Record.Created.ToString(DateFormat);

Source/LibationWinForms/Dialogs/Login/WinformLoginBase.cs

@@ -5,18 +5,19 @@ namespace LibationWinForms.Dialogs.Login
 {
 	public abstract class WinformLoginBase
 	{
-		private readonly IWin32Window _owner;
-		protected WinformLoginBase(IWin32Window owner)
+		protected Control Owner { get; }
+		protected WinformLoginBase(Control owner)
 		{
-			_owner = owner;
+			Owner = owner;
 		}
 
 		/// <returns>True if ShowDialog's DialogResult == OK</returns>
 		protected bool ShowDialog(Form dialog)
-		{
-			var result = dialog.ShowDialog(_owner);
-			Serilog.Log.Logger.Debug("{@DebugInfo}", new { DialogResult = result });
-			return result == DialogResult.OK;
-		}
+			=> Owner.Invoke(() =>
+			{
+				var result = dialog.ShowDialog(Owner);
+				Serilog.Log.Logger.Debug("{@DebugInfo}", new { DialogResult = result });
+				return result == DialogResult.OK;
+			});
 	}
 }

Source/LibationWinForms/Dialogs/Login/WinformLoginCallback.cs

@@ -13,48 +13,53 @@ namespace LibationWinForms.Login
 
 		public string DeviceName { get; } = "Libation";
 
-		public WinformLoginCallback(Account account, IWin32Window owner) : base(owner)
+		public WinformLoginCallback(Account account, Control owner) : base(owner)
 		{
 			_account = Dinah.Core.ArgumentValidator.EnsureNotNull(account, nameof(account));
 		}
 
 		public Task<string> Get2faCodeAsync(string prompt)
-		{
-			using var dialog = new _2faCodeDialog(prompt);
-			if (ShowDialog(dialog))
-				return Task.FromResult(dialog.Code);
-			return Task.FromResult<string>(null);
-		}
+			=> Owner.Invoke(() =>
+			{
+				using var dialog = new _2faCodeDialog(prompt);
+				if (ShowDialog(dialog))
+					return Task.FromResult(dialog.Code);
+				return Task.FromResult<string>(null);
+			});
 
 		public Task<(string password, string guess)> GetCaptchaAnswerAsync(string password, byte[] captchaImage)
-		{
-			using var dialog = new CaptchaDialog(password, captchaImage);
-			if (ShowDialog(dialog))
-				return Task.FromResult((dialog.Password, dialog.Answer));
-			return Task.FromResult<(string, string)>((null,null));
-		}
+			=> Owner.Invoke(() =>
+			{
+				using var dialog = new CaptchaDialog(password, captchaImage);
+				if (ShowDialog(dialog))
+					return Task.FromResult((dialog.Password, dialog.Answer));
+				return Task.FromResult<(string, string)>((null, null));
+			});
 
 		public Task<(string name, string value)> GetMfaChoiceAsync(MfaConfig mfaConfig)
-		{
-			using var dialog = new MfaDialog(mfaConfig);
-			if (ShowDialog(dialog))
-				return Task.FromResult((dialog.SelectedName, dialog.SelectedValue));
-			return Task.FromResult<(string, string)>((null, null));
-		}
+			=> Owner.Invoke(() =>
+			{
+				using var dialog = new MfaDialog(mfaConfig);
+				if (ShowDialog(dialog))
+					return Task.FromResult((dialog.SelectedName, dialog.SelectedValue));
+				return Task.FromResult<(string, string)>((null, null));
+			});
 
 		public Task<(string email, string password)> GetLoginAsync()
-		{
-			using var dialog = new LoginCallbackDialog(_account);
-			if (ShowDialog(dialog))
-				return Task.FromResult((dialog.Email, dialog.Password));
-			return Task.FromResult<(string, string)>((null, null));
-		}
+			=> Owner.Invoke(() =>
+			{
+				using var dialog = new LoginCallbackDialog(_account);
+				if (ShowDialog(dialog))
+					return Task.FromResult((dialog.Email, dialog.Password));
+				return Task.FromResult<(string, string)>((null, null));
+			});
 
 		public Task ShowApprovalNeededAsync()
-		{
-			using var dialog = new ApprovalNeededDialog();
-			ShowDialog(dialog);
-			return Task.CompletedTask;
-		}
+			=> Owner.Invoke(() =>
+			{
+				using var dialog = new ApprovalNeededDialog();
+				ShowDialog(dialog);
+				return Task.CompletedTask;
+			});
 	}
 }