increment version

Fix temp file storage/deletion + a few new features:

* .tmp and .json files are again properly stored in DownloadsInProgressDirectory, and the are again used if resuming a download.
* Yellow stoplight works again.
* All audio files stored in DecryptInProgressDirectory are deleted if the conversion fails Partial / Complete files in %temp%\Libation are not tidied / reused #144
* Added option to retain aax file Feature Request: Allow saving the original aax #187
* Add option to remove "(Unabridged)" from metadata tags Remove "(Unabridged)" from the title? #223
* Added options for mp3 encoding
* Add option to create cue sheet
* Prevent same book being decrypted more than once at a time
* Made a new settings tab for all audio file editing/fixing options.

AaxDecrypter/AaxDecrypter.csproj

@@ -1,12 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0-windows</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="AAXClean" Version="0.1.10" />
-    <PackageReference Include="Dinah.Core" Version="2.0.2.1" />
+    <PackageReference Include="AAXClean" Version="0.4.6" />
+    <PackageReference Include="AAXClean.Codecs" Version="0.2.7" />
   </ItemGroup>
 
   <ItemGroup>

AaxDecrypter/AaxcDownloadConvertBase.cs

@@ -6,33 +6,62 @@ namespace AaxDecrypter
 {
 	public abstract class AaxcDownloadConvertBase : AudiobookDownloadBase
 	{
-		protected OutputFormat OutputFormat { get; }
+		public event EventHandler<AppleTags> RetrievedMetadata;
 
 		protected AaxFile AaxFile;
 
-		protected AaxcDownloadConvertBase(string outFileName, string cacheDirectory, DownloadLicense dlLic, OutputFormat outputFormat)
-			: base(outFileName, cacheDirectory, dlLic)
-		{
-			OutputFormat = outputFormat;
-		}
+		protected AaxcDownloadConvertBase(string outFileName, string cacheDirectory, DownloadOptions dlLic)
+			: base(outFileName, cacheDirectory, dlLic) { }
 
 		/// <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);
+			if (coverArt is not null && AaxFile?.AppleTags is not null)
+				AaxFile.AppleTags.Cover = coverArt;
 		}
 
 		protected bool Step_GetMetadata()
 		{
 			AaxFile = new AaxFile(InputFileStream);
 
+			if (DownloadOptions.StripUnabridged)
+			{
+				AaxFile.AppleTags.Title = AaxFile.AppleTags.TitleSansUnabridged;
+				AaxFile.AppleTags.Album = AaxFile.AppleTags.Album?.Replace(" (Unabridged)", "");
+			}
+
+			//Finishing configuring lame encoder.
+			if (DownloadOptions.OutputFormat == OutputFormat.Mp3)
+			{
+				double bitrateMultiple = 1;
+
+				if (AaxFile.AudioChannels == 2)
+				{
+					if (DownloadOptions.Downsample)
+						bitrateMultiple = 0.5;
+					else
+						DownloadOptions.LameConfig.Mode = NAudio.Lame.MPEGMode.Stereo;
+				}
+
+				if (DownloadOptions.MatchSourceBitrate)
+				{
+					int kbps = (int)(AaxFile.AverageBitrate * bitrateMultiple / 1024);
+
+					if (DownloadOptions.LameConfig.VBR is null)
+						DownloadOptions.LameConfig.BitRate = kbps;
+					else if (DownloadOptions.LameConfig.VBR == NAudio.Lame.VBRMode.ABR)
+						DownloadOptions.LameConfig.ABRRateKbps = kbps;
+				}
+			}
+
 			OnRetrievedTitle(AaxFile.AppleTags.TitleSansUnabridged);
 			OnRetrievedAuthors(AaxFile.AppleTags.FirstAuthor ?? "[unknown]");
 			OnRetrievedNarrators(AaxFile.AppleTags.Narrator ?? "[unknown]");
 			OnRetrievedCoverArt(AaxFile.AppleTags.Cover);
 
+			RetrievedMetadata?.Invoke(this, AaxFile.AppleTags);
+
 			return !IsCanceled;
 		}
 
@@ -47,7 +76,7 @@ namespace AaxDecrypter
 
 			OnDecryptProgressUpdate(zeroProgress);
 
-			AaxFile.SetDecryptionKey(DownloadLicense.AudibleKey, DownloadLicense.AudibleIV);
+			AaxFile.SetDecryptionKey(DownloadOptions.AudibleKey, DownloadOptions.AudibleIV);
 			return zeroProgress;
 		}
 
@@ -69,7 +98,7 @@ namespace AaxDecrypter
 			if (double.IsNormal(estTimeRemaining))
 				OnDecryptTimeRemaining(TimeSpan.FromSeconds(estTimeRemaining));
 
-			var progressPercent = e.ProcessPosition.TotalSeconds / duration.TotalSeconds;
+			var progressPercent = (e.ProcessPosition / e.TotalDuration);
 
 			OnDecryptProgressUpdate(
 				new DownloadProgress

AaxDecrypter/AaxcDownloadMultiConverter.cs

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using AAXClean;
+using AAXClean.Codecs;
 using Dinah.Core.StepRunner;
 using FileManager;
 
@@ -12,34 +13,24 @@ namespace AaxDecrypter
 	{
 		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 Func<MultiConvertFileProperties, string> multipartFileNameCallback { get; }
 
         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)
+        public AaxcDownloadMultiConverter(string outFileName, string cacheDirectory, DownloadOptions dlLic,
+            Func<MultiConvertFileProperties, string> multipartFileNameCallback = null)
+			: base(outFileName, cacheDirectory, dlLic)
         {
             Steps = new StepSequence
             {
-                Name = "Download and Convert Aaxc To " + OutputFormat,
+                Name = "Download and Convert Aaxc To " + DownloadOptions.OutputFormat,
 
                 ["Step 1: Get Aaxc Metadata"] = Step_GetMetadata,
                 ["Step 2: Download Decrypted Audiobook"] = Step_DownloadAudiobookAsMultipleFilesPerChapter,
                 ["Step 3: Cleanup"] = Step_Cleanup,
             };
-            this.multipartFileNameCallback = multipartFileNameCallback ?? DefaultMultipartFilename;
+            this.multipartFileNameCallback = multipartFileNameCallback ?? MultiConvertFileProperties.DefaultMultipartFilename;
         }
 
         /*
@@ -70,10 +61,10 @@ That naming may not be desirable for everyone, but it's an easy change to instea
         {
             var zeroProgress = Step_DownloadAudiobook_Start();
 
-            var chapters = DownloadLicense.ChapterInfo.Chapters.ToList();
+            var chapters = DownloadOptions.ChapterInfo.Chapters.ToList();
 
             // Ensure split files are at least minChapterLength in duration.
-            var splitChapters = new ChapterInfo();
+            var splitChapters = new ChapterInfo(DownloadOptions.ChapterInfo.StartOffset);
 
             var runningTotal = TimeSpan.Zero;
             string title = "";
@@ -95,45 +86,47 @@ That naming may not be desirable for everyone, but it's an easy change to instea
             // reset, just in case
             multiPartFilePaths.Clear();
 
+            ConversionResult result;
+
             AaxFile.ConversionProgressUpdate += AaxFile_ConversionProgressUpdate;
-            if (OutputFormat == OutputFormat.M4b)
-                ConvertToMultiMp4a(splitChapters);
+            if (DownloadOptions.OutputFormat == OutputFormat.M4b)
+                result = ConvertToMultiMp4a(splitChapters);
             else
-                ConvertToMultiMp3(splitChapters);
+                result = ConvertToMultiMp3(splitChapters);
             AaxFile.ConversionProgressUpdate -= AaxFile_ConversionProgressUpdate;
 
             Step_DownloadAudiobook_End(zeroProgress);
 
-            var success = !IsCanceled;
-
-            if (success)
-                foreach (var path in multiPartFilePaths)
-                    OnFileCreated(path);
-
-            return success;
+            return result == ConversionResult.NoErrorsDetected;
         }
 
-        private void ConvertToMultiMp4a(ChapterInfo splitChapters)
+        private ConversionResult ConvertToMultiMp4a(ChapterInfo splitChapters)
         {
             var chapterCount = 0;
-            AaxFile.ConvertToMultiMp4a(splitChapters, newSplitCallback =>
-                createOutputFileStream(++chapterCount, splitChapters, newSplitCallback)
-            );
+            return AaxFile.ConvertToMultiMp4a(splitChapters, newSplitCallback =>
+                createOutputFileStream(++chapterCount, splitChapters, newSplitCallback),
+            DownloadOptions.TrimOutputToChapterLength);
         }
 
-        private void ConvertToMultiMp3(ChapterInfo splitChapters)
+        private ConversionResult ConvertToMultiMp3(ChapterInfo splitChapters)
         {
             var chapterCount = 0;
-            AaxFile.ConvertToMultiMp3(splitChapters, newSplitCallback =>
+            return AaxFile.ConvertToMultiMp3(splitChapters, newSplitCallback =>
             {
                 createOutputFileStream(++chapterCount, splitChapters, newSplitCallback);
-                newSplitCallback.LameConfig.ID3.Track = chapterCount.ToString();
-            });
+                ((NAudio.Lame.LameConfig)newSplitCallback.UserState).ID3.Track = chapterCount.ToString();
+            }, DownloadOptions.LameConfig, DownloadOptions.TrimOutputToChapterLength);
         }
 
         private void createOutputFileStream(int currentChapter, ChapterInfo splitChapters, NewSplitCallback newSplitCallback)
         {
-            var fileName = multipartFileNameCallback(OutputFileName, currentChapter, splitChapters.Count, newSplitCallback);
+            var fileName = multipartFileNameCallback(new()
+            {
+                OutputFileName = OutputFileName,
+                PartsPosition = currentChapter,
+                PartsTotal = splitChapters.Count,
+                Title = newSplitCallback?.Chapter?.Title
+            });
             fileName = FileUtility.GetValidFilename(fileName);
 
             multiPartFilePaths.Add(fileName);
@@ -141,6 +134,8 @@ That naming may not be desirable for everyone, but it's an easy change to instea
             FileUtility.SaferDelete(fileName);
 
             newSplitCallback.OutputFile = File.Open(fileName, FileMode.OpenOrCreate);
+
+            OnFileCreated(fileName);
         }
     }
 }

AaxDecrypter/AaxcDownloadSingleConverter.cs

@@ -1,6 +1,7 @@
 using System;
 using System.IO;
 using AAXClean;
+using AAXClean.Codecs;
 using Dinah.Core.StepRunner;
 using FileManager;
 
@@ -10,12 +11,12 @@ namespace AaxDecrypter
 	{
 		protected override StepSequence Steps { get; }
 
-        public AaxcDownloadSingleConverter(string outFileName, string cacheDirectory, DownloadLicense dlLic, OutputFormat outputFormat)
-			: base(outFileName, cacheDirectory, dlLic, outputFormat)
+        public AaxcDownloadSingleConverter(string outFileName, string cacheDirectory, DownloadOptions dlLic)
+			: base(outFileName, cacheDirectory, dlLic)
         {
             Steps = new StepSequence
             {
-                Name = "Download and Convert Aaxc To " + OutputFormat,
+                Name = "Download and Convert Aaxc To " + DownloadOptions.OutputFormat,
 
                 ["Step 1: Get Aaxc Metadata"] = Step_GetMetadata,
                 ["Step 2: Download Decrypted Audiobook"] = Step_DownloadAudiobookAsSingleFile,
@@ -31,15 +32,16 @@ namespace AaxDecrypter
             FileUtility.SaferDelete(OutputFileName);
 
             var outputFile = File.Open(OutputFileName, FileMode.OpenOrCreate, FileAccess.ReadWrite);
+            OnFileCreated(OutputFileName);
 
             AaxFile.ConversionProgressUpdate += AaxFile_ConversionProgressUpdate;
             var decryptionResult
-                = OutputFormat == OutputFormat.M4b
-                ? AaxFile.ConvertToMp4a(outputFile, DownloadLicense.ChapterInfo)
-                : AaxFile.ConvertToMp3(outputFile);
+                = DownloadOptions.OutputFormat == OutputFormat.M4b
+                ? AaxFile.ConvertToMp4a(outputFile, DownloadOptions.ChapterInfo, DownloadOptions.TrimOutputToChapterLength)
+                : AaxFile.ConvertToMp3(outputFile, DownloadOptions.LameConfig, DownloadOptions.ChapterInfo, DownloadOptions.TrimOutputToChapterLength);
             AaxFile.ConversionProgressUpdate -= AaxFile_ConversionProgressUpdate;
 
-            DownloadLicense.ChapterInfo = AaxFile.Chapters;
+            DownloadOptions.ChapterInfo = AaxFile.Chapters;
 
             Step_DownloadAudiobook_End(zeroProgress);
 

AaxDecrypter/AudiobookDownloadBase.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.IO;
 using Dinah.Core;
 using Dinah.Core.Net.Http;
@@ -20,8 +21,9 @@ namespace AaxDecrypter
 		public event EventHandler<string> FileCreated;
 
 		protected bool IsCanceled { get; set; }
+		
 		protected string OutputFileName { get; private set; }
-		protected DownloadLicense DownloadLicense { get; }
+		protected DownloadOptions DownloadOptions { get; }
 		protected NetworkFileStream InputFileStream => (nfsPersister ??= OpenNetworkFileStream()).NetworkFileStream;
 
 		// Don't give the property a 'set'. This should have to be an obvious choice; not accidental
@@ -31,9 +33,9 @@ namespace AaxDecrypter
 		private NetworkFileStreamPersister nfsPersister;
 
 		private string jsonDownloadState { get; }
-		private string tempFile => Path.ChangeExtension(jsonDownloadState, ".tmp");
+		public string TempFilePath { get; }
 
-		protected AudiobookDownloadBase(string outFileName, string cacheDirectory, DownloadLicense dlLic)
+		protected AudiobookDownloadBase(string outFileName, string cacheDirectory, DownloadOptions dlLic)
 		{
 			OutputFileName = ArgumentValidator.EnsureNotNullOrWhiteSpace(outFileName, nameof(outFileName));
 
@@ -43,9 +45,11 @@ namespace AaxDecrypter
 
 			if (!Directory.Exists(cacheDirectory))
 				throw new DirectoryNotFoundException($"Directory does not exist: {nameof(cacheDirectory)}");
-			jsonDownloadState = Path.Combine(cacheDirectory, Path.ChangeExtension(OutputFileName, ".json"));
 
-			DownloadLicense = ArgumentValidator.EnsureNotNull(dlLic, nameof(dlLic));
+			jsonDownloadState = Path.Combine(cacheDirectory, Path.GetFileName(Path.ChangeExtension(OutputFileName, ".json")));
+			TempFilePath = Path.ChangeExtension(jsonDownloadState, ".aaxc");
+
+			DownloadOptions = ArgumentValidator.EnsureNotNull(dlLic, nameof(dlLic));
 
 			// delete file after validation is complete
 			FileUtility.SaferDelete(OutputFileName);
@@ -67,16 +71,18 @@ namespace AaxDecrypter
 				Serilog.Log.Logger.Error("Conversion failed");
 
 			return IsSuccess;
-		}		
+		}
 
-		protected void OnRetrievedTitle(string title) 
+		protected void OnRetrievedTitle(string title)
 			=> RetrievedTitle?.Invoke(this, title);
-		protected void OnRetrievedAuthors(string authors) 
+		protected void OnRetrievedAuthors(string authors)
 			=> RetrievedAuthors?.Invoke(this, authors);
-		protected void OnRetrievedNarrators(string narrators) 
+		protected void OnRetrievedNarrators(string narrators)
 			=> RetrievedNarrators?.Invoke(this, narrators);
-		protected void OnRetrievedCoverArt(byte[] coverArt) 
+
+		protected void OnRetrievedCoverArt(byte[] coverArt)
 			=> RetrievedCoverArt?.Invoke(this, coverArt);
+
 		protected void OnDecryptProgressUpdate(DownloadProgress downloadProgress) 
 			=> DecryptProgressUpdate?.Invoke(this, downloadProgress);
 		protected void OnDecryptTimeRemaining(TimeSpan timeRemaining)
@@ -92,12 +98,14 @@ namespace AaxDecrypter
 
 		protected bool Step_CreateCue()
 		{
+			if (!DownloadOptions.CreateCueSheet) return true;
+
 			// not a critical step. its failure should not prevent future steps from running
 			try
 			{
 				var path = Path.ChangeExtension(OutputFileName, ".cue");
 				path = FileUtility.GetValidFilename(path);
-				File.WriteAllText(path, Cue.CreateContents(Path.GetFileName(OutputFileName), DownloadLicense.ChapterInfo));
+				File.WriteAllText(path, Cue.CreateContents(Path.GetFileName(OutputFileName), DownloadOptions.ChapterInfo));
 				OnFileCreated(path);
 			}
 			catch (Exception ex)
@@ -109,9 +117,36 @@ namespace AaxDecrypter
 
 		protected bool Step_Cleanup()
 		{
-			FileUtility.SaferDelete(jsonDownloadState);
-			FileUtility.SaferDelete(tempFile);
-			return !IsCanceled;
+			bool success = !IsCanceled;
+			if (success)
+			{
+				FileUtility.SaferDelete(jsonDownloadState);
+
+				if (DownloadOptions.AudibleKey is not null && 
+					DownloadOptions.AudibleIV is not null && 
+					DownloadOptions.RetainEncryptedFile)
+				{
+					string aaxPath = Path.ChangeExtension(TempFilePath, ".aax");
+					FileUtility.SaferMove(TempFilePath, aaxPath);
+
+					//Write aax decryption key
+					string keyPath = Path.ChangeExtension(aaxPath, ".key");
+					FileUtility.SaferDelete(keyPath);
+					File.WriteAllText(keyPath, $"Key={DownloadOptions.AudibleKey}\r\nIV={DownloadOptions.AudibleIV}");
+
+					OnFileCreated(aaxPath);
+					OnFileCreated(keyPath);
+				}
+				else
+					FileUtility.SaferDelete(TempFilePath);
+			}
+			else
+			{
+				FileUtility.SaferDelete(OutputFileName);
+			}
+
+
+			return success;
 		}
 
 		private NetworkFileStreamPersister OpenNetworkFileStream()
@@ -124,13 +159,13 @@ namespace AaxDecrypter
 				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));
+				nfsp.NetworkFileStream.SetUriForSameFile(new Uri(DownloadOptions.DownloadUrl));
 				return nfsp;
 			}
 			catch
 			{
 				FileUtility.SaferDelete(jsonDownloadState);
-				FileUtility.SaferDelete(tempFile);
+				FileUtility.SaferDelete(TempFilePath);
 				return NewNetworkFilePersister();
 			}
 		}
@@ -139,10 +174,10 @@ namespace AaxDecrypter
 		{
 			var headers = new System.Net.WebHeaderCollection
 			{
-				{ "User-Agent", DownloadLicense.UserAgent }
+				{ "User-Agent", DownloadOptions.UserAgent }
 			};
 
-			var networkFileStream = new NetworkFileStream(tempFile, new Uri(DownloadLicense.DownloadUrl), 0, headers);
+			var networkFileStream = new NetworkFileStream(TempFilePath, new Uri(DownloadOptions.DownloadUrl), 0, headers);
 			return new NetworkFileStreamPersister(networkFileStream, jsonDownloadState);
 		}
 	}

AaxDecrypter/Cue.cs

@@ -14,14 +14,17 @@ namespace AaxDecrypter
 
             stringBuilder.AppendLine(GetFileLine(filePath, "MP3"));
 
+            var startOffset = chapters.StartOffset;
+
             var trackCount = 0;
             foreach (var c in chapters.Chapters)
             {
+                var startTime = c.StartOffset - startOffset;
                 trackCount++;
 
                 stringBuilder.AppendLine($"TRACK {trackCount} AUDIO");
                 stringBuilder.AppendLine($"  TITLE \"{c.Title}\"");
-                stringBuilder.AppendLine($"  INDEX 01 {(int)c.StartOffset.TotalMinutes}:{c.StartOffset:ss\\:ff}");
+                stringBuilder.AppendLine($"  INDEX 01 {(int)startTime.TotalMinutes}:{startTime:ss}:{(int)(startTime.Milliseconds / 1000d * 75)}");
             }
 
             return stringBuilder.ToString();

AaxDecrypter/DownloadLicense.cs

@@ -1,24 +0,0 @@
-using AAXClean;
-using Dinah.Core;
-
-namespace AaxDecrypter
-{
-    public class DownloadLicense
-    {
-        public string DownloadUrl { get; }
-        public string AudibleKey { get; }
-        public string AudibleIV { get; }
-        public string UserAgent { get; }
-        public ChapterInfo ChapterInfo { get; set; }
-
-        public DownloadLicense(string downloadUrl, string audibleKey, string audibleIV, string userAgent)
-        {
-            DownloadUrl = ArgumentValidator.EnsureNotNullOrEmpty(downloadUrl, nameof(downloadUrl));
-            UserAgent = ArgumentValidator.EnsureNotNullOrEmpty(userAgent, nameof(userAgent));
-
-            // no null/empty check. unencrypted files do not have these
-            AudibleKey = audibleKey;
-            AudibleIV = audibleIV;
-        }
-    }
-}

AaxDecrypter/DownloadOptions.cs

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

AaxDecrypter/MultiConvertFileProperties.cs

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

AaxDecrypter/NetworkFileStream.cs

@@ -193,9 +193,6 @@ namespace AaxDecrypter
             if (response.StatusCode != HttpStatusCode.PartialContent)
                 throw new WebException($"Server at {Uri.Host} responded with unexpected status code: {response.StatusCode}.");
 
-            if (response.Headers.GetValues("Accept-Ranges").FirstOrDefault(r => r.EqualsInsensitive("bytes")) is null)
-                throw new WebException($"Server at {Uri.Host} does not support Http ranges");
-
             //Content length is the length of the range request, and it is only equal
             //to the complete file length if requesting Range: bytes=0-
             if (WritePosition == 0)

AaxDecrypter/UnencryptedAudiobookDownloader.cs

@@ -10,7 +10,7 @@ namespace AaxDecrypter
 	{
 		protected override StepSequence Steps { get; }
 
-		public UnencryptedAudiobookDownloader(string outFileName, string cacheDirectory, DownloadLicense dlLic)
+		public UnencryptedAudiobookDownloader(string outFileName, string cacheDirectory, DownloadOptions dlLic)
 			: base(outFileName, cacheDirectory, dlLic)
 		{
 			Steps = new StepSequence

AppScaffolding/AppScaffolding.csproj

@@ -2,8 +2,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
-    <Version>6.3.3.1</Version>
+    <TargetFramework>net6.0-windows</TargetFramework>
+    <Version>7.2.0.1</Version>
   </PropertyGroup>
 
   <ItemGroup>
@@ -11,7 +11,7 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Octokit" Version="0.50.0" />
+    <PackageReference Include="Octokit" Version="0.51.0" />
   </ItemGroup>
 
   <ItemGroup>

AppScaffolding/LibationScaffolding.cs

@@ -50,16 +50,78 @@ namespace AppScaffolding
 		public static void RunPostConfigMigrations(Configuration config)
 		{
 			AudibleApiStorage.EnsureAccountsSettingsFileExists();
+			PopulateMissingConfigValues(config);
 
 			//
 			// migrations go below here
 			//
 
-			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);
+			Migrations.migrate_to_v6_6_9(config);
+		}
+
+		public static void PopulateMissingConfigValues(Configuration config)
+		{
+			config.InProgress ??= Configuration.WinTemp;
+
+			if (!config.Exists(nameof(config.AllowLibationFixup)))
+				config.AllowLibationFixup = true;
+
+			if (!config.Exists(nameof(config.CreateCueSheet)))
+				config.CreateCueSheet = true;
+
+			if (!config.Exists(nameof(config.RetainAaxFile)))
+				config.RetainAaxFile = false;
+
+			if (!config.Exists(nameof(config.SplitFilesByChapter)))
+				config.SplitFilesByChapter = false;
+
+			if (!config.Exists(nameof(config.StripUnabridged)))
+				config.StripUnabridged = false;
+
+			if (!config.Exists(nameof(config.StripAudibleBrandAudio)))
+				config.StripAudibleBrandAudio = false;
+
+			if (!config.Exists(nameof(config.DecryptToLossy)))
+				config.DecryptToLossy = false;
+
+			if (!config.Exists(nameof(config.LameTargetBitrate)))
+				config.LameTargetBitrate = false;			
+			
+			if (!config.Exists(nameof(config.LameDownsampleMono)))
+				config.LameDownsampleMono = true;
+			
+			if (!config.Exists(nameof(config.LameBitrate)))
+				config.LameBitrate = 64;
+			
+			if (!config.Exists(nameof(config.LameConstantBitrate)))
+				config.LameConstantBitrate = false;
+			
+			if (!config.Exists(nameof(config.LameMatchSourceBR)))
+				config.LameMatchSourceBR = true;
+			
+			if (!config.Exists(nameof(config.LameVBRQuality)))
+				config.LameVBRQuality = 2;
+
+			if (!config.Exists(nameof(config.BadBook)))
+				config.BadBook = Configuration.BadBookAction.Ask;
+
+			if (!config.Exists(nameof(config.ShowImportedStats)))
+				config.ShowImportedStats = true;
+
+			if (!config.Exists(nameof(config.ImportEpisodes)))
+				config.ImportEpisodes = true;
+
+			if (!config.Exists(nameof(config.DownloadEpisodes)))
+				config.DownloadEpisodes = true;
+
+			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;
 		}
 
 		/// <summary>Initialize logging. Run after migration</summary>
@@ -72,32 +134,15 @@ namespace AppScaffolding
 
 		private static void ensureSerilogConfig(Configuration config)
 		{
-			if (config.GetObject("Serilog") != null)
+			if (config.GetObject("Serilog") is not null)
 				return;
 
-			// "Serilog": {
-			//   "MinimumLevel": "Information"
-			//   "WriteTo": [
-			//     {
-			//       "Name": "Console"
-			//     },
-			//     {
-			//       "Name": "File",
-			//       "Args": {
-			//         "rollingInterval": "Day",
-			//         "outputTemplate": ...
-			//       }
-			//     }
-			//   ],
-			//   "Using": [ "Dinah.Core" ],
-			//   "Enrich": [ "WithCaller" ]
-			// }
 			var serilogObj = new JObject
 			{
 				{ "MinimumLevel", "Information" },
 				{ "WriteTo", new JArray
 					{
-						new JObject { {"Name", "Console" } },
+						// new JObject { {"Name", "Console" } }, // this has caused more problems than it's solved
 						new JObject
 						{
 							{ "Name", "File" },
@@ -112,14 +157,16 @@ namespace AppScaffolding
 									//   output example:             2019-11-26 08:48:40.224 -05:00 [DBG] Begin Libation
 									// - with class and method info: "{Timestamp:yyyy-MM-dd HH:mm:ss.fff zzz} [{Level:u3}] (at {Caller}) {Message:lj}{NewLine}{Exception}";
 									//   output example:             2019-11-26 08:48:40.224 -05:00 [DBG] (at LibationWinForms.Program.init()) Begin Libation
-									{ "outputTemplate", "{Timestamp:yyyy-MM-dd HH:mm:ss.fff zzz} [{Level:u3}] (at {Caller}) {Message:lj}{NewLine}{Exception}" }
+									// {Properties:j} needed for expanded exception logging
+									{ "outputTemplate", "{Timestamp:yyyy-MM-dd HH:mm:ss.fff zzz} [{Level:u3}] (at {Caller}) {Message:lj}{NewLine}{Exception} {Properties:j}" }
 								}
 							}
 						}
 					}
 				},
-				{ "Using", new JArray{ "Dinah.Core" } }, // dll's name, NOT namespace
-				{ "Enrich", new JArray{ "WithCaller" } },
+				// better exception logging with: Serilog.Exceptions library -- WithExceptionDetails
+				{ "Using", new JArray{ "Dinah.Core", "Serilog.Exceptions" } }, // dll's name, NOT namespace
+				{ "Enrich", new JArray{ "WithCaller", "WithExceptionDetails" } },
 			};
 			config.SetObject("Serilog", serilogObj);
 		}
@@ -134,9 +181,9 @@ namespace AppScaffolding
 			// capture most Console.WriteLine() and write to serilog. See below tests for details.
 			// Some dependencies print helpful info via Console.WriteLine. We'd like to log it.
 			//
-			// Serilog also writes to Console so this might be asking for trouble. ie: infinite loops.
-			// SerilogTextWriter needs to be more robust and tested. Esp the Write() methods.
-			// Empirical testing so far has shown no issues.
+			// If Serilog also writes to Console, this might be asking for trouble. ie: infinite loops.
+			// To use that way, SerilogTextWriter needs to be more robust and tested. Esp the Write() methods.
+			// However, empirical testing so far has shown no issues.
 			Console.SetOut(new MultiTextWriter(origOut, new SerilogTextWriter()));
 
 			#region Console => Serilog tests
@@ -213,10 +260,10 @@ namespace AppScaffolding
 				config.InProgress,
 
 				AudibleFileStorage.DownloadsInProgressDirectory,
-				DownloadsInProgressFiles = Directory.EnumerateFiles(AudibleFileStorage.DownloadsInProgressDirectory).Count(),
+				DownloadsInProgressFiles = FileManager.FileUtility.SaferEnumerateFiles(AudibleFileStorage.DownloadsInProgressDirectory).Count(),
 
 				AudibleFileStorage.DecryptInProgressDirectory,
-				DecryptInProgressFiles = Directory.EnumerateFiles(AudibleFileStorage.DecryptInProgressDirectory).Count(),
+				DecryptInProgressFiles = FileManager.FileUtility.SaferEnumerateFiles(AudibleFileStorage.DecryptInProgressDirectory).Count(),
 			});
 		}
 
@@ -312,52 +359,53 @@ namespace AppScaffolding
 				"WinTemp" => Path.GetFullPath(Path.Combine(Path.GetTempPath(), "Libation")),
 				_ => path
 			};
-
-		public static void migrate_to_v5_2_0__post_config(Configuration config)
-		{
-			if (!config.Exists(nameof(config.AllowLibationFixup)))
-				config.AllowLibationFixup = true;
-
-			if (!config.Exists(nameof(config.DecryptToLossy)))
-				config.DecryptToLossy = false;
-		}
 		#endregion
 
-		// add config.BadBook
-		public static void migrate_to_v5_7_1(Configuration config)
+		public static void migrate_to_v6_6_9(Configuration config)
 		{
-			if (!config.Exists(nameof(config.BadBook)))
-				config.BadBook = Configuration.BadBookAction.Ask;
-		}
+			var writeToPath = $"Serilog.WriteTo";
 
-		// add config.DownloadEpisodes , config.ImportEpisodes
-		public static void migrate_to_v6_1_2(Configuration config)
-		{
-			if (!config.Exists(nameof(config.DownloadEpisodes)))
-				config.DownloadEpisodes = true;
+			// remove WriteTo[].Name == Console
+			{
+				if (UNSAFE_MigrationHelper.Settings_TryGetArrayLength(writeToPath, out var length1))
+				{
+					for (var i = length1 - 1; i >= 0; i--)
+					{
+						var exists = UNSAFE_MigrationHelper.Settings_TryGetFromJsonPath($"{writeToPath}[{i}].Name", out var value);
 
-			if (!config.Exists(nameof(config.ImportEpisodes)))
-				config.ImportEpisodes = true;
-		}
+						if (exists && value == "Console")
+							UNSAFE_MigrationHelper.Settings_RemoveFromArray(writeToPath, i);
+					}
+				}
+			}
 
-		// add config.SplitFilesByChapter
-		public static void migrate_to_v6_2_0(Configuration config)
-		{
-			if (!config.Exists(nameof(config.SplitFilesByChapter)))
-				config.SplitFilesByChapter = false;
-		}
+			// add Serilog.Exceptions -- WithExceptionDetails
+			{
+				// outputTemplate should contain "{Properties:j}"
+				{
+					// re-calculate. previous loop may have changed the length
+					if (UNSAFE_MigrationHelper.Settings_TryGetArrayLength(writeToPath, out var length2))
+					{
+						var propertyName = "outputTemplate";
+						for (var i = 0; i < length2; i++)
+						{
+							var jsonPath = $"{writeToPath}[{i}].Args";
+							var exists = UNSAFE_MigrationHelper.Settings_TryGetFromJsonPath($"{jsonPath}.{propertyName}", out var value);
 
-		// 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;
+							var newValue = "{Timestamp:yyyy-MM-dd HH:mm:ss.fff zzz} [{Level:u3}] (at {Caller}) {Message:lj}{NewLine}{Exception} {Properties:j}";
 
-			if (!config.Exists(nameof(config.FileTemplate)))
-				config.FileTemplate = Templates.File.DefaultTemplate;
+							if (exists && value != newValue)
+								UNSAFE_MigrationHelper.Settings_SetWithJsonPath(jsonPath, propertyName, newValue);
+						}
+					}
+				}
 
-			if (!config.Exists(nameof(config.ChapterFileTemplate)))
-				config.ChapterFileTemplate = Templates.ChapterFile.DefaultTemplate;
+				// Serilog.Using must include "Serilog.Exceptions"
+				UNSAFE_MigrationHelper.Settings_AddUniqueToArray("Serilog.Using", "Serilog.Exceptions");
+
+				// Serilog.Enrich must include "WithExceptionDetails"
+				UNSAFE_MigrationHelper.Settings_AddUniqueToArray("Serilog.Enrich", "WithExceptionDetails");
+			}
 		}
 	}
 }

AppScaffolding/UNSAFE_MigrationHelper.cs

@@ -113,6 +113,108 @@ namespace AppScaffolding
 			return success;
 		}
 
+		public static bool Settings_JsonPathIsType(string jsonPath, JTokenType jTokenType)
+		{
+			JToken val = null;
+
+			process_SettingsJson(jObj => val = jObj.SelectToken(jsonPath), false);
+
+			return val?.Type == jTokenType;
+		}
+
+		public static bool Settings_TryGetFromJsonPath(string jsonPath, out string value)
+		{
+			JToken val = null;
+
+			process_SettingsJson(jObj => val = jObj.SelectToken(jsonPath), false);
+
+			if (val?.Type == JTokenType.String)
+			{
+				value = val.Value<string>();
+				return true;
+			}
+			else
+			{
+				value = null;
+				return false;
+			}
+		}
+
+		public static void Settings_SetWithJsonPath(string jsonPath, string propertyName, string newValue)
+		{
+			if (!Settings_TryGetFromJsonPath($"{jsonPath}.{propertyName}", out _))
+				return;
+
+			process_SettingsJson(jObj =>
+			{
+				var token = jObj.SelectToken(jsonPath);
+				if (token is null
+				|| token is not JObject o
+				|| o[propertyName] is null)
+					return;
+
+				var oldValue = token.Value<string>(propertyName);
+				if (oldValue != newValue)
+					token[propertyName] = newValue;
+			});
+		}
+
+		public static bool Settings_TryGetArrayLength(string jsonPath, out int length)
+		{
+			length = 0;
+
+			if (!Settings_JsonPathIsType(jsonPath, JTokenType.Array))
+				return false;
+
+			JArray array = null;
+			process_SettingsJson(jObj => array = (JArray)jObj.SelectToken(jsonPath));
+
+			length = array.Count;
+			return true;
+		}
+
+		public static void Settings_AddToArray(string jsonPath, string newValue)
+		{
+			if (!Settings_JsonPathIsType(jsonPath, JTokenType.Array))
+				return;
+
+			process_SettingsJson(jObj =>
+			{
+				var array = (JArray)jObj.SelectToken(jsonPath);
+				array.Add(newValue);
+			});
+		}
+
+		/// <summary>Do not add if already exists</summary>
+		public static void Settings_AddUniqueToArray(string arrayPath, string newValue)
+		{
+			if (!Settings_TryGetArrayLength(arrayPath, out var qty))
+				return;
+
+			for (var i = 0; i < qty; i++)
+			{
+				var exists = Settings_TryGetFromJsonPath($"{arrayPath}[{i}]", out var value);
+				if (exists && value == newValue)
+					return;
+			}
+
+			Settings_AddToArray(arrayPath, newValue);
+		}
+
+		/// <summary>only remove if not exists</summary>
+		public static void Settings_RemoveFromArray(string jsonPath, int position)
+		{
+			if (!Settings_JsonPathIsType(jsonPath, JTokenType.Array))
+				return;
+
+			process_SettingsJson(jObj =>
+			{
+				var array = (JArray)jObj.SelectToken(jsonPath);
+				if (position < array.Count)
+					array.RemoveAt(position);
+			});
+		}
+
 		/// <summary>only insert if not exists</summary>
 		public static void Settings_Insert(string key, string value)
 			=> process_SettingsJson(jObj => jObj.TryAdd(key, value));

ApplicationServices/ApplicationServices.csproj

@@ -1,12 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0-windows</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="CsvHelper" Version="27.1.1" />
-    <PackageReference Include="NPOI" Version="2.5.5" />
+    <PackageReference Include="CsvHelper" Version="27.2.1" />
+    <PackageReference Include="NPOI" Version="2.5.6" />
   </ItemGroup>
 
   <ItemGroup>

ApplicationServices/LibraryCommands.cs

@@ -15,7 +15,19 @@ namespace ApplicationServices
 {
 	public static class LibraryCommands
 	{
-		public static async Task<List<LibraryBook>> FindInactiveBooks(Func<Account, Task<ApiExtended>> apiExtendedfunc, List<LibraryBook> existingLibrary, params Account[] accounts)
+		public static event EventHandler<int> ScanBegin;
+		public static event EventHandler ScanEnd;
+
+		public static bool Scanning { get; private set; }
+		private static object _lock { get; } = new();
+
+		static LibraryCommands()
+		{
+			ScanBegin += (_, __) => Scanning = true;
+			ScanEnd += (_, __) => Scanning = false;
+		}
+
+        public static async Task<List<LibraryBook>> FindInactiveBooks(Func<Account, Task<ApiExtended>> apiExtendedfunc, List<LibraryBook> existingLibrary, params Account[] accounts)
 		{
 			logRestart();
 
@@ -82,6 +94,13 @@ namespace ApplicationServices
 
 			try
 			{
+				lock (_lock)
+                {
+					if (Scanning)
+						return (0, 0);
+					ScanBegin?.Invoke(null, accounts.Length);
+				}
+
 				logTime($"pre {nameof(scanAccountsAsync)} all");
 				var importItems = await scanAccountsAsync(apiExtendedfunc, accounts, LibraryOptions.ResponseGroupOptions.ALL_OPTIONS);
 				logTime($"post {nameof(scanAccountsAsync)} all");
@@ -89,6 +108,9 @@ namespace ApplicationServices
 				var totalCount = importItems.Count;
 				Log.Logger.Information($"GetAllLibraryItems: Total count {totalCount}");
 
+				if (totalCount == 0)
+					return default;
+
 				Log.Logger.Information("Begin long-running import");
 				logTime($"pre {nameof(importIntoDbAsync)}");
 				var newCount = await importIntoDbAsync(importItems);
@@ -124,6 +146,7 @@ namespace ApplicationServices
 			{
 				stop();
 				var putBreakPointHere = logOutput;
+				ScanEnd?.Invoke(null, null);
 			}
 		}
 
@@ -164,25 +187,47 @@ namespace ApplicationServices
 		}
 
 		private static async Task<int> importIntoDbAsync(List<ImportItem> importItems)
+        {
+            logTime("importIntoDbAsync -- pre db");
+            using var context = DbContexts.GetContext();
+            var libraryBookImporter = new LibraryBookImporter(context);
+            var newCount = await Task.Run(() => libraryBookImporter.Import(importItems));
+            logTime("importIntoDbAsync -- post Import()");
+            int qtyChanges = saveChanges(context);
+            logTime("importIntoDbAsync -- post SaveChanges");
+
+			// this is any changes at all to the database, not just new books
+            if (qtyChanges > 0)
+                await Task.Run(() => finalizeLibrarySizeChange());
+            logTime("importIntoDbAsync -- post finalizeLibrarySizeChange");
+
+            return newCount;
+        }
+
+        private static int saveChanges(LibationContext context)
 		{
-			logTime("importIntoDbAsync -- pre db");
-			using var context = DbContexts.GetContext();
-			var libraryImporter = new LibraryBookImporter(context);
-			var newCount = await Task.Run(() => libraryImporter.Import(importItems));
-			logTime("importIntoDbAsync -- post Import()");
-			var qtyChanges = context.SaveChanges();
-			logTime("importIntoDbAsync -- post SaveChanges");
+			try
+			{
+				return context.SaveChanges();
+			}
+			catch (Microsoft.EntityFrameworkCore.DbUpdateException ex)
+			{
+				// DbUpdateException exceptions can wreck serilog. Condense it until we can find a better solution. I suspect the culpret is the "WithExceptionDetails" serilog extension
 
-			if (qtyChanges > 0)
-				await Task.Run(() => finalizeLibrarySizeChange());
-			logTime("importIntoDbAsync -- post finalizeLibrarySizeChange");
+				static string format(Exception ex) => $"\r\nMessage: {ex.Message}\r\nStack Trace:\r\n{ex.StackTrace}";
 
-			return newCount;
-		}
-		#endregion
+				var msg = "Microsoft.EntityFrameworkCore.DbUpdateException";
+				if (ex.InnerException is null)
+					throw new Exception($"{msg}{format(ex)}");
+				throw new Exception(
+					$"{msg}{format(ex)}",
+					new Exception($"Inner Exception{format(ex.InnerException)}"));
+			}
+        }
+        #endregion
 
-		#region remove books
-		public static Task<List<LibraryBook>> RemoveBooksAsync(List<string> idsToRemove) => Task.Run(() => removeBooks(idsToRemove));
+        #region remove books
+        public static Task<List<LibraryBook>> RemoveBooksAsync(List<string> idsToRemove) => Task.Run(() => removeBooks(idsToRemove));
 		private static List<LibraryBook> removeBooks(List<string> idsToRemove)
 		{
 			using var context = DbContexts.GetContext();

ApplicationServices/LibraryExporter.cs

@@ -44,6 +44,9 @@ namespace ApplicationServices
 		[Name("Length In Minutes")]
 		public int LengthInMinutes { get; set; }
 
+		[Name("Description")]
+		public string Description { get; set; }
+
 		[Name("Publisher")]
 		public string Publisher { get; set; }
 
@@ -111,6 +114,7 @@ namespace ApplicationServices
 				AuthorNames = a.Book.AuthorNames,
 				NarratorNames = a.Book.NarratorNames,
 				LengthInMinutes = a.Book.LengthInMinutes,
+				Description = a.Book.Description,
 				Publisher = a.Book.Publisher,
 				HasPdf = a.Book.HasPdf,
 				SeriesNames = a.Book.SeriesNames,
@@ -180,6 +184,7 @@ namespace ApplicationServices
 				nameof (ExportDto.AuthorNames),
 				nameof (ExportDto.NarratorNames),
 				nameof (ExportDto.LengthInMinutes),
+				nameof (ExportDto.Description),
 				nameof (ExportDto.Publisher),
 				nameof (ExportDto.HasPdf),
 				nameof (ExportDto.SeriesNames),
@@ -233,6 +238,7 @@ namespace ApplicationServices
 				row.CreateCell(col++).SetCellValue(dto.AuthorNames);
 				row.CreateCell(col++).SetCellValue(dto.NarratorNames);
 				row.CreateCell(col++).SetCellValue(dto.LengthInMinutes);
+				row.CreateCell(col++).SetCellValue(dto.Description);
 				row.CreateCell(col++).SetCellValue(dto.Publisher);
 				row.CreateCell(col++).SetCellValue(dto.HasPdf);
 				row.CreateCell(col++).SetCellValue(dto.SeriesNames);

AudibleUtilities/Account.cs

@@ -73,10 +73,10 @@ namespace AudibleUtilities
 				if (_identity is null && value is null)
 					return;
 
-				if (_identity != null)
+				if (_identity is not null)
 					_identity.Updated -= update;
 
-				if (value != null)
+				if (value is not null)
 					value.Updated += update;
 
 				_identity = value;

AudibleUtilities/AccountsSettings.cs

@@ -66,7 +66,7 @@ namespace AudibleUtilities
 		{
 			var acct = GetAccount(accountId, locale);
 
-			if (acct != null)
+			if (acct is not null)
 				return acct;
 
 			var l = Localization.Get(locale);

AudibleUtilities/ApiExtended.cs

@@ -127,11 +127,18 @@ namespace AudibleUtilities
 //    items = AudibleApi.Common.Converter.FromJson<List<Item>>(System.IO.File.ReadAllText(library_json));
 //}
 #endif
+
+			Serilog.Log.Logger.Debug("Begin initial library scan");
+
 			if (!items.Any())
 				items = await Api.GetAllLibraryItemsAsync(responseGroups);
 
+			Serilog.Log.Logger.Debug("Initial library scan complete. Begin episode scan");
+
 			await manageEpisodesAsync(items, importEpisodes);
 
+			Serilog.Log.Logger.Debug("Episode scan complete");
+
 #if DEBUG
 //System.IO.File.WriteAllText(library_json, AudibleApi.Common.Converter.ToJson(items));
 #endif
@@ -141,7 +148,7 @@ namespace AudibleUtilities
 			foreach (var v in validators)
 			{
 				var exceptions = v.Validate(items);
-				if (exceptions != null && exceptions.Any())
+				if (exceptions is not null && exceptions.Any())
 					throw new AggregateException(exceptions);
 			}
 
@@ -166,8 +173,7 @@ namespace AudibleUtilities
 
 				Serilog.Log.Logger.Information($"{parents.Count} series of shows/podcasts found");
 
-				// remove episode parents. even if the following stuff fails, these will still be removed from the collection.
-				// also must happen before processing children because children abuses this flag
+				// remove episode parents. even if the following stuff fails, these will still be removed from the collection
 				items.RemoveAll(i => i.IsEpisodes);
 
 				if (importEpisodes)
@@ -192,6 +198,14 @@ namespace AudibleUtilities
 			{
 				var children = await getEpisodeChildrenAsync(parent);
 
+				// actual individual episode, not the parent of a series.
+				// for now I'm keeping it inside this method since it fits the work flow, incl. importEpisodes logic
+				if (!children.Any())
+				{
+					results.Add(parent);
+					continue;
+				}
+
 				foreach (var child in children)
 				{
 					// use parent's 'DateAdded'. DateAdded is just a convenience prop for: PurchaseDate.UtcDateTime
@@ -202,7 +216,8 @@ namespace AudibleUtilities
 						new Series
 						{
 							Asin = parent.Asin,
-							Sequence = parent.Relationships.Single(r => r.Asin == child.Asin).Sort.ToString(),
+							// This should properly be Single() not FirstOrDefault(), but FirstOrDefault is defensive for malformed data from audible
+							Sequence = parent.Relationships.FirstOrDefault(r => r.Asin == child.Asin).Sort.ToString(),
 							Title = parent.TitleWithSubtitle
 						}
 					};

AudibleUtilities/AudibleUtilities.csproj

@@ -1,11 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0-windows</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="AudibleApi" Version="2.3.2.1" />
+    <PackageReference Include="AudibleApi" Version="2.7.3.1" />
   </ItemGroup>
 
   <ItemGroup>

DataLayer/Configurations/BookContributorConfig.cs

@@ -9,8 +9,8 @@ namespace DataLayer.Configurations
         {
             entity.HasKey(bc => new { bc.BookId, bc.ContributorId, bc.Role });
 
-            entity.HasIndex(b => b.BookId);
-            entity.HasIndex(b => b.ContributorId);
+            entity.HasIndex(bc => bc.BookId);
+            entity.HasIndex(bc => bc.ContributorId);
 
             entity
                 .HasOne(bc => bc.Book)

DataLayer/Configurations/LibraryBookConfig.cs

@@ -21,12 +21,12 @@ namespace DataLayer.Configurations
             // - update LibraryBook import code
             // - would likely challenge assumptions throughout Libation which have been true up until now
 
-            entity.HasKey(b => b.BookId);
+            entity.HasKey(lb => lb.BookId);
 
             entity
-                .HasOne(le => le.Book)
+                .HasOne(lb => lb.Book)
                 .WithOne()
-                .HasForeignKey<LibraryBook>(le => le.BookId);
+                .HasForeignKey<LibraryBook>(lb => lb.BookId);
         }
     }
 }

DataLayer/Configurations/SeriesBookConfig.cs

@@ -7,10 +7,10 @@ namespace DataLayer.Configurations
     {
         public void Configure(EntityTypeBuilder<SeriesBook> entity)
         {
-            entity.HasKey(bc => new { bc.SeriesId, bc.BookId });
+            entity.HasKey(sb => new { sb.SeriesId, sb.BookId });
 
-            entity.HasIndex(b => b.SeriesId);
-            entity.HasIndex(b => b.BookId);
+            entity.HasIndex(sb => sb.SeriesId);
+            entity.HasIndex(sb => sb.BookId);
 
             entity
                 .HasOne(sb => sb.Series)

DataLayer/Configurations/SeriesConfig.cs

@@ -7,8 +7,8 @@ namespace DataLayer.Configurations
     {
         public void Configure(EntityTypeBuilder<Series> entity)
         {
-            entity.HasKey(b => b.SeriesId);
-            entity.HasIndex(b => b.AudibleSeriesId);
+            entity.HasKey(s => s.SeriesId);
+            entity.HasIndex(s => s.AudibleSeriesId);
 
             entity
                 .Metadata

DataLayer/DataLayer.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0-windows</TargetFramework>
   </PropertyGroup>
 
   <PropertyGroup>
@@ -12,13 +12,13 @@
   </PropertyGroup>
   
   <ItemGroup>
-    <PackageReference Include="Dinah.EntityFrameworkCore" Version="1.0.7.1" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="5.0.11">
+    <PackageReference Include="Dinah.EntityFrameworkCore" Version="4.0.0.3" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="6.0.4">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="5.0.11" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="5.0.11">
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="6.0.4" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="6.0.4">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

DataLayer/EfClasses/Book.cs

@@ -43,14 +43,17 @@ namespace DataLayer
         internal int CategoryId { get; private set; }
         public Category Category { get; private set; }
         public string[] CategoriesNames
-            => Category == null ? new string[0]
-            : Category.ParentCategory == null ? new[] { Category.Name }
+            => Category is null ? new string[0]
+            : Category.ParentCategory is null ? new[] { Category.Name }
             : new[] { Category.ParentCategory.Name, Category.Name };
         public string[] CategoriesIds
-            => Category == null ? null
-            : Category.ParentCategory == null ? new[] { Category.AudibleCategoryId }
+            => Category is null ? null
+            : Category.ParentCategory is null ? new[] { Category.AudibleCategoryId }
             : new[] { Category.ParentCategory.AudibleCategoryId, Category.AudibleCategoryId };
 
+        public string TitleSortable => Formatters.GetSortName(Title);
+        public string SeriesSortable => Formatters.GetSortName(SeriesNames);
+
         // is owned, not optional 1:1
         public UserDefinedItem UserDefinedItem { get; private set; }
 
@@ -185,6 +188,9 @@ namespace DataLayer
         {
             get
             {
+                if (_seriesLink is null)
+                    return "";
+
                 // first: alphabetical by name
                 var withNames = _seriesLink
                     .Where(s => !string.IsNullOrWhiteSpace(s.Series.Name))
@@ -213,7 +219,7 @@ namespace DataLayer
 				getEntry(context).Collection(s => s.SeriesLink).Load();
 
 			var singleSeriesBook = _seriesLink.SingleOrDefault(sb => sb.Series == series);
-            if (singleSeriesBook == null)
+            if (singleSeriesBook is null)
                 _seriesLink.Add(new SeriesBook(series, this, order));
             else
                 singleSeriesBook.UpdateOrder(order);

DataLayer/EfClasses/Category.cs

@@ -18,7 +18,7 @@ namespace DataLayer
     public class Category
     {
         // Empty is a special case. use private ctor w/o validation
-        public static Category GetEmpty() => new Category { CategoryId = -1, AudibleCategoryId = "", Name = "" };
+        public static Category GetEmpty() => new() { CategoryId = -1, AudibleCategoryId = "", Name = "" };
 
         internal int CategoryId { get; private set; }
         public string AudibleCategoryId { get; private set; }
@@ -44,7 +44,7 @@ namespace DataLayer
         public void UpdateParentCategory(Category parentCategory)
         {
             // don't overwrite with null but not an error
-            if (parentCategory != null)
+            if (parentCategory is not null)
                 ParentCategory = parentCategory;
         }
 

DataLayer/EfClasses/Contributor.cs

@@ -7,7 +7,7 @@ namespace DataLayer
     public class Contributor
 	{
 		// Empty is a special case. use private ctor w/o validation
-		public static Contributor GetEmpty() => new Contributor { ContributorId = -1, Name = "" };
+		public static Contributor GetEmpty() => new() { ContributorId = -1, Name = "" };
 
 		// contributors search links are just name with url-encoding. space can be + or %20
 		//   author search link:   /search?searchAuthor=Robert+Bevan
@@ -31,16 +31,12 @@ namespace DataLayer
         public string AudibleContributorId { get; private set; }
 
         private Contributor() { }
-        public Contributor(string name)
+        public Contributor(string name, string audibleContributorId = null)
         {
-            ArgumentValidator.EnsureNotNullOrWhiteSpace(name, nameof(name));
+            Name = ArgumentValidator.EnsureNotNullOrWhiteSpace(name, nameof(name));
 
             _booksLink = new HashSet<BookContributor>();
 
-            Name = name;
-        }
-		public Contributor(string name, string audibleContributorId) : this(name)
-		{
 			// don't overwrite with null or whitespace but not an error
 			if (!string.IsNullOrWhiteSpace(audibleContributorId))
 				AudibleContributorId = audibleContributorId;

DataLayer/EfClasses/UserDefinedItem.cs

@@ -162,38 +162,6 @@ namespace DataLayer
         }
 		#endregion
 
-		#region batch changes
-		public static event EventHandler<string> Batch_ItemChanged;
-        public void BatchMode_UpdateBookStatus(LiberatedStatus value)
-        {
-            if (_bookStatus != value)
-            {
-                _bookStatus = value;
-                batchFlag = true;
-            }
-        }
-
-        // don't overwrite current with null. Therefore input is "LiberatedStatus" not "LiberatedStatus?"
-        public void BatchMode_UpdatePdfStatus(LiberatedStatus value)
-        {
-            if (_pdfStatus != value)
-            {
-                _pdfStatus = value;
-                batchFlag = true;
-            }
-        }
-
-        private static bool batchFlag = false;
-
-        public static void BatchMode_Finalize()
-        {
-            if (batchFlag)
-                Batch_ItemChanged?.Invoke(null, null);
-
-            batchFlag = false;
-        }
-        #endregion
-
         public override string ToString() => $"{Book} {Rating} {Tags}";
 	}
 }

DataLayer/Formatters.cs

@@ -0,0 +1,27 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace DataLayer
+{
+    internal class Formatters
+	{
+		private static string[] _sortPrefixIgnores { get; } = { "the", "a", "an" };
+
+		public static string GetSortName(string unformattedName)
+		{
+			var sortName = unformattedName
+				.Replace("|", "")
+				.Replace(":", "")
+				.ToLowerInvariant()
+				.Trim();
+
+			if (_sortPrefixIgnores.Any(prefix => sortName.StartsWith(prefix + " ")))
+				sortName = sortName
+					.Substring(sortName.IndexOf(" ") + 1)
+					.TrimStart();
+
+			return sortName;
+		}
+	}
+}

DataLayer/QueryObjects/BookQueries.cs

@@ -19,7 +19,8 @@ namespace DataLayer
         public static Book GetBook(this IQueryable<Book> books, string productId)
             => books
                 .GetBooks()
-                .SingleOrDefault(b => b.AudibleProductId == productId);
+                // 'Single' is more accurate but 'First' is faster and less error prone
+                .FirstOrDefault(b => b.AudibleProductId == productId);
 
         /// <summary>This is still IQueryable. YOU MUST CALL ToList() YOURSELF</summary>
         public static IQueryable<Book> GetBooks(this IQueryable<Book> books, Expression<Func<Book, bool>> predicate)

DataLayer/TagPersistenceInterceptor.cs

@@ -19,7 +19,7 @@ namespace DataLayer
 				.Entries()
 				.Where(e => e.State.In(EntityState.Modified, EntityState.Added))
 				.Select(e => e.Entity as UserDefinedItem)
-				.Where(udi => udi != null)
+				.Where(udi => udi is not null)
 				// do NOT filter out entires with blank tags. blank is the valid way to show the absence of tags
 				.Select(t => (t.Book.AudibleProductId, t.Tags))
 				.ToList();

DtoImporterService/BookImporter.cs

@@ -4,62 +4,53 @@ using System.Linq;
 using AudibleApi.Common;
 using AudibleUtilities;
 using DataLayer;
+using Dinah.Core.Collections.Generic;
 
 namespace DtoImporterService
 {
 	public class BookImporter : ItemsImporterBase
 	{
-		public BookImporter(LibationContext context) : base(context) { }
+		protected override IValidator Validator => new BookValidator();
 
-		public override IEnumerable<Exception> Validate(IEnumerable<ImportItem> importItems) => new BookValidator().Validate(importItems.Select(i => i.DtoItem));
+		public Dictionary<string, Book> Cache { get; private set; } = new();
+
+		private ContributorImporter contributorImporter { get; }
+		private SeriesImporter seriesImporter { get; }
+		private CategoryImporter categoryImporter { get; }
+
+		public BookImporter(LibationContext context) : base(context)
+		{
+			contributorImporter = new ContributorImporter(DbContext);
+			seriesImporter = new SeriesImporter(DbContext);
+			categoryImporter = new CategoryImporter(DbContext);
+		}
 
 		protected override int DoImport(IEnumerable<ImportItem> importItems)
 		{
 			// pre-req.s
-			new ContributorImporter(DbContext).Import(importItems);
-			new SeriesImporter(DbContext).Import(importItems);
-			new CategoryImporter(DbContext).Import(importItems);
-			
-			// get distinct
-			var productIds = importItems.Select(i => i.DtoItem.ProductId).Distinct().ToList();
-			
-			// load db existing => .Local
-			loadLocal_books(productIds);
-			
+			contributorImporter.Import(importItems);
+			seriesImporter.Import(importItems);
+			categoryImporter.Import(importItems);
+
+			// load db existing => hash table
+			loadLocal_books(importItems);
+
 			// upsert
 			var qtyNew = upsertBooks(importItems);
 			return qtyNew;
 		}
 
-		private void loadLocal_books(List<string> productIds)
+		private void loadLocal_books(IEnumerable<ImportItem> importItems)
 		{
-			// if this context has already loaded books, don't need to reload them. vestige from when context was long-lived. in practice, we now typically use a fresh context. this is quick though so no harm in leaving it.
-			var localProductIds = DbContext.Books.Local.Select(b => b.AudibleProductId).ToList();
-			var remainingProductIds = productIds
-				.Except(localProductIds)
+			// get distinct
+			var productIds = importItems
+				.Select(i => i.DtoItem.ProductId)
+				.Distinct()
 				.ToList();
 
-			#region // explanation of DbContext.Books.GetBooks(b => remainingProductIds.Contains(b.AudibleProductId)).ToList();
-			/*
-			articles suggest loading to Local with
-			    context.Books.Load();
-			we want Books and associated fields
-			    context.Books.GetBooks(b => remainingProductIds.Contains(b.AudibleProductId)).ToList();
-			this is emulating Load() but with also getting associated fields
-
-			from: Microsoft.EntityFrameworkCore.EntityFrameworkQueryableExtensions
-			// Summary:
-			//     Enumerates the query. When using Entity Framework, this causes the results of
-			//     the query to be loaded into the associated context. This is equivalent to calling
-			//     ToList and then throwing away the list (without the overhead of actually creating
-			//     the list).
-			public static void Load<TSource>([NotNullAttribute] this IQueryable<TSource> source); 
-			*/
-			#endregion
-
-			// GetBooks() eager loads Series, category, et al
-			if (remainingProductIds.Any())
-				DbContext.Books.GetBooks(b => remainingProductIds.Contains(b.AudibleProductId)).ToList();
+			Cache = DbContext.Books
+				.GetBooks(b => productIds.Contains(b.AudibleProductId))
+				.ToDictionarySafe(b => b.AudibleProductId);
 		}
 
 		private int upsertBooks(IEnumerable<ImportItem> importItems)
@@ -68,8 +59,7 @@ namespace DtoImporterService
 
 			foreach (var item in importItems)
 			{
-				var book = DbContext.Books.Local.FirstOrDefault(p => p.AudibleProductId == item.DtoItem.ProductId);
-				if (book is null)
+				if (!Cache.TryGetValue(item.DtoItem.ProductId, out var book))
 				{
 					book = createNewBook(item);
 					qtyNew++;
@@ -94,7 +84,7 @@ namespace DtoImporterService
 			// nested logic is required so order of names is retained. else, contributors may appear in the order they were inserted into the db
 			var authors = item
 				.Authors
-				.Select(a => DbContext.Contributors.Local.Single(c => a.Name == c.Name))
+				.Select(a => contributorImporter.Cache[a.Name])
 				.ToList();
 
 			var narrators
@@ -104,7 +94,7 @@ namespace DtoImporterService
 				// nested logic is required so order of names is retained. else, contributors may appear in the order they were inserted into the db
 				: item
 					.Narrators
-					.Select(n => DbContext.Contributors.Local.Single(c => n.Name == c.Name))
+					.Select(n => contributorImporter.Cache[n.Name])
 					.ToList();
 
 			// categories are laid out for a breadcrumb. category is 1st, subcategory is 2nd
@@ -118,24 +108,44 @@ namespace DtoImporterService
 				// 2+
 				: item.Categories[1].CategoryId;
 
-			var category = DbContext.Categories.Local.SingleOrDefault(c => c.AudibleCategoryId == lastCategory);
+			var category = categoryImporter.Cache[lastCategory];
 
-			var book = DbContext.Books.Add(new Book(
-				new AudibleProductId(item.ProductId),
-				item.TitleWithSubtitle,
-				item.Description,
-				item.LengthInMinutes,
-				contentType,
-				authors,
-				narrators,
-				category,
-				importItem.LocaleName)
-			).Entity;
+			Book book;
+			try
+			{
+				book = DbContext.Books.Add(new Book(
+					new AudibleProductId(item.ProductId),
+					item.TitleWithSubtitle,
+					item.Description,
+					item.LengthInMinutes,
+					contentType,
+					authors,
+					narrators,
+					category,
+					importItem.LocaleName)
+					).Entity;
+				Cache.Add(book.AudibleProductId, book);
+			}
+			catch (Exception ex)
+			{
+				Serilog.Log.Logger.Error(ex, "Error adding book. {@DebugInfo}", new {
+					item.ProductId,
+					item.TitleWithSubtitle,
+					item.Description,
+					item.LengthInMinutes,
+					contentType,
+					QtyAuthors = authors?.Count,
+					QtyNarrators = narrators?.Count,
+					Category = category?.Name,
+					importItem.LocaleName
+				});
+				throw;
+			}
 
 			var publisherName = item.Publisher;
 			if (!string.IsNullOrWhiteSpace(publisherName))
 			{
-				var publisher = DbContext.Contributors.Local.Single(c => publisherName == c.Name);
+				var publisher = contributorImporter.Cache[publisherName];
 				book.ReplacePublisher(publisher);
 			}
 
@@ -152,7 +162,9 @@ namespace DtoImporterService
 			var item = importItem.DtoItem;
 
 			// set/update book-specific info which may have changed
-			book.PictureId = item.PictureId;
+			if (item.PictureId is not null)
+				book.PictureId = item.PictureId;
+
 			book.UpdateProductRating(item.Product_OverallStars, item.Product_PerformanceStars, item.Product_StoryStars);
 
 			// important to update user-specific info. this will have changed if user has rated/reviewed the book since last library import
@@ -160,11 +172,11 @@ namespace DtoImporterService
 
 			// update series even for existing books. these are occasionally updated
 			// these will upsert over library-scraped series, but will not leave orphans
-			if (item.Series != null)
+			if (item.Series is not null)
 			{
 				foreach (var seriesEntry in item.Series)
 				{
-					var series = DbContext.Series.Local.FirstOrDefault(s => seriesEntry.SeriesId == s.AudibleSeriesId);
+					var series = seriesImporter.Cache[seriesEntry.SeriesId];
 					book.UpsertSeries(series, seriesEntry.Sequence);
 				}
 			}

DtoImporterService/CategoryImporter.cs

@@ -4,14 +4,17 @@ using System.Linq;
 using AudibleApi.Common;
 using AudibleUtilities;
 using DataLayer;
+using Dinah.Core.Collections.Generic;
 
 namespace DtoImporterService
 {
 	public class CategoryImporter : ItemsImporterBase
 	{
-		public CategoryImporter(LibationContext context) : base(context) { }
+		protected override IValidator Validator => new CategoryValidator();
 
-		public override IEnumerable<Exception> Validate(IEnumerable<ImportItem> importItems) => new CategoryValidator().Validate(importItems.Select(i => i.DtoItem));
+		public Dictionary<string, Category> Cache { get; private set; } = new();
+
+		public CategoryImporter(LibationContext context) : base(context) { }
 
 		protected override int DoImport(IEnumerable<ImportItem> importItems)
 		{
@@ -19,7 +22,9 @@ namespace DtoImporterService
 			var categoryIds = importItems
 				.Select(i => i.DtoItem)
 				.GetCategoriesDistinct()
-				.Select(c => c.CategoryId).ToList();
+				.Select(c => c.CategoryId)
+				.Distinct()
+				.ToList();
 
 			// load db existing => .Local
 			loadLocal_categories(categoryIds);
@@ -35,17 +40,13 @@ namespace DtoImporterService
 
 		private void loadLocal_categories(List<string> categoryIds)
 		{
-			var localIds = DbContext.Categories.Local.Select(c => c.AudibleCategoryId).ToList();
-			var remainingCategoryIds = categoryIds
-				.Distinct()
-				.Except(localIds)
-				.ToList();
+			// must include default/empty/missing
+			categoryIds.Add(Category.GetEmpty().AudibleCategoryId);
 
 			// load existing => local
-			// remember to include default/empty/missing
-			var emptyName = Contributor.GetEmpty().Name;
-			if (remainingCategoryIds.Any())
-				DbContext.Categories.Where(c => remainingCategoryIds.Contains(c.AudibleCategoryId) || c.Name == emptyName).ToList();
+			Cache = DbContext.Categories
+				.Where(c => categoryIds.Contains(c.AudibleCategoryId))
+				.ToDictionarySafe(c => c.AudibleCategoryId);
 		}
 
 		// only use after loading contributors => local
@@ -66,14 +67,11 @@ namespace DtoImporterService
 
 					Category parentCategory = null;
 					if (i == 1)
-						// should be "Single()" but user is getting a strange error
-						parentCategory = DbContext.Categories.Local.FirstOrDefault(c => c.AudibleCategoryId == pair[0].CategoryId);
+						Cache.TryGetValue(pair[0].CategoryId, out parentCategory);
 
-					// should be "SingleOrDefault()" but user is getting a strange error
-					var category = DbContext.Categories.Local.FirstOrDefault(c => c.AudibleCategoryId == id);
-					if (category is null)
+					if (!Cache.TryGetValue(id, out var category))
 					{
-						category = DbContext.Categories.Add(new Category(new AudibleCategoryId(id), name)).Entity;
+						category = addCategory(id, name);
 						qtyNew++;
 					}
 
@@ -83,5 +81,24 @@ namespace DtoImporterService
 
 			return qtyNew;
 		}
+
+		private Category addCategory(string id, string name)
+		{
+			try
+			{
+				var category = new Category(new AudibleCategoryId(id), name);
+
+				var entityEntry = DbContext.Categories.Add(category);
+				var entity = entityEntry.Entity;
+
+				Cache.Add(entity.AudibleCategoryId, entity);
+				return entity;
+			}
+			catch (Exception ex)
+			{
+				Serilog.Log.Logger.Error(ex, "Error adding category. {@DebugInfo}", new { id, name });
+				throw;
+			}
+		}
 	}
 }

DtoImporterService/ContributorImporter.cs

@@ -4,14 +4,17 @@ using System.Linq;
 using AudibleApi.Common;
 using AudibleUtilities;
 using DataLayer;
+using Dinah.Core.Collections.Generic;
 
 namespace DtoImporterService
 {
 	public class ContributorImporter : ItemsImporterBase
 	{
-		public ContributorImporter(LibationContext context) : base(context) { }
+		protected override IValidator Validator => new ContributorValidator();
 
-		public override IEnumerable<Exception> Validate(IEnumerable<ImportItem> importItems) => new ContributorValidator().Validate(importItems.Select(i => i.DtoItem));
+		public Dictionary<string, Contributor> Cache { get; private set; } = new();
+
+		public ContributorImporter(LibationContext context) : base(context) { }
 
 		protected override int DoImport(IEnumerable<ImportItem> importItems)
 		{
@@ -50,58 +53,61 @@ namespace DtoImporterService
 			// must include default/empty/missing
 			contributorNames.Add(Contributor.GetEmpty().Name);
 
-			//// BAD: very inefficient
-			// var x = context.Contributors.Local.Where(c => !contribNames.Contains(c.Name));
-
-			// GOOD: Except() is efficient. Due to hashing, it's close to O(n)
-			var localNames = DbContext.Contributors.Local.Select(c => c.Name).ToList();
-			var remainingContribNames = contributorNames
-				.Distinct()
-				.Except(localNames)
-				.ToList();
-
 			// load existing => local
-			if (remainingContribNames.Any())
-				DbContext.Contributors.Where(c => remainingContribNames.Contains(c.Name)).ToList();
+			Cache = DbContext.Contributors
+				.Where(c => contributorNames.Contains(c.Name))
+				.ToDictionarySafe(c => c.Name);
 		}
 
-		// only use after loading contributors => local
 		private int upsertPeople(List<Person> people)
 		{
-			var localNames = DbContext.Contributors.Local.Select(c => c.Name).ToList();
-			var newPeople = people
-				.Select(p => p.Name)
-				.Distinct()
-				.Except(localNames)
-				.ToList();
+			var hash = people
+				// new people only
+				.Where(p => !Cache.ContainsKey(p.Name))
+				// remove duplicates by Name. first in wins
+				.ToDictionarySafe(p => p.Name);
 
-			var groupby = people.GroupBy(
-				p => p.Name,
-				p => p,
-				(key, g) => new { Name = key, People = g.ToList() }
-				);
-			foreach (var name in newPeople)
+			foreach (var kvp in hash)
 			{
-				var p = groupby.Single(g => g.Name == name).People.First();
-				DbContext.Contributors.Add(new Contributor(p.Name, p.Asin));
+				var person = kvp.Value;
+				addContributor(person.Name, person.Asin);
 			}
 
-			return newPeople.Count;
+			return hash.Count;
 		}
 
 		// only use after loading contributors => local
 		private int upsertPublishers(List<string> publishers)
 		{
-			var localNames = DbContext.Contributors.Local.Select(c => c.Name).ToList();
-			var newPublishers = publishers
-				.Distinct()
-				.Except(localNames)
-				.ToList();
+			var hash = publishers
+				// new publishers only
+				.Where(p => !Cache.ContainsKey(p))
+				// remove duplicates
+				.ToHashSet();
 
-			foreach (var pub in newPublishers)
-				DbContext.Contributors.Add(new Contributor(pub));
+			foreach (var pub in hash)
+				addContributor(pub);
 
-			return newPublishers.Count;
+			return hash.Count;
 		}
-	}
+
+        private Contributor addContributor(string name, string id = null)
+		{
+			try
+			{
+				var newContrib = new Contributor(name);
+
+				var entityEntry = DbContext.Contributors.Add(newContrib);
+				var entity = entityEntry.Entity;
+
+				Cache.Add(entity.Name, entity);
+				return entity;
+			}
+			catch (Exception ex)
+			{
+				Serilog.Log.Logger.Error(ex, "Error adding contributor. {@DebugInfo}", new { name, id });
+				throw;
+			}
+        }
+    }
 }

DtoImporterService/DtoImporterService.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0-windows</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

DtoImporterService/ImporterBase.cs

@@ -25,7 +25,7 @@ namespace DtoImporterService
 			try
 			{
 				var exceptions = Validate(param);
-				if (exceptions != null && exceptions.Any())
+				if (exceptions is not null && exceptions.Any())
 					throw new AggregateException($"Importer validation failed", exceptions);
 			}
 			catch (Exception ex)
@@ -53,5 +53,9 @@ namespace DtoImporterService
 	public abstract class ItemsImporterBase : ImporterBase<IEnumerable<ImportItem>>
 	{
 		protected ItemsImporterBase(LibationContext context) : base(context) { }
+
+		protected abstract IValidator Validator { get; }
+        public sealed override IEnumerable<Exception> Validate(IEnumerable<ImportItem> importItems)
+			=> Validator.Validate(importItems.Select(i => i.DtoItem));
 	}
 }

DtoImporterService/LibraryBookImporter.cs

@@ -3,18 +3,24 @@ using System.Collections.Generic;
 using System.Linq;
 using AudibleUtilities;
 using DataLayer;
+using Dinah.Core.Collections.Generic;
 
 namespace DtoImporterService
 {
 	public class LibraryBookImporter : ItemsImporterBase
 	{
-		public LibraryBookImporter(LibationContext context) : base(context) { }
+		protected override IValidator Validator => new LibraryValidator();
 
-		public override IEnumerable<Exception> Validate(IEnumerable<ImportItem> importItems) => new LibraryValidator().Validate(importItems.Select(i => i.DtoItem));
+		private BookImporter bookImporter { get; }
+
+		public LibraryBookImporter(LibationContext context) : base(context)
+		{
+			bookImporter = new BookImporter(DbContext);
+		}
 
 		protected override int DoImport(IEnumerable<ImportItem> importItems)
 		{
-			new BookImporter(DbContext).Import(importItems);
+			bookImporter.Import(importItems);
 
 			var qtyNew = upsertLibraryBooks(importItems);
 			return qtyNew;
@@ -35,18 +41,32 @@ namespace DtoImporterService
 			// CURRENT SOLUTION: don't re-insert
 
 			var currentLibraryProductIds = DbContext.LibraryBooks.Select(l => l.Book.AudibleProductId).ToList();
-			var newItems = importItems.Where(dto => !currentLibraryProductIds.Contains(dto.DtoItem.ProductId)).ToList();
+			var newItems = importItems
+				.Where(dto => !currentLibraryProductIds.Contains(dto.DtoItem.ProductId))
+				.ToList();
+
+			// if 2 accounts try to import the same book in the same transaction: error since we're only tracking and pulling by asin.
+			// just use the first
+			var hash = newItems.ToDictionarySafe(dto => dto.DtoItem.ProductId);
+			foreach (var kvp in hash)
+            {
+				var newItem = kvp.Value;
 
-			foreach (var newItem in newItems)
-			{
 				var libraryBook = new LibraryBook(
-					DbContext.Books.Local.Single(b => b.AudibleProductId == newItem.DtoItem.ProductId),
+					bookImporter.Cache[newItem.DtoItem.ProductId],
 					newItem.DtoItem.DateAdded,
 					newItem.AccountId);
-				DbContext.LibraryBooks.Add(libraryBook);
+				try
+				{
+					DbContext.LibraryBooks.Add(libraryBook);
+				}
+				catch (Exception ex)
+				{
+					Serilog.Log.Logger.Error(ex, "Error adding library book. {@DebugInfo}", new { libraryBook.Book, libraryBook.Account });
+				}
 			}
 
-			var qtyNew = newItems.Count;
+			var qtyNew = hash.Count;
 			return qtyNew;
 		}
 	}

DtoImporterService/PerfLogger.cs

@@ -8,8 +8,8 @@ namespace DtoImporterService
 	public record timeLogEntry(string msg, long totalElapsed, long delta);
 	public static class PerfLogger
 	{
-		private static Stopwatch sw = new Stopwatch();
-		private static List<timeLogEntry> __log { get; } = new List<timeLogEntry> { new("begin", 0, 0) };
+		private static Stopwatch sw { get; } = new();
+		private static List<timeLogEntry> __log { get; } = new() { new("begin", 0, 0) };
 
 		public static void logTime(string s)
 		{

DtoImporterService/SeriesImporter.cs

@@ -4,14 +4,17 @@ using System.Linq;
 using AudibleApi.Common;
 using AudibleUtilities;
 using DataLayer;
+using Dinah.Core.Collections.Generic;
 
 namespace DtoImporterService
 {
 	public class SeriesImporter : ItemsImporterBase
 	{
-		public SeriesImporter(LibationContext context) : base(context) { }
+		protected override IValidator Validator => new SeriesValidator();
 
-		public override IEnumerable<Exception> Validate(IEnumerable<ImportItem> importItems) => new SeriesValidator().Validate(importItems.Select(i => i.DtoItem));
+		public Dictionary<string, DataLayer.Series> Cache { get; private set; } = new();
+
+		public SeriesImporter(LibationContext context) : base(context) { }
 
 		protected override int DoImport(IEnumerable<ImportItem> importItems)
 		{
@@ -31,15 +34,12 @@ namespace DtoImporterService
 
 		private void loadLocal_series(List<AudibleApi.Common.Series> series)
 		{
-			var seriesIds = series.Select(s => s.SeriesId).ToList();
-			var localIds = DbContext.Series.Local.Select(s => s.AudibleSeriesId).ToList();
-			var remainingSeriesIds = seriesIds
-				.Distinct()
-				.Except(localIds)
-				.ToList();
+			var seriesIds = series.Select(s => s.SeriesId).Distinct().ToList();
 
-			if (remainingSeriesIds.Any())
-				DbContext.Series.Where(s => remainingSeriesIds.Contains(s.AudibleSeriesId)).ToList();
+			if (seriesIds.Any())
+				Cache = DbContext.Series
+					.Where(s => seriesIds.Contains(s.AudibleSeriesId))
+					.ToDictionarySafe(s => s.AudibleSeriesId);
 		}
 
 		private int upsertSeries(List<AudibleApi.Common.Series> requestedSeries)
@@ -48,10 +48,10 @@ namespace DtoImporterService
 
 			foreach (var s in requestedSeries)
 			{
-				var series = DbContext.Series.Local.FirstOrDefault(c => c.AudibleSeriesId == s.SeriesId);
-				if (series is null)
+				// AudibleApi.Common.Series.SeriesId == DataLayer.AudibleSeriesId
+				if (!Cache.TryGetValue(s.SeriesId, out var series))
 				{
-					series = DbContext.Series.Add(new DataLayer.Series(new AudibleSeriesId(s.SeriesId))).Entity;
+					series = addSeries(s.SeriesId);
 					qtyNew++;
 				}
 				series.UpdateName(s.SeriesName);
@@ -59,5 +59,24 @@ namespace DtoImporterService
 
 			return qtyNew;
 		}
+
+		private DataLayer.Series addSeries(string seriesId)
+		{
+			try
+			{
+				var series = new DataLayer.Series(new AudibleSeriesId(seriesId));
+
+				var entityEntry = DbContext.Series.Add(series);
+				var entity = entityEntry.Entity;
+
+				Cache.Add(entity.AudibleSeriesId, entity);
+				return entity;
+			}
+			catch (Exception ex)
+			{
+				Serilog.Log.Logger.Error(ex, "Error adding series. {@DebugInfo}", new { seriesId });
+				throw;
+			}
+		}
 	}
 }

DtoImporterService/_importer notes.txt

@@ -0,0 +1,37 @@
+* Local (eg DbContext.Books.Local): indexes/hashes PK and nothing else. Local.Find(PK) is fast. All other searches (eg FirstOrDefault) have awful performance. It deceptively *feels* like we get this partially for free since added/modified entries live here.
+* live db: for all importers, fields used for lookup are indexed
+
+Using BookImporter as an example: since AudibleProductId is indexed, hitting the live db is much faster than using Local. Fastest is putting all in a local hash table
+
+Note: GetBook/GetBooks eager loads Series, category, et al
+
+for 1,200 iterations
+* load to LocalView
+  DbContext.Books.Local.FirstOrDefault(p => p.AudibleProductId == item.DtoItem.ProductId)
+  27,125 ms
+* read from live db
+  DbContext.Books.GetBook(item.DtoItem.ProductId)
+  12,224 ms
+* load to hash table: Dictionary<string, Book>
+  dictionary[item.DtoItem.ProductId];
+  1 ms (yes: ONE)
+
+With hashtable, somehow memory usage was not significantly affected
+
+-----------------------------------
+
+why were we using Local to begin with?
+
+articles suggest loading to Local with
+    context.Books.Load();
+this loads this table but not associated fields
+we want Books and associated fields
+    context.Books.GetBooks(b => remainingProductIds.Contains(b.AudibleProductId)).ToList();
+this is emulating Load() but with also getting associated fields
+			from: Microsoft.EntityFrameworkCore.EntityFrameworkQueryableExtensions
+			// Summary:
+			//     Enumerates the query. When using Entity Framework, this causes the results of
+			//     the query to be loaded into the associated context. This is equivalent to calling
+			//     ToList and then throwing away the list (without the overhead of actually creating
+			//     the list).
+			public static void Load<TSource>([NotNullAttribute] this IQueryable<TSource> source);

FileLiberator/AudioDecodable.cs

@@ -11,30 +11,33 @@ namespace FileLiberator
         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)
+        protected void OnTitleDiscovered(string title) => OnTitleDiscovered(null, title);
+        protected void OnTitleDiscovered(object _, string title)
 		{
             Serilog.Log.Logger.Debug("Event fired {@DebugInfo}", new { Name = nameof(TitleDiscovered), Title = title });
             TitleDiscovered?.Invoke(this, title);
 		}
 
-        protected void OnAuthorsDiscovered(string authors)
+        protected void OnAuthorsDiscovered(string authors) => OnAuthorsDiscovered(null, authors);
+        protected void OnAuthorsDiscovered(object _, string authors)
 		{
             Serilog.Log.Logger.Debug("Event fired {@DebugInfo}", new { Name = nameof(AuthorsDiscovered), Authors = authors });
             AuthorsDiscovered?.Invoke(this, authors);
 		}
 
-        protected void OnNarratorsDiscovered(string narrators)
+        protected void OnNarratorsDiscovered(string narrators) => OnNarratorsDiscovered(null, narrators);
+        protected void OnNarratorsDiscovered(object _, string narrators)
 		{
             Serilog.Log.Logger.Debug("Event fired {@DebugInfo}", new { Name = nameof(NarratorsDiscovered), Narrators = narrators });
             NarratorsDiscovered?.Invoke(this, narrators);
 		}
 
+        protected void OnRequestCoverArt(Action<byte[]> setCoverArtDel)
+		{
+            Serilog.Log.Logger.Debug("Event fired {@DebugInfo}", new { Name = nameof(RequestCoverArt) });
+            RequestCoverArt?.Invoke(this, setCoverArtDel);
+        }
+
         protected void OnCoverImageDiscovered(byte[] coverImage)
 		{
             Serilog.Log.Logger.Debug("Event fired {@DebugInfo}", new { Name = nameof(CoverImageDiscovered), CoverImageBytes = coverImage?.Length });

FileLiberator/AudioFileStorageExt.cs

@@ -11,72 +11,46 @@ 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
+        private class MultipartRenamer
         {
-            public LibraryBook libraryBook { get; }
+            private LibraryBook libraryBook { get; }
 
-            public MultipartRenamer(LibraryBook libraryBook) => this.libraryBook = libraryBook;
+            internal 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();
-            }
+            internal string MultipartFilename(AaxDecrypter.MultiConvertFileProperties props)
+                => Templates.ChapterFile.GetFilename(libraryBook.ToDto(), props);
         }
 
-        public static Func<string, int, int, AAXClean.NewSplitCallback, string> CreateMultipartRenamerFunc(this AudioFileStorage _, LibraryBook libraryBook)
+        public static Func<AaxDecrypter.MultiConvertFileProperties, 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);
-
+        /// <summary>
+        /// DownloadDecryptBook:
+        /// File path for where to move files into.
+        /// Path: directory nested inside of Books directory
+        /// File name: n/a
+        /// </summary>
         public static string GetDestinationDirectory(this AudioFileStorage _, LibraryBook libraryBook)
-            => GetFileTemplateSingle(Configuration.Instance.FolderTemplate, libraryBook, AudibleFileStorage.BooksDirectory, null)
-            .GetFilePath();
+            => Templates.Folder.GetFilename(libraryBook.ToDto());
 
+        /// <summary>
+        /// DownloadDecryptBook:
+        /// Path: in progress directory.
+        /// File name: final file name.
+        /// </summary>
+        public static string GetInProgressFilename(this AudioFileStorage _, LibraryBook libraryBook, string extension)
+            => Templates.File.GetFilename(libraryBook.ToDto(), AudibleFileStorage.DecryptInProgressDirectory, extension, returnFirstExisting: true);
+
+        /// <summary>
+        /// PDF: audio file does not exist
+        /// </summary>
+        public static string GetBooksDirectoryFilename(this AudioFileStorage _, LibraryBook libraryBook, string extension)
+            => Templates.File.GetFilename(libraryBook.ToDto(), AudibleFileStorage.BooksDirectory, extension);
+
+        /// <summary>
+        /// PDF: audio file already exists
+        /// </summary>
         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;
-        }
+            => Templates.File.GetFilename(libraryBook.ToDto(), dirFullPath, extension);
     }
 }

FileLiberator/ConvertToMp3.cs

@@ -2,6 +2,7 @@
 using System.IO;
 using System.Threading.Tasks;
 using AAXClean;
+using AAXClean.Codecs;
 using DataLayer;
 using Dinah.Core;
 using Dinah.Core.ErrorHandling;
@@ -72,8 +73,8 @@ namespace FileLiberator
         private void M4bBook_ConversionProgressUpdate(object sender, ConversionProgressEventArgs e)
         {
             var duration = m4bBook.Duration;
-            double remainingSecsToProcess = (duration - e.ProcessPosition).TotalSeconds;
-            double estTimeRemaining = remainingSecsToProcess / e.ProcessSpeed;
+            var remainingSecsToProcess = (duration - e.ProcessPosition).TotalSeconds;
+            var estTimeRemaining = remainingSecsToProcess / e.ProcessSpeed;
 
             if (double.IsNormal(estTimeRemaining))
                 OnStreamingTimeRemaining(TimeSpan.FromSeconds(estTimeRemaining));

FileLiberator/DownloadDecryptBook.cs

@@ -61,7 +61,12 @@ namespace FileLiberator
 
                 // decrypt failed
                 if (!success)
+                {
+                    foreach (var tmpFile in entries.Where(f => f.FileType != FileType.AAXC))
+                        FileUtility.SaferDelete(tmpFile.Path);
+
                     return new StatusHandler { "Decrypt failed" };
+                }
 
                 // moves new files from temp dir to final dest
                 var movedAudioFile = moveFilesToBooksDir(libraryBook, entries);
@@ -86,51 +91,38 @@ namespace FileLiberator
 
             try
             {
+                var config = Configuration.Instance;
+
                 downloadValidation(libraryBook);
 
                 var api = await libraryBook.GetApiAsync();
                 var contentLic = await api.GetDownloadLicenseAsync(libraryBook.Book.AudibleProductId);
+                var audiobookDlLic = BuildDownloadOptions(config, contentLic);
 
-                var audiobookDlLic = new DownloadLicense
-                    (
-                    contentLic?.ContentMetadata?.ContentUrl?.OfflineUrl,
-                    contentLic?.Voucher?.Key,
-                    contentLic?.Voucher?.Iv,
-                    Resources.USER_AGENT
-                    );
-
-                //I assume if ContentFormat == "MPEG" that the delivered file is an unencrypted mp3.
-                //I also assume that if DrmType != Adrm, the file will be an mp3.
-                //These assumptions may be wrong, and only time and bug reports will tell.
-                var outputFormat = 
-                    contentLic.ContentMetadata.ContentReference.ContentFormat == "MPEG" ||
-                    (Configuration.Instance.AllowLibationFixup && Configuration.Instance.DecryptToLossy) ? 
-                    OutputFormat.Mp3 : OutputFormat.M4b;
-
-                if (Configuration.Instance.AllowLibationFixup || outputFormat == OutputFormat.Mp3)
-                {
-                    audiobookDlLic.ChapterInfo = new AAXClean.ChapterInfo();
-
-                    foreach (var chap in contentLic.ContentMetadata?.ChapterInfo?.Chapters)
-                        audiobookDlLic.ChapterInfo.AddChapter(chap.Title, TimeSpan.FromMilliseconds(chap.LengthMs));
-                }
-
-                var outFileName = AudibleFileStorage.Audio.GetInProgressFilename(libraryBook, outputFormat.ToString().ToLower());
-
+                var outFileName = AudibleFileStorage.Audio.GetInProgressFilename(libraryBook, audiobookDlLic.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);
+                if (contentLic.DrmType != AudibleApi.Common.DrmType.Adrm)
+                    abDownloader = new UnencryptedAudiobookDownloader(outFileName, cacheDir, audiobookDlLic);
+                else
+                {
+                    AaxcDownloadConvertBase converter
+                        = config.SplitFilesByChapter ? new AaxcDownloadMultiConverter(
+                            outFileName, cacheDir, audiobookDlLic,
+                            AudibleFileStorage.Audio.CreateMultipartRenamerFunc(libraryBook))
+                        : new AaxcDownloadSingleConverter(outFileName, cacheDir, audiobookDlLic);
+
+                    if (config.AllowLibationFixup)
+                        converter.RetrievedMetadata += (_, tags) => tags.Generes = string.Join(", ", libraryBook.Book.CategoriesNames);
+
+                    abDownloader = converter;
+                }
+
+                abDownloader.DecryptProgressUpdate += OnStreamingProgressChanged;
+                abDownloader.DecryptTimeRemaining += OnStreamingTimeRemaining;
+                abDownloader.RetrievedTitle += OnTitleDiscovered;
+                abDownloader.RetrievedAuthors += OnAuthorsDiscovered;
+                abDownloader.RetrievedNarrators += OnNarratorsDiscovered;
                 abDownloader.RetrievedCoverArt += AaxcDownloader_RetrievedCoverArt;
                 abDownloader.FileCreated += (_, path) => OnFileCreated(libraryBook, path);
 
@@ -144,6 +136,85 @@ namespace FileLiberator
             }
         }
 
+        private static DownloadOptions BuildDownloadOptions(Configuration config, AudibleApi.Common.ContentLicense contentLic)
+        {
+            //I assume if ContentFormat == "MPEG" that the delivered file is an unencrypted mp3.
+            //I also assume that if DrmType != Adrm, the file will be an mp3.
+            //These assumptions may be wrong, and only time and bug reports will tell.
+
+            bool encrypted = contentLic.DrmType == AudibleApi.Common.DrmType.Adrm;
+
+            var outputFormat = !encrypted || (config.AllowLibationFixup && config.DecryptToLossy) ?
+                     OutputFormat.Mp3 : OutputFormat.M4b;
+
+            var audiobookDlLic = new DownloadOptions
+                 (
+                 contentLic?.ContentMetadata?.ContentUrl?.OfflineUrl,
+                 Resources.USER_AGENT
+                 )
+            {
+                AudibleKey = contentLic?.Voucher?.Key,
+                AudibleIV = contentLic?.Voucher?.Iv,
+                OutputFormat = outputFormat,
+                TrimOutputToChapterLength = config.AllowLibationFixup && config.StripAudibleBrandAudio,
+                RetainEncryptedFile = config.RetainAaxFile && encrypted,
+                StripUnabridged = config.AllowLibationFixup && config.StripUnabridged,
+                Downsample = config.AllowLibationFixup && config.LameDownsampleMono,
+                MatchSourceBitrate = config.AllowLibationFixup && config.LameMatchSourceBR && config.LameTargetBitrate,
+                CreateCueSheet = config.CreateCueSheet
+            };
+
+            if (config.AllowLibationFixup || outputFormat == OutputFormat.Mp3)
+            {
+
+                long startMs = audiobookDlLic.TrimOutputToChapterLength ?
+                    contentLic.ContentMetadata.ChapterInfo.BrandIntroDurationMs : 0;
+
+                audiobookDlLic.ChapterInfo = new AAXClean.ChapterInfo(TimeSpan.FromMilliseconds(startMs));
+
+                for (int i = 0; i < contentLic.ContentMetadata.ChapterInfo.Chapters.Length; i++)
+                {
+                    var chapter = contentLic.ContentMetadata.ChapterInfo.Chapters[i];
+                    long chapLenMs = chapter.LengthMs;
+
+                    if (i == 0)
+                        chapLenMs -= startMs;
+
+                    if (config.StripAudibleBrandAudio && i == contentLic.ContentMetadata.ChapterInfo.Chapters.Length - 1)
+                        chapLenMs -= contentLic.ContentMetadata.ChapterInfo.BrandOutroDurationMs;
+
+                    audiobookDlLic.ChapterInfo.AddChapter(chapter.Title, TimeSpan.FromMilliseconds(chapLenMs));
+                }
+            }
+
+            NAudio.Lame.LameConfig lameConfig = new();
+
+
+            lameConfig.Mode = NAudio.Lame.MPEGMode.Mono;
+
+            if (config.LameTargetBitrate)
+			{
+                if (config.LameConstantBitrate)
+                    lameConfig.BitRate = config.LameBitrate;
+                else
+                {
+                    lameConfig.ABRRateKbps = config.LameBitrate;
+                    lameConfig.VBR = NAudio.Lame.VBRMode.ABR;
+                    lameConfig.WriteVBRTag = true;
+                }
+			}
+			else
+			{
+                lameConfig.VBR = NAudio.Lame.VBRMode.Default;
+                lameConfig.VBRQuality = config.LameVBRQuality;
+                lameConfig.WriteVBRTag = true;
+            }
+
+            audiobookDlLic.LameConfig = lameConfig;
+
+            return audiobookDlLic;
+        }
+
         private static void downloadValidation(LibraryBook libraryBook)
         {
             string errorString(string field)
@@ -166,7 +237,7 @@ namespace FileLiberator
                 throw new Exception(errorString("Locale"));
         }
 
-        private void AaxcDownloader_RetrievedCoverArt(object sender, byte[] e)
+        private void AaxcDownloader_RetrievedCoverArt(object _, byte[] e)
         {
             if (e is not null)
                 OnCoverImageDiscovered(e);

FileLiberator/DownloadFile.cs

@@ -12,8 +12,7 @@ namespace FileLiberator
 		{
 			var client = new HttpClient();
 
-			var progress = new Progress<DownloadProgress>();
-			progress.ProgressChanged += (_, e) => OnStreamingProgressChanged(e);
+			var progress = new Progress<DownloadProgress>(OnStreamingProgressChanged);
 
 			OnStreamingBegin(proposedDownloadFilePath);
 

FileLiberator/DownloadPdf.cs

@@ -62,8 +62,7 @@ namespace FileLiberator
 				var api = await libraryBook.GetApiAsync();
 				var downloadUrl = await api.GetPdfDownloadLinkAsync(libraryBook.Book.AudibleProductId);
 
-				var progress = new Progress<DownloadProgress>();
-				progress.ProgressChanged += (_, e) => OnStreamingProgressChanged(e);
+				var progress = new Progress<DownloadProgress>(OnStreamingProgressChanged);
 
 				var client = new HttpClient();
 

FileLiberator/FileLiberator.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0-windows</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

FileLiberator/Streamable.cs

@@ -18,12 +18,14 @@ namespace FileLiberator
             StreamingBegin?.Invoke(this, filePath);
         }
 
-        protected void OnStreamingProgressChanged(DownloadProgress progress)
+        protected void OnStreamingProgressChanged(DownloadProgress progress) => OnStreamingProgressChanged(null, progress);
+        protected void OnStreamingProgressChanged(object _, DownloadProgress progress)
         {
             StreamingProgressChanged?.Invoke(this, progress);
         }
 
-        protected void OnStreamingTimeRemaining(TimeSpan timeRemaining)
+        protected void OnStreamingTimeRemaining(TimeSpan timeRemaining) => OnStreamingTimeRemaining(null, timeRemaining);
+        protected void OnStreamingTimeRemaining(object _, TimeSpan timeRemaining)
         {
             StreamingTimeRemaining?.Invoke(this, timeRemaining);
         }

FileLiberator/UtilityExtensions.cs

@@ -4,6 +4,7 @@ using System.Linq;
 using System.Threading.Tasks;
 using DataLayer;
 using Dinah.Core;
+using LibationFileManager;
 
 namespace FileLiberator
 {
@@ -22,5 +23,21 @@ namespace FileLiberator
 			var apiExtended = await AudibleUtilities.ApiExtended.CreateAsync(libraryBook.Account, libraryBook.Book.Locale);
 			return apiExtended.Api;
 		}
+
+		public static LibraryBookDto ToDto(this LibraryBook libraryBook) => new()
+		{
+			Account = libraryBook.Account,
+
+			AudibleProductId = libraryBook.Book.AudibleProductId,
+			Title = libraryBook.Book.Title ?? "",
+			Locale = libraryBook.Book.Locale,
+
+			Authors = libraryBook.Book.Authors.Select(c => c.Name).ToList(),
+
+			Narrators = libraryBook.Book.Narrators.Select(c => c.Name).ToList(),
+
+			SeriesName = libraryBook.Book.SeriesLink.FirstOrDefault()?.Series.Name,
+			SeriesNumber = libraryBook.Book.SeriesLink.FirstOrDefault()?.Order
+		};
 	}
 }

FileManager/BackgroundFileSystem.cs

@@ -43,7 +43,7 @@ namespace FileManager
             lock (fsCacheLocker)
             {
                 fsCache.Clear();
-                fsCache.AddRange(Directory.EnumerateFiles(RootDirectory, SearchPattern, SearchOption));
+                fsCache.AddRange(FileUtility.SaferEnumerateFiles(RootDirectory, SearchPattern, SearchOption));
             }
         }
 
@@ -52,7 +52,7 @@ namespace FileManager
             Stop();
 
             lock (fsCacheLocker)
-                fsCache.AddRange(Directory.EnumerateFiles(RootDirectory, SearchPattern, SearchOption));
+                fsCache.AddRange(FileUtility.SaferEnumerateFiles(RootDirectory, SearchPattern, SearchOption));
 
             directoryChangesEvents = new BlockingCollection<FileSystemEventArgs>();
 			fileSystemWatcher = new FileSystemWatcher(RootDirectory)
@@ -135,7 +135,7 @@ namespace FileManager
         private void AddPath(string path)
         {
             if (File.GetAttributes(path).HasFlag(FileAttributes.Directory))
-                AddUniqueFiles(Directory.EnumerateFiles(path, SearchPattern, SearchOption));
+                AddUniqueFiles(FileUtility.SaferEnumerateFiles(path, SearchPattern, SearchOption));
             else
                 AddUniqueFile(path);
         }

FileManager/FileManager.csproj

@@ -1,12 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Dinah.Core" Version="2.0.2.1" />
-    <PackageReference Include="Polly" Version="7.2.2" />
+    <PackageReference Include="Dinah.Core" Version="4.0.6.1" />
+    <PackageReference Include="Polly" Version="7.2.3" />
   </ItemGroup>
 
 </Project>

FileManager/FileNamingTemplate.cs

@@ -6,13 +6,13 @@ using Dinah.Core;
 namespace FileManager
 {
     /// <summary>Get valid filename. Advanced features incl. parameterized template</summary>
-    public class FileTemplate
+    public class FileNamingTemplate
     {
         /// <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));
+        public FileNamingTemplate(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>();
@@ -29,14 +29,14 @@ namespace FileManager
         public string IllegalCharacterReplacements { get; set; }
 
         /// <summary>Generate a valid path for this file or directory</summary>
-        public string GetFilePath()
+        public string GetFilePath(bool returnFirstExisting = false)
         {
             var filename = Template;
 
             foreach (var r in ParameterReplacements)
                 filename = filename.Replace($"<{formatKey(r.Key)}>", formatValue(r.Value));
 
-            return FileUtility.GetValidFilename(filename, IllegalCharacterReplacements);
+            return FileUtility.GetValidFilename(filename, IllegalCharacterReplacements, returnFirstExisting);
         }
 
         private static string formatKey(string key)
@@ -45,8 +45,20 @@ namespace FileManager
             .Replace(">", "");
 
         private string formatValue(object value)
-            => ParameterMaxSize.HasValue && ParameterMaxSize.Value > 0
-            ? value?.ToString().Truncate(ParameterMaxSize.Value)
-            : value?.ToString();
+        {
+            if (value is null)
+                return "";
+
+            // Other illegal characters will be taken care of later. Must take care of slashes now so params can't introduce new folders.
+            // Esp important for file templates.
+            var val = value
+                .ToString()
+                .Replace($"{System.IO.Path.DirectorySeparatorChar}", IllegalCharacterReplacements)
+                .Replace($"{System.IO.Path.AltDirectorySeparatorChar}", IllegalCharacterReplacements);
+            return 
+                ParameterMaxSize.HasValue && ParameterMaxSize.Value > 0
+                ? val.Truncate(ParameterMaxSize.Value)
+                : val;
+        }
     }
 }

FileManager/FileUtility.cs

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using System.Text.RegularExpressions;
 using Dinah.Core;
 using Polly;
 using Polly.Retry;
@@ -47,7 +48,7 @@ namespace FileManager
         /// <br/>- ensure uniqueness
         /// <br/>- enforce max file length
         /// </summary>
-        public static string GetValidFilename(string path, string illegalCharacterReplacements = "")
+        public static string GetValidFilename(string path, string illegalCharacterReplacements = "", bool returnFirstExisting = false)
         {
             ArgumentValidator.EnsureNotNull(path, nameof(path));
 
@@ -65,8 +66,10 @@ namespace FileManager
 
             var fullfilename = fileStem.Truncate(MAX_FILENAME_LENGTH - extension.Length) + extension;
 
+            fullfilename = removeInvalidWhitespace(fullfilename);
+
             var i = 0;
-            while (File.Exists(fullfilename))
+            while (File.Exists(fullfilename) && !returnFirstExisting)
             {
                 var increm = $" ({++i})";
                 fullfilename = fileStem.Truncate(MAX_FILENAME_LENGTH - increm.Length - extension.Length) + increm + extension;
@@ -86,36 +89,80 @@ namespace FileManager
         {
             ArgumentValidator.EnsureNotNull(path, nameof(path));
 
-            var invalidChars = Path.GetInvalidPathChars().Union(new[] {
+            path = replaceInvalidChars(path, illegalCharacterReplacements);
+            path = standardizeSlashes(path);
+            path = replaceColons(path, illegalCharacterReplacements);
+            path = removeDoubleSlashes(path);
+
+            return path;
+        }
+
+        private static char[] invalidChars { get; } = Path.GetInvalidPathChars().Union(new[] {
                 '*', '?',
-                // these are weird. If you run Path.GetInvalidPathChars() in C# interactive, these characters are included.
+                // these are weird. If you run Path.GetInvalidPathChars() in Visual Studio's "C# Interactive", then these characters are included.
                 // In live code, Path.GetInvalidPathChars() does not include them
                 '"', '<', '>'
             }).ToArray();
+        private static string replaceInvalidChars(string path, string illegalCharacterReplacements)
+            => string.Join(illegalCharacterReplacements ?? "", path.Split(invalidChars));
 
-            var fixedPath = string
-                .Join(illegalCharacterReplacements ?? "", path.Split(invalidChars))
-                .Replace(Path.AltDirectorySeparatorChar, Path.DirectorySeparatorChar);
+        private static string standardizeSlashes(string path)
+            => path.Replace(Path.AltDirectorySeparatorChar, Path.DirectorySeparatorChar);
 
+        private static string replaceColons(string path, string illegalCharacterReplacements)
+        {
             // replace all colons except within the first 2 chars
             var builder = new System.Text.StringBuilder();
-            for (var i = 0; i < fixedPath.Length; i++)
+            for (var i = 0; i < path.Length; i++)
             {
-                var c = fixedPath[i];
+                var c = path[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;
+            return builder.ToString();
         }
 
+        private static string removeDoubleSlashes(string path)
+        {
+            if (path.Length < 2)
+                return path;
+
+            // exception: don't try to condense the initial dbl bk slashes in a path. eg: \\192.168.0.1
+
+            var remainder = path[1..];
+            var dblSeparator = $"{Path.DirectorySeparatorChar}{Path.DirectorySeparatorChar}";
+            while (remainder.Contains(dblSeparator))
+                remainder = remainder.Replace(dblSeparator, $"{Path.DirectorySeparatorChar}");
+
+            return path[0] + remainder;
+        }
+
+        private static string removeInvalidWhitespace_pattern { get; } = $@"[\s\.]*\{Path.DirectorySeparatorChar}\s*";
+        private static Regex removeInvalidWhitespace_regex { get; } = new(removeInvalidWhitespace_pattern, RegexOptions.Compiled | RegexOptions.IgnorePatternWhitespace);
+
+        /// <summary>no part of the path may begin or end in whitespace</summary>
+        private static string removeInvalidWhitespace(string fullfilename)
+        {
+            // no whitespace at beginning or end
+            // replace whitespace around path slashes
+            //    regex (with space added for clarity)
+            //    \s*  \\  \s*    =>    \
+            // no ending dots. beginning dots are valid
+
+            // regex is easier by ending with separator
+            fullfilename += Path.DirectorySeparatorChar;
+            fullfilename = removeInvalidWhitespace_regex.Replace(fullfilename, Path.DirectorySeparatorChar.ToString());
+            // take seperator back off
+            fullfilename = RemoveLastCharacter(fullfilename);
+
+            fullfilename = removeDoubleSlashes(fullfilename);
+            return fullfilename;
+        }
+
+        public static string RemoveLastCharacter(this string str) => string.IsNullOrEmpty(str) ? str : str[..^1];
+
         /// <summary>
         /// Move file.
         /// <br/>- Ensure valid file name path: remove invalid chars, ensure uniqueness, enforce max file length
@@ -142,15 +189,19 @@ namespace FileManager
             {
                 try
                 {
-                    if (File.Exists(source))
+                    if (!File.Exists(source))
                     {
-                        File.Delete(source);
-                        Serilog.Log.Logger.Information("File successfully deleted", new { source });
+                        Serilog.Log.Logger.Debug("No file to delete: {@DebugText}", new { source });
+                        return;
                     }
+
+                    Serilog.Log.Logger.Debug("Attempt to delete file: {@DebugText}", new { source });
+                    File.Delete(source);
+                    Serilog.Log.Logger.Information("File successfully deleted: {@DebugText}", new { source });
                 }
                 catch (Exception e)
                 {
-                    Serilog.Log.Logger.Error(e, "Failed to delete file", new { source });
+                    Serilog.Log.Logger.Error(e, "Failed to delete file: {@DebugText}", new { source });
                     throw;
                 }
             });
@@ -161,19 +212,61 @@ namespace FileManager
             {
                 try
                 {
-                    if (File.Exists(source))
+                    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 });
+                        Serilog.Log.Logger.Debug("No file to move: {@DebugText}", new { source });
+                        return;
                     }
+
+                    SaferDelete(destination);
+
+                    var dir = Path.GetDirectoryName(destination);
+                    Serilog.Log.Logger.Debug("Attempt to create directory: {@DebugText}", new { dir });
+                    Directory.CreateDirectory(dir);
+
+                    Serilog.Log.Logger.Debug("Attempt to move file: {@DebugText}", new { source, destination });
+                    File.Move(source, destination);
+                    Serilog.Log.Logger.Information("File successfully moved: {@DebugText}", new { source, destination });
                 }
                 catch (Exception e)
                 {
-                    Serilog.Log.Logger.Error(e, "Failed to move file", new { source, destination });
+                    Serilog.Log.Logger.Error(e, "Failed to move file: {@DebugText}", new { source, destination });
                     throw;
                 }
             });
+
+        /// <summary>
+        /// A safer way to get all the files in a directory and sub directory without crashing on UnauthorizedException or PathTooLongException
+        /// </summary>
+        /// <param name="rootPath">Starting directory</param>
+        /// <param name="patternMatch">Filename pattern match</param>
+        /// <param name="searchOption">Search subdirectories or only top level directory for files</param>
+        /// <returns>List of files</returns>
+        public static IEnumerable<string> SaferEnumerateFiles(string path, string searchPattern = "*", SearchOption searchOption = SearchOption.TopDirectoryOnly)
+        {
+            var foundFiles = Enumerable.Empty<string>();
+
+            if (searchOption == SearchOption.AllDirectories)
+            {
+                try
+                {
+                    IEnumerable<string> subDirs = Directory.EnumerateDirectories(path);
+                    // Add files in subdirectories recursively to the list
+                    foreach (string dir in subDirs)
+                        foundFiles = foundFiles.Concat(SaferEnumerateFiles(dir, searchPattern, searchOption));
+                }
+                catch (UnauthorizedAccessException) { }
+                catch (PathTooLongException) { }
+            }
+
+            try
+            {
+                // Add files from the current directory
+                foundFiles = foundFiles.Concat(Directory.EnumerateFiles(path, searchPattern));
+            }
+            catch (UnauthorizedAccessException) { }
+
+            return foundFiles;
+        }
     }
 }

FileManager/PersistentDictionary.cs

@@ -30,8 +30,7 @@ namespace FileManager
             if (IsReadOnly)
                 return;
 
-            File.WriteAllText(Filepath, "{}");
-            System.Threading.Thread.Sleep(100);
+            createNewFile();
         }
 
         public string GetString(string propertyName)
@@ -205,9 +204,39 @@ namespace FileManager
 
         private JObject readFile()
         {
+            if (!File.Exists(Filepath))
+            {
+                var msg = "Unrecoverable error. Settings file cannot be found";
+                var ex = new FileNotFoundException(msg, Filepath);
+                Serilog.Log.Logger.Error(ex, msg);
+                throw ex;
+            }
+
             var settingsJsonContents = File.ReadAllText(Filepath);
+
+            if (string.IsNullOrWhiteSpace(settingsJsonContents))
+            {
+                createNewFile();
+                settingsJsonContents = File.ReadAllText(Filepath);
+            }
+
             var jObject = JsonConvert.DeserializeObject<JObject>(settingsJsonContents);
+
+            if (jObject is null)
+            {
+                var msg = "Unrecoverable error. Unable to read settings from Settings file";
+                var ex = new NullReferenceException(msg);
+                Serilog.Log.Logger.Error(ex, msg);
+                throw ex;
+            }
+
             return jObject;
         }
+
+        private void createNewFile()
+        {
+            File.WriteAllText(Filepath, "{}");
+            System.Threading.Thread.Sleep(100);
+        }
     }
 }

Hoopla/Hoopla.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
   </PropertyGroup>
 
 </Project>

Libation.sln

@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.28803.156
+# Visual Studio Version 17
+VisualStudioVersion = 17.0.31903.59
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "_Solution Items", "_Solution Items", "{03C8835F-936C-4AF7-87AE-FF92BDBE8B9B}"
 	ProjectSection(SolutionItems) = preProject
@@ -62,7 +62,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FileLiberator.Tests", "_Tes
 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}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibationFileManager.Tests", "_Tests\LibationFileManager.Tests\LibationFileManager.Tests.csproj", "{EB781571-8548-477E-82AD-FB9FAB548D2F}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

LibationCli/LibationCli.csproj

@@ -3,7 +3,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0-windows</TargetFramework>
 
     <PublishTrimmed>true</PublishTrimmed>
     <PublishReadyToRun>true</PublishReadyToRun>

LibationCli/Options/ScanOptions.cs

@@ -35,7 +35,8 @@ namespace LibationCli
 			var (TotalBooksProcessed, NewBooksAdded) = await LibraryCommands.ImportAccountAsync((a) => ApiExtended.CreateAsync(a), _accounts);
 
 			Console.WriteLine("Scan complete.");
-			Console.WriteLine($"Total processed: {TotalBooksProcessed}\r\nNew: {NewBooksAdded}");
+			Console.WriteLine($"Total processed: {TotalBooksProcessed}");
+			Console.WriteLine($"New: {NewBooksAdded}");
 		}
 
 		private Account[] getAccounts()

LibationFileManager/AudibleFileStorage.cs

@@ -47,7 +47,7 @@ namespace LibationFileManager
         {
             // primary lookup
             var cachedFile = FilePathCache.GetFirstPath(productId, FileType);
-            if (cachedFile != null)
+            if (cachedFile is not null && File.Exists(cachedFile))
                 return cachedFile;
 
             // secondary lookup attempt
@@ -73,12 +73,12 @@ namespace LibationFileManager
         protected override string GetFilePathCustom(string productId)
         {
             var regex = GetBookSearchRegex(productId);
-            return Directory
-                .EnumerateFiles(DownloadsInProgressDirectory, "*.*", SearchOption.AllDirectories)
+            return FileUtility
+                .SaferEnumerateFiles(DownloadsInProgressDirectory, "*.*", SearchOption.AllDirectories)
                 .FirstOrDefault(s => regex.IsMatch(s));
         }
 
-        public bool Exists(string productId) => GetFilePath(productId) != null;
+        public bool Exists(string productId) => GetFilePath(productId) is not null;
     }
 
     public class AudioFileStorage : AudibleFileStorage

LibationFileManager/Configuration.cs

@@ -96,18 +96,88 @@ namespace LibationFileManager
             set => persistentDictionary.SetNonString(nameof(AllowLibationFixup), value);
         }
 
+        [Description("Create a cue sheet (.cue)")]
+        public bool CreateCueSheet
+        {
+            get => persistentDictionary.GetNonString<bool>(nameof(CreateCueSheet));
+            set => persistentDictionary.SetNonString(nameof(CreateCueSheet), value);
+        }
+
+        [Description("Retain the Aax file after successfully decrypting")]
+        public bool RetainAaxFile
+        {
+            get => persistentDictionary.GetNonString<bool>(nameof(RetainAaxFile));
+            set => persistentDictionary.SetNonString(nameof(RetainAaxFile), value);
+        }
+
+        [Description("Split my books into multiple files by chapter")]
+        public bool SplitFilesByChapter
+        {
+            get => persistentDictionary.GetNonString<bool>(nameof(SplitFilesByChapter));
+            set => persistentDictionary.SetNonString(nameof(SplitFilesByChapter), value);
+        }
+
+        [Description("Strip \"(Unabridged)\" from audiobook metadata tags")]
+        public bool StripUnabridged
+        {
+            get => persistentDictionary.GetNonString<bool>(nameof(StripUnabridged));
+            set => persistentDictionary.SetNonString(nameof(StripUnabridged), value);
+        }
+
+        [Description("Allow Libation to remove audible branding from the start\r\nand end of audiobooks. (e.g. \"This is Audible\")")]
+        public bool StripAudibleBrandAudio
+        {
+            get => persistentDictionary.GetNonString<bool>(nameof(StripAudibleBrandAudio));
+            set => persistentDictionary.SetNonString(nameof(StripAudibleBrandAudio), value);
+        }
+
         [Description("Decrypt to lossy format?")]
         public bool DecryptToLossy
         {
             get => persistentDictionary.GetNonString<bool>(nameof(DecryptToLossy));
             set => persistentDictionary.SetNonString(nameof(DecryptToLossy), value);
         }
-        
-        [Description("Split my books into multiple files by chapter")]
-        public bool SplitFilesByChapter
+
+        [Description("Lame encoder target. true = Bitrate, false = Quality")]
+        public bool LameTargetBitrate
         {
-            get => persistentDictionary.GetNonString<bool>(nameof(SplitFilesByChapter));
-            set => persistentDictionary.SetNonString(nameof(SplitFilesByChapter), value);
+            get => persistentDictionary.GetNonString<bool>(nameof(LameTargetBitrate));
+            set => persistentDictionary.SetNonString(nameof(LameTargetBitrate), value);
+        }
+
+        [Description("Lame encoder downsamples to mono")]
+        public bool LameDownsampleMono
+        {
+            get => persistentDictionary.GetNonString<bool>(nameof(LameDownsampleMono));
+            set => persistentDictionary.SetNonString(nameof(LameDownsampleMono), value);
+        }
+
+        [Description("Lame target bitrate [16,320]")]
+        public int LameBitrate
+        {
+            get => persistentDictionary.GetNonString<int>(nameof(LameBitrate));
+            set => persistentDictionary.SetNonString(nameof(LameBitrate), value);
+        }
+
+        [Description("Restrict encoder to constant bitrate?")]
+        public bool LameConstantBitrate
+        {
+            get => persistentDictionary.GetNonString<bool>(nameof(LameConstantBitrate));
+            set => persistentDictionary.SetNonString(nameof(LameConstantBitrate), value);
+        }
+
+        [Description("Match the source bitrate?")]
+        public bool LameMatchSourceBR
+        {
+            get => persistentDictionary.GetNonString<bool>(nameof(LameMatchSourceBR));
+            set => persistentDictionary.SetNonString(nameof(LameMatchSourceBR), value);
+        }
+
+        [Description("Lame target VBR quality [10,100]")]
+        public int LameVBRQuality
+        {
+            get => persistentDictionary.GetNonString<int>(nameof(LameVBRQuality));
+            set => persistentDictionary.SetNonString(nameof(LameVBRQuality), value);
         }
 
         public enum BadBookAction
@@ -133,6 +203,13 @@ namespace LibationFileManager
             set => persistentDictionary.SetString(nameof(BadBook), value.ToString());
         }
 
+        [Description("Show number of newly imported titles? When unchecked, no pop-up will appear after library scan.")]
+        public bool ShowImportedStats
+        {
+            get => persistentDictionary.GetNonString<bool>(nameof(ShowImportedStats));
+            set => persistentDictionary.SetNonString(nameof(ShowImportedStats), value);
+        }
+
         [Description("Import episodes? (eg: podcasts) When unchecked, episodes will not be imported into Libation.")]
         public bool ImportEpisodes
         {
@@ -170,14 +247,10 @@ namespace LibationFileManager
             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 string getTemplate(string settingName, Templates templ) => templ.GetValid(persistentDictionary.GetString(settingName));
         private void setTemplate(string settingName, Templates templ, string newValue)
         {
-            var template = newValue.Trim();
+            var template = newValue?.Trim();
             if (templ.IsValid(template))
                 persistentDictionary.SetString(settingName, template);
         }
@@ -267,7 +340,7 @@ namespace LibationFileManager
                 var valueWasChanged = persistentDictionary.SetWithJsonPath("Serilog", "MinimumLevel", value.ToString());
                 if (!valueWasChanged)
                 {
-                    Log.Logger.Information("LogLevel.set attempt. No change");
+                    Log.Logger.Debug("LogLevel.set attempt. No change");
                     return;
                 }
 

LibationFileManager/FilePathCache.cs

@@ -26,11 +26,23 @@ namespace LibationFileManager
 			if (File.Exists(jsonFile))
 			{
 				var list = JsonConvert.DeserializeObject<List<CacheEntry>>(File.ReadAllText(jsonFile));
+
+				// file exists but deser is null. this will never happen when file is healthy
+				if (list is null)
+				{
+					lock (locker)
+					{
+						Serilog.Log.Logger.Error("Error deserializing file. Wrong format. Possibly corrupt. Deleting file. {@DebugInfo}", new { jsonFile });
+						File.Delete(jsonFile);
+						return;
+					}
+				}
+
 				cache = new Cache<CacheEntry>(list);
 			}
         }
 
-        public static bool Exists(string id, FileType type) => GetFirstPath(id, type) != null;
+        public static bool Exists(string id, FileType type) => GetFirstPath(id, type) is not null;
 
 		public static List<(FileType fileType, string path)> GetFiles(string id)
 			=> getEntries(entry => entry.Id == id)

LibationFileManager/LibationFileManager.csproj

@@ -1,14 +1,16 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0-windows</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="5.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="6.0.0" />
+    <PackageReference Include="Serilog.Exceptions" Version="8.1.0" />
   </ItemGroup>
 
   <ItemGroup>
+    <ProjectReference Include="..\AaxDecrypter\AaxDecrypter.csproj" />
     <ProjectReference Include="..\FileManager\FileManager.csproj" />
   </ItemGroup>
 

LibationFileManager/LibraryBookDto.cs

@@ -0,0 +1,29 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace LibationFileManager
+{
+    public class BookDto
+    {
+        public string AudibleProductId { get; set; }
+        public string Title { get; set; }
+        public string Locale { get; set; }
+
+        public IEnumerable<string> Authors { get; set; }
+        public string AuthorNames => string.Join(", ", Authors);
+        public string FirstAuthor => Authors.FirstOrDefault();
+
+        public IEnumerable<string> Narrators { get; set; }
+        public string NarratorNames => string.Join(", ", Narrators);
+        public string FirstNarrator => Narrators.FirstOrDefault();
+
+        public string SeriesName { get; set; }
+        public string SeriesNumber { get; set; }
+    }
+
+    public class LibraryBookDto : BookDto
+    {
+        public string Account { get; set; }
+    }
+}

LibationFileManager/PictureStorage.cs

@@ -70,19 +70,13 @@ namespace LibationFileManager
 		{
 			lock (cacheLocker)
 			{
-				if (!cache.ContainsKey(def) || cache[def] == null)
+				if (!cache.ContainsKey(def) || cache[def] is null)
 				{
 					var path = getPath(def);
-					byte[] bytes;
-
-					if (File.Exists(path))
-						bytes = File.ReadAllBytes(path);
-					else
-					{
-						bytes = downloadBytes(def);
-						saveFile(def, bytes);
-					}
-
+					var bytes
+						= File.Exists(path)
+						? File.ReadAllBytes(path)
+						: downloadBytes(def);
 					cache[def] = bytes;
 				}
 				return cache[def];
@@ -104,7 +98,6 @@ namespace LibationFileManager
 					continue;
 
 				var bytes = downloadBytes(def);
-				saveFile(def, bytes);
 				lock (cacheLocker)
 					cache[def] = bytes;
 
@@ -115,14 +108,24 @@ namespace LibationFileManager
 		private static HttpClient imageDownloadClient { get; } = new HttpClient();
 		private static byte[] downloadBytes(PictureDefinition def)
 		{
-			var sz = (int)def.Size;
-			return imageDownloadClient.GetByteArrayAsync("ht" + $"tps://images-na.ssl-images-amazon.com/images/I/{def.PictureId}._SL{sz}_.jpg").Result;
-		}
+			if (def.PictureId is null)
+				return getDefaultImage(def.Size);
 
-		private static void saveFile(PictureDefinition def, byte[] bytes)
-		{
-			var path = getPath(def);
-			File.WriteAllBytes(path, bytes);
+			try
+			{
+				var sz = (int)def.Size;
+				var bytes = imageDownloadClient.GetByteArrayAsync("ht" + $"tps://images-na.ssl-images-amazon.com/images/I/{def.PictureId}._SL{sz}_.jpg").Result;
+
+				// save image file. make sure to not save default image
+				var path = getPath(def);
+				File.WriteAllBytes(path, bytes);
+
+				return bytes;
+			}
+			catch
+			{
+				return getDefaultImage(def.Size);
+			}
 		}
 	}
 }

LibationFileManager/QuickFilters.cs

@@ -9,6 +9,8 @@ namespace LibationFileManager
 {
     public static class QuickFilters
     {
+        public static event EventHandler Updated;
+
         internal class FilterState
         {
             public bool UseDefault { get; set; }
@@ -34,7 +36,7 @@ namespace LibationFileManager
                 lock (locker)
                 {
                     inMemoryState.UseDefault = value;
-                    save();
+                    save(false);
                 }
             }
         }
@@ -97,7 +99,7 @@ namespace LibationFileManager
         private static object locker { get; } = new object();
 
         // ONLY call this within lock()
-        private static void save()
+        private static void save(bool invokeUpdatedEvent = true)
         {
             // create json if not exists
             void resave() => File.WriteAllText(JsonFile, JsonConvert.SerializeObject(inMemoryState, Formatting.Indented));
@@ -111,6 +113,9 @@ namespace LibationFileManager
 					throw;
 				}
 			}
+
+            if (invokeUpdatedEvent)
+                Updated?.Invoke(null, null);
         }
     }
 }

LibationFileManager/SqliteStorage.cs

@@ -6,6 +6,6 @@ namespace LibationFileManager
 	{
 		// not customizable. don't move to config
 		private static string databasePath => Path.Combine(Configuration.Instance.LibationFiles, "LibationContext.db");
-		public static string ConnectionString => $"Data Source={databasePath};Foreign Keys=False;";
+		public static string ConnectionString => $"Data Source={databasePath};Foreign Keys=False;Pooling=False;";
 	}
 }

LibationFileManager/TagsPersistence.cs

@@ -54,11 +54,17 @@ namespace LibationFileManager
 
 		private static void ensureCache()
 		{
-			if (cache is null)
-				lock (locker)
-					cache = !File.Exists(TagsFile)
-						? new Dictionary<string, string>()
-						: JsonConvert.DeserializeObject<Dictionary<string, string>>(File.ReadAllText(TagsFile));
+			if (cache is not null)
+				return;
+
+			lock (locker)
+			{
+				if (File.Exists(TagsFile))
+					cache = JsonConvert.DeserializeObject<Dictionary<string, string>>(File.ReadAllText(TagsFile));
+
+				// if file doesn't exist. or if file is corrupt and deserialize returns null
+				cache ??= new Dictionary<string, string>();
+			}
 		}
 	}
 }

LibationFileManager/TemplateTags.cs

@@ -18,6 +18,12 @@ namespace LibationFileManager
             IsChapterOnly = isChapterOnly;
         }
 
+        // putting these first is the incredibly lazy way to make them show up first in the EditTemplateDialog
+        public static TemplateTags ChCount { get; } = new TemplateTags("ch count", "Number of chapters", true);
+        public static TemplateTags ChTitle { get; } = new TemplateTags("ch title", "Chapter title", true);
+        public static TemplateTags ChNumber { get; } = new TemplateTags("ch#", "Chapter #", true);
+        public static TemplateTags ChNumber0 { get; } = new TemplateTags("ch# 0", "Chapter # with leading zeros", true);
+
         public static TemplateTags 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");
@@ -28,10 +34,11 @@ namespace LibationFileManager
         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 Account { get; } = new TemplateTags("account", "Audible account of this book");
+        public static TemplateTags Locale { get; } = new TemplateTags("locale", "Region/country");
 
-        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);
+        // Special case. Isn't mapped to a replacement in Templates.cs
+        // Included here for display by EditTemplateDialog
+        public static TemplateTags IfSeries { get; } = new TemplateTags("if series->...<-if series", "Only include if part of a series");
     }
 }

LibationFileManager/Templates.cs

@@ -1,96 +1,284 @@
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Linq;
+using System.Text.RegularExpressions;
+using Dinah.Core;
+using FileManager;
 
 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();
+        protected static string[] Valid => Array.Empty<string>();
+        public const string ERROR_NULL_IS_INVALID = "Null template is invalid.";
+        public const string ERROR_FULL_PATH_IS_INVALID = @"No colons or full paths allowed. Eg: should not start with C:\";
+        public const string ERROR_INVALID_FILE_NAME_CHAR = @"Only file name friendly characters allowed. Eg: no colons or slashes";
+
+        public const string WARNING_EMPTY = "Template is empty.";
+        public const string WARNING_WHITE_SPACE = "Template is white space.";
+        public const string WARNING_NO_TAGS = "Should use tags. Eg: <title>";
+        public const string WARNING_HAS_CHAPTER_TAGS = "Chapter tags should only be used in the template used for naming files which are split by chapter. Eg: <ch title>";
+        public const string WARNING_NO_CHAPTER_NUMBER_TAG = "Should include chapter number tag in template used for naming files which are split by chapter. Ie: <ch#> or <ch# 0>";
+
+        public static FolderTemplate Folder { get; } = new FolderTemplate();
+        public static FileTemplate File { get; } = new FileTemplate();
+        public static ChapterFileTemplate ChapterFile { get; } = new ChapterFileTemplate();
 
         public abstract string Name { get; }
         public abstract string Description { get; }
         public abstract string DefaultTemplate { get; }
+        protected abstract bool IsChapterized { get; }
 
-        public abstract bool IsValid(string template);
-        public abstract bool IsRecommended(string template);
-        public abstract int TagCount(string template);
+        protected Templates() { }
 
-        public static bool ContainsChapterOnlyTags(string template)
-            => TemplateTags.GetAll()
-            .Where(t => t.IsChapterOnly)
-            .Any(t => ContainsTag(template, t.TagName));
+		#region validation
+		internal string GetValid(string configValue)
+        {
+            var value = configValue?.Trim();
+            return IsValid(value) ? value : DefaultTemplate;
+        }
 
-        public static bool ContainsTag(string template, string tag) => template.Contains($"<{tag}>");
+        public abstract IEnumerable<string> GetErrors(string template);
+        public bool IsValid(string template) => !GetErrors(template).Any();
 
-        protected static bool fileIsValid(string template)
+        public abstract IEnumerable<string> GetWarnings(string template);
+        public bool HasWarnings(string template) => GetWarnings(template).Any();
+
+        protected static string[] GetFileErrors(string template)
+        {
             // File name only; not path. all other path chars are valid enough to pass this check and will be handled on final save.
+
             // null is invalid. whitespace is valid but not recommended
-            => template is not null
-            && !template.Contains(':')
-            && !template.Contains(System.IO.Path.DirectorySeparatorChar)
-            && !template.Contains(System.IO.Path.AltDirectorySeparatorChar);
+            if (template is null)
+                return new[] { ERROR_NULL_IS_INVALID };
 
-        protected bool isRecommended(string template, bool isChapter)
-            => IsValid(template)
-            && !string.IsNullOrWhiteSpace(template)
-            && TagCount(template) > 0
-            && ContainsChapterOnlyTags(template) == isChapter;
+            if (template.Contains(':')
+                || template.Contains(Path.DirectorySeparatorChar)
+                || template.Contains(Path.AltDirectorySeparatorChar)
+                )
+                return new[] { ERROR_INVALID_FILE_NAME_CHAR };
 
-        protected static int tagCount(string template, Func<TemplateTags, bool> func)
-            => TemplateTags.GetAll()
-            .Where(func)
+            return Valid;
+        }
+
+        protected IEnumerable<string> GetStandardWarnings(string template)
+        {
+            var warnings = GetErrors(template).ToList();
+            if (template is null)
+                return warnings;
+
+            if (string.IsNullOrEmpty(template))
+                warnings.Add(WARNING_EMPTY);
+            else if (string.IsNullOrWhiteSpace(template))
+                warnings.Add(WARNING_WHITE_SPACE);
+
+            if (TagCount(template) == 0)
+                warnings.Add(WARNING_NO_TAGS);
+
+            if (!IsChapterized && ContainsChapterOnlyTags(template))
+                warnings.Add(WARNING_HAS_CHAPTER_TAGS);
+
+            return warnings;
+        }
+
+        internal int TagCount(string template)
+            => GetTemplateTags()
             // for <id><id> == 1, use:
             //   .Count(t => template.Contains($"<{t.TagName}>"))
             // .Sum() impl: <id><id> == 2
             .Sum(t => template.Split($"<{t.TagName}>").Length - 1);
 
-        private class FolderTemplate : Templates
+        internal static bool ContainsChapterOnlyTags(string template)
+            => TemplateTags.GetAll()
+            .Where(t => t.IsChapterOnly)
+            .Any(t => ContainsTag(template, t.TagName));
+
+        internal static bool ContainsTag(string template, string tag) => template.Contains($"<{tag}>");
+        #endregion
+
+        #region to file name
+        /// <summary>
+        /// EditTemplateDialog: Get template generated filename for portion of path
+        /// </summary>
+        public string GetPortionFilename(LibraryBookDto libraryBookDto, string template)
+            => string.IsNullOrWhiteSpace(template)
+            ? ""
+            : getFileNamingTemplate(libraryBookDto, template, null, null)
+            .GetFilePath();
+
+        private static Regex ifSeriesRegex { get; } = new Regex("<if series->(.*?)<-if series>", RegexOptions.Compiled | RegexOptions.IgnoreCase);
+
+        internal static FileNamingTemplate getFileNamingTemplate(LibraryBookDto libraryBookDto, string template, string dirFullPath, string extension)
+        {
+            ArgumentValidator.EnsureNotNullOrWhiteSpace(template, nameof(template));
+            ArgumentValidator.EnsureNotNull(libraryBookDto, nameof(libraryBookDto));
+
+            dirFullPath = dirFullPath?.Trim() ?? "";
+
+            // for non-series, remove <if series-> and <-if series> tags and everything in between
+            // for series, remove <if series-> and <-if series> tags, what's in between will remain
+            template = ifSeriesRegex.Replace(
+                template,
+                string.IsNullOrWhiteSpace(libraryBookDto.SeriesName) ? "" : "$1");
+
+            var t = template + FileUtility.GetStandardizedExtension(extension);
+            var fullfilename = dirFullPath == "" ? t : Path.Combine(dirFullPath, t);
+
+            var fileNamingTemplate = new FileNamingTemplate(fullfilename) { IllegalCharacterReplacements = "_" };
+
+            var title = libraryBookDto.Title ?? "";
+            var titleShort = title.IndexOf(':') < 1 ? title : title.Substring(0, title.IndexOf(':'));
+
+            fileNamingTemplate.AddParameterReplacement(TemplateTags.Id, libraryBookDto.AudibleProductId);
+            fileNamingTemplate.AddParameterReplacement(TemplateTags.Title, title);
+            fileNamingTemplate.AddParameterReplacement(TemplateTags.TitleShort, titleShort);
+            fileNamingTemplate.AddParameterReplacement(TemplateTags.Author, libraryBookDto.AuthorNames);
+            fileNamingTemplate.AddParameterReplacement(TemplateTags.FirstAuthor, libraryBookDto.FirstAuthor);
+            fileNamingTemplate.AddParameterReplacement(TemplateTags.Narrator, libraryBookDto.NarratorNames);
+            fileNamingTemplate.AddParameterReplacement(TemplateTags.FirstNarrator, libraryBookDto.FirstNarrator);
+            fileNamingTemplate.AddParameterReplacement(TemplateTags.Series, libraryBookDto.SeriesName);
+            fileNamingTemplate.AddParameterReplacement(TemplateTags.SeriesNumber, libraryBookDto.SeriesNumber);
+            fileNamingTemplate.AddParameterReplacement(TemplateTags.Account, libraryBookDto.Account);
+            fileNamingTemplate.AddParameterReplacement(TemplateTags.Locale, libraryBookDto.Locale);
+
+            return fileNamingTemplate;
+        }
+        #endregion
+
+        public IEnumerable<TemplateTags> GetTemplateTags()
+            => TemplateTags.GetAll()
+            // yeah, this line is a little funky but it works when you think through it. also: trust the unit tests
+            .Where(t => IsChapterized || !t.IsChapterOnly);
+
+        public string Sanitize(string template)
+        {
+            var value = template ?? "";
+
+            // don't use alt slash
+            value = value.Replace(Path.AltDirectorySeparatorChar, Path.DirectorySeparatorChar);
+
+            // don't allow double slashes
+            var sing = $"{Path.DirectorySeparatorChar}";
+            var dbl = $"{Path.DirectorySeparatorChar}{Path.DirectorySeparatorChar}";
+            while (value.Contains(dbl))
+                value = value.Replace(dbl, sing);
+
+            // trim. don't start or end with slash
+            while (true)
+            {
+                var start = value.Length;
+                value = value
+                    .Trim()
+                    .Trim(Path.DirectorySeparatorChar);
+                var end = value.Length;
+                if (start == end)
+                    break;
+            }
+
+            return value;
+        }
+
+        public class FolderTemplate : Templates
         {
 			public override string Name => "Folder Template";
             public override string Description => Configuration.GetDescription(nameof(Configuration.FolderTemplate));
 			public override string DefaultTemplate { get; } = "<title short> [<id>]";
+            protected override bool IsChapterized { get; } = false;
 
-			public 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.
+            internal FolderTemplate() : base() { }
+
+            #region validation
+            public override IEnumerable<string> GetErrors(string template)
+            {
                 // null is invalid. whitespace is valid but not recommended
-                => template is not null
-                && !template.Contains(':');
+                if (template is null)
+                    return new[] { ERROR_NULL_IS_INVALID };
 
-            public override bool IsRecommended(string template) => isRecommended(template, false);
+                // must be relative. no colons. all other path chars are valid enough to pass this check and will be handled on final save.
+                if (template.Contains(':'))
+                    return new[] { ERROR_FULL_PATH_IS_INVALID };
 
-            public override int TagCount(string template) => tagCount(template, t => !t.IsChapterOnly);
+                return Valid;
+            }
+            
+            public override IEnumerable<string> GetWarnings(string template) => GetStandardWarnings(template);
+            #endregion
+
+            #region to file name
+            /// <summary>USES LIVE CONFIGURATION VALUES</summary>
+            public string GetFilename(LibraryBookDto libraryBookDto)
+                => getFileNamingTemplate(libraryBookDto, Configuration.Instance.FolderTemplate, AudibleFileStorage.BooksDirectory, null)
+                .GetFilePath();
+            #endregion
         }
 
-        private class FileTemplate : Templates
+        public class FileTemplate : Templates
         {
             public override string Name => "File Template";
             public override string Description => Configuration.GetDescription(nameof(Configuration.FileTemplate));
             public override string DefaultTemplate { get; } = "<title> [<id>]";
+            protected override bool IsChapterized { get; } = false;
 
-            public override bool IsValid(string template) => fileIsValid(template);
+            internal FileTemplate() : base() { }
 
-            public override bool IsRecommended(string template) => isRecommended(template, false);
+            #region validation
+            public override IEnumerable<string> GetErrors(string template) => GetFileErrors(template);
 
-            public override int TagCount(string template) => tagCount(template, t => !t.IsChapterOnly);
+            public override IEnumerable<string> GetWarnings(string template) => GetStandardWarnings(template);
+            #endregion
+
+            #region to file name
+            /// <summary>USES LIVE CONFIGURATION VALUES</summary>
+            public string GetFilename(LibraryBookDto libraryBookDto, string dirFullPath, string extension, bool returnFirstExisting = false)
+                => getFileNamingTemplate(libraryBookDto, Configuration.Instance.FileTemplate, dirFullPath, extension)
+                .GetFilePath(returnFirstExisting);
+            #endregion
         }
 
-        private class ChapterFileTemplate : Templates
+        public class ChapterFileTemplate : Templates
         {
             public override string Name => "Chapter File Template";
             public override string Description => Configuration.GetDescription(nameof(Configuration.ChapterFileTemplate));
             public override string DefaultTemplate { get; } = "<title> [<id>] - <ch# 0> - <ch title>";
+            protected override bool IsChapterized { get; } = true;
 
-            public override bool IsValid(string template) => fileIsValid(template);
+            internal ChapterFileTemplate() : base() { }
+
+            #region validation
+            public override IEnumerable<string> GetErrors(string template) => GetFileErrors(template);
+
+            public override IEnumerable<string> GetWarnings(string template)
+            {
+                var warnings = GetStandardWarnings(template).ToList();
+                if (template is null)
+                    return warnings;
 
-            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));
+                if (!ContainsTag(template, TemplateTags.ChNumber.TagName) && !ContainsTag(template, TemplateTags.ChNumber0.TagName))
+                    warnings.Add(WARNING_NO_CHAPTER_NUMBER_TAG);
 
-            public override int TagCount(string template) => tagCount(template, t => true);
+                return warnings;
+            }
+            #endregion
+
+            #region to file name
+            /// <summary>USES LIVE CONFIGURATION VALUES</summary>
+            public string GetFilename(LibraryBookDto libraryBookDto, AaxDecrypter.MultiConvertFileProperties props)
+                => GetPortionFilename(libraryBookDto, Configuration.Instance.ChapterFileTemplate, props, AudibleFileStorage.DecryptInProgressDirectory);
+
+            public string GetPortionFilename(LibraryBookDto libraryBookDto, string template, AaxDecrypter.MultiConvertFileProperties props, string fullDirPath)
+            {
+                var fileNamingTemplate = getFileNamingTemplate(libraryBookDto, template, fullDirPath, Path.GetExtension(props.OutputFileName));
+
+                fileNamingTemplate.AddParameterReplacement(TemplateTags.ChCount, props.PartsTotal);
+                fileNamingTemplate.AddParameterReplacement(TemplateTags.ChNumber, props.PartsPosition);
+                fileNamingTemplate.AddParameterReplacement(TemplateTags.ChNumber0, FileUtility.GetSequenceFormatted(props.PartsPosition, props.PartsTotal));
+                fileNamingTemplate.AddParameterReplacement(TemplateTags.ChTitle, props.Title ?? "");
+
+                return fileNamingTemplate.GetFilePath();
+            }
+            #endregion
         }
     }
 }

LibationFileManager/UtilityExtensions.cs

@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using FileManager;
+
+namespace LibationFileManager
+{
+	public static class UtilityExtensions
+	{
+		public static void AddParameterReplacement(this FileNamingTemplate fileNamingTemplate, TemplateTags templateTags, object value)
+			=> fileNamingTemplate.AddParameterReplacement(templateTags.TagName, value);
+	}
+}

LibationSearchEngine/LibationSearchEngine.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0-windows</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

LibationSearchEngine/LuceneExtensions.cs

@@ -16,7 +16,7 @@ namespace LibationSearchEngine
 
         internal static void AddAnalyzed(this Document document, string name, string value)
         {
-            if (value != null)
+            if (value is not null)
                 document.Add(new Field(name.ToLowerInvariant(), value, Field.Store.YES, Field.Index.ANALYZED));
         }
 

LibationSearchEngine/SearchEngine.cs

@@ -70,11 +70,11 @@ namespace LibationSearchEngine
                             .Select(s => s.Series.AudibleSeriesId)),
                     ["SeriesId"] = lb => string.Join(", ", lb.Book.SeriesLink.Select(s => s.Series.AudibleSeriesId)),
 
-                    [nameof(Book.CategoriesNames)] = lb => lb.Book.CategoriesIds == null ? null : string.Join(", ", lb.Book.CategoriesIds),
-                    [nameof(Book.Category)] = lb => lb.Book.CategoriesIds == null ? null : string.Join(", ", lb.Book.CategoriesIds),
-                    ["Categories"] = lb => lb.Book.CategoriesIds == null ? null : string.Join(", ", lb.Book.CategoriesIds),
-                    ["CategoriesId"] = lb => lb.Book.CategoriesIds == null ? null : string.Join(", ", lb.Book.CategoriesIds),
-                    ["CategoryId"] = lb => lb.Book.CategoriesIds == null ? null : string.Join(", ", lb.Book.CategoriesIds),
+                    [nameof(Book.CategoriesNames)] = lb => lb.Book.CategoriesIds is null ? null : string.Join(", ", lb.Book.CategoriesIds),
+                    [nameof(Book.Category)] = lb => lb.Book.CategoriesIds is null ? null : string.Join(", ", lb.Book.CategoriesIds),
+                    ["Categories"] = lb => lb.Book.CategoriesIds is null ? null : string.Join(", ", lb.Book.CategoriesIds),
+                    ["CategoriesId"] = lb => lb.Book.CategoriesIds is null ? null : string.Join(", ", lb.Book.CategoriesIds),
+                    ["CategoryId"] = lb => lb.Book.CategoriesIds is null ? null : string.Join(", ", lb.Book.CategoriesIds),
 
                     [TAGS.FirstCharToUpper()] = lb => lb.Book.UserDefinedItem.Tags,
 
@@ -314,7 +314,7 @@ namespace LibationSearchEngine
             var query = new TermQuery(productTerm);
             var docs = searcher.Search(query, 1);
             var scoreDoc = docs.ScoreDocs.SingleOrDefault();
-            if (scoreDoc == null)
+            if (scoreDoc is null)
                 return;
             var document = searcher.Doc(scoreDoc.Doc);
 

LibationWinForms/BookLiberation/AudioDecodeForm.cs

@@ -14,11 +14,6 @@ namespace LibationWinForms.BookLiberation
 
 		private Func<byte[]> GetCoverArtDelegate;
 
-		// book info
-		private string title;
-		private string authorNames;
-		private string narratorNames;
-
 		#region Processable event handler overrides
 		public override void Processable_Begin(object sender, LibraryBook libraryBook)
 		{
@@ -31,8 +26,8 @@ namespace LibationWinForms.BookLiberation
 
 			//Set default values from library
 			AudioDecodable_TitleDiscovered(sender, libraryBook.Book.Title);
-			AudioDecodable_AuthorsDiscovered(sender, string.Join(", ", libraryBook.Book.Authors));
-			AudioDecodable_NarratorsDiscovered(sender, string.Join(", ", libraryBook.Book.NarratorNames));
+			AudioDecodable_AuthorsDiscovered(sender, libraryBook.Book.AuthorNames);
+			AudioDecodable_NarratorsDiscovered(sender, libraryBook.Book.NarratorNames);
 			AudioDecodable_CoverImageDiscovered(sender,
 					PictureStorage.GetPicture(
 						new PictureDefinition(
@@ -60,14 +55,23 @@ namespace LibationWinForms.BookLiberation
 			updateRemainingTime((int)timeRemaining.TotalSeconds);
 		}
 
+		private void updateRemainingTime(int remaining)
+			=> 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";
+		}
 		#endregion
 
 		#region AudioDecodable event handlers
-		public override void AudioDecodable_RequestCoverArt(object sender, Action<byte[]> setCoverArtDelegate)
-		{
-			base.AudioDecodable_RequestCoverArt(sender, setCoverArtDelegate);
-			setCoverArtDelegate(GetCoverArtDelegate?.Invoke());
-		}
+		private string title;
+		private string authorNames;
+		private string narratorNames;
 
 		public override void AudioDecodable_TitleDiscovered(object sender, string title)
 		{
@@ -91,27 +95,20 @@ namespace LibationWinForms.BookLiberation
 			updateBookInfo();
 		}
 
+		private void updateBookInfo()
+			=> bookInfoLbl.UIThreadAsync(() => bookInfoLbl.Text = $"{title}\r\nBy {authorNames}\r\nNarrated by {narratorNames}");
+
+		public override void AudioDecodable_RequestCoverArt(object sender, Action<byte[]> setCoverArtDelegate)
+		{
+			base.AudioDecodable_RequestCoverArt(sender, setCoverArtDelegate);
+			setCoverArtDelegate(GetCoverArtDelegate?.Invoke());
+		}
+
 		public override void AudioDecodable_CoverImageDiscovered(object sender, byte[] coverArt)
 		{
 			base.AudioDecodable_CoverImageDiscovered(sender, coverArt);
 			pictureBox1.UIThreadAsync(() => pictureBox1.Image = Dinah.Core.Drawing.ImageReader.ToImage(coverArt));
 		}
 		#endregion
-
-		// thread-safe UI updates
-		private void updateBookInfo()
-			=> bookInfoLbl.UIThreadAsync(() => bookInfoLbl.Text = $"{title}\r\nBy {authorNames}\r\nNarrated by {narratorNames}");
-
-		private void updateRemainingTime(int remaining)
-			=> 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/BaseForms/LiberationBaseForm.cs

@@ -152,11 +152,12 @@ namespace LibationWinForms.BookLiberation.BaseForms
 		#endregion
 
 		#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) { }
+		public virtual void AudioDecodable_RequestCoverArt(object sender, Action<byte[]> setCoverArtDelegate) { }
 		#endregion
 	}
 }

LibationWinForms/Dialogs/AccountsDialog.cs

@@ -112,6 +112,9 @@ namespace LibationWinForms.Dialogs
 		{
 			try
 			{
+				if (!inputIsValid())
+					return;
+
 				// without transaction, accounts persister will write ANY EDIT immediately to file
 				using var persister = AudibleApiStorage.GetAccountsSettingsPersister();
 
@@ -129,6 +132,28 @@ namespace LibationWinForms.Dialogs
 			}
 		}
 
+		private bool inputIsValid()
+		{
+			var dtos = getRowDtos();
+
+			foreach (var dto in dtos)
+			{
+				if (string.IsNullOrWhiteSpace(dto.AccountId))
+				{
+					MessageBox.Show("Account id cannot be blank. Please enter an account id for all accounts.", "Blank account", MessageBoxButtons.OK, MessageBoxIcon.Error);
+					return false;
+				}
+
+				if (string.IsNullOrWhiteSpace(dto.LocaleName))
+				{
+					MessageBox.Show("Please select a locale (i.e.: country or region) for all accounts.", "Blank region", MessageBoxButtons.OK, MessageBoxIcon.Error);
+					return false;
+				}
+			}
+
+			return true;
+		}
+
 		private void persist(AccountsSettings accountsSettings)
 		{
 			var existingAccounts = accountsSettings.Accounts;
@@ -152,11 +177,6 @@ namespace LibationWinForms.Dialogs
 			// upsert each. validation occurs through Account and AccountsSettings
 			foreach (var dto in dtos)
 			{
-				if (string.IsNullOrWhiteSpace(dto.AccountId))
-					throw new Exception("Please enter an account id for all accounts");
-				if (string.IsNullOrWhiteSpace(dto.LocaleName))
-					throw new Exception("Please select a locale (i.e.: country or region) for all accounts");
-
 				var acct = accountsSettings.Upsert(dto.AccountId, dto.LocaleName);
 				acct.LibraryScan = dto.LibraryScan;
 				acct.AccountName

LibationWinForms/Dialogs/EditQuickFilters.cs

@@ -53,7 +53,6 @@ namespace LibationWinForms.Dialogs
 				.ToList();
 			QuickFilters.ReplaceAll(list);
 
-			_parent.UpdateFilterDropDown();
 			this.DialogResult = DialogResult.OK;
 			this.Close();
 		}

LibationWinForms/Dialogs/EditTemplateDialog.Designer.cs

@@ -33,13 +33,18 @@
 			this.templateTb = new System.Windows.Forms.TextBox();
 			this.templateLbl = new System.Windows.Forms.Label();
 			this.resetToDefaultBtn = new System.Windows.Forms.Button();
-			this.outputTb = new System.Windows.Forms.TextBox();
+			this.listView1 = new System.Windows.Forms.ListView();
+			this.columnHeader1 = new System.Windows.Forms.ColumnHeader();
+			this.columnHeader2 = new System.Windows.Forms.ColumnHeader();
+			this.richTextBox1 = new System.Windows.Forms.RichTextBox();
+			this.warningsLbl = new System.Windows.Forms.Label();
+			this.exampleLbl = new System.Windows.Forms.Label();
 			this.SuspendLayout();
 			// 
 			// saveBtn
 			// 
 			this.saveBtn.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-			this.saveBtn.Location = new System.Drawing.Point(714, 496);
+			this.saveBtn.Location = new System.Drawing.Point(714, 345);
 			this.saveBtn.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
 			this.saveBtn.Name = "saveBtn";
 			this.saveBtn.Size = new System.Drawing.Size(88, 27);
@@ -52,7 +57,7 @@
 			// 
 			this.cancelBtn.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
 			this.cancelBtn.DialogResult = System.Windows.Forms.DialogResult.Cancel;
-			this.cancelBtn.Location = new System.Drawing.Point(832, 496);
+			this.cancelBtn.Location = new System.Drawing.Point(832, 345);
 			this.cancelBtn.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
 			this.cancelBtn.Name = "cancelBtn";
 			this.cancelBtn.Size = new System.Drawing.Size(88, 27);
@@ -91,14 +96,63 @@
 			this.resetToDefaultBtn.UseVisualStyleBackColor = true;
 			this.resetToDefaultBtn.Click += new System.EventHandler(this.resetToDefaultBtn_Click);
 			// 
-			// outputTb
+			// listView1
 			// 
-			this.outputTb.Location = new System.Drawing.Point(12, 153);
-			this.outputTb.Multiline = true;
-			this.outputTb.Name = "outputTb";
-			this.outputTb.ReadOnly = true;
-			this.outputTb.Size = new System.Drawing.Size(759, 205);
-			this.outputTb.TabIndex = 100;
+			this.listView1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            | System.Windows.Forms.AnchorStyles.Left)));
+			this.listView1.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
+            this.columnHeader1,
+            this.columnHeader2});
+			this.listView1.HideSelection = false;
+			this.listView1.Location = new System.Drawing.Point(12, 56);
+			this.listView1.Name = "listView1";
+			this.listView1.Size = new System.Drawing.Size(328, 283);
+			this.listView1.TabIndex = 3;
+			this.listView1.UseCompatibleStateImageBehavior = false;
+			this.listView1.View = System.Windows.Forms.View.Details;
+			// 
+			// columnHeader1
+			// 
+			this.columnHeader1.Text = "Tag";
+			this.columnHeader1.Width = 137;
+			// 
+			// columnHeader2
+			// 
+			this.columnHeader2.Text = "Description";
+			this.columnHeader2.Width = 170;
+			// 
+			// richTextBox1
+			// 
+			this.richTextBox1.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.richTextBox1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+			this.richTextBox1.Location = new System.Drawing.Point(346, 74);
+			this.richTextBox1.Name = "richTextBox1";
+			this.richTextBox1.ReadOnly = true;
+			this.richTextBox1.Size = new System.Drawing.Size(574, 185);
+			this.richTextBox1.TabIndex = 5;
+			this.richTextBox1.Text = "";
+			// 
+			// warningsLbl
+			// 
+			this.warningsLbl.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+			this.warningsLbl.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point);
+			this.warningsLbl.ForeColor = System.Drawing.Color.Firebrick;
+			this.warningsLbl.Location = new System.Drawing.Point(346, 262);
+			this.warningsLbl.Name = "warningsLbl";
+			this.warningsLbl.Size = new System.Drawing.Size(574, 77);
+			this.warningsLbl.TabIndex = 6;
+			this.warningsLbl.Text = "[warnings]";
+			// 
+			// exampleLbl
+			// 
+			this.exampleLbl.AutoSize = true;
+			this.exampleLbl.Location = new System.Drawing.Point(346, 56);
+			this.exampleLbl.Name = "exampleLbl";
+			this.exampleLbl.Size = new System.Drawing.Size(55, 15);
+			this.exampleLbl.TabIndex = 4;
+			this.exampleLbl.Text = "Example:";
 			// 
 			// EditTemplateDialog
 			// 
@@ -106,8 +160,11 @@
 			this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
 			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
 			this.CancelButton = this.cancelBtn;
-			this.ClientSize = new System.Drawing.Size(933, 539);
-			this.Controls.Add(this.outputTb);
+			this.ClientSize = new System.Drawing.Size(933, 388);
+			this.Controls.Add(this.exampleLbl);
+			this.Controls.Add(this.warningsLbl);
+			this.Controls.Add(this.richTextBox1);
+			this.Controls.Add(this.listView1);
 			this.Controls.Add(this.resetToDefaultBtn);
 			this.Controls.Add(this.templateLbl);
 			this.Controls.Add(this.templateTb);
@@ -130,6 +187,11 @@
 		private System.Windows.Forms.TextBox templateTb;
 		private System.Windows.Forms.Label templateLbl;
 		private System.Windows.Forms.Button resetToDefaultBtn;
-		private System.Windows.Forms.TextBox outputTb;
+		private System.Windows.Forms.ListView listView1;
+		private System.Windows.Forms.ColumnHeader columnHeader1;
+		private System.Windows.Forms.ColumnHeader columnHeader2;
+		private System.Windows.Forms.RichTextBox richTextBox1;
+		private System.Windows.Forms.Label warningsLbl;
+		private System.Windows.Forms.Label exampleLbl;
 	}
 }

LibationWinForms/Dialogs/EditTemplateDialog.cs

@@ -10,8 +10,19 @@ namespace LibationWinForms.Dialogs
 {
 	public partial class EditTemplateDialog : Form
 	{
+		// final value. post-validity check
 		public string TemplateText { get; private set; }
 
+		// hold the work-in-progress value. not guaranteed to be valid
+		private string _workingTemplateText;
+		private string workingTemplateText
+		{
+			get => _workingTemplateText;
+			set => _workingTemplateText = template.Sanitize(value);
+		}
+
+		private void resetTextBox(string value) => this.templateTb.Text = workingTemplateText = value;
+
 		private Configuration config { get; } = Configuration.Instance;
 
 		private Templates template { get; }
@@ -35,49 +46,119 @@ namespace LibationWinForms.Dialogs
 				return;
 			}
 
+			warningsLbl.Text = "";
+
 			this.Text = $"Edit {template.Name}";
 
 			this.templateLbl.Text = template.Description;
-			this.templateTb.Text = inputTemplateText;
+			resetTextBox(inputTemplateText);
+
+			// populate list view
+			foreach (var tag in template.GetTemplateTags())
+				listView1.Items.Add(new ListViewItem(new[] { $"<{tag.TagName}>", tag.Description }));
 		}
 
-		private void resetToDefaultBtn_Click(object sender, EventArgs e) => templateTb.Text = template.DefaultTemplate;
+		private void resetToDefaultBtn_Click(object sender, EventArgs e) => resetTextBox(template.DefaultTemplate);
 
 		private void templateTb_TextChanged(object sender, EventArgs e)
 		{
+			workingTemplateText = templateTb.Text;
+
+			var isFolder = template == Templates.Folder;
+
+			var libraryBookDto = new LibraryBookDto
+			{
+				Account = "my account",
+				AudibleProductId = "123456789",
+				Title = "A Study in Scarlet: A Sherlock Holmes Novel",
+				Locale = "us",
+				Authors = new List<string> { "Arthur Conan Doyle", "Stephen Fry - introductions" },
+				Narrators = new List<string> { "Stephen Fry" },
+				SeriesName = "Sherlock Holmes",
+				SeriesNumber = "1"
+			};
+			var chapterName = "A Flight for Life";
+			var chapterNumber = 4;
+			var chaptersTotal = 10;
+
 			var books = config.Books;
-			var folderTemplate = template == Templates.Folder ? templateTb.Text : config.FolderTemplate;
-			folderTemplate = folderTemplate.Trim().Trim(new[] { Path.DirectorySeparatorChar, Path.AltDirectorySeparatorChar }).Trim();
-			var fileTemplate = template == Templates.Folder ? config.FileTemplate : templateTb.Text;
-			fileTemplate = fileTemplate.Trim();
+			var folder = Templates.Folder.GetPortionFilename(
+				libraryBookDto,
+				isFolder ? workingTemplateText : config.FolderTemplate);
+			var file
+				= template == Templates.ChapterFile
+				? Templates.ChapterFile.GetPortionFilename(
+					libraryBookDto,
+					workingTemplateText,
+					new() { OutputFileName = "", PartsPosition = chapterNumber, PartsTotal = chaptersTotal, Title = chapterName },
+					"")
+				: Templates.File.GetPortionFilename(
+					libraryBookDto,
+					isFolder ? config.FileTemplate : workingTemplateText);
 			var ext = config.DecryptToLossy ? "mp3" : "m4b";
 
-			var path = Path.Combine(books, folderTemplate, $"{fileTemplate}.{ext}");
+			const char ZERO_WIDTH_SPACE = '\u200B';
+			var sing = $"{Path.DirectorySeparatorChar}";
 
-			// this logic should be external
-			path = path.Replace(Path.AltDirectorySeparatorChar, Path.DirectorySeparatorChar);
-			var dbl = $"{Path.DirectorySeparatorChar}{Path.DirectorySeparatorChar}";
-			while (path.Contains(dbl))
-				path = path.Replace(dbl, $"{Path.DirectorySeparatorChar}");
+			// result: can wrap long paths. eg:
+			// |-- LINE WRAP BOUNDARIES --|
+			// \books\author with a very     <= normal line break on space between words
+			// long name\narrator narrator   
+			// \title                        <= line break on the zero-with space we added before slashes
+			string slashWrap(string val) => val.Replace(sing, $"{ZERO_WIDTH_SPACE}{sing}");
 
-			outputTb.Text = @$"
-{books}
-{folderTemplate}
-{fileTemplate}
-{ext}
-{path}
-";
+			warningsLbl.Text
+				= !template.HasWarnings(workingTemplateText)
+				? ""
+				: "Warning:\r\n" +
+					template
+					.GetWarnings(workingTemplateText)
+					.Select(err => $"- {err}")
+					.Aggregate((a, b) => $"{a}\r\n{b}");
+
+			var bold = new System.Drawing.Font(richTextBox1.Font, System.Drawing.FontStyle.Bold);
+			var reg = new System.Drawing.Font(richTextBox1.Font, System.Drawing.FontStyle.Regular);
+
+			richTextBox1.Clear();
+			richTextBox1.SelectionFont = reg;
+
+			richTextBox1.AppendText(slashWrap(books));
+			richTextBox1.AppendText(sing);
+
+			if (isFolder)
+				richTextBox1.SelectionFont = bold;
+
+			richTextBox1.AppendText(slashWrap(folder));
+
+			if (isFolder)
+				richTextBox1.SelectionFont = reg;
+
+			richTextBox1.AppendText(sing);
+
+			if (!isFolder)
+				richTextBox1.SelectionFont = bold;
+
+			richTextBox1.AppendText(file);
+
+			if (!isFolder)
+				richTextBox1.SelectionFont = reg;
+
+			richTextBox1.AppendText($".{ext}");
 		}
 
 		private void saveBtn_Click(object sender, EventArgs e)
 		{
-			if (!template.IsValid(templateTb.Text))
+			if (!template.IsValid(workingTemplateText))
 			{
-				MessageBox.Show("This template text is not valid.", "Invalid", MessageBoxButtons.OK, MessageBoxIcon.Error);
+				var errors = template
+					.GetErrors(workingTemplateText)
+					.Select(err => $"- {err}")
+					.Aggregate((a, b) => $"{a}\r\n{b}");
+				MessageBox.Show($"This template text is not valid. Errors:\r\n{errors}", "Invalid", MessageBoxButtons.OK, MessageBoxIcon.Error);
 				return;
 			}
 
-			TemplateText = templateTb.Text;
+			TemplateText = workingTemplateText;
 
 			this.DialogResult = DialogResult.OK;
 			this.Close();

LibationWinForms/Dialogs/IndexLibraryDialog.Designer.cs

@@ -1,65 +0,0 @@
-namespace LibationWinForms.Dialogs
-{
-	partial class IndexLibraryDialog
-	{
-		/// <summary>
-		/// Required designer variable.
-		/// </summary>
-		private System.ComponentModel.IContainer components = null;
-
-		/// <summary>
-		/// Clean up any resources being used.
-		/// </summary>
-		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-		protected override void Dispose(bool disposing)
-		{
-			if (disposing && (components != null))
-			{
-				components.Dispose();
-			}
-			base.Dispose(disposing);
-		}
-
-		#region Windows Form Designer generated code
-
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent()
-		{
-			this.label1 = new System.Windows.Forms.Label();
-			this.SuspendLayout();
-			// 
-			// label1
-			// 
-			this.label1.AutoSize = true;
-			this.label1.Location = new System.Drawing.Point(28, 24);
-			this.label1.Name = "label1";
-			this.label1.Size = new System.Drawing.Size(263, 13);
-			this.label1.TabIndex = 0;
-			this.label1.Text = "Scanning Audible library. This may take a few minutes";
-			// 
-			// IndexLibraryDialog
-			// 
-			this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-			this.ClientSize = new System.Drawing.Size(440, 63);
-			this.Controls.Add(this.label1);
-			this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
-			this.MaximizeBox = false;
-			this.MinimizeBox = false;
-			this.Name = "IndexLibraryDialog";
-			this.ShowIcon = false;
-			this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
-			this.Text = "Scan Library";
-			this.ResumeLayout(false);
-			this.PerformLayout();
-
-		}
-
-		#endregion
-
-		private System.Windows.Forms.Label label1;
-	}
-}

LibationWinForms/Dialogs/IndexLibraryDialog.cs

@@ -1,48 +0,0 @@
-using System;
-using System.Windows.Forms;
-using ApplicationServices;
-using AudibleUtilities;
-using LibationWinForms.Login;
-
-namespace LibationWinForms.Dialogs
-{
-	public partial class IndexLibraryDialog : Form
-	{
-		private Account[] _accounts { get; }
-
-		public int NewBooksAdded { get; private set; }
-		public int TotalBooksProcessed { get; private set; }
-
-		public IndexLibraryDialog(params Account[] accounts)
-		{
-			_accounts = accounts;
-			InitializeComponent();
-			this.Shown += IndexLibraryDialog_Shown;
-		}
-
-		private async void IndexLibraryDialog_Shown(object sender, EventArgs e)
-		{
-			if (_accounts != null && _accounts.Length > 0)
-			{
-				this.label1.Text
-					= (_accounts.Length == 1)
-					? "Scanning Audible library. This may take a few minutes."
-					: $"Scanning Audible library: {_accounts.Length} accounts. This may take a few minutes per account.";
-
-				try
-				{
-					(TotalBooksProcessed, NewBooksAdded) = await LibraryCommands.ImportAccountAsync((account) => ApiExtended.CreateAsync(account, new WinformLoginChoiceEager(account)), _accounts);
-				}
-				catch (Exception ex)
-				{
-					MessageBoxAlertAdmin.Show(
-						"Error importing library. Please try again. If this still happens after 2 or 3 tries, stop and contact administrator",
-						"Error importing library",
-						ex);
-				}
-			}
-
-			this.Close();
-		}
-	}
-}

LibationWinForms/Dialogs/IndexLibraryDialog.resx

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

LibationWinForms/Dialogs/Login/LoginExternalDialog.Designer.cs

@@ -28,140 +28,152 @@
 		/// </summary>
 		private void InitializeComponent()
 		{
-			System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(LoginExternalDialog));
-			this.submitBtn = new System.Windows.Forms.Button();
-			this.localeLbl = new System.Windows.Forms.Label();
-			this.usernameLbl = new System.Windows.Forms.Label();
-			this.loginUrlLbl = new System.Windows.Forms.Label();
-			this.loginUrlTb = new System.Windows.Forms.TextBox();
-			this.copyBtn = new System.Windows.Forms.Button();
-			this.launchBrowserBtn = new System.Windows.Forms.Button();
-			this.instructionsLbl = new System.Windows.Forms.Label();
-			this.responseUrlTb = new System.Windows.Forms.TextBox();
-			this.SuspendLayout();
-			// 
-			// submitBtn
-			// 
-			this.submitBtn.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-			this.submitBtn.Location = new System.Drawing.Point(665, 400);
-			this.submitBtn.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
-			this.submitBtn.Name = "submitBtn";
-			this.submitBtn.Size = new System.Drawing.Size(88, 27);
-			this.submitBtn.TabIndex = 8;
-			this.submitBtn.Text = "Submit";
-			this.submitBtn.UseVisualStyleBackColor = true;
-			this.submitBtn.Click += new System.EventHandler(this.submitBtn_Click);
-			// 
-			// localeLbl
-			// 
-			this.localeLbl.AutoSize = true;
-			this.localeLbl.Location = new System.Drawing.Point(14, 10);
-			this.localeLbl.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-			this.localeLbl.Name = "localeLbl";
-			this.localeLbl.Size = new System.Drawing.Size(61, 15);
-			this.localeLbl.TabIndex = 0;
-			this.localeLbl.Text = "Locale: {0}";
-			// 
-			// usernameLbl
-			// 
-			this.usernameLbl.AutoSize = true;
-			this.usernameLbl.Location = new System.Drawing.Point(14, 25);
-			this.usernameLbl.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-			this.usernameLbl.Name = "usernameLbl";
-			this.usernameLbl.Size = new System.Drawing.Size(80, 15);
-			this.usernameLbl.TabIndex = 1;
-			this.usernameLbl.Text = "Username: {0}";
-			// 
-			// loginUrlLbl
-			// 
-			this.loginUrlLbl.AutoSize = true;
-			this.loginUrlLbl.Location = new System.Drawing.Point(14, 61);
-			this.loginUrlLbl.Name = "loginUrlLbl";
-			this.loginUrlLbl.Size = new System.Drawing.Size(180, 15);
-			this.loginUrlLbl.TabIndex = 2;
-			this.loginUrlLbl.Text = "Paste this URL into your browser:";
-			// 
-			// loginUrlTb
-			// 
-			this.loginUrlTb.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(LoginExternalDialog));
+            this.submitBtn = new System.Windows.Forms.Button();
+            this.localeLbl = new System.Windows.Forms.Label();
+            this.usernameLbl = new System.Windows.Forms.Label();
+            this.loginUrlLbl = new System.Windows.Forms.Label();
+            this.loginUrlTb = new System.Windows.Forms.TextBox();
+            this.copyBtn = new System.Windows.Forms.Button();
+            this.launchBrowserBtn = new System.Windows.Forms.Button();
+            this.instructionsLbl = new System.Windows.Forms.Label();
+            this.responseUrlTb = new System.Windows.Forms.TextBox();
+            this.tldrLbl = new System.Windows.Forms.Label();
+            this.SuspendLayout();
+            // 
+            // submitBtn
+            // 
+            this.submitBtn.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this.submitBtn.Location = new System.Drawing.Point(665, 458);
+            this.submitBtn.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
+            this.submitBtn.Name = "submitBtn";
+            this.submitBtn.Size = new System.Drawing.Size(88, 27);
+            this.submitBtn.TabIndex = 8;
+            this.submitBtn.Text = "Submit";
+            this.submitBtn.UseVisualStyleBackColor = true;
+            this.submitBtn.Click += new System.EventHandler(this.submitBtn_Click);
+            // 
+            // localeLbl
+            // 
+            this.localeLbl.AutoSize = true;
+            this.localeLbl.Location = new System.Drawing.Point(14, 10);
+            this.localeLbl.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.localeLbl.Name = "localeLbl";
+            this.localeLbl.Size = new System.Drawing.Size(61, 15);
+            this.localeLbl.TabIndex = 0;
+            this.localeLbl.Text = "Locale: {0}";
+            // 
+            // usernameLbl
+            // 
+            this.usernameLbl.AutoSize = true;
+            this.usernameLbl.Location = new System.Drawing.Point(14, 25);
+            this.usernameLbl.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.usernameLbl.Name = "usernameLbl";
+            this.usernameLbl.Size = new System.Drawing.Size(80, 15);
+            this.usernameLbl.TabIndex = 1;
+            this.usernameLbl.Text = "Username: {0}";
+            // 
+            // loginUrlLbl
+            // 
+            this.loginUrlLbl.AutoSize = true;
+            this.loginUrlLbl.Location = new System.Drawing.Point(14, 61);
+            this.loginUrlLbl.Name = "loginUrlLbl";
+            this.loginUrlLbl.Size = new System.Drawing.Size(180, 15);
+            this.loginUrlLbl.TabIndex = 2;
+            this.loginUrlLbl.Text = "Paste this URL into your browser:";
+            // 
+            // loginUrlTb
+            // 
+            this.loginUrlTb.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.loginUrlTb.Location = new System.Drawing.Point(14, 79);
-			this.loginUrlTb.Multiline = true;
-			this.loginUrlTb.Name = "loginUrlTb";
-			this.loginUrlTb.ReadOnly = true;
-			this.loginUrlTb.ScrollBars = System.Windows.Forms.ScrollBars.Both;
-			this.loginUrlTb.Size = new System.Drawing.Size(739, 92);
-			this.loginUrlTb.TabIndex = 3;
-			// 
-			// copyBtn
-			// 
-			this.copyBtn.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
-			this.copyBtn.Location = new System.Drawing.Point(14, 177);
-			this.copyBtn.Name = "copyBtn";
-			this.copyBtn.Size = new System.Drawing.Size(165, 23);
-			this.copyBtn.TabIndex = 4;
-			this.copyBtn.Text = "Copy URL to clipboard";
-			this.copyBtn.UseVisualStyleBackColor = true;
-			this.copyBtn.Click += new System.EventHandler(this.copyBtn_Click);
-			// 
-			// launchBrowserBtn
-			// 
-			this.launchBrowserBtn.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-			this.launchBrowserBtn.Location = new System.Drawing.Point(588, 177);
-			this.launchBrowserBtn.Name = "launchBrowserBtn";
-			this.launchBrowserBtn.Size = new System.Drawing.Size(165, 23);
-			this.launchBrowserBtn.TabIndex = 5;
-			this.launchBrowserBtn.Text = "Launch in browser";
-			this.launchBrowserBtn.UseVisualStyleBackColor = true;
-			this.launchBrowserBtn.Click += new System.EventHandler(this.launchBrowserBtn_Click);
-			// 
-			// instructionsLbl
-			// 
-			this.instructionsLbl.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
-			this.instructionsLbl.AutoSize = true;
-			this.instructionsLbl.Location = new System.Drawing.Point(14, 203);
-			this.instructionsLbl.Name = "instructionsLbl";
-			this.instructionsLbl.Size = new System.Drawing.Size(436, 90);
-			this.instructionsLbl.TabIndex = 6;
-			this.instructionsLbl.Text = resources.GetString("instructionsLbl.Text");
-			// 
-			// responseUrlTb
-			// 
-			this.responseUrlTb.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) 
+            this.loginUrlTb.Location = new System.Drawing.Point(14, 79);
+            this.loginUrlTb.Multiline = true;
+            this.loginUrlTb.Name = "loginUrlTb";
+            this.loginUrlTb.ReadOnly = true;
+            this.loginUrlTb.ScrollBars = System.Windows.Forms.ScrollBars.Both;
+            this.loginUrlTb.Size = new System.Drawing.Size(739, 117);
+            this.loginUrlTb.TabIndex = 3;
+            // 
+            // copyBtn
+            // 
+            this.copyBtn.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+            this.copyBtn.Location = new System.Drawing.Point(14, 202);
+            this.copyBtn.Name = "copyBtn";
+            this.copyBtn.Size = new System.Drawing.Size(165, 23);
+            this.copyBtn.TabIndex = 4;
+            this.copyBtn.Text = "Copy URL to clipboard";
+            this.copyBtn.UseVisualStyleBackColor = true;
+            this.copyBtn.Click += new System.EventHandler(this.copyBtn_Click);
+            // 
+            // launchBrowserBtn
+            // 
+            this.launchBrowserBtn.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this.launchBrowserBtn.Location = new System.Drawing.Point(589, 202);
+            this.launchBrowserBtn.Name = "launchBrowserBtn";
+            this.launchBrowserBtn.Size = new System.Drawing.Size(165, 23);
+            this.launchBrowserBtn.TabIndex = 5;
+            this.launchBrowserBtn.Text = "Launch in browser";
+            this.launchBrowserBtn.UseVisualStyleBackColor = true;
+            this.launchBrowserBtn.Click += new System.EventHandler(this.launchBrowserBtn_Click);
+            // 
+            // instructionsLbl
+            // 
+            this.instructionsLbl.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+            this.instructionsLbl.AutoSize = true;
+            this.instructionsLbl.Location = new System.Drawing.Point(14, 261);
+            this.instructionsLbl.Name = "instructionsLbl";
+            this.instructionsLbl.Size = new System.Drawing.Size(436, 90);
+            this.instructionsLbl.TabIndex = 6;
+            this.instructionsLbl.Text = resources.GetString("instructionsLbl.Text");
+            // 
+            // responseUrlTb
+            // 
+            this.responseUrlTb.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
-			this.responseUrlTb.Location = new System.Drawing.Point(14, 296);
-			this.responseUrlTb.Multiline = true;
-			this.responseUrlTb.Name = "responseUrlTb";
-			this.responseUrlTb.ScrollBars = System.Windows.Forms.ScrollBars.Both;
-			this.responseUrlTb.Size = new System.Drawing.Size(739, 98);
-			this.responseUrlTb.TabIndex = 7;
-			// 
-			// LoginExternalDialog
-			// 
-			this.AcceptButton = this.submitBtn;
-			this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
-			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-			this.ClientSize = new System.Drawing.Size(766, 440);
-			this.Controls.Add(this.responseUrlTb);
-			this.Controls.Add(this.instructionsLbl);
-			this.Controls.Add(this.launchBrowserBtn);
-			this.Controls.Add(this.copyBtn);
-			this.Controls.Add(this.loginUrlTb);
-			this.Controls.Add(this.loginUrlLbl);
-			this.Controls.Add(this.usernameLbl);
-			this.Controls.Add(this.localeLbl);
-			this.Controls.Add(this.submitBtn);
-			this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
-			this.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
-			this.MaximizeBox = false;
-			this.MinimizeBox = false;
-			this.Name = "LoginExternalDialog";
-			this.ShowIcon = false;
-			this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
-			this.Text = "Audible External Login";
-			this.ResumeLayout(false);
-			this.PerformLayout();
+            this.responseUrlTb.Location = new System.Drawing.Point(14, 354);
+            this.responseUrlTb.Multiline = true;
+            this.responseUrlTb.Name = "responseUrlTb";
+            this.responseUrlTb.ScrollBars = System.Windows.Forms.ScrollBars.Both;
+            this.responseUrlTb.Size = new System.Drawing.Size(739, 98);
+            this.responseUrlTb.TabIndex = 7;
+            // 
+            // tldrLbl
+            // 
+            this.tldrLbl.AutoSize = true;
+            this.tldrLbl.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point);
+            this.tldrLbl.Location = new System.Drawing.Point(14, 237);
+            this.tldrLbl.Name = "tldrLbl";
+            this.tldrLbl.Size = new System.Drawing.Size(421, 15);
+            this.tldrLbl.TabIndex = 9;
+            this.tldrLbl.Text = "tl;dr : an ERROR on Amazon is GOOD. Sorry, I can\'t control their weird login";
+            // 
+            // LoginExternalDialog
+            // 
+            this.AcceptButton = this.submitBtn;
+            this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(766, 498);
+            this.Controls.Add(this.tldrLbl);
+            this.Controls.Add(this.responseUrlTb);
+            this.Controls.Add(this.instructionsLbl);
+            this.Controls.Add(this.launchBrowserBtn);
+            this.Controls.Add(this.copyBtn);
+            this.Controls.Add(this.loginUrlTb);
+            this.Controls.Add(this.loginUrlLbl);
+            this.Controls.Add(this.usernameLbl);
+            this.Controls.Add(this.localeLbl);
+            this.Controls.Add(this.submitBtn);
+            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
+            this.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
+            this.MaximizeBox = false;
+            this.MinimizeBox = false;
+            this.Name = "LoginExternalDialog";
+            this.ShowIcon = false;
+            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
+            this.Text = "Audible External Login";
+            this.ResumeLayout(false);
+            this.PerformLayout();
 
 		}
 
@@ -175,5 +187,6 @@
 		private System.Windows.Forms.Button launchBrowserBtn;
 		private System.Windows.Forms.Label instructionsLbl;
 		private System.Windows.Forms.TextBox responseUrlTb;
-	}
+        private System.Windows.Forms.Label tldrLbl;
+    }
 }

LibationWinForms/Dialogs/RemoveBooksDialog.cs

@@ -17,9 +17,9 @@ namespace LibationWinForms.Dialogs
 	public partial class RemoveBooksDialog : Form
 	{
 		private Account[] _accounts { get; }
-		private readonly List<LibraryBook> _libraryBooks;
-		private readonly SortableBindingList<RemovableGridEntry> _removableGridEntries;
-		private readonly string _labelFormat;
+		private List<LibraryBook> _libraryBooks { get; }
+		private SortableBindingList<RemovableGridEntry> _removableGridEntries { get; }
+		private string _labelFormat { get; }
 		private int SelectedCount => SelectedEntries?.Count() ?? 0;
 		private IEnumerable<RemovableGridEntry> SelectedEntries => _removableGridEntries?.Where(b => b.Remove);
 
@@ -58,7 +58,7 @@ namespace LibationWinForms.Dialogs
 
 		private async void RemoveBooksDialog_Shown(object sender, EventArgs e)
 		{
-			if (_accounts == null || _accounts.Length == 0)
+			if (_accounts is null || _accounts.Length == 0)
 				return;
 			try
 			{

LibationWinForms/Dialogs/SettingsDialog.AudioSettings.cs

@@ -0,0 +1,46 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace LibationWinForms.Dialogs
+{
+	partial class SettingsDialog
+	{
+		private void lameTargetRb_CheckedChanged(object sender, EventArgs e)
+		{
+			lameBitrateGb.Enabled = lameTargetBitrateRb.Checked;
+			lameQualityGb.Enabled = !lameTargetBitrateRb.Checked;
+		}
+
+		private void LameMatchSourceBRCbox_CheckedChanged(object sender, EventArgs e)
+		{
+			lameBitrateTb.Enabled = !LameMatchSourceBRCbox.Checked;
+			lameConstantBitrateCbox.Enabled = !LameMatchSourceBRCbox.Checked;
+		}
+
+		private void convertFormatRb_CheckedChanged(object sender, EventArgs e)
+		{
+			lameOptionsGb.Enabled = convertLossyRb.Checked;
+			lameTargetRb_CheckedChanged(sender, e);
+			LameMatchSourceBRCbox_CheckedChanged(sender, e);
+		}
+		private void allowLibationFixupCbox_CheckedChanged(object sender, EventArgs e)
+		{
+			convertLosslessRb.Enabled = allowLibationFixupCbox.Checked;
+			convertLossyRb.Enabled = allowLibationFixupCbox.Checked;
+			splitFilesByChapterCbox.Enabled = allowLibationFixupCbox.Checked;
+			stripUnabridgedCbox.Enabled = allowLibationFixupCbox.Checked;
+			stripAudibleBrandingCbox.Enabled = allowLibationFixupCbox.Checked;
+
+			if (!allowLibationFixupCbox.Checked)
+			{
+				convertLosslessRb.Checked = true;
+				splitFilesByChapterCbox.Checked = false;
+				stripUnabridgedCbox.Checked = false;
+				stripAudibleBrandingCbox.Checked = false;
+			}
+		}
+	}
+}

LibationWinForms/Dialogs/SettingsDialog.Designer.cs

@@ -39,7 +39,7 @@
 			this.badBookRetryRb = new System.Windows.Forms.RadioButton();
 			this.badBookAbortRb = new System.Windows.Forms.RadioButton();
 			this.badBookAskRb = new System.Windows.Forms.RadioButton();
-			this.decryptAndConvertGb = new System.Windows.Forms.GroupBox();
+			this.stripAudibleBrandingCbox = new System.Windows.Forms.CheckBox();
 			this.splitFilesByChapterCbox = new System.Windows.Forms.CheckBox();
 			this.allowLibationFixupCbox = new System.Windows.Forms.CheckBox();
 			this.convertLossyRb = new System.Windows.Forms.RadioButton();
@@ -53,6 +53,7 @@
 			this.tab1ImportantSettings = new System.Windows.Forms.TabPage();
 			this.booksGb = new System.Windows.Forms.GroupBox();
 			this.tab2ImportLibrary = new System.Windows.Forms.TabPage();
+			this.showImportedStatsCb = new System.Windows.Forms.CheckBox();
 			this.tab3DownloadDecrypt = new System.Windows.Forms.TabPage();
 			this.inProgressFilesGb = new System.Windows.Forms.GroupBox();
 			this.customFileNamingGb = new System.Windows.Forms.GroupBox();
@@ -65,8 +66,41 @@
 			this.folderTemplateBtn = new System.Windows.Forms.Button();
 			this.folderTemplateTb = new System.Windows.Forms.TextBox();
 			this.folderTemplateLbl = new System.Windows.Forms.Label();
+			this.tab4AudioFileOptions = new System.Windows.Forms.TabPage();
+			this.lameOptionsGb = new System.Windows.Forms.GroupBox();
+			this.lameDownsampleMonoCbox = new System.Windows.Forms.CheckBox();
+			this.lameBitrateGb = new System.Windows.Forms.GroupBox();
+			this.LameMatchSourceBRCbox = new System.Windows.Forms.CheckBox();
+			this.lameConstantBitrateCbox = new System.Windows.Forms.CheckBox();
+			this.label7 = new System.Windows.Forms.Label();
+			this.label6 = new System.Windows.Forms.Label();
+			this.label5 = new System.Windows.Forms.Label();
+			this.label4 = new System.Windows.Forms.Label();
+			this.label11 = new System.Windows.Forms.Label();
+			this.label3 = new System.Windows.Forms.Label();
+			this.lameBitrateTb = new System.Windows.Forms.TrackBar();
+			this.label1 = new System.Windows.Forms.Label();
+			this.lameQualityGb = new System.Windows.Forms.GroupBox();
+			this.label19 = new System.Windows.Forms.Label();
+			this.label18 = new System.Windows.Forms.Label();
+			this.label17 = new System.Windows.Forms.Label();
+			this.label16 = new System.Windows.Forms.Label();
+			this.label12 = new System.Windows.Forms.Label();
+			this.label15 = new System.Windows.Forms.Label();
+			this.label9 = new System.Windows.Forms.Label();
+			this.label8 = new System.Windows.Forms.Label();
+			this.label13 = new System.Windows.Forms.Label();
+			this.label10 = new System.Windows.Forms.Label();
+			this.label14 = new System.Windows.Forms.Label();
+			this.label2 = new System.Windows.Forms.Label();
+			this.lameVBRQualityTb = new System.Windows.Forms.TrackBar();
+			this.groupBox2 = new System.Windows.Forms.GroupBox();
+			this.lameTargetQualityRb = new System.Windows.Forms.RadioButton();
+			this.lameTargetBitrateRb = new System.Windows.Forms.RadioButton();
+			this.stripUnabridgedCbox = new System.Windows.Forms.CheckBox();
+			this.retainAaxFileCbox = new System.Windows.Forms.CheckBox();
+			this.createCueSheetCbox = new System.Windows.Forms.CheckBox();
 			this.badBookGb.SuspendLayout();
-			this.decryptAndConvertGb.SuspendLayout();
 			this.tabControl.SuspendLayout();
 			this.tab1ImportantSettings.SuspendLayout();
 			this.booksGb.SuspendLayout();
@@ -74,6 +108,13 @@
 			this.tab3DownloadDecrypt.SuspendLayout();
 			this.inProgressFilesGb.SuspendLayout();
 			this.customFileNamingGb.SuspendLayout();
+			this.tab4AudioFileOptions.SuspendLayout();
+			this.lameOptionsGb.SuspendLayout();
+			this.lameBitrateGb.SuspendLayout();
+			((System.ComponentModel.ISupportInitialize)(this.lameBitrateTb)).BeginInit();
+			this.lameQualityGb.SuspendLayout();
+			((System.ComponentModel.ISupportInitialize)(this.lameVBRQualityTb)).BeginInit();
+			this.groupBox2.SuspendLayout();
 			this.SuspendLayout();
 			// 
 			// booksLocationDescLbl
@@ -99,7 +140,7 @@
 			// saveBtn
 			// 
 			this.saveBtn.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-			this.saveBtn.Location = new System.Drawing.Point(714, 496);
+			this.saveBtn.Location = new System.Drawing.Point(667, 441);
 			this.saveBtn.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
 			this.saveBtn.Name = "saveBtn";
 			this.saveBtn.Size = new System.Drawing.Size(88, 27);
@@ -112,7 +153,7 @@
 			// 
 			this.cancelBtn.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
 			this.cancelBtn.DialogResult = System.Windows.Forms.DialogResult.Cancel;
-			this.cancelBtn.Location = new System.Drawing.Point(832, 496);
+			this.cancelBtn.Location = new System.Drawing.Point(785, 441);
 			this.cancelBtn.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
 			this.cancelBtn.Name = "cancelBtn";
 			this.cancelBtn.Size = new System.Drawing.Size(88, 27);
@@ -124,20 +165,20 @@
 			// importEpisodesCb
 			// 
 			this.importEpisodesCb.AutoSize = true;
-			this.importEpisodesCb.Location = new System.Drawing.Point(6, 6);
+			this.importEpisodesCb.Location = new System.Drawing.Point(6, 31);
 			this.importEpisodesCb.Name = "importEpisodesCb";
 			this.importEpisodesCb.Size = new System.Drawing.Size(146, 19);
-			this.importEpisodesCb.TabIndex = 7;
+			this.importEpisodesCb.TabIndex = 2;
 			this.importEpisodesCb.Text = "[import episodes desc]";
 			this.importEpisodesCb.UseVisualStyleBackColor = true;
 			// 
 			// downloadEpisodesCb
 			// 
 			this.downloadEpisodesCb.AutoSize = true;
-			this.downloadEpisodesCb.Location = new System.Drawing.Point(6, 31);
+			this.downloadEpisodesCb.Location = new System.Drawing.Point(6, 56);
 			this.downloadEpisodesCb.Name = "downloadEpisodesCb";
 			this.downloadEpisodesCb.Size = new System.Drawing.Size(163, 19);
-			this.downloadEpisodesCb.TabIndex = 8;
+			this.downloadEpisodesCb.TabIndex = 3;
 			this.downloadEpisodesCb.Text = "[download episodes desc]";
 			this.downloadEpisodesCb.UseVisualStyleBackColor = true;
 			// 
@@ -147,9 +188,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(371, 6);
+			this.badBookGb.Location = new System.Drawing.Point(7, 6);
 			this.badBookGb.Name = "badBookGb";
-			this.badBookGb.Size = new System.Drawing.Size(524, 124);
+			this.badBookGb.Size = new System.Drawing.Size(888, 76);
 			this.badBookGb.TabIndex = 13;
 			this.badBookGb.TabStop = false;
 			this.badBookGb.Text = "[bad book desc]";
@@ -157,7 +198,7 @@
 			// badBookIgnoreRb
 			// 
 			this.badBookIgnoreRb.AutoSize = true;
-			this.badBookIgnoreRb.Location = new System.Drawing.Point(6, 97);
+			this.badBookIgnoreRb.Location = new System.Drawing.Point(384, 47);
 			this.badBookIgnoreRb.Name = "badBookIgnoreRb";
 			this.badBookIgnoreRb.Size = new System.Drawing.Size(94, 19);
 			this.badBookIgnoreRb.TabIndex = 17;
@@ -168,7 +209,7 @@
 			// badBookRetryRb
 			// 
 			this.badBookRetryRb.AutoSize = true;
-			this.badBookRetryRb.Location = new System.Drawing.Point(6, 72);
+			this.badBookRetryRb.Location = new System.Drawing.Point(5, 47);
 			this.badBookRetryRb.Name = "badBookRetryRb";
 			this.badBookRetryRb.Size = new System.Drawing.Size(84, 19);
 			this.badBookRetryRb.TabIndex = 16;
@@ -179,7 +220,7 @@
 			// badBookAbortRb
 			// 
 			this.badBookAbortRb.AutoSize = true;
-			this.badBookAbortRb.Location = new System.Drawing.Point(6, 47);
+			this.badBookAbortRb.Location = new System.Drawing.Point(384, 22);
 			this.badBookAbortRb.Name = "badBookAbortRb";
 			this.badBookAbortRb.Size = new System.Drawing.Size(88, 19);
 			this.badBookAbortRb.TabIndex = 15;
@@ -198,23 +239,20 @@
 			this.badBookAskRb.Text = "[ask desc]";
 			this.badBookAskRb.UseVisualStyleBackColor = true;
 			// 
-			// decryptAndConvertGb
+			// stripAudibleBrandingCbox
 			// 
-			this.decryptAndConvertGb.Controls.Add(this.splitFilesByChapterCbox);
-			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(6, 6);
-			this.decryptAndConvertGb.Name = "decryptAndConvertGb";
-			this.decryptAndConvertGb.Size = new System.Drawing.Size(359, 124);
-			this.decryptAndConvertGb.TabIndex = 9;
-			this.decryptAndConvertGb.TabStop = false;
-			this.decryptAndConvertGb.Text = "Decrypt and convert";
+			this.stripAudibleBrandingCbox.AutoSize = true;
+			this.stripAudibleBrandingCbox.Location = new System.Drawing.Point(19, 143);
+			this.stripAudibleBrandingCbox.Name = "stripAudibleBrandingCbox";
+			this.stripAudibleBrandingCbox.Size = new System.Drawing.Size(143, 34);
+			this.stripAudibleBrandingCbox.TabIndex = 13;
+			this.stripAudibleBrandingCbox.Text = "[StripAudibleBranding\r\ndesc]";
+			this.stripAudibleBrandingCbox.UseVisualStyleBackColor = true;
 			// 
 			// splitFilesByChapterCbox
 			// 
 			this.splitFilesByChapterCbox.AutoSize = true;
-			this.splitFilesByChapterCbox.Location = new System.Drawing.Point(6, 46);
+			this.splitFilesByChapterCbox.Location = new System.Drawing.Point(19, 93);
 			this.splitFilesByChapterCbox.Name = "splitFilesByChapterCbox";
 			this.splitFilesByChapterCbox.Size = new System.Drawing.Size(162, 19);
 			this.splitFilesByChapterCbox.TabIndex = 13;
@@ -226,7 +264,7 @@
 			this.allowLibationFixupCbox.AutoSize = true;
 			this.allowLibationFixupCbox.Checked = true;
 			this.allowLibationFixupCbox.CheckState = System.Windows.Forms.CheckState.Checked;
-			this.allowLibationFixupCbox.Location = new System.Drawing.Point(6, 22);
+			this.allowLibationFixupCbox.Location = new System.Drawing.Point(19, 18);
 			this.allowLibationFixupCbox.Name = "allowLibationFixupCbox";
 			this.allowLibationFixupCbox.Size = new System.Drawing.Size(163, 19);
 			this.allowLibationFixupCbox.TabIndex = 10;
@@ -237,24 +275,26 @@
 			// convertLossyRb
 			// 
 			this.convertLossyRb.AutoSize = true;
-			this.convertLossyRb.Location = new System.Drawing.Point(6, 101);
+			this.convertLossyRb.Location = new System.Drawing.Point(19, 207);
 			this.convertLossyRb.Name = "convertLossyRb";
 			this.convertLossyRb.Size = new System.Drawing.Size(329, 19);
 			this.convertLossyRb.TabIndex = 12;
 			this.convertLossyRb.Text = "Download my books as .MP3 files (transcode if necessary)";
 			this.convertLossyRb.UseVisualStyleBackColor = true;
+			this.convertLossyRb.CheckedChanged += new System.EventHandler(this.convertFormatRb_CheckedChanged);
 			// 
 			// convertLosslessRb
 			// 
 			this.convertLosslessRb.AutoSize = true;
 			this.convertLosslessRb.Checked = true;
-			this.convertLosslessRb.Location = new System.Drawing.Point(6, 76);
+			this.convertLosslessRb.Location = new System.Drawing.Point(19, 182);
 			this.convertLosslessRb.Name = "convertLosslessRb";
 			this.convertLosslessRb.Size = new System.Drawing.Size(335, 19);
 			this.convertLosslessRb.TabIndex = 11;
 			this.convertLosslessRb.TabStop = true;
 			this.convertLosslessRb.Text = "Download my books in the original audio format (Lossless)";
 			this.convertLosslessRb.UseVisualStyleBackColor = true;
+			this.convertLosslessRb.CheckedChanged += new System.EventHandler(this.convertFormatRb_CheckedChanged);
 			// 
 			// inProgressSelectControl
 			// 
@@ -263,7 +303,7 @@
 			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(875, 52);
+			this.inProgressSelectControl.Size = new System.Drawing.Size(828, 52);
 			this.inProgressSelectControl.TabIndex = 19;
 			// 
 			// logsBtn
@@ -283,7 +323,7 @@
 			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(876, 87);
+			this.booksSelectControl.Size = new System.Drawing.Size(829, 87);
 			this.booksSelectControl.TabIndex = 2;
 			// 
 			// loggingLevelLbl
@@ -312,10 +352,11 @@
 			this.tabControl.Controls.Add(this.tab1ImportantSettings);
 			this.tabControl.Controls.Add(this.tab2ImportLibrary);
 			this.tabControl.Controls.Add(this.tab3DownloadDecrypt);
+			this.tabControl.Controls.Add(this.tab4AudioFileOptions);
 			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.Size = new System.Drawing.Size(862, 423);
 			this.tabControl.TabIndex = 100;
 			// 
 			// tab1ImportantSettings
@@ -327,7 +368,7 @@
 			this.tab1ImportantSettings.Location = new System.Drawing.Point(4, 24);
 			this.tab1ImportantSettings.Name = "tab1ImportantSettings";
 			this.tab1ImportantSettings.Padding = new System.Windows.Forms.Padding(3);
-			this.tab1ImportantSettings.Size = new System.Drawing.Size(901, 450);
+			this.tab1ImportantSettings.Size = new System.Drawing.Size(854, 395);
 			this.tab1ImportantSettings.TabIndex = 0;
 			this.tab1ImportantSettings.Text = "Important settings";
 			this.tab1ImportantSettings.UseVisualStyleBackColor = true;
@@ -340,33 +381,43 @@
 			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.Size = new System.Drawing.Size(842, 129);
 			this.booksGb.TabIndex = 0;
 			this.booksGb.TabStop = false;
 			this.booksGb.Text = "Books location";
 			// 
 			// tab2ImportLibrary
 			// 
+			this.tab2ImportLibrary.Controls.Add(this.showImportedStatsCb);
 			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.Size = new System.Drawing.Size(854, 395);
 			this.tab2ImportLibrary.TabIndex = 1;
 			this.tab2ImportLibrary.Text = "Import library";
 			this.tab2ImportLibrary.UseVisualStyleBackColor = true;
 			// 
+			// showImportedStatsCb
+			// 
+			this.showImportedStatsCb.AutoSize = true;
+			this.showImportedStatsCb.Location = new System.Drawing.Point(6, 6);
+			this.showImportedStatsCb.Name = "showImportedStatsCb";
+			this.showImportedStatsCb.Size = new System.Drawing.Size(168, 19);
+			this.showImportedStatsCb.TabIndex = 1;
+			this.showImportedStatsCb.Text = "[show imported stats desc]";
+			this.showImportedStatsCb.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.Size = new System.Drawing.Size(854, 395);
 			this.tab3DownloadDecrypt.TabIndex = 2;
 			this.tab3DownloadDecrypt.Text = "Download/Decrypt";
 			this.tab3DownloadDecrypt.UseVisualStyleBackColor = true;
@@ -377,9 +428,9 @@
             | 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.Location = new System.Drawing.Point(7, 251);
 			this.inProgressFilesGb.Name = "inProgressFilesGb";
-			this.inProgressFilesGb.Size = new System.Drawing.Size(888, 128);
+			this.inProgressFilesGb.Size = new System.Drawing.Size(841, 128);
 			this.inProgressFilesGb.TabIndex = 21;
 			this.inProgressFilesGb.TabStop = false;
 			this.inProgressFilesGb.Text = "In progress files";
@@ -397,9 +448,9 @@
 			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.Location = new System.Drawing.Point(7, 88);
 			this.customFileNamingGb.Name = "customFileNamingGb";
-			this.customFileNamingGb.Size = new System.Drawing.Size(888, 157);
+			this.customFileNamingGb.Size = new System.Drawing.Size(841, 157);
 			this.customFileNamingGb.TabIndex = 20;
 			this.customFileNamingGb.TabStop = false;
 			this.customFileNamingGb.Text = "Custom file naming";
@@ -407,7 +458,7 @@
 			// 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.Location = new System.Drawing.Point(761, 124);
 			this.chapterFileTemplateBtn.Name = "chapterFileTemplateBtn";
 			this.chapterFileTemplateBtn.Size = new System.Drawing.Size(75, 23);
 			this.chapterFileTemplateBtn.TabIndex = 8;
@@ -422,7 +473,7 @@
 			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.Size = new System.Drawing.Size(749, 23);
 			this.chapterFileTemplateTb.TabIndex = 7;
 			// 
 			// chapterFileTemplateLbl
@@ -437,7 +488,7 @@
 			// 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.Location = new System.Drawing.Point(761, 80);
 			this.fileTemplateBtn.Name = "fileTemplateBtn";
 			this.fileTemplateBtn.Size = new System.Drawing.Size(75, 23);
 			this.fileTemplateBtn.TabIndex = 5;
@@ -452,7 +503,7 @@
 			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.Size = new System.Drawing.Size(749, 23);
 			this.fileTemplateTb.TabIndex = 4;
 			// 
 			// fileTemplateLbl
@@ -467,7 +518,7 @@
 			// 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.Location = new System.Drawing.Point(760, 36);
 			this.folderTemplateBtn.Name = "folderTemplateBtn";
 			this.folderTemplateBtn.Size = new System.Drawing.Size(75, 23);
 			this.folderTemplateBtn.TabIndex = 2;
@@ -482,7 +533,7 @@
 			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.Size = new System.Drawing.Size(749, 23);
 			this.folderTemplateTb.TabIndex = 1;
 			// 
 			// folderTemplateLbl
@@ -494,13 +545,390 @@
 			this.folderTemplateLbl.TabIndex = 0;
 			this.folderTemplateLbl.Text = "[folder template desc]";
 			// 
+			// tab4AudioFileOptions
+			// 
+			this.tab4AudioFileOptions.Controls.Add(this.lameOptionsGb);
+			this.tab4AudioFileOptions.Controls.Add(this.convertLossyRb);
+			this.tab4AudioFileOptions.Controls.Add(this.stripAudibleBrandingCbox);
+			this.tab4AudioFileOptions.Controls.Add(this.convertLosslessRb);
+			this.tab4AudioFileOptions.Controls.Add(this.stripUnabridgedCbox);
+			this.tab4AudioFileOptions.Controls.Add(this.splitFilesByChapterCbox);
+			this.tab4AudioFileOptions.Controls.Add(this.retainAaxFileCbox);
+			this.tab4AudioFileOptions.Controls.Add(this.createCueSheetCbox);
+			this.tab4AudioFileOptions.Controls.Add(this.allowLibationFixupCbox);
+			this.tab4AudioFileOptions.Location = new System.Drawing.Point(4, 24);
+			this.tab4AudioFileOptions.Name = "tab4AudioFileOptions";
+			this.tab4AudioFileOptions.Padding = new System.Windows.Forms.Padding(3);
+			this.tab4AudioFileOptions.Size = new System.Drawing.Size(854, 395);
+			this.tab4AudioFileOptions.TabIndex = 3;
+			this.tab4AudioFileOptions.Text = "Audio File Options";
+			this.tab4AudioFileOptions.UseVisualStyleBackColor = true;
+			// 
+			// lameOptionsGb
+			// 
+			this.lameOptionsGb.Controls.Add(this.lameDownsampleMonoCbox);
+			this.lameOptionsGb.Controls.Add(this.lameBitrateGb);
+			this.lameOptionsGb.Controls.Add(this.label1);
+			this.lameOptionsGb.Controls.Add(this.lameQualityGb);
+			this.lameOptionsGb.Controls.Add(this.groupBox2);
+			this.lameOptionsGb.Location = new System.Drawing.Point(415, 18);
+			this.lameOptionsGb.Name = "lameOptionsGb";
+			this.lameOptionsGb.Size = new System.Drawing.Size(433, 371);
+			this.lameOptionsGb.TabIndex = 14;
+			this.lameOptionsGb.TabStop = false;
+			this.lameOptionsGb.Text = "Mp3 Encoding Options";
+			// 
+			// lameDownsampleMonoCbox
+			// 
+			this.lameDownsampleMonoCbox.AutoSize = true;
+			this.lameDownsampleMonoCbox.Location = new System.Drawing.Point(234, 35);
+			this.lameDownsampleMonoCbox.Name = "lameDownsampleMonoCbox";
+			this.lameDownsampleMonoCbox.Size = new System.Drawing.Size(184, 34);
+			this.lameDownsampleMonoCbox.TabIndex = 1;
+			this.lameDownsampleMonoCbox.Text = "Downsample stereo to mono?\r\n(Recommended)\r\n";
+			this.lameDownsampleMonoCbox.UseVisualStyleBackColor = true;
+			// 
+			// lameBitrateGb
+			// 
+			this.lameBitrateGb.Controls.Add(this.LameMatchSourceBRCbox);
+			this.lameBitrateGb.Controls.Add(this.lameConstantBitrateCbox);
+			this.lameBitrateGb.Controls.Add(this.label7);
+			this.lameBitrateGb.Controls.Add(this.label6);
+			this.lameBitrateGb.Controls.Add(this.label5);
+			this.lameBitrateGb.Controls.Add(this.label4);
+			this.lameBitrateGb.Controls.Add(this.label11);
+			this.lameBitrateGb.Controls.Add(this.label3);
+			this.lameBitrateGb.Controls.Add(this.lameBitrateTb);
+			this.lameBitrateGb.Location = new System.Drawing.Point(6, 84);
+			this.lameBitrateGb.Name = "lameBitrateGb";
+			this.lameBitrateGb.Size = new System.Drawing.Size(421, 112);
+			this.lameBitrateGb.TabIndex = 0;
+			this.lameBitrateGb.TabStop = false;
+			this.lameBitrateGb.Text = "Bitrate";
+			// 
+			// LameMatchSourceBRCbox
+			// 
+			this.LameMatchSourceBRCbox.AutoSize = true;
+			this.LameMatchSourceBRCbox.Location = new System.Drawing.Point(260, 87);
+			this.LameMatchSourceBRCbox.Name = "LameMatchSourceBRCbox";
+			this.LameMatchSourceBRCbox.Size = new System.Drawing.Size(140, 19);
+			this.LameMatchSourceBRCbox.TabIndex = 3;
+			this.LameMatchSourceBRCbox.Text = "Match source bitrate?";
+			this.LameMatchSourceBRCbox.UseVisualStyleBackColor = true;
+			this.LameMatchSourceBRCbox.CheckedChanged += new System.EventHandler(this.LameMatchSourceBRCbox_CheckedChanged);
+			// 
+			// lameConstantBitrateCbox
+			// 
+			this.lameConstantBitrateCbox.AutoSize = true;
+			this.lameConstantBitrateCbox.Location = new System.Drawing.Point(6, 87);
+			this.lameConstantBitrateCbox.Name = "lameConstantBitrateCbox";
+			this.lameConstantBitrateCbox.Size = new System.Drawing.Size(216, 19);
+			this.lameConstantBitrateCbox.TabIndex = 2;
+			this.lameConstantBitrateCbox.Text = "Restrict encoder to constant bitrate?";
+			this.lameConstantBitrateCbox.UseVisualStyleBackColor = true;
+			// 
+			// label7
+			// 
+			this.label7.AutoSize = true;
+			this.label7.BackColor = System.Drawing.SystemColors.ControlLightLight;
+			this.label7.Location = new System.Drawing.Point(390, 52);
+			this.label7.Name = "label7";
+			this.label7.Size = new System.Drawing.Size(25, 15);
+			this.label7.TabIndex = 1;
+			this.label7.Text = "320";
+			// 
+			// label6
+			// 
+			this.label6.AutoSize = true;
+			this.label6.BackColor = System.Drawing.SystemColors.ControlLightLight;
+			this.label6.Location = new System.Drawing.Point(309, 52);
+			this.label6.Name = "label6";
+			this.label6.Size = new System.Drawing.Size(25, 15);
+			this.label6.TabIndex = 1;
+			this.label6.Text = "256";
+			// 
+			// label5
+			// 
+			this.label5.AutoSize = true;
+			this.label5.BackColor = System.Drawing.SystemColors.ControlLightLight;
+			this.label5.Location = new System.Drawing.Point(228, 52);
+			this.label5.Name = "label5";
+			this.label5.Size = new System.Drawing.Size(25, 15);
+			this.label5.TabIndex = 1;
+			this.label5.Text = "192";
+			// 
+			// label4
+			// 
+			this.label4.AutoSize = true;
+			this.label4.BackColor = System.Drawing.SystemColors.ControlLightLight;
+			this.label4.Location = new System.Drawing.Point(147, 52);
+			this.label4.Name = "label4";
+			this.label4.Size = new System.Drawing.Size(25, 15);
+			this.label4.TabIndex = 1;
+			this.label4.Text = "128";
+			// 
+			// label11
+			// 
+			this.label11.AutoSize = true;
+			this.label11.BackColor = System.Drawing.SystemColors.ControlLightLight;
+			this.label11.Location = new System.Drawing.Point(10, 52);
+			this.label11.Name = "label11";
+			this.label11.Size = new System.Drawing.Size(19, 15);
+			this.label11.TabIndex = 1;
+			this.label11.Text = "16";
+			// 
+			// label3
+			// 
+			this.label3.AutoSize = true;
+			this.label3.BackColor = System.Drawing.SystemColors.ControlLightLight;
+			this.label3.Location = new System.Drawing.Point(71, 52);
+			this.label3.Name = "label3";
+			this.label3.Size = new System.Drawing.Size(19, 15);
+			this.label3.TabIndex = 1;
+			this.label3.Text = "64";
+			// 
+			// lameBitrateTb
+			// 
+			this.lameBitrateTb.BackColor = System.Drawing.SystemColors.ControlLightLight;
+			this.lameBitrateTb.LargeChange = 32;
+			this.lameBitrateTb.Location = new System.Drawing.Point(6, 22);
+			this.lameBitrateTb.Maximum = 320;
+			this.lameBitrateTb.Minimum = 16;
+			this.lameBitrateTb.Name = "lameBitrateTb";
+			this.lameBitrateTb.Size = new System.Drawing.Size(409, 45);
+			this.lameBitrateTb.SmallChange = 8;
+			this.lameBitrateTb.TabIndex = 0;
+			this.lameBitrateTb.TickFrequency = 16;
+			this.lameBitrateTb.Value = 64;
+			// 
+			// label1
+			// 
+			this.label1.AutoSize = true;
+			this.label1.Enabled = false;
+			this.label1.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point);
+			this.label1.Location = new System.Drawing.Point(6, 353);
+			this.label1.Name = "label1";
+			this.label1.Size = new System.Drawing.Size(172, 15);
+			this.label1.TabIndex = 1;
+			this.label1.Text = "Using L.A.M.E. encoding engine";
+			// 
+			// lameQualityGb
+			// 
+			this.lameQualityGb.Controls.Add(this.label19);
+			this.lameQualityGb.Controls.Add(this.label18);
+			this.lameQualityGb.Controls.Add(this.label17);
+			this.lameQualityGb.Controls.Add(this.label16);
+			this.lameQualityGb.Controls.Add(this.label12);
+			this.lameQualityGb.Controls.Add(this.label15);
+			this.lameQualityGb.Controls.Add(this.label9);
+			this.lameQualityGb.Controls.Add(this.label8);
+			this.lameQualityGb.Controls.Add(this.label13);
+			this.lameQualityGb.Controls.Add(this.label10);
+			this.lameQualityGb.Controls.Add(this.label14);
+			this.lameQualityGb.Controls.Add(this.label2);
+			this.lameQualityGb.Controls.Add(this.lameVBRQualityTb);
+			this.lameQualityGb.Location = new System.Drawing.Point(6, 202);
+			this.lameQualityGb.Name = "lameQualityGb";
+			this.lameQualityGb.Size = new System.Drawing.Size(421, 109);
+			this.lameQualityGb.TabIndex = 0;
+			this.lameQualityGb.TabStop = false;
+			this.lameQualityGb.Text = "Quality";
+			// 
+			// label19
+			// 
+			this.label19.AutoSize = true;
+			this.label19.Location = new System.Drawing.Point(349, 52);
+			this.label19.Name = "label19";
+			this.label19.Size = new System.Drawing.Size(20, 15);
+			this.label19.TabIndex = 1;
+			this.label19.Text = "V8";
+			// 
+			// label18
+			// 
+			this.label18.AutoSize = true;
+			this.label18.Location = new System.Drawing.Point(307, 52);
+			this.label18.Name = "label18";
+			this.label18.Size = new System.Drawing.Size(20, 15);
+			this.label18.TabIndex = 1;
+			this.label18.Text = "V7";
+			// 
+			// label17
+			// 
+			this.label17.AutoSize = true;
+			this.label17.Location = new System.Drawing.Point(265, 52);
+			this.label17.Name = "label17";
+			this.label17.Size = new System.Drawing.Size(20, 15);
+			this.label17.TabIndex = 1;
+			this.label17.Text = "V6";
+			// 
+			// label16
+			// 
+			this.label16.AutoSize = true;
+			this.label16.Location = new System.Drawing.Point(223, 52);
+			this.label16.Name = "label16";
+			this.label16.Size = new System.Drawing.Size(20, 15);
+			this.label16.TabIndex = 1;
+			this.label16.Text = "V5";
+			// 
+			// label12
+			// 
+			this.label12.AutoSize = true;
+			this.label12.Location = new System.Drawing.Point(182, 52);
+			this.label12.Name = "label12";
+			this.label12.Size = new System.Drawing.Size(20, 15);
+			this.label12.TabIndex = 1;
+			this.label12.Text = "V4";
+			// 
+			// label15
+			// 
+			this.label15.AutoSize = true;
+			this.label15.Location = new System.Drawing.Point(140, 52);
+			this.label15.Name = "label15";
+			this.label15.Size = new System.Drawing.Size(20, 15);
+			this.label15.TabIndex = 1;
+			this.label15.Text = "V3";
+			// 
+			// label9
+			// 
+			this.label9.AutoSize = true;
+			this.label9.Location = new System.Drawing.Point(97, 52);
+			this.label9.Name = "label9";
+			this.label9.Size = new System.Drawing.Size(20, 15);
+			this.label9.TabIndex = 1;
+			this.label9.Text = "V2";
+			// 
+			// label8
+			// 
+			this.label8.AutoSize = true;
+			this.label8.Location = new System.Drawing.Point(391, 52);
+			this.label8.Name = "label8";
+			this.label8.Size = new System.Drawing.Size(20, 15);
+			this.label8.TabIndex = 1;
+			this.label8.Text = "V9";
+			// 
+			// label13
+			// 
+			this.label13.AutoSize = true;
+			this.label13.Location = new System.Drawing.Point(376, 81);
+			this.label13.Name = "label13";
+			this.label13.Size = new System.Drawing.Size(39, 15);
+			this.label13.TabIndex = 1;
+			this.label13.Text = "Lower";
+			// 
+			// label10
+			// 
+			this.label10.AutoSize = true;
+			this.label10.Location = new System.Drawing.Point(6, 81);
+			this.label10.Name = "label10";
+			this.label10.Size = new System.Drawing.Size(43, 15);
+			this.label10.TabIndex = 1;
+			this.label10.Text = "Higher";
+			// 
+			// label14
+			// 
+			this.label14.AutoSize = true;
+			this.label14.Location = new System.Drawing.Point(56, 52);
+			this.label14.Name = "label14";
+			this.label14.Size = new System.Drawing.Size(20, 15);
+			this.label14.TabIndex = 1;
+			this.label14.Text = "V1";
+			// 
+			// label2
+			// 
+			this.label2.AutoSize = true;
+			this.label2.Location = new System.Drawing.Point(14, 52);
+			this.label2.Name = "label2";
+			this.label2.Size = new System.Drawing.Size(20, 15);
+			this.label2.TabIndex = 1;
+			this.label2.Text = "V0";
+			// 
+			// lameVBRQualityTb
+			// 
+			this.lameVBRQualityTb.BackColor = System.Drawing.SystemColors.ControlLightLight;
+			this.lameVBRQualityTb.LargeChange = 1;
+			this.lameVBRQualityTb.Location = new System.Drawing.Point(10, 22);
+			this.lameVBRQualityTb.Maximum = 9;
+			this.lameVBRQualityTb.Name = "lameVBRQualityTb";
+			this.lameVBRQualityTb.Size = new System.Drawing.Size(405, 45);
+			this.lameVBRQualityTb.TabIndex = 0;
+			this.lameVBRQualityTb.Value = 9;
+			// 
+			// groupBox2
+			// 
+			this.groupBox2.Controls.Add(this.lameTargetQualityRb);
+			this.groupBox2.Controls.Add(this.lameTargetBitrateRb);
+			this.groupBox2.Location = new System.Drawing.Point(6, 22);
+			this.groupBox2.Name = "groupBox2";
+			this.groupBox2.Size = new System.Drawing.Size(222, 56);
+			this.groupBox2.TabIndex = 0;
+			this.groupBox2.TabStop = false;
+			this.groupBox2.Text = "Target";
+			// 
+			// lameTargetQualityRb
+			// 
+			this.lameTargetQualityRb.AutoSize = true;
+			this.lameTargetQualityRb.Location = new System.Drawing.Point(138, 23);
+			this.lameTargetQualityRb.Name = "lameTargetQualityRb";
+			this.lameTargetQualityRb.Size = new System.Drawing.Size(63, 19);
+			this.lameTargetQualityRb.TabIndex = 0;
+			this.lameTargetQualityRb.TabStop = true;
+			this.lameTargetQualityRb.Text = "Quality";
+			this.lameTargetQualityRb.UseVisualStyleBackColor = true;
+			this.lameTargetQualityRb.CheckedChanged += new System.EventHandler(this.lameTargetRb_CheckedChanged);
+			// 
+			// lameTargetBitrateRb
+			// 
+			this.lameTargetBitrateRb.AutoSize = true;
+			this.lameTargetBitrateRb.Location = new System.Drawing.Point(6, 23);
+			this.lameTargetBitrateRb.Name = "lameTargetBitrateRb";
+			this.lameTargetBitrateRb.Size = new System.Drawing.Size(59, 19);
+			this.lameTargetBitrateRb.TabIndex = 0;
+			this.lameTargetBitrateRb.TabStop = true;
+			this.lameTargetBitrateRb.Text = "Bitrate";
+			this.lameTargetBitrateRb.UseVisualStyleBackColor = true;
+			this.lameTargetBitrateRb.CheckedChanged += new System.EventHandler(this.lameTargetRb_CheckedChanged);
+			// 
+			// stripUnabridgedCbox
+			// 
+			this.stripUnabridgedCbox.AutoSize = true;
+			this.stripUnabridgedCbox.Location = new System.Drawing.Point(19, 118);
+			this.stripUnabridgedCbox.Name = "stripUnabridgedCbox";
+			this.stripUnabridgedCbox.Size = new System.Drawing.Size(147, 19);
+			this.stripUnabridgedCbox.TabIndex = 13;
+			this.stripUnabridgedCbox.Text = "[StripUnabridged desc]";
+			this.stripUnabridgedCbox.UseVisualStyleBackColor = true;
+			// 
+			// retainAaxFileCbox
+			// 
+			this.retainAaxFileCbox.AutoSize = true;
+			this.retainAaxFileCbox.Location = new System.Drawing.Point(19, 68);
+			this.retainAaxFileCbox.Name = "retainAaxFileCbox";
+			this.retainAaxFileCbox.Size = new System.Drawing.Size(132, 19);
+			this.retainAaxFileCbox.TabIndex = 10;
+			this.retainAaxFileCbox.Text = "[RetainAaxFile desc]";
+			this.retainAaxFileCbox.UseVisualStyleBackColor = true;
+			this.retainAaxFileCbox.CheckedChanged += new System.EventHandler(this.allowLibationFixupCbox_CheckedChanged);
+			// 
+			// createCueSheetCbox
+			// 
+			this.createCueSheetCbox.AutoSize = true;
+			this.createCueSheetCbox.Checked = true;
+			this.createCueSheetCbox.CheckState = System.Windows.Forms.CheckState.Checked;
+			this.createCueSheetCbox.Location = new System.Drawing.Point(19, 43);
+			this.createCueSheetCbox.Name = "createCueSheetCbox";
+			this.createCueSheetCbox.Size = new System.Drawing.Size(145, 19);
+			this.createCueSheetCbox.TabIndex = 10;
+			this.createCueSheetCbox.Text = "[CreateCueSheet desc]";
+			this.createCueSheetCbox.UseVisualStyleBackColor = true;
+			this.createCueSheetCbox.CheckedChanged += new System.EventHandler(this.allowLibationFixupCbox_CheckedChanged);
+			// 
 			// SettingsDialog
 			// 
 			this.AcceptButton = this.saveBtn;
 			this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
 			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
 			this.CancelButton = this.cancelBtn;
-			this.ClientSize = new System.Drawing.Size(933, 539);
+			this.ClientSize = new System.Drawing.Size(886, 484);
 			this.Controls.Add(this.tabControl);
 			this.Controls.Add(this.cancelBtn);
 			this.Controls.Add(this.saveBtn);
@@ -512,8 +940,6 @@
 			this.Load += new System.EventHandler(this.SettingsDialog_Load);
 			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();
@@ -526,6 +952,18 @@
 			this.inProgressFilesGb.PerformLayout();
 			this.customFileNamingGb.ResumeLayout(false);
 			this.customFileNamingGb.PerformLayout();
+			this.tab4AudioFileOptions.ResumeLayout(false);
+			this.tab4AudioFileOptions.PerformLayout();
+			this.lameOptionsGb.ResumeLayout(false);
+			this.lameOptionsGb.PerformLayout();
+			this.lameBitrateGb.ResumeLayout(false);
+			this.lameBitrateGb.PerformLayout();
+			((System.ComponentModel.ISupportInitialize)(this.lameBitrateTb)).EndInit();
+			this.lameQualityGb.ResumeLayout(false);
+			this.lameQualityGb.PerformLayout();
+			((System.ComponentModel.ISupportInitialize)(this.lameVBRQualityTb)).EndInit();
+			this.groupBox2.ResumeLayout(false);
+			this.groupBox2.PerformLayout();
 			this.ResumeLayout(false);
 
 		}
@@ -543,7 +981,6 @@
 		private System.Windows.Forms.Button logsBtn;
 		private System.Windows.Forms.Label loggingLevelLbl;
 		private System.Windows.Forms.ComboBox loggingLevelCb;
-		private System.Windows.Forms.GroupBox decryptAndConvertGb;
 		private System.Windows.Forms.GroupBox badBookGb;
 		private System.Windows.Forms.RadioButton badBookRetryRb;
 		private System.Windows.Forms.RadioButton badBookAbortRb;
@@ -568,5 +1005,41 @@
 		private System.Windows.Forms.Button folderTemplateBtn;
 		private System.Windows.Forms.TextBox folderTemplateTb;
 		private System.Windows.Forms.Label folderTemplateLbl;
+        private System.Windows.Forms.CheckBox showImportedStatsCb;
+		private System.Windows.Forms.CheckBox stripAudibleBrandingCbox;
+		private System.Windows.Forms.TabPage tab4AudioFileOptions;
+		private System.Windows.Forms.CheckBox retainAaxFileCbox;
+		private System.Windows.Forms.CheckBox stripUnabridgedCbox;
+		private System.Windows.Forms.GroupBox lameOptionsGb;
+		private System.Windows.Forms.CheckBox lameDownsampleMonoCbox;
+		private System.Windows.Forms.GroupBox lameBitrateGb;
+		private System.Windows.Forms.TrackBar lameBitrateTb;
+		private System.Windows.Forms.GroupBox lameQualityGb;
+		private System.Windows.Forms.GroupBox groupBox2;
+		private System.Windows.Forms.RadioButton lameTargetQualityRb;
+		private System.Windows.Forms.RadioButton lameTargetBitrateRb;
+		private System.Windows.Forms.CheckBox lameConstantBitrateCbox;
+		private System.Windows.Forms.Label label7;
+		private System.Windows.Forms.Label label6;
+		private System.Windows.Forms.Label label5;
+		private System.Windows.Forms.Label label4;
+		private System.Windows.Forms.Label label3;
+		private System.Windows.Forms.Label label2;
+		private System.Windows.Forms.Label label9;
+		private System.Windows.Forms.Label label8;
+		private System.Windows.Forms.TrackBar lameVBRQualityTb;
+		private System.Windows.Forms.Label label11;
+		private System.Windows.Forms.CheckBox LameMatchSourceBRCbox;
+		private System.Windows.Forms.Label label1;
+		private System.Windows.Forms.Label label12;
+		private System.Windows.Forms.Label label10;
+		private System.Windows.Forms.Label label15;
+		private System.Windows.Forms.Label label13;
+		private System.Windows.Forms.Label label14;
+		private System.Windows.Forms.Label label19;
+		private System.Windows.Forms.Label label18;
+		private System.Windows.Forms.Label label17;
+		private System.Windows.Forms.Label label16;
+		private System.Windows.Forms.CheckBox createCueSheetCbox;
 	}
 }

LibationWinForms/Dialogs/SettingsDialog.cs

@@ -27,12 +27,17 @@ namespace LibationWinForms.Dialogs
 				loggingLevelCb.SelectedItem = config.LogLevel;
 			}
 
+			this.showImportedStatsCb.Text = desc(nameof(config.ShowImportedStats));
 			this.importEpisodesCb.Text = desc(nameof(config.ImportEpisodes));
 			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));
+			this.stripAudibleBrandingCbox.Text = desc(nameof(config.StripAudibleBrandAudio));
+			this.retainAaxFileCbox.Text = desc(nameof(config.RetainAaxFile));
+			this.stripUnabridgedCbox.Text = desc(nameof(config.StripUnabridged));
+			this.createCueSheetCbox.Text = desc(nameof(config.CreateCueSheet));
 
 			booksSelectControl.SetSearchTitle("books location");
 			booksSelectControl.SetDirectoryItems(
@@ -46,13 +51,30 @@ namespace LibationWinForms.Dialogs
 				"Books");
 			booksSelectControl.SelectDirectory(config.Books);
 
-			importEpisodesCb.Checked = config.ImportEpisodes;
-			downloadEpisodesCb.Checked = config.DownloadEpisodes;
 			allowLibationFixupCbox.Checked = config.AllowLibationFixup;
+			createCueSheetCbox.Checked = config.CreateCueSheet;
+			retainAaxFileCbox.Checked = config.RetainAaxFile;
+			splitFilesByChapterCbox.Checked = config.SplitFilesByChapter;
+			stripUnabridgedCbox.Checked = config.StripUnabridged;
+			stripAudibleBrandingCbox.Checked = config.StripAudibleBrandAudio;
 			convertLosslessRb.Checked = !config.DecryptToLossy;
 			convertLossyRb.Checked = config.DecryptToLossy;
-			splitFilesByChapterCbox.Checked = config.SplitFilesByChapter;
 
+			lameTargetBitrateRb.Checked = config.LameTargetBitrate;
+			lameTargetQualityRb.Checked = !config.LameTargetBitrate;
+			lameDownsampleMonoCbox.Checked = config.LameDownsampleMono;
+			lameBitrateTb.Value = config.LameBitrate;
+			lameConstantBitrateCbox.Checked = config.LameConstantBitrate;
+			LameMatchSourceBRCbox.Checked = config.LameMatchSourceBR;
+			lameVBRQualityTb.Value = config.LameVBRQuality;
+
+			showImportedStatsCb.Checked = config.ShowImportedStats;
+			importEpisodesCb.Checked = config.ImportEpisodes;
+			downloadEpisodesCb.Checked = config.DownloadEpisodes;
+
+			lameTargetRb_CheckedChanged(this, e);
+			LameMatchSourceBRCbox_CheckedChanged(this, e);
+			convertFormatRb_CheckedChanged(this, e);
 			allowLibationFixupCbox_CheckedChanged(this, e);
 
 			inProgressSelectControl.SetDirectoryItems(new()
@@ -88,19 +110,6 @@ namespace LibationWinForms.Dialogs
 			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) => editTemplate(Templates.Folder, folderTemplateTb);
@@ -108,47 +117,44 @@ namespace LibationWinForms.Dialogs
 		private void chapterFileTemplateBtn_Click(object sender, EventArgs e) => editTemplate(Templates.ChapterFile, chapterFileTemplateTb);
 		private static void editTemplate(Templates template, TextBox textBox)
 		{
-			TEMP_TEMP_TEMP();
-			return;
-
 			var form = new EditTemplateDialog(template, textBox.Text);
 			if (form.ShowDialog() == DialogResult.OK)
 				textBox.Text = form.TemplateText;
 		}
 
-		private static 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
+			static void validationError(string text, string caption)
+				=> MessageBox.Show(text, caption, MessageBoxButtons.OK, MessageBoxIcon.Error);
 			if (string.IsNullOrWhiteSpace(newBooks))
 			{
-				MessageBox.Show("Cannot set Books Location to blank", "Location is blank", MessageBoxButtons.OK, MessageBoxIcon.Error);
+				validationError("Cannot set Books Location to blank", "Location is blank");
 				return;
 			}
 
 			if (!Directory.Exists(newBooks) && 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);
+				validationError($"Not saving change to Books location. This folder does not exist:\r\n{newBooks}", "Folder does not exist");
 				return;
 			}
 
+			// these 3 should do nothing. Configuration will only init these with a valid value. EditTemplateDialog ensures valid before returning
 			if (!Templates.Folder.IsValid(folderTemplateTb.Text))
 			{
-				MessageBox.Show($"Not saving change to folder naming template. Invalid format.", "Invalid folder template", MessageBoxButtons.OK, MessageBoxIcon.Error);
+				validationError($"Not saving change to folder naming template. Invalid format.", "Invalid folder template");
 				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);
+				validationError($"Not saving change to file naming template. Invalid format.", "Invalid file template");
 				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);
+				validationError($"Not saving change to chapter file naming template. Invalid format.", "Invalid chapter file template");
 				return;
 			}
 			#endregion
@@ -169,11 +175,24 @@ namespace LibationWinForms.Dialogs
 					MessageBoxVerboseLoggingWarning.ShowIfTrue();
 			}
 
+			config.AllowLibationFixup = allowLibationFixupCbox.Checked;
+			config.CreateCueSheet = createCueSheetCbox.Checked;
+			config.RetainAaxFile = retainAaxFileCbox.Checked;
+			config.SplitFilesByChapter = splitFilesByChapterCbox.Checked;
+			config.StripUnabridged = stripUnabridgedCbox.Checked;
+			config.StripAudibleBrandAudio = stripAudibleBrandingCbox.Checked;
+			config.DecryptToLossy = convertLossyRb.Checked;
+
+			config.LameTargetBitrate = lameTargetBitrateRb.Checked;
+			config.LameDownsampleMono = lameDownsampleMonoCbox.Checked;
+			config.LameBitrate = lameBitrateTb.Value;
+			config.LameConstantBitrate = lameConstantBitrateCbox.Checked;
+			config.LameMatchSourceBR = LameMatchSourceBRCbox.Checked;
+			config.LameVBRQuality = lameVBRQualityTb.Value;
+
+			config.ShowImportedStats = showImportedStatsCb.Checked;
 			config.ImportEpisodes = importEpisodesCb.Checked;
 			config.DownloadEpisodes = downloadEpisodesCb.Checked;
-			config.AllowLibationFixup = allowLibationFixupCbox.Checked;
-			config.DecryptToLossy = convertLossyRb.Checked;
-			config.SplitFilesByChapter = splitFilesByChapterCbox.Checked;
 
 			config.InProgress = inProgressSelectControl.SelectedDirectory;
 
@@ -197,5 +216,6 @@ namespace LibationWinForms.Dialogs
 			this.DialogResult = DialogResult.Cancel;
 			this.Close();
 		}
+
 	}
 }

LibationWinForms/Form1.Designer.cs

@@ -28,338 +28,366 @@
 		/// </summary>
 		private void InitializeComponent()
 		{
-			System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Form1));
-			this.gridPanel = new System.Windows.Forms.Panel();
-			this.filterHelpBtn = new System.Windows.Forms.Button();
-			this.filterBtn = new System.Windows.Forms.Button();
-			this.filterSearchTb = new System.Windows.Forms.TextBox();
-			this.menuStrip1 = new System.Windows.Forms.MenuStrip();
-			this.importToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.noAccountsYetAddAccountToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.scanLibraryToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.scanLibraryOfAllAccountsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.scanLibraryOfSomeAccountsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.removeLibraryBooksToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.removeAllAccountsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.removeSomeAccountsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.liberateToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.beginBookBackupsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.beginPdfBackupsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.convertAllM4bToMp3ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.exportToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.exportLibraryToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.quickFiltersToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.firstFilterIsDefaultToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.editQuickFiltersToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();
-			this.settingsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.accountsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.basicSettingsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.statusStrip1 = new System.Windows.Forms.StatusStrip();
-			this.visibleCountLbl = new System.Windows.Forms.ToolStripStatusLabel();
-			this.springLbl = new System.Windows.Forms.ToolStripStatusLabel();
-			this.backupsCountsLbl = new System.Windows.Forms.ToolStripStatusLabel();
-			this.pdfsCountsLbl = new System.Windows.Forms.ToolStripStatusLabel();
-			this.addFilterBtn = new System.Windows.Forms.Button();
-			this.menuStrip1.SuspendLayout();
-			this.statusStrip1.SuspendLayout();
-			this.SuspendLayout();
-			// 
-			// gridPanel
-			// 
-			this.gridPanel.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Form1));
+            this.gridPanel = new System.Windows.Forms.Panel();
+            this.filterHelpBtn = new System.Windows.Forms.Button();
+            this.filterBtn = new System.Windows.Forms.Button();
+            this.filterSearchTb = new System.Windows.Forms.TextBox();
+            this.menuStrip1 = new System.Windows.Forms.MenuStrip();
+            this.importToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.noAccountsYetAddAccountToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.scanLibraryToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.scanLibraryOfAllAccountsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.scanLibraryOfSomeAccountsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.removeLibraryBooksToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.removeAllAccountsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.removeSomeAccountsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.liberateToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.beginBookBackupsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.beginPdfBackupsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.convertAllM4bToMp3ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.exportToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.exportLibraryToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.quickFiltersToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.firstFilterIsDefaultToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.editQuickFiltersToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();
+            this.settingsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.accountsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.basicSettingsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator();
+            this.aboutToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.statusStrip1 = new System.Windows.Forms.StatusStrip();
+            this.visibleCountLbl = new System.Windows.Forms.ToolStripStatusLabel();
+            this.springLbl = new System.Windows.Forms.ToolStripStatusLabel();
+            this.backupsCountsLbl = new System.Windows.Forms.ToolStripStatusLabel();
+            this.pdfsCountsLbl = new System.Windows.Forms.ToolStripStatusLabel();
+            this.addFilterBtn = new System.Windows.Forms.Button();
+            this.scanningToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.menuStrip1.SuspendLayout();
+            this.statusStrip1.SuspendLayout();
+            this.SuspendLayout();
+            // 
+            // gridPanel
+            // 
+            this.gridPanel.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.gridPanel.Location = new System.Drawing.Point(14, 65);
-			this.gridPanel.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
-			this.gridPanel.Name = "gridPanel";
-			this.gridPanel.Size = new System.Drawing.Size(979, 445);
-			this.gridPanel.TabIndex = 5;
-			// 
-			// filterHelpBtn
-			// 
-			this.filterHelpBtn.Location = new System.Drawing.Point(14, 31);
-			this.filterHelpBtn.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
-			this.filterHelpBtn.Name = "filterHelpBtn";
-			this.filterHelpBtn.Size = new System.Drawing.Size(26, 27);
-			this.filterHelpBtn.TabIndex = 3;
-			this.filterHelpBtn.Text = "?";
-			this.filterHelpBtn.UseVisualStyleBackColor = true;
-			this.filterHelpBtn.Click += new System.EventHandler(this.filterHelpBtn_Click);
-			// 
-			// filterBtn
-			// 
-			this.filterBtn.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-			this.filterBtn.Location = new System.Drawing.Point(905, 31);
-			this.filterBtn.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
-			this.filterBtn.Name = "filterBtn";
-			this.filterBtn.Size = new System.Drawing.Size(88, 27);
-			this.filterBtn.TabIndex = 2;
-			this.filterBtn.Text = "Filter";
-			this.filterBtn.UseVisualStyleBackColor = true;
-			this.filterBtn.Click += new System.EventHandler(this.filterBtn_Click);
-			// 
-			// filterSearchTb
-			// 
-			this.filterSearchTb.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            this.gridPanel.Location = new System.Drawing.Point(14, 65);
+            this.gridPanel.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
+            this.gridPanel.Name = "gridPanel";
+            this.gridPanel.Size = new System.Drawing.Size(979, 445);
+            this.gridPanel.TabIndex = 5;
+            // 
+            // filterHelpBtn
+            // 
+            this.filterHelpBtn.Location = new System.Drawing.Point(14, 31);
+            this.filterHelpBtn.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
+            this.filterHelpBtn.Name = "filterHelpBtn";
+            this.filterHelpBtn.Size = new System.Drawing.Size(26, 27);
+            this.filterHelpBtn.TabIndex = 3;
+            this.filterHelpBtn.Text = "?";
+            this.filterHelpBtn.UseVisualStyleBackColor = true;
+            this.filterHelpBtn.Click += new System.EventHandler(this.filterHelpBtn_Click);
+            // 
+            // filterBtn
+            // 
+            this.filterBtn.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.filterBtn.Location = new System.Drawing.Point(905, 31);
+            this.filterBtn.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
+            this.filterBtn.Name = "filterBtn";
+            this.filterBtn.Size = new System.Drawing.Size(88, 27);
+            this.filterBtn.TabIndex = 2;
+            this.filterBtn.Text = "Filter";
+            this.filterBtn.UseVisualStyleBackColor = true;
+            this.filterBtn.Click += new System.EventHandler(this.filterBtn_Click);
+            // 
+            // filterSearchTb
+            // 
+            this.filterSearchTb.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
-			this.filterSearchTb.Location = new System.Drawing.Point(217, 33);
-			this.filterSearchTb.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
-			this.filterSearchTb.Name = "filterSearchTb";
-			this.filterSearchTb.Size = new System.Drawing.Size(681, 23);
-			this.filterSearchTb.TabIndex = 1;
-			this.filterSearchTb.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.filterSearchTb_KeyPress);
-			// 
-			// menuStrip1
-			// 
-			this.menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.filterSearchTb.Location = new System.Drawing.Point(217, 33);
+            this.filterSearchTb.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
+            this.filterSearchTb.Name = "filterSearchTb";
+            this.filterSearchTb.Size = new System.Drawing.Size(681, 23);
+            this.filterSearchTb.TabIndex = 1;
+            this.filterSearchTb.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.filterSearchTb_KeyPress);
+            // 
+            // menuStrip1
+            // 
+            this.menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.importToolStripMenuItem,
             this.liberateToolStripMenuItem,
             this.exportToolStripMenuItem,
             this.quickFiltersToolStripMenuItem,
-            this.settingsToolStripMenuItem});
-			this.menuStrip1.Location = new System.Drawing.Point(0, 0);
-			this.menuStrip1.Name = "menuStrip1";
-			this.menuStrip1.Padding = new System.Windows.Forms.Padding(7, 2, 0, 2);
-			this.menuStrip1.Size = new System.Drawing.Size(1007, 24);
-			this.menuStrip1.TabIndex = 0;
-			this.menuStrip1.Text = "menuStrip1";
-			// 
-			// importToolStripMenuItem
-			// 
-			this.importToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.settingsToolStripMenuItem,
+            this.scanningToolStripMenuItem});
+            this.menuStrip1.Location = new System.Drawing.Point(0, 0);
+            this.menuStrip1.Name = "menuStrip1";
+            this.menuStrip1.Padding = new System.Windows.Forms.Padding(7, 2, 0, 2);
+            this.menuStrip1.Size = new System.Drawing.Size(1007, 24);
+            this.menuStrip1.TabIndex = 0;
+            this.menuStrip1.Text = "menuStrip1";
+            // 
+            // importToolStripMenuItem
+            // 
+            this.importToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.noAccountsYetAddAccountToolStripMenuItem,
             this.scanLibraryToolStripMenuItem,
             this.scanLibraryOfAllAccountsToolStripMenuItem,
             this.scanLibraryOfSomeAccountsToolStripMenuItem,
             this.removeLibraryBooksToolStripMenuItem});
-			this.importToolStripMenuItem.Name = "importToolStripMenuItem";
-			this.importToolStripMenuItem.Size = new System.Drawing.Size(55, 20);
-			this.importToolStripMenuItem.Text = "&Import";
-			// 
-			// noAccountsYetAddAccountToolStripMenuItem
-			// 
-			this.noAccountsYetAddAccountToolStripMenuItem.Name = "noAccountsYetAddAccountToolStripMenuItem";
-			this.noAccountsYetAddAccountToolStripMenuItem.Size = new System.Drawing.Size(247, 22);
-			this.noAccountsYetAddAccountToolStripMenuItem.Text = "No accounts yet. A&dd Account...";
-			this.noAccountsYetAddAccountToolStripMenuItem.Click += new System.EventHandler(this.noAccountsYetAddAccountToolStripMenuItem_Click);
-			// 
-			// scanLibraryToolStripMenuItem
-			// 
-			this.scanLibraryToolStripMenuItem.Name = "scanLibraryToolStripMenuItem";
-			this.scanLibraryToolStripMenuItem.Size = new System.Drawing.Size(247, 22);
-			this.scanLibraryToolStripMenuItem.Text = "Scan &Library";
-			this.scanLibraryToolStripMenuItem.Click += new System.EventHandler(this.scanLibraryToolStripMenuItem_Click);
-			// 
-			// scanLibraryOfAllAccountsToolStripMenuItem
-			// 
-			this.scanLibraryOfAllAccountsToolStripMenuItem.Name = "scanLibraryOfAllAccountsToolStripMenuItem";
-			this.scanLibraryOfAllAccountsToolStripMenuItem.Size = new System.Drawing.Size(247, 22);
-			this.scanLibraryOfAllAccountsToolStripMenuItem.Text = "Scan Library of &All Accounts";
-			this.scanLibraryOfAllAccountsToolStripMenuItem.Click += new System.EventHandler(this.scanLibraryOfAllAccountsToolStripMenuItem_Click);
-			// 
-			// scanLibraryOfSomeAccountsToolStripMenuItem
-			// 
-			this.scanLibraryOfSomeAccountsToolStripMenuItem.Name = "scanLibraryOfSomeAccountsToolStripMenuItem";
-			this.scanLibraryOfSomeAccountsToolStripMenuItem.Size = new System.Drawing.Size(247, 22);
-			this.scanLibraryOfSomeAccountsToolStripMenuItem.Text = "Scan Library of &Some Accounts...";
-			this.scanLibraryOfSomeAccountsToolStripMenuItem.Click += new System.EventHandler(this.scanLibraryOfSomeAccountsToolStripMenuItem_Click);
-			// 
-			// removeLibraryBooksToolStripMenuItem
-			// 
-			this.removeLibraryBooksToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.importToolStripMenuItem.Name = "importToolStripMenuItem";
+            this.importToolStripMenuItem.Size = new System.Drawing.Size(55, 20);
+            this.importToolStripMenuItem.Text = "&Import";
+            // 
+            // noAccountsYetAddAccountToolStripMenuItem
+            // 
+            this.noAccountsYetAddAccountToolStripMenuItem.Name = "noAccountsYetAddAccountToolStripMenuItem";
+            this.noAccountsYetAddAccountToolStripMenuItem.Size = new System.Drawing.Size(247, 22);
+            this.noAccountsYetAddAccountToolStripMenuItem.Text = "No accounts yet. A&dd Account...";
+            this.noAccountsYetAddAccountToolStripMenuItem.Click += new System.EventHandler(this.noAccountsYetAddAccountToolStripMenuItem_Click);
+            // 
+            // scanLibraryToolStripMenuItem
+            // 
+            this.scanLibraryToolStripMenuItem.Name = "scanLibraryToolStripMenuItem";
+            this.scanLibraryToolStripMenuItem.Size = new System.Drawing.Size(247, 22);
+            this.scanLibraryToolStripMenuItem.Text = "Scan &Library";
+            this.scanLibraryToolStripMenuItem.Click += new System.EventHandler(this.scanLibraryToolStripMenuItem_Click);
+            // 
+            // scanLibraryOfAllAccountsToolStripMenuItem
+            // 
+            this.scanLibraryOfAllAccountsToolStripMenuItem.Name = "scanLibraryOfAllAccountsToolStripMenuItem";
+            this.scanLibraryOfAllAccountsToolStripMenuItem.Size = new System.Drawing.Size(247, 22);
+            this.scanLibraryOfAllAccountsToolStripMenuItem.Text = "Scan Library of &All Accounts";
+            this.scanLibraryOfAllAccountsToolStripMenuItem.Click += new System.EventHandler(this.scanLibraryOfAllAccountsToolStripMenuItem_Click);
+            // 
+            // scanLibraryOfSomeAccountsToolStripMenuItem
+            // 
+            this.scanLibraryOfSomeAccountsToolStripMenuItem.Name = "scanLibraryOfSomeAccountsToolStripMenuItem";
+            this.scanLibraryOfSomeAccountsToolStripMenuItem.Size = new System.Drawing.Size(247, 22);
+            this.scanLibraryOfSomeAccountsToolStripMenuItem.Text = "Scan Library of &Some Accounts...";
+            this.scanLibraryOfSomeAccountsToolStripMenuItem.Click += new System.EventHandler(this.scanLibraryOfSomeAccountsToolStripMenuItem_Click);
+            // 
+            // removeLibraryBooksToolStripMenuItem
+            // 
+            this.removeLibraryBooksToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.removeAllAccountsToolStripMenuItem,
             this.removeSomeAccountsToolStripMenuItem});
-			this.removeLibraryBooksToolStripMenuItem.Name = "removeLibraryBooksToolStripMenuItem";
-			this.removeLibraryBooksToolStripMenuItem.Size = new System.Drawing.Size(247, 22);
-			this.removeLibraryBooksToolStripMenuItem.Text = "Remove Library Books";
-			this.removeLibraryBooksToolStripMenuItem.Click += new System.EventHandler(this.removeLibraryBooksToolStripMenuItem_Click);
-			// 
-			// removeAllAccountsToolStripMenuItem
-			// 
-			this.removeAllAccountsToolStripMenuItem.Name = "removeAllAccountsToolStripMenuItem";
-			this.removeAllAccountsToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
-			this.removeAllAccountsToolStripMenuItem.Text = "All Accounts";
-			this.removeAllAccountsToolStripMenuItem.Click += new System.EventHandler(this.removeAllAccountsToolStripMenuItem_Click);
-			// 
-			// removeSomeAccountsToolStripMenuItem
-			// 
-			this.removeSomeAccountsToolStripMenuItem.Name = "removeSomeAccountsToolStripMenuItem";
-			this.removeSomeAccountsToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
-			this.removeSomeAccountsToolStripMenuItem.Text = "Some Accounts";
-			this.removeSomeAccountsToolStripMenuItem.Click += new System.EventHandler(this.removeSomeAccountsToolStripMenuItem_Click);
-			// 
-			// liberateToolStripMenuItem
-			// 
-			this.liberateToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.removeLibraryBooksToolStripMenuItem.Name = "removeLibraryBooksToolStripMenuItem";
+            this.removeLibraryBooksToolStripMenuItem.Size = new System.Drawing.Size(247, 22);
+            this.removeLibraryBooksToolStripMenuItem.Text = "Remove Library Books";
+            this.removeLibraryBooksToolStripMenuItem.Click += new System.EventHandler(this.removeLibraryBooksToolStripMenuItem_Click);
+            // 
+            // removeAllAccountsToolStripMenuItem
+            // 
+            this.removeAllAccountsToolStripMenuItem.Name = "removeAllAccountsToolStripMenuItem";
+            this.removeAllAccountsToolStripMenuItem.Size = new System.Drawing.Size(157, 22);
+            this.removeAllAccountsToolStripMenuItem.Text = "All Accounts";
+            this.removeAllAccountsToolStripMenuItem.Click += new System.EventHandler(this.removeAllAccountsToolStripMenuItem_Click);
+            // 
+            // removeSomeAccountsToolStripMenuItem
+            // 
+            this.removeSomeAccountsToolStripMenuItem.Name = "removeSomeAccountsToolStripMenuItem";
+            this.removeSomeAccountsToolStripMenuItem.Size = new System.Drawing.Size(157, 22);
+            this.removeSomeAccountsToolStripMenuItem.Text = "Some Accounts";
+            this.removeSomeAccountsToolStripMenuItem.Click += new System.EventHandler(this.removeSomeAccountsToolStripMenuItem_Click);
+            // 
+            // liberateToolStripMenuItem
+            // 
+            this.liberateToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.beginBookBackupsToolStripMenuItem,
             this.beginPdfBackupsToolStripMenuItem,
             this.convertAllM4bToMp3ToolStripMenuItem});
-			this.liberateToolStripMenuItem.Name = "liberateToolStripMenuItem";
-			this.liberateToolStripMenuItem.Size = new System.Drawing.Size(61, 20);
-			this.liberateToolStripMenuItem.Text = "&Liberate";
-			// 
-			// beginBookBackupsToolStripMenuItem
-			// 
-			this.beginBookBackupsToolStripMenuItem.Name = "beginBookBackupsToolStripMenuItem";
-			this.beginBookBackupsToolStripMenuItem.Size = new System.Drawing.Size(293, 22);
-			this.beginBookBackupsToolStripMenuItem.Text = "Begin &Book and PDF Backups: {0}";
-			this.beginBookBackupsToolStripMenuItem.Click += new System.EventHandler(this.beginBookBackupsToolStripMenuItem_Click);
-			// 
-			// beginPdfBackupsToolStripMenuItem
-			// 
-			this.beginPdfBackupsToolStripMenuItem.Name = "beginPdfBackupsToolStripMenuItem";
-			this.beginPdfBackupsToolStripMenuItem.Size = new System.Drawing.Size(293, 22);
-			this.beginPdfBackupsToolStripMenuItem.Text = "Begin &PDF Only Backups: {0}";
-			this.beginPdfBackupsToolStripMenuItem.Click += new System.EventHandler(this.beginPdfBackupsToolStripMenuItem_Click);
-			// 
-			// convertAllM4bToMp3ToolStripMenuItem
-			// 
-			this.convertAllM4bToMp3ToolStripMenuItem.Name = "convertAllM4bToMp3ToolStripMenuItem";
-			this.convertAllM4bToMp3ToolStripMenuItem.Size = new System.Drawing.Size(293, 22);
-			this.convertAllM4bToMp3ToolStripMenuItem.Text = "Convert all M4b to Mp3 [Long-running]...";
-			this.convertAllM4bToMp3ToolStripMenuItem.Click += new System.EventHandler(this.convertAllM4bToMp3ToolStripMenuItem_Click);
-			// 
-			// exportToolStripMenuItem
-			// 
-			this.exportToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.liberateToolStripMenuItem.Name = "liberateToolStripMenuItem";
+            this.liberateToolStripMenuItem.Size = new System.Drawing.Size(61, 20);
+            this.liberateToolStripMenuItem.Text = "&Liberate";
+            // 
+            // beginBookBackupsToolStripMenuItem
+            // 
+            this.beginBookBackupsToolStripMenuItem.Name = "beginBookBackupsToolStripMenuItem";
+            this.beginBookBackupsToolStripMenuItem.Size = new System.Drawing.Size(293, 22);
+            this.beginBookBackupsToolStripMenuItem.Text = "Begin &Book and PDF Backups: {0}";
+            this.beginBookBackupsToolStripMenuItem.Click += new System.EventHandler(this.beginBookBackupsToolStripMenuItem_Click);
+            // 
+            // beginPdfBackupsToolStripMenuItem
+            // 
+            this.beginPdfBackupsToolStripMenuItem.Name = "beginPdfBackupsToolStripMenuItem";
+            this.beginPdfBackupsToolStripMenuItem.Size = new System.Drawing.Size(293, 22);
+            this.beginPdfBackupsToolStripMenuItem.Text = "Begin &PDF Only Backups: {0}";
+            this.beginPdfBackupsToolStripMenuItem.Click += new System.EventHandler(this.beginPdfBackupsToolStripMenuItem_Click);
+            // 
+            // convertAllM4bToMp3ToolStripMenuItem
+            // 
+            this.convertAllM4bToMp3ToolStripMenuItem.Name = "convertAllM4bToMp3ToolStripMenuItem";
+            this.convertAllM4bToMp3ToolStripMenuItem.Size = new System.Drawing.Size(293, 22);
+            this.convertAllM4bToMp3ToolStripMenuItem.Text = "Convert all M4b to Mp3 [Long-running]...";
+            this.convertAllM4bToMp3ToolStripMenuItem.Click += new System.EventHandler(this.convertAllM4bToMp3ToolStripMenuItem_Click);
+            // 
+            // exportToolStripMenuItem
+            // 
+            this.exportToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.exportLibraryToolStripMenuItem});
-			this.exportToolStripMenuItem.Name = "exportToolStripMenuItem";
-			this.exportToolStripMenuItem.Size = new System.Drawing.Size(53, 20);
-			this.exportToolStripMenuItem.Text = "E&xport";
-			// 
-			// exportLibraryToolStripMenuItem
-			// 
-			this.exportLibraryToolStripMenuItem.Name = "exportLibraryToolStripMenuItem";
-			this.exportLibraryToolStripMenuItem.Size = new System.Drawing.Size(156, 22);
-			this.exportLibraryToolStripMenuItem.Text = "E&xport Library...";
-			this.exportLibraryToolStripMenuItem.Click += new System.EventHandler(this.exportLibraryToolStripMenuItem_Click);
-			// 
-			// quickFiltersToolStripMenuItem
-			// 
-			this.quickFiltersToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.exportToolStripMenuItem.Name = "exportToolStripMenuItem";
+            this.exportToolStripMenuItem.Size = new System.Drawing.Size(53, 20);
+            this.exportToolStripMenuItem.Text = "E&xport";
+            // 
+            // exportLibraryToolStripMenuItem
+            // 
+            this.exportLibraryToolStripMenuItem.Name = "exportLibraryToolStripMenuItem";
+            this.exportLibraryToolStripMenuItem.Size = new System.Drawing.Size(156, 22);
+            this.exportLibraryToolStripMenuItem.Text = "E&xport Library...";
+            this.exportLibraryToolStripMenuItem.Click += new System.EventHandler(this.exportLibraryToolStripMenuItem_Click);
+            // 
+            // quickFiltersToolStripMenuItem
+            // 
+            this.quickFiltersToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.firstFilterIsDefaultToolStripMenuItem,
             this.editQuickFiltersToolStripMenuItem,
             this.toolStripSeparator1});
-			this.quickFiltersToolStripMenuItem.Name = "quickFiltersToolStripMenuItem";
-			this.quickFiltersToolStripMenuItem.Size = new System.Drawing.Size(84, 20);
-			this.quickFiltersToolStripMenuItem.Text = "Quick &Filters";
-			// 
-			// firstFilterIsDefaultToolStripMenuItem
-			// 
-			this.firstFilterIsDefaultToolStripMenuItem.Name = "firstFilterIsDefaultToolStripMenuItem";
-			this.firstFilterIsDefaultToolStripMenuItem.Size = new System.Drawing.Size(256, 22);
-			this.firstFilterIsDefaultToolStripMenuItem.Text = "Start Libation with 1st filter &Default";
-			this.firstFilterIsDefaultToolStripMenuItem.Click += new System.EventHandler(this.FirstFilterIsDefaultToolStripMenuItem_Click);
-			// 
-			// editQuickFiltersToolStripMenuItem
-			// 
-			this.editQuickFiltersToolStripMenuItem.Name = "editQuickFiltersToolStripMenuItem";
-			this.editQuickFiltersToolStripMenuItem.Size = new System.Drawing.Size(256, 22);
-			this.editQuickFiltersToolStripMenuItem.Text = "&Edit quick filters...";
-			this.editQuickFiltersToolStripMenuItem.Click += new System.EventHandler(this.EditQuickFiltersToolStripMenuItem_Click);
-			// 
-			// toolStripSeparator1
-			// 
-			this.toolStripSeparator1.Name = "toolStripSeparator1";
-			this.toolStripSeparator1.Size = new System.Drawing.Size(253, 6);
-			// 
-			// settingsToolStripMenuItem
-			// 
-			this.settingsToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.quickFiltersToolStripMenuItem.Name = "quickFiltersToolStripMenuItem";
+            this.quickFiltersToolStripMenuItem.Size = new System.Drawing.Size(84, 20);
+            this.quickFiltersToolStripMenuItem.Text = "Quick &Filters";
+            // 
+            // firstFilterIsDefaultToolStripMenuItem
+            // 
+            this.firstFilterIsDefaultToolStripMenuItem.Name = "firstFilterIsDefaultToolStripMenuItem";
+            this.firstFilterIsDefaultToolStripMenuItem.Size = new System.Drawing.Size(256, 22);
+            this.firstFilterIsDefaultToolStripMenuItem.Text = "Start Libation with 1st filter &Default";
+            this.firstFilterIsDefaultToolStripMenuItem.Click += new System.EventHandler(this.FirstFilterIsDefaultToolStripMenuItem_Click);
+            // 
+            // editQuickFiltersToolStripMenuItem
+            // 
+            this.editQuickFiltersToolStripMenuItem.Name = "editQuickFiltersToolStripMenuItem";
+            this.editQuickFiltersToolStripMenuItem.Size = new System.Drawing.Size(256, 22);
+            this.editQuickFiltersToolStripMenuItem.Text = "&Edit quick filters...";
+            this.editQuickFiltersToolStripMenuItem.Click += new System.EventHandler(this.EditQuickFiltersToolStripMenuItem_Click);
+            // 
+            // toolStripSeparator1
+            // 
+            this.toolStripSeparator1.Name = "toolStripSeparator1";
+            this.toolStripSeparator1.Size = new System.Drawing.Size(253, 6);
+            // 
+            // settingsToolStripMenuItem
+            // 
+            this.settingsToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.accountsToolStripMenuItem,
-            this.basicSettingsToolStripMenuItem});
-			this.settingsToolStripMenuItem.Name = "settingsToolStripMenuItem";
-			this.settingsToolStripMenuItem.Size = new System.Drawing.Size(61, 20);
-			this.settingsToolStripMenuItem.Text = "&Settings";
-			// 
-			// accountsToolStripMenuItem
-			// 
-			this.accountsToolStripMenuItem.Name = "accountsToolStripMenuItem";
-			this.accountsToolStripMenuItem.Size = new System.Drawing.Size(133, 22);
-			this.accountsToolStripMenuItem.Text = "&Accounts...";
-			this.accountsToolStripMenuItem.Click += new System.EventHandler(this.accountsToolStripMenuItem_Click);
-			// 
-			// basicSettingsToolStripMenuItem
-			// 
-			this.basicSettingsToolStripMenuItem.Name = "basicSettingsToolStripMenuItem";
-			this.basicSettingsToolStripMenuItem.Size = new System.Drawing.Size(133, 22);
-			this.basicSettingsToolStripMenuItem.Text = "&Settings...";
-			this.basicSettingsToolStripMenuItem.Click += new System.EventHandler(this.basicSettingsToolStripMenuItem_Click);
-			// 
-			// statusStrip1
-			// 
-			this.statusStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.basicSettingsToolStripMenuItem,
+            this.toolStripSeparator2,
+            this.aboutToolStripMenuItem});
+            this.settingsToolStripMenuItem.Name = "settingsToolStripMenuItem";
+            this.settingsToolStripMenuItem.Size = new System.Drawing.Size(61, 20);
+            this.settingsToolStripMenuItem.Text = "&Settings";
+            // 
+            // accountsToolStripMenuItem
+            // 
+            this.accountsToolStripMenuItem.Name = "accountsToolStripMenuItem";
+            this.accountsToolStripMenuItem.Size = new System.Drawing.Size(133, 22);
+            this.accountsToolStripMenuItem.Text = "&Accounts...";
+            this.accountsToolStripMenuItem.Click += new System.EventHandler(this.accountsToolStripMenuItem_Click);
+            // 
+            // basicSettingsToolStripMenuItem
+            // 
+            this.basicSettingsToolStripMenuItem.Name = "basicSettingsToolStripMenuItem";
+            this.basicSettingsToolStripMenuItem.Size = new System.Drawing.Size(133, 22);
+            this.basicSettingsToolStripMenuItem.Text = "&Settings...";
+            this.basicSettingsToolStripMenuItem.Click += new System.EventHandler(this.basicSettingsToolStripMenuItem_Click);
+            // 
+            // toolStripSeparator2
+            // 
+            this.toolStripSeparator2.Name = "toolStripSeparator2";
+            this.toolStripSeparator2.Size = new System.Drawing.Size(130, 6);
+            // 
+            // aboutToolStripMenuItem
+            // 
+            this.aboutToolStripMenuItem.Name = "aboutToolStripMenuItem";
+            this.aboutToolStripMenuItem.Size = new System.Drawing.Size(133, 22);
+            this.aboutToolStripMenuItem.Text = "A&bout...";
+            this.aboutToolStripMenuItem.Click += new System.EventHandler(this.aboutToolStripMenuItem_Click);
+            // 
+            // statusStrip1
+            // 
+            this.statusStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.visibleCountLbl,
             this.springLbl,
             this.backupsCountsLbl,
             this.pdfsCountsLbl});
-			this.statusStrip1.Location = new System.Drawing.Point(0, 517);
-			this.statusStrip1.Name = "statusStrip1";
-			this.statusStrip1.Padding = new System.Windows.Forms.Padding(1, 0, 16, 0);
-			this.statusStrip1.Size = new System.Drawing.Size(1007, 22);
-			this.statusStrip1.TabIndex = 6;
-			this.statusStrip1.Text = "statusStrip1";
-			// 
-			// visibleCountLbl
-			// 
-			this.visibleCountLbl.Name = "visibleCountLbl";
-			this.visibleCountLbl.Size = new System.Drawing.Size(53, 17);
-			this.visibleCountLbl.Text = "Visible: 0";
-			// 
-			// springLbl
-			// 
-			this.springLbl.Name = "springLbl";
-			this.springLbl.Size = new System.Drawing.Size(548, 17);
-			this.springLbl.Spring = true;
-			// 
-			// backupsCountsLbl
-			// 
-			this.backupsCountsLbl.Name = "backupsCountsLbl";
-			this.backupsCountsLbl.Size = new System.Drawing.Size(218, 17);
-			this.backupsCountsLbl.Text = "[Calculating backed up book quantities]";
-			// 
-			// pdfsCountsLbl
-			// 
-			this.pdfsCountsLbl.Name = "pdfsCountsLbl";
-			this.pdfsCountsLbl.Size = new System.Drawing.Size(171, 17);
-			this.pdfsCountsLbl.Text = "|  [Calculating backed up PDFs]";
-			// 
-			// addFilterBtn
-			// 
-			this.addFilterBtn.Location = new System.Drawing.Point(47, 31);
-			this.addFilterBtn.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
-			this.addFilterBtn.Name = "addFilterBtn";
-			this.addFilterBtn.Size = new System.Drawing.Size(163, 27);
-			this.addFilterBtn.TabIndex = 4;
-			this.addFilterBtn.Text = "Add To Quick Filters";
-			this.addFilterBtn.UseVisualStyleBackColor = true;
-			this.addFilterBtn.Click += new System.EventHandler(this.AddFilterBtn_Click);
-			// 
-			// Form1
-			// 
-			this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
-			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-			this.ClientSize = new System.Drawing.Size(1007, 539);
-			this.Controls.Add(this.filterBtn);
-			this.Controls.Add(this.addFilterBtn);
-			this.Controls.Add(this.filterSearchTb);
-			this.Controls.Add(this.filterHelpBtn);
-			this.Controls.Add(this.statusStrip1);
-			this.Controls.Add(this.gridPanel);
-			this.Controls.Add(this.menuStrip1);
-			this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
-			this.MainMenuStrip = this.menuStrip1;
-			this.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
-			this.Name = "Form1";
-			this.Text = "Libation: Liberate your Library";
-			this.Load += new System.EventHandler(this.Form1_Load);
-			this.menuStrip1.ResumeLayout(false);
-			this.menuStrip1.PerformLayout();
-			this.statusStrip1.ResumeLayout(false);
-			this.statusStrip1.PerformLayout();
-			this.ResumeLayout(false);
-			this.PerformLayout();
+            this.statusStrip1.Location = new System.Drawing.Point(0, 517);
+            this.statusStrip1.Name = "statusStrip1";
+            this.statusStrip1.Padding = new System.Windows.Forms.Padding(1, 0, 16, 0);
+            this.statusStrip1.Size = new System.Drawing.Size(1007, 22);
+            this.statusStrip1.TabIndex = 6;
+            this.statusStrip1.Text = "statusStrip1";
+            // 
+            // visibleCountLbl
+            // 
+            this.visibleCountLbl.Name = "visibleCountLbl";
+            this.visibleCountLbl.Size = new System.Drawing.Size(53, 17);
+            this.visibleCountLbl.Text = "Visible: 0";
+            // 
+            // springLbl
+            // 
+            this.springLbl.Name = "springLbl";
+            this.springLbl.Size = new System.Drawing.Size(548, 17);
+            this.springLbl.Spring = true;
+            // 
+            // backupsCountsLbl
+            // 
+            this.backupsCountsLbl.Name = "backupsCountsLbl";
+            this.backupsCountsLbl.Size = new System.Drawing.Size(218, 17);
+            this.backupsCountsLbl.Text = "[Calculating backed up book quantities]";
+            // 
+            // pdfsCountsLbl
+            // 
+            this.pdfsCountsLbl.Name = "pdfsCountsLbl";
+            this.pdfsCountsLbl.Size = new System.Drawing.Size(171, 17);
+            this.pdfsCountsLbl.Text = "|  [Calculating backed up PDFs]";
+            // 
+            // addFilterBtn
+            // 
+            this.addFilterBtn.Location = new System.Drawing.Point(47, 31);
+            this.addFilterBtn.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
+            this.addFilterBtn.Name = "addFilterBtn";
+            this.addFilterBtn.Size = new System.Drawing.Size(163, 27);
+            this.addFilterBtn.TabIndex = 4;
+            this.addFilterBtn.Text = "Add To Quick Filters";
+            this.addFilterBtn.UseVisualStyleBackColor = true;
+            this.addFilterBtn.Click += new System.EventHandler(this.AddFilterBtn_Click);
+            // 
+            // scanningToolStripMenuItem
+            // 
+            this.scanningToolStripMenuItem.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
+            this.scanningToolStripMenuItem.Enabled = false;
+            this.scanningToolStripMenuItem.Image = global::LibationWinForms.Properties.Resources.import_16x16;
+            this.scanningToolStripMenuItem.Name = "scanningToolStripMenuItem";
+            this.scanningToolStripMenuItem.Size = new System.Drawing.Size(93, 20);
+            this.scanningToolStripMenuItem.Text = "Scanning...";
+            this.scanningToolStripMenuItem.Visible = false;
+            // 
+            // Form1
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(1007, 539);
+            this.Controls.Add(this.filterBtn);
+            this.Controls.Add(this.addFilterBtn);
+            this.Controls.Add(this.filterSearchTb);
+            this.Controls.Add(this.filterHelpBtn);
+            this.Controls.Add(this.statusStrip1);
+            this.Controls.Add(this.gridPanel);
+            this.Controls.Add(this.menuStrip1);
+            this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
+            this.MainMenuStrip = this.menuStrip1;
+            this.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
+            this.Name = "Form1";
+            this.Text = "Libation: Liberate your Library";
+            this.Load += new System.EventHandler(this.Form1_Load);
+            this.menuStrip1.ResumeLayout(false);
+            this.menuStrip1.PerformLayout();
+            this.statusStrip1.ResumeLayout(false);
+            this.statusStrip1.PerformLayout();
+            this.ResumeLayout(false);
+            this.PerformLayout();
 
 		}
 
@@ -397,5 +425,8 @@
         private System.Windows.Forms.ToolStripMenuItem removeLibraryBooksToolStripMenuItem;
         private System.Windows.Forms.ToolStripMenuItem removeAllAccountsToolStripMenuItem;
         private System.Windows.Forms.ToolStripMenuItem removeSomeAccountsToolStripMenuItem;
-	}
+        private System.Windows.Forms.ToolStripSeparator toolStripSeparator2;
+        private System.Windows.Forms.ToolStripMenuItem aboutToolStripMenuItem;
+        private System.Windows.Forms.ToolStripMenuItem scanningToolStripMenuItem;
+    }
 }

LibationWinForms/Form1.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Threading.Tasks;
 using System.Windows.Forms;
 using ApplicationServices;
 using AudibleUtilities;
@@ -34,8 +35,9 @@ namespace LibationWinForms
 			this.FormClosing += (_, _) => this.SaveSizeAndLocation(Configuration.Instance);
 			LibraryCommands.LibrarySizeChanged += reloadGridAndUpdateBottomNumbers;
 			LibraryCommands.BookUserDefinedItemCommitted += setBackupCounts;
-			// used by async migrations to update ui when complete
-			DataLayer.UserDefinedItem.Batch_ItemChanged += reloadGridAndUpdateBottomNumbers;
+            QuickFilters.Updated += updateFiltersMenu;
+            LibraryCommands.ScanBegin += LibraryCommands_ScanBegin;
+            LibraryCommands.ScanEnd += LibraryCommands_ScanEnd;
 
 			var format = System.Drawing.Imaging.ImageFormat.Jpeg;
 			PictureStorage.SetDefaultImage(PictureSize._80x80, Properties.Resources.default_cover_80x80.ToBytes(format));
@@ -43,7 +45,7 @@ namespace LibationWinForms
 			PictureStorage.SetDefaultImage(PictureSize._500x500, Properties.Resources.default_cover_500x500.ToBytes(format));
 		}
 
-		private void Form1_Load(object sender, EventArgs e)
+        private void Form1_Load(object sender, EventArgs e)
 		{
 			if (this.DesignMode)
 				return;
@@ -61,7 +63,7 @@ namespace LibationWinForms
 			// suppressed filter while init'ing UI
 			var prev_isProcessingGridSelect = isProcessingGridSelect;
 			isProcessingGridSelect = true;
-			this.UIThreadSync(() => setGrid());
+			this.UIThreadSync(setGrid);
 			isProcessingGridSelect = prev_isProcessingGridSelect;
 
 			// UI init complete. now we can apply filter
@@ -71,22 +73,28 @@ namespace LibationWinForms
 		}
 
 		#region reload grid
-		private ProductsGrid currProductsGrid;
+		private ProductsGrid productsGrid;
 		private void setGrid()
 		{
 			SuspendLayout();
 			{
-				if (currProductsGrid != null)
+				// previous non-null grid with zero-count removes columns. remove/re-add grid to get columns back
+				if (productsGrid?.Count == 0)
 				{
-					gridPanel.Controls.Remove(currProductsGrid);
-					currProductsGrid.VisibleCountChanged -= setVisibleCount;
-					currProductsGrid.Dispose();
+					gridPanel.Controls.Remove(productsGrid);
+					productsGrid.VisibleCountChanged -= setVisibleCount;
+					productsGrid.Dispose();
+					productsGrid = null;
 				}
 
-				currProductsGrid = new ProductsGrid { Dock = DockStyle.Fill };
-				currProductsGrid.VisibleCountChanged += setVisibleCount;
-				gridPanel.UIThreadSync(() => gridPanel.Controls.Add(currProductsGrid));
-				currProductsGrid.Display();
+				if (productsGrid is null)
+				{
+					productsGrid = new ProductsGrid { Dock = DockStyle.Fill };
+					productsGrid.VisibleCountChanged += setVisibleCount;
+					gridPanel.UIThreadSync(() => gridPanel.Controls.Add(productsGrid));
+				}
+
+				productsGrid.Display();
 			}
 			ResumeLayout();
 		}
@@ -187,11 +195,7 @@ namespace LibationWinForms
 		#region filter
 		private void filterHelpBtn_Click(object sender, EventArgs e) => new SearchSyntaxDialog().ShowDialog();
 
-		private void AddFilterBtn_Click(object sender, EventArgs e)
-		{
-			QuickFilters.Add(this.filterSearchTb.Text);
-			UpdateFilterDropDown();
-		}
+		private void AddFilterBtn_Click(object sender, EventArgs e) => QuickFilters.Add(this.filterSearchTb.Text);
 
 		private void filterSearchTb_KeyPress(object sender, KeyPressEventArgs e)
 		{
@@ -214,12 +218,12 @@ namespace LibationWinForms
 		}
 		private void doFilter()
 		{
-			if (isProcessingGridSelect || currProductsGrid == null)
+			if (isProcessingGridSelect || productsGrid is null)
 				return;
 
 			try
 			{
-				currProductsGrid.Filter(filterSearchTb.Text);
+				productsGrid.Filter(filterSearchTb.Text);
 				lastGoodFilter = filterSearchTb.Text;
 			}
 			catch (Exception ex)
@@ -255,21 +259,21 @@ namespace LibationWinForms
 			new AccountsDialog(this).ShowDialog();
 		}
 
-		private void scanLibraryToolStripMenuItem_Click(object sender, EventArgs e)
-		{
-			using var persister = AudibleApiStorage.GetAccountsSettingsPersister();
-			var firstAccount = persister.AccountsSettings.GetAll().FirstOrDefault();
-			scanLibraries(firstAccount);
-		}
+		private async void scanLibraryToolStripMenuItem_Click(object sender, EventArgs e)
+        {
+            using var persister = AudibleApiStorage.GetAccountsSettingsPersister();
+            var firstAccount = persister.AccountsSettings.GetAll().FirstOrDefault();
+            await scanLibrariesAsync(firstAccount);
+        }
 
-		private void scanLibraryOfAllAccountsToolStripMenuItem_Click(object sender, EventArgs e)
+		private async void scanLibraryOfAllAccountsToolStripMenuItem_Click(object sender, EventArgs e)
 		{
 			using var persister = AudibleApiStorage.GetAccountsSettingsPersister();
 			var allAccounts = persister.AccountsSettings.GetAll();
-			scanLibraries(allAccounts);
+			await scanLibrariesAsync(allAccounts);
 		}
 
-		private void scanLibraryOfSomeAccountsToolStripMenuItem_Click(object sender, EventArgs e)
+		private async void scanLibraryOfSomeAccountsToolStripMenuItem_Click(object sender, EventArgs e)
 		{
 			using var scanAccountsDialog = new ScanAccountsDialog(this);
 
@@ -279,7 +283,7 @@ namespace LibationWinForms
 			if (!scanAccountsDialog.CheckedAccounts.Any())
 				return;
 
-			scanLibraries(scanAccountsDialog.CheckedAccounts);
+			await scanLibrariesAsync(scanAccountsDialog.CheckedAccounts);
 		}
 
 		private void removeLibraryBooksToolStripMenuItem_Click(object sender, EventArgs e)
@@ -325,20 +329,28 @@ namespace LibationWinForms
 			dialog.ShowDialog();
 		}
 
-		private void scanLibraries(IEnumerable<Account> accounts) => scanLibraries(accounts.ToArray());
-		private void scanLibraries(params Account[] accounts)
+		private async Task scanLibrariesAsync(IEnumerable<Account> accounts) => await scanLibrariesAsync(accounts.ToArray());
+		private async Task scanLibrariesAsync(params Account[] accounts)
 		{
-			using var dialog = new IndexLibraryDialog(accounts);
-			dialog.ShowDialog();
+			try
+			{
+				var (totalProcessed, newAdded) = await LibraryCommands.ImportAccountAsync(account => ApiExtended.CreateAsync(account, new Login.WinformLoginChoiceEager(account)), accounts);
 
-			var totalProcessed = dialog.TotalBooksProcessed;
-			var newAdded = dialog.NewBooksAdded;
-
-			MessageBox.Show($"Total processed: {totalProcessed}\r\nNew: {newAdded}");
+				// this is here instead of ScanEnd so that the following is only possible when it's user-initiated, not automatic loop
+				if (Configuration.Instance.ShowImportedStats && newAdded > 0)
+					MessageBox.Show($"Total processed: {totalProcessed}\r\nNew: {newAdded}");
+			}
+			catch (Exception ex)
+			{
+				MessageBoxAlertAdmin.Show(
+					"Error importing library. Please try again. If this still happens after 2 or 3 tries, stop and contact administrator",
+					"Error importing library",
+					ex);
+			}
 		}
 		#endregion
 
-		#region liberate menu
+		#region Liberate menu
 		private async void beginBookBackupsToolStripMenuItem_Click(object sender, EventArgs e)
 			=> await BookLiberation.ProcessorAutomationController.BackupAllBooksAsync();
 
@@ -399,7 +411,13 @@ namespace LibationWinForms
 		}
 		#endregion
 
-		#region quick filters menu
+		#region Quick Filters menu
+		private void FirstFilterIsDefaultToolStripMenuItem_Click(object sender, EventArgs e)
+		{
+			firstFilterIsDefaultToolStripMenuItem.Checked = !firstFilterIsDefaultToolStripMenuItem.Checked;
+			QuickFilters.UseDefault = firstFilterIsDefaultToolStripMenuItem.Checked;
+		}
+
 		private void loadInitialQuickFilterState()
 		{
 			// set inital state. do once only
@@ -409,18 +427,11 @@ namespace LibationWinForms
 			if (QuickFilters.UseDefault)
 				doFilter(QuickFilters.Filters.FirstOrDefault());
 
-			// do after every save
-			UpdateFilterDropDown();
-		}
-
-		private void FirstFilterIsDefaultToolStripMenuItem_Click(object sender, EventArgs e)
-		{
-			firstFilterIsDefaultToolStripMenuItem.Checked = !firstFilterIsDefaultToolStripMenuItem.Checked;
-			QuickFilters.UseDefault = firstFilterIsDefaultToolStripMenuItem.Checked;
+			updateFiltersMenu();
 		}
 
 		private object quickFilterTag { get; } = new object();
-		public void UpdateFilterDropDown()
+		private void updateFiltersMenu(object _ = null, object __ = null)
 		{
 			// remove old
 			for (var i = quickFiltersToolStripMenuItem.DropDownItems.Count - 1; i >= 0; i--)
@@ -447,10 +458,37 @@ namespace LibationWinForms
 		private void EditQuickFiltersToolStripMenuItem_Click(object sender, EventArgs e) => new EditQuickFilters(this).ShowDialog();
 		#endregion
 
-		#region settings menu
+		#region Settings menu
 		private void accountsToolStripMenuItem_Click(object sender, EventArgs e) => new AccountsDialog(this).ShowDialog();
 
 		private void basicSettingsToolStripMenuItem_Click(object sender, EventArgs e) => new SettingsDialog().ShowDialog();
-		#endregion
-	}
+
+        private void aboutToolStripMenuItem_Click(object sender, EventArgs e)
+			=> MessageBox.Show($"Running Libation version {AppScaffolding.LibationScaffolding.BuildVersion}", $"Libation v{AppScaffolding.LibationScaffolding.BuildVersion}");
+        #endregion
+
+        #region Scanning label
+		private void LibraryCommands_ScanBegin(object sender, int accountsLength)
+		{
+			scanLibraryToolStripMenuItem.Enabled = false;
+			scanLibraryOfAllAccountsToolStripMenuItem.Enabled = false;
+			scanLibraryOfSomeAccountsToolStripMenuItem.Enabled = false;
+
+			this.scanningToolStripMenuItem.Visible = true;
+			this.scanningToolStripMenuItem.Text
+				= (accountsLength == 1)
+				? "Scanning..."
+				: $"Scanning {accountsLength} accounts...";
+		}
+
+		private void LibraryCommands_ScanEnd(object sender, EventArgs e)
+		{
+			scanLibraryToolStripMenuItem.Enabled = true;
+			scanLibraryOfAllAccountsToolStripMenuItem.Enabled = true;
+			scanLibraryOfSomeAccountsToolStripMenuItem.Enabled = true;
+
+			this.scanningToolStripMenuItem.Visible = false;
+		}
+        #endregion
+    }
 }

LibationWinForms/LibationWinForms.csproj

@@ -3,12 +3,11 @@
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework>net5.0-windows</TargetFramework>
+    <TargetFramework>net6.0-windows</TargetFramework>
     <UseWindowsForms>true</UseWindowsForms>
     <ApplicationIcon>libation.ico</ApplicationIcon>
     <AssemblyName>Libation</AssemblyName>
 
-    <PublishTrimmed>true</PublishTrimmed>
     <PublishReadyToRun>true</PublishReadyToRun>
     <RuntimeIdentifier>win-x64</RuntimeIdentifier>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
@@ -29,7 +28,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Dinah.Core.WindowsDesktop" Version="2.0.2.2" />
+    <PackageReference Include="Dinah.Core.WindowsDesktop" Version="4.1.6.1" />
   </ItemGroup>
 
   <ItemGroup>

LibationWinForms/Program.cs

@@ -30,9 +30,7 @@ namespace LibationWinForms
 				//// Only use while debugging. Acts erratically in the wild
 				//AllocConsole();
 
-				Application.SetHighDpiMode(HighDpiMode.SystemAware);
-				Application.EnableVisualStyles();
-				Application.SetCompatibleTextRenderingDefault(false);
+				ApplicationConfiguration.Initialize();
 
 				//***********************************************//
 				//                                               //
@@ -140,9 +138,10 @@ namespace LibationWinForms
 				}
 			}
 
+			// INIT DEFAULT SETTINGS
 			// if 'new user' was clicked, or if 'returning user' chose new install: show basic settings dialog
 			config.Books ??= Path.Combine(defaultLibationFilesDir, "Books");
-			config.InProgress ??= Configuration.WinTemp;
+			AppScaffolding.LibationScaffolding.PopulateMissingConfigValues(config);
 
 			if (new SettingsDialog().ShowDialog() != DialogResult.OK)
 			{
@@ -159,136 +158,11 @@ namespace LibationWinForms
 		/// <summary>migrations which require Forms or are long-running</summary>
 		private static void RunWindowsOnlyMigrations(Configuration config)
 		{
-			// only supported in winforms. don't move to app scaffolding
-			migrate_to_v5_0_0(config);
-
-			// long running. won't get a chance to finish in cli. don't move to app scaffolding
-			migrate_to_v5_5_0(config);
+			// examples:
+			// - only supported in winforms. don't move to app scaffolding
+			// - long running. won't get a chance to finish in cli. don't move to app scaffolding
 		}
 
-		#region migrate to v5.0.0 re-register device if device info not in settings
-		private static void migrate_to_v5_0_0(Configuration config)
-		{
-			if (!File.Exists(AudibleApiStorage.AccountsSettingsFile))
-				return;
-
-			var accountsPersister = AudibleApiStorage.GetAccountsSettingsPersister();
-
-			var accounts = accountsPersister?.AccountsSettings?.Accounts;
-			if (accounts is null)
-				return;
-
-			foreach (var account in accounts)
-			{
-				var identity = account?.IdentityTokens;
-
-				if (identity is null)
-					continue;
-
-				if (!string.IsNullOrWhiteSpace(identity.DeviceType) &&
-					!string.IsNullOrWhiteSpace(identity.DeviceSerialNumber) &&
-					!string.IsNullOrWhiteSpace(identity.AmazonAccountId))
-					continue;
-
-				var authorize = new Authorize(identity.Locale);
-
-				try
-				{
-					authorize.DeregisterAsync(identity.ExistingAccessToken, identity.Cookies.ToKeyValuePair()).GetAwaiter().GetResult();
-					identity.Invalidate();
-
-					// re-registers device
-					ApiExtended.CreateAsync(account, new Login.WinformLoginChoiceEager(account)).GetAwaiter().GetResult();
-				}
-                catch
-                {
-					// Don't care if it fails
-                }
-			}
-		}
-		#endregion
-
-		#region migrate to v5.5.0. FilePaths.json => db. long running. fire and forget
-		private static void migrate_to_v5_5_0(Configuration config)
-			=> new System.Threading.Thread(() => migrate_to_v5_5_0_thread(config)) { IsBackground = true }.Start();
-		private static void migrate_to_v5_5_0_thread(Configuration config)
-		{
-			try
-			{
-				var filePaths = Path.Combine(config.LibationFiles, "FilePaths.json");
-				if (!File.Exists(filePaths))
-					return;
-
-				var fileLocations = Path.Combine(config.LibationFiles, "FileLocations.json");
-				if (!File.Exists(fileLocations))
-					File.Copy(filePaths, fileLocations);
-
-				// files to be deleted at the end
-				var libhackFilesToDelete = new List<string>();
-				// .libhack files => errors
-				var libhackFiles = Directory.EnumerateDirectories(config.Books, "*.libhack", SearchOption.AllDirectories);
-
-				using var context = ApplicationServices.DbContexts.GetContext();
-				context.Books.Load();
-
-				var jArr = JArray.Parse(File.ReadAllText(filePaths));
-
-				foreach (var jToken in jArr)
-				{
-					var asinToken = jToken["Id"];
-					var fileTypeToken = jToken["FileType"];
-					var pathToken = jToken["Path"];
-					if (asinToken is null || fileTypeToken is null || pathToken is null ||
-						asinToken.Type != JTokenType.String || fileTypeToken.Type != JTokenType.Integer || pathToken.Type != JTokenType.String)
-						continue;
-
-					var asin = asinToken.Value<string>();
-					var fileType = (FileType)fileTypeToken.Value<int>();
-					var path = pathToken.Value<string>();
-
-					if (fileType == FileType.Unknown || fileType == FileType.AAXC)
-						continue;
-
-					var book = context.Books.Local.FirstOrDefault(b => b.AudibleProductId == asin);
-					if (book is null)
-						continue;
-
-					// assign these strings and enums/ints unconditionally. EFCore will only update if changed
-					if (fileType == FileType.PDF)
-						book.UserDefinedItem.BatchMode_UpdatePdfStatus(LiberatedStatus.Liberated);
-
-					if (fileType == FileType.Audio)
-					{
-						var lhack = libhackFiles.FirstOrDefault(f => f.ContainsInsensitive(asin));
-						if (lhack is null)
-							book.UserDefinedItem.BatchMode_UpdateBookStatus(LiberatedStatus.Liberated);
-						else
-						{
-							book.UserDefinedItem.BatchMode_UpdateBookStatus(LiberatedStatus.Error);
-							libhackFilesToDelete.Add(lhack);
-						}
-					}
-				}
-
-				// in order: save to db, full reindex from db, refresh ui
-				var changed = context.SaveChanges();
-				if (changed > 0)
-					ApplicationServices.SearchEngineCommands.FullReIndex();
-				UserDefinedItem.BatchMode_Finalize();
-
-				// only do this after save changes
-				foreach (var libhackFile in libhackFilesToDelete)
-					File.Delete(libhackFile);
-
-				File.Delete(filePaths);
-			}
-			catch (Exception ex)
-			{
-				Log.Logger.Error(ex, "Error attempting to insert FilePaths into db");
-			}
-		}
-		#endregion
-
 		private static void checkForUpdate()
 		{
 			string zipUrl;

LibationWinForms/Properties/Resources.Designer.cs

@@ -19,7 +19,7 @@ namespace LibationWinForms.Properties {
     // class via a tool like ResGen or Visual Studio.
     // To add or remove a member, edit your .ResX file then rerun ResGen
     // with the /str option, or rebuild your VS project.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
     internal class Resources {
@@ -130,6 +130,16 @@ namespace LibationWinForms.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap import_16x16 {
+            get {
+                object obj = ResourceManager.GetObject("import_16x16", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>

LibationWinForms/Properties/Resources.resx

@@ -112,12 +112,12 @@
     <value>2.0</value>
   </resheader>
   <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
   <data name="default_cover_300x300" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\img-coverart-prod-unavailable_300x300.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -139,6 +139,9 @@
   <data name="edit_tags_50x50" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\edit-tags-50x50.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="import_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\import_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="liberate_green" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\liberate_green.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>

LibationWinForms/SyncBindingSource.cs

@@ -19,7 +19,7 @@ namespace LibationWinForms
 
         protected override void OnListChanged(ListChangedEventArgs e)
         {
-            if (syncContext != null)
+            if (syncContext is not null)
                 syncContext.Send(_ => base.OnListChanged(e), null);
             else
                 base.OnListChanged(e);

LibationWinForms/grid/EditTagsDataGridViewImageButtonColumn.cs

@@ -13,8 +13,8 @@ namespace LibationWinForms
 
 	internal class EditTagsDataGridViewImageButtonCell : DataGridViewImageButtonCell
 	{
-		private static readonly Image ButtonImage = Properties.Resources.edit_25x25;
-		private static readonly Color HiddenForeColor = Color.LightGray;
+		private static Image ButtonImage { get; } = Properties.Resources.edit_25x25;
+		private static Color HiddenForeColor { get; } = Color.LightGray;
 
 		protected override void Paint(Graphics graphics, Rectangle clipBounds, Rectangle cellBounds, int rowIndex, DataGridViewElementStates elementState, object value, object formattedValue, string errorText, DataGridViewCellStyle cellStyle, DataGridViewAdvancedBorderStyle advancedBorderStyle, DataGridViewPaintParts paintParts)
 		{