Bug fix #657 : Settings dialog size was recently changed. Save and Cancel buttons were pushed outside of the dialog's bounds

Fix query parsing tags with underscores (#655)

.github/workflows/build-windows.yml

@@ -75,6 +75,7 @@ jobs:
               LibationCli/LibationCli.csproj `
               --configuration ${{ env.DOTNET_CONFIGURATION }} `
               --output bin/Publish/${{ matrix.os }}-${{ matrix.release_name }} `
+              -p:DefineConstants="${{ matrix.release_name }}" `
               -p:PublishProfile=LibationCli/Properties/PublishProfiles/${{ matrix.os }}Profile.pubxml
           dotnet publish `
               Hangover${{ matrix.ui }}/Hangover${{ matrix.ui }}.csproj `

Source/AppScaffolding/AppScaffolding.csproj

@@ -2,7 +2,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>net7.0</TargetFramework>
-    <Version>10.5.0.1</Version>
+    <Version>10.5.1.1</Version>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Octokit" Version="6.0.0" />

Source/AppScaffolding/LibationScaffolding.cs

@@ -90,28 +90,18 @@ namespace AppScaffolding
 		}
 
 		/// <summary>Initialize logging. Wire-up events. Run after migration</summary>
-		public static void RunPostMigrationScaffolding(Configuration config)
+		public static void RunPostMigrationScaffolding(Variety variety, Configuration config)
 		{
+			Variety = Enum.IsDefined(variety) ? variety : Variety.None;
+
+			var releaseID = (ReleaseIdentifier)((int)variety | (int)Configuration.OS | (int)RuntimeInformation.ProcessArchitecture);
+
+			ReleaseIdentifier = Enum.IsDefined(releaseID) ? releaseID : ReleaseIdentifier.None;
+
 			ensureSerilogConfig(config);
 			configureLogging(config);
 			logStartupState(config);
 
-			#region Determine Libation Variery and Release ID
-
-			Variety = File.Exists("System.Windows.Forms.dll") ? Variety.Classic : Variety.Chardonnay;
-
-			var releaseID = (ReleaseIdentifier)((int)Variety | (int)Configuration.OS | (int)RuntimeInformation.ProcessArchitecture);
-
-			if (Enum.IsDefined(releaseID))
-				ReleaseIdentifier = releaseID;
-			else
-			{
-				ReleaseIdentifier = ReleaseIdentifier.None;
-				Serilog.Log.Logger.Warning("Unknown release identifier @{DebugInfo}", new { Variety, Configuration.OS, RuntimeInformation.ProcessArchitecture });
-			}
-
-			#endregion
-
 			// all else should occur after logging
 
 			wireUpSystemEvents(config);

Source/HangoverAvalonia/Views/MainWindow.axaml.cs

@@ -13,7 +13,7 @@ namespace HangoverAvalonia.Views
 
 			var config = LibationScaffolding.RunPreConfigMigrations();
 			LibationScaffolding.RunPostConfigMigrations(config);
-			LibationScaffolding.RunPostMigrationScaffolding(config);
+			LibationScaffolding.RunPostMigrationScaffolding(Variety.Chardonnay, config);
 		}
 
 		public void OnLoad()

Source/HangoverWinForms/Form1.cs

@@ -10,7 +10,7 @@ namespace HangoverWinForms
 
             var config = LibationScaffolding.RunPreConfigMigrations();
             LibationScaffolding.RunPostConfigMigrations(config);
-            LibationScaffolding.RunPostMigrationScaffolding(config);
+            LibationScaffolding.RunPostMigrationScaffolding(Variety.Classic, config);
 
             databaseTab.VisibleChanged += databaseTab_VisibleChanged;
             cliTab.VisibleChanged += cliTab_VisibleChanged;

Source/LibationAvalonia/App.axaml.cs

@@ -141,7 +141,7 @@ namespace LibationAvalonia
 			await MessageBox.VerboseLoggingWarning_ShowIfTrue();
 
 			// logging is init'd here
-			AppScaffolding.LibationScaffolding.RunPostMigrationScaffolding(config);
+			AppScaffolding.LibationScaffolding.RunPostMigrationScaffolding(AppScaffolding.Variety.Chardonnay, config);
 		}
 
 		private void ShowLibationFilesDialog(IClassicDesktopStyleApplicationLifetime desktop, Configuration config, Action<IClassicDesktopStyleApplicationLifetime, LibationFilesDialog, Configuration> OnClose)

Source/LibationAvalonia/Program.cs

@@ -73,9 +73,9 @@ namespace LibationAvalonia
 			{
 				// most migrations go in here
 				LibationScaffolding.RunPostConfigMigrations(config);
-				LibationScaffolding.RunPostMigrationScaffolding(config);
+				LibationScaffolding.RunPostMigrationScaffolding(Variety.Chardonnay, config);
 
-				return LibationScaffolding.ReleaseIdentifier is not ReleaseIdentifier.None;
+				return true;
 			}
 			catch (Exception exDebug)
 			{

Source/LibationCli/Setup.cs

@@ -17,9 +17,13 @@ namespace LibationCli
 			//***********************************************//
 			var config = LibationScaffolding.RunPreConfigMigrations();
 
-
 			LibationScaffolding.RunPostConfigMigrations(config);
-			LibationScaffolding.RunPostMigrationScaffolding(config);
+
+#if classic
+			LibationScaffolding.RunPostMigrationScaffolding(Variety.Classic, config);
+#else
+			LibationScaffolding.RunPostMigrationScaffolding(Variety.Chardonnay, config);
+#endif
 		}
 
 		public static Type[] LoadVerbs() => Assembly.GetExecutingAssembly()

Source/LibationSearchEngine/QuerySanitizer.cs

@@ -2,10 +2,11 @@
 using Lucene.Net.Analysis.Tokenattributes;
 using System.Collections.Generic;
 using System.Linq;
+using System.Text.RegularExpressions;
 
 namespace LibationSearchEngine
 {
-	internal static class QuerySanitizer
+	internal static partial class QuerySanitizer
 	{
 		private static readonly HashSet<string> idTerms
 			= SearchEngine.FieldIndexRules.IdFieldNames
@@ -23,11 +24,17 @@ namespace LibationSearchEngine
 			.Select(n => n.ToLowerInvariant())
 			.ToHashSet();
 
+		private static readonly Regex tagRegex = TagRegex();
+
 		internal static string Sanitize(string searchString, StandardAnalyzer analyzer)
 		{
 			if (string.IsNullOrWhiteSpace(searchString))
 				return SearchEngine.ALL_QUERY;
 
+			//Replace a block tags with tags with proper tag query syntax
+			//eg: [foo] -> tags:foo
+			searchString = tagRegex.Replace(searchString, $"{SearchEngine.TAGS}:$1 ");
+
 			// range operator " TO " and bool operators " AND " and " OR " must be uppercase
 			searchString
 				= searchString
@@ -76,11 +83,6 @@ namespace LibationSearchEngine
 					addUnalteredToken(offset);
 					previousIsTags = false;
 				}
-				else if (tryParseBlockTag(offset, partList, searchString, out var tagName))
-				{
-					//The term is a block tag. add it to the part list
-					partList.Add($"{SearchEngine.TAGS}:{tagName}");
-				}
 				else if (double.TryParse(term, out var num))
 				{
 					//Term is a number so pad it with zeros
@@ -117,35 +119,7 @@ namespace LibationSearchEngine
 				partList.Add(searchString.Substring(offset.StartOffset, offset.EndOffset - offset.StartOffset));			
 		}
 
-		private static bool tryParseBlockTag(IOffsetAttribute offset, List<string> partList, string searchString, out string tagName)
-		{
-			tagName = null;
-			if (partList.Count == 0) return false;
-
-			var previous = partList[^1].TrimEnd();
-
-			//cannot be preceeded by an escaping \
-			if (previous.Length == 0) return false;
-			if (previous[^1] != '[' || (previous.Length > 1 && previous[^2] == '\\')) return false;
-
-			var next = searchString.Substring(offset.EndOffset);
-			if (next.Length == 0 || !next.TrimStart().StartsWith(']')) return false;
-
-			tagName = searchString.Substring(offset.StartOffset, offset.EndOffset - offset.StartOffset);
-
-			//Only legal tag characters are letters, numbers and underscores
-			//Per DataLayer.UserDefinedItem.IllegalCharacterRegex()
-			foreach (var c in tagName)
-			{
-				if (!char.IsLetterOrDigit(c) && c != '_')
-					return false;
-			}
-
-			//Remove the leading '['
-			partList[^1] = previous[..^1];
-			//Ignore the trailing ']'
-			offset.SetOffset(offset.StartOffset, searchString.IndexOf(']', offset.EndOffset) + 1);
-			return true;
-		}
+		[GeneratedRegex(@"(?<!\\)\[\u0020*(\w+)\u0020*\]", RegexOptions.Compiled)]
+		private static partial Regex TagRegex();
 	}
 }

Source/LibationWinForms/Dialogs/SettingsDialog.AudioSettings.cs

@@ -5,165 +5,165 @@ using LibationUiBase;
 
 namespace LibationWinForms.Dialogs
 {
-	partial class SettingsDialog
-	{
-		private void Load_AudioSettings(Configuration config)
-		{
-			this.fileDownloadQualityLbl.Text = desc(nameof(config.FileDownloadQuality));
-			this.allowLibationFixupCbox.Text = desc(nameof(config.AllowLibationFixup));
-			this.createCueSheetCbox.Text = desc(nameof(config.CreateCueSheet));
-			this.downloadCoverArtCbox.Text = desc(nameof(config.DownloadCoverArt));
-			this.retainAaxFileCbox.Text = desc(nameof(config.RetainAaxFile));
-			this.splitFilesByChapterCbox.Text = desc(nameof(config.SplitFilesByChapter));
-			this.mergeOpeningEndCreditsCbox.Text = desc(nameof(config.MergeOpeningAndEndCredits));
-			this.stripAudibleBrandingCbox.Text = desc(nameof(config.StripAudibleBrandAudio));
-			this.stripUnabridgedCbox.Text = desc(nameof(config.StripUnabridged));
-			this.moveMoovAtomCbox.Text = desc(nameof(config.MoveMoovToBeginning));
+    partial class SettingsDialog
+    {
+        private void Load_AudioSettings(Configuration config)
+        {
+            this.fileDownloadQualityLbl.Text = desc(nameof(config.FileDownloadQuality));
+            this.allowLibationFixupCbox.Text = desc(nameof(config.AllowLibationFixup));
+            this.createCueSheetCbox.Text = desc(nameof(config.CreateCueSheet));
+            this.downloadCoverArtCbox.Text = desc(nameof(config.DownloadCoverArt));
+            this.retainAaxFileCbox.Text = desc(nameof(config.RetainAaxFile));
+            this.splitFilesByChapterCbox.Text = desc(nameof(config.SplitFilesByChapter));
+            this.mergeOpeningEndCreditsCbox.Text = desc(nameof(config.MergeOpeningAndEndCredits));
+            this.stripAudibleBrandingCbox.Text = desc(nameof(config.StripAudibleBrandAudio));
+            this.stripUnabridgedCbox.Text = desc(nameof(config.StripUnabridged));
+            this.moveMoovAtomCbox.Text = desc(nameof(config.MoveMoovToBeginning));
 
-			fileDownloadQualityCb.Items.AddRange(
-				new object[]
-				{
-					Configuration.DownloadQuality.Normal,
-					Configuration.DownloadQuality.High
-				});
+            fileDownloadQualityCb.Items.AddRange(
+                new object[]
+                {
+                    Configuration.DownloadQuality.Normal,
+                    Configuration.DownloadQuality.High
+                });
 
-			clipsBookmarksFormatCb.Items.AddRange(
-				new object[]
-				{
-					Configuration.ClipBookmarkFormat.CSV,
-					Configuration.ClipBookmarkFormat.Xlsx,
-					Configuration.ClipBookmarkFormat.Json
-				});
+            clipsBookmarksFormatCb.Items.AddRange(
+                new object[]
+                {
+                    Configuration.ClipBookmarkFormat.CSV,
+                    Configuration.ClipBookmarkFormat.Xlsx,
+                    Configuration.ClipBookmarkFormat.Json
+                });
 
-			maxSampleRateCb.Items.AddRange(
-				Enum.GetValues<AAXClean.SampleRate>()
-				.Select(v => new EnumDiaplay<AAXClean.SampleRate>(v, $"{(int)v} Hz"))
-				.ToArray());
+            maxSampleRateCb.Items.AddRange(
+                Enum.GetValues<AAXClean.SampleRate>()
+                .Select(v => new EnumDiaplay<AAXClean.SampleRate>(v, $"{(int)v} Hz"))
+                .ToArray());
 
-			encoderQualityCb.Items.AddRange(
-				new object[]
-				{
-					NAudio.Lame.EncoderQuality.High,
-					NAudio.Lame.EncoderQuality.Standard,
-					NAudio.Lame.EncoderQuality.Fast,
-				});
+            encoderQualityCb.Items.AddRange(
+                new object[]
+                {
+                    NAudio.Lame.EncoderQuality.High,
+                    NAudio.Lame.EncoderQuality.Standard,
+                    NAudio.Lame.EncoderQuality.Fast,
+                });
 
-			allowLibationFixupCbox.Checked = config.AllowLibationFixup;
-			createCueSheetCbox.Checked = config.CreateCueSheet;
-			downloadCoverArtCbox.Checked = config.DownloadCoverArt;
-			downloadClipsBookmarksCbox.Checked = config.DownloadClipsBookmarks;
-			fileDownloadQualityCb.SelectedItem = config.FileDownloadQuality;
-			clipsBookmarksFormatCb.SelectedItem = config.ClipsBookmarksFileFormat;
-			retainAaxFileCbox.Checked = config.RetainAaxFile;
-			splitFilesByChapterCbox.Checked = config.SplitFilesByChapter;
-			mergeOpeningEndCreditsCbox.Checked = config.MergeOpeningAndEndCredits;
-			stripUnabridgedCbox.Checked = config.StripUnabridged;
-			stripAudibleBrandingCbox.Checked = config.StripAudibleBrandAudio;
-			convertLosslessRb.Checked = !config.DecryptToLossy;
-			convertLossyRb.Checked = config.DecryptToLossy;
-			moveMoovAtomCbox.Checked = config.MoveMoovToBeginning;
+            allowLibationFixupCbox.Checked = config.AllowLibationFixup;
+            createCueSheetCbox.Checked = config.CreateCueSheet;
+            downloadCoverArtCbox.Checked = config.DownloadCoverArt;
+            downloadClipsBookmarksCbox.Checked = config.DownloadClipsBookmarks;
+            fileDownloadQualityCb.SelectedItem = config.FileDownloadQuality;
+            clipsBookmarksFormatCb.SelectedItem = config.ClipsBookmarksFileFormat;
+            retainAaxFileCbox.Checked = config.RetainAaxFile;
+            splitFilesByChapterCbox.Checked = config.SplitFilesByChapter;
+            mergeOpeningEndCreditsCbox.Checked = config.MergeOpeningAndEndCredits;
+            stripUnabridgedCbox.Checked = config.StripUnabridged;
+            stripAudibleBrandingCbox.Checked = config.StripAudibleBrandAudio;
+            convertLosslessRb.Checked = !config.DecryptToLossy;
+            convertLossyRb.Checked = config.DecryptToLossy;
+            moveMoovAtomCbox.Checked = config.MoveMoovToBeginning;
 
-			lameTargetBitrateRb.Checked = config.LameTargetBitrate;
-			lameTargetQualityRb.Checked = !config.LameTargetBitrate;
+            lameTargetBitrateRb.Checked = config.LameTargetBitrate;
+            lameTargetQualityRb.Checked = !config.LameTargetBitrate;
 
-			maxSampleRateCb.SelectedItem
-				= maxSampleRateCb.Items
-				.Cast<EnumDiaplay<AAXClean.SampleRate>>()
-				.SingleOrDefault(v => v.Value == config.MaxSampleRate)
-				?? maxSampleRateCb.Items[0];
+            maxSampleRateCb.SelectedItem
+                = maxSampleRateCb.Items
+                .Cast<EnumDiaplay<AAXClean.SampleRate>>()
+                .SingleOrDefault(v => v.Value == config.MaxSampleRate)
+                ?? maxSampleRateCb.Items[0];
 
-			encoderQualityCb.SelectedItem = config.LameEncoderQuality;
-			lameDownsampleMonoCbox.Checked = config.LameDownsampleMono;
-			lameBitrateTb.Value = config.LameBitrate;
-			lameConstantBitrateCbox.Checked = config.LameConstantBitrate;
-			LameMatchSourceBRCbox.Checked = config.LameMatchSourceBR;
-			lameVBRQualityTb.Value = config.LameVBRQuality;
+            encoderQualityCb.SelectedItem = config.LameEncoderQuality;
+            lameDownsampleMonoCbox.Checked = config.LameDownsampleMono;
+            lameBitrateTb.Value = config.LameBitrate;
+            lameConstantBitrateCbox.Checked = config.LameConstantBitrate;
+            LameMatchSourceBRCbox.Checked = config.LameMatchSourceBR;
+            lameVBRQualityTb.Value = config.LameVBRQuality;
 
-			chapterTitleTemplateGb.Text = desc(nameof(config.ChapterTitleTemplate));
-			chapterTitleTemplateTb.Text = config.ChapterTitleTemplate;
+            chapterTitleTemplateGb.Text = desc(nameof(config.ChapterTitleTemplate));
+            chapterTitleTemplateTb.Text = config.ChapterTitleTemplate;
 
-			lameTargetRb_CheckedChanged(this, EventArgs.Empty);
-			LameMatchSourceBRCbox_CheckedChanged(this, EventArgs.Empty);
-			convertFormatRb_CheckedChanged(this, EventArgs.Empty);
-			allowLibationFixupCbox_CheckedChanged(this, EventArgs.Empty);
-			splitFilesByChapterCbox_CheckedChanged(this, EventArgs.Empty);
-			downloadClipsBookmarksCbox_CheckedChanged(this, EventArgs.Empty);
-		}
+            lameTargetRb_CheckedChanged(this, EventArgs.Empty);
+            LameMatchSourceBRCbox_CheckedChanged(this, EventArgs.Empty);
+            convertFormatRb_CheckedChanged(this, EventArgs.Empty);
+            allowLibationFixupCbox_CheckedChanged(this, EventArgs.Empty);
+            splitFilesByChapterCbox_CheckedChanged(this, EventArgs.Empty);
+            downloadClipsBookmarksCbox_CheckedChanged(this, EventArgs.Empty);
+        }
 
-		private void Save_AudioSettings(Configuration config)
-		{
-			config.AllowLibationFixup = allowLibationFixupCbox.Checked;
-			config.CreateCueSheet = createCueSheetCbox.Checked;
-			config.DownloadCoverArt = downloadCoverArtCbox.Checked;
-			config.DownloadClipsBookmarks = downloadClipsBookmarksCbox.Checked;
-			config.FileDownloadQuality = (Configuration.DownloadQuality)fileDownloadQualityCb.SelectedItem;
-			config.ClipsBookmarksFileFormat = (Configuration.ClipBookmarkFormat)clipsBookmarksFormatCb.SelectedItem;
-			config.RetainAaxFile = retainAaxFileCbox.Checked;
-			config.SplitFilesByChapter = splitFilesByChapterCbox.Checked;
-			config.MergeOpeningAndEndCredits = mergeOpeningEndCreditsCbox.Checked;
-			config.StripUnabridged = stripUnabridgedCbox.Checked;
-			config.StripAudibleBrandAudio = stripAudibleBrandingCbox.Checked;
-			config.DecryptToLossy = convertLossyRb.Checked;
-			config.MoveMoovToBeginning = moveMoovAtomCbox.Checked;
-			config.LameTargetBitrate = lameTargetBitrateRb.Checked;
-			config.MaxSampleRate = ((EnumDiaplay<AAXClean.SampleRate>)maxSampleRateCb.SelectedItem).Value;
-			config.LameEncoderQuality = (NAudio.Lame.EncoderQuality)encoderQualityCb.SelectedItem;
-			config.LameDownsampleMono = lameDownsampleMonoCbox.Checked;
-			config.LameBitrate = lameBitrateTb.Value;
-			config.LameConstantBitrate = lameConstantBitrateCbox.Checked;
-			config.LameMatchSourceBR = LameMatchSourceBRCbox.Checked;
-			config.LameVBRQuality = lameVBRQualityTb.Value;
+        private void Save_AudioSettings(Configuration config)
+        {
+            config.AllowLibationFixup = allowLibationFixupCbox.Checked;
+            config.CreateCueSheet = createCueSheetCbox.Checked;
+            config.DownloadCoverArt = downloadCoverArtCbox.Checked;
+            config.DownloadClipsBookmarks = downloadClipsBookmarksCbox.Checked;
+            config.FileDownloadQuality = (Configuration.DownloadQuality)fileDownloadQualityCb.SelectedItem;
+            config.ClipsBookmarksFileFormat = (Configuration.ClipBookmarkFormat)clipsBookmarksFormatCb.SelectedItem;
+            config.RetainAaxFile = retainAaxFileCbox.Checked;
+            config.SplitFilesByChapter = splitFilesByChapterCbox.Checked;
+            config.MergeOpeningAndEndCredits = mergeOpeningEndCreditsCbox.Checked;
+            config.StripUnabridged = stripUnabridgedCbox.Checked;
+            config.StripAudibleBrandAudio = stripAudibleBrandingCbox.Checked;
+            config.DecryptToLossy = convertLossyRb.Checked;
+            config.MoveMoovToBeginning = moveMoovAtomCbox.Checked;
+            config.LameTargetBitrate = lameTargetBitrateRb.Checked;
+            config.MaxSampleRate = ((EnumDiaplay<AAXClean.SampleRate>)maxSampleRateCb.SelectedItem).Value;
+            config.LameEncoderQuality = (NAudio.Lame.EncoderQuality)encoderQualityCb.SelectedItem;
+            config.LameDownsampleMono = lameDownsampleMonoCbox.Checked;
+            config.LameBitrate = lameBitrateTb.Value;
+            config.LameConstantBitrate = lameConstantBitrateCbox.Checked;
+            config.LameMatchSourceBR = LameMatchSourceBRCbox.Checked;
+            config.LameVBRQuality = lameVBRQualityTb.Value;
 
-			config.ChapterTitleTemplate = chapterTitleTemplateTb.Text;
-		}
+            config.ChapterTitleTemplate = chapterTitleTemplateTb.Text;
+        }
 
 
-		private void downloadClipsBookmarksCbox_CheckedChanged(object sender, EventArgs e)
-		{
-			clipsBookmarksFormatCb.Enabled = downloadClipsBookmarksCbox.Checked;
-		}
+        private void downloadClipsBookmarksCbox_CheckedChanged(object sender, EventArgs e)
+        {
+            clipsBookmarksFormatCb.Enabled = downloadClipsBookmarksCbox.Checked;
+        }
 
-		private void lameTargetRb_CheckedChanged(object sender, EventArgs e)
-		{
-			lameBitrateGb.Enabled = lameTargetBitrateRb.Checked;
-			lameQualityGb.Enabled = !lameTargetBitrateRb.Checked;
-		}
+        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;
-		}
+        private void LameMatchSourceBRCbox_CheckedChanged(object sender, EventArgs e)
+        {
+            lameBitrateTb.Enabled = !LameMatchSourceBRCbox.Checked;
+        }
 
-		private void splitFilesByChapterCbox_CheckedChanged(object sender, EventArgs e)
-		{
-			chapterTitleTemplateGb.Enabled = splitFilesByChapterCbox.Checked;
-		}
+        private void splitFilesByChapterCbox_CheckedChanged(object sender, EventArgs e)
+        {
+            chapterTitleTemplateGb.Enabled = splitFilesByChapterCbox.Checked;
+        }
 
-		private void chapterTitleTemplateBtn_Click(object sender, EventArgs e)
-			=> editTemplate(TemplateEditor<Templates.ChapterTitleTemplate>.CreateNameEditor(chapterTitleTemplateTb.Text), chapterTitleTemplateTb);
+        private void chapterTitleTemplateBtn_Click(object sender, EventArgs e)
+            => editTemplate(TemplateEditor<Templates.ChapterTitleTemplate>.CreateNameEditor(chapterTitleTemplateTb.Text), chapterTitleTemplateTb);
 
-		private void convertFormatRb_CheckedChanged(object sender, EventArgs e)
-		{
-			moveMoovAtomCbox.Enabled = convertLosslessRb.Checked;
-			lameTargetRb_CheckedChanged(sender, e);
-			LameMatchSourceBRCbox_CheckedChanged(sender, e);
-		}
-		private void allowLibationFixupCbox_CheckedChanged(object sender, EventArgs e)
-		{
-			audiobookFixupsGb.Enabled = allowLibationFixupCbox.Checked;
-			convertLosslessRb.Enabled = allowLibationFixupCbox.Checked;
-			convertLossyRb.Enabled = allowLibationFixupCbox.Checked;
-			splitFilesByChapterCbox.Enabled = allowLibationFixupCbox.Checked;
-			stripUnabridgedCbox.Enabled = allowLibationFixupCbox.Checked;
-			stripAudibleBrandingCbox.Enabled = allowLibationFixupCbox.Checked;
+        private void convertFormatRb_CheckedChanged(object sender, EventArgs e)
+        {
+            moveMoovAtomCbox.Enabled = convertLosslessRb.Checked;
+            lameTargetRb_CheckedChanged(sender, e);
+            LameMatchSourceBRCbox_CheckedChanged(sender, e);
+        }
+        private void allowLibationFixupCbox_CheckedChanged(object sender, EventArgs e)
+        {
+            audiobookFixupsGb.Enabled = allowLibationFixupCbox.Checked;
+            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;
-			}
-		}
-	}
+            if (!allowLibationFixupCbox.Checked)
+            {
+                convertLosslessRb.Checked = true;
+                splitFilesByChapterCbox.Checked = false;
+                stripUnabridgedCbox.Checked = false;
+                stripAudibleBrandingCbox.Checked = false;
+            }
+        }
+    }
 }

Source/LibationWinForms/Dialogs/SettingsDialog.DownloadDecrypt.cs

@@ -5,78 +5,78 @@ using LibationFileManager;
 
 namespace LibationWinForms.Dialogs
 {
-	public partial class SettingsDialog
-	{
-		private void folderTemplateBtn_Click(object sender, EventArgs e)
-			=> editTemplate(TemplateEditor<Templates.FolderTemplate>.CreateFilenameEditor(config.Books, folderTemplateTb.Text), folderTemplateTb);
-		private void fileTemplateBtn_Click(object sender, EventArgs e)
-			=> editTemplate(TemplateEditor<Templates.FileTemplate>.CreateFilenameEditor(config.Books, fileTemplateTb.Text), fileTemplateTb);
-		private void chapterFileTemplateBtn_Click(object sender, EventArgs e)
-			=> editTemplate(TemplateEditor<Templates.ChapterFileTemplate>.CreateFilenameEditor(config.Books, chapterFileTemplateTb.Text), chapterFileTemplateTb);
+    public partial class SettingsDialog
+    {
+        private void folderTemplateBtn_Click(object sender, EventArgs e)
+            => editTemplate(TemplateEditor<Templates.FolderTemplate>.CreateFilenameEditor(config.Books, folderTemplateTb.Text), folderTemplateTb);
+        private void fileTemplateBtn_Click(object sender, EventArgs e)
+            => editTemplate(TemplateEditor<Templates.FileTemplate>.CreateFilenameEditor(config.Books, fileTemplateTb.Text), fileTemplateTb);
+        private void chapterFileTemplateBtn_Click(object sender, EventArgs e)
+            => editTemplate(TemplateEditor<Templates.ChapterFileTemplate>.CreateFilenameEditor(config.Books, chapterFileTemplateTb.Text), chapterFileTemplateTb);
 
-		private void editCharreplacementBtn_Click(object sender, EventArgs e)
-		{
-			var form = new EditReplacementChars(config);
-			form.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
-			form.ShowDialog(this);
-		}
+        private void editCharreplacementBtn_Click(object sender, EventArgs e)
+        {
+            var form = new EditReplacementChars(config);
+            form.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
+            form.ShowDialog(this);
+        }
 
-		private void Load_DownloadDecrypt(Configuration config)
-		{
-			inProgressDescLbl.Text = desc(nameof(config.InProgress));
-			editCharreplacementBtn.Text = desc(nameof(config.ReplacementCharacters));
+        private void Load_DownloadDecrypt(Configuration config)
+        {
+            inProgressDescLbl.Text = desc(nameof(config.InProgress));
+            editCharreplacementBtn.Text = desc(nameof(config.ReplacementCharacters));
 
-			badBookGb.Text = desc(nameof(config.BadBook));
-			badBookAskRb.Text = Configuration.BadBookAction.Ask.GetDescription();
-			badBookAbortRb.Text = Configuration.BadBookAction.Abort.GetDescription();
-			badBookRetryRb.Text = Configuration.BadBookAction.Retry.GetDescription();
-			badBookIgnoreRb.Text = Configuration.BadBookAction.Ignore.GetDescription();
-			useCoverAsFolderIconCb.Text = desc(nameof(config.UseCoverAsFolderIcon));
+            badBookGb.Text = desc(nameof(config.BadBook));
+            badBookAskRb.Text = Configuration.BadBookAction.Ask.GetDescription();
+            badBookAbortRb.Text = Configuration.BadBookAction.Abort.GetDescription();
+            badBookRetryRb.Text = Configuration.BadBookAction.Retry.GetDescription();
+            badBookIgnoreRb.Text = Configuration.BadBookAction.Ignore.GetDescription();
+            useCoverAsFolderIconCb.Text = desc(nameof(config.UseCoverAsFolderIcon));
 
-			inProgressSelectControl.SetDirectoryItems(new()
-			{
-				Configuration.KnownDirectories.WinTemp,
-				Configuration.KnownDirectories.UserProfile,
-				Configuration.KnownDirectories.AppDir,
-				Configuration.KnownDirectories.MyDocs,
-				Configuration.KnownDirectories.LibationFiles
-			}, Configuration.KnownDirectories.WinTemp);
-			inProgressSelectControl.SelectDirectory(config.InProgress);
+            inProgressSelectControl.SetDirectoryItems(new()
+            {
+                Configuration.KnownDirectories.WinTemp,
+                Configuration.KnownDirectories.UserProfile,
+                Configuration.KnownDirectories.AppDir,
+                Configuration.KnownDirectories.MyDocs,
+                Configuration.KnownDirectories.LibationFiles
+            }, Configuration.KnownDirectories.WinTemp);
+            inProgressSelectControl.SelectDirectory(config.InProgress);
 
-			var rb = config.BadBook switch
-			{
-				Configuration.BadBookAction.Ask => this.badBookAskRb,
-				Configuration.BadBookAction.Abort => this.badBookAbortRb,
-				Configuration.BadBookAction.Retry => this.badBookRetryRb,
-				Configuration.BadBookAction.Ignore => this.badBookIgnoreRb,
-				_ => this.badBookAskRb
-			};
-			rb.Checked = true;
+            var rb = config.BadBook switch
+            {
+                Configuration.BadBookAction.Ask => this.badBookAskRb,
+                Configuration.BadBookAction.Abort => this.badBookAbortRb,
+                Configuration.BadBookAction.Retry => this.badBookRetryRb,
+                Configuration.BadBookAction.Ignore => this.badBookIgnoreRb,
+                _ => this.badBookAskRb
+            };
+            rb.Checked = true;
 
-			folderTemplateLbl.Text = desc(nameof(config.FolderTemplate));
-			fileTemplateLbl.Text = desc(nameof(config.FileTemplate));
-			chapterFileTemplateLbl.Text = desc(nameof(config.ChapterFileTemplate));
-			folderTemplateTb.Text = config.FolderTemplate;
-			fileTemplateTb.Text = config.FileTemplate;
-			chapterFileTemplateTb.Text = config.ChapterFileTemplate;
-			useCoverAsFolderIconCb.Checked = config.UseCoverAsFolderIcon;
-		}
+            folderTemplateLbl.Text = desc(nameof(config.FolderTemplate));
+            fileTemplateLbl.Text = desc(nameof(config.FileTemplate));
+            chapterFileTemplateLbl.Text = desc(nameof(config.ChapterFileTemplate));
+            folderTemplateTb.Text = config.FolderTemplate;
+            fileTemplateTb.Text = config.FileTemplate;
+            chapterFileTemplateTb.Text = config.ChapterFileTemplate;
+            useCoverAsFolderIconCb.Checked = config.UseCoverAsFolderIcon;
+        }
 
-		private void Save_DownloadDecrypt(Configuration config)
-		{
-			config.InProgress = inProgressSelectControl.SelectedDirectory;
+        private void Save_DownloadDecrypt(Configuration config)
+        {
+            config.InProgress = inProgressSelectControl.SelectedDirectory;
 
-			config.BadBook
-				= badBookAskRb.Checked ? Configuration.BadBookAction.Ask
-				: badBookAbortRb.Checked ? Configuration.BadBookAction.Abort
-				: badBookRetryRb.Checked ? Configuration.BadBookAction.Retry
-				: badBookIgnoreRb.Checked ? Configuration.BadBookAction.Ignore
-				: Configuration.BadBookAction.Ask;
+            config.BadBook
+                = badBookAskRb.Checked ? Configuration.BadBookAction.Ask
+                : badBookAbortRb.Checked ? Configuration.BadBookAction.Abort
+                : badBookRetryRb.Checked ? Configuration.BadBookAction.Retry
+                : badBookIgnoreRb.Checked ? Configuration.BadBookAction.Ignore
+                : Configuration.BadBookAction.Ask;
 
-			config.FolderTemplate = folderTemplateTb.Text;
-			config.FileTemplate = fileTemplateTb.Text;
-			config.ChapterFileTemplate = chapterFileTemplateTb.Text;
-			config.UseCoverAsFolderIcon = useCoverAsFolderIconCb.Checked;
-		}
-	}
+            config.FolderTemplate = folderTemplateTb.Text;
+            config.FileTemplate = fileTemplateTb.Text;
+            config.ChapterFileTemplate = chapterFileTemplateTb.Text;
+            config.UseCoverAsFolderIcon = useCoverAsFolderIconCb.Checked;
+        }
+    }
 }

Source/LibationWinForms/Dialogs/SettingsDialog.ImportLibrary.cs

@@ -5,29 +5,29 @@ using System.Linq;
 
 namespace LibationWinForms.Dialogs
 {
-	public partial class SettingsDialog
-	{
-		private void Load_ImportLibrary(Configuration config)
-		{
-			this.autoScanCb.Text = desc(nameof(config.AutoScan));
-			this.showImportedStatsCb.Text = desc(nameof(config.ShowImportedStats));
-			this.importEpisodesCb.Text = desc(nameof(config.ImportEpisodes));
-			this.downloadEpisodesCb.Text = desc(nameof(config.DownloadEpisodes));
-			this.autoDownloadEpisodesCb.Text = desc(nameof(config.AutoDownloadEpisodes));
+    public partial class SettingsDialog
+    {
+        private void Load_ImportLibrary(Configuration config)
+        {
+            this.autoScanCb.Text = desc(nameof(config.AutoScan));
+            this.showImportedStatsCb.Text = desc(nameof(config.ShowImportedStats));
+            this.importEpisodesCb.Text = desc(nameof(config.ImportEpisodes));
+            this.downloadEpisodesCb.Text = desc(nameof(config.DownloadEpisodes));
+            this.autoDownloadEpisodesCb.Text = desc(nameof(config.AutoDownloadEpisodes));
 
-			autoScanCb.Checked = config.AutoScan;
-			showImportedStatsCb.Checked = config.ShowImportedStats;
-			importEpisodesCb.Checked = config.ImportEpisodes;
-			downloadEpisodesCb.Checked = config.DownloadEpisodes;
-			autoDownloadEpisodesCb.Checked = config.AutoDownloadEpisodes;
-		}
-		private void Save_ImportLibrary(Configuration config)
-		{
-			config.AutoScan = autoScanCb.Checked;
-			config.ShowImportedStats = showImportedStatsCb.Checked;
-			config.ImportEpisodes = importEpisodesCb.Checked;
-			config.DownloadEpisodes = downloadEpisodesCb.Checked;
-			config.AutoDownloadEpisodes = autoDownloadEpisodesCb.Checked;
-		}
-	}
+            autoScanCb.Checked = config.AutoScan;
+            showImportedStatsCb.Checked = config.ShowImportedStats;
+            importEpisodesCb.Checked = config.ImportEpisodes;
+            downloadEpisodesCb.Checked = config.DownloadEpisodes;
+            autoDownloadEpisodesCb.Checked = config.AutoDownloadEpisodes;
+        }
+        private void Save_ImportLibrary(Configuration config)
+        {
+            config.AutoScan = autoScanCb.Checked;
+            config.ShowImportedStats = showImportedStatsCb.Checked;
+            config.ImportEpisodes = importEpisodesCb.Checked;
+            config.DownloadEpisodes = downloadEpisodesCb.Checked;
+            config.AutoDownloadEpisodes = autoDownloadEpisodesCb.Checked;
+        }
+    }
 }

Source/LibationWinForms/Dialogs/SettingsDialog.Important.cs

@@ -9,104 +9,104 @@ using System.Windows.Forms;
 
 namespace LibationWinForms.Dialogs
 {
-	public partial class SettingsDialog
-	{
-		private void logsBtn_Click(object sender, EventArgs e) => Go.To.Folder(((LongPath)Configuration.Instance.LibationFiles).ShortPathName);
+    public partial class SettingsDialog
+    {
+        private void logsBtn_Click(object sender, EventArgs e) => Go.To.Folder(((LongPath)Configuration.Instance.LibationFiles).ShortPathName);
 
-		private void Load_Important(Configuration config)
-		{
-			{
-				loggingLevelCb.Items.Clear();
-				foreach (var level in Enum<Serilog.Events.LogEventLevel>.GetValues())
-					loggingLevelCb.Items.Add(level);
-				loggingLevelCb.SelectedItem = config.LogLevel;
-			}
+        private void Load_Important(Configuration config)
+        {
+            {
+                loggingLevelCb.Items.Clear();
+                foreach (var level in Enum<Serilog.Events.LogEventLevel>.GetValues())
+                    loggingLevelCb.Items.Add(level);
+                loggingLevelCb.SelectedItem = config.LogLevel;
+            }
 
-			booksLocationDescLbl.Text = desc(nameof(config.Books));
-			betaOptInCbox.Text = desc(nameof(config.BetaOptIn));
-			saveEpisodesToSeriesFolderCbox.Text = desc(nameof(config.SavePodcastsToParentFolder));
-			overwriteExistingCbox.Text = desc(nameof(config.OverwriteExisting));
-			creationTimeLbl.Text = desc(nameof(config.CreationTime));
-			lastWriteTimeLbl.Text = desc(nameof(config.LastWriteTime));
+            booksLocationDescLbl.Text = desc(nameof(config.Books));
+            betaOptInCbox.Text = desc(nameof(config.BetaOptIn));
+            saveEpisodesToSeriesFolderCbox.Text = desc(nameof(config.SavePodcastsToParentFolder));
+            overwriteExistingCbox.Text = desc(nameof(config.OverwriteExisting));
+            creationTimeLbl.Text = desc(nameof(config.CreationTime));
+            lastWriteTimeLbl.Text = desc(nameof(config.LastWriteTime));
 
-			var dateTimeSources = Enum.GetValues<Configuration.DateTimeSource>().Select(v => new EnumDiaplay<Configuration.DateTimeSource>(v)).ToArray();
-			creationTimeCb.Items.AddRange(dateTimeSources);
-			lastWriteTimeCb.Items.AddRange(dateTimeSources);
+            var dateTimeSources = Enum.GetValues<Configuration.DateTimeSource>().Select(v => new EnumDiaplay<Configuration.DateTimeSource>(v)).ToArray();
+            creationTimeCb.Items.AddRange(dateTimeSources);
+            lastWriteTimeCb.Items.AddRange(dateTimeSources);
 
-			creationTimeCb.SelectedItem = dateTimeSources.SingleOrDefault(v => v.Value == config.CreationTime) ?? dateTimeSources[0];
-			lastWriteTimeCb.SelectedItem = dateTimeSources.SingleOrDefault(v => v.Value == config.LastWriteTime) ?? dateTimeSources[0];
+            creationTimeCb.SelectedItem = dateTimeSources.SingleOrDefault(v => v.Value == config.CreationTime) ?? dateTimeSources[0];
+            lastWriteTimeCb.SelectedItem = dateTimeSources.SingleOrDefault(v => v.Value == config.LastWriteTime) ?? dateTimeSources[0];
 
 
-			booksSelectControl.SetSearchTitle("books location");
-			booksSelectControl.SetDirectoryItems(
-				new()
-				{
-					Configuration.KnownDirectories.UserProfile,
-					Configuration.KnownDirectories.AppDir,
-					Configuration.KnownDirectories.MyDocs
-				},
-				Configuration.KnownDirectories.UserProfile,
-				"Books");
-			booksSelectControl.SelectDirectory(config.Books.PathWithoutPrefix);
+            booksSelectControl.SetSearchTitle("books location");
+            booksSelectControl.SetDirectoryItems(
+                new()
+                {
+                    Configuration.KnownDirectories.UserProfile,
+                    Configuration.KnownDirectories.AppDir,
+                    Configuration.KnownDirectories.MyDocs
+                },
+                Configuration.KnownDirectories.UserProfile,
+                "Books");
+            booksSelectControl.SelectDirectory(config.Books.PathWithoutPrefix);
 
-			saveEpisodesToSeriesFolderCbox.Checked = config.SavePodcastsToParentFolder;
-			overwriteExistingCbox.Checked = config.OverwriteExisting;
+            saveEpisodesToSeriesFolderCbox.Checked = config.SavePodcastsToParentFolder;
+            overwriteExistingCbox.Checked = config.OverwriteExisting;
 
-			betaOptInCbox.Checked = config.BetaOptIn;
+            betaOptInCbox.Checked = config.BetaOptIn;
 
-			if (!betaOptInCbox.Checked)
-				betaOptInCbox.CheckedChanged += betaOptInCbox_CheckedChanged;
-		}
+            if (!betaOptInCbox.Checked)
+                betaOptInCbox.CheckedChanged += betaOptInCbox_CheckedChanged;
+        }
 
-		private void Save_Important(Configuration config)
-		{
-			var newBooks = booksSelectControl.SelectedDirectory;
+        private void Save_Important(Configuration config)
+        {
+            var newBooks = booksSelectControl.SelectedDirectory;
 
-			#region validation
-			static void validationError(string text, string caption)
-				=> MessageBox.Show(text, caption, MessageBoxButtons.OK, MessageBoxIcon.Error);
-			if (string.IsNullOrWhiteSpace(newBooks))
-			{
-				validationError("Cannot set Books Location to blank", "Location is blank");
-				return;
-			}
-			#endregion
+            #region validation
+            static void validationError(string text, string caption)
+                => MessageBox.Show(text, caption, MessageBoxButtons.OK, MessageBoxIcon.Error);
+            if (string.IsNullOrWhiteSpace(newBooks))
+            {
+                validationError("Cannot set Books Location to blank", "Location is blank");
+                return;
+            }
+            #endregion
 
-			LongPath lonNewBooks = newBooks;
-			if (!Directory.Exists(lonNewBooks))
-				Directory.CreateDirectory(lonNewBooks);
+            LongPath lonNewBooks = newBooks;
+            if (!Directory.Exists(lonNewBooks))
+                Directory.CreateDirectory(lonNewBooks);
 
-			config.Books = newBooks;
+            config.Books = newBooks;
 
-			{
-				var logLevelOld = config.LogLevel;
-				var logLevelNew = (Serilog.Events.LogEventLevel)loggingLevelCb.SelectedItem;
+            {
+                var logLevelOld = config.LogLevel;
+                var logLevelNew = (Serilog.Events.LogEventLevel)loggingLevelCb.SelectedItem;
 
-				config.LogLevel = logLevelNew;
+                config.LogLevel = logLevelNew;
 
-				// only warn if changed during this time. don't want to warn every time user happens to change settings while level is verbose
-				if (logLevelOld != logLevelNew)
-					MessageBoxLib.VerboseLoggingWarning_ShowIfTrue();
-			}
+                // only warn if changed during this time. don't want to warn every time user happens to change settings while level is verbose
+                if (logLevelOld != logLevelNew)
+                    MessageBoxLib.VerboseLoggingWarning_ShowIfTrue();
+            }
 
-			config.SavePodcastsToParentFolder = saveEpisodesToSeriesFolderCbox.Checked;
-			config.OverwriteExisting = overwriteExistingCbox.Checked;
+            config.SavePodcastsToParentFolder = saveEpisodesToSeriesFolderCbox.Checked;
+            config.OverwriteExisting = overwriteExistingCbox.Checked;
 
-			config.BetaOptIn = betaOptInCbox.Checked;
+            config.BetaOptIn = betaOptInCbox.Checked;
 
 
-			config.CreationTime = ((EnumDiaplay<Configuration.DateTimeSource>)creationTimeCb.SelectedItem).Value;
-			config.LastWriteTime = ((EnumDiaplay<Configuration.DateTimeSource>)lastWriteTimeCb.SelectedItem).Value;
+            config.CreationTime = ((EnumDiaplay<Configuration.DateTimeSource>)creationTimeCb.SelectedItem).Value;
+            config.LastWriteTime = ((EnumDiaplay<Configuration.DateTimeSource>)lastWriteTimeCb.SelectedItem).Value;
 
-		}
+        }
 
 
-		private void betaOptInCbox_CheckedChanged(object sender, EventArgs e)
-		{
-			if (!betaOptInCbox.Checked)
-				return;
+        private void betaOptInCbox_CheckedChanged(object sender, EventArgs e)
+        {
+            if (!betaOptInCbox.Checked)
+                return;
 
-			var result = MessageBox.Show(this, @"
+            var result = MessageBox.Show(this, @"
 
 
 You've chosen to opt-in to Libation's beta releases. Thank you! We need all the testers we can get.
@@ -117,14 +117,14 @@ If bad/weird things happen, please report them at getlibation.com.
 
 ".Trim(), "A word of warning...", MessageBoxButtons.YesNo, MessageBoxIcon.Warning, MessageBoxDefaultButton.Button2);
 
-			if (result == DialogResult.Yes)
-			{
-				betaOptInCbox.CheckedChanged -= betaOptInCbox_CheckedChanged;
-			}
-			else
-			{
-				betaOptInCbox.Checked = false;
-			}
-		}
-	}
+            if (result == DialogResult.Yes)
+            {
+                betaOptInCbox.CheckedChanged -= betaOptInCbox_CheckedChanged;
+            }
+            else
+            {
+                betaOptInCbox.Checked = false;
+            }
+        }
+    }
 }

Source/LibationWinForms/Dialogs/SettingsDialog.cs

@@ -5,50 +5,50 @@ using LibationFileManager;
 
 namespace LibationWinForms.Dialogs
 {
-	public partial class SettingsDialog : Form
-	{
-		private Configuration config { get; } = Configuration.Instance;
-		private Func<string, string> desc { get; } = Configuration.GetDescription;
+    public partial class SettingsDialog : Form
+    {
+        private Configuration config { get; } = Configuration.Instance;
+        private Func<string, string> desc { get; } = Configuration.GetDescription;
 
-		public SettingsDialog()
-		{
-			InitializeComponent();
-			this.SetLibationIcon();
-		}
+        public SettingsDialog()
+        {
+            InitializeComponent();
+            this.SetLibationIcon();
+        }
 
-		private void SettingsDialog_Load(object sender, EventArgs e)
-		{
-			if (this.DesignMode)
-				return;
+        private void SettingsDialog_Load(object sender, EventArgs e)
+        {
+            if (this.DesignMode)
+                return;
 
-			Load_Important(config);
-			Load_ImportLibrary(config);
-			Load_DownloadDecrypt(config);
-			Load_AudioSettings(config);
-		}
+            Load_Important(config);
+            Load_ImportLibrary(config);
+            Load_DownloadDecrypt(config);
+            Load_AudioSettings(config);
+        }
 
-		private static void editTemplate(ITemplateEditor template, TextBox textBox)
-		{
-			var form = new EditTemplateDialog(template);
-			if (form.ShowDialog() == DialogResult.OK)
-				textBox.Text = template.EditingTemplate.TemplateText;
-		}
+        private static void editTemplate(ITemplateEditor template, TextBox textBox)
+        {
+            var form = new EditTemplateDialog(template);
+            if (form.ShowDialog() == DialogResult.OK)
+                textBox.Text = template.EditingTemplate.TemplateText;
+        }
 
-		private void saveBtn_Click(object sender, EventArgs e)
-		{
-			Save_Important(config);
-			Save_ImportLibrary(config);
-			Save_DownloadDecrypt(config);
-			Save_AudioSettings(config);
+        private void saveBtn_Click(object sender, EventArgs e)
+        {
+            Save_Important(config);
+            Save_ImportLibrary(config);
+            Save_DownloadDecrypt(config);
+            Save_AudioSettings(config);
 
-			this.DialogResult = DialogResult.OK;
-			this.Close();
-		}
+            this.DialogResult = DialogResult.OK;
+            this.Close();
+        }
 
-		private void cancelBtn_Click(object sender, EventArgs e)
-		{
-			this.DialogResult = DialogResult.Cancel;
-			this.Close();
-		}
-	}
+        private void cancelBtn_Click(object sender, EventArgs e)
+        {
+            this.DialogResult = DialogResult.Cancel;
+            this.Close();
+        }
+    }
 }

Source/LibationWinForms/Program.cs

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Windows.Forms;
+using AppScaffolding;
 using Dinah.Core;
 using LibationFileManager;
 using LibationWinForms.Dialogs;
@@ -42,7 +43,7 @@ namespace LibationWinForms
 				RunInstaller(config);
 
 				// most migrations go in here
-				AppScaffolding.LibationScaffolding.RunPostConfigMigrations(config);
+				LibationScaffolding.RunPostConfigMigrations(config);
 
 				// migrations which require Forms or are long-running
 				RunWindowsOnlyMigrations(config);
@@ -50,7 +51,7 @@ namespace LibationWinForms
 				MessageBoxLib.VerboseLoggingWarning_ShowIfTrue();
 
 				// logging is init'd here
-				AppScaffolding.LibationScaffolding.RunPostMigrationScaffolding(config);
+				LibationScaffolding.RunPostMigrationScaffolding(Variety.Classic, config);
 			}
 			catch (Exception ex)
 			{

Source/_Tests/LibationSearchEngine.Tests/SearchEngineTests.cs

@@ -30,18 +30,21 @@ namespace SearchEngineTests
 		[DataRow("   ", "*:*")]
 
 		// tag surrounded by spaces
-		[DataRow("[foo]", "tags:foo")]
-		[DataRow("  [foo]", "  tags:foo")]
-		[DataRow("  [   foo   ]", "  tags:foo")]
-		[DataRow("[foo]  ", "tags:foo  ")]
-		[DataRow("  [foo]  ", "  tags:foo  ")]
-		[DataRow("-[foo]", "-tags:foo")]
-		[DataRow("  -[foo]", "  -tags:foo")]
-		[DataRow("-[foo]  ", "-tags:foo  ")]
-		[DataRow("  -[foo]  ", "  -tags:foo  ")]
+		[DataRow("[foo]", "tags:foo ")]
+		[DataRow("  [foo]", "  tags:foo ")]
+		[DataRow("  [   foo   ]", "  tags:foo ")]
+		[DataRow("[foo]  ", "tags:foo   ")]
+		[DataRow("  [foo]  ", "  tags:foo   ")]
+		[DataRow("-[foo]", "-tags:foo ")]
+		[DataRow("  -[foo]", "  -tags:foo ")]
+		[DataRow("-[foo]  ", "-tags:foo   ")]
+		[DataRow("  -[foo]  ", "  -tags:foo   ")]
+		[DataRow("[foo_bar]", "tags:foo_bar ")]
+		[DataRow("-[foo_bar]", "-tags:foo_bar ")]
+		[DataRow("[foo_bar] [foo_bar2]", "tags:foo_bar  tags:foo_bar2 ")]
 
 		// tag case irrelevant
-		[DataRow("[FoO]", "tags:FoO")]
+		[DataRow("[FoO]", "tags:FoO ")]
 
 		// bool keyword surrounded by spaces
 		[DataRow("israted", "israted:True")]
@@ -69,9 +72,9 @@ namespace SearchEngineTests
 		[DataRow("liberated AND isRated:false", "liberated:True AND israted:false")]
 
 		// tag which happens to be a bool keyword >> parse as tag
-		[DataRow("[israted]", "tags:israted")]
-		[DataRow("[tags]    [israted] [tags] [tags]  [isliberated] [israted]   ", "tags:tags    tags:israted tags:tags tags:tags  tags:isliberated tags:israted   ")]
-		[DataRow("[tags][israted]", "tags:tagstags:israted")]
+		[DataRow("[israted]", "tags:israted ")]
+		[DataRow("[tags]    [israted] [tags] [tags]  [isliberated] [israted]   ", "tags:tags     tags:israted  tags:tags  tags:tags   tags:isliberated  tags:israted    ")]
+		[DataRow("[tags][israted]", "tags:tags tags:israted ")]
 
 		// numbers with "to". TO all caps, numbers [8.2] format
 		[DataRow("1 to 10", "00000001.00 TO 00000010.00")]