Bugfix: template validation was opposite #142

File extensions: Dinah.Core => Libation FileUtility

AaxDecrypter/AaxDecrypter.csproj

@@ -5,8 +5,12 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="AAXClean" Version="0.1.9" />
-    <PackageReference Include="Dinah.Core" Version="1.1.1.2" />
+    <PackageReference Include="AAXClean" Version="0.1.10" />
+    <PackageReference Include="Dinah.Core" Version="2.0.2.1" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\FileManager\FileManager.csproj" />
   </ItemGroup>
 
 </Project>

AaxDecrypter/AaxcDownloadConvertBase.cs

@@ -0,0 +1,91 @@
+using System;
+using AAXClean;
+using Dinah.Core.Net.Http;
+
+namespace AaxDecrypter
+{
+	public abstract class AaxcDownloadConvertBase : AudiobookDownloadBase
+	{
+		protected OutputFormat OutputFormat { get; }
+
+		protected AaxFile AaxFile;
+
+		protected AaxcDownloadConvertBase(string outFileName, string cacheDirectory, DownloadLicense dlLic, OutputFormat outputFormat)
+			: base(outFileName, cacheDirectory, dlLic)
+		{
+			OutputFormat = outputFormat;
+		}
+
+		/// <summary>Setting cover art by this method will insert the art into the audiobook metadata</summary>
+		public override void SetCoverArt(byte[] coverArt)
+		{
+			base.SetCoverArt(coverArt);
+			if (coverArt is not null)
+				AaxFile?.AppleTags.SetCoverArt(coverArt);
+		}
+
+		protected bool Step_GetMetadata()
+		{
+			AaxFile = new AaxFile(InputFileStream);
+
+			OnRetrievedTitle(AaxFile.AppleTags.TitleSansUnabridged);
+			OnRetrievedAuthors(AaxFile.AppleTags.FirstAuthor ?? "[unknown]");
+			OnRetrievedNarrators(AaxFile.AppleTags.Narrator ?? "[unknown]");
+			OnRetrievedCoverArt(AaxFile.AppleTags.Cover);
+
+			return !IsCanceled;
+		}
+
+		protected DownloadProgress Step_DownloadAudiobook_Start()
+		{
+			var zeroProgress = new DownloadProgress
+			{
+				BytesReceived = 0,
+				ProgressPercentage = 0,
+				TotalBytesToReceive = InputFileStream.Length
+			};
+
+			OnDecryptProgressUpdate(zeroProgress);
+
+			AaxFile.SetDecryptionKey(DownloadLicense.AudibleKey, DownloadLicense.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 estTimeRemaining = remainingSecsToProcess / e.ProcessSpeed;
+
+			if (double.IsNormal(estTimeRemaining))
+				OnDecryptTimeRemaining(TimeSpan.FromSeconds(estTimeRemaining));
+
+			var progressPercent = e.ProcessPosition.TotalSeconds / duration.TotalSeconds;
+
+			OnDecryptProgressUpdate(
+				new DownloadProgress
+				{
+					ProgressPercentage = 100 * progressPercent,
+					BytesReceived = (long)(InputFileStream.Length * progressPercent),
+					TotalBytesToReceive = InputFileStream.Length
+				});
+		}
+
+		public override void Cancel()
+		{
+			IsCanceled = true;
+			AaxFile?.Cancel();
+			AaxFile?.Dispose();
+			CloseInputFileStream();
+		}
+	}
+}

AaxDecrypter/AaxcDownloadConverter.cs

@@ -1,178 +0,0 @@
-using AAXClean;
-using Dinah.Core.IO;
-using Dinah.Core.Net.Http;
-using Dinah.Core.StepRunner;
-using System;
-using System.IO;
-
-namespace AaxDecrypter
-{
-    public class AaxcDownloadConverter : AudiobookDownloadBase
-    {
-        protected override StepSequence steps { get; }
-
-        private AaxFile aaxFile;
-
-        private OutputFormat OutputFormat { get; }
-
-        public AaxcDownloadConverter(string outFileName, string cacheDirectory, DownloadLicense dlLic, OutputFormat outputFormat, bool splitFileByChapters)
-            :base(outFileName, cacheDirectory, dlLic)
-        {
-            OutputFormat = outputFormat;
-
-            steps = new StepSequence
-            {
-                Name = "Download and Convert Aaxc To " + OutputFormat,
-
-                ["Step 1: Get Aaxc Metadata"] = Step1_GetMetadata,
-                ["Step 2: Download Decrypted Audiobook"] = splitFileByChapters
-                    ? Step2_DownloadAudiobookAsMultipleFilesPerChapter
-                    : Step2_DownloadAudiobookAsSingleFile,
-                ["Step 3: Create Cue"] = splitFileByChapters 
-                    ? () => true 
-                    : Step3_CreateCue,
-                ["Step 4: Cleanup"] = Step4_Cleanup,
-            };
-        }
-
-        /// <summary>
-        /// Setting cover art by this method will insert the art into the audiobook metadata
-        /// </summary>
-        public override void SetCoverArt(byte[] coverArt)
-        {
-            base.SetCoverArt(coverArt);
-
-            aaxFile?.AppleTags.SetCoverArt(coverArt);
-        }
-
-        protected override bool Step1_GetMetadata()
-        {    
-            aaxFile = new AaxFile(InputFileStream);
-
-            OnRetrievedTitle(aaxFile.AppleTags.TitleSansUnabridged);
-            OnRetrievedAuthors(aaxFile.AppleTags.FirstAuthor ?? "[unknown]");
-            OnRetrievedNarrators(aaxFile.AppleTags.Narrator ?? "[unknown]");
-            OnRetrievedCoverArt(aaxFile.AppleTags.Cover);
-
-            return !isCanceled;
-        }
-
-        protected override bool Step2_DownloadAudiobookAsSingleFile()
-        {
-            var zeroProgress = Step2_Start();
-            
-            if (File.Exists(outputFileName))
-                FileExt.SafeDelete(outputFileName);
-
-            var outputFile =  File.Open(outputFileName, FileMode.OpenOrCreate, FileAccess.ReadWrite);
-
-            aaxFile.ConversionProgressUpdate += AaxFile_ConversionProgressUpdate;
-            var decryptionResult = OutputFormat == OutputFormat.M4b ? aaxFile.ConvertToMp4a(outputFile, downloadLicense.ChapterInfo) : aaxFile.ConvertToMp3(outputFile);
-            aaxFile.ConversionProgressUpdate -= AaxFile_ConversionProgressUpdate;
-
-            downloadLicense.ChapterInfo = aaxFile.Chapters;
-            
-            Step2_End(zeroProgress);
-
-            return decryptionResult == ConversionResult.NoErrorsDetected && !isCanceled;
-        }
-
-        private bool Step2_DownloadAudiobookAsMultipleFilesPerChapter()
-        {
-            var zeroProgress = Step2_Start();
-
-            aaxFile.ConversionProgressUpdate += AaxFile_ConversionProgressUpdate;
-            if(OutputFormat == OutputFormat.M4b) 
-                ConvertToMultiMp4b();
-            else 
-                ConvertToMultiMp3();
-            aaxFile.ConversionProgressUpdate -= AaxFile_ConversionProgressUpdate;
-
-            Step2_End(zeroProgress);
-
-            return true;
-        }
-
-        private DownloadProgress Step2_Start()
-        {
-            var zeroProgress = new DownloadProgress
-            {
-                BytesReceived = 0,
-                ProgressPercentage = 0,
-                TotalBytesToReceive = InputFileStream.Length
-            };
-
-            OnDecryptProgressUpdate(zeroProgress);
-
-            aaxFile.SetDecryptionKey(downloadLicense.AudibleKey, downloadLicense.AudibleIV);
-            return zeroProgress;
-        }
-        
-        private void Step2_End(DownloadProgress zeroProgress)
-        {
-            aaxFile.Close();
-
-            CloseInputFileStream();
-
-            OnDecryptProgressUpdate(zeroProgress);
-        }
-
-        private void ConvertToMultiMp4b()
-        {
-            var chapterCount = 0;
-            aaxFile.ConvertToMultiMp4a(downloadLicense.ChapterInfo, newSplitCallback =>
-            {
-                chapterCount++;
-                var fileName = Path.ChangeExtension(outputFileName, $"{chapterCount}.m4b");
-                if (File.Exists(fileName))
-                    FileExt.SafeDelete(fileName);
-                newSplitCallback.OutputFile = File.Open(fileName, FileMode.OpenOrCreate);
-            });
-        }
-        
-        private void ConvertToMultiMp3()
-        {
-            var chapterCount = 0;
-            aaxFile.ConvertToMultiMp3(downloadLicense.ChapterInfo, newSplitCallback =>
-            {
-                chapterCount++;
-                var fileName = Path.ChangeExtension(outputFileName, $"{chapterCount}.mp3");
-                if (File.Exists(fileName))
-                    FileExt.SafeDelete(fileName);
-                newSplitCallback.OutputFile = File.Open(fileName, FileMode.OpenOrCreate);
-                newSplitCallback.LameConfig.ID3.Track = chapterCount.ToString();
-            });
-        }
-
-        private void AaxFile_ConversionProgressUpdate(object sender, ConversionProgressEventArgs e)
-        {
-            var duration = aaxFile.Duration;
-            double remainingSecsToProcess = (duration - e.ProcessPosition).TotalSeconds;
-            double estTimeRemaining = remainingSecsToProcess / e.ProcessSpeed;
-
-            if (double.IsNormal(estTimeRemaining))
-                OnDecryptTimeRemaining(TimeSpan.FromSeconds(estTimeRemaining));
-
-            double progressPercent = e.ProcessPosition.TotalSeconds / duration.TotalSeconds;
-
-            OnDecryptProgressUpdate(
-                new DownloadProgress 
-                {
-                    ProgressPercentage = 100 * progressPercent,
-                    BytesReceived = (long)(InputFileStream.Length * progressPercent),
-                    TotalBytesToReceive = InputFileStream.Length
-                });
-        }
-
-        public override void Cancel()
-        {
-            isCanceled = true;
-            aaxFile?.Cancel();
-            aaxFile?.Dispose();
-            CloseInputFileStream();
-        }
-
-		protected override int GetSpeedup(TimeSpan elapsed)
-            => (int)(aaxFile.Duration.TotalSeconds / (long)elapsed.TotalSeconds);
-	}
-}

AaxDecrypter/AaxcDownloadMultiConverter.cs

@@ -0,0 +1,146 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using AAXClean;
+using Dinah.Core.StepRunner;
+using FileManager;
+
+namespace AaxDecrypter
+{
+	public class AaxcDownloadMultiConverter : AaxcDownloadConvertBase
+	{
+		protected override StepSequence Steps { get; }
+
+        private Func<string, int, int, NewSplitCallback, string> multipartFileNameCallback { get; }
+        private static string DefaultMultipartFilename(string outputFileName, int partsPosition, int partsTotal, NewSplitCallback newSplitCallback)
+        {
+            var template = Path.ChangeExtension(outputFileName, null) + " - <ch# 0> - <title>" + Path.GetExtension(outputFileName);
+
+            var fileTemplate = new FileTemplate(template) { IllegalCharacterReplacements = " " };
+            fileTemplate.AddParameterReplacement("ch# 0", FileUtility.GetSequenceFormatted(partsPosition, partsTotal));
+            fileTemplate.AddParameterReplacement("title", newSplitCallback?.Chapter?.Title ?? "");
+
+            return fileTemplate.GetFilePath();
+        }
+
+        private static TimeSpan minChapterLength { get; } = TimeSpan.FromSeconds(3);
+		private List<string> multiPartFilePaths { get; } = new List<string>();
+
+        public AaxcDownloadMultiConverter(string outFileName, string cacheDirectory, DownloadLicense dlLic, OutputFormat outputFormat,
+            Func<string, int, int, NewSplitCallback, string> multipartFileNameCallback = null)
+			: base(outFileName, cacheDirectory, dlLic, outputFormat)
+        {
+            Steps = new StepSequence
+            {
+                Name = "Download and Convert Aaxc To " + OutputFormat,
+
+                ["Step 1: Get Aaxc Metadata"] = Step_GetMetadata,
+                ["Step 2: Download Decrypted Audiobook"] = Step_DownloadAudiobookAsMultipleFilesPerChapter,
+                ["Step 3: Cleanup"] = Step_Cleanup,
+            };
+            this.multipartFileNameCallback = multipartFileNameCallback ?? DefaultMultipartFilename;
+        }
+
+        /*
+https://github.com/rmcrackan/Libation/pull/127#issuecomment-939088489
+
+If the chapter truly is empty, that is, 0 audio frames in length, then yes it is ignored.
+If the chapter is shorter than 3 seconds long but still has some audio frames, those frames are combined with the following chapter and not split into a new file.
+
+I also implemented file naming by chapter title. When 2 or more consecutive chapters are combined, the first of the combined chapter's title is used in the file name. For example, given an audiobook with the following chapters:
+
+00:00:00 - 00:00:02 | Part 1
+00:00:02 - 00:35:00 | Chapter 1
+00:35:02 - 01:02:00 | Chapter 2
+01:02:00 - 01:02:02 | Part 2
+01:02:02 - 01:41:00 | Chapter 3
+01:41:00 - 02:05:00 | Chapter 4
+
+The book will be split into the following files:
+
+00:00:00 - 00:35:00 | Book - 01 - Part 1.m4b
+00:35:00 - 01:02:00 | Book - 02 - Chapter 2.m4b
+01:02:00 - 01:41:00 | Book - 03 - Part 2.m4b
+01:41:00 - 02:05:00 | Book - 04 - Chapter 4.m4b
+
+That naming may not be desirable for everyone, but it's an easy change to instead use the last of the combined chapter's title in the file name.
+         */
+        private bool Step_DownloadAudiobookAsMultipleFilesPerChapter()
+        {
+            var zeroProgress = Step_DownloadAudiobook_Start();
+
+            var chapters = DownloadLicense.ChapterInfo.Chapters.ToList();
+
+            // Ensure split files are at least minChapterLength in duration.
+            var splitChapters = new ChapterInfo();
+
+            var runningTotal = TimeSpan.Zero;
+            string title = "";
+
+            for (int i = 0; i < chapters.Count; i++)
+            {
+                if (runningTotal == TimeSpan.Zero)
+                    title = chapters[i].Title;
+
+                runningTotal += chapters[i].Duration;
+
+                if (runningTotal >= minChapterLength)
+                {
+                    splitChapters.AddChapter(title, runningTotal);
+                    runningTotal = TimeSpan.Zero;
+                }
+            }
+
+            // reset, just in case
+            multiPartFilePaths.Clear();
+
+            AaxFile.ConversionProgressUpdate += AaxFile_ConversionProgressUpdate;
+            if (OutputFormat == OutputFormat.M4b)
+                ConvertToMultiMp4a(splitChapters);
+            else
+                ConvertToMultiMp3(splitChapters);
+            AaxFile.ConversionProgressUpdate -= AaxFile_ConversionProgressUpdate;
+
+            Step_DownloadAudiobook_End(zeroProgress);
+
+            var success = !IsCanceled;
+
+            if (success)
+                foreach (var path in multiPartFilePaths)
+                    OnFileCreated(path);
+
+            return success;
+        }
+
+        private void ConvertToMultiMp4a(ChapterInfo splitChapters)
+        {
+            var chapterCount = 0;
+            AaxFile.ConvertToMultiMp4a(splitChapters, newSplitCallback =>
+                createOutputFileStream(++chapterCount, splitChapters, newSplitCallback)
+            );
+        }
+
+        private void ConvertToMultiMp3(ChapterInfo splitChapters)
+        {
+            var chapterCount = 0;
+            AaxFile.ConvertToMultiMp3(splitChapters, newSplitCallback =>
+            {
+                createOutputFileStream(++chapterCount, splitChapters, newSplitCallback);
+                newSplitCallback.LameConfig.ID3.Track = chapterCount.ToString();
+            });
+        }
+
+        private void createOutputFileStream(int currentChapter, ChapterInfo splitChapters, NewSplitCallback newSplitCallback)
+        {
+            var fileName = multipartFileNameCallback(OutputFileName, currentChapter, splitChapters.Count, newSplitCallback);
+            fileName = FileUtility.GetValidFilename(fileName);
+
+            multiPartFilePaths.Add(fileName);
+
+            FileUtility.SaferDelete(fileName);
+
+            newSplitCallback.OutputFile = File.Open(fileName, FileMode.OpenOrCreate);
+        }
+    }
+}

AaxDecrypter/AaxcDownloadSingleConverter.cs

@@ -0,0 +1,53 @@
+using System;
+using System.IO;
+using AAXClean;
+using Dinah.Core.StepRunner;
+using FileManager;
+
+namespace AaxDecrypter
+{
+	public class AaxcDownloadSingleConverter : AaxcDownloadConvertBase
+	{
+		protected override StepSequence Steps { get; }
+
+        public AaxcDownloadSingleConverter(string outFileName, string cacheDirectory, DownloadLicense dlLic, OutputFormat outputFormat)
+			: base(outFileName, cacheDirectory, dlLic, outputFormat)
+        {
+            Steps = new StepSequence
+            {
+                Name = "Download and Convert Aaxc To " + OutputFormat,
+
+                ["Step 1: Get Aaxc Metadata"] = Step_GetMetadata,
+                ["Step 2: Download Decrypted Audiobook"] = Step_DownloadAudiobookAsSingleFile,
+                ["Step 3: Create Cue"] = Step_CreateCue,
+                ["Step 4: Cleanup"] = Step_Cleanup,
+            };
+        }
+
+        private bool Step_DownloadAudiobookAsSingleFile()
+        {
+            var zeroProgress = Step_DownloadAudiobook_Start();
+
+            FileUtility.SaferDelete(OutputFileName);
+
+            var outputFile = File.Open(OutputFileName, FileMode.OpenOrCreate, FileAccess.ReadWrite);
+
+            AaxFile.ConversionProgressUpdate += AaxFile_ConversionProgressUpdate;
+            var decryptionResult
+                = OutputFormat == OutputFormat.M4b
+                ? AaxFile.ConvertToMp4a(outputFile, DownloadLicense.ChapterInfo)
+                : AaxFile.ConvertToMp3(outputFile);
+            AaxFile.ConversionProgressUpdate -= AaxFile_ConversionProgressUpdate;
+
+            DownloadLicense.ChapterInfo = AaxFile.Chapters;
+
+            Step_DownloadAudiobook_End(zeroProgress);
+
+            var success = decryptionResult == ConversionResult.NoErrorsDetected && !IsCanceled;
+            if (success)
+                base.OnFileCreated(OutputFileName);
+
+            return success;
+        }
+    }
+}

AaxDecrypter/AudiobookDownloadBase.cs

@@ -1,13 +1,9 @@
-using Dinah.Core;
-using Dinah.Core.IO;
+using System;
+using System.IO;
+using Dinah.Core;
 using Dinah.Core.Net.Http;
 using Dinah.Core.StepRunner;
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using FileManager;
 
 namespace AaxDecrypter
 {
@@ -21,67 +17,56 @@ namespace AaxDecrypter
 		public event EventHandler<byte[]> RetrievedCoverArt;
 		public event EventHandler<DownloadProgress> DecryptProgressUpdate;
 		public event EventHandler<TimeSpan> DecryptTimeRemaining;
+		public event EventHandler<string> FileCreated;
 
-		public string AppName { get; set; }
-
-		protected bool isCanceled { get; set; }
-		protected string outputFileName { get; }
-		protected string cacheDir { get; }
-		protected DownloadLicense downloadLicense { get; }
+		protected bool IsCanceled { get; set; }
+		protected string OutputFileName { get; private set; }
+		protected DownloadLicense DownloadLicense { get; }
 		protected NetworkFileStream InputFileStream => (nfsPersister ??= OpenNetworkFileStream()).NetworkFileStream;
 
+		// Don't give the property a 'set'. This should have to be an obvious choice; not accidental
+		protected void SetOutputFileName(string newOutputFileName) => OutputFileName = newOutputFileName;
 
-		protected abstract StepSequence steps { get; }
+		protected abstract StepSequence Steps { get; }
 		private NetworkFileStreamPersister nfsPersister;
 
-		private string jsonDownloadState => Path.Combine(cacheDir, Path.GetFileNameWithoutExtension(outputFileName) + ".json");
-		private string tempFile => PathLib.ReplaceExtension(jsonDownloadState, ".tmp");
+		private string jsonDownloadState { get; }
+		private string tempFile => Path.ChangeExtension(jsonDownloadState, ".tmp");
 
-		public AudiobookDownloadBase(string outFileName, string cacheDirectory, DownloadLicense dlLic)
+		protected AudiobookDownloadBase(string outFileName, string cacheDirectory, DownloadLicense dlLic)
 		{
-			AppName = GetType().Name;
+			OutputFileName = ArgumentValidator.EnsureNotNullOrWhiteSpace(outFileName, nameof(outFileName));
 
-			ArgumentValidator.EnsureNotNullOrWhiteSpace(outFileName, nameof(outFileName));
-			outputFileName = outFileName;
-
-			var outDir = Path.GetDirectoryName(outputFileName);
+			var outDir = Path.GetDirectoryName(OutputFileName);
 			if (!Directory.Exists(outDir))
-				throw new ArgumentNullException(nameof(outDir), "Directory does not exist");
-			if (File.Exists(outputFileName))
-				File.Delete(outputFileName);
+				throw new DirectoryNotFoundException($"Directory does not exist: {nameof(outDir)}");
 
 			if (!Directory.Exists(cacheDirectory))
-				throw new ArgumentNullException(nameof(cacheDirectory), "Directory does not exist");
-			cacheDir = cacheDirectory;
+				throw new DirectoryNotFoundException($"Directory does not exist: {nameof(cacheDirectory)}");
+			jsonDownloadState = Path.Combine(cacheDirectory, Path.ChangeExtension(OutputFileName, ".json"));
 
-			downloadLicense = ArgumentValidator.EnsureNotNull(dlLic, nameof(dlLic));
+			DownloadLicense = ArgumentValidator.EnsureNotNull(dlLic, nameof(dlLic));
+
+			// delete file after validation is complete
+			FileUtility.SaferDelete(OutputFileName);
 		}
 
 		public abstract void Cancel();
-		protected abstract int GetSpeedup(TimeSpan elapsed);
-		protected abstract bool Step2_DownloadAudiobookAsSingleFile();
-		protected abstract bool Step1_GetMetadata();
 
 		public virtual void SetCoverArt(byte[] coverArt)
 		{
-			if (coverArt is null) return;
-
-			OnRetrievedCoverArt(coverArt);
+			if (coverArt is not null)
+				OnRetrievedCoverArt(coverArt);
 		}
 
-
 		public bool Run()
 		{
-			var (IsSuccess, Elapsed) = steps.Run();
+			var (IsSuccess, Elapsed) = Steps.Run();
 
 			if (!IsSuccess)
-			{
-				Console.WriteLine("WARNING-Conversion failed");
-				return false;
-			}
+				Serilog.Log.Logger.Error("Conversion failed");
 
-			//Serilog.Log.Logger.Information($"Speedup is {GetSpeedup(Elapsed)}x realtime.");
-			return true;
+			return IsSuccess;
 		}		
 
 		protected void OnRetrievedTitle(string title) 
@@ -94,8 +79,10 @@ namespace AaxDecrypter
 			=> RetrievedCoverArt?.Invoke(this, coverArt);
 		protected void OnDecryptProgressUpdate(DownloadProgress downloadProgress) 
 			=> DecryptProgressUpdate?.Invoke(this, downloadProgress);
-		protected void OnDecryptTimeRemaining(TimeSpan timeRemaining) 
+		protected void OnDecryptTimeRemaining(TimeSpan timeRemaining)
 			=> DecryptTimeRemaining?.Invoke(this, timeRemaining);
+		protected void OnFileCreated(string path)
+			=> FileCreated?.Invoke(this, path);
 
 		protected void CloseInputFileStream()
 		{
@@ -103,62 +90,59 @@ namespace AaxDecrypter
 			nfsPersister?.Dispose();
 		}
 
-		protected bool Step3_CreateCue()
+		protected bool Step_CreateCue()
 		{
 			// not a critical step. its failure should not prevent future steps from running
 			try
 			{
-				File.WriteAllText(PathLib.ReplaceExtension(outputFileName, ".cue"), Cue.CreateContents(Path.GetFileName(outputFileName), downloadLicense.ChapterInfo));
+				var path = Path.ChangeExtension(OutputFileName, ".cue");
+				path = FileUtility.GetValidFilename(path);
+				File.WriteAllText(path, Cue.CreateContents(Path.GetFileName(OutputFileName), DownloadLicense.ChapterInfo));
+				OnFileCreated(path);
 			}
 			catch (Exception ex)
 			{
-				Serilog.Log.Logger.Error(ex, $"{nameof(Step3_CreateCue)}. FAILED");
+				Serilog.Log.Logger.Error(ex, $"{nameof(Step_CreateCue)}. FAILED");
 			}
-			return !isCanceled;
+			return !IsCanceled;
 		}
 
-		protected bool Step4_Cleanup()
+		protected bool Step_Cleanup()
 		{
-			FileExt.SafeDelete(jsonDownloadState);
-			FileExt.SafeDelete(tempFile);
-			return !isCanceled;
+			FileUtility.SaferDelete(jsonDownloadState);
+			FileUtility.SaferDelete(tempFile);
+			return !IsCanceled;
 		}
 
 		private NetworkFileStreamPersister OpenNetworkFileStream()
 		{
-			NetworkFileStreamPersister nfsp;
+			if (!File.Exists(jsonDownloadState))
+				return NewNetworkFilePersister();
 
-			if (File.Exists(jsonDownloadState))
+			try
 			{
-				try
-				{
-					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.
-					nfsp.NetworkFileStream.SetUriForSameFile(new Uri(downloadLicense.DownloadUrl));
-				}
-				catch
-				{
-					FileExt.SafeDelete(jsonDownloadState);
-					FileExt.SafeDelete(tempFile);
-					nfsp = NewNetworkFilePersister();
-				}
+				var 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.
+				nfsp.NetworkFileStream.SetUriForSameFile(new Uri(DownloadLicense.DownloadUrl));
+				return nfsp;
 			}
-			else
+			catch
 			{
-				nfsp = NewNetworkFilePersister();
+				FileUtility.SaferDelete(jsonDownloadState);
+				FileUtility.SaferDelete(tempFile);
+				return NewNetworkFilePersister();
 			}
-			return nfsp;
 		}
 
 		private NetworkFileStreamPersister NewNetworkFilePersister()
 		{
 			var headers = new System.Net.WebHeaderCollection
 			{
-				{ "User-Agent", downloadLicense.UserAgent }
+				{ "User-Agent", DownloadLicense.UserAgent }
 			};
 
-			var networkFileStream = new NetworkFileStream(tempFile, new Uri(downloadLicense.DownloadUrl), 0, headers);
+			var networkFileStream = new NetworkFileStream(tempFile, new Uri(DownloadLicense.DownloadUrl), 0, headers);
 			return new NetworkFileStreamPersister(networkFileStream, jsonDownloadState);
 		}
 	}

AaxDecrypter/UnencryptedAudiobookDownloader.cs

@@ -1,56 +1,47 @@
-using Dinah.Core.IO;
+using System;
+using System.Threading;
 using Dinah.Core.Net.Http;
 using Dinah.Core.StepRunner;
-using System;
-using System.IO;
-using System.Linq;
-using System.Threading;
+using FileManager;
 
 namespace AaxDecrypter
 {
 	public class UnencryptedAudiobookDownloader : AudiobookDownloadBase
 	{
-		protected override StepSequence steps { get; }
+		protected override StepSequence Steps { get; }
 
 		public UnencryptedAudiobookDownloader(string outFileName, string cacheDirectory, DownloadLicense dlLic)
 			: base(outFileName, cacheDirectory, dlLic)
 		{
-
-			steps = new StepSequence
+			Steps = new StepSequence
 			{
 				Name = "Download Mp3 Audiobook",
 
-				["Step 1: Get Mp3 Metadata"] = Step1_GetMetadata,
-				["Step 2: Download Audiobook"] = Step2_DownloadAudiobookAsSingleFile,
-				["Step 3: Create Cue"] = Step3_CreateCue,
-				["Step 4: Cleanup"] = Step4_Cleanup,
+				["Step 1: Get Mp3 Metadata"] = Step_GetMetadata,
+				["Step 2: Download Audiobook"] = Step_DownloadAudiobookAsSingleFile,
+				["Step 3: Create Cue"] = Step_CreateCue,
+				["Step 4: Cleanup"] = Step_Cleanup,
 			};
 		}
 
 		public override void Cancel()
 		{
-			isCanceled = true;
+			IsCanceled = true;
 			CloseInputFileStream();
 		}
 
-		protected override int GetSpeedup(TimeSpan elapsed)
-		{
-			//Not implemented
-			return 0;
-		}
-
-		protected override bool Step1_GetMetadata()
+		protected bool Step_GetMetadata()
 		{
 			OnRetrievedCoverArt(null);
 
-			return !isCanceled;
+			return !IsCanceled;
 		}
 
-		protected override bool Step2_DownloadAudiobookAsSingleFile()
+		private bool Step_DownloadAudiobookAsSingleFile()
 		{
 			DateTime startTime = DateTime.Now;
 
-			//MUST put InputFileStream.Length first, because it starts background downloader.
+			// MUST put InputFileStream.Length first, because it starts background downloader.
 
 			while (InputFileStream.Length > InputFileStream.WritePosition && !InputFileStream.IsCancelled) 
 			{
@@ -75,12 +66,11 @@ namespace AaxDecrypter
 
 			CloseInputFileStream();
 
-			if (File.Exists(outputFileName))
-				FileExt.SafeDelete(outputFileName);
+			var realOutputFileName = FileUtility.SaferMoveToValidPath(InputFileStream.SaveFilePath, OutputFileName);
+			SetOutputFileName(realOutputFileName);
+			OnFileCreated(realOutputFileName);
 
-			FileExt.SafeMove(InputFileStream.SaveFilePath, outputFileName);
-
-			return !isCanceled;
+			return !IsCanceled;
 		}
 	}
 }

AppScaffolding/AppScaffolding.csproj

@@ -3,7 +3,7 @@
 
   <PropertyGroup>
     <TargetFramework>net5.0</TargetFramework>
-    <Version>6.2.0.1</Version>
+    <Version>6.3.2.1</Version>
   </PropertyGroup>
 
   <ItemGroup>
@@ -15,7 +15,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\InternalUtilities\InternalUtilities.csproj" />
+    <ProjectReference Include="..\AudibleUtilities\AudibleUtilities.csproj" />
   </ItemGroup>
 
 </Project>

AppScaffolding/LibationScaffolding.cs

@@ -3,11 +3,11 @@ using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Reflection;
+using AudibleUtilities;
 using Dinah.Core;
 using Dinah.Core.IO;
 using Dinah.Core.Logging;
-using FileManager;
-using InternalUtilities;
+using LibationFileManager;
 using Newtonsoft.Json.Linq;
 using Serilog;
 
@@ -58,6 +58,8 @@ namespace AppScaffolding
 			Migrations.migrate_to_v5_2_0__post_config(config);
 			Migrations.migrate_to_v5_7_1(config);
 			Migrations.migrate_to_v6_1_2(config);
+			Migrations.migrate_to_v6_2_0(config);
+			Migrations.migrate_to_v6_2_9(config);
 		}
 
 		/// <summary>Initialize logging. Run after migration</summary>
@@ -210,11 +212,11 @@ namespace AppScaffolding
 
 				config.InProgress,
 
-				DownloadsInProgressDir = AudibleFileStorage.DownloadsInProgress,
-				DownloadsInProgressFiles = Directory.EnumerateFiles(AudibleFileStorage.DownloadsInProgress).Count(),
+				AudibleFileStorage.DownloadsInProgressDirectory,
+				DownloadsInProgressFiles = Directory.EnumerateFiles(AudibleFileStorage.DownloadsInProgressDirectory).Count(),
 
-				DecryptInProgressDir = AudibleFileStorage.DecryptInProgress,
-				DecryptInProgressFiles = Directory.EnumerateFiles(AudibleFileStorage.DecryptInProgress).Count(),
+				AudibleFileStorage.DecryptInProgressDirectory,
+				DecryptInProgressFiles = Directory.EnumerateFiles(AudibleFileStorage.DecryptInProgressDirectory).Count(),
 			});
 		}
 
@@ -337,5 +339,25 @@ namespace AppScaffolding
 			if (!config.Exists(nameof(config.ImportEpisodes)))
 				config.ImportEpisodes = true;
 		}
+
+		// add config.SplitFilesByChapter
+		public static void migrate_to_v6_2_0(Configuration config)
+		{
+			if (!config.Exists(nameof(config.SplitFilesByChapter)))
+				config.SplitFilesByChapter = false;
+		}
+
+		// add file naming templates
+		public static void migrate_to_v6_2_9(Configuration config)
+		{
+			if (!config.Exists(nameof(config.FolderTemplate)))
+				config.FolderTemplate = Templates.Folder.DefaultTemplate;
+
+			if (!config.Exists(nameof(config.FileTemplate)))
+				config.FileTemplate = Templates.File.DefaultTemplate;
+
+			if (!config.Exists(nameof(config.ChapterFileTemplate)))
+				config.ChapterFileTemplate = Templates.ChapterFile.DefaultTemplate;
+		}
 	}
 }

ApplicationServices/ApplicationServices.csproj

@@ -6,7 +6,7 @@
 
   <ItemGroup>
     <PackageReference Include="CsvHelper" Version="27.1.1" />
-    <PackageReference Include="NPOI" Version="2.5.4" />
+    <PackageReference Include="NPOI" Version="2.5.5" />
   </ItemGroup>
 
   <ItemGroup>

ApplicationServices/DbContexts.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 using DataLayer;
-using FileManager;
+using LibationFileManager;
 
 namespace ApplicationServices
 {

ApplicationServices/LibraryCommands.cs

@@ -3,10 +3,11 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 using AudibleApi;
+using AudibleUtilities;
 using DataLayer;
 using Dinah.Core;
 using DtoImporterService;
-using InternalUtilities;
+using LibationFileManager;
 using Serilog;
 using static DtoImporterService.PerfLogger;
 
@@ -43,7 +44,7 @@ namespace ApplicationServices
 			}
 			catch (AudibleApi.Authentication.LoginFailedException lfEx)
 			{
-				lfEx.SaveFiles(FileManager.Configuration.Instance.LibationFiles);
+				lfEx.SaveFiles(Configuration.Instance.LibationFiles);
 
 				// nuget Serilog.Exceptions would automatically log custom properties
 				//   However, it comes with a scary warning when used with EntityFrameworkCore which I'm not yet ready to implement:
@@ -98,7 +99,7 @@ namespace ApplicationServices
 			}
 			catch (AudibleApi.Authentication.LoginFailedException lfEx)
 			{
-				lfEx.SaveFiles(FileManager.Configuration.Instance.LibationFiles);
+				lfEx.SaveFiles(Configuration.Instance.LibationFiles);
 
 				// nuget Serilog.Exceptions would automatically log custom properties
 				//   However, it comes with a scary warning when used with EntityFrameworkCore which I'm not yet ready to implement:
@@ -155,7 +156,7 @@ namespace ApplicationServices
 
 			logTime($"pre scanAccountAsync {account.AccountName}");
 
-			var dtoItems = await apiExtended.GetLibraryValidatedAsync(libraryResponseGroups, FileManager.Configuration.Instance.ImportEpisodes);
+			var dtoItems = await apiExtended.GetLibraryValidatedAsync(libraryResponseGroups, Configuration.Instance.ImportEpisodes);
 
 			logTime($"post scanAccountAsync {account.AccountName} qty: {dtoItems.Count}");
 
@@ -228,6 +229,7 @@ namespace ApplicationServices
 				if (qtyChanges > 0)
 				{
 					SearchEngineCommands.UpdateLiberatedStatus(book);
+					SearchEngineCommands.UpdateBookTags(book);
 					BookUserDefinedItemCommitted?.Invoke(null, book.AudibleProductId);
 				}
 
@@ -244,7 +246,7 @@ namespace ApplicationServices
 		// must be here instead of in db layer due to AaxcExists
 		public static LiberatedStatus Liberated_Status(Book book)
 			=> book.Audio_Exists ? book.UserDefinedItem.BookStatus
-			: FileManager.AudibleFileStorage.AaxcExists(book.AudibleProductId) ? LiberatedStatus.PartialDownload
+			: AudibleFileStorage.AaxcExists(book.AudibleProductId) ? LiberatedStatus.PartialDownload
 			: LiberatedStatus.NotLiberated;
 
 		// exists here for feature predictability. It makes sense for this to be where Liberated_Status is

AudibleUtilities/Account.cs

@@ -6,7 +6,7 @@ using AudibleApi.Authorization;
 using Dinah.Core;
 using Newtonsoft.Json;
 
-namespace InternalUtilities
+namespace AudibleUtilities
 {
 	public class Account : IUpdatable
 	{

AudibleUtilities/AccountsSettings.cs

@@ -6,7 +6,7 @@ using AudibleApi.Authorization;
 using Dinah.Core;
 using Newtonsoft.Json;
 
-namespace InternalUtilities
+namespace AudibleUtilities
 {
 	// 'AccountsSettings' is intentionally NOT IEnumerable<> so that properties can be added/extended
 	// from newtonsoft (https://www.newtonsoft.com/json/help/html/SerializationGuide.htm):

AudibleUtilities/AccountsSettingsPersister.cs

@@ -3,7 +3,7 @@ using AudibleApi.Authorization;
 using Dinah.Core.IO;
 using Newtonsoft.Json;
 
-namespace InternalUtilities
+namespace AudibleUtilities
 {
 	public class AccountsSettingsPersister : JsonFilePersister<AccountsSettings>
 	{

AudibleUtilities/ApiExtended.cs

@@ -8,7 +8,7 @@ using Dinah.Core;
 using Polly;
 using Polly.Retry;
 
-namespace InternalUtilities
+namespace AudibleUtilities
 {
 	/// <summary>USE THIS from within Libation. It wraps the call with correct JSONPath</summary>
 	public class ApiExtended

AudibleUtilities/AudibleApiStorage.cs

@@ -1,9 +1,9 @@
 using System;
 using System.IO;
-using FileManager;
+using LibationFileManager;
 using Newtonsoft.Json;
 
-namespace InternalUtilities
+namespace AudibleUtilities
 {
 	public static class AudibleApiStorage
 	{

AudibleUtilities/AudibleApiValidators.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using AudibleApi.Common;
 
-namespace InternalUtilities
+namespace AudibleUtilities
 {
 	public interface IValidator
 	{

AudibleUtilities/AudibleUtilities.csproj

@@ -0,0 +1,15 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net5.0</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="AudibleApi" Version="2.3.2.1" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\LibationFileManager\LibationFileManager.csproj" />
+  </ItemGroup>
+
+</Project>

AudibleUtilities/_InternalsVisible.cs

@@ -0,0 +1 @@
+[assembly: System.Runtime.CompilerServices.InternalsVisibleTo(nameof(AudibleUtilities) + ".Tests")]

DataLayer/DataLayer.csproj

@@ -12,20 +12,20 @@
   </PropertyGroup>
   
   <ItemGroup>
-    <PackageReference Include="Dinah.EntityFrameworkCore" Version="1.0.5.2" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="5.0.10">
+    <PackageReference Include="Dinah.EntityFrameworkCore" Version="1.0.7.1" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="5.0.11">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="5.0.10" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="5.0.10">
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="5.0.11" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="5.0.11">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
   </ItemGroup>
   
   <ItemGroup>
-    <ProjectReference Include="..\FileManager\FileManager.csproj" />
+    <ProjectReference Include="..\LibationFileManager\LibationFileManager.csproj" />
   </ItemGroup>
   
   <ItemGroup>

DataLayer/EfClasses/UserDefinedItem.cs

@@ -33,7 +33,7 @@ namespace DataLayer
 
 			// import previously saved tags
 			ArgumentValidator.EnsureNotNullOrWhiteSpace(book.AudibleProductId, nameof(book.AudibleProductId));
-			Tags = FileManager.TagsPersistence.GetTags(book.AudibleProductId);
+			Tags = LibationFileManager.TagsPersistence.GetTags(book.AudibleProductId);
 		}
 
         #region Tags
@@ -47,7 +47,7 @@ namespace DataLayer
                 if (_tags != newTags)
                 {
                     _tags = newTags;
-                    ItemChanged?.Invoke(this, nameof(Tags));
+                    OnItemChanged(nameof(Tags));
                 }
             }
 		}
@@ -112,6 +112,28 @@ namespace DataLayer
         /// </summary>
         public static event EventHandler<string> ItemChanged;
 
+        private void OnItemChanged(string e)
+        {
+            // HACK
+            // must not fire during initial import.
+            //
+            // these checks are necessary because current architecture attaches to this instead of attaching to an event *after* fully committed to db. the attached delegate/action sometimes calls commit:
+            //
+            // desired:
+            // - importing new book
+            // - update pdf status
+            // - initial book commit
+            //
+            // actual without these checks [BAD]:
+            // - importing new book
+            // - update pdf status
+            //   - invoke event
+            //   - commit UserDefinedItem
+            // - initial book commit
+            if (BookId > 0 && Book is not null && Book.BookId > 0)
+                ItemChanged?.Invoke(this, e);
+        }
+
         private LiberatedStatus _bookStatus;
         private LiberatedStatus? _pdfStatus;
         public LiberatedStatus BookStatus
@@ -122,7 +144,7 @@ namespace DataLayer
                 if (_bookStatus != value)
 				{
                     _bookStatus = value;
-                    ItemChanged?.Invoke(this, nameof(BookStatus));
+                    OnItemChanged(nameof(BookStatus));
                 }
             }
         }
@@ -134,7 +156,7 @@ namespace DataLayer
                 if (_pdfStatus != value)
                 {
                     _pdfStatus = value;
-                    ItemChanged?.Invoke(this, nameof(PdfStatus));
+                    OnItemChanged(nameof(PdfStatus));
                 }
             }
         }

DataLayer/TagPersistenceInterceptor.cs

@@ -24,7 +24,7 @@ namespace DataLayer
 				.Select(t => (t.Book.AudibleProductId, t.Tags))
 				.ToList();
 
-			FileManager.TagsPersistence.Save(tagsCollection);
+			LibationFileManager.TagsPersistence.Save(tagsCollection);
 		}
 	}
 }

DataLayer/Utilities/LocalDatabaseInfo.cs

@@ -1,38 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-
-namespace DataLayer.Utilities
-{
-	public static class LocalDatabaseInfo
-	{
-		public static List<string> GetLocalDBInstances()
-		{
-			// Start the child process.
-			using var p = new System.Diagnostics.Process
-			{
-				StartInfo = new System.Diagnostics.ProcessStartInfo
-				{
-					UseShellExecute = false,
-					RedirectStandardOutput = true,
-					FileName = "cmd.exe",
-					Arguments = "/C sqllocaldb info",
-					CreateNoWindow = true,
-					WindowStyle = System.Diagnostics.ProcessWindowStyle.Hidden
-				}
-			};
-			p.Start();
-			var output = p.StandardOutput.ReadToEnd();
-			p.WaitForExit();
-
-			// if LocalDb is not installed then it will return that 'sqllocaldb' is not recognized as an internal or external command operable program or batch file
-			return string.IsNullOrWhiteSpace(output) || output.Contains("not recognized")
-				? new List<string>()
-				: output
-					.Split(new string[] { Environment.NewLine }, StringSplitOptions.None)
-					.Select(i => i.Trim())
-					.Where(i => !string.IsNullOrEmpty(i))
-					.ToList();
-		}
-	}
-}

DtoImporterService/BookImporter.cs

@@ -2,8 +2,8 @@
 using System.Collections.Generic;
 using System.Linq;
 using AudibleApi.Common;
+using AudibleUtilities;
 using DataLayer;
-using InternalUtilities;
 
 namespace DtoImporterService
 {
@@ -68,7 +68,7 @@ namespace DtoImporterService
 
 			foreach (var item in importItems)
 			{
-				var book = DbContext.Books.Local.SingleOrDefault(p => p.AudibleProductId == item.DtoItem.ProductId);
+				var book = DbContext.Books.Local.FirstOrDefault(p => p.AudibleProductId == item.DtoItem.ProductId);
 				if (book is null)
 				{
 					book = createNewBook(item);
@@ -164,7 +164,7 @@ namespace DtoImporterService
 			{
 				foreach (var seriesEntry in item.Series)
 				{
-					var series = DbContext.Series.Local.Single(s => seriesEntry.SeriesId == s.AudibleSeriesId);
+					var series = DbContext.Series.Local.FirstOrDefault(s => seriesEntry.SeriesId == s.AudibleSeriesId);
 					book.UpsertSeries(series, seriesEntry.Sequence);
 				}
 			}

DtoImporterService/CategoryImporter.cs

@@ -2,8 +2,8 @@
 using System.Collections.Generic;
 using System.Linq;
 using AudibleApi.Common;
+using AudibleUtilities;
 using DataLayer;
-using InternalUtilities;
 
 namespace DtoImporterService
 {

DtoImporterService/ContributorImporter.cs

@@ -2,8 +2,8 @@
 using System.Collections.Generic;
 using System.Linq;
 using AudibleApi.Common;
+using AudibleUtilities;
 using DataLayer;
-using InternalUtilities;
 
 namespace DtoImporterService
 {

DtoImporterService/DtoImporterService.csproj

@@ -5,8 +5,8 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <ProjectReference Include="..\AudibleUtilities\AudibleUtilities.csproj" />
     <ProjectReference Include="..\DataLayer\DataLayer.csproj" />
-    <ProjectReference Include="..\InternalUtilities\InternalUtilities.csproj" />
   </ItemGroup>
 
 </Project>

DtoImporterService/ImporterBase.cs

@@ -1,9 +1,9 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using AudibleUtilities;
 using DataLayer;
 using Dinah.Core;
-using InternalUtilities;
 
 namespace DtoImporterService
 {

DtoImporterService/LibraryBookImporter.cs

@@ -1,8 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using AudibleUtilities;
 using DataLayer;
-using InternalUtilities;
 
 namespace DtoImporterService
 {

DtoImporterService/SeriesImporter.cs

@@ -2,8 +2,8 @@
 using System.Collections.Generic;
 using System.Linq;
 using AudibleApi.Common;
+using AudibleUtilities;
 using DataLayer;
-using InternalUtilities;
 
 namespace DtoImporterService
 {

FileLiberator/AudioDecodable.cs

@@ -0,0 +1,44 @@
+using System;
+
+namespace FileLiberator
+{
+    public abstract class AudioDecodable : Processable
+    {
+        public event EventHandler<Action<byte[]>> RequestCoverArt;
+        public event EventHandler<string> TitleDiscovered;
+        public event EventHandler<string> AuthorsDiscovered;
+        public event EventHandler<string> NarratorsDiscovered;
+        public event EventHandler<byte[]> CoverImageDiscovered;
+        public abstract void Cancel();
+
+        protected void OnRequestCoverArt(Action<byte[]> setCoverArtDel)
+		{
+            Serilog.Log.Logger.Debug("Event fired {@DebugInfo}", new { Name = nameof(RequestCoverArt) });
+            RequestCoverArt?.Invoke(this, setCoverArtDel);
+        }
+
+        protected void OnTitleDiscovered(string title)
+		{
+            Serilog.Log.Logger.Debug("Event fired {@DebugInfo}", new { Name = nameof(TitleDiscovered), Title = title });
+            TitleDiscovered?.Invoke(this, title);
+		}
+
+        protected void OnAuthorsDiscovered(string authors)
+		{
+            Serilog.Log.Logger.Debug("Event fired {@DebugInfo}", new { Name = nameof(AuthorsDiscovered), Authors = authors });
+            AuthorsDiscovered?.Invoke(this, authors);
+		}
+
+        protected void OnNarratorsDiscovered(string narrators)
+		{
+            Serilog.Log.Logger.Debug("Event fired {@DebugInfo}", new { Name = nameof(NarratorsDiscovered), Narrators = narrators });
+            NarratorsDiscovered?.Invoke(this, narrators);
+		}
+
+        protected void OnCoverImageDiscovered(byte[] coverImage)
+		{
+            Serilog.Log.Logger.Debug("Event fired {@DebugInfo}", new { Name = nameof(CoverImageDiscovered), CoverImageBytes = coverImage?.Length });
+            CoverImageDiscovered?.Invoke(this, coverImage);
+        }
+    }
+}

FileLiberator/AudioFileStorageExt.cs

@@ -0,0 +1,82 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using DataLayer;
+using Dinah.Core;
+using FileManager;
+using LibationFileManager;
+
+namespace FileLiberator
+{
+    public static class AudioFileStorageExt
+    {
+        private static void AddParameterReplacement(this FileTemplate fileTemplate, TemplateTags templateTags, object value)
+            => fileTemplate.AddParameterReplacement(templateTags.TagName, value);
+
+        internal class MultipartRenamer
+        {
+            public LibraryBook libraryBook { get; }
+
+            public MultipartRenamer(LibraryBook libraryBook) => this.libraryBook = libraryBook;
+
+            internal string MultipartFilename(string outputFileName, int partsPosition, int partsTotal, AAXClean.NewSplitCallback newSplitCallback)
+                => MultipartFilename(Configuration.Instance.ChapterFileTemplate, AudibleFileStorage.DecryptInProgressDirectory, Path.GetExtension(outputFileName), partsPosition, partsTotal, newSplitCallback?.Chapter?.Title ?? "");
+
+            internal string MultipartFilename(string template, string fullDirPath, string extension, int partsPosition, int partsTotal, string chapterTitle)
+            {
+                var fileTemplate = GetFileTemplateSingle(template, libraryBook, fullDirPath, extension);
+
+                fileTemplate.AddParameterReplacement(TemplateTags.ChCount, partsTotal);
+                fileTemplate.AddParameterReplacement(TemplateTags.ChNumber, partsPosition);
+                fileTemplate.AddParameterReplacement(TemplateTags.ChNumber0, FileUtility.GetSequenceFormatted(partsPosition, partsTotal));
+                fileTemplate.AddParameterReplacement(TemplateTags.ChTitle, chapterTitle);
+
+                return fileTemplate.GetFilePath();
+            }
+        }
+
+        public static Func<string, int, int, AAXClean.NewSplitCallback, string> CreateMultipartRenamerFunc(this AudioFileStorage _, LibraryBook libraryBook)
+            => new MultipartRenamer(libraryBook).MultipartFilename;
+
+        public static string GetInProgressFilename(this AudioFileStorage _, LibraryBook libraryBook, string extension)
+            => GetCustomDirFilename(_, libraryBook, AudibleFileStorage.DecryptInProgressDirectory, extension);
+
+        public static string GetBooksDirectoryFilename(this AudioFileStorage _, LibraryBook libraryBook, string extension)
+            => GetCustomDirFilename(_, libraryBook, AudibleFileStorage.BooksDirectory, extension);
+
+        public static string GetDestinationDirectory(this AudioFileStorage _, LibraryBook libraryBook)
+            => GetFileTemplateSingle(Configuration.Instance.FolderTemplate, libraryBook, AudibleFileStorage.BooksDirectory, null)
+            .GetFilePath();
+
+        public static string GetCustomDirFilename(this AudioFileStorage _, LibraryBook libraryBook, string dirFullPath, string extension)
+            => GetFileTemplateSingle(Configuration.Instance.FileTemplate, libraryBook, dirFullPath, extension)
+            .GetFilePath();
+
+        internal static FileTemplate GetFileTemplateSingle(string template, LibraryBook libraryBook, string dirFullPath, string extension)
+        {
+            ArgumentValidator.EnsureNotNullOrWhiteSpace(template, nameof(template));
+            ArgumentValidator.EnsureNotNull(libraryBook, nameof(libraryBook));
+            ArgumentValidator.EnsureNotNullOrWhiteSpace(dirFullPath, nameof(dirFullPath));
+
+            var fullfilename = Path.Combine(dirFullPath, template + FileUtility.GetStandardizedExtension(extension));
+            var fileTemplate = new FileTemplate(fullfilename) { IllegalCharacterReplacements = "_" };
+
+            var title = libraryBook.Book.Title ?? "";
+
+            fileTemplate.AddParameterReplacement(TemplateTags.Id, libraryBook.Book.AudibleProductId);
+            fileTemplate.AddParameterReplacement(TemplateTags.Title, title);
+            fileTemplate.AddParameterReplacement(TemplateTags.TitleShort, title.IndexOf(':') < 1 ? title : title.Substring(0, title.IndexOf(':')));
+            fileTemplate.AddParameterReplacement(TemplateTags.Author, libraryBook.Book.AuthorNames);
+            fileTemplate.AddParameterReplacement(TemplateTags.FirstAuthor, libraryBook.Book.Authors.FirstOrDefault()?.Name);
+            fileTemplate.AddParameterReplacement(TemplateTags.Narrator, libraryBook.Book.NarratorNames);
+            fileTemplate.AddParameterReplacement(TemplateTags.FirstNarrator, libraryBook.Book.Narrators.FirstOrDefault()?.Name);
+
+            var seriesLink = libraryBook.Book.SeriesLink.FirstOrDefault();
+            fileTemplate.AddParameterReplacement(TemplateTags.Series, seriesLink?.Series.Name);
+            fileTemplate.AddParameterReplacement(TemplateTags.SeriesNumber, seriesLink?.Order);
+
+            return fileTemplate;
+        }
+    }
+}

FileLiberator/ConvertToMp3.cs

@@ -1,50 +1,36 @@
-using AAXClean;
+using System;
+using System.IO;
+using System.Threading.Tasks;
+using AAXClean;
 using DataLayer;
 using Dinah.Core;
 using Dinah.Core.ErrorHandling;
-using Dinah.Core.IO;
 using Dinah.Core.Net.Http;
 using FileManager;
-using System;
-using System.IO;
-using System.Linq;
-using System.Threading.Tasks;
+using LibationFileManager;
 
 namespace FileLiberator
 {
-    public class ConvertToMp3 : IAudioDecodable
+    public class ConvertToMp3 : AudioDecodable
     {
         private Mp4File m4bBook;
 
-		public event EventHandler<TimeSpan> StreamingTimeRemaining;
-		public event EventHandler<Action<byte[]>> RequestCoverArt;
-		public event EventHandler<string> TitleDiscovered;
-		public event EventHandler<string> AuthorsDiscovered;
-		public event EventHandler<string> NarratorsDiscovered;
-		public event EventHandler<byte[]> CoverImageDiscovered;
-		public event EventHandler<string> StreamingBegin;
-		public event EventHandler<DownloadProgress> StreamingProgressChanged;
-		public event EventHandler<string> StreamingCompleted;
-		public event EventHandler<LibraryBook> Begin;
-		public event EventHandler<string> StatusUpdate;
-		public event EventHandler<LibraryBook> Completed;
-
 		private long fileSize;
-		private string Mp3FileName(string m4bPath) => m4bPath is null ? string.Empty : PathLib.ReplaceExtension(m4bPath, ".mp3");
+        private static string Mp3FileName(string m4bPath) => Path.ChangeExtension(m4bPath ?? "", ".mp3");
 
-        public void Cancel() => m4bBook?.Cancel();
+        public override void Cancel() => m4bBook?.Cancel();
 
-        public bool Validate(LibraryBook libraryBook)
+        public override bool Validate(LibraryBook libraryBook)
         {
             var path = AudibleFileStorage.Audio.GetPath(libraryBook.Book.AudibleProductId);
             return path?.ToLower()?.EndsWith(".m4b") == true && !File.Exists(Mp3FileName(path));
         }
 
-        public async Task<StatusHandler> ProcessAsync(LibraryBook libraryBook)
+        public override async Task<StatusHandler> ProcessAsync(LibraryBook libraryBook)
         {
-            Begin?.Invoke(this, libraryBook);
+            OnBegin(libraryBook);
 
-            StreamingBegin?.Invoke(this, $"Begin converting {libraryBook} to mp3");
+            OnStreamingBegin($"Begin converting {libraryBook} to mp3");
 
             try
             {
@@ -54,10 +40,10 @@ namespace FileLiberator
 
                 fileSize = m4bBook.InputStream.Length;
 
-                TitleDiscovered?.Invoke(this, m4bBook.AppleTags.Title);
-                AuthorsDiscovered?.Invoke(this, m4bBook.AppleTags.FirstAuthor);
-                NarratorsDiscovered?.Invoke(this, m4bBook.AppleTags.Narrator);
-                CoverImageDiscovered?.Invoke(this, m4bBook.AppleTags.Cover);
+                OnTitleDiscovered(m4bBook.AppleTags.Title);
+                OnAuthorsDiscovered(m4bBook.AppleTags.FirstAuthor);
+                OnNarratorsDiscovered(m4bBook.AppleTags.Narrator);
+                OnCoverImageDiscovered(m4bBook.AppleTags.Cover);
 
                 using var mp3File = File.OpenWrite(Path.GetTempFileName());
 
@@ -65,9 +51,9 @@ namespace FileLiberator
                 m4bBook.InputStream.Close();
                 mp3File.Close();
 
-                var mp3Path = Mp3FileName(m4bPath);
-
-                FileExt.SafeMove(mp3File.Name, mp3Path);
+                var proposedMp3Path = Mp3FileName(m4bPath);
+                var realMp3Path = FileUtility.SaferMoveToValidPath(mp3File.Name, proposedMp3Path);
+                OnFileCreated(libraryBook, realMp3Path);
 
                 var statusHandler = new StatusHandler();
 
@@ -78,8 +64,8 @@ namespace FileLiberator
             }
             finally
             {
-                StreamingCompleted?.Invoke(this, $"Completed converting to mp3: {libraryBook.Book.Title}");
-                Completed?.Invoke(this, libraryBook);
+                OnStreamingCompleted($"Completed converting to mp3: {libraryBook.Book.Title}");
+                OnCompleted(libraryBook);
             }
         }
 
@@ -90,11 +76,11 @@ namespace FileLiberator
             double estTimeRemaining = remainingSecsToProcess / e.ProcessSpeed;
 
             if (double.IsNormal(estTimeRemaining))
-                StreamingTimeRemaining?.Invoke(this, TimeSpan.FromSeconds(estTimeRemaining));
+                OnStreamingTimeRemaining(TimeSpan.FromSeconds(estTimeRemaining));
 
             double progressPercent = 100 * e.ProcessPosition.TotalSeconds / duration.TotalSeconds;
 
-            StreamingProgressChanged?.Invoke(this,
+            OnStreamingProgressChanged(
                 new DownloadProgress
                 {
                     ProgressPercentage = progressPercent,

FileLiberator/DownloadDecryptBook.cs

@@ -8,47 +8,66 @@ using AudibleApi;
 using DataLayer;
 using Dinah.Core;
 using Dinah.Core.ErrorHandling;
-using Dinah.Core.Net.Http;
 using FileManager;
+using LibationFileManager;
 
 namespace FileLiberator
 {
-    public class DownloadDecryptBook : IAudioDecodable
+    public class DownloadDecryptBook : AudioDecodable
     {
-        private AudiobookDownloadBase aaxcDownloader;
+        private AudiobookDownloadBase abDownloader;
 
-        public event EventHandler<TimeSpan> StreamingTimeRemaining;
-        public event EventHandler<Action<byte[]>> RequestCoverArt;
-        public event EventHandler<string> TitleDiscovered;
-        public event EventHandler<string> AuthorsDiscovered;
-        public event EventHandler<string> NarratorsDiscovered;
-        public event EventHandler<byte[]> CoverImageDiscovered;
-        public event EventHandler<string> StreamingBegin;
-        public event EventHandler<DownloadProgress> StreamingProgressChanged;
-        public event EventHandler<string> StreamingCompleted;
-        public event EventHandler<LibraryBook> Begin;
-        public event EventHandler<string> StatusUpdate;
-        public event EventHandler<LibraryBook> Completed;
+        public override bool Validate(LibraryBook libraryBook) => !libraryBook.Book.Audio_Exists;
 
-        public async Task<StatusHandler> ProcessAsync(LibraryBook libraryBook)
+        public override void Cancel() => abDownloader?.Cancel();
+
+        public override async Task<StatusHandler> ProcessAsync(LibraryBook libraryBook)
         {
-            Begin?.Invoke(this, libraryBook);
+            var entries = new List<FilePathCache.CacheEntry>();
+            // these only work so minimally b/c CacheEntry is a record.
+            // in case of parallel decrypts, only capture the ones for this book id.
+            // if user somehow starts multiple decrypts of the same book in parallel: on their own head be it
+            void FilePathCache_Inserted(object sender, FilePathCache.CacheEntry e)
+            {
+                if (e.Id.EqualsInsensitive(libraryBook.Book.AudibleProductId))
+                    entries.Add(e);
+            }
+            void FilePathCache_Removed(object sender, FilePathCache.CacheEntry e)
+            {
+                if (e.Id.EqualsInsensitive(libraryBook.Book.AudibleProductId))
+                    entries.Remove(e);
+            }
+
+            OnBegin(libraryBook);
 
             try
             {
                 if (libraryBook.Book.Audio_Exists)
                     return new StatusHandler { "Cannot find decrypt. Final audio file already exists" };
 
-                var outputAudioFilename = await downloadAudiobookAsync(AudibleFileStorage.DownloadsInProgress, AudibleFileStorage.DecryptInProgress, libraryBook);
+                bool success = false;
+                try
+                {
+                    FilePathCache.Inserted += FilePathCache_Inserted;
+                    FilePathCache.Removed += FilePathCache_Removed;
+
+                    success = await downloadAudiobookAsync(libraryBook);
+                }
+                finally
+                {
+                    FilePathCache.Inserted -= FilePathCache_Inserted;
+                    FilePathCache.Removed -= FilePathCache_Removed;
+                }
 
                 // decrypt failed
-                if (outputAudioFilename is null)
+                if (!success)
                     return new StatusHandler { "Decrypt failed" };
 
-                // moves files and returns dest dir
-                var moveResults = MoveFilesToBooksDir(libraryBook.Book, outputAudioFilename);
+                // moves new files from temp dir to final dest
+                var movedAudioFile = moveFilesToBooksDir(libraryBook, entries);
 
-                if (!moveResults.movedAudioFile)
+                // decrypt failed
+                if (!movedAudioFile)
                     return new StatusHandler { "Cannot find final audio file after decryption" };
 
                 libraryBook.Book.UserDefinedItem.BookStatus = LiberatedStatus.Liberated;
@@ -57,17 +76,17 @@ namespace FileLiberator
             }
             finally
             {
-                Completed?.Invoke(this, libraryBook);
+                OnCompleted(libraryBook);
             }
         }
 
-        private async Task<string> downloadAudiobookAsync(string cacheDir, string destinationDir, LibraryBook libraryBook)
+        private async Task<bool> downloadAudiobookAsync(LibraryBook libraryBook)
         {
-            StreamingBegin?.Invoke(this, $"Begin decrypting {libraryBook}");
+            OnStreamingBegin($"Begin decrypting {libraryBook}");
 
             try
             {
-                validate(libraryBook);
+                downloadValidation(libraryBook);
 
                 var api = await libraryBook.GetApiAsync();
                 var contentLic = await api.GetDownloadLicenseAsync(libraryBook.Book.AudibleProductId);
@@ -95,104 +114,37 @@ namespace FileLiberator
                     foreach (var chap in contentLic.ContentMetadata?.ChapterInfo?.Chapters)
                         audiobookDlLic.ChapterInfo.AddChapter(chap.Title, TimeSpan.FromMilliseconds(chap.LengthMs));
                 }
-                
-                var outFileName = Path.Combine(destinationDir, $"{PathLib.ToPathSafeString(libraryBook.Book.Title)} [{libraryBook.Book.AudibleProductId}].{outputFormat.ToString().ToLower()}");
 
-                aaxcDownloader = contentLic.DrmType == AudibleApi.Common.DrmType.Adrm
-                    ? new AaxcDownloadConverter(outFileName, cacheDir, audiobookDlLic, outputFormat, Configuration.Instance.SplitFilesByChapter) { AppName = "Libation" }
-                    : new UnencryptedAudiobookDownloader(outFileName, cacheDir, audiobookDlLic);
-                aaxcDownloader.DecryptProgressUpdate += (s, progress) => StreamingProgressChanged?.Invoke(this, progress);
-                aaxcDownloader.DecryptTimeRemaining += (s, remaining) => StreamingTimeRemaining?.Invoke(this, remaining);
-                aaxcDownloader.RetrievedTitle += (s, title) => TitleDiscovered?.Invoke(this, title);
-                aaxcDownloader.RetrievedAuthors += (s, authors) => AuthorsDiscovered?.Invoke(this, authors);
-                aaxcDownloader.RetrievedNarrators += (s, narrators) => NarratorsDiscovered?.Invoke(this, narrators);
-                aaxcDownloader.RetrievedCoverArt += AaxcDownloader_RetrievedCoverArt;
+                var outFileName = AudibleFileStorage.Audio.GetInProgressFilename(libraryBook, outputFormat.ToString().ToLower());
+
+                var cacheDir = AudibleFileStorage.DownloadsInProgressDirectory;
+
+                abDownloader
+                    = contentLic.DrmType != AudibleApi.Common.DrmType.Adrm ? new UnencryptedAudiobookDownloader(outFileName, cacheDir, audiobookDlLic)
+                    : Configuration.Instance.SplitFilesByChapter ? new AaxcDownloadMultiConverter(
+                        outFileName, cacheDir, audiobookDlLic, outputFormat,
+                        AudibleFileStorage.Audio.CreateMultipartRenamerFunc(libraryBook)
+                        )
+                    : new AaxcDownloadSingleConverter(outFileName, cacheDir, audiobookDlLic, outputFormat);
+                abDownloader.DecryptProgressUpdate += (_, progress) => OnStreamingProgressChanged(progress);
+                abDownloader.DecryptTimeRemaining += (_, remaining) => OnStreamingTimeRemaining(remaining);
+                abDownloader.RetrievedTitle += (_, title) => OnTitleDiscovered(title);
+                abDownloader.RetrievedAuthors += (_, authors) => OnAuthorsDiscovered(authors);
+                abDownloader.RetrievedNarrators += (_, narrators) => OnNarratorsDiscovered(narrators);
+                abDownloader.RetrievedCoverArt += AaxcDownloader_RetrievedCoverArt;
+                abDownloader.FileCreated += (_, path) => OnFileCreated(libraryBook, path);
 
                 // REAL WORK DONE HERE
-                var success = await Task.Run(() => aaxcDownloader.Run());
-
-                // decrypt failed
-                if (!success)
-                    return null;
-
-                return outFileName;
+                var success = await Task.Run(abDownloader.Run);
+                return success;
             }
             finally
             {
-                StreamingCompleted?.Invoke(this, $"Completed downloading and decrypting {libraryBook.Book.Title}");
+                OnStreamingCompleted($"Completed downloading and decrypting {libraryBook.Book.Title}");
             }
         }
 
-        private void AaxcDownloader_RetrievedCoverArt(object sender, byte[] e)
-        {
-            if (e is null && Configuration.Instance.AllowLibationFixup)
-            {
-                RequestCoverArt?.Invoke(this, aaxcDownloader.SetCoverArt);
-            }
-
-            if (e is not null)
-            {
-                CoverImageDiscovered?.Invoke(this, e);
-            }
-        }
-
-        private static (string destinationDir, bool movedAudioFile) MoveFilesToBooksDir(Book product, string outputAudioFilename)
-        {
-            // create final directory. move each file into it. MOVE AUDIO FILE LAST
-            // new dir: safetitle_limit50char + " [" + productId + "]"
-            // TODO make this method handle multiple audio files or a single audio file.
-            var destinationDir = AudibleFileStorage.Audio.GetDestDir(product.Title, product.AudibleProductId);
-            Directory.CreateDirectory(destinationDir);
-
-            var sortedFiles = getProductFilesSorted(product, outputAudioFilename);
-
-            var musicFileExt = Path.GetExtension(outputAudioFilename).Trim('.');
-
-            // audio filename: safetitle_limit50char + " [" + productId + "]." + audio_ext
-            var audioFileName = FileUtility.GetValidFilename(destinationDir, product.Title, musicFileExt, product.AudibleProductId);
-
-            bool movedAudioFile = false;
-            foreach (var f in sortedFiles)
-            {
-                var dest
-                    = AudibleFileStorage.Audio.IsFileTypeMatch(f)//f.Extension.Equals($".{musicFileExt}", StringComparison.OrdinalIgnoreCase)
-                    ? Path.Join(destinationDir, f.Name)
-                    // non-audio filename: safetitle_limit50char + " [" + productId + "][" + audio_ext + "]." + non_audio_ext
-                    : FileUtility.GetValidFilename(destinationDir, product.Title, f.Extension, product.AudibleProductId, musicFileExt);
-
-                if (Path.GetExtension(dest).Trim('.').ToLower() == "cue")
-                    Cue.UpdateFileName(f, audioFileName);
-
-                File.Move(f.FullName, dest);
-
-                movedAudioFile |= AudibleFileStorage.Audio.IsFileTypeMatch(f);
-            }
-
-            AudibleFileStorage.Audio.Refresh();
-
-            return (destinationDir, movedAudioFile);
-        }
-
-        private static List<FileInfo> getProductFilesSorted(Book product, string outputAudioFilename)
-        {
-            // files are: temp path\author\[asin].ext
-            var m4bDir = new FileInfo(outputAudioFilename).Directory;
-            var files = m4bDir
-                .EnumerateFiles()
-                .Where(f => f.Name.ContainsInsensitive(product.AudibleProductId))
-                .ToList();
-
-            // move audio files to the end of the collection so these files are moved last
-            var musicFiles = files.Where(f => AudibleFileStorage.Audio.IsFileTypeMatch(f));
-            var sortedFiles = files
-                .Except(musicFiles)
-                .Concat(musicFiles)
-                .ToList();
-
-            return sortedFiles;
-        }
-
-        private static void validate(LibraryBook libraryBook)
+        private static void downloadValidation(LibraryBook libraryBook)
         {
             string errorString(string field)
                 => $"{errorTitle()}\r\nCannot download book. {field} is not known. Try re-importing the account which owns this book.";
@@ -214,11 +166,45 @@ namespace FileLiberator
                 throw new Exception(errorString("Locale"));
         }
 
-        public bool Validate(LibraryBook libraryBook) => !libraryBook.Book.Audio_Exists;
-
-        public void Cancel()
+        private void AaxcDownloader_RetrievedCoverArt(object sender, byte[] e)
         {
-            aaxcDownloader?.Cancel();
+            if (e is not null)
+                OnCoverImageDiscovered(e);
+            else if (Configuration.Instance.AllowLibationFixup)
+                OnRequestCoverArt(abDownloader.SetCoverArt);
         }
-    }
+
+        /// <summary>Move new files to 'Books' directory</summary>
+        /// <returns>True if audiobook file(s) were successfully created and can be located on disk. Else false.</returns>
+        private static bool moveFilesToBooksDir(LibraryBook libraryBook, List<FilePathCache.CacheEntry> entries)
+        {
+            // create final directory. move each file into it
+            var destinationDir = AudibleFileStorage.Audio.GetDestinationDirectory(libraryBook);
+            Directory.CreateDirectory(destinationDir);
+
+            FilePathCache.CacheEntry getFirstAudio() => entries.FirstOrDefault(f => f.FileType == FileType.Audio);
+
+			if (getFirstAudio() == default)
+				return false;
+
+			for (var i = 0; i < entries.Count; i++)
+			{
+				var entry = entries[i];
+
+				var realDest = FileUtility.SaferMoveToValidPath(entry.Path, Path.Combine(destinationDir, Path.GetFileName(entry.Path)));
+				FilePathCache.Insert(libraryBook.Book.AudibleProductId, realDest);
+
+				// propogate corrected path. Must update cache with corrected path. Also want updated path for cue file (after this for-loop)
+				entries[i] = entry with { Path = realDest };
+			}
+
+			var cue = entries.FirstOrDefault(f => f.FileType == FileType.Cue);
+			if (cue != default)
+				Cue.UpdateFileName(cue.Path, getFirstAudio().Path);
+
+			AudibleFileStorage.Audio.Refresh();
+
+			return true;
+		}
+	}
 }

FileLiberator/DownloadFile.cs

@@ -6,30 +6,26 @@ using Dinah.Core.Net.Http;
 namespace FileLiberator
 {
 	// currently only used to download the .zip flies for upgrade
-	public class DownloadFile : IStreamable
+	public class DownloadFile : Streamable
 	{
-		public event EventHandler<string> StreamingBegin;
-		public event EventHandler<DownloadProgress> StreamingProgressChanged;
-		public event EventHandler<string> StreamingCompleted;
-		public event EventHandler<TimeSpan> StreamingTimeRemaining;
-
 		public async Task<string> PerformDownloadFileAsync(string downloadUrl, string proposedDownloadFilePath)
 		{
 			var client = new HttpClient();
 
 			var progress = new Progress<DownloadProgress>();
-			progress.ProgressChanged += (_, e) => StreamingProgressChanged?.Invoke(this, e);
+			progress.ProgressChanged += (_, e) => OnStreamingProgressChanged(e);
 
-			StreamingBegin?.Invoke(this, proposedDownloadFilePath);
+			OnStreamingBegin(proposedDownloadFilePath);
 
 			try
 			{
 				var actualDownloadedFilePath = await client.DownloadFileAsync(downloadUrl, proposedDownloadFilePath, progress);
+				OnFileCreated("Upgrade", actualDownloadedFilePath);
 				return actualDownloadedFilePath;
 			}
 			finally
 			{
-				StreamingCompleted?.Invoke(this, proposedDownloadFilePath);
+				OnStreamingCompleted(proposedDownloadFilePath);
 			}
 		}
 	}

FileLiberator/DownloadPdf.cs

@@ -8,28 +8,19 @@ using DataLayer;
 using Dinah.Core.ErrorHandling;
 using Dinah.Core.Net.Http;
 using FileManager;
+using LibationFileManager;
 
 namespace FileLiberator
 {
-	public class DownloadPdf : IProcessable
+	public class DownloadPdf : Processable
 	{
-		public event EventHandler<LibraryBook> Begin;
-		public event EventHandler<LibraryBook> Completed;
-
-		public event EventHandler<string> StreamingBegin;
-		public event EventHandler<DownloadProgress> StreamingProgressChanged;
-		public event EventHandler<string> StreamingCompleted;
-
-		public event EventHandler<string> StatusUpdate;
-		public event EventHandler<TimeSpan> StreamingTimeRemaining;
-
-		public bool Validate(LibraryBook libraryBook)
+		public override bool Validate(LibraryBook libraryBook)
 			=> !string.IsNullOrWhiteSpace(getdownloadUrl(libraryBook))
 			&& !libraryBook.Book.PDF_Exists;
 
-		public async Task<StatusHandler> ProcessAsync(LibraryBook libraryBook)
+		public override async Task<StatusHandler> ProcessAsync(LibraryBook libraryBook)
 		{
-			Begin?.Invoke(this, libraryBook);
+			OnBegin(libraryBook);
 
 			try
 			{
@@ -43,25 +34,20 @@ namespace FileLiberator
 			}
 			finally
 			{
-				Completed?.Invoke(this, libraryBook);
+				OnCompleted(libraryBook);
 			}
 		}
 
 		private static string getProposedDownloadFilePath(LibraryBook libraryBook)
 		{
+			var extension = Path.GetExtension(getdownloadUrl(libraryBook));
+
 			// if audio file exists, get it's dir. else return base Book dir
 			var existingPath = Path.GetDirectoryName(AudibleFileStorage.Audio.GetPath(libraryBook.Book.AudibleProductId));
-			var file = getdownloadUrl(libraryBook);
+			if (existingPath is not null)
+				return AudibleFileStorage.Audio.GetCustomDirFilename(libraryBook, existingPath, extension);
 
-			if (existingPath != null)
-				return Path.Combine(existingPath, Path.GetFileName(file));
-
-			var full = FileUtility.GetValidFilename(
-				AudibleFileStorage.PdfStorageDirectory,
-				libraryBook.Book.Title,
-				Path.GetExtension(file),
-				libraryBook.Book.AudibleProductId);
-			return full;
+			return AudibleFileStorage.Audio.GetBooksDirectoryFilename(libraryBook, extension);
 		}
 
 		private static string getdownloadUrl(LibraryBook libraryBook)
@@ -69,7 +55,7 @@ namespace FileLiberator
 
 		private async Task<string> downloadPdfAsync(LibraryBook libraryBook, string proposedDownloadFilePath)
 		{
-			StreamingBegin?.Invoke(this, proposedDownloadFilePath);
+			OnStreamingBegin(proposedDownloadFilePath);
 
 			try
 			{
@@ -77,17 +63,19 @@ namespace FileLiberator
 				var downloadUrl = await api.GetPdfDownloadLinkAsync(libraryBook.Book.AudibleProductId);
 
 				var progress = new Progress<DownloadProgress>();
-				progress.ProgressChanged += (_, e) => StreamingProgressChanged?.Invoke(this, e);
+				progress.ProgressChanged += (_, e) => OnStreamingProgressChanged(e);
 
 				var client = new HttpClient();
 
 				var actualDownloadedFilePath = await client.DownloadFileAsync(downloadUrl, proposedDownloadFilePath, progress);
-				StatusUpdate?.Invoke(this, actualDownloadedFilePath);
+				OnFileCreated(libraryBook, actualDownloadedFilePath);
+
+				OnStatusUpdate(actualDownloadedFilePath);
 				return actualDownloadedFilePath;
 			}
 			finally
 			{
-				StreamingCompleted?.Invoke(this, proposedDownloadFilePath);
+				OnStreamingCompleted(proposedDownloadFilePath);
 			}
 		}
 

FileLiberator/FileLiberator.csproj

@@ -7,8 +7,7 @@
   <ItemGroup>
     <ProjectReference Include="..\AaxDecrypter\AaxDecrypter.csproj" />
     <ProjectReference Include="..\DataLayer\DataLayer.csproj" />
-    <ProjectReference Include="..\FileManager\FileManager.csproj" />
-    <ProjectReference Include="..\InternalUtilities\InternalUtilities.csproj" />
+    <ProjectReference Include="..\AudibleUtilities\AudibleUtilities.csproj" />
   </ItemGroup>
 
 </Project>

FileLiberator/IAudioDecodable.cs

@@ -1,14 +0,0 @@
-using System;
-
-namespace FileLiberator
-{
-    public interface IAudioDecodable : IProcessable
-    {
-        event EventHandler<Action<byte[]>> RequestCoverArt;
-        event EventHandler<string> TitleDiscovered;
-        event EventHandler<string> AuthorsDiscovered;
-        event EventHandler<string> NarratorsDiscovered;
-        event EventHandler<byte[]> CoverImageDiscovered;
-        void Cancel();
-    }
-}

FileLiberator/IProcessable.cs

@@ -1,23 +0,0 @@
-using System;
-using System.Threading.Tasks;
-using DataLayer;
-using Dinah.Core.ErrorHandling;
-
-namespace FileLiberator
-{
-    public interface IProcessable : IStreamable
-    {
-        event EventHandler<LibraryBook> Begin;
-
-        /// <summary>General string message to display. DON'T rely on this for success, failure, or control logic</summary>
-        event EventHandler<string> StatusUpdate;
-
-        event EventHandler<LibraryBook> Completed;
-
-		/// <returns>True == Valid</returns>
-		bool Validate(LibraryBook libraryBook);
-
-        /// <returns>True == success</returns>
-        Task<StatusHandler> ProcessAsync(LibraryBook libraryBook);
-    }
-}

FileLiberator/IProcessableExt.cs

@@ -1,45 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using DataLayer;
-using Dinah.Core;
-using Dinah.Core.ErrorHandling;
-
-namespace FileLiberator
-{
-    public static class IProcessableExt
-    {
-        // when used in foreach: stateful. deferred execution
-        public static IEnumerable<LibraryBook> GetValidLibraryBooks(this IProcessable processable, IEnumerable<LibraryBook> library)
-            => library.Where(libraryBook =>
-                processable.Validate(libraryBook)
-                && (libraryBook.Book.ContentType != ContentType.Episode || FileManager.Configuration.Instance.DownloadEpisodes)
-                );
-
-        public static async Task<StatusHandler> ProcessSingleAsync(this IProcessable processable, LibraryBook libraryBook, bool validate)
-        {
-            if (validate && !processable.Validate(libraryBook))
-                return new StatusHandler { "Validation failed" };
-
-            Serilog.Log.Logger.Information("Begin " + nameof(ProcessSingleAsync) + " {@DebugInfo}", new
-            {
-                libraryBook.Book.Title,
-                libraryBook.Book.AudibleProductId,
-                libraryBook.Book.Locale,
-                Account = libraryBook.Account?.ToMask() ?? "[empty]"
-            });
-
-            var status
-                = (await processable.ProcessAsync(libraryBook))
-                ?? new StatusHandler { "Processable should never return a null status" };
-
-            return status;
-        }
-
-		public static async Task<StatusHandler> TryProcessAsync(this IProcessable processable, LibraryBook libraryBook)
-			=> processable.Validate(libraryBook)
-			? await processable.ProcessAsync(libraryBook)
-			: new StatusHandler();
-	}
-}

FileLiberator/IStreamable.cs

@@ -1,13 +0,0 @@
-using System;
-using Dinah.Core.Net.Http;
-
-namespace FileLiberator
-{
-    public interface IStreamable
-    {
-        event EventHandler<string> StreamingBegin;
-		event EventHandler<DownloadProgress> StreamingProgressChanged;
-        event EventHandler<TimeSpan> StreamingTimeRemaining;
-        event EventHandler<string> StreamingCompleted;
-    }
-}

FileLiberator/Processable.cs

@@ -0,0 +1,76 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using DataLayer;
+using Dinah.Core;
+using Dinah.Core.ErrorHandling;
+
+namespace FileLiberator
+{
+    public abstract class Processable : Streamable
+    {
+        public event EventHandler<LibraryBook> Begin;
+
+        /// <summary>General string message to display. DON'T rely on this for success, failure, or control logic</summary>
+        public event EventHandler<string> StatusUpdate;
+
+        public event EventHandler<LibraryBook> Completed;
+
+        /// <returns>True == Valid</returns>
+        public abstract bool Validate(LibraryBook libraryBook);
+
+        /// <returns>True == success</returns>
+        public abstract Task<StatusHandler> ProcessAsync(LibraryBook libraryBook);
+
+        // when used in foreach: stateful. deferred execution
+        public IEnumerable<LibraryBook> GetValidLibraryBooks(IEnumerable<LibraryBook> library)
+            => library.Where(libraryBook =>
+                Validate(libraryBook)
+                && (libraryBook.Book.ContentType != ContentType.Episode || LibationFileManager.Configuration.Instance.DownloadEpisodes)
+                );
+
+        public async Task<StatusHandler> ProcessSingleAsync(LibraryBook libraryBook, bool validate)
+        {
+            if (validate && !Validate(libraryBook))
+                return new StatusHandler { "Validation failed" };
+
+            Serilog.Log.Logger.Information("Begin " + nameof(ProcessSingleAsync) + " {@DebugInfo}", new
+            {
+                libraryBook.Book.Title,
+                libraryBook.Book.AudibleProductId,
+                libraryBook.Book.Locale,
+                Account = libraryBook.Account?.ToMask() ?? "[empty]"
+            });
+
+            var status
+                = (await ProcessAsync(libraryBook))
+                ?? new StatusHandler { "Processable should never return a null status" };
+
+            return status;
+        }
+
+        public async Task<StatusHandler> TryProcessAsync(LibraryBook libraryBook)
+            => Validate(libraryBook)
+            ? await ProcessAsync(libraryBook)
+            : new StatusHandler();
+
+        protected void OnBegin(LibraryBook libraryBook)
+        {
+            Serilog.Log.Logger.Debug("Event fired {@DebugInfo}", new { Name = nameof(Begin), Book = libraryBook.LogFriendly() });
+            Begin?.Invoke(this, libraryBook);
+        }
+
+        protected void OnStatusUpdate(string statusUpdate)
+        {
+            Serilog.Log.Logger.Debug("Event fired {@DebugInfo}", new { Name = nameof(StatusUpdate), Status = statusUpdate });
+            StatusUpdate?.Invoke(this, statusUpdate);
+        }
+
+        protected void OnCompleted(LibraryBook libraryBook)
+        {
+            Serilog.Log.Logger.Debug("Event fired {@DebugInfo}", new { Name = nameof(Completed), Book = libraryBook.LogFriendly() });
+            Completed?.Invoke(this, libraryBook);
+        }
+    }
+}

FileLiberator/Streamable.cs

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

FileLiberator/UtilityExtensions.cs

@@ -19,7 +19,7 @@ namespace FileLiberator
 
 		public static async Task<AudibleApi.Api> GetApiAsync(this LibraryBook libraryBook)
 		{
-			var apiExtended = await InternalUtilities.ApiExtended.CreateAsync(libraryBook.Account, libraryBook.Book.Locale);
+			var apiExtended = await AudibleUtilities.ApiExtended.CreateAsync(libraryBook.Account, libraryBook.Book.Locale);
 			return apiExtended.Api;
 		}
 	}

FileLiberator/_InternalsVisible.cs

@@ -0,0 +1 @@
+[assembly: System.Runtime.CompilerServices.InternalsVisibleTo(nameof(FileLiberator) + ".Tests")]

FileManager/AudibleFileStorage.cs

@@ -1,149 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Text.RegularExpressions;
-using Dinah.Core;
-using Dinah.Core.Collections.Generic;
-
-namespace FileManager
-{
-    public enum FileType { Unknown, Audio, AAXC, PDF }
-
-	public abstract class AudibleFileStorage : Enumeration<AudibleFileStorage>
-	{
-		protected abstract string[] Extensions { get; }
-		public abstract string StorageDirectory { get; }
-
-		public static string DownloadsInProgress => Directory.CreateDirectory(Path.Combine(Configuration.Instance.InProgress, "DownloadsInProgress")).FullName;
-        public static string DecryptInProgress => Directory.CreateDirectory(Path.Combine(Configuration.Instance.InProgress, "DecryptInProgress")).FullName;
-
-        public static string PdfStorageDirectory => BooksDirectory;
-
-		private static AaxcFileStorage AAXC { get; } = new AaxcFileStorage();
-        public static bool AaxcExists(string productId) => AAXC.Exists(productId);
-
-		#region static
-		public static AudioFileStorage Audio { get; } = new AudioFileStorage();
-
-        public static string BooksDirectory
-        {
-            get
-            {
-                if (string.IsNullOrWhiteSpace(Configuration.Instance.Books))
-                    Configuration.Instance.Books = Path.Combine(Configuration.UserProfile, "Books");
-                return Directory.CreateDirectory(Configuration.Instance.Books).FullName;
-            }
-        }
-
-        private static object bookDirectoryFilesLocker { get; } = new();
-        internal static BackgroundFileSystem BookDirectoryFiles { get; set; }
-        #endregion
-
-        #region instance
-        public FileType FileType => (FileType)Value;
-
-		protected IEnumerable<string> extensions_noDots { get; }
-        private string extAggr { get; }
-
-        protected AudibleFileStorage(FileType fileType) : base((int)fileType, fileType.ToString())
-		{
-			extensions_noDots = Extensions.Select(ext => ext.ToLower().Trim('.')).ToList();
-			extAggr = extensions_noDots.Aggregate((a, b) => $"{a}|{b}");
-            BookDirectoryFiles ??= new BackgroundFileSystem(BooksDirectory, "*.*", SearchOption.AllDirectories);
-        }
-
-        protected string GetFilePath(string productId)
-        {
-            var cachedFile = FilePathCache.GetPath(productId, FileType);
-            if (cachedFile != null)
-                return cachedFile;
-
-            var regex = new Regex($@"{productId}.*?\.({extAggr})$", RegexOptions.IgnoreCase);
-
-            string firstOrNull;
-
-            if (StorageDirectory == BooksDirectory)
-            {
-                //If user changed the BooksDirectory, reinitialize.
-                if (StorageDirectory != BookDirectoryFiles.RootDirectory)
-				{
-                    lock (bookDirectoryFilesLocker)
-                    {
-                        if (StorageDirectory != BookDirectoryFiles.RootDirectory)
-                        {
-                            BookDirectoryFiles = new BackgroundFileSystem(StorageDirectory, "*.*", SearchOption.AllDirectories);
-                        }
-                    }
-				}
-
-                firstOrNull = BookDirectoryFiles.FindFile(regex);
-            }
-            else
-            {
-                firstOrNull =
-                    Directory
-                    .EnumerateFiles(StorageDirectory, "*.*", SearchOption.AllDirectories)
-                    .FirstOrDefault(s => regex.IsMatch(s));
-            }
-
-			if (firstOrNull is null)
-				return null;
-
-			FilePathCache.Upsert(productId, FileType, firstOrNull);
-			return firstOrNull;
-        }
-        #endregion
-    }
-
-    public class AudioFileStorage : AudibleFileStorage
-    {
-        protected override string[] Extensions { get; } = new[] { "m4b", "mp3", "aac", "mp4", "m4a", "ogg", "flac" };
-
-        // we always want to use the latest config value, therefore
-        // - DO use 'get' arrow "=>"
-        // - do NOT use assign "="
-        public override string StorageDirectory => BooksDirectory;
-
-        public AudioFileStorage() : base(FileType.Audio) { }
-
-        public void Refresh() => BookDirectoryFiles.RefreshFiles();
-
-        public string GetDestDir(string title, string asin)
-        {
-            // to prevent the paths from getting too long, we don't need after the 1st ":" for the folder
-            var underscoreIndex = title.IndexOf(':');
-            var titleDir
-                = underscoreIndex < 4
-                ? title
-                : title.Substring(0, underscoreIndex);
-            var finalDir = FileUtility.GetValidFilename(StorageDirectory, titleDir, null, asin);
-            return finalDir;
-        }
-
-        public bool IsFileTypeMatch(FileInfo fileInfo)
-            => extensions_noDots.ContainsInsensative(fileInfo.Extension.Trim('.'));
-
-        public string GetPath(string productId) => GetFilePath(productId);
-    }
-
-    public class AaxcFileStorage : AudibleFileStorage
-    {
-        protected override string[] Extensions { get; } = new[] { "aaxc" };
-
-        // we always want to use the latest config value, therefore
-        // - DO use 'get' arrow "=>"
-        // - do NOT use assign "="
-        public override string StorageDirectory => DownloadsInProgress;
-
-        public AaxcFileStorage() : base(FileType.AAXC) { }
-
-        /// <summary>
-        /// Example for full books:
-        /// Search recursively in _books directory. Full book exists if either are true
-        /// - a directory name has the product id and an audio file is immediately inside
-        /// - any audio filename contains the product id
-        /// </summary>
-        public bool Exists(string productId) => GetFilePath(productId) != null;
-    }
-}

FileManager/BackgroundFileSystem.cs

@@ -8,13 +8,9 @@ using System.Threading.Tasks;
 namespace FileManager
 {
     /// <summary>
-    /// Tracks actual locations of files. This is especially useful for clicking button to navigate to the book's files.
-    /// 
-    /// Note: this is no longer how Libation manages "Liberated" state. That is not statefully managed in the database.
-    /// This paradigm is what allows users to manually choose to not download books. Also allows them to manually toggle
-    /// this state and download again.
+    /// Tracks actual locations of files.
     /// </summary>
-    internal class BackgroundFileSystem
+    public class BackgroundFileSystem
     {
         public string RootDirectory { get; private set; }
         public string SearchPattern { get; private set; }

FileManager/FileManager.csproj

@@ -1,12 +1,11 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>net5.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Dinah.Core" Version="1.1.1.2" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="5.0.0" />
+    <PackageReference Include="Dinah.Core" Version="2.0.2.1" />
     <PackageReference Include="Polly" Version="7.2.2" />
   </ItemGroup>
 

FileManager/FileTemplate.cs

@@ -0,0 +1,52 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Dinah.Core;
+
+namespace FileManager
+{
+    /// <summary>Get valid filename. Advanced features incl. parameterized template</summary>
+    public class FileTemplate
+    {
+        /// <summary>Proposed full file path. 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 FileTemplate(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);
+
+        /// <summary>If set, truncate each parameter replacement to this many characters. Default 50</summary>
+        public int? ParameterMaxSize { get; set; } = 50;
+
+        /// <summary>Optional step 2: Replace all illegal characters with this. Default=<see cref="string.Empty"/></summary>
+        public string IllegalCharacterReplacements { get; set; }
+
+        /// <summary>Generate a valid path for this file or directory</summary>
+        public string GetFilePath()
+        {
+            var filename = Template;
+
+            foreach (var r in ParameterReplacements)
+                filename = filename.Replace($"<{formatKey(r.Key)}>", formatValue(r.Value));
+
+            return FileUtility.GetValidFilename(filename, IllegalCharacterReplacements);
+        }
+
+        private static string formatKey(string key)
+            => key
+            .Replace("<", "")
+            .Replace(">", "");
+
+        private string formatValue(object value)
+            => ParameterMaxSize.HasValue && ParameterMaxSize.Value > 0
+            ? value?.ToString().Truncate(ParameterMaxSize.Value)
+            : value?.ToString();
+    }
+}

FileManager/FileUtility.cs

@@ -1,52 +1,179 @@
 using System;
+using System.Collections.Generic;
 using System.IO;
+using System.Linq;
+using Dinah.Core;
+using Polly;
+using Polly.Retry;
 
 namespace FileManager
 {
     public static class FileUtility
     {
-        public static string GetValidFilename(string dirFullPath, string filename, string extension, params string[] metadataSuffixes)
+        /// <summary>
+        /// "txt" => ".txt"
+        /// <br />".txt" => ".txt"
+        /// <br />null or whitespace => ""
+        /// </summary>
+        public static string GetStandardizedExtension(string extension)
+            => string.IsNullOrWhiteSpace(extension)
+            ? (extension ?? "")?.Trim()
+            : '.' + extension.Trim().Trim('.');
+
+        /// <summary>
+        /// Return position with correct number of leading zeros.
+        /// <br />- 2 of 9 => "2"
+        /// <br />- 2 of 90 => "02"
+        /// <br />- 2 of 900 => "002"
+        /// </summary>
+        /// <param name="position">position in sequence. The 'x' in 'x of y'</param>
+        /// <param name="total">total qty in sequence. The 'y' in 'x of y'</param>
+        public static string GetSequenceFormatted(int position, int total)
         {
-            if (string.IsNullOrWhiteSpace(dirFullPath))
-                throw new ArgumentException($"{nameof(dirFullPath)} may not be null or whitespace", nameof(dirFullPath));
+            ArgumentValidator.EnsureGreaterThan(position, nameof(position), 0);
+            ArgumentValidator.EnsureGreaterThan(total, nameof(total), 0);
+            if (position > total)
+                throw new ArgumentException($"{position} may not be greater than {total}");
 
-            // file max length = 255. dir max len = 247
+            return position.ToString().PadLeft(total.ToString().Length, '0');
+        }
 
-            // sanitize
-            filename = getAsciiTag(filename);
-            // manage length
-            if (filename.Length > 50)
-                filename = filename.Substring(0, 50) + "[...]";
+        private const int MAX_FILENAME_LENGTH = 255;
+        private const int MAX_DIRECTORY_LENGTH = 247;
 
-            // append id. it is 10 or 14 char in the common cases
-            if (metadataSuffixes != null && metadataSuffixes.Length > 0)
-                filename += " [" + string.Join("][", metadataSuffixes) + "]";
+        /// <summary>
+        /// Ensure valid file name path: 
+        /// <br/>- remove invalid chars
+        /// <br/>- ensure uniqueness
+        /// <br/>- enforce max file length
+        /// </summary>
+        public static string GetValidFilename(string path, string illegalCharacterReplacements = "")
+        {
+            ArgumentValidator.EnsureNotNull(path, nameof(path));
 
-            // this method may also be used for directory names, so no guarantee of extension
-            if (!string.IsNullOrWhiteSpace(extension))
-                extension = '.' + extension.Trim('.');
+            // remove invalid chars
+            path = GetSafePath(path, illegalCharacterReplacements);
+
+            // ensure uniqueness and check lengths
+            var dir = Path.GetDirectoryName(path);
+            dir = dir.Truncate(MAX_DIRECTORY_LENGTH);
+
+            var filename = Path.GetFileNameWithoutExtension(path);
+            var fileStem = Path.Combine(dir, filename);
+
+            var extension = Path.GetExtension(path);
+
+            var fullfilename = fileStem.Truncate(MAX_FILENAME_LENGTH - extension.Length) + extension;
 
-            // ensure uniqueness
-            var fullfilename = Path.Combine(dirFullPath, filename + extension);
             var i = 0;
             while (File.Exists(fullfilename))
-                fullfilename = Path.Combine(dirFullPath, filename + $" ({++i})" + extension);
+            {
+                var increm = $" ({++i})";
+                fullfilename = fileStem.Truncate(MAX_FILENAME_LENGTH - increm.Length - extension.Length) + increm + extension;
+            }
 
             return fullfilename;
         }
 
-        private static string getAsciiTag(string property)
+        // GetInvalidFileNameChars contains everything in GetInvalidPathChars plus ':', '*', '?', '\\', '/'
+
+        /// <summary>Use with file name, not full path. Valid path charaters which are invalid file name characters will be replaced: ':', '\\', '/'</summary>
+        public static string GetSafeFileName(string str, string illegalCharacterReplacements = "")
+            => string.Join(illegalCharacterReplacements ?? "", str.Split(Path.GetInvalidFileNameChars()));
+
+        /// <summary>Use with full path, not file name. Valid path charaters which are invalid file name characters will be retained: '\\', '/'</summary>
+        public static string GetSafePath(string path, string illegalCharacterReplacements = "")
         {
-            if (property == null)
-                return "";
+            ArgumentValidator.EnsureNotNull(path, nameof(path));
 
-            // omit characters which are invalid. EXCEPTION: change colon to underscore
-            property = property.Replace(':', '_');
+            var invalidChars = Path.GetInvalidPathChars().Union(new[] {
+                '*', '?',
+                // these are weird. If you run Path.GetInvalidPathChars() in C# interactive, these characters are included.
+                // In live code, Path.GetInvalidPathChars() does not include them
+                '"', '<', '>'
+            }).ToArray();
 
-            // GetInvalidFileNameChars contains everything in GetInvalidPathChars plus ':', '*', '?', '\\', '/'
-            foreach (var ch in Path.GetInvalidFileNameChars())
-                property = property.Replace(ch.ToString(), "");
-            return property;
+            var fixedPath = string
+                .Join(illegalCharacterReplacements ?? "", path.Split(invalidChars))
+                .Replace(Path.AltDirectorySeparatorChar, Path.DirectorySeparatorChar);
+
+            // replace all colons except within the first 2 chars
+            var builder = new System.Text.StringBuilder();
+            for (var i = 0; i < fixedPath.Length; i++)
+            {
+                var c = fixedPath[i];
+                if (i >= 2 && c == ':')
+                    builder.Append(illegalCharacterReplacements);
+                else
+                    builder.Append(c);
+            }
+            fixedPath = builder.ToString();
+
+            var dblSeparator = $"{Path.DirectorySeparatorChar}{Path.DirectorySeparatorChar}";
+            while (fixedPath.Contains(dblSeparator))
+                fixedPath = fixedPath.Replace(dblSeparator, $"{Path.DirectorySeparatorChar}");
+
+            return fixedPath;
         }
+
+        /// <summary>
+        /// Move file.
+        /// <br/>- Ensure valid file name path: remove invalid chars, ensure uniqueness, enforce max file length
+        /// <br/>- Perform <see cref="SaferMove"/>
+        /// <br/>- Return valid path
+        /// </summary>
+        public static string SaferMoveToValidPath(string source, string destination)
+        {
+            destination = GetValidFilename(destination);
+            SaferMove(source, destination);
+            return destination;
+        }
+
+        private static int maxRetryAttempts { get; } = 3;
+        private static TimeSpan pauseBetweenFailures { get; } = TimeSpan.FromMilliseconds(100);
+        private static RetryPolicy retryPolicy { get; } =
+            Policy
+            .Handle<Exception>()
+            .WaitAndRetry(maxRetryAttempts, i => pauseBetweenFailures);
+
+        /// <summary>Delete file. No error when source does not exist. Retry up to 3 times before throwing exception.</summary>
+        public static void SaferDelete(string source)
+            => retryPolicy.Execute(() =>
+            {
+                try
+                {
+                    if (File.Exists(source))
+                    {
+                        File.Delete(source);
+                        Serilog.Log.Logger.Information("File successfully deleted", new { source });
+                    }
+                }
+                catch (Exception e)
+                {
+                    Serilog.Log.Logger.Error(e, "Failed to delete file", new { source });
+                    throw;
+                }
+            });
+
+        /// <summary>Move file. No error when source does not exist. Retry up to 3 times before throwing exception.</summary>
+		public static void SaferMove(string source, string destination)
+            => retryPolicy.Execute(() =>
+            {
+                try
+                {
+                    if (File.Exists(source))
+                    {
+                        SaferDelete(destination);
+                        Directory.CreateDirectory(Path.GetDirectoryName(destination));
+                        File.Move(source, destination);
+                        Serilog.Log.Logger.Information("File successfully moved", new { source, destination });
+                    }
+                }
+                catch (Exception e)
+                {
+                    Serilog.Log.Logger.Error(e, "Failed to move file", new { source, destination });
+                    throw;
+                }
+            });
     }
 }

FileManager/_InternalsVisible.cs

@@ -0,0 +1 @@
+[assembly: System.Runtime.CompilerServices.InternalsVisibleTo(nameof(FileManager) + ".Tests")]

Libation.sln

@@ -23,13 +23,13 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "2 Utilities (domain ignoran
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AaxDecrypter", "AaxDecrypter\AaxDecrypter.csproj", "{8BD8E012-F44F-4EE2-A234-D66C14D5FE4B}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FileManager", "FileManager\FileManager.csproj", "{1AE65B61-9C05-4C80-ABFF-48F16E22FDF1}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibationFileManager", "LibationFileManager\LibationFileManager.csproj", "{1AE65B61-9C05-4C80-ABFF-48F16E22FDF1}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DataLayer", "DataLayer\DataLayer.csproj", "{59A10DF3-63EC-43F1-A3BF-4000CFA118D2}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FileLiberator", "FileLiberator\FileLiberator.csproj", "{393B5B27-D15C-4F77-9457-FA14BA8F3C73}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "InternalUtilities", "InternalUtilities\InternalUtilities.csproj", "{06882742-27A6-4347-97D9-56162CEC9C11}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AudibleUtilities", "AudibleUtilities\AudibleUtilities.csproj", "{06882742-27A6-4347-97D9-56162CEC9C11}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "3 Domain Internal Utilities (db ignorant)", "3 Domain Internal Utilities (db ignorant)", "{F0CBB7A7-D3FB-41FF-8F47-CF3F6A592249}"
 EndProject
@@ -46,8 +46,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ApplicationServices", "Appl
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "_Tests", "_Tests", "{67E66E82-5532-4440-AFB3-9FB1DF9DEF53}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "InternalUtilities.Tests", "_Tests\InternalUtilities.Tests\InternalUtilities.Tests.csproj", "{8447C956-B03E-4F59-9DD4-877793B849D9}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibationSearchEngine.Tests", "_Tests\LibationSearchEngine.Tests\LibationSearchEngine.Tests.csproj", "{C5B21768-C7C9-4FCB-AC1E-187B223D5A98}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Hoopla", "Hoopla\Hoopla.csproj", "{D8F56E5A-3E65-41A6-B7E7-C4515A264B1F}"
@@ -56,6 +54,16 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibationCli", "LibationCli\
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AppScaffolding", "AppScaffolding\AppScaffolding.csproj", "{595E7C4D-506D-486D-98B7-5FDDF398D033}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FileManager", "FileManager\FileManager.csproj", "{E86014F9-E4B3-4CD4-A210-2B3DB571DD86}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AudibleUtilities.Tests", "_Tests\AudibleUtilities.Tests\AudibleUtilities.Tests.csproj", "{788294BE-0D8E-40D4-9CEE-67896FBB52CE}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FileLiberator.Tests", "_Tests\FileLiberator.Tests\FileLiberator.Tests.csproj", "{5B8FC827-BF58-4CB1-A59E-BDEB9C62A05E}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FileManager.Tests", "_Tests\FileManager.Tests\FileManager.Tests.csproj", "{F2E04270-4551-41C4-99FF-E7125BED708C}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LibationFileManager.Tests", "_Tests\LibationFileManager.Tests\LibationFileManager.Tests.csproj", "{EB781571-8548-477E-82AD-FB9FAB548D2F}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -98,10 +106,6 @@ Global
 		{B95650EA-25F0-449E-BA5D-99126BC5D730}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{B95650EA-25F0-449E-BA5D-99126BC5D730}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{B95650EA-25F0-449E-BA5D-99126BC5D730}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8447C956-B03E-4F59-9DD4-877793B849D9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8447C956-B03E-4F59-9DD4-877793B849D9}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8447C956-B03E-4F59-9DD4-877793B849D9}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8447C956-B03E-4F59-9DD4-877793B849D9}.Release|Any CPU.Build.0 = Release|Any CPU
 		{C5B21768-C7C9-4FCB-AC1E-187B223D5A98}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{C5B21768-C7C9-4FCB-AC1E-187B223D5A98}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{C5B21768-C7C9-4FCB-AC1E-187B223D5A98}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -118,6 +122,26 @@ Global
 		{595E7C4D-506D-486D-98B7-5FDDF398D033}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{595E7C4D-506D-486D-98B7-5FDDF398D033}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{595E7C4D-506D-486D-98B7-5FDDF398D033}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E86014F9-E4B3-4CD4-A210-2B3DB571DD86}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E86014F9-E4B3-4CD4-A210-2B3DB571DD86}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E86014F9-E4B3-4CD4-A210-2B3DB571DD86}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E86014F9-E4B3-4CD4-A210-2B3DB571DD86}.Release|Any CPU.Build.0 = Release|Any CPU
+		{788294BE-0D8E-40D4-9CEE-67896FBB52CE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{788294BE-0D8E-40D4-9CEE-67896FBB52CE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{788294BE-0D8E-40D4-9CEE-67896FBB52CE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{788294BE-0D8E-40D4-9CEE-67896FBB52CE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5B8FC827-BF58-4CB1-A59E-BDEB9C62A05E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5B8FC827-BF58-4CB1-A59E-BDEB9C62A05E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5B8FC827-BF58-4CB1-A59E-BDEB9C62A05E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5B8FC827-BF58-4CB1-A59E-BDEB9C62A05E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F2E04270-4551-41C4-99FF-E7125BED708C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F2E04270-4551-41C4-99FF-E7125BED708C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F2E04270-4551-41C4-99FF-E7125BED708C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F2E04270-4551-41C4-99FF-E7125BED708C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EB781571-8548-477E-82AD-FB9FAB548D2F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EB781571-8548-477E-82AD-FB9FAB548D2F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EB781571-8548-477E-82AD-FB9FAB548D2F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EB781571-8548-477E-82AD-FB9FAB548D2F}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -132,11 +156,15 @@ Global
 		{635F00E1-AAD1-45F7-BEB7-D909AD33B9F6} = {8679CAC8-9164-4007-BDD2-F004810EDA14}
 		{401865F5-1942-4713-B230-04544C0A97B0} = {41CDCC73-9B81-49DD-9570-C54406E852AF}
 		{B95650EA-25F0-449E-BA5D-99126BC5D730} = {41CDCC73-9B81-49DD-9570-C54406E852AF}
-		{8447C956-B03E-4F59-9DD4-877793B849D9} = {67E66E82-5532-4440-AFB3-9FB1DF9DEF53}
 		{C5B21768-C7C9-4FCB-AC1E-187B223D5A98} = {67E66E82-5532-4440-AFB3-9FB1DF9DEF53}
 		{D8F56E5A-3E65-41A6-B7E7-C4515A264B1F} = {7FBBB086-0807-4998-85BF-6D1A49C8AD05}
 		{428163C3-D558-4914-B570-A92069521877} = {8679CAC8-9164-4007-BDD2-F004810EDA14}
 		{595E7C4D-506D-486D-98B7-5FDDF398D033} = {8679CAC8-9164-4007-BDD2-F004810EDA14}
+		{E86014F9-E4B3-4CD4-A210-2B3DB571DD86} = {43E3ACB3-E0BC-4370-8DBB-E3720C8C8FD1}
+		{788294BE-0D8E-40D4-9CEE-67896FBB52CE} = {67E66E82-5532-4440-AFB3-9FB1DF9DEF53}
+		{5B8FC827-BF58-4CB1-A59E-BDEB9C62A05E} = {67E66E82-5532-4440-AFB3-9FB1DF9DEF53}
+		{F2E04270-4551-41C4-99FF-E7125BED708C} = {67E66E82-5532-4440-AFB3-9FB1DF9DEF53}
+		{EB781571-8548-477E-82AD-FB9FAB548D2F} = {67E66E82-5532-4440-AFB3-9FB1DF9DEF53}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {615E00ED-BAEF-4E8E-A92A-9B82D87942A9}

LibationCli/Options/ExportOptions.cs

@@ -3,8 +3,8 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 using ApplicationServices;
+using AudibleUtilities;
 using CommandLine;
-using InternalUtilities;
 
 namespace LibationCli
 {

LibationCli/Options/LiberateOptions.cs

@@ -20,7 +20,7 @@ namespace LibationCli
 			? RunAsync(CreateProcessable<DownloadPdf>())
 			: RunAsync(CreateBackupBook());
 
-		private static IProcessable CreateBackupBook()
+		private static Processable CreateBackupBook()
 		{
 			var downloadPdf = CreateProcessable<DownloadPdf>();
 

LibationCli/Options/ScanOptions.cs

@@ -3,8 +3,8 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 using ApplicationServices;
+using AudibleUtilities;
 using CommandLine;
-using InternalUtilities;
 
 namespace LibationCli
 {

LibationCli/Options/_ProcessableOptionsBase.cs

@@ -13,7 +13,7 @@ namespace LibationCli
 	public abstract class ProcessableOptionsBase : OptionsBase
 	{
 		protected static TProcessable CreateProcessable<TProcessable>(EventHandler<LibraryBook> completedAction = null)
-			where TProcessable : IProcessable, new()
+			where TProcessable : Processable, new()
 		{
 			var strProc = new TProcessable();
 
@@ -25,7 +25,7 @@ namespace LibationCli
 			return strProc;
 		}
 
-		protected static async Task RunAsync(IProcessable Processable)
+		protected static async Task RunAsync(Processable Processable)
 		{
 			foreach (var libraryBook in Processable.GetValidLibraryBooks(DbContexts.GetLibrary_Flat_NoTracking()))
 				await ProcessOneAsync(Processable, libraryBook, false);
@@ -35,7 +35,7 @@ namespace LibationCli
 			Serilog.Log.Logger.Information(done);
 		}
 
-		private static async Task ProcessOneAsync(IProcessable Processable, LibraryBook libraryBook, bool validate)
+		private static async Task ProcessOneAsync(Processable Processable, LibraryBook libraryBook, bool validate)
 		{
 			try
 			{

LibationFileManager/AudibleFileStorage.cs

@@ -0,0 +1,106 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text.RegularExpressions;
+using FileManager;
+
+namespace LibationFileManager
+{
+    public abstract class AudibleFileStorage
+    {
+        protected abstract string GetFilePathCustom(string productId);
+
+        #region static
+        public static string DownloadsInProgressDirectory => Directory.CreateDirectory(Path.Combine(Configuration.Instance.InProgress, "DownloadsInProgress")).FullName;
+        public static string DecryptInProgressDirectory => Directory.CreateDirectory(Path.Combine(Configuration.Instance.InProgress, "DecryptInProgress")).FullName;
+
+        private static AaxcFileStorage AAXC { get; } = new AaxcFileStorage();
+        public static bool AaxcExists(string productId) => AAXC.Exists(productId);
+
+        public static AudioFileStorage Audio { get; } = new AudioFileStorage();
+
+        public static string BooksDirectory
+        {
+            get
+            {
+                if (string.IsNullOrWhiteSpace(Configuration.Instance.Books))
+                    Configuration.Instance.Books = Path.Combine(Configuration.UserProfile, "Books");
+                return Directory.CreateDirectory(Configuration.Instance.Books).FullName;
+            }
+        }
+        #endregion
+
+        #region instance
+        private FileType FileType { get; }
+        private string regexTemplate { get; }
+
+        protected AudibleFileStorage(FileType fileType)
+        {
+            FileType = fileType;
+
+            var extAggr = FileTypes.GetExtensions(FileType).Aggregate((a, b) => $"{a}|{b}");
+            regexTemplate = $@"{{0}}.*?\.({extAggr})$";
+        }
+
+        protected string GetFilePath(string productId)
+        {
+            // primary lookup
+            var cachedFile = FilePathCache.GetFirstPath(productId, FileType);
+            if (cachedFile != null)
+                return cachedFile;
+
+            // secondary lookup attempt
+            var firstOrNull = GetFilePathCustom(productId);
+            if (firstOrNull is not null)
+                FilePathCache.Insert(productId, firstOrNull);
+
+            return firstOrNull;
+        }
+
+        protected Regex GetBookSearchRegex(string productId)
+        {
+            var pattern = string.Format(regexTemplate, productId);
+            return new Regex(pattern, RegexOptions.IgnoreCase);
+        }
+        #endregion
+    }
+
+    internal class AaxcFileStorage : AudibleFileStorage
+    {
+        internal AaxcFileStorage() : base(FileType.AAXC) { }
+
+        protected override string GetFilePathCustom(string productId)
+        {
+            var regex = GetBookSearchRegex(productId);
+            return Directory
+                .EnumerateFiles(DownloadsInProgressDirectory, "*.*", SearchOption.AllDirectories)
+                .FirstOrDefault(s => regex.IsMatch(s));
+        }
+
+        public bool Exists(string productId) => GetFilePath(productId) != null;
+    }
+
+    public class AudioFileStorage : AudibleFileStorage
+    {
+        internal AudioFileStorage() : base(FileType.Audio)
+            => BookDirectoryFiles ??= new BackgroundFileSystem(BooksDirectory, "*.*", SearchOption.AllDirectories);
+
+        private static BackgroundFileSystem BookDirectoryFiles { get; set; }
+        private static object bookDirectoryFilesLocker { get; } = new();
+        protected override string GetFilePathCustom(string productId)
+        {
+            // If user changed the BooksDirectory: reinitialize
+            lock (bookDirectoryFilesLocker)
+                if (BooksDirectory != BookDirectoryFiles.RootDirectory)
+                    BookDirectoryFiles = new BackgroundFileSystem(BooksDirectory, "*.*", SearchOption.AllDirectories);
+
+            var regex = GetBookSearchRegex(productId);
+            return BookDirectoryFiles.FindFile(regex);
+        }
+
+        public void Refresh() => BookDirectoryFiles.RefreshFiles();
+
+        public string GetPath(string productId) => GetFilePath(productId);
+    }
+}

LibationFileManager/Configuration.cs

@@ -5,13 +5,14 @@ using System.IO;
 using System.Linq;
 using Dinah.Core;
 using Dinah.Core.Logging;
+using FileManager;
 using Microsoft.Extensions.Configuration;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using Serilog;
 using Serilog.Events;
 
-namespace FileManager
+namespace LibationFileManager
 {
     public class Configuration
     {
@@ -88,7 +89,7 @@ namespace FileManager
             set => persistentDictionary.SetString(nameof(InProgress), value);
         }
 
-        [Description("Allow Libation for fix up audiobook metadata?")]
+        [Description("Allow Libation to fix up audiobook metadata")]
         public bool AllowLibationFixup
         {
             get => persistentDictionary.GetNonString<bool>(nameof(AllowLibationFixup));
@@ -102,7 +103,7 @@ namespace FileManager
             set => persistentDictionary.SetNonString(nameof(DecryptToLossy), value);
         }
         
-        [Description("Split my books into multi files by cahpter")]
+        [Description("Split my books into multiple files by chapter")]
         public bool SplitFilesByChapter
         {
             get => persistentDictionary.GetNonString<bool>(nameof(SplitFilesByChapter));
@@ -144,8 +145,44 @@ namespace FileManager
         {
             get => persistentDictionary.GetNonString<bool>(nameof(DownloadEpisodes));
             set => persistentDictionary.SetNonString(nameof(DownloadEpisodes), value);
+		}
+
+        #region templates: custom file naming
+
+        [Description("How to format the folders in which files will be saved")]
+		public string FolderTemplate
+        {
+            get => getTemplate(nameof(FolderTemplate), Templates.Folder);
+            set => setTemplate(nameof(FolderTemplate), Templates.Folder, value);
         }
 
+        [Description("How to format the saved pdf and audio files")]
+		public string FileTemplate
+        {
+            get => getTemplate(nameof(FileTemplate), Templates.File);
+            set => setTemplate(nameof(FileTemplate), Templates.File, value);
+        }
+
+        [Description("How to format the saved audio files when split by chapters")]
+        public string ChapterFileTemplate
+        {
+            get => getTemplate(nameof(ChapterFileTemplate), Templates.ChapterFile);
+            set => setTemplate(nameof(ChapterFileTemplate), Templates.ChapterFile, value);
+        }
+
+        private string getTemplate(string settingName, Templates templ)
+        {
+            var value = persistentDictionary.GetString(settingName).Trim();
+            return templ.IsValid(value) ? value : templ.DefaultTemplate;
+        }
+        private void setTemplate(string settingName, Templates templ, string newValue)
+        {
+            var template = newValue.Trim();
+            if (templ.IsValid(template))
+                persistentDictionary.SetString(settingName, template);
+        }
+        #endregion
+
         #endregion
 
         #region known directories

LibationFileManager/FilePathCache.cs

@@ -5,17 +5,16 @@ using System.Linq;
 using Dinah.Core.Collections.Immutable;
 using Newtonsoft.Json;
 
-namespace FileManager
+namespace LibationFileManager
 {
 	public static class FilePathCache
-    {
+	{
+		public record CacheEntry(string Id, FileType FileType, string Path);
+
 		private const string FILENAME = "FileLocations.json";
-        internal class CacheEntry
-        {
-            public string Id { get; set; }
-            public FileType FileType { get; set; }
-            public string Path { get; set; }
-        }
+
+		public static event EventHandler<CacheEntry> Inserted;
+		public static event EventHandler<CacheEntry> Removed;
 
 		private static Cache<CacheEntry> cache { get; } = new Cache<CacheEntry>();
 
@@ -31,42 +30,51 @@ namespace FileManager
 			}
         }
 
-        public static bool Exists(string id, FileType type) => GetPath(id, type) != null;
+        public static bool Exists(string id, FileType type) => GetFirstPath(id, type) != null;
 
-        public static string GetPath(string id, FileType type)
-        {
-            var entry = cache.SingleOrDefault(i => i.Id == id && i.FileType == type);
+		public static List<(FileType fileType, string path)> GetFiles(string id)
+			=> getEntries(entry => entry.Id == id)
+			.Select(entry => (entry.FileType, entry.Path))
+			.ToList();
 
-            if (entry == null)
-                return null;
+		public static string GetFirstPath(string id, FileType type)
+			=> getEntries(entry => entry.Id == id && entry.FileType == type)
+			?.FirstOrDefault()
+			?.Path;
 
-            if (!File.Exists(entry.Path))
-            {
-                remove(entry);
-                return null;
-            }
-
-            return entry.Path;
-        }
-
-        private static void remove(CacheEntry entry)
+		private static List<CacheEntry> getEntries(Func<CacheEntry, bool> predicate)
 		{
-			cache.Remove(entry);
-			save();
+			var entries = cache.Where(predicate).ToList();
+			if (entries is null || !entries.Any())
+				return null;
+
+			remove(entries.Where(e => !File.Exists(e.Path)).ToList());
+
+			return entries;
 		}
 
-        public static void Upsert(string id, FileType type, string path)
-        {
-            if (!File.Exists(path))
-                throw new FileNotFoundException("Cannot add path to cache. File not found");
+		private static void remove(List<CacheEntry> entries)
+		{
+			if (entries is null)
+				return;
 
-			var entry = cache.SingleOrDefault(i => i.Id == id && i.FileType == type);
-
-			if (entry is null)
-				cache.Add(new CacheEntry { Id = id, FileType = type, Path = path });
-			else
-				entry.Path = path;
+			lock (locker)
+			{
+				foreach (var entry in entries)
+				{
+					cache.Remove(entry);
+					Removed?.Invoke(null, entry);
+				}
+				save();
+			}
+		}
 
+        public static void Insert(string id, string path)
+		{
+			var type = FileTypes.GetFileTypeFromPath(path);
+			var entry = new CacheEntry(id, type, path);
+			cache.Add(entry);
+			Inserted?.Invoke(null, entry);
 			save();
 		}
 

LibationFileManager/FileTypes.cs

@@ -0,0 +1,39 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+
+namespace LibationFileManager
+{
+	public enum FileType { Unknown, Audio, AAXC, PDF, Zip, Cue }
+
+	public static class FileTypes
+	{
+		private static Dictionary<string, FileType> dic => new()
+		{
+			["aaxc"] = FileType.AAXC,
+			["cue"] = FileType.Cue,
+			["pdf"] = FileType.PDF,
+			["zip"] = FileType.Zip,
+
+			["aac"] = FileType.Audio,
+			["flac"] = FileType.Audio,
+			["m4a"] = FileType.Audio,
+			["m4b"] = FileType.Audio,
+			["mp3"] = FileType.Audio,
+			["mp4"] = FileType.Audio,
+			["ogg"] = FileType.Audio,
+		};
+
+		public static FileType GetFileTypeFromPath(string path)
+			=> dic.TryGetValue(Path.GetExtension(path).ToLower().Trim('.'), out var fileType)
+			? fileType
+			: FileType.Unknown;
+
+		public static List<string> GetExtensions(FileType fileType)
+			=> dic
+			.Where(kvp => kvp.Value == fileType)
+			.Select(kvp => kvp.Key)
+			.ToList();
+	}
+}

LibationFileManager/LibationFileManager.csproj

@@ -5,7 +5,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="AudibleApi" Version="2.2.0.1" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="5.0.0" />
   </ItemGroup>
 
   <ItemGroup>

LibationFileManager/PictureStorage.cs

@@ -6,7 +6,7 @@ using System.Linq;
 using System.Net.Http;
 using System.Threading.Tasks;
 
-namespace FileManager
+namespace LibationFileManager
 {
 	public enum PictureSize { _80x80 = 80, _300x300 = 300, _500x500 = 500 }
 	public class PictureCachedEventArgs : EventArgs

LibationFileManager/QuickFilters.cs

@@ -5,7 +5,7 @@ using System.Linq;
 using Dinah.Core.Collections.Generic;
 using Newtonsoft.Json;
 
-namespace FileManager
+namespace LibationFileManager
 {
     public static class QuickFilters
     {

LibationFileManager/SqliteStorage.cs

@@ -1,6 +1,6 @@
 using System.IO;
 
-namespace FileManager
+namespace LibationFileManager
 {
 	public static class SqliteStorage
 	{

LibationFileManager/TagsPersistence.cs

@@ -6,7 +6,7 @@ using Newtonsoft.Json;
 using Polly;
 using Polly.Retry;
 
-namespace FileManager
+namespace LibationFileManager
 {
     /// <summary>
     /// Tags must also be stored in db for search performance. Stored in json file to survive a db reset.

LibationFileManager/TemplateTags.cs

@@ -0,0 +1,37 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Dinah.Core;
+
+namespace LibationFileManager
+{
+    public sealed class TemplateTags : Enumeration<TemplateTags>
+    {
+        public string TagName => DisplayName;
+        public string Description { get; }
+        public bool IsChapterOnly { get; }
+
+        private static int value = 0;
+        private TemplateTags(string tagName, string description, bool isChapterOnly = false) : base(value++, tagName)
+        {
+            Description = description;
+            IsChapterOnly = isChapterOnly;
+        }
+
+        public static TemplateTags Id { get; } = new TemplateTags("id", "Audible ID");
+        public static TemplateTags Title { get; } = new TemplateTags("title", "Full title");
+        public static TemplateTags TitleShort { get; } = new TemplateTags("title short", "Title. Stop at first colon");
+        public static TemplateTags Author { get; } = new TemplateTags("author", "Author(s)");
+        public static TemplateTags FirstAuthor { get; } = new TemplateTags("first author", "First author");
+        public static TemplateTags Narrator { get; } = new TemplateTags("narrator", "Narrator(s)");
+        public static TemplateTags FirstNarrator { get; } = new TemplateTags("first narrator", "First narrator");
+        public static TemplateTags Series { get; } = new TemplateTags("series", "Name of series");
+        // can't also have a leading zeros version. Too many weird edge cases. Eg: "1-4"
+        public static TemplateTags SeriesNumber { get; } = new TemplateTags("series#", "Number order in series");
+
+        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 number", true);
+        public static TemplateTags ChNumber0 { get; } = new TemplateTags("ch# 0", "Chapter number with leading zeros", true);
+    }
+}

LibationFileManager/Templates.cs

@@ -0,0 +1,88 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace LibationFileManager
+{
+    public abstract class Templates
+    {
+        public static Templates Folder { get; } = new FolderTemplate();
+        public static Templates File { get; } = new FileTemplate();
+        public static Templates ChapterFile { get; } = new ChapterFileTemplate();
+
+        public abstract string DefaultTemplate { get; }
+
+        public abstract bool IsValid(string template);
+        public abstract bool IsRecommended(string template);
+        public abstract int TagCount(string template);
+
+        public static bool ContainsChapterOnlyTags(string template)
+            => TemplateTags.GetAll()
+            .Where(t => t.IsChapterOnly)
+            .Any(t => ContainsTag(template, t.TagName));
+
+        public static bool ContainsTag(string template, string tag) => template.Contains($"<{tag}>");
+
+        protected static bool fileIsValid(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
+            => template is not null
+            && !template.Contains(':')
+            && !template.Contains(System.IO.Path.DirectorySeparatorChar)
+            && !template.Contains(System.IO.Path.AltDirectorySeparatorChar);
+
+        protected bool isRecommended(string template, bool isChapter)
+            => IsValid(template)
+            && !string.IsNullOrWhiteSpace(template)
+            && TagCount(template) > 0
+            && ContainsChapterOnlyTags(template) == isChapter;
+
+        protected static int tagCount(string template, Func<TemplateTags, bool> func)
+            => TemplateTags.GetAll()
+            .Where(func)
+            // for <id><id> == 1, use:
+            //   .Count(t => template.Contains($"<{t.TagName}>"))
+            // .Sum() impl: <id><id> == 2
+            .Sum(t => template.Split($"<{t.TagName}>").Length - 1);
+
+        private class FolderTemplate : Templates
+        {
+			public override string DefaultTemplate { get; } = "<title short> [<id>]";
+
+			public override bool IsValid(string template)
+                // must be relative. no colons. 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
+                => template is not null
+                && !template.Contains(':');
+
+            public override bool IsRecommended(string template) => isRecommended(template, false);
+
+            public override int TagCount(string template) => tagCount(template, t => !t.IsChapterOnly);
+        }
+
+        private class FileTemplate : Templates
+        {
+			public override string DefaultTemplate { get; } = "<title> [<id>]";
+
+            public override bool IsValid(string template) => fileIsValid(template);
+
+            public override bool IsRecommended(string template) => isRecommended(template, false);
+
+            public override int TagCount(string template) => tagCount(template, t => !t.IsChapterOnly);
+        }
+
+        private class ChapterFileTemplate : Templates
+        {
+            public override string DefaultTemplate { get; } = "<title> [<id>] - <ch# 0> - <ch title>";
+
+            public override bool IsValid(string template) => fileIsValid(template);
+
+            public override bool IsRecommended(string template)
+                => isRecommended(template, true)
+                // recommended to incl. <ch#> or <ch# 0>
+                && (ContainsTag(template, TemplateTags.ChNumber.TagName) || ContainsTag(template, TemplateTags.ChNumber0.TagName));
+
+            public override int TagCount(string template) => tagCount(template, t => true);
+        }
+    }
+}

LibationFileManager/_InternalsVisible.cs

@@ -0,0 +1 @@
+[assembly: System.Runtime.CompilerServices.InternalsVisibleTo(nameof(LibationFileManager) + ".Tests")]

LibationSearchEngine/LibationSearchEngine.csproj

@@ -14,7 +14,6 @@
 
   <ItemGroup>
     <ProjectReference Include="..\DataLayer\DataLayer.csproj" />
-    <ProjectReference Include="..\FileManager\FileManager.csproj" />
   </ItemGroup>
 
 </Project>

LibationSearchEngine/SearchEngine.cs

@@ -5,7 +5,7 @@ using System.Linq;
 using System.Text.RegularExpressions;
 using DataLayer;
 using Dinah.Core;
-using FileManager;
+using LibationFileManager;
 using Lucene.Net.Analysis.Standard;
 using Lucene.Net.Documents;
 using Lucene.Net.Index;

LibationSearchEngine/_InternalsVisible.cs

@@ -0,0 +1 @@
+[assembly: System.Runtime.CompilerServices.InternalsVisibleTo(nameof(LibationSearchEngine) + ".Tests")]

LibationWinForms/BookLiberation/AudioConvertForm.cs

@@ -1,6 +1,6 @@
-using DataLayer;
-using FileManager;
-using System;
+using System;
+using DataLayer;
+using LibationFileManager;
 
 namespace LibationWinForms.BookLiberation
 {
@@ -16,16 +16,16 @@ namespace LibationWinForms.BookLiberation
 		public override string DecodeActionName => "Converting";
 		#endregion
 
-		#region IProcessable event handler overrides
-		public override void OnBegin(object sender, LibraryBook libraryBook)
+		#region Processable event handler overrides
+		public override void Processable_Begin(object sender, LibraryBook libraryBook)
 		{
 			LogMe.Info($"Convert Step, Begin: {libraryBook.Book}");
 
-			base.OnBegin(sender, libraryBook);
+			base.Processable_Begin(sender, libraryBook);
 		}
-		public override void OnCompleted(object sender, LibraryBook libraryBook)
+		public override void Processable_Completed(object sender, LibraryBook libraryBook)
 		{
-			base.OnCompleted(sender, libraryBook);
+			base.Processable_Completed(sender, libraryBook);
 			LogMe.Info($"Convert Step, Completed: {libraryBook.Book}{Environment.NewLine}");
 		}
 

LibationWinForms/BookLiberation/AudioDecodeForm.cs

@@ -2,6 +2,7 @@
 using DataLayer;
 using Dinah.Core.Net.Http;
 using Dinah.Core.Threading;
+using LibationFileManager;
 using LibationWinForms.BookLiberation.BaseForms;
 
 namespace LibationWinForms.BookLiberation
@@ -18,32 +19,32 @@ namespace LibationWinForms.BookLiberation
 		private string authorNames;
 		private string narratorNames;
 
-		#region IProcessable event handler overrides
-		public override void OnBegin(object sender, LibraryBook libraryBook)
+		#region Processable event handler overrides
+		public override void Processable_Begin(object sender, LibraryBook libraryBook)
 		{
-			base.OnBegin(sender, libraryBook);
+			base.Processable_Begin(sender, libraryBook);
 
-			GetCoverArtDelegate = () => FileManager.PictureStorage.GetPictureSynchronously(
-						new FileManager.PictureDefinition(
+			GetCoverArtDelegate = () => PictureStorage.GetPictureSynchronously(
+						new PictureDefinition(
 							libraryBook.Book.PictureId,
-							FileManager.PictureSize._500x500));
+							PictureSize._500x500));
 
 			//Set default values from library
-			OnTitleDiscovered(sender, libraryBook.Book.Title);
-			OnAuthorsDiscovered(sender, string.Join(", ", libraryBook.Book.Authors));
-			OnNarratorsDiscovered(sender, string.Join(", ", libraryBook.Book.NarratorNames));
-			OnCoverImageDiscovered(sender,
-					FileManager.PictureStorage.GetPicture(
-						new FileManager.PictureDefinition(
+			AudioDecodable_TitleDiscovered(sender, libraryBook.Book.Title);
+			AudioDecodable_AuthorsDiscovered(sender, string.Join(", ", libraryBook.Book.Authors));
+			AudioDecodable_NarratorsDiscovered(sender, string.Join(", ", libraryBook.Book.NarratorNames));
+			AudioDecodable_CoverImageDiscovered(sender,
+					PictureStorage.GetPicture(
+						new PictureDefinition(
 							libraryBook.Book.PictureId,
-							FileManager.PictureSize._80x80)).bytes);
+							PictureSize._80x80)).bytes);
 		}
 		#endregion
 
-		#region IStreamable event handler overrides
-		public override void OnStreamingProgressChanged(object sender, DownloadProgress downloadProgress)
+		#region Streamable event handler overrides
+		public override void Streamable_StreamingProgressChanged(object sender, DownloadProgress downloadProgress)
 		{
-			base.OnStreamingProgressChanged(sender, downloadProgress);
+			base.Streamable_StreamingProgressChanged(sender, downloadProgress);
 			if (!downloadProgress.ProgressPercentage.HasValue)
 				return;
 
@@ -53,46 +54,46 @@ namespace LibationWinForms.BookLiberation
 				progressBar1.UIThreadAsync(() => progressBar1.Value = (int)downloadProgress.ProgressPercentage);
 		}
 
-		public override void OnStreamingTimeRemaining(object sender, TimeSpan timeRemaining)
+		public override void Streamable_StreamingTimeRemaining(object sender, TimeSpan timeRemaining)
 		{
-			base.OnStreamingTimeRemaining(sender, timeRemaining);
+			base.Streamable_StreamingTimeRemaining(sender, timeRemaining);
 			updateRemainingTime((int)timeRemaining.TotalSeconds);
 		}
 
 		#endregion
 
-		#region IAudioDecodable event handlers
-		public override void OnRequestCoverArt(object sender, Action<byte[]> setCoverArtDelegate)
+		#region AudioDecodable event handlers
+		public override void AudioDecodable_RequestCoverArt(object sender, Action<byte[]> setCoverArtDelegate)
 		{
-			base.OnRequestCoverArt(sender, setCoverArtDelegate);
+			base.AudioDecodable_RequestCoverArt(sender, setCoverArtDelegate);
 			setCoverArtDelegate(GetCoverArtDelegate?.Invoke());
 		}
 
-		public override void OnTitleDiscovered(object sender, string title)
+		public override void AudioDecodable_TitleDiscovered(object sender, string title)
 		{
-			base.OnTitleDiscovered(sender, title);
+			base.AudioDecodable_TitleDiscovered(sender, title);
 			this.UIThreadAsync(() => this.Text = DecodeActionName + " " + title);
 			this.title = title;
 			updateBookInfo();
 		}
 
-		public override void OnAuthorsDiscovered(object sender, string authors)
+		public override void AudioDecodable_AuthorsDiscovered(object sender, string authors)
 		{
-			base.OnAuthorsDiscovered(sender, authors);
+			base.AudioDecodable_AuthorsDiscovered(sender, authors);
 			authorNames = authors;
 			updateBookInfo();
 		}
 
-		public override void OnNarratorsDiscovered(object sender, string narrators)
+		public override void AudioDecodable_NarratorsDiscovered(object sender, string narrators)
 		{
-			base.OnNarratorsDiscovered(sender, narrators);
+			base.AudioDecodable_NarratorsDiscovered(sender, narrators);
 			narratorNames = narrators;
 			updateBookInfo();
 		}
 
-		public override void OnCoverImageDiscovered(object sender, byte[] coverArt)
+		public override void AudioDecodable_CoverImageDiscovered(object sender, byte[] coverArt)
 		{
-			base.OnCoverImageDiscovered(sender, coverArt);
+			base.AudioDecodable_CoverImageDiscovered(sender, coverArt);
 			pictureBox1.UIThreadAsync(() => pictureBox1.Image = Dinah.Core.Drawing.ImageReader.ToImage(coverArt));
 		}
 		#endregion
@@ -102,6 +103,15 @@ namespace LibationWinForms.BookLiberation
 			=> bookInfoLbl.UIThreadAsync(() => bookInfoLbl.Text = $"{title}\r\nBy {authorNames}\r\nNarrated by {narratorNames}");
 
 		private void updateRemainingTime(int remaining)
-			=> remainingTimeLbl.UIThreadAsync(() => remainingTimeLbl.Text = $"ETA:\r\n{remaining} sec");
+			=> remainingTimeLbl.UIThreadAsync(() => remainingTimeLbl.Text = $"ETA:\r\n{formatTime(remaining)}");
+
+		private string formatTime(int seconds)
+		{
+			var timeSpan = new TimeSpan(0, 0, seconds);
+			return
+				timeSpan.TotalHours >= 1 ? $"{timeSpan:%h}h {timeSpan:mm}m {timeSpan:ss}s"
+				: timeSpan.TotalMinutes >= 1 ? $"{timeSpan:%m}m {timeSpan:ss}s"
+				: $"{seconds} sec";
+		}
 	}
 }

LibationWinForms/BookLiberation/AudioDecryptForm.cs

@@ -1,6 +1,6 @@
-using DataLayer;
-using FileManager;
-using System;
+using System;
+using DataLayer;
+using LibationFileManager;
 
 namespace LibationWinForms.BookLiberation
 {
@@ -16,16 +16,16 @@ namespace LibationWinForms.BookLiberation
 		public override string DecodeActionName => "Decrypting";
 		#endregion
 
-		#region IProcessable event handler overrides
-		public override void OnBegin(object sender, LibraryBook libraryBook)
+		#region Processable event handler overrides
+		public override void Processable_Begin(object sender, LibraryBook libraryBook)
 		{
 			LogMe.Info($"Download & Decrypt Step, Begin: {libraryBook.Book}");
 
-			base.OnBegin(sender, libraryBook);
+			base.Processable_Begin(sender, libraryBook);
 		}
-		public override void OnCompleted(object sender, LibraryBook libraryBook)
+		public override void Processable_Completed(object sender, LibraryBook libraryBook)
 		{
-			base.OnCompleted(sender, libraryBook);
+			base.Processable_Completed(sender, libraryBook);
 			LogMe.Info($"Download & Decrypt Step, Completed: {libraryBook.Book}{Environment.NewLine}");
 		}
 

LibationWinForms/BookLiberation/BaseForms/LiberationBaseForm.cs

@@ -9,7 +9,7 @@ namespace LibationWinForms.BookLiberation.BaseForms
 {
 	public class LiberationBaseForm : Form
 	{
-		protected IStreamable Streamable { get; private set; }
+		protected Streamable Streamable { get; private set; }
 		protected LogMe LogMe { get; private set; }
 		private SynchronizeInvoker Invoker { get; init; } 
 
@@ -21,7 +21,7 @@ namespace LibationWinForms.BookLiberation.BaseForms
 			Invoker = new SynchronizeInvoker();
 		}
 
-		public void RegisterFileLiberator(IStreamable streamable, LogMe logMe = null)
+		public void RegisterFileLiberator(Streamable streamable, LogMe logMe = null)
 		{
 			if (streamable is null) return;
 
@@ -30,52 +30,52 @@ namespace LibationWinForms.BookLiberation.BaseForms
 
 			Subscribe(streamable);
 
-			if (Streamable is IProcessable processable)
+			if (Streamable is Processable processable)
 				Subscribe(processable);
-			if (Streamable is IAudioDecodable audioDecodable)
+			if (Streamable is AudioDecodable audioDecodable)
 				Subscribe(audioDecodable);
 		}
 
 		#region Event Subscribers and Unsubscribers
-		private void Subscribe(IStreamable streamable)
+		private void Subscribe(Streamable streamable)
 		{
 			UnsubscribeStreamable(this, EventArgs.Empty);
 
 			streamable.StreamingBegin += OnStreamingBeginShow;
-			streamable.StreamingBegin += OnStreamingBegin;
-			streamable.StreamingProgressChanged += OnStreamingProgressChanged;
-			streamable.StreamingTimeRemaining += OnStreamingTimeRemaining;
-			streamable.StreamingCompleted += OnStreamingCompleted;
+			streamable.StreamingBegin += Streamable_StreamingBegin;
+			streamable.StreamingProgressChanged += Streamable_StreamingProgressChanged;
+			streamable.StreamingTimeRemaining += Streamable_StreamingTimeRemaining;
+			streamable.StreamingCompleted += Streamable_StreamingCompleted;
 			streamable.StreamingCompleted += OnStreamingCompletedClose;
 
 			Disposed += UnsubscribeStreamable;
 		}
-		private void Subscribe(IProcessable processable)
+		private void Subscribe(Processable processable)
 		{
 			UnsubscribeProcessable(this, null);
 
-			processable.Begin += OnBegin;
-			processable.StatusUpdate += OnStatusUpdate;
-			processable.Completed += OnCompleted;
+			processable.Begin += Processable_Begin;
+			processable.StatusUpdate += Processable_StatusUpdate;
+			processable.Completed += Processable_Completed;
 
-			//The form is created on IProcessable.Begin and we
-			//dispose of it on IProcessable.Completed
+			//The form is created on Processable.Begin and we
+			//dispose of it on Processable.Completed
 			processable.Completed += OnCompletedDispose;
 
 			//Don't unsubscribe from Dispose because it fires when
-			//IStreamable.StreamingCompleted closes the form, and
-			//the IProcessable events need to live past that event.
+			//Streamable.StreamingCompleted closes the form, and
+			//the Processable events need to live past that event.
 			processable.Completed += UnsubscribeProcessable;
 		}
-		private void Subscribe(IAudioDecodable audioDecodable)
+		private void Subscribe(AudioDecodable audioDecodable)
 		{
 			UnsubscribeAudioDecodable(this, EventArgs.Empty);
 
-			audioDecodable.RequestCoverArt += OnRequestCoverArt;
-			audioDecodable.TitleDiscovered += OnTitleDiscovered;
-			audioDecodable.AuthorsDiscovered += OnAuthorsDiscovered;
-			audioDecodable.NarratorsDiscovered += OnNarratorsDiscovered;
-			audioDecodable.CoverImageDiscovered += OnCoverImageDiscovered;
+			audioDecodable.RequestCoverArt += AudioDecodable_RequestCoverArt;
+			audioDecodable.TitleDiscovered += AudioDecodable_TitleDiscovered;
+			audioDecodable.AuthorsDiscovered += AudioDecodable_AuthorsDiscovered;
+			audioDecodable.NarratorsDiscovered += AudioDecodable_NarratorsDiscovered;
+			audioDecodable.CoverImageDiscovered += AudioDecodable_CoverImageDiscovered;
 
 			Disposed += UnsubscribeAudioDecodable;
 		}
@@ -84,34 +84,34 @@ namespace LibationWinForms.BookLiberation.BaseForms
 			Disposed -= UnsubscribeStreamable;
 
 			Streamable.StreamingBegin -= OnStreamingBeginShow;
-			Streamable.StreamingBegin -= OnStreamingBegin;
-			Streamable.StreamingProgressChanged -= OnStreamingProgressChanged;
-			Streamable.StreamingTimeRemaining -= OnStreamingTimeRemaining;
-			Streamable.StreamingCompleted -= OnStreamingCompleted;
+			Streamable.StreamingBegin -= Streamable_StreamingBegin;
+			Streamable.StreamingProgressChanged -= Streamable_StreamingProgressChanged;
+			Streamable.StreamingTimeRemaining -= Streamable_StreamingTimeRemaining;
+			Streamable.StreamingCompleted -= Streamable_StreamingCompleted;
 			Streamable.StreamingCompleted -= OnStreamingCompletedClose;
 		}
 		private void UnsubscribeProcessable(object sender, LibraryBook e)
 		{
-			if (Streamable is not IProcessable processable)
+			if (Streamable is not Processable processable)
 				return;
 
 			processable.Completed -= UnsubscribeProcessable;
 			processable.Completed -= OnCompletedDispose;
-			processable.Completed -= OnCompleted;
-			processable.StatusUpdate -= OnStatusUpdate;
-			processable.Begin -= OnBegin;
+			processable.Completed -= Processable_Completed;
+			processable.StatusUpdate -= Processable_StatusUpdate;
+			processable.Begin -= Processable_Begin;
 		}
 		private void UnsubscribeAudioDecodable(object sender, EventArgs e)
 		{
-			if (Streamable is not IAudioDecodable audioDecodable)
+			if (Streamable is not AudioDecodable audioDecodable)
 				return;
 
 			Disposed -= UnsubscribeAudioDecodable;
-			audioDecodable.RequestCoverArt -= OnRequestCoverArt;
-			audioDecodable.TitleDiscovered -= OnTitleDiscovered;
-			audioDecodable.AuthorsDiscovered -= OnAuthorsDiscovered;
-			audioDecodable.NarratorsDiscovered -= OnNarratorsDiscovered;
-			audioDecodable.CoverImageDiscovered -= OnCoverImageDiscovered;
+			audioDecodable.RequestCoverArt -= AudioDecodable_RequestCoverArt;
+			audioDecodable.TitleDiscovered -= AudioDecodable_TitleDiscovered;
+			audioDecodable.AuthorsDiscovered -= AudioDecodable_AuthorsDiscovered;
+			audioDecodable.NarratorsDiscovered -= AudioDecodable_NarratorsDiscovered;
+			audioDecodable.CoverImageDiscovered -= AudioDecodable_CoverImageDiscovered;
 
 			audioDecodable.Cancel();
 		}
@@ -133,40 +133,30 @@ namespace LibationWinForms.BookLiberation.BaseForms
 		/// (ie. shown) because Control doesn't get a window handle until it is Shown.
 		/// </summary>
 		private void OnStreamingBeginShow(object sender, string beginString) => Invoker.UIThreadAsync(Show);
-		
+
 		#endregion
 
-		#region IStreamable event handlers
-		public virtual void OnStreamingBegin(object sender, string beginString)
-		=> Serilog.Log.Logger.Debug("Event fired {@DebugInfo}", new { Name = nameof(IStreamable.StreamingBegin), Message = beginString });		
-		public virtual void OnStreamingProgressChanged(object sender, DownloadProgress downloadProgress) { }
-		public virtual void OnStreamingTimeRemaining(object sender, TimeSpan timeRemaining) { }
-		public virtual void OnStreamingCompleted(object sender, string completedString)
-		=> Serilog.Log.Logger.Debug("Event fired {@DebugInfo}", new { Name = nameof(IStreamable.StreamingCompleted), Message = completedString });
-		
+		#region Streamable event handlers
+		public virtual void Streamable_StreamingBegin(object sender, string beginString) { }
+		public virtual void Streamable_StreamingProgressChanged(object sender, DownloadProgress downloadProgress) { }
+		public virtual void Streamable_StreamingTimeRemaining(object sender, TimeSpan timeRemaining) { }
+		public virtual void Streamable_StreamingCompleted(object sender, string completedString) { }
+
 		#endregion
 
-		#region IProcessable event handlers
-		public virtual void OnBegin(object sender, LibraryBook libraryBook)
-		=> Serilog.Log.Logger.Debug("Event fired {@DebugInfo}", new { Name = nameof(IProcessable.Begin), Book = libraryBook.LogFriendly() });		
-		public virtual void OnStatusUpdate(object sender, string statusUpdate)
-		=> Serilog.Log.Logger.Debug("Event fired {@DebugInfo}", new { Name = nameof(IProcessable.StatusUpdate), Status = statusUpdate });		
-		public virtual void OnCompleted(object sender, LibraryBook libraryBook)
-		=> Serilog.Log.Logger.Debug("Event fired {@DebugInfo}", new { Name = nameof(IProcessable.Completed), Book = libraryBook.LogFriendly() });
-		
+		#region Processable event handlers
+		public virtual void Processable_Begin(object sender, LibraryBook libraryBook) { }
+		public virtual void Processable_StatusUpdate(object sender, string statusUpdate) { }
+		public virtual void Processable_Completed(object sender, LibraryBook libraryBook) { }
+
 		#endregion
 
-		#region IAudioDecodable event handlers
-		public virtual void OnRequestCoverArt(object sender, Action<byte[]> setCoverArtDelegate)
-		=> Serilog.Log.Logger.Debug("Event fired {@DebugInfo}", new { Name = nameof(IAudioDecodable.RequestCoverArt) });		
-		public virtual void OnTitleDiscovered(object sender, string title)
-		=> Serilog.Log.Logger.Debug("Event fired {@DebugInfo}", new { Name = nameof(IAudioDecodable.TitleDiscovered), Title = title });		
-		public virtual void OnAuthorsDiscovered(object sender, string authors)
-		=> Serilog.Log.Logger.Debug("Event fired {@DebugInfo}", new { Name = nameof(IAudioDecodable.AuthorsDiscovered), Authors = authors });		
-		public virtual void OnNarratorsDiscovered(object sender, string narrators)
-		=> Serilog.Log.Logger.Debug("Event fired {@DebugInfo}", new { Name = nameof(IAudioDecodable.NarratorsDiscovered), Narrators = narrators });		
-		public virtual void OnCoverImageDiscovered(object sender, byte[] coverArt)
-			=> Serilog.Log.Logger.Debug("Event fired {@DebugInfo}", new { Name = nameof(IAudioDecodable.CoverImageDiscovered), CoverImageBytes = coverArt?.Length });
+		#region AudioDecodable event handlers
+		public virtual void AudioDecodable_RequestCoverArt(object sender, Action<byte[]> setCoverArtDelegate) { }
+		public virtual void AudioDecodable_TitleDiscovered(object sender, string title) { }
+		public virtual void AudioDecodable_AuthorsDiscovered(object sender, string authors) { }
+		public virtual void AudioDecodable_NarratorsDiscovered(object sender, string narrators) { }
+		public virtual void AudioDecodable_CoverImageDiscovered(object sender, byte[] coverArt) { }
 		#endregion
 	}
 }

LibationWinForms/BookLiberation/DownloadForm.cs

@@ -17,15 +17,15 @@ namespace LibationWinForms.BookLiberation
 		}
 
 
-		#region IStreamable event handler overrides
-		public override void OnStreamingBegin(object sender, string beginString)
+		#region Streamable event handler overrides
+		public override void Streamable_StreamingBegin(object sender, string beginString)
 		{
-			base.OnStreamingBegin(sender, beginString);
+			base.Streamable_StreamingBegin(sender, beginString);
 			filenameLbl.UIThreadAsync(() => filenameLbl.Text = beginString);
 		}
-		public override void OnStreamingProgressChanged(object sender, DownloadProgress downloadProgress)
+		public override void Streamable_StreamingProgressChanged(object sender, DownloadProgress downloadProgress)
 		{
-			base.OnStreamingProgressChanged(sender, downloadProgress);
+			base.Streamable_StreamingProgressChanged(sender, downloadProgress);
 			// this won't happen with download file. it will happen with download string
 			if (!downloadProgress.TotalBytesToReceive.HasValue || downloadProgress.TotalBytesToReceive.Value <= 0)
 				return;

LibationWinForms/BookLiberation/PdfDownloadForm.cs

@@ -4,14 +4,14 @@ namespace LibationWinForms.BookLiberation
 {
 	internal class PdfDownloadForm : DownloadForm
 	{
-		public override void OnBegin(object sender, LibraryBook libraryBook)
+		public override void Processable_Begin(object sender, LibraryBook libraryBook)
 		{
-			base.OnBegin(sender, libraryBook);
+			base.Processable_Begin(sender, libraryBook);
 			LogMe.Info($"PDF Step, Begin: {libraryBook.Book}");
 		}
-		public override void OnCompleted(object sender, LibraryBook libraryBook)
+		public override void Processable_Completed(object sender, LibraryBook libraryBook)
 		{
-			base.OnCompleted(sender, libraryBook);
+			base.Processable_Completed(sender, libraryBook);
 			LogMe.Info($"PDF Step, Completed: {libraryBook.Book}");
 		}
 	}

LibationWinForms/BookLiberation/ProcessorAutomationController.cs

@@ -1,11 +1,11 @@
-using DataLayer;
-using Dinah.Core;
-using FileLiberator;
-using LibationWinForms.BookLiberation.BaseForms;
-using System;
-using System.Linq;
+using System;
 using System.Threading.Tasks;
 using System.Windows.Forms;
+using DataLayer;
+using Dinah.Core;
+using FileLiberator;
+using LibationFileManager;
+using LibationWinForms.BookLiberation.BaseForms;
 
 namespace LibationWinForms.BookLiberation
 {
@@ -96,7 +96,7 @@ namespace LibationWinForms.BookLiberation
 			await new BackupLoop(logMe, downloadPdf, automatedBackupsForm).RunBackupAsync();
 		}
 
-		private static IProcessable CreateBackupBook(LogMe logMe)
+		private static Processable CreateBackupBook(LogMe logMe)
 		{
 			var downloadPdf = CreateProcessable<DownloadPdf, PdfDownloadForm>(logMe);
 
@@ -132,16 +132,16 @@ namespace LibationWinForms.BookLiberation
 		}
 
 		/// <summary>
-		/// Create a new <see cref="IProcessable"/> and links it to a new <see cref="LiberationBaseForm"/>.
+		/// Create a new <see cref="Processable"/> and links it to a new <see cref="LiberationBaseForm"/>.
 		/// </summary>
-		/// <typeparam name="TProcessable">The <see cref="IProcessable"/> derived type to create.</typeparam>
-		/// <typeparam name="TForm">The <see cref="LiberationBaseForm"/> derived Form to create on <see cref="IProcessable.Begin"/>, Show on <see cref="IStreamable.StreamingBegin"/>, Close on <see cref="IStreamable.StreamingCompleted"/>, and Dispose on <see cref="IProcessable.Completed"/> </typeparam>
+		/// <typeparam name="TProcessable">The <see cref="Processable"/> derived type to create.</typeparam>
+		/// <typeparam name="TForm">The <see cref="LiberationBaseForm"/> derived Form to create on <see cref="Processable.Begin"/>, Show on <see cref="Streamable.StreamingBegin"/>, Close on <see cref="Streamable.StreamingCompleted"/>, and Dispose on <see cref="Processable.Completed"/> </typeparam>
 		/// <param name="logMe">The logger</param>
-		/// <param name="completedAction">An additional event handler to handle <see cref="IProcessable.Completed"/></param>
-		/// <returns>A new <see cref="IProcessable"/> of type <typeparamref name="TProcessable"/></returns>
+		/// <param name="completedAction">An additional event handler to handle <see cref="Processable.Completed"/></param>
+		/// <returns>A new <see cref="Processable"/> of type <typeparamref name="TProcessable"/></returns>
 		private static TProcessable CreateProcessable<TProcessable, TForm>(LogMe logMe, EventHandler<LibraryBook> completedAction = null)
 			where TForm : LiberationBaseForm, new()
-			where TProcessable : IProcessable, new()
+			where TProcessable : Processable, new()
 		{
 			var strProc = new TProcessable();
 
@@ -149,7 +149,7 @@ namespace LibationWinForms.BookLiberation
 			{
 				var processForm = new TForm();
 				processForm.RegisterFileLiberator(strProc, logMe);
-				processForm.OnBegin(sender, libraryBook);
+				processForm.Processable_Begin(sender, libraryBook);
 			};
 
 			strProc.Completed += completedAction;
@@ -161,10 +161,10 @@ namespace LibationWinForms.BookLiberation
 	internal abstract class BackupRunner
 	{
 		protected LogMe LogMe { get; }
-		protected IProcessable Processable { get; }
+		protected Processable Processable { get; }
 		protected AutomatedBackupsForm AutomatedBackupsForm { get; }
 
-		protected BackupRunner(LogMe logMe, IProcessable processable, AutomatedBackupsForm automatedBackupsForm = null)
+		protected BackupRunner(LogMe logMe, Processable processable, AutomatedBackupsForm automatedBackupsForm = null)
 		{
 			LogMe = logMe;
 			Processable = processable;
@@ -218,12 +218,12 @@ namespace LibationWinForms.BookLiberation
 		{
 			LogMe.Error("ERROR. All books have not been processed. Most recent book: processing failed");
 
-			DialogResult? dialogResult = FileManager.Configuration.Instance.BadBook switch
+			DialogResult? dialogResult = Configuration.Instance.BadBook switch
 			{
-				FileManager.Configuration.BadBookAction.Abort => DialogResult.Abort,
-				FileManager.Configuration.BadBookAction.Retry => DialogResult.Retry,
-				FileManager.Configuration.BadBookAction.Ignore => DialogResult.Ignore,
-				FileManager.Configuration.BadBookAction.Ask => null,
+				Configuration.BadBookAction.Abort => DialogResult.Abort,
+				Configuration.BadBookAction.Retry => DialogResult.Retry,
+				Configuration.BadBookAction.Ignore => DialogResult.Ignore,
+				Configuration.BadBookAction.Ask => null,
 				_ => null
 			};
 
@@ -278,7 +278,7 @@ An error occurred while trying to process this book. Skip this book permanently?
 		protected override MessageBoxDefaultButton SkipDialogDefaultButton => MessageBoxDefaultButton.Button2;
 		protected override DialogResult SkipResult => DialogResult.Yes;
 
-		public BackupSingle(LogMe logMe, IProcessable processable, LibraryBook libraryBook)
+		public BackupSingle(LogMe logMe, Processable processable, LibraryBook libraryBook)
 			: base(logMe, processable)
 		{
 			_libraryBook = libraryBook;
@@ -307,7 +307,7 @@ An error occurred while trying to process this book.
 		protected override MessageBoxDefaultButton SkipDialogDefaultButton => MessageBoxDefaultButton.Button1;
 		protected override DialogResult SkipResult => DialogResult.Ignore;
 
-		public BackupLoop(LogMe logMe, IProcessable processable, AutomatedBackupsForm automatedBackupsForm)
+		public BackupLoop(LogMe logMe, Processable processable, AutomatedBackupsForm automatedBackupsForm)
 			: base(logMe, processable, automatedBackupsForm) { }
 
 		protected override async Task RunAsync()

LibationWinForms/Dialogs/AccountsDialog.cs

@@ -1,9 +1,9 @@
-using AudibleApi;
-using InternalUtilities;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Windows.Forms;
+using AudibleApi;
+using AudibleUtilities;
 
 namespace LibationWinForms.Dialogs
 {

LibationWinForms/Dialogs/BookDetailsDialog.cs

@@ -4,6 +4,7 @@ using System.Linq;
 using System.Windows.Forms;
 using DataLayer;
 using Dinah.Core;
+using LibationFileManager;
 
 namespace LibationWinForms.Dialogs
 {
@@ -39,7 +40,7 @@ namespace LibationWinForms.Dialogs
 		{
 			this.Text = Book.Title;
 
-			(var isDefault, var picture) = FileManager.PictureStorage.GetPicture(new FileManager.PictureDefinition(Book.PictureId, FileManager.PictureSize._80x80));
+			(_, var picture) = PictureStorage.GetPicture(new PictureDefinition(Book.PictureId, PictureSize._80x80));
 			this.coverPb.Image = Dinah.Core.Drawing.ImageReader.ToImage(picture);
 
 			var t = @$"

LibationWinForms/Dialogs/DirectoryOrCustomSelectControl.cs

@@ -1,8 +1,8 @@
-using FileManager;
-using System;
+using System;
 using System.Linq;
 using System.Collections.Generic;
 using System.Windows.Forms;
+using LibationFileManager;
 
 namespace LibationWinForms.Dialogs
 {

LibationWinForms/Dialogs/DirectorySelectControl.cs

@@ -1,9 +1,9 @@
-using Dinah.Core;
-using FileManager;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Windows.Forms;
+using Dinah.Core;
+using LibationFileManager;
 
 namespace LibationWinForms.Dialogs
 {

LibationWinForms/Dialogs/EditQuickFilters.cs

@@ -1,7 +1,7 @@
-using FileManager;
-using System;
+using System;
 using System.Linq;
 using System.Windows.Forms;
+using LibationFileManager;
 
 namespace LibationWinForms.Dialogs
 {

LibationWinForms/Dialogs/IndexLibraryDialog.cs

@@ -1,9 +1,8 @@
-using ApplicationServices;
-using InternalUtilities;
-using LibationWinForms.Login;
-using System;
-using System.Linq;
+using System;
 using System.Windows.Forms;
+using ApplicationServices;
+using AudibleUtilities;
+using LibationWinForms.Login;
 
 namespace LibationWinForms.Dialogs
 {

LibationWinForms/Dialogs/LibationFilesDialog.cs

@@ -1,7 +1,6 @@
-using FileManager;
-using System;
-using System.Linq;
+using System;
 using System.Windows.Forms;
+using LibationFileManager;
 
 namespace LibationWinForms.Dialogs
 {

LibationWinForms/Dialogs/Login/LoginCallbackDialog.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Windows.Forms;
+using AudibleUtilities;
 using Dinah.Core;
-using InternalUtilities;
 
 namespace LibationWinForms.Dialogs.Login
 {

LibationWinForms/Dialogs/Login/LoginChoiceEagerDialog.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Windows.Forms;
+using AudibleUtilities;
 using Dinah.Core;
-using InternalUtilities;
 
 namespace LibationWinForms.Dialogs.Login
 {

LibationWinForms/Dialogs/Login/LoginExternalDialog.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Windows.Forms;
+using AudibleUtilities;
 using Dinah.Core;
-using InternalUtilities;
 
 namespace LibationWinForms.Dialogs.Login
 {

LibationWinForms/Dialogs/Login/WinformLoginCallback.cs

@@ -1,6 +1,6 @@
 using System;
 using AudibleApi;
-using InternalUtilities;
+using AudibleUtilities;
 using LibationWinForms.Dialogs.Login;
 
 namespace LibationWinForms.Login

LibationWinForms/Dialogs/Login/WinformLoginChoiceEager.cs

@@ -1,6 +1,6 @@
 using System;
 using AudibleApi;
-using InternalUtilities;
+using AudibleUtilities;
 using LibationWinForms.Dialogs.Login;
 
 namespace LibationWinForms.Login

LibationWinForms/Dialogs/MessageBoxAlertAdminDialog.cs

@@ -50,7 +50,7 @@ namespace LibationWinForms.Dialogs
 			string dir = "";
 			try
 			{
-				dir = FileManager.Configuration.Instance.LibationFiles;
+				dir = LibationFileManager.Configuration.Instance.LibationFiles;
 			}
 			catch { }
 

LibationWinForms/Dialogs/RemoveBooksDialog.cs

@@ -1,16 +1,16 @@
-using ApplicationServices;
-using DataLayer;
-using Dinah.Core.DataBinding;
-using FileManager;
-using InternalUtilities;
-using LibationWinForms.Login;
-using System;
+using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Data;
 using System.Linq;
 using System.Windows.Forms;
+using ApplicationServices;
+using AudibleUtilities;
+using DataLayer;
+using Dinah.Core.DataBinding;
+using LibationFileManager;
+using LibationWinForms.Login;
 
 namespace LibationWinForms.Dialogs
 {

LibationWinForms/Dialogs/ScanAccountsDialog.cs

@@ -1,8 +1,8 @@
-using InternalUtilities;
-using System;
+using System;
 using System.Linq;
 using System.Collections.Generic;
 using System.Windows.Forms;
+using AudibleUtilities;
 
 namespace LibationWinForms.Dialogs
 {

LibationWinForms/Dialogs/SettingsDialog.Designer.cs

@@ -32,7 +32,6 @@
 			this.inProgressDescLbl = new System.Windows.Forms.Label();
 			this.saveBtn = new System.Windows.Forms.Button();
 			this.cancelBtn = new System.Windows.Forms.Button();
-			this.advancedSettingsGb = new System.Windows.Forms.GroupBox();
 			this.importEpisodesCb = new System.Windows.Forms.CheckBox();
 			this.downloadEpisodesCb = new System.Windows.Forms.CheckBox();
 			this.badBookGb = new System.Windows.Forms.GroupBox();
@@ -48,13 +47,33 @@
 			this.inProgressSelectControl = new LibationWinForms.Dialogs.DirectorySelectControl();
 			this.logsBtn = new System.Windows.Forms.Button();
 			this.booksSelectControl = new LibationWinForms.Dialogs.DirectoryOrCustomSelectControl();
-			this.booksGb = new System.Windows.Forms.GroupBox();
 			this.loggingLevelLbl = new System.Windows.Forms.Label();
 			this.loggingLevelCb = new System.Windows.Forms.ComboBox();
-			this.advancedSettingsGb.SuspendLayout();
+			this.tabControl = new System.Windows.Forms.TabControl();
+			this.tab1ImportantSettings = new System.Windows.Forms.TabPage();
+			this.booksGb = new System.Windows.Forms.GroupBox();
+			this.tab2ImportLibrary = new System.Windows.Forms.TabPage();
+			this.tab3DownloadDecrypt = new System.Windows.Forms.TabPage();
+			this.inProgressFilesGb = new System.Windows.Forms.GroupBox();
+			this.customFileNamingGb = new System.Windows.Forms.GroupBox();
+			this.chapterFileTemplateBtn = new System.Windows.Forms.Button();
+			this.chapterFileTemplateTb = new System.Windows.Forms.TextBox();
+			this.chapterFileTemplateLbl = new System.Windows.Forms.Label();
+			this.fileTemplateBtn = new System.Windows.Forms.Button();
+			this.fileTemplateTb = new System.Windows.Forms.TextBox();
+			this.fileTemplateLbl = new System.Windows.Forms.Label();
+			this.folderTemplateBtn = new System.Windows.Forms.Button();
+			this.folderTemplateTb = new System.Windows.Forms.TextBox();
+			this.folderTemplateLbl = new System.Windows.Forms.Label();
 			this.badBookGb.SuspendLayout();
 			this.decryptAndConvertGb.SuspendLayout();
+			this.tabControl.SuspendLayout();
+			this.tab1ImportantSettings.SuspendLayout();
 			this.booksGb.SuspendLayout();
+			this.tab2ImportLibrary.SuspendLayout();
+			this.tab3DownloadDecrypt.SuspendLayout();
+			this.inProgressFilesGb.SuspendLayout();
+			this.customFileNamingGb.SuspendLayout();
 			this.SuspendLayout();
 			// 
 			// booksLocationDescLbl
@@ -70,12 +89,12 @@
 			// inProgressDescLbl
 			// 
 			this.inProgressDescLbl.AutoSize = true;
-			this.inProgressDescLbl.Location = new System.Drawing.Point(8, 199);
+			this.inProgressDescLbl.Location = new System.Drawing.Point(7, 19);
 			this.inProgressDescLbl.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
 			this.inProgressDescLbl.Name = "inProgressDescLbl";
-			this.inProgressDescLbl.Size = new System.Drawing.Size(43, 45);
+			this.inProgressDescLbl.Size = new System.Drawing.Size(100, 45);
 			this.inProgressDescLbl.TabIndex = 18;
-			this.inProgressDescLbl.Text = "[desc]\r\n[line 2]\r\n[line 3]";
+			this.inProgressDescLbl.Text = "[in progress desc]\r\n[line 2]\r\n[line 3]";
 			// 
 			// saveBtn
 			// 
@@ -102,30 +121,10 @@
 			this.cancelBtn.UseVisualStyleBackColor = true;
 			this.cancelBtn.Click += new System.EventHandler(this.cancelBtn_Click);
 			// 
-			// advancedSettingsGb
-			// 
-			this.advancedSettingsGb.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-			this.advancedSettingsGb.Controls.Add(this.importEpisodesCb);
-			this.advancedSettingsGb.Controls.Add(this.downloadEpisodesCb);
-			this.advancedSettingsGb.Controls.Add(this.badBookGb);
-			this.advancedSettingsGb.Controls.Add(this.decryptAndConvertGb);
-			this.advancedSettingsGb.Controls.Add(this.inProgressSelectControl);
-			this.advancedSettingsGb.Controls.Add(this.inProgressDescLbl);
-			this.advancedSettingsGb.Location = new System.Drawing.Point(12, 176);
-			this.advancedSettingsGb.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
-			this.advancedSettingsGb.Name = "advancedSettingsGb";
-			this.advancedSettingsGb.Padding = new System.Windows.Forms.Padding(4, 3, 4, 3);
-			this.advancedSettingsGb.Size = new System.Drawing.Size(908, 309);
-			this.advancedSettingsGb.TabIndex = 6;
-			this.advancedSettingsGb.TabStop = false;
-			this.advancedSettingsGb.Text = "Advanced settings for control freaks";
-			// 
 			// importEpisodesCb
 			// 
 			this.importEpisodesCb.AutoSize = true;
-			this.importEpisodesCb.Location = new System.Drawing.Point(7, 22);
+			this.importEpisodesCb.Location = new System.Drawing.Point(6, 6);
 			this.importEpisodesCb.Name = "importEpisodesCb";
 			this.importEpisodesCb.Size = new System.Drawing.Size(146, 19);
 			this.importEpisodesCb.TabIndex = 7;
@@ -135,7 +134,7 @@
 			// downloadEpisodesCb
 			// 
 			this.downloadEpisodesCb.AutoSize = true;
-			this.downloadEpisodesCb.Location = new System.Drawing.Point(7, 47);
+			this.downloadEpisodesCb.Location = new System.Drawing.Point(6, 31);
 			this.downloadEpisodesCb.Name = "downloadEpisodesCb";
 			this.downloadEpisodesCb.Size = new System.Drawing.Size(163, 19);
 			this.downloadEpisodesCb.TabIndex = 8;
@@ -148,9 +147,9 @@
 			this.badBookGb.Controls.Add(this.badBookRetryRb);
 			this.badBookGb.Controls.Add(this.badBookAbortRb);
 			this.badBookGb.Controls.Add(this.badBookAskRb);
-			this.badBookGb.Location = new System.Drawing.Point(372, 72);
+			this.badBookGb.Location = new System.Drawing.Point(371, 6);
 			this.badBookGb.Name = "badBookGb";
-			this.badBookGb.Size = new System.Drawing.Size(529, 124);
+			this.badBookGb.Size = new System.Drawing.Size(524, 124);
 			this.badBookGb.TabIndex = 13;
 			this.badBookGb.TabStop = false;
 			this.badBookGb.Text = "[bad book desc]";
@@ -205,7 +204,7 @@
 			this.decryptAndConvertGb.Controls.Add(this.allowLibationFixupCbox);
 			this.decryptAndConvertGb.Controls.Add(this.convertLossyRb);
 			this.decryptAndConvertGb.Controls.Add(this.convertLosslessRb);
-			this.decryptAndConvertGb.Location = new System.Drawing.Point(7, 72);
+			this.decryptAndConvertGb.Location = new System.Drawing.Point(6, 6);
 			this.decryptAndConvertGb.Name = "decryptAndConvertGb";
 			this.decryptAndConvertGb.Size = new System.Drawing.Size(359, 124);
 			this.decryptAndConvertGb.TabIndex = 9;
@@ -217,9 +216,9 @@
 			this.splitFilesByChapterCbox.AutoSize = true;
 			this.splitFilesByChapterCbox.Location = new System.Drawing.Point(6, 46);
 			this.splitFilesByChapterCbox.Name = "splitFilesByChapterCbox";
-			this.splitFilesByChapterCbox.Size = new System.Drawing.Size(258, 19);
+			this.splitFilesByChapterCbox.Size = new System.Drawing.Size(162, 19);
 			this.splitFilesByChapterCbox.TabIndex = 13;
-			this.splitFilesByChapterCbox.Text = "Split my books into multiple files by chapter";
+			this.splitFilesByChapterCbox.Text = "[SplitFilesByChapter desc]";
 			this.splitFilesByChapterCbox.UseVisualStyleBackColor = true;
 			// 
 			// allowLibationFixupCbox
@@ -229,9 +228,9 @@
 			this.allowLibationFixupCbox.CheckState = System.Windows.Forms.CheckState.Checked;
 			this.allowLibationFixupCbox.Location = new System.Drawing.Point(6, 22);
 			this.allowLibationFixupCbox.Name = "allowLibationFixupCbox";
-			this.allowLibationFixupCbox.Size = new System.Drawing.Size(262, 19);
+			this.allowLibationFixupCbox.Size = new System.Drawing.Size(163, 19);
 			this.allowLibationFixupCbox.TabIndex = 10;
-			this.allowLibationFixupCbox.Text = "Allow Libation to fix up audiobook metadata";
+			this.allowLibationFixupCbox.Text = "[AllowLibationFixup desc]";
 			this.allowLibationFixupCbox.UseVisualStyleBackColor = true;
 			this.allowLibationFixupCbox.CheckedChanged += new System.EventHandler(this.allowLibationFixupCbox_CheckedChanged);
 			// 
@@ -261,15 +260,15 @@
 			// 
 			this.inProgressSelectControl.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
-			this.inProgressSelectControl.Location = new System.Drawing.Point(7, 247);
+			this.inProgressSelectControl.Location = new System.Drawing.Point(7, 68);
 			this.inProgressSelectControl.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
 			this.inProgressSelectControl.Name = "inProgressSelectControl";
-			this.inProgressSelectControl.Size = new System.Drawing.Size(894, 52);
+			this.inProgressSelectControl.Size = new System.Drawing.Size(875, 52);
 			this.inProgressSelectControl.TabIndex = 19;
 			// 
 			// logsBtn
 			// 
-			this.logsBtn.Location = new System.Drawing.Point(262, 147);
+			this.logsBtn.Location = new System.Drawing.Point(256, 169);
 			this.logsBtn.Name = "logsBtn";
 			this.logsBtn.Size = new System.Drawing.Size(132, 23);
 			this.logsBtn.TabIndex = 5;
@@ -284,26 +283,13 @@
 			this.booksSelectControl.Location = new System.Drawing.Point(7, 37);
 			this.booksSelectControl.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
 			this.booksSelectControl.Name = "booksSelectControl";
-			this.booksSelectControl.Size = new System.Drawing.Size(895, 87);
+			this.booksSelectControl.Size = new System.Drawing.Size(876, 87);
 			this.booksSelectControl.TabIndex = 2;
 			// 
-			// booksGb
-			// 
-			this.booksGb.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-			this.booksGb.Controls.Add(this.booksSelectControl);
-			this.booksGb.Controls.Add(this.booksLocationDescLbl);
-			this.booksGb.Location = new System.Drawing.Point(12, 12);
-			this.booksGb.Name = "booksGb";
-			this.booksGb.Size = new System.Drawing.Size(908, 129);
-			this.booksGb.TabIndex = 0;
-			this.booksGb.TabStop = false;
-			this.booksGb.Text = "Books location";
-			// 
 			// loggingLevelLbl
 			// 
 			this.loggingLevelLbl.AutoSize = true;
-			this.loggingLevelLbl.Location = new System.Drawing.Point(12, 150);
+			this.loggingLevelLbl.Location = new System.Drawing.Point(6, 172);
 			this.loggingLevelLbl.Name = "loggingLevelLbl";
 			this.loggingLevelLbl.Size = new System.Drawing.Size(78, 15);
 			this.loggingLevelLbl.TabIndex = 3;
@@ -313,11 +299,201 @@
 			// 
 			this.loggingLevelCb.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
 			this.loggingLevelCb.FormattingEnabled = true;
-			this.loggingLevelCb.Location = new System.Drawing.Point(96, 147);
+			this.loggingLevelCb.Location = new System.Drawing.Point(90, 169);
 			this.loggingLevelCb.Name = "loggingLevelCb";
 			this.loggingLevelCb.Size = new System.Drawing.Size(129, 23);
 			this.loggingLevelCb.TabIndex = 4;
 			// 
+			// tabControl
+			// 
+			this.tabControl.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+			this.tabControl.Controls.Add(this.tab1ImportantSettings);
+			this.tabControl.Controls.Add(this.tab2ImportLibrary);
+			this.tabControl.Controls.Add(this.tab3DownloadDecrypt);
+			this.tabControl.Location = new System.Drawing.Point(12, 12);
+			this.tabControl.Name = "tabControl";
+			this.tabControl.SelectedIndex = 0;
+			this.tabControl.Size = new System.Drawing.Size(909, 478);
+			this.tabControl.TabIndex = 100;
+			// 
+			// tab1ImportantSettings
+			// 
+			this.tab1ImportantSettings.Controls.Add(this.booksGb);
+			this.tab1ImportantSettings.Controls.Add(this.logsBtn);
+			this.tab1ImportantSettings.Controls.Add(this.loggingLevelCb);
+			this.tab1ImportantSettings.Controls.Add(this.loggingLevelLbl);
+			this.tab1ImportantSettings.Location = new System.Drawing.Point(4, 24);
+			this.tab1ImportantSettings.Name = "tab1ImportantSettings";
+			this.tab1ImportantSettings.Padding = new System.Windows.Forms.Padding(3);
+			this.tab1ImportantSettings.Size = new System.Drawing.Size(901, 450);
+			this.tab1ImportantSettings.TabIndex = 0;
+			this.tab1ImportantSettings.Text = "Important settings";
+			this.tab1ImportantSettings.UseVisualStyleBackColor = true;
+			// 
+			// booksGb
+			// 
+			this.booksGb.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+			this.booksGb.Controls.Add(this.booksSelectControl);
+			this.booksGb.Controls.Add(this.booksLocationDescLbl);
+			this.booksGb.Location = new System.Drawing.Point(6, 6);
+			this.booksGb.Name = "booksGb";
+			this.booksGb.Size = new System.Drawing.Size(889, 129);
+			this.booksGb.TabIndex = 0;
+			this.booksGb.TabStop = false;
+			this.booksGb.Text = "Books location";
+			// 
+			// tab2ImportLibrary
+			// 
+			this.tab2ImportLibrary.Controls.Add(this.importEpisodesCb);
+			this.tab2ImportLibrary.Controls.Add(this.downloadEpisodesCb);
+			this.tab2ImportLibrary.Location = new System.Drawing.Point(4, 24);
+			this.tab2ImportLibrary.Name = "tab2ImportLibrary";
+			this.tab2ImportLibrary.Padding = new System.Windows.Forms.Padding(3);
+			this.tab2ImportLibrary.Size = new System.Drawing.Size(901, 450);
+			this.tab2ImportLibrary.TabIndex = 1;
+			this.tab2ImportLibrary.Text = "Import library";
+			this.tab2ImportLibrary.UseVisualStyleBackColor = true;
+			// 
+			// tab3DownloadDecrypt
+			// 
+			this.tab3DownloadDecrypt.Controls.Add(this.inProgressFilesGb);
+			this.tab3DownloadDecrypt.Controls.Add(this.customFileNamingGb);
+			this.tab3DownloadDecrypt.Controls.Add(this.decryptAndConvertGb);
+			this.tab3DownloadDecrypt.Controls.Add(this.badBookGb);
+			this.tab3DownloadDecrypt.Location = new System.Drawing.Point(4, 24);
+			this.tab3DownloadDecrypt.Name = "tab3DownloadDecrypt";
+			this.tab3DownloadDecrypt.Padding = new System.Windows.Forms.Padding(3);
+			this.tab3DownloadDecrypt.Size = new System.Drawing.Size(901, 450);
+			this.tab3DownloadDecrypt.TabIndex = 2;
+			this.tab3DownloadDecrypt.Text = "Download/Decrypt";
+			this.tab3DownloadDecrypt.UseVisualStyleBackColor = true;
+			// 
+			// inProgressFilesGb
+			// 
+			this.inProgressFilesGb.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+			this.inProgressFilesGb.Controls.Add(this.inProgressDescLbl);
+			this.inProgressFilesGb.Controls.Add(this.inProgressSelectControl);
+			this.inProgressFilesGb.Location = new System.Drawing.Point(7, 299);
+			this.inProgressFilesGb.Name = "inProgressFilesGb";
+			this.inProgressFilesGb.Size = new System.Drawing.Size(888, 128);
+			this.inProgressFilesGb.TabIndex = 21;
+			this.inProgressFilesGb.TabStop = false;
+			this.inProgressFilesGb.Text = "In progress files";
+			// 
+			// customFileNamingGb
+			// 
+			this.customFileNamingGb.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+			this.customFileNamingGb.Controls.Add(this.chapterFileTemplateBtn);
+			this.customFileNamingGb.Controls.Add(this.chapterFileTemplateTb);
+			this.customFileNamingGb.Controls.Add(this.chapterFileTemplateLbl);
+			this.customFileNamingGb.Controls.Add(this.fileTemplateBtn);
+			this.customFileNamingGb.Controls.Add(this.fileTemplateTb);
+			this.customFileNamingGb.Controls.Add(this.fileTemplateLbl);
+			this.customFileNamingGb.Controls.Add(this.folderTemplateBtn);
+			this.customFileNamingGb.Controls.Add(this.folderTemplateTb);
+			this.customFileNamingGb.Controls.Add(this.folderTemplateLbl);
+			this.customFileNamingGb.Location = new System.Drawing.Point(7, 136);
+			this.customFileNamingGb.Name = "customFileNamingGb";
+			this.customFileNamingGb.Size = new System.Drawing.Size(888, 157);
+			this.customFileNamingGb.TabIndex = 20;
+			this.customFileNamingGb.TabStop = false;
+			this.customFileNamingGb.Text = "Custom file naming";
+			// 
+			// chapterFileTemplateBtn
+			// 
+			this.chapterFileTemplateBtn.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+			this.chapterFileTemplateBtn.Location = new System.Drawing.Point(808, 124);
+			this.chapterFileTemplateBtn.Name = "chapterFileTemplateBtn";
+			this.chapterFileTemplateBtn.Size = new System.Drawing.Size(75, 23);
+			this.chapterFileTemplateBtn.TabIndex = 8;
+			this.chapterFileTemplateBtn.Text = "Edit...";
+			this.chapterFileTemplateBtn.UseVisualStyleBackColor = true;
+			this.chapterFileTemplateBtn.Click += new System.EventHandler(this.chapterFileTemplateBtn_Click);
+			// 
+			// chapterFileTemplateTb
+			// 
+			this.chapterFileTemplateTb.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+			this.chapterFileTemplateTb.Location = new System.Drawing.Point(6, 125);
+			this.chapterFileTemplateTb.Name = "chapterFileTemplateTb";
+			this.chapterFileTemplateTb.ReadOnly = true;
+			this.chapterFileTemplateTb.Size = new System.Drawing.Size(796, 23);
+			this.chapterFileTemplateTb.TabIndex = 7;
+			// 
+			// chapterFileTemplateLbl
+			// 
+			this.chapterFileTemplateLbl.AutoSize = true;
+			this.chapterFileTemplateLbl.Location = new System.Drawing.Point(6, 107);
+			this.chapterFileTemplateLbl.Name = "chapterFileTemplateLbl";
+			this.chapterFileTemplateLbl.Size = new System.Drawing.Size(123, 15);
+			this.chapterFileTemplateLbl.TabIndex = 6;
+			this.chapterFileTemplateLbl.Text = "[folder template desc]";
+			// 
+			// fileTemplateBtn
+			// 
+			this.fileTemplateBtn.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+			this.fileTemplateBtn.Location = new System.Drawing.Point(808, 80);
+			this.fileTemplateBtn.Name = "fileTemplateBtn";
+			this.fileTemplateBtn.Size = new System.Drawing.Size(75, 23);
+			this.fileTemplateBtn.TabIndex = 5;
+			this.fileTemplateBtn.Text = "Edit...";
+			this.fileTemplateBtn.UseVisualStyleBackColor = true;
+			this.fileTemplateBtn.Click += new System.EventHandler(this.fileTemplateBtn_Click);
+			// 
+			// fileTemplateTb
+			// 
+			this.fileTemplateTb.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+			this.fileTemplateTb.Location = new System.Drawing.Point(6, 81);
+			this.fileTemplateTb.Name = "fileTemplateTb";
+			this.fileTemplateTb.ReadOnly = true;
+			this.fileTemplateTb.Size = new System.Drawing.Size(796, 23);
+			this.fileTemplateTb.TabIndex = 4;
+			// 
+			// fileTemplateLbl
+			// 
+			this.fileTemplateLbl.AutoSize = true;
+			this.fileTemplateLbl.Location = new System.Drawing.Point(6, 63);
+			this.fileTemplateLbl.Name = "fileTemplateLbl";
+			this.fileTemplateLbl.Size = new System.Drawing.Size(123, 15);
+			this.fileTemplateLbl.TabIndex = 3;
+			this.fileTemplateLbl.Text = "[folder template desc]";
+			// 
+			// folderTemplateBtn
+			// 
+			this.folderTemplateBtn.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+			this.folderTemplateBtn.Location = new System.Drawing.Point(807, 36);
+			this.folderTemplateBtn.Name = "folderTemplateBtn";
+			this.folderTemplateBtn.Size = new System.Drawing.Size(75, 23);
+			this.folderTemplateBtn.TabIndex = 2;
+			this.folderTemplateBtn.Text = "Edit...";
+			this.folderTemplateBtn.UseVisualStyleBackColor = true;
+			this.folderTemplateBtn.Click += new System.EventHandler(this.folderTemplateBtn_Click);
+			// 
+			// folderTemplateTb
+			// 
+			this.folderTemplateTb.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+			this.folderTemplateTb.Location = new System.Drawing.Point(5, 37);
+			this.folderTemplateTb.Name = "folderTemplateTb";
+			this.folderTemplateTb.ReadOnly = true;
+			this.folderTemplateTb.Size = new System.Drawing.Size(796, 23);
+			this.folderTemplateTb.TabIndex = 1;
+			// 
+			// folderTemplateLbl
+			// 
+			this.folderTemplateLbl.AutoSize = true;
+			this.folderTemplateLbl.Location = new System.Drawing.Point(5, 19);
+			this.folderTemplateLbl.Name = "folderTemplateLbl";
+			this.folderTemplateLbl.Size = new System.Drawing.Size(123, 15);
+			this.folderTemplateLbl.TabIndex = 0;
+			this.folderTemplateLbl.Text = "[folder template desc]";
+			// 
 			// SettingsDialog
 			// 
 			this.AcceptButton = this.saveBtn;
@@ -325,11 +501,7 @@
 			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
 			this.CancelButton = this.cancelBtn;
 			this.ClientSize = new System.Drawing.Size(933, 539);
-			this.Controls.Add(this.logsBtn);
-			this.Controls.Add(this.loggingLevelCb);
-			this.Controls.Add(this.loggingLevelLbl);
-			this.Controls.Add(this.booksGb);
-			this.Controls.Add(this.advancedSettingsGb);
+			this.Controls.Add(this.tabControl);
 			this.Controls.Add(this.cancelBtn);
 			this.Controls.Add(this.saveBtn);
 			this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow;
@@ -338,16 +510,23 @@
 			this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
 			this.Text = "Edit Settings";
 			this.Load += new System.EventHandler(this.SettingsDialog_Load);
-			this.advancedSettingsGb.ResumeLayout(false);
-			this.advancedSettingsGb.PerformLayout();
 			this.badBookGb.ResumeLayout(false);
 			this.badBookGb.PerformLayout();
 			this.decryptAndConvertGb.ResumeLayout(false);
 			this.decryptAndConvertGb.PerformLayout();
+			this.tabControl.ResumeLayout(false);
+			this.tab1ImportantSettings.ResumeLayout(false);
+			this.tab1ImportantSettings.PerformLayout();
 			this.booksGb.ResumeLayout(false);
 			this.booksGb.PerformLayout();
+			this.tab2ImportLibrary.ResumeLayout(false);
+			this.tab2ImportLibrary.PerformLayout();
+			this.tab3DownloadDecrypt.ResumeLayout(false);
+			this.inProgressFilesGb.ResumeLayout(false);
+			this.inProgressFilesGb.PerformLayout();
+			this.customFileNamingGb.ResumeLayout(false);
+			this.customFileNamingGb.PerformLayout();
 			this.ResumeLayout(false);
-			this.PerformLayout();
 
 		}
 
@@ -356,13 +535,11 @@
 		private System.Windows.Forms.Label inProgressDescLbl;
 		private System.Windows.Forms.Button saveBtn;
 		private System.Windows.Forms.Button cancelBtn;
-		private System.Windows.Forms.GroupBox advancedSettingsGb;
         private System.Windows.Forms.CheckBox allowLibationFixupCbox;
 		private DirectoryOrCustomSelectControl booksSelectControl;
 		private DirectorySelectControl inProgressSelectControl;
         private System.Windows.Forms.RadioButton convertLossyRb;
         private System.Windows.Forms.RadioButton convertLosslessRb;
-		private System.Windows.Forms.GroupBox booksGb;
 		private System.Windows.Forms.Button logsBtn;
 		private System.Windows.Forms.Label loggingLevelLbl;
 		private System.Windows.Forms.ComboBox loggingLevelCb;
@@ -375,5 +552,21 @@
 		private System.Windows.Forms.CheckBox downloadEpisodesCb;
 		private System.Windows.Forms.CheckBox importEpisodesCb;
         private System.Windows.Forms.CheckBox splitFilesByChapterCbox;
-    }
+		private System.Windows.Forms.TabControl tabControl;
+		private System.Windows.Forms.TabPage tab1ImportantSettings;
+		private System.Windows.Forms.GroupBox booksGb;
+		private System.Windows.Forms.TabPage tab2ImportLibrary;
+		private System.Windows.Forms.TabPage tab3DownloadDecrypt;
+		private System.Windows.Forms.GroupBox inProgressFilesGb;
+		private System.Windows.Forms.GroupBox customFileNamingGb;
+		private System.Windows.Forms.Button chapterFileTemplateBtn;
+		private System.Windows.Forms.TextBox chapterFileTemplateTb;
+		private System.Windows.Forms.Label chapterFileTemplateLbl;
+		private System.Windows.Forms.Button fileTemplateBtn;
+		private System.Windows.Forms.TextBox fileTemplateTb;
+		private System.Windows.Forms.Label fileTemplateLbl;
+		private System.Windows.Forms.Button folderTemplateBtn;
+		private System.Windows.Forms.TextBox folderTemplateTb;
+		private System.Windows.Forms.Label folderTemplateLbl;
+	}
 }

LibationWinForms/Dialogs/SettingsDialog.cs

@@ -1,9 +1,10 @@
-using Dinah.Core;
-using FileManager;
-using System;
+using System;
+using System.Collections.Generic;
 using System.Linq;
 using System.IO;
 using System.Windows.Forms;
+using Dinah.Core;
+using LibationFileManager;
 
 namespace LibationWinForms.Dialogs
 {
@@ -30,6 +31,8 @@ namespace LibationWinForms.Dialogs
 			this.downloadEpisodesCb.Text = desc(nameof(config.DownloadEpisodes));
 			this.booksLocationDescLbl.Text = desc(nameof(config.Books));
 			this.inProgressDescLbl.Text = desc(nameof(config.InProgress));
+			this.allowLibationFixupCbox.Text = desc(nameof(config.AllowLibationFixup));
+			this.splitFilesByChapterCbox.Text = desc(nameof(config.SplitFilesByChapter));
 
 			booksSelectControl.SetSearchTitle("books location");
 			booksSelectControl.SetDirectoryItems(
@@ -76,43 +79,88 @@ namespace LibationWinForms.Dialogs
 				_ => this.badBookAskRb
 			};
 			rb.Checked = true;
+
+			folderTemplateLbl.Text = desc(nameof(config.FolderTemplate));
+			fileTemplateLbl.Text = desc(nameof(config.FileTemplate));
+			chapterFileTemplateLbl.Text = desc(nameof(config.ChapterFileTemplate));
+			folderTemplateTb.Text = config.FolderTemplate;
+			fileTemplateTb.Text = config.FileTemplate;
+			chapterFileTemplateTb.Text = config.ChapterFileTemplate;
 		}
 
 		private void allowLibationFixupCbox_CheckedChanged(object sender, EventArgs e)
 		{
 			convertLosslessRb.Enabled = allowLibationFixupCbox.Checked;
 			convertLossyRb.Enabled = allowLibationFixupCbox.Checked;
+			splitFilesByChapterCbox.Enabled = allowLibationFixupCbox.Checked;
 
 			if (!allowLibationFixupCbox.Checked)
 			{
 				convertLosslessRb.Checked = true;
+				splitFilesByChapterCbox.Checked = false;
 			}
 		}
 
 		private void logsBtn_Click(object sender, EventArgs e) => Go.To.Folder(Configuration.Instance.LibationFiles);
 
+		private void folderTemplateBtn_Click(object sender, EventArgs e)
+		{
+			TEMP_TEMP_TEMP();
+
+		}
+
+		private void fileTemplateBtn_Click(object sender, EventArgs e)
+		{
+			TEMP_TEMP_TEMP();
+
+		}
+
+		private void chapterFileTemplateBtn_Click(object sender, EventArgs e)
+		{
+			TEMP_TEMP_TEMP();
+
+		}
+
+		private void TEMP_TEMP_TEMP()
+			=> MessageBox.Show("Sorry, not yet. Coming soon :)");
+
 		private void saveBtn_Click(object sender, EventArgs e)
 		{
 			var newBooks = booksSelectControl.SelectedDirectory;
 
+			#region validation
 			if (string.IsNullOrWhiteSpace(newBooks))
 			{
 				MessageBox.Show("Cannot set Books Location to blank", "Location is blank", MessageBoxButtons.OK, MessageBoxIcon.Error);
 				return;
 			}
 
-			if (!Directory.Exists(newBooks))
+			if (!Directory.Exists(newBooks) && booksSelectControl.SelectedDirectoryIsCustom)
 			{
-				if (booksSelectControl.SelectedDirectoryIsCustom)
-				{
-					MessageBox.Show($"Not saving change to Books location. This folder does not exist:\r\n{newBooks}", "Folder does not exist", MessageBoxButtons.OK, MessageBoxIcon.Error);
-					return;
-				}
-
-				if (booksSelectControl.SelectedDirectoryIsKnown)
-					Directory.CreateDirectory(newBooks);
+				MessageBox.Show($"Not saving change to Books location. This folder does not exist:\r\n{newBooks}", "Folder does not exist", MessageBoxButtons.OK, MessageBoxIcon.Error);
+				return;
 			}
 
+			if (!Templates.Folder.IsValid(folderTemplateTb.Text))
+			{
+				MessageBox.Show($"Not saving change to folder naming template. Invalid format.", "Invalid folder template", MessageBoxButtons.OK, MessageBoxIcon.Error);
+				return;
+			}
+			if (!Templates.File.IsValid(fileTemplateTb.Text))
+			{
+				MessageBox.Show($"Not saving change to file naming template. Invalid format.", "Invalid file template", MessageBoxButtons.OK, MessageBoxIcon.Error);
+				return;
+			}
+			if (!Templates.ChapterFile.IsValid(chapterFileTemplateTb.Text))
+			{
+				MessageBox.Show($"Not saving change to chapter file naming template. Invalid format.", "Invalid chapter file template", MessageBoxButtons.OK, MessageBoxIcon.Error);
+				return;
+			}
+			#endregion
+
+			if (!Directory.Exists(newBooks) && booksSelectControl.SelectedDirectoryIsKnown)
+				Directory.CreateDirectory(newBooks);
+
 			config.Books = newBooks;
 
 			{
@@ -141,6 +189,10 @@ namespace LibationWinForms.Dialogs
 				: badBookIgnoreRb.Checked ? Configuration.BadBookAction.Ignore
 				: Configuration.BadBookAction.Ask;
 
+			config.FolderTemplate = folderTemplateTb.Text;
+			config.FileTemplate = fileTemplateTb.Text;
+			config.ChapterFileTemplate = chapterFileTemplateTb.Text;
+
 			this.DialogResult = DialogResult.OK;
 			this.Close();
 		}

LibationWinForms/Form1.cs

@@ -3,11 +3,11 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Windows.Forms;
 using ApplicationServices;
+using AudibleUtilities;
 using Dinah.Core;
 using Dinah.Core.Drawing;
 using Dinah.Core.Threading;
-using FileManager;
-using InternalUtilities;
+using LibationFileManager;
 using LibationWinForms.Dialogs;
 
 namespace LibationWinForms

LibationWinForms/FormSaveExtension.cs

@@ -1,7 +1,7 @@
-using FileManager;
-using System.Drawing;
+using System.Drawing;
 using System.Linq;
 using System.Windows.Forms;
+using LibationFileManager;
 
 namespace LibationWinForms
 {

LibationWinForms/GridEntry.cs

@@ -9,6 +9,7 @@ using DataLayer;
 using Dinah.Core.DataBinding;
 using Dinah.Core;
 using Dinah.Core.Drawing;
+using LibationFileManager;
 
 namespace LibationWinForms
 {
@@ -39,10 +40,10 @@ namespace LibationWinForms
 
 			//Get cover art. If it's default, subscribe to PictureCached
 			{
-				(bool isDefault, byte[] picture) = FileManager.PictureStorage.GetPicture(new FileManager.PictureDefinition(Book.PictureId, FileManager.PictureSize._80x80));
+				(bool isDefault, byte[] picture) = PictureStorage.GetPicture(new PictureDefinition(Book.PictureId, PictureSize._80x80));
 
 				if (isDefault)
-					FileManager.PictureStorage.PictureCached += PictureStorage_PictureCached;
+					PictureStorage.PictureCached += PictureStorage_PictureCached;
 
 				//Mutable property. Set the field so PropertyChanged isn't fired.
 				_cover = ImageReader.ToImage(picture);
@@ -66,12 +67,12 @@ namespace LibationWinForms
 			UserDefinedItem.ItemChanged += UserDefinedItem_ItemChanged;
 		}
 
-		private void PictureStorage_PictureCached(object sender, FileManager.PictureCachedEventArgs e)
+		private void PictureStorage_PictureCached(object sender, PictureCachedEventArgs e)
 		{
 			if (e.Definition.PictureId == Book.PictureId)
 			{
 				Cover = ImageReader.ToImage(e.Picture);
-				FileManager.PictureStorage.PictureCached -= PictureStorage_PictureCached;
+				PictureStorage.PictureCached -= PictureStorage_PictureCached;
 			}
 		}
 
@@ -294,7 +295,7 @@ namespace LibationWinForms
 		~GridEntry()
 		{
 			UserDefinedItem.ItemChanged -= UserDefinedItem_ItemChanged;
-			FileManager.PictureStorage.PictureCached -= PictureStorage_PictureCached;
+			PictureStorage.PictureCached -= PictureStorage_PictureCached;
 		}
 	}
 }

LibationWinForms/LibationWinForms.csproj

@@ -29,7 +29,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Dinah.Core.WindowsDesktop" Version="1.1.1.1" />
+    <PackageReference Include="Dinah.Core.WindowsDesktop" Version="2.0.2.2" />
   </ItemGroup>
 
   <ItemGroup>