Bug fix #474

Made changes discussed in previous PR and fixed #472

.github/workflows/docker.yml

@@ -39,7 +39,7 @@ jobs:
           password: ${{ secrets.docker_token }}
 
       - name: Build and push
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v4
         with:
           push: true
           build-args: 'FOLDER_NAME=Linux-chardonnay'

Documentation/Advanced.md

@@ -9,7 +9,7 @@
 
 - [Files and folders](#files-and-folders)
 - [Settings](#settings)
-- [Custom File Naming](#custom-file-naming)
+- [Custom File Naming](NamingTemplates.md)
 - [Command Line Interface](#command-line-interface)
 
 
@@ -28,12 +28,6 @@ To make upgrades and reinstalls easier, Libation separates all of its responsibi
 
 * Allow Libation to fix up audiobook metadata. After decrypting a title, Libation attempts to fix details like chapters and cover art. Some power users and/or control freaks prefer to manage this themselves. By unchecking this setting, Libation will only decrypt the book and will leave metadata as-is, warts and all.
 
-### Custom File Naming
-
-In Settings, on the Download/Decrypt tab, you can specify the format in which you want your files to be named. As you edit these templates, a live example will be shown. Parameters are listed for folders, files, and files split by chapter including an explanation of what each naming option means. For instance: you can use template `<title short> - <ch# 0> of <ch count> - <ch title>` to create the file `A Study in Scarlet - 04 of 10 - A Flight for Life.m4b`.
-
-These templates apply to GUI and CLI.
-
 ### Command Line Interface
 
 Libationcli.exe allows limited access to Libation's functionalities as a CLI.

Documentation/NamingTemplates.md

@@ -0,0 +1,109 @@
+# Naming Templates
+File and Folder names can be customized using Libation's built-in tag template naming engine. To edit how folder and file names are created, go to Settings \> Download/Decrypt and edit the naming templates. If you're splitting your audiobook into multiple files by chapter, you can also use a custom template to set each chapter's title metadata tag by editing the template in Settings \> Audio File Options.
+
+These templates apply to both GUI and CLI.
+
+# Table of Contents
+
+- [Template Tags](#template-tags)
+  - [Property Tags](#property-tags)
+  - [Conditional Tags](#conditional-tags)
+- [Tag Formatters](#tag-formatters)
+  - [Text Formatters](#text-formatters)
+  - [Integer Formatters](#integer-formatters)
+  - [Date Formatters](#date-formatters)
+
+
+# Template Tags
+
+These are the naming template tags currently supported by Libation.
+
+## Property Tags
+These tags will be replaced in the template with the audiobook's values.
+
+|Tag|Description|Type|
+|-|-|-|
+|\<id\> **†**|Audible book ID (ASIN)|Text|
+|\<title\>|Full title|Text|
+|\<title short\>|Title. Stop at first colon|Text|
+|\<author\>|Author(s)|Text|
+|\<first author\>|First author|Text|
+|\<narrator\>|Narrator(s)|Text|
+|\<first narrator\>|First narrator|Text|
+|\<series\>|Name of series|Text|
+|\<series#\>|Number order in series|Text|
+|\<bitrate\>|File's original bitrate (Kbps)|Integer|
+|\<samplerate\>|File's original audio sample rate|Integer|
+|\<channels\>|Number of audio channels|Integer|
+|\<account\>|Audible account of this book|Text|
+|\<locale\>|Region/country|Text|
+|\<year\>|Year published|Integer|
+|\<language\>|Book's language|Text|
+|\<language short\> **†**|Book's language abbreviated. Eg: ENG|Text|
+|\<file date\>|File creation date/time.|DateTime|
+|\<pub date\>|Audiobook publication date|DateTime|
+|\<date added\>|Date the book added to your Audible account|DateTime|
+|\<ch count\> **‡**|Number of chapters|Integer|
+|\<ch title\> **‡**|Chapter title|Text|
+|\<ch#\> **‡**|Chapter number|Integer|
+|\<ch# 0\> **‡**|Chapter number with leading zeros|Integer|
+
+**†** Does not support custom formatting
+
+**‡** Only valid for Chapter Filename and Chapter Tile Metadata
+
+To change how these properties are displayed, [read about custom formatters](#tag-formatters)
+
+## Conditional Tags
+Anything between the opening tag (`<tagname->`) and closing tag (`<-tagname>`) will only appear in the name if the condition evaluates to true. 
+
+|Tag|Description|Type|
+|-|-|-|
+|\<if series-\>...\<-if series\>|Only include if part of a book series or podcast|Conditional|
+|\<if podcast-\>...\<-if podcast\>|Only include if part of a podcast|Conditional|
+|\<if bookseries-\>...\<-if bookseries\>|Only include if part of a book series|Conditional|
+
+For example, <if podcast-\>\<series\>\<-if podcast\> will evaluate to the podcast's series name if the file is a podcast. For audiobooks that are not podcasts, that tag will be blank.
+
+You can invert the condition (instead of displaying the text when the condition is true, display the text when it is false) by playing a '!' symbol before the opening tag name.
+
+As an example, this folder template will place all Liberated podcasts into a "Podcasts" folder and all liberated books (not podcasts) into a "Books" folder.
+
+\<if podcast-\>Podcasts<-if podcast\>\<!if podcast-\>Books\<-if podcast\>\\\<title\>
+
+
+# Tag Formatters
+**Text**, **Integer**, and **DateTime** tags can be optionally formatted using format text in square brackets after the tag name. Below is a list of supported formatters for each tag type.
+
+## Text Formatters
+|Formatter|Description|Example Usage|Example Result|
+|-|-|-|-|
+|L|Converts text to lowercase|\<title[L]\>|a study in scarlet꞉ a sherlock holmes novel|
+|U|Converts text to uppercase|\<title short[U]\>|A STUDY IN SCARLET|
+
+## Integer Formatters
+|Formatter|Description|Example Usage|Example Result|
+|-|-|-|-|
+|# (a number)|Zero-pads the number|\<bitrate[4]\><br>\<series#[3]\><br>\<samplerate[6]\>|0128<br>001<br>044100|
+
+**Text**, **Integer**, and **DateTime** tags can be optionally formatted using format text in square brackets after the tag name. Below is a list of supported formatters for each tag type.
+
+## Date Formatters
+Form more standard formatters, [see this guide from Microsoft](https://learn.microsoft.com/en-us/dotnet/standard/base-types/standard-date-and-time-format-strings).
+### Standard DateTime Formatters
+|Formatter|Description|Example Usage|Example Result|
+|-|-|-|-|
+|s|Sortable date/time pattern.|\<file date[s]\>|2023-02-14T13:45:30|
+|Y|Year month pattern.|\<file date[Y]\>|February 2023|
+
+### Custom DateTime Formatters
+You can use custom formatters to construct customized DateTime string. For more custom formatters and examples, [see this guide from Microsoft](https://learn.microsoft.com/en-us/dotnet/standard/base-types/custom-date-and-time-format-strings).
+|Formatter|Description|Example Usage|Example Result|
+|-|-|-|-|
+|yyyy|4-digit year|\<file date[yyyy]\>|2023|
+|yy|2-digit year|\<file date[yy]\>|23|
+|MM|2-digit month|\<file date[MM]\>|02|
+|dd|2-digit day of the month|\<file date[yyyy-MM-dd]\>|2023-02-14|
+|HH<br>mm|The hour, using a 24-hour clock from 00 to 23<br>The minute, from 00 through 59.|\<file date[HH:mm]\>|14:45|
+
+

README.md

@@ -28,7 +28,7 @@
 - [Advanced](Documentation/Advanced.md)
     - [Files and folders](Documentation/Advanced.md#files-and-folders)
     - [Settings](Documentation/Advanced.md#settings)
-    - [Custom File Naming](Documentation/Advanced.md#custom-file-naming)
+    - [Custom File Naming](Documentation/NamingTemplates.md)
     - [Command Line Interface](Documentation/Advanced.md#command-line-interface)
 - [Docker](Documentation/Docker.md)
 

Scripts/targz2deb.sh

@@ -128,7 +128,7 @@ chmod +x "$FOLDER_DEBIAN/preinst"
 chmod +x "$FOLDER_DEBIAN/postinst"
 
 echo "Creating .deb file..."
-dpkg-deb --build $FOLDER_MAIN
+dpkg-deb -Zxz --build $FOLDER_MAIN
 
 rm -r "$FOLDER_MAIN"
 

Source/AaxDecrypter/AaxcDownloadConvertBase.cs

@@ -1,7 +1,7 @@
-using System;
-using System.Threading.Tasks;
-using AAXClean;
+using AAXClean;
 using Dinah.Core.Net.Http;
+using System;
+using System.Threading.Tasks;
 
 namespace AaxDecrypter
 {
@@ -9,8 +9,23 @@ namespace AaxDecrypter
 	{
 		public event EventHandler<AppleTags> RetrievedMetadata;
 
-		protected AaxFile AaxFile;
-		protected Mp4Operation aaxConversion;
+		protected AaxFile AaxFile { get; private set; }
+		private Mp4Operation aaxConversion;
+		protected Mp4Operation AaxConversion
+		{
+			get => aaxConversion;
+			set
+			{
+				if (aaxConversion is not null)
+					aaxConversion.ConversionProgressUpdate -= AaxFile_ConversionProgressUpdate;
+
+				if (value is not null)
+				{
+					aaxConversion = value;
+					aaxConversion.ConversionProgressUpdate += AaxFile_ConversionProgressUpdate;
+				}
+			}
+		}
 
 		protected AaxcDownloadConvertBase(string outFileName, string cacheDirectory, IDownloadOptions dlOptions)
 			: base(outFileName, cacheDirectory, dlOptions) { }
@@ -23,9 +38,23 @@ namespace AaxDecrypter
 				AaxFile.AppleTags.Cover = coverArt;
 		}
 
+		public override async Task CancelAsync()
+		{
+			IsCanceled = true;
+			await (AaxConversion?.CancelAsync() ?? Task.CompletedTask);
+			FinalizeDownload();
+		}
+
+		protected override void FinalizeDownload()
+		{
+			AaxConversion = null;
+			base.FinalizeDownload();
+		}
+
 		protected bool Step_GetMetadata()
 		{
 			AaxFile = new AaxFile(InputFileStream);
+			AaxFile.SetDecryptionKey(DownloadOptions.AudibleKey, DownloadOptions.AudibleIV);
 
 			if (DownloadOptions.StripUnabridged)
 			{
@@ -44,7 +73,6 @@ namespace AaxDecrypter
 					DownloadOptions.Downsample,
 					DownloadOptions.MatchSourceBitrate);
 
-
 			OnRetrievedTitle(AaxFile.AppleTags.TitleSansUnabridged);
 			OnRetrievedAuthors(AaxFile.AppleTags.FirstAuthor ?? "[unknown]");
 			OnRetrievedNarrators(AaxFile.AppleTags.Narrator ?? "[unknown]");
@@ -55,40 +83,15 @@ namespace AaxDecrypter
 			return !IsCanceled;
 		}
 
-		protected DownloadProgress Step_DownloadAudiobook_Start()
+		private void AaxFile_ConversionProgressUpdate(object sender, ConversionProgressEventArgs e)
 		{
-			var zeroProgress = new DownloadProgress
-			{
-				BytesReceived = 0,
-				ProgressPercentage = 0,
-				TotalBytesToReceive = InputFileStream.Length
-			};
-
-			OnDecryptProgressUpdate(zeroProgress);
-
-			AaxFile.SetDecryptionKey(DownloadOptions.AudibleKey, DownloadOptions.AudibleIV);
-			return zeroProgress;
-		}
-
-		protected void Step_DownloadAudiobook_End(DownloadProgress zeroProgress)
-		{
-			AaxFile.Close();
-
-			CloseInputFileStream();
-
-			OnDecryptProgressUpdate(zeroProgress);
-		}
-
-		protected void AaxFile_ConversionProgressUpdate(object sender, ConversionProgressEventArgs e)
-		{
-			var duration = AaxFile.Duration;
-			var remainingSecsToProcess = (duration - e.ProcessPosition).TotalSeconds;
+			var remainingSecsToProcess = (e.TotalDuration - e.ProcessPosition).TotalSeconds;
 			var estTimeRemaining = remainingSecsToProcess / e.ProcessSpeed;
 
 			if (double.IsNormal(estTimeRemaining))
 				OnDecryptTimeRemaining(TimeSpan.FromSeconds(estTimeRemaining));
 
-			var progressPercent = (e.ProcessPosition / e.TotalDuration);
+			var progressPercent = e.ProcessPosition / e.TotalDuration;
 
 			OnDecryptProgressUpdate(
 				new DownloadProgress
@@ -98,14 +101,5 @@ namespace AaxDecrypter
 					TotalBytesToReceive = InputFileStream.Length
 				});
 		}
-
-		public override async Task CancelAsync()
-		{
-			IsCanceled = true;
-				if (aaxConversion != null)
-					await aaxConversion.CancelAsync();
-			AaxFile?.Close();
-			CloseInputFileStream();
-		}
 	}
 }

Source/AaxDecrypter/AaxcDownloadMultiConverter.cs

@@ -1,81 +1,24 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Threading.Tasks;
-using AAXClean;
+using AAXClean;
 using AAXClean.Codecs;
 using FileManager;
+using System;
+using System.IO;
+using System.Threading.Tasks;
 
 namespace AaxDecrypter
 {
 	public class AaxcDownloadMultiConverter : AaxcDownloadConvertBase
 	{
-		private static TimeSpan minChapterLength { get; } = TimeSpan.FromSeconds(3);
-		private List<string> multiPartFilePaths { get; } = new List<string>();
+		private static readonly TimeSpan minChapterLength = TimeSpan.FromSeconds(3);
 		private FileStream workingFileStream;
 
 		public AaxcDownloadMultiConverter(string outFileName, string cacheDirectory, IDownloadOptions dlOptions)
-			: base(outFileName, cacheDirectory, dlOptions) { }
-
-		public override async Task<bool> RunAsync()
+			: base(outFileName, cacheDirectory, dlOptions)
 		{
-			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
-				if (DownloadOptions.DownloadClipsBookmarks)
-				{
-					Serilog.Log.Information("Begin Downloading Clips and Bookmarks");
-					if (await Task.Run(Step_DownloadClipsBookmarks))
-						Serilog.Log.Information("Completed Downloading Clips and Bookmarks");
-					else
-					{
-						Serilog.Log.Information("Failed to Download Clips and Bookmarks");
-						return false;
-					}
-				}
-
-				//Step 4
-				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;
-			}
+			AsyncSteps.Name = $"Download, Convert Aaxc To {DownloadOptions.OutputFormat}, and Split";
+			AsyncSteps["Step 1: Get Aaxc Metadata"] = () => Task.Run(Step_GetMetadata);
+			AsyncSteps["Step 2: Download Decrypted Audiobook"] = Step_DownloadAndDecryptAudiobookAsync;
+			AsyncSteps["Step 3: Download Clips and Bookmarks"] = Step_DownloadClipsBookmarksAsync;
 		}
 
 		/*
@@ -102,10 +45,8 @@ 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 async Task<bool> Step_DownloadAudiobookAsMultipleFilesPerChapter()
+		protected async override Task<bool> Step_DownloadAndDecryptAudiobookAsync()
 		{
-			var zeroProgress = Step_DownloadAudiobook_Start();
-
 			var chapters = DownloadOptions.ChapterInfo.Chapters;
 
 			// Ensure split files are at least minChapterLength in duration.
@@ -128,110 +69,79 @@ That naming may not be desirable for everyone, but it's an easy change to instea
 				}
 			}
 
-			// reset, just in case
-			multiPartFilePaths.Clear();
-
 			try
 			{
-				if (DownloadOptions.OutputFormat == OutputFormat.M4b)
-					aaxConversion = ConvertToMultiMp4a(splitChapters);
-				else
-					aaxConversion = ConvertToMultiMp3(splitChapters);
+				await (AaxConversion = decryptMultiAsync(splitChapters));
 
-				aaxConversion.ConversionProgressUpdate += AaxFile_ConversionProgressUpdate;
-				await aaxConversion;
+				if (AaxConversion.IsCompletedSuccessfully)
+					await moveMoovToBeginning(workingFileStream?.Name);
 
-				if (aaxConversion.IsCompletedSuccessfully)
-					moveMoovToBeginning(workingFileStream?.Name);
-
-				return aaxConversion.IsCompletedSuccessfully;
-			}
-			catch(Exception ex)
-			{
-				Serilog.Log.Error(ex, "AAXClean Error");
-				workingFileStream?.Close();
-				if (workingFileStream?.Name is not null)
-					FileUtility.SaferDelete(workingFileStream.Name);
-				return false;
+				return AaxConversion.IsCompletedSuccessfully;
 			}
 			finally
 			{
-				if (aaxConversion is not null)
-					aaxConversion.ConversionProgressUpdate -= AaxFile_ConversionProgressUpdate;
-
-				Step_DownloadAudiobook_End(zeroProgress);
+				workingFileStream?.Dispose();
+				FinalizeDownload();
 			}
 		}
 
-		private Mp4Operation ConvertToMultiMp4a(ChapterInfo splitChapters)
+		private Mp4Operation decryptMultiAsync(ChapterInfo splitChapters)
 		{
 			var chapterCount = 0;
-			return AaxFile.ConvertToMultiMp4aAsync
+			return
+				DownloadOptions.OutputFormat == OutputFormat.M4b
+				? AaxFile.ConvertToMultiMp4aAsync
 				(
 					splitChapters,
-					newSplitCallback => Callback(++chapterCount, splitChapters, newSplitCallback),
+					newSplitCallback => newSplit(++chapterCount, splitChapters, newSplitCallback),
 					DownloadOptions.TrimOutputToChapterLength
-				);
-		}
-
-		private Mp4Operation ConvertToMultiMp3(ChapterInfo splitChapters)
-		{
-			var chapterCount = 0;
-			return AaxFile.ConvertToMultiMp3Async
+				)
+				: AaxFile.ConvertToMultiMp3Async
 				(
 					splitChapters,
-					newSplitCallback => Callback(++chapterCount, splitChapters, newSplitCallback),
+					newSplitCallback => newSplit(++chapterCount, splitChapters, newSplitCallback),
 					DownloadOptions.LameConfig,
 					DownloadOptions.TrimOutputToChapterLength
 				);
-		}
 
-
-		private void Callback(int currentChapter, ChapterInfo splitChapters, NewMP3SplitCallback newSplitCallback)
-			=> Callback(currentChapter, splitChapters, newSplitCallback as NewSplitCallback);
-
-		private void Callback(int currentChapter, ChapterInfo splitChapters, NewSplitCallback newSplitCallback)
-		{
-			MultiConvertFileProperties props = new()
+			void newSplit(int currentChapter, ChapterInfo splitChapters, NewSplitCallback newSplitCallback)
 			{
-				OutputFileName = OutputFileName,
-				PartsPosition = currentChapter,
-				PartsTotal = splitChapters.Count,
-				Title = newSplitCallback?.Chapter?.Title,
-			};
+				MultiConvertFileProperties props = new()
+				{
+					OutputFileName = OutputFileName,
+					PartsPosition = currentChapter,
+					PartsTotal = splitChapters.Count,
+					Title = newSplitCallback?.Chapter?.Title,
+				};
 
-			moveMoovToBeginning(workingFileStream?.Name);
+				moveMoovToBeginning(workingFileStream?.Name).GetAwaiter().GetResult();
 
-			newSplitCallback.OutputFile = createOutputFileStream(props);
-			newSplitCallback.TrackTitle = DownloadOptions.GetMultipartTitleName(props);
-			newSplitCallback.TrackNumber = currentChapter;
-			newSplitCallback.TrackCount = splitChapters.Count;
+				newSplitCallback.OutputFile = workingFileStream = createOutputFileStream(props);
+				newSplitCallback.TrackTitle = DownloadOptions.GetMultipartTitle(props);
+				newSplitCallback.TrackNumber = currentChapter;
+				newSplitCallback.TrackCount = splitChapters.Count;
+
+				OnFileCreated(workingFileStream.Name);
+			}
+
+			FileStream createOutputFileStream(MultiConvertFileProperties multiConvertFileProperties)
+			{
+				var fileName = DownloadOptions.GetMultipartFileName(multiConvertFileProperties);
+				FileUtility.SaferDelete(fileName);
+				return File.Open(fileName, FileMode.OpenOrCreate, FileAccess.ReadWrite);
+			}
 		}
 
-		private void moveMoovToBeginning(string filename)
+		private Mp4Operation moveMoovToBeginning(string filename)
 		{
 			if (DownloadOptions.OutputFormat is OutputFormat.M4b
 				&& DownloadOptions.MoveMoovToBeginning
 				&& filename is not null
 				&& File.Exists(filename))
 			{
-				Mp4File.RelocateMoovAsync(filename).GetAwaiter().GetResult();
+				return Mp4File.RelocateMoovAsync(filename);
 			}
-		}
-
-		private FileStream createOutputFileStream(MultiConvertFileProperties multiConvertFileProperties)
-		{
-			var fileName = DownloadOptions.GetMultipartFileName(multiConvertFileProperties);
-			var extension = Path.GetExtension(fileName);
-			fileName = FileUtility.GetValidFilename(fileName, DownloadOptions.ReplacementCharacters, extension);
-
-			multiPartFilePaths.Add(fileName);
-
-			FileUtility.SaferDelete(fileName);
-
-			workingFileStream = File.Open(fileName, FileMode.OpenOrCreate, FileAccess.ReadWrite);
-			OnFileCreated(fileName);
-			return workingFileStream;
+			else return Mp4Operation.CompletedOperation;
 		}
 	}
 }

Source/AaxDecrypter/AaxcDownloadSingleConverter.cs

@@ -1,153 +1,67 @@
-using System;
-using System.IO;
-using System.Threading.Tasks;
-using AAXClean;
+using AAXClean;
 using AAXClean.Codecs;
 using FileManager;
-using Mpeg4Lib.Util;
+using System.IO;
+using System.Threading.Tasks;
 
 namespace AaxDecrypter
 {
 	public class AaxcDownloadSingleConverter : AaxcDownloadConvertBase
 	{
 		public AaxcDownloadSingleConverter(string outFileName, string cacheDirectory, IDownloadOptions dlOptions)
-			: base(outFileName, cacheDirectory, dlOptions) { }
-
-		public override async Task<bool> RunAsync()
+			: base(outFileName, cacheDirectory, dlOptions)
 		{
-			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
-				if (DownloadOptions.DownloadClipsBookmarks)
-				{
-					Serilog.Log.Information("Begin Downloading Clips and Bookmarks");
-					if (await Task.Run(Step_DownloadClipsBookmarks))
-						Serilog.Log.Information("Completed Downloading Clips and Bookmarks");
-					else
-					{
-						Serilog.Log.Information("Failed to Download Clips and Bookmarks");
-						return false;
-					}
-				}
-
-				//Step 5
-				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;
-			}
+			AsyncSteps.Name = $"Download and Convert Aaxc To {DownloadOptions.OutputFormat}";
+			AsyncSteps["Step 1: Get Aaxc Metadata"] = () => Task.Run(Step_GetMetadata);
+			AsyncSteps["Step 2: Download Decrypted Audiobook"] = Step_DownloadAndDecryptAudiobookAsync;
+			AsyncSteps["Step 3: Download Clips and Bookmarks"] = Step_DownloadClipsBookmarksAsync;
+			AsyncSteps["Step 4: Create Cue"] = Step_CreateCueAsync;
 		}
 
-		private async Task<bool> Step_DownloadAudiobookAsSingleFile()
+		protected async override Task<bool> Step_DownloadAndDecryptAudiobookAsync()
 		{
-			var zeroProgress = Step_DownloadAudiobook_Start();
-
 			FileUtility.SaferDelete(OutputFileName);
 
-			var outputFile = File.Open(OutputFileName, FileMode.OpenOrCreate, FileAccess.ReadWrite);
+			using var outputFile = File.Open(OutputFileName, FileMode.OpenOrCreate, FileAccess.ReadWrite);
 			OnFileCreated(OutputFileName);
 
-
 			try
 			{
-				aaxConversion =  decryptAsync(outputFile);
-				aaxConversion.ConversionProgressUpdate += AaxFile_ConversionProgressUpdate;
-				await aaxConversion;
+				await (AaxConversion = decryptAsync(outputFile));
 
-				outputFile.Close();
-
-				if (aaxConversion.IsCompletedSuccessfully
-					&& DownloadOptions.OutputFormat is OutputFormat.M4b
-					&& DownloadOptions.MoveMoovToBeginning)
+				if (AaxConversion.IsCompletedSuccessfully
+					&& DownloadOptions.MoveMoovToBeginning
+					&& DownloadOptions.OutputFormat is OutputFormat.M4b)
 				{
-					aaxConversion.ConversionProgressUpdate -= AaxFile_ConversionProgressUpdate;
-					aaxConversion = Mp4File.RelocateMoovAsync(OutputFileName);
-					aaxConversion.ConversionProgressUpdate += AaxFile_ConversionProgressUpdate;
-					await aaxConversion;
+					outputFile.Close();
+					await (AaxConversion = Mp4File.RelocateMoovAsync(OutputFileName));
 				}
 
-				if (aaxConversion.IsCompletedSuccessfully)
-					base.OnFileCreated(OutputFileName);
-
-				return aaxConversion.IsCompletedSuccessfully;
-			}
-			catch(Exception ex)
-			{
-				Serilog.Log.Error(ex, "AAXClean Error");
-				FileUtility.SaferDelete(OutputFileName);
-				return false;
+				return AaxConversion.IsCompletedSuccessfully;
 			}
 			finally
 			{
-				outputFile.Close();
-
-				if (aaxConversion is not null)
-					aaxConversion.ConversionProgressUpdate -= AaxFile_ConversionProgressUpdate;
-
-				Step_DownloadAudiobook_End(zeroProgress);
+				FinalizeDownload();
 			}
 		}
 
 		private Mp4Operation decryptAsync(Stream outputFile)
-			=> DownloadOptions.OutputFormat == OutputFormat.Mp3 ? 
-			AaxFile.ConvertToMp3Async
+			=> 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);
+			: DownloadOptions.FixupFile
+			? AaxFile.ConvertToMp4aAsync
+			(
+				outputFile,
+				DownloadOptions.ChapterInfo,
+				DownloadOptions.TrimOutputToChapterLength
+			)
+			: AaxFile.ConvertToMp4aAsync(outputFile);
 	}
 }

Source/AaxDecrypter/AudiobookDownloadBase.cs

@@ -1,9 +1,10 @@
-using System;
+using Dinah.Core;
+using Dinah.Core.Net.Http;
+using Dinah.Core.StepRunner;
+using FileManager;
+using System;
 using System.IO;
 using System.Threading.Tasks;
-using Dinah.Core;
-using Dinah.Core.Net.Http;
-using FileManager;
 
 namespace AaxDecrypter
 {
@@ -19,19 +20,16 @@ namespace AaxDecrypter
 		public event EventHandler<TimeSpan> DecryptTimeRemaining;
 		public event EventHandler<string> FileCreated;
 
-		public bool IsCanceled { get; set; }
-		public string TempFilePath { get; }
-
-		protected string OutputFileName { get; private set; }
+		public bool IsCanceled { get; protected set; }
+		protected AsyncStepSequence AsyncSteps { get; } = new();
+		protected string OutputFileName { get; }
 		protected IDownloadOptions DownloadOptions { get; }
-		protected NetworkFileStream InputFileStream => (nfsPersister ??= OpenNetworkFileStream()).NetworkFileStream;
+		protected NetworkFileStream InputFileStream => nfsPersister.NetworkFileStream;
 
-		// Don't give the property a 'set'. This should have to be an obvious choice; not accidental
-		protected void SetOutputFileName(string newOutputFileName) => OutputFileName = newOutputFileName;
-
-		private NetworkFileStreamPersister nfsPersister;
-
-		private string jsonDownloadState { get; }
+		private readonly NetworkFileStreamPersister nfsPersister;
+		private readonly DownloadProgress zeroProgress;
+		private readonly string jsonDownloadState;
+		private readonly string tempFilePath;
 
 		protected AudiobookDownloadBase(string outFileName, string cacheDirectory, IDownloadOptions dlOptions)
 		{
@@ -45,16 +43,39 @@ namespace AaxDecrypter
 				Directory.CreateDirectory(cacheDirectory);
 
 			jsonDownloadState = Path.Combine(cacheDirectory, Path.GetFileName(Path.ChangeExtension(OutputFileName, ".json")));
-			TempFilePath = Path.ChangeExtension(jsonDownloadState, ".aaxc");
+			tempFilePath = Path.ChangeExtension(jsonDownloadState, ".aaxc");
 
 			DownloadOptions = ArgumentValidator.EnsureNotNull(dlOptions, nameof(dlOptions));
 			DownloadOptions.DownloadSpeedChanged += (_, speed) => InputFileStream.SpeedLimit = speed;
 
 			// delete file after validation is complete
 			FileUtility.SaferDelete(OutputFileName);
+
+			nfsPersister = OpenNetworkFileStream();
+
+			zeroProgress = new DownloadProgress
+			{
+				BytesReceived = 0,
+				ProgressPercentage = 0,
+				TotalBytesToReceive = InputFileStream.Length
+			};
+
+			OnDecryptProgressUpdate(zeroProgress);
+		}
+
+		public async Task<bool> RunAsync()
+		{
+			AsyncSteps[$"Cleanup"] = CleanupAsync;
+			(bool success, var elapsed) = await AsyncSteps.RunAsync();
+
+			var speedup = DownloadOptions.RuntimeLength / elapsed;
+			Serilog.Log.Information($"Speedup is {speedup:F0}x realtime.");
+
+			return success;
 		}
 
 		public abstract Task CancelAsync();
+		protected abstract Task<bool> Step_DownloadAndDecryptAudiobookAsync();
 
 		public virtual void SetCoverArt(byte[] coverArt)
 		{
@@ -62,8 +83,6 @@ namespace AaxDecrypter
 				OnRetrievedCoverArt(coverArt);
 		}
 
-		public abstract Task<bool> RunAsync();
-
 		protected void OnRetrievedTitle(string title)
 			=> RetrievedTitle?.Invoke(this, title);
 		protected void OnRetrievedAuthors(string authors)
@@ -79,69 +98,66 @@ namespace AaxDecrypter
 		protected void OnFileCreated(string path)
 			=> FileCreated?.Invoke(this, path);
 
-		protected void CloseInputFileStream()
+		protected virtual void FinalizeDownload()
 		{
-			nfsPersister?.NetworkFileStream?.Close();
 			nfsPersister?.Dispose();
+			OnDecryptProgressUpdate(zeroProgress);
 		}
 
-		protected bool Step_CreateCue()
+		protected async Task<bool> Step_DownloadClipsBookmarksAsync()
 		{
-			if (!DownloadOptions.CreateCueSheet) return true;
+			if (!IsCanceled && DownloadOptions.DownloadClipsBookmarks)
+			{
+				var recordsFile = await DownloadOptions.SaveClipsAndBookmarksAsync(OutputFileName);
+
+				if (File.Exists(recordsFile))
+					OnFileCreated(recordsFile);
+			}
+			return !IsCanceled;
+		}
+
+		protected async Task<bool> Step_CreateCueAsync()
+		{
+			if (!DownloadOptions.CreateCueSheet) return !IsCanceled;
 
 			// not a critical step. its failure should not prevent future steps from running
 			try
 			{
 				var path = Path.ChangeExtension(OutputFileName, ".cue");
-				path = FileUtility.GetValidFilename(path, DownloadOptions.ReplacementCharacters, ".cue");
-				File.WriteAllText(path, Cue.CreateContents(Path.GetFileName(OutputFileName), DownloadOptions.ChapterInfo));
+				await File.WriteAllTextAsync(path, Cue.CreateContents(Path.GetFileName(OutputFileName), DownloadOptions.ChapterInfo));
 				OnFileCreated(path);
 			}
 			catch (Exception ex)
 			{
-				Serilog.Log.Logger.Error(ex, $"{nameof(Step_CreateCue)}. FAILED");
+				Serilog.Log.Logger.Error(ex, $"{nameof(Step_CreateCueAsync)} Failed");
 			}
 			return !IsCanceled;
 		}
 
-		protected bool Step_Cleanup()
+		private async Task<bool> CleanupAsync()
 		{
-			bool success = !IsCanceled;
-			if (success)
+			if (IsCanceled) return false;
+
+			FileUtility.SaferDelete(jsonDownloadState);
+
+			if (!string.IsNullOrEmpty(DownloadOptions.AudibleKey) &&
+				!string.IsNullOrEmpty(DownloadOptions.AudibleIV) &&
+				DownloadOptions.RetainEncryptedFile)
 			{
-				FileUtility.SaferDelete(jsonDownloadState);
+				string aaxPath = Path.ChangeExtension(tempFilePath, ".aax");
+				FileUtility.SaferMove(tempFilePath, aaxPath);
 
-				if (DownloadOptions.AudibleKey is not null &&
-					DownloadOptions.AudibleIV is not null &&
-					DownloadOptions.RetainEncryptedFile)
-				{
-					string aaxPath = Path.ChangeExtension(TempFilePath, ".aax");
-					FileUtility.SaferMove(TempFilePath, aaxPath);
+				//Write aax decryption key
+				string keyPath = Path.ChangeExtension(aaxPath, ".key");
+				FileUtility.SaferDelete(keyPath);
+				await File.WriteAllTextAsync(keyPath, $"Key={DownloadOptions.AudibleKey}{Environment.NewLine}IV={DownloadOptions.AudibleIV}");
 
-					//Write aax decryption key
-					string keyPath = Path.ChangeExtension(aaxPath, ".key");
-					FileUtility.SaferDelete(keyPath);
-					File.WriteAllText(keyPath, $"Key={DownloadOptions.AudibleKey}\r\nIV={DownloadOptions.AudibleIV}");
-
-					OnFileCreated(aaxPath);
-					OnFileCreated(keyPath);
-				}
-				else
-					FileUtility.SaferDelete(TempFilePath);
+				OnFileCreated(aaxPath);
+				OnFileCreated(keyPath);
 			}
+			else
+				FileUtility.SaferDelete(tempFilePath);
 
-			return success;
-		}
-
-		protected async Task<bool> Step_DownloadClipsBookmarks()
-		{
-			if (!IsCanceled && DownloadOptions.DownloadClipsBookmarks)
-			{
-				var recordsFile = await DownloadOptions.SaveClipsAndBookmarks(OutputFileName);
-
-				if (File.Exists(recordsFile))
-					OnFileCreated(recordsFile);
-			}
 			return !IsCanceled;
 		}
 
@@ -151,31 +167,30 @@ namespace AaxDecrypter
 			try
 			{
 				if (!File.Exists(jsonDownloadState))
-					return nfsp = NewNetworkFilePersister();
+					return nfsp = newNetworkFilePersister();
 
 				nfsp = new NetworkFileStreamPersister(jsonDownloadState);
-				// If More than ~1 hour has elapsed since getting the download url, it will expire.
-				// The new url will be to the same file.
+				// The download url expires after 1 hour.
+				// The new url points to the same file.
 				nfsp.NetworkFileStream.SetUriForSameFile(new Uri(DownloadOptions.DownloadUrl));
 				return nfsp;
 			}
 			catch
 			{
 				FileUtility.SaferDelete(jsonDownloadState);
-				FileUtility.SaferDelete(TempFilePath);
-				return nfsp = NewNetworkFilePersister();
+				FileUtility.SaferDelete(tempFilePath);
+				return nfsp = newNetworkFilePersister();
 			}
 			finally
 			{
-				if (nfsp?.NetworkFileStream is not null)
-					nfsp.NetworkFileStream.SpeedLimit = DownloadOptions.DownloadSpeedBps;
+				nfsp.NetworkFileStream.SpeedLimit = DownloadOptions.DownloadSpeedBps;
 			}
-		}
 
-		private NetworkFileStreamPersister NewNetworkFilePersister()
-		{
-			var networkFileStream = new NetworkFileStream(TempFilePath, new Uri(DownloadOptions.DownloadUrl), 0, new() { { "User-Agent", DownloadOptions.UserAgent } });
-			return new NetworkFileStreamPersister(networkFileStream, jsonDownloadState);
+			NetworkFileStreamPersister newNetworkFilePersister()
+			{
+				var networkFileStream = new NetworkFileStream(tempFilePath, new Uri(DownloadOptions.DownloadUrl), 0, new() { { "User-Agent", DownloadOptions.UserAgent } });
+				return new NetworkFileStreamPersister(networkFileStream, jsonDownloadState);
+			}
 		}
 	}
 }

Source/AaxDecrypter/Cue.cs

@@ -1,8 +1,7 @@
-using System;
+using AAXClean;
+using Dinah.Core;
 using System.IO;
 using System.Text;
-using AAXClean;
-using Dinah.Core;
 
 namespace AaxDecrypter
 {
@@ -16,15 +15,14 @@ namespace AaxDecrypter
 
             var startOffset = chapters.StartOffset;
 
-            var trackCount = 0;
+            var trackCount = 1;
             foreach (var c in chapters.Chapters)
             {
                 var startTime = c.StartOffset - startOffset;
-                trackCount++;
 
-                stringBuilder.AppendLine($"TRACK {trackCount} AUDIO");
+                stringBuilder.AppendLine($"TRACK {trackCount++} AUDIO");
                 stringBuilder.AppendLine($"  TITLE \"{c.Title}\"");
-                stringBuilder.AppendLine($"  INDEX 01 {(int)startTime.TotalMinutes}:{startTime:ss}:{(int)(startTime.Milliseconds / 1000d * 75)}");
+                stringBuilder.AppendLine($"  INDEX 01 {(int)startTime.TotalMinutes}:{startTime:ss}:{(int)(startTime.Milliseconds * 75d / 1000):D2}");
             }
 
             return stringBuilder.ToString();
@@ -46,7 +44,7 @@ namespace AaxDecrypter
             for (var i = 0; i < cueContents.Length; i++)
             {
                 var line = cueContents[i];
-                if (!line.Trim().StartsWith("FILE") || !line.Contains(" "))
+                if (!line.Trim().StartsWith("FILE") || !line.Contains(' '))
                     continue;
 
                 var fileTypeBegins = line.LastIndexOf(" ") + 1;

Source/AaxDecrypter/IDownloadOptions.cs

@@ -5,13 +5,13 @@ using System.Threading.Tasks;
 namespace AaxDecrypter
 {
     public interface IDownloadOptions
-	{
+    {
         event EventHandler<long> DownloadSpeedChanged;
-        FileManager.ReplacementCharacters ReplacementCharacters { get; }
         string DownloadUrl { get; }
         string UserAgent { get; }
         string AudibleKey { get; }
         string AudibleIV { get; }
+        TimeSpan RuntimeLength { get; }
         OutputFormat OutputFormat { get; }
         bool TrimOutputToChapterLength { get; }
         bool RetainEncryptedFile { get; }
@@ -26,7 +26,7 @@ namespace AaxDecrypter
         bool MatchSourceBitrate { get; }
         bool MoveMoovToBeginning { get; }
         string GetMultipartFileName(MultiConvertFileProperties props);
-        string GetMultipartTitleName(MultiConvertFileProperties props);
-        Task<string> SaveClipsAndBookmarks(string fileName);
-	}    
+        string GetMultipartTitle(MultiConvertFileProperties props);
+        Task<string> SaveClipsAndBookmarksAsync(string fileName);
+    }
 }

Source/AaxDecrypter/MpegUtil.cs

@@ -1,7 +1,5 @@
 using AAXClean;
 using NAudio.Lame;
-using System;
-using System.Linq;
 
 namespace AaxDecrypter
 {

Source/AaxDecrypter/MultiConvertFileProperties.cs

@@ -1,6 +1,4 @@
 using System;
-using System.IO;
-using FileManager;
 
 namespace AaxDecrypter
 {

Source/AaxDecrypter/NetworkFileStream.cs

@@ -3,7 +3,6 @@ using Newtonsoft.Json;
 using System;
 using System.Collections.Generic;
 using System.IO;
-using System.Linq;
 using System.Net;
 using System.Net.Http;
 using System.Threading;
@@ -83,16 +82,13 @@ namespace AaxDecrypter
 		/// <param name="requestHeaders">Http headers to be sent to the server with the <see cref="HttpWebRequest"/>.</param>
 		public NetworkFileStream(string saveFilePath, Uri uri, long writePosition = 0, Dictionary<string, string> requestHeaders = null)
 		{
-			ArgumentValidator.EnsureNotNullOrWhiteSpace(saveFilePath, nameof(saveFilePath));
-			ArgumentValidator.EnsureNotNullOrWhiteSpace(uri?.AbsoluteUri, nameof(uri));
-			ArgumentValidator.EnsureGreaterThan(writePosition, nameof(writePosition), -1);
+			SaveFilePath = ArgumentValidator.EnsureNotNullOrWhiteSpace(saveFilePath, nameof(saveFilePath));
+			Uri = ArgumentValidator.EnsureNotNull(uri, nameof(uri));
+			WritePosition = ArgumentValidator.EnsureGreaterThan(writePosition, nameof(writePosition), -1);
 
 			if (!Directory.Exists(Path.GetDirectoryName(saveFilePath)))
 				throw new ArgumentException($"Specified {nameof(saveFilePath)} directory \"{Path.GetDirectoryName(saveFilePath)}\" does not exist.");
 
-			SaveFilePath = saveFilePath;
-			Uri = uri;
-			WritePosition = writePosition;
 			RequestHeaders = requestHeaders ?? new();
 
 			_writeFile = new FileStream(SaveFilePath, FileMode.OpenOrCreate, FileAccess.Write, FileShare.ReadWrite)
@@ -109,8 +105,8 @@ namespace AaxDecrypter
 
 		#region Downloader
 
-		/// <summary> Update the <see cref="JsonFilePersister"/>. </summary>
-		private void Update()
+		/// <summary> Update the <see cref="Dinah.Core.IO.JsonFilePersister{T}"/>. </summary>
+		private void OnUpdate()
 		{
 			RequestHeaders["Range"] = $"bytes={WritePosition}-";
 			try
@@ -167,7 +163,7 @@ namespace AaxDecrypter
 			_downloadedPiece = new EventWaitHandle(false, EventResetMode.AutoReset);
 
 			//Download the file in the background.
-			return Task.Run(async () => await DownloadFile(networkStream), _cancellationSource.Token);
+			return Task.Run(() => DownloadFile(networkStream), _cancellationSource.Token);
 		}
 
 		/// <summary> Download <see cref="Uri"/> to <see cref="SaveFilePath"/>.</summary>
@@ -184,7 +180,7 @@ namespace AaxDecrypter
 				int bytesRead;
 				do
 				{
-					bytesRead = await networkStream.ReadAsync(buff, 0, DOWNLOAD_BUFF_SZ, _cancellationSource.Token);
+					bytesRead = await networkStream.ReadAsync(buff, _cancellationSource.Token);
 					await _writeFile.WriteAsync(buff, 0, bytesRead, _cancellationSource.Token);
 
 					downloadPosition += bytesRead;
@@ -193,7 +189,7 @@ namespace AaxDecrypter
 					{
 						await _writeFile.FlushAsync(_cancellationSource.Token);
 						WritePosition = downloadPosition;
-						Update();
+						OnUpdate();
 						nextFlush = downloadPosition + DATA_FLUSH_SZ;
 						_downloadedPiece.Set();
 					}
@@ -233,19 +229,12 @@ namespace AaxDecrypter
 				networkStream.Close();
 				_writeFile.Close();
 				_downloadedPiece.Set();
-				Update();
+				OnUpdate();
 			}
 		}
 
 		#endregion
 
-		#region Json Connverters
-
-		public static JsonSerializerSettings GetJsonSerializerSettings()
-			=> new JsonSerializerSettings();
-
-		#endregion
-
 		#region Download Stream Reader
 
 		[JsonIgnore]
@@ -289,7 +278,7 @@ namespace AaxDecrypter
 
 			var toRead = Math.Min(count, Length - Position);
 			WaitToPosition(Position + toRead);
-			return IsCancelled ? 0: _readFile.Read(buffer, offset, count);
+			return IsCancelled ? 0 : _readFile.Read(buffer, offset, count);
 		}
 
 		public override long Seek(long offset, SeekOrigin origin)
@@ -306,7 +295,7 @@ namespace AaxDecrypter
 		}
 
 		/// <summary>Blocks until the file has downloaded to at least <paramref name="requiredPosition"/>, then returns. </summary>
-		/// <param name="requiredPosition">The minimum required flished data length in <see cref="SaveFilePath"/>.</param>
+		/// <param name="requiredPosition">The minimum required flushed data length in <see cref="SaveFilePath"/>.</param>
 		private void WaitToPosition(long requiredPosition)
 		{
 			while (WritePosition < requiredPosition
@@ -317,20 +306,31 @@ namespace AaxDecrypter
 			}
 		}
 
-		public override void Close()
-		{
-			_cancellationSource.Cancel();
-			_backgroundDownloadTask?.Wait();
+		private bool disposed = false;
 
-			_readFile.Close();
-			_writeFile.Close();
-			Update();
+		/*
+		 * https://learn.microsoft.com/en-us/dotnet/api/system.io.stream.dispose?view=net-7.0
+		 * 
+		 * In derived classes, do not override the Close() method, instead, put all of the
+		 * Stream cleanup logic in the Dispose(Boolean) method.
+		 */
+		protected override void Dispose(bool disposing)
+		{
+			if (disposing && !disposed)
+			{
+				_cancellationSource.Cancel();
+				_backgroundDownloadTask?.GetAwaiter().GetResult();
+				_downloadedPiece?.Dispose();
+				_cancellationSource?.Dispose();
+				_readFile.Dispose();
+				_writeFile.Dispose();
+				OnUpdate();
+			}
+
+			disposed = true;
+			base.Dispose(disposing);
 		}
 
 		#endregion
-		~NetworkFileStream()
-		{
-			_downloadedPiece?.Close();
-		}
 	}
 }

Source/AaxDecrypter/NetworkFileStreamPersister.cs

@@ -1,11 +1,9 @@
 using Dinah.Core.IO;
-using Newtonsoft.Json;
 
 namespace AaxDecrypter
 {
-    internal class NetworkFileStreamPersister : JsonFilePersister<NetworkFileStream>
-    {
-
+	internal class NetworkFileStreamPersister : JsonFilePersister<NetworkFileStream>
+	{
 		/// <summary>Alias for Target </summary>
 		public NetworkFileStream NetworkFileStream => Target;
 
@@ -17,7 +15,11 @@ namespace AaxDecrypter
 		public NetworkFileStreamPersister(string path, string jsonPath = null)
 			: base(path, jsonPath) { }
 
-		protected override JsonSerializerSettings GetSerializerSettings() => NetworkFileStream.GetJsonSerializerSettings();
-
-    }
+		protected override void Dispose(bool disposing)
+		{
+			if (disposing)
+				NetworkFileStream?.Dispose();
+			base.Dispose(disposing);
+		}
+	}
 }

Source/AaxDecrypter/UnencryptedAudiobookDownloader.cs

@@ -1,97 +1,35 @@
-using System;
-using System.Threading;
-using System.Threading.Tasks;
-using Dinah.Core.Net.Http;
+using Dinah.Core.Net.Http;
 using FileManager;
+using System;
+using System.Threading.Tasks;
 
 namespace AaxDecrypter
 {
 	public class UnencryptedAudiobookDownloader : AudiobookDownloadBase
 	{
-
 		public UnencryptedAudiobookDownloader(string outFileName, string cacheDirectory, IDownloadOptions dlLic)
-			: base(outFileName, cacheDirectory, dlLic) { }
-
-		public override async Task<bool> RunAsync()
+			: base(outFileName, cacheDirectory, dlLic)
 		{
-			try
-			{
-				Serilog.Log.Information("Begin downloading unencrypted audiobook.");
-
-				//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
-				if (DownloadOptions.DownloadClipsBookmarks)
-				{
-					Serilog.Log.Information("Begin Downloading Clips and Bookmarks");
-					if (await Task.Run(Step_DownloadClipsBookmarks))
-						Serilog.Log.Information("Completed Downloading Clips and Bookmarks");
-					else
-					{
-						Serilog.Log.Information("Failed to Download Clips and Bookmarks");
-						return false;
-					}
-				}
-
-				//Step 4
-				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;
-			}
+			AsyncSteps.Name = "Download Unencrypted Audiobook";
+			AsyncSteps["Step 1: Download Audiobook"] = Step_DownloadAndDecryptAudiobookAsync;
+			AsyncSteps["Step 2: Download Clips and Bookmarks"] = Step_DownloadClipsBookmarksAsync;
+			AsyncSteps["Step 3: Create Cue"] = Step_CreateCueAsync;
 		}
 
 		public override Task CancelAsync()
 		{
 			IsCanceled = true;
-			CloseInputFileStream();
+			FinalizeDownload();
 			return Task.CompletedTask;
 		}
 
-		protected bool Step_GetMetadata()
-		{
-			OnRetrievedCoverArt(null);
-
-			return !IsCanceled;
-		}
-
-		private bool Step_DownloadAudiobookAsSingleFile()
+		protected override async Task<bool> Step_DownloadAndDecryptAudiobookAsync()
 		{
 			DateTime startTime = DateTime.Now;
 
 			// MUST put InputFileStream.Length first, because it starts background downloader.
 
-			while (InputFileStream.Length > InputFileStream.WritePosition && !InputFileStream.IsCancelled) 
+			while (InputFileStream.Length > InputFileStream.WritePosition && !InputFileStream.IsCancelled)
 			{
 				var rate = InputFileStream.WritePosition / (DateTime.Now - startTime).TotalSeconds;
 
@@ -100,25 +38,28 @@ namespace AaxDecrypter
 				if (double.IsNormal(estTimeRemaining))
 					OnDecryptTimeRemaining(TimeSpan.FromSeconds(estTimeRemaining));
 
-				var progressPercent = (double)InputFileStream.WritePosition / InputFileStream.Length;
+				var progressPercent = 100d * InputFileStream.WritePosition / InputFileStream.Length;
 
 				OnDecryptProgressUpdate(
 					new DownloadProgress
 					{
-						ProgressPercentage = 100 * progressPercent,
-						BytesReceived = (long)(InputFileStream.Length * progressPercent),
+						ProgressPercentage = progressPercent,
+						BytesReceived = InputFileStream.WritePosition,
 						TotalBytesToReceive = InputFileStream.Length
 					});
-				Thread.Sleep(200);
+
+				await Task.Delay(200);
 			}
 
-			CloseInputFileStream();
-			
-			var realOutputFileName = FileUtility.SaferMoveToValidPath(InputFileStream.SaveFilePath, OutputFileName, DownloadOptions.ReplacementCharacters);
-			SetOutputFileName(realOutputFileName);
-			OnFileCreated(realOutputFileName);
-
-			return !IsCanceled;
+			if (IsCanceled)
+				return false;
+			else
+			{
+				FinalizeDownload();
+				FileUtility.SaferMove(InputFileStream.SaveFilePath, OutputFileName);
+				OnFileCreated(OutputFileName);
+				return true;
+			}
 		}
 	}
 }

Source/AppScaffolding/AppScaffolding.csproj

@@ -2,10 +2,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>net7.0</TargetFramework>
-    <Version>9.1.0.1</Version>
+    <Version>9.2.2.1</Version>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Octokit" Version="4.0.3" />
+    <PackageReference Include="Octokit" Version="5.0.0" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\ApplicationServices\ApplicationServices.csproj" />

Source/ApplicationServices/LibraryExporter.cs

@@ -103,7 +103,10 @@ namespace ApplicationServices
 
         [Name("Audio Format")]
 		public string AudioFormat { get; set; }
-	}
+
+		[Name("Language")]
+        public string Language { get; set; }
+    }
 	public static class LibToDtos
 	{
 		public static List<ExportDto> ToDtos(this IEnumerable<LibraryBook> library)
@@ -136,7 +139,8 @@ namespace ApplicationServices
 				BookStatus = a.Book.UserDefinedItem.BookStatus.ToString(),
 				PdfStatus = a.Book.UserDefinedItem.PdfStatus.ToString(),
 				ContentType = a.Book.ContentType.ToString(),
-				AudioFormat = a.Book.AudioFormat.ToString()
+				AudioFormat = a.Book.AudioFormat.ToString(),
+				Language = a.Book.Language
 			}).ToList();
 	}
 	public static class LibraryExporter
@@ -207,8 +211,9 @@ namespace ApplicationServices
 				nameof(ExportDto.BookStatus),
 				nameof(ExportDto.PdfStatus),
 				nameof(ExportDto.ContentType),
-				nameof(ExportDto.AudioFormat)
-			};
+				nameof(ExportDto.AudioFormat),
+                nameof(ExportDto.Language)
+            };
 			var col = 0;
 			foreach (var c in columns)
 			{
@@ -273,9 +278,10 @@ namespace ApplicationServices
 				row.CreateCell(col++).SetCellValue(dto.BookStatus);
 				row.CreateCell(col++).SetCellValue(dto.PdfStatus);
 				row.CreateCell(col++).SetCellValue(dto.ContentType);
-				row.CreateCell(col++).SetCellValue(dto.AudioFormat);
+                row.CreateCell(col++).SetCellValue(dto.AudioFormat);
+                row.CreateCell(col++).SetCellValue(dto.Language);
 
-				rowIndex++;
+                rowIndex++;
 			}
 
 			using var fileData = new System.IO.FileStream(saveFilePath, System.IO.FileMode.Create);

Source/AudibleUtilities/AudibleUtilities.csproj

@@ -5,7 +5,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="AudibleApi" Version="7.3.1.1" />
+    <PackageReference Include="AudibleApi" Version="7.3.2.1" />
   </ItemGroup>
 
   <ItemGroup>

Source/DataLayer/DataLayer.csproj

@@ -10,14 +10,14 @@
   </PropertyGroup>
   
   <ItemGroup>
-    <PackageReference Include="Dinah.Core" Version="7.2.0.1" />
-    <PackageReference Include="Dinah.EntityFrameworkCore" Version="7.1.0.1" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.1">
+    <PackageReference Include="Dinah.Core" Version="7.2.1.1" />
+    <PackageReference Include="Dinah.EntityFrameworkCore" Version="7.1.1.1" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.2">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="7.0.1" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.1">
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="7.0.2" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.2">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

Source/DataLayer/EfClasses/Book.cs

@@ -50,6 +50,7 @@ namespace DataLayer
         // book details
         public bool IsAbridged { get; private set; }
         public DateTime? DatePublished { get; private set; }
+        public string Language { get; private set; }
 
         // non-null. use "empty pattern"
         internal int CategoryId { get; private set; }
@@ -215,11 +216,12 @@ namespace DataLayer
         public void UpdateProductRating(float overallRating, float performanceRating, float storyRating)
             => Rating.Update(overallRating, performanceRating, storyRating);
 
-        public void UpdateBookDetails(bool isAbridged, DateTime? datePublished)
+        public void UpdateBookDetails(bool isAbridged, DateTime? datePublished, string language)
         {
             // don't overwrite with default values
             IsAbridged |= isAbridged;
             DatePublished = datePublished ?? DatePublished;
+            Language = language?.FirstCharToUpper() ?? Language;
         }
 
         public void UpdateCategory(Category category, DbContext context = null)

Source/DataLayer/Migrations/20230201162454_AddBookLanguage.Designer.cs

@@ -0,0 +1,404 @@
+// <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("20230201162454_AddBookLanguage")]
+    partial class AddBookLanguage
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder.HasAnnotation("ProductVersion", "7.0.2");
+
+            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<string>("Language")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("LengthInMinutes")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Locale")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("PictureId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("PictureLarge")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("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.Property<bool>("IsDeleted")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("BookId");
+
+                    b.ToTable("LibraryBooks");
+                });
+
+            modelBuilder.Entity("DataLayer.Series", b =>
+                {
+                    b.Property<int>("SeriesId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("AudibleSeriesId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("SeriesId");
+
+                    b.HasIndex("AudibleSeriesId");
+
+                    b.ToTable("Series");
+                });
+
+            modelBuilder.Entity("DataLayer.SeriesBook", b =>
+                {
+                    b.Property<int>("SeriesId")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("BookId")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Order")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("SeriesId", "BookId");
+
+                    b.HasIndex("BookId");
+
+                    b.HasIndex("SeriesId");
+
+                    b.ToTable("SeriesBook");
+                });
+
+            modelBuilder.Entity("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/20230201162454_AddBookLanguage.cs

@@ -0,0 +1,28 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace DataLayer.Migrations
+{
+    /// <inheritdoc />
+    public partial class AddBookLanguage : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<string>(
+                name: "Language",
+                table: "Books",
+                type: "TEXT",
+                nullable: true);
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "Language",
+                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", "7.0.0");
+            modelBuilder.HasAnnotation("ProductVersion", "7.0.2");
 
             modelBuilder.Entity("DataLayer.Book", b =>
                 {
@@ -41,6 +41,9 @@ namespace DataLayer.Migrations
                     b.Property<bool>("IsAbridged")
                         .HasColumnType("INTEGER");
 
+                    b.Property<string>("Language")
+                        .HasColumnType("TEXT");
+
                     b.Property<int>("LengthInMinutes")
                         .HasColumnType("INTEGER");
 

Source/DtoImporterService/BookImporter.cs

@@ -152,9 +152,9 @@ namespace DtoImporterService
 				book.ReplacePublisher(publisher);
 			}
 
-			book.UpdateBookDetails(item.IsAbridged, item.DatePublished);
+            book.UpdateBookDetails(item.IsAbridged, item.DatePublished, item.Language);
 
-			if (item.PdfUrl is not null)
+            if (item.PdfUrl is not null)
 				book.AddSupplementDownloadUrl(item.PdfUrl.ToString());
 
 			return book;
@@ -174,7 +174,12 @@ namespace DtoImporterService
 			if (item.PictureLarge is not null)
 				book.PictureLarge = item.PictureLarge;
 
-			book.UpdateProductRating(
+            // 2023-02-01
+            // updateBook must update language on books which were imported before the migration which added language.
+            // Can eventually delete this
+            book.UpdateBookDetails(item.IsAbridged, item.DatePublished, item.Language);
+
+            book.UpdateProductRating(
 				(float)(item.Rating?.OverallDistribution?.AverageRating ?? 0),
 				(float)(item.Rating?.PerformanceDistribution?.AverageRating ?? 0),
 				(float)(item.Rating?.StoryDistribution?.AverageRating ?? 0));

Source/FileLiberator/AudioFileStorageExt.cs

@@ -25,13 +25,12 @@ namespace FileLiberator
 
 					if (seriesParent is not null)
 					{
-						var baseDir = Templates.Folder.GetFilename(seriesParent.ToDto());
-						return Templates.Folder.GetFilename(libraryBook.ToDto(), baseDir);
+						var baseDir = Templates.Folder.GetFilename(seriesParent.ToDto(), AudibleFileStorage.BooksDirectory, "");
+						return Templates.Folder.GetFilename(libraryBook.ToDto(), baseDir, "");
 					}
 				}
 			}
-
-			return Templates.Folder.GetFilename(libraryBook.ToDto());
+			return Templates.Folder.GetFilename(libraryBook.ToDto(), AudibleFileStorage.BooksDirectory, "");
 		}
 
 		/// <summary>

Source/FileLiberator/DownloadDecryptBook.cs

@@ -5,7 +5,6 @@ using System.Linq;
 using System.Threading.Tasks;
 using AaxDecrypter;
 using ApplicationServices;
-using AudibleApi;
 using DataLayer;
 using Dinah.Core;
 using Dinah.Core.ErrorHandling;
@@ -138,41 +137,27 @@ namespace FileLiberator
 
         private DownloadOptions BuildDownloadOptions(LibraryBook libraryBook, Configuration config, AudibleApi.Common.ContentLicense contentLic)
         {
-            //I assume if ContentFormat == "MPEG" that the delivered file is an unencrypted mp3.
-            //I also assume that if DrmType != Adrm, the file will be an mp3.
-            //These assumptions may be wrong, and only time and bug reports will tell.
+			//If DrmType != Adrm the delivered file is an unencrypted mp3.
 
-            bool encrypted = contentLic.DrmType == AudibleApi.Common.DrmType.Adrm;
+            var outputFormat
+                = contentLic.DrmType != AudibleApi.Common.DrmType.Adrm || (config.AllowLibationFixup && config.DecryptToLossy)
+                ? OutputFormat.Mp3
+                : OutputFormat.M4b;
 
-            var outputFormat = !encrypted || (config.AllowLibationFixup && config.DecryptToLossy) ?
-                     OutputFormat.Mp3 : OutputFormat.M4b;
+            long chapterStartMs
+                = config.StripAudibleBrandAudio
+                ? contentLic.ContentMetadata.ChapterInfo.BrandIntroDurationMs
+                : 0;
 
-            long chapterStartMs = config.StripAudibleBrandAudio ?
-                contentLic.ContentMetadata.ChapterInfo.BrandIntroDurationMs : 0;
-
-            var dlOptions = new DownloadOptions
-                 (
-                    libraryBook,
-                    contentLic?.ContentMetadata?.ContentUrl?.OfflineUrl,
-                    Resources.USER_AGENT
-                 )
+            var dlOptions = new DownloadOptions(config, libraryBook, contentLic?.ContentMetadata?.ContentUrl?.OfflineUrl)
             {
                 AudibleKey = contentLic?.Voucher?.Key,
                 AudibleIV = contentLic?.Voucher?.Iv,
-                OutputFormat = outputFormat,
-                MoveMoovToBeginning = config.MoveMoovToBeginning,
-                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,
-                DownloadClipsBookmarks = config.DownloadClipsBookmarks,
-                DownloadSpeedBps = config.DownloadSpeedLimit,
-                LameConfig = GetLameOptions(config),
-                ChapterInfo = new AAXClean.ChapterInfo(TimeSpan.FromMilliseconds(chapterStartMs)),
-                FixupFile = config.AllowLibationFixup
-            };
+				OutputFormat = outputFormat,
+				LameConfig = GetLameOptions(config),
+				ChapterInfo = new AAXClean.ChapterInfo(TimeSpan.FromMilliseconds(chapterStartMs)),
+				RuntimeLength = TimeSpan.FromMilliseconds(contentLic?.ContentMetadata?.ChapterInfo?.RuntimeLengthMs ?? 0),
+			};
 
             var chapters = flattenChapters(contentLic.ContentMetadata.ChapterInfo.Chapters).OrderBy(c => c.StartOffsetMs).ToList();
 
@@ -277,8 +262,10 @@ namespace FileLiberator
 
             foreach (var c in chapters)
             {
-                if (c.Chapters is not null)
-                {
+                if (c.Chapters is null)
+					chaps.Add(c);
+				else
+				{
                     if (c.LengthMs < 10000)
                     {
                         c.Chapters[0].StartOffsetMs = c.StartOffsetMs;
@@ -296,8 +283,6 @@ namespace FileLiberator
                     chaps.AddRange(children);
                     c.Chapters = null;
                 }
-                else
-                    chaps.Add(c);
             }
             return chaps;
         }

Source/FileLiberator/DownloadOptions.cs

@@ -3,7 +3,6 @@ using AAXClean;
 using Dinah.Core;
 using DataLayer;
 using LibationFileManager;
-using FileManager;
 using System.Threading.Tasks;
 using System;
 using System.IO;
@@ -17,36 +16,39 @@ namespace FileLiberator
 		public LibraryBook LibraryBook { get; }
 		public LibraryBookDto LibraryBookDto { get; }
 		public string DownloadUrl { get; }
-		public string UserAgent { get; }
 		public string AudibleKey { get; init; }
 		public string AudibleIV { get; init; }
-		public AaxDecrypter.OutputFormat OutputFormat { get; init; }
-		public bool TrimOutputToChapterLength { get; init; }
-		public bool RetainEncryptedFile { get; init; }
-		public bool StripUnabridged { get; init; }
-		public bool CreateCueSheet { get; init; }
-		public bool DownloadClipsBookmarks { get; init; }
-		public long DownloadSpeedBps { get; init; }
+		public TimeSpan RuntimeLength { get; init; }
+		public OutputFormat OutputFormat { get; init; }
 		public ChapterInfo ChapterInfo { get; init; }
-		public bool FixupFile { get; init; }
 		public NAudio.Lame.LameConfig LameConfig { get; init; }
-		public bool Downsample { get; init; }
-		public bool MatchSourceBitrate { get; init; }
-		public ReplacementCharacters ReplacementCharacters => Configuration.Instance.ReplacementCharacters;
-
-		public bool MoveMoovToBeginning { get; init; }
+		public string UserAgent => AudibleApi.Resources.USER_AGENT;
+		public bool TrimOutputToChapterLength => config.AllowLibationFixup && config.StripAudibleBrandAudio;
+		public bool StripUnabridged => config.AllowLibationFixup && config.StripUnabridged;
+		public bool CreateCueSheet => config.CreateCueSheet;
+		public bool DownloadClipsBookmarks => config.DownloadClipsBookmarks;
+		public long DownloadSpeedBps => config.DownloadSpeedLimit;
+		public bool RetainEncryptedFile => config.RetainAaxFile;
+		public bool FixupFile => config.AllowLibationFixup;
+		public bool Downsample => config.AllowLibationFixup && config.LameDownsampleMono;
+		public bool MatchSourceBitrate => config.AllowLibationFixup && config.LameMatchSourceBR && config.LameTargetBitrate;
+		public bool MoveMoovToBeginning => config.MoveMoovToBeginning;
 
 		public string GetMultipartFileName(MultiConvertFileProperties props)
-			=> Templates.ChapterFile.GetFilename(LibraryBookDto, props);
+		{
+			var baseDir = Path.GetDirectoryName(props.OutputFileName);
+			var extension = Path.GetExtension(props.OutputFileName);
+			return Templates.ChapterFile.GetFilename(LibraryBookDto, props, baseDir, extension);
+		}
 
-		public string GetMultipartTitleName(MultiConvertFileProperties props)
-			=> Templates.ChapterTitle.GetTitle(LibraryBookDto, props);
+		public string GetMultipartTitle(MultiConvertFileProperties props)
+			=> Templates.ChapterTitle.GetName(LibraryBookDto, props);
 
-		public async Task<string> SaveClipsAndBookmarks(string fileName)
+		public async Task<string> SaveClipsAndBookmarksAsync(string fileName)
 		{
 			if (DownloadClipsBookmarks)
 			{
-				var format = Configuration.Instance.ClipsBookmarksFileFormat;
+				var format = config.ClipsBookmarksFileFormat;
 
 				var formatExtension = format.ToString().ToLowerInvariant();
 				var filePath = Path.ChangeExtension(fileName, formatExtension);
@@ -71,20 +73,21 @@ namespace FileLiberator
 			return string.Empty;
 		}
 
+		private readonly Configuration config;
 		private readonly IDisposable cancellation;
 		public void Dispose() => cancellation?.Dispose();
 
-		public DownloadOptions(LibraryBook libraryBook, string downloadUrl, string userAgent)
+		public DownloadOptions(Configuration config, LibraryBook libraryBook, string downloadUrl)
 		{
+			this.config = ArgumentValidator.EnsureNotNull(config, nameof(config));
 			LibraryBook = ArgumentValidator.EnsureNotNull(libraryBook, nameof(libraryBook));
 			DownloadUrl = ArgumentValidator.EnsureNotNullOrEmpty(downloadUrl, nameof(downloadUrl));
-			UserAgent = ArgumentValidator.EnsureNotNullOrEmpty(userAgent, nameof(userAgent));
 			// no null/empty check for key/iv. unencrypted files do not have them
 
 			LibraryBookDto = LibraryBook.ToDto();
 
 			cancellation =
-				Configuration.Instance
+				config
 				.ObservePropertyChanged<long>(
 					nameof(Configuration.DownloadSpeedLimit),
 					newVal => DownloadSpeedChanged?.Invoke(this, newVal));

Source/FileLiberator/UtilityExtensions.cs

@@ -40,11 +40,13 @@ namespace FileLiberator
 			Narrators = libraryBook.Book.Narrators.Select(c => c.Name).ToList(),
 
 			SeriesName = libraryBook.Book.SeriesLink.FirstOrDefault()?.Series.Name,
-			SeriesNumber = libraryBook.Book.SeriesLink.FirstOrDefault()?.Order,
+			SeriesNumber = (int?)libraryBook.Book.SeriesLink.FirstOrDefault()?.Index,
+			IsPodcast = libraryBook.Book.IsEpisodeChild(),
 
 			BitRate = libraryBook.Book.AudioFormat.Bitrate,
 			SampleRate = libraryBook.Book.AudioFormat.SampleRate,
 			Channels = libraryBook.Book.AudioFormat.Channels,
+			Language = libraryBook.Book.Language
 		};
 	}
 }

Source/FileManager/FileManager.csproj

@@ -5,7 +5,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Dinah.Core" Version="7.2.0.1" />
+    <PackageReference Include="Dinah.Core" Version="7.2.1.1" />
     <PackageReference Include="Polly" Version="7.2.3" />
   </ItemGroup>
 

Source/FileManager/FileNamingTemplate.cs

@@ -1,123 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Text;
-
-namespace FileManager
-{
-	/// <summary>Get valid filename. Advanced features incl. parameterized template</summary>
-	public class FileNamingTemplate : NamingTemplate
-	{
-		public ReplacementCharacters ReplacementCharacters { get; }
-		/// <param name="template">Proposed file name with optional html-styled template tags.</param>
-		public FileNamingTemplate(string template, ReplacementCharacters replacement) : base(template)
-		{
-			ReplacementCharacters = replacement ?? ReplacementCharacters.Default;
-		}
-
-		/// <summary>Generate a valid path for this file or directory</summary>
-		public LongPath GetFilePath(string fileExtension, bool returnFirstExisting = false)
-		{
-			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, ReplacementCharacters));
-
-			while (!string.IsNullOrEmpty(fileName))
-			{
-				var file = Path.GetFileName(fileName);
-
-				if (Path.IsPathRooted(Template) && file == string.Empty)
-				{
-					pathParts.Add(fileName);
-					break;
-				}
-				else
-				{
-					pathParts.Add(file);
-					fileName = Path.GetDirectoryName(fileName);
-				}
-			}
-
-			pathParts.Reverse();
-			var fileNamePart = pathParts[^1];
-			pathParts.Remove(fileNamePart);
-
-			fileNamePart = fileNamePart[..^fileExtension.Length];
-
-			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 - fileExtension.Length - 5)) + fileExtension,
-				ReplacementCharacters,
-				fileExtension,
-				returnFirstExisting
-				);
-		}
-
-		private static string replaceFileName(string filename, Dictionary<string,string> paramReplacements, int maxFilenameLength)
-		{
-			List<StringBuilder> filenameParts = new();
-			//Build the filename in parts, replacing replacement parameters with
-			//their values, and storing the parts in a list.
-			while (!string.IsNullOrEmpty(filename))
-			{
-				int openIndex = filename.IndexOf('<');
-				int closeIndex = filename.IndexOf('>');
-
-				if (openIndex == 0 && closeIndex > 0)
-				{
-					var key = filename[..(closeIndex + 1)];
-
-					if (paramReplacements.ContainsKey(key))
-						filenameParts.Add(new StringBuilder(paramReplacements[key]));
-					else
-						filenameParts.Add(new StringBuilder(key));
-
-					filename = filename[(closeIndex + 1)..];
-				}
-				else if (openIndex > 0 && closeIndex > openIndex)
-				{
-					var other = filename[..openIndex];
-					filenameParts.Add(new StringBuilder(other));
-					filename = filename[openIndex..];
-				}
-				else
-				{
-					filenameParts.Add(new StringBuilder(filename));
-					filename = string.Empty;
-				}
-			}
-
-			//Remove 1 character from the end of the longest filename part until
-			//the total filename is less than max filename length
-			while (filenameParts.Sum(p => LongPath.GetFilesystemStringLength(p)) > maxFilenameLength)
-			{
-				int maxLength = filenameParts.Max(p => p.Length);
-				var maxEntry = filenameParts.First(p => p.Length == maxLength);
-
-				maxEntry.Remove(maxLength - 1, 1);
-			}
-			return string.Join("", filenameParts);
-		}
-
-		private static string formatValue(object value, ReplacementCharacters replacements)
-		{
-			if (value is null)
-				return "";
-
-			// Other illegal characters will be taken care of later. Must take care of slashes now so params can't introduce new folders.
-			// Esp important for file templates.
-			return replacements.ReplaceFilenameChars(value.ToString());
-		}
-	}
-}

Source/FileManager/LongPath.cs

@@ -40,6 +40,7 @@ namespace FileManager
 			}
 		}
 
+		[JsonConstructor]
 		private LongPath(string path)
 		{
 			if (IsWindows && path.Length > MaxPathLength)
@@ -55,10 +56,9 @@ namespace FileManager
 		//don't care about encoding, so how unicode characters are encoded is
 		///a choice made by the linux kernel. As best as I can tell, pretty
 		//much everyone uses UTF-8.
-		public static int GetFilesystemStringLength(StringBuilder filename)
-			=> LongPath.IsWindows ?
-				filename.Length
-				: Encoding.UTF8.GetByteCount(filename.ToString());
+		public static int GetFilesystemStringLength(string filename)
+			=> IsWindows ? filename.Length
+			: Encoding.UTF8.GetByteCount(filename);
 
 		public static implicit operator LongPath(string path)
 		{

Source/FileManager/MetadataNamingTemplate.cs

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

Source/FileManager/NamingTemplate.cs

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

Source/FileManager/NamingTemplate/ConditionalTagCollection[TClass].cs

@@ -0,0 +1,66 @@
+using System;
+using System.Linq.Expressions;
+using System.Text.RegularExpressions;
+
+namespace FileManager.NamingTemplate;
+
+internal interface IClosingPropertyTag : IPropertyTag
+{
+	/// <summary>The <see cref="Regex"/> used to match the closing <see cref="IPropertyTag.TemplateTag"/> in template strings.</summary>
+	public Regex NameCloseMatcher { get; }
+
+	/// <summary>
+	/// Determine if the template string starts with <see cref="IPropertyTag.TemplateTag"/>'s closing tag signature,
+	/// and if it does output the matching tag's <see cref="ITemplateTag"/>
+	/// </summary>
+	/// <param name="templateString">Template string</param>
+	/// <param name="exactName">The <paramref name="templateString"/> substring that was matched.</param>
+	/// <param name="propertyTag">The registered <see cref="IPropertyTag"/></param>
+	/// <returns>True if the <paramref name="templateString"/> starts with this tag.</returns>
+	bool StartsWithClosing(string templateString, out string exactName, out IClosingPropertyTag propertyTag);
+}
+
+public class ConditionalTagCollection<TClass> : TagCollection
+{
+	public ConditionalTagCollection(bool caseSensative = true) :base(typeof(TClass), caseSensative) { }
+
+	/// <summary>
+	/// Register a conditional tag.
+	/// </summary>
+	/// <param name="propertyGetter">A Func to get the condition's <see cref="bool"/> value from <see cref="TClass"/></param>
+	public void Add(ITemplateTag templateTag, Func<TClass, bool> propertyGetter)
+	{
+		var expr = Expression.Call(Expression.Constant(propertyGetter.Target), propertyGetter.Method, Parameter);
+
+		AddPropertyTag(new ConditionalTag(templateTag, Options, expr));
+	}
+	
+	private class ConditionalTag : TagBase, IClosingPropertyTag
+	{
+		public Regex NameCloseMatcher { get; }
+
+		public ConditionalTag(ITemplateTag templateTag, RegexOptions options, Expression conditionExpression)
+			: base(templateTag, conditionExpression)
+		{
+			NameMatcher = new Regex($"^<(!)?{templateTag.TagName}->", options);
+			NameCloseMatcher = new Regex($"^<-{templateTag.TagName}>", options);
+		}
+
+		public bool StartsWithClosing(string templateString, out string exactName, out IClosingPropertyTag propertyTag)
+		{
+			var match = NameCloseMatcher.Match(templateString);
+			if (match.Success)
+			{
+				exactName = match.Value;
+				propertyTag = this;
+				return true;
+			}
+
+			exactName = null;
+			propertyTag = null;
+			return false;
+		}
+
+		protected override Expression GetTagExpression(string exactName, string formatter) => formatter == "!" ? Expression.Not(ValueExpression) : ValueExpression;
+	}
+}

Source/FileManager/NamingTemplate/ITemplateTag.cs

@@ -0,0 +1,6 @@
+namespace FileManager.NamingTemplate;
+
+public interface ITemplateTag
+{
+	string TagName { get; }
+}

Source/FileManager/NamingTemplate/NamingTemplate.cs

@@ -0,0 +1,275 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Linq.Expressions;
+
+namespace FileManager.NamingTemplate;
+
+public class NamingTemplate
+{
+	public string TemplateText { get; private set; }
+	public IEnumerable<ITemplateTag> TagsInUse => _tagsInUse;
+	public IEnumerable<ITemplateTag> TagsRegistered => Classes.SelectMany(t => t).DistinctBy(t => t.TagName);
+	public IEnumerable<string> Warnings => errors.Concat(warnings);
+	public IEnumerable<string> Errors => errors;
+
+	private Delegate templateToString;
+	private readonly List<string> warnings = new();
+	private readonly List<string> errors = new();
+	private readonly IEnumerable<TagCollection> Classes;
+	private readonly List<ITemplateTag> _tagsInUse = new();
+
+	public const string ERROR_NULL_IS_INVALID = "Null template is invalid.";
+	public const string WARNING_EMPTY = "Template is empty.";
+	public const string WARNING_WHITE_SPACE = "Template is white space.";
+	public const string WARNING_NO_TAGS = "Should use tags. Eg: <title>";
+
+	/// <summary>
+	/// Invoke the <see cref="NamingTemplate"/> to  
+	/// </summary>
+	/// <param name="propertyClasses">Instances of the TClass used in <see cref="PropertyTagCollection{TClass}"/> and <see cref="ConditionalTagCollection{TClass}"/></param>
+	/// <returns></returns>
+	public TemplatePart Evaluate(params object[] propertyClasses)
+	{
+		//Match propertyClasses to the arguments required by templateToString.DynamicInvoke()
+		var delegateArgTypes = templateToString.GetType().GenericTypeArguments[..^1];
+
+		object[] args = new object[delegateArgTypes.Length];
+
+		for (int i = 0; i < delegateArgTypes.Length; i++)
+			args[i] = propertyClasses.First(o => o.GetType() == delegateArgTypes[i]);
+
+		if (args.Any(a => a is null))
+			throw new ArgumentException($"This instance of {nameof(NamingTemplate)} requires the following arguments: {string.Join(", ", delegateArgTypes.Select(t => t.Name).Distinct())}");
+
+		return ((TemplatePart)templateToString.DynamicInvoke(args)).FirstPart;
+	}
+
+	/// <summary>Parse a template string to a <see cref="NamingTemplate"/></summary>
+	/// <param name="template">The template string to parse</param>
+	/// <param name="tagClasses">A collection of <see cref="TagCollection"/> with
+	/// properties registered to match to the <paramref name="template"/></param>
+	public static NamingTemplate Parse(string template, IEnumerable<TagCollection> tagClasses)
+	{
+		var namingTemplate = new NamingTemplate(tagClasses);
+		try
+		{
+			BinaryNode intermediate = namingTemplate.IntermediateParse(template);
+			Expression evalTree = GetExpressionTree(intermediate);
+
+			List<ParameterExpression> parameters = new();
+
+			foreach (var tagclass in tagClasses)
+					parameters.Add(tagclass.Parameter);
+
+			namingTemplate.templateToString = Expression.Lambda(evalTree, parameters).Compile();
+		}
+		catch(Exception ex)
+		{
+			namingTemplate.errors.Add(ex.Message);
+		}
+		return namingTemplate;
+	}
+
+	private NamingTemplate(IEnumerable<TagCollection> properties)
+	{
+		Classes = properties;
+	}
+
+	/// <summary>Builds an <see cref="Expression"/> tree that will evaluate to a <see cref="TemplatePart"/></summary>
+	private static Expression GetExpressionTree(BinaryNode node)
+	{
+		if (node is null) return TemplatePart.Blank;
+		else if (node.IsValue) return node.Expression;
+		else if (node.IsConditional) return Expression.Condition(node.Expression, concatExpression(node), TemplatePart.Blank);
+		else return concatExpression(node);
+
+		Expression concatExpression(BinaryNode node)
+			=> TemplatePart.CreateConcatenation(GetExpressionTree(node.LeftChild), GetExpressionTree(node.RightChild));
+	}
+
+	/// <summary>Parse a template string into a <see cref="BinaryNode"/> tree</summary>
+	private BinaryNode IntermediateParse(string templateString)
+	{
+		if (templateString is null)
+			throw new NullReferenceException(ERROR_NULL_IS_INVALID);
+		else if (string.IsNullOrEmpty(templateString))
+			warnings.Add(WARNING_EMPTY);
+		else if (string.IsNullOrWhiteSpace(templateString))
+			warnings.Add(WARNING_WHITE_SPACE);
+
+		TemplateText = templateString;
+
+		BinaryNode currentNode = BinaryNode.CreateRoot();
+		BinaryNode topNode = currentNode;
+		List<char> literalChars = new();
+
+		while (templateString.Length > 0)
+		{
+			if (StartsWith(templateString, out string exactPropertyName, out var propertyTag, out var valueExpression))
+			{
+				checkAndAddLiterals();
+
+				if (propertyTag is IClosingPropertyTag)
+					currentNode = currentNode.AddNewNode(BinaryNode.CreateConditional(propertyTag.TemplateTag, valueExpression));
+				else
+				{
+					currentNode = currentNode.AddNewNode(BinaryNode.CreateValue(propertyTag.TemplateTag, valueExpression));
+					_tagsInUse.Add(propertyTag.TemplateTag);
+				}
+
+				templateString = templateString[exactPropertyName.Length..];
+			}
+			else if (StartsWithClosing(templateString, out exactPropertyName, out var closingPropertyTag))
+			{
+				checkAndAddLiterals();
+
+				BinaryNode lastParenth = currentNode;
+
+				while (lastParenth?.IsConditional is false)
+					lastParenth = lastParenth.Parent;
+
+				if (lastParenth?.Parent is null)
+				{
+					warnings.Add($"Missing <{closingPropertyTag.TemplateTag.TagName}-> open conditional.");
+					break;
+				}
+				else if (lastParenth.Name != closingPropertyTag.TemplateTag.TagName)
+				{
+					warnings.Add($"Missing <-{lastParenth.Name}> closing conditional.");
+					break;
+				}
+
+				currentNode = lastParenth.Parent;
+				templateString = templateString[exactPropertyName.Length..];
+			}
+			else
+			{
+				//templateString does not start with a tag, so the first
+				//character is a literal and not part of a tag expression.
+				literalChars.Add(templateString[0]);
+				templateString = templateString[1..];
+			}
+		}
+		checkAndAddLiterals();
+
+		//Check for any conditionals that haven't been closed
+		while (currentNode is not null)
+		{
+			if (currentNode.IsConditional)
+				warnings.Add($"Missing <-{currentNode.Name}> closing conditional.");
+			currentNode = currentNode.Parent;
+		}
+
+		if (!_tagsInUse.Any())
+			warnings.Add(WARNING_NO_TAGS);
+
+		return topNode;
+
+		void checkAndAddLiterals()
+		{
+			if (literalChars.Count != 0)
+			{
+				currentNode = currentNode.AddNewNode(BinaryNode.CreateValue(new string(literalChars.ToArray())));
+				literalChars.Clear();
+			}
+		}
+	}
+
+	private bool StartsWith(string template, out string exactName, out IPropertyTag propertyTag, out Expression valueExpression)
+	{
+		foreach (var pc in Classes)
+		{
+			if (pc.StartsWith(template, out exactName, out propertyTag, out valueExpression))
+				return true;
+		}
+
+		exactName = null;
+		valueExpression = null;
+		propertyTag = null;
+		return false;
+	}
+
+	private bool StartsWithClosing(string template, out string exactName, out IClosingPropertyTag closingPropertyTag)
+	{
+		foreach (var pc in Classes)
+		{
+			if (pc.StartsWithClosing(template, out exactName, out closingPropertyTag))
+				return true;
+		}
+
+		exactName = null;
+		closingPropertyTag = null;
+		return false;
+	}
+
+	private class BinaryNode
+	{
+		public string Name { get; }
+		public BinaryNode Parent { get; private set; }
+		public BinaryNode RightChild { get; private set; }
+		public BinaryNode LeftChild { get; private set; }
+		public Expression Expression { get; private init; }
+		public bool IsConditional { get; private init; } = false;
+		public bool IsValue { get; private init; } = false;
+
+		public static BinaryNode CreateRoot() => new("Root");
+
+		public static BinaryNode CreateValue(string literal) => new("Literal")
+		{
+			IsValue = true,
+			Expression = TemplatePart.CreateLiteral(literal)
+		};
+
+		public static BinaryNode CreateValue(ITemplateTag templateTag, Expression property) => new(templateTag.TagName)
+		{
+			IsValue = true,
+			Expression = TemplatePart.CreateProperty(templateTag, property)
+		};
+
+		public static BinaryNode CreateConditional(ITemplateTag templateTag, Expression property) => new(templateTag.TagName)
+		{
+			IsConditional = true,
+			Expression = property
+		};
+
+		private static BinaryNode CreateConcatenation(BinaryNode left, BinaryNode right)
+		{
+			var newNode = new BinaryNode("Concatenation")
+			{
+				LeftChild = left,
+				RightChild = right
+			};
+			newNode.LeftChild.Parent = newNode;
+			newNode.RightChild.Parent = newNode;
+			return newNode;
+		}
+
+		private BinaryNode(string name) => Name = name;
+		public override string ToString() => Name;
+
+		public BinaryNode AddNewNode(BinaryNode newNode)
+		{
+			BinaryNode currentNode = this;
+
+			if (LeftChild is null)
+			{
+				newNode.Parent = currentNode;
+				LeftChild = newNode;
+			}
+			else if (RightChild is null)
+			{
+				newNode.Parent = currentNode;
+				RightChild = newNode;
+			}
+			else
+			{
+				RightChild = CreateConcatenation(RightChild, newNode);
+				RightChild.Parent = currentNode;
+				currentNode = RightChild;
+			}
+
+			return newNode.IsConditional ? newNode : currentNode;
+		}
+	}
+}

Source/FileManager/NamingTemplate/PropertyTagCollection[TClass].cs

@@ -0,0 +1,164 @@
+using Dinah.Core;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Linq.Expressions;
+using System.Text.RegularExpressions;
+
+namespace FileManager.NamingTemplate;
+
+public delegate string PropertyFormatter<T>(ITemplateTag templateTag, T value, string formatString);
+
+public class PropertyTagCollection<TClass> : TagCollection
+{
+	private readonly Dictionary<Type, MulticastDelegate> defaultFormatters = new();
+
+	public PropertyTagCollection(bool caseSensative = true, params MulticastDelegate[] defaultFormatters) : base(typeof(TClass), caseSensative)
+	{
+		foreach (var formatter in defaultFormatters)
+		{
+			var parameters = formatter.Method.GetParameters();
+
+			if (formatter.Method.ReturnType != typeof(string)
+				|| parameters.Length != 3
+				|| parameters[0].ParameterType != typeof(ITemplateTag)
+				|| parameters[2].ParameterType != typeof(string))
+				throw new ArgumentException($"{nameof(defaultFormatters)} must have a signature of [{nameof(String)} PropertyFormatter<T>({nameof(ITemplateTag)}, T, {nameof(String)})]");
+
+			this.defaultFormatters[parameters[1].ParameterType] = formatter;
+		}
+	}
+
+	/// <summary>
+	/// Register a nullable value type <typeparamref name="TClass"/> property.
+	/// </summary>
+	/// <typeparam name="TProperty">Type of the property from <see cref="TClass"/></typeparam>
+	/// <param name="propertyGetter">A Func to get the property value from <see cref="TClass"/></param>
+	/// <param name="formatter">Optional formatting function that accepts the <typeparamref name="TProperty"/> property
+	/// and a formatting string and returnes the value the formatted string. If <see cref="null"/>, use the default
+	/// <typeparamref name="TProperty"/> formatter if present, or <see cref="object.ToString"/></param>
+	public void Add<TProperty>(ITemplateTag templateTag, Func<TClass, TProperty?> propertyGetter, PropertyFormatter<TProperty> formatter = null)
+		where TProperty : struct
+		=> RegisterWithFormatter(templateTag, propertyGetter, formatter);
+
+	/// <summary>
+	/// Register a nullable value type <typeparamref name="TClass"/> property.
+	/// </summary>
+	/// <param name="propertyGetter">A Func to get the string property from <see cref="TClass"/></param>
+	/// <param name="toString">ToString function that accepts the <typeparamref name="TProperty"/> property and returnes a string</param>
+	public void Add<TProperty>(ITemplateTag templateTag, Func<TClass, TProperty?> propertyGetter, Func<TProperty, string> toString)
+		where TProperty : struct
+		=> RegisterWithToString(templateTag, propertyGetter, toString);
+
+	/// <summary>
+	/// Register a <typeparamref name="TClass"/> property
+	/// </summary>
+	/// <typeparam name="TProperty">Type of the property from <see cref="TClass"/></typeparam>
+	/// <param name="propertyGetter">A Func to get the property value from <see cref="TClass"/></param>
+	/// <param name="formatter">Optional formatting function that accepts the <typeparamref name="TProperty"/> property
+	/// and a formatting string and returnes the value formatted to string. If <see cref="null"/>, use the default
+	/// <typeparamref name="TProperty"/> formatter if present, or <see cref="object.ToString"/></param>
+	public void Add<TProperty>(ITemplateTag templateTag, Func<TClass, TProperty> propertyGetter, PropertyFormatter<TProperty> formatter = null)
+		=> RegisterWithFormatter(templateTag, propertyGetter, formatter);
+
+	/// <summary>
+	/// Register a <typeparamref name="TClass"/> property.
+	/// </summary>
+	/// <param name="propertyGetter">A Func to get the string property from <see cref="TClass"/></param>
+	/// <param name="toString">ToString function that accepts the <typeparamref name="TProperty"/> property and returnes a string</param>
+	public void Add<TProperty>(ITemplateTag templateTag, Func<TClass, TProperty> propertyGetter, Func<TProperty, string> toString)
+		=> RegisterWithToString(templateTag, propertyGetter, toString);
+
+	private void RegisterWithFormatter<TProperty, TPropertyValue>
+		(ITemplateTag templateTag, Func<TClass, TProperty> propertyGetter, PropertyFormatter<TPropertyValue> formatter)
+	{
+		ArgumentValidator.EnsureNotNull(templateTag, nameof(templateTag));
+		ArgumentValidator.EnsureNotNull(propertyGetter, nameof(propertyGetter));
+
+		formatter ??= GetDefaultFormatter<TPropertyValue>();
+
+		if (formatter is null)
+			RegisterWithToString<TProperty, TPropertyValue>(templateTag, propertyGetter, null);
+		else
+		{
+			var expr = Expression.Call(Expression.Constant(propertyGetter.Target), propertyGetter.Method, Parameter);
+			AddPropertyTag(PropertyTag.Create(templateTag, Options, expr, formatter));
+		}
+	}
+
+	private PropertyFormatter<T> GetDefaultFormatter<T>()
+	{
+		try
+		{
+			var del = defaultFormatters.FirstOrDefault(kvp => kvp.Key == typeof(T)).Value;
+			return del is null ? null : Delegate.CreateDelegate(typeof(PropertyFormatter<T>), del.Target, del.Method) as PropertyFormatter<T>;
+		}
+		catch
+		{
+			return null;
+		}
+	}
+
+	private void RegisterWithToString<TProperty, TPropertyValue>
+		(ITemplateTag templateTag, Func<TClass, TProperty> propertyGetter, Func<TPropertyValue, string> toString)
+	{
+		static string ToStringFunc(TPropertyValue value) => value?.ToString() ?? "";
+		ArgumentValidator.EnsureNotNull(templateTag, nameof(templateTag));
+		ArgumentValidator.EnsureNotNull(propertyGetter, nameof(propertyGetter));
+
+		var expr = Expression.Call(Expression.Constant(propertyGetter.Target), propertyGetter.Method, Parameter);
+		AddPropertyTag(PropertyTag.Create(templateTag, Options, expr, toString ?? ToStringFunc));
+	}
+
+	private class PropertyTag : TagBase
+	{
+		private Func<Expression, string, Expression> CreateToStringExpression { get; init; }
+		private PropertyTag(ITemplateTag templateTag, Expression propertyGetter) : base(templateTag, propertyGetter) { }
+
+		public static PropertyTag Create<TPropertyValue>(ITemplateTag templateTag, RegexOptions options, Expression propertyGetter, PropertyFormatter<TPropertyValue> formatter)
+		{
+			return new PropertyTag(templateTag, propertyGetter)
+			{
+				NameMatcher = new Regex(@$"^<{templateTag.TagName.Replace(" ", "\\s*?")}\s*?(?:\[([^\[\]]*?)\]\s*?)?>", options),
+				CreateToStringExpression = (expVal, format) =>
+				Expression.Call(
+					formatter.Target is null ? null : Expression.Constant(formatter.Target),
+					formatter.Method,
+					Expression.Constant(templateTag),
+					expVal,
+					Expression.Constant(format))
+			};
+		}
+
+		public static PropertyTag Create<TPropertyValue>(ITemplateTag templateTag, RegexOptions options, Expression propertyGetter, Func<TPropertyValue, string> toString)
+		{
+			return new PropertyTag(templateTag, propertyGetter)
+			{
+				NameMatcher = new Regex(@$"^<{templateTag.TagName}>", options),
+				CreateToStringExpression = (expVal, _) =>
+					Expression.Call(
+						toString.Target is null ? null : Expression.Constant(toString.Target),
+						toString.Method,
+						expVal)
+			};
+		}
+
+		protected override Expression GetTagExpression(string exactName, string formatString)
+		{
+			Expression toStringExpression
+				= !ReturnType.IsValueType
+				? Expression.Condition(
+					Expression.Equal(ValueExpression, Expression.Constant(null)),
+					Expression.Constant(""),
+					CreateToStringExpression(ValueExpression, formatString))
+				: Nullable.GetUnderlyingType(ReturnType) is null
+				? CreateToStringExpression(ValueExpression, formatString)
+				: Expression.Condition(
+					Expression.PropertyOrField(ValueExpression, "HasValue"),
+					CreateToStringExpression(Expression.PropertyOrField(ValueExpression, "Value"), formatString),
+					Expression.Constant(""));
+
+			return Expression.TryCatch(toStringExpression, Expression.Catch(typeof(Exception), Expression.Constant(exactName)));
+		}
+	}
+}

Source/FileManager/NamingTemplate/TagBase.cs

@@ -0,0 +1,65 @@
+using System;
+using System.Linq.Expressions;
+using System.Text.RegularExpressions;
+
+namespace FileManager.NamingTemplate;
+
+internal interface IPropertyTag
+{
+	/// <summary>The tag that will be matched in a tag string</summary>
+	ITemplateTag TemplateTag { get; }
+
+	/// <summary><see cref="TemplateTag"/>'s <see cref="Type"/></summary>
+	Type ReturnType { get; }
+
+	/// <summary>The <see cref="Regex"/> used to match <see cref="TemplateTag"/> in template strings.</summary>
+	Regex NameMatcher { get; }
+
+	/// <summary>
+	/// Determine if the template string starts with <see cref="TemplateTag"/>, and if it does parse the tag to an <see cref="Expression"/>
+	/// </summary>
+	/// <param name="templateString">Template string</param>
+	/// <param name="exactName">The <paramref name="templateString"/> substring that was matched.</param>
+	/// <param name="propertyValue">The <see cref="Expression"/> that returns the property's value</param>
+	/// <returns>True if the <paramref name="templateString"/> starts with this tag.</returns>
+	bool StartsWith(string templateString, out string exactName, out Expression propertyValue);
+}
+
+internal abstract class TagBase : IPropertyTag
+{
+	public ITemplateTag TemplateTag { get; }
+	public Regex NameMatcher { get; protected init; }
+	public Type ReturnType => ValueExpression.Type;
+	protected Expression ValueExpression { get; }
+
+	protected TagBase(ITemplateTag templateTag, Expression propertyExpression)
+	{
+		TemplateTag = templateTag;
+		ValueExpression = propertyExpression;
+	}
+
+	/// <summary>Create an <see cref="Expression"/> that returns the property's value.</summary>
+	/// <param name="exactName">The exact string that was matched to <see cref="ITemplateTag"/></param>
+	/// <param name="formatter">The optional format string in the match inside the square brackets</param>
+	protected abstract Expression GetTagExpression(string exactName, string formatter);
+
+	public bool StartsWith(string templateString, out string exactName, out Expression propertyValue)
+	{
+		var match = NameMatcher.Match(templateString);
+		if (match.Success)
+		{
+			exactName = match.Value;
+			propertyValue = GetTagExpression(exactName, match.Groups.Count == 2 ? match.Groups[1].Value.Trim() : "");
+			return true;
+		}
+
+		exactName = null;
+		propertyValue = null;
+		return false;
+	}
+
+	public override string ToString()
+	{
+		return $"[Name = {TemplateTag.TagName}, Type = {ReturnType.Name}]";
+	}
+}

Source/FileManager/NamingTemplate/TagCollection.cs

@@ -0,0 +1,80 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
+using System.Linq.Expressions;
+using System.Text.RegularExpressions;
+
+namespace FileManager.NamingTemplate;
+
+/// <summary>A collection of <see cref="IPropertyTag"/>s registered to a single <see cref="Type"/>.</summary>
+public abstract class TagCollection : IEnumerable<ITemplateTag>
+{
+	/// <summary>The <see cref="ParameterExpression"/> of the <see cref="TagCollection"/>'s TClass type.</summary>
+	public ParameterExpression Parameter { get; }
+	/// <summary>The <see cref="ITemplateTag"/>s registered with this <see cref="TagCollection"/> </summary>
+	public IEnumerator<ITemplateTag> GetEnumerator() => PropertyTags.Select(p => p.TemplateTag).GetEnumerator();
+
+	protected RegexOptions Options { get; } = RegexOptions.Compiled;
+	private List<IPropertyTag> PropertyTags { get; } = new();
+
+	protected TagCollection(Type classType, bool caseSensative = true)
+	{
+		Parameter = Expression.Parameter(classType, classType.Name);
+		Options |= caseSensative ? RegexOptions.None : RegexOptions.IgnoreCase;
+	}
+
+	/// <summary>
+	/// Determine if the template string starts with any of the <see cref="TemplateTags"/>s' <see cref="ITemplateTag"/> signatures,
+	/// and if it does parse the tag to an <see cref="Expression"/>
+	/// </summary>
+	/// <param name="templateString">Template string</param>
+	/// <param name="exactName">The <paramref name="templateString"/> substring that was matched.</param>
+	/// <param name="propertyValue">The <see cref="Expression"/> that returns the <paramref name="propertyTag"/>'s value</param>
+	/// <returns>True if the <paramref name="templateString"/> starts with a tag registered in this class.</returns>
+	internal bool StartsWith(string templateString, out string exactName, out IPropertyTag propertyTag, out Expression propertyValue)
+	{
+		foreach (var p in PropertyTags)
+		{
+			if (p.StartsWith(templateString, out exactName, out propertyValue))
+			{
+				propertyTag = p;
+				return true;
+			}
+		}
+
+		propertyValue = null;
+		propertyTag = null;
+		exactName = null;
+		return false;
+	}
+
+	/// <summary>
+	/// Determine if the template string starts with <see cref="IPropertyTag.TemplateTag"/>'s closing tag signature,
+	/// and if it does output the matching tag's <see cref="ITemplateTag"/>
+	/// </summary>
+	/// <param name="templateString">Template string</param>
+	/// <param name="exactName">The <paramref name="templateString"/> substring that was matched.</param>
+	/// <param name="closingPropertyTag">The registered <see cref="IClosingPropertyTag"/></param>
+	/// <returns>True if the <paramref name="templateString"/> starts with this tag.</returns>
+	internal bool StartsWithClosing(string templateString, out string exactName, out IClosingPropertyTag closingPropertyTag)
+	{
+		foreach (var  cg in PropertyTags.OfType<IClosingPropertyTag>())
+		{
+			if (cg.StartsWithClosing(templateString, out exactName, out closingPropertyTag))
+				return true;
+		}
+
+		closingPropertyTag = null;
+		exactName = null;
+		return false;
+	}
+
+	private protected void AddPropertyTag(IPropertyTag propertyTag)
+	{
+		if (!PropertyTags.Any(c => c.TemplateTag.TagName == propertyTag.TemplateTag.TagName))
+			PropertyTags.Add(propertyTag);
+	}
+
+	IEnumerator IEnumerable.GetEnumerator() => GetEnumerator();
+}

Source/FileManager/NamingTemplate/TemplatePart.cs

@@ -0,0 +1,109 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Reflection;
+
+namespace FileManager.NamingTemplate;
+
+/// <summary>Represents one part of an evaluated <see cref="NamingTemplate"/>.</summary>
+public class TemplatePart : IEnumerable<TemplatePart>
+{
+	/// <summary>The <see cref="TemplatePart"/> name. If <see cref="TemplatePart"/> is
+	/// a registered property, this value is <see cref="ITemplateTag.TagName"/></summary>
+	public string TagName { get; }
+
+	/// <summary> The <see cref="IPropertyTag"/>'s <see cref="ITemplateTag"/> if <see cref="TemplatePart"/> is
+	/// a registered property, otherwise <see cref="null"/> for string literals. </summary>
+	public ITemplateTag TemplateTag { get; }
+
+	/// <summary>The evaluated string.</summary>
+	public string Value { get; }
+
+	private TemplatePart previous;
+	private TemplatePart next;
+	private TemplatePart(string name, string value)
+	{
+		TagName = name;
+		Value = value;
+	}
+	private TemplatePart(ITemplateTag templateTag, string value)
+	{
+		TemplateTag = templateTag;
+		TagName = templateTag.TagName;
+		Value = value;
+	}
+
+	internal static Expression Blank
+		=> CreateExpression("Blank", Expression.Constant(""));
+
+	internal static Expression CreateLiteral(string constant)
+		=> CreateExpression("Literal", Expression.Constant(constant));
+
+	internal static Expression CreateProperty(ITemplateTag templateTag, Expression property)
+		=> Expression.New(tagTemplateConstructorInfo, Expression.Constant(templateTag), property);
+
+	internal static Expression CreateConcatenation(Expression left, Expression right)
+	{
+		if (left.Type != typeof(TemplatePart) || right.Type != typeof(TemplatePart))
+			throw new InvalidOperationException($"Cannot concatenate expressions of types {left.Type.Name} and {right.Type.Name}");
+		return Expression.Add(left, right, addMethodInfo);
+	}
+
+	private static Expression CreateExpression(string name, Expression value)
+		=> Expression.New(constructorInfo, Expression.Constant(name), value);
+
+	private static readonly ConstructorInfo constructorInfo
+		= typeof(TemplatePart).GetConstructor(BindingFlags.NonPublic | BindingFlags.Instance, new Type[] { typeof(string), typeof(string) });
+
+	private static readonly ConstructorInfo tagTemplateConstructorInfo
+		= typeof(TemplatePart).GetConstructor(BindingFlags.NonPublic | BindingFlags.Instance, new Type[] { typeof(ITemplateTag), typeof(string)	});
+
+	private static readonly MethodInfo addMethodInfo
+		= typeof(TemplatePart).GetMethod(nameof(Concatenate), BindingFlags.NonPublic | BindingFlags.Static, new Type[] { typeof(TemplatePart), typeof(TemplatePart) });
+
+	public IEnumerator<TemplatePart> GetEnumerator()
+	{
+		var firstPart = FirstPart;
+
+		do
+		{
+			if (firstPart.TemplateTag is not null || firstPart.TagName is not "Blank")
+				yield return firstPart;
+			firstPart = firstPart.next;
+		}
+		while (firstPart is not null);
+	}
+
+	IEnumerator IEnumerable.GetEnumerator() => GetEnumerator();
+
+	internal TemplatePart FirstPart
+	{
+		get
+		{
+			var part = this;
+			while (part.previous is not null)
+				part = part.previous;
+			return part;
+		}
+	}
+
+	private TemplatePart LastPart
+	{
+		get
+		{
+			var part = this;
+			while (part.next is not null)
+				part = part.next;
+			return part;
+		}
+	}
+
+	private static TemplatePart Concatenate(TemplatePart left, TemplatePart right)
+	{
+		var last = left.LastPart;
+		last.next = right;
+		right.previous = last;
+		return left.FirstPart;
+	}
+}

Source/LibationAvalonia/Dialogs/BookDetailsDialog.axaml.cs

@@ -105,6 +105,8 @@ namespace LibationAvalonia.Dialogs
 
 			public BookDetailsDialogViewModel(LibraryBook libraryBook)
 			{
+				var Book = libraryBook.Book;
+
 				//init tags
 				Tags = libraryBook.Book.UserDefinedItem.Tags;
 
@@ -115,14 +117,15 @@ namespace LibationAvalonia.Dialogs
 
 				//init book details
 				DetailsText = @$"
-Title: {libraryBook.Book.Title}
-Author(s): {libraryBook.Book.AuthorNames()}
-Narrator(s): {libraryBook.Book.NarratorNames()}
-Length: {(libraryBook.Book.LengthInMinutes == 0 ? "" : $"{libraryBook.Book.LengthInMinutes / 60} hr {libraryBook.Book.LengthInMinutes % 60} min")}
-Audio Bitrate: {libraryBook.Book.AudioFormat}
-Category: {string.Join(" > ", libraryBook.Book.CategoriesNames())}
+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:d}
-Audible ID: {libraryBook.Book.AudibleProductId}
+Language: {Book.Language}
+Audible ID: {Book.AudibleProductId}
 ".Trim();
 
 				var seriesNames = libraryBook.Book.SeriesNames();

Source/LibationAvalonia/Dialogs/EditTemplateDialog.axaml.cs

@@ -11,14 +11,12 @@ using ReactiveUI;
 using Avalonia.Controls.Documents;
 using Avalonia.Collections;
 using Avalonia.Controls;
+using Avalonia.Markup.Xaml.Templates;
 
 namespace LibationAvalonia.Dialogs
 {
 	public partial class EditTemplateDialog : DialogWindow
 	{
-		// final value. post-validity check
-		public string TemplateText { get; private set; }
-
 		private EditTemplateViewModel _viewModel;
 
 		public EditTemplateDialog()
@@ -28,20 +26,21 @@ namespace LibationAvalonia.Dialogs
 			if (Design.IsDesignMode)
 			{
 				_ = Configuration.Instance.LibationFiles;
-				_viewModel = new(Configuration.Instance, Templates.File);
-				_viewModel.resetTextBox(_viewModel.Template.DefaultTemplate);
-				Title = $"Edit {_viewModel.Template.Name}";
+				var editor = TemplateEditor<Templates.FileTemplate>.CreateFilenameEditor(Configuration.Instance.Books, Configuration.Instance.FileTemplate);
+				_viewModel = new(Configuration.Instance, editor);
+				_viewModel.resetTextBox(editor.EditingTemplate.TemplateText);
+				Title = $"Edit {editor.EditingTemplate.Name}";
 				DataContext = _viewModel;
 			}
 		}
 
-		public EditTemplateDialog(Templates template, string inputTemplateText) : this()
+		public EditTemplateDialog(ITemplateEditor templateEditor) : this()
 		{
-			ArgumentValidator.EnsureNotNull(template, nameof(template));
+			ArgumentValidator.EnsureNotNull(templateEditor, nameof(templateEditor));
 
-			_viewModel = new EditTemplateViewModel(Configuration.Instance, template);
-			_viewModel.resetTextBox(inputTemplateText);
-			Title = $"Edit {template.Name}";
+			_viewModel = new EditTemplateViewModel(Configuration.Instance, templateEditor);
+			_viewModel.resetTextBox(templateEditor.EditingTemplate.TemplateText);
+			Title = $"Edit {templateEditor.EditingTemplate.Name}";
 			DataContext = _viewModel;
 		}
 
@@ -64,7 +63,6 @@ namespace LibationAvalonia.Dialogs
 			if (!await _viewModel.Validate())
 				return;
 
-			TemplateText = _viewModel.workingTemplateText;
 			await base.SaveAndCloseAsync();
 		}
 
@@ -72,23 +70,25 @@ namespace LibationAvalonia.Dialogs
 			=> await SaveAndCloseAsync();
 
 		public void ResetButton_Click(object sender, Avalonia.Interactivity.RoutedEventArgs e)
-			=> _viewModel.resetTextBox(_viewModel.Template.DefaultTemplate);
+			=> _viewModel.resetTextBox(_viewModel.TemplateEditor.DefaultTemplate);
 
 		private class EditTemplateViewModel : ViewModels.ViewModelBase
 		{
 			private readonly Configuration config;
 			public FontFamily FontFamily { get; } = FontManager.Current.DefaultFontFamilyName;
 			public InlineCollection Inlines { get; } = new();
-			public Templates Template { get; }
-			public EditTemplateViewModel(Configuration configuration, Templates templates)
+			public ITemplateEditor TemplateEditor { get; }
+			public EditTemplateViewModel(Configuration configuration, ITemplateEditor templates)
 			{
 				config = configuration;
-				Template = templates;
-				Description = templates.Description;
+				TemplateEditor = templates;
+				Description = templates.EditingTemplate.Description;
 				ListItems
 				= new AvaloniaList<Tuple<string, string, string>>(
-					Template
-					.GetTemplateTags()
+					TemplateEditor
+					.EditingTemplate
+					.TagsRegistered
+					.Cast<TemplateTags>()
 					.Select(
 						t => new Tuple<string, string, string>(
 							$"<{t.TagName.Replace("->", "-\x200C>").Replace("<-", "<\x200C-")}>",
@@ -111,7 +111,6 @@ namespace LibationAvalonia.Dialogs
 				}
 			}
 
-			public string workingTemplateText => Template.Sanitize(UserTemplateText, Configuration.Instance.ReplacementCharacters);
 			private string _warningText;
 			public string WarningText { get => _warningText; set => this.RaiseAndSetIfChanged(ref _warningText, value); }
 
@@ -123,77 +122,22 @@ namespace LibationAvalonia.Dialogs
 
 			public async Task<bool> Validate()
 			{
-				if (Template.IsValid(workingTemplateText))
+				if (TemplateEditor.EditingTemplate.IsValid)
 					return true;
-				var errors = Template
-					.GetErrors(workingTemplateText)
-					.Select(err => $"- {err}")
-					.Aggregate((a, b) => $"{a}\r\n{b}");
+
+				var errors
+					= TemplateEditor
+						.EditingTemplate
+						.Errors
+						.Select(err => $"- {err}")
+						.Aggregate((a, b) => $"{a}\r\n{b}");
 				await MessageBox.Show($"This template text is not valid. Errors:\r\n{errors}", "Invalid", MessageBoxButtons.OK, MessageBoxIcon.Error);
 				return false;
 			}
 
 			private void templateTb_TextChanged()
 			{
-				var isChapterTitle = Template == Templates.ChapterTitle;
-				var isFolder = Template == Templates.Folder;
-
-				var libraryBookDto = new LibraryBookDto
-				{
-					Account = "my account",
-					DateAdded = new DateTime(2022, 6, 9, 0, 0, 0),
-					DatePublished = new DateTime(2017, 2, 27, 0, 0, 0),
-					AudibleProductId = "123456789",
-					Title = "A Study in Scarlet: A Sherlock Holmes Novel",
-					Locale = "us",
-					YearPublished = 2017,
-					Authors = new List<string> { "Arthur Conan Doyle", "Stephen Fry - introductions" },
-					Narrators = new List<string> { "Stephen Fry" },
-					SeriesName = "Sherlock Holmes",
-					SeriesNumber = "1",
-					BitRate = 128,
-					SampleRate = 44100,
-					Channels = 2
-				};
-				var chapterName = "A Flight for Life";
-				var chapterNumber = 4;
-				var chaptersTotal = 10;
-
-				var partFileProperties = new AaxDecrypter.MultiConvertFileProperties()
-				{
-					OutputFileName = "",
-					PartsPosition = chapterNumber,
-					PartsTotal = chaptersTotal,
-					Title = chapterName
-				};
-
-				/*
-				* Path must be rooted for windows to allow long file paths. This is
-				* only necessary for folder templates because they may contain several
-				* subdirectories. Without rooting, we won't be allowed to create a
-				* relative path longer than MAX_PATH.
-				*/
-
-				var books = config.Books;
-				var folder = Templates.Folder.GetPortionFilename(
-					libraryBookDto,
-					Path.Combine(books, isFolder ? workingTemplateText : config.FolderTemplate), "");
-
-				folder = Path.GetRelativePath(books, folder);
-
-				var file
-				= Template == Templates.ChapterFile
-				? Templates.ChapterFile.GetPortionFilename(
-					libraryBookDto,
-					workingTemplateText,
-					partFileProperties,
-					"")
-				: Templates.File.GetPortionFilename(
-					libraryBookDto,
-					isFolder ? config.FileTemplate : workingTemplateText, "");
-				var ext = config.DecryptToLossy ? "mp3" : "m4b";
-
-				var chapterTitle = Templates.ChapterTitle.GetPortionTitle(libraryBookDto, workingTemplateText, partFileProperties);
+				TemplateEditor.SetTemplateText(UserTemplateText);
 
 				const char ZERO_WIDTH_SPACE = '\u200B';
 				var sing = $"{Path.DirectorySeparatorChar}";
@@ -206,11 +150,12 @@ namespace LibationAvalonia.Dialogs
 				string slashWrap(string val) => val.Replace(sing, $"{ZERO_WIDTH_SPACE}{sing}");
 
 				WarningText
-					= !Template.HasWarnings(workingTemplateText)
+					= !TemplateEditor.EditingTemplate.HasWarnings
 					? ""
 					: "Warning:\r\n" +
-						Template
-						.GetWarnings(workingTemplateText)
+						TemplateEditor
+						.EditingTemplate
+						.Warnings
 						.Select(err => $"- {err}")
 						.Aggregate((a, b) => $"{a}\r\n{b}");
 
@@ -219,20 +164,24 @@ namespace LibationAvalonia.Dialogs
 
 				Inlines.Clear();
 
-				if (isChapterTitle)
+				if (!TemplateEditor.IsFilePath)
 				{
-					Inlines.Add(new Run(chapterTitle) { FontWeight = bold });
+					Inlines.Add(new Run(TemplateEditor.GetName()) { FontWeight = bold });
 					return;
 				}
 
-				Inlines.Add(new Run(slashWrap(books)) { FontWeight = reg });
+				var folder = TemplateEditor.GetFolderName();
+				var file = TemplateEditor.GetFileName();
+				var ext = config.DecryptToLossy ? "mp3" : "m4b";
+
+				Inlines.Add(new Run(slashWrap(TemplateEditor.BaseDirectory.PathWithoutPrefix)) { FontWeight = reg });
 				Inlines.Add(new Run(sing) { FontWeight = reg });
 
-				Inlines.Add(new Run(slashWrap(folder)) { FontWeight = isFolder ? bold : reg });
+				Inlines.Add(new Run(slashWrap(folder)) { FontWeight = TemplateEditor.IsFolder ? bold : reg });
 
 				Inlines.Add(new Run(sing));
 
-				Inlines.Add(new Run(slashWrap(file)) { FontWeight = isFolder ? reg : bold });
+				Inlines.Add(new Run(slashWrap(file)) { FontWeight = TemplateEditor.IsFolder ? reg : bold });
 
 				Inlines.Add(new Run($".{ext}"));
 			}

Source/LibationAvalonia/Dialogs/SettingsDialog.axaml.cs

@@ -52,21 +52,22 @@ namespace LibationAvalonia.Dialogs
 
 		public async void EditFolderTemplateButton_Click(object sender, Avalonia.Interactivity.RoutedEventArgs e)
 		{
-			var newTemplate = await editTemplate(Templates.Folder, settingsDisp.DownloadDecryptSettings.FolderTemplate);
+			var newTemplate = await editTemplate(TemplateEditor<Templates.FolderTemplate>.CreateFilenameEditor(config.Books, settingsDisp.DownloadDecryptSettings.FolderTemplate));
 			if (newTemplate is not null)
 				settingsDisp.DownloadDecryptSettings.FolderTemplate = newTemplate;
 		}
 
 		public async void EditFileTemplateButton_Click(object sender, Avalonia.Interactivity.RoutedEventArgs e)
-		{
-			var newTemplate = await editTemplate(Templates.File, settingsDisp.DownloadDecryptSettings.FileTemplate);
+		{			
+			var newTemplate = await editTemplate(TemplateEditor<Templates.FileTemplate>.CreateFilenameEditor(config.Books, settingsDisp.DownloadDecryptSettings.FileTemplate));
 			if (newTemplate is not null)
 				settingsDisp.DownloadDecryptSettings.FileTemplate = newTemplate;
 		}
 
 		public async void EditChapterFileTemplateButton_Click(object sender, Avalonia.Interactivity.RoutedEventArgs e)
 		{
-			var newTemplate = await editTemplate(Templates.ChapterFile, settingsDisp.DownloadDecryptSettings.ChapterFileTemplate);
+			
+			var newTemplate = await editTemplate(TemplateEditor<Templates.ChapterFileTemplate>.CreateFilenameEditor(config.Books, settingsDisp.DownloadDecryptSettings.ChapterFileTemplate));
 			if (newTemplate is not null)
 				settingsDisp.DownloadDecryptSettings.ChapterFileTemplate = newTemplate;
 		}
@@ -79,16 +80,16 @@ namespace LibationAvalonia.Dialogs
 
 		public async void EditChapterTitleTemplateButton_Click(object sender, Avalonia.Interactivity.RoutedEventArgs e)
 		{
-			var newTemplate = await editTemplate(Templates.ChapterTitle, settingsDisp.AudioSettings.ChapterTitleTemplate);
+			var newTemplate = await editTemplate(TemplateEditor<Templates.ChapterTitleTemplate>.CreateNameEditor(settingsDisp.AudioSettings.ChapterTitleTemplate));
 			if (newTemplate is not null)
 				settingsDisp.AudioSettings.ChapterTitleTemplate = newTemplate;
 		}
 
-		private async Task<string> editTemplate(Templates template, string existingTemplate)
+		private async Task<string> editTemplate(ITemplateEditor template)
 		{
-			var form = new EditTemplateDialog(template, existingTemplate);
+			var form = new EditTemplateDialog(template);
 			if (await form.ShowDialog<DialogResult>(this) == DialogResult.OK)
-				return form.TemplateText;
+				return template.EditingTemplate.TemplateText;
 			else return null;
 		}
 	}
@@ -266,28 +267,8 @@ namespace LibationAvalonia.Dialogs
 			UseCoverAsFolderIcon = config.UseCoverAsFolderIcon;
 		}
 
-		public async Task<bool> SaveSettingsAsync(Configuration config)
+		public Task<bool> SaveSettingsAsync(Configuration config)
 		{
-			static Task validationError(string text, string caption)
-				=> MessageBox.Show(text, caption, MessageBoxButtons.OK, MessageBoxIcon.Error);
-
-			// these 3 should do nothing. Configuration will only init these with a valid value. EditTemplateDialog ensures valid before returning
-			if (!Templates.Folder.IsValid(FolderTemplate))
-			{
-				await validationError($"Not saving change to folder naming template. Invalid format.", "Invalid folder template");
-				return false;
-			}
-			if (!Templates.File.IsValid(FileTemplate))
-			{
-				await validationError($"Not saving change to file naming template. Invalid format.", "Invalid file template");
-				return false;
-			}
-			if (!Templates.ChapterFile.IsValid(ChapterFileTemplate))
-			{
-				await validationError($"Not saving change to chapter file naming template. Invalid format.", "Invalid chapter file template");
-				return false;
-			}
-
 			config.BadBook
 				= BadBookAbort ? Configuration.BadBookAction.Abort
 				: BadBookRetry ? Configuration.BadBookAction.Retry
@@ -301,7 +282,7 @@ namespace LibationAvalonia.Dialogs
 
 			config.UseCoverAsFolderIcon = UseCoverAsFolderIcon;
 
-			return true;
+			return Task.FromResult(true);
 		}
 
 		public string UseCoverAsFolderIconText { get; } = Configuration.GetDescription(nameof(Configuration.UseCoverAsFolderIcon));

Source/LibationAvalonia/ViewModels/GridEntry.cs

@@ -130,8 +130,17 @@ namespace LibationAvalonia.ViewModels
 		}
 
 		private void PictureStorage_PictureCached(object sender, PictureCachedEventArgs e)
-		{
-			if (e.Definition.PictureId == Book.PictureId)
+        {
+            // state validation
+            if (e is null ||
+                e.Definition.PictureId is null ||
+                Book?.PictureId is null ||
+                e.Picture is null ||
+                e.Picture.Length == 0)
+                return;
+
+            // logic validation
+            if (e.Definition.PictureId == Book.PictureId)
 			{
 				using var ms = new System.IO.MemoryStream(e.Picture);
 				Cover = new Avalonia.Media.Imaging.Bitmap(ms);

Source/LibationAvalonia/Views/MainWindow.Export.cs

@@ -19,7 +19,7 @@ namespace LibationAvalonia.Views
 				var options = new FilePickerSaveOptions
 				{
 					Title = "Where to export Library",
-					SuggestedStartLocation = new Avalonia.Platform.Storage.FileIO.BclStorageFolder(Configuration.Instance.Books),
+					SuggestedStartLocation = new Avalonia.Platform.Storage.FileIO.BclStorageFolder(Configuration.Instance.Books.PathWithoutPrefix),
 					SuggestedFileName = $"Libation Library Export {DateTime.Now:yyyy-MM-dd}.xlsx",
 					DefaultExtension = "xlsx",
 					ShowOverwritePrompt = true,

Source/LibationAvalonia/Views/ProductsDisplay.axaml.cs

@@ -111,7 +111,7 @@ namespace LibationAvalonia.Views
 						{
 							Title = $"Locate the audio file for '{entry.Book.Title}'",
 							AllowMultiple = false,
-							SuggestedStartLocation = new Avalonia.Platform.Storage.FileIO.BclStorageFolder(Configuration.Instance.Books),
+							SuggestedStartLocation = new Avalonia.Platform.Storage.FileIO.BclStorageFolder(Configuration.Instance.Books.PathWithoutPrefix),
 							FileTypeFilter = new FilePickerFileType[]
 							{
 								new("All files (*.*)") { Patterns = new[] { "*" } },

Source/LibationFileManager/Configuration.PersistentSettings.cs

@@ -80,7 +80,7 @@ namespace LibationFileManager
 		public bool BetaOptIn { get => GetNonString(defaultValue: false); set => SetNonString(value); }
 
 		[Description("Location for book storage. Includes destination of newly liberated books")]
-		public string Books { get => GetString(); set => SetString(value); }
+		public LongPath Books { get => GetString(); set => SetString(value); }
 
 		// temp/working dir(s) should be outside of dropbox
 		[Description("Temporary location of files while they're in process of being downloaded and decrypted.\r\nWhen decryption is complete, the final file will be in Books location\r\nRecommend not using a folder which is backed up real time. Eg: Dropbox, iCloud, Google Drive")]
@@ -223,36 +223,41 @@ namespace LibationFileManager
 		[Description("How to format the folders in which files will be saved")]
 		public string FolderTemplate
 		{
-			get => Templates.Folder.GetValid(GetString(defaultValue: Templates.Folder.DefaultTemplate));
-			set => setTemplate(Templates.Folder, value);
+			get => getTemplate<Templates.FolderTemplate>();
+			set => setTemplate<Templates.FolderTemplate>(value);
 		}
 
 		[Description("How to format the saved pdf and audio files")]
 		public string FileTemplate
 		{
-			get => Templates.File.GetValid(GetString(defaultValue: Templates.File.DefaultTemplate));
-			set => setTemplate(Templates.File, value);
+			get => getTemplate<Templates.FileTemplate>();
+			set => setTemplate<Templates.FileTemplate>(value);
 		}
 
 		[Description("How to format the saved audio files when split by chapters")]
 		public string ChapterFileTemplate
 		{
-			get => Templates.ChapterFile.GetValid(GetString(defaultValue: Templates.ChapterFile.DefaultTemplate));
-			set => setTemplate(Templates.ChapterFile, value);
+			get => getTemplate<Templates.ChapterFileTemplate>();
+			set => setTemplate<Templates.ChapterFileTemplate>(value);
 		}
 
 		[Description("How to format the file's Tile stored in metadata")]
 		public string ChapterTitleTemplate
 		{
-			get => Templates.ChapterTitle.GetValid(GetString(defaultValue: Templates.ChapterTitle.DefaultTemplate));
-			set => setTemplate(Templates.ChapterTitle, value);
+			get => getTemplate<Templates.ChapterTitleTemplate>();
+			set => setTemplate<Templates.ChapterTitleTemplate>(value);
 		}
 
-		private void setTemplate(Templates templ, string newValue, [CallerMemberName] string propertyName = "")
+		private string getTemplate<T>([CallerMemberName] string propertyName = "")
+			where T : Templates, ITemplate, new()
 		{
-			var template = newValue?.Trim();
-			if (templ.IsValid(template))
-				SetString(template, propertyName);
+			return Templates.GetTemplate<T>(GetString(defaultValue: T.DefaultTemplate, propertyName)).TemplateText;
+		}
+
+		private void setTemplate<T>(string newValue, [CallerMemberName] string propertyName = "")
+			where T : Templates, ITemplate, new()
+		{
+			SetString(Templates.GetTemplate<T>(newValue).TemplateText, propertyName);
 		}
 		#endregion
 	}

Source/LibationFileManager/Configuration.PropertyChange.cs

@@ -2,7 +2,7 @@
 
 namespace LibationFileManager
 {
-	public partial class Configuration : PropertyChangeFilter
+	public partial class Configuration
 	{
 		/*
 		 * Use this type in the getter for any Dictionary<TKey, TValue> settings,

Source/LibationFileManager/Configuration.cs

@@ -7,7 +7,7 @@ using FileManager;
 
 namespace LibationFileManager
 {
-	public partial class Configuration
+	public partial class Configuration : PropertyChangeFilter
 	{
 		public bool LibationSettingsAreValid
 			=> File.Exists(APPSETTINGS_JSON)

Source/LibationFileManager/LibraryBookDto.cs

@@ -20,14 +20,16 @@ namespace LibationFileManager
         public string FirstNarrator => Narrators.FirstOrDefault();
 
         public string SeriesName { get; set; }
-        public string SeriesNumber { get; set; }
+        public int? SeriesNumber { get; set; }
+        public bool IsSeries => !string.IsNullOrEmpty(SeriesName);
+        public bool IsPodcast { get; set; }
 
         public int BitRate { get; set; }
         public int SampleRate { get; set; }
         public int Channels { get; set; }
 		public DateTime FileDate { get; set; } = DateTime.Now;
         public DateTime? DatePublished { get; set; }
-
+        public string Language { get; set; }
 	}
 
     public class LibraryBookDto : BookDto

Source/LibationFileManager/PropertyChangeFilter.cs

@@ -1,326 +0,0 @@
-using Dinah.Core;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Linq;
-using System.Reflection;
-
-namespace LibationFileManager
-{
-	#region Useage
-
-	/*
-	 * USEAGE
-	 
-		*************************
-		*						*
-		*   Event Filter Mode   *
-		*						*
-		*************************
-
-	 
-	 	propertyChangeFilter.PropertyChanged += MyPropertiesChanged;
-
-		[PropertyChangeFilter("MyProperty1")]
-		[PropertyChangeFilter("MyProperty2")]
-		void MyPropertiesChanged(object sender, PropertyChangedEventArgsEx e)
-		{
-			// Only properties whose names match either "MyProperty1"
-			// or "MyProperty2" will fire this event handler.
-		}
-
-	******
-	* OR *
-	******
-	
-		propertyChangeFilter.PropertyChanged +=
-			[PropertyChangeFilter("MyProperty1")]
-			[PropertyChangeFilter("MyProperty2")]
-			(_, _) => 
-			{
-				// Only properties whose names match either "MyProperty1"
-				// or "MyProperty2" will fire this event handler.
-			};
-
-
-		*************************
-		*						*
-		*    Observable Mode	*
-		*						*
-		*************************
-		
-		using var cancellation = propertyChangeFilter.ObservePropertyChanging<int>("MyProperty", MyPropertyChanging);
-		
-        void MyPropertyChanging(int oldValue, int newValue)
-        {
-			// Only the property whose name match
-			// "MyProperty" will fire this method.
-        }
-	
-		//The observer is delisted when cancellation is disposed
-
-	******
-	* OR *
-	******
-	
-		using var cancellation = propertyChangeFilter.ObservePropertyChanged<bool>("MyProperty", s =>
-			{
-				// Only the property whose name match
-				// "MyProperty" will fire this action.
-			});
-		
-		//The observer is delisted when cancellation is disposed
-
-	 */
-
-	#endregion
-
-	public abstract class PropertyChangeFilter
-	{
-		private readonly Dictionary<string, List<Delegate>> propertyChangedActions = new();
-		private readonly Dictionary<string, List<Delegate>> propertyChangingActions = new();
-
-		private readonly List<(PropertyChangedEventHandlerEx subscriber, PropertyChangedEventHandlerEx wrapper)> changedFilters = new();
-		private readonly List<(PropertyChangingEventHandlerEx subscriber, PropertyChangingEventHandlerEx wrapper)> changingFilters = new();
-
-		protected void OnPropertyChanged(string propertyName, object newValue)
-		{
-			if (propertyChangedActions.ContainsKey(propertyName))
-			{
-				//Invoke observables registered for propertyName 
-				foreach (var action in propertyChangedActions[propertyName])
-					action.DynamicInvoke(newValue);
-			}
-
-			_propertyChanged?.Invoke(this, new(propertyName, newValue));
-		}
-
-		protected void OnPropertyChanging(string propertyName, object oldValue, object newValue)
-		{
-			if (propertyChangingActions.ContainsKey(propertyName))
-			{
-				//Invoke observables registered for propertyName
-				foreach (var action in propertyChangingActions[propertyName])
-					action.DynamicInvoke(oldValue, newValue);
-			}
-
-			_propertyChanging?.Invoke(this, new(propertyName, oldValue, newValue));
-		}
-
-		#region Events
-
-		private PropertyChangedEventHandlerEx _propertyChanged;
-		private PropertyChangingEventHandlerEx _propertyChanging;
-
-		public event PropertyChangedEventHandlerEx PropertyChanged
-		{
-			add
-			{
-				var attributes = getAttributes<PropertyChangeFilterAttribute>(value.Method);
-
-				if (attributes.Any())
-				{
-					var matches = attributes.Select(a => a.PropertyName).ToArray();
-
-					void filterer(object s, PropertyChangedEventArgsEx e)
-					{
-						if (e.PropertyName.In(matches)) value(s, e);
-					}
-
-					changedFilters.Add((value, filterer));
-
-					_propertyChanged += filterer;
-				}
-				else
-					_propertyChanged += value;
-			}
-			remove
-			{
-				var del = changedFilters.LastOrDefault(d => d.subscriber == value);
-				if (del == default)
-					_propertyChanged -= value;
-				else
-				{
-					_propertyChanged -= del.wrapper;
-					changedFilters.Remove(del);
-				}
-			}
-		}
-
-		public event PropertyChangingEventHandlerEx PropertyChanging
-		{
-			add
-			{
-				var attributes = getAttributes<PropertyChangeFilterAttribute>(value.Method);
-
-				if (attributes.Any())
-				{
-					var matches = attributes.Select(a => a.PropertyName).ToArray();
-
-					void filterer(object s, PropertyChangingEventArgsEx e)
-					{
-						if (e.PropertyName.In(matches)) value(s, e);
-					}
-
-					changingFilters.Add((value, filterer));
-
-					_propertyChanging += filterer;
-
-				}
-				else
-					_propertyChanging += value;
-			}
-			remove
-			{
-				var del = changingFilters.LastOrDefault(d => d.subscriber == value);
-				if (del == default)
-					_propertyChanging -= value;
-				else
-				{
-					_propertyChanging -= del.wrapper;
-					changingFilters.Remove(del);
-				}
-			}
-		}
-
-		private static T[] getAttributes<T>(MethodInfo methodInfo) where T : Attribute
-			=> Attribute.GetCustomAttributes(methodInfo, typeof(T)) as T[];
-
-		#endregion
-
-		#region Observables
-
-		/// <summary>
-		/// Clear all subscriptions to Property<b>Changed</b> for <paramref name="propertyName"/>
-		/// </summary>
-		public void ClearChangedSubscriptions(string propertyName)
-		{
-			if (propertyChangedActions.ContainsKey(propertyName)
-				&& propertyChangedActions[propertyName] is not null)
-				propertyChangedActions[propertyName].Clear();
-		}
-
-		/// <summary>
-		/// Clear all subscriptions to Property<b>Changing</b> for <paramref name="propertyName"/>
-		/// </summary>
-		public void ClearChangingSubscriptions(string propertyName)
-		{
-			if (propertyChangingActions.ContainsKey(propertyName)
-				&& propertyChangingActions[propertyName] is not null)
-				propertyChangingActions[propertyName].Clear();
-		}
-
-		/// <summary>
-		/// Add an action to be executed when a property's value has changed
-		/// </summary>
-		/// <typeparam name="T">The <paramref name="propertyName"/>'s <see cref="Type"/></typeparam>
-		/// <param name="propertyName">Name of the property whose change triggers the <paramref name="action"/></param>
-		/// <param name="action">Action to be executed with the NewValue as a parameter</param>
-		/// <returns>A reference to an interface that allows observers to stop receiving notifications before the provider has finished sending them.</returns>
-		public IDisposable ObservePropertyChanged<T>(string propertyName, Action<T> action)
-		{
-			validateSubscriber<T>(propertyName, action);
-
-			if (!propertyChangedActions.ContainsKey(propertyName))
-				propertyChangedActions.Add(propertyName, new List<Delegate>());
-
-			var actionlist = propertyChangedActions[propertyName];
-
-			if (!actionlist.Contains(action))
-				actionlist.Add(action);
-
-			return new Unsubscriber(actionlist, action);
-		}
-
-		/// <summary>
-		/// Add an action to be executed when a property's value is changing
-		/// </summary>
-		/// <typeparam name="T">The <paramref name="propertyName"/>'s <see cref="Type"/></typeparam>
-		/// <param name="propertyName">Name of the property whose change triggers the <paramref name="action"/></param>
-		/// <param name="action">Action to be executed with OldValue and NewValue as parameters</param>
-		/// <returns>A reference to an interface that allows observers to stop receiving notifications before the provider has finished sending them.</returns>
-		public IDisposable ObservePropertyChanging<T>(string propertyName, Action<T, T> action)
-		{
-			validateSubscriber<T>(propertyName, action);
-
-			if (!propertyChangingActions.ContainsKey(propertyName))
-				propertyChangingActions.Add(propertyName, new List<Delegate>());
-
-			var actionlist = propertyChangingActions[propertyName];
-
-			if (!actionlist.Contains(action))
-				actionlist.Add(action);
-
-			return new Unsubscriber(actionlist, action);
-		}
-
-		private void validateSubscriber<T>(string propertyName, Delegate action)
-		{
-			ArgumentValidator.EnsureNotNullOrWhiteSpace(propertyName, nameof(propertyName));
-			ArgumentValidator.EnsureNotNull(action, nameof(action));
-
-			var propertyInfo = GetType().GetProperty(propertyName);
-
-			if (propertyInfo is null)
-				throw new MissingMemberException($"{nameof(Configuration)}.{propertyName} does not exist.");
-
-			if (propertyInfo.PropertyType != typeof(T))
-				throw new InvalidCastException($"{nameof(Configuration)}.{propertyName} is {propertyInfo.PropertyType}, but parameter is {typeof(T)}.");
-		}
-
-		private class Unsubscriber : IDisposable
-		{
-			private List<Delegate> _observers;
-			private Delegate _observer;
-
-			internal Unsubscriber(List<Delegate> observers, Delegate observer)
-			{
-				_observers = observers;
-				_observer = observer;
-			}
-
-			public void Dispose()
-			{
-				if (_observers.Contains(_observer))
-					_observers.Remove(_observer);
-			}
-		}
-
-		#endregion
-	}
-
-	public delegate void PropertyChangedEventHandlerEx(object sender, PropertyChangedEventArgsEx e);
-	public delegate void PropertyChangingEventHandlerEx(object sender, PropertyChangingEventArgsEx e);
-
-	public class PropertyChangedEventArgsEx : PropertyChangedEventArgs
-	{
-		public object NewValue { get; }
-
-		public PropertyChangedEventArgsEx(string propertyName, object newValue) : base(propertyName)
-		{
-			NewValue = newValue;
-		}
-	}
-
-	public class PropertyChangingEventArgsEx : PropertyChangingEventArgs
-	{
-		public object OldValue { get; }
-		public object NewValue { get; }
-
-		public PropertyChangingEventArgsEx(string propertyName, object oldValue, object newValue) : base(propertyName)
-		{
-			OldValue = oldValue;
-			NewValue = newValue;
-		}
-	}
-
-	[AttributeUsage(AttributeTargets.Method, AllowMultiple = true)]
-	public class PropertyChangeFilterAttribute : Attribute
-	{
-		public string PropertyName { get; }
-		public PropertyChangeFilterAttribute(string propertyName)
-		{
-			PropertyName = propertyName;
-		}
-	}
-}

Source/LibationFileManager/TemplateEditor[T].cs

@@ -0,0 +1,130 @@
+using AaxDecrypter;
+using FileManager;
+using System.Collections.Generic;
+using System;
+using System.IO;
+
+namespace LibationFileManager
+{
+	public interface ITemplateEditor
+	{
+		bool IsFolder { get; }
+		bool IsFilePath { get; }
+		LongPath BaseDirectory { get; }
+		string DefaultTemplate { get; }
+		Templates Folder { get; }
+		Templates File { get; }
+		Templates Name { get; }
+		Templates EditingTemplate { get; }
+		void SetTemplateText(string templateText);
+		string GetFolderName();
+		string GetFileName();
+		string GetName();
+	}
+
+	public class TemplateEditor<T> : ITemplateEditor where T : Templates, ITemplate, new()
+	{
+		public bool IsFolder => EditingTemplate is Templates.FolderTemplate;
+		public bool IsFilePath => EditingTemplate is not Templates.ChapterTitleTemplate;
+		public LongPath BaseDirectory { get; private init; }
+		public string DefaultTemplate { get; private init; }
+		public Templates Folder { get; private set; }
+		public Templates File { get; private set; }
+		public Templates Name { get; private set; }
+		public Templates EditingTemplate
+		{
+			get => _editingTemplate;
+			private set => _editingTemplate = !IsFilePath ? Name = value : IsFolder ? Folder = value : File = value;
+		}
+
+		private Templates _editingTemplate;
+
+		public void SetTemplateText(string templateText)
+		{
+			Templates.TryGetTemplate<T>(templateText, out var template);
+			EditingTemplate = template;
+		}
+
+		private static readonly LibraryBookDto libraryBookDto
+			= new()
+			{
+				Account = "my account",
+				DateAdded = new DateTime(2022, 6, 9, 0, 0, 0),
+				DatePublished = new DateTime(2017, 2, 27, 0, 0, 0),
+				AudibleProductId = "123456789",
+				Title = "A Study in Scarlet: A Sherlock Holmes Novel",
+				Locale = "us",
+				YearPublished = 2017,
+				Authors = new List<string> { "Arthur Conan Doyle", "Stephen Fry - introductions" },
+				Narrators = new List<string> { "Stephen Fry" },
+				SeriesName = "Sherlock Holmes",
+				SeriesNumber = 1,
+				BitRate = 128,
+				SampleRate = 44100,
+				Channels = 2,
+				Language = "English"
+			};
+
+		private static readonly MultiConvertFileProperties partFileProperties
+			= new()
+			{
+				OutputFileName = "",
+				PartsPosition = 4,
+				PartsTotal = 10,
+				Title = "A Flight for Life"
+			};
+
+		public string GetFolderName()
+		{
+			/*
+			* Path must be rooted for windows to allow long file paths. This is
+			* only necessary for folder templates because they may contain several
+			* subdirectories. Without rooting, we won't be allowed to create a
+			* relative path longer than MAX_PATH.
+			*/
+			var dir = Folder.GetFilename(libraryBookDto, BaseDirectory, "");
+			return Path.GetRelativePath(BaseDirectory, dir);
+		}
+
+		public string GetFileName()
+			=> File.GetFilename(libraryBookDto, partFileProperties, "", "");
+		public string GetName()
+			=> Name.GetName(libraryBookDto, partFileProperties);
+
+		public static ITemplateEditor CreateFilenameEditor(LongPath baseDir, string templateText)
+		{
+			Templates.TryGetTemplate<T>(templateText, out var template);
+
+			var templateEditor = new TemplateEditor<T>
+			{
+				_editingTemplate = template,
+				BaseDirectory = baseDir,
+				DefaultTemplate = T.DefaultTemplate
+			};
+
+			if (!templateEditor.IsFolder && !templateEditor.IsFilePath)
+				throw new InvalidOperationException($"This method is only for File and Folder templates. Use {nameof(CreateNameEditor)} for name templates");
+
+			templateEditor.Folder = templateEditor.IsFolder ? template : Templates.Folder;
+			templateEditor.File = templateEditor.IsFolder ? Templates.File : template;
+
+			return templateEditor;
+		}
+
+		public static ITemplateEditor CreateNameEditor(string templateText)
+		{
+			Templates.TryGetTemplate<T>(templateText, out var nameTemplate);
+
+			var templateEditor = new TemplateEditor<T>
+			{
+				_editingTemplate = nameTemplate,
+				DefaultTemplate = T.DefaultTemplate
+			};
+
+			if (templateEditor.IsFolder || templateEditor.IsFilePath)
+				throw new InvalidOperationException($"This method is only for name templates. Use {nameof(CreateFilenameEditor)} for file templates");
+
+			return templateEditor;
+		}
+	}
+}

Source/LibationFileManager/TemplateTags.cs

@@ -1,31 +1,27 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using Dinah.Core;
+using FileManager.NamingTemplate;
 
 namespace LibationFileManager
 {
-    public sealed class TemplateTags : Enumeration<TemplateTags>
-    {
-		public string TagName => DisplayName;
-        public string DefaultValue { get; }
+    public sealed class TemplateTags : ITemplateTag
+	{
+		public const string DEFAULT_DATE_FORMAT = "yyyy-MM-dd";
+		public string TagName { get; }
+		public string DefaultValue { get; }
         public string Description { get; }
-        public bool IsChapterOnly { get; }
-
-        private static int value = 0;
-        private TemplateTags(string tagName, string description, bool isChapterOnly = false, string defaultValue = null) : base(value++, tagName)
-        {
-            Description = description;
-            IsChapterOnly = isChapterOnly;
-            DefaultValue = defaultValue ?? $"<{tagName}>";
+        public string Display { get; }
 
+		private TemplateTags(string tagName, string description, string defaultValue = null, string display = null)
+		{
+			TagName = tagName;
+			Description = description;
+			DefaultValue = defaultValue ?? $"<{tagName}>";
+			Display = display ?? $"<{tagName}>";
 		}
 
-        // putting these first is the incredibly lazy way to make them show up first in the EditTemplateDialog
-        public static TemplateTags ChCount { get; } = new TemplateTags("ch count", "Number of chapters", true);
-        public static TemplateTags ChTitle { get; } = new TemplateTags("ch title", "Chapter title", true);
-        public static TemplateTags ChNumber { get; } = new TemplateTags("ch#", "Chapter #", true);
-        public static TemplateTags ChNumber0 { get; } = new TemplateTags("ch# 0", "Chapter # with leading zeros", true);
+		public static TemplateTags ChCount { get; } = new TemplateTags("ch count", "Number of chapters");
+        public static TemplateTags ChTitle { get; } = new TemplateTags("ch title", "Chapter title");
+        public static TemplateTags ChNumber { get; } = new TemplateTags("ch#", "Chapter #");
+        public static TemplateTags ChNumber0 { get; } = new TemplateTags("ch# 0", "Chapter # with leading zeros");
 
         public static TemplateTags Id { get; } = new TemplateTags("id", "Audible ID");
         public static TemplateTags Title { get; } = new TemplateTags("title", "Full title");
@@ -41,14 +37,16 @@ namespace LibationFileManager
         public static TemplateTags SampleRate { get; } = new TemplateTags("samplerate", "File's orig. sample rate");
         public static TemplateTags Channels { get; } = new TemplateTags("channels", "Number of audio channels");
         public static TemplateTags Account { get; } = new TemplateTags("account", "Audible account of this book");
-        public static TemplateTags Locale { get; } = new TemplateTags("locale", "Region/country");
-        public static TemplateTags YearPublished { get; } = new TemplateTags("year", "Year published");
+        public static TemplateTags Locale { get; } = new ("locale", "Region/country");
+        public static TemplateTags YearPublished { get; } = new("year", "Year published");
+		public static TemplateTags Language { get; } = new("language", "Book's language");
+		public static TemplateTags LanguageShort { get; } = new("language short", "Book's language abbreviated. Eg: ENG");
 
-        // Special cases. Aren't mapped to replacements in Templates.cs
-        // Included here for display by EditTemplateDialog
-        public static TemplateTags FileDate { get; } = new TemplateTags("file date [...]", "File date/time. e.g. yyyy-MM-dd HH-mm", false, $"<file date [{Templates.DEFAULT_DATE_FORMAT}]>");
-        public static TemplateTags DatePublished { get; } = new TemplateTags("pub date [...]", "Publication date. e.g. yyyy-MM-dd", false, $"<pub date [{Templates.DEFAULT_DATE_FORMAT}]>");
-        public static TemplateTags DateAdded { get; } = new TemplateTags("date added [...]", "Date added to your Audible account. e.g. yyyy-MM-dd", false, $"<date added [{Templates.DEFAULT_DATE_FORMAT}]>");
-        public static TemplateTags IfSeries { get; } = new TemplateTags("if series->...<-if series", "Only include if part of a series", false, "<if series-><-if series>");
+		public static TemplateTags FileDate { get; } = new TemplateTags("file date", "File date/time. e.g. yyyy-MM-dd HH-mm", $"<file date [{DEFAULT_DATE_FORMAT}]>", "<file date [...]>");
+        public static TemplateTags DatePublished { get; } = new TemplateTags("pub date", "Publication date. e.g. yyyy-MM-dd", $"<pub date [{DEFAULT_DATE_FORMAT}]>", "<pub date [...]>");
+        public static TemplateTags DateAdded { get; } = new TemplateTags("date added", "Date added to your Audible account. e.g. yyyy-MM-dd", $"<date added [{DEFAULT_DATE_FORMAT}]>", "<date added [...]>");
+        public static TemplateTags IfSeries { get; } = new TemplateTags("if series", "Only include if part of a book series or podcast", "<if series-><-if series>", "<if series->...<-if series>");
+        public static TemplateTags IfPodcast { get; } = new TemplateTags("if podcast", "Only include if part of a podcast", "<if podcast-><-if podcast>", "<if podcast->...<-if podcast>");
+        public static TemplateTags IfBookseries { get; } = new TemplateTags("if bookseries", "Only include if part of a book series", "<if bookseries-><-if bookseries>", "<if bookseries->...<-if bookseries>");
     }
 }

Source/LibationFileManager/Templates.cs

@@ -2,438 +2,337 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using System.Text.RegularExpressions;
+using AaxDecrypter;
 using Dinah.Core;
-using Dinah.Core.Collections.Generic;
 using FileManager;
+using FileManager.NamingTemplate;
 
 namespace LibationFileManager
 {
+	public interface ITemplate
+	{
+		static abstract string DefaultTemplate { get; }
+		static abstract IEnumerable<TagCollection> TagCollections { get; }
+	}
+
 	public abstract class Templates
 	{
-		protected static string[] Valid => Array.Empty<string>();
-		public const string ERROR_NULL_IS_INVALID = "Null template is invalid.";
 		public const string ERROR_FULL_PATH_IS_INVALID = @"No colons or full paths allowed. Eg: should not start with C:\";
-		public const string ERROR_INVALID_FILE_NAME_CHAR = @"Only file name friendly characters allowed. Eg: no colons or slashes";
-
-		public const string WARNING_EMPTY = "Template is empty.";
-		public const string WARNING_WHITE_SPACE = "Template is white space.";
-		public const string WARNING_NO_TAGS = "Should use tags. Eg: <title>";
-		public const string WARNING_HAS_CHAPTER_TAGS = "Chapter tags should only be used in the template used for naming files which are split by chapter. Eg: <ch title>";
 		public const string WARNING_NO_CHAPTER_NUMBER_TAG = "Should include chapter number tag in template used for naming files which are split by chapter. Ie: <ch#> or <ch# 0>";
 
-		public static FolderTemplate Folder { get; } = new FolderTemplate();
-		public static FileTemplate File { get; } = new FileTemplate();
-		public static ChapterFileTemplate ChapterFile { get; } = new ChapterFileTemplate();
-		public static ChapterTitleTemplate ChapterTitle { get; } = new ChapterTitleTemplate();
+		//Assigning the properties in the static constructor will require all
+		//Templates users to have a valid configuration file. To allow tests
+		//to work without access to Configuration, only load templates on demand.
+		private static FolderTemplate _folder;
+		private static FileTemplate _file;
+		private static ChapterFileTemplate _chapterFile;
+		private static ChapterTitleTemplate _chapterTitle;
 
+		public static FolderTemplate Folder => _folder ??= GetTemplate<FolderTemplate>(Configuration.Instance.FolderTemplate);
+		public static FileTemplate File => _file ??= GetTemplate<FileTemplate>(Configuration.Instance.FileTemplate);
+		public static ChapterFileTemplate ChapterFile => _chapterFile ??= GetTemplate<ChapterFileTemplate>(Configuration.Instance.ChapterFileTemplate);
+		public static ChapterTitleTemplate ChapterTitle => _chapterTitle ??= GetTemplate<ChapterTitleTemplate>(Configuration.Instance.ChapterTitleTemplate);
+
+		#region Template Parsing
+
+		public static T GetTemplate<T>(string templateText) where T : Templates, ITemplate, new()
+			=> TryGetTemplate<T>(templateText, out var template) ? template : GetDefaultTemplate<T>();
+
+		public static bool TryGetTemplate<T>(string templateText, out T template) where T : Templates, ITemplate, new()
+		{
+			var namingTemplate = NamingTemplate.Parse(templateText, T.TagCollections);
+
+			template = new() { Template = namingTemplate };
+			return !namingTemplate.Errors.Any();
+		}
+
+		private static T GetDefaultTemplate<T>() where T : Templates, ITemplate, new()
+			=> new() { Template = NamingTemplate.Parse(T.DefaultTemplate, T.TagCollections) };
+
+		static Templates()
+		{
+			Configuration.Instance.PropertyChanged +=
+				[PropertyChangeFilter(nameof(Configuration.FolderTemplate))]
+				(_,e) => _folder = GetTemplate<FolderTemplate>((string)e.NewValue);
+
+			Configuration.Instance.PropertyChanged +=
+				[PropertyChangeFilter(nameof(Configuration.FileTemplate))]
+				(_, e) => _file = GetTemplate<FileTemplate>((string)e.NewValue);
+
+			Configuration.Instance.PropertyChanged +=
+				[PropertyChangeFilter(nameof(Configuration.ChapterFileTemplate))]
+				(_, e) => _chapterFile = GetTemplate<ChapterFileTemplate>((string)e.NewValue);
+
+			Configuration.Instance.PropertyChanged +=
+				[PropertyChangeFilter(nameof(Configuration.ChapterTitleTemplate))]
+				(_, e) => _chapterTitle = GetTemplate<ChapterTitleTemplate>((string)e.NewValue);
+		}
+
+		#endregion
+
+		#region Template Properties
+
+		public IEnumerable<TemplateTags> TagsRegistered => Template.TagsRegistered.Cast<TemplateTags>();
+		public IEnumerable<TemplateTags> TagsInUse => Template.TagsInUse.Cast<TemplateTags>();
 		public abstract string Name { get; }
 		public abstract string Description { get; }
-		public abstract string DefaultTemplate { get; }
-		protected abstract bool IsChapterized { get; }
+		public string TemplateText => Template.TemplateText;
+		protected NamingTemplate Template { get; private set; }
 
-		protected Templates() { }
+		#endregion
 
 		#region validation
-		internal string GetValid(string configValue)
-		{
-			var value = configValue?.Trim();
-			return IsValid(value) ? value : DefaultTemplate;
-		}
 
-		public abstract IEnumerable<string> GetErrors(string template);
-		public bool IsValid(string template) => !GetErrors(template).Any();
+		public virtual IEnumerable<string> Errors => Template.Errors;
+		public bool IsValid => !Errors.Any();
 
-		public abstract IEnumerable<string> GetWarnings(string template);
-		public bool HasWarnings(string template) => GetWarnings(template).Any();
+		public virtual IEnumerable<string> Warnings => Template.Warnings;
+		public bool HasWarnings => Warnings.Any();
 
-		protected static string[] GetFileErrors(string template)
-		{
-			// File name only; not path. all other path chars are valid enough to pass this check and will be handled on final save.
-
-			// null is invalid. whitespace is valid but not recommended
-			if (template is null)
-				return new[] { ERROR_NULL_IS_INVALID };
-
-			if (ReplacementCharacters.ContainsInvalidFilenameChar(template.Replace("<","").Replace(">","")))
-				return new[] { ERROR_INVALID_FILE_NAME_CHAR };
-
-			return Valid;
-		}
-
-		protected IEnumerable<string> GetStandardWarnings(string template)
-		{
-			var warnings = GetErrors(template).ToList();
-			if (template is null)
-				return warnings;
-
-			if (string.IsNullOrEmpty(template))
-				warnings.Add(WARNING_EMPTY);
-			else if (string.IsNullOrWhiteSpace(template))
-				warnings.Add(WARNING_WHITE_SPACE);
-
-			if (TagCount(template) == 0)
-				warnings.Add(WARNING_NO_TAGS);
-
-			if (!IsChapterized && ContainsChapterOnlyTags(template))
-				warnings.Add(WARNING_HAS_CHAPTER_TAGS);
-
-			return warnings;
-		}
-
-		internal int TagCount(string template)
-			=> GetTemplateTags()
-			// for <id><id> == 1, use:
-			//   .Count(t => template.Contains($"<{t.TagName}>"))
-			// .Sum() impl: <id><id> == 2
-			.Sum(t => template.Split($"<{t.TagName}>").Length - 1);
-
-		internal static bool ContainsChapterOnlyTags(string template)
-			=> TemplateTags.GetAll()
-			.Where(t => t.IsChapterOnly)
-			.Any(t => ContainsTag(template, t.TagName));
-
-		internal static bool ContainsTag(string template, string tag) => template.Contains($"<{tag}>");
 		#endregion
 
 		#region to file name
-		/// <summary>
-		/// EditTemplateDialog: Get template generated filename for portion of path
-		/// </summary>
-		public string GetPortionFilename(LibraryBookDto libraryBookDto, string template, string fileExtension)
-			=> string.IsNullOrWhiteSpace(template)
-			? ""
-			: getFileNamingTemplate(libraryBookDto, template, null, fileExtension, Configuration.Instance.ReplacementCharacters)
-			.GetFilePath(fileExtension).PathWithoutPrefix;
 
-		public const string DEFAULT_DATE_FORMAT = "yyyy-MM-dd";
-		private static Regex fileDateTagRegex { get; } = new Regex(@"<file\s*?date\s*?(?:\[([^\[\]]*?)\]\s*?)?>", RegexOptions.Compiled | RegexOptions.IgnoreCase);
-		private static Regex dateAddedTagRegex { get; } = new Regex(@"<date\s*?added\s*?(?:\[([^\[\]]*?)\]\s*?)?>", RegexOptions.Compiled | RegexOptions.IgnoreCase);
-		private static Regex datePublishedTagRegex { get; } = new Regex(@"<pub\s*?date\s*?(?:\[([^\[\]]*?)\]\s*?)?>", RegexOptions.Compiled | RegexOptions.IgnoreCase);
-		private static Regex ifSeriesRegex { get; } = new Regex("<if series->(.*?)<-if series>", RegexOptions.Compiled | RegexOptions.IgnoreCase);
-
-		internal static FileNamingTemplate getFileNamingTemplate(LibraryBookDto libraryBookDto, string template, string dirFullPath, string extension, ReplacementCharacters replacements)
+		public string GetName(LibraryBookDto libraryBookDto, MultiConvertFileProperties multiChapProps)
 		{
-			ArgumentValidator.EnsureNotNullOrWhiteSpace(template, nameof(template));
 			ArgumentValidator.EnsureNotNull(libraryBookDto, nameof(libraryBookDto));
+			ArgumentValidator.EnsureNotNull(multiChapProps, nameof(multiChapProps));
+			return string.Join("", Template.Evaluate(libraryBookDto, multiChapProps).Select(p => p.Value));
+		}
+
+		public LongPath GetFilename(LibraryBookDto libraryBookDto, string baseDir, string fileExtension, ReplacementCharacters replacements = null, bool returnFirstExisting = false)
+		{
+			ArgumentValidator.EnsureNotNull(libraryBookDto, nameof(libraryBookDto));
+			ArgumentValidator.EnsureNotNull(baseDir, nameof(baseDir));
+			ArgumentValidator.EnsureNotNull(fileExtension, nameof(fileExtension));
 
 			replacements ??= Configuration.Instance.ReplacementCharacters;
-			dirFullPath = dirFullPath?.Trim() ?? "";
-
-			// for non-series, remove <if series-> and <-if series> tags and everything in between
-			// for series, remove <if series-> and <-if series> tags, what's in between will remain
-			template = ifSeriesRegex.Replace(
-				template,
-				string.IsNullOrWhiteSpace(libraryBookDto.SeriesName) ? "" : "$1");
-
-			//Get date replacement parameters. Sanitizes the format text and replaces
-			//the template with the sanitized text before creating FileNamingTemplate
-			var fileDateParams = getSanitizeDateReplacementParameters(fileDateTagRegex, ref template, replacements, libraryBookDto.FileDate);
-			var dateAddedParams = getSanitizeDateReplacementParameters(dateAddedTagRegex, ref template, replacements, libraryBookDto.DateAdded);
-			var pubDateParams = getSanitizeDateReplacementParameters(datePublishedTagRegex, ref template, replacements, libraryBookDto.DatePublished);
-
-			var t = template + FileUtility.GetStandardizedExtension(extension);
-			var fullfilename = dirFullPath == "" ? t : Path.Combine(dirFullPath, t);
-
-			var fileNamingTemplate = new FileNamingTemplate(fullfilename, replacements);
-
-			var title = libraryBookDto.Title ?? "";
-			var titleShort = title.IndexOf(':') < 1 ? title : title.Substring(0, title.IndexOf(':'));
-
-			fileNamingTemplate.AddParameterReplacement(TemplateTags.Id, libraryBookDto.AudibleProductId);
-			fileNamingTemplate.AddParameterReplacement(TemplateTags.Title, title);
-			fileNamingTemplate.AddParameterReplacement(TemplateTags.TitleShort, titleShort);
-			fileNamingTemplate.AddParameterReplacement(TemplateTags.Author, libraryBookDto.AuthorNames);
-			fileNamingTemplate.AddParameterReplacement(TemplateTags.FirstAuthor, libraryBookDto.FirstAuthor);
-			fileNamingTemplate.AddParameterReplacement(TemplateTags.Narrator, libraryBookDto.NarratorNames);
-			fileNamingTemplate.AddParameterReplacement(TemplateTags.FirstNarrator, libraryBookDto.FirstNarrator);
-			fileNamingTemplate.AddParameterReplacement(TemplateTags.Series, libraryBookDto.SeriesName);
-			fileNamingTemplate.AddParameterReplacement(TemplateTags.SeriesNumber, libraryBookDto.SeriesNumber);
-			fileNamingTemplate.AddParameterReplacement(TemplateTags.Bitrate, libraryBookDto.BitRate);
-			fileNamingTemplate.AddParameterReplacement(TemplateTags.SampleRate, libraryBookDto.SampleRate);
-			fileNamingTemplate.AddParameterReplacement(TemplateTags.Channels, libraryBookDto.Channels);
-			fileNamingTemplate.AddParameterReplacement(TemplateTags.Account, libraryBookDto.Account);
-			fileNamingTemplate.AddParameterReplacement(TemplateTags.Locale, libraryBookDto.Locale);
-            fileNamingTemplate.AddParameterReplacement(TemplateTags.YearPublished, libraryBookDto.YearPublished?.ToString() ?? "1900");
-
-			//Add the sanitized replacement parameters
-			foreach (var param in fileDateParams)
-				fileNamingTemplate.ParameterReplacements.AddIfNotContains(param);
-			foreach (var param in dateAddedParams)
-				fileNamingTemplate.ParameterReplacements.AddIfNotContains(param);
-			foreach (var param in pubDateParams)
-				fileNamingTemplate.ParameterReplacements.AddIfNotContains(param);
-
-			return fileNamingTemplate;
+			return GetFilename(baseDir, fileExtension,replacements, returnFirstExisting, libraryBookDto);
 		}
-		#endregion
 
-		#region DateTime Tags
-
-		/// <param name="template">the file naming template. Any found date tags will be sanitized,
-		/// and the template's original date tag will be replaced with the sanitized tag.</param>
-		/// <returns>A list of parameter replacement key-value pairs</returns>
-		private static List<KeyValuePair<string, object>> getSanitizeDateReplacementParameters(Regex datePattern, ref string template, ReplacementCharacters replacements, DateTime? dateTime)
+		public LongPath GetFilename(LibraryBookDto libraryBookDto, MultiConvertFileProperties multiChapProps, string baseDir, string fileExtension, ReplacementCharacters replacements = null, bool returnFirstExisting = false)
 		{
-			List<KeyValuePair<string, object>> dateParams = new();
+			ArgumentValidator.EnsureNotNull(libraryBookDto, nameof(libraryBookDto));
+			ArgumentValidator.EnsureNotNull(multiChapProps, nameof(multiChapProps));
+			ArgumentValidator.EnsureNotNull(baseDir, nameof(baseDir));
+			ArgumentValidator.EnsureNotNull(fileExtension, nameof(fileExtension));
 
-			foreach (Match dateTag in datePattern.Matches(template))
+			replacements ??= Configuration.Instance.ReplacementCharacters;
+			return GetFilename(baseDir, fileExtension, replacements, returnFirstExisting, libraryBookDto, multiChapProps);
+		}
+
+		protected virtual IEnumerable<string> GetTemplatePartsStrings(List<TemplatePart> parts, ReplacementCharacters replacements)
+			=> parts.Select(p => replacements.ReplaceFilenameChars(p.Value));
+
+		private LongPath GetFilename(string baseDir, string fileExtension, ReplacementCharacters replacements, bool returnFirstExisting, params object[] dtos)
+		{
+			fileExtension = FileUtility.GetStandardizedExtension(fileExtension);
+
+			var parts = Template.Evaluate(dtos).ToList();
+			var pathParts = GetPathParts(GetTemplatePartsStrings(parts, replacements));
+
+			//Remove 1 character from the end of the longest filename part until
+			//the total filename is less than max filename length
+			for (int i = 0; i < pathParts.Count; i++)
 			{
-				var sanitizedTag = sanitizeDateParameterTag(dateTag, replacements, out var sanitizedFormatter);
-				if (tryFormatDateTime(dateTime, sanitizedFormatter, replacements, out var formattedDateString))
+				var part = pathParts[i];
+
+				//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.
+				var maxFilenameLength = LongPath.MaxFilenameLength - 
+					(i < pathParts.Count - 1 || string.IsNullOrEmpty(fileExtension) ? 0 : fileExtension.Length + 5);
+
+				while (part.Sum(LongPath.GetFilesystemStringLength) > maxFilenameLength)
 				{
-					dateParams.Add(new(sanitizedTag, formattedDateString));
-					template = template.Replace(dateTag.Value, sanitizedTag);
+					int maxLength = part.Max(p => p.Length);
+					var maxEntry = part.First(p => p.Length == maxLength);
+
+					var maxIndex = part.IndexOf(maxEntry);
+					part.RemoveAt(maxIndex);
+					part.Insert(maxIndex, maxEntry.Remove(maxLength - 1, 1));
 				}
 			}
-			return dateParams;
+
+			var fullPath = Path.Combine(pathParts.Select(fileParts => string.Join("", fileParts)).Prepend(baseDir).ToArray());
+
+			return  FileUtility.GetValidFilename(fullPath, replacements, fileExtension, returnFirstExisting);
 		}
 
-		/// <returns>a date parameter replacement tag with the format string sanitized</returns>
-		private static string sanitizeDateParameterTag(Match dateTag, ReplacementCharacters replacements, out string sanitizedFormatter)
+		/// <summary>
+		/// Organize template parts into directories. Any Extra slashes will be
+		/// returned as empty directories and are taken care of by Path.Combine()
+		/// </summary>
+		/// <returns>A List of template directories. Each directory is a list of template part strings</returns>
+		private static List<List<string>> GetPathParts(IEnumerable<string> templateParts)
 		{
-			if (dateTag.Groups.Count != 2 || string.IsNullOrWhiteSpace(dateTag.Groups[1].Value))
+			List<List<string>> directories = new();
+			List<string> dir = new();
+
+			foreach (var part in templateParts)
 			{
-				sanitizedFormatter = DEFAULT_DATE_FORMAT;
-				return dateTag.Value;
+				int slashIndex, lastIndex = 0;
+				while((slashIndex = part.IndexOf(Path.DirectorySeparatorChar, lastIndex)) > -1)
+				{
+					dir.Add(part[lastIndex..slashIndex]);
+					directories.Add(dir);
+					dir = new();
+
+					lastIndex = slashIndex + 1;
+				}
+				dir.Add(part[lastIndex..]);
 			}
+			directories.Add(dir);
 
-			var formatter = dateTag.Groups[1].Value;
-
-			sanitizedFormatter = replacements.ReplaceFilenameChars(formatter).Trim();
-
-			return dateTag.Value.Replace(formatter, sanitizedFormatter);
+			return directories;
 		}
 
-		private static bool tryFormatDateTime(DateTime? dateTime, string sanitizedFormatter, ReplacementCharacters replacements, out string formattedDateString)
-		{
-			if (!dateTime.HasValue)
-			{
-				formattedDateString = string.Empty;
-				return true;
-			}
-
-			try
-			{
-				formattedDateString = replacements.ReplaceFilenameChars(dateTime.Value.ToString(sanitizedFormatter)).Trim();
-				return true;
-			}
-			catch
-			{
-				formattedDateString = null;
-				return false;
-			}
-		}
 		#endregion
 
-		public virtual IEnumerable<TemplateTags> GetTemplateTags()
-			=> TemplateTags.GetAll()
-			// yeah, this line is a little funky but it works when you think through it. also: trust the unit tests
-			.Where(t => IsChapterized || !t.IsChapterOnly);
+		#region Registered Template Properties
 
-		public string Sanitize(string template, ReplacementCharacters replacements)
+		private static readonly PropertyTagCollection<LibraryBookDto> filePropertyTags =
+			new(caseSensative: true, StringFormatter, DateTimeFormatter, IntegerFormatter)
 		{
-			var value = template ?? "";
+			//Don't allow formatting of Id
+			{ TemplateTags.Id, lb => lb.AudibleProductId, v => v },
+			{ TemplateTags.Title, lb => lb.Title },
+			{ TemplateTags.TitleShort, lb => getTitleShort(lb.Title) },
+			{ TemplateTags.Author, lb => lb.AuthorNames },
+			{ TemplateTags.FirstAuthor, lb => lb.FirstAuthor },
+			{ TemplateTags.Narrator, lb => lb.NarratorNames },
+			{ TemplateTags.FirstNarrator, lb => lb.FirstNarrator },
+			{ TemplateTags.Series, lb => lb.SeriesName },
+			{ TemplateTags.SeriesNumber, lb => lb.SeriesNumber },
+			{ TemplateTags.Language, lb => lb.Language },
+			//Don't allow formatting of LanguageShort
+			{ TemplateTags.LanguageShort, lb =>lb.Language, getLanguageShort },
+			{ TemplateTags.Bitrate, lb => lb.BitRate },
+			{ TemplateTags.SampleRate, lb => lb.SampleRate },
+			{ TemplateTags.Channels, lb => lb.Channels },
+			{ TemplateTags.Account, lb => lb.Account },
+			{ TemplateTags.Locale, lb => lb.Locale },
+			{ TemplateTags.YearPublished, lb => lb.YearPublished },
+			{ TemplateTags.DatePublished, lb => lb.DatePublished },
+			{ TemplateTags.DateAdded, lb => lb.DateAdded },
+			{ TemplateTags.FileDate, lb => lb.FileDate },
+		};
 
-			// Replace invalid filename characters in the DateTime format provider so we don't trip any alarms.
-			// Illegal filename characters in the formatter are allowed because they will be replaced by
-			// getFileNamingTemplate()
-			value = fileDateTagRegex.Replace(value, m => sanitizeDateParameterTag(m, replacements, out _));
-			value = dateAddedTagRegex.Replace(value, m => sanitizeDateParameterTag(m, replacements, out _));
-			value = datePublishedTagRegex.Replace(value, m => sanitizeDateParameterTag(m, replacements, out _));
-
-			// don't use alt slash
-			value = value.Replace(Path.AltDirectorySeparatorChar, Path.DirectorySeparatorChar);
-
-			// don't allow double slashes
-			var sing = $"{Path.DirectorySeparatorChar}";
-			var dbl = $"{Path.DirectorySeparatorChar}{Path.DirectorySeparatorChar}";
-			while (value.Contains(dbl))
-				value = value.Replace(dbl, sing);
-
-			// trim. don't start or end with slash
-			while (true)
+		private static readonly List<TagCollection> chapterPropertyTags = new()
+		{
+			new PropertyTagCollection<LibraryBookDto>(caseSensative: true, StringFormatter)
 			{
-				var start = value.Length;
-				value = value
-					.Trim()
-					.Trim(Path.DirectorySeparatorChar);
-				var end = value.Length;
-				if (start == end)
-					break;
+				{ TemplateTags.Title, lb => lb.Title },
+				{ TemplateTags.TitleShort, lb => getTitleShort(lb.Title) },
+				{ TemplateTags.Series, lb => lb.SeriesName },
+			},
+			new PropertyTagCollection<MultiConvertFileProperties>(caseSensative: true, StringFormatter, IntegerFormatter, DateTimeFormatter)
+			{
+				{ TemplateTags.ChCount, m => m.PartsTotal },
+				{ TemplateTags.ChNumber, m => m.PartsPosition },
+				{ TemplateTags.ChNumber0, m => m.PartsPosition.ToString("D" + ((int)Math.Log10(m.PartsTotal) + 1)) },
+				{ TemplateTags.ChTitle, m => m.Title },
+				{ TemplateTags.FileDate, m => m.FileDate }
 			}
+		};
 
-			return value;
+		private static readonly ConditionalTagCollection<LibraryBookDto> conditionalTags = new()
+		{
+			{ TemplateTags.IfSeries, lb => lb.IsSeries },
+			{ TemplateTags.IfPodcast, lb => lb.IsPodcast },
+			{ TemplateTags.IfBookseries, lb => lb.IsSeries && !lb.IsPodcast },
+		};
+
+		#endregion
+
+		#region Tag Formatters
+
+		private static string getTitleShort(string title)
+			=> title?.IndexOf(':') > 0 ? title.Substring(0, title.IndexOf(':')) : title;
+
+		private static string getLanguageShort(string language)
+		{
+			if (language is null)
+				return null;
+
+			language = language.Trim();
+			if (language.Length <= 3)
+				return language.ToUpper();
+			return language[..3].ToUpper();
 		}
 
-		public class FolderTemplate : Templates
+		private static string StringFormatter(ITemplateTag templateTag, string value, string formatString)
+		{
+			if (string.Compare(formatString, "u", ignoreCase: true) == 0) return value?.ToUpper();
+			else if (string.Compare(formatString, "l", ignoreCase: true) == 0) return value?.ToLower();
+			else return value;
+		}
+
+		private static string IntegerFormatter(ITemplateTag templateTag, int value, string formatString)
+		{
+			if (int.TryParse(formatString, out var numDigits))
+				return value.ToString($"D{numDigits}");
+			return value.ToString();
+		}
+
+		private static string DateTimeFormatter(ITemplateTag templateTag, DateTime value, string formatString)
+		{
+			if (string.IsNullOrEmpty(formatString))
+				return value.ToString(TemplateTags.DEFAULT_DATE_FORMAT);
+			return value.ToString(formatString);
+		}
+
+		#endregion
+
+		public class FolderTemplate : Templates, ITemplate
 		{
 			public override string Name => "Folder Template";
 			public override string Description => Configuration.GetDescription(nameof(Configuration.FolderTemplate));
-			public override string DefaultTemplate { get; } = "<title short> [<id>]";
-			protected override bool IsChapterized { get; } = false;
+			public static string DefaultTemplate { get; } = "<title short> [<id>]";
+			public static IEnumerable<TagCollection> TagCollections => new TagCollection[] { filePropertyTags, conditionalTags };
 
-			internal FolderTemplate() : base() { }
+			public override IEnumerable<string> Errors
+				=> TemplateText?.Length >= 2 && Path.IsPathFullyQualified(TemplateText) ? base.Errors.Append(ERROR_FULL_PATH_IS_INVALID) : base.Errors;
 
-			#region validation
-			public override IEnumerable<string> GetErrors(string template)
-			{
-				// null is invalid. whitespace is valid but not recommended
-				if (template is null)
-					return new[] { ERROR_NULL_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 (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.ContainsInvalidPathChar(template.Replace("<", "").Replace(">", "")))
-					return new[] { ERROR_INVALID_FILE_NAME_CHAR };
-
-				return Valid;
-			}
-			
-			public override IEnumerable<string> GetWarnings(string template) => GetStandardWarnings(template);
-			#endregion
-
-			#region to file name
-			/// <summary>USES LIVE CONFIGURATION VALUES</summary>
-			public string GetFilename(LibraryBookDto libraryBookDto, string baseDir = null)
-				=> getFileNamingTemplate(libraryBookDto, Configuration.Instance.FolderTemplate, baseDir ?? AudibleFileStorage.BooksDirectory, null, Configuration.Instance.ReplacementCharacters)
-				.GetFilePath(string.Empty);
-			#endregion
+			protected override List<string> GetTemplatePartsStrings(List<TemplatePart> parts, ReplacementCharacters replacements)
+				=> parts
+				.Select(tp => tp.TemplateTag is null
+					//FolderTemplate literals can have directory separator characters
+					? replacements.ReplacePathChars(tp.Value.Replace(Path.AltDirectorySeparatorChar, Path.DirectorySeparatorChar))
+					: replacements.ReplaceFilenameChars(tp.Value)
+				).ToList();
 		}
 
-		public class FileTemplate : Templates
+		public class FileTemplate : Templates, ITemplate
 		{
 			public override string Name => "File Template";
 			public override string Description => Configuration.GetDescription(nameof(Configuration.FileTemplate));
-			public override string DefaultTemplate { get; } = "<title> [<id>]";
-			protected override bool IsChapterized { get; } = false;
-
-			internal FileTemplate() : base() { }
-
-			#region validation
-			public override IEnumerable<string> GetErrors(string template) => GetFileErrors(template);
-
-			public override IEnumerable<string> GetWarnings(string template) => GetStandardWarnings(template);
-			#endregion
-
-			#region to file name
-			/// <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, Configuration.Instance.ReplacementCharacters)
-				.GetFilePath(extension, returnFirstExisting);
-			#endregion
+			public static string DefaultTemplate { get; } = "<title> [<id>]";
+			public static IEnumerable<TagCollection> TagCollections { get; } = new TagCollection[] { filePropertyTags, conditionalTags };
 		}
 
-		public class ChapterFileTemplate : Templates
+		public class ChapterFileTemplate : Templates, ITemplate
 		{
 			public override string Name => "Chapter File Template";
 			public override string Description => Configuration.GetDescription(nameof(Configuration.ChapterFileTemplate));
-			public override string DefaultTemplate { get; } = "<title> [<id>] - <ch# 0> - <ch title>";
-			protected override bool IsChapterized { get; } = true;
+			public static string DefaultTemplate { get; } = "<title> [<id>] - <ch# 0> - <ch title>";
+			public static IEnumerable<TagCollection> TagCollections { get; } = chapterPropertyTags.Append(filePropertyTags).Append(conditionalTags);
 
-			internal ChapterFileTemplate() : base() { }
-
-			#region validation
-			public override IEnumerable<string> GetErrors(string template) => GetFileErrors(template);
-
-			public override IEnumerable<string> GetWarnings(string template)
-			{
-				var warnings = GetStandardWarnings(template).ToList();
-				if (template is null)
-					return warnings;
-
-				// recommended to incl. <ch#> or <ch# 0>
-				if (!ContainsTag(template, TemplateTags.ChNumber.TagName) && !ContainsTag(template, TemplateTags.ChNumber0.TagName))
-					warnings.Add(WARNING_NO_CHAPTER_NUMBER_TAG);
-
-				return warnings;
-			}
-			#endregion
-
-			#region to file name
-			/// <summary>USES LIVE CONFIGURATION VALUES</summary>
-			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, ReplacementCharacters replacements = null)
-			{
-				if (string.IsNullOrWhiteSpace(template)) return string.Empty;
-
-				replacements ??= Configuration.Instance.ReplacementCharacters;
-				var fileExtension = Path.GetExtension(props.OutputFileName);
-				var fileNamingTemplate = getFileNamingTemplate(libraryBookDto, template, fullDirPath, fileExtension, replacements);
-
-				fileNamingTemplate.AddParameterReplacement(TemplateTags.ChCount, props.PartsTotal);
-				fileNamingTemplate.AddParameterReplacement(TemplateTags.ChNumber, props.PartsPosition);
-				fileNamingTemplate.AddParameterReplacement(TemplateTags.ChNumber0, FileUtility.GetSequenceFormatted(props.PartsPosition, props.PartsTotal));
-				fileNamingTemplate.AddParameterReplacement(TemplateTags.ChTitle, props.Title ?? "");
-
-				foreach (Match dateTag in fileDateTagRegex.Matches(fileNamingTemplate.Template))
-				{
-					var sanitizedTag = sanitizeDateParameterTag(dateTag, replacements, out string sanitizedFormatter);
-					if (tryFormatDateTime(props.FileDate, sanitizedFormatter, replacements, out var formattedDateString))
-						fileNamingTemplate.ParameterReplacements[sanitizedTag] = formattedDateString;
-				}
-
-				return fileNamingTemplate.GetFilePath(fileExtension).PathWithoutPrefix;
-			}
-			#endregion
+			public override IEnumerable<string> Warnings
+				=> Template.TagsInUse.Any(t => t.TagName.In(TemplateTags.ChNumber.TagName, TemplateTags.ChNumber0.TagName))
+				? base.Warnings
+				: base.Warnings.Append(WARNING_NO_CHAPTER_NUMBER_TAG);
 		}
 
-		public class ChapterTitleTemplate : Templates
+		public class ChapterTitleTemplate : Templates, ITemplate
 		{
-			private List<TemplateTags> _templateTags { get; } = new()
-			{
-				TemplateTags.Title,
-				TemplateTags.TitleShort,
-				TemplateTags.Series,
-				TemplateTags.ChCount,
-				TemplateTags.ChNumber,
-				TemplateTags.ChNumber0,
-				TemplateTags.ChTitle,
-			};
 			public override string Name => "Chapter Title Template";
-
 			public override string Description => Configuration.GetDescription(nameof(Configuration.ChapterTitleTemplate));
+			public static string DefaultTemplate => "<ch#> - <title short>: <ch title>";
+			public static IEnumerable<TagCollection> TagCollections { get; } = chapterPropertyTags.Append(conditionalTags);
 
-			public override string DefaultTemplate => "<ch#> - <title short>: <ch title>";
-
-			protected override bool IsChapterized => true;
-
-			public override IEnumerable<string> GetErrors(string template)
-				=> new List<string>();
-
-			public override IEnumerable<string> GetWarnings(string template)
-				=> GetStandardWarnings(template).ToList();
-
-			public string GetTitle(LibraryBookDto libraryBookDto, AaxDecrypter.MultiConvertFileProperties props)
-				=> GetPortionTitle(libraryBookDto, Configuration.Instance.ChapterTitleTemplate, props);
-
-			public string GetPortionTitle(LibraryBookDto libraryBookDto, string template, AaxDecrypter.MultiConvertFileProperties props)
-			{
-				if (string.IsNullOrEmpty(template)) return string.Empty;
-
-				ArgumentValidator.EnsureNotNull(libraryBookDto, nameof(libraryBookDto));
-
-				var fileNamingTemplate = new MetadataNamingTemplate(template);
-			  
-				var title = libraryBookDto.Title ?? "";
-				var titleShort = title.IndexOf(':') < 1 ? title : title.Substring(0, title.IndexOf(':'));
-
-				fileNamingTemplate.AddParameterReplacement(TemplateTags.Title, title);
-				fileNamingTemplate.AddParameterReplacement(TemplateTags.TitleShort, titleShort);
-				fileNamingTemplate.AddParameterReplacement(TemplateTags.Series, libraryBookDto.SeriesName);
-				fileNamingTemplate.AddParameterReplacement(TemplateTags.ChCount, props.PartsTotal);
-				fileNamingTemplate.AddParameterReplacement(TemplateTags.ChNumber, props.PartsPosition);
-				fileNamingTemplate.AddParameterReplacement(TemplateTags.ChNumber0, FileUtility.GetSequenceFormatted(props.PartsPosition, props.PartsTotal));
-				fileNamingTemplate.AddParameterReplacement(TemplateTags.ChTitle, props.Title ?? "");
-
-				return fileNamingTemplate.GetTagContents();
-			}
-			public override IEnumerable<TemplateTags> GetTemplateTags() => _templateTags;
+			protected override IEnumerable<string> GetTemplatePartsStrings(List<TemplatePart> parts, ReplacementCharacters replacements)
+				=> parts.Select(p => p.Value);
 		}
 	}
 }

Source/LibationFileManager/UtilityExtensions.cs

@@ -1,16 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using FileManager;
-
-namespace LibationFileManager
-{
-	public static class UtilityExtensions
-	{
-		public static void AddParameterReplacement(this NamingTemplate fileNamingTemplate, TemplateTags templateTags, object value)
-			=> fileNamingTemplate.AddParameterReplacement(templateTags.TagName, value);
-
-		public static void AddUniqueParameterReplacement(this NamingTemplate namingTemplate, string key, object value)
-			=> namingTemplate.ParameterReplacements[key] = value;
-	}
-}

Source/LibationWinForms/Dialogs/BookDetailsDialog.cs

@@ -52,6 +52,7 @@ Length: {(Book.LengthInMinutes == 0 ? "" : $"{Book.LengthInMinutes / 60} hr {Boo
 Audio Bitrate: {Book.AudioFormat}
 Category: {string.Join(" > ", Book.CategoriesNames())}
 Purchase Date: {_libraryBook.DateAdded:d}
+Language: {Book.Language}
 Audible ID: {Book.AudibleProductId}
 ".Trim();
 

Source/LibationWinForms/Dialogs/EditTemplateDialog.cs

@@ -1,5 +1,4 @@
 using System;
-using System.Collections.Generic;
 using System.Linq;
 using System.IO;
 using System.Windows.Forms;
@@ -10,33 +9,19 @@ namespace LibationWinForms.Dialogs
 {
 	public partial class EditTemplateDialog : Form
 	{
-		// final value. post-validity check
-		public string TemplateText { get; private set; }
-
-		// hold the work-in-progress value. not guaranteed to be valid
-		private string _workingTemplateText;
-		private string workingTemplateText
-		{
-			get => _workingTemplateText;
-			set => _workingTemplateText = template.Sanitize(value, Configuration.Instance.ReplacementCharacters);
-		}
-
-		private void resetTextBox(string value) => this.templateTb.Text = workingTemplateText = value;
-
+		private void resetTextBox(string value) => this.templateTb.Text = value;
 		private Configuration config { get; } = Configuration.Instance;
-
-		private Templates template { get; }
-		private string inputTemplateText { get; }
+		private ITemplateEditor templateEditor { get;}		
 
 		public EditTemplateDialog()
 		{
 			InitializeComponent();
 			this.SetLibationIcon();
 		}
-		public EditTemplateDialog(Templates template, string inputTemplateText) : this()
+
+		public EditTemplateDialog(ITemplateEditor templateEditor) : this()
 		{
-			this.template = ArgumentValidator.EnsureNotNull(template, nameof(template));
-			this.inputTemplateText = inputTemplateText ?? "";
+			this.templateEditor = ArgumentValidator.EnsureNotNull(templateEditor, nameof(templateEditor));
 		}
 
 		private void EditTemplateDialog_Load(object sender, EventArgs e)
@@ -44,88 +29,31 @@ namespace LibationWinForms.Dialogs
 			if (this.DesignMode)
 				return;
 
-			if (template is null)
+			if (templateEditor is null)
 			{
-				MessageBoxLib.ShowAdminAlert(this, $"Programming error. {nameof(EditTemplateDialog)} was not created correctly", "Edit template error", new NullReferenceException($"{nameof(template)} is null"));
+				MessageBoxLib.ShowAdminAlert(this, $"Programming error. {nameof(EditTemplateDialog)} was not created correctly", "Edit template error", new NullReferenceException($"{nameof(templateEditor)} is null"));
 				return;
 			}
 
 			warningsLbl.Text = "";
 
-			this.Text = $"Edit {template.Name}";
+			this.Text = $"Edit {templateEditor.EditingTemplate.Name}";
 
-			this.templateLbl.Text = template.Description;
-			resetTextBox(inputTemplateText);
+			this.templateLbl.Text = templateEditor.EditingTemplate.Description;
+			resetTextBox(templateEditor.EditingTemplate.TemplateText);
 
 			// populate list view
-			foreach (var tag in template.GetTemplateTags())
-				listView1.Items.Add(new ListViewItem(new[] { $"<{tag.TagName}>", tag.Description }) { Tag = tag.DefaultValue });
+			foreach (TemplateTags tag in templateEditor.EditingTemplate.TagsRegistered)
+				listView1.Items.Add(new ListViewItem(new[] { tag.Display, tag.Description }) { Tag = tag.DefaultValue });
+
+			listView1.AutoResizeColumns(ColumnHeaderAutoResizeStyle.ColumnContent);
 		}
 
-		private void resetToDefaultBtn_Click(object sender, EventArgs e) => resetTextBox(template.DefaultTemplate);
+		private void resetToDefaultBtn_Click(object sender, EventArgs e) => resetTextBox(templateEditor.DefaultTemplate);
 
 		private void templateTb_TextChanged(object sender, EventArgs e)
 		{
-			workingTemplateText = templateTb.Text;
-			var isChapterTitle = template == Templates.ChapterTitle;
-			var isFolder = template == Templates.Folder;
-
-			var libraryBookDto = new LibraryBookDto
-			{
-				Account = "my account",
-				DateAdded = new DateTime(2022, 6, 9, 0, 0, 0),
-				DatePublished = new DateTime(2017, 2, 27, 0, 0, 0),
-				AudibleProductId = "123456789",
-				Title = "A Study in Scarlet: A Sherlock Holmes Novel",
-				Locale = "us",
-                YearPublished = 2017,
-                Authors = new List<string> { "Arthur Conan Doyle", "Stephen Fry - introductions" },
-				Narrators = new List<string> { "Stephen Fry" },
-				SeriesName = "Sherlock Holmes",
-				SeriesNumber = "1",
-				BitRate = 128,
-				SampleRate = 44100,
-				Channels = 2
-			};
-			var chapterName = "A Flight for Life";
-			var chapterNumber = 4;
-			var chaptersTotal = 10;
-
-			var partFileProperties = new AaxDecrypter.MultiConvertFileProperties() 
-			{ 
-				OutputFileName = "", 
-				PartsPosition = chapterNumber, 
-				PartsTotal = chaptersTotal, 
-				Title = chapterName 
-			};
-
-
-			/*
-			* Path must be rooted for windows to allow long file paths. This is
-			* only necessary for folder templates because they may contain several
-			* subdirectories. Without rooting, we won't be allowed to create a
-			* relative path longer than MAX_PATH.
-			*/
-			var books = config.Books;
-			var folder = Templates.Folder.GetPortionFilename(
-				libraryBookDto,				
-				Path.Combine(books, isFolder ? workingTemplateText : config.FolderTemplate), "");
-
-			folder = Path.GetRelativePath(books, folder);
-
-			var file
-				= template == Templates.ChapterFile
-				? Templates.ChapterFile.GetPortionFilename(
-					libraryBookDto,
-					workingTemplateText,
-					partFileProperties,
-					"")
-				: Templates.File.GetPortionFilename(
-					libraryBookDto,
-					isFolder ? config.FileTemplate : workingTemplateText, "");
-			var ext = config.DecryptToLossy ? "mp3" : "m4b";
-
-			var chapterTitle = Templates.ChapterTitle.GetPortionTitle(libraryBookDto, workingTemplateText, partFileProperties);
+			templateEditor.SetTemplateText(templateTb.Text);			
 
 			const char ZERO_WIDTH_SPACE = '\u200B';
 			var sing = $"{Path.DirectorySeparatorChar}";
@@ -138,11 +66,12 @@ namespace LibationWinForms.Dialogs
 			string slashWrap(string val) => val.Replace(sing, $"{ZERO_WIDTH_SPACE}{sing}");
 
 			warningsLbl.Text
-				= !template.HasWarnings(workingTemplateText)
+				= !templateEditor.EditingTemplate.HasWarnings
 				? ""
 				: "Warning:\r\n" +
-					template
-					.GetWarnings(workingTemplateText)
+					templateEditor
+					.EditingTemplate
+					.Warnings
 					.Select(err => $"- {err}")
 					.Aggregate((a, b) => $"{a}\r\n{b}");
 
@@ -152,51 +81,52 @@ namespace LibationWinForms.Dialogs
 			richTextBox1.Clear();
 			richTextBox1.SelectionFont = reg;
 
-			if (isChapterTitle)
+			if (!templateEditor.IsFilePath)
 			{
 				richTextBox1.SelectionFont = bold;
-				richTextBox1.AppendText(chapterTitle);
+				richTextBox1.AppendText(templateEditor.GetName());
 				return;
 			}
 
-			richTextBox1.AppendText(slashWrap(books));
+			var folder = templateEditor.GetFolderName();
+			var file = templateEditor.GetFileName();
+			var ext = config.DecryptToLossy ? "mp3" : "m4b";
+
+			richTextBox1.AppendText(slashWrap(templateEditor.BaseDirectory.PathWithoutPrefix));
 			richTextBox1.AppendText(sing);
 
-			if (isFolder)
+			if (templateEditor.IsFolder)
 				richTextBox1.SelectionFont = bold;
 
 			richTextBox1.AppendText(slashWrap(folder));
 
-			if (isFolder)
+			if (templateEditor.IsFolder)
 				richTextBox1.SelectionFont = reg;
 
 			richTextBox1.AppendText(sing);
 
-			if (!isFolder)
+			if (templateEditor.IsFilePath && !templateEditor.IsFolder)
 				richTextBox1.SelectionFont = bold;
 
 			richTextBox1.AppendText(file);
 
-			if (!isFolder)
-				richTextBox1.SelectionFont = reg;
-
+			richTextBox1.SelectionFont = reg;
 			richTextBox1.AppendText($".{ext}");
 		}
 
 		private void saveBtn_Click(object sender, EventArgs e)
 		{
-			if (!template.IsValid(workingTemplateText))
+			if (!templateEditor.EditingTemplate.IsValid)
 			{
-				var errors = template
-					.GetErrors(workingTemplateText)
+				var errors = templateEditor
+					.EditingTemplate
+					.Errors
 					.Select(err => $"- {err}")
 					.Aggregate((a, b) => $"{a}\r\n{b}");
 				MessageBox.Show($"This template text is not valid. Errors:\r\n{errors}", "Invalid", MessageBoxButtons.OK, MessageBoxIcon.Error);
 				return;
 			}
 
-			TemplateText = workingTemplateText;
-
 			this.DialogResult = DialogResult.OK;
 			this.Close();
 		}

Source/LibationWinForms/Dialogs/SettingsDialog.AudioSettings.cs

@@ -106,7 +106,8 @@ namespace LibationWinForms.Dialogs
 			chapterTitleTemplateGb.Enabled = splitFilesByChapterCbox.Checked;
 		}
 
-		private void chapterTitleTemplateBtn_Click(object sender, EventArgs e) => editTemplate(Templates.ChapterTitle, chapterTitleTemplateTb);
+		private void chapterTitleTemplateBtn_Click(object sender, EventArgs e)
+			=> editTemplate(TemplateEditor<Templates.ChapterTitleTemplate>.CreateNameEditor(chapterTitleTemplateTb.Text), chapterTitleTemplateTb);
 
 		private void convertFormatRb_CheckedChanged(object sender, EventArgs e)
 		{

Source/LibationWinForms/Dialogs/SettingsDialog.DownloadDecrypt.cs

@@ -7,10 +7,12 @@ namespace LibationWinForms.Dialogs
 {
 	public partial class SettingsDialog
 	{
-		private void folderTemplateBtn_Click(object sender, EventArgs e) => editTemplate(Templates.Folder, folderTemplateTb);
-		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 folderTemplateBtn_Click(object sender, EventArgs e)
+			=> editTemplate(TemplateEditor<Templates.FolderTemplate>.CreateFilenameEditor(config.Books, folderTemplateTb.Text), folderTemplateTb);
+		private void fileTemplateBtn_Click(object sender, EventArgs e)
+			=> editTemplate(TemplateEditor<Templates.FileTemplate>.CreateFilenameEditor(config.Books, fileTemplateTb.Text), fileTemplateTb);
+		private void chapterFileTemplateBtn_Click(object sender, EventArgs e)
+			=> editTemplate(TemplateEditor<Templates.ChapterFileTemplate>.CreateFilenameEditor(config.Books, chapterFileTemplateTb.Text), chapterFileTemplateTb);
 
 		private void editCharreplacementBtn_Click(object sender, EventArgs e)
 		{

Source/LibationWinForms/Dialogs/SettingsDialog.Important.cs

@@ -56,23 +56,6 @@ namespace LibationWinForms.Dialogs
 				validationError("Cannot set Books Location to blank", "Location is blank");
 				return;
 			}
-
-			// these 3 should do nothing. Configuration will only init these with a valid value. EditTemplateDialog ensures valid before returning
-			if (!Templates.Folder.IsValid(folderTemplateTb.Text))
-			{
-				validationError($"Not saving change to folder naming template. Invalid format.", "Invalid folder template");
-				return;
-			}
-			if (!Templates.File.IsValid(fileTemplateTb.Text))
-			{
-				validationError($"Not saving change to file naming template. Invalid format.", "Invalid file template");
-				return;
-			}
-			if (!Templates.ChapterFile.IsValid(chapterFileTemplateTb.Text))
-			{
-				validationError($"Not saving change to chapter file naming template. Invalid format.", "Invalid chapter file template");
-				return;
-			}
 			#endregion
 
 			LongPath lonNewBooks = newBooks;

Source/LibationWinForms/Dialogs/SettingsDialog.cs

@@ -27,11 +27,11 @@ namespace LibationWinForms.Dialogs
 			Load_AudioSettings(config);
 		}
 
-		private static void editTemplate(Templates template, TextBox textBox)
+		private static void editTemplate(ITemplateEditor template, TextBox textBox)
 		{
-			var form = new EditTemplateDialog(template, textBox.Text);
+			var form = new EditTemplateDialog(template);
 			if (form.ShowDialog() == DialogResult.OK)
-				textBox.Text = form.TemplateText;
+				textBox.Text = template.EditingTemplate.TemplateText;
 		}
 
 		private void saveBtn_Click(object sender, EventArgs e)

Source/LibationWinForms/GridView/GridEntry.cs

@@ -140,7 +140,16 @@ namespace LibationWinForms.GridView
 
 		private void PictureStorage_PictureCached(object sender, PictureCachedEventArgs e)
 		{
-			if (e.Definition.PictureId == Book.PictureId)
+            // state validation
+            if (e is null ||
+				e.Definition.PictureId is null ||
+				Book?.PictureId is null ||
+				e.Picture is null ||
+				e.Picture.Length == 0)
+				return;
+
+            // logic validation
+            if (e.Definition.PictureId == Book.PictureId)
 			{
 				Cover = ImageReader.ToImage(e.Picture);
 				PictureStorage.PictureCached -= PictureStorage_PictureCached;

Source/LibationWinForms/LibationWinForms.csproj

@@ -45,7 +45,7 @@
 
 	<ItemGroup>
 		<PackageReference Include="Autoupdater.NET.Official" Version="1.7.6" />
-		<PackageReference Include="Dinah.Core.WindowsDesktop" Version="7.2.0.1" />
+		<PackageReference Include="Dinah.Core.WindowsDesktop" Version="7.2.1.1" />
 	</ItemGroup>
 
 	<ItemGroup>
@@ -64,16 +64,6 @@
 			<DependentUpon>SettingsDialog.cs</DependentUpon>
 		</Compile>
 	</ItemGroup>
-	<ItemGroup>
-		<Compile Update="Form1.*.cs">
-			<DependentUpon>Form1.cs</DependentUpon>
-		</Compile>
-	</ItemGroup>
-	<ItemGroup>
-		<Compile Update="Form1.*.cs">
-			<DependentUpon>Form1.cs</DependentUpon>
-		</Compile>
-	</ItemGroup>
 
 	<ItemGroup>
 		<Compile Update="Properties\Resources.Designer.cs">

Source/LoadByOS/WindowsConfigApp/WindowsConfigApp.csproj

@@ -33,7 +33,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Dinah.Core.WindowsDesktop" Version="7.2.0.1" />
+    <PackageReference Include="Dinah.Core.WindowsDesktop" Version="7.2.1.1" />
   </ItemGroup>
 
   <ItemGroup>

Source/_Demos/LoadByOS/CrossPlatformClientExe/CrossPlatformClientExe.csproj

@@ -19,7 +19,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Dinah.Core" Version="7.2.0.1" />
+    <PackageReference Include="Dinah.Core" Version="7.2.1.1" />
   </ItemGroup>
 
 </Project>

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

@@ -6,7 +6,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="FluentAssertions" Version="6.8.0" />
+    <PackageReference Include="FluentAssertions" Version="6.9.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
     <PackageReference Include="Moq" Version="4.18.4" />
     <PackageReference Include="MSTest.TestAdapter" Version="3.0.2" />

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

@@ -6,7 +6,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="FluentAssertions" Version="6.8.0" />
+    <PackageReference Include="FluentAssertions" Version="6.9.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
     <PackageReference Include="MSTest.TestAdapter" Version="3.0.2" />
     <PackageReference Include="MSTest.TestFramework" Version="3.0.2" />

Source/_Tests/FileManager.Tests/FileManager.Tests.csproj

@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="FluentAssertions" Version="6.8.0" />
+    <PackageReference Include="FluentAssertions" Version="6.9.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
     <PackageReference Include="MSTest.TestAdapter" Version="3.0.2" />
     <PackageReference Include="MSTest.TestFramework" Version="3.0.2" />

Source/_Tests/FileManager.Tests/FileNamingTemplateTests.cs

@@ -1,82 +1,207 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using Dinah.Core;
-using FileManager;
+using System.Linq;
+using FileManager.NamingTemplate;
 using FluentAssertions;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
-namespace FileNamingTemplateTests
+namespace NamingTemplateTests
 {
-	[TestClass]
-	public class GetFilePath
+	class TemplateTag : ITemplateTag
 	{
-		static ReplacementCharacters Replacements = ReplacementCharacters.Default;
+		public string TagName { get; init; }
+	}
+
+	class PropertyClass1
+	{
+		public string Item1 { get; set; }
+		public string Item2 { get; set; }
+		public string Item3 { get; set; }
+		public int Int1 { get; set; }
+		public bool Condition { get; set; }
+	}
+
+	class PropertyClass2
+	{
+		public string Item1 { get; set; }
+		public string Item2 { get; set; }
+		public string Item3 { get; set; }
+		public string Item4 { get; set; }
+		public bool Condition { get; set; }
+	}
+	class PropertyClass3
+	{
+		public string Item1 { get; set; }
+		public string Item2 { get; set; }
+		public string Item3 { get; set; }
+		public string Item4 { get; set; }
+		public ReferenceType RefType { get; set; }
+		public int? Int2 { get; set; }
+		public bool Condition { get; set; }
+	}
+	class ReferenceType
+	{
+		public override string ToString()
+		{
+			return nameof(ReferenceType);
+		}
+	}
+
+
+	[TestClass]
+	public class GetPortionFilename
+	{
+		PropertyTagCollection<PropertyClass1> props1 = new()
+		{
+			{ new TemplateTag { TagName = "item1" }, i => i.Item1 },
+			{ new TemplateTag { TagName = "item2" }, i => i.Item2 },
+			{ new TemplateTag { TagName = "item3" }, i => i.Item3 }
+		};
+
+		PropertyTagCollection<PropertyClass2> props2 = new()
+		{
+			{ new TemplateTag { TagName = "item1" }, i => i.Item1 },
+			{ new TemplateTag { TagName = "item2" }, i => i.Item2 },
+			{ new TemplateTag { TagName = "item3" }, i => i.Item3 },
+			{ new TemplateTag { TagName = "item4" }, i => i.Item4 },
+		};
+		PropertyTagCollection<PropertyClass3> props3 = new(true, GetVal)
+		{
+			{ new TemplateTag { TagName = "item3_1" }, i => i.Item1 },
+			{ new TemplateTag { TagName = "item3_2" }, i => i.Item2 },
+			{ new TemplateTag { TagName = "item3_3" }, i => i.Item3 },
+			{ new TemplateTag { TagName = "item3_4" }, i => i.Item4 },
+			{ new TemplateTag { TagName = "reftype" }, i => i.RefType },
+		};
+		ConditionalTagCollection<PropertyClass1> conditional1 = new()
+		{
+			{ new TemplateTag { TagName = "ifc1" }, i => i.Condition },
+		};
+		ConditionalTagCollection<PropertyClass2> conditional2 = new()
+		{
+			{ new TemplateTag { TagName = "ifc2" }, i => i.Condition },
+		};
+		ConditionalTagCollection<PropertyClass3> conditional3 = new()
+		{
+			{ new TemplateTag { TagName = "ifc3" }, i => i.Condition },
+		};
+
+		PropertyClass1 propertyClass1 = new()
+		{
+			Item1 = "prop1_item1",
+			Item2 = "prop1_item2",
+			Item3 = "prop1_item3",
+			Int1 = 55,
+			Condition = true,
+		};
+
+		PropertyClass2 propertyClass2 = new()
+		{
+			Item1 = "prop2_item1",
+			Item3 = "prop2_item3",
+			Item4 = "prop2_item4",
+			Condition = false
+		};
+
+		PropertyClass3 propertyClass3 = new()
+		{
+			Item1 = "prop3_item1",
+			Item2 = "prop3_item2",
+			Item3 = "Prop3_Item3",
+			Item4 = "prop3_item4",
+			Condition = true
+		};
+
 
 		[TestMethod]
-		[DataRow(@"C:\foo\bar", @"C:\foo\bar\my꞉ book 0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 [ID123456].txt", PlatformID.Win32NT)]
-		[DataRow(@"/foo/bar", @"/foo/bar/my: book 0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 [ID123456].txt", PlatformID.Unix)]
-		public void equiv_GetValidFilename(string dirFullPath, string expected, PlatformID platformID)
+		[DataRow("<item1>", "prop1_item1", 1)]
+		[DataRow("< item1>", "< item1>", 0)]
+		[DataRow("<item1 >", "<item1 >", 0)]
+		[DataRow("< item1 >", "< item1 >", 0)]
+		[DataRow("<item3_1>", "prop3_item1", 1)]
+		[DataRow("<item1> <item2> <item3> <item4>", "prop1_item1 prop1_item2 prop1_item3 prop2_item4", 4)]
+		[DataRow("<item3_1> <item3_2> <item3> <item4>", "prop3_item1 prop3_item2 prop1_item3 prop2_item4", 4)]
+		[DataRow("<ifc1-><item1><-ifc1><ifc2-><item4><-ifc2><ifc3-><item3_2><-ifc3>", "prop1_item1prop3_item2", 3)]
+		[DataRow("<ifc1-><ifc3-><item1><ifc2-><item4><-ifc2><item3_2><-ifc3><-ifc1>", "prop1_item1prop3_item2", 3)]
+		[DataRow("<ifc2-><ifc1-><ifc3-><item1><item4><item3_2><-ifc3><-ifc1><-ifc2>", "", 3)]
+		[DataRow("<!ifc2-><ifc1-><ifc3-><item1><item4><item3_2><-ifc3><-ifc1><-ifc2>", "prop1_item1prop2_item4prop3_item2", 3)]
+		public void test(string inStr, string outStr, int numTags)
 		{
-			if (Environment.OSVersion.Platform != platformID)
-				return;
+			var template = NamingTemplate.Parse(inStr, new TagCollection[] { props1, props2, props3, conditional1, conditional2, conditional3 });
 
-			var sb = new System.Text.StringBuilder();
-			sb.Append('0', 300);
-			var longText = sb.ToString();
+			template.TagsInUse.Should().HaveCount(numTags);
+			template.Warnings.Should().HaveCount(numTags > 0 ? 0 : 1);
+			template.Errors.Should().HaveCount(0);
 
-			NEW_GetValidFilename_FileNamingTemplate(dirFullPath, "my: book " + longText, "txt", "ID123456").Should().Be(expected);
-		}
+			var templateText = string.Join("", template.Evaluate(propertyClass3, propertyClass2, propertyClass1).Select(v => v.Value));
 
-		private static string NEW_GetValidFilename_FileNamingTemplate(string dirFullPath, string filename, string extension, string metadataSuffix)
-		{
-			var template = $"<title> [<id>]";
-
-			extension = FileUtility.GetStandardizedExtension(extension);
-			var fullfilename = Path.Combine(dirFullPath, template + extension);
-
-			var fileNamingTemplate = new FileNamingTemplate(fullfilename, Replacements);
-			fileNamingTemplate.AddParameterReplacement("title", filename);
-			fileNamingTemplate.AddParameterReplacement("id", metadataSuffix);
-			return fileNamingTemplate.GetFilePath(extension).PathWithoutPrefix;
+			templateText.Should().Be(outStr);
 		}
 
 		[TestMethod]
-		[DataRow(@"C:\foo\bar\my file.txt", @"C:\foo\bar\my file - 002 - title.txt", PlatformID.Win32NT)]
-		[DataRow(@"/foo/bar/my file.txt", @"/foo/bar/my file - 002 - title.txt", PlatformID.Unix)]
-		public void equiv_GetMultipartFileName(string inStr, string outStr, PlatformID platformID)
+		[DataRow("<ifc2-><ifc1-><ifc3-><item1><item4><item3_2><-ifc3><-ifc1><ifc2->", new string[] { "Missing <-ifc2> closing conditional.", "Missing <-ifc2> closing conditional." })]
+		[DataRow("<ifc2-><ifc1-><ifc3-><-ifc3><-ifc1><-ifc2>", new string[] { "Should use tags. Eg: <title>" })]
+		[DataRow("<ifc1-><ifc3-><item1><-ifc3><-ifc1><-ifc2>", new string[] { "Missing <ifc2-> open conditional." })]
+		[DataRow("<ifc1-><ifc3-><-ifc3><-ifc1><-ifc2>", new string[] { "Missing <ifc2-> open conditional.", "Should use tags. Eg: <title>" })]
+		[DataRow("<ifc2-><ifc1-><ifc3-><item1><item4><item3_2><-ifc3><-ifc1>", new string[] { "Missing <-ifc2> closing conditional." })]
+		[DataRow("<ifc2-><ifc1-><ifc3-><item1><item4><item3_2><-ifc3>", new string[] { "Missing <-ifc1> closing conditional.", "Missing <-ifc2> closing conditional." })]
+		[DataRow("<ifc2-><ifc1-><ifc3-><item1><item4>", new string[] { "Missing <-ifc3> closing conditional.", "Missing <-ifc1> closing conditional.", "Missing <-ifc2> closing conditional." })]
+		[DataRow("<ifc2-><ifc1-><ifc3-><item1><item4><item3_2><-ifc1><-ifc2>", new string[] { "Missing <-ifc3> closing conditional.", "Missing <-ifc3> closing conditional.", "Missing <-ifc1> closing conditional.", "Missing <-ifc2> closing conditional." })]
+		public void condition_error(string inStr, string[] warnings)
 		{
-			if (Environment.OSVersion.Platform == platformID)
-				NEW_GetMultipartFileName_FileNamingTemplate(inStr, 2, 100, "title").Should().Be(outStr);
+			var template = NamingTemplate.Parse(inStr, new TagCollection[] { props1, props2, props3, conditional1, conditional2, conditional3 });
+
+			template.Errors.Should().HaveCount(0);
+			template.Warnings.Should().BeEquivalentTo(warnings);
 		}
 
-		private static string NEW_GetMultipartFileName_FileNamingTemplate(string originalPath, int partsPosition, int partsTotal, string suffix)
+		static string GetVal(ITemplateTag templateTag, ReferenceType referenceType, string format)
 		{
-			// 1-9     => 1-9
-			// 10-99   => 01-99
-			// 100-999 => 001-999
-			var chapterCountLeadingZeros = partsPosition.ToString().PadLeft(partsTotal.ToString().Length, '0');
-
-			var estension = Path.GetExtension(originalPath);
-			var t = Path.ChangeExtension(originalPath, null) + " - <chapter> - <title>" + estension;
-
-			var fileNamingTemplate = new FileNamingTemplate(t, Replacements);
-			fileNamingTemplate.AddParameterReplacement("chapter", chapterCountLeadingZeros);
-			fileNamingTemplate.AddParameterReplacement("title", suffix);
-			return fileNamingTemplate.GetFilePath(estension).PathWithoutPrefix;
+			return "";
 		}
 
 		[TestMethod]
-		[DataRow(@"\foo\<title>.txt", @"\foo\sl∕as∕he∕s.txt", PlatformID.Win32NT)]
-		[DataRow(@"/foo/<title>.txt", @"/foo/s\l∕a\s∕h\e∕s.txt", PlatformID.Unix)]
-		public void remove_slashes(string inStr, string outStr, PlatformID platformID)
+		[DataRow("<int1>", "55")]
+		[DataRow("<int1[]>", "55")]
+		[DataRow("<int1[5]>", "00055")]
+		[DataRow("<int2>", "")]
+		[DataRow("<int2[]>", "")]
+		[DataRow("<int2[4]>", "")]
+		[DataRow("<item3_format>", "Prop3_Item3")]
+		[DataRow("<item3_format[]>", "Prop3_Item3")]
+		[DataRow("<item3_format[rtreue5]>", "Prop3_Item3")]
+		[DataRow("<item3_format[l]>", "prop3_item3")]
+		[DataRow("<item3_format[u]>", "PROP3_ITEM3")]
+		[DataRow("<item2_2_null>", "")]
+		[DataRow("<item2_2_null[]>", "")]
+		[DataRow("<item2_2_null[l]>", "")]
+		[DataRow("<reftype[l]>", "")]
+		public void formatting(string inStr, string outStr)
 		{
-			if (Environment.OSVersion.Platform == platformID)
+			props1.Add(new TemplateTag { TagName = "int1" }, i => i.Int1, formatInt);
+			props3.Add(new TemplateTag { TagName = "int2" }, i => i.Int2, formatInt);
+			props3.Add(new TemplateTag { TagName = "item3_format" }, i => i.Item3, formatString);
+			props2.Add(new TemplateTag { TagName = "item2_2_null" }, i => i.Item2, formatString);
+
+			var template = NamingTemplate.Parse(inStr, new TagCollection[] { props1, props2, props3, conditional1, conditional2, conditional3 });
+
+			template.Warnings.Should().HaveCount(0);
+			template.Errors.Should().HaveCount(0);
+
+			var templateText = string.Join("", template.Evaluate(propertyClass3, propertyClass2, propertyClass1).Select(v => v.Value));
+
+			templateText.Should().Be(outStr);
+
+			string formatInt(ITemplateTag templateTag, int value, string format)
 			{
-				var fileNamingTemplate = new FileNamingTemplate(inStr, Replacements);
-				fileNamingTemplate.AddParameterReplacement("title", @"s\l/a\s/h\e/s");
-				fileNamingTemplate.GetFilePath("txt").PathWithoutPrefix.Should().Be(outStr);
+				if (int.TryParse(format, out var numDecs))
+					return value.ToString($"D{numDecs}");
+				return value.ToString();
+			}
+
+			string formatString(ITemplateTag templateTag, string value, string formatString)
+			{
+				if (string.Compare(formatString, "u", ignoreCase: true) == 0) return value?.ToUpper();
+				else if (string.Compare(formatString, "l", ignoreCase: true) == 0) return value?.ToLower();
+				else return value;
 			}
 		}
 	}

Source/_Tests/LibationFileManager.Tests/LibationFileManager.Tests.csproj

@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="FluentAssertions" Version="6.8.0" />
+    <PackageReference Include="FluentAssertions" Version="6.9.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
     <PackageReference Include="MSTest.TestAdapter" Version="3.0.2" />
     <PackageReference Include="MSTest.TestFramework" Version="3.0.2" />

Source/_Tests/LibationFileManager.Tests/TemplatesTests.cs

@@ -4,6 +4,7 @@ using System.IO;
 using System.Linq;
 using Dinah.Core;
 using FileManager;
+using FileManager.NamingTemplate;
 using FluentAssertions;
 using LibationFileManager;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
@@ -36,50 +37,27 @@ namespace TemplatesTests
 				Authors = new List<string> { "Arthur Conan Doyle", "Stephen Fry - introductions" },
 				Narrators = new List<string> { "Stephen Fry" },
 				SeriesName = seriesName ?? "",
-				SeriesNumber = "1",
+				SeriesNumber = 1,
 				BitRate = 128,
 				SampleRate = 44100,
-				Channels = 2
-			};
-
-		public static LibraryBookDto GetLibraryBookWithNullDates(string seriesName = "Sherlock Holmes")
-			=> new()
-			{
-				Account = "my account",
-				FileDate = new DateTime(2023, 1, 28, 0, 0, 0),
-				AudibleProductId = "asin",
-				Title = "A Study in Scarlet: A Sherlock Holmes Novel",
-				Locale = "us",
-				YearPublished = 2017,
-				Authors = new List<string> { "Arthur Conan Doyle", "Stephen Fry - introductions" },
-				Narrators = new List<string> { "Stephen Fry" },
-				SeriesName = seriesName ?? "",
-				SeriesNumber = "1",
-				BitRate = 128,
-				SampleRate = 44100,
-				Channels = 2
-			};
-	}
-
-	[TestClass]
-	public class ContainsChapterOnlyTags
-	{
-		[TestMethod]
-		[DataRow("<ch>", false)]
-		[DataRow("<ch#>", true)]
-		[DataRow("<id>", false)]
-		[DataRow("<id><ch#>", true)]
-		public void Tests(string template, bool expected) => Templates.ContainsChapterOnlyTags(template).Should().Be(expected);
+				Channels = 2,
+                Language = "English"
+            };
 	}
 
 	[TestClass]
 	public class ContainsTag
 	{
 		[TestMethod]
-		[DataRow("<ch#>", "ch#", true)]
-		[DataRow("<id>", "ch#", false)]
-		[DataRow("<id><ch#>", "ch#", true)]
-		public void Tests(string template, string tag, bool expected) => Templates.ContainsTag(template, tag).Should().Be(expected);
+		[DataRow("<ch#>", 0)]
+		[DataRow("<id>", 1)]
+		[DataRow("<id><ch#>", 1)]
+		public void Tests(string template, int numTags)
+		{
+			Templates.TryGetTemplate<Templates.FileTemplate>(template, out var fileTemplate).Should().BeTrue();
+
+			fileTemplate.TagsInUse.Should().HaveCount(numTags);
+		}
 	}
 
 	[TestClass]
@@ -87,19 +65,22 @@ namespace TemplatesTests
 	{
 		static ReplacementCharacters Replacements = ReplacementCharacters.Default;
 
+		[TestMethod]
+		[DataRow(null)]
+		public void template_null(string template)
+		{
+			Templates.TryGetTemplate<Templates.FileTemplate>(template, out var t).Should().BeFalse();
+			t.IsValid.Should().BeFalse();
+		}
 
 		[TestMethod]
-		[DataRow(null, @"C:\", "ext")]
-		[ExpectedException(typeof(ArgumentNullException))]
-		public void arg_null_exception(string template, string dirFullPath, string extension)
-			=> Templates.getFileNamingTemplate(GetLibraryBook(), template, dirFullPath, extension, Replacements);
-
-		[TestMethod]
-		[DataRow("", @"C:\foo\bar", "ext")]
-		[DataRow("   ", @"C:\foo\bar", "ext")]
-		[ExpectedException(typeof(ArgumentException))]
-		public void arg_exception(string template, string dirFullPath, string extension)
-			=> Templates.getFileNamingTemplate(GetLibraryBook(), template, dirFullPath, extension, Replacements);
+		[DataRow("")]
+		[DataRow("   ")]
+		public void template_empty(string template)
+		{
+			Templates.TryGetTemplate<Templates.FileTemplate>(template, out var t).Should().BeTrue();
+			t.Warnings.Should().HaveCount(2);
+		}
 
 		[TestMethod]
 		[DataRow("f.txt", @"C:\foo\bar", "", @"C:\foo\bar\f.txt")]
@@ -117,10 +98,26 @@ namespace TemplatesTests
 				expected = expected.Replace("C:", "").Replace('\\', '/');
 			}
 
-			Templates.getFileNamingTemplate(GetLibraryBook(), template, dirFullPath, extension, Replacements)
-			.GetFilePath(extension)
-			.PathWithoutPrefix
-			.Should().Be(expected);
+			Templates.TryGetTemplate<Templates.FileTemplate>(template, out var fileTemplate).Should().BeTrue();
+
+			fileTemplate
+				.GetFilename(GetLibraryBook(), dirFullPath, extension, Replacements)
+				.PathWithoutPrefix
+				.Should().Be(expected);
+		}
+
+		[TestMethod]
+		[DataRow("<bitrate>Kbps <samplerate>Hz", "128Kbps 44100Hz")]
+		[DataRow("<bitrate>Kbps <samplerate[6]>Hz", "128Kbps 044100Hz")]
+		[DataRow("<bitrate[4]>Kbps <samplerate>Hz", "0128Kbps 44100Hz")]
+		[DataRow("<bitrate[4]>Kbps <titleshort[u]>", "0128Kbps A STUDY IN SCARLET")]
+		[DataRow("<bitrate[4]>Kbps <titleshort[l]>", "0128Kbps a study in scarlet")]
+		[DataRow("<bitrate[4]>Kbps <samplerate[6]>Hz", "0128Kbps 044100Hz")]
+		[DataRow("<bitrate  [ 4 ]  >Kbps <samplerate   [  6  ]   >Hz", "0128Kbps 044100Hz")]
+		public void FormatTags(string template, string expected)
+		{
+			Templates.TryGetTemplate<Templates.FileTemplate>(template, out var fileTemplate).Should().BeTrue();
+			fileTemplate.GetFilename(GetLibraryBook(), "", "", Replacements).PathWithoutPrefix.Should().Be(expected);
 		}
 
 		[TestMethod]
@@ -143,8 +140,9 @@ namespace TemplatesTests
 				expected = expected.Replace("C:", "").Replace('\\', '/');
 			}
 
-			Templates.getFileNamingTemplate(GetLibraryBook(), template, dirFullPath, extension, Replacements)
-				.GetFilePath(extension)
+			Templates.TryGetTemplate<Templates.FileTemplate>(template, out var fileTemplate).Should().BeTrue();
+			fileTemplate
+				.GetFilename(GetLibraryBook(), dirFullPath, extension, Replacements)
 				.PathWithoutPrefix
 				.Should().Be(expected);
 		}
@@ -168,11 +166,12 @@ namespace TemplatesTests
 			if (Environment.OSVersion.Platform is not PlatformID.Win32NT)
 			{
 				dirFullPath = dirFullPath.Replace("C:", "").Replace('\\', '/');
-				expected = expected.Replace("C:", "").Replace('\\', '/').Replace('＜', '<').Replace('＞','>');
+				expected = expected.Replace("C:", "").Replace('\\', '/').Replace('＜', '<').Replace('＞', '>');
 			}
 
-			Templates.getFileNamingTemplate(GetLibraryBook(), template, dirFullPath, extension, Replacements)
-				.GetFilePath(extension)
+			Templates.TryGetTemplate<Templates.FileTemplate>(template, out var fileTemplate).Should().BeTrue();
+			fileTemplate
+				.GetFilename(GetLibraryBook(), dirFullPath, extension, Replacements)
 				.PathWithoutPrefix
 				.Should().Be(expected);
 		}
@@ -189,8 +188,9 @@ namespace TemplatesTests
 				expected = expected.Replace("C:", "").Replace('\\', '/');
 			}
 
-			Templates.getFileNamingTemplate(GetLibraryBook(), template, dirFullPath, extension, Replacements)
-				.GetFilePath(extension)
+			Templates.TryGetTemplate<Templates.FileTemplate>(template, out var fileTemplate).Should().BeTrue();
+			fileTemplate
+				.GetFilename(GetLibraryBook(), dirFullPath, extension, Replacements)
 				.PathWithoutPrefix
 				.Should().Be(expected);
 		}
@@ -206,13 +206,13 @@ namespace TemplatesTests
 		{
 			if (Environment.OSVersion.Platform == platformID)
 			{
-				Templates.File.HasWarnings(template).Should().BeTrue();
-				Templates.File.HasWarnings(Templates.File.Sanitize(template, Replacements)).Should().BeFalse();
-				Templates.getFileNamingTemplate(GetLibraryBook(), template, dirFullPath, extension, Replacements)
-					.GetFilePath(extension)
+				Templates.TryGetTemplate<Templates.FileTemplate>(template, out var fileTemplate).Should().BeTrue();
+
+				fileTemplate.HasWarnings.Should().BeFalse();
+				fileTemplate
+					.GetFilename(GetLibraryBook(), dirFullPath, extension, Replacements)
 					.PathWithoutPrefix
 					.Should().Be(expected);
-
 			}
 		}
 
@@ -227,11 +227,15 @@ namespace TemplatesTests
 				expected = expected.Replace("C:", "").Replace('\\', '/');
 			}
 
-			Templates.getFileNamingTemplate(GetLibraryBookWithNullDates(), template, dirFullPath, extension, Replacements)
-				.GetFilePath(extension)
+			var lbDto = GetLibraryBook();
+			lbDto.DatePublished = null;
+			lbDto.DateAdded = null;
+
+			Templates.TryGetTemplate<Templates.FileTemplate>(template, out var fileTemplate).Should().BeTrue();
+			fileTemplate
+				.GetFilename(lbDto, dirFullPath, extension, Replacements)
 				.PathWithoutPrefix
 				.Should().Be(expected);
-
 		}
 
 		[TestMethod]
@@ -240,10 +244,14 @@ namespace TemplatesTests
 		public void IfSeries_empty(string directory, string expected, PlatformID platformID)
 		{
 			if (Environment.OSVersion.Platform == platformID)
-				Templates.getFileNamingTemplate(GetLibraryBook(), "foo<if series-><-if series>bar", directory, "ext", Replacements)
-				.GetFilePath(".ext")
-				.PathWithoutPrefix
-				.Should().Be(expected);
+			{
+				Templates.TryGetTemplate<Templates.FileTemplate>("foo<if series-><-if series>bar", out var fileTemplate).Should().BeTrue();
+
+				fileTemplate
+					.GetFilename(GetLibraryBook(), directory, "ext", Replacements)
+					.PathWithoutPrefix
+					.Should().Be(expected);
+			}
 		}
 
 		[TestMethod]
@@ -252,10 +260,13 @@ namespace TemplatesTests
 		public void IfSeries_no_series(string directory, string expected, PlatformID platformID)
 		{
 			if (Environment.OSVersion.Platform == platformID)
-				Templates.getFileNamingTemplate(GetLibraryBook(null), "foo<if series->-<series>-<id>-<-if series>bar", directory, "ext", Replacements)
-				.GetFilePath(".ext")
+			{
+				Templates.TryGetTemplate<Templates.FileTemplate>("foo<if series->-<series>-<id>-<-if series>bar", out var fileTemplate).Should().BeTrue();
+
+				fileTemplate.GetFilename(GetLibraryBook(null), directory, "ext", Replacements)
 				.PathWithoutPrefix
 				.Should().Be(expected);
+			}
 		}
 
 		[TestMethod]
@@ -264,10 +275,128 @@ namespace TemplatesTests
 		public void IfSeries_with_series(string directory, string expected, PlatformID platformID)
 		{
 			if (Environment.OSVersion.Platform == platformID)
-				Templates.getFileNamingTemplate(GetLibraryBook(), "foo<if series->-<series>-<id>-<-if series>bar", directory, "ext", Replacements)
-				.GetFilePath(".ext")
-				.PathWithoutPrefix
-				.Should().Be(expected);
+			{
+				Templates.TryGetTemplate<Templates.FileTemplate>("foo<if series->-<series>-<id>-<-if series>bar", out var fileTemplate).Should().BeTrue();
+
+				fileTemplate
+					.GetFilename(GetLibraryBook(), directory, "ext", Replacements)
+					.PathWithoutPrefix
+					.Should().Be(expected);
+			}
+		}
+	}
+}
+
+
+namespace Templates_Other
+{
+
+	[TestClass]
+	public class GetFilePath
+	{
+		static ReplacementCharacters Replacements = ReplacementCharacters.Default;
+
+		[TestMethod]
+		[DataRow(@"C:\foo\bar", @"\\Folder\<title>\[<id>]\\", @"C:\foo\bar\Folder\my꞉ book 000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000\[ID123456].txt", PlatformID.Win32NT)]
+		[DataRow("/foo/bar", "/Folder/<title>/[<id>]/", @"/foo/bar/Folder/my: book 000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000/[ID123456].txt", PlatformID.Unix)]
+		[DataRow(@"C:\foo\bar", @"\Folder\<title> [<id>]", @"C:\foo\bar\Folder\my꞉ book 0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 [ID123456].txt", PlatformID.Win32NT)]
+		[DataRow("/foo/bar", "/Folder/<title> [<id>]", @"/foo/bar/Folder/my: book 0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 [ID123456].txt", PlatformID.Unix)]
+		[DataRow(@"C:\foo\bar", @"\Folder\<title> <title> <title> <title> <title> <title> <title> <title> <title> [<id>]", @"C:\foo\bar\Folder\my꞉ book 0000000000000000 my꞉ book 0000000000000000 my꞉ book 0000000000000000 my꞉ book 0000000000000000 my꞉ book 0000000000000000 my꞉ book 0000000000000000 my꞉ book 0000000000000000 my꞉ book 00000000000000000 my꞉ book 00000000000000000 [ID123456].txt", PlatformID.Win32NT)]
+		[DataRow("/foo/bar", "/Folder/<title> <title> <title> <title> <title> <title> <title> <title> <title> [<id>]", @"/foo/bar/Folder/my: book 0000000000000000 my: book 0000000000000000 my: book 0000000000000000 my: book 0000000000000000 my: book 0000000000000000 my: book 0000000000000000 my: book 0000000000000000 my: book 00000000000000000 my: book 00000000000000000 [ID123456].txt", PlatformID.Unix)]
+		[DataRow(@"C:\foo\bar", @"\<title>\<title> [<id>]", @"C:\foo\bar\my꞉ book 000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000\my꞉ book 0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 [ID123456].txt", PlatformID.Win32NT)]
+		[DataRow("/foo/bar", @"/<title>/<title> [<id>]", "/foo/bar/my: book 000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000/my: book 0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 [ID123456].txt", PlatformID.Unix)]
+		public void Test_trim_to_max_path(string dirFullPath, string template, string expected, PlatformID platformID)
+		{
+			if (Environment.OSVersion.Platform != platformID)
+				return;
+
+			var sb = new System.Text.StringBuilder();
+			sb.Append('0', 300);
+			var longText = sb.ToString();
+
+			NEW_GetValidFilename_FileNamingTemplate(dirFullPath, template, "my: book " + longText, "txt").Should().Be(expected);
+		}
+
+		[TestMethod]
+		[DataRow(@"\foo\bar", @"<title>\<title>")]
+		[DataRow(@"\foooo\barrrr", "<title>")]
+		public void Test_windows_relative_path_too_long(string baseDir, string template)
+		{
+			if (Environment.OSVersion.Platform != PlatformID.Win32NT)
+				return;
+
+			var sb = new System.Text.StringBuilder();
+			sb.Append('0', 300);
+			var longText = sb.ToString();
+			Assert.ThrowsException<PathTooLongException>(() => NEW_GetValidFilename_FileNamingTemplate(baseDir, template, "my: book " + longText, "txt"));
+		}
+
+		private class TemplateTag : ITemplateTag
+		{
+			public string TagName { get; init; }
+			public string DefaultValue { get; }
+			public string Description { get; }
+			public string Display { get; }
+		}
+		private static string NEW_GetValidFilename_FileNamingTemplate(string dirFullPath, string template, string title, string extension)
+		{
+			extension = FileUtility.GetStandardizedExtension(extension);
+
+			var lbDto = GetLibraryBook();
+			lbDto.Title = title;
+			lbDto.AudibleProductId = "ID123456";
+
+			Templates.TryGetTemplate<Templates.FolderTemplate>(template, out var fileNamingTemplate).Should().BeTrue();
+
+			return fileNamingTemplate.GetFilename(lbDto, dirFullPath, extension, Replacements).PathWithoutPrefix;
+		}
+
+		[TestMethod]
+		[DataRow(@"C:\foo\bar\my file.txt", @"C:\foo\bar\my file - 002 - title.txt", PlatformID.Win32NT)]
+		[DataRow(@"/foo/bar/my file.txt", @"/foo/bar/my file - 002 - title.txt", PlatformID.Unix)]
+		public void equiv_GetMultipartFileName(string inStr, string outStr, PlatformID platformID)
+		{
+			if (Environment.OSVersion.Platform == platformID)
+				NEW_GetMultipartFileName_FileNamingTemplate(inStr, 2, 100, "title").Should().Be(outStr);
+		}
+
+		private static string NEW_GetMultipartFileName_FileNamingTemplate(string originalPath, int partsPosition, int partsTotal, string suffix)
+		{
+			// 1-9     => 1-9
+			// 10-99   => 01-99
+			// 100-999 => 001-999
+
+			var estension = Path.GetExtension(originalPath);
+			var dir = Path.GetDirectoryName(originalPath);
+			var template = Path.GetFileNameWithoutExtension(originalPath) + " - <ch# 0> - <title>" + estension;
+
+			var lbDto = GetLibraryBook();
+			lbDto.Title = suffix;
+
+			Templates.TryGetTemplate<Templates.ChapterFileTemplate>(template, out var chapterFileTemplate).Should().BeTrue();
+
+			return chapterFileTemplate
+				.GetFilename(lbDto, new AaxDecrypter.MultiConvertFileProperties { Title = suffix, PartsTotal = partsTotal, PartsPosition = partsPosition }, dir, estension, Replacements)
+				.PathWithoutPrefix;
+		}
+
+		[TestMethod]
+		[DataRow(@"\foo\<title>.txt", @"\foo\sl∕as∕he∕s.txt", PlatformID.Win32NT)]
+		[DataRow(@"/foo/<title>.txt", @"/foo/s\l∕a\s∕h\e∕s.txt", PlatformID.Unix)]
+		public void remove_slashes(string inStr, string outStr, PlatformID platformID)
+		{
+			if (Environment.OSVersion.Platform == platformID)
+			{
+				var lbDto = GetLibraryBook();
+				lbDto.Title = @"s\l/a\s/h\e/s";
+
+				var directory = Path.GetDirectoryName(inStr);
+				var fileName = Path.GetFileName(inStr);
+
+				Templates.TryGetTemplate<Templates.FileTemplate>(fileName, out var fileNamingTemplate).Should().BeTrue();
+
+				fileNamingTemplate.GetFilename(lbDto, directory, "txt", Replacements).PathWithoutPrefix.Should().Be(outStr);
+			}
 		}
 	}
 }
@@ -278,7 +407,7 @@ namespace Templates_Folder_Tests
 	public class GetErrors
 	{
 		[TestMethod]
-		public void null_is_invalid() => Tests(null, new[] { Templates.ERROR_NULL_IS_INVALID });
+		public void null_is_invalid() => Tests(null, PlatformID.Win32NT | PlatformID.Unix, new[] { NamingTemplate.ERROR_NULL_IS_INVALID });
 
 		[TestMethod]
 		public void empty_is_valid() => valid_tests("");
@@ -294,15 +423,19 @@ namespace Templates_Folder_Tests
 		[DataRow(@"foo\bar")]
 		[DataRow(@"<id>")]
 		[DataRow(@"<id>\<title>")]
-		public void valid_tests(string template) => Tests(template, Array.Empty<string>());
+		public void valid_tests(string template) => Tests(template, PlatformID.Win32NT | PlatformID.Unix, Array.Empty<string>());
 
 		[TestMethod]
-		[DataRow(@"C:\", Templates.ERROR_FULL_PATH_IS_INVALID)]
-		public void Tests(string template, params string[] expected)
+		[DataRow(@"C:\", PlatformID.Win32NT, Templates.ERROR_FULL_PATH_IS_INVALID)]
+		public void Tests(string template, PlatformID platformID, params string[] expected)
 		{
-			var result = Templates.Folder.GetErrors(template);
-			result.Count().Should().Be(expected.Length);
-			result.Should().BeEquivalentTo(expected);
+			if ((platformID & Environment.OSVersion.Platform) == Environment.OSVersion.Platform)
+			{
+				Templates.TryGetTemplate<Templates.FolderTemplate>(template, out var folderTemplate);
+				var result = folderTemplate.Errors;
+				result.Should().HaveCount(expected.Length);
+				result.Should().BeEquivalentTo(expected);
+			}
 		}
 	}
 
@@ -310,50 +443,57 @@ namespace Templates_Folder_Tests
 	public class IsValid
 	{
 		[TestMethod]
-		public void null_is_invalid() => Tests(null, false);
+		public void null_is_invalid() => Templates.TryGetTemplate<Templates.FolderTemplate>(null, out _).Should().BeFalse();
 
 		[TestMethod]
-		public void empty_is_valid() => Tests("", true);
+		public void empty_is_valid() => Tests("", true, PlatformID.Win32NT | PlatformID.Unix);
 
 		[TestMethod]
-		public void whitespace_is_valid() => Tests("   ", true);
+		public void whitespace_is_valid() => Tests("   ", true, PlatformID.Win32NT | PlatformID.Unix);
 
 		[TestMethod]
-		[DataRow(@"C:\", false)]
-		[DataRow(@"foo", true)]
-		[DataRow(@"\foo", true)]
-		[DataRow(@"foo\", true)]
-		[DataRow(@"\foo\", true)]
-		[DataRow(@"foo\bar", true)]
-		[DataRow(@"<id>", true)]
-		[DataRow(@"<id>\<title>", true)]
-		public void Tests(string template, bool expected) => Templates.Folder.IsValid(template).Should().Be(expected);
+		[DataRow(@"C:\", false, PlatformID.Win32NT)]
+		[DataRow(@"foo", true, PlatformID.Win32NT | PlatformID.Unix)]
+		[DataRow(@"\foo", true, PlatformID.Win32NT | PlatformID.Unix)]
+		[DataRow(@"foo\", true, PlatformID.Win32NT | PlatformID.Unix)]
+		[DataRow(@"\foo\", true, PlatformID.Win32NT | PlatformID.Unix)]
+		[DataRow(@"foo\bar", true, PlatformID.Win32NT | PlatformID.Unix)]
+		[DataRow(@"<id>", true, PlatformID.Win32NT | PlatformID.Unix)]
+		[DataRow(@"<id>\<title>", true, PlatformID.Win32NT | PlatformID.Unix)]
+		public void Tests(string template, bool expected, PlatformID platformID)
+		{
+			if ((platformID & Environment.OSVersion.Platform) == Environment.OSVersion.Platform)
+			{
+				Templates.TryGetTemplate<Templates.FolderTemplate>(template, out var folderTemplate).Should().BeTrue();
+				folderTemplate.IsValid.Should().Be(expected);
+			}
+		}
 	}
 
 	[TestClass]
 	public class GetWarnings
 	{
 		[TestMethod]
-		public void null_is_invalid() => Tests(null, new[] { Templates.ERROR_NULL_IS_INVALID });
+		public void null_is_invalid() => Tests(null, new[] { NamingTemplate.ERROR_NULL_IS_INVALID });
 
 		[TestMethod]
-		public void empty_has_warnings() => Tests("", Templates.WARNING_EMPTY, Templates.WARNING_NO_TAGS);
+		public void empty_has_warnings() => Tests("", NamingTemplate.WARNING_EMPTY, NamingTemplate.WARNING_NO_TAGS);
 
 		[TestMethod]
-		public void whitespace_has_warnings() => Tests("   ", Templates.WARNING_WHITE_SPACE, Templates.WARNING_NO_TAGS);
+		public void whitespace_has_warnings() => Tests("   ", NamingTemplate.WARNING_WHITE_SPACE, NamingTemplate.WARNING_NO_TAGS);
 
 		[TestMethod]
 		[DataRow(@"<id>\foo\bar")]
 		public void valid_tests(string template) => Tests(template, Array.Empty<string>());
 
 		[TestMethod]
-		[DataRow(@"no tags", Templates.WARNING_NO_TAGS)]
-		[DataRow("<ch#> <id>", Templates.WARNING_HAS_CHAPTER_TAGS)]
-		[DataRow("<ch#> chapter tag", Templates.WARNING_NO_TAGS, Templates.WARNING_HAS_CHAPTER_TAGS)]
+		[DataRow(@"no tags", NamingTemplate.WARNING_NO_TAGS)]
+		[DataRow("<ch#> chapter tag", NamingTemplate.WARNING_NO_TAGS)]
 		public void Tests(string template, params string[] expected)
 		{
-			var result = Templates.Folder.GetWarnings(template);
-			result.Count().Should().Be(expected.Length);
+			Templates.TryGetTemplate<Templates.FolderTemplate>(template, out var folderTemplate);
+			var result = folderTemplate.Warnings;
+			result.Should().HaveCount(expected.Length);
 			result.Should().BeEquivalentTo(expected);
 		}
 	}
@@ -373,16 +513,23 @@ namespace Templates_Folder_Tests
 		[TestMethod]
 		[DataRow(@"no tags", true)]
 		[DataRow(@"<id>\foo\bar", false)]
-		[DataRow("<ch#> <id>", true)]
 		[DataRow("<ch#> chapter tag", true)]
-		public void Tests(string template, bool expected) => Templates.Folder.HasWarnings(template).Should().Be(expected);
+		public void Tests(string template, bool expected)
+		{
+			Templates.TryGetTemplate<Templates.FolderTemplate>(template, out var folderTemplate);
+			folderTemplate.HasWarnings.Should().Be(expected);
+		}
 	}
 
 	[TestClass]
 	public class TagCount
 	{
 		[TestMethod]
-		public void null_throws() => Assert.ThrowsException<NullReferenceException>(() => Templates.Folder.TagCount(null));
+		public void null_invalid()
+		{
+			Templates.TryGetTemplate<Templates.FolderTemplate>(null, out var template).Should().BeFalse();
+			template.IsValid.Should().BeFalse();
+		}
 
 		[TestMethod]
 		public void empty() => Tests("", 0);
@@ -400,7 +547,11 @@ namespace Templates_Folder_Tests
 		[DataRow("<not a real tag>", 0)]
 		[DataRow("<ch#> non-folder tag", 0)]
 		[DataRow("<ID> case specific", 0)]
-		public void Tests(string template, int expected) => Templates.Folder.TagCount(template).Should().Be(expected);
+		public void Tests(string template, int expected)
+		{
+			Templates.TryGetTemplate<Templates.FolderTemplate>(template, out var folderTemplate).Should().BeTrue();
+			folderTemplate.TagsInUse.Count().Should().Be(expected);
+		}
 	}
 }
 
@@ -410,7 +561,7 @@ namespace Templates_File_Tests
 	public class GetErrors
 	{
 		[TestMethod]
-		public void null_is_invalid() => Tests(null, Environment.OSVersion.Platform, new[] { Templates.ERROR_NULL_IS_INVALID });
+		public void null_is_invalid() => Tests(null, Environment.OSVersion.Platform, new[] { NamingTemplate.ERROR_NULL_IS_INVALID });
 
 		[TestMethod]
 		public void empty_is_valid() => valid_tests("");
@@ -423,19 +574,13 @@ namespace Templates_File_Tests
 		[DataRow(@"<id>")]
 		public void valid_tests(string template) => Tests(template, Environment.OSVersion.Platform, Array.Empty<string>());
 
-
-		[TestMethod]
-		[DataRow(@"C:\", PlatformID.Win32NT, Templates.ERROR_INVALID_FILE_NAME_CHAR)]
-		[DataRow(@"/", PlatformID.Unix, Templates.ERROR_INVALID_FILE_NAME_CHAR)]
-		[DataRow(@"\foo", PlatformID.Win32NT, Templates.ERROR_INVALID_FILE_NAME_CHAR)]
-		[DataRow(@"/foo", PlatformID.Win32NT, Templates.ERROR_INVALID_FILE_NAME_CHAR)]
-		[DataRow(@"/foo", PlatformID.Unix, Templates.ERROR_INVALID_FILE_NAME_CHAR)]
 		public void Tests(string template, PlatformID platformID, params string[] expected)
 		{
 			if (Environment.OSVersion.Platform == platformID)
 			{
-				var result = Templates.File.GetErrors(template);
-				result.Count().Should().Be(expected.Length);
+				Templates.TryGetTemplate<Templates.FileTemplate>(template, out var fileTemplate);
+				var result = fileTemplate.Errors;
+				result.Should().HaveCount(expected.Length);
 				result.Should().BeEquivalentTo(expected);
 			}
 		}
@@ -445,28 +590,26 @@ namespace Templates_File_Tests
 	public class IsValid
 	{
 		[TestMethod]
-		public void null_is_invalid() => Tests(null, false, Environment.OSVersion.Platform);
+		public void null_is_invalid() => Templates.TryGetTemplate<Templates.FileTemplate>(null, out _).Should().BeFalse();
 
 		[TestMethod]
-		public void empty_is_valid() => Tests("", true, Environment.OSVersion.Platform);
+		public void empty_is_valid() => Tests("", true);
 
 		[TestMethod]
-		public void whitespace_is_valid() => Tests("   ", true, Environment.OSVersion.Platform);
+		public void whitespace_is_valid() => Tests("   ", true);
 
 		[TestMethod]
-		[DataRow(@"C:\", false, PlatformID.Win32NT)]
-		[DataRow(@"/", false, PlatformID.Unix)]
-		[DataRow(@"foo", true, PlatformID.Win32NT)]
-		[DataRow(@"foo", true, PlatformID.Unix)]
-		[DataRow(@"\foo", false, PlatformID.Win32NT)]
-		[DataRow(@"\foo", true, PlatformID.Unix)]
-		[DataRow(@"/foo", false, PlatformID.Win32NT)]
-		[DataRow(@"<id>", true, PlatformID.Win32NT)]
-		[DataRow(@"<id>", true, PlatformID.Unix)]
-		public void Tests(string template, bool expected, PlatformID platformID)
+		[DataRow(@"foo", true)]
+		[DataRow(@"\foo", true)]
+		[DataRow(@"foo\", true)]
+		[DataRow(@"\foo\", true)]
+		[DataRow(@"foo\bar", true)]
+		[DataRow(@"<id>", true)]
+		[DataRow(@"<id>\<title>", true)]
+		public void Tests(string template, bool expected)
 		{
-			if (Environment.OSVersion.Platform == platformID)
-						Templates.File.IsValid(template).Should().Be(expected);	
+			Templates.TryGetTemplate<Templates.FileTemplate>(template, out var folderTemplate).Should().BeTrue();
+			folderTemplate.IsValid.Should().Be(expected);
 		}
 	}
 
@@ -497,13 +640,13 @@ namespace Templates_ChapterFile_Tests
 	public class GetWarnings
 	{
 		[TestMethod]
-		public void null_is_invalid() => Tests(null, null, new[] { Templates.ERROR_NULL_IS_INVALID });
+		public void null_is_invalid() => Tests(null, null, new[] { NamingTemplate.ERROR_NULL_IS_INVALID, Templates.WARNING_NO_CHAPTER_NUMBER_TAG });
 
 		[TestMethod]
-		public void empty_has_warnings() => Tests("", null, Templates.WARNING_EMPTY, Templates.WARNING_NO_TAGS, Templates.WARNING_NO_CHAPTER_NUMBER_TAG);
+		public void empty_has_warnings() => Tests("", null, NamingTemplate.WARNING_EMPTY, NamingTemplate.WARNING_NO_TAGS, Templates.WARNING_NO_CHAPTER_NUMBER_TAG);
 
 		[TestMethod]
-		public void whitespace_has_warnings() => Tests("   ", null, Templates.WARNING_WHITE_SPACE, Templates.WARNING_NO_TAGS, Templates.WARNING_NO_CHAPTER_NUMBER_TAG);
+		public void whitespace_has_warnings() => Tests("   ", null, NamingTemplate.WARNING_WHITE_SPACE, NamingTemplate.WARNING_NO_TAGS, Templates.WARNING_NO_CHAPTER_NUMBER_TAG);
 
 		[TestMethod]
 		[DataRow("<ch#>")]
@@ -511,18 +654,20 @@ namespace Templates_ChapterFile_Tests
 		public void valid_tests(string template) => Tests(template, null, Array.Empty<string>());
 
 		[TestMethod]
-		[DataRow(@"no tags", null, Templates.WARNING_NO_TAGS, Templates.WARNING_NO_CHAPTER_NUMBER_TAG)]
-		[DataRow(@"<id>\foo\bar", true, Templates.ERROR_INVALID_FILE_NAME_CHAR, Templates.WARNING_NO_CHAPTER_NUMBER_TAG)]
-		[DataRow(@"<id>/foo/bar", false, Templates.ERROR_INVALID_FILE_NAME_CHAR, Templates.WARNING_NO_CHAPTER_NUMBER_TAG)]
-		[DataRow("<chapter count> -- chapter tag but not ch# or ch_#", null, Templates.WARNING_NO_TAGS, Templates.WARNING_NO_CHAPTER_NUMBER_TAG)]
+		[DataRow(@"no tags", null, NamingTemplate.WARNING_NO_TAGS, Templates.WARNING_NO_CHAPTER_NUMBER_TAG)]
+		[DataRow(@"<id>\foo\bar", true, Templates.WARNING_NO_CHAPTER_NUMBER_TAG)]
+		[DataRow(@"<id>/foo/bar", false, Templates.WARNING_NO_CHAPTER_NUMBER_TAG)]
+		[DataRow("<chapter count> -- chapter tag but not ch# or ch_#", null, NamingTemplate.WARNING_NO_TAGS, Templates.WARNING_NO_CHAPTER_NUMBER_TAG)]
 		public void Tests(string template, bool? windows, params string[] expected)
 		{
-			if(windows is null
+			if (windows is null
 			|| (windows is true && Environment.OSVersion.Platform is PlatformID.Win32NT)
 			|| (windows is false && Environment.OSVersion.Platform is PlatformID.Unix))
 			{
-				var result = Templates.ChapterFile.GetWarnings(template);
-				result.Count().Should().Be(expected.Length);
+
+				Templates.TryGetTemplate<Templates.ChapterFileTemplate>(template, out var chapterFileTemplate);
+				var result = chapterFileTemplate.Warnings;
+				result.Should().HaveCount(expected.Length);
 				result.Should().BeEquivalentTo(expected);
 			}
 		}
@@ -546,14 +691,18 @@ namespace Templates_ChapterFile_Tests
 		[DataRow("<ch#> <id>", false)]
 		[DataRow("<ch#> -- chapter tag", false)]
 		[DataRow("<chapter count> -- chapter tag but not ch# or ch_#", true)]
-		public void Tests(string template, bool expected) => Templates.ChapterFile.HasWarnings(template).Should().Be(expected);
+		public void Tests(string template, bool expected)
+		{
+			Templates.TryGetTemplate<Templates.ChapterFileTemplate>(template, out var chapterFileTemplate);
+			chapterFileTemplate.HasWarnings.Should().Be(expected);
+		}
 	}
 
 	[TestClass]
 	public class TagCount
 	{
 		[TestMethod]
-		public void null_is_not_recommended() => Assert.ThrowsException<NullReferenceException>(() => Tests(null, -1));
+		public void null_is_not_recommended() => Templates.TryGetTemplate<Templates.ChapterFileTemplate>(null, out _).Should().BeFalse();
 
 		[TestMethod]
 		public void empty_is_not_recommended() => Tests("", 0);
@@ -571,11 +720,15 @@ namespace Templates_ChapterFile_Tests
 		[DataRow("<not a real tag>", 0)]
 		[DataRow("<ch#> non-folder tag", 1)]
 		[DataRow("<ID> case specific", 0)]
-		public void Tests(string template, int expected) => Templates.ChapterFile.TagCount(template).Should().Be(expected);
+		public void Tests(string template, int expected)
+		{
+			Templates.TryGetTemplate<Templates.ChapterFileTemplate>(template, out var chapterFileTemplate).Should().BeTrue();
+			chapterFileTemplate.TagsInUse.Count().Should().Be(expected);
+		}
 	}
 
 	[TestClass]
-	public class GetPortionFilename
+	public class GetFilename
 	{
 		static readonly ReplacementCharacters Default = ReplacementCharacters.Default;
 
@@ -587,8 +740,13 @@ namespace Templates_ChapterFile_Tests
 		public void Tests(string template, string dir, string ext, int pos, int total, string chapter, string expected, PlatformID platformID)
 		{
 			if (Environment.OSVersion.Platform == platformID)
-				Templates.ChapterFile.GetPortionFilename(GetLibraryBook(), template, new() { OutputFileName = $"xyz.{ext}", PartsPosition = pos, PartsTotal = total, Title = chapter }, dir, Default)
-				.Should().Be(expected);
+			{
+				Templates.TryGetTemplate<Templates.ChapterFileTemplate>(template, out var chapterTemplate).Should().BeTrue();
+				chapterTemplate
+					.GetFilename(GetLibraryBook(), new() { OutputFileName = $"xyz.{ext}", PartsPosition = pos, PartsTotal = total, Title = chapter }, dir, ext, Default)
+					.PathWithoutPrefix
+					.Should().Be(expected);
+			}
 		}
 	}
 }

Source/_Tests/LibationSearchEngine.Tests/LibationSearchEngine.Tests.csproj

@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="FluentAssertions" Version="6.8.0" />
+    <PackageReference Include="FluentAssertions" Version="6.9.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
     <PackageReference Include="Moq" Version="4.18.4" />
     <PackageReference Include="MSTest.TestAdapter" Version="3.0.2" />