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

@@ -5,8 +5,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="AAXClean" Version="0.3.2" />
-    <PackageReference Include="AAXClean.Codecs" Version="0.1.10" />
+    <PackageReference Include="AAXClean" Version="0.4.6" />
+    <PackageReference Include="AAXClean.Codecs" Version="0.2.7" />
   </ItemGroup>
 
   <ItemGroup>

AaxDecrypter/AaxcDownloadConvertBase.cs

@@ -8,15 +8,10 @@ namespace AaxDecrypter
 	{
 		public event EventHandler<AppleTags> RetrievedMetadata;
 
-		protected OutputFormat OutputFormat { get; }
-
 		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)
@@ -30,6 +25,36 @@ namespace AaxDecrypter
 		{
 			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]");
@@ -51,7 +76,7 @@ namespace AaxDecrypter
 
 			OnDecryptProgressUpdate(zeroProgress);
 
-			AaxFile.SetDecryptionKey(DownloadLicense.AudibleKey, DownloadLicense.AudibleIV);
+			AaxFile.SetDecryptionKey(DownloadOptions.AudibleKey, DownloadOptions.AudibleIV);
 			return zeroProgress;
 		}
 
@@ -73,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

@@ -18,13 +18,13 @@ namespace AaxDecrypter
         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,
+        public AaxcDownloadMultiConverter(string outFileName, string cacheDirectory, DownloadOptions dlLic,
             Func<MultiConvertFileProperties, string> multipartFileNameCallback = null)
-			: base(outFileName, cacheDirectory, dlLic, outputFormat)
+			: 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,
@@ -61,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 = "";
@@ -86,40 +86,36 @@ 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);
                 ((NAudio.Lame.LameConfig)newSplitCallback.UserState).ID3.Track = chapterCount.ToString();
-            });
+            }, DownloadOptions.LameConfig, DownloadOptions.TrimOutputToChapterLength);
         }
 
         private void createOutputFileStream(int currentChapter, ChapterInfo splitChapters, NewSplitCallback newSplitCallback)
@@ -138,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

@@ -11,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,
@@ -32,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);
@@ -94,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)
@@ -111,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()
@@ -126,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();
 			}
 		}
@@ -141,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/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

@@ -3,7 +3,7 @@
 
   <PropertyGroup>
     <TargetFramework>net6.0-windows</TargetFramework>
-    <Version>7.0.0.1</Version>
+    <Version>7.2.0.1</Version>
   </PropertyGroup>
 
   <ItemGroup>

AppScaffolding/LibationScaffolding.cs

@@ -66,20 +66,53 @@ namespace AppScaffolding
 			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.DownloadEpisodes)))
-				config.DownloadEpisodes = true;
+			if (!config.Exists(nameof(config.ShowImportedStats)))
+				config.ShowImportedStats = true;
 
 			if (!config.Exists(nameof(config.ImportEpisodes)))
 				config.ImportEpisodes = true;
 
-			if (!config.Exists(nameof(config.SplitFilesByChapter)))
-				config.SplitFilesByChapter = false;
+			if (!config.Exists(nameof(config.DownloadEpisodes)))
+				config.DownloadEpisodes = true;
 
 			if (!config.Exists(nameof(config.FolderTemplate)))
 				config.FolderTemplate = Templates.Folder.DefaultTemplate;
@@ -89,9 +122,6 @@ namespace AppScaffolding
 
 			if (!config.Exists(nameof(config.ChapterFileTemplate)))
 				config.ChapterFileTemplate = Templates.ChapterFile.DefaultTemplate;
-
-			if (!config.Exists(nameof(config.ShowImportedStats)))
-				config.ShowImportedStats = true;
 		}
 
 		/// <summary>Initialize logging. Run after migration</summary>
@@ -104,7 +134,7 @@ namespace AppScaffolding
 
 		private static void ensureSerilogConfig(Configuration config)
 		{
-			if (config.GetObject("Serilog") != null)
+			if (config.GetObject("Serilog") is not null)
 				return;
 
 			var serilogObj = new JObject

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");
@@ -127,6 +146,7 @@ namespace ApplicationServices
 			{
 				stop();
 				var putBreakPointHere = logOutput;
+				ScanEnd?.Invoke(null, null);
 			}
 		}
 
@@ -176,6 +196,7 @@ namespace ApplicationServices
             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");

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

@@ -148,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);
 			}
 

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; }
 
@@ -216,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

@@ -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/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/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

@@ -172,7 +172,7 @@ 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)
 				{

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)

FileLiberator/AudioFileStorageExt.cs

@@ -39,7 +39,7 @@ namespace FileLiberator
         /// File name: final file name.
         /// </summary>
         public static string GetInProgressFilename(this AudioFileStorage _, LibraryBook libraryBook, string extension)
-            => Templates.File.GetFilename(libraryBook.ToDto(), AudibleFileStorage.DecryptInProgressDirectory, extension);
+            => Templates.File.GetFilename(libraryBook.ToDto(), AudibleFileStorage.DecryptInProgressDirectory, extension, returnFirstExisting: true);
 
         /// <summary>
         /// PDF: audio file does not exist

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,37 +91,15 @@ 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;
 
                 if (contentLic.DrmType != AudibleApi.Common.DrmType.Adrm)
@@ -124,12 +107,12 @@ namespace FileLiberator
                 else
                 {
                     AaxcDownloadConvertBase converter
-                        = Configuration.Instance.SplitFilesByChapter ? new AaxcDownloadMultiConverter(
-                            outFileName, cacheDir, audiobookDlLic, outputFormat,
+                        = config.SplitFilesByChapter ? new AaxcDownloadMultiConverter(
+                            outFileName, cacheDir, audiobookDlLic,
                             AudibleFileStorage.Audio.CreateMultipartRenamerFunc(libraryBook))
-                        : new AaxcDownloadSingleConverter(outFileName, cacheDir, audiobookDlLic, outputFormat);
+                        : new AaxcDownloadSingleConverter(outFileName, cacheDir, audiobookDlLic);
 
-                    if (Configuration.Instance.AllowLibationFixup)
+                    if (config.AllowLibationFixup)
                         converter.RetrievedMetadata += (_, tags) => tags.Generes = string.Join(", ", libraryBook.Book.CategoriesNames);
 
                     abDownloader = converter;
@@ -137,7 +120,6 @@ namespace FileLiberator
 
                 abDownloader.DecryptProgressUpdate += OnStreamingProgressChanged;
                 abDownloader.DecryptTimeRemaining += OnStreamingTimeRemaining;
-
                 abDownloader.RetrievedTitle += OnTitleDiscovered;
                 abDownloader.RetrievedAuthors += OnAuthorsDiscovered;
                 abDownloader.RetrievedNarrators += OnNarratorsDiscovered;
@@ -154,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)

FileManager/FileNamingTemplate.cs

@@ -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)

FileManager/FileUtility.cs

@@ -48,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));
 
@@ -69,7 +69,7 @@ namespace FileManager
             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;

LibationFileManager/AudibleFileStorage.cs

@@ -78,7 +78,7 @@ namespace LibationFileManager
                 .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

LibationFileManager/FilePathCache.cs

@@ -42,7 +42,7 @@ namespace LibationFileManager
 			}
         }
 
-        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/PictureStorage.cs

@@ -70,7 +70,7 @@ namespace LibationFileManager
 		{
 			lock (cacheLocker)
 			{
-				if (!cache.ContainsKey(def) || cache[def] == null)
+				if (!cache.ContainsKey(def) || cache[def] is null)
 				{
 					var path = getPath(def);
 					var bytes

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

@@ -230,9 +230,9 @@ namespace LibationFileManager
 
             #region to file name
             /// <summary>USES LIVE CONFIGURATION VALUES</summary>
-            public string GetFilename(LibraryBookDto libraryBookDto, string dirFullPath, string extension)
+            public string GetFilename(LibraryBookDto libraryBookDto, string dirFullPath, string extension, bool returnFirstExisting = false)
                 => getFileNamingTemplate(libraryBookDto, Configuration.Instance.FileTemplate, dirFullPath, extension)
-                .GetFilePath();
+                .GetFilePath(returnFirstExisting);
             #endregion
         }
 

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/Dialogs/EditQuickFilters.cs

@@ -53,7 +53,6 @@ namespace LibationWinForms.Dialogs
 				.ToList();
 			QuickFilters.ReplaceAll(list);
 
-			_parent.UpdateFilterDropDown();
 			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/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.cs

@@ -34,6 +34,10 @@ namespace LibationWinForms.Dialogs
 			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(
@@ -47,14 +51,30 @@ namespace LibationWinForms.Dialogs
 				"Books");
 			booksSelectControl.SelectDirectory(config.Books);
 
+			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;
+
+			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;
-			allowLibationFixupCbox.Checked = config.AllowLibationFixup;
-			convertLosslessRb.Checked = !config.DecryptToLossy;
-			convertLossyRb.Checked = config.DecryptToLossy;
-			splitFilesByChapterCbox.Checked = config.SplitFilesByChapter;
 
+			lameTargetRb_CheckedChanged(this, e);
+			LameMatchSourceBRCbox_CheckedChanged(this, e);
+			convertFormatRb_CheckedChanged(this, e);
 			allowLibationFixupCbox_CheckedChanged(this, e);
 
 			inProgressSelectControl.SetDirectoryItems(new()
@@ -90,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);
@@ -168,12 +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;
@@ -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,21 +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;
-
-			if (Configuration.Instance.ShowImportedStats)
-				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();
 
@@ -400,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
@@ -410,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--)
@@ -448,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

@@ -28,7 +28,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Dinah.Core.WindowsDesktop" Version="4.0.6.1" />
+    <PackageReference Include="Dinah.Core.WindowsDesktop" Version="4.1.6.1" />
   </ItemGroup>
 
   <ItemGroup>

LibationWinForms/Program.cs

@@ -158,135 +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();
-
-				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.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)
 		{

LibationWinForms/grid/GridEntry.cs

@@ -10,6 +10,7 @@ using Dinah.Core.DataBinding;
 using Dinah.Core;
 using Dinah.Core.Drawing;
 using LibationFileManager;
+using System.Threading.Tasks;
 
 namespace LibationWinForms
 {
@@ -24,8 +25,7 @@ namespace LibationWinForms
 		[Browsable(false)]
 		public string AudibleProductId => Book.AudibleProductId;
 		[Browsable(false)]
-		public LibraryBook LibraryBook { get; }
-
+		public LibraryBook LibraryBook { get; private set; }
 		#endregion
 
 		#region Model properties exposed to the view
@@ -40,17 +40,18 @@ namespace LibationWinForms
 			}
 		}
 
-		public string ProductRating { get; }
-		public string PurchaseDate { get; }
-		public string MyRating { get; }
-		public string Series { get; }
-		public string Title { get; }
-		public string Length { get; }
-		public string Authors { get; }
-		public string Narrators { get; }
-		public string Category { get; }
-		public string Misc { get; }
-		public string Description { get; }
+		public bool DownloadInProgress { get; private set; }
+		public string ProductRating { get; private set; }
+		public string PurchaseDate { get; private set; }
+		public string MyRating { get; private set; }
+		public string Series { get; private set; }
+		public string Title { get; private set; }
+		public string Length { get; private set; }
+		public string Authors { get; private set; }
+		public string Narrators { get; private set; }
+		public string Category { get; private set; }
+		public string Misc { get; private set; }
+		public string Description { get; private set; }
 		public string DisplayTags
 		{
 			get => string.Join("\r\n", Book.UserDefinedItem.TagsEnumerated);
@@ -68,30 +69,57 @@ namespace LibationWinForms
 				LibraryBook.Book.UserDefinedItem.PdfStatus = value.PdfStatus;
 			}
 		}
-
 		#endregion
 
+		public event EventHandler<string> LibraryBookUpdated;
 		public event EventHandler Committed;
 
+		// alias
 		private Book Book => LibraryBook.Book;
 
-		public GridEntry(LibraryBook libraryBook)
+		public GridEntry(LibraryBook libraryBook) => setLibraryBook(libraryBook);
+
+		public async Task DownloadBook()
+		{
+			if (!DownloadInProgress)
+			{
+				try
+				{
+					DownloadInProgress = true;
+					await BookLiberation.ProcessorAutomationController.BackupSingleBookAsync(LibraryBook);
+				}
+				finally
+				{
+					DownloadInProgress = false;
+				}
+			}
+		}
+
+		public void UpdateLibraryBook(LibraryBook libraryBook)
+		{
+			if (AudibleProductId != libraryBook.Book.AudibleProductId)
+				throw new Exception("Invalid grid entry update. IDs must match");
+
+			setLibraryBook(libraryBook);
+		}
+
+		private void setLibraryBook(LibraryBook libraryBook)
 		{
 			LibraryBook = libraryBook;
 			_memberValues = CreateMemberValueDictionary();
 
-			//Get cover art. If it's default, subscribe to PictureCached
+			// Get cover art. If it's default, subscribe to PictureCached
 			{
 				(bool isDefault, byte[] picture) = PictureStorage.GetPicture(new PictureDefinition(Book.PictureId, PictureSize._80x80));
 
 				if (isDefault)
 					PictureStorage.PictureCached += PictureStorage_PictureCached;
 
-				//Mutable property. Set the field so PropertyChanged isn't fired.
+				// Mutable property. Set the field so PropertyChanged isn't fired.
 				_cover = ImageReader.ToImage(picture);
 			}
 
-			//Immutable properties
+			// Immutable properties
 			{
 				Title = Book.Title;
 				Series = Book.SeriesNames;
@@ -107,6 +135,9 @@ namespace LibationWinForms
 			}
 
 			UserDefinedItem.ItemChanged += UserDefinedItem_ItemChanged;
+
+			// this will never have a value when triggered by ctor b/c nothing can subscribe to the event until after ctor is complete
+			LibraryBookUpdated?.Invoke(this, AudibleProductId);
 		}
 
 		private void PictureStorage_PictureCached(object sender, PictureCachedEventArgs e)
@@ -134,22 +165,16 @@ namespace LibationWinForms
 			switch (itemName)
 			{
 				case nameof(udi.Tags):
-					{
-						Book.UserDefinedItem.Tags = udi.Tags;
-						NotifyPropertyChanged(nameof(DisplayTags));
-					}
+					Book.UserDefinedItem.Tags = udi.Tags;
+					NotifyPropertyChanged(nameof(DisplayTags));
 					break;
 				case nameof(udi.BookStatus):
-					{
-						Book.UserDefinedItem.BookStatus = udi.BookStatus;
-						NotifyPropertyChanged(nameof(Liberate));
-					}
+					Book.UserDefinedItem.BookStatus = udi.BookStatus;
+					NotifyPropertyChanged(nameof(Liberate));
 					break;
 				case nameof(udi.PdfStatus):
-					{
-						Book.UserDefinedItem.PdfStatus = udi.PdfStatus;
-						NotifyPropertyChanged(nameof(Liberate));
-					}
+					Book.UserDefinedItem.PdfStatus = udi.PdfStatus;
+					NotifyPropertyChanged(nameof(Liberate));
 					break;
 			}
 
@@ -195,15 +220,15 @@ namespace LibationWinForms
 		public virtual object GetMemberValue(string memberName) => _memberValues[memberName]();
 		public virtual IComparer GetMemberComparer(Type memberType) => _memberTypeComparers[memberType];
 
-		private Dictionary<string, Func<object>> _memberValues { get; }
+		private Dictionary<string, Func<object>> _memberValues { get; set; }
 
 		/// <summary>
 		/// Create getters for all member object values by name
 		/// </summary>
 		private Dictionary<string, Func<object>> CreateMemberValueDictionary() => new()
 		{
-			{ nameof(Title), () => GetSortName(Book.Title) },
-			{ nameof(Series), () => GetSortName(Book.SeriesNames) },
+			{ nameof(Title), () => Book.TitleSortable },
+			{ nameof(Series), () => Book.SeriesSortable },
 			{ nameof(Length), () => Book.LengthInMinutes },
 			{ nameof(MyRating), () => Book.UserDefinedItem.Rating.FirstScore },
 			{ nameof(PurchaseDate), () => LibraryBook.DateAdded },
@@ -227,21 +252,6 @@ namespace LibationWinForms
 			{ typeof(LiberatedStatus), new ObjectComparer<LiberatedStatus>() },
 		};
 
-		private static readonly string[] _sortPrefixIgnores = { "the", "a", "an" };
-		private 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;
-		}
-
 		#endregion
 
 		#region Static library display functions

LibationWinForms/grid/LiberateDataGridViewImageButtonColumn.cs

@@ -1,5 +1,4 @@
-using ApplicationServices;
-using System;
+using System;
 using System.Drawing;
 using System.Windows.Forms;
 using System.Linq;

LibationWinForms/grid/ProductsGrid.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 using System.Windows.Forms;
@@ -38,7 +39,7 @@ namespace LibationWinForms
 			InitializeComponent();
 
 			// sorting breaks filters. must reapply filters after sorting
-			_dataGridView.Sorted += (_, __) => Filter();
+			_dataGridView.Sorted += Filter;
 			_dataGridView.CellContentClick += DataGridView_CellContentClick;
 
 			EnableDoubleBuffering();
@@ -88,7 +89,7 @@ namespace LibationWinForms
 			}
 
 			// else: liberate
-			await BookLiberation.ProcessorAutomationController.BackupSingleBookAsync(libraryBook);
+			await liveGridEntry.DownloadBook();
 		}
 
 		private static void Details_Click(GridEntry liveGridEntry)
@@ -107,25 +108,18 @@ namespace LibationWinForms
 
 		#endregion
 
-		private SortableBindingList<GridEntry> bindingList;
-
-		/// <summary>Insert ad hoc library books to top of grid</summary>
-		public void AddToTop(DataLayer.LibraryBook libraryBook) => bindingList.Insert(0, new GridEntry(libraryBook));
-
 		#region UI display functions
 
-		private bool hasBeenDisplayed = false;
+		public int Count { get; private set; }
+
+		private SortableBindingList<GridEntry> bindingList;
+
 		public void Display()
 		{
-			if (hasBeenDisplayed)
-				return;
-			hasBeenDisplayed = true;
-
-			//
-			// transform into sorted GridEntry.s BEFORE binding
-			//
 			var lib = DbContexts.GetLibrary_Flat_NoTracking();
 
+			Count = lib.Count;
+
 			// if no data. hide all columns. return
 			if (!lib.Any())
 			{
@@ -134,35 +128,72 @@ namespace LibationWinForms
 				return;
 			}
 
-			var orderedGridEntries = lib
-				.Select(lb =>
-				{
-					var entry = new GridEntry(lb);
-					entry.Committed += (_, __) => Filter();
-					return entry;
-				}).ToList()
+			var orderedBooks = lib
 				// default load order
-				.OrderByDescending(ge => (DateTime)ge.GetMemberValue(nameof(ge.PurchaseDate)))
+				.OrderByDescending(lb => lb.DateAdded)
 				//// more advanced example: sort by author, then series, then title
-				//.OrderBy(ge => ge.Authors)
-				//    .ThenBy(ge => ge.Series)
-				//    .ThenBy(ge => ge.Title)
+				//.OrderBy(lb => lb.Book.AuthorNames)
+				//    .ThenBy(lb => lb.Book.SeriesSortable)
+				//    .ThenBy(lb => lb.Book.TitleSortable)
 				.ToList();
 
 			// BIND
-			bindingList = new SortableBindingList<GridEntry>(orderedGridEntries);
-			gridEntryBindingSource.DataSource = bindingList;
+			if (bindingList is null)
+				bindToGrid(orderedBooks);
+			else
+				updateGrid(orderedBooks);
 
 			// FILTER
 			Filter();
 		}
 
-		#endregion
+        private void bindToGrid(List<DataLayer.LibraryBook> orderedBooks)
+        {
+            bindingList = new SortableBindingList<GridEntry>(orderedBooks.Select(lb => toGridEntry(lb)));
+            gridEntryBindingSource.DataSource = bindingList;
+        }
 
-		#region Filter
+        private void updateGrid(List<DataLayer.LibraryBook> orderedBooks)
+        {
+            for (var i = orderedBooks.Count - 1; i >= 0; i--)
+            {
+                var libraryBook = orderedBooks[i];
+                var existingItem = bindingList.FirstOrDefault(i => i.AudibleProductId == libraryBook.Book.AudibleProductId);
 
-		private string _filterSearchString;
-		private void Filter() => Filter(_filterSearchString);
+                // add new to top
+                if (existingItem is null)
+                    bindingList.Insert(0, toGridEntry(libraryBook));
+                // update existing
+                else
+                    existingItem.UpdateLibraryBook(libraryBook);
+            }
+
+            // remove deleted from grid. note: actual deletion from db must still occur via the RemoveBook feature. deleting from audible will not trigger this
+            var oldIds = bindingList.Select(ge => ge.AudibleProductId).ToList();
+            var newIds = orderedBooks.Select(lb => lb.Book.AudibleProductId).ToList();
+            var remove = oldIds.Except(newIds).ToList();
+            foreach (var id in remove)
+            {
+                var oldItem = bindingList.FirstOrDefault(ge => ge.AudibleProductId == id);
+                if (oldItem is not null)
+                    bindingList.Remove(oldItem);
+            }
+        }
+
+        private GridEntry toGridEntry(DataLayer.LibraryBook libraryBook)
+		{
+			var entry = new GridEntry(libraryBook);
+			entry.Committed += Filter;
+			entry.LibraryBookUpdated += (sender, productId) => _dataGridView.InvalidateRow(_dataGridView.GetRowIdOfBoundItem((GridEntry)sender));
+			return entry;
+		}
+
+        #endregion
+
+        #region Filter
+
+        private string _filterSearchString;
+		private void Filter(object _ = null, EventArgs __ = null) => Filter(_filterSearchString);
 		public void Filter(string searchString)
 		{
 			_filterSearchString = searchString;
@@ -184,7 +215,7 @@ namespace LibationWinForms
 				});
 			}
 
-			//Causes repainting of the DataGridView
+			// Causes repainting of the DataGridView
 			bindingContext.ResumeBinding();
 			VisibleCountChanged?.Invoke(this, _dataGridView.AsEnumerable().Count(r => r.Visible));
 		}