OSX-specific bug fix for search engine

Fixes and Improvements

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,31 @@
+---
+name: Bug report
+about: Create a report to help us improve Libation
+title: ''
+labels: bug
+assignees: ''
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Platform**
+
+[e.g. Windows 10, Windows 11, Mac, Linux (State distribution)]
+
+**Log Files**
+Attach your Libation log file here.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,19 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: enhancement
+assignees: ''
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.

.gitignore

@@ -184,7 +184,7 @@ publish/
 *.azurePubxml
 # Note: Comment the next line if you want to checkin your web deploy settings,
 # but database connection strings (with potential passwords) will be unencrypted
-*.pubxml
+#*.pubxml
 *.publishproj
 
 # Microsoft Azure Web App publish settings. Comment the next line if you want to
@@ -370,3 +370,4 @@ FodyWeavers.xsd
 
 /__TODO.txt
 /DataLayer/LibationContext.db
+*/bin-Avalonia

.releaseindex.json

@@ -0,0 +1,6 @@
+{
+   "WindowsClassic": "Libation\\.\\d+\\.\\d+\\.\\d+-win-classic\\.zip",
+   "WindowsAvalonia":"Libation\\.\\d+\\.\\d+\\.\\d+-win-chardonnay\\.zip",
+   "LinuxAvalonia":  "Libation\\.\\d+\\.\\d+\\.\\d+-linux-chardonnay",
+   "MacOSAvalonia":  "Libation\\.\\d+\\.\\d+\\.\\d+-macos-chardonnay"
+}

Documentation/Advanced.md

@@ -27,7 +27,7 @@ To make upgrades and reinstalls easier, Libation separates all of its responsibi
 
 ### Linux and Mac
 
-Although Libation only currently officially supports Windows, some users have had success with WINE. ([Linux](https://github.com/rmcrackan/Libation/issues/28#issuecomment-890594158), [OSX Crossover and WINE](https://github.com/rmcrackan/Libation/issues/150#issuecomment-1004918592))
+Although Libation only currently officially supports Windows, some users have had success with WINE. ([Linux](https://github.com/rmcrackan/Libation/issues/28#issuecomment-890594158), [OSX Crossover and WINE](https://github.com/rmcrackan/Libation/issues/150#issuecomment-1004918592), [Linux and WINE](https://github.com/rmcrackan/Libation/issues/28#issuecomment-1161111014))
 
 ### Settings
 

README.md

@@ -14,6 +14,7 @@
 - [Getting started](Documentation/GettingStarted.md)
     - [Download Libation](Documentation/GettingStarted.md#download-libation-1)
     - [Installation](Documentation/GettingStarted.md#installation)
+    - [Installation on Ubuntu](Source/LibationAvalonia/README.md)
     - [Create Accounts](Documentation/GettingStarted.md#create-accounts)
     - [Import your library](Documentation/GettingStarted.md#import-your-library)
     - [Download your books -- DRM-free!](Documentation/GettingStarted.md#download-your-books----drm-free)
@@ -66,4 +67,4 @@
 
 Disclaimer: I've made every good-faith effort to include nothing insecure, malicious, anti-privacy, or destructive. That said: use at your own risk.
 
-I made this for myself and I want to share it with the great programming and audible/audiobook communiites which have been so generous with their time and help.
+I made this for myself and I want to share it with the great programming and audible/audiobook communities which have been so generous with their time and help.

Source/AaxDecrypter/AaxDecrypter.csproj

@@ -1,15 +1,22 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0-windows</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
   </PropertyGroup>
 
-  <ItemGroup>
-    <PackageReference Include="AAXClean" Version="0.4.7" />
-    <PackageReference Include="AAXClean.Codecs" Version="0.2.7" />
-  </ItemGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+		<DebugType>embedded</DebugType>
+	</PropertyGroup>
 
-  <ItemGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
+		<DebugType>embedded</DebugType>
+	</PropertyGroup>
+
+	<ItemGroup>
+	  <PackageReference Include="AAXClean.Codecs" Version="0.2.12" />
+	</ItemGroup>
+
+	<ItemGroup>
     <ProjectReference Include="..\FileManager\FileManager.csproj" />
   </ItemGroup>
 

Source/AaxDecrypter/AaxcDownloadConvertBase.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Threading.Tasks;
 using AAXClean;
 using Dinah.Core.Net.Http;
 
@@ -10,8 +11,8 @@ namespace AaxDecrypter
 
 		protected AaxFile AaxFile;
 
-		protected AaxcDownloadConvertBase(string outFileName, string cacheDirectory, DownloadOptions dlLic)
-			: base(outFileName, cacheDirectory, dlLic) { }
+		protected AaxcDownloadConvertBase(string outFileName, string cacheDirectory, IDownloadOptions dlOptions)
+			: base(outFileName, cacheDirectory, dlOptions) { }
 
 		/// <summary>Setting cover art by this method will insert the art into the audiobook metadata</summary>
 		public override void SetCoverArt(byte[] coverArt)
@@ -33,27 +34,12 @@ namespace AaxDecrypter
 
 			//Finishing configuring lame encoder.
 			if (DownloadOptions.OutputFormat == OutputFormat.Mp3)
-			{
-				double bitrateMultiple = 1;
+				MpegUtil.ConfigureLameOptions(
+					AaxFile,
+					DownloadOptions.LameConfig,
+					DownloadOptions.Downsample,
+					DownloadOptions.MatchSourceBitrate);
 
-				if (AaxFile.AudioChannels == 2)
-				{
-					if (DownloadOptions.Downsample)
-						bitrateMultiple = 0.5;
-					else
-						DownloadOptions.LameConfig.Mode = NAudio.Lame.MPEGMode.Stereo;
-				}
-
-				if (DownloadOptions.MatchSourceBitrate)
-				{
-					int kbps = (int)(AaxFile.AverageBitrate * bitrateMultiple / 1024);
-
-					if (DownloadOptions.LameConfig.VBR is null)
-						DownloadOptions.LameConfig.BitRate = kbps;
-					else if (DownloadOptions.LameConfig.VBR == NAudio.Lame.VBRMode.ABR)
-						DownloadOptions.LameConfig.ABRRateKbps = kbps;
-				}
-			}
 
 			OnRetrievedTitle(AaxFile.AppleTags.TitleSansUnabridged);
 			OnRetrievedAuthors(AaxFile.AppleTags.FirstAuthor ?? "[unknown]");
@@ -109,10 +95,11 @@ namespace AaxDecrypter
 				});
 		}
 
-		public override void Cancel()
+		public override async Task CancelAsync()
 		{
 			IsCanceled = true;
-			AaxFile?.Cancel();
+			if (AaxFile != null)
+				await AaxFile.CancelAsync();
 			AaxFile?.Dispose();
 			CloseInputFileStream();
 		}

Source/AaxDecrypter/AaxcDownloadMultiConverter.cs

@@ -2,38 +2,68 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using System.Threading.Tasks;
 using AAXClean;
 using AAXClean.Codecs;
-using Dinah.Core.StepRunner;
 using FileManager;
 
 namespace AaxDecrypter
 {
 	public class AaxcDownloadMultiConverter : AaxcDownloadConvertBase
 	{
-		protected override StepSequence Steps { get; }
-
-        private Func<MultiConvertFileProperties, string> multipartFileNameCallback { get; }
-
-        private static TimeSpan minChapterLength { get; } = TimeSpan.FromSeconds(3);
+		private static TimeSpan minChapterLength { get; } = TimeSpan.FromSeconds(3);
 		private List<string> multiPartFilePaths { get; } = new List<string>();
 
-        public AaxcDownloadMultiConverter(string outFileName, string cacheDirectory, DownloadOptions dlLic,
-            Func<MultiConvertFileProperties, string> multipartFileNameCallback = null)
-			: base(outFileName, cacheDirectory, dlLic)
-        {
-            Steps = new StepSequence
-            {
-                Name = "Download and Convert Aaxc To " + DownloadOptions.OutputFormat,
+		public AaxcDownloadMultiConverter(string outFileName, string cacheDirectory, IDownloadOptions dlOptions)
+			: base(outFileName, cacheDirectory, dlOptions) { }
 
-                ["Step 1: Get Aaxc Metadata"] = Step_GetMetadata,
-                ["Step 2: Download Decrypted Audiobook"] = Step_DownloadAudiobookAsMultipleFilesPerChapter,
-                ["Step 3: Cleanup"] = Step_Cleanup,
-            };
-            this.multipartFileNameCallback = multipartFileNameCallback ?? MultiConvertFileProperties.DefaultMultipartFilename;
-        }
+		public override async Task<bool> RunAsync()
+		{
+			try
+			{
+				Serilog.Log.Information("Begin download and convert Aaxc To {format}", DownloadOptions.OutputFormat);
 
-        /*
+				//Step 1
+				Serilog.Log.Information("Begin Get Aaxc Metadata");
+				if (await Task.Run(Step_GetMetadata))
+					Serilog.Log.Information("Completed Get Aaxc Metadata");
+				else
+				{
+					Serilog.Log.Information("Failed to Complete Get Aaxc Metadata");
+					return false;
+				}
+
+				//Step 2
+				Serilog.Log.Information("Begin Download Decrypted Audiobook");
+				if (await Step_DownloadAudiobookAsMultipleFilesPerChapter())
+					Serilog.Log.Information("Completed Download Decrypted Audiobook");
+				else
+				{
+					Serilog.Log.Information("Failed to Complete Download Decrypted Audiobook");
+					return false;
+				}
+
+				//Step 3
+				Serilog.Log.Information("Begin Cleanup");
+				if (await Task.Run(Step_Cleanup))
+					Serilog.Log.Information("Completed Cleanup");
+				else
+				{
+					Serilog.Log.Information("Failed to Complete Cleanup");
+					return false;
+				}
+
+				Serilog.Log.Information("Completed download and convert Aaxc To {format}", DownloadOptions.OutputFormat);
+				return true;
+			}
+			catch (Exception ex)
+			{
+				Serilog.Log.Error(ex, "Error encountered in download and convert Aaxc To {format}", DownloadOptions.OutputFormat);
+				return false;
+			}
+		}
+
+		/*
 https://github.com/rmcrackan/Libation/pull/127#issuecomment-939088489
 
 If the chapter truly is empty, that is, 0 audio frames in length, then yes it is ignored.
@@ -56,86 +86,104 @@ The book will be split into the following files:
 01:41:00 - 02:05:00 | Book - 04 - Chapter 4.m4b
 
 That naming may not be desirable for everyone, but it's an easy change to instead use the last of the combined chapter's title in the file name.
-         */
-        private bool Step_DownloadAudiobookAsMultipleFilesPerChapter()
-        {
-            var zeroProgress = Step_DownloadAudiobook_Start();
+		 */
+		private async Task<bool> Step_DownloadAudiobookAsMultipleFilesPerChapter()
+		{
+			var zeroProgress = Step_DownloadAudiobook_Start();
 
-            var chapters = DownloadOptions.ChapterInfo.Chapters.ToList();
+			var chapters = DownloadOptions.ChapterInfo.Chapters;
 
-            // Ensure split files are at least minChapterLength in duration.
-            var splitChapters = new ChapterInfo(DownloadOptions.ChapterInfo.StartOffset);
+			// Ensure split files are at least minChapterLength in duration.
+			var splitChapters = new ChapterInfo(DownloadOptions.ChapterInfo.StartOffset);
 
-            var runningTotal = TimeSpan.Zero;
-            string title = "";
+			var runningTotal = TimeSpan.Zero;
+			string title = "";
 
-            for (int i = 0; i < chapters.Count; i++)
-            {
-                if (runningTotal == TimeSpan.Zero)
-                    title = chapters[i].Title;
+			for (int i = 0; i < chapters.Count; i++)
+			{
+				if (runningTotal == TimeSpan.Zero)
+					title = chapters[i].Title;
 
-                runningTotal += chapters[i].Duration;
+				runningTotal += chapters[i].Duration;
 
-                if (runningTotal >= minChapterLength)
-                {
-                    splitChapters.AddChapter(title, runningTotal);
-                    runningTotal = TimeSpan.Zero;
-                }
-            }
+				if (runningTotal >= minChapterLength)
+				{
+					splitChapters.AddChapter(title, runningTotal);
+					runningTotal = TimeSpan.Zero;
+				}
+			}
 
-            // reset, just in case
-            multiPartFilePaths.Clear();
+			// reset, just in case
+			multiPartFilePaths.Clear();
 
-            ConversionResult result;
+			ConversionResult result;
 
-            AaxFile.ConversionProgressUpdate += AaxFile_ConversionProgressUpdate;
-            if (DownloadOptions.OutputFormat == OutputFormat.M4b)
-                result = ConvertToMultiMp4a(splitChapters);
-            else
-                result = ConvertToMultiMp3(splitChapters);
-            AaxFile.ConversionProgressUpdate -= AaxFile_ConversionProgressUpdate;
+			AaxFile.ConversionProgressUpdate += AaxFile_ConversionProgressUpdate;
+			if (DownloadOptions.OutputFormat == OutputFormat.M4b)
+				result = await ConvertToMultiMp4a(splitChapters);
+			else
+				result = await ConvertToMultiMp3(splitChapters);
+			AaxFile.ConversionProgressUpdate -= AaxFile_ConversionProgressUpdate;
 
-            Step_DownloadAudiobook_End(zeroProgress);
+			Step_DownloadAudiobook_End(zeroProgress);
 
-            return result == ConversionResult.NoErrorsDetected;
-        }
+			return result == ConversionResult.NoErrorsDetected;
+		}
 
-        private ConversionResult ConvertToMultiMp4a(ChapterInfo splitChapters)
-        {
-            var chapterCount = 0;
-            return AaxFile.ConvertToMultiMp4a(splitChapters, newSplitCallback =>
-                createOutputFileStream(++chapterCount, splitChapters, newSplitCallback),
-            DownloadOptions.TrimOutputToChapterLength);
-        }
+		private Task<ConversionResult> ConvertToMultiMp4a(ChapterInfo splitChapters)
+		{
+			var chapterCount = 0;
+			return AaxFile.ConvertToMultiMp4aAsync
+				(
+					splitChapters,
+					newSplitCallback => Callback(++chapterCount, splitChapters, newSplitCallback),
+					DownloadOptions.TrimOutputToChapterLength
+				);
+		}
 
-        private ConversionResult ConvertToMultiMp3(ChapterInfo splitChapters)
-        {
-            var chapterCount = 0;
-            return AaxFile.ConvertToMultiMp3(splitChapters, newSplitCallback =>
-            {
-                createOutputFileStream(++chapterCount, splitChapters, newSplitCallback);
-                ((NAudio.Lame.LameConfig)newSplitCallback.UserState).ID3.Track = chapterCount.ToString();
-            }, DownloadOptions.LameConfig, DownloadOptions.TrimOutputToChapterLength);
-        }
+		private Task<ConversionResult> ConvertToMultiMp3(ChapterInfo splitChapters)
+		{
+			var chapterCount = 0;
+			return AaxFile.ConvertToMultiMp3Async
+				(
+					splitChapters,
+					newSplitCallback => Callback(++chapterCount, splitChapters, newSplitCallback),
+					DownloadOptions.LameConfig,
+					DownloadOptions.TrimOutputToChapterLength
+				);
+		}
 
-        private void createOutputFileStream(int currentChapter, ChapterInfo splitChapters, NewSplitCallback newSplitCallback)
-        {
-            var fileName = multipartFileNameCallback(new()
-            {
-                OutputFileName = OutputFileName,
-                PartsPosition = currentChapter,
-                PartsTotal = splitChapters.Count,
-                Title = newSplitCallback?.Chapter?.Title
-            });
-            fileName = FileUtility.GetValidFilename(fileName);
 
-            multiPartFilePaths.Add(fileName);
+		private void Callback(int currentChapter, ChapterInfo splitChapters, NewMP3SplitCallback newSplitCallback)
+			=> Callback(currentChapter, splitChapters, newSplitCallback as NewSplitCallback);
 
-            FileUtility.SaferDelete(fileName);
+		private void Callback(int currentChapter, ChapterInfo splitChapters, NewSplitCallback newSplitCallback)
+		{
+			MultiConvertFileProperties props = new()
+			{
+				OutputFileName = OutputFileName,
+				PartsPosition = currentChapter,
+				PartsTotal = splitChapters.Count,
+				Title = newSplitCallback?.Chapter?.Title,
+			};
+			newSplitCallback.OutputFile = createOutputFileStream(props);
+			newSplitCallback.TrackTitle = DownloadOptions.GetMultipartTitleName(props);
+			newSplitCallback.TrackNumber = currentChapter;
+			newSplitCallback.TrackCount = splitChapters.Count;
+		}
 
-            newSplitCallback.OutputFile = File.Open(fileName, FileMode.OpenOrCreate);
+		private FileStream createOutputFileStream(MultiConvertFileProperties multiConvertFileProperties)
+		{
+			var fileName = DownloadOptions.GetMultipartFileName(multiConvertFileProperties);
+			fileName = FileUtility.GetValidFilename(fileName, DownloadOptions.ReplacementCharacters);
 
-            OnFileCreated(fileName);
-        }
-    }
+			multiPartFilePaths.Add(fileName);
+
+			FileUtility.SaferDelete(fileName);
+
+			var file = File.Open(fileName, FileMode.OpenOrCreate);
+			OnFileCreated(fileName);
+			return file;
+		}
+	}
 }

Source/AaxDecrypter/AaxcDownloadSingleConverter.cs

@@ -1,55 +1,113 @@
 using System;
 using System.IO;
+using System.Threading.Tasks;
 using AAXClean;
 using AAXClean.Codecs;
-using Dinah.Core.StepRunner;
 using FileManager;
 
 namespace AaxDecrypter
 {
 	public class AaxcDownloadSingleConverter : AaxcDownloadConvertBase
 	{
-		protected override StepSequence Steps { get; }
+		public AaxcDownloadSingleConverter(string outFileName, string cacheDirectory, IDownloadOptions dlOptions)
+			: base(outFileName, cacheDirectory, dlOptions) { }
 
-        public AaxcDownloadSingleConverter(string outFileName, string cacheDirectory, DownloadOptions dlLic)
-			: base(outFileName, cacheDirectory, dlLic)
-        {
-            Steps = new StepSequence
-            {
-                Name = "Download and Convert Aaxc To " + DownloadOptions.OutputFormat,
+		public override async Task<bool> RunAsync()
+		{
+			try
+			{
+				Serilog.Log.Information("Begin download and convert Aaxc To {format}", DownloadOptions.OutputFormat);
 
-                ["Step 1: Get Aaxc Metadata"] = Step_GetMetadata,
-                ["Step 2: Download Decrypted Audiobook"] = Step_DownloadAudiobookAsSingleFile,
-                ["Step 3: Create Cue"] = Step_CreateCue,
-                ["Step 4: Cleanup"] = Step_Cleanup,
-            };
-        }
+				//Step 1
+				Serilog.Log.Information("Begin Step 1: Get Aaxc Metadata");
+				if (await Task.Run(Step_GetMetadata))
+					Serilog.Log.Information("Completed Step 1: Get Aaxc Metadata");
+				else
+				{
+					Serilog.Log.Information("Failed to Complete Step 1: Get Aaxc Metadata");
+					return false;
+				}
 
-        private bool Step_DownloadAudiobookAsSingleFile()
-        {
-            var zeroProgress = Step_DownloadAudiobook_Start();
+				//Step 2
+				Serilog.Log.Information("Begin Step 2: Download Decrypted Audiobook");
+				if (await Step_DownloadAudiobookAsSingleFile())
+					Serilog.Log.Information("Completed Step 2: Download Decrypted Audiobook");
+				else
+				{
+					Serilog.Log.Information("Failed to Complete Step 2: Download Decrypted Audiobook");
+					return false;
+				}
 
-            FileUtility.SaferDelete(OutputFileName);
+				//Step 3
+				Serilog.Log.Information("Begin Step 3: Create Cue");
+				if (await Task.Run(Step_CreateCue))
+					Serilog.Log.Information("Completed Step 3: Create Cue");
+				else
+				{
+					Serilog.Log.Information("Failed to Complete Step 3: Create Cue");
+					return false;
+				}
 
-            var outputFile = File.Open(OutputFileName, FileMode.OpenOrCreate, FileAccess.ReadWrite);
-            OnFileCreated(OutputFileName);
+				//Step 4
+				Serilog.Log.Information("Begin Step 4: Cleanup");
+				if (await Task.Run(Step_Cleanup))
+					Serilog.Log.Information("Completed Step 4: Cleanup");
+				else
+				{
+					Serilog.Log.Information("Failed to Complete Step 4: Cleanup");
+					return false;
+				}
 
-            AaxFile.ConversionProgressUpdate += AaxFile_ConversionProgressUpdate;
-            var decryptionResult
-                = DownloadOptions.OutputFormat == OutputFormat.M4b
-                ? AaxFile.ConvertToMp4a(outputFile, DownloadOptions.ChapterInfo, DownloadOptions.TrimOutputToChapterLength)
-                : AaxFile.ConvertToMp3(outputFile, DownloadOptions.LameConfig, DownloadOptions.ChapterInfo, DownloadOptions.TrimOutputToChapterLength);
-            AaxFile.ConversionProgressUpdate -= AaxFile_ConversionProgressUpdate;
+				Serilog.Log.Information("Completed download and convert Aaxc To {format}", DownloadOptions.OutputFormat);
+				return true;
+			}
+			catch (Exception ex)
+			{
+				Serilog.Log.Error(ex, "Error encountered in download and convert Aaxc To {format}", DownloadOptions.OutputFormat);
+				return false;
+			}
+		}
 
-            DownloadOptions.ChapterInfo = AaxFile.Chapters;
+		private async Task<bool> Step_DownloadAudiobookAsSingleFile()
+		{
+			var zeroProgress = Step_DownloadAudiobook_Start();
 
-            Step_DownloadAudiobook_End(zeroProgress);
+			FileUtility.SaferDelete(OutputFileName);
 
-            var success = decryptionResult == ConversionResult.NoErrorsDetected && !IsCanceled;
-            if (success)
-                base.OnFileCreated(OutputFileName);
+			var outputFile = File.Open(OutputFileName, FileMode.OpenOrCreate, FileAccess.ReadWrite);
+			OnFileCreated(OutputFileName);
 
-            return success;
-        }
-    }
+			AaxFile.ConversionProgressUpdate += AaxFile_ConversionProgressUpdate;
+
+			ConversionResult decryptionResult = await decryptAsync(outputFile);
+
+			AaxFile.ConversionProgressUpdate -= AaxFile_ConversionProgressUpdate;
+
+			Step_DownloadAudiobook_End(zeroProgress);
+
+			var success = decryptionResult == ConversionResult.NoErrorsDetected && !IsCanceled;
+			if (success)
+				base.OnFileCreated(OutputFileName);
+
+			return success;
+		}
+
+		private Task<ConversionResult> decryptAsync(Stream outputFile)
+			=> DownloadOptions.OutputFormat == OutputFormat.Mp3 ? 
+			AaxFile.ConvertToMp3Async
+			(
+				outputFile,
+				DownloadOptions.LameConfig,
+				DownloadOptions.ChapterInfo,
+				DownloadOptions.TrimOutputToChapterLength
+			)
+			: DownloadOptions.FixupFile ?
+				AaxFile.ConvertToMp4aAsync
+				(
+					outputFile,
+					DownloadOptions.ChapterInfo,
+					DownloadOptions.TrimOutputToChapterLength
+				)
+				: AaxFile.ConvertToMp4aAsync(outputFile);
+	}
 }

Source/AaxDecrypter/AudiobookDownloadBase.cs

@@ -1,9 +1,9 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
+using System.Threading.Tasks;
 using Dinah.Core;
 using Dinah.Core.Net.Http;
-using Dinah.Core.StepRunner;
 using FileManager;
 
 namespace AaxDecrypter
@@ -21,41 +21,40 @@ namespace AaxDecrypter
 		public event EventHandler<string> FileCreated;
 
 		public bool IsCanceled { get; set; }
-		
+		public string TempFilePath { get; }
+
 		protected string OutputFileName { get; private set; }
-		protected DownloadOptions DownloadOptions { get; }
+		protected IDownloadOptions DownloadOptions { get; }
 		protected NetworkFileStream InputFileStream => (nfsPersister ??= OpenNetworkFileStream()).NetworkFileStream;
 
 		// Don't give the property a 'set'. This should have to be an obvious choice; not accidental
 		protected void SetOutputFileName(string newOutputFileName) => OutputFileName = newOutputFileName;
 
-		protected abstract StepSequence Steps { get; }
 		private NetworkFileStreamPersister nfsPersister;
 
 		private string jsonDownloadState { get; }
-		public string TempFilePath { get; }
 
-		protected AudiobookDownloadBase(string outFileName, string cacheDirectory, DownloadOptions dlLic)
+		protected AudiobookDownloadBase(string outFileName, string cacheDirectory, IDownloadOptions dlOptions)
 		{
 			OutputFileName = ArgumentValidator.EnsureNotNullOrWhiteSpace(outFileName, nameof(outFileName));
 
 			var outDir = Path.GetDirectoryName(OutputFileName);
 			if (!Directory.Exists(outDir))
-				throw new DirectoryNotFoundException($"Directory does not exist: {nameof(outDir)}");
+				Directory.CreateDirectory(outDir);
 
 			if (!Directory.Exists(cacheDirectory))
-				throw new DirectoryNotFoundException($"Directory does not exist: {nameof(cacheDirectory)}");
+				Directory.CreateDirectory(cacheDirectory);
 
 			jsonDownloadState = Path.Combine(cacheDirectory, Path.GetFileName(Path.ChangeExtension(OutputFileName, ".json")));
 			TempFilePath = Path.ChangeExtension(jsonDownloadState, ".aaxc");
 
-			DownloadOptions = ArgumentValidator.EnsureNotNull(dlLic, nameof(dlLic));
+			DownloadOptions = ArgumentValidator.EnsureNotNull(dlOptions, nameof(dlOptions));
 
 			// delete file after validation is complete
 			FileUtility.SaferDelete(OutputFileName);
-		}
+		}		
 
-		public abstract void Cancel();
+		public abstract Task CancelAsync();
 
 		public virtual void SetCoverArt(byte[] coverArt)
 		{
@@ -63,15 +62,7 @@ namespace AaxDecrypter
 				OnRetrievedCoverArt(coverArt);
 		}
 
-		public bool Run()
-		{
-			var (IsSuccess, Elapsed) = Steps.Run();
-
-			if (!IsSuccess)
-				Serilog.Log.Logger.Error("Conversion failed");
-
-			return IsSuccess;
-		}
+		public abstract Task<bool> RunAsync();
 
 		protected void OnRetrievedTitle(string title)
 			=> RetrievedTitle?.Invoke(this, title);
@@ -79,10 +70,8 @@ namespace AaxDecrypter
 			=> RetrievedAuthors?.Invoke(this, authors);
 		protected void OnRetrievedNarrators(string narrators)
 			=> RetrievedNarrators?.Invoke(this, narrators);
-
 		protected void OnRetrievedCoverArt(byte[] coverArt)
 			=> RetrievedCoverArt?.Invoke(this, coverArt);
-
 		protected void OnDecryptProgressUpdate(DownloadProgress downloadProgress) 
 			=> DecryptProgressUpdate?.Invoke(this, downloadProgress);
 		protected void OnDecryptTimeRemaining(TimeSpan timeRemaining)
@@ -104,7 +93,7 @@ namespace AaxDecrypter
 			try
 			{
 				var path = Path.ChangeExtension(OutputFileName, ".cue");
-				path = FileUtility.GetValidFilename(path);
+				path = FileUtility.GetValidFilename(path, DownloadOptions.ReplacementCharacters);
 				File.WriteAllText(path, Cue.CreateContents(Path.GetFileName(OutputFileName), DownloadOptions.ChapterInfo));
 				OnFileCreated(path);
 			}

Source/AaxDecrypter/DownloadOptions.cs

@@ -1,30 +0,0 @@
-using AAXClean;
-using Dinah.Core;
-
-namespace AaxDecrypter
-{
-    public class DownloadOptions
-    {
-        public string DownloadUrl { get; }
-        public string UserAgent { get; }
-        public string AudibleKey { get; init; }
-        public string AudibleIV { get; init; }
-        public OutputFormat OutputFormat { get; init; }
-        public bool TrimOutputToChapterLength { get; init; }
-        public bool RetainEncryptedFile { get; init; }
-        public bool StripUnabridged { get; init; }
-        public bool CreateCueSheet { get; init; }
-        public ChapterInfo ChapterInfo { get; set; }
-        public NAudio.Lame.LameConfig LameConfig { get; set; }
-        public bool Downsample { get; set; }
-        public bool MatchSourceBitrate { get; set; }       
-
-        public DownloadOptions(string downloadUrl, string userAgent)
-        {
-            DownloadUrl = ArgumentValidator.EnsureNotNullOrEmpty(downloadUrl, nameof(downloadUrl));
-            UserAgent = ArgumentValidator.EnsureNotNullOrEmpty(userAgent, nameof(userAgent));
-
-            // no null/empty check for key/iv. unencrypted files do not have them
-        }
-    }
-}

Source/AaxDecrypter/IDownloadOptions.cs

@@ -0,0 +1,25 @@
+using AAXClean;
+
+namespace AaxDecrypter
+{
+    public interface IDownloadOptions
+	{
+        FileManager.ReplacementCharacters ReplacementCharacters { get; }
+        string DownloadUrl { get; }
+        string UserAgent { get; }
+        string AudibleKey { get; }
+        string AudibleIV { get; }
+        OutputFormat OutputFormat { get; }
+        bool TrimOutputToChapterLength { get; }
+        bool RetainEncryptedFile { get; }
+        bool StripUnabridged { get; }
+        bool CreateCueSheet { get; }
+        ChapterInfo ChapterInfo { get; }
+        bool FixupFile { get; }
+        NAudio.Lame.LameConfig LameConfig { get; }
+        bool Downsample { get; }
+        bool MatchSourceBitrate { get; }
+        string GetMultipartFileName(MultiConvertFileProperties props);
+        string GetMultipartTitleName(MultiConvertFileProperties props);
+    }    
+}

Source/AaxDecrypter/MpegUtil.cs

@@ -0,0 +1,33 @@
+using AAXClean;
+using NAudio.Lame;
+using System;
+using System.Linq;
+
+namespace AaxDecrypter
+{
+	public static class MpegUtil
+	{
+		public static void ConfigureLameOptions(Mp4File mp4File, LameConfig lameConfig, bool downsample, bool matchSourceBitrate)
+		{
+			double bitrateMultiple = 1;
+
+			if (mp4File.AudioChannels == 2)
+			{
+				if (downsample)
+					bitrateMultiple = 0.5;
+				else
+					lameConfig.Mode = MPEGMode.Stereo;
+			}
+
+			if (matchSourceBitrate)
+			{
+				int kbps = (int)(mp4File.AverageBitrate * bitrateMultiple / 1024);
+
+				if (lameConfig.VBR is null)
+					lameConfig.BitRate = kbps;
+				else if (lameConfig.VBR == VBRMode.ABR)
+					lameConfig.ABRRateKbps = kbps;
+			}
+		}
+	}
+}

Source/AaxDecrypter/MultiConvertFileProperties.cs

@@ -11,15 +11,5 @@ namespace AaxDecrypter
         public int PartsTotal { get; set; }
         public string Title { get; set; }
 
-        public static string DefaultMultipartFilename(MultiConvertFileProperties multiConvertFileProperties)
-        {
-            var template = Path.ChangeExtension(multiConvertFileProperties.OutputFileName, null) + " - <ch# 0> - <title>" + Path.GetExtension(multiConvertFileProperties.OutputFileName);
-
-            var fileNamingTemplate = new FileNamingTemplate(template) { IllegalCharacterReplacements = " " };
-            fileNamingTemplate.AddParameterReplacement("ch# 0", FileUtility.GetSequenceFormatted(multiConvertFileProperties.PartsPosition, multiConvertFileProperties.PartsTotal));
-            fileNamingTemplate.AddParameterReplacement("title", multiConvertFileProperties.Title ?? "");
-
-            return fileNamingTemplate.GetFilePath();
-        }
     }
 }

Source/AaxDecrypter/NetworkFileStream.cs

@@ -145,7 +145,14 @@ namespace AaxDecrypter
 		private void Update()
 		{
 			RequestHeaders = HttpRequest.Headers;
-			Updated?.Invoke(this, EventArgs.Empty);
+			try
+			{
+				Updated?.Invoke(this, EventArgs.Empty);
+			}
+			catch (Exception ex)
+			{
+				Serilog.Log.Error(ex, "An error was encountered while saving the download progress to JSON");
+			}
 		}
 
 		/// <summary>
@@ -211,7 +218,7 @@ namespace AaxDecrypter
 		}
 
 		/// <summary>
-		/// Downlod <see cref="Uri"/> to <see cref="SaveFilePath"/>.
+		/// Download <see cref="Uri"/> to <see cref="SaveFilePath"/>.
 		/// </summary>
 		private void DownloadFile()
 		{
@@ -245,9 +252,6 @@ namespace AaxDecrypter
 				WritePosition = downloadPosition;
 				Update();
 
-				downloadedPiece.Set();
-				downloadEnded.Set();
-
 				if (!IsCancelled && WritePosition < ContentLength)
 					throw new WebException($"Downloaded size (0x{WritePosition:X10}) is less than {nameof(ContentLength)} (0x{ContentLength:X10}).");
 
@@ -257,7 +261,11 @@ namespace AaxDecrypter
 			catch (Exception ex)
 			{
 				Serilog.Log.Error(ex, "An error was encountered while downloading {Uri}", Uri);
-				IsCancelled = true;
+			}
+			finally
+			{
+				downloadedPiece.Set();
+				downloadEnded.Set();
 			}
 		}
 
@@ -401,7 +409,7 @@ namespace AaxDecrypter
 		{
 			if (!hasBegunDownloading)
 				BeginDownloading();
-
+			
 			var toRead = Math.Min(count, Length - Position);
 			WaitToPosition(Position + toRead);
 			return _readFile.Read(buffer, offset, count);
@@ -426,14 +434,20 @@ namespace AaxDecrypter
 		/// <param name="requiredPosition">The minimum required flished data length in <see cref="SaveFilePath"/>.</param>
 		private void WaitToPosition(long requiredPosition)
 		{
-			while (requiredPosition > WritePosition && !IsCancelled && hasBegunDownloading && !downloadedPiece.WaitOne(1000)) ;
+			while (WritePosition < requiredPosition
+				&& hasBegunDownloading
+				&& !IsCancelled
+				&& !downloadEnded.WaitOne(0))
+			{
+				downloadedPiece.WaitOne(100);
+			}
 		}
 
 		public override void Close()
 		{
 			IsCancelled = true;
 
-			while (downloadEnded is not null && !downloadEnded.WaitOne(1000)) ;
+			while (downloadEnded is not null && !downloadEnded.WaitOne(100)) ;
 
 			_readFile.Close();
 			_writeFile.Close();

Source/AaxDecrypter/UnencryptedAudiobookDownloader.cs

@@ -1,33 +1,69 @@
 using System;
 using System.Threading;
+using System.Threading.Tasks;
 using Dinah.Core.Net.Http;
-using Dinah.Core.StepRunner;
 using FileManager;
 
 namespace AaxDecrypter
 {
 	public class UnencryptedAudiobookDownloader : AudiobookDownloadBase
 	{
-		protected override StepSequence Steps { get; }
 
-		public UnencryptedAudiobookDownloader(string outFileName, string cacheDirectory, DownloadOptions dlLic)
-			: base(outFileName, cacheDirectory, dlLic)
+		public UnencryptedAudiobookDownloader(string outFileName, string cacheDirectory, IDownloadOptions dlLic)
+			: base(outFileName, cacheDirectory, dlLic) { }
+
+		public override async Task<bool> RunAsync()
 		{
-			Steps = new StepSequence
+			try
 			{
-				Name = "Download Mp3 Audiobook",
+				Serilog.Log.Information("Begin download and convert Aaxc To {format}", DownloadOptions.OutputFormat);
 
-				["Step 1: Get Mp3 Metadata"] = Step_GetMetadata,
-				["Step 2: Download Audiobook"] = Step_DownloadAudiobookAsSingleFile,
-				["Step 3: Create Cue"] = Step_CreateCue,
-				["Step 4: Cleanup"] = Step_Cleanup,
-			};
+				//Step 1
+				Serilog.Log.Information("Begin Step 1: Get Mp3 Metadata");
+				if (await Task.Run(Step_GetMetadata))
+					Serilog.Log.Information("Completed Step 1: Get Mp3 Metadata");
+				else
+				{
+					Serilog.Log.Information("Failed to Complete Step 1: Get Mp3 Metadata");
+					return false;
+				}
+
+				//Step 2
+				Serilog.Log.Information("Begin Step 2: Download Audiobook");
+				if (await Task.Run(Step_DownloadAudiobookAsSingleFile))
+					Serilog.Log.Information("Completed Step 2: Download Audiobook");
+				else
+				{
+					Serilog.Log.Information("Failed to Complete Step 2: Download Audiobook");
+					return false;
+				}
+
+				//Step 3
+				Serilog.Log.Information("Begin Step 3: Cleanup");
+				if (await Task.Run(Step_Cleanup))
+					Serilog.Log.Information("Completed Step 3: Cleanup");
+				else
+				{
+					Serilog.Log.Information("Failed to Complete Step 3: Cleanup");
+					return false;
+				}
+
+				Serilog.Log.Information("Completed download and convert Aaxc To {format}", DownloadOptions.OutputFormat);
+				return true;
+			}
+			catch (Exception ex)
+			{
+				Serilog.Log.Error(ex, "Error encountered in download and convert Aaxc To {format}", DownloadOptions.OutputFormat);
+				return false;
+			}
 		}
 
-		public override void Cancel()
+
+		public override Task CancelAsync()
 		{
 			IsCanceled = true;
 			CloseInputFileStream();
+			return Task.CompletedTask;
 		}
 
 		protected bool Step_GetMetadata()
@@ -65,8 +101,8 @@ namespace AaxDecrypter
 			}
 
 			CloseInputFileStream();
-
-			var realOutputFileName = FileUtility.SaferMoveToValidPath(InputFileStream.SaveFilePath, OutputFileName);
+			
+			var realOutputFileName = FileUtility.SaferMoveToValidPath(InputFileStream.SaveFilePath, OutputFileName, DownloadOptions.ReplacementCharacters);
 			SetOutputFileName(realOutputFileName);
 			OnFileCreated(realOutputFileName);
 

Source/AppScaffolding/.msbump

@@ -1,4 +0,0 @@
-{
-  "//": "https://github.com/BalassaMarton/MSBump",
-  BumpRevision: true
-}

Source/AppScaffolding/AppScaffolding.csproj

@@ -1,22 +1,27 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
-
   <PropertyGroup>
-    <TargetFramework>net6.0-windows</TargetFramework>
-    <Version>8.0.2.1</Version>
+    <TargetFramework>net6.0</TargetFramework>
+    <Version>8.3.3.1</Version>
   </PropertyGroup>
-
   <ItemGroup>
-    <PackageReference Include="MSBump" Version="2.3.2">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
-    <PackageReference Include="Octokit" Version="0.51.0" />
+    <PackageReference Include="Octokit" Version="1.0.0" />
   </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\ApplicationServices\ApplicationServices.csproj" />
     <ProjectReference Include="..\AudibleUtilities\AudibleUtilities.csproj" />
   </ItemGroup>
 
-</Project>
+	<PropertyGroup>
+		<DefineConstants Condition=" '$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Windows)))' ">$(DefineConstants);WINDOWS</DefineConstants>
+		<DefineConstants Condition=" '$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Linux)))' ">$(DefineConstants);LINUX</DefineConstants>
+		<DefineConstants Condition=" '$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::OSX)))' ">$(DefineConstants);MACOS</DefineConstants>
+	</PropertyGroup>
+	
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+    <DebugType>embedded</DebugType>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
+    <DebugType>embedded</DebugType>
+  </PropertyGroup>
+</Project>

Source/AppScaffolding/LibationScaffolding.cs

@@ -14,8 +14,23 @@ using Serilog;
 
 namespace AppScaffolding
 {
+
+	public enum ReleaseIdentifier
+	{
+		None,
+		WindowsClassic,
+		WindowsAvalonia,
+		LinuxAvalonia,
+		MacOSAvalonia
+	}
+
 	public static class LibationScaffolding
 	{
+		public static ReleaseIdentifier ReleaseIdentifier { get; private set; }
+
+		public static void SetReleaseIdentifier(ReleaseIdentifier releaseID)
+			=> ReleaseIdentifier = releaseID;
+
 		// AppScaffolding
 		private static Assembly _executingAssembly;
 		private static Assembly ExecutingAssembly
@@ -66,6 +81,9 @@ namespace AppScaffolding
 		{
 			config.InProgress ??= Configuration.WinTemp;
 
+			if (!config.Exists(nameof(config.BetaOptIn)))
+				config.BetaOptIn = false;
+
 			if (!config.Exists(nameof(config.AllowLibationFixup)))
 				config.AllowLibationFixup = true;
 
@@ -88,20 +106,20 @@ namespace AppScaffolding
 				config.DecryptToLossy = false;
 
 			if (!config.Exists(nameof(config.LameTargetBitrate)))
-				config.LameTargetBitrate = false;			
-			
+				config.LameTargetBitrate = false;
+
 			if (!config.Exists(nameof(config.LameDownsampleMono)))
 				config.LameDownsampleMono = true;
-			
+
 			if (!config.Exists(nameof(config.LameBitrate)))
 				config.LameBitrate = 64;
-			
+
 			if (!config.Exists(nameof(config.LameConstantBitrate)))
 				config.LameConstantBitrate = false;
-			
+
 			if (!config.Exists(nameof(config.LameMatchSourceBR)))
 				config.LameMatchSourceBR = true;
-			
+
 			if (!config.Exists(nameof(config.LameVBRQuality)))
 				config.LameVBRQuality = 2;
 
@@ -117,6 +135,9 @@ namespace AppScaffolding
 			if (!config.Exists(nameof(config.DownloadEpisodes)))
 				config.DownloadEpisodes = true;
 
+			if (!config.Exists(nameof(config.ReplacementCharacters)))
+				config.ReplacementCharacters = FileManager.ReplacementCharacters.Default;
+
 			if (!config.Exists(nameof(config.FolderTemplate)))
 				config.FolderTemplate = Templates.Folder.DefaultTemplate;
 
@@ -126,6 +147,9 @@ namespace AppScaffolding
 			if (!config.Exists(nameof(config.ChapterFileTemplate)))
 				config.ChapterFileTemplate = Templates.ChapterFile.DefaultTemplate;
 
+			if (!config.Exists(nameof(config.ChapterTitleTemplate)))
+				config.ChapterTitleTemplate = Templates.ChapterTitle.DefaultTemplate;
+
 			if (!config.Exists(nameof(config.AutoScan)))
 				config.AutoScan = true;
 
@@ -266,12 +290,23 @@ namespace AppScaffolding
 			if (System.Diagnostics.Debugger.IsAttached)
 				mode += " (Debugger attached)";
 
+#if MACOS
+			var os = "MacOS";
+#elif LINUX
+			var os = "Linux";
+#else
+			var os = "Windows";
+#endif
+
+
 			// begin logging session with a form feed
 			Log.Logger.Information("\r\n\f");
 			Log.Logger.Information("Begin. {@DebugInfo}", new
 			{
 				AppName = EntryAssembly.GetName().Name,
 				Version = BuildVersion.ToString(),
+				ReleaseIdentifier = ReleaseIdentifier,
+				OS = os,
 				Mode = mode,
 				LogLevel_Verbose_Enabled = Log.Logger.IsVerboseEnabled(),
 				LogLevel_Debug_Enabled = Log.Logger.IsDebugEnabled(),
@@ -280,6 +315,7 @@ namespace AppScaffolding
 				LogLevel_Error_Enabled = Log.Logger.IsErrorEnabled(),
 				LogLevel_Fatal_Enabled = Log.Logger.IsFatalEnabled(),
 
+				config.BetaOptIn,
 				config.LibationFiles,
 				AudibleFileStorage.BooksDirectory,
 
@@ -302,8 +338,9 @@ namespace AppScaffolding
 		public static UpgradeProperties GetLatestRelease()
 		{
 			// timed out
-			var latest = getLatestRelease(TimeSpan.FromSeconds(10));
-			if (latest is null)
+			(var latest, var zip) = getLatestRelease(TimeSpan.FromSeconds(10));
+
+			if (latest is null || zip is null)
 				return null;
 
 			var latestVersionString = latest.TagName.Trim('v');
@@ -315,7 +352,7 @@ namespace AppScaffolding
 				return null;
 
 			// we have an update
-			var zip = latest.Assets.FirstOrDefault(a => a.BrowserDownloadUrl.EndsWith(".zip"));
+
 			var zipUrl = zip?.BrowserDownloadUrl;
 
 			Log.Logger.Information("Update available: {@DebugInfo}", new
@@ -327,11 +364,11 @@ namespace AppScaffolding
 
 			return new(zipUrl, latest.HtmlUrl, zip.Name, latestRelease);
 		}
-		private static Octokit.Release getLatestRelease(TimeSpan timeout)
+		private static (Octokit.Release, Octokit.ReleaseAsset) getLatestRelease(TimeSpan timeout)
 		{
 			try
 			{
-				var task = System.Threading.Tasks.Task.Run(() => getLatestRelease());
+				var task = getLatestRelease();
 				if (task.Wait(timeout))
 					return task.Result;
 
@@ -341,16 +378,26 @@ namespace AppScaffolding
 			{
 				Log.Logger.Error(aggEx, "Checking for new version too often");
 			}
-			return null;
+			return (null, null);
 		}
-		private static Octokit.Release getLatestRelease()
+		private static async System.Threading.Tasks.Task<(Octokit.Release, Octokit.ReleaseAsset)> getLatestRelease()
 		{
-			var gitHubClient = new Octokit.GitHubClient(new Octokit.ProductHeaderValue("Libation"));
+			var ownerAccount = "rmcrackan";
+			var repoName = "Libation";
+
+			var gitHubClient = new Octokit.GitHubClient(new Octokit.ProductHeaderValue(repoName));
+
+			//Download the release index
+			var bts = await gitHubClient.Repository.Content.GetRawContent(ownerAccount, repoName, ".releaseindex.json");
+			var releaseIndex = JObject.Parse(System.Text.Encoding.ASCII.GetString(bts));
+			var regexPattern = releaseIndex.Value<string>(ReleaseIdentifier.ToString());
 
 			// https://octokitnet.readthedocs.io/en/latest/releases/
-			var releases = gitHubClient.Repository.Release.GetAll("rmcrackan", "Libation").GetAwaiter().GetResult();
-			var latest = releases.First(r => !r.Draft && !r.Prerelease);
-			return latest;
+			var releases = await gitHubClient.Repository.Release.GetAll(ownerAccount, repoName);
+
+			var regex = new System.Text.RegularExpressions.Regex(regexPattern, System.Text.RegularExpressions.RegexOptions.IgnoreCase);
+			var latestRelease = releases.FirstOrDefault(r => !r.Draft && !r.Prerelease && r.Assets.Any(a => regex.IsMatch(a.Name)));
+			return (latestRelease, latestRelease?.Assets?.FirstOrDefault(a => regex.IsMatch(a.Name)));
 		}
 	}
 
@@ -405,9 +452,9 @@ namespace AppScaffolding
 
 		public static void migrate_from_7_10_1(Configuration config)
 		{
-			var lastNigrationThres = config.GetNonString<bool>($"{nameof(migrate_from_7_10_1)}_ThrewError");
+			var lastMigrationThrew = config.GetNonString<bool>($"{nameof(migrate_from_7_10_1)}_ThrewError");
 
-			if (lastNigrationThres) return;
+			if (lastMigrationThrew) return;
 
 			try
 			{
@@ -467,7 +514,7 @@ namespace AppScaffolding
 			}
 			catch (Exception ex)
 			{
-				Serilog.Log.Logger.Error(ex, "An error occured while running database migrations in {0}", nameof(migrate_from_7_10_1));
+				Serilog.Log.Logger.Error(ex, "An error occurred while running database migrations in {0}", nameof(migrate_from_7_10_1));
 				config.SetObject($"{nameof(migrate_from_7_10_1)}_ThrewError", true);
 			}
 		}

Source/AppScaffolding/UNSAFE_MigrationHelper.cs

@@ -25,7 +25,7 @@ namespace AppScaffolding
 			: value;
 
 		#region appsettings.json
-		private static string APPSETTINGS_JSON { get; } = Path.Combine(Path.GetDirectoryName(System.Reflection.Assembly.GetEntryAssembly().Location), "appsettings.json");
+		private static string APPSETTINGS_JSON { get; } = Path.Combine(Path.GetDirectoryName(System.Diagnostics.Process.GetCurrentProcess().MainModule.FileName), "appsettings.json");
 
 		public static bool APPSETTINGS_Json_Exists => File.Exists(APPSETTINGS_JSON);
 

Source/ApplicationServices/ApplicationServices.csproj

@@ -1,11 +1,11 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0-windows</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="CsvHelper" Version="27.2.1" />
+    <PackageReference Include="CsvHelper" Version="28.0.1" />
     <PackageReference Include="NPOI" Version="2.5.6" />
   </ItemGroup>
 
@@ -14,4 +14,12 @@
     <ProjectReference Include="..\LibationSearchEngine\LibationSearchEngine.csproj" />
   </ItemGroup>
 
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+		<DebugType>embedded</DebugType>
+	</PropertyGroup>
+
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
+		<DebugType>embedded</DebugType>
+	</PropertyGroup>
+
 </Project>

Source/ApplicationServices/LibraryCommands.cs

@@ -128,13 +128,13 @@ namespace ApplicationServices
 
 
 				Log.Logger.Information("Begin scan for orphaned episode parents");
-				var newParents = await findAndAddMissingParents(apiExtendedfunc, accounts);
+				var newParents = await findAndAddMissingParents(accounts);
 				Log.Logger.Information($"Orphan episode scan complete. New parents count {newParents}");
 
 				if (newParents >= 0)
 				{
 					//If any episodes are still orphaned, their series have been
-					//removed from the catalog and wel'll never be able to find them.
+					//removed from the catalog and we'll never be able to find them.
 
 					//only do this if findAndAddMissingParents returned >= 0. If it
 					//returned < 0, an error happened and there's still a chance that
@@ -251,11 +251,11 @@ namespace ApplicationServices
 			}
 			catch (Exception ex)
 			{
-				Serilog.Log.Logger.Error(ex, "An error occured while trying to remove orphaned episodes from the database");
+				Serilog.Log.Logger.Error(ex, "An error occurred while trying to remove orphaned episodes from the database");
 			}
 		}
 
-		static async Task<int> findAndAddMissingParents(Func<Account, Task<ApiExtended>> apiExtendedfunc, Account[] accounts)
+		static async Task<int> findAndAddMissingParents(Account[] accounts)
 		{
 			using var context = DbContexts.GetContext();
 
@@ -274,11 +274,11 @@ namespace ApplicationServices
 					.DistinctBy(s => s.Series.AudibleSeriesId)
 					.ToList();
 
-				// We're only calling the Catalog endpoint, so it doesn't matter which account we use.
-				var apiExtended = await apiExtendedfunc(accounts[0]);
+				// The Catalog endpoint does not require authentication.
+				var api = new ApiUnauthenticated(accounts[0].Locale);
 
 				var seriesParents = orphanedSeries.Select(o => o.Series.AudibleSeriesId).ToList();
-				var items = await apiExtended.Api.GetCatalogProductsAsync(seriesParents, CatalogOptions.ResponseGroupOptions.ALL_OPTIONS);
+				var items = await api.GetCatalogProductsAsync(seriesParents, CatalogOptions.ResponseGroupOptions.ALL_OPTIONS);
 
 				List<ImportItem> newParentsImportItems = new();
 				foreach (var sp in orphanedSeries)
@@ -308,7 +308,7 @@ namespace ApplicationServices
 			}
 			catch (Exception ex)
 			{
-				Serilog.Log.Logger.Error(ex, "An error occured while trying to scan for orphaned episode parents.");
+				Serilog.Log.Logger.Error(ex, "An error occurred while trying to scan for orphaned episode parents.");
 				return -1;
 			}
 		}
@@ -321,7 +321,7 @@ namespace ApplicationServices
 			}
 			catch (Microsoft.EntityFrameworkCore.DbUpdateException ex)
 			{
-				// DbUpdateException exceptions can wreck serilog. Condense it until we can find a better solution. I suspect the culpret is the "WithExceptionDetails" serilog extension
+				// DbUpdateException exceptions can wreck serilog. Condense it until we can find a better solution. I suspect the culprit is the "WithExceptionDetails" serilog extension
 
 				static string format(Exception ex) => $"\r\nMessage: {ex.Message}\r\nStack Trace:\r\n{ex.StackTrace}";
 

Source/ApplicationServices/LibraryExporter.cs

@@ -100,6 +100,9 @@ namespace ApplicationServices
 
 		[Name("Content Type")]
 		public string ContentType { get; set; }
+
+        [Name("Audio Format")]
+		public string AudioFormat { get; set; }
 	}
 	public static class LibToDtos
 	{
@@ -132,7 +135,8 @@ namespace ApplicationServices
 				MyLibationTags = a.Book.UserDefinedItem.Tags,
 				BookStatus = a.Book.UserDefinedItem.BookStatus.ToString(),
 				PdfStatus = a.Book.UserDefinedItem.PdfStatus.ToString(),
-				ContentType = a.Book.ContentType.ToString()
+				ContentType = a.Book.ContentType.ToString(),
+				AudioFormat = a.Book.AudioFormat.ToString()
 			}).ToList();
 	}
 	public static class LibraryExporter
@@ -176,33 +180,34 @@ namespace ApplicationServices
 			var row = sheet.CreateRow(rowIndex);
 
 			var columns = new[] {
-				nameof (ExportDto.Account),
-				nameof (ExportDto.DateAdded),
-				nameof (ExportDto.AudibleProductId),
-				nameof (ExportDto.Locale),
-				nameof (ExportDto.Title),
-				nameof (ExportDto.AuthorNames),
-				nameof (ExportDto.NarratorNames),
-				nameof (ExportDto.LengthInMinutes),
-				nameof (ExportDto.Description),
-				nameof (ExportDto.Publisher),
-				nameof (ExportDto.HasPdf),
-				nameof (ExportDto.SeriesNames),
-				nameof (ExportDto.SeriesOrder),
-				nameof (ExportDto.CommunityRatingOverall),
-				nameof (ExportDto.CommunityRatingPerformance),
-				nameof (ExportDto.CommunityRatingStory),
-				nameof (ExportDto.PictureId),
-				nameof (ExportDto.IsAbridged),
-				nameof (ExportDto.DatePublished),
-				nameof (ExportDto.CategoriesNames),
-				nameof (ExportDto.MyRatingOverall),
-				nameof (ExportDto.MyRatingPerformance),
-				nameof (ExportDto.MyRatingStory),
-				nameof (ExportDto.MyLibationTags),
-				nameof (ExportDto.BookStatus),
-				nameof (ExportDto.PdfStatus),
-				nameof (ExportDto.ContentType)
+				nameof(ExportDto.Account),
+				nameof(ExportDto.DateAdded),
+				nameof(ExportDto.AudibleProductId),
+				nameof(ExportDto.Locale),
+				nameof(ExportDto.Title),
+				nameof(ExportDto.AuthorNames),
+				nameof(ExportDto.NarratorNames),
+				nameof(ExportDto.LengthInMinutes),
+				nameof(ExportDto.Description),
+				nameof(ExportDto.Publisher),
+				nameof(ExportDto.HasPdf),
+				nameof(ExportDto.SeriesNames),
+				nameof(ExportDto.SeriesOrder),
+				nameof(ExportDto.CommunityRatingOverall),
+				nameof(ExportDto.CommunityRatingPerformance),
+				nameof(ExportDto.CommunityRatingStory),
+				nameof(ExportDto.PictureId),
+				nameof(ExportDto.IsAbridged),
+				nameof(ExportDto.DatePublished),
+				nameof(ExportDto.CategoriesNames),
+				nameof(ExportDto.MyRatingOverall),
+				nameof(ExportDto.MyRatingPerformance),
+				nameof(ExportDto.MyRatingStory),
+				nameof(ExportDto.MyLibationTags),
+				nameof(ExportDto.BookStatus),
+				nameof(ExportDto.PdfStatus),
+				nameof(ExportDto.ContentType),
+				nameof(ExportDto.AudioFormat)
 			};
 			var col = 0;
 			foreach (var c in columns)
@@ -268,6 +273,7 @@ namespace ApplicationServices
 				row.CreateCell(col++).SetCellValue(dto.BookStatus);
 				row.CreateCell(col++).SetCellValue(dto.PdfStatus);
 				row.CreateCell(col++).SetCellValue(dto.ContentType);
+				row.CreateCell(col++).SetCellValue(dto.AudioFormat);
 
 				rowIndex++;
 			}

Source/AudibleUtilities/ApiExtended.cs

@@ -137,7 +137,7 @@ namespace AudibleUtilities
 					//Get child episodes asynchronously and await all at the end
 					getChildEpisodesTasks.Add(getChildEpisodesAsync(concurrencySemaphore, item));
 				}
-				else if (!item.IsEpisodes)
+				else if (!item.IsEpisodes && !item.IsSeriesParent)
 					items.Add(item);
 
 				count++;
@@ -145,13 +145,18 @@ namespace AudibleUtilities
 
 			Serilog.Log.Logger.Debug("Library scan complete. Found {count} books and series. Waiting on {getChildEpisodesTasksCount} series episode scans to complete.", count, getChildEpisodesTasks.Count);
 
-			//await and add all episides from all parents
+			//await and add all episodes from all parents
 			foreach (var epList in await Task.WhenAll(getChildEpisodesTasks))
 				items.AddRange(epList);
 
 			Serilog.Log.Logger.Debug("Completed library scan.");
 
 #if DEBUG
+			//// this will not work for multi accounts
+			//var library_json = "library.json";
+			//library_json = System.IO.Path.GetFullPath(library_json);
+			//if (System.IO.File.Exists(library_json))
+			//    items = AudibleApi.Common.Converter.FromJson<List<Item>>(System.IO.File.ReadAllText(library_json));
 			//System.IO.File.WriteAllText(library_json, AudibleApi.Common.Converter.ToJson(items));
 #endif
 			var validators = new List<IValidator>();
@@ -162,10 +167,19 @@ namespace AudibleUtilities
 				if (exceptions is not null && exceptions.Any())
 					throw new AggregateException(exceptions);
 			}
-
 			return items;
 		}
 
+		private static List<IValidator> getValidators()
+		{
+			var type = typeof(IValidator);
+			var types = AppDomain.CurrentDomain.GetAssemblies()
+				.SelectMany(s => s.GetTypes())
+				.Where(p => type.IsAssignableFrom(p) && !p.IsInterface);
+
+			return types.Select(t => Activator.CreateInstance(t) as IValidator).ToList();
+		}
+
 		#region episodes and podcasts
 
 		private async Task<List<Item>> getChildEpisodesAsync(SemaphoreSlim concurrencySemaphore, Item parent)
@@ -197,7 +211,8 @@ namespace AudibleUtilities
 					if (numSeriesParents != 1)
 					{
 						//There should only ever be 1 top-level parent per episode. If not, log
-						//and throw so we can figure out what to do about those special cases.
+						//so we can figure out what to do about those special cases, and don't
+						//import the episode.
 						JsonSerializerSettings Settings = new()
 						{
 							MetadataPropertyHandling = MetadataPropertyHandling.Ignore,
@@ -207,9 +222,8 @@ namespace AudibleUtilities
 								new IsoDateTimeConverter { DateTimeStyles = DateTimeStyles.AssumeUniversal }
 							},
 						};
-						var ex = new ApplicationException($"Found {numSeriesParents} parents for {parent.Asin}");
-						Serilog.Log.Logger.Error(ex, $"Episode Product:\r\n{JsonConvert.SerializeObject(parent, Formatting.None, Settings)}");
-						throw ex;
+						Serilog.Log.Logger.Error($"Found {numSeriesParents} parents for {parent.Asin}\r\nEpisode Product:\r\n{JsonConvert.SerializeObject(parent, Formatting.None, Settings)}");
+						return new List<Item>();
 					}
 
 					var realParent = seriesParents.Single(p => p.IsSeriesParent);
@@ -329,15 +343,5 @@ namespace AudibleUtilities
 			return results;
 		}
 		#endregion
-
-		private static List<IValidator> getValidators()
-		{
-			var type = typeof(IValidator);
-			var types = AppDomain.CurrentDomain.GetAssemblies()
-				.SelectMany(s => s.GetTypes())
-				.Where(p => type.IsAssignableFrom(p) && !p.IsInterface);
-
-			return types.Select(t => Activator.CreateInstance(t) as IValidator).ToList();
-		}
 	}
 }

Source/AudibleUtilities/AudibleUtilities.csproj

@@ -1,15 +1,23 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0-windows</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="AudibleApi" Version="4.0.0.1" />
+    <PackageReference Include="AudibleApi" Version="4.6.0.1" />
   </ItemGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\LibationFileManager\LibationFileManager.csproj" />
   </ItemGroup>
+	
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+		<DebugType>embedded</DebugType>
+	</PropertyGroup>
+
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
+		<DebugType>embedded</DebugType>
+	</PropertyGroup>
 
 </Project>

Source/DataLayer/Configurations/BookConfig.cs

@@ -12,11 +12,13 @@ namespace DataLayer.Configurations
 
             entity.OwnsOne(b => b.Rating);
 
+            entity.Property(nameof(Book._audioFormat));
             //
             // CRUCIAL: ignore unmapped collections, even get-only
             //
             entity.Ignore(nameof(Book.Authors));
             entity.Ignore(nameof(Book.Narrators));
+            entity.Ignore(nameof(Book.AudioFormat));
 			//// these don't seem to matter
 			//entity.Ignore(nameof(Book.AuthorNames));
 			//entity.Ignore(nameof(Book.NarratorNames));

Source/DataLayer/DataLayer.csproj

@@ -1,30 +1,36 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0-windows</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
   </PropertyGroup>
 
   <PropertyGroup>
     <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
-    <ApplicationIcon />
     <OutputType>Library</OutputType>
-    <StartupObject />
   </PropertyGroup>
   
   <ItemGroup>
-    <PackageReference Include="Dinah.EntityFrameworkCore" Version="4.1.0.1" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="6.0.6">
+    <PackageReference Include="Dinah.EntityFrameworkCore" Version="4.1.1.1" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="6.0.7">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="6.0.6" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="6.0.6">
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="6.0.7" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="6.0.7">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
   </ItemGroup>
-  
-  <ItemGroup>
+
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+		<DebugType>embedded</DebugType>
+	</PropertyGroup>
+
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
+		<DebugType>embedded</DebugType>
+	</PropertyGroup>
+
+	<ItemGroup>
     <ProjectReference Include="..\LibationFileManager\LibationFileManager.csproj" />
   </ItemGroup>
   

Source/DataLayer/EfClasses/AudioFormat.cs

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

Source/DataLayer/EfClasses/Book.cs

@@ -25,6 +25,7 @@ namespace DataLayer
         Parent = 4,
     }
 
+
     public class Book
     {
         // implementation detail. set by db only. only used by data layer
@@ -38,6 +39,10 @@ namespace DataLayer
         public ContentType ContentType { get; private set; }
         public string Locale { get; private set; }
 
+        internal AudioFormatEnum _audioFormat;
+
+        public AudioFormat AudioFormat { get => AudioFormat.FromEnum(_audioFormat); set => _audioFormat = value.ToEnum(); }
+
         // mutable
         public string PictureId { get; set; }
         public string PictureLarge { get; set; }

Source/DataLayer/Migrations/20220624214932_AddAudioFormat.Designer.cs

@@ -0,0 +1,397 @@
+// <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("20220624214932_AddAudioFormat")]
+    partial class AddAudioFormat
+    {
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder.HasAnnotation("ProductVersion", "6.0.6");
+
+            modelBuilder.Entity("DataLayer.Book", b =>
+                {
+                    b.Property<int>("BookId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("AudibleProductId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("CategoryId")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("ContentType")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<DateTime?>("DatePublished")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("IsAbridged")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("LengthInMinutes")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Locale")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("PictureId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("PictureLarge")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Title")
+                        .HasColumnType("TEXT");
+
+                    b.Property<long>("_audioFormat")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("BookId");
+
+                    b.HasIndex("AudibleProductId");
+
+                    b.HasIndex("CategoryId");
+
+                    b.ToTable("Books");
+                });
+
+            modelBuilder.Entity("DataLayer.BookContributor", b =>
+                {
+                    b.Property<int>("BookId")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("ContributorId")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("Role")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<byte>("Order")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("BookId", "ContributorId", "Role");
+
+                    b.HasIndex("BookId");
+
+                    b.HasIndex("ContributorId");
+
+                    b.ToTable("BookContributor");
+                });
+
+            modelBuilder.Entity("DataLayer.Category", b =>
+                {
+                    b.Property<int>("CategoryId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("AudibleCategoryId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int?>("ParentCategoryCategoryId")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("CategoryId");
+
+                    b.HasIndex("AudibleCategoryId");
+
+                    b.HasIndex("ParentCategoryCategoryId");
+
+                    b.ToTable("Categories");
+
+                    b.HasData(
+                        new
+                        {
+                            CategoryId = -1,
+                            AudibleCategoryId = "",
+                            Name = ""
+                        });
+                });
+
+            modelBuilder.Entity("DataLayer.Contributor", b =>
+                {
+                    b.Property<int>("ContributorId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("AudibleContributorId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("ContributorId");
+
+                    b.HasIndex("Name");
+
+                    b.ToTable("Contributors");
+
+                    b.HasData(
+                        new
+                        {
+                            ContributorId = -1,
+                            Name = ""
+                        });
+                });
+
+            modelBuilder.Entity("DataLayer.LibraryBook", b =>
+                {
+                    b.Property<int>("BookId")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Account")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("DateAdded")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("BookId");
+
+                    b.ToTable("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("DataLayer.Book", b =>
+                {
+                    b.HasOne("DataLayer.Category", "Category")
+                        .WithMany()
+                        .HasForeignKey("CategoryId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.OwnsOne("DataLayer.Rating", "Rating", b1 =>
+                        {
+                            b1.Property<int>("BookId")
+                                .HasColumnType("INTEGER");
+
+                            b1.Property<float>("OverallRating")
+                                .HasColumnType("REAL");
+
+                            b1.Property<float>("PerformanceRating")
+                                .HasColumnType("REAL");
+
+                            b1.Property<float>("StoryRating")
+                                .HasColumnType("REAL");
+
+                            b1.HasKey("BookId");
+
+                            b1.ToTable("Books");
+
+                            b1.WithOwner()
+                                .HasForeignKey("BookId");
+                        });
+
+                    b.OwnsMany("DataLayer.Supplement", "Supplements", b1 =>
+                        {
+                            b1.Property<int>("SupplementId")
+                                .ValueGeneratedOnAdd()
+                                .HasColumnType("INTEGER");
+
+                            b1.Property<int>("BookId")
+                                .HasColumnType("INTEGER");
+
+                            b1.Property<string>("Url")
+                                .HasColumnType("TEXT");
+
+                            b1.HasKey("SupplementId");
+
+                            b1.HasIndex("BookId");
+
+                            b1.ToTable("Supplement");
+
+                            b1.WithOwner("Book")
+                                .HasForeignKey("BookId");
+
+                            b1.Navigation("Book");
+                        });
+
+                    b.OwnsOne("DataLayer.UserDefinedItem", "UserDefinedItem", b1 =>
+                        {
+                            b1.Property<int>("BookId")
+                                .HasColumnType("INTEGER");
+
+                            b1.Property<int>("BookStatus")
+                                .HasColumnType("INTEGER");
+
+                            b1.Property<int?>("PdfStatus")
+                                .HasColumnType("INTEGER");
+
+                            b1.Property<string>("Tags")
+                                .HasColumnType("TEXT");
+
+                            b1.HasKey("BookId");
+
+                            b1.ToTable("UserDefinedItem", (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("Category");
+
+                    b.Navigation("Rating");
+
+                    b.Navigation("Supplements");
+
+                    b.Navigation("UserDefinedItem");
+                });
+
+            modelBuilder.Entity("DataLayer.BookContributor", b =>
+                {
+                    b.HasOne("DataLayer.Book", "Book")
+                        .WithMany("ContributorsLink")
+                        .HasForeignKey("BookId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("DataLayer.Contributor", "Contributor")
+                        .WithMany("BooksLink")
+                        .HasForeignKey("ContributorId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Book");
+
+                    b.Navigation("Contributor");
+                });
+
+            modelBuilder.Entity("DataLayer.Category", b =>
+                {
+                    b.HasOne("DataLayer.Category", "ParentCategory")
+                        .WithMany()
+                        .HasForeignKey("ParentCategoryCategoryId");
+
+                    b.Navigation("ParentCategory");
+                });
+
+            modelBuilder.Entity("DataLayer.LibraryBook", b =>
+                {
+                    b.HasOne("DataLayer.Book", "Book")
+                        .WithOne()
+                        .HasForeignKey("DataLayer.LibraryBook", "BookId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Book");
+                });
+
+            modelBuilder.Entity("DataLayer.SeriesBook", b =>
+                {
+                    b.HasOne("DataLayer.Book", "Book")
+                        .WithMany("SeriesLink")
+                        .HasForeignKey("BookId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("DataLayer.Series", "Series")
+                        .WithMany("BooksLink")
+                        .HasForeignKey("SeriesId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Book");
+
+                    b.Navigation("Series");
+                });
+
+            modelBuilder.Entity("DataLayer.Book", b =>
+                {
+                    b.Navigation("ContributorsLink");
+
+                    b.Navigation("SeriesLink");
+                });
+
+            modelBuilder.Entity("DataLayer.Contributor", b =>
+                {
+                    b.Navigation("BooksLink");
+                });
+
+            modelBuilder.Entity("DataLayer.Series", b =>
+                {
+                    b.Navigation("BooksLink");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}

Source/DataLayer/Migrations/20220624214932_AddAudioFormat.cs

@@ -0,0 +1,26 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace DataLayer.Migrations
+{
+    public partial class AddAudioFormat : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<long>(
+                name: "_audioFormat",
+                table: "Books",
+                type: "INTEGER",
+                nullable: false,
+                defaultValue: 0L);
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "_audioFormat",
+                table: "Books");
+        }
+    }
+}

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", "6.0.4");
+            modelBuilder.HasAnnotation("ProductVersion", "6.0.6");
 
             modelBuilder.Entity("DataLayer.Book", b =>
                 {
@@ -56,6 +56,9 @@ namespace DataLayer.Migrations
                     b.Property<string>("Title")
                         .HasColumnType("TEXT");
 
+                    b.Property<long>("_audioFormat")
+                        .HasColumnType("INTEGER");
+
                     b.HasKey("BookId");
 
                     b.HasIndex("AudibleProductId");

Source/DataLayer/QueryObjects/LibraryBookQueries.cs

@@ -88,5 +88,13 @@ namespace DataLayer
                         s.Series.AudibleSeriesId == parent.Book.AudibleProductId
                         ) == true
                     ).ToList();
+
+        public static IEnumerable<LibraryBook> UnLiberated(this IEnumerable<LibraryBook> bookList)
+            => bookList
+                .Where(
+                    lb =>
+                        lb.Book.UserDefinedItem.BookStatus is LiberatedStatus.NotLiberated or LiberatedStatus.PartialDownload
+                        || lb.Book.UserDefinedItem.PdfStatus is LiberatedStatus.NotLiberated or LiberatedStatus.PartialDownload
+                    );
     }
 }

Source/DtoImporterService/BookImporter.cs

@@ -101,7 +101,8 @@ namespace DtoImporterService
 			// absence of categories is also possible
 
 			// CATEGORY HACK: only use the 1st 2 categories
-			// (real impl: var lastCategory = item.Categories.LastOrDefault()?.CategoryId ?? "";)
+			// after we support full arbitrary-depth category trees and multiple categories per book, the real impl will be something like this
+			//   var lastCategory = item.Categories.LastOrDefault()?.CategoryId ?? "";
 			var lastCategory
 				= item.Categories.Length == 0 ? ""
 				: item.Categories.Length == 1 ? item.Categories[0].CategoryId
@@ -161,6 +162,9 @@ namespace DtoImporterService
 		{
 			var item = importItem.DtoItem;
 
+			var codec = item.AvailableCodecs?.Max(f => AudioFormat.FromString(f.EnhancedCodec)) ?? new AudioFormat();
+			book.AudioFormat = codec;
+
 			// set/update book-specific info which may have changed
 			if (item.PictureId is not null)
 				book.PictureId = item.PictureId;

Source/DtoImporterService/ContributorImporter.cs

@@ -91,7 +91,7 @@ namespace DtoImporterService
 			return hash.Count;
 		}
 
-        private Contributor addContributor(string name, string id = null)
+		private Contributor addContributor(string name, string id = null)
 		{
 			try
 			{
@@ -108,6 +108,6 @@ namespace DtoImporterService
 				Serilog.Log.Logger.Error(ex, "Error adding contributor. {@DebugInfo}", new { name, id });
 				throw;
 			}
-        }
-    }
+		}
+	}
 }

Source/DtoImporterService/DtoImporterService.csproj

@@ -1,7 +1,15 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0-windows</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+    <DebugType>embedded</DebugType>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
+    <DebugType>embedded</DebugType>
   </PropertyGroup>
 
   <ItemGroup>

Source/DtoImporterService/ImporterBase.cs

@@ -55,7 +55,7 @@ namespace DtoImporterService
 		protected ItemsImporterBase(LibationContext context) : base(context) { }
 
 		protected abstract IValidator Validator { get; }
-        public sealed override IEnumerable<Exception> Validate(IEnumerable<ImportItem> importItems)
+		public sealed override IEnumerable<Exception> Validate(IEnumerable<ImportItem> importItems)
 			=> Validator.Validate(importItems.Select(i => i.DtoItem));
 	}
 }

Source/DtoImporterService/LibraryBookImporter.cs

@@ -49,7 +49,7 @@ namespace DtoImporterService
 			// just use the first
 			var hash = newItems.ToDictionarySafe(dto => dto.DtoItem.ProductId);
 			foreach (var kvp in hash)
-            {
+			{
 				var newItem = kvp.Value;
 
 				var libraryBook = new LibraryBook(

Source/FileLiberator/AudioDecodable.cs

@@ -1,4 +1,7 @@
-using System;
+using LibationFileManager;
+using NAudio.Lame;
+using System;
+using System.Threading.Tasks;
 
 namespace FileLiberator
 {
@@ -10,8 +13,32 @@ namespace FileLiberator
         public event EventHandler<string> AuthorsDiscovered;
         public event EventHandler<string> NarratorsDiscovered;
         public event EventHandler<byte[]> CoverImageDiscovered;
-        public abstract void Cancel();
+        public abstract Task CancelAsync();
 
+        protected LameConfig GetLameOptions(Configuration config)
+        {
+            LameConfig lameConfig = new();
+            lameConfig.Mode = MPEGMode.Mono;
+
+            if (config.LameTargetBitrate)
+            {
+                if (config.LameConstantBitrate)
+                    lameConfig.BitRate = config.LameBitrate;
+                else
+                {
+                    lameConfig.ABRRateKbps = config.LameBitrate;
+                    lameConfig.VBR = VBRMode.ABR;
+                    lameConfig.WriteVBRTag = true;
+                }
+            }
+            else
+            {
+                lameConfig.VBR = VBRMode.Default;
+                lameConfig.VBRQuality = config.LameVBRQuality;
+                lameConfig.WriteVBRTag = true;
+            }
+            return lameConfig;
+        }
         protected void OnTitleDiscovered(string title) => OnTitleDiscovered(null, title);
         protected void OnTitleDiscovered(object _, string title)
 		{

Source/FileLiberator/AudioFileStorageExt.cs

@@ -8,19 +8,6 @@ namespace FileLiberator
 {
 	public static class AudioFileStorageExt
 	{
-		private class MultipartRenamer
-		{
-			private LibraryBook libraryBook { get; }
-
-			internal MultipartRenamer(LibraryBook libraryBook) => this.libraryBook = libraryBook;
-
-			internal string MultipartFilename(AaxDecrypter.MultiConvertFileProperties props)
-				=> Templates.ChapterFile.GetFilename(libraryBook.ToDto(), props);
-		}
-
-		public static Func<AaxDecrypter.MultiConvertFileProperties, string> CreateMultipartRenamerFunc(this AudioFileStorage _, LibraryBook libraryBook)
-			=> new MultipartRenamer(libraryBook).MultipartFilename;
-
 		/// <summary>
 		/// DownloadDecryptBook:
 		/// File path for where to move files into.

Source/FileLiberator/ConvertToMp3.cs

@@ -1,10 +1,10 @@
 using System;
 using System.IO;
+using System.Linq;
 using System.Threading.Tasks;
 using AAXClean;
 using AAXClean.Codecs;
 using DataLayer;
-using Dinah.Core;
 using Dinah.Core.ErrorHandling;
 using Dinah.Core.Net.Http;
 using FileManager;
@@ -12,90 +12,102 @@ using LibationFileManager;
 
 namespace FileLiberator
 {
-    public class ConvertToMp3 : AudioDecodable
-    {
-        public override string Name => "Convert to Mp3";
-        private Mp4File m4bBook;
+	public class ConvertToMp3 : AudioDecodable
+	{
+		public override string Name => "Convert to Mp3";
+		private Mp4File m4bBook;
 
-        private long fileSize;
-        private static string Mp3FileName(string m4bPath) => Path.ChangeExtension(m4bPath ?? "", ".mp3");
+		private long fileSize;
+		private static string Mp3FileName(string m4bPath) => Path.ChangeExtension(m4bPath ?? "", ".mp3");
 
-        private bool cancelled = false;
-        public override void Cancel()
-        {            
-            m4bBook?.Cancel();
-            cancelled = true;
-        }
+		public override Task CancelAsync() => m4bBook?.CancelAsync() ?? Task.CompletedTask;
 
-        public static bool ValidateMp3(LibraryBook libraryBook)
+		public static bool ValidateMp3(LibraryBook libraryBook)
 		{
-            var path = AudibleFileStorage.Audio.GetPath(libraryBook.Book.AudibleProductId);
-            return path?.ToLower()?.EndsWith(".m4b") == true && !File.Exists(Mp3FileName(path));
-        }
+			var paths = AudibleFileStorage.Audio.GetPaths(libraryBook.Book.AudibleProductId);
+			return paths.Any(path => path?.ToString()?.ToLower()?.EndsWith(".m4b") == true && !File.Exists(Mp3FileName(path)));
+		}
 
-        public override bool Validate(LibraryBook libraryBook) => ValidateMp3(libraryBook);
+		public override bool Validate(LibraryBook libraryBook) => ValidateMp3(libraryBook);
 
-        public override async Task<StatusHandler> ProcessAsync(LibraryBook libraryBook)
-        {
-            OnBegin(libraryBook);
+		public override async Task<StatusHandler> ProcessAsync(LibraryBook libraryBook)
+		{
+			OnBegin(libraryBook);
 
-            OnStreamingBegin($"Begin converting {libraryBook} to mp3");
+			try
+			{
+				var m4bPaths = AudibleFileStorage.Audio.GetPaths(libraryBook.Book.AudibleProductId);
 
-            try
-            {
-                var m4bPath = AudibleFileStorage.Audio.GetPath(libraryBook.Book.AudibleProductId);
-                m4bBook = new Mp4File(m4bPath, FileAccess.Read);
-                m4bBook.ConversionProgressUpdate += M4bBook_ConversionProgressUpdate;
+				foreach (var m4bPath in m4bPaths)
+				{
+					var proposedMp3Path = Mp3FileName(m4bPath);
+					if (File.Exists(proposedMp3Path) || !File.Exists(m4bPath)) continue;
 
-                fileSize = m4bBook.InputStream.Length;
+					m4bBook = await Task.Run(() => new Mp4File(m4bPath, FileAccess.Read));
+					m4bBook.ConversionProgressUpdate += M4bBook_ConversionProgressUpdate;
 
-                OnTitleDiscovered(m4bBook.AppleTags.Title);
-                OnAuthorsDiscovered(m4bBook.AppleTags.FirstAuthor);
-                OnNarratorsDiscovered(m4bBook.AppleTags.Narrator);
-                OnCoverImageDiscovered(m4bBook.AppleTags.Cover);
+					fileSize = m4bBook.InputStream.Length;
 
-                using var mp3File = File.OpenWrite(Path.GetTempFileName());
+					OnTitleDiscovered(m4bBook.AppleTags.Title);
+					OnAuthorsDiscovered(m4bBook.AppleTags.FirstAuthor);
+					OnNarratorsDiscovered(m4bBook.AppleTags.Narrator);
+					OnCoverImageDiscovered(m4bBook.AppleTags.Cover);
 
-                var result = await Task.Run(() => m4bBook.ConvertToMp3(mp3File));
-                m4bBook.InputStream.Close();
-                mp3File.Close();
+					var config = Configuration.Instance;
+					var lameConfig = GetLameOptions(config);
 
-                var proposedMp3Path = Mp3FileName(m4bPath);
-                var realMp3Path = FileUtility.SaferMoveToValidPath(mp3File.Name, proposedMp3Path);
-                OnFileCreated(libraryBook, realMp3Path);
+					//Finishing configuring lame encoder.
+					AaxDecrypter.MpegUtil.ConfigureLameOptions(
+						m4bBook,
+						lameConfig,
+						config.LameDownsampleMono,
+						config.LameMatchSourceBR);
 
-                if (result == ConversionResult.Failed)
-                    return new StatusHandler { "Conversion failed" };
-                else if (result == ConversionResult.Cancelled)
-                    return new StatusHandler { "Cancelled" };
-                else
-                    return new StatusHandler();
-            }
-            finally
-            {
-                OnStreamingCompleted($"Completed converting to mp3: {libraryBook.Book.Title}");
-                OnCompleted(libraryBook);
-            }
-        }
+					using var mp3File = File.OpenWrite(Path.GetTempFileName());
+					var result = await m4bBook.ConvertToMp3Async(mp3File, lameConfig);
+					m4bBook.InputStream.Close();
+					mp3File.Close();
 
-        private void M4bBook_ConversionProgressUpdate(object sender, ConversionProgressEventArgs e)
-        {
-            var duration = m4bBook.Duration;
-            var remainingSecsToProcess = (duration - e.ProcessPosition).TotalSeconds;
-            var estTimeRemaining = remainingSecsToProcess / e.ProcessSpeed;
+					if (result == ConversionResult.Failed)
+					{
+						FileUtility.SaferDelete(mp3File.Name);
+						return new StatusHandler { "Conversion failed" };
+					}
+					else if (result == ConversionResult.Cancelled)
+					{
+						FileUtility.SaferDelete(mp3File.Name);
+						return new StatusHandler { "Cancelled" };
+					}
 
-            if (double.IsNormal(estTimeRemaining))
-                OnStreamingTimeRemaining(TimeSpan.FromSeconds(estTimeRemaining));
+					var realMp3Path = FileUtility.SaferMoveToValidPath(mp3File.Name, proposedMp3Path, Configuration.Instance.ReplacementCharacters);
+					OnFileCreated(libraryBook, realMp3Path);
+				}
+				return new StatusHandler();
+			}
+			finally
+			{
+				OnCompleted(libraryBook);
+			}
+		}
 
-            double progressPercent = 100 * e.ProcessPosition.TotalSeconds / duration.TotalSeconds;
+		private void M4bBook_ConversionProgressUpdate(object sender, ConversionProgressEventArgs e)
+		{
+			var duration = m4bBook.Duration;
+			var remainingSecsToProcess = (duration - e.ProcessPosition).TotalSeconds;
+			var estTimeRemaining = remainingSecsToProcess / e.ProcessSpeed;
 
-            OnStreamingProgressChanged(
-                new DownloadProgress
-                {
-                    ProgressPercentage = progressPercent,
-                    BytesReceived = (long)(fileSize * progressPercent),
-                    TotalBytesToReceive = fileSize
-                });
-        }
-    }
+			if (double.IsNormal(estTimeRemaining))
+				OnStreamingTimeRemaining(TimeSpan.FromSeconds(estTimeRemaining));
+
+			double progressPercent = 100 * e.ProcessPosition.TotalSeconds / duration.TotalSeconds;
+
+			OnStreamingProgressChanged(
+				new DownloadProgress
+				{
+					ProgressPercentage = progressPercent,
+					BytesReceived = (long)(fileSize * progressPercent),
+					TotalBytesToReceive = fileSize
+				});
+		}
+	}
 }

Source/FileLiberator/DownloadDecryptBook.cs

@@ -14,251 +14,345 @@ using LibationFileManager;
 
 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 AudiobookDownloadBase abDownloader;
 
-        public override bool Validate(LibraryBook libraryBook) => !libraryBook.Book.Audio_Exists();
+		public override bool Validate(LibraryBook libraryBook) => !libraryBook.Book.Audio_Exists();
 
-        public override void Cancel() => abDownloader?.Cancel();
+		public override Task CancelAsync() => abDownloader?.CancelAsync() ?? Task.CompletedTask;
 
-        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);
-            }
-
-            OnBegin(libraryBook);
-
-            try
-            {
-                if (libraryBook.Book.Audio_Exists())
-                    return new StatusHandler { "Cannot find decrypt. Final audio file already exists" };
-
-                bool success = false;
-                try
-                {
-                    FilePathCache.Inserted += FilePathCache_Inserted;
-                    FilePathCache.Removed += FilePathCache_Removed;
-
-                    success = await downloadAudiobookAsync(libraryBook);
-                }
-                finally
-                {
-                    FilePathCache.Inserted -= FilePathCache_Inserted;
-                    FilePathCache.Removed -= FilePathCache_Removed;
-                }
-
-                // decrypt failed
-                if (!success)
-                {
-                    foreach (var tmpFile in entries.Where(f => f.FileType != FileType.AAXC))
-                        FileUtility.SaferDelete(tmpFile.Path);
-
-                    return abDownloader?.IsCanceled == true ?
-                        new StatusHandler { "Cancelled" } : 
-                        new StatusHandler { "Decrypt failed" };
-                }
-
-                // moves new files from temp dir to final dest.
-                // This could take a few seconds if moving hundreds of files.
-                var movedAudioFile = await Task.Run(() => moveFilesToBooksDir(libraryBook, entries));
-
-                // decrypt failed
-                if (!movedAudioFile)
-                    return new StatusHandler { "Cannot find final audio file after decryption" };
-
-                if (Configuration.Instance.DownloadCoverArt)
-                    DownloadCoverArt(libraryBook);
-
-                libraryBook.Book.UpdateBookStatus(LiberatedStatus.Liberated);
-
-                return new StatusHandler();
-            }
-            finally
-            {
-                OnCompleted(libraryBook);
-            }
-        }
-
-        private async Task<bool> downloadAudiobookAsync(LibraryBook libraryBook)
-        {
-            OnStreamingBegin($"Begin decrypting {libraryBook}");
-
-            try
-            {
-                var config = Configuration.Instance;
-
-                downloadValidation(libraryBook);
-
-                var api = await libraryBook.GetApiAsync();
-                var contentLic = await api.GetDownloadLicenseAsync(libraryBook.Book.AudibleProductId);
-                var audiobookDlLic = BuildDownloadOptions(config, contentLic);
-
-                var outFileName = AudibleFileStorage.Audio.GetInProgressFilename(libraryBook, audiobookDlLic.OutputFormat.ToString().ToLower());
-                var cacheDir = AudibleFileStorage.DownloadsInProgressDirectory;
-
-                if (contentLic.DrmType != AudibleApi.Common.DrmType.Adrm)
-                    abDownloader = new UnencryptedAudiobookDownloader(outFileName, cacheDir, audiobookDlLic);
-                else
-                {
-                    AaxcDownloadConvertBase converter
-                        = config.SplitFilesByChapter ? new AaxcDownloadMultiConverter(
-                            outFileName, cacheDir, audiobookDlLic,
-                            AudibleFileStorage.Audio.CreateMultipartRenamerFunc(libraryBook))
-                        : new AaxcDownloadSingleConverter(outFileName, cacheDir, audiobookDlLic);
-
-                    if (config.AllowLibationFixup)
-                        converter.RetrievedMetadata += (_, tags) => tags.Generes = string.Join(", ", libraryBook.Book.CategoriesNames());
-
-                    abDownloader = converter;
-                }
-
-                abDownloader.DecryptProgressUpdate += OnStreamingProgressChanged;
-                abDownloader.DecryptTimeRemaining += OnStreamingTimeRemaining;
-                abDownloader.RetrievedTitle += OnTitleDiscovered;
-                abDownloader.RetrievedAuthors += OnAuthorsDiscovered;
-                abDownloader.RetrievedNarrators += OnNarratorsDiscovered;
-                abDownloader.RetrievedCoverArt += AaxcDownloader_RetrievedCoverArt;
-                abDownloader.FileCreated += (_, path) => OnFileCreated(libraryBook, path);
-
-                // REAL WORK DONE HERE
-                var success = await Task.Run(abDownloader.Run);
-
-                return success;
-            }
-            finally
-            {
-                OnStreamingCompleted($"Completed downloading and decrypting {libraryBook.Book.Title}");
-            }
-        }
-
-        private static DownloadOptions BuildDownloadOptions(Configuration config, AudibleApi.Common.ContentLicense contentLic)
-        {
-            //I assume if ContentFormat == "MPEG" that the delivered file is an unencrypted mp3.
-            //I also assume that if DrmType != Adrm, the file will be an mp3.
-            //These assumptions may be wrong, and only time and bug reports will tell.
-
-            bool encrypted = contentLic.DrmType == AudibleApi.Common.DrmType.Adrm;
-
-            var outputFormat = !encrypted || (config.AllowLibationFixup && config.DecryptToLossy) ?
-                     OutputFormat.Mp3 : OutputFormat.M4b;
-
-            var audiobookDlLic = new DownloadOptions
-                 (
-                 contentLic?.ContentMetadata?.ContentUrl?.OfflineUrl,
-                 Resources.USER_AGENT
-                 )
-            {
-                AudibleKey = contentLic?.Voucher?.Key,
-                AudibleIV = contentLic?.Voucher?.Iv,
-                OutputFormat = outputFormat,
-                TrimOutputToChapterLength = config.AllowLibationFixup && config.StripAudibleBrandAudio,
-                RetainEncryptedFile = config.RetainAaxFile && encrypted,
-                StripUnabridged = config.AllowLibationFixup && config.StripUnabridged,
-                Downsample = config.AllowLibationFixup && config.LameDownsampleMono,
-                MatchSourceBitrate = config.AllowLibationFixup && config.LameMatchSourceBR && config.LameTargetBitrate,
-                CreateCueSheet = config.CreateCueSheet
-            };
-
-            if (config.AllowLibationFixup || outputFormat == OutputFormat.Mp3)
-            {
-
-                long startMs = audiobookDlLic.TrimOutputToChapterLength ?
-                    contentLic.ContentMetadata.ChapterInfo.BrandIntroDurationMs : 0;
-
-                audiobookDlLic.ChapterInfo = new AAXClean.ChapterInfo(TimeSpan.FromMilliseconds(startMs));
-
-                for (int i = 0; i < contentLic.ContentMetadata.ChapterInfo.Chapters.Length; i++)
-                {
-                    var chapter = contentLic.ContentMetadata.ChapterInfo.Chapters[i];
-                    long chapLenMs = chapter.LengthMs;
-
-                    if (i == 0)
-                        chapLenMs -= startMs;
-
-                    if (config.StripAudibleBrandAudio && i == contentLic.ContentMetadata.ChapterInfo.Chapters.Length - 1)
-                        chapLenMs -= contentLic.ContentMetadata.ChapterInfo.BrandOutroDurationMs;
-
-                    audiobookDlLic.ChapterInfo.AddChapter(chapter.Title, TimeSpan.FromMilliseconds(chapLenMs));
-                }
-            }
-
-            audiobookDlLic.LameConfig = new();
-            audiobookDlLic.LameConfig.Mode = NAudio.Lame.MPEGMode.Mono;
-
-            if (config.LameTargetBitrate)
+		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 (config.LameConstantBitrate)
-                    audiobookDlLic.LameConfig.BitRate = config.LameBitrate;
-                else
-                {
-                    audiobookDlLic.LameConfig.ABRRateKbps = config.LameBitrate;
-                    audiobookDlLic.LameConfig.VBR = NAudio.Lame.VBRMode.ABR;
-                    audiobookDlLic.LameConfig.WriteVBRTag = true;
-                }
+				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);
+			}
+
+			OnBegin(libraryBook);
+
+			try
+			{
+				if (libraryBook.Book.Audio_Exists())
+					return new StatusHandler { "Cannot find decrypt. Final audio file already exists" };
+
+				bool success = false;
+				try
+				{
+					FilePathCache.Inserted += FilePathCache_Inserted;
+					FilePathCache.Removed += FilePathCache_Removed;
+
+					success = await downloadAudiobookAsync(libraryBook);
+				}
+				finally
+				{
+					FilePathCache.Inserted -= FilePathCache_Inserted;
+					FilePathCache.Removed -= FilePathCache_Removed;
+				}
+
+				// decrypt failed
+				if (!success)
+				{
+					foreach (var tmpFile in entries.Where(f => f.FileType != FileType.AAXC))
+						FileUtility.SaferDelete(tmpFile.Path);
+
+					return abDownloader?.IsCanceled == true ?
+						new StatusHandler { "Cancelled" } : 
+						new StatusHandler { "Decrypt failed" };
+				}
+
+				// moves new files from temp dir to final dest.
+				// This could take a few seconds if moving hundreds of files.
+				var movedAudioFile = await Task.Run(() => moveFilesToBooksDir(libraryBook, entries));
+
+				// decrypt failed
+				if (!movedAudioFile)
+					return new StatusHandler { "Cannot find final audio file after decryption" };
+
+				if (Configuration.Instance.DownloadCoverArt)
+					DownloadCoverArt(libraryBook);
+
+				libraryBook.Book.UpdateBookStatus(LiberatedStatus.Liberated);
+
+				return new StatusHandler();
+			}
+			finally
+			{
+				OnCompleted(libraryBook);
+			}
+		}
+
+		private async Task<bool> downloadAudiobookAsync(LibraryBook libraryBook)
+		{
+			var config = Configuration.Instance;
+
+			downloadValidation(libraryBook);
+
+			var api = await libraryBook.GetApiAsync();
+			var contentLic = await api.GetDownloadLicenseAsync(libraryBook.Book.AudibleProductId);
+			var dlOptions = BuildDownloadOptions(libraryBook, config, contentLic);
+
+			var outFileName = AudibleFileStorage.Audio.GetInProgressFilename(libraryBook, dlOptions.OutputFormat.ToString().ToLower());
+			var cacheDir = AudibleFileStorage.DownloadsInProgressDirectory;
+
+			if (contentLic.DrmType != AudibleApi.Common.DrmType.Adrm)
+				abDownloader = new UnencryptedAudiobookDownloader(outFileName, cacheDir, dlOptions);
 			else
 			{
-                audiobookDlLic.LameConfig.VBR = NAudio.Lame.VBRMode.Default;
-                audiobookDlLic.LameConfig.VBRQuality = config.LameVBRQuality;
-                audiobookDlLic.LameConfig.WriteVBRTag = true;
-            }
+				AaxcDownloadConvertBase converter
+					= config.SplitFilesByChapter ? 
+					new AaxcDownloadMultiConverter(outFileName, cacheDir, dlOptions) :
+					new AaxcDownloadSingleConverter(outFileName, cacheDir, dlOptions);
 
-            return audiobookDlLic;
-        }
+				if (config.AllowLibationFixup)
+					converter.RetrievedMetadata += (_, tags) => tags.Generes = string.Join(", ", libraryBook.Book.CategoriesNames());
 
-        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.";
+				abDownloader = converter;
+			}
 
-            string errorTitle()
-            {
-                var title
-                    = (libraryBook.Book.Title.Length > 53)
-                    ? $"{libraryBook.Book.Title.Truncate(50)}..."
-                    : libraryBook.Book.Title;
-                var errorBookTitle = $"{title} [{libraryBook.Book.AudibleProductId}]";
-                return errorBookTitle;
-            };
+			abDownloader.DecryptProgressUpdate += OnStreamingProgressChanged;
+			abDownloader.DecryptTimeRemaining += OnStreamingTimeRemaining;
+			abDownloader.RetrievedTitle += OnTitleDiscovered;
+			abDownloader.RetrievedAuthors += OnAuthorsDiscovered;
+			abDownloader.RetrievedNarrators += OnNarratorsDiscovered;
+			abDownloader.RetrievedCoverArt += AaxcDownloader_RetrievedCoverArt;
+			abDownloader.FileCreated += (_, path) => OnFileCreated(libraryBook, path);
 
-            if (string.IsNullOrWhiteSpace(libraryBook.Account))
-                throw new Exception(errorString("Account"));
+			// REAL WORK DONE HERE
+			var success = await abDownloader.RunAsync();
 
-            if (string.IsNullOrWhiteSpace(libraryBook.Book.Locale))
-                throw new Exception(errorString("Locale"));
-        }
+			return success;
+		}
 
-        private void AaxcDownloader_RetrievedCoverArt(object _, byte[] e)
-        {
-            if (e is not null)
-                OnCoverImageDiscovered(e);
-            else if (Configuration.Instance.AllowLibationFixup)
-                abDownloader.SetCoverArt(OnRequestCoverArt());
-        }
+		private DownloadOptions BuildDownloadOptions(LibraryBook libraryBook, Configuration config, AudibleApi.Common.ContentLicense contentLic)
+		{
+			//I assume if ContentFormat == "MPEG" that the delivered file is an unencrypted mp3.
+			//I also assume that if DrmType != Adrm, the file will be an mp3.
+			//These assumptions may be wrong, and only time and bug reports will tell.
 
-        /// <summary>Move new files to 'Books' directory</summary>
-        /// <returns>True if audiobook file(s) were successfully created and can be located on disk. Else false.</returns>
-        private static bool moveFilesToBooksDir(LibraryBook libraryBook, List<FilePathCache.CacheEntry> entries)
-        {
-            // create final directory. move each file into it
-            var destinationDir = AudibleFileStorage.Audio.GetDestinationDirectory(libraryBook);
-            Directory.CreateDirectory(destinationDir);
+			bool encrypted = contentLic.DrmType == AudibleApi.Common.DrmType.Adrm;
 
-            FilePathCache.CacheEntry getFirstAudio() => entries.FirstOrDefault(f => f.FileType == FileType.Audio);
+			var outputFormat = !encrypted || (config.AllowLibationFixup && config.DecryptToLossy) ?
+					 OutputFormat.Mp3 : OutputFormat.M4b;
+
+			long chapterStartMs = config.StripAudibleBrandAudio ?
+				contentLic.ContentMetadata.ChapterInfo.BrandIntroDurationMs : 0;
+
+			var dlOptions = new DownloadOptions
+				 (
+					libraryBook,
+					contentLic?.ContentMetadata?.ContentUrl?.OfflineUrl,
+					Resources.USER_AGENT
+				 )
+			{
+				AudibleKey = contentLic?.Voucher?.Key,
+				AudibleIV = contentLic?.Voucher?.Iv,
+				OutputFormat = outputFormat,
+				TrimOutputToChapterLength = config.AllowLibationFixup && config.StripAudibleBrandAudio,
+				RetainEncryptedFile = config.RetainAaxFile && encrypted,
+				StripUnabridged = config.AllowLibationFixup && config.StripUnabridged,
+				Downsample = config.AllowLibationFixup && config.LameDownsampleMono,
+				MatchSourceBitrate = config.AllowLibationFixup && config.LameMatchSourceBR && config.LameTargetBitrate,
+				CreateCueSheet = config.CreateCueSheet,
+				LameConfig = GetLameOptions(config),
+				ChapterInfo = new AAXClean.ChapterInfo(TimeSpan.FromMilliseconds(chapterStartMs)),
+				FixupFile = config.AllowLibationFixup
+			};
+
+			var chapters = flattenChapters(contentLic.ContentMetadata.ChapterInfo.Chapters).OrderBy(c => c.StartOffsetMs).ToList();
+
+			if (config.MergeOpeningAndEndCredits)
+				combineCredits(chapters);
+
+			for (int i = 0; i < chapters.Count; i++)
+			{
+				var chapter = chapters[i];
+				long chapLenMs = chapter.LengthMs;
+
+				if (i == 0)
+					chapLenMs -= chapterStartMs;
+
+				if (config.StripAudibleBrandAudio && i == chapters.Count - 1)
+					chapLenMs -= contentLic.ContentMetadata.ChapterInfo.BrandOutroDurationMs;
+
+				dlOptions.ChapterInfo.AddChapter(chapter.Title, TimeSpan.FromMilliseconds(chapLenMs));
+			}
+
+			return dlOptions;
+		}
+
+		/*
+
+		Flatten Audible's new hierarchical chapters, combining children into parents.
+
+		Audible may deliver chapters like this:
+
+		00:00 - 00:10	Opening Credits
+		00:10 - 00:12	Book 1
+		00:12 - 00:14	|	Part 1
+		00:14 - 01:40	|	|	Chapter 1
+		01:40 - 03:20	|	|	Chapter 2
+		03:20 - 03:22	|	Part 2
+		03:22 - 05:00	|	|	Chapter 3
+		05:00 - 06:40	|	|	Chapter 4
+		06:40 - 06:42	Book 2
+		06:42 - 06:44	|	Part 3
+		06:44 - 08:20	|	|	Chapter 5
+		08:20 - 10:00	|	|	Chapter 6
+		10:00 - 10:02	|	Part 4
+		10:02 - 11:40	|	|	Chapter 7
+		11:40 - 13:20	|	|	Chapter 8
+		13:20 - 13:30	End Credits
+
+		And flattenChapters will combine them into this:
+
+		00:00 - 00:10	Opening Credits
+		00:10 - 01:40	Book 1: Part 1: Chapter 1
+		01:40 - 03:20	Book 1: Part 1: Chapter 2
+		03:20 - 05:00	Book 1: Part 2: Chapter 3
+		05:00 - 06:40	Book 1: Part 2: Chapter 4
+		06:40 - 08:20	Book 2: Part 3: Chapter 5
+		08:20 - 10:00	Book 2: Part 3: Chapter 6
+		10:00 - 11:40	Book 2: Part 4: Chapter 7
+		11:40 - 13:20	Book 2: Part 4: Chapter 8
+		13:20 - 13:40	End Credits
+
+		However, if one of the parent chapters is longer than 10000 milliseconds, it's kept as its own
+		chapter. A duration longer than a few seconds implies that the chapter contains more than just
+		the narrator saying the chapter title, so it should probably be preserved as a separate chapter.
+		Using the example above, if "Book 1" was 15 seconds long and "Part 3" was 20 seconds long:
+
+		00:00 - 00:10	Opening Credits
+		00:10 - 00:25	Book 1
+		00:25 - 00:27	|	Part 1
+		00:27 - 01:40	|	|	Chapter 1
+		01:40 - 03:20	|	|	Chapter 2
+		03:20 - 03:22	|	Part 2
+		03:22 - 05:00	|	|	Chapter 3
+		05:00 - 06:40	|	|	Chapter 4
+		06:40 - 06:42	Book 2
+		06:42 - 07:02	|	Part 3
+		07:02 - 08:20	|	|	Chapter 5
+		08:20 - 10:00	|	|	Chapter 6
+		10:00 - 10:02	|	Part 4
+		10:02 - 11:40	|	|	Chapter 7
+		11:40 - 13:20	|	|	Chapter 8
+		13:20 - 13:30	End Credits
+
+		then flattenChapters will combine them into this:
+
+		00:00 - 00:10	Opening Credits
+		00:10 - 00:25	Book 1
+		00:25 - 01:40	Book 1: Part 1: Chapter 1
+		01:40 - 03:20	Book 1: Part 1: Chapter 2
+		03:20 - 05:00	Book 1: Part 2: Chapter 3
+		05:00 - 06:40	Book 1: Part 2: Chapter 4
+		06:40 - 07:02	Book 2: Part 3
+		07:02 - 08:20	Book 2: Part 3: Chapter 5
+		08:20 - 10:00	Book 2: Part 3: Chapter 6
+		10:00 - 11:40	Book 2: Part 4: Chapter 7
+		11:40 - 13:20	Book 2: Part 4: Chapter 8
+		13:20 - 13:40	End Credits
+
+		*/
+
+		public static List<AudibleApi.Common.Chapter> flattenChapters(IList<AudibleApi.Common.Chapter> chapters, string titleConcat = ": ")
+		{
+			List<AudibleApi.Common.Chapter> chaps = new();
+
+			foreach (var c in chapters)
+			{
+				if (c.Chapters is not null)
+				{
+					if (c.LengthMs < 10000)
+					{
+						c.Chapters[0].StartOffsetMs = c.StartOffsetMs;
+						c.Chapters[0].StartOffsetSec = c.StartOffsetSec;
+						c.Chapters[0].LengthMs += c.LengthMs;
+					}
+					else
+						chaps.Add(c);
+
+					var children = flattenChapters(c.Chapters);
+
+					foreach (var child in children)
+						child.Title = $"{c.Title}{titleConcat}{child.Title}";
+
+					chaps.AddRange(children);
+					c.Chapters = null;
+				}
+				else
+					chaps.Add(c);
+			}
+			return chaps;
+		}
+
+		public static void combineCredits(IList<AudibleApi.Common.Chapter> chapters)
+		{
+			if (chapters.Count > 1 && chapters[0].Title == "Opening Credits")
+			{
+				chapters[1].StartOffsetMs = chapters[0].StartOffsetMs;
+				chapters[1].StartOffsetSec = chapters[0].StartOffsetSec;
+				chapters[1].LengthMs += chapters[0].LengthMs;
+				chapters.RemoveAt(0);
+			}
+			if (chapters.Count > 1 && chapters[^1].Title == "End Credits")
+			{
+				chapters[^2].LengthMs += chapters[^1].LengthMs;
+				chapters.Remove(chapters[^1]);
+			}
+		}		
+
+		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.Title.Length > 53)
+					? $"{libraryBook.Book.Title.Truncate(50)}..."
+					: libraryBook.Book.Title;
+				var errorBookTitle = $"{title} [{libraryBook.Book.AudibleProductId}]";
+				return errorBookTitle;
+			};
+
+			if (string.IsNullOrWhiteSpace(libraryBook.Account))
+				throw new Exception(errorString("Account"));
+
+			if (string.IsNullOrWhiteSpace(libraryBook.Book.Locale))
+				throw new Exception(errorString("Locale"));
+		}
+
+		private void AaxcDownloader_RetrievedCoverArt(object _, byte[] e)
+		{
+			if (e is not null)
+				OnCoverImageDiscovered(e);
+			else if (Configuration.Instance.AllowLibationFixup)
+				abDownloader.SetCoverArt(OnRequestCoverArt());
+		}
+
+		/// <summary>Move new files to 'Books' directory</summary>
+		/// <returns>True if audiobook file(s) were successfully created and can be located on disk. Else false.</returns>
+		private static bool moveFilesToBooksDir(LibraryBook libraryBook, List<FilePathCache.CacheEntry> entries)
+		{
+			// create final directory. move each file into it
+			var destinationDir = AudibleFileStorage.Audio.GetDestinationDirectory(libraryBook);
+			Directory.CreateDirectory(destinationDir);
+
+			FilePathCache.CacheEntry getFirstAudio() => entries.FirstOrDefault(f => f.FileType == FileType.Audio);
 
 			if (getFirstAudio() == default)
 				return false;
@@ -267,10 +361,10 @@ namespace FileLiberator
 			{
 				var entry = entries[i];
 
-				var realDest = FileUtility.SaferMoveToValidPath(entry.Path, Path.Combine(destinationDir, Path.GetFileName(entry.Path)));
+				var realDest = FileUtility.SaferMoveToValidPath(entry.Path, Path.Combine(destinationDir, Path.GetFileName(entry.Path)), Configuration.Instance.ReplacementCharacters);
 				FilePathCache.Insert(libraryBook.Book.AudibleProductId, realDest);
 
-				// propogate corrected path. Must update cache with corrected path. Also want updated path for cue file (after this for-loop)
+				// 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 };
 			}
 
@@ -283,33 +377,33 @@ namespace FileLiberator
 			return true;
 		}
 
-        private void DownloadCoverArt(LibraryBook libraryBook)
+		private void DownloadCoverArt(LibraryBook libraryBook)
 		{
-            var destinationDir = AudibleFileStorage.Audio.GetDestinationDirectory(libraryBook);
-            var coverPath = AudibleFileStorage.Audio.GetBooksDirectoryFilename(libraryBook, ".jpg");
-            coverPath = Path.Combine(destinationDir, Path.GetFileName(coverPath));
+			var destinationDir = AudibleFileStorage.Audio.GetDestinationDirectory(libraryBook);
+			var coverPath = AudibleFileStorage.Audio.GetBooksDirectoryFilename(libraryBook, ".jpg");
+			coverPath = Path.Combine(destinationDir, Path.GetFileName(coverPath));
 
-            try
-            {
-                if (File.Exists(coverPath)) 
-                    FileUtility.SaferDelete(coverPath);
+			try
+			{
+				if (File.Exists(coverPath)) 
+					FileUtility.SaferDelete(coverPath);
 
-                (string picId, PictureSize size) = libraryBook.Book.PictureLarge is null ?
-                    (libraryBook.Book.PictureId, PictureSize.Native) :
-                    (libraryBook.Book.PictureLarge, PictureSize.Native);
+				(string picId, PictureSize size) = libraryBook.Book.PictureLarge is null ?
+					(libraryBook.Book.PictureId, PictureSize.Native) :
+					(libraryBook.Book.PictureLarge, PictureSize.Native);
 
-                var picBytes = PictureStorage.GetPictureSynchronously(new PictureDefinition(picId, size));
-                
-                if (picBytes.Length > 0)
-                    File.WriteAllBytes(coverPath, picBytes);
-            }
-            catch (Exception ex)
-            {
-                //Failure to download cover art should not be
-                //considered a failure to download the book
-                Serilog.Log.Logger.Error(ex, $"Error downloading cover art of {libraryBook.Book.AudibleProductId} to {coverPath} catalog product.");
-            }
-        }
+				var picBytes = PictureStorage.GetPictureSynchronously(new PictureDefinition(picId, size));
+				
+				if (picBytes.Length > 0)
+					File.WriteAllBytes(coverPath, picBytes);
+			}
+			catch (Exception ex)
+			{
+				//Failure to download cover art should not be
+				//considered a failure to download the book
+				Serilog.Log.Logger.Error(ex, $"Error downloading cover art of {libraryBook.Book.AudibleProductId} to {coverPath} catalog product.");
+			}
+		}
 
 	}
 }

Source/FileLiberator/DownloadOptions.cs

@@ -0,0 +1,47 @@
+using AaxDecrypter;
+using AAXClean;
+using Dinah.Core;
+using DataLayer;
+using LibationFileManager;
+using FileManager;
+
+namespace FileLiberator
+{
+    public class DownloadOptions : IDownloadOptions
+    {
+        public LibraryBook LibraryBook { get; }
+        public LibraryBookDto LibraryBookDto { get; }
+        public string DownloadUrl { get; }
+        public string UserAgent { get; }
+        public string AudibleKey { get; init; }
+        public string AudibleIV { get; init; }
+        public AaxDecrypter.OutputFormat OutputFormat { get; init; }
+        public bool TrimOutputToChapterLength { get; init; }
+        public bool RetainEncryptedFile { get; init; }
+        public bool StripUnabridged { get; init; }
+        public bool CreateCueSheet { get; init; }
+        public ChapterInfo ChapterInfo { get; init; }
+        public bool FixupFile { get; init; }
+        public NAudio.Lame.LameConfig LameConfig { get; init; }
+        public bool Downsample { get; init; }
+        public bool MatchSourceBitrate { get; init; }
+        public ReplacementCharacters ReplacementCharacters => Configuration.Instance.ReplacementCharacters;
+
+        public string GetMultipartFileName(MultiConvertFileProperties props)
+            => Templates.ChapterFile.GetFilename(LibraryBookDto, props);
+
+        public string GetMultipartTitleName(MultiConvertFileProperties props)
+            => Templates.ChapterTitle.GetTitle(LibraryBookDto, props);
+
+        public DownloadOptions(LibraryBook libraryBook, string downloadUrl, string userAgent)
+        {
+            LibraryBook = ArgumentValidator.EnsureNotNull(libraryBook, nameof(libraryBook));
+            DownloadUrl = ArgumentValidator.EnsureNotNullOrEmpty(downloadUrl, nameof(downloadUrl));
+            UserAgent = ArgumentValidator.EnsureNotNullOrEmpty(userAgent, nameof(userAgent));
+
+            LibraryBookDto = LibraryBook.ToDto();
+
+            // no null/empty check for key/iv. unencrypted files do not have them
+        }
+    }
+}

Source/FileLiberator/DownloadPdf.cs

@@ -57,27 +57,18 @@ namespace FileLiberator
 
 		private async Task<string> downloadPdfAsync(LibraryBook libraryBook, string proposedDownloadFilePath)
 		{
-			OnStreamingBegin(proposedDownloadFilePath);
+			var api = await libraryBook.GetApiAsync();
+			var downloadUrl = await api.GetPdfDownloadLinkAsync(libraryBook.Book.AudibleProductId);
 
-			try
-			{
-				var api = await libraryBook.GetApiAsync();
-				var downloadUrl = await api.GetPdfDownloadLinkAsync(libraryBook.Book.AudibleProductId);
+			var progress = new Progress<DownloadProgress>(OnStreamingProgressChanged);
 
-				var progress = new Progress<DownloadProgress>(OnStreamingProgressChanged);
+			var client = new HttpClient();
 
-				var client = new HttpClient();
+			var actualDownloadedFilePath = await client.DownloadFileAsync(downloadUrl, proposedDownloadFilePath, progress);
+			OnFileCreated(libraryBook, actualDownloadedFilePath);
 
-				var actualDownloadedFilePath = await client.DownloadFileAsync(downloadUrl, proposedDownloadFilePath, progress);
-				OnFileCreated(libraryBook, actualDownloadedFilePath);
-
-				OnStatusUpdate(actualDownloadedFilePath);
-				return actualDownloadedFilePath;
-			}
-			finally
-			{
-				OnStreamingCompleted(proposedDownloadFilePath);
-			}
+			OnStatusUpdate(actualDownloadedFilePath);
+			return actualDownloadedFilePath;
 		}
 
 		private static StatusHandler verifyDownload(string actualDownloadedFilePath)

Source/FileLiberator/FileLiberator.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0-windows</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
@@ -11,4 +11,13 @@
     <ProjectReference Include="..\AudibleUtilities\AudibleUtilities.csproj" />
   </ItemGroup>
 
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+		<DebugType>embedded</DebugType>
+	</PropertyGroup>
+
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
+		<DebugType>embedded</DebugType>
+	</PropertyGroup>
+
+
 </Project>

Source/FileLiberator/Processable.cs

@@ -5,17 +5,22 @@ using System.Threading.Tasks;
 using DataLayer;
 using Dinah.Core;
 using Dinah.Core.ErrorHandling;
+using Dinah.Core.Net.Http;
 using LibationFileManager;
 
 namespace FileLiberator
 {
-    public abstract class Processable : Streamable
+    public abstract class Processable
     {
         public abstract string Name { get; }
         public event EventHandler<LibraryBook> Begin;
 
         /// <summary>General string message to display. DON'T rely on this for success, failure, or control logic</summary>
         public event EventHandler<string> StatusUpdate;
+        /// <summary>Fired when a file is successfully saved to disk</summary>
+        public event EventHandler<(string id, string path)> FileCreated;
+        public event EventHandler<DownloadProgress> StreamingProgressChanged;
+        public event EventHandler<TimeSpan> StreamingTimeRemaining;
 
         public event EventHandler<LibraryBook> Completed;
 
@@ -69,6 +74,23 @@ namespace FileLiberator
             StatusUpdate?.Invoke(this, statusUpdate);
         }
 
+        protected void OnFileCreated(LibraryBook libraryBook, string path)
+        {
+            Serilog.Log.Logger.Information("File created {@DebugInfo}", new { Name = nameof(FileCreated), libraryBook.Book.AudibleProductId, path });
+            FilePathCache.Insert(libraryBook.Book.AudibleProductId, path);
+            FileCreated?.Invoke(this, (libraryBook.Book.AudibleProductId, path));
+        }
+
+        protected void OnStreamingProgressChanged(DownloadProgress progress)
+            => OnStreamingProgressChanged(null, progress);
+        protected void OnStreamingProgressChanged(object _, DownloadProgress progress)
+            => StreamingProgressChanged?.Invoke(this, progress);
+
+        protected void OnStreamingTimeRemaining(TimeSpan timeRemaining)
+            => OnStreamingTimeRemaining(null, timeRemaining);
+        protected void OnStreamingTimeRemaining(object _, TimeSpan timeRemaining)
+            => StreamingTimeRemaining?.Invoke(this, timeRemaining);
+
         protected void OnCompleted(LibraryBook libraryBook)
         {
             Serilog.Log.Logger.Debug("Event fired {@DebugInfo}", new { Name = nameof(Completed), Book = libraryBook.LogFriendly() });

Source/FileLiberator/Streamable.cs

@@ -1,47 +0,0 @@
-using System;
-using Dinah.Core.Net.Http;
-
-namespace FileLiberator
-{
-    public abstract class Streamable
-    {
-        public event EventHandler<string> StreamingBegin;
-        public event EventHandler<DownloadProgress> StreamingProgressChanged;
-        public event EventHandler<TimeSpan> StreamingTimeRemaining;
-        public event EventHandler<string> StreamingCompleted;
-        /// <summary>Fired when a file is successfully saved to disk</summary>
-        public event EventHandler<(string id, string path)> FileCreated;
-
-        protected void OnStreamingBegin(string filePath)
-        {
-            Serilog.Log.Logger.Debug("Event fired {@DebugInfo}", new { Name = nameof(StreamingBegin), Message = filePath });
-            StreamingBegin?.Invoke(this, filePath);
-        }
-
-        protected void OnStreamingProgressChanged(DownloadProgress progress) => OnStreamingProgressChanged(null, progress);
-        protected void OnStreamingProgressChanged(object _, DownloadProgress progress)
-        {
-            StreamingProgressChanged?.Invoke(this, progress);
-        }
-
-        protected void OnStreamingTimeRemaining(TimeSpan timeRemaining) => OnStreamingTimeRemaining(null, timeRemaining);
-        protected void OnStreamingTimeRemaining(object _, TimeSpan timeRemaining)
-        {
-            StreamingTimeRemaining?.Invoke(this, timeRemaining);
-        }
-
-        protected void OnStreamingCompleted(string filePath)
-        {
-            Serilog.Log.Logger.Debug("Event fired {@DebugInfo}", new { Name = nameof(StreamingCompleted), Message = filePath });
-            StreamingCompleted?.Invoke(this, filePath);
-        }
-
-        protected void OnFileCreated(DataLayer.LibraryBook libraryBook, string path) => OnFileCreated(libraryBook.Book.AudibleProductId, path);
-        protected void OnFileCreated(string id, string path)
-        {
-            Serilog.Log.Logger.Information("File created {@DebugInfo}", new { Name = nameof(FileCreated), id, path });
-            LibationFileManager.FilePathCache.Insert(id, path);
-            FileCreated?.Invoke(this, (id, path));
-        }
-    }
-}

Source/FileLiberator/UtilityExtensions.cs

@@ -37,7 +37,11 @@ namespace FileLiberator
 			Narrators = libraryBook.Book.Narrators.Select(c => c.Name).ToList(),
 
 			SeriesName = libraryBook.Book.SeriesLink.FirstOrDefault()?.Series.Name,
-			SeriesNumber = libraryBook.Book.SeriesLink.FirstOrDefault()?.Order
+			SeriesNumber = libraryBook.Book.SeriesLink.FirstOrDefault()?.Order,
+
+			BitRate = libraryBook.Book.AudioFormat.Bitrate,
+			SampleRate = libraryBook.Book.AudioFormat.SampleRate,
+			Channels = libraryBook.Book.AudioFormat.Channels,
 		};
 	}
 }

Source/FileManager/BackgroundFileSystem.cs

@@ -12,7 +12,7 @@ namespace FileManager
     /// </summary>
     public class BackgroundFileSystem
     {
-        public string RootDirectory { get; private set; }
+        public LongPath RootDirectory { get; private set; }
         public string SearchPattern { get; private set; }
         public SearchOption SearchOption { get; private set; }
 
@@ -21,9 +21,9 @@ namespace FileManager
         private Task backgroundScanner { get; set; }
 
         private object fsCacheLocker { get; } = new();
-        private List<string> fsCache { get; } = new();
+        private List<LongPath> fsCache { get; } = new();
 
-        public BackgroundFileSystem(string rootDirectory, string searchPattern, SearchOption searchOptions)
+        public BackgroundFileSystem(LongPath rootDirectory, string searchPattern, SearchOption searchOptions)
         {
             RootDirectory = rootDirectory;
             SearchPattern = searchPattern;
@@ -32,12 +32,18 @@ namespace FileManager
             Init();
         }
 
-        public string FindFile(System.Text.RegularExpressions.Regex regex)
+        public LongPath FindFile(System.Text.RegularExpressions.Regex regex)
         {
             lock (fsCacheLocker)
                 return fsCache.FirstOrDefault(s => regex.IsMatch(s));
         }
 
+        public List<LongPath> FindFiles(System.Text.RegularExpressions.Regex regex)
+        {
+            lock (fsCacheLocker)
+                return fsCache.Where(s => regex.IsMatch(s)).ToList();
+        }
+
         public void RefreshFiles()
         {
             lock (fsCacheLocker)
@@ -73,8 +79,13 @@ namespace FileManager
             //Stop raising events
             fileSystemWatcher?.Dispose();
 
-            //Calling CompleteAdding() will cause background scanner to terminate.
-            directoryChangesEvents?.CompleteAdding();
+            try
+            {
+                //Calling CompleteAdding() will cause background scanner to terminate.
+                directoryChangesEvents?.CompleteAdding();
+            }
+            // if directoryChangesEvents is non-null and isDisposed, this exception is thrown. there's no other way to check >:(
+            catch (ObjectDisposedException) { }
 
             //Wait for background scanner to terminate before reinitializing.
             backgroundScanner?.Wait();
@@ -124,16 +135,18 @@ namespace FileManager
             }
         }
 
-        private void RemovePath(string path)
+        private void RemovePath(LongPath path)
         {
-            var pathsToRemove = fsCache.Where(p => p.StartsWith(path)).ToArray();
+            path = path.LongPathName;
+            var pathsToRemove = fsCache.Where(p => ((string)p).StartsWith(path)).ToArray();
 
             foreach (var p in pathsToRemove)
                 fsCache.Remove(p);
         }
 
-        private void AddPath(string path)
+        private void AddPath(LongPath path)
         {
+            path = path.LongPathName;
             if (!File.Exists(path) && !Directory.Exists(path))
                 return;
             if (File.GetAttributes(path).HasFlag(FileAttributes.Directory))
@@ -141,12 +154,14 @@ namespace FileManager
             else
                 AddUniqueFile(path);
         }
-        private void AddUniqueFiles(IEnumerable<string> newFiles)
+
+        private void AddUniqueFiles(IEnumerable<LongPath> newFiles)
         {
             foreach (var file in newFiles)
                 AddUniqueFile(file);
         }
-        private void AddUniqueFile(string newFile)
+
+        private void AddUniqueFile(LongPath newFile)
         {
             if (!fsCache.Contains(newFile))
                 fsCache.Add(newFile);

Source/FileManager/FileManager.csproj

@@ -1,12 +1,20 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Dinah.Core" Version="4.4.0.1" />
+    <PackageReference Include="Dinah.Core" Version="4.4.1.1" />
     <PackageReference Include="Polly" Version="7.2.3" />
   </ItemGroup>
 
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+		<DebugType>embedded</DebugType>
+	</PropertyGroup>
+
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
+		<DebugType>embedded</DebugType>
+	</PropertyGroup>
+
 </Project>

Source/FileManager/FileNamingTemplate.cs

@@ -1,64 +1,111 @@
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Linq;
-using Dinah.Core;
+using System.Text;
 
 namespace FileManager
 {
-    /// <summary>Get valid filename. Advanced features incl. parameterized template</summary>
-    public class FileNamingTemplate
-    {
-        /// <summary>Proposed full file path. May contain optional html-styled template tags. Eg: &lt;name&gt;</summary>
-        public string Template { get; }
+	/// <summary>Get valid filename. Advanced features incl. parameterized template</summary>
+	public class FileNamingTemplate : NamingTemplate
+	{
+		/// <param name="template">Proposed file name with optional html-styled template tags.</param>
+		public FileNamingTemplate(string template) : base(template) { }
 
-        /// <param name="template">Proposed file name with optional html-styled template tags.</param>
-        public FileNamingTemplate(string template) => Template = ArgumentValidator.EnsureNotNullOrWhiteSpace(template, nameof(template));
+		/// <summary>Generate a valid path for this file or directory</summary>
+		public LongPath GetFilePath(ReplacementCharacters replacements, bool returnFirstExisting = false)
+		{
+			string fileName = 
+				Template.EndsWith(Path.DirectorySeparatorChar) || Template.EndsWith(Path.AltDirectorySeparatorChar) ?
+					FileUtility.RemoveLastCharacter(Template) : 
+					Template;
 
-        /// <summary>Optional step 1: Replace html-styled template tags with parameters. Eg {"name", "Bill Gates"} => /&lt;name&gt;/ => /Bill Gates/</summary>
-        public Dictionary<string, object> ParameterReplacements { get; } = new Dictionary<string, object>();
+			List<string> pathParts = new();
 
-        /// <summary>Convenience method</summary>
-        public void AddParameterReplacement(string key, object value)
-            // using .Add() instead of "[key] = value" will make unintended overwriting throw exception
-            => ParameterReplacements.Add(key, value);
+			var paramReplacements = ParameterReplacements.ToDictionary(r => $"<{formatKey(r.Key)}>", r => formatValue(r.Value, replacements));
 
-        /// <summary>If set, truncate each parameter replacement to this many characters. Default 50</summary>
-        public int? ParameterMaxSize { get; set; } = 50;
+			while (!string.IsNullOrEmpty(fileName))
+			{
+				var file = Path.GetFileName(fileName);
 
-        /// <summary>Optional step 2: Replace all illegal characters with this. Default=<see cref="string.Empty"/></summary>
-        public string IllegalCharacterReplacements { get; set; }
+				if (Path.IsPathRooted(Template) && file == string.Empty)
+				{
+					pathParts.Add(fileName);
+					break;
+				}
+				else
+				{
+					pathParts.Add(file);
+					fileName = Path.GetDirectoryName(fileName);
+				}
+			}
 
-        /// <summary>Generate a valid path for this file or directory</summary>
-        public string GetFilePath(bool returnFirstExisting = false)
-        {
-            var filename = Template;
+			pathParts.Reverse();
+			var fileNamePart = pathParts[^1];
+			pathParts.Remove(fileNamePart);
 
-            foreach (var r in ParameterReplacements)
-                filename = filename.Replace($"<{formatKey(r.Key)}>", formatValue(r.Value));
+			LongPath directory = Path.Join(pathParts.Select(p => replaceFileName(p, paramReplacements, LongPath.MaxFilenameLength)).ToArray());
 
-            return FileUtility.GetValidFilename(filename, IllegalCharacterReplacements, returnFirstExisting);
-        }
+			//If file already exists, GetValidFilename will append " (n)" to the filename.
+			//This could cause the filename length to exceed MaxFilenameLength, so reduce
+			//allowable filename length by 5 chars, allowing for up to 99 duplicates.
+			return FileUtility.GetValidFilename(Path.Join(directory, replaceFileName(fileNamePart, paramReplacements, LongPath.MaxFilenameLength - 5)), replacements, returnFirstExisting);
+		}
 
-        private static string formatKey(string key)
-            => key
-            .Replace("<", "")
-            .Replace(">", "");
+		private string replaceFileName(string filename, Dictionary<string,string> paramReplacements, int maxFilenameLength)
+		{
+			List<StringBuilder> filenameParts = new();
+			//Build the filename in parts, replacing replacement parameters with
+			//their values, and storing the parts in a list.
+			while (!string.IsNullOrEmpty(filename))
+			{
+				int openIndex = filename.IndexOf('<');
+				int closeIndex = filename.IndexOf('>');
 
-        private string formatValue(object value)
-        {
-            if (value is null)
-                return "";
+				if (openIndex == 0 && closeIndex > 0)
+				{
+					var key = filename[..(closeIndex + 1)];
 
-            // Other illegal characters will be taken care of later. Must take care of slashes now so params can't introduce new folders.
-            // Esp important for file templates.
-            var val = value
-                .ToString()
-                .Replace($"{System.IO.Path.DirectorySeparatorChar}", IllegalCharacterReplacements)
-                .Replace($"{System.IO.Path.AltDirectorySeparatorChar}", IllegalCharacterReplacements);
-            return 
-                ParameterMaxSize.HasValue && ParameterMaxSize.Value > 0
-                ? val.Truncate(ParameterMaxSize.Value)
-                : val;
-        }
-    }
+					if (paramReplacements.ContainsKey(key))
+						filenameParts.Add(new StringBuilder(paramReplacements[key]));
+					else
+						filenameParts.Add(new StringBuilder(key));
+
+					filename = filename[(closeIndex + 1)..];
+				}
+				else if (openIndex > 0 && closeIndex > openIndex)
+				{
+					var other = filename[..openIndex];
+					filenameParts.Add(new StringBuilder(other));
+					filename = filename[openIndex..];
+				}
+				else
+				{
+					filenameParts.Add(new StringBuilder(filename));
+					filename = string.Empty;
+				}
+			}
+
+			//Remove 1 character from the end of the longest filename part until
+			//the total filename is less than max filename length
+			while (filenameParts.Sum(p => p.Length) > maxFilenameLength)
+			{
+				int maxLength = filenameParts.Max(p => p.Length);
+				var maxEntry = filenameParts.First(p => p.Length == maxLength);
+
+				maxEntry.Remove(maxLength - 1, 1);
+			}
+			return string.Join("", filenameParts);
+		}
+
+		private string formatValue(object value, ReplacementCharacters replacements)
+		{
+			if (value is null)
+				return "";
+
+			// Other illegal characters will be taken care of later. Must take care of slashes now so params can't introduce new folders.
+			// Esp important for file templates.
+			return replacements.ReplaceInvalidFilenameChars(value.ToString());
+		}
+	}
 }

Source/FileManager/FileUtility.cs

@@ -9,264 +9,230 @@ using Polly.Retry;
 
 namespace FileManager
 {
-    public static class FileUtility
-    {
-        /// <summary>
-        /// "txt" => ".txt"
-        /// <br />".txt" => ".txt"
-        /// <br />null or whitespace => ""
-        /// </summary>
-        public static string GetStandardizedExtension(string extension)
-            => string.IsNullOrWhiteSpace(extension)
-            ? (extension ?? "")?.Trim()
-            : '.' + extension.Trim().Trim('.');
+	public static class FileUtility
+	{
+		/// <summary>
+		/// "txt" => ".txt"
+		/// <br />".txt" => ".txt"
+		/// <br />null or whitespace => ""
+		/// </summary>
+		public static string GetStandardizedExtension(string extension)
+			=> string.IsNullOrWhiteSpace(extension)
+			? (extension ?? "")?.Trim()
+			: '.' + extension.Trim().Trim('.');
 
-        /// <summary>
-        /// Return position with correct number of leading zeros.
-        /// <br />- 2 of 9 => "2"
-        /// <br />- 2 of 90 => "02"
-        /// <br />- 2 of 900 => "002"
-        /// </summary>
-        /// <param name="position">position in sequence. The 'x' in 'x of y'</param>
-        /// <param name="total">total qty in sequence. The 'y' in 'x of y'</param>
-        public static string GetSequenceFormatted(int position, int total)
-        {
-            ArgumentValidator.EnsureGreaterThan(position, nameof(position), 0);
-            ArgumentValidator.EnsureGreaterThan(total, nameof(total), 0);
-            if (position > total)
-                throw new ArgumentException($"{position} may not be greater than {total}");
+		/// <summary>
+		/// Return position with correct number of leading zeros.
+		/// <br />- 2 of 9 => "2"
+		/// <br />- 2 of 90 => "02"
+		/// <br />- 2 of 900 => "002"
+		/// </summary>
+		/// <param name="position">position in sequence. The 'x' in 'x of y'</param>
+		/// <param name="total">total qty in sequence. The 'y' in 'x of y'</param>
+		public static string GetSequenceFormatted(int position, int total)
+		{
+			ArgumentValidator.EnsureGreaterThan(position, nameof(position), 0);
+			ArgumentValidator.EnsureGreaterThan(total, nameof(total), 0);
+			if (position > total)
+				throw new ArgumentException($"{position} may not be greater than {total}");
 
-            return position.ToString().PadLeft(total.ToString().Length, '0');
-        }
+			return position.ToString().PadLeft(total.ToString().Length, '0');
+		}
 
-        private const int MAX_FILENAME_LENGTH = 255;
-        private const int MAX_DIRECTORY_LENGTH = 247;
 
-        /// <summary>
-        /// Ensure valid file name path: 
-        /// <br/>- remove invalid chars
-        /// <br/>- ensure uniqueness
-        /// <br/>- enforce max file length
-        /// </summary>
-        public static string GetValidFilename(string path, string illegalCharacterReplacements = "", bool returnFirstExisting = false)
-        {
-            ArgumentValidator.EnsureNotNull(path, nameof(path));
+		/// <summary>
+		/// Ensure valid file name path: 
+		/// <br/>- remove invalid chars
+		/// <br/>- ensure uniqueness
+		/// <br/>- enforce max file length
+		/// </summary>
+		public static LongPath GetValidFilename(LongPath path, ReplacementCharacters replacements, bool returnFirstExisting = false)
+		{
+			ArgumentValidator.EnsureNotNull(path, nameof(path));
 
-            // remove invalid chars
-            path = GetSafePath(path, illegalCharacterReplacements);
+			// remove invalid chars
+			path = GetSafePath(path, replacements);
 
-            // ensure uniqueness and check lengths
-            var dir = Path.GetDirectoryName(path);
-            dir = dir.Truncate(MAX_DIRECTORY_LENGTH);
+			// ensure uniqueness and check lengths
+			var dir = Path.GetDirectoryName(path);
+			dir = dir?.Truncate(LongPath.MaxDirectoryLength) ?? string.Empty;
 
-            var filename = Path.GetFileNameWithoutExtension(path);
-            var fileStem = Path.Combine(dir, filename);
+			var extension = Path.GetExtension(path);
 
-            var extension = Path.GetExtension(path);
+			var filename = Path.GetFileNameWithoutExtension(path).Truncate(LongPath.MaxFilenameLength - extension.Length);
+			var fileStem = Path.Combine(dir, filename);
 
-            var fullfilename = fileStem.Truncate(MAX_FILENAME_LENGTH - extension.Length) + extension;
 
-            fullfilename = removeInvalidWhitespace(fullfilename);
+			var fullfilename = fileStem.Truncate(LongPath.MaxPathLength - extension.Length) + extension;
 
-            var i = 0;
-            while (File.Exists(fullfilename) && !returnFirstExisting)
-            {
-                var increm = $" ({++i})";
-                fullfilename = fileStem.Truncate(MAX_FILENAME_LENGTH - increm.Length - extension.Length) + increm + extension;
-            }
+			fullfilename = removeInvalidWhitespace(fullfilename);
 
-            return fullfilename;
-        }
+			var i = 0;
+			while (File.Exists(fullfilename) && !returnFirstExisting)
+			{
+				var increm = $" ({++i})";
+				fullfilename = fileStem.Truncate(LongPath.MaxPathLength - increm.Length - extension.Length) + increm + extension;
+			}
 
-        // GetInvalidFileNameChars contains everything in GetInvalidPathChars plus ':', '*', '?', '\\', '/'
+			return fullfilename;
+		}
 
-        /// <summary>Use with file name, not full path. Valid path charaters which are invalid file name characters will be replaced: ':', '\\', '/'</summary>
-        public static string GetSafeFileName(string str, string illegalCharacterReplacements = "")
-            => string.Join(illegalCharacterReplacements ?? "", str.Split(Path.GetInvalidFileNameChars()));
+		/// <summary>Use with full path, not file name. Valid path characters which are invalid file name characters will be retained: '\\', '/'</summary>
+		public static LongPath GetSafePath(LongPath path, ReplacementCharacters replacements)
+		{
+			ArgumentValidator.EnsureNotNull(path, nameof(path));
 
-        /// <summary>Use with full path, not file name. Valid path charaters which are invalid file name characters will be retained: '\\', '/'</summary>
-        public static string GetSafePath(string path, string illegalCharacterReplacements = "")
-        {
-            ArgumentValidator.EnsureNotNull(path, nameof(path));
+			var pathNoPrefix = path.PathWithoutPrefix;
 
-            path = replaceInvalidChars(path, illegalCharacterReplacements);
-            path = standardizeSlashes(path);
-            path = replaceColons(path, illegalCharacterReplacements);
-            path = removeDoubleSlashes(path);
+			pathNoPrefix = replacements.ReplaceInvalidPathChars(pathNoPrefix);
+			pathNoPrefix = removeDoubleSlashes(pathNoPrefix);
 
-            return path;
-        }
+			return pathNoPrefix;
+		}
 
-        private static char[] invalidChars { get; } = Path.GetInvalidPathChars().Union(new[] {
-                '*', '?',
-                // these are weird. If you run Path.GetInvalidPathChars() in Visual Studio's "C# Interactive", then these characters are included.
-                // In live code, Path.GetInvalidPathChars() does not include them
-                '"', '<', '>'
-            }).ToArray();
-        private static string replaceInvalidChars(string path, string illegalCharacterReplacements)
-            => string.Join(illegalCharacterReplacements ?? "", path.Split(invalidChars));
+		private static string removeDoubleSlashes(string path)
+		{
+			if (path.Length < 2)
+				return path;
 
-        private static string standardizeSlashes(string path)
-            => path.Replace(Path.AltDirectorySeparatorChar, Path.DirectorySeparatorChar);
+			// exception: don't try to condense the initial dbl bk slashes in a path. eg: \\192.168.0.1
 
-        private static string replaceColons(string path, string illegalCharacterReplacements)
-        {
-            // replace all colons except within the first 2 chars
-            var builder = new System.Text.StringBuilder();
-            for (var i = 0; i < path.Length; i++)
-            {
-                var c = path[i];
-                if (i >= 2 && c == ':')
-                    builder.Append(illegalCharacterReplacements);
-                else
-                    builder.Append(c);
-            }
-            return builder.ToString();
-        }
+			var remainder = path[1..];
+			var dblSeparator = $"{Path.DirectorySeparatorChar}{Path.DirectorySeparatorChar}";
+			while (remainder.Contains(dblSeparator))
+				remainder = remainder.Replace(dblSeparator, $"{Path.DirectorySeparatorChar}");
 
-        private static string removeDoubleSlashes(string path)
-        {
-            if (path.Length < 2)
-                return path;
+			return path[0] + remainder;
+		}
 
-            // exception: don't try to condense the initial dbl bk slashes in a path. eg: \\192.168.0.1
+		private static string removeInvalidWhitespace_pattern { get; } = $@"[\s\.]*\{Path.DirectorySeparatorChar}\s*";
+		private static Regex removeInvalidWhitespace_regex { get; } = new(removeInvalidWhitespace_pattern, RegexOptions.Compiled | RegexOptions.IgnorePatternWhitespace);
 
-            var remainder = path[1..];
-            var dblSeparator = $"{Path.DirectorySeparatorChar}{Path.DirectorySeparatorChar}";
-            while (remainder.Contains(dblSeparator))
-                remainder = remainder.Replace(dblSeparator, $"{Path.DirectorySeparatorChar}");
+		/// <summary>no part of the path may begin or end in whitespace</summary>
+		private static string removeInvalidWhitespace(string fullfilename)
+		{
+			// no whitespace at beginning or end
+			// replace whitespace around path slashes
+			//    regex (with space added for clarity)
+			//    \s*  \\  \s*    =>    \
+			// no ending dots. beginning dots are valid
 
-            return path[0] + remainder;
-        }
+			// regex is easier by ending with separator
+			fullfilename += Path.DirectorySeparatorChar;
+			fullfilename = removeInvalidWhitespace_regex.Replace(fullfilename, Path.DirectorySeparatorChar.ToString());
+			// take separator back off
+			fullfilename = RemoveLastCharacter(fullfilename);
 
-        private static string removeInvalidWhitespace_pattern { get; } = $@"[\s\.]*\{Path.DirectorySeparatorChar}\s*";
-        private static Regex removeInvalidWhitespace_regex { get; } = new(removeInvalidWhitespace_pattern, RegexOptions.Compiled | RegexOptions.IgnorePatternWhitespace);
+			fullfilename = removeDoubleSlashes(fullfilename);
+			return fullfilename;
+		}
 
-        /// <summary>no part of the path may begin or end in whitespace</summary>
-        private static string removeInvalidWhitespace(string fullfilename)
-        {
-            // no whitespace at beginning or end
-            // replace whitespace around path slashes
-            //    regex (with space added for clarity)
-            //    \s*  \\  \s*    =>    \
-            // no ending dots. beginning dots are valid
+		public static string RemoveLastCharacter(this string str) => string.IsNullOrEmpty(str) ? str : str[..^1];
 
-            // regex is easier by ending with separator
-            fullfilename += Path.DirectorySeparatorChar;
-            fullfilename = removeInvalidWhitespace_regex.Replace(fullfilename, Path.DirectorySeparatorChar.ToString());
-            // take seperator back off
-            fullfilename = RemoveLastCharacter(fullfilename);
+		/// <summary>
+		/// Move file.
+		/// <br/>- Ensure valid file name path: remove invalid chars, ensure uniqueness, enforce max file length
+		/// <br/>- Perform <see cref="SaferMove"/>
+		/// <br/>- Return valid path
+		/// </summary>
+		public static string SaferMoveToValidPath(LongPath source, LongPath destination, ReplacementCharacters replacements)
+		{
+			destination = GetValidFilename(destination, replacements);
+			SaferMove(source, destination);
+			return destination;
+		}
 
-            fullfilename = removeDoubleSlashes(fullfilename);
-            return fullfilename;
-        }
+		private static int maxRetryAttempts { get; } = 3;
+		private static TimeSpan pauseBetweenFailures { get; } = TimeSpan.FromMilliseconds(100);
+		private static RetryPolicy retryPolicy { get; } =
+			Policy
+			.Handle<Exception>()
+			.WaitAndRetry(maxRetryAttempts, i => pauseBetweenFailures);
 
-        public static string RemoveLastCharacter(this string str) => string.IsNullOrEmpty(str) ? str : str[..^1];
+		/// <summary>Delete file. No error when source does not exist. Retry up to 3 times before throwing exception.</summary>
+		public static void SaferDelete(LongPath source)
+			=> retryPolicy.Execute(() =>
+			{
+				try
+				{
+					if (!File.Exists(source))
+					{
+						Serilog.Log.Logger.Debug("No file to delete: {@DebugText}", new { source });
+						return;
+					}
 
-        /// <summary>
-        /// Move file.
-        /// <br/>- Ensure valid file name path: remove invalid chars, ensure uniqueness, enforce max file length
-        /// <br/>- Perform <see cref="SaferMove"/>
-        /// <br/>- Return valid path
-        /// </summary>
-        public static string SaferMoveToValidPath(string source, string destination)
-        {
-            destination = GetValidFilename(destination);
-            SaferMove(source, destination);
-            return destination;
-        }
+					Serilog.Log.Logger.Debug("Attempt to delete file: {@DebugText}", new { source });
+					File.Delete(source);
+					Serilog.Log.Logger.Information("File successfully deleted: {@DebugText}", new { source });
+				}
+				catch (Exception e)
+				{
+					Serilog.Log.Logger.Error(e, "Failed to delete file: {@DebugText}", new { source });
+					throw;
+				}
+			});
 
-        private static int maxRetryAttempts { get; } = 3;
-        private static TimeSpan pauseBetweenFailures { get; } = TimeSpan.FromMilliseconds(100);
-        private static RetryPolicy retryPolicy { get; } =
-            Policy
-            .Handle<Exception>()
-            .WaitAndRetry(maxRetryAttempts, i => pauseBetweenFailures);
+		/// <summary>Move file. No error when source does not exist. Retry up to 3 times before throwing exception.</summary>
+		public static void SaferMove(LongPath source, LongPath destination)
+			=> retryPolicy.Execute(() =>
+			{
+				try
+				{
+					if (!File.Exists(source))
+					{
+						Serilog.Log.Logger.Debug("No file to move: {@DebugText}", new { source });
+						return;
+					}
 
-        /// <summary>Delete file. No error when source does not exist. Retry up to 3 times before throwing exception.</summary>
-        public static void SaferDelete(string source)
-            => retryPolicy.Execute(() =>
-            {
-                try
-                {
-                    if (!File.Exists(source))
-                    {
-                        Serilog.Log.Logger.Debug("No file to delete: {@DebugText}", new { source });
-                        return;
-                    }
+					SaferDelete(destination);
 
-                    Serilog.Log.Logger.Debug("Attempt to delete file: {@DebugText}", new { source });
-                    File.Delete(source);
-                    Serilog.Log.Logger.Information("File successfully deleted: {@DebugText}", new { source });
-                }
-                catch (Exception e)
-                {
-                    Serilog.Log.Logger.Error(e, "Failed to delete file: {@DebugText}", new { source });
-                    throw;
-                }
-            });
+					var dir = Path.GetDirectoryName(destination);
+					Serilog.Log.Logger.Debug("Attempt to create directory: {@DebugText}", new { dir });
+					Directory.CreateDirectory(dir);
 
-        /// <summary>Move file. No error when source does not exist. Retry up to 3 times before throwing exception.</summary>
-		public static void SaferMove(string source, string destination)
-            => retryPolicy.Execute(() =>
-            {
-                try
-                {
-                    if (!File.Exists(source))
-                    {
-                        Serilog.Log.Logger.Debug("No file to move: {@DebugText}", new { source });
-                        return;
-                    }
+					Serilog.Log.Logger.Debug("Attempt to move file: {@DebugText}", new { source, destination });
+					File.Move(source, destination);
+					Serilog.Log.Logger.Information("File successfully moved: {@DebugText}", new { source, destination });
+				}
+				catch (Exception e)
+				{
+					Serilog.Log.Logger.Error(e, "Failed to move file: {@DebugText}", new { source, destination });
+					throw;
+				}
+			});
 
-                    SaferDelete(destination);
+		/// <summary>
+		/// A safer way to get all the files in a directory and sub directory without crashing on UnauthorizedException or PathTooLongException
+		/// </summary>
+		/// <param name="rootPath">Starting directory</param>
+		/// <param name="patternMatch">Filename pattern match</param>
+		/// <param name="searchOption">Search subdirectories or only top level directory for files</param>
+		/// <returns>List of files</returns>
+		public static IEnumerable<LongPath> SaferEnumerateFiles(LongPath path, string searchPattern = "*", SearchOption searchOption = SearchOption.TopDirectoryOnly)
+		{
+			var foundFiles = Enumerable.Empty<LongPath>();
 
-                    var dir = Path.GetDirectoryName(destination);
-                    Serilog.Log.Logger.Debug("Attempt to create directory: {@DebugText}", new { dir });
-                    Directory.CreateDirectory(dir);
+			if (searchOption == SearchOption.AllDirectories)
+			{
+				try
+				{
+					IEnumerable <LongPath> subDirs = Directory.EnumerateDirectories(path).Select(p => (LongPath)p);
+					// Add files in subdirectories recursively to the list
+					foreach (string dir in subDirs)
+						foundFiles = foundFiles.Concat(SaferEnumerateFiles(dir, searchPattern, searchOption));
+				}
+				catch (UnauthorizedAccessException) { }
+				catch (PathTooLongException) { }
+			}
 
-                    Serilog.Log.Logger.Debug("Attempt to move file: {@DebugText}", new { source, destination });
-                    File.Move(source, destination);
-                    Serilog.Log.Logger.Information("File successfully moved: {@DebugText}", new { source, destination });
-                }
-                catch (Exception e)
-                {
-                    Serilog.Log.Logger.Error(e, "Failed to move file: {@DebugText}", new { source, destination });
-                    throw;
-                }
-            });
+			try
+			{
+				// Add files from the current directory
+				foundFiles = foundFiles.Concat(Directory.EnumerateFiles(path, searchPattern).Select(f => (LongPath)f));
+			}
+			catch (UnauthorizedAccessException) { }
 
-        /// <summary>
-        /// A safer way to get all the files in a directory and sub directory without crashing on UnauthorizedException or PathTooLongException
-        /// </summary>
-        /// <param name="rootPath">Starting directory</param>
-        /// <param name="patternMatch">Filename pattern match</param>
-        /// <param name="searchOption">Search subdirectories or only top level directory for files</param>
-        /// <returns>List of files</returns>
-        public static IEnumerable<string> SaferEnumerateFiles(string path, string searchPattern = "*", SearchOption searchOption = SearchOption.TopDirectoryOnly)
-        {
-            var foundFiles = Enumerable.Empty<string>();
-
-            if (searchOption == SearchOption.AllDirectories)
-            {
-                try
-                {
-                    IEnumerable<string> subDirs = Directory.EnumerateDirectories(path);
-                    // Add files in subdirectories recursively to the list
-                    foreach (string dir in subDirs)
-                        foundFiles = foundFiles.Concat(SaferEnumerateFiles(dir, searchPattern, searchOption));
-                }
-                catch (UnauthorizedAccessException) { }
-                catch (PathTooLongException) { }
-            }
-
-            try
-            {
-                // Add files from the current directory
-                foundFiles = foundFiles.Concat(Directory.EnumerateFiles(path, searchPattern));
-            }
-            catch (UnauthorizedAccessException) { }
-
-            return foundFiles;
-        }
-    }
+			return foundFiles;
+		}
+	}
 }

Source/FileManager/LongPath.cs

@@ -0,0 +1,134 @@
+using Newtonsoft.Json;
+using System;
+using System.Linq;
+using System.Runtime.InteropServices;
+using System.Text;
+
+namespace FileManager
+{
+	public class LongPath
+	{
+		//https://docs.microsoft.com/en-us/windows/win32/fileio/maximum-file-path-limitation?tabs=cmd
+
+		public const int MaxDirectoryLength = MaxPathLength - 13;
+		public const int MaxPathLength = short.MaxValue;
+		public const int MaxFilenameLength = 255;
+
+		private const int MAX_PATH = 260;
+		private const string LONG_PATH_PREFIX = "\\\\?\\";
+
+		public string Path { get; init; }
+		public override string ToString() => Path;
+
+		private static readonly PlatformID PlatformID = Environment.OSVersion.Platform;
+
+	
+		public static implicit operator LongPath(string path)
+		{
+			if (PlatformID is PlatformID.Unix) return new LongPath { Path = path };
+
+			if (path is null) return null;
+
+			//File I/O functions in the Windows API convert "/" to "\" as part of converting
+			//the name to an NT-style name, except when using the "\\?\" prefix 
+			path = path.Replace(System.IO.Path.AltDirectorySeparatorChar, System.IO.Path.DirectorySeparatorChar);
+
+			if (path.StartsWith(LONG_PATH_PREFIX))
+				return new LongPath { Path = path };
+			else if ((path.Length > 2 && path[1] == ':') || path.StartsWith("UNC\\"))
+				return new LongPath { Path = LONG_PATH_PREFIX + path };
+			else if (path.StartsWith("\\\\"))
+				//The "\\?\" prefix can also be used with paths constructed according to the
+				//universal naming convention (UNC). To specify such a path using UNC, use
+				//the "\\?\UNC\" prefix.
+				return new LongPath { Path = LONG_PATH_PREFIX + "UNC\\" + path.Substring(2) };
+			else
+			{
+				//These prefixes are not used as part of the path itself. They indicate that
+				//the path should be passed to the system with minimal modification, which
+				//means that you cannot use forward slashes to represent path separators, or
+				//a period to represent the current directory, or double dots to represent the
+				//parent directory. Because you cannot use the "\\?\" prefix with a relative
+				//path, relative paths are always limited to a total of MAX_PATH characters.
+				if (path.Length > MAX_PATH)
+					throw new System.IO.PathTooLongException();
+				return new LongPath { Path = path };
+			}
+		}
+
+		public static implicit operator string(LongPath path) => path?.Path;
+
+		[JsonIgnore]
+		public string ShortPathName
+		{
+			get
+			{
+				if (PlatformID is PlatformID.Unix) return Path;
+
+				//Short Path names are useful for navigating to the file in windows explorer,
+				//which will not recognize paths longer than MAX_PATH. Short path names are not
+				//always enabled on every volume. So to check if a volume enables short path
+				//names (aka 8dot3 names), run the following command from an elevated command
+				//prompt:
+				//
+				//	fsutil 8dot3name query c:
+				//
+				//It will say:
+				//
+				//	"Based on the above settings, 8dot3 name creation is [enabled/disabled] on c:"
+				//
+				//To enable short names on a volume on the system, run the following command
+				//from an elevated command prompt:
+				//
+				//	fsutil 8dot3name set c: 0
+				//
+				//or for all volumes on the system:
+				//
+				//	fsutil 8dot3name set 0
+				//
+				//Note that after enabling 8dot3 names on a volume, they will only be available
+				//for newly-created entries in ther file system. Existing entries made while
+				//8dot3 names were disabled will not be reachable by short paths.
+
+				if (Path is null) return null;
+
+				StringBuilder shortPathBuffer = new(MaxPathLength);
+				GetShortPathName(Path, shortPathBuffer, MaxPathLength);
+				return shortPathBuffer.ToString();
+			}
+		}
+
+		[JsonIgnore]
+		public string LongPathName
+		{
+			get
+			{
+				if (PlatformID is PlatformID.Unix) return Path;
+				if (Path is null) return null;
+
+				StringBuilder longPathBuffer = new(MaxPathLength);
+				GetLongPathName(Path, longPathBuffer, MaxPathLength);
+				return longPathBuffer.ToString();
+			}
+		}
+
+		[JsonIgnore]
+		public string PathWithoutPrefix
+		{
+			get
+			{
+				if (PlatformID is PlatformID.Unix) return Path;
+				return
+					Path?.StartsWith(LONG_PATH_PREFIX) == true ? Path.Remove(0, LONG_PATH_PREFIX.Length)
+					:Path;
+			}
+		}
+
+		[DllImport("kernel32.dll", CharSet = CharSet.Unicode)]
+		private static extern int GetShortPathName([MarshalAs(UnmanagedType.LPWStr)] string path, [MarshalAs(UnmanagedType.LPWStr)] StringBuilder shortPath, int shortPathLength);
+
+		[DllImport("kernel32.dll", CharSet = CharSet.Unicode)]
+		private static extern int GetLongPathName([MarshalAs(UnmanagedType.LPWStr)] string lpszShortPath, [MarshalAs(UnmanagedType.LPWStr)] StringBuilder lpszLongPath, int cchBuffer);
+
+	}
+}

Source/FileManager/MetadataNamingTemplate.cs

@@ -0,0 +1,20 @@
+using System;
+using System.Linq;
+
+namespace FileManager
+{
+	public class MetadataNamingTemplate : NamingTemplate
+	{
+		public MetadataNamingTemplate(string template) : base(template) { }
+
+		public string GetTagContents()
+		{
+			var tagValue = Template;
+
+			foreach (var r in ParameterReplacements)
+				tagValue = tagValue.Replace($"<{formatKey(r.Key)}>", r.Value?.ToString() ?? "");
+
+			return tagValue;
+		}
+	}
+}

Source/FileManager/NamingTemplate.cs

@@ -0,0 +1,28 @@
+using Dinah.Core;
+using System;
+using System.Collections.Generic;
+
+namespace FileManager
+{
+	public class NamingTemplate
+	{
+		/// <summary>Proposed full name. May contain optional html-styled template tags. Eg: &lt;name&gt;</summary>
+		public string Template { get; }
+
+		/// <param name="template">Proposed file name with optional html-styled template tags.</param>
+		public NamingTemplate(string template) => Template = ArgumentValidator.EnsureNotNullOrWhiteSpace(template, nameof(template));
+
+		/// <summary>Optional step 1: Replace html-styled template tags with parameters. Eg {"name", "Bill Gates"} => /&lt;name&gt;/ => /Bill Gates/</summary>
+		public Dictionary<string, object> ParameterReplacements { get; } = new Dictionary<string, object>();
+
+		/// <summary>Convenience method</summary>
+		public void AddParameterReplacement(string key, object value)
+			// using .Add() instead of "[key] = value" will make unintended overwriting throw exception
+			=> ParameterReplacements.Add(key, value);
+
+		protected static string formatKey(string key)
+			=> key
+			.Replace("<", "")
+			.Replace(">", "");
+	}
+}

Source/FileManager/ReplacementCharacters.cs

@@ -0,0 +1,278 @@
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+
+namespace FileManager
+{
+	public class Replacement : ICloneable
+	{
+		public const int FIXED_COUNT = 6;
+
+		internal const char QUOTE_MARK = '"';
+		[JsonIgnore] public bool Mandatory { get; internal set; }
+		[JsonProperty] public char CharacterToReplace { get; private set; }
+		[JsonProperty] public string ReplacementString { get; set; }
+		[JsonProperty] public string Description { get; private set; }
+		public override string ToString() => $"{CharacterToReplace} → {ReplacementString} ({Description})";
+
+		public Replacement(char charToReplace, string replacementString, string description)
+		{
+			CharacterToReplace = charToReplace;
+			ReplacementString = replacementString;
+			Description = description;
+		}
+		private Replacement(char charToReplace, string replacementString, string description, bool mandatory)
+			: this(charToReplace, replacementString, description)
+		{
+			Mandatory = mandatory;
+		}
+
+		public object Clone() => new Replacement(CharacterToReplace, ReplacementString, Description, Mandatory);
+
+		public void Update(char charToReplace, string replacementString, string description)
+		{
+			ReplacementString = replacementString;
+
+			if (!Mandatory)
+			{
+				CharacterToReplace = charToReplace;
+				Description = description;
+			}
+		}
+
+		public static Replacement OtherInvalid(string replacement) => new(default, replacement, "All other invalid characters", true);
+		public static Replacement FilenameForwardSlash(string replacement) => new('/', replacement, "Forward Slash (Filename Only)", true);
+		public static Replacement FilenameBackSlash(string replacement) => new('\\', replacement, "Back Slash (Filename Only)", true);
+		public static Replacement OpenQuote(string replacement) => new('"', replacement, "Open Quote", true);
+		public static Replacement CloseQuote(string replacement) => new('"', replacement, "Close Quote", true);
+		public static Replacement OtherQuote(string replacement) => new('"', replacement, "Other Quote", true);
+		public static Replacement Colon(string replacement) => new(':', replacement, "Colon");
+		public static Replacement Asterisk(string replacement) => new('*', replacement, "Asterisk");
+		public static Replacement QuestionMark(string replacement) => new('?', replacement, "Question Mark");
+		public static Replacement OpenAngleBracket(string replacement) => new('<', replacement, "Open Angle Bracket");
+		public static Replacement CloseAngleBracket(string replacement) => new('>', replacement, "Close Angle Bracket");
+		public static Replacement Pipe(string replacement) => new('|', replacement, "Vertical Line");
+
+	}
+
+	[JsonConverter(typeof(ReplacementCharactersConverter))]
+	public class ReplacementCharacters
+	{
+		public static readonly ReplacementCharacters Default = new()
+		{
+			Replacements = new List<Replacement>()
+			{
+				Replacement.OtherInvalid("_"),
+				Replacement.FilenameForwardSlash("∕"),
+				Replacement.FilenameBackSlash(""),
+				Replacement.OpenQuote("“"),
+				Replacement.CloseQuote("”"),
+				Replacement.OtherQuote("＂"),
+				Replacement.OpenAngleBracket("＜"),
+				Replacement.CloseAngleBracket("＞"),
+				Replacement.Colon("꞉"),
+				Replacement.Asterisk("✱"),
+				Replacement.QuestionMark("？"),
+				Replacement.Pipe("⏐"),
+			}
+		};
+
+		public static readonly ReplacementCharacters LoFiDefault = new()
+		{
+			Replacements = new List<Replacement>()
+			{
+				Replacement.OtherInvalid("_"),
+				Replacement.FilenameForwardSlash("_"),
+				Replacement.FilenameBackSlash("_"),
+				Replacement.OpenQuote("'"),
+				Replacement.CloseQuote("'"),
+				Replacement.OtherQuote("'"),
+				Replacement.OpenAngleBracket("{"),
+				Replacement.CloseAngleBracket("}"),
+				Replacement.Colon("-"),
+			}
+		};
+
+		public static readonly ReplacementCharacters Barebones = new()
+		{
+			Replacements = new List<Replacement>()
+			{
+				Replacement.OtherInvalid("_"),
+				Replacement.FilenameForwardSlash("_"),
+				Replacement.FilenameBackSlash("_"),
+				Replacement.OpenQuote("_"),
+				Replacement.CloseQuote("_"),
+				Replacement.OtherQuote("_"),
+			}
+		};
+
+		private static readonly char[] invalidChars = Path.GetInvalidPathChars().Union(new[] {
+				'*', '?', ':',
+				// these are weird. If you run Path.GetInvalidPathChars() in Visual Studio's "C# Interactive", then these characters are included.
+				// In live code, Path.GetInvalidPathChars() does not include them
+				'"', '<', '>'
+			}).ToArray();
+
+		public IReadOnlyList<Replacement> Replacements { get; init; }
+		private string DefaultReplacement => Replacements[0].ReplacementString;
+		private Replacement ForwardSlash => Replacements[1];
+		private Replacement BackSlash => Replacements[2];
+		private string OpenQuote => Replacements[3].ReplacementString;
+		private string CloseQuote => Replacements[4].ReplacementString;
+		private string OtherQuote => Replacements[5].ReplacementString;
+
+		private string GetFilenameCharReplacement(char toReplace, char preceding, char succeding)
+		{
+			if (toReplace == ForwardSlash.CharacterToReplace)
+				return ForwardSlash.ReplacementString;
+			else if (toReplace == BackSlash.CharacterToReplace)
+				return BackSlash.ReplacementString;
+			else return GetPathCharReplacement(toReplace, preceding, succeding);
+		}
+		private string GetPathCharReplacement(char toReplace, char preceding, char succeding)
+		{
+			if (toReplace == Replacement.QUOTE_MARK)
+			{
+				if (
+					preceding == default ||
+						(
+							!char.IsLetter(preceding) &&
+							!char.IsNumber(preceding) &&
+							(char.IsLetter(succeding) || char.IsNumber(succeding))
+						)
+					)
+					return OpenQuote;
+				else if (
+						succeding == default ||
+							(
+								!char.IsLetter(succeding) &&
+								!char.IsNumber(succeding) &&
+								(char.IsLetter(preceding) || char.IsNumber(preceding))
+							)
+						)
+					return CloseQuote;
+				else
+					return OtherQuote;
+			}
+
+			for (int i = Replacement.FIXED_COUNT; i < Replacements.Count; i++)
+			{
+				var r = Replacements[i];
+				if (r.CharacterToReplace == toReplace)
+					return r.ReplacementString;
+			}
+			return DefaultReplacement;
+		}
+
+
+		public static bool ContainsInvalidPathChar(string path)
+			=> path.Any(c => invalidChars.Contains(c));
+		public static bool ContainsInvalidFilenameChar(string path)
+			=> path.Any(c => invalidChars.Concat(new char[] { '\\', '/' }).Contains(c));
+
+		public string ReplaceInvalidFilenameChars(string fileName)
+		{
+			if (string.IsNullOrEmpty(fileName)) return string.Empty;
+			var builder = new System.Text.StringBuilder();
+			for (var i = 0; i < fileName.Length; i++)
+			{
+				var c = fileName[i];
+
+				if (invalidChars.Contains(c) || c == ForwardSlash.CharacterToReplace || c == BackSlash.CharacterToReplace)
+				{
+					char preceding = i > 0 ? fileName[i - 1] : default;
+					char succeeding = i < fileName.Length - 1 ? fileName[i + 1] : default;
+					builder.Append(GetFilenameCharReplacement(c, preceding, succeeding));
+				}
+				else
+					builder.Append(c);
+
+			}
+			return builder.ToString();
+		}
+
+		public string ReplaceInvalidPathChars(string pathStr)
+		{
+			if (string.IsNullOrEmpty(pathStr)) return string.Empty;
+
+			// replace all colons except within the first 2 chars
+			var builder = new System.Text.StringBuilder();
+			for (var i = 0; i < pathStr.Length; i++)
+			{
+				var c = pathStr[i];
+
+				if (!invalidChars.Contains(c) || (c == ':' && i == 1 && Path.IsPathRooted(pathStr)))
+					builder.Append(c);
+				else
+				{
+					char preceding = i > 0 ? pathStr[i - 1] : default;
+					char succeeding = i < pathStr.Length - 1 ? pathStr[i + 1] : default;
+					builder.Append(GetPathCharReplacement(c, preceding, succeeding));
+				}
+
+			}
+			return builder.ToString();
+		}
+	}
+
+	#region JSON Converter
+	internal class ReplacementCharactersConverter : JsonConverter
+	{
+		public override bool CanConvert(Type objectType)
+			=> objectType == typeof(ReplacementCharacters);
+
+		public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
+		{
+			var jObj = JObject.Load(reader);
+			var replaceArr = jObj[nameof(Replacement)];
+			IReadOnlyList<Replacement> dict = replaceArr
+				.ToObject<Replacement[]>().ToList();
+
+			//Ensure that the first 6 replacements are for the expected chars and that all replacement strings are valid.
+			//If not, reset to default.
+
+			var default0 = Replacement.OtherInvalid("");
+			var default1 = Replacement.FilenameForwardSlash("");
+			var default2 = Replacement.FilenameBackSlash("");
+			var default3 = Replacement.OpenQuote("");
+			var default4 = Replacement.CloseQuote("");
+			var default5 = Replacement.OtherQuote("");
+
+			if (dict.Count < Replacement.FIXED_COUNT ||
+				dict[0].CharacterToReplace != default0.CharacterToReplace || dict[0].Description != default0.Description ||
+				dict[1].CharacterToReplace != default1.CharacterToReplace || dict[1].Description != default1.Description ||
+				dict[2].CharacterToReplace != default2.CharacterToReplace || dict[2].Description != default2.Description ||
+				dict[3].CharacterToReplace != default3.CharacterToReplace || dict[3].Description != default3.Description ||
+				dict[4].CharacterToReplace != default4.CharacterToReplace || dict[4].Description != default4.Description ||
+				dict[5].CharacterToReplace != default5.CharacterToReplace || dict[5].Description != default5.Description ||
+				dict.Any(r => ReplacementCharacters.ContainsInvalidPathChar(r.ReplacementString))
+				)
+			{
+				dict = ReplacementCharacters.Default.Replacements;
+			}
+			//First FIXED_COUNT are mandatory
+			for (int i = 0; i < Replacement.FIXED_COUNT; i++)
+				dict[i].Mandatory = true;
+
+			return new ReplacementCharacters { Replacements = dict };
+		}
+
+		public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
+		{
+			ReplacementCharacters replacements = (ReplacementCharacters)value;
+
+			var propertyNames = replacements.Replacements
+				.Select(c => JObject.FromObject(c)).ToList();
+
+			var prop = new JProperty(nameof(Replacement), new JArray(propertyNames));
+
+			var obj = new JObject();
+			obj.AddFirst(prop);
+			obj.WriteTo(writer);
+		}
+	}
+	#endregion
+}

Source/Hangover/Hangover.csproj

@@ -6,13 +6,23 @@
     <UseWindowsForms>true</UseWindowsForms>
     <ApplicationIcon>hangover.ico</ApplicationIcon>
     <ImplicitUsings>enable</ImplicitUsings>
-
+	<IsPublishable>true</IsPublishable>
     <PublishReadyToRun>true</PublishReadyToRun>
     <RuntimeIdentifier>win-x64</RuntimeIdentifier>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     <AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
   </PropertyGroup>
 
+  <PropertyGroup>
+    <!--
+    HACK FOR COMPILER BUG  2021-09-14. Hopefully will be fixed in future versions
+    - Not using SatelliteResourceLanguages will load all language packs: works
+    - Specifying 'en' semicolon 1 more should load 1 language pack: works
+    - Specifying only 'en' should load no language packs: broken, still loads all
+    -->
+    <SatelliteResourceLanguages>en;es</SatelliteResourceLanguages>
+  </PropertyGroup>
+
   <!--
   When LibationWinForms and Hangover output to the same dir, Hangover must build before LibationWinForms
 
@@ -24,11 +34,13 @@
   edit debug and release output paths
   -->
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-    <OutputPath>..\LibationWinForms\bin\Debug</OutputPath>
+    <OutputPath>..\bin\Debug</OutputPath>
+	  <DebugType>embedded</DebugType>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
-    <OutputPath>..\LibationWinForms\bin\Release</OutputPath>
+    <OutputPath>..\bin\Release</OutputPath>
+	  <DebugType>embedded</DebugType>
   </PropertyGroup>
 
   <ItemGroup>
@@ -37,10 +49,17 @@
     <ProjectReference Include="..\FileLiberator\FileLiberator.csproj" />
   </ItemGroup>
 
-  <ItemGroup>
+	<ItemGroup>
     <Compile Update="Form1.*.cs">
       <DependentUpon>Form1.cs</DependentUpon>
     </Compile>
   </ItemGroup>
 
+	<Target Name="SpicNSpan"  AfterTargets="Clean">
+		<!-- Remove obj folder -->
+		<RemoveDir Directories="$(BaseIntermediateOutputPath)" />
+		<!-- Remove bin folder -->
+		<RemoveDir Directories="$(BaseOutputPath)" />
+	</Target>
+
 </Project>

Source/Hangover/Properties/PublishProfiles/WindowsProfile.pubxml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+https://go.microsoft.com/fwlink/?LinkID=208121.
+-->
+<Project>
+  <PropertyGroup>
+    <Configuration>Release</Configuration>
+    <Platform>Any CPU</Platform>
+    <PublishDir>..\bin\publish\</PublishDir>
+    <PublishProtocol>FileSystem</PublishProtocol>
+    <TargetFramework>net6.0-windows</TargetFramework>
+    <RuntimeIdentifier>win-x64</RuntimeIdentifier>
+    <SelfContained>true</SelfContained>
+    <PublishSingleFile>false</PublishSingleFile>
+	  <PublishTrimmed>false</PublishTrimmed>
+  </PropertyGroup>
+</Project>

Source/Libation.sln

@@ -66,6 +66,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibationFileManager.Tests",
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Hangover", "Hangover\Hangover.csproj", "{40C67036-C1A7-4FDF-AA83-8EC902E257F3}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibationAvalonia", "LibationAvalonia\LibationAvalonia.csproj", "{F612D06F-3134-4B9B-95CD-EB3FC798AE60}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -144,6 +146,10 @@ Global
 		{40C67036-C1A7-4FDF-AA83-8EC902E257F3}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{40C67036-C1A7-4FDF-AA83-8EC902E257F3}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{40C67036-C1A7-4FDF-AA83-8EC902E257F3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F612D06F-3134-4B9B-95CD-EB3FC798AE60}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F612D06F-3134-4B9B-95CD-EB3FC798AE60}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F612D06F-3134-4B9B-95CD-EB3FC798AE60}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F612D06F-3134-4B9B-95CD-EB3FC798AE60}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -167,6 +173,7 @@ Global
 		{F2E04270-4551-41C4-99FF-E7125BED708C} = {67E66E82-5532-4440-AFB3-9FB1DF9DEF53}
 		{EB781571-8548-477E-82AD-FB9FAB548D2F} = {67E66E82-5532-4440-AFB3-9FB1DF9DEF53}
 		{40C67036-C1A7-4FDF-AA83-8EC902E257F3} = {8679CAC8-9164-4007-BDD2-F004810EDA14}
+		{F612D06F-3134-4B9B-95CD-EB3FC798AE60} = {8679CAC8-9164-4007-BDD2-F004810EDA14}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {615E00ED-BAEF-4E8E-A92A-9B82D87942A9}

Source/LibationAvalonia/App.axaml

@@ -0,0 +1,17 @@
+<Application xmlns="https://github.com/avaloniaui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:local="using:LibationAvalonia"
+			 x:Class="LibationAvalonia.App">
+	
+	<Application.DataTemplates>
+		<local:ViewLocator/>
+	</Application.DataTemplates>
+	
+    <Application.Styles>
+        <FluentTheme Mode="Light"/>
+		<StyleInclude Source="avares://Avalonia.Themes.Default/DefaultTheme.xaml"/>
+		<StyleInclude Source="avares://Avalonia.Themes.Default/Accents/BaseLight.xaml"/>
+		<StyleInclude Source="/Assets/DataGridTheme.xaml"/>
+		<StyleInclude Source="/Assets/LibationStyles.xaml"/>
+	</Application.Styles>
+</Application>

Source/LibationAvalonia/App.axaml.cs

@@ -0,0 +1,236 @@
+using Avalonia;
+using Avalonia.Controls.ApplicationLifetimes;
+using Avalonia.Markup.Xaml;
+using Avalonia.Media;
+using LibationFileManager;
+using LibationAvalonia.Views;
+using System;
+using Avalonia.Platform;
+using LibationAvalonia.Dialogs;
+using System.Threading.Tasks;
+using System.Collections.Generic;
+using System.IO;
+using ApplicationServices;
+using Dinah.Core;
+
+namespace LibationAvalonia
+{
+	public class App : Application
+	{
+		public static readonly bool IsWindows;
+		public static readonly bool IsLinux;
+		public static readonly bool IsMacOs;
+		static App()
+		{
+			IsWindows = OperatingSystem.IsWindows();
+			IsLinux = OperatingSystem.IsLinux();
+			IsMacOs = OperatingSystem.IsMacOS();
+		}
+
+		public static IBrush ProcessQueueBookFailedBrush { get; private set; }
+		public static IBrush ProcessQueueBookCompletedBrush { get; private set; }
+		public static IBrush ProcessQueueBookCancelledBrush { get; private set; }
+		public static IBrush ProcessQueueBookDefaultBrush { get; private set; }
+		public static IBrush SeriesEntryGridBackgroundBrush { get; private set; }
+
+		public static IAssetLoader AssetLoader { get; private set; }
+
+		public static readonly Uri AssetUriBase = new("avares://Libation/Assets/");
+		public static Stream OpenAsset(string assetRelativePath)
+			=> AssetLoader.Open(new Uri(AssetUriBase, assetRelativePath));
+
+
+		public static bool GoToFile(string path)
+			=> IsWindows ? Go.To.File(path)
+			: GoToFolder(path is null ? string.Empty : Path.GetDirectoryName(path));
+
+		public static bool GoToFolder(string path)
+		{
+			if (IsWindows)
+				return Go.To.Folder(path);
+			else if (IsLinux)
+			{
+				var startInfo = new System.Diagnostics.ProcessStartInfo()
+				{
+					FileName = "/bin/xdg-open",
+					Arguments = path is null ? string.Empty : $"\"{path}\"",
+					UseShellExecute = false, //Import in Linux environments
+					CreateNoWindow = false,
+					RedirectStandardOutput = true,
+					RedirectStandardError = true
+				};
+				System.Diagnostics.Process.Start(startInfo);
+				return true;
+			}
+			//Don't know how to do this for mac yet
+			else return true;
+		}
+
+		public override void Initialize()
+		{
+			AvaloniaXamlLoader.Load(this);
+			AssetLoader = AvaloniaLocator.Current.GetService<IAssetLoader>();
+		}
+
+		public static Task<List<DataLayer.LibraryBook>> LibraryTask;
+		public static bool SetupRequired;
+
+		public override void OnFrameworkInitializationCompleted()
+		{
+			LoadStyles();
+
+			var SEGOEUI = new Typeface(new FontFamily(new Uri("avares://Libation/Assets/WINGDING.TTF"), "SEGOEUI_Local"));
+			var gtf = FontManager.Current.GetOrAddGlyphTypeface(SEGOEUI);
+
+
+			if (ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop)
+			{
+				if (SetupRequired)
+				{
+					var config = Configuration.Instance;
+
+					var defaultLibationFilesDir = Configuration.UserProfile;
+
+					// check for existing settings in default location
+					var defaultSettingsFile = Path.Combine(defaultLibationFilesDir, "Settings.json");
+					if (Configuration.SettingsFileIsValid(defaultSettingsFile))
+						config.SetLibationFiles(defaultLibationFilesDir);
+
+					if (config.LibationSettingsAreValid)
+					{
+						LibraryTask = Task.Run(() => DbContexts.GetLibrary_Flat_NoTracking(includeParents: true));
+						ShowMainWindow(desktop);
+					}
+					else
+					{
+						var setupDialog = new SetupDialog { Config = config };
+						setupDialog.Closing += Setup_Closing;
+						desktop.MainWindow = setupDialog;
+					}
+				}
+				else
+					ShowMainWindow(desktop);
+			}
+
+			base.OnFrameworkInitializationCompleted();
+		}
+
+		private async void Setup_Closing(object sender, System.ComponentModel.CancelEventArgs e)
+		{
+			var setupDialog = sender as SetupDialog;
+			var desktop = ApplicationLifetime as IClassicDesktopStyleApplicationLifetime;
+
+			try
+			{
+				// all returns should be preceded by either:
+				// - if config.LibationSettingsAreValid
+				// - error message, Exit()
+
+				if ((!setupDialog.IsNewUser
+					&& !setupDialog.IsReturningUser) ||
+					!await RunInstall(setupDialog))
+				{
+					await CancelInstallation();
+					return;
+				}
+
+
+				// most migrations go in here
+				AppScaffolding.LibationScaffolding.RunPostConfigMigrations(setupDialog.Config);
+
+				await MessageBox.VerboseLoggingWarning_ShowIfTrue();
+
+#if !DEBUG
+				//AutoUpdater.NET only works for WinForms or WPF application projects.
+				//checkForUpdate();
+#endif
+				// logging is init'd here
+				AppScaffolding.LibationScaffolding.RunPostMigrationScaffolding(setupDialog.Config);
+
+			}
+			catch (Exception ex)
+			{
+				var title = "Fatal error, pre-logging";
+				var body = "An unrecoverable error occurred. Since this error happened before logging could be initialized, this error can not be written to the log file.";
+				try
+				{
+					await MessageBox.ShowAdminAlert(null, body, title, ex);
+				}
+				catch
+				{
+					await MessageBox.Show($"{body}\r\n\r\n{ex.Message}\r\n\r\n{ex.StackTrace}", title, MessageBoxButtons.OK, MessageBoxIcon.Error);
+				}
+				return;
+			}
+
+			LibraryTask = Task.Run(() => DbContexts.GetLibrary_Flat_NoTracking(includeParents: true));
+			AudibleUtilities.AudibleApiStorage.EnsureAccountsSettingsFileExists();
+			ShowMainWindow(desktop);
+		}
+
+		private static async Task<bool> RunInstall(SetupDialog setupDialog)
+		{
+			var config = setupDialog.Config;
+
+			if (setupDialog.IsNewUser)
+			{
+				config.SetLibationFiles(Configuration.UserProfile);
+			}
+			else if (setupDialog.IsReturningUser)
+			{
+
+				var libationFilesDialog = new LibationFilesDialog();
+
+				if (await libationFilesDialog.ShowDialog<DialogResult>(setupDialog) != DialogResult.OK)
+					return false;
+
+				config.SetLibationFiles(libationFilesDialog.SelectedDirectory);
+				if (config.LibationSettingsAreValid)
+					return true;
+
+				// path did not result in valid settings
+				var continueResult = await MessageBox.Show(
+					$"No valid settings were found at this location.\r\nWould you like to create a new install settings in this folder?\r\n\r\n{libationFilesDialog.SelectedDirectory}",
+					"New install?",
+					MessageBoxButtons.YesNo,
+					MessageBoxIcon.Question);
+
+				if (continueResult != DialogResult.Yes)
+					return false;
+			}
+
+			// INIT DEFAULT SETTINGS
+			// if 'new user' was clicked, or if 'returning user' chose new install: show basic settings dialog
+			config.Books ??= Path.Combine(Configuration.UserProfile, "Books");
+
+			AppScaffolding.LibationScaffolding.PopulateMissingConfigValues(config);
+			return await new SettingsDialog().ShowDialog<DialogResult>(setupDialog) == DialogResult.OK
+				&& config.LibationSettingsAreValid;
+		}
+
+		static async Task CancelInstallation()
+		{
+			await MessageBox.Show("Initial set up cancelled.", "Cancelled", MessageBoxButtons.OK, MessageBoxIcon.Warning);
+			Environment.Exit(0);
+		}
+
+		private static void ShowMainWindow(IClassicDesktopStyleApplicationLifetime desktop)
+		{
+			var mainWindow = new MainWindow();
+			desktop.MainWindow = mainWindow;
+			mainWindow.RestoreSizeAndLocation(Configuration.Instance);
+			mainWindow.OnLoad();
+			mainWindow.OnLibraryLoaded(LibraryTask.GetAwaiter().GetResult());
+			mainWindow.Show();
+		}
+
+		private static void LoadStyles()
+		{
+			ProcessQueueBookFailedBrush = AvaloniaUtils.GetBrushFromResources("ProcessQueueBookFailedBrush");
+			ProcessQueueBookCompletedBrush = AvaloniaUtils.GetBrushFromResources("ProcessQueueBookCompletedBrush");
+			ProcessQueueBookCancelledBrush = AvaloniaUtils.GetBrushFromResources("ProcessQueueBookCancelledBrush");
+			ProcessQueueBookDefaultBrush = AvaloniaUtils.GetBrushFromResources("ProcessQueueBookDefaultBrush");
+			SeriesEntryGridBackgroundBrush = AvaloniaUtils.GetBrushFromResources("SeriesEntryGridBackgroundBrush");
+		}
+	}
+}

Source/LibationAvalonia/Assets/DataGridTheme.xaml

@@ -0,0 +1,658 @@
+<Styles xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+  <Styles.Resources>
+    <x:Double x:Key="ListAccentLowOpacity">0.6</x:Double>
+    <x:Double x:Key="ListAccentMediumOpacity">0.8</x:Double>
+    <Thickness x:Key="DataGridTextColumnCellTextBlockMargin">12,0,12,0</Thickness>
+
+    <StreamGeometry x:Key="DataGridSortIconDescendingPath">M1875 1011l-787 787v-1798h-128v1798l-787 -787l-90 90l941 941l941 -941z</StreamGeometry>
+    <StreamGeometry x:Key="DataGridRowGroupHeaderIconClosedPath">M515 93l930 931l-930 931l90 90l1022 -1021l-1022 -1021z</StreamGeometry>
+    <StreamGeometry x:Key="DataGridRowGroupHeaderIconOpenedPath">M1939 1581l90 -90l-1005 -1005l-1005 1005l90 90l915 -915z</StreamGeometry>
+
+    <SolidColorBrush x:Key="DataGridColumnHeaderForegroundBrush" Color="{DynamicResource SystemBaseMediumColor}" />
+    <SolidColorBrush x:Key="DataGridColumnHeaderBackgroundBrush" Color="{DynamicResource SystemAltHighColor}" />
+    <SolidColorBrush x:Key="DataGridColumnHeaderHoveredBackgroundBrush" Color="{DynamicResource SystemListLowColor}" />
+    <SolidColorBrush x:Key="DataGridColumnHeaderPressedBackgroundBrush" Color="{DynamicResource SystemListMediumColor}" />
+    <SolidColorBrush x:Key="DataGridColumnHeaderDraggedBackgroundBrush" Color="{DynamicResource SystemChromeMediumLowColor}" />
+
+    <SolidColorBrush x:Key="DataGridRowGroupHeaderBackgroundBrush" Color="{DynamicResource SystemChromeMediumColor}" />
+    <SolidColorBrush x:Key="DataGridRowGroupHeaderPressedBackgroundBrush" Color="{DynamicResource SystemListMediumColor}" />
+    <SolidColorBrush x:Key="DataGridRowGroupHeaderForegroundBrush" Color="{DynamicResource SystemBaseHighColor}" />
+    <SolidColorBrush x:Key="DataGridRowGroupHeaderHoveredBackgroundBrush" Color="{DynamicResource SystemListLowColor}" />
+
+    <StaticResource x:Key="DataGridRowBackgroundBrush" ResourceKey="SystemControlTransparentBrush" />
+    <SolidColorBrush x:Key="DataGridRowSelectedBackgroundBrush" Color="{DynamicResource SystemAccentColor}" />
+    <StaticResource x:Key="DataGridRowSelectedBackgroundOpacity" ResourceKey="ListAccentLowOpacity" />
+    <SolidColorBrush x:Key="DataGridRowSelectedHoveredBackgroundBrush" Color="{DynamicResource SystemAccentColor}" />
+    <StaticResource x:Key="DataGridRowSelectedHoveredBackgroundOpacity" ResourceKey="ListAccentMediumOpacity" />
+    <SolidColorBrush x:Key="DataGridRowSelectedUnfocusedBackgroundBrush" Color="{DynamicResource SystemAccentColor}" />
+    <StaticResource x:Key="DataGridRowSelectedUnfocusedBackgroundOpacity" ResourceKey="ListAccentLowOpacity" />
+    <SolidColorBrush x:Key="DataGridRowSelectedHoveredUnfocusedBackgroundBrush" Color="{DynamicResource SystemAccentColor}" />
+    <StaticResource x:Key="DataGridRowSelectedHoveredUnfocusedBackgroundOpacity" ResourceKey="ListAccentMediumOpacity" />
+    <SolidColorBrush x:Key="DataGridRowHoveredBackgroundColor" Color="{DynamicResource SystemListLowColor}" />
+    <SolidColorBrush x:Key="DataGridRowInvalidBrush" Color="{DynamicResource SystemErrorTextColor}" />
+
+    <SolidColorBrush x:Key="DataGridRowHeaderForegroundBrush" Color="{DynamicResource SystemBaseMediumColor}" />
+    <SolidColorBrush x:Key="DataGridRowHeaderBackgroundBrush" Color="{DynamicResource SystemAltHighColor}" />
+
+    <StaticResource x:Key="DataGridCellBackgroundBrush" ResourceKey="SystemControlTransparentBrush" />
+    <SolidColorBrush x:Key="DataGridCellFocusVisualPrimaryBrush" Color="{DynamicResource SystemBaseHighColor}" />
+    <SolidColorBrush x:Key="DataGridCellFocusVisualSecondaryBrush" Color="{DynamicResource SystemAltMediumColor}" />
+    <SolidColorBrush x:Key="DataGridCellInvalidBrush" Color="{DynamicResource SystemErrorTextColor}" />
+
+    <SolidColorBrush x:Key="DataGridGridLinesBrush"
+                     Opacity="0.4"
+                     Color="{DynamicResource SystemBaseMediumLowColor}" />
+    <StaticResource x:Key="DataGridCurrencyVisualPrimaryBrush" ResourceKey="SystemControlTransparentBrush" />
+    <SolidColorBrush x:Key="DataGridDetailsPresenterBackgroundBrush" Color="{DynamicResource SystemChromeMediumLowColor}" />
+    <StaticResource x:Key="DataGridFillerColumnGridLinesBrush" ResourceKey="SystemControlTransparentBrush" />
+  </Styles.Resources>
+
+  <Style Selector="DataGridCell">
+    <Setter Property="Background" Value="{DynamicResource DataGridCellBackgroundBrush}" />
+    <Setter Property="HorizontalContentAlignment" Value="Stretch" />
+    <Setter Property="VerticalContentAlignment" Value="Stretch" />
+    <Setter Property="FontSize" Value="12" />
+    <Setter Property="MinHeight" Value="32" />
+    <Setter Property="Focusable" Value="False" />
+    <Setter Property="Template">
+      <ControlTemplate>
+        <Border x:Name="CellBorder"
+                Background="{TemplateBinding Background}"
+                BorderBrush="{TemplateBinding BorderBrush}"
+                BorderThickness="{TemplateBinding BorderThickness}"
+                CornerRadius="{TemplateBinding CornerRadius}">
+          <Grid x:Name="PART_CellRoot" ColumnDefinitions="*,Auto">
+
+            <Rectangle x:Name="CurrencyVisual"
+                       HorizontalAlignment="Stretch"
+                       VerticalAlignment="Stretch"
+                       Fill="Transparent"
+                       IsHitTestVisible="False"
+                       Stroke="{DynamicResource DataGridCurrencyVisualPrimaryBrush}"
+                       StrokeThickness="1" />
+            <Grid x:Name="FocusVisual" IsHitTestVisible="False">
+              <Rectangle HorizontalAlignment="Stretch"
+                         VerticalAlignment="Stretch"
+                         Fill="Transparent"
+                         IsHitTestVisible="False"
+                         Stroke="{DynamicResource DataGridCellFocusVisualPrimaryBrush}"
+                         StrokeThickness="2" />
+              <Rectangle Margin="2"
+                         HorizontalAlignment="Stretch"
+                         VerticalAlignment="Stretch"
+                         Fill="Transparent"
+                         IsHitTestVisible="False"
+                         Stroke="{DynamicResource DataGridCellFocusVisualSecondaryBrush}"
+                         StrokeThickness="1" />
+				
+            </Grid>
+
+            <ContentPresenter Margin="{TemplateBinding Padding}"
+                              HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                              VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                              Content="{TemplateBinding Content}"
+                              ContentTemplate="{TemplateBinding ContentTemplate}"/>
+
+            <Rectangle x:Name="InvalidVisualElement"
+                       HorizontalAlignment="Stretch"
+                       VerticalAlignment="Stretch"
+                       IsHitTestVisible="False"
+                       Stroke="{DynamicResource DataGridCellInvalidBrush}"
+                       StrokeThickness="1" />
+
+            <Rectangle Name="PART_RightGridLine"
+                       Grid.Column="1"
+                       Width="1"
+                       VerticalAlignment="Stretch"
+                       Fill="{DynamicResource DataGridFillerColumnGridLinesBrush}" />
+          </Grid>
+        </Border>
+      </ControlTemplate>
+    </Setter>
+  </Style>
+
+  <Style Selector="DataGridCell > TextBlock#CellTextBlock">
+    <Setter Property="Margin" Value="{DynamicResource DataGridTextColumnCellTextBlockMargin}" />
+    <Setter Property="VerticalAlignment" Value="Center" />
+  </Style>
+  
+  <Style Selector="DataGridCell /template/ Rectangle#CurrencyVisual">
+    <Setter Property="IsVisible" Value="False" />
+  </Style>
+  <Style Selector="DataGridCell /template/ Grid#FocusVisual">
+    <Setter Property="IsVisible" Value="False" />
+  </Style>
+  <Style Selector="DataGridCell:current /template/ Rectangle#CurrencyVisual">
+    <Setter Property="IsVisible" Value="True" />
+  </Style>
+  <Style Selector="DataGrid:focus DataGridCell:current /template/ Grid#FocusVisual">
+    <Setter Property="IsVisible" Value="True" />
+  </Style>
+  <Style Selector="DataGridCell /template/ Rectangle#InvalidVisualElement">
+    <Setter Property="IsVisible" Value="False" />
+  </Style>
+  <Style Selector="DataGridCell:invalid /template/ Rectangle#InvalidVisualElement">
+    <Setter Property="IsVisible" Value="True" />
+  </Style>
+  <Style Selector="DataGridCell > TextBox DataValidationErrors">
+    <Setter Property="Template" Value="{DynamicResource TooltipDataValidationContentTemplate}" />
+    <Setter Property="ErrorTemplate" Value="{DynamicResource TooltipDataValidationErrorTemplate}" />
+  </Style>
+
+  <Style Selector="DataGridColumnHeader">
+    <Setter Property="Foreground" Value="{DynamicResource DataGridColumnHeaderForegroundBrush}" />
+    <Setter Property="Background" Value="{DynamicResource DataGridColumnHeaderBackgroundBrush}" />
+    <Setter Property="HorizontalContentAlignment" Value="Stretch" />
+    <Setter Property="VerticalContentAlignment" Value="Center" />
+    <Setter Property="Focusable" Value="False" />
+    <Setter Property="SeparatorBrush" Value="{DynamicResource DataGridGridLinesBrush}" />
+    <Setter Property="Padding" Value="6,0,0,0" />
+    <Setter Property="FontSize" Value="12" />
+    <Setter Property="MinHeight" Value="40" />
+    <Setter Property="Template">
+      <ControlTemplate>
+        <Border x:Name="HeaderBorder"
+                Background="{TemplateBinding Background}"
+                BorderBrush="{TemplateBinding BorderBrush}"
+                BorderThickness="{TemplateBinding BorderThickness}"
+                CornerRadius="{TemplateBinding CornerRadius}">
+          <Grid Name="PART_ColumnHeaderRoot" ColumnDefinitions="*,Auto">
+
+            <Grid Grid.Column="0" Margin="{TemplateBinding Padding}"
+                  HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                  VerticalAlignment="{TemplateBinding VerticalContentAlignment}" ColumnDefinitions="*,12">
+ 
+              <ContentPresenter Grid.Column="0"			  
+                    HorizontalAlignment="Left"
+                    VerticalAlignment="Center"
+					Content="{TemplateBinding Content}"
+					ContentTemplate="{TemplateBinding ContentTemplate}" />
+
+              <Path Name="SortIcon"
+                    Grid.Column="1"
+                    Height="12"
+                    Width="8"
+                    HorizontalAlignment="Right"
+                    VerticalAlignment="Center"
+                    Fill="{TemplateBinding Foreground}"
+                    Stretch="Uniform"
+                    Margin="0,0,4,0"
+					Data="F1 M -5.215,6.099L 5.215,6.099L 0,0L -5.215,6.099 Z "/>
+            </Grid>
+
+            <Rectangle Name="VerticalSeparator"
+                       Grid.Column="1"
+                       Width="1"
+                       VerticalAlignment="Stretch"
+                       Fill="{TemplateBinding SeparatorBrush}"
+                       IsVisible="{TemplateBinding AreSeparatorsVisible}" />
+
+            <Grid x:Name="FocusVisual" IsHitTestVisible="False">
+              <Rectangle x:Name="FocusVisualPrimary"
+                         HorizontalAlignment="Stretch"
+                         VerticalAlignment="Stretch"
+                         Fill="Transparent"
+                         IsHitTestVisible="False"
+                         Stroke="{DynamicResource DataGridCellFocusVisualPrimaryBrush}"
+                         StrokeThickness="2" />
+              <Rectangle x:Name="FocusVisualSecondary"
+                         Margin="2"
+                         HorizontalAlignment="Stretch"
+                         VerticalAlignment="Stretch"
+                         Fill="Transparent"
+                         IsHitTestVisible="False"
+                         Stroke="{DynamicResource DataGridCellFocusVisualSecondaryBrush}"
+                         StrokeThickness="1" />
+            </Grid>
+          </Grid>
+        </Border>
+      </ControlTemplate>
+    </Setter>
+  </Style>
+
+  <Style Selector="DataGridColumnHeader /template/ Grid#FocusVisual">
+    <Setter Property="IsVisible" Value="False" />
+  </Style>
+  <Style Selector="DataGridColumnHeader:focus-visible /template/ Grid#FocusVisual">
+    <Setter Property="IsVisible" Value="True" />
+  </Style>
+
+  <Style Selector="DataGridColumnHeader:pointerover /template/ Grid#PART_ColumnHeaderRoot">
+    <Setter Property="Background" Value="{DynamicResource DataGridColumnHeaderHoveredBackgroundBrush}" />
+  </Style>
+  <Style Selector="DataGridColumnHeader:pressed /template/ Grid#PART_ColumnHeaderRoot">
+    <Setter Property="Background" Value="{DynamicResource DataGridColumnHeaderPressedBackgroundBrush}" />
+  </Style>
+
+  <Style Selector="DataGridColumnHeader:dragIndicator">
+    <Setter Property="Opacity" Value="0.5" />
+  </Style>
+
+  <Style Selector="DataGridColumnHeader /template/ Path#SortIcon">
+    <Setter Property="IsVisible" Value="False" />
+	<Setter Property="RenderTransform">
+      <Setter.Value>
+        <ScaleTransform ScaleX="0.9" ScaleY="0.9" />
+      </Setter.Value>
+    </Setter>
+  </Style>
+
+  <Style Selector="DataGridColumnHeader:sortascending /template/ Path#SortIcon">
+    <Setter Property="IsVisible" Value="True" />
+  </Style>
+
+  <Style Selector="DataGridColumnHeader:sortdescending /template/ Path#SortIcon">
+    <Setter Property="IsVisible" Value="True" />
+    <Setter Property="RenderTransform">
+      <Setter.Value>
+        <ScaleTransform ScaleX="0.9" ScaleY="-0.9" />
+      </Setter.Value>
+    </Setter>
+  </Style>
+
+  <Style Selector="DataGridRow">
+    <Setter Property="Focusable" Value="False" />
+    <Setter Property="Template">
+      <ControlTemplate>
+        <Border x:Name="RowBorder"
+                Background="{TemplateBinding Background}"
+                BorderBrush="{TemplateBinding BorderBrush}"
+                BorderThickness="{TemplateBinding BorderThickness}"
+                CornerRadius="{TemplateBinding CornerRadius}">
+          <DataGridFrozenGrid Name="PART_Root"
+                              ColumnDefinitions="Auto,*"
+                              RowDefinitions="*,Auto,Auto">
+
+            <Rectangle Name="BackgroundRectangle"
+                       Grid.RowSpan="2"
+                       Grid.ColumnSpan="2" />
+            <Rectangle x:Name="InvalidVisualElement"
+                       Grid.ColumnSpan="2"
+                       Fill="{DynamicResource DataGridRowInvalidBrush}" />
+
+            <DataGridRowHeader Name="PART_RowHeader"
+                               Grid.RowSpan="3"
+                               DataGridFrozenGrid.IsFrozen="True" />
+            <DataGridCellsPresenter Name="PART_CellsPresenter"
+                                    Grid.Column="1"
+                                    DataGridFrozenGrid.IsFrozen="True" />
+            <DataGridDetailsPresenter Name="PART_DetailsPresenter"
+                                      Grid.Row="1"
+                                      Grid.Column="1"
+                                      Background="{DynamicResource DataGridDetailsPresenterBackgroundBrush}" />
+            <Rectangle Name="PART_BottomGridLine"
+                       Grid.Row="2"
+                       Grid.Column="1"
+                       Height="1"
+                       HorizontalAlignment="Stretch" />
+
+          </DataGridFrozenGrid>
+        </Border>
+      </ControlTemplate>
+    </Setter>
+  </Style>
+
+  <Style Selector="DataGridRow">
+    <Setter Property="Background" Value="{Binding $parent[DataGrid].RowBackground}" />
+  </Style>
+  <Style Selector="DataGridRow:nth-child(even)">
+    <Setter Property="Background" Value="{Binding $parent[DataGrid].AlternatingRowBackground}" />
+  </Style>
+
+  <Style Selector="DataGridRow /template/ Rectangle#InvalidVisualElement">
+    <Setter Property="Opacity" Value="0" />
+  </Style>
+  <Style Selector="DataGridRow:invalid /template/ Rectangle#InvalidVisualElement">
+    <Setter Property="Opacity" Value="0.4" />
+  </Style>
+  <Style Selector="DataGridRow:invalid /template/ Rectangle#BackgroundRectangle">
+    <Setter Property="Opacity" Value="0" />
+  </Style>
+
+  <Style Selector="DataGridRow /template/ Rectangle#BackgroundRectangle">
+    <Setter Property="Fill" Value="{DynamicResource DataGridRowBackgroundBrush}" />
+  </Style>
+  <Style Selector="DataGridRow:pointerover /template/ Rectangle#BackgroundRectangle">
+    <Setter Property="Fill" Value="{DynamicResource DataGridRowHoveredBackgroundColor}" />
+  </Style>
+  <Style Selector="DataGridRow:selected /template/ Rectangle#BackgroundRectangle">
+    <Setter Property="Fill" Value="{DynamicResource DataGridRowSelectedUnfocusedBackgroundBrush}" />
+    <Setter Property="Opacity" Value="{DynamicResource DataGridRowSelectedUnfocusedBackgroundOpacity}" />
+  </Style>
+  <Style Selector="DataGridRow:selected:pointerover /template/ Rectangle#BackgroundRectangle">
+    <Setter Property="Fill" Value="{DynamicResource DataGridRowSelectedHoveredUnfocusedBackgroundBrush}" />
+    <Setter Property="Opacity" Value="{DynamicResource DataGridRowSelectedHoveredUnfocusedBackgroundOpacity}" />
+  </Style>
+  <Style Selector="DataGridRow:selected:focus /template/ Rectangle#BackgroundRectangle">
+    <Setter Property="Fill" Value="{DynamicResource DataGridRowSelectedBackgroundBrush}" />
+    <Setter Property="Opacity" Value="{DynamicResource DataGridRowSelectedBackgroundOpacity}" />
+  </Style>
+  <Style Selector="DataGridRow:selected:pointerover:focus /template/ Rectangle#BackgroundRectangle">
+    <Setter Property="Fill" Value="{DynamicResource DataGridRowSelectedHoveredBackgroundBrush}" />
+    <Setter Property="Opacity" Value="{DynamicResource DataGridRowSelectedHoveredBackgroundOpacity}" />
+  </Style>
+
+  <Style Selector="DataGridRowHeader">
+    <Setter Property="Foreground" Value="{DynamicResource DataGridRowHeaderForegroundBrush}" />
+    <Setter Property="Background" Value="{DynamicResource DataGridRowHeaderBackgroundBrush}" />
+    <Setter Property="Focusable" Value="False" />
+    <Setter Property="SeparatorBrush" Value="{DynamicResource DataGridGridLinesBrush}" />
+    <Setter Property="AreSeparatorsVisible" Value="False" />
+    <Setter Property="Template">
+      <ControlTemplate>
+        <Grid x:Name="PART_Root"
+              RowDefinitions="*,*,Auto"
+              ColumnDefinitions="Auto,*">
+          <Border Grid.RowSpan="3"
+                  Grid.ColumnSpan="2"
+                  BorderBrush="{TemplateBinding SeparatorBrush}"
+                  BorderThickness="0,0,1,0">
+            <Grid Background="{TemplateBinding Background}">
+              <Rectangle x:Name="RowInvalidVisualElement"
+                         Fill="{DynamicResource DataGridRowInvalidBrush}"
+                         Stretch="Fill" />
+              <Rectangle x:Name="BackgroundRectangle"
+                         Stretch="Fill" />
+            </Grid>
+          </Border>
+          <Rectangle x:Name="HorizontalSeparator"
+                     Grid.Row="2"
+                     Grid.ColumnSpan="2"
+                     Height="1"
+                     Margin="1,0,1,0"
+                     HorizontalAlignment="Stretch"
+                     Fill="{TemplateBinding SeparatorBrush}"
+                     IsVisible="{TemplateBinding AreSeparatorsVisible}" />
+
+          <ContentPresenter Grid.RowSpan="2"
+                            Grid.Column="1"
+                            HorizontalAlignment="Center"
+                            VerticalAlignment="Center"
+                            Content="{TemplateBinding Content}" />
+        </Grid>
+      </ControlTemplate>
+    </Setter>
+  </Style>
+
+  <Style Selector="DataGridRowHeader /template/ Rectangle#RowInvalidVisualElement">
+    <Setter Property="Opacity" Value="0" />
+  </Style>
+  <Style Selector="DataGridRowHeader:invalid /template/ Rectangle#RowInvalidVisualElement">
+    <Setter Property="Opacity" Value="0.4" />
+  </Style>
+  <Style Selector="DataGridRowHeader:invalid /template/ Rectangle#BackgroundRectangle">
+    <Setter Property="Opacity" Value="0" />
+  </Style>
+
+  <Style Selector="DataGridRowHeader /template/ Rectangle#BackgroundRectangle">
+    <Setter Property="Fill" Value="{DynamicResource DataGridRowBackgroundBrush}" />
+  </Style>
+  <Style Selector="DataGridRow:pointerover DataGridRowHeader /template/ Rectangle#BackgroundRectangle">
+    <Setter Property="Fill" Value="{DynamicResource DataGridRowHoveredBackgroundColor}" />
+  </Style>
+  <Style Selector="DataGridRowHeader:selected /template/ Rectangle#BackgroundRectangle">
+    <Setter Property="Fill" Value="{DynamicResource DataGridRowSelectedUnfocusedBackgroundBrush}" />
+    <Setter Property="Opacity" Value="{DynamicResource DataGridRowSelectedUnfocusedBackgroundOpacity}" />
+  </Style>
+  <Style Selector="DataGridRow:pointerover DataGridRowHeader:selected /template/ Rectangle#BackgroundRectangle">
+    <Setter Property="Fill" Value="{DynamicResource DataGridRowSelectedHoveredUnfocusedBackgroundBrush}" />
+    <Setter Property="Opacity" Value="{DynamicResource DataGridRowSelectedHoveredUnfocusedBackgroundOpacity}" />
+  </Style>
+  <Style Selector="DataGridRowHeader:selected:focus /template/ Rectangle#BackgroundRectangle">
+    <Setter Property="Fill" Value="{DynamicResource DataGridRowSelectedBackgroundBrush}" />
+    <Setter Property="Opacity" Value="{DynamicResource DataGridRowSelectedBackgroundOpacity}" />
+  </Style>
+  <Style Selector="DataGridRow:pointerover DataGridRowHeader:selected:focus /template/ Rectangle#BackgroundRectangle">
+    <Setter Property="Fill" Value="{DynamicResource DataGridRowSelectedHoveredBackgroundBrush}" />
+    <Setter Property="Opacity" Value="{DynamicResource DataGridRowSelectedHoveredBackgroundOpacity}" />
+  </Style>
+
+  <Style Selector="DataGridRowGroupHeader">
+    <Setter Property="Focusable" Value="False" />
+    <Setter Property="Foreground" Value="{DynamicResource DataGridRowGroupHeaderForegroundBrush}" />
+    <Setter Property="Background" Value="{DynamicResource DataGridRowGroupHeaderBackgroundBrush}" />
+    <Setter Property="FontSize" Value="15" />
+    <Setter Property="MinHeight" Value="32" />
+    <Setter Property="Template">
+      <ControlTemplate>
+        <DataGridFrozenGrid Name="PART_Root"
+                            MinHeight="{TemplateBinding MinHeight}"
+                            ColumnDefinitions="Auto,Auto,Auto,Auto,*"
+                            RowDefinitions="*,Auto">
+
+          <Rectangle Name="IndentSpacer"
+                     Grid.Column="1" />
+          <ToggleButton Name="ExpanderButton"
+                        Grid.Column="2"
+                        Width="12"
+                        Height="12"
+                        Margin="12,0,0,0"
+                        BorderBrush="{TemplateBinding BorderBrush}"
+                        BorderThickness="{TemplateBinding BorderThickness}"
+                        Background="{TemplateBinding Background}"
+                        CornerRadius="{TemplateBinding CornerRadius}"
+                        Focusable="False"
+                        Foreground="{TemplateBinding Foreground}" />
+
+          <StackPanel Grid.Column="3"
+                      Orientation="Horizontal"
+                      VerticalAlignment="Center"
+                      Margin="12,0,0,0">
+            <TextBlock Name="PropertyNameElement"
+                       Margin="4,0,0,0"
+                       IsVisible="{TemplateBinding IsPropertyNameVisible}"
+                       Foreground="{TemplateBinding Foreground}" />
+            <TextBlock Margin="4,0,0,0"
+                       Text="{Binding Key}"
+                       Foreground="{TemplateBinding Foreground}" />
+            <TextBlock Name="ItemCountElement"
+                       Margin="4,0,0,0"
+                       IsVisible="{TemplateBinding IsItemCountVisible}"
+                       Foreground="{TemplateBinding Foreground}" />
+          </StackPanel>
+
+          <Rectangle x:Name="CurrencyVisual"
+                     Grid.ColumnSpan="5"
+                     HorizontalAlignment="Stretch"
+                     VerticalAlignment="Stretch"
+                     Fill="Transparent"
+                     IsHitTestVisible="False"
+                     Stroke="{DynamicResource DataGridCurrencyVisualPrimaryBrush}"
+                     StrokeThickness="1" />
+          <Grid x:Name="FocusVisual"
+                Grid.ColumnSpan="5"
+                IsHitTestVisible="False">
+            <Rectangle HorizontalAlignment="Stretch"
+                       VerticalAlignment="Stretch"
+                       Fill="Transparent"
+                       IsHitTestVisible="False"
+                       Stroke="{DynamicResource DataGridCellFocusVisualPrimaryBrush}"
+                       StrokeThickness="2" />
+            <Rectangle Margin="2"
+                       HorizontalAlignment="Stretch"
+                       VerticalAlignment="Stretch"
+                       Fill="Transparent"
+                       IsHitTestVisible="False"
+                       Stroke="{DynamicResource DataGridCellFocusVisualSecondaryBrush}"
+                       StrokeThickness="1" />
+          </Grid>
+
+          <DataGridRowHeader Name="PART_RowHeader"
+                             Grid.RowSpan="2"
+                             DataGridFrozenGrid.IsFrozen="True" />
+
+          <Rectangle x:Name="PART_BottomGridLine"
+                     Grid.Row="1"
+                     Grid.ColumnSpan="5"
+                     Height="1" />
+        </DataGridFrozenGrid>
+      </ControlTemplate>
+    </Setter>
+  </Style>
+
+  <Style Selector="DataGridRowGroupHeader /template/ ToggleButton#ExpanderButton">
+    <Setter Property="Template">
+      <ControlTemplate>
+        <Border Grid.Column="0"
+                Width="12"
+                Height="12"
+                Background="Transparent"
+                HorizontalAlignment="Center"
+                VerticalAlignment="Center">
+          <Path Fill="{TemplateBinding Foreground}"
+                HorizontalAlignment="Right"
+                VerticalAlignment="Center"
+                Stretch="Uniform" />
+        </Border>
+      </ControlTemplate>
+    </Setter>
+  </Style>
+
+  <Style Selector="DataGridRowGroupHeader /template/ ToggleButton#ExpanderButton /template/ Path">
+    <Setter Property="Data" Value="{StaticResource DataGridRowGroupHeaderIconOpenedPath}" />
+    <Setter Property="Stretch" Value="Uniform" />
+  </Style>
+
+  <Style Selector="DataGridRowGroupHeader /template/ ToggleButton#ExpanderButton:checked /template/ Path">
+    <Setter Property="Data" Value="{StaticResource DataGridRowGroupHeaderIconClosedPath}" />
+    <Setter Property="Stretch" Value="UniformToFill" />
+  </Style>
+
+  <Style Selector="DataGridRowGroupHeader /template/ DataGridFrozenGrid#PART_Root">
+    <Setter Property="Background" Value="{Binding $parent[DataGridRowGroupHeader].Background}" />
+  </Style>
+  <Style Selector="DataGridRowGroupHeader:pointerover /template/ DataGridFrozenGrid#PART_Root">
+    <Setter Property="Background" Value="{DynamicResource DataGridRowGroupHeaderHoveredBackgroundBrush}" />
+  </Style>
+  <Style Selector="DataGridRowGroupHeader:pressed /template/ DataGridFrozenGrid#PART_Root">
+    <Setter Property="Background" Value="{DynamicResource DataGridRowGroupHeaderPressedBackgroundBrush}" />
+  </Style>
+
+  <Style Selector="DataGridRowGroupHeader /template/ Rectangle#CurrencyVisual">
+    <Setter Property="IsVisible" Value="False" />
+  </Style>
+  <Style Selector="DataGridRowGroupHeader /template/ Grid#FocusVisual">
+    <Setter Property="IsVisible" Value="False" />
+  </Style>
+  <Style Selector="DataGridRowGroupHeader:current /template/ Rectangle#CurrencyVisual">
+    <Setter Property="IsVisible" Value="True" />
+  </Style>
+  <Style Selector="DataGrid:focus DataGridRowGroupHeader:current /template/ Grid#FocusVisual">
+    <Setter Property="IsVisible" Value="True" />
+  </Style>
+
+  <Style Selector="DataGrid">
+    <Setter Property="RowBackground" Value="Transparent" />
+    <Setter Property="AlternatingRowBackground" Value="Transparent" />
+    <Setter Property="HeadersVisibility" Value="Column" />
+    <Setter Property="HorizontalScrollBarVisibility" Value="Auto" />
+    <Setter Property="VerticalScrollBarVisibility" Value="Auto" />
+    <Setter Property="SelectionMode" Value="Extended" />
+    <Setter Property="GridLinesVisibility" Value="None" />
+    <Setter Property="HorizontalGridLinesBrush" Value="{DynamicResource DataGridGridLinesBrush}" />
+    <Setter Property="VerticalGridLinesBrush" Value="{DynamicResource DataGridGridLinesBrush}" />
+    <Setter Property="DropLocationIndicatorTemplate">
+      <Template>
+        <Rectangle Fill="{DynamicResource DataGridDropLocationIndicatorBackground}"
+                   Width="2" />
+      </Template>
+    </Setter>
+    <Setter Property="Template">
+      <ControlTemplate>
+        <Border x:Name="DataGridBorder"
+                Background="{TemplateBinding Background}"
+                BorderBrush="{TemplateBinding BorderBrush}"
+                BorderThickness="{TemplateBinding BorderThickness}"
+                CornerRadius="{TemplateBinding CornerRadius}">
+          <Grid ColumnDefinitions="Auto,*,Auto" RowDefinitions="Auto,*,Auto,Auto">
+            <Grid.Resources>
+              <ControlTemplate x:Key="TopLeftHeaderTemplate"
+                               TargetType="DataGridColumnHeader">
+                <Grid x:Name="TopLeftHeaderRoot"
+                      RowDefinitions="*,*,Auto">
+                  <Border Grid.RowSpan="2"
+                          BorderThickness="0,0,1,0"
+                          BorderBrush="{DynamicResource DataGridGridLinesBrush}" />
+                  <Rectangle Grid.RowSpan="2"
+                             VerticalAlignment="Bottom"
+                             StrokeThickness="1"
+                             Height="1"
+                             Fill="{DynamicResource DataGridGridLinesBrush}" />
+                </Grid>
+              </ControlTemplate>
+              <ControlTemplate x:Key="TopRightHeaderTemplate"
+                               TargetType="DataGridColumnHeader">
+                <Grid x:Name="RootElement" />
+              </ControlTemplate>
+            </Grid.Resources>
+
+            <DataGridColumnHeader Name="PART_TopLeftCornerHeader"
+                                  Template="{StaticResource TopLeftHeaderTemplate}" />
+            <DataGridColumnHeadersPresenter Name="PART_ColumnHeadersPresenter"
+                                            Grid.Column="1"
+                                            Grid.ColumnSpan="2" />
+            <!--<DataGridColumnHeader Name="PART_TopRightCornerHeader"
+                                  Grid.Column="2"
+                                  Template="{StaticResource TopRightHeaderTemplate}" />-->
+            <Rectangle Name="PART_ColumnHeadersAndRowsSeparator"
+                       Grid.ColumnSpan="3"
+                       VerticalAlignment="Bottom"
+                       Height="1"
+                       Fill="{DynamicResource DataGridGridLinesBrush}" />
+
+            <DataGridRowsPresenter Name="PART_RowsPresenter"
+                                   Grid.Row="1"
+                                   Grid.RowSpan="2"
+                                   Grid.ColumnSpan="3">
+              <DataGridRowsPresenter.GestureRecognizers>
+                <ScrollGestureRecognizer CanHorizontallyScroll="True" CanVerticallyScroll="True" />
+              </DataGridRowsPresenter.GestureRecognizers>
+            </DataGridRowsPresenter>
+            <Rectangle Name="PART_BottomRightCorner"
+                       Fill="{DynamicResource DataGridScrollBarsSeparatorBackground}"
+                       Grid.Column="2"
+                       Grid.Row="2" />
+            <!--<Rectangle Name="BottomLeftCorner"
+                       Fill="{DynamicResource DataGridScrollBarsSeparatorBackground}"
+                       Grid.Row="2"
+                       Grid.ColumnSpan="2" />-->
+            <ScrollBar Name="PART_VerticalScrollbar"
+                       Orientation="Vertical"
+                       Grid.Column="2"
+                       Grid.Row="1"
+                       Width="{DynamicResource ScrollBarSize}" />
+
+            <Grid Grid.Column="1"
+                  Grid.Row="2"
+                  ColumnDefinitions="Auto,*">
+              <Rectangle Name="PART_FrozenColumnScrollBarSpacer" />
+              <ScrollBar Name="PART_HorizontalScrollbar"
+                         Grid.Column="1"
+                         Orientation="Horizontal"
+                         Height="{DynamicResource ScrollBarSize}" />
+            </Grid>
+            <Border x:Name="PART_DisabledVisualElement"
+                    Grid.ColumnSpan="3"
+                    Grid.RowSpan="4"
+                    IsHitTestVisible="False"
+                    HorizontalAlignment="Stretch"
+                    VerticalAlignment="Stretch"
+                    CornerRadius="2"
+                    Background="{DynamicResource DataGridDisabledVisualElementBackground}"
+                    IsVisible="{Binding !$parent[DataGrid].IsEnabled}" />
+          </Grid>
+        </Border>
+      </ControlTemplate>
+    </Setter>
+  </Style>
+
+  <Style Selector="DataGrid:empty-columns /template/ DataGridColumnHeader#PART_TopLeftCornerHeader">
+    <Setter Property="IsVisible" Value="False" />
+  </Style>
+  <Style Selector="DataGrid:empty-columns /template/ DataGridColumnHeadersPresenter#PART_ColumnHeadersPresenter">
+    <Setter Property="IsVisible" Value="False" />
+  </Style>
+  <Style Selector="DataGrid:empty-columns /template/ Rectangle#PART_ColumnHeadersAndRowsSeparator">
+    <Setter Property="IsVisible" Value="False" />
+  </Style>
+</Styles>

Source/LibationAvalonia/Assets/LibationStyles.xaml

@@ -0,0 +1,12 @@
+<Styles xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+	<Styles.Resources>
+		<Color x:Key="SeriesEntryGridBackgroundColor">#FFE6FFE6</Color>
+
+		<SolidColorBrush x:Key="SeriesEntryGridBackgroundBrush"  Color="{StaticResource SeriesEntryGridBackgroundColor}" />
+		<SolidColorBrush x:Key="ProcessQueueBookFailedBrush" Color="LightCoral" />
+		<SolidColorBrush x:Key="ProcessQueueBookCompletedBrush" Color="PaleGreen" />
+		<SolidColorBrush x:Key="ProcessQueueBookCancelledBrush" Color="Khaki" />
+		<SolidColorBrush x:Key="ProcessQueueBookDefaultBrush" Color="{StaticResource SystemAltHighColor}" />
+		<SolidColorBrush x:Key="ProcessQueueBookBorderBrush" Color="Gray" />
+	</Styles.Resources>
+</Styles>