v8.1.7

Fix some bugs with user settings.

.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

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

@@ -66,4 +66,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/.config/dotnet-tools.json

@@ -0,0 +1,12 @@
+{
+  "version": 1,
+  "isRoot": true,
+  "tools": {
+    "frogvall.dotnetbumpversion": {
+      "version": "3.0.1",
+      "commands": [
+        "bump-version"
+      ]
+    }
+  }
+}

Source/AaxDecrypter/AaxDecrypter.csproj

@@ -5,10 +5,19 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="AAXClean.Codecs" Version="0.2.9" />
+    <PackageReference Include="AAXClean.Codecs" Version="0.2.10" />
   </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="..\FileManager\FileManager.csproj" />
   </ItemGroup>
 

Source/AaxDecrypter/AaxcDownloadConvertBase.cs

@@ -34,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]");

Source/AaxDecrypter/AaxcDownloadMultiConverter.cs

@@ -2,31 +2,65 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using System.Threading.Tasks;
 using AAXClean;
 using AAXClean.Codecs;
-using Dinah.Core;
-using Dinah.Core.StepRunner;
 using FileManager;
 
 namespace AaxDecrypter
 {
 	public class AaxcDownloadMultiConverter : AaxcDownloadConvertBase
 	{
-		protected override StepSequence Steps { get; }
 		private static TimeSpan minChapterLength { get; } = TimeSpan.FromSeconds(3);
 		private List<string> multiPartFilePaths { get; } = new List<string>();
 
 		public AaxcDownloadMultiConverter(string outFileName, string cacheDirectory, IDownloadOptions dlOptions)
-			: base(outFileName, cacheDirectory, dlOptions)
-		{
-			Steps = new StepSequence
-			{
-				Name = "Download and Convert Aaxc To " + DownloadOptions.OutputFormat,
+			: base(outFileName, cacheDirectory, dlOptions) { }
 
-				["Step 1: Get Aaxc Metadata"] = Step_GetMetadata,
-				["Step 2: Download Decrypted Audiobook"] = Step_DownloadAudiobookAsMultipleFilesPerChapter,
-				["Step 3: Cleanup"] = Step_Cleanup,
-			};
+		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;
+			}
 		}
 
 		/*
@@ -53,7 +87,7 @@ The book will be split into the following files:
 
 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()
+		private async Task<bool> Step_DownloadAudiobookAsMultipleFilesPerChapter()
 		{
 			var zeroProgress = Step_DownloadAudiobook_Start();
 
@@ -86,9 +120,9 @@ That naming may not be desirable for everyone, but it's an easy change to instea
 
 			AaxFile.ConversionProgressUpdate += AaxFile_ConversionProgressUpdate;
 			if (DownloadOptions.OutputFormat == OutputFormat.M4b)
-				result = ConvertToMultiMp4a(splitChapters);
+				result = await ConvertToMultiMp4a(splitChapters);
 			else
-				result = ConvertToMultiMp3(splitChapters);
+				result = await ConvertToMultiMp3(splitChapters);
 			AaxFile.ConversionProgressUpdate -= AaxFile_ConversionProgressUpdate;
 
 			Step_DownloadAudiobook_End(zeroProgress);
@@ -96,10 +130,10 @@ That naming may not be desirable for everyone, but it's an easy change to instea
 			return result == ConversionResult.NoErrorsDetected;
 		}
 
-		private ConversionResult ConvertToMultiMp4a(ChapterInfo splitChapters)
+		private Task<ConversionResult> ConvertToMultiMp4a(ChapterInfo splitChapters)
 		{
 			var chapterCount = 0;
-			return AaxFile.ConvertToMultiMp4a
+			return AaxFile.ConvertToMultiMp4aAsync
 				(
 					splitChapters,
 					newSplitCallback => Callback(++chapterCount, splitChapters, newSplitCallback),
@@ -107,10 +141,10 @@ That naming may not be desirable for everyone, but it's an easy change to instea
 				);
 		}
 
-		private ConversionResult ConvertToMultiMp3(ChapterInfo splitChapters)
+		private Task<ConversionResult> ConvertToMultiMp3(ChapterInfo splitChapters)
 		{
 			var chapterCount = 0;
-			return AaxFile.ConvertToMultiMp3
+			return AaxFile.ConvertToMultiMp3Async
 				(
 					splitChapters,
 					newSplitCallback => Callback(++chapterCount, splitChapters, newSplitCallback),
@@ -121,7 +155,7 @@ That naming may not be desirable for everyone, but it's an easy change to instea
 
 
 		private void Callback(int currentChapter, ChapterInfo splitChapters, NewMP3SplitCallback newSplitCallback)
-			=> Callback(currentChapter, splitChapters, newSplitCallback);
+			=> Callback(currentChapter, splitChapters, newSplitCallback as NewSplitCallback);
 
 		private void Callback(int currentChapter, ChapterInfo splitChapters, NewSplitCallback newSplitCallback)
 		{
@@ -141,7 +175,7 @@ That naming may not be desirable for everyone, but it's an easy change to instea
 		private FileStream createOutputFileStream(MultiConvertFileProperties multiConvertFileProperties)
 		{
 			var fileName = DownloadOptions.GetMultipartFileName(multiConvertFileProperties);
-			fileName = FileUtility.GetValidFilename(fileName);
+			fileName = FileUtility.GetValidFilename(fileName, DownloadOptions.ReplacementCharacters);
 
 			multiPartFilePaths.Add(fileName);
 

Source/AaxDecrypter/AaxcDownloadSingleConverter.cs

@@ -1,31 +1,74 @@
 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)
-		{
-			Steps = new StepSequence
-			{
-				Name = "Download and Convert Aaxc To " + DownloadOptions.OutputFormat,
+			: base(outFileName, cacheDirectory, dlOptions) { }
 
-				["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,
-			};
+		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 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;
+				}
+
+				//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;
+				}
+
+				//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;
+				}
+
+				//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;
+				}
+
+				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;
+			}
 		}
 
-		private bool Step_DownloadAudiobookAsSingleFile()
+		private async Task<bool> Step_DownloadAudiobookAsSingleFile()
 		{
 			var zeroProgress = Step_DownloadAudiobook_Start();
 
@@ -35,13 +78,10 @@ namespace AaxDecrypter
 			OnFileCreated(OutputFileName);
 
 			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;
 
-			DownloadOptions.ChapterInfo = AaxFile.Chapters;
+			ConversionResult decryptionResult = await decryptAsync(outputFile);
+
+			AaxFile.ConversionProgressUpdate -= AaxFile_ConversionProgressUpdate;
 
 			Step_DownloadAudiobook_End(zeroProgress);
 
@@ -51,5 +91,23 @@ namespace AaxDecrypter
 
 			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

@@ -4,7 +4,6 @@ using System.IO;
 using System.Threading.Tasks;
 using Dinah.Core;
 using Dinah.Core.Net.Http;
-using Dinah.Core.StepRunner;
 using FileManager;
 
 namespace AaxDecrypter
@@ -31,7 +30,6 @@ namespace AaxDecrypter
 		// 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; }
@@ -64,15 +62,7 @@ namespace AaxDecrypter
 				OnRetrievedCoverArt(coverArt);
 		}
 
-		public bool Run()
-		{
-			var (IsSuccess, _) = 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);
@@ -103,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/IDownloadOptions.cs

@@ -4,6 +4,7 @@ namespace AaxDecrypter
 {
     public interface IDownloadOptions
 	{
+        FileManager.ReplacementCharacters ReplacementCharacters { get; }
         string DownloadUrl { get; }
         string UserAgent { get; }
         string AudibleKey { get; }
@@ -13,10 +14,11 @@ namespace AaxDecrypter
         bool RetainEncryptedFile { get; }
         bool StripUnabridged { get; }
         bool CreateCueSheet { get; }
-        ChapterInfo ChapterInfo { get; set; }
-        NAudio.Lame.LameConfig LameConfig { get; set; }
-        bool Downsample { get; set; }
-        bool MatchSourceBitrate { get; set; }
+        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

@@ -2,29 +2,63 @@
 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, IDownloadOptions dlLic)
-			: base(outFileName, cacheDirectory, dlLic)
-		{
-			Steps = new StepSequence
-			{
-				Name = "Download Mp3 Audiobook",
+			: base(outFileName, cacheDirectory, dlLic) { }
 
-				["Step 1: Get Mp3 Metadata"] = Step_GetMetadata,
-				["Step 2: Download Audiobook"] = Step_DownloadAudiobookAsSingleFile,
-				["Step 3: Create Cue"] = Step_CreateCue,
-				["Step 4: Cleanup"] = Step_Cleanup,
-			};
+		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 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 Task CancelAsync()
 		{
 			IsCanceled = true;
@@ -67,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,14 @@
-<?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.1.0.1</Version>
+    <Version>8.1.7.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" />
   </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\ApplicationServices\ApplicationServices.csproj" />
     <ProjectReference Include="..\AudibleUtilities\AudibleUtilities.csproj" />
   </ItemGroup>
-
-</Project>
+</Project>

Source/AppScaffolding/LibationScaffolding.cs

@@ -117,6 +117,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;
 
@@ -470,7 +473,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,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>net6.0-windows</TargetFramework>
@@ -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

@@ -134,7 +134,7 @@ namespace ApplicationServices
 				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,7 +251,7 @@ 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");
 			}
 		}
 
@@ -274,7 +274,7 @@ namespace ApplicationServices
 					.DistinctBy(s => s.Series.AudibleSeriesId)
 					.ToList();
 
-				// The Catalog endpointdoes not require authentication.
+				// The Catalog endpoint does not require authentication.
 				var api = new ApiUnauthenticated(accounts[0].Locale);
 
 				var seriesParents = orphanedSeries.Select(o => o.Series.AudibleSeriesId).ToList();
@@ -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/AudibleUtilities/ApiExtended.cs

@@ -145,7 +145,7 @@ 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);
 
@@ -162,10 +162,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 +206,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 +217,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 +338,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

@@ -5,11 +5,19 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="AudibleApi" Version="4.1.0.1" />
+    <PackageReference Include="AudibleApi" Version="4.3.1.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

@@ -6,13 +6,11 @@
 
   <PropertyGroup>
     <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
-    <ApplicationIcon />
     <OutputType>Library</OutputType>
-    <StartupObject />
   </PropertyGroup>
   
   <ItemGroup>
-    <PackageReference Include="Dinah.EntityFrameworkCore" Version="4.1.0.1" />
+    <PackageReference Include="Dinah.EntityFrameworkCore" Version="4.1.1.1" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="6.0.6">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
@@ -23,8 +21,16 @@
       <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,62 @@
+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

@@ -4,6 +4,14 @@
     <TargetFramework>net6.0-windows</TargetFramework>
   </PropertyGroup>
 
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+    <DebugType>embedded</DebugType>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
+    <DebugType>embedded</DebugType>
+  </PropertyGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\AudibleUtilities\AudibleUtilities.csproj" />
     <ProjectReference Include="..\DataLayer\DataLayer.csproj" />

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/ConvertToMp3.cs

@@ -43,7 +43,7 @@ namespace FileLiberator
 					var proposedMp3Path = Mp3FileName(m4bPath);
 					if (File.Exists(proposedMp3Path) || !File.Exists(m4bPath)) continue;
 
-					m4bBook = new Mp4File(m4bPath, FileAccess.Read);
+					m4bBook = await Task.Run(() => new Mp4File(m4bPath, FileAccess.Read));
 					m4bBook.ConversionProgressUpdate += M4bBook_ConversionProgressUpdate;
 
 					fileSize = m4bBook.InputStream.Length;
@@ -53,9 +53,18 @@ namespace FileLiberator
 					OnNarratorsDiscovered(m4bBook.AppleTags.Narrator);
 					OnCoverImageDiscovered(m4bBook.AppleTags.Cover);
 
+					var config = Configuration.Instance;
+					var lameConfig = GetLameOptions(config);
+
+					//Finishing configuring lame encoder.
+					AaxDecrypter.MpegUtil.ConfigureLameOptions(
+						m4bBook,
+						lameConfig,
+						config.LameDownsampleMono,
+						config.LameMatchSourceBR);
+
 					using var mp3File = File.OpenWrite(Path.GetTempFileName());
-					var lameConfig = GetLameOptions(Configuration.Instance);
-					var result = await Task.Run(() => m4bBook.ConvertToMp3(mp3File, lameConfig));
+					var result = await m4bBook.ConvertToMp3Async(mp3File, lameConfig);
 					m4bBook.InputStream.Close();
 					mp3File.Close();
 
@@ -70,7 +79,7 @@ namespace FileLiberator
 						return new StatusHandler { "Cancelled" };
 					}
 
-					var realMp3Path = FileUtility.SaferMoveToValidPath(mp3File.Name, proposedMp3Path);
+					var realMp3Path = FileUtility.SaferMoveToValidPath(mp3File.Name, proposedMp3Path, Configuration.Instance.ReplacementCharacters);
 					OnFileCreated(libraryBook, realMp3Path);
 				}
 				return new StatusHandler();

Source/FileLiberator/DownloadDecryptBook.cs

@@ -130,7 +130,7 @@ namespace FileLiberator
 			abDownloader.FileCreated += (_, path) => OnFileCreated(libraryBook, path);
 
 			// REAL WORK DONE HERE
-			var success = await Task.Run(abDownloader.Run);
+			var success = await abDownloader.RunAsync();
 
 			return success;
 		}
@@ -146,71 +146,174 @@ namespace FileLiberator
 			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)
-				};
-
-			var chapters = getChapters(contentLic.ContentMetadata.ChapterInfo.Chapters).OrderBy(c => c.StartOffsetMs).ToList();
-
-			if (config.AllowLibationFixup || outputFormat == OutputFormat.Mp3)
 			{
-				long startMs = dlOptions.TrimOutputToChapterLength ?
-					contentLic.ContentMetadata.ChapterInfo.BrandIntroDurationMs : 0;
+				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
+			};
 
-				dlOptions.ChapterInfo = new AAXClean.ChapterInfo(TimeSpan.FromMilliseconds(startMs));
+			var chapters = flattenChapters(contentLic.ContentMetadata.ChapterInfo.Chapters).OrderBy(c => c.StartOffsetMs).ToList();
 
-				for (int i = 0; i < chapters.Count; i++)
-				{
-					var chapter = chapters[i];
-					long chapLenMs = chapter.LengthMs;
+			if (config.MergeOpeningAndEndCredits)
+				combineCredits(chapters);
 
-					if (i == 0)
-						chapLenMs -= startMs;
+			for (int i = 0; i < chapters.Count; i++)
+			{
+				var chapter = chapters[i];
+				long chapLenMs = chapter.LengthMs;
 
-					if (config.StripAudibleBrandAudio && i == chapters.Count - 1)
-						chapLenMs -= contentLic.ContentMetadata.ChapterInfo.BrandOutroDurationMs;
+				if (i == 0)
+					chapLenMs -= chapterStartMs;
 
-					dlOptions.ChapterInfo.AddChapter(chapter.Title, TimeSpan.FromMilliseconds(chapLenMs));
-				}
+				if (config.StripAudibleBrandAudio && i == chapters.Count - 1)
+					chapLenMs -= contentLic.ContentMetadata.ChapterInfo.BrandOutroDurationMs;
+
+				dlOptions.ChapterInfo.AddChapter(chapter.Title, TimeSpan.FromMilliseconds(chapLenMs));
 			}
 
 			return dlOptions;
 		}
 
-		private List<AudibleApi.Common.Chapter> getChapters(IEnumerable<AudibleApi.Common.Chapter> chapters)
+		/*
+
+		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 = chapters.ToList();
+			List<AudibleApi.Common.Chapter> chaps = new();
 
 			foreach (var c in chapters)
 			{
 				if (c.Chapters is not null)
 				{
-					var children = getChapters(c.Chapters);
+					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 = string.IsNullOrEmpty(c.Title) ? child.Title : $"{c.Title}: {child.Title}";
+						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)
@@ -258,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 };
 			}
 

Source/FileLiberator/DownloadOptions.cs

@@ -3,6 +3,7 @@ using AAXClean;
 using Dinah.Core;
 using DataLayer;
 using LibationFileManager;
+using FileManager;
 
 namespace FileLiberator
 {
@@ -19,10 +20,12 @@ namespace FileLiberator
         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 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);

Source/FileLiberator/FileLiberator.csproj

@@ -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/FileManager/BackgroundFileSystem.cs

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

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

@@ -12,16 +12,17 @@ namespace FileManager
 		/// <param name="template">Proposed file name with optional html-styled template tags.</param>
 		public FileNamingTemplate(string template) : base(template) { }
 
-		/// <summary>Optional step 2: Replace all illegal characters with this. Default=<see cref="string.Empty"/></summary>
-		public string IllegalCharacterReplacements { get; set; }
-
 		/// <summary>Generate a valid path for this file or directory</summary>
-		public LongPath GetFilePath(bool returnFirstExisting = false)
+		public LongPath GetFilePath(ReplacementCharacters replacements, bool returnFirstExisting = false)
 		{
-			string fileName = Template;
+			string fileName = 
+				Template.EndsWith(Path.DirectorySeparatorChar) || Template.EndsWith(Path.AltDirectorySeparatorChar) ?
+					FileUtility.RemoveLastCharacter(Template) : 
+					Template;
+
 			List<string> pathParts = new();
 
-			var paramReplacements = ParameterReplacements.ToDictionary(r => $"<{formatKey(r.Key)}>", r => formatValue(r.Value));
+			var paramReplacements = ParameterReplacements.ToDictionary(r => $"<{formatKey(r.Key)}>", r => formatValue(r.Value, replacements));
 
 			while (!string.IsNullOrEmpty(fileName))
 			{
@@ -34,18 +35,24 @@ namespace FileManager
 				}
 				else
 				{
-					file = replaceFileName(file, paramReplacements);
-					fileName = Path.GetDirectoryName(fileName);
 					pathParts.Add(file);
+					fileName = Path.GetDirectoryName(fileName);
 				}
 			}
 
 			pathParts.Reverse();
+			var fileNamePart = pathParts[^1];
+			pathParts.Remove(fileNamePart);
 
-			return FileUtility.GetValidFilename(Path.Join(pathParts.ToArray()), IllegalCharacterReplacements, returnFirstExisting);
+			LongPath directory = Path.Join(pathParts.Select(p => replaceFileName(p, paramReplacements, LongPath.MaxFilenameLength)).ToArray());
+
+			//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 string replaceFileName(string filename, Dictionary<string,string> paramReplacements)
+		private string replaceFileName(string filename, Dictionary<string,string> paramReplacements, int maxFilenameLength)
 		{
 			List<StringBuilder> filenameParts = new();
 			//Build the filename in parts, replacing replacement parameters with
@@ -81,7 +88,7 @@ namespace FileManager
 
 			//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) > LongPath.MaxFilenameLength)
+			while (filenameParts.Sum(p => p.Length) > maxFilenameLength)
 			{
 				int maxLength = filenameParts.Max(p => p.Length);
 				var maxEntry = filenameParts.First(p => p.Length == maxLength);
@@ -91,17 +98,14 @@ namespace FileManager
 			return string.Join("", filenameParts);
 		}
 
-		private string formatValue(object value)
+		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 value
-				.ToString()
-				.Replace($"{System.IO.Path.DirectorySeparatorChar}", IllegalCharacterReplacements)
-				.Replace($"{System.IO.Path.AltDirectorySeparatorChar}", IllegalCharacterReplacements);
+			return replacements.ReplaceInvalidFilenameChars(value.ToString());
 		}
 	}
 }

Source/FileManager/FileUtility.cs

@@ -46,12 +46,12 @@ namespace FileManager
 		/// <br/>- ensure uniqueness
 		/// <br/>- enforce max file length
 		/// </summary>
-		public static LongPath GetValidFilename(LongPath path, string illegalCharacterReplacements = "", bool returnFirstExisting = false)
+		public static LongPath GetValidFilename(LongPath path, ReplacementCharacters replacements, bool returnFirstExisting = false)
 		{
 			ArgumentValidator.EnsureNotNull(path, nameof(path));
 
 			// remove invalid chars
-			path = GetSafePath(path, illegalCharacterReplacements);
+			path = GetSafePath(path, replacements);
 
 			// ensure uniqueness and check lengths
 			var dir = Path.GetDirectoryName(path);
@@ -77,36 +77,19 @@ namespace FileManager
 			return fullfilename;
 		}
 
-		// GetInvalidFileNameChars contains everything in GetInvalidPathChars plus ':', '*', '?', '\\', '/'
-
-		/// <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 charaters which are invalid file name characters will be retained: '\\', '/'</summary>
-		public static LongPath GetSafePath(LongPath path, string illegalCharacterReplacements = "")
+		/// <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));
 
 			var pathNoPrefix = path.PathWithoutPrefix;
 
-			pathNoPrefix = replaceColons(pathNoPrefix, "꞉");
-			pathNoPrefix = replaceIllegalWithUnicodeAnalog(pathNoPrefix);
-			pathNoPrefix = replaceInvalidChars(pathNoPrefix, illegalCharacterReplacements);
+			pathNoPrefix = replacements.ReplaceInvalidPathChars(pathNoPrefix);
 			pathNoPrefix = removeDoubleSlashes(pathNoPrefix);
 
 			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)
@@ -122,60 +105,6 @@ namespace FileManager
 			return path[0] + remainder;
 		}
 
-		private static string replaceIllegalWithUnicodeAnalog(string path)
-		{
-			char[] replaced = path.ToCharArray();
-
-			char GetQuote(int position)
-			{
-				if (
-					position == 0
-					|| (position > 0
-						&& position < replaced.Length
-						&& !char.IsLetter(replaced[position - 1])
-						&& !char.IsNumber(replaced[position - 1])
-						)
-					) return '“';
-				else if (
-						position == replaced.Length - 1
-						|| (position >= 0
-							&& position < replaced.Length - 1
-							&& !char.IsLetter(replaced[position + 1])
-							&& !char.IsNumber(replaced[position + 1])
-							)
-						) return '”';
-				else return '＂';
-			}
-
-			for (int i = 0; i < replaced.Length; i++)
-			{
-				replaced[i] = replaced[i] switch
-				{
-					'?' => '？',
-					'*' => '✱',
-					'<' => '＜',
-					'>' => '＞',
-					'"' => GetQuote(i),
-					_ => replaced[i]
-				};
-			}
-			return new string(replaced);
-		}
-
-		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();
-		}
 		private static string removeInvalidWhitespace_pattern { get; } = $@"[\s\.]*\{Path.DirectorySeparatorChar}\s*";
 		private static Regex removeInvalidWhitespace_regex { get; } = new(removeInvalidWhitespace_pattern, RegexOptions.Compiled | RegexOptions.IgnorePatternWhitespace);
 
@@ -191,7 +120,7 @@ namespace FileManager
 			// regex is easier by ending with separator
 			fullfilename += Path.DirectorySeparatorChar;
 			fullfilename = removeInvalidWhitespace_regex.Replace(fullfilename, Path.DirectorySeparatorChar.ToString());
-			// take seperator back off
+			// take separator back off
 			fullfilename = RemoveLastCharacter(fullfilename);
 
 			fullfilename = removeDoubleSlashes(fullfilename);
@@ -206,9 +135,9 @@ namespace FileManager
 		/// <br/>- Perform <see cref="SaferMove"/>
 		/// <br/>- Return valid path
 		/// </summary>
-		public static string SaferMoveToValidPath(LongPath source, LongPath destination)
+		public static string SaferMoveToValidPath(LongPath source, LongPath destination, ReplacementCharacters replacements)
 		{
-			destination = GetValidFilename(destination);
+			destination = GetValidFilename(destination, replacements);
 			SaferMove(source, destination);
 			return destination;
 		}

Source/FileManager/ReplacementCharacters.cs

@@ -0,0 +1,276 @@
+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; private 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 ContainsInvalid(string path)
+			=> path.Any(c => invalidChars.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.ContainsInvalid(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,22 @@
     <UseWindowsForms>true</UseWindowsForms>
     <ApplicationIcon>hangover.ico</ApplicationIcon>
     <ImplicitUsings>enable</ImplicitUsings>
-
     <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 +33,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,7 +48,7 @@
     <ProjectReference Include="..\FileLiberator\FileLiberator.csproj" />
   </ItemGroup>
 
-  <ItemGroup>
+	<ItemGroup>
     <Compile Update="Form1.*.cs">
       <DependentUpon>Form1.cs</DependentUpon>
     </Compile>

Source/Hangover/Properties/PublishProfiles/FolderProfile.pubxml

@@ -0,0 +1,16 @@
+<?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>false</SelfContained>
+    <PublishSingleFile>false</PublishSingleFile>
+  </PropertyGroup>
+</Project>

Source/LibationCli/LibationCli.csproj

@@ -4,12 +4,21 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>net6.0-windows</TargetFramework>
-
-    <PublishTrimmed>true</PublishTrimmed>
     <PublishReadyToRun>true</PublishReadyToRun>
     <RuntimeIdentifier>win-x64</RuntimeIdentifier>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     <AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
+    <IsPublishable>True</IsPublishable>
+  </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>
 
   <!--
@@ -23,11 +32,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>

Source/LibationCli/Properties/PublishProfiles/FolderProfile.pubxml

@@ -0,0 +1,16 @@
+<?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>false</SelfContained>
+    <PublishSingleFile>false</PublishSingleFile>
+  </PropertyGroup>
+</Project>

Source/LibationFileManager/Configuration.cs

@@ -117,6 +117,13 @@ namespace LibationFileManager
 			set => persistentDictionary.SetNonString(nameof(SplitFilesByChapter), value);
 		}
 
+		[Description("Merge Opening/End Credits into the following/preceding chapters")]
+		public bool MergeOpeningAndEndCredits
+		{
+			get => persistentDictionary.GetNonString<bool>(nameof(MergeOpeningAndEndCredits));
+			set => persistentDictionary.SetNonString(nameof(MergeOpeningAndEndCredits), value);
+		}
+
 		[Description("Strip \"(Unabridged)\" from audiobook metadata tags")]
 		public bool StripUnabridged
 		{
@@ -284,6 +291,13 @@ namespace LibationFileManager
 
 		#region templates: custom file naming
 
+		[Description("Edit how illegal filename characters are replaced")]
+		public ReplacementCharacters ReplacementCharacters
+		{
+			get => persistentDictionary.GetNonString<ReplacementCharacters>(nameof(ReplacementCharacters));
+			set => persistentDictionary.SetNonString(nameof(ReplacementCharacters), value);
+		}
+
 		[Description("How to format the folders in which files will be saved")]
 		public string FolderTemplate
 		{
@@ -430,7 +444,7 @@ namespace LibationFileManager
 		#endregion
 
 		#region LibationFiles
-		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");
 		private const string LIBATION_FILES_KEY = "LibationFiles";
 
 		[Description("Location for storage of program-created files")]

Source/LibationFileManager/LibationFileManager.csproj

@@ -14,4 +14,12 @@
     <ProjectReference Include="..\FileManager\FileManager.csproj" />
   </ItemGroup>
 
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+		<DebugType>embedded</DebugType>
+	</PropertyGroup>
+
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
+		<DebugType>embedded</DebugType>
+	</PropertyGroup>
+	
 </Project>

Source/LibationFileManager/Templates.cs

@@ -54,10 +54,7 @@ namespace LibationFileManager
 			if (template is null)
 				return new[] { ERROR_NULL_IS_INVALID };
 
-			if (template.Contains(':')
-				|| template.Contains(Path.DirectorySeparatorChar)
-				|| template.Contains(Path.AltDirectorySeparatorChar)
-				)
+			if (ReplacementCharacters.ContainsInvalid(template.Replace("<","").Replace(">","")))
 				return new[] { ERROR_INVALID_FILE_NAME_CHAR };
 
 			return Valid;
@@ -106,7 +103,7 @@ namespace LibationFileManager
 			=> string.IsNullOrWhiteSpace(template)
 			? ""
 			: getFileNamingTemplate(libraryBookDto, template, null, null)
-			.GetFilePath().PathWithoutPrefix;
+			.GetFilePath(Configuration.Instance.ReplacementCharacters).PathWithoutPrefix;
 
 		private static Regex ifSeriesRegex { get; } = new Regex("<if series->(.*?)<-if series>", RegexOptions.Compiled | RegexOptions.IgnoreCase);
 
@@ -126,7 +123,7 @@ namespace LibationFileManager
 			var t = template + FileUtility.GetStandardizedExtension(extension);
 			var fullfilename = dirFullPath == "" ? t : Path.Combine(dirFullPath, t);
 
-			var fileNamingTemplate = new FileNamingTemplate(fullfilename) { IllegalCharacterReplacements = "_" };
+			var fileNamingTemplate = new FileNamingTemplate(fullfilename);
 
 			var title = libraryBookDto.Title ?? "";
 			var titleShort = title.IndexOf(':') < 1 ? title : title.Substring(0, title.IndexOf(':'));
@@ -200,6 +197,10 @@ namespace LibationFileManager
 				if (template.Contains(':'))
 					return new[] { ERROR_FULL_PATH_IS_INVALID };
 
+				// must be relative. no colons. all other path chars are valid enough to pass this check and will be handled on final save.
+				if (ReplacementCharacters.ContainsInvalid(template.Replace("<", "").Replace(">", "")))
+						return new[] { ERROR_INVALID_FILE_NAME_CHAR };
+
 				return Valid;
 			}
 			
@@ -210,7 +211,7 @@ namespace LibationFileManager
 			/// <summary>USES LIVE CONFIGURATION VALUES</summary>
 			public string GetFilename(LibraryBookDto libraryBookDto, string baseDir = null)
 				=> getFileNamingTemplate(libraryBookDto, Configuration.Instance.FolderTemplate, baseDir ?? AudibleFileStorage.BooksDirectory, null)
-				.GetFilePath();
+				.GetFilePath(Configuration.Instance.ReplacementCharacters);
 			#endregion
 		}
 
@@ -233,7 +234,7 @@ namespace LibationFileManager
 			/// <summary>USES LIVE CONFIGURATION VALUES</summary>
 			public string GetFilename(LibraryBookDto libraryBookDto, string dirFullPath, string extension, bool returnFirstExisting = false)
 				=> getFileNamingTemplate(libraryBookDto, Configuration.Instance.FileTemplate, dirFullPath, extension)
-				.GetFilePath(returnFirstExisting);
+				.GetFilePath(Configuration.Instance.ReplacementCharacters, returnFirstExisting);
 			#endregion
 		}
 
@@ -268,8 +269,9 @@ namespace LibationFileManager
 			public string GetFilename(LibraryBookDto libraryBookDto, AaxDecrypter.MultiConvertFileProperties props)
 				=> GetPortionFilename(libraryBookDto, Configuration.Instance.ChapterFileTemplate, props, AudibleFileStorage.DecryptInProgressDirectory);
 
-			public string GetPortionFilename(LibraryBookDto libraryBookDto, string template, AaxDecrypter.MultiConvertFileProperties props, string fullDirPath)
+			public string GetPortionFilename(LibraryBookDto libraryBookDto, string template, AaxDecrypter.MultiConvertFileProperties props, string fullDirPath, ReplacementCharacters replacements = null)
 			{
+				replacements ??= Configuration.Instance.ReplacementCharacters;
 				var fileNamingTemplate = getFileNamingTemplate(libraryBookDto, template, fullDirPath, Path.GetExtension(props.OutputFileName));
 
 				fileNamingTemplate.AddParameterReplacement(TemplateTags.ChCount, props.PartsTotal);
@@ -277,7 +279,7 @@ namespace LibationFileManager
 				fileNamingTemplate.AddParameterReplacement(TemplateTags.ChNumber0, FileUtility.GetSequenceFormatted(props.PartsPosition, props.PartsTotal));
 				fileNamingTemplate.AddParameterReplacement(TemplateTags.ChTitle, props.Title ?? "");
 
-				return fileNamingTemplate.GetFilePath().PathWithoutPrefix;
+				return fileNamingTemplate.GetFilePath(replacements).PathWithoutPrefix;
 			}
 			#endregion
 		}

Source/LibationSearchEngine/LibationSearchEngine.csproj

@@ -15,5 +15,14 @@
   <ItemGroup>
     <ProjectReference Include="..\DataLayer\DataLayer.csproj" />
   </ItemGroup>
+	
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+    <DebugType>embedded</DebugType>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
+    <DebugType>embedded</DebugType>
+  </PropertyGroup>
+
 
 </Project>

Source/LibationWinForms/Dialogs/AccountsDialog.cs

@@ -252,7 +252,7 @@ namespace LibationWinForms.Dialogs
 			{
 				MessageBoxLib.ShowAdminAlert(
 					this,
-					$"An error occured while exporting account:\r\n{account.AccountName}",
+					$"An error occurred while exporting account:\r\n{account.AccountName}",
 					"Error Exporting Account",
 					ex);
 			}
@@ -294,7 +294,7 @@ namespace LibationWinForms.Dialogs
 			{
 				MessageBoxLib.ShowAdminAlert(
 						this,
-						$"An error occured while importing an account from:\r\n{ofd.FileName}\r\n\r\nIs the file encrypted?",
+						$"An error occurred while importing an account from:\r\n{ofd.FileName}\r\n\r\nIs the file encrypted?",
 						"Error Importing Account",
 						ex);
 			}

Source/LibationWinForms/Dialogs/BookDetailsDialog.cs

@@ -49,6 +49,7 @@ Title: {Book.Title}
 Author(s): {Book.AuthorNames()}
 Narrator(s): {Book.NarratorNames()}
 Length: {(Book.LengthInMinutes == 0 ? "" : $"{Book.LengthInMinutes / 60} hr {Book.LengthInMinutes % 60} min")}
+Audio Bitrate: {Book.AudioFormat}
 Category: {string.Join(" > ", Book.CategoriesNames())}
 Purchase Date: {_libraryBook.DateAdded.ToString("d")}
 ".Trim();

Source/LibationWinForms/Dialogs/EditReplacementChars.Designer.cs

@@ -0,0 +1,175 @@
+namespace LibationWinForms.Dialogs
+{
+	partial class EditReplacementChars
+	{
+		/// <summary>
+		/// Required designer variable.
+		/// </summary>
+		private System.ComponentModel.IContainer components = null;
+
+		/// <summary>
+		/// Clean up any resources being used.
+		/// </summary>
+		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+		protected override void Dispose(bool disposing)
+		{
+			if (disposing && (components != null))
+			{
+				components.Dispose();
+			}
+			base.Dispose(disposing);
+		}
+
+		#region Windows Form Designer generated code
+
+		/// <summary>
+		/// Required method for Designer support - do not modify
+		/// the contents of this method with the code editor.
+		/// </summary>
+		private void InitializeComponent()
+		{
+			this.dataGridView1 = new System.Windows.Forms.DataGridView();
+			this.charToReplaceCol = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.replacementStringCol = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.descriptionCol = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.defaultsBtn = new System.Windows.Forms.Button();
+			this.loFiDefaultsBtn = new System.Windows.Forms.Button();
+			this.saveBtn = new System.Windows.Forms.Button();
+			this.cancelBtn = new System.Windows.Forms.Button();
+			this.minDefaultBtn = new System.Windows.Forms.Button();
+			((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).BeginInit();
+			this.SuspendLayout();
+			// 
+			// dataGridView1
+			// 
+			this.dataGridView1.AllowUserToResizeColumns = false;
+			this.dataGridView1.AllowUserToResizeRows = false;
+			this.dataGridView1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+			this.dataGridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+			this.dataGridView1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
+            this.charToReplaceCol,
+            this.replacementStringCol,
+            this.descriptionCol});
+			this.dataGridView1.Location = new System.Drawing.Point(12, 12);
+			this.dataGridView1.Name = "dataGridView1";
+			this.dataGridView1.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing;
+			this.dataGridView1.RowTemplate.Height = 25;
+			this.dataGridView1.Size = new System.Drawing.Size(498, 393);
+			this.dataGridView1.TabIndex = 0;
+			this.dataGridView1.CellEndEdit += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridView1_CellEndEdit);
+			this.dataGridView1.UserDeletingRow += new System.Windows.Forms.DataGridViewRowCancelEventHandler(this.dataGridView1_UserDeletingRow);
+			this.dataGridView1.Resize += new System.EventHandler(this.dataGridView1_Resize);
+			// 
+			// charToReplaceCol
+			// 
+			this.charToReplaceCol.HeaderText = "Char to Replace";
+			this.charToReplaceCol.MinimumWidth = 70;
+			this.charToReplaceCol.Name = "charToReplaceCol";
+			this.charToReplaceCol.Resizable = System.Windows.Forms.DataGridViewTriState.False;
+			this.charToReplaceCol.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+			this.charToReplaceCol.Width = 70;
+			// 
+			// replacementStringCol
+			// 
+			this.replacementStringCol.HeaderText = "Replacement Text";
+			this.replacementStringCol.MinimumWidth = 85;
+			this.replacementStringCol.Name = "replacementStringCol";
+			this.replacementStringCol.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+			this.replacementStringCol.Width = 85;
+			// 
+			// descriptionCol
+			// 
+			this.descriptionCol.HeaderText = "Description";
+			this.descriptionCol.MinimumWidth = 100;
+			this.descriptionCol.Name = "descriptionCol";
+			this.descriptionCol.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+			this.descriptionCol.Width = 200;
+			// 
+			// defaultsBtn
+			// 
+			this.defaultsBtn.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+			this.defaultsBtn.Location = new System.Drawing.Point(12, 430);
+			this.defaultsBtn.Name = "defaultsBtn";
+			this.defaultsBtn.Size = new System.Drawing.Size(64, 25);
+			this.defaultsBtn.TabIndex = 1;
+			this.defaultsBtn.Text = "Defaults";
+			this.defaultsBtn.UseVisualStyleBackColor = true;
+			this.defaultsBtn.Click += new System.EventHandler(this.defaultsBtn_Click);
+			// 
+			// loFiDefaultsBtn
+			// 
+			this.loFiDefaultsBtn.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+			this.loFiDefaultsBtn.Location = new System.Drawing.Point(82, 430);
+			this.loFiDefaultsBtn.Name = "loFiDefaultsBtn";
+			this.loFiDefaultsBtn.Size = new System.Drawing.Size(84, 25);
+			this.loFiDefaultsBtn.TabIndex = 1;
+			this.loFiDefaultsBtn.Text = "LoFi Defaults";
+			this.loFiDefaultsBtn.UseVisualStyleBackColor = true;
+			this.loFiDefaultsBtn.Click += new System.EventHandler(this.loFiDefaultsBtn_Click);
+			// 
+			// saveBtn
+			// 
+			this.saveBtn.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+			this.saveBtn.Location = new System.Drawing.Point(428, 430);
+			this.saveBtn.Name = "saveBtn";
+			this.saveBtn.Size = new System.Drawing.Size(82, 25);
+			this.saveBtn.TabIndex = 1;
+			this.saveBtn.Text = "Save";
+			this.saveBtn.UseVisualStyleBackColor = true;
+			this.saveBtn.Click += new System.EventHandler(this.saveBtn_Click);
+			// 
+			// cancelBtn
+			// 
+			this.cancelBtn.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+			this.cancelBtn.Location = new System.Drawing.Point(340, 430);
+			this.cancelBtn.Name = "cancelBtn";
+			this.cancelBtn.Size = new System.Drawing.Size(82, 25);
+			this.cancelBtn.TabIndex = 1;
+			this.cancelBtn.Text = "Cancel";
+			this.cancelBtn.UseVisualStyleBackColor = true;
+			this.cancelBtn.Click += new System.EventHandler(this.cancelBtn_Click);
+			// 
+			// minDefaultBtn
+			// 
+			this.minDefaultBtn.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+			this.minDefaultBtn.Location = new System.Drawing.Point(172, 430);
+			this.minDefaultBtn.Name = "minDefaultBtn";
+			this.minDefaultBtn.Size = new System.Drawing.Size(80, 25);
+			this.minDefaultBtn.TabIndex = 1;
+			this.minDefaultBtn.Text = "Barebones";
+			this.minDefaultBtn.UseVisualStyleBackColor = true;
+			this.minDefaultBtn.Click += new System.EventHandler(this.minDefaultBtn_Click);
+			// 
+			// EditReplacementChars
+			// 
+			this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
+			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+			this.ClientSize = new System.Drawing.Size(522, 467);
+			this.Controls.Add(this.minDefaultBtn);
+			this.Controls.Add(this.loFiDefaultsBtn);
+			this.Controls.Add(this.cancelBtn);
+			this.Controls.Add(this.saveBtn);
+			this.Controls.Add(this.defaultsBtn);
+			this.Controls.Add(this.dataGridView1);
+			this.Name = "EditReplacementChars";
+			this.Text = "Character Replacements";
+			((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).EndInit();
+			this.ResumeLayout(false);
+
+		}
+
+		#endregion
+
+		private System.Windows.Forms.DataGridView dataGridView1;
+		private System.Windows.Forms.Button defaultsBtn;
+		private System.Windows.Forms.Button loFiDefaultsBtn;
+		private System.Windows.Forms.Button saveBtn;
+		private System.Windows.Forms.Button cancelBtn;
+		private System.Windows.Forms.Button minDefaultBtn;
+		private System.Windows.Forms.DataGridViewTextBoxColumn charToReplaceCol;
+		private System.Windows.Forms.DataGridViewTextBoxColumn replacementStringCol;
+		private System.Windows.Forms.DataGridViewTextBoxColumn descriptionCol;
+	}
+}

Source/LibationWinForms/Dialogs/EditReplacementChars.cs

@@ -0,0 +1,144 @@
+using FileManager;
+using LibationFileManager;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Windows.Forms;
+
+namespace LibationWinForms.Dialogs
+{
+	public partial class EditReplacementChars : Form
+	{
+		Configuration config;
+		public EditReplacementChars()
+		{
+			InitializeComponent();
+			dataGridView1_Resize(this, EventArgs.Empty);
+		}
+
+		public EditReplacementChars(Configuration config) : this()
+		{
+			this.config = config;
+			LoadTable(config.ReplacementCharacters.Replacements);
+		}
+
+		private void LoadTable(IReadOnlyList<Replacement> replacements)
+		{
+			dataGridView1.Rows.Clear();
+			for (int i = 0; i < replacements.Count; i++)
+			{
+				var r = replacements[i];
+
+				int row = dataGridView1.Rows.Add(r.CharacterToReplace.ToString(), r.ReplacementString, r.Description);
+				dataGridView1.Rows[row].Tag = r.Clone();
+
+
+				if (r.Mandatory)
+				{
+					dataGridView1.Rows[row].Cells[charToReplaceCol.Index].ReadOnly = true;
+					dataGridView1.Rows[row].Cells[descriptionCol.Index].ReadOnly = true;
+					dataGridView1.Rows[row].Cells[charToReplaceCol.Index].Style.BackColor = System.Drawing.Color.LightGray;
+					dataGridView1.Rows[row].Cells[descriptionCol.Index].Style.BackColor = System.Drawing.Color.LightGray;
+				}
+			}
+		}
+
+		private void dataGridView1_UserDeletingRow(object sender, DataGridViewRowCancelEventArgs e)
+		{
+			if (e.Row?.Tag is Replacement r && r.Mandatory)
+				e.Cancel = true;
+		}
+
+		private void loFiDefaultsBtn_Click(object sender, EventArgs e)
+			=> LoadTable(ReplacementCharacters.LoFiDefault.Replacements);
+
+		private void defaultsBtn_Click(object sender, EventArgs e)
+			=> LoadTable(ReplacementCharacters.Default.Replacements);
+
+		private void minDefaultBtn_Click(object sender, EventArgs e)
+			=> LoadTable(ReplacementCharacters.Barebones.Replacements);
+
+
+		private void dataGridView1_CellEndEdit(object sender, DataGridViewCellEventArgs e)
+		{
+			if (e.RowIndex < 0) return;
+
+			dataGridView1.Rows[e.RowIndex].ErrorText = string.Empty;
+
+			var charToReplaceStr = dataGridView1.Rows[e.RowIndex].Cells[charToReplaceCol.Index].Value?.ToString();
+			var replacement = dataGridView1.Rows[e.RowIndex].Cells[replacementStringCol.Index].Value?.ToString() ?? string.Empty;
+			var description = dataGridView1.Rows[e.RowIndex].Cells[descriptionCol.Index].Value?.ToString() ?? string.Empty;
+
+			//Validate the whole row.  If it passes all validation, add or update the row's tag.
+			if (string.IsNullOrEmpty(charToReplaceStr) && replacement == string.Empty && description == string.Empty)
+			{
+				//Invalid entry, so delete row
+				var row = dataGridView1.Rows[e.RowIndex];
+				if (!row.IsNewRow)
+				{
+					BeginInvoke(new MethodInvoker(delegate
+					{
+						dataGridView1.Rows.Remove(row);
+					}));
+				}
+			}
+			else if (string.IsNullOrEmpty(charToReplaceStr))
+			{
+				dataGridView1.Rows[e.RowIndex].ErrorText = $"You must choose a character to replace";
+			}
+			else if (charToReplaceStr.Length > 1)
+			{
+				dataGridView1.Rows[e.RowIndex].ErrorText = $"Only 1 {charToReplaceCol.HeaderText} per entry";
+			}
+			else if (dataGridView1.Rows[e.RowIndex].Tag is Replacement repl && !repl.Mandatory &&
+				   dataGridView1.Rows
+				   .Cast<DataGridViewRow>()
+				   .Where(r => r.Index != e.RowIndex)
+				   .Select(r => r.Tag)
+				   .OfType<Replacement>()
+				   .Any(r => r.CharacterToReplace == charToReplaceStr[0])
+				   )
+			{
+				dataGridView1.Rows[e.RowIndex].ErrorText = $"The {charToReplaceStr[0]} character is already being replaced";
+			}
+			else if (ReplacementCharacters.ContainsInvalid(replacement))
+			{
+				dataGridView1.Rows[e.RowIndex].ErrorText = $"Your {replacementStringCol.HeaderText} contains illegal characters";
+			}
+			else
+			{
+				//valid entry. Add or update Replacement in row's Tag
+				var charToReplace = charToReplaceStr[0];
+
+				if (dataGridView1.Rows[e.RowIndex].Tag is Replacement existing)
+					existing.Update(charToReplace, replacement, description);
+				else
+					dataGridView1.Rows[e.RowIndex].Tag = new Replacement(charToReplace, replacement, description);
+			}
+		}
+
+		private void saveBtn_Click(object sender, EventArgs e)
+		{
+			var replacements = dataGridView1.Rows
+				.Cast<DataGridViewRow>()
+				.Select(r => r.Tag)
+				.OfType<Replacement>()
+				.ToList();
+
+			config.ReplacementCharacters = new ReplacementCharacters { Replacements = replacements };
+			DialogResult = DialogResult.OK;
+			Close();
+		}
+
+		private void cancelBtn_Click(object sender, EventArgs e)
+		{
+			DialogResult = DialogResult.Cancel;
+			Close();
+		}
+
+		private void dataGridView1_Resize(object sender, EventArgs e)
+		{
+			dataGridView1.Columns[^1].Width = dataGridView1.Width - dataGridView1.Columns.Cast<DataGridViewColumn>().Sum(c => c == dataGridView1.Columns[^1] ? 0 : c.Width) - dataGridView1.RowHeadersWidth - 2;
+		}
+	}
+}

Source/LibationWinForms/Dialogs/EditReplacementChars.resx

@@ -0,0 +1,69 @@
+<root>
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <metadata name="charToReplaceCol.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="replacementStringCol.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="descriptionCol.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+</root>

Source/LibationWinForms/Dialogs/SettingsDialog.AudioSettings.cs

@@ -13,6 +13,7 @@ namespace LibationWinForms.Dialogs
 			this.downloadCoverArtCbox.Text = desc(nameof(config.DownloadCoverArt));
 			this.retainAaxFileCbox.Text = desc(nameof(config.RetainAaxFile));
 			this.splitFilesByChapterCbox.Text = desc(nameof(config.SplitFilesByChapter));
+			this.mergeOpeningEndCreditsCbox.Text = desc(nameof(config.MergeOpeningAndEndCredits));
 			this.stripAudibleBrandingCbox.Text = desc(nameof(config.StripAudibleBrandAudio));
 			this.stripUnabridgedCbox.Text = desc(nameof(config.StripUnabridged));
 
@@ -21,6 +22,7 @@ namespace LibationWinForms.Dialogs
 			downloadCoverArtCbox.Checked = config.DownloadCoverArt;
 			retainAaxFileCbox.Checked = config.RetainAaxFile;
 			splitFilesByChapterCbox.Checked = config.SplitFilesByChapter;
+			mergeOpeningEndCreditsCbox.Checked = config.MergeOpeningAndEndCredits;
 			stripUnabridgedCbox.Checked = config.StripUnabridged;
 			stripAudibleBrandingCbox.Checked = config.StripAudibleBrandAudio;
 			convertLosslessRb.Checked = !config.DecryptToLossy;
@@ -41,6 +43,7 @@ namespace LibationWinForms.Dialogs
 			LameMatchSourceBRCbox_CheckedChanged(this, EventArgs.Empty);
 			convertFormatRb_CheckedChanged(this, EventArgs.Empty);
 			allowLibationFixupCbox_CheckedChanged(this, EventArgs.Empty);
+			splitFilesByChapterCbox_CheckedChanged(this, EventArgs.Empty);
 		}
 
 		private void Save_AudioSettings(Configuration config)
@@ -50,6 +53,7 @@ namespace LibationWinForms.Dialogs
 			config.DownloadCoverArt = downloadCoverArtCbox.Checked;
 			config.RetainAaxFile = retainAaxFileCbox.Checked;
 			config.SplitFilesByChapter = splitFilesByChapterCbox.Checked;
+			config.MergeOpeningAndEndCredits = mergeOpeningEndCreditsCbox.Checked;
 			config.StripUnabridged = stripUnabridgedCbox.Checked;
 			config.StripAudibleBrandAudio = stripAudibleBrandingCbox.Checked;
 			config.DecryptToLossy = convertLossyRb.Checked;
@@ -89,6 +93,7 @@ namespace LibationWinForms.Dialogs
 		}
 		private void allowLibationFixupCbox_CheckedChanged(object sender, EventArgs e)
 		{
+			audiobookFixupsGb.Enabled = allowLibationFixupCbox.Checked;
 			convertLosslessRb.Enabled = allowLibationFixupCbox.Checked;
 			convertLossyRb.Enabled = allowLibationFixupCbox.Checked;
 			splitFilesByChapterCbox.Enabled = allowLibationFixupCbox.Checked;

Source/LibationWinForms/Dialogs/SettingsDialog.Designer.cs

@@ -60,6 +60,7 @@
 			this.tab3DownloadDecrypt = new System.Windows.Forms.TabPage();
 			this.inProgressFilesGb = new System.Windows.Forms.GroupBox();
 			this.customFileNamingGb = new System.Windows.Forms.GroupBox();
+			this.editCharreplacementBtn = new System.Windows.Forms.Button();
 			this.chapterFileTemplateBtn = new System.Windows.Forms.Button();
 			this.chapterFileTemplateTb = new System.Windows.Forms.TextBox();
 			this.chapterFileTemplateLbl = new System.Windows.Forms.Label();
@@ -104,9 +105,11 @@
 			this.lameTargetQualityRb = new System.Windows.Forms.RadioButton();
 			this.lameTargetBitrateRb = new System.Windows.Forms.RadioButton();
 			this.stripUnabridgedCbox = new System.Windows.Forms.CheckBox();
+			this.mergeOpeningEndCreditsCbox = new System.Windows.Forms.CheckBox();
 			this.retainAaxFileCbox = new System.Windows.Forms.CheckBox();
 			this.downloadCoverArtCbox = new System.Windows.Forms.CheckBox();
 			this.createCueSheetCbox = new System.Windows.Forms.CheckBox();
+			this.audiobookFixupsGb = new System.Windows.Forms.GroupBox();
 			this.badBookGb.SuspendLayout();
 			this.tabControl.SuspendLayout();
 			this.tab1ImportantSettings.SuspendLayout();
@@ -123,6 +126,7 @@
 			this.lameQualityGb.SuspendLayout();
 			((System.ComponentModel.ISupportInitialize)(this.lameVBRQualityTb)).BeginInit();
 			this.groupBox2.SuspendLayout();
+			this.audiobookFixupsGb.SuspendLayout();
 			this.SuspendLayout();
 			// 
 			// booksLocationDescLbl
@@ -148,7 +152,7 @@
 			// saveBtn
 			// 
 			this.saveBtn.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-			this.saveBtn.Location = new System.Drawing.Point(667, 441);
+			this.saveBtn.Location = new System.Drawing.Point(667, 461);
 			this.saveBtn.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
 			this.saveBtn.Name = "saveBtn";
 			this.saveBtn.Size = new System.Drawing.Size(88, 27);
@@ -161,7 +165,7 @@
 			// 
 			this.cancelBtn.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
 			this.cancelBtn.DialogResult = System.Windows.Forms.DialogResult.Cancel;
-			this.cancelBtn.Location = new System.Drawing.Point(785, 441);
+			this.cancelBtn.Location = new System.Drawing.Point(785, 461);
 			this.cancelBtn.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
 			this.cancelBtn.Name = "cancelBtn";
 			this.cancelBtn.Size = new System.Drawing.Size(88, 27);
@@ -250,7 +254,7 @@
 			// stripAudibleBrandingCbox
 			// 
 			this.stripAudibleBrandingCbox.AutoSize = true;
-			this.stripAudibleBrandingCbox.Location = new System.Drawing.Point(19, 168);
+			this.stripAudibleBrandingCbox.Location = new System.Drawing.Point(13, 72);
 			this.stripAudibleBrandingCbox.Name = "stripAudibleBrandingCbox";
 			this.stripAudibleBrandingCbox.Size = new System.Drawing.Size(143, 34);
 			this.stripAudibleBrandingCbox.TabIndex = 13;
@@ -260,7 +264,7 @@
 			// splitFilesByChapterCbox
 			// 
 			this.splitFilesByChapterCbox.AutoSize = true;
-			this.splitFilesByChapterCbox.Location = new System.Drawing.Point(19, 118);
+			this.splitFilesByChapterCbox.Location = new System.Drawing.Point(13, 22);
 			this.splitFilesByChapterCbox.Name = "splitFilesByChapterCbox";
 			this.splitFilesByChapterCbox.Size = new System.Drawing.Size(162, 19);
 			this.splitFilesByChapterCbox.TabIndex = 13;
@@ -273,7 +277,7 @@
 			this.allowLibationFixupCbox.AutoSize = true;
 			this.allowLibationFixupCbox.Checked = true;
 			this.allowLibationFixupCbox.CheckState = System.Windows.Forms.CheckState.Checked;
-			this.allowLibationFixupCbox.Location = new System.Drawing.Point(19, 18);
+			this.allowLibationFixupCbox.Location = new System.Drawing.Point(19, 118);
 			this.allowLibationFixupCbox.Name = "allowLibationFixupCbox";
 			this.allowLibationFixupCbox.Size = new System.Drawing.Size(163, 19);
 			this.allowLibationFixupCbox.TabIndex = 10;
@@ -284,7 +288,7 @@
 			// convertLossyRb
 			// 
 			this.convertLossyRb.AutoSize = true;
-			this.convertLossyRb.Location = new System.Drawing.Point(19, 232);
+			this.convertLossyRb.Location = new System.Drawing.Point(13, 136);
 			this.convertLossyRb.Name = "convertLossyRb";
 			this.convertLossyRb.Size = new System.Drawing.Size(329, 19);
 			this.convertLossyRb.TabIndex = 12;
@@ -296,7 +300,7 @@
 			// 
 			this.convertLosslessRb.AutoSize = true;
 			this.convertLosslessRb.Checked = true;
-			this.convertLosslessRb.Location = new System.Drawing.Point(19, 207);
+			this.convertLosslessRb.Location = new System.Drawing.Point(13, 111);
 			this.convertLosslessRb.Name = "convertLosslessRb";
 			this.convertLosslessRb.Size = new System.Drawing.Size(335, 19);
 			this.convertLosslessRb.TabIndex = 11;
@@ -308,7 +312,7 @@
 			// inProgressSelectControl
 			// 
 			this.inProgressSelectControl.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
-			| System.Windows.Forms.AnchorStyles.Right)));
+            | System.Windows.Forms.AnchorStyles.Right)));
 			this.inProgressSelectControl.Location = new System.Drawing.Point(7, 68);
 			this.inProgressSelectControl.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
 			this.inProgressSelectControl.Name = "inProgressSelectControl";
@@ -328,7 +332,7 @@
 			// booksSelectControl
 			// 
 			this.booksSelectControl.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
-			| System.Windows.Forms.AnchorStyles.Right)));
+            | System.Windows.Forms.AnchorStyles.Right)));
 			this.booksSelectControl.Location = new System.Drawing.Point(7, 37);
 			this.booksSelectControl.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
 			this.booksSelectControl.Name = "booksSelectControl";
@@ -356,8 +360,8 @@
 			// tabControl
 			// 
 			this.tabControl.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-			| System.Windows.Forms.AnchorStyles.Left) 
-			| System.Windows.Forms.AnchorStyles.Right)));
+            | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
 			this.tabControl.Controls.Add(this.tab1ImportantSettings);
 			this.tabControl.Controls.Add(this.tab2ImportLibrary);
 			this.tabControl.Controls.Add(this.tab3DownloadDecrypt);
@@ -365,7 +369,7 @@
 			this.tabControl.Location = new System.Drawing.Point(12, 12);
 			this.tabControl.Name = "tabControl";
 			this.tabControl.SelectedIndex = 0;
-			this.tabControl.Size = new System.Drawing.Size(862, 423);
+			this.tabControl.Size = new System.Drawing.Size(862, 443);
 			this.tabControl.TabIndex = 100;
 			// 
 			// tab1ImportantSettings
@@ -377,7 +381,7 @@
 			this.tab1ImportantSettings.Location = new System.Drawing.Point(4, 24);
 			this.tab1ImportantSettings.Name = "tab1ImportantSettings";
 			this.tab1ImportantSettings.Padding = new System.Windows.Forms.Padding(3);
-			this.tab1ImportantSettings.Size = new System.Drawing.Size(854, 395);
+			this.tab1ImportantSettings.Size = new System.Drawing.Size(854, 415);
 			this.tab1ImportantSettings.TabIndex = 0;
 			this.tab1ImportantSettings.Text = "Important settings";
 			this.tab1ImportantSettings.UseVisualStyleBackColor = true;
@@ -385,7 +389,7 @@
 			// booksGb
 			// 
 			this.booksGb.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
-			| System.Windows.Forms.AnchorStyles.Right)));
+            | System.Windows.Forms.AnchorStyles.Right)));
 			this.booksGb.Controls.Add(this.saveEpisodesToSeriesFolderCbox);
 			this.booksGb.Controls.Add(this.booksSelectControl);
 			this.booksGb.Controls.Add(this.booksLocationDescLbl);
@@ -416,7 +420,7 @@
 			this.tab2ImportLibrary.Location = new System.Drawing.Point(4, 24);
 			this.tab2ImportLibrary.Name = "tab2ImportLibrary";
 			this.tab2ImportLibrary.Padding = new System.Windows.Forms.Padding(3);
-			this.tab2ImportLibrary.Size = new System.Drawing.Size(854, 395);
+			this.tab2ImportLibrary.Size = new System.Drawing.Size(854, 415);
 			this.tab2ImportLibrary.TabIndex = 1;
 			this.tab2ImportLibrary.Text = "Import library";
 			this.tab2ImportLibrary.UseVisualStyleBackColor = true;
@@ -459,7 +463,7 @@
 			this.tab3DownloadDecrypt.Location = new System.Drawing.Point(4, 24);
 			this.tab3DownloadDecrypt.Name = "tab3DownloadDecrypt";
 			this.tab3DownloadDecrypt.Padding = new System.Windows.Forms.Padding(3);
-			this.tab3DownloadDecrypt.Size = new System.Drawing.Size(854, 395);
+			this.tab3DownloadDecrypt.Size = new System.Drawing.Size(854, 415);
 			this.tab3DownloadDecrypt.TabIndex = 2;
 			this.tab3DownloadDecrypt.Text = "Download/Decrypt";
 			this.tab3DownloadDecrypt.UseVisualStyleBackColor = true;
@@ -467,10 +471,10 @@
 			// inProgressFilesGb
 			// 
 			this.inProgressFilesGb.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
-			| System.Windows.Forms.AnchorStyles.Right)));
+            | System.Windows.Forms.AnchorStyles.Right)));
 			this.inProgressFilesGb.Controls.Add(this.inProgressDescLbl);
 			this.inProgressFilesGb.Controls.Add(this.inProgressSelectControl);
-			this.inProgressFilesGb.Location = new System.Drawing.Point(7, 251);
+			this.inProgressFilesGb.Location = new System.Drawing.Point(6, 281);
 			this.inProgressFilesGb.Name = "inProgressFilesGb";
 			this.inProgressFilesGb.Size = new System.Drawing.Size(841, 128);
 			this.inProgressFilesGb.TabIndex = 21;
@@ -480,7 +484,8 @@
 			// customFileNamingGb
 			// 
 			this.customFileNamingGb.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
-			| System.Windows.Forms.AnchorStyles.Right)));
+            | System.Windows.Forms.AnchorStyles.Right)));
+			this.customFileNamingGb.Controls.Add(this.editCharreplacementBtn);
 			this.customFileNamingGb.Controls.Add(this.chapterFileTemplateBtn);
 			this.customFileNamingGb.Controls.Add(this.chapterFileTemplateTb);
 			this.customFileNamingGb.Controls.Add(this.chapterFileTemplateLbl);
@@ -492,11 +497,22 @@
 			this.customFileNamingGb.Controls.Add(this.folderTemplateLbl);
 			this.customFileNamingGb.Location = new System.Drawing.Point(7, 88);
 			this.customFileNamingGb.Name = "customFileNamingGb";
-			this.customFileNamingGb.Size = new System.Drawing.Size(841, 157);
+			this.customFileNamingGb.Size = new System.Drawing.Size(841, 187);
 			this.customFileNamingGb.TabIndex = 20;
 			this.customFileNamingGb.TabStop = false;
 			this.customFileNamingGb.Text = "Custom file naming";
 			// 
+			// editCharreplacementBtn
+			// 
+			this.editCharreplacementBtn.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+			this.editCharreplacementBtn.Location = new System.Drawing.Point(5, 158);
+			this.editCharreplacementBtn.Name = "editCharreplacementBtn";
+			this.editCharreplacementBtn.Size = new System.Drawing.Size(387, 23);
+			this.editCharreplacementBtn.TabIndex = 8;
+			this.editCharreplacementBtn.Text = "[edit char replacement desc]";
+			this.editCharreplacementBtn.UseVisualStyleBackColor = true;
+			this.editCharreplacementBtn.Click += new System.EventHandler(this.editCharreplacementBtn_Click);
+			// 
 			// chapterFileTemplateBtn
 			// 
 			this.chapterFileTemplateBtn.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
@@ -511,7 +527,7 @@
 			// chapterFileTemplateTb
 			// 
 			this.chapterFileTemplateTb.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
-			| System.Windows.Forms.AnchorStyles.Right)));
+            | System.Windows.Forms.AnchorStyles.Right)));
 			this.chapterFileTemplateTb.Location = new System.Drawing.Point(6, 125);
 			this.chapterFileTemplateTb.Name = "chapterFileTemplateTb";
 			this.chapterFileTemplateTb.ReadOnly = true;
@@ -541,7 +557,7 @@
 			// fileTemplateTb
 			// 
 			this.fileTemplateTb.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
-			| System.Windows.Forms.AnchorStyles.Right)));
+            | System.Windows.Forms.AnchorStyles.Right)));
 			this.fileTemplateTb.Location = new System.Drawing.Point(6, 81);
 			this.fileTemplateTb.Name = "fileTemplateTb";
 			this.fileTemplateTb.ReadOnly = true;
@@ -571,7 +587,7 @@
 			// folderTemplateTb
 			// 
 			this.folderTemplateTb.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
-			| System.Windows.Forms.AnchorStyles.Right)));
+            | System.Windows.Forms.AnchorStyles.Right)));
 			this.folderTemplateTb.Location = new System.Drawing.Point(5, 37);
 			this.folderTemplateTb.Name = "folderTemplateTb";
 			this.folderTemplateTb.ReadOnly = true;
@@ -589,13 +605,10 @@
 			// 
 			// tab4AudioFileOptions
 			// 
+			this.tab4AudioFileOptions.Controls.Add(this.audiobookFixupsGb);
 			this.tab4AudioFileOptions.Controls.Add(this.chapterTitleTemplateGb);
 			this.tab4AudioFileOptions.Controls.Add(this.lameOptionsGb);
-			this.tab4AudioFileOptions.Controls.Add(this.convertLossyRb);
-			this.tab4AudioFileOptions.Controls.Add(this.stripAudibleBrandingCbox);
-			this.tab4AudioFileOptions.Controls.Add(this.convertLosslessRb);
-			this.tab4AudioFileOptions.Controls.Add(this.stripUnabridgedCbox);
-			this.tab4AudioFileOptions.Controls.Add(this.splitFilesByChapterCbox);
+			this.tab4AudioFileOptions.Controls.Add(this.mergeOpeningEndCreditsCbox);
 			this.tab4AudioFileOptions.Controls.Add(this.retainAaxFileCbox);
 			this.tab4AudioFileOptions.Controls.Add(this.downloadCoverArtCbox);
 			this.tab4AudioFileOptions.Controls.Add(this.createCueSheetCbox);
@@ -603,7 +616,7 @@
 			this.tab4AudioFileOptions.Location = new System.Drawing.Point(4, 24);
 			this.tab4AudioFileOptions.Name = "tab4AudioFileOptions";
 			this.tab4AudioFileOptions.Padding = new System.Windows.Forms.Padding(3);
-			this.tab4AudioFileOptions.Size = new System.Drawing.Size(854, 395);
+			this.tab4AudioFileOptions.Size = new System.Drawing.Size(854, 415);
 			this.tab4AudioFileOptions.TabIndex = 3;
 			this.tab4AudioFileOptions.Text = "Audio File Options";
 			this.tab4AudioFileOptions.UseVisualStyleBackColor = true;
@@ -633,7 +646,7 @@
 			// chapterTitleTemplateTb
 			// 
 			this.chapterTitleTemplateTb.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
-			| System.Windows.Forms.AnchorStyles.Right)));
+            | System.Windows.Forms.AnchorStyles.Right)));
 			this.chapterTitleTemplateTb.Location = new System.Drawing.Point(6, 22);
 			this.chapterTitleTemplateTb.Name = "chapterTitleTemplateTb";
 			this.chapterTitleTemplateTb.ReadOnly = true;
@@ -967,17 +980,27 @@
 			// stripUnabridgedCbox
 			// 
 			this.stripUnabridgedCbox.AutoSize = true;
-			this.stripUnabridgedCbox.Location = new System.Drawing.Point(19, 143);
+			this.stripUnabridgedCbox.Location = new System.Drawing.Point(13, 47);
 			this.stripUnabridgedCbox.Name = "stripUnabridgedCbox";
 			this.stripUnabridgedCbox.Size = new System.Drawing.Size(147, 19);
 			this.stripUnabridgedCbox.TabIndex = 13;
 			this.stripUnabridgedCbox.Text = "[StripUnabridged desc]";
 			this.stripUnabridgedCbox.UseVisualStyleBackColor = true;
 			// 
+			// mergeOpeningEndCreditsCbox
+			// 
+			this.mergeOpeningEndCreditsCbox.AutoSize = true;
+			this.mergeOpeningEndCreditsCbox.Location = new System.Drawing.Point(19, 93);
+			this.mergeOpeningEndCreditsCbox.Name = "mergeOpeningEndCreditsCbox";
+			this.mergeOpeningEndCreditsCbox.Size = new System.Drawing.Size(198, 19);
+			this.mergeOpeningEndCreditsCbox.TabIndex = 13;
+			this.mergeOpeningEndCreditsCbox.Text = "[MergeOpeningEndCredits desc]";
+			this.mergeOpeningEndCreditsCbox.UseVisualStyleBackColor = true;
+			// 
 			// retainAaxFileCbox
 			// 
 			this.retainAaxFileCbox.AutoSize = true;
-			this.retainAaxFileCbox.Location = new System.Drawing.Point(19, 93);
+			this.retainAaxFileCbox.Location = new System.Drawing.Point(19, 68);
 			this.retainAaxFileCbox.Name = "retainAaxFileCbox";
 			this.retainAaxFileCbox.Size = new System.Drawing.Size(132, 19);
 			this.retainAaxFileCbox.TabIndex = 10;
@@ -990,7 +1013,7 @@
 			this.downloadCoverArtCbox.AutoSize = true;
 			this.downloadCoverArtCbox.Checked = true;
 			this.downloadCoverArtCbox.CheckState = System.Windows.Forms.CheckState.Checked;
-			this.downloadCoverArtCbox.Location = new System.Drawing.Point(19, 68);
+			this.downloadCoverArtCbox.Location = new System.Drawing.Point(19, 43);
 			this.downloadCoverArtCbox.Name = "downloadCoverArtCbox";
 			this.downloadCoverArtCbox.Size = new System.Drawing.Size(162, 19);
 			this.downloadCoverArtCbox.TabIndex = 10;
@@ -1003,7 +1026,7 @@
 			this.createCueSheetCbox.AutoSize = true;
 			this.createCueSheetCbox.Checked = true;
 			this.createCueSheetCbox.CheckState = System.Windows.Forms.CheckState.Checked;
-			this.createCueSheetCbox.Location = new System.Drawing.Point(19, 43);
+			this.createCueSheetCbox.Location = new System.Drawing.Point(19, 18);
 			this.createCueSheetCbox.Name = "createCueSheetCbox";
 			this.createCueSheetCbox.Size = new System.Drawing.Size(145, 19);
 			this.createCueSheetCbox.TabIndex = 10;
@@ -1011,13 +1034,27 @@
 			this.createCueSheetCbox.UseVisualStyleBackColor = true;
 			this.createCueSheetCbox.CheckedChanged += new System.EventHandler(this.allowLibationFixupCbox_CheckedChanged);
 			// 
+			// audiobookFixupsGb
+			// 
+			this.audiobookFixupsGb.Controls.Add(this.splitFilesByChapterCbox);
+			this.audiobookFixupsGb.Controls.Add(this.stripUnabridgedCbox);
+			this.audiobookFixupsGb.Controls.Add(this.convertLosslessRb);
+			this.audiobookFixupsGb.Controls.Add(this.convertLossyRb);
+			this.audiobookFixupsGb.Controls.Add(this.stripAudibleBrandingCbox);
+			this.audiobookFixupsGb.Location = new System.Drawing.Point(6, 143);
+			this.audiobookFixupsGb.Name = "audiobookFixupsGb";
+			this.audiobookFixupsGb.Size = new System.Drawing.Size(403, 160);
+			this.audiobookFixupsGb.TabIndex = 19;
+			this.audiobookFixupsGb.TabStop = false;
+			this.audiobookFixupsGb.Text = "Audiobook Fix-ups";
+			// 
 			// SettingsDialog
 			// 
 			this.AcceptButton = this.saveBtn;
 			this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
 			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
 			this.CancelButton = this.cancelBtn;
-			this.ClientSize = new System.Drawing.Size(886, 484);
+			this.ClientSize = new System.Drawing.Size(886, 504);
 			this.Controls.Add(this.tabControl);
 			this.Controls.Add(this.cancelBtn);
 			this.Controls.Add(this.saveBtn);
@@ -1057,6 +1094,8 @@
 			((System.ComponentModel.ISupportInitialize)(this.lameVBRQualityTb)).EndInit();
 			this.groupBox2.ResumeLayout(false);
 			this.groupBox2.PerformLayout();
+			this.audiobookFixupsGb.ResumeLayout(false);
+			this.audiobookFixupsGb.PerformLayout();
 			this.ResumeLayout(false);
 
 		}
@@ -1141,5 +1180,8 @@
 		private System.Windows.Forms.GroupBox chapterTitleTemplateGb;
 		private System.Windows.Forms.Button chapterTitleTemplateBtn;
 		private System.Windows.Forms.TextBox chapterTitleTemplateTb;
+		private System.Windows.Forms.Button editCharreplacementBtn;
+		private System.Windows.Forms.CheckBox mergeOpeningEndCreditsCbox;
+		private System.Windows.Forms.GroupBox audiobookFixupsGb;
 	}
 }

Source/LibationWinForms/Dialogs/SettingsDialog.DownloadDecrypt.cs

@@ -11,9 +11,19 @@ namespace LibationWinForms.Dialogs
 		private void fileTemplateBtn_Click(object sender, EventArgs e) => editTemplate(Templates.File, fileTemplateTb);
 		private void chapterFileTemplateBtn_Click(object sender, EventArgs e) => editTemplate(Templates.ChapterFile, chapterFileTemplateTb);
 
+
+		private void editCharreplacementBtn_Click(object sender, EventArgs e)
+		{
+			var form = new EditReplacementChars(config);
+			form.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
+			form.ShowDialog(this);
+		}
+
 		private void Load_DownloadDecrypt(Configuration config)
 		{
 			inProgressDescLbl.Text = desc(nameof(config.InProgress));
+			editCharreplacementBtn.Text = desc(nameof(config.ReplacementCharacters));
+
 			badBookGb.Text = desc(nameof(config.BadBook));
 			badBookAskRb.Text = Configuration.BadBookAction.Ask.GetDescription();
 			badBookAbortRb.Text = Configuration.BadBookAction.Abort.GetDescription();

Source/LibationWinForms/Form1.Liberate.cs

@@ -1,4 +1,5 @@
-using System;
+using DataLayer;
+using System;
 using System.Linq;
 using System.Threading.Tasks;
 using System.Windows.Forms;
@@ -10,11 +11,24 @@ namespace LibationWinForms
 		private void Configure_Liberate() { }
 
 		//GetLibrary_Flat_NoTracking() may take a long time on a hugh library. so run in new thread 
-		private async void beginBookBackupsToolStripMenuItem_Click(object _ = null, EventArgs __ = null)
+		private void beginBookBackupsToolStripMenuItem_Click(object _ = null, EventArgs __ = null)
 		{
-			SetQueueCollapseState(false);
-			await Task.Run(() => processBookQueue1.AddDownloadDecrypt(ApplicationServices.DbContexts.GetLibrary_Flat_NoTracking()
-				.Where(lb => lb.Book.UserDefinedItem.PdfStatus is DataLayer.LiberatedStatus.NotLiberated || lb.Book.UserDefinedItem.BookStatus is DataLayer.LiberatedStatus.NotLiberated)));
+			try
+			{
+				SetQueueCollapseState(false);
+
+				Serilog.Log.Logger.Information("Begin backing up all library books");
+
+				processBookQueue1.AddDownloadDecrypt(
+					ApplicationServices.DbContexts
+					.GetLibrary_Flat_NoTracking()
+					.UnLiberated()
+					);
+			}
+			catch (Exception ex)
+			{
+				Serilog.Log.Logger.Error(ex, "An error occurred while backing up all library books");
+			}
 		}
 
 		private async void beginPdfBackupsToolStripMenuItem_Click(object sender, EventArgs e)

Source/LibationWinForms/Form1.ProcessQueue.cs

@@ -22,27 +22,36 @@ namespace LibationWinForms
 			this.Width = width;
 		}
 
-		private void ProductsDisplay_LiberateClicked(object sender, LibraryBook e)
+		private void ProductsDisplay_LiberateClicked(object sender, LibraryBook libraryBook)
 		{
-			if (e.Book.UserDefinedItem.BookStatus != LiberatedStatus.Liberated)
+			try
 			{
-				SetQueueCollapseState(false);
-				processBookQueue1.AddDownloadDecrypt(e);
-			}
-			else if (e.Book.UserDefinedItem.PdfStatus is not null and LiberatedStatus.NotLiberated)
-			{
-				SetQueueCollapseState(false);
-				processBookQueue1.AddDownloadPdf(e);
-			}
-			else if (e.Book.Audio_Exists())
-			{
-				// liberated: open explorer to file
-				var filePath = AudibleFileStorage.Audio.GetPath(e.Book.AudibleProductId);
-				if (!Go.To.File(filePath?.ShortPathName))
+				if (libraryBook.Book.UserDefinedItem.BookStatus is LiberatedStatus.NotLiberated or LiberatedStatus.PartialDownload)
 				{
-					var suffix = string.IsNullOrWhiteSpace(filePath) ? "" : $":\r\n{filePath}";
-					MessageBox.Show($"File not found" + suffix);
+					Serilog.Log.Logger.Information("Begin single book backup of {libraryBook}", libraryBook);
+					SetQueueCollapseState(false);
+					processBookQueue1.AddDownloadDecrypt(libraryBook);
 				}
+				else if (libraryBook.Book.UserDefinedItem.PdfStatus is LiberatedStatus.NotLiberated)
+				{
+					Serilog.Log.Logger.Information("Begin single pdf backup of {libraryBook}", libraryBook);
+					SetQueueCollapseState(false);
+					processBookQueue1.AddDownloadPdf(libraryBook);
+				}
+				else if (libraryBook.Book.Audio_Exists())
+				{
+					// liberated: open explorer to file
+					var filePath = AudibleFileStorage.Audio.GetPath(libraryBook.Book.AudibleProductId);
+					if (!Go.To.File(filePath?.ShortPathName))
+					{
+						var suffix = string.IsNullOrWhiteSpace(filePath) ? "" : $":\r\n{filePath}";
+						MessageBox.Show($"File not found" + suffix);
+					}
+				}
+			}
+			catch (Exception ex)
+			{
+				Serilog.Log.Logger.Error(ex, "An error occurred while handling the stop light button click for {libraryBook}", libraryBook);
 			}
 		}
 

Source/LibationWinForms/Form1.ScanAuto.cs

@@ -33,7 +33,18 @@ namespace LibationWinForms
 					.ToArray();
 
 				// in autoScan, new books SHALL NOT show dialog
-				await Invoke(async () => await LibraryCommands.ImportAccountAsync(Login.WinformLoginChoiceEager.ApiExtendedFunc, accounts));
+				try
+				{
+					Task importAsync() => LibraryCommands.ImportAccountAsync(Login.WinformLoginChoiceEager.ApiExtendedFunc, accounts);
+					if (InvokeRequired)
+						await Invoke(importAsync);
+					else
+						await importAsync();
+				}
+                catch (Exception ex)
+                {
+					Serilog.Log.Logger.Error(ex, "Error invoking auto-scan");
+                }
 			};
 
 			// load init state to menu checkbox

Source/LibationWinForms/Form1.ScanNotification.cs

@@ -3,7 +3,7 @@ using ApplicationServices;
 
 namespace LibationWinForms
 {
-	// This is for the Scanning notificationin the upper right. This shown for manual scanning and auto-scan
+	// This is for the Scanning notification in the upper right. This shown for manual scanning and auto-scan
     public partial class Form1
     {
         private void Configure_ScanNotification()

Source/LibationWinForms/Form1.VisibleBooks.cs

@@ -3,6 +3,7 @@ using System.Linq;
 using System.Threading.Tasks;
 using System.Windows.Forms;
 using ApplicationServices;
+using DataLayer;
 using Dinah.Core.Threading;
 using LibationWinForms.Dialogs;
 
@@ -48,10 +49,24 @@ namespace LibationWinForms
 			});
 		}
 
-		private async void liberateVisible(object sender, EventArgs e)
+		private void liberateVisible(object sender, EventArgs e)
 		{
-			SetQueueCollapseState(false);
-			await Task.Run(() => processBookQueue1.AddDownloadDecrypt(productsDisplay.GetVisible()));
+			try
+			{
+				SetQueueCollapseState(false);
+
+				Serilog.Log.Logger.Information("Begin backing up visible library books");
+
+				processBookQueue1.AddDownloadDecrypt(
+					productsDisplay
+					.GetVisible()
+					.UnLiberated()
+					);
+			}
+			catch (Exception ex)
+			{
+				Serilog.Log.Logger.Error(ex, "An error occurred while backing up visible library books");
+			}
 		}
 
 		private void replaceTagsToolStripMenuItem_Click(object sender, EventArgs e)

Source/LibationWinForms/GridView/ProductsGrid.cs

@@ -50,45 +50,52 @@ namespace LibationWinForms.GridView
 		#region Button controls
 		private void DataGridView_CellContentClick(object sender, DataGridViewCellEventArgs e)
 		{
-			// handle grid button click: https://stackoverflow.com/a/13687844
-			if (e.RowIndex < 0)
-				return;
+			try
+			{
+				// handle grid button click: https://stackoverflow.com/a/13687844
+				if (e.RowIndex < 0)
+					return;
 
-			var entry = getGridEntry(e.RowIndex);
-			if (entry is LibraryBookEntry lbEntry)
-			{
-				if (e.ColumnIndex == liberateGVColumn.Index)
-					LiberateClicked?.Invoke(lbEntry);
-				else if (e.ColumnIndex == tagAndDetailsGVColumn.Index)
-					DetailsClicked?.Invoke(lbEntry);
-				else if (e.ColumnIndex == descriptionGVColumn.Index)
-					DescriptionClicked?.Invoke(lbEntry, gridEntryDataGridView.GetCellDisplayRectangle(e.ColumnIndex, e.RowIndex, false));
-				else if (e.ColumnIndex == coverGVColumn.Index)
-					CoverClicked?.Invoke(lbEntry);
-			}
-			else if (entry is SeriesEntry sEntry)
-			{
-				if (e.ColumnIndex == liberateGVColumn.Index)
+				var entry = getGridEntry(e.RowIndex);
+				if (entry is LibraryBookEntry lbEntry)
 				{
-					if (sEntry.Liberate.Expanded)
-						bindingList.CollapseItem(sEntry);
-					else
-						bindingList.ExpandItem(sEntry);
-
-					sEntry.NotifyPropertyChanged(nameof(sEntry.Liberate));
-
-					VisibleCountChanged?.Invoke(this, bindingList.BookEntries().Count());
+					if (e.ColumnIndex == liberateGVColumn.Index)
+						LiberateClicked?.Invoke(lbEntry);
+					else if (e.ColumnIndex == tagAndDetailsGVColumn.Index)
+						DetailsClicked?.Invoke(lbEntry);
+					else if (e.ColumnIndex == descriptionGVColumn.Index)
+						DescriptionClicked?.Invoke(lbEntry, gridEntryDataGridView.GetCellDisplayRectangle(e.ColumnIndex, e.RowIndex, false));
+					else if (e.ColumnIndex == coverGVColumn.Index)
+						CoverClicked?.Invoke(lbEntry);
 				}
-				else if (e.ColumnIndex == descriptionGVColumn.Index)
-					DescriptionClicked?.Invoke(sEntry, gridEntryDataGridView.GetCellDisplayRectangle(e.ColumnIndex, e.RowIndex, false));
-				else if (e.ColumnIndex == coverGVColumn.Index)
-					CoverClicked?.Invoke(sEntry);
-			}
+				else if (entry is SeriesEntry sEntry)
+				{
+					if (e.ColumnIndex == liberateGVColumn.Index)
+					{
+						if (sEntry.Liberate.Expanded)
+							bindingList.CollapseItem(sEntry);
+						else
+							bindingList.ExpandItem(sEntry);
 
-			if (e.ColumnIndex == removeGVColumn.Index)
+						sEntry.NotifyPropertyChanged(nameof(sEntry.Liberate));
+
+						VisibleCountChanged?.Invoke(this, bindingList.BookEntries().Count());
+					}
+					else if (e.ColumnIndex == descriptionGVColumn.Index)
+						DescriptionClicked?.Invoke(sEntry, gridEntryDataGridView.GetCellDisplayRectangle(e.ColumnIndex, e.RowIndex, false));
+					else if (e.ColumnIndex == coverGVColumn.Index)
+						CoverClicked?.Invoke(sEntry);
+				}
+
+				if (e.ColumnIndex == removeGVColumn.Index)
+				{
+					gridEntryDataGridView.CommitEdit(DataGridViewDataErrorContexts.Commit);
+					RemovableCountChanged?.Invoke(this, EventArgs.Empty);
+				}
+			}
+			catch(Exception ex)
 			{
-				gridEntryDataGridView.CommitEdit(DataGridViewDataErrorContexts.Commit);
-				RemovableCountChanged?.Invoke(this, EventArgs.Empty);
+				Serilog.Log.Logger.Error(ex, $"An error was encountered while processing a user click in the {nameof(ProductsGrid)}");
 			}
 		}
 

Source/LibationWinForms/LibationWinForms.csproj

@@ -7,7 +7,7 @@
     <UseWindowsForms>true</UseWindowsForms>
     <ApplicationIcon>libation.ico</ApplicationIcon>
     <AssemblyName>Libation</AssemblyName>
-
+	  
     <PublishReadyToRun>true</PublishReadyToRun>
     <RuntimeIdentifier>win-x64</RuntimeIdentifier>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
@@ -27,9 +27,19 @@
     <SatelliteResourceLanguages>en;es</SatelliteResourceLanguages>
   </PropertyGroup>
 
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+	  <OutputPath>..\bin\Debug</OutputPath>
+    <DebugType>embedded</DebugType>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
+	  <OutputPath>..\bin\Release</OutputPath>
+    <DebugType>embedded</DebugType>
+  </PropertyGroup>
+
   <ItemGroup>
     <PackageReference Include="Autoupdater.NET.Official" Version="1.7.3" />
-    <PackageReference Include="Dinah.Core.WindowsDesktop" Version="4.2.2.1" />
+    <PackageReference Include="Dinah.Core.WindowsDesktop" Version="4.2.3.1" />
   </ItemGroup>
 
   <ItemGroup>

Source/LibationWinForms/ProcessQueue/ProcessQueueControl.cs

@@ -42,8 +42,6 @@ namespace LibationWinForms.ProcessQueue
 		public bool Running => !QueueRunner?.IsCompleted ?? false;
 		public ToolStripButton popoutBtn = new();
 
-		private System.Threading.SynchronizationContext syncContext { get; } = System.Threading.SynchronizationContext.Current;
-
 		public ProcessQueueControl()
 		{
 			InitializeComponent();
@@ -103,6 +101,7 @@ namespace LibationWinForms.ProcessQueue
 				procs.Add(pbook);
 			}
 
+			Serilog.Log.Logger.Information("Queueing {count} books", procs.Count);
 			AddToQueue(procs);
 		}
 
@@ -121,6 +120,7 @@ namespace LibationWinForms.ProcessQueue
 				procs.Add(pbook);
 			}
 
+			Serilog.Log.Logger.Information("Queueing {count} books", procs.Count);
 			AddToQueue(procs);
 		}
 		
@@ -138,44 +138,57 @@ namespace LibationWinForms.ProcessQueue
 				procs.Add(pbook);
 			}
 
+			Serilog.Log.Logger.Information("Queueing {count} books", procs.Count);
 			AddToQueue(procs);
 		}
-
 		private void AddToQueue(IEnumerable<ProcessBook> pbook)
 		{
-			syncContext.Post(_ =>
+			BeginInvoke(() =>
 			{
 				Queue.Enqueue(pbook);
 				if (!Running)
 					QueueRunner = QueueLoop();
-			},
-			null);
+			});
 		}
 
-
 		DateTime StartingTime;
 		private async Task QueueLoop()
 		{
-			StartingTime = DateTime.Now;
-			counterTimer.Start();
-
-			while (Queue.MoveNext())
+			try
 			{
-				var nextBook = Queue.Current;
+				Serilog.Log.Logger.Information("Begin processing queue");
 
-				var result = await nextBook.ProcessOneAsync();
+				StartingTime = DateTime.Now;
+				counterTimer.Start();
 
-				if (result == ProcessBookResult.ValidationFail)
-					Queue.ClearCurrent();
-				else if (result == ProcessBookResult.FailedAbort)
-					Queue.ClearQueue();
-				else if (result == ProcessBookResult.FailedSkip)
-					nextBook.LibraryBook.Book.UpdateBookStatus(DataLayer.LiberatedStatus.Error);
+				while (Queue.MoveNext())
+				{
+					var nextBook = Queue.Current;
+
+					Serilog.Log.Logger.Information("Begin processing queued item. {item_LibraryBook}", nextBook?.LibraryBook);
+
+					var result = await nextBook.ProcessOneAsync();
+
+					Serilog.Log.Logger.Information("Completed processing queued item: {item_LibraryBook}\r\nResult: {result}", nextBook?.LibraryBook, result);
+
+					if (result == ProcessBookResult.ValidationFail)
+						Queue.ClearCurrent();
+					else if (result == ProcessBookResult.FailedAbort)
+						Queue.ClearQueue();
+					else if (result == ProcessBookResult.FailedSkip)
+						nextBook.LibraryBook.Book.UpdateBookStatus(DataLayer.LiberatedStatus.Error);
+				}
+				Serilog.Log.Logger.Information("Completed processing queue");
+
+				Queue_CompletedCountChanged(this, 0);
+				counterTimer.Stop();
+				virtualFlowControl2.VirtualControlCount = Queue.Count;
+				UpdateAllControls();
+			}
+			catch (Exception ex)
+			{
+				Serilog.Log.Logger.Error(ex, "An error was encountered while processing queued items");
 			}
-			Queue_CompletedCountChanged(this, 0);
-			counterTimer.Stop();
-			virtualFlowControl2.VirtualControlCount = Queue.Count;
-			UpdateAllControls();
 		}
 
 		public void WriteLine(string text)
@@ -282,35 +295,41 @@ namespace LibationWinForms.ProcessQueue
 		/// <param name="propertyName">The nme of the property that needs updating. If null, all properties are updated.</param>
 		private void UpdateControl(int queueIndex, string propertyName = null)
 		{
-			int i = queueIndex - FirstVisible;
-
-			if (i > NumVisible || i < 0) return;
-
-			var proc = Queue[queueIndex];
-
-			syncContext.Send(_ =>
+			try
 			{
-				Panels[i].SuspendLayout();
-				if (propertyName is null or nameof(proc.Cover))
-					Panels[i].SetCover(proc.Cover);
-				if (propertyName is null or nameof(proc.BookText))
-					Panels[i].SetBookInfo(proc.BookText);
+				int i = queueIndex - FirstVisible;
 
-				if (proc.Result != ProcessBookResult.None)
+				if (i > NumVisible || i < 0) return;
+
+				var proc = Queue[queueIndex];
+
+				Invoke(() =>
 				{
-					Panels[i].SetResult(proc.Result);
-					return;
-				}
+					Panels[i].SuspendLayout();
+					if (propertyName is null or nameof(proc.Cover))
+						Panels[i].SetCover(proc.Cover);
+					if (propertyName is null or nameof(proc.BookText))
+						Panels[i].SetBookInfo(proc.BookText);
 
-				if (propertyName is null or nameof(proc.Status))
-					Panels[i].SetStatus(proc.Status);
-				if (propertyName is null or nameof(proc.Progress))
-					Panels[i].SetProgrss(proc.Progress);
-				if (propertyName is null or nameof(proc.TimeRemaining))
-					Panels[i].SetRemainingTime(proc.TimeRemaining);
-				Panels[i].ResumeLayout();
-			},
-			null);
+					if (proc.Result != ProcessBookResult.None)
+					{
+						Panels[i].SetResult(proc.Result);
+						return;
+					}
+
+					if (propertyName is null or nameof(proc.Status))
+						Panels[i].SetStatus(proc.Status);
+					if (propertyName is null or nameof(proc.Progress))
+						Panels[i].SetProgrss(proc.Progress);
+					if (propertyName is null or nameof(proc.TimeRemaining))
+						Panels[i].SetRemainingTime(proc.TimeRemaining);
+					Panels[i].ResumeLayout();
+				});
+			}
+			catch (Exception ex)
+			{
+				Serilog.Log.Logger.Error(ex, "Error updating the queued item's display.");
+			}
 		}
 
 		private void UpdateAllControls()
@@ -329,37 +348,44 @@ namespace LibationWinForms.ProcessQueue
 		/// <param name="panelClicked">The clicked control to update</param>
 		private async void VirtualFlowControl2_ButtonClicked(int queueIndex, string buttonName, ProcessBookControl panelClicked)
 		{
-			ProcessBook item = Queue[queueIndex];
-			if (buttonName == nameof(panelClicked.cancelBtn))
+			try
 			{
-				if (item is not null)
-					await item.CancelAsync();
-				Queue.RemoveQueued(item);
-				virtualFlowControl2.VirtualControlCount = Queue.Count;
+				ProcessBook item = Queue[queueIndex];
+				if (buttonName == nameof(panelClicked.cancelBtn))
+				{
+					if (item is not null)
+						await item.CancelAsync();
+					Queue.RemoveQueued(item);
+					virtualFlowControl2.VirtualControlCount = Queue.Count;
+				}
+				else if (buttonName == nameof(panelClicked.moveFirstBtn))
+				{
+					Queue.MoveQueuePosition(item, QueuePosition.Fisrt);
+					UpdateAllControls();
+				}
+				else if (buttonName == nameof(panelClicked.moveUpBtn))
+				{
+					Queue.MoveQueuePosition(item, QueuePosition.OneUp);
+					UpdateControl(queueIndex);
+					if (queueIndex > 0)
+						UpdateControl(queueIndex - 1);
+				}
+				else if (buttonName == nameof(panelClicked.moveDownBtn))
+				{
+					Queue.MoveQueuePosition(item, QueuePosition.OneDown);
+					UpdateControl(queueIndex);
+					if (queueIndex + 1 < Queue.Count)
+						UpdateControl(queueIndex + 1);
+				}
+				else if (buttonName == nameof(panelClicked.moveLastBtn))
+				{
+					Queue.MoveQueuePosition(item, QueuePosition.Last);
+					UpdateAllControls();
+				}
 			}
-			else if (buttonName == nameof(panelClicked.moveFirstBtn))
+			catch(Exception ex)
 			{
-				Queue.MoveQueuePosition(item, QueuePosition.Fisrt);
-				UpdateAllControls();
-			}
-			else if (buttonName == nameof(panelClicked.moveUpBtn))
-			{
-				Queue.MoveQueuePosition(item, QueuePosition.OneUp);
-				UpdateControl(queueIndex);
-				if (queueIndex > 0)
-					UpdateControl(queueIndex - 1);
-			}
-			else if (buttonName == nameof(panelClicked.moveDownBtn))
-			{
-				Queue.MoveQueuePosition(item, QueuePosition.OneDown);
-				UpdateControl(queueIndex);
-				if (queueIndex + 1 < Queue.Count) 
-					UpdateControl(queueIndex + 1);
-			}
-			else if (buttonName == nameof(panelClicked.moveLastBtn))
-			{
-				Queue.MoveQueuePosition(item, QueuePosition.Last);
-				UpdateAllControls();
+				Serilog.Log.Logger.Error(ex, "Error handling button click from queued item");
 			}
 		}
 

Source/LibationWinForms/Program.cs

@@ -87,7 +87,7 @@ namespace LibationWinForms
 
 			var defaultLibationFilesDir = Configuration.UserProfile;
 
-			// check for existing settigns in default location
+			// check for existing settings in default location
 			var defaultSettingsFile = Path.Combine(defaultLibationFilesDir, "Settings.json");
 			if (Configuration.SettingsFileIsValid(defaultSettingsFile))
 				config.SetLibationFiles(defaultLibationFilesDir);

Source/LibationWinForms/Properties/PublishProfiles/FolderProfile.pubxml

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

Source/LibationWinForms/Updater.cs

@@ -29,7 +29,7 @@ namespace LibationWinForms
 				return;
 
 			var dialogResult = MessageBox.Show(string.Format(
-				$"There is a new version avilable. Would you like to update?\r\n\r\nAfter you close Libation, the upgrade will start automatically."),
+				$"There is a new version available. Would you like to update?\r\n\r\nAfter you close Libation, the upgrade will start automatically."),
 				"Update Available",
 				MessageBoxButtons.YesNo,
 				MessageBoxIcon.Information);

Source/_Tests/AudibleUtilities.Tests/AudibleUtilities.Tests.csproj

@@ -2,7 +2,6 @@
 
   <PropertyGroup>
     <TargetFramework>net6.0-windows</TargetFramework>
-
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 

Source/_Tests/FileLiberator.Tests/DownloadDecryptBookTests.cs

@@ -0,0 +1,547 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using AudibleApi.Common;
+using Dinah.Core;
+using FileManager;
+using FluentAssertions;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+
+namespace FileLiberator.Tests
+{
+	[TestClass]
+	public class DownloadDecryptBookTests
+	{
+		private static Chapter[] HierarchicalChapters => new Chapter[]
+		{
+			new ()
+			{
+				Title = "Opening Credits",
+				StartOffsetMs = 0,
+				StartOffsetSec = 0,
+				LengthMs = 10000,
+			},
+			new ()
+			{
+				Title = "Book 1",
+				StartOffsetMs = 10000,
+				StartOffsetSec = 10,
+				LengthMs = 2000,
+				Chapters = new Chapter[]
+				{
+					new ()
+					{
+						Title = "Part 1",
+						StartOffsetMs = 12000,
+						StartOffsetSec = 12,
+						LengthMs = 2000,
+						Chapters = new Chapter[]
+						{
+							new ()
+							{
+								Title = "Chapter 1",
+								StartOffsetMs = 14000,
+								StartOffsetSec = 14,
+								LengthMs = 86000,
+							},
+							new()
+							{
+								Title = "Chapter 2",
+								StartOffsetMs = 100000,
+								StartOffsetSec = 100,
+								LengthMs = 100000,
+							},
+						}
+					},
+					new()
+					{
+						Title = "Part 2",
+						StartOffsetMs = 200000,
+						StartOffsetSec = 200,
+						LengthMs = 2000,
+						Chapters = new Chapter[]
+						{
+							new()
+							{
+								Title = "Chapter 3",
+								StartOffsetMs = 202000,
+								StartOffsetSec = 202,
+								LengthMs = 98000,
+							},
+							new()
+							{
+								Title = "Chapter 4",
+								StartOffsetMs = 300000,
+								StartOffsetSec = 300,
+								LengthMs = 100000,
+							},
+						}
+					}
+				}
+			},
+			new()
+			{
+				Title = "Book 2",
+				StartOffsetMs = 400000,
+				StartOffsetSec = 400,
+				LengthMs = 2000,
+				Chapters = new Chapter[]
+				{
+					new()
+					{
+						Title = "Part 3",
+						StartOffsetMs = 402000,
+						StartOffsetSec = 402,
+						LengthMs = 2000,
+						Chapters = new Chapter[]
+						{
+							new()
+							{
+								Title = "Chapter 5",
+								StartOffsetMs = 404000,
+								StartOffsetSec = 404,
+								LengthMs = 96000,
+							},
+							new()
+							{
+								Title = "Chapter 6",
+								StartOffsetMs = 500000,
+								StartOffsetSec = 500,
+								LengthMs = 100000,
+							},
+						}
+					},
+					new()
+					{
+						Title = "Part 4",
+						StartOffsetMs = 600000,
+						StartOffsetSec = 600,
+						LengthMs = 2000,
+						Chapters = new Chapter[]
+						{
+							new()
+							{
+								Title = "Chapter 7",
+								StartOffsetMs = 602000,
+								StartOffsetSec = 602,
+								LengthMs = 98000,
+							},
+							new()
+							{
+								Title = "Chapter 8",
+								StartOffsetMs = 700000,
+								StartOffsetSec = 700,
+								LengthMs = 100000,
+							},
+						}
+					}
+				}
+			},
+			new()
+			{
+				Title = "End Credits",
+				StartOffsetMs = 800000,
+				StartOffsetSec = 800,
+				LengthMs = 10000,
+			},
+		};
+
+
+		private static Chapter[] HierarchicalChapters_LongerParents => new Chapter[]
+		{
+			new ()
+			{
+				Title = "Opening Credits",
+				StartOffsetMs = 0,
+				StartOffsetSec = 0,
+				LengthMs = 10000,
+			},
+			new ()
+			{
+				Title = "Book 1",
+				StartOffsetMs = 10000,
+				StartOffsetSec = 10,
+				LengthMs = 15000,
+				Chapters = new Chapter[]
+				{
+					new ()
+					{
+						Title = "Part 1",
+						StartOffsetMs = 25000,
+						StartOffsetSec = 25,
+						LengthMs = 2000,
+						Chapters = new Chapter[]
+						{
+							new ()
+							{
+								Title = "Chapter 1",
+								StartOffsetMs = 27000,
+								StartOffsetSec = 27,
+								LengthMs = 73000,
+							},
+							new()
+							{
+								Title = "Chapter 2",
+								StartOffsetMs = 100000,
+								StartOffsetSec = 100,
+								LengthMs = 100000,
+							},
+						}
+					},
+					new()
+					{
+						Title = "Part 2",
+						StartOffsetMs = 200000,
+						StartOffsetSec = 200,
+						LengthMs = 2000,
+						Chapters = new Chapter[]
+						{
+							new()
+							{
+								Title = "Chapter 3",
+								StartOffsetMs = 202000,
+								StartOffsetSec = 202,
+								LengthMs = 98000,
+							},
+							new()
+							{
+								Title = "Chapter 4",
+								StartOffsetMs = 300000,
+								StartOffsetSec = 300,
+								LengthMs = 100000,
+							},
+						}
+					}
+				}
+			},
+			new()
+			{
+				Title = "Book 2",
+				StartOffsetMs = 400000,
+				StartOffsetSec = 400,
+				LengthMs = 2000,
+				Chapters = new Chapter[]
+				{
+					new()
+					{
+						Title = "Part 3",
+						StartOffsetMs = 402000,
+						StartOffsetSec = 402,
+						LengthMs = 20000,
+						Chapters = new Chapter[]
+						{
+							new()
+							{
+								Title = "Chapter 5",
+								StartOffsetMs = 422000,
+								StartOffsetSec = 422,
+								LengthMs = 78000,
+							},
+							new()
+							{
+								Title = "Chapter 6",
+								StartOffsetMs = 500000,
+								StartOffsetSec = 500,
+								LengthMs = 100000,
+							},
+						}
+					},
+					new()
+					{
+						Title = "Part 4",
+						StartOffsetMs = 600000,
+						StartOffsetSec = 600,
+						LengthMs = 2000,
+						Chapters = new Chapter[]
+						{
+							new()
+							{
+								Title = "Chapter 7",
+								StartOffsetMs = 602000,
+								StartOffsetSec = 602,
+								LengthMs = 98000,
+							},
+							new()
+							{
+								Title = "Chapter 8",
+								StartOffsetMs = 700000,
+								StartOffsetSec = 700,
+								LengthMs = 100000,
+							},
+						}
+					}
+				}
+			},
+			new()
+			{
+				Title = "End Credits",
+				StartOffsetMs = 800000,
+				StartOffsetSec = 800,
+				LengthMs = 10000,
+			},
+		};
+
+		[TestMethod]
+		public void Chapters_CombineCredits()
+		{
+			var expected = new Chapter[]
+			{
+				new()
+				{
+					Title = "Book 1: Part 1: Chapter 1",
+					StartOffsetMs = 0,
+					StartOffsetSec = 0,
+					LengthMs = 100000,
+				},
+				new()
+				{
+					Title = "Book 1: Part 1: Chapter 2",
+					StartOffsetMs = 100000,
+					StartOffsetSec = 100,
+					LengthMs = 100000,
+				},
+				new()
+				{
+					Title = "Book 1: Part 2: Chapter 3",
+					StartOffsetMs = 200000,
+					StartOffsetSec = 200,
+					LengthMs = 100000,
+				},
+				new()
+				{
+					Title = "Book 1: Part 2: Chapter 4",
+					StartOffsetMs = 300000,
+					StartOffsetSec = 300,
+					LengthMs = 100000,
+				},
+				new()
+				{
+					Title = "Book 2: Part 3: Chapter 5",
+					StartOffsetMs = 400000,
+					StartOffsetSec = 400,
+					LengthMs = 100000,
+				},
+				new()
+				{
+					Title = "Book 2: Part 3: Chapter 6",
+					StartOffsetMs = 500000,
+					StartOffsetSec = 500,
+					LengthMs = 100000,
+				},
+				new()
+				{
+					Title = "Book 2: Part 4: Chapter 7",
+					StartOffsetMs = 600000,
+					StartOffsetSec = 600,
+					LengthMs = 100000,
+				},
+				new()
+				{
+					Title = "Book 2: Part 4: Chapter 8",
+					StartOffsetMs = 700000,
+					StartOffsetSec = 700,
+					LengthMs = 110000,
+				}
+			};
+
+			var flatChapters = DownloadDecryptBook.flattenChapters(HierarchicalChapters);
+			DownloadDecryptBook.combineCredits(flatChapters);
+			checkChapters(flatChapters, expected);
+		}
+
+
+		[TestMethod]
+		public void HierarchicalChapters_Flatten()
+		{
+			var expected = new Chapter[]
+			{
+				new()
+				{
+					Title = "Opening Credits",
+					StartOffsetMs = 0,
+					StartOffsetSec = 0,
+					LengthMs = 10000,
+				},
+				new()
+				{
+					Title = "Book 1: Part 1: Chapter 1",
+					StartOffsetMs = 10000,
+					StartOffsetSec = 10,
+					LengthMs = 90000,
+				},
+				new()
+				{
+					Title = "Book 1: Part 1: Chapter 2",
+					StartOffsetMs = 100000,
+					StartOffsetSec = 100,
+					LengthMs = 100000,
+				},
+				new()
+				{
+					Title = "Book 1: Part 2: Chapter 3",
+					StartOffsetMs = 200000,
+					StartOffsetSec = 200,
+					LengthMs = 100000,
+				},
+				new()
+				{
+					Title = "Book 1: Part 2: Chapter 4",
+					StartOffsetMs = 300000,
+					StartOffsetSec = 300,
+					LengthMs = 100000,
+				},
+				new()
+				{
+					Title = "Book 2: Part 3: Chapter 5",
+					StartOffsetMs = 400000,
+					StartOffsetSec = 400,
+					LengthMs = 100000,
+				},
+				new()
+				{
+					Title = "Book 2: Part 3: Chapter 6",
+					StartOffsetMs = 500000,
+					StartOffsetSec = 500,
+					LengthMs = 100000,
+				},
+				new()
+				{
+					Title = "Book 2: Part 4: Chapter 7",
+					StartOffsetMs = 600000,
+					StartOffsetSec = 600,
+					LengthMs = 100000,
+				},
+				new()
+				{
+					Title = "Book 2: Part 4: Chapter 8",
+					StartOffsetMs = 700000,
+					StartOffsetSec = 700,
+					LengthMs = 100000,
+				},
+				new()
+				{
+					Title = "End Credits",
+					StartOffsetMs = 800000,
+					StartOffsetSec = 800,
+					LengthMs = 10000,
+				}
+			};
+			
+			var flatChapters = DownloadDecryptBook.flattenChapters(HierarchicalChapters);
+
+			checkChapters(flatChapters, expected);
+		}
+
+		[TestMethod]
+		public void HierarchicalChapters_LongerParents_Flatten()
+		{
+			var expected = new Chapter[]
+			{
+				new()
+				{
+					Title = "Opening Credits",
+					StartOffsetMs = 0,
+					StartOffsetSec = 0,
+					LengthMs = 10000,
+				},
+				new()
+				{
+					Title = "Book 1",
+					StartOffsetMs = 10000,
+					StartOffsetSec = 10,
+					LengthMs = 15000,
+				},
+				new()
+				{
+					Title = "Book 1: Part 1: Chapter 1",
+					StartOffsetMs = 25000,
+					StartOffsetSec = 25,
+					LengthMs = 75000,
+				},
+				new()
+				{
+					Title = "Book 1: Part 1: Chapter 2",
+					StartOffsetMs = 100000,
+					StartOffsetSec = 100,
+					LengthMs = 100000,
+				},
+				new()
+				{
+					Title = "Book 1: Part 2: Chapter 3",
+					StartOffsetMs = 200000,
+					StartOffsetSec = 200,
+					LengthMs = 100000,
+				},
+				new()
+				{
+					Title = "Book 1: Part 2: Chapter 4",
+					StartOffsetMs = 300000,
+					StartOffsetSec = 300,
+					LengthMs = 100000,
+				},
+				new()
+				{
+					Title = "Book 2: Part 3",
+					StartOffsetMs = 400000,
+					StartOffsetSec = 400,
+					LengthMs = 22000,
+				},
+				new()
+				{
+					Title = "Book 2: Part 3: Chapter 5",
+					StartOffsetMs = 422000,
+					StartOffsetSec = 422,
+					LengthMs = 78000,
+				},
+				new()
+				{
+					Title = "Book 2: Part 3: Chapter 6",
+					StartOffsetMs = 500000,
+					StartOffsetSec = 500,
+					LengthMs = 100000,
+				},
+				new()
+				{
+					Title = "Book 2: Part 4: Chapter 7",
+					StartOffsetMs = 600000,
+					StartOffsetSec = 600,
+					LengthMs = 100000,
+				},
+				new()
+				{
+					Title = "Book 2: Part 4: Chapter 8",
+					StartOffsetMs = 700000,
+					StartOffsetSec = 700,
+					LengthMs = 100000,
+				},
+				new()
+				{
+					Title = "End Credits",
+					StartOffsetMs = 800000,
+					StartOffsetSec = 800,
+					LengthMs = 10000,
+				}
+			};
+			
+			var flatChapters = DownloadDecryptBook.flattenChapters(HierarchicalChapters_LongerParents);
+
+			checkChapters(flatChapters, expected);
+		}
+
+		private static void checkChapters(IList<Chapter> value, IList<Chapter> expected)
+		{
+			value.Count.Should().Be(expected.Count);
+
+			for (int i = 0; i < value.Count; i++)
+			{
+				value[i].Title.Should().Be(expected[i].Title);
+				value[i].StartOffsetMs.Should().Be(expected[i].StartOffsetMs);
+				value[i].StartOffsetSec.Should().Be(expected[i].StartOffsetSec);
+				value[i].LengthMs.Should().Be(expected[i].LengthMs);
+				value[i].Chapters.Should().BeNull();
+			}
+		}
+	}
+}

Source/_Tests/FileLiberator.Tests/FileLiberator.Tests.csproj

@@ -2,7 +2,6 @@
 
   <PropertyGroup>
     <TargetFramework>net6.0-windows</TargetFramework>
-
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 

Source/_Tests/FileManager.Tests/FileNamingTemplateTests.cs

@@ -12,6 +12,8 @@ namespace FileNamingTemplateTests
 	[TestClass]
 	public class GetFilePath
 	{
+		static ReplacementCharacters Replacements = ReplacementCharacters.Default;
+
 		[TestMethod]
 		public void equiv_GetValidFilename()
 		{
@@ -19,81 +21,33 @@ namespace FileNamingTemplateTests
 			sb.Append('0', 300);
 			var longText = sb.ToString();
 
-			var expectedOld = "C:\\foo\\bar\\my_ book 00000000000000000000000000000000000000000 [ID123456].txt";
 			var expectedNew = "C:\\foo\\bar\\my꞉ book 000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 [ID123456].txt";
-			var f1 = OLD_GetValidFilename(@"C:\foo\bar", "my: book " + longText, "txt", "ID123456");
 			var f2 = NEW_GetValidFilename_FileNamingTemplate(@"C:\foo\bar", "my: book " + longText, "txt", "ID123456");
 
-			f1.Should().Be(expectedOld);
 			f2.Should().Be(expectedNew);
 		}
-		private static string OLD_GetValidFilename(string dirFullPath, string filename, string extension, string metadataSuffix)
-		{
-			ArgumentValidator.EnsureNotNullOrWhiteSpace(dirFullPath, nameof(dirFullPath));
 
-			filename ??= "";
-
-			// sanitize. omit invalid characters. exception: colon => underscore
-			filename = filename.Replace(":", "_");
-			filename = FileUtility.GetSafeFileName(filename);
-
-			if (filename.Length > 50)
-				filename = filename.Substring(0, 50);
-
-			if (!string.IsNullOrWhiteSpace(metadataSuffix))
-				filename += $" [{metadataSuffix}]";
-
-			// extension is null when this method is used for directory names
-			extension = FileUtility.GetStandardizedExtension(extension);
-
-			// ensure uniqueness
-			var fullfilename = Path.Combine(dirFullPath, filename + extension);
-			var i = 0;
-			while (File.Exists(fullfilename))
-				fullfilename = Path.Combine(dirFullPath, filename + $" ({++i})" + extension);
-
-			return fullfilename;
-		}
 		private static string NEW_GetValidFilename_FileNamingTemplate(string dirFullPath, string filename, string extension, string metadataSuffix)
 		{
 			var template = $"<title> [<id>]";
 
 			var fullfilename = Path.Combine(dirFullPath, template + FileUtility.GetStandardizedExtension(extension));
 
-			var fileNamingTemplate = new FileNamingTemplate(fullfilename) { IllegalCharacterReplacements = "_" };
+			var fileNamingTemplate = new FileNamingTemplate(fullfilename);
 			fileNamingTemplate.AddParameterReplacement("title", filename);
 			fileNamingTemplate.AddParameterReplacement("id", metadataSuffix);
-			return fileNamingTemplate.GetFilePath().PathWithoutPrefix;
+			return fileNamingTemplate.GetFilePath(Replacements).PathWithoutPrefix;
 		}
 
 		[TestMethod]
 		public void equiv_GetMultipartFileName()
 		{
 			var expected = @"C:\foo\bar\my file - 002 - title.txt";
-			var f1 = OLD_GetMultipartFileName(@"C:\foo\bar\my file.txt", 2, 100, "title");
 			var f2 = NEW_GetMultipartFileName_FileNamingTemplate(@"C:\foo\bar\my file.txt", 2, 100, "title");
 
-			f1.Should().Be(expected);
-			f1.Should().Be(f2);
+			f2.Should().Be(expected);
 		}
-		private static string OLD_GetMultipartFileName(string originalPath, int partsPosition, int partsTotal, string suffix)
-		{
-			// 1-9     => 1-9
-			// 10-99   => 01-99
-			// 100-999 => 001-999
-			var chapterCountLeadingZeros = partsPosition.ToString().PadLeft(partsTotal.ToString().Length, '0');
 
-			string extension = Path.GetExtension(originalPath);
-
-			var filenameBase = $"{Path.GetFileNameWithoutExtension(originalPath)} - {chapterCountLeadingZeros}";
-			if (!string.IsNullOrWhiteSpace(suffix))
-				filenameBase += $" - {suffix}";
-
-			// Replace illegal path characters with spaces
-			var fileName = FileUtility.GetSafeFileName(filenameBase, " ");
-			var path = Path.Combine(Path.GetDirectoryName(originalPath), fileName + extension);
-			return path;
-		}
 		private static string NEW_GetMultipartFileName_FileNamingTemplate(string originalPath, int partsPosition, int partsTotal, string suffix)
 		{
 			// 1-9     => 1-9
@@ -103,10 +57,10 @@ namespace FileNamingTemplateTests
 
 			var t = Path.ChangeExtension(originalPath, null) + " - <chapter> - <title>" + Path.GetExtension(originalPath);
 
-			var fileNamingTemplate = new FileNamingTemplate(t) { IllegalCharacterReplacements = " " };
+			var fileNamingTemplate = new FileNamingTemplate(t);
 			fileNamingTemplate.AddParameterReplacement("chapter", chapterCountLeadingZeros);
 			fileNamingTemplate.AddParameterReplacement("title", suffix);
-			return fileNamingTemplate.GetFilePath().PathWithoutPrefix;
+			return fileNamingTemplate.GetFilePath(Replacements).PathWithoutPrefix;
 		}
 
 		[TestMethod]
@@ -114,7 +68,7 @@ namespace FileNamingTemplateTests
 		{
 			var fileNamingTemplate = new FileNamingTemplate(@"\foo\<title>.txt");
 			fileNamingTemplate.AddParameterReplacement("title", @"s\l/a\s/h\e/s");
-			fileNamingTemplate.GetFilePath().PathWithoutPrefix.Should().Be(@"\foo\slashes.txt");
+			fileNamingTemplate.GetFilePath(Replacements).PathWithoutPrefix.Should().Be(@"\foo\sl∕as∕he∕s.txt");
 		}
 	}
 }

Source/_Tests/FileManager.Tests/FileUtilityTests.cs

@@ -12,49 +12,88 @@ namespace FileUtilityTests
 	[TestClass]
 	public class GetSafePath
 	{
-		[TestMethod]
-		public void null_path_throws() => Assert.ThrowsException<ArgumentNullException>(() => FileUtility.GetSafePath(null));
+		static readonly ReplacementCharacters Default = ReplacementCharacters.Default;
+		static readonly ReplacementCharacters LoFiDefault = ReplacementCharacters.LoFiDefault;
+		static readonly ReplacementCharacters Barebones = ReplacementCharacters.Barebones;
 
-		// needs separate method. middle null param not running correctly in TestExplorer when used in DataRow()
 		[TestMethod]
-		[DataRow("http://test.com/a/b/c", @"http꞉\test.com\a\b\c")]
-		public void null_replacement(string inStr, string outStr) => Tests(inStr, null, outStr);
+		public void null_path_throws() => Assert.ThrowsException<ArgumentNullException>(() => FileUtility.GetSafePath(null, Default));
+
+		[TestMethod]
+		// non-empty replacement
+		[DataRow("abc*abc.txt", "abc✱abc.txt")]
+		// standardize slashes
+		[DataRow(@"a/b\c/d", @"a\b\c\d")]
+		// remove illegal chars
+		[DataRow("a*?:z.txt", "a✱？꞉z.txt")]
+		// retain drive letter path colon
+		[DataRow(@"C:\az.txt", @"C:\az.txt")]
+		// replace all other colons
+		[DataRow(@"a\b:c\d.txt", @"a\b꞉c\d.txt")]
+		// remove empty directories
+		[DataRow(@"C:\a\\\b\c\\\d.txt",  @"C:\a\b\c\d.txt")]
+		[DataRow(@"C:\""foo\<id>", @"C:\“foo\＜id＞")]
+		public void DefaultTests(string inStr, string outStr) => Assert.AreEqual(outStr, FileUtility.GetSafePath(inStr, Default).PathWithoutPrefix);
+
+		[TestMethod]
+		// non-empty replacement
+		[DataRow("abc*abc.txt", "abc_abc.txt")]
+		// standardize slashes
+		[DataRow(@"a/b\c/d", @"a\b\c\d")]
+		// remove illegal chars
+		[DataRow("a*?:z.txt", "a__-z.txt")]
+		// retain drive letter path colon
+		[DataRow(@"C:\az.txt", @"C:\az.txt")]
+		// replace all other colons
+		[DataRow(@"a\b:c\d.txt", @"a\b-c\d.txt")]
+		// remove empty directories
+		[DataRow(@"C:\a\\\b\c\\\d.txt",  @"C:\a\b\c\d.txt")]
+		[DataRow(@"C:\""foo\<id>", @"C:\'foo\{id}")]
+		public void LoFiDefaultTests(string inStr, string outStr) => Assert.AreEqual(outStr, FileUtility.GetSafePath(inStr, LoFiDefault).PathWithoutPrefix);
 
 		[TestMethod]
 		// empty replacement
-		[DataRow("abc*abc.txt", "", "abc✱abc.txt")]
-		// non-empty replacement
-		[DataRow("abc*abc.txt", "ZZZ", "abc✱abc.txt")]
+		[DataRow("abc*abc.txt", "abc_abc.txt")]
 		// standardize slashes
-		[DataRow(@"a/b\c/d", "Z", @"a\b\c\d")]
+		[DataRow(@"a/b\c/d", @"a\b\c\d")]
 		// remove illegal chars
-		[DataRow("a*?:z.txt", "Z", "a✱？꞉z.txt")]
+		[DataRow("a*?:z.txt", "a___z.txt")]
 		// retain drive letter path colon
-		[DataRow(@"C:\az.txt", "Z", @"C:\az.txt")]
+		[DataRow(@"C:\az.txt", @"C:\az.txt")]
 		// replace all other colons
-		[DataRow(@"a\b:c\d.txt", "ZZZ", @"a\b꞉c\d.txt")]
+		[DataRow(@"a\b:c\d.txt", @"a\b_c\d.txt")]
 		// remove empty directories
-		[DataRow(@"C:\a\\\b\c\\\d.txt", "ZZZ", @"C:\a\b\c\d.txt")]
-		[DataRow(@"C:\""foo\<id>", "ZZZ", @"C:\“foo\＜id＞")]
-		public void Tests(string inStr, string replacement, string outStr) => Assert.AreEqual(outStr, FileUtility.GetSafePath(inStr, replacement).PathWithoutPrefix);
+		[DataRow(@"C:\a\\\b\c\\\d.txt",  @"C:\a\b\c\d.txt")]
+		[DataRow(@"C:\""foo\<id>", @"C:\_foo\_id_")]
+		public void BarebonesDefaultTests(string inStr, string outStr) => Assert.AreEqual(outStr, FileUtility.GetSafePath(inStr, Barebones).PathWithoutPrefix);
 	}
 
 	[TestClass]
 	public class GetSafeFileName
 	{
+		static readonly ReplacementCharacters Default = ReplacementCharacters.Default;
+		static readonly ReplacementCharacters LoFiDefault = ReplacementCharacters.LoFiDefault;
+		static readonly ReplacementCharacters Barebones = ReplacementCharacters.Barebones;
+
 		// needs separate method. middle null param not running correctly in TestExplorer when used in DataRow()
 		[TestMethod]
-		[DataRow("http://test.com/a/b/c", "httptest.comabc")]
-		public void url_null_replacement(string inStr, string outStr) => ReplacementTests(inStr, null, outStr);
+		[DataRow("http://test.com/a/b/c", "http꞉∕∕test.com∕a∕b∕c")]
+		public void url_null_replacement(string inStr, string outStr) => DefaultReplacementTest(inStr, outStr);
 
 		[TestMethod]
 		// empty replacement
-		[DataRow("http://test.com/a/b/c", "", "httptest.comabc")]
-		// single char replace
-		[DataRow("http://test.com/a/b/c", "_", "http___test.com_a_b_c")]
-		// multi char replace
-		[DataRow("http://test.com/a/b/c", "!!!", "http!!!!!!!!!test.com!!!a!!!b!!!c")]
-		public void ReplacementTests(string inStr, string replacement, string outStr) => FileUtility.GetSafeFileName(inStr, replacement).Should().Be(outStr);
+		[DataRow("http://test.com/a/b/c", "http꞉∕∕test.com∕a∕b∕c")]
+		public void DefaultReplacementTest(string inStr, string outStr) => Default.ReplaceInvalidFilenameChars(inStr).Should().Be(outStr);
+
+		[TestMethod]
+		// empty replacement
+		[DataRow("http://test.com/a/b/c", "http-__test.com_a_b_c")] 
+		public void LoFiDefaultReplacementTest(string inStr, string outStr) => LoFiDefault.ReplaceInvalidFilenameChars(inStr).Should().Be(outStr);
+
+		[TestMethod]
+		// empty replacement
+		[DataRow("http://test.com/a/b/c", "http___test.com_a_b_c")] 
+		public void BarebonesDefaultReplacementTest(string inStr, string outStr) => Barebones.ReplaceInvalidFilenameChars(inStr).Should().Be(outStr);
 	}
 
 	[TestClass]
@@ -117,6 +156,8 @@ namespace FileUtilityTests
 	[TestClass]
     public class GetValidFilename
 	{
+		static ReplacementCharacters Replacements = ReplacementCharacters.Default;
+
 		[TestMethod]
 		// dot-files
 		[DataRow(@"C:\a bc\x y z\.f i l e.txt")]
@@ -134,7 +175,7 @@ namespace FileUtilityTests
 		// file end dots
 		[DataRow(@"C:\a bc\x y z\f i l e.txt . . .", @"C:\a bc\x y z\f i l e.txt")]
 		public void Tests(string input, string expected)
-			=> FileUtility.GetValidFilename(input).PathWithoutPrefix.Should().Be(expected);
+			=> FileUtility.GetValidFilename(input, Replacements).PathWithoutPrefix.Should().Be(expected);
 	}
 
 	[TestClass]

Source/_Tests/LibationFileManager.Tests/TemplatesTests.cs

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using Dinah.Core;
+using FileManager;
 using FluentAssertions;
 using LibationFileManager;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
@@ -51,6 +52,9 @@ namespace TemplatesTests
 	[TestClass]
 	public class getFileNamingTemplate
 	{
+		static ReplacementCharacters Replacements = ReplacementCharacters.Default;
+
+
 		[TestMethod]
 		[DataRow(null, "asin", @"C:\", "ext")]
 		[ExpectedException(typeof(ArgumentNullException))]
@@ -73,28 +77,28 @@ namespace TemplatesTests
 		[DataRow("<id>", "asin", @"C:\foo\bar", "ext", @"C:\foo\bar\asin.ext")]
 		public void Tests(string template, string asin, string dirFullPath, string extension, string expected)
 			=> Templates.getFileNamingTemplate(GetLibraryBook(asin), template, dirFullPath, extension)
-			.GetFilePath()
+			.GetFilePath(Replacements)
 			.PathWithoutPrefix
 			.Should().Be(expected);
 
 		[TestMethod]
 		public void IfSeries_empty()
 			=> Templates.getFileNamingTemplate(GetLibraryBook("asin", "Sherlock Holmes"), "foo<if series-><-if series>bar", @"C:\a\b", "ext")
-			.GetFilePath()
+			.GetFilePath(Replacements)
 			.PathWithoutPrefix
 			.Should().Be(@"C:\a\b\foobar.ext");
 
 		[TestMethod]
 		public void IfSeries_no_series()
 			=> Templates.getFileNamingTemplate(GetLibraryBook("asin", ""), "foo<if series->-<series>-<id>-<-if series>bar", @"C:\a\b", "ext")
-			.GetFilePath()
+			.GetFilePath(Replacements)
 			.PathWithoutPrefix
 			.Should().Be(@"C:\a\b\foobar.ext");
 
 		[TestMethod]
 		public void IfSeries_with_series()
 			=> Templates.getFileNamingTemplate(GetLibraryBook("asin", "Sherlock Holmes"), "foo<if series->-<series>-<id>-<-if series>bar", @"C:\a\b", "ext")
-			.GetFilePath()
+			.GetFilePath(Replacements)
 			.PathWithoutPrefix
 			.Should().Be(@"C:\a\b\foo-Sherlock Holmes-asin-bar.ext");
 	}
@@ -387,11 +391,13 @@ namespace Templates_ChapterFile_Tests
 	[TestClass]
 	public class GetPortionFilename
 	{
+		static readonly ReplacementCharacters Default = ReplacementCharacters.Default;
+
 		[TestMethod]
 		[DataRow("asin", "[<id>] <ch# 0> of <ch count> - <ch title>", @"C:\foo\", "txt", 6, 10, "chap", @"C:\foo\[asin] 06 of 10 - chap.txt")]
 		[DataRow("asin", "<ch#>", @"C:\foo\", "txt", 6, 10, "chap", @"C:\foo\6.txt")]
 		public void Tests(string asin, string template, string dir, string ext, int pos, int total, string chapter, string expected)
-			=> Templates.ChapterFile.GetPortionFilename(GetLibraryBook(asin), template, new() { OutputFileName = $"xyz.{ext}", PartsPosition = pos, PartsTotal = total, Title = chapter }, dir)
+			=> Templates.ChapterFile.GetPortionFilename(GetLibraryBook(asin), template, new() { OutputFileName = $"xyz.{ext}", PartsPosition = pos, PartsTotal = total, Title = chapter }, dir, Default)
 			.Should().Be(expected);
 	}
 }

Source/__README - COLLABORATORS.txt

@@ -20,7 +20,7 @@ STRUCTURE
 * Folders in the solution are numbered. Eg: "4 Domain (db)"
 * All projects should only refer to other projects in the same folder or to projects in folders with smaller numbers.
 * 1 Core Libraries
-  This is code which has roughly equivilent priority and knowledge as the BCL. In practice, if code is this universal then it doesn't live here long and is instead moved into Dinah.Core.
+  This is code which has roughly equivalent priority and knowledge as the BCL. In practice, if code is this universal then it doesn't live here long and is instead moved into Dinah.Core.
 * 2 Utilities (domain ignorant)
   Stand-alone libraries with no knowledge of anything having to do with Libation or other programs. In theory any of these should be able to one day be converted to a nuget pkg
 * 3 Domain Internal Utilities (db ignorant)

Source/publish.ps1

@@ -0,0 +1,16 @@
+<# You must enable running powershell scripts.
+
+	Set-ExecutionPolicy -Scope CurrentUser Unrestricted
+#>
+
+$pubDir = "bin\Publish"
+Remove-Item $pubDir -Recurse -Force
+
+dotnet publish -c Release LibationWinForms\LibationWinForms.csproj -p:PublishProfile=LibationWinForms\Properties\PublishProfiles\FolderProfile.pubxml
+dotnet publish -c Release LibationCli\LibationCli.csproj -p:PublishProfile=LibationCli\Properties\PublishProfiles\FolderProfile.pubxml
+dotnet publish -c Release Hangover\Hangover.csproj -p:PublishProfile=Hangover\Properties\PublishProfiles\FolderProfile.pubxml
+
+$verMatch = Select-String -Path 'AppScaffolding\AppScaffolding.csproj' -Pattern '<Version>(\d{0,3}\.\d{0,3}\.\d{0,3})\.\d{0,3}</Version>'
+$archiveName = "bin\Libation."+$verMatch.Matches.Groups[1].Value+".zip"
+Get-ChildItem -Path $pubDir -Recurse |
+	Compress-Archive -DestinationPath $archiveName -Force