incr ver

Change assembly loadig

Source/AppScaffolding/AppScaffolding.csproj

@@ -2,10 +2,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
-    <Version>8.3.4.1</Version>
+    <Version>8.4.3.1</Version>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Octokit" Version="1.0.0" />
+    <PackageReference Include="Octokit" Version="2.0.0" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\ApplicationServices\ApplicationServices.csproj" />

Source/AppScaffolding/LibationScaffolding.cs

@@ -5,6 +5,7 @@ using System.Linq;
 using System.Reflection;
 using ApplicationServices;
 using AudibleUtilities;
+using Dinah.Core.Collections.Generic;
 using Dinah.Core.IO;
 using Dinah.Core.Logging;
 using LibationFileManager;
@@ -23,19 +24,16 @@ namespace AppScaffolding
 		MacOSAvalonia
 	}
 
+	// I know I'm taking the wine metaphor a bit far by naming this "Variety", but I don't know what else to call it
+	public enum VarietyType { None, Classic, Chardonnay }
+
 	public static class LibationScaffolding
 	{
-		public static readonly bool IsWindows;
-		public static readonly bool IsLinux;
-		public static readonly bool IsMacOs;
-		static LibationScaffolding()
-		{
-			IsWindows = OperatingSystem.IsWindows();
-			IsLinux = OperatingSystem.IsLinux();
-			IsMacOs = OperatingSystem.IsMacOS();
-		}
-
 		public static ReleaseIdentifier ReleaseIdentifier { get; private set; }
+		public static VarietyType Variety
+			=> ReleaseIdentifier == ReleaseIdentifier.WindowsClassic ? VarietyType.Classic
+			: ReleaseIdentifier.In(ReleaseIdentifier.WindowsAvalonia, ReleaseIdentifier.LinuxAvalonia, ReleaseIdentifier.MacOSAvalonia) ? VarietyType.Chardonnay
+			: VarietyType.None;
 
 		public static void SetReleaseIdentifier(ReleaseIdentifier releaseID)
 			=> ReleaseIdentifier = releaseID;
@@ -57,8 +55,8 @@ namespace AppScaffolding
 			??= new[] { ExecutingAssembly.GetName(), EntryAssembly.GetName() }
 			.Max(a => a.Version);
 
-		/// <summary>Run migrations before loading Configuration for the first time. Then load and return Configuration</summary>
-		public static Configuration RunPreConfigMigrations()
+        /// <summary>Run migrations before loading Configuration for the first time. Then load and return Configuration</summary>
+        public static Configuration RunPreConfigMigrations()
 		{
 			// must occur before access to Configuration instance
 			// // outdated. kept here as an example of what belongs in this area
@@ -90,10 +88,13 @@ namespace AppScaffolding
 		{
 			config.InProgress ??= Configuration.WinTemp;
 
-			if (!config.Exists(nameof(config.BetaOptIn)))
-				config.BetaOptIn = false;
+            if (!config.Exists(nameof(config.UseCoverAsFolderIcon)))
+                config.UseCoverAsFolderIcon = false;
 
-			if (!config.Exists(nameof(config.AllowLibationFixup)))
+            if (!config.Exists(nameof(config.BetaOptIn)))
+                config.BetaOptIn = false;
+
+            if (!config.Exists(nameof(config.AllowLibationFixup)))
 				config.AllowLibationFixup = true;
 
 			if (!config.Exists(nameof(config.CreateCueSheet)))
@@ -185,6 +186,8 @@ namespace AppScaffolding
 			configureLogging(config);
 			logStartupState(config);
 
+			// all else should occur after logging
+
 			wireUpSystemEvents(config);
 		}
 
@@ -242,8 +245,8 @@ namespace AppScaffolding
 			// However, empirical testing so far has shown no issues.
 			Console.SetOut(new MultiTextWriter(origOut, new SerilogTextWriter()));
 
-			#region Console => Serilog tests
-			/*
+            #region Console => Serilog tests
+            /*
 			// all below apply to "Console." and "Console.Out."
 
 			// captured
@@ -282,12 +285,12 @@ namespace AppScaffolding
 			Console.Write("{0}{1}{2}", "zero|", "one|", "two");
 			Console.Write("{0}", new object[] { "arr" });
 			*/
-			#endregion
+            #endregion
 
-			// .Here() captures debug info via System.Runtime.CompilerServices attributes. Warning: expensive
-			//var withLineNumbers_outputTemplate = "[{Timestamp:HH:mm:ss} {Level}] {SourceContext}{NewLine}{Message}{NewLine}in method {MemberName} at {FilePath}:{LineNumber}{NewLine}{Exception}{NewLine}";
-			//Log.Logger.Here().Debug("Begin Libation. Debug with line numbers");
-		}
+            // .Here() captures debug info via System.Runtime.CompilerServices attributes. Warning: expensive
+            //var withLineNumbers_outputTemplate = "[{Timestamp:HH:mm:ss} {Level}] {SourceContext}{NewLine}{Message}{NewLine}in method {MemberName} at {FilePath}:{LineNumber}{NewLine}{Exception}{NewLine}";
+            //Log.Logger.Here().Debug("Begin Libation. Debug with line numbers");
+        }
 
 		private static void logStartupState(Configuration config)
 		{
@@ -299,21 +302,16 @@ namespace AppScaffolding
 			if (System.Diagnostics.Debugger.IsAttached)
 				mode += " (Debugger attached)";
 
-			string OS
-				= IsLinux ? "Linux"
-				: IsMacOs ? "MacOS"
-				: IsWindows ? "Windows"
-				: "UNKNOWN_OS";
-
 			// begin logging session with a form feed
 			Log.Logger.Information("\r\n\f");
 			Log.Logger.Information("Begin. {@DebugInfo}", new
 			{
 				AppName = EntryAssembly.GetName().Name,
 				Version = BuildVersion.ToString(),
-				ReleaseIdentifier = ReleaseIdentifier,
-				OS = OS,
-				Mode = mode,
+				ReleaseIdentifier,
+				Configuration.OS,
+                InteropFactory.InteropFunctionsType,
+                Mode = mode,
 				LogLevel_Verbose_Enabled = Log.Logger.IsVerboseEnabled(),
 				LogLevel_Debug_Enabled = Log.Logger.IsDebugEnabled(),
 				LogLevel_Information_Enabled = Log.Logger.IsInformationEnabled(),
@@ -321,8 +319,9 @@ namespace AppScaffolding
 				LogLevel_Error_Enabled = Log.Logger.IsErrorEnabled(),
 				LogLevel_Fatal_Enabled = Log.Logger.IsFatalEnabled(),
 
-				config.BetaOptIn,
-				config.LibationFiles,
+                config.BetaOptIn,
+                config.UseCoverAsFolderIcon,
+                config.LibationFiles,
 				AudibleFileStorage.BooksDirectory,
 
 				config.InProgress,
@@ -333,9 +332,12 @@ namespace AppScaffolding
 				AudibleFileStorage.DecryptInProgressDirectory,
 				DecryptInProgressFiles = FileManager.FileUtility.SaferEnumerateFiles(AudibleFileStorage.DecryptInProgressDirectory).Count(),
 			});
-		}
 
-		private static void wireUpSystemEvents(Configuration configuration)
+            if (InteropFactory.InteropFunctionsType is null)
+                Serilog.Log.Logger.Warning("WARNING: OSInteropProxy.InteropFunctionsType is null");
+        }
+
+        private static void wireUpSystemEvents(Configuration configuration)
 		{
 			LibraryCommands.LibrarySizeChanged += (_, __) => SearchEngineCommands.FullReIndex();
 			LibraryCommands.BookUserDefinedItemCommitted += (_, books) => SearchEngineCommands.UpdateBooks(books);

Source/AppScaffolding/OSConfigBase.cs

@@ -0,0 +1,29 @@
+using System;
+
+namespace AppScaffolding
+{
+    public abstract class OSConfigBase
+    {
+        public abstract Type InteropFunctionsType { get; }
+        public virtual Type[] ReferencedTypes { get; } = new Type[0];
+
+        public void Run()
+        {
+            //Each of these types belongs to a different windows-only assembly that's needed by
+            //the WinInterop methods. By referencing these types in main we force the runtime to
+            //load their assemblies before execution reaches inside main. This allows the calling
+            //process to find these assemblies in its module list.
+            _ = ReferencedTypes;
+            _ = InteropFunctionsType;
+
+            //Wait for the calling process to be ready to read the WriteLine()
+            Console.ReadLine();
+
+            // Signal the calling process that execution has reached inside main, and that all referenced assemblies have been loaded.
+            Console.WriteLine();
+
+            // Wait for the calling process to finish reading the process module list, then exit.
+            Console.ReadLine();
+        }
+    }
+}

Source/AppScaffolding/UNSAFE_MigrationHelper.cs

@@ -25,7 +25,7 @@ namespace AppScaffolding
 			: value;
 
 		#region appsettings.json
-		private static string APPSETTINGS_JSON { get; } = Path.Combine(Path.GetDirectoryName(System.Diagnostics.Process.GetCurrentProcess().MainModule.FileName), "appsettings.json");
+		private static string APPSETTINGS_JSON { get; } = Path.Combine(Path.GetDirectoryName(Environment.ProcessPath), "appsettings.json");
 
 		public static bool APPSETTINGS_Json_Exists => File.Exists(APPSETTINGS_JSON);
 

Source/AudibleUtilities/AudibleUtilities.csproj

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

Source/DataLayer/DataLayer.csproj

@@ -10,7 +10,7 @@
   </PropertyGroup>
   
   <ItemGroup>
-    <PackageReference Include="Dinah.Core" Version="4.4.1.1" />
+    <PackageReference Include="Dinah.Core" Version="5.1.0.1" />
     <PackageReference Include="Dinah.EntityFrameworkCore" Version="5.0.0.1" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="6.0.7">
       <PrivateAssets>all</PrivateAssets>

Source/DtoImporterService/BookImporter.cs

@@ -84,7 +84,8 @@ namespace DtoImporterService
 			// nested logic is required so order of names is retained. else, contributors may appear in the order they were inserted into the db
 			var authors = item
 				.Authors
-				.Select(a => contributorImporter.Cache[a.Name])
+                .DistinctBy(a => a.Name)
+                .Select(a => contributorImporter.Cache[a.Name])
 				.ToList();
 
 			var narrators
@@ -94,7 +95,8 @@ namespace DtoImporterService
 				// nested logic is required so order of names is retained. else, contributors may appear in the order they were inserted into the db
 				: item
 					.Narrators
-					.Select(n => contributorImporter.Cache[n.Name])
+					.DistinctBy(a => a.Name)
+                    .Select(n => contributorImporter.Cache[n.Name])
 					.ToList();
 
 			// categories are laid out for a breadcrumb. category is 1st, subcategory is 2nd

Source/FileLiberator/DownloadDecryptBook.cs

@@ -14,185 +14,188 @@ using LibationFileManager;
 
 namespace FileLiberator
 {
-	public class DownloadDecryptBook : AudioDecodable
-	{
-		public override string Name => "Download & Decrypt";
-		private AudiobookDownloadBase abDownloader;
+    public class DownloadDecryptBook : AudioDecodable
+    {
+        public override string Name => "Download & Decrypt";
+        private AudiobookDownloadBase abDownloader;
 
-		public override bool Validate(LibraryBook libraryBook) => !libraryBook.Book.Audio_Exists();
+        public override bool Validate(LibraryBook libraryBook) => !libraryBook.Book.Audio_Exists();
 
-		public override Task CancelAsync() => abDownloader?.CancelAsync() ?? Task.CompletedTask;
+        public override Task CancelAsync() => abDownloader?.CancelAsync() ?? Task.CompletedTask;
 
-		public override async Task<StatusHandler> ProcessAsync(LibraryBook libraryBook)
-		{
-			var entries = new List<FilePathCache.CacheEntry>();
-			// these only work so minimally b/c CacheEntry is a record.
-			// in case of parallel decrypts, only capture the ones for this book id.
-			// if user somehow starts multiple decrypts of the same book in parallel: on their own head be it
-			void FilePathCache_Inserted(object sender, FilePathCache.CacheEntry e)
-			{
-				if (e.Id.EqualsInsensitive(libraryBook.Book.AudibleProductId))
-					entries.Add(e);
-			}
-			void FilePathCache_Removed(object sender, FilePathCache.CacheEntry e)
-			{
-				if (e.Id.EqualsInsensitive(libraryBook.Book.AudibleProductId))
-					entries.Remove(e);
-			}
+        public override async Task<StatusHandler> ProcessAsync(LibraryBook libraryBook)
+        {
+            var entries = new List<FilePathCache.CacheEntry>();
+            // these only work so minimally b/c CacheEntry is a record.
+            // in case of parallel decrypts, only capture the ones for this book id.
+            // if user somehow starts multiple decrypts of the same book in parallel: on their own head be it
+            void FilePathCache_Inserted(object sender, FilePathCache.CacheEntry e)
+            {
+                if (e.Id.EqualsInsensitive(libraryBook.Book.AudibleProductId))
+                    entries.Add(e);
+            }
+            void FilePathCache_Removed(object sender, FilePathCache.CacheEntry e)
+            {
+                if (e.Id.EqualsInsensitive(libraryBook.Book.AudibleProductId))
+                    entries.Remove(e);
+            }
 
-			OnBegin(libraryBook);
+            OnBegin(libraryBook);
 
-			try
-			{
-				if (libraryBook.Book.Audio_Exists())
-					return new StatusHandler { "Cannot find decrypt. Final audio file already exists" };
+            try
+            {
+                if (libraryBook.Book.Audio_Exists())
+                    return new StatusHandler { "Cannot find decrypt. Final audio file already exists" };
 
-				bool success = false;
-				try
-				{
-					FilePathCache.Inserted += FilePathCache_Inserted;
-					FilePathCache.Removed += FilePathCache_Removed;
+                bool success = false;
+                try
+                {
+                    FilePathCache.Inserted += FilePathCache_Inserted;
+                    FilePathCache.Removed += FilePathCache_Removed;
 
-					success = await downloadAudiobookAsync(libraryBook);
-				}
-				finally
-				{
-					FilePathCache.Inserted -= FilePathCache_Inserted;
-					FilePathCache.Removed -= FilePathCache_Removed;
-				}
+                    success = await downloadAudiobookAsync(libraryBook);
+                }
+                finally
+                {
+                    FilePathCache.Inserted -= FilePathCache_Inserted;
+                    FilePathCache.Removed -= FilePathCache_Removed;
+                }
 
-				// decrypt failed
-				if (!success)
-				{
-					foreach (var tmpFile in entries.Where(f => f.FileType != FileType.AAXC))
-						FileUtility.SaferDelete(tmpFile.Path);
+                // decrypt failed
+                if (!success)
+                {
+                    foreach (var tmpFile in entries.Where(f => f.FileType != FileType.AAXC))
+                        FileUtility.SaferDelete(tmpFile.Path);
 
-					return abDownloader?.IsCanceled == true ?
-						new StatusHandler { "Cancelled" } : 
-						new StatusHandler { "Decrypt failed" };
-				}
+                    return abDownloader?.IsCanceled == true ?
+                        new StatusHandler { "Cancelled" } :
+                        new StatusHandler { "Decrypt failed" };
+                }
 
-				// moves new files from temp dir to final dest.
-				// This could take a few seconds if moving hundreds of files.
-				var movedAudioFile = await Task.Run(() => moveFilesToBooksDir(libraryBook, entries));
+                // moves new files from temp dir to final dest.
+                // This could take a few seconds if moving hundreds of files.
+                var finalStorageDir = await Task.Run(() => moveFilesToBooksDir(libraryBook, entries));
 
-				// decrypt failed
-				if (!movedAudioFile)
-					return new StatusHandler { "Cannot find final audio file after decryption" };
+                // decrypt failed
+                if (finalStorageDir is null)
+                    return new StatusHandler { "Cannot find final audio file after decryption" };
 
-				if (Configuration.Instance.DownloadCoverArt)
-					DownloadCoverArt(libraryBook);
+                if (Configuration.Instance.DownloadCoverArt)
+                    downloadCoverArt(libraryBook);
 
-				libraryBook.Book.UpdateBookStatus(LiberatedStatus.Liberated);
+                // contains logic to check for config setting and OS
+                WindowsDirectory.SetCoverAsFolderIcon(pictureId: libraryBook.Book.PictureId, directory: finalStorageDir);
 
-				return new StatusHandler();
-			}
-			finally
-			{
-				OnCompleted(libraryBook);
-			}
-		}
+                libraryBook.Book.UpdateBookStatus(LiberatedStatus.Liberated);
 
-		private async Task<bool> downloadAudiobookAsync(LibraryBook libraryBook)
-		{
-			var config = Configuration.Instance;
+                return new StatusHandler();
+            }
+            finally
+            {
+                OnCompleted(libraryBook);
+            }
+        }
 
-			downloadValidation(libraryBook);
+        private async Task<bool> downloadAudiobookAsync(LibraryBook libraryBook)
+        {
+            var config = Configuration.Instance;
 
-			var api = await libraryBook.GetApiAsync();
-			var contentLic = await api.GetDownloadLicenseAsync(libraryBook.Book.AudibleProductId);
-			var dlOptions = BuildDownloadOptions(libraryBook, config, contentLic);
+            downloadValidation(libraryBook);
 
-			var outFileName = AudibleFileStorage.Audio.GetInProgressFilename(libraryBook, dlOptions.OutputFormat.ToString().ToLower());
-			var cacheDir = AudibleFileStorage.DownloadsInProgressDirectory;
+            var api = await libraryBook.GetApiAsync();
+            var contentLic = await api.GetDownloadLicenseAsync(libraryBook.Book.AudibleProductId);
+            var dlOptions = BuildDownloadOptions(libraryBook, config, contentLic);
 
-			if (contentLic.DrmType != AudibleApi.Common.DrmType.Adrm)
-				abDownloader = new UnencryptedAudiobookDownloader(outFileName, cacheDir, dlOptions);
-			else
-			{
-				AaxcDownloadConvertBase converter
-					= config.SplitFilesByChapter ? 
-					new AaxcDownloadMultiConverter(outFileName, cacheDir, dlOptions) :
-					new AaxcDownloadSingleConverter(outFileName, cacheDir, dlOptions);
+            var outFileName = AudibleFileStorage.Audio.GetInProgressFilename(libraryBook, dlOptions.OutputFormat.ToString().ToLower());
+            var cacheDir = AudibleFileStorage.DownloadsInProgressDirectory;
 
-				if (config.AllowLibationFixup)
-					converter.RetrievedMetadata += (_, tags) => tags.Generes = string.Join(", ", libraryBook.Book.CategoriesNames());
+            if (contentLic.DrmType != AudibleApi.Common.DrmType.Adrm)
+                abDownloader = new UnencryptedAudiobookDownloader(outFileName, cacheDir, dlOptions);
+            else
+            {
+                AaxcDownloadConvertBase converter
+                    = config.SplitFilesByChapter ?
+                    new AaxcDownloadMultiConverter(outFileName, cacheDir, dlOptions) :
+                    new AaxcDownloadSingleConverter(outFileName, cacheDir, dlOptions);
 
-				abDownloader = converter;
-			}
+                if (config.AllowLibationFixup)
+                    converter.RetrievedMetadata += (_, tags) => tags.Generes = string.Join(", ", libraryBook.Book.CategoriesNames());
 
-			abDownloader.DecryptProgressUpdate += OnStreamingProgressChanged;
-			abDownloader.DecryptTimeRemaining += OnStreamingTimeRemaining;
-			abDownloader.RetrievedTitle += OnTitleDiscovered;
-			abDownloader.RetrievedAuthors += OnAuthorsDiscovered;
-			abDownloader.RetrievedNarrators += OnNarratorsDiscovered;
-			abDownloader.RetrievedCoverArt += AaxcDownloader_RetrievedCoverArt;
-			abDownloader.FileCreated += (_, path) => OnFileCreated(libraryBook, path);
+                abDownloader = converter;
+            }
 
-			// REAL WORK DONE HERE
-			var success = await abDownloader.RunAsync();
+            abDownloader.DecryptProgressUpdate += OnStreamingProgressChanged;
+            abDownloader.DecryptTimeRemaining += OnStreamingTimeRemaining;
+            abDownloader.RetrievedTitle += OnTitleDiscovered;
+            abDownloader.RetrievedAuthors += OnAuthorsDiscovered;
+            abDownloader.RetrievedNarrators += OnNarratorsDiscovered;
+            abDownloader.RetrievedCoverArt += AaxcDownloader_RetrievedCoverArt;
+            abDownloader.FileCreated += (_, path) => OnFileCreated(libraryBook, path);
 
-			return success;
-		}
+            // REAL WORK DONE HERE
+            var success = await abDownloader.RunAsync();
 
-		private DownloadOptions BuildDownloadOptions(LibraryBook libraryBook, Configuration config, AudibleApi.Common.ContentLicense contentLic)
-		{
-			//I assume if ContentFormat == "MPEG" that the delivered file is an unencrypted mp3.
-			//I also assume that if DrmType != Adrm, the file will be an mp3.
-			//These assumptions may be wrong, and only time and bug reports will tell.
+            return success;
+        }
 
-			bool encrypted = contentLic.DrmType == AudibleApi.Common.DrmType.Adrm;
+        private DownloadOptions BuildDownloadOptions(LibraryBook libraryBook, Configuration config, AudibleApi.Common.ContentLicense contentLic)
+        {
+            //I assume if ContentFormat == "MPEG" that the delivered file is an unencrypted mp3.
+            //I also assume that if DrmType != Adrm, the file will be an mp3.
+            //These assumptions may be wrong, and only time and bug reports will tell.
 
-			var outputFormat = !encrypted || (config.AllowLibationFixup && config.DecryptToLossy) ?
-					 OutputFormat.Mp3 : OutputFormat.M4b;
+            bool encrypted = contentLic.DrmType == AudibleApi.Common.DrmType.Adrm;
 
-			long chapterStartMs = config.StripAudibleBrandAudio ?
-				contentLic.ContentMetadata.ChapterInfo.BrandIntroDurationMs : 0;
+            var outputFormat = !encrypted || (config.AllowLibationFixup && config.DecryptToLossy) ?
+                     OutputFormat.Mp3 : OutputFormat.M4b;
 
-			var dlOptions = new DownloadOptions
-				 (
-					libraryBook,
-					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,
-				LameConfig = GetLameOptions(config),
-				ChapterInfo = new AAXClean.ChapterInfo(TimeSpan.FromMilliseconds(chapterStartMs)),
-				FixupFile = config.AllowLibationFixup
-			};
+            long chapterStartMs = config.StripAudibleBrandAudio ?
+                contentLic.ContentMetadata.ChapterInfo.BrandIntroDurationMs : 0;
 
-			var chapters = flattenChapters(contentLic.ContentMetadata.ChapterInfo.Chapters).OrderBy(c => c.StartOffsetMs).ToList();
+            var dlOptions = new DownloadOptions
+                 (
+                    libraryBook,
+                    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,
+                LameConfig = GetLameOptions(config),
+                ChapterInfo = new AAXClean.ChapterInfo(TimeSpan.FromMilliseconds(chapterStartMs)),
+                FixupFile = config.AllowLibationFixup
+            };
 
-			if (config.MergeOpeningAndEndCredits)
-				combineCredits(chapters);
+            var chapters = flattenChapters(contentLic.ContentMetadata.ChapterInfo.Chapters).OrderBy(c => c.StartOffsetMs).ToList();
 
-			for (int i = 0; i < chapters.Count; i++)
-			{
-				var chapter = chapters[i];
-				long chapLenMs = chapter.LengthMs;
+            if (config.MergeOpeningAndEndCredits)
+                combineCredits(chapters);
 
-				if (i == 0)
-					chapLenMs -= chapterStartMs;
+            for (int i = 0; i < chapters.Count; i++)
+            {
+                var chapter = chapters[i];
+                long chapLenMs = chapter.LengthMs;
 
-				if (config.StripAudibleBrandAudio && i == chapters.Count - 1)
-					chapLenMs -= contentLic.ContentMetadata.ChapterInfo.BrandOutroDurationMs;
+                if (i == 0)
+                    chapLenMs -= chapterStartMs;
 
-				dlOptions.ChapterInfo.AddChapter(chapter.Title, TimeSpan.FromMilliseconds(chapLenMs));
-			}
+                if (config.StripAudibleBrandAudio && i == chapters.Count - 1)
+                    chapLenMs -= contentLic.ContentMetadata.ChapterInfo.BrandOutroDurationMs;
 
-			return dlOptions;
-		}
+                dlOptions.ChapterInfo.AddChapter(chapter.Title, TimeSpan.FromMilliseconds(chapLenMs));
+            }
 
-		/*
+            return dlOptions;
+        }
+
+        /*
 
 		Flatten Audible's new hierarchical chapters, combining children into parents.
 
@@ -267,143 +270,138 @@ namespace FileLiberator
 
 		*/
 
-		public static List<AudibleApi.Common.Chapter> flattenChapters(IList<AudibleApi.Common.Chapter> chapters, string titleConcat = ": ")
-		{
-			List<AudibleApi.Common.Chapter> chaps = new();
+        public static List<AudibleApi.Common.Chapter> flattenChapters(IList<AudibleApi.Common.Chapter> chapters, string titleConcat = ": ")
+        {
+            List<AudibleApi.Common.Chapter> chaps = new();
 
-			foreach (var c in chapters)
-			{
-				if (c.Chapters is not null)
-				{
-					if (c.LengthMs < 10000)
-					{
-						c.Chapters[0].StartOffsetMs = c.StartOffsetMs;
-						c.Chapters[0].StartOffsetSec = c.StartOffsetSec;
-						c.Chapters[0].LengthMs += c.LengthMs;
-					}
-					else
-						chaps.Add(c);
+            foreach (var c in chapters)
+            {
+                if (c.Chapters is not null)
+                {
+                    if (c.LengthMs < 10000)
+                    {
+                        c.Chapters[0].StartOffsetMs = c.StartOffsetMs;
+                        c.Chapters[0].StartOffsetSec = c.StartOffsetSec;
+                        c.Chapters[0].LengthMs += c.LengthMs;
+                    }
+                    else
+                        chaps.Add(c);
 
-					var children = flattenChapters(c.Chapters);
+                    var children = flattenChapters(c.Chapters);
 
-					foreach (var child in children)
-						child.Title = $"{c.Title}{titleConcat}{child.Title}";
+                    foreach (var child in children)
+                        child.Title = $"{c.Title}{titleConcat}{child.Title}";
 
-					chaps.AddRange(children);
-					c.Chapters = null;
-				}
-				else
-					chaps.Add(c);
-			}
-			return chaps;
-		}
+                    chaps.AddRange(children);
+                    c.Chapters = null;
+                }
+                else
+                    chaps.Add(c);
+            }
+            return chaps;
+        }
 
-		public static void combineCredits(IList<AudibleApi.Common.Chapter> chapters)
-		{
-			if (chapters.Count > 1 && chapters[0].Title == "Opening Credits")
-			{
-				chapters[1].StartOffsetMs = chapters[0].StartOffsetMs;
-				chapters[1].StartOffsetSec = chapters[0].StartOffsetSec;
-				chapters[1].LengthMs += chapters[0].LengthMs;
-				chapters.RemoveAt(0);
-			}
-			if (chapters.Count > 1 && chapters[^1].Title == "End Credits")
-			{
-				chapters[^2].LengthMs += chapters[^1].LengthMs;
-				chapters.Remove(chapters[^1]);
-			}
-		}		
+        public static void combineCredits(IList<AudibleApi.Common.Chapter> chapters)
+        {
+            if (chapters.Count > 1 && chapters[0].Title == "Opening Credits")
+            {
+                chapters[1].StartOffsetMs = chapters[0].StartOffsetMs;
+                chapters[1].StartOffsetSec = chapters[0].StartOffsetSec;
+                chapters[1].LengthMs += chapters[0].LengthMs;
+                chapters.RemoveAt(0);
+            }
+            if (chapters.Count > 1 && chapters[^1].Title == "End Credits")
+            {
+                chapters[^2].LengthMs += chapters[^1].LengthMs;
+                chapters.Remove(chapters[^1]);
+            }
+        }
 
-		private static void downloadValidation(LibraryBook libraryBook)
-		{
-			string errorString(string field)
-				=> $"{errorTitle()}\r\nCannot download book. {field} is not known. Try re-importing the account which owns this book.";
+        private static void downloadValidation(LibraryBook libraryBook)
+        {
+            string errorString(string field)
+                => $"{errorTitle()}\r\nCannot download book. {field} is not known. Try re-importing the account which owns this book.";
 
-			string errorTitle()
-			{
-				var title
-					= (libraryBook.Book.Title.Length > 53)
-					? $"{libraryBook.Book.Title.Truncate(50)}..."
-					: libraryBook.Book.Title;
-				var errorBookTitle = $"{title} [{libraryBook.Book.AudibleProductId}]";
-				return errorBookTitle;
-			};
+            string errorTitle()
+            {
+                var title
+                    = (libraryBook.Book.Title.Length > 53)
+                    ? $"{libraryBook.Book.Title.Truncate(50)}..."
+                    : libraryBook.Book.Title;
+                var errorBookTitle = $"{title} [{libraryBook.Book.AudibleProductId}]";
+                return errorBookTitle;
+            };
 
-			if (string.IsNullOrWhiteSpace(libraryBook.Account))
-				throw new Exception(errorString("Account"));
+            if (string.IsNullOrWhiteSpace(libraryBook.Account))
+                throw new Exception(errorString("Account"));
 
-			if (string.IsNullOrWhiteSpace(libraryBook.Book.Locale))
-				throw new Exception(errorString("Locale"));
-		}
+            if (string.IsNullOrWhiteSpace(libraryBook.Book.Locale))
+                throw new Exception(errorString("Locale"));
+        }
 
-		private void AaxcDownloader_RetrievedCoverArt(object _, byte[] e)
-		{
-			if (e is not null)
-				OnCoverImageDiscovered(e);
-			else if (Configuration.Instance.AllowLibationFixup)
-				abDownloader.SetCoverArt(OnRequestCoverArt());
-		}
+        private void AaxcDownloader_RetrievedCoverArt(object _, byte[] e)
+        {
+            if (e is not null)
+                OnCoverImageDiscovered(e);
+            else if (Configuration.Instance.AllowLibationFixup)
+                abDownloader.SetCoverArt(OnRequestCoverArt());
+        }
 
-		/// <summary>Move new files to 'Books' directory</summary>
-		/// <returns>True if audiobook file(s) were successfully created and can be located on disk. Else false.</returns>
-		private static bool moveFilesToBooksDir(LibraryBook libraryBook, List<FilePathCache.CacheEntry> entries)
-		{
-			// create final directory. move each file into it
-			var destinationDir = AudibleFileStorage.Audio.GetDestinationDirectory(libraryBook);
-			Directory.CreateDirectory(destinationDir);
+        /// <summary>Move new files to 'Books' directory</summary>
+        /// <returns>Return directory if audiobook file(s) were successfully created and can be located on disk. Else null.</returns>
+        private static string moveFilesToBooksDir(LibraryBook libraryBook, List<FilePathCache.CacheEntry> entries)
+        {
+            // create final directory. move each file into it
+            var destinationDir = AudibleFileStorage.Audio.GetDestinationDirectory(libraryBook);
+            Directory.CreateDirectory(destinationDir);
 
-			FilePathCache.CacheEntry getFirstAudio() => entries.FirstOrDefault(f => f.FileType == FileType.Audio);
+            FilePathCache.CacheEntry getFirstAudio() => entries.FirstOrDefault(f => f.FileType == FileType.Audio);
 
-			if (getFirstAudio() == default)
-				return false;
+            if (getFirstAudio() == default)
+                return null;
 
-			for (var i = 0; i < entries.Count; i++)
-			{
-				var entry = entries[i];
+            for (var i = 0; i < entries.Count; i++)
+            {
+                var entry = entries[i];
 
-				var realDest = FileUtility.SaferMoveToValidPath(entry.Path, Path.Combine(destinationDir, Path.GetFileName(entry.Path)), Configuration.Instance.ReplacementCharacters);
-				FilePathCache.Insert(libraryBook.Book.AudibleProductId, realDest);
+                var realDest = FileUtility.SaferMoveToValidPath(entry.Path, Path.Combine(destinationDir, Path.GetFileName(entry.Path)), Configuration.Instance.ReplacementCharacters);
+                FilePathCache.Insert(libraryBook.Book.AudibleProductId, realDest);
 
-				// propagate corrected path. Must update cache with corrected path. Also want updated path for cue file (after this for-loop)
-				entries[i] = entry with { Path = realDest };
-			}
+                // propagate corrected path. Must update cache with corrected path. Also want updated path for cue file (after this for-loop)
+                entries[i] = entry with { Path = realDest };
+            }
 
-			var cue = entries.FirstOrDefault(f => f.FileType == FileType.Cue);
-			if (cue != default)
-				Cue.UpdateFileName(cue.Path, getFirstAudio().Path);
+            var cue = entries.FirstOrDefault(f => f.FileType == FileType.Cue);
+            if (cue != default)
+                Cue.UpdateFileName(cue.Path, getFirstAudio().Path);
 
-			AudibleFileStorage.Audio.Refresh();
+            AudibleFileStorage.Audio.Refresh();
 
-			return true;
-		}
+            return destinationDir;
+        }
 
-		private void DownloadCoverArt(LibraryBook libraryBook)
-		{
-			var destinationDir = AudibleFileStorage.Audio.GetDestinationDirectory(libraryBook);
-			var coverPath = AudibleFileStorage.Audio.GetBooksDirectoryFilename(libraryBook, ".jpg");
-			coverPath = Path.Combine(destinationDir, Path.GetFileName(coverPath));
+        private static void downloadCoverArt(LibraryBook libraryBook)
+        {
+            var coverPath = "[null]";
 
-			try
-			{
-				if (File.Exists(coverPath)) 
-					FileUtility.SaferDelete(coverPath);
+            try
+            {
+                var destinationDir = AudibleFileStorage.Audio.GetDestinationDirectory(libraryBook);
+                coverPath = AudibleFileStorage.Audio.GetBooksDirectoryFilename(libraryBook, ".jpg");
+                coverPath = Path.Combine(destinationDir, Path.GetFileName(coverPath));
 
-				(string picId, PictureSize size) = libraryBook.Book.PictureLarge is null ?
-					(libraryBook.Book.PictureId, PictureSize.Native) :
-					(libraryBook.Book.PictureLarge, PictureSize.Native);
+                if (File.Exists(coverPath))
+                    FileUtility.SaferDelete(coverPath);
 
-				var picBytes = PictureStorage.GetPictureSynchronously(new PictureDefinition(picId, size));
-				
-				if (picBytes.Length > 0)
-					File.WriteAllBytes(coverPath, picBytes);
-			}
-			catch (Exception ex)
-			{
-				//Failure to download cover art should not be
-				//considered a failure to download the book
-				Serilog.Log.Logger.Error(ex, $"Error downloading cover art of {libraryBook.Book.AudibleProductId} to {coverPath} catalog product.");
-			}
-		}
-
-	}
+                var picBytes = PictureStorage.GetPictureSynchronously(new(libraryBook.Book.PictureLarge ?? libraryBook.Book.PictureId, PictureSize.Native));
+                if (picBytes.Length > 0)
+                    File.WriteAllBytes(coverPath, picBytes);
+            }
+            catch (Exception ex)
+            {
+                //Failure to download cover art should not be considered a failure to download the book
+                Serilog.Log.Logger.Error(ex, $"Error downloading cover art of {libraryBook.Book.AudibleProductId} to {coverPath} catalog product.");
+            }
+        }
+    }
 }

Source/FileLiberator/DownloadOptions.cs

@@ -9,7 +9,6 @@ namespace FileLiberator
 {
     public class DownloadOptions : IDownloadOptions
     {
-        public LibraryBook LibraryBook { get; }
         public LibraryBookDto LibraryBookDto { get; }
         public string DownloadUrl { get; }
         public string UserAgent { get; }
@@ -35,12 +34,12 @@ namespace FileLiberator
 
         public DownloadOptions(LibraryBook libraryBook, string downloadUrl, string userAgent)
         {
-            LibraryBook = ArgumentValidator.EnsureNotNull(libraryBook, nameof(libraryBook));
+            LibraryBookDto = ArgumentValidator
+                .EnsureNotNull(libraryBook, nameof(libraryBook))
+                .ToDto();
             DownloadUrl = ArgumentValidator.EnsureNotNullOrEmpty(downloadUrl, nameof(downloadUrl));
             UserAgent = ArgumentValidator.EnsureNotNullOrEmpty(userAgent, nameof(userAgent));
 
-            LibraryBookDto = LibraryBook.ToDto();
-
             // no null/empty check for key/iv. unencrypted files do not have them
         }
     }

Source/FileManager/FileManager.csproj

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

Source/FileManager/FileNamingTemplate.cs

@@ -52,7 +52,7 @@ namespace FileManager
 			return FileUtility.GetValidFilename(Path.Join(directory, replaceFileName(fileNamePart, paramReplacements, LongPath.MaxFilenameLength - 5)), replacements, returnFirstExisting);
 		}
 
-		private string replaceFileName(string filename, Dictionary<string,string> paramReplacements, int maxFilenameLength)
+		private static string replaceFileName(string filename, Dictionary<string,string> paramReplacements, int maxFilenameLength)
 		{
 			List<StringBuilder> filenameParts = new();
 			//Build the filename in parts, replacing replacement parameters with
@@ -98,7 +98,7 @@ namespace FileManager
 			return string.Join("", filenameParts);
 		}
 
-		private string formatValue(object value, ReplacementCharacters replacements)
+		private static string formatValue(object value, ReplacementCharacters replacements)
 		{
 			if (value is null)
 				return "";

Source/Hangover/Form1.Database.cs

@@ -1,140 +0,0 @@
-using ApplicationServices;
-using AppScaffolding;
-using Microsoft.EntityFrameworkCore;
-
-namespace Hangover
-{
-    public partial class Form1
-    {
-        private string dbFile;
-
-        private void Load_databaseTab()
-        {
-            dbFile = UNSAFE_MigrationHelper.DatabaseFile;
-            if (dbFile is null)
-            {
-                databaseFileLbl.Text = $"Database file not found";
-                return;
-            }
-
-            databaseFileLbl.Text = $"Database file: {UNSAFE_MigrationHelper.DatabaseFile ?? "not found"}";
-        }
-
-        private void databaseTab_VisibleChanged(object sender, EventArgs e)
-        {
-            if (!databaseTab.Visible)
-                return;
-        }
-
-        private void sqlExecuteBtn_Click(object sender, EventArgs e)
-        {
-            ensureBackup();
-
-            sqlResultsTb.Clear();
-
-            try
-            {
-                var sql = sqlTb.Text.Trim();
-
-                #region // explanation
-                // Routing statements to non-query is a convenience.
-                // I went down the rabbit hole of full parsing and it's more trouble than it's worth. The parsing is easy due to available libraries. The edge cases of what to do next got too complex for slight gains.
-                // It's also not useful to take the extra effort to separate non-queries which don't return a row count. Eg: alter table, drop table
-                // My half-assed solution here won't even catch simple mistakes like this -- and that's ok
-                //   -- line 1 is a comment
-                //   delete from foo
-                #endregion
-                var lower = sql.ToLower();
-                if (lower.StartsWith("update") || lower.StartsWith("insert") || lower.StartsWith("delete"))
-                    nonQuery(sql);
-                else
-                    query(sql);
-            }
-            catch (Exception ex)
-            {
-                sqlResultsTb.Text = $"{ex.Message}\r\n{ex.StackTrace}";
-            }
-            finally
-            {
-                deleteUnneededBackups();
-            }
-        }
-
-        private string dbBackup;
-        private DateTime dbFileLastModified;
-        private void ensureBackup()
-        {
-            if (dbBackup is not null)
-                return;
-
-            dbFileLastModified = File.GetLastWriteTimeUtc(dbFile);
-
-            dbBackup
-                = Path.ChangeExtension(dbFile, "").TrimEnd('.')
-                + $"_backup_{DateTime.UtcNow:O}".Replace(':', '-').Replace('.', '-')
-                + Path.GetExtension(dbFile);
-            File.Copy(dbFile, dbBackup);
-        }
-
-        private void deleteUnneededBackups()
-        {
-            var newLastModified = File.GetLastWriteTimeUtc(dbFile);
-            if (dbFileLastModified == newLastModified)
-            {
-                File.Delete(dbBackup);
-                dbBackup = null;
-            }
-        }
-
-        void query(string sql)
-        {
-            // ef doesn't support truly generic queries. have to drop down to ado.net
-            using var context = DbContexts.GetContext();
-            using var conn = context.Database.GetDbConnection();
-            conn.Open();
-            using var cmd = conn.CreateCommand();
-            cmd.CommandText = sql;
-
-            var reader = cmd.ExecuteReader();
-            var results = 0;
-            var builder = new System.Text.StringBuilder();
-            var lines = 0;
-            while (reader.Read())
-            {
-                results++;
-
-                for (var i = 0; i < reader.FieldCount; i++)
-                    builder.Append(reader.GetValue(i) + "\t");
-                builder.AppendLine();
-
-                lines++;
-                if (lines % 10 == 0)
-                {
-                    sqlResultsTb.AppendText(builder.ToString());
-                    builder.Clear();
-                }
-            }
-
-            sqlResultsTb.AppendText(builder.ToString());
-            builder.Clear();
-
-            if (results == 0)
-                sqlResultsTb.Text = "[no results]";
-            else
-            {
-                sqlResultsTb.AppendText($"\r\n{results} result");
-                if (results != 1) sqlResultsTb.AppendText("s");
-            }
-        }
-
-        void nonQuery(string sql)
-        {
-            using var context = DbContexts.GetContext();
-            var results = context.Database.ExecuteSqlRaw(sql);
-
-            sqlResultsTb.AppendText($"{results} record");
-            if (results != 1) sqlResultsTb.AppendText("s");
-            sqlResultsTb.AppendText(" affected");
-        }
-    }
-}

Source/HangoverAvalonia/HangoverAvalonia.csproj

@@ -20,6 +20,16 @@
 		<ApplicationIcon>hangover.ico</ApplicationIcon>
 	</PropertyGroup>
 
+  <PropertyGroup>
+    <!--
+    HACK FOR COMPILER BUG  2021-09-14. Hopefully will be fixed in future versions
+    - Not using SatelliteResourceLanguages will load all language packs: works
+    - Specifying 'en' semicolon 1 more should load 1 language pack: works
+    - Specifying only 'en' should load no language packs: broken, still loads all
+    -->
+    <SatelliteResourceLanguages>en;es</SatelliteResourceLanguages>
+  </PropertyGroup>
+
 	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
 		<OutputPath>..\bin\Avalonia\Debug</OutputPath>
 		<DebugType>embedded</DebugType>
@@ -61,9 +71,7 @@
 		<PackageReference Include="XamlNameReferenceGenerator" Version="1.3.4" />
 	</ItemGroup>
 	<ItemGroup>
-		<ProjectReference Include="..\ApplicationServices\ApplicationServices.csproj" />
-		<ProjectReference Include="..\AppScaffolding\AppScaffolding.csproj" />
-		<ProjectReference Include="..\FileLiberator\FileLiberator.csproj" />
+		<ProjectReference Include="..\HangoverBase\HangoverBase.csproj" />
 	</ItemGroup>
 
 

Source/HangoverAvalonia/Properties/PublishProfiles/LinuxProfile.pubxml

@@ -3,15 +3,15 @@
 https://go.microsoft.com/fwlink/?LinkID=208121.
 -->
 <Project>
-	<PropertyGroup>
-		<Configuration>Release</Configuration>
-		<Platform>Any CPU</Platform>
-		<PublishDir>..\bin\Release\linux-chardonnay</PublishDir>
-		<PublishProtocol>FileSystem</PublishProtocol>
-		<TargetFramework>net6.0</TargetFramework>
-		<RuntimeIdentifier>linux-x64</RuntimeIdentifier>
-		<SelfContained>true</SelfContained>
-		<PublishSingleFile>false</PublishSingleFile>
-		<PublishTrimmed>false</PublishTrimmed>
-	</PropertyGroup>
+  <PropertyGroup>
+    <Configuration>Release</Configuration>
+    <Platform>Any CPU</Platform>
+    <PublishDir>..\bin\Publish\linux-chardonnay</PublishDir>
+    <PublishProtocol>FileSystem</PublishProtocol>
+    <TargetFramework>net6.0</TargetFramework>
+    <RuntimeIdentifier>linux-x64</RuntimeIdentifier>
+    <SelfContained>true</SelfContained>
+    <PublishSingleFile>false</PublishSingleFile>
+    <PublishTrimmed>false</PublishTrimmed>
+  </PropertyGroup>
 </Project>

Source/HangoverAvalonia/Properties/PublishProfiles/MacOSProfile.pubxml

@@ -6,12 +6,12 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
   <PropertyGroup>
     <Configuration>Release</Configuration>
     <Platform>Any CPU</Platform>
-    <PublishDir>..\bin\Release\macos-chardonnay</PublishDir>
+    <PublishDir>..\bin\Publish\macos-chardonnay</PublishDir>
     <PublishProtocol>FileSystem</PublishProtocol>
     <TargetFramework>net6.0</TargetFramework>
     <RuntimeIdentifier>osx-x64</RuntimeIdentifier>
-	  <SelfContained>true</SelfContained>
-	  <PublishSingleFile>false</PublishSingleFile>
-	  <PublishTrimmed>false</PublishTrimmed>
+    <SelfContained>true</SelfContained>
+    <PublishSingleFile>false</PublishSingleFile>
+    <PublishTrimmed>false</PublishTrimmed>
   </PropertyGroup>
 </Project>

Source/HangoverAvalonia/Properties/PublishProfiles/WindowsProfile.pubxml

@@ -6,7 +6,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
   <PropertyGroup>
     <Configuration>Release</Configuration>
     <Platform>Any CPU</Platform>
-    <PublishDir>..\bin\Release\win-chardonnay</PublishDir>
+    <PublishDir>..\bin\Publish\win-chardonnay</PublishDir>
     <PublishProtocol>FileSystem</PublishProtocol>
     <TargetFramework>net6.0</TargetFramework>
     <RuntimeIdentifier>win-x64</RuntimeIdentifier>

Source/HangoverAvalonia/ViewModels/MainWindowViewModel.cs

@@ -1,17 +1,13 @@
-using ApplicationServices;
-using AppScaffolding;
-using Microsoft.EntityFrameworkCore;
-using ReactiveUI;
 using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Text;
+using HangoverBase;
+using ReactiveUI;
 
 namespace HangoverAvalonia.ViewModels
 {
 	public class MainWindowViewModel : ViewModelBase
     {
-        private string dbFile;
+        private DatabaseTab _tab;
+
         private string _databaseFileText;
         private bool _databaseFound;
         private string _sqlResults;
@@ -22,129 +18,20 @@ namespace HangoverAvalonia.ViewModels
 
         public MainWindowViewModel()
         {
-            dbFile = UNSAFE_MigrationHelper.DatabaseFile;
-            if (dbFile is null)
+            _tab = new(new(() => SqlQuery, s => SqlResults = s, s => SqlResults = s));
+
+            _tab.LoadDatabaseFile();
+            if (_tab.DbFile is null)
             {
                 DatabaseFileText = $"Database file not found";
                 DatabaseFound = false;
                 return;
             }
 
-            DatabaseFileText = $"Database file: {UNSAFE_MigrationHelper.DatabaseFile ?? "not found"}";
-
-            DatabaseFound = UNSAFE_MigrationHelper.DatabaseFile is not null;
+            DatabaseFileText = $"Database file: {_tab.DbFile}";
+            DatabaseFound = true;
         }
 
-        public void ExecuteQuery()
-        {
-            ensureBackup();
-
-            SqlResults = string.Empty;
-
-            try
-            {
-                var sql = SqlQuery.Trim();
-
-                #region // explanation
-                // Routing statements to non-query is a convenience.
-                // I went down the rabbit hole of full parsing and it's more trouble than it's worth. The parsing is easy due to available libraries. The edge cases of what to do next got too complex for slight gains.
-                // It's also not useful to take the extra effort to separate non-queries which don't return a row count. Eg: alter table, drop table
-                // My half-assed solution here won't even catch simple mistakes like this -- and that's ok
-                //   -- line 1 is a comment
-                //   delete from foo
-                #endregion
-                var lower = sql.ToLower();
-                if (lower.StartsWith("update") || lower.StartsWith("insert") || lower.StartsWith("delete"))
-                    nonQuery(sql);
-                else
-                    query(sql);
-            }
-            catch (Exception ex)
-            {
-                SqlResults = $"{ex.Message}\r\n{ex.StackTrace}";
-            }
-            finally
-            {
-                deleteUnneededBackups();
-            }
-        }
-
-        private string dbBackup;
-        private DateTime dbFileLastModified;
-
-        private void ensureBackup()
-        {
-            if (dbBackup is not null)
-                return;
-
-            dbFileLastModified = File.GetLastWriteTimeUtc(dbFile);
-
-            dbBackup
-                = Path.ChangeExtension(dbFile, "").TrimEnd('.')
-                + $"_backup_{DateTime.UtcNow:O}".Replace(':', '-').Replace('.', '-')
-                + Path.GetExtension(dbFile);
-            File.Copy(dbFile, dbBackup);
-        }
-
-        private void deleteUnneededBackups()
-        {
-            var newLastModified = File.GetLastWriteTimeUtc(dbFile);
-            if (dbFileLastModified == newLastModified)
-            {
-                File.Delete(dbBackup);
-                dbBackup = null;
-            }
-        }
-
-        void query(string sql)
-        {
-            // ef doesn't support truly generic queries. have to drop down to ado.net
-            using var context = DbContexts.GetContext();
-            using var conn = context.Database.GetDbConnection();
-            conn.Open();
-            using var cmd = conn.CreateCommand();
-            cmd.CommandText = sql;
-
-            var reader = cmd.ExecuteReader();
-            var results = 0;
-            var builder = new StringBuilder();
-            var lines = 0;
-            while (reader.Read())
-            {
-                results++;
-
-                for (var i = 0; i < reader.FieldCount; i++)
-                    builder.Append(reader.GetValue(i) + "\t");
-                builder.AppendLine();
-
-                lines++;
-                if (lines % 10 == 0)
-                {
-                    SqlResults += builder.ToString();
-                    builder.Clear();
-                }
-            }
-
-            SqlResults += builder.ToString();
-            builder.Clear();
-
-            if (results == 0)
-                SqlResults = "[no results]";
-            else
-            {
-                SqlResults += $"\r\n{results} result";
-                if (results != 1) SqlResults += "s";
-            }
-        }
-
-        void nonQuery(string sql)
-        {
-            using var context = DbContexts.GetContext();
-            var results = context.Database.ExecuteSqlRaw(sql);
-
-            SqlResults += $"{results} record";
-            if (results != 1) SqlResults += "s";
-            SqlResults += " affected";
-        }
+        public void ExecuteQuery() => _tab.ExecuteQuery();
     }
 }

Source/HangoverBase/DatabaseTab.cs

@@ -0,0 +1,154 @@
+using System.Text;
+using ApplicationServices;
+using AppScaffolding;
+using Dinah.Core;
+using Microsoft.EntityFrameworkCore;
+
+namespace HangoverBase
+{
+    public class DatabaseTabCommands
+    {
+        public Func<string> SqlInput { get; }
+        public Action<string> SqlOutputAppend { get; }
+        public Action<string> SqlOutputOverwrite { get; }
+
+        public DatabaseTabCommands() { }
+        public DatabaseTabCommands(
+            Func<string> sqlInput,
+            Action<string> sqlDisplayAppend,
+            Action<string> sqlDisplayOverwrite)
+        {
+            SqlInput = ArgumentValidator.EnsureNotNull(sqlInput, nameof(sqlInput));
+            SqlOutputAppend = ArgumentValidator.EnsureNotNull(sqlDisplayAppend, nameof(sqlDisplayAppend));
+            SqlOutputOverwrite = ArgumentValidator.EnsureNotNull(sqlDisplayOverwrite, nameof(sqlDisplayOverwrite));
+        }
+    }
+
+    public class DatabaseTab
+    {
+        private DatabaseTabCommands _commands { get; }
+        public string DbFile { get; private set; }
+
+        public DatabaseTab(DatabaseTabCommands commands)
+        {
+            _commands = ArgumentValidator.EnsureNotNull(commands, nameof(commands));
+
+            ArgumentValidator.EnsureNotNull(commands, nameof(_commands.SqlInput));
+            ArgumentValidator.EnsureNotNull(commands, nameof(_commands.SqlOutputAppend));
+            ArgumentValidator.EnsureNotNull(commands, nameof(_commands.SqlOutputOverwrite));
+        }
+
+        public void LoadDatabaseFile() => DbFile = UNSAFE_MigrationHelper.DatabaseFile;
+
+        private string dbBackup;
+        private DateTime dbFileLastModified;
+        public void EnsureBackup()
+        {
+            if (dbBackup is not null)
+                return;
+
+            dbFileLastModified = File.GetLastWriteTimeUtc(DbFile);
+
+            dbBackup
+                = Path.ChangeExtension(DbFile, "").TrimEnd('.')
+                + $"_backup_{DateTime.UtcNow:O}".Replace(':', '-').Replace('.', '-')
+                + Path.GetExtension(DbFile);
+            File.Copy(DbFile, dbBackup);
+        }
+
+        public void ExecuteQuery()
+        {
+            EnsureBackup();
+
+            _commands.SqlOutputOverwrite("");
+
+            try
+            {
+                var sql = _commands.SqlInput().Trim();
+
+                #region // explanation
+                // Routing statements to non-query is a convenience.
+                // I went down the rabbit hole of full parsing and it's more trouble than it's worth. The parsing is easy due to available libraries. The edge cases of what to do next got too complex for slight gains.
+                // It's also not useful to take the extra effort to separate non-queries which don't return a row count. Eg: alter table, drop table
+                // My half-assed solution here won't even catch simple mistakes like this -- and that's ok
+                //   -- line 1 is a comment
+                //   delete from foo
+                #endregion
+                var lower = sql.ToLower();
+                if (lower.StartsWith("update") || lower.StartsWith("insert") || lower.StartsWith("delete"))
+                    NonQuery(sql);
+                else
+                    Query(sql);
+            }
+            catch (Exception ex)
+            {
+                _commands.SqlOutputOverwrite($"{ex.Message}\r\n{ex.StackTrace}");
+            }
+            finally
+            {
+                DeleteUnneededBackups();
+            }
+        }
+
+        public void DeleteUnneededBackups()
+        {
+            var newLastModified = File.GetLastWriteTimeUtc(DbFile);
+            if (dbFileLastModified == newLastModified)
+            {
+                File.Delete(dbBackup);
+                dbBackup = null;
+            }
+        }
+
+        public void Query(string sql)
+        {
+            // ef doesn't support truly generic queries. have to drop down to ado.net
+            using var context = DbContexts.GetContext();
+            using var conn = context.Database.GetDbConnection();
+            conn.Open();
+            using var cmd = conn.CreateCommand();
+            cmd.CommandText = sql;
+
+            var reader = cmd.ExecuteReader();
+            var results = 0;
+            var builder = new StringBuilder();
+            var lines = 0;
+            while (reader.Read())
+            {
+                results++;
+
+                for (var i = 0; i < reader.FieldCount; i++)
+                    builder.Append(reader.GetValue(i) + "\t");
+                builder.AppendLine();
+
+                lines++;
+                if (lines % 10 == 0)
+                {
+                    _commands.SqlOutputAppend(builder.ToString());
+                    builder.Clear();
+                }
+            }
+
+            _commands.SqlOutputAppend(builder.ToString());
+            builder.Clear();
+
+            if (results == 0)
+                _commands.SqlOutputOverwrite("[no results]");
+            else
+            {
+                _commands.SqlOutputAppend($"\r\n{results} result");
+                if (results != 1) _commands.SqlOutputAppend("s");
+            }
+        }
+
+        public void NonQuery(string sql)
+        {
+            using var context = DbContexts.GetContext();
+            var results = context.Database.ExecuteSqlRaw(sql);
+
+            _commands.SqlOutputAppend($"{results} record");
+            if (results != 1) _commands.SqlOutputAppend("s");
+            _commands.SqlOutputAppend(" affected");
+        }
+    }
+}

Source/HangoverBase/HangoverBase.csproj

@@ -0,0 +1,20 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net6.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\AppScaffolding\AppScaffolding.csproj" />
+    <ProjectReference Include="..\FileLiberator\FileLiberator.csproj" />
+  </ItemGroup>
+
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+    <DebugType>embedded</DebugType>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
+    <DebugType>embedded</DebugType>
+  </PropertyGroup>
+
+</Project>

Source/HangoverWinForms/Form1.CLI.cs

@@ -1,6 +1,6 @@
 using AppScaffolding;
 
-namespace Hangover
+namespace HangoverWinForms
 {
     public partial class Form1
     {

Source/HangoverWinForms/Form1.Database.cs

@@ -0,0 +1,31 @@
+using HangoverBase;
+
+namespace HangoverWinForms
+{
+    public partial class Form1
+    {
+        private DatabaseTab _tab;
+
+        private void Load_databaseTab()
+        {
+            _tab = new(new(() => sqlTb.Text, sqlResultsTb.AppendText, s => sqlResultsTb.Text = s));
+
+            _tab.LoadDatabaseFile();
+            if (_tab.DbFile is null)
+            {
+                databaseFileLbl.Text = $"Database file not found";
+                return;
+            }
+
+            databaseFileLbl.Text = $"Database file: {_tab.DbFile}";
+        }
+
+        private void databaseTab_VisibleChanged(object sender, EventArgs e)
+        {
+            if (!databaseTab.Visible)
+                return;
+        }
+
+        private void sqlExecuteBtn_Click(object sender, EventArgs e) => _tab.ExecuteQuery();
+    }
+}

Source/HangoverWinForms/Form1.Designer.cs

@@ -1,4 +1,4 @@
-namespace Hangover
+namespace HangoverWinForms
 {
     partial class Form1
     {

Source/HangoverWinForms/Form1.cs

@@ -1,4 +1,4 @@
-namespace Hangover
+namespace HangoverWinForms
 {
     public partial class Form1 : Form
     {

Source/HangoverWinForms/HangoverWinForms.csproj

@@ -44,9 +44,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\ApplicationServices\ApplicationServices.csproj" />
-    <ProjectReference Include="..\AppScaffolding\AppScaffolding.csproj" />
-    <ProjectReference Include="..\FileLiberator\FileLiberator.csproj" />
+    <ProjectReference Include="..\HangoverBase\HangoverBase.csproj" />
   </ItemGroup>
 
 	<ItemGroup>
@@ -55,7 +53,7 @@
     </Compile>
   </ItemGroup>
 
-	<Target Name="SpicNSpan"  AfterTargets="Clean">
+	<Target Name="SpicNSpan" AfterTargets="Clean">
 		<!-- Remove obj folder -->
 		<RemoveDir Directories="$(BaseIntermediateOutputPath)" />
 		<!-- Remove bin folder -->

Source/HangoverWinForms/Program.cs

@@ -1,4 +1,4 @@
-namespace Hangover
+namespace HangoverWinForms
 {
     internal static class Program
     {

Source/HangoverWinForms/Properties/PublishProfiles/WindowsProfile.pubxml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+https://go.microsoft.com/fwlink/?LinkID=208121.
+-->
+<Project>
+  <PropertyGroup>
+    <Configuration>Release</Configuration>
+    <Platform>Any CPU</Platform>
+    <PublishDir>..\bin\Publish\classic</PublishDir>
+    <PublishProtocol>FileSystem</PublishProtocol>
+    <TargetFramework>net6.0-windows</TargetFramework>
+    <RuntimeIdentifier>win-x64</RuntimeIdentifier>
+    <SelfContained>true</SelfContained>
+    <PublishSingleFile>false</PublishSingleFile>
+    <PublishTrimmed>false</PublishTrimmed>
+  </PropertyGroup>
+</Project>

Source/Libation.sln

@@ -7,9 +7,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "_Solution Items", "_Solutio
 	ProjectSection(SolutionItems) = preProject
 		REFERENCE.txt = REFERENCE.txt
 		_ARCHITECTURE NOTES.txt = _ARCHITECTURE NOTES.txt
+		_AvaloniaUI Primer.txt = _AvaloniaUI Primer.txt
 		_DB_NOTES.txt = _DB_NOTES.txt
 		__README - COLLABORATORS.txt = __README - COLLABORATORS.txt
-		__TODO.txt = __TODO.txt
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "5 Domain Utilities (db aware)", "5 Domain Utilities (db aware)", "{41CDCC73-9B81-49DD-9570-C54406E852AF}"
@@ -64,12 +64,35 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FileManager.Tests", "_Tests
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibationFileManager.Tests", "_Tests\LibationFileManager.Tests\LibationFileManager.Tests.csproj", "{EB781571-8548-477E-82AD-FB9FAB548D2F}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Hangover", "Hangover\Hangover.csproj", "{40C67036-C1A7-4FDF-AA83-8EC902E257F3}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HangoverWinForms", "HangoverWinForms\HangoverWinForms.csproj", "{40C67036-C1A7-4FDF-AA83-8EC902E257F3}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibationAvalonia", "LibationAvalonia\LibationAvalonia.csproj", "{F612D06F-3134-4B9B-95CD-EB3FC798AE60}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HangoverAvalonia", "HangoverAvalonia\HangoverAvalonia.csproj", "{8A7B01D3-9830-44FD-91A1-D8D010996BEB}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HangoverBase", "HangoverBase\HangoverBase.csproj", "{5C7005BA-7D83-4E99-8073-D970943A7D61}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "_Demos", "_Demos", "{185AC9FF-381E-4AA1-B649-9771F4917214}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "LoadByOS", "LoadByOS", "{59DF46F3-ECD0-43CA-AD12-3FEE8FCF9E4F}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CrossPlatformClientExe", "_Demos\LoadByOS\CrossPlatformClientExe\CrossPlatformClientExe.csproj", "{CC275937-DFE4-4383-B1BF-1D5D42B70C98}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LinuxConfigApp", "_Demos\LoadByOS\LinuxConfigApp\LinuxConfigApp.csproj", "{47325742-5B38-48E7-95FB-CD94E6E07332}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WindowsConfigApp", "_Demos\LoadByOS\WindowsConfigApp\WindowsConfigApp.csproj", "{0520760A-9CFB-48A8-BCE4-6E951AFD6BE9}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "LoadByOS", "LoadByOS", "{9B906374-1142-4D69-86FF-B384806CA5FE}"
+	ProjectSection(SolutionItems) = preProject
+		LoadByOS\README.txt = LoadByOS\README.txt
+	EndProjectSection
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LinuxConfigApp", "LoadByOS\LinuxConfigApp\LinuxConfigApp.csproj", "{357DF797-4EC2-4DBD-A4BD-D045277F2666}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MacOSConfigApp", "LoadByOS\MacOSConfigApp\MacOSConfigApp.csproj", "{ECED4E13-B676-4277-8A8F-C8B2507B7D8C}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WindowsConfigApp", "LoadByOS\WindowsConfigApp\WindowsConfigApp.csproj", "{5F65A509-26E3-4B02-B403-EEB6F0EF391F}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -156,6 +179,34 @@ Global
 		{8A7B01D3-9830-44FD-91A1-D8D010996BEB}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{8A7B01D3-9830-44FD-91A1-D8D010996BEB}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{8A7B01D3-9830-44FD-91A1-D8D010996BEB}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5C7005BA-7D83-4E99-8073-D970943A7D61}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5C7005BA-7D83-4E99-8073-D970943A7D61}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5C7005BA-7D83-4E99-8073-D970943A7D61}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5C7005BA-7D83-4E99-8073-D970943A7D61}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CC275937-DFE4-4383-B1BF-1D5D42B70C98}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CC275937-DFE4-4383-B1BF-1D5D42B70C98}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CC275937-DFE4-4383-B1BF-1D5D42B70C98}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CC275937-DFE4-4383-B1BF-1D5D42B70C98}.Release|Any CPU.Build.0 = Release|Any CPU
+		{47325742-5B38-48E7-95FB-CD94E6E07332}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{47325742-5B38-48E7-95FB-CD94E6E07332}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{47325742-5B38-48E7-95FB-CD94E6E07332}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{47325742-5B38-48E7-95FB-CD94E6E07332}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0520760A-9CFB-48A8-BCE4-6E951AFD6BE9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0520760A-9CFB-48A8-BCE4-6E951AFD6BE9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0520760A-9CFB-48A8-BCE4-6E951AFD6BE9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0520760A-9CFB-48A8-BCE4-6E951AFD6BE9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{357DF797-4EC2-4DBD-A4BD-D045277F2666}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{357DF797-4EC2-4DBD-A4BD-D045277F2666}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{357DF797-4EC2-4DBD-A4BD-D045277F2666}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{357DF797-4EC2-4DBD-A4BD-D045277F2666}.Release|Any CPU.Build.0 = Release|Any CPU
+		{ECED4E13-B676-4277-8A8F-C8B2507B7D8C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{ECED4E13-B676-4277-8A8F-C8B2507B7D8C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{ECED4E13-B676-4277-8A8F-C8B2507B7D8C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{ECED4E13-B676-4277-8A8F-C8B2507B7D8C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5F65A509-26E3-4B02-B403-EEB6F0EF391F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5F65A509-26E3-4B02-B403-EEB6F0EF391F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5F65A509-26E3-4B02-B403-EEB6F0EF391F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5F65A509-26E3-4B02-B403-EEB6F0EF391F}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -181,6 +232,15 @@ Global
 		{40C67036-C1A7-4FDF-AA83-8EC902E257F3} = {8679CAC8-9164-4007-BDD2-F004810EDA14}
 		{F612D06F-3134-4B9B-95CD-EB3FC798AE60} = {8679CAC8-9164-4007-BDD2-F004810EDA14}
 		{8A7B01D3-9830-44FD-91A1-D8D010996BEB} = {8679CAC8-9164-4007-BDD2-F004810EDA14}
+		{5C7005BA-7D83-4E99-8073-D970943A7D61} = {8679CAC8-9164-4007-BDD2-F004810EDA14}
+		{59DF46F3-ECD0-43CA-AD12-3FEE8FCF9E4F} = {185AC9FF-381E-4AA1-B649-9771F4917214}
+		{CC275937-DFE4-4383-B1BF-1D5D42B70C98} = {59DF46F3-ECD0-43CA-AD12-3FEE8FCF9E4F}
+		{47325742-5B38-48E7-95FB-CD94E6E07332} = {59DF46F3-ECD0-43CA-AD12-3FEE8FCF9E4F}
+		{0520760A-9CFB-48A8-BCE4-6E951AFD6BE9} = {59DF46F3-ECD0-43CA-AD12-3FEE8FCF9E4F}
+		{9B906374-1142-4D69-86FF-B384806CA5FE} = {8679CAC8-9164-4007-BDD2-F004810EDA14}
+		{357DF797-4EC2-4DBD-A4BD-D045277F2666} = {9B906374-1142-4D69-86FF-B384806CA5FE}
+		{ECED4E13-B676-4277-8A8F-C8B2507B7D8C} = {9B906374-1142-4D69-86FF-B384806CA5FE}
+		{5F65A509-26E3-4B02-B403-EEB6F0EF391F} = {9B906374-1142-4D69-86FF-B384806CA5FE}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {615E00ED-BAEF-4E8E-A92A-9B82D87942A9}

Source/LibationAvalonia/App.axaml.cs

@@ -29,33 +29,6 @@ namespace LibationAvalonia
 		public static Stream OpenAsset(string assetRelativePath)
 			=> AssetLoader.Open(new Uri(AssetUriBase, assetRelativePath));
 
-
-		public static bool GoToFile(string path)
-			=> AppScaffolding.LibationScaffolding.IsWindows ? Go.To.File(path)
-			: GoToFolder(path is null ? string.Empty : Path.GetDirectoryName(path));
-
-		public static bool GoToFolder(string path)
-		{
-			if (AppScaffolding.LibationScaffolding.IsWindows)
-				return Go.To.Folder(path);
-			else if (AppScaffolding.LibationScaffolding.IsLinux)
-			{
-				var startInfo = new System.Diagnostics.ProcessStartInfo()
-				{
-					FileName = "/bin/xdg-open",
-					Arguments = path is null ? string.Empty : $"\"{path}\"",
-					UseShellExecute = false, //Import in Linux environments
-					CreateNoWindow = false,
-					RedirectStandardOutput = true,
-					RedirectStandardError = true
-				};
-				System.Diagnostics.Process.Start(startInfo);
-				return true;
-			}
-			//Don't know how to do this for mac yet
-			else return true;
-		}
-
 		public override void Initialize()
 		{
 			AvaloniaXamlLoader.Load(this);

Source/LibationAvalonia/Dialogs/BookDetailsDialog.axaml.cs

@@ -49,8 +49,8 @@ namespace LibationAvalonia.Dialogs
 		}
 
 		protected override void SaveAndClose()
-		{
-			SaveButton_Clicked(null, null);
+        {
+            LibraryBook.Book.UpdateBook(NewTags, bookStatus: BookLiberatedStatus, pdfStatus: PdfLiberatedStatus);
 			base.SaveAndClose();
 		}
 
@@ -62,11 +62,9 @@ namespace LibationAvalonia.Dialogs
 		}
 
 		public void SaveButton_Clicked(object sender, Avalonia.Interactivity.RoutedEventArgs e)
-		{
-			LibraryBook.Book.UpdateBook(NewTags, bookStatus: BookLiberatedStatus, pdfStatus: PdfLiberatedStatus);
-		}
+            => SaveAndClose();
 
-		private void InitializeComponent()
+        private void InitializeComponent()
 		{
 			AvaloniaXamlLoader.Load(this);
 		}
@@ -122,7 +120,7 @@ Narrator(s): {libraryBook.Book.NarratorNames()}
 Length: {(libraryBook.Book.LengthInMinutes == 0 ? "" : $"{libraryBook.Book.LengthInMinutes / 60} hr {libraryBook.Book.LengthInMinutes % 60} min")}
 Audio Bitrate: {libraryBook.Book.AudioFormat}
 Category: {string.Join(" > ", libraryBook.Book.CategoriesNames())}
-Purchase Date: {libraryBook.DateAdded.ToString("d")}
+Purchase Date: {libraryBook.DateAdded:d}
 Audible ID: {libraryBook.Book.AudibleProductId}
 ".Trim();
 

Source/LibationAvalonia/Dialogs/ImageDisplayDialog.axaml.cs

@@ -51,7 +51,7 @@ namespace LibationAvalonia.Dialogs
 			saveFileDialog.Filters.Add(new FileDialogFilter { Name = "Jpeg", Extensions = new System.Collections.Generic.List<string>() { "jpg" } });
 			saveFileDialog.InitialFileName = PictureFileName;
 			saveFileDialog.Directory
-				= !AppScaffolding.LibationScaffolding.IsWindows ? null
+				= !LibationFileManager.Configuration.IsWindows ? null
 				: Directory.Exists(BookSaveDirectory) ? BookSaveDirectory
 				: Path.GetDirectoryName(BookSaveDirectory);
 

Source/LibationAvalonia/Dialogs/MessageBoxAlertAdminDialog.axaml.cs

@@ -52,7 +52,7 @@ namespace LibationAvalonia.Dialogs
 
 			try
 			{
-				App.GoToFolder(dir.ShortPathName);
+				Go.To.Folder(dir.ShortPathName);
 			}
 			catch
 			{

Source/LibationAvalonia/Dialogs/SettingsDialog.axaml

@@ -2,8 +2,8 @@
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="600"
-		MinWidth="800" MinHeight="600"
+        mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="620"
+		MinWidth="800" MinHeight="620"
         x:Class="LibationAvalonia.Dialogs.SettingsDialog"
         xmlns:controls="clr-namespace:LibationAvalonia.Controls"
         Title="Edit Settings"
@@ -206,7 +206,7 @@
 					BorderThickness="2"
 					BorderBrush="{DynamicResource DataGridGridLinesBrush}">
 
-					<Grid RowDefinitions="Auto,Auto,*">
+					<Grid RowDefinitions="Auto,Auto,Auto,*">
 						<controls:GroupBox
 							Grid.Row="0"
 							Margin="5"
@@ -367,6 +367,20 @@
 
 
 						</StackPanel>
+
+						<CheckBox
+							Grid.Row="3"
+							Margin="5"
+							VerticalAlignment="Top"
+							IsVisible="{Binding IsWindows}"
+							IsChecked="{Binding DownloadDecryptSettings.UseCoverAsFolderIcon, Mode=TwoWay}">
+
+							<TextBlock
+								TextWrapping="Wrap"
+								Text="{Binding DownloadDecryptSettings.UseCoverAsFolderIconText}" />
+
+						</CheckBox>
+
 					</Grid>
 				</Border>
 			</TabItem>

Source/LibationAvalonia/Dialogs/SettingsDialog.axaml.cs

@@ -45,7 +45,7 @@ namespace LibationAvalonia.Dialogs
 
 		public void OpenLogFolderButton_Click(object sender, Avalonia.Interactivity.RoutedEventArgs e)
 		{
-			App.GoToFolder(((LongPath)Configuration.Instance.LibationFiles).ShortPathName);
+			Go.To.Folder(((LongPath)Configuration.Instance.LibationFiles).ShortPathName);
 		}
 
 		public async void EditFolderTemplateButton_Click(object sender, Avalonia.Interactivity.RoutedEventArgs e)
@@ -107,6 +107,7 @@ namespace LibationAvalonia.Dialogs
 			LoadSettings(config);
 		}
 
+		public bool IsWindows => AppScaffolding.LibationScaffolding.ReleaseIdentifier is AppScaffolding.ReleaseIdentifier.WindowsAvalonia;
 		public ImportantSettings ImportantSettings { get; private set; }
 		public ImportSettings ImportSettings { get; private set; }
 		public DownloadDecryptSettings DownloadDecryptSettings { get; private set; }
@@ -257,6 +258,7 @@ namespace LibationAvalonia.Dialogs
 			InProgressDirectory
 				= config.InProgress == Configuration.AppDir_Absolute ? Configuration.KnownDirectories.AppDir
 				: Configuration.GetKnownDirectory(config.InProgress);
+			UseCoverAsFolderIcon = config.UseCoverAsFolderIcon;
 		}
 
 		public async Task<bool> SaveSettingsAsync(Configuration config)
@@ -294,9 +296,12 @@ namespace LibationAvalonia.Dialogs
 				= InProgressDirectory is Configuration.KnownDirectories.AppDir ? Configuration.AppDir_Absolute
 				: Configuration.GetKnownDirectoryPath(InProgressDirectory);
 
+			config.UseCoverAsFolderIcon = UseCoverAsFolderIcon;
+
 			return true;
 		}
 
+		public string UseCoverAsFolderIconText { get; } = Configuration.GetDescription(nameof(Configuration.UseCoverAsFolderIcon));
 		public string BadBookGroupboxText { get; } = Configuration.GetDescription(nameof(Configuration.BadBook));
 		public string BadBookAskText { get; } = Configuration.BadBookAction.Ask.GetDescription();
 		public string BadBookAbortText { get; } = Configuration.BadBookAction.Abort.GetDescription();
@@ -311,6 +316,7 @@ namespace LibationAvalonia.Dialogs
 		public string FolderTemplate { get => _folderTemplate; set { this.RaiseAndSetIfChanged(ref _folderTemplate, value); } }
 		public string FileTemplate { get => _fileTemplate; set { this.RaiseAndSetIfChanged(ref _fileTemplate, value); } }
 		public string ChapterFileTemplate { get => _chapterFileTemplate; set { this.RaiseAndSetIfChanged(ref _chapterFileTemplate, value); } }
+		public bool UseCoverAsFolderIcon { get; set; }
 
 		public bool BadBookAsk
 		{
@@ -381,7 +387,7 @@ namespace LibationAvalonia.Dialogs
 		private int _lameVBRQuality;
 		private string _chapterTitleTemplate;
 
-		public bool IsMp3Supported => AppScaffolding.LibationScaffolding.IsLinux || AppScaffolding.LibationScaffolding.IsWindows;
+		public bool IsMp3Supported => Configuration.IsLinux || Configuration.IsWindows;
 
 		public AudioSettings(Configuration config)
 		{

Source/LibationAvalonia/FormSaveExtension.cs

@@ -113,7 +113,7 @@ namespace LibationAvalonia
 
 		public static void HideMinMaxBtns(this Window form)
 		{
-			if (Design.IsDesignMode || !AppScaffolding.LibationScaffolding.IsWindows)
+			if (Design.IsDesignMode || !Configuration.IsWindows)
 				return;
 			var handle = form.PlatformImpl.Handle.Handle;
 			var currentStyle = GetWindowLong(handle, GWL_STYLE);

Source/LibationAvalonia/Program.cs

@@ -30,11 +30,11 @@ namespace LibationAvalonia
 			var classicLifetimeTask = Task.Run(() => new ClassicDesktopStyleApplicationLifetime());
 			var appBuilderTask = Task.Run(BuildAvaloniaApp);
 
-			if (AppScaffolding.LibationScaffolding.IsWindows)
+			if (Configuration.IsWindows)
 				AppScaffolding.LibationScaffolding.SetReleaseIdentifier(AppScaffolding.ReleaseIdentifier.WindowsAvalonia);
-			else if (AppScaffolding.LibationScaffolding.IsLinux)
+			else if (Configuration.IsLinux)
 				AppScaffolding.LibationScaffolding.SetReleaseIdentifier(AppScaffolding.ReleaseIdentifier.LinuxAvalonia);
-			else if (AppScaffolding.LibationScaffolding.IsMacOs)
+			else if (Configuration.IsMacOs)
 				AppScaffolding.LibationScaffolding.SetReleaseIdentifier(AppScaffolding.ReleaseIdentifier.MacOSAvalonia);
 			else return;
 

Source/LibationAvalonia/Properties/PublishProfiles/LinuxProfile.pubxml

@@ -3,15 +3,15 @@
 https://go.microsoft.com/fwlink/?LinkID=208121.
 -->
 <Project>
-	<PropertyGroup>
-		<Configuration>Release</Configuration>
-		<Platform>Any CPU</Platform>
-		<PublishDir>..\bin\Release\linux-chardonnay</PublishDir>
-		<PublishProtocol>FileSystem</PublishProtocol>
-		<TargetFramework>net6.0</TargetFramework>
-		<RuntimeIdentifier>linux-x64</RuntimeIdentifier>
-		<SelfContained>true</SelfContained>
-		<PublishSingleFile>false</PublishSingleFile>
-		<PublishTrimmed>false</PublishTrimmed>
-	</PropertyGroup>
+  <PropertyGroup>
+    <Configuration>Release</Configuration>
+    <Platform>Any CPU</Platform>
+    <PublishDir>..\bin\Publish\linux-chardonnay</PublishDir>
+    <PublishProtocol>FileSystem</PublishProtocol>
+    <TargetFramework>net6.0</TargetFramework>
+    <RuntimeIdentifier>linux-x64</RuntimeIdentifier>
+    <SelfContained>true</SelfContained>
+    <PublishSingleFile>false</PublishSingleFile>
+    <PublishTrimmed>false</PublishTrimmed>
+  </PropertyGroup>
 </Project>

Source/LibationAvalonia/Properties/PublishProfiles/MacOSProfile.pubxml

@@ -3,15 +3,15 @@
 https://go.microsoft.com/fwlink/?LinkID=208121.
 -->
 <Project>
-	<PropertyGroup>
-		<Configuration>Release</Configuration>
-		<Platform>Any CPU</Platform>
-		<PublishDir>..\bin\Release\macos-chardonnay</PublishDir>
-		<PublishProtocol>FileSystem</PublishProtocol>
-		<TargetFramework>net6.0</TargetFramework>
-		<RuntimeIdentifier>osx-x64</RuntimeIdentifier>
-		<SelfContained>true</SelfContained>
-		<PublishSingleFile>false</PublishSingleFile>
-		<PublishTrimmed>false</PublishTrimmed>
-	</PropertyGroup>
+  <PropertyGroup>
+    <Configuration>Release</Configuration>
+    <Platform>Any CPU</Platform>
+    <PublishDir>..\bin\Publish\macos-chardonnay</PublishDir>
+    <PublishProtocol>FileSystem</PublishProtocol>
+    <TargetFramework>net6.0</TargetFramework>
+    <RuntimeIdentifier>osx-x64</RuntimeIdentifier>
+    <SelfContained>true</SelfContained>
+    <PublishSingleFile>false</PublishSingleFile>
+    <PublishTrimmed>false</PublishTrimmed>
+  </PropertyGroup>
 </Project>

Source/LibationAvalonia/Properties/PublishProfiles/WindowsProfile.pubxml

@@ -6,7 +6,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
   <PropertyGroup>
     <Configuration>Release</Configuration>
     <Platform>Any CPU</Platform>
-    <PublishDir>..\bin\Release\win-chardonnay</PublishDir>
+    <PublishDir>..\bin\Publish\win-chardonnay</PublishDir>
     <PublishProtocol>FileSystem</PublishProtocol>
     <TargetFramework>net6.0</TargetFramework>
     <RuntimeIdentifier>win-x64</RuntimeIdentifier>

Source/LibationAvalonia/ViewModels/MainWindowViewModel.cs

@@ -19,7 +19,7 @@ namespace LibationAvalonia.ViewModels
 		private int _visibleCount = 1;
 		private LibraryCommands.LibraryStats _libraryStats;
 		private int _visibleNotLiberated = 1;
-		public bool IsMp3Supported => AppScaffolding.LibationScaffolding.IsLinux || AppScaffolding.LibationScaffolding.IsWindows;
+		public bool IsMp3Supported => Configuration.IsLinux || Configuration.IsWindows;
 
 		/// <summary> The Process Queue's viewmodel </summary>
 		public ProcessQueueViewModel ProcessQueue { get; } = new ProcessQueueViewModel();

Source/LibationAvalonia/Views/MainWindow/MainWindow.ProcessQueue.axaml.cs

@@ -36,7 +36,7 @@ namespace LibationAvalonia.Views
 					// liberated: open explorer to file
 					var filePath = AudibleFileStorage.Audio.GetPath(libraryBook.Book.AudibleProductId);
 
-					if (!App.GoToFile(filePath?.ShortPathName))
+					if (!Go.To.File(filePath?.ShortPathName))
 					{
 						var suffix = string.IsNullOrWhiteSpace(filePath) ? "" : $":\r\n{filePath}";
 						await MessageBox.Show($"File not found" + suffix);

Source/LibationAvalonia/Views/MainWindow/MainWindow.Settings.axaml.cs

@@ -15,6 +15,6 @@ namespace LibationAvalonia.Views
 			=> await new Dialogs.SettingsDialog().ShowDialog(this);
 
 		public async void aboutToolStripMenuItem_Click(object sender, Avalonia.Interactivity.RoutedEventArgs e)
-			=> await MessageBox.Show($"Running Libation version {AppScaffolding.LibationScaffolding.BuildVersion}", $"Libation v{AppScaffolding.LibationScaffolding.BuildVersion}");
+			=> await MessageBox.Show($"Libation {AppScaffolding.LibationScaffolding.Variety}{Environment.NewLine}Version {AppScaffolding.LibationScaffolding.BuildVersion}", $"Libation v{AppScaffolding.LibationScaffolding.BuildVersion}");
 	}
 }

Source/LibationAvalonia/Views/MainWindow/MainWindow.axaml.cs

@@ -70,7 +70,7 @@ namespace LibationAvalonia.Views
 #if !DEBUG
 			//This is temporaty until we have a solution for linux/mac so that
 			//Libation doesn't download a zip every time it runs.
-			if (!LibationScaffolding.IsWindows)
+			if (!Configuration.IsWindows)
 				return;
 
 			try
@@ -85,15 +85,15 @@ namespace LibationAvalonia.Views
 				if (result != DialogResult.Yes)
 					return;
 
-				if (LibationScaffolding.IsWindows)
-				{ 
+				if (Configuration.IsWindows)
+				{
 					runWindowsUpgrader(zipFile);
 				}
-				else if (LibationScaffolding.IsLinux)
+				else if (Configuration.IsLinux)
 				{
 
 				}
-				else if (LibationScaffolding.IsMacOs)
+				else if (Configuration.IsMacOs)
 				{
 
 				}
@@ -149,8 +149,7 @@ namespace LibationAvalonia.Views
 
 		private void runWindowsUpgrader(string zipFile)
 		{
-
-			var thisExe = System.Diagnostics.Process.GetCurrentProcess().MainModule.FileName;
+			var thisExe = Environment.ProcessPath;
 			var thisDir = System.IO.Path.GetDirectoryName(thisExe);
 
 			var args = $"--input {zipFile} --output {thisDir} --executable {thisExe}";

Source/LibationCli/Options/LiberateOptions.cs

@@ -25,9 +25,10 @@ namespace LibationCli
 			var downloadPdf = CreateProcessable<DownloadPdf>();
 
 			//Chain pdf download on DownloadDecryptBook.Completed
-			async void onDownloadDecryptBookCompleted(object sender, LibraryBook e)
+			void onDownloadDecryptBookCompleted(object sender, LibraryBook e)
 			{
-				await downloadPdf.TryProcessAsync(e);
+				// this is fast anyway. run as sync for easy exception catching
+				downloadPdf.TryProcessAsync(e).GetAwaiter().GetResult();
 			}
 
 			var downloadDecryptBook = CreateProcessable<DownloadDecryptBook>(onDownloadDecryptBookCompleted);

Source/LibationCli/Options/_ProcessableOptionsBase.cs

@@ -19,7 +19,17 @@ namespace LibationCli
 			strProc.Begin += (o, e) => Console.WriteLine($"{typeof(TProcessable).Name} Begin: {e}");
 			strProc.Completed += (o, e) => Console.WriteLine($"{typeof(TProcessable).Name} Completed: {e}");
 
-			strProc.Completed += completedAction;
+			strProc.Completed += (s, e) =>
+			{
+				try
+				{
+					completedAction?.Invoke(s, e);
+				}
+				catch (Exception ex)
+				{
+					Serilog.Log.Logger.Error(ex, "CLI error");
+				}
+			};
 
 			return strProc;
 		}

Source/LibationCli/Properties/PublishProfiles/LinuxProfile.pubxml

@@ -3,15 +3,15 @@
 https://go.microsoft.com/fwlink/?LinkID=208121.
 -->
 <Project>
-	<PropertyGroup>
-		<Configuration>Release</Configuration>
-		<Platform>Any CPU</Platform>
-		<PublishDir>..\bin\Release\linux-chardonnay</PublishDir>
-		<PublishProtocol>FileSystem</PublishProtocol>
-		<TargetFramework>net6.0</TargetFramework>
-		<RuntimeIdentifier>linux-x64</RuntimeIdentifier>
-		<SelfContained>true</SelfContained>
-		<PublishSingleFile>false</PublishSingleFile>
-		<PublishTrimmed>false</PublishTrimmed>
-	</PropertyGroup>
+  <PropertyGroup>
+    <Configuration>Release</Configuration>
+    <Platform>Any CPU</Platform>
+    <PublishDir>..\bin\Publish\linux-chardonnay</PublishDir>
+    <PublishProtocol>FileSystem</PublishProtocol>
+    <TargetFramework>net6.0</TargetFramework>
+    <RuntimeIdentifier>linux-x64</RuntimeIdentifier>
+    <SelfContained>true</SelfContained>
+    <PublishSingleFile>false</PublishSingleFile>
+    <PublishTrimmed>false</PublishTrimmed>
+  </PropertyGroup>
 </Project>

Source/LibationCli/Properties/PublishProfiles/MacOSProfile.pubxml

@@ -3,15 +3,15 @@
 https://go.microsoft.com/fwlink/?LinkID=208121.
 -->
 <Project>
-	<PropertyGroup>
-		<Configuration>Release</Configuration>
-		<Platform>Any CPU</Platform>
-		<PublishDir>..\bin\Release\macos-chardonnay</PublishDir>
-		<PublishProtocol>FileSystem</PublishProtocol>
-		<TargetFramework>net6.0</TargetFramework>
-		<RuntimeIdentifier>osx-x64</RuntimeIdentifier>
-		<SelfContained>true</SelfContained>
-		<PublishSingleFile>false</PublishSingleFile>
-		<PublishTrimmed>false</PublishTrimmed>
-	</PropertyGroup>
+  <PropertyGroup>
+    <Configuration>Release</Configuration>
+    <Platform>Any CPU</Platform>
+    <PublishDir>..\bin\Publish\macos-chardonnay</PublishDir>
+    <PublishProtocol>FileSystem</PublishProtocol>
+    <TargetFramework>net6.0</TargetFramework>
+    <RuntimeIdentifier>osx-x64</RuntimeIdentifier>
+    <SelfContained>true</SelfContained>
+    <PublishSingleFile>false</PublishSingleFile>
+    <PublishTrimmed>false</PublishTrimmed>
+  </PropertyGroup>
 </Project>

Source/LibationCli/Properties/PublishProfiles/WindowsProfile.pubxml

@@ -3,15 +3,15 @@
 https://go.microsoft.com/fwlink/?LinkID=208121.
 -->
 <Project>
-	<PropertyGroup>
-		<Configuration>Release</Configuration>
-		<Platform>Any CPU</Platform>
-		<PublishDir>..\bin\Release\win-chardonnay</PublishDir>
-		<PublishProtocol>FileSystem</PublishProtocol>
-		<TargetFramework>net6.0</TargetFramework>
-		<RuntimeIdentifier>win-x64</RuntimeIdentifier>
-		<SelfContained>true</SelfContained>
-		<PublishSingleFile>false</PublishSingleFile>
-		<PublishTrimmed>false</PublishTrimmed>
-	</PropertyGroup>
+  <PropertyGroup>
+    <Configuration>Release</Configuration>
+    <Platform>Any CPU</Platform>
+    <PublishDir>..\bin\Publish\win-chardonnay</PublishDir>
+    <PublishProtocol>FileSystem</PublishProtocol>
+    <TargetFramework>net6.0</TargetFramework>
+    <RuntimeIdentifier>win-x64</RuntimeIdentifier>
+    <SelfContained>true</SelfContained>
+    <PublishSingleFile>false</PublishSingleFile>
+    <PublishTrimmed>false</PublishTrimmed>
+  </PropertyGroup>
 </Project>

Source/LibationFileManager/Configuration.Environment.cs

@@ -0,0 +1,21 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace LibationFileManager
+{
+    public partial class Configuration
+    {
+        public static bool IsWindows { get; } = OperatingSystem.IsWindows();
+        public static bool IsLinux { get; } = OperatingSystem.IsLinux();
+        public static bool IsMacOs { get; } = OperatingSystem.IsMacOS();
+
+        public static string OS { get; }
+            = IsLinux ? "Linux"
+            : IsMacOs ? "MacOS"
+            : IsWindows ? "Windows"
+            : "UNKNOWN_OS";
+    }
+}

Source/LibationFileManager/Configuration.KnownDirectories.cs

@@ -0,0 +1,66 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.IO;
+using System.Linq;
+using Dinah.Core;
+
+namespace LibationFileManager
+{
+    public partial class Configuration
+    {
+        public static string AppDir_Relative => $@".{Path.PathSeparator}{LIBATION_FILES_KEY}";
+        public static string AppDir_Absolute => Path.GetFullPath(Path.Combine(Path.GetDirectoryName(Exe.FileLocationOnDisk), LIBATION_FILES_KEY));
+        public static string MyDocs => Path.GetFullPath(Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments), "Libation"));
+        public static string WinTemp => Path.GetFullPath(Path.Combine(Path.GetTempPath(), "Libation"));
+        public static string UserProfile => Path.GetFullPath(Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile), "Libation"));
+
+        public enum KnownDirectories
+        {
+            None = 0,
+
+            [Description("My Users folder")]
+            UserProfile = 1,
+
+            [Description("The same folder that Libation is running from")]
+            AppDir = 2,
+
+            [Description("Windows temporary folder")]
+            WinTemp = 3,
+
+            [Description("My Documents")]
+            MyDocs = 4,
+
+            [Description("Your settings folder (aka: Libation Files)")]
+            LibationFiles = 5
+        }
+        // use func calls so we always get the latest value of LibationFiles
+        private static List<(KnownDirectories directory, Func<string> getPathFunc)> directoryOptionsPaths { get; } = new()
+        {
+            (KnownDirectories.None, () => null),
+            (KnownDirectories.UserProfile, () => UserProfile),
+            (KnownDirectories.AppDir, () => AppDir_Relative),
+            (KnownDirectories.WinTemp, () => WinTemp),
+            (KnownDirectories.MyDocs, () => MyDocs),
+			// this is important to not let very early calls try to accidentally load LibationFiles too early.
+			// also, keep this at bottom of this list
+			(KnownDirectories.LibationFiles, () => libationFilesPathCache)
+        };
+        public static string GetKnownDirectoryPath(KnownDirectories directory)
+        {
+            var dirFunc = directoryOptionsPaths.SingleOrDefault(dirFunc => dirFunc.directory == directory);
+            return dirFunc == default ? null : dirFunc.getPathFunc();
+        }
+        public static KnownDirectories GetKnownDirectory(string directory)
+        {
+            // especially important so a very early call doesn't match null => LibationFiles
+            if (string.IsNullOrWhiteSpace(directory))
+                return KnownDirectories.None;
+
+            // 'First' instead of 'Single' because LibationFiles could match other directories. eg: default value of LibationFiles == UserProfile.
+            // since it's a list, order matters and non-LibationFiles will be returned first
+            var dirFunc = directoryOptionsPaths.FirstOrDefault(dirFunc => dirFunc.getPathFunc() == directory);
+            return dirFunc == default ? KnownDirectories.None : dirFunc.directory;
+        }
+    }
+}

Source/LibationFileManager/Configuration.LibationFiles.cs

@@ -0,0 +1,113 @@
+using System;
+using System.ComponentModel;
+using System.IO;
+using FileManager;
+using Newtonsoft.Json.Linq;
+using Newtonsoft.Json;
+using Serilog;
+
+namespace LibationFileManager
+{
+    public partial class Configuration
+    {
+        private static string APPSETTINGS_JSON { get; } = Path.Combine(Path.GetDirectoryName(System.Reflection.Assembly.GetExecutingAssembly().Location), "appsettings.json");
+        private const string LIBATION_FILES_KEY = "LibationFiles";
+
+        [Description("Location for storage of program-created files")]
+        public string LibationFiles
+        {
+            get
+            {
+                if (libationFilesPathCache is not null)
+                    return libationFilesPathCache;
+
+                // FIRST: must write here before SettingsFilePath in next step reads cache
+                libationFilesPathCache = getLibationFilesSettingFromJson();
+
+                // SECOND. before setting to json file with SetWithJsonPath, PersistentDictionary must exist
+                persistentDictionary = new PersistentDictionary(SettingsFilePath);
+
+                // Config init in ensureSerilogConfig() only happens when serilog setting is first created (prob on 1st run).
+                // This Set() enforces current LibationFiles every time we restart Libation or redirect LibationFiles
+                var logPath = Path.Combine(LibationFiles, "Log.log");
+
+                // BAD: Serilog.WriteTo[1].Args
+                //      "[1]" assumes ordinal position
+                // GOOD: Serilog.WriteTo[?(@.Name=='File')].Args
+                var jsonpath = "Serilog.WriteTo[?(@.Name=='File')].Args";
+
+                SetWithJsonPath(jsonpath, "path", logPath, true);
+
+                return libationFilesPathCache;
+            }
+        }
+
+        private static string libationFilesPathCache { get; set; }
+
+        private string getLibationFilesSettingFromJson()
+        {
+            string startingContents = null;
+            try
+            {
+                if (File.Exists(APPSETTINGS_JSON))
+                {
+                    startingContents = File.ReadAllText(APPSETTINGS_JSON);
+                    var startingJObj = JObject.Parse(startingContents);
+
+                    if (startingJObj.ContainsKey(LIBATION_FILES_KEY))
+                    {
+                        var startingValue = startingJObj[LIBATION_FILES_KEY].Value<string>();
+                        if (!string.IsNullOrWhiteSpace(startingValue))
+                            return startingValue;
+                    }
+                }
+            }
+            catch { }
+
+            // not found. write to file. read from file
+            var endingContents = new JObject { { LIBATION_FILES_KEY, UserProfile.ToString() } }.ToString(Formatting.Indented);
+            if (startingContents != endingContents)
+            {
+                File.WriteAllText(APPSETTINGS_JSON, endingContents);
+                System.Threading.Thread.Sleep(100);
+            }
+
+            // do not check whether directory exists. special/meta directory (eg: AppDir) is valid
+            // verify from live file. no try/catch. want failures to be visible
+            var jObjFinal = JObject.Parse(File.ReadAllText(APPSETTINGS_JSON));
+            var valueFinal = jObjFinal[LIBATION_FILES_KEY].Value<string>();
+            return valueFinal;
+        }
+
+        public void SetLibationFiles(string directory)
+        {
+            // ensure exists
+            if (!File.Exists(APPSETTINGS_JSON))
+            {
+                // getter creates new file, loads PersistentDictionary
+                var _ = LibationFiles;
+                System.Threading.Thread.Sleep(100);
+            }
+
+            libationFilesPathCache = null;
+
+            var startingContents = File.ReadAllText(APPSETTINGS_JSON);
+            var jObj = JObject.Parse(startingContents);
+
+            jObj[LIBATION_FILES_KEY] = directory;
+
+            var endingContents = JsonConvert.SerializeObject(jObj, Formatting.Indented);
+            if (startingContents == endingContents)
+                return;
+
+            // now it's set in the file again but no settings have moved yet
+            File.WriteAllText(APPSETTINGS_JSON, endingContents);
+
+            try
+            {
+                Log.Logger.Information("Libation files changed {@DebugInfo}", new { APPSETTINGS_JSON, LIBATION_FILES_KEY, directory });
+            }
+            catch { }
+        }
+    }
+}

Source/LibationFileManager/Configuration.Logging.cs

@@ -0,0 +1,58 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using Dinah.Core;
+using Dinah.Core.Logging;
+using Microsoft.Extensions.Configuration;
+using Serilog;
+using Serilog.Events;
+
+namespace LibationFileManager
+{
+    public partial class Configuration
+    {
+        private IConfigurationRoot configuration;
+
+        public void ConfigureLogging()
+        {
+            configuration = new ConfigurationBuilder()
+                .AddJsonFile(SettingsFilePath, optional: false, reloadOnChange: true)
+                .Build();
+            Log.Logger = new LoggerConfiguration()
+                .ReadFrom.Configuration(configuration)
+                .CreateLogger();
+        }
+
+        [Description("The importance of a log event")]
+        public LogEventLevel LogLevel
+        {
+            get
+            {
+                var logLevelStr = persistentDictionary.GetStringFromJsonPath("Serilog", "MinimumLevel");
+                return Enum.TryParse<LogEventLevel>(logLevelStr, out var logLevelEnum) ? logLevelEnum : LogEventLevel.Information;
+            }
+            set
+            {
+                var valueWasChanged = persistentDictionary.SetWithJsonPath("Serilog", "MinimumLevel", value.ToString());
+                if (!valueWasChanged)
+                {
+                    Log.Logger.Debug("LogLevel.set attempt. No change");
+                    return;
+                }
+
+                configuration.Reload();
+
+                Log.Logger.Information("Updated LogLevel MinimumLevel. {@DebugInfo}", new
+                {
+                    LogLevel_Verbose_Enabled = Log.Logger.IsVerboseEnabled(),
+                    LogLevel_Debug_Enabled = Log.Logger.IsDebugEnabled(),
+                    LogLevel_Information_Enabled = Log.Logger.IsInformationEnabled(),
+                    LogLevel_Warning_Enabled = Log.Logger.IsWarningEnabled(),
+                    LogLevel_Error_Enabled = Log.Logger.IsErrorEnabled(),
+                    LogLevel_Fatal_Enabled = Log.Logger.IsFatalEnabled()
+                });
+            }
+        }
+    }
+}

Source/LibationFileManager/Configuration.PersistentSettings.cs

@@ -0,0 +1,322 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.IO;
+using System.Linq;
+using FileManager;
+
+namespace LibationFileManager
+{
+    public partial class Configuration
+    {
+        // note: any potential file manager static ctors can't compensate if storage dir is changed at run time via settings. this is partly bad architecture. but the side effect is desirable. if changing LibationFiles location: restart app
+
+        // default setting and directory creation occur in class responsible for files.
+        // config class is only responsible for path. not responsible for setting defaults, dir validation, or dir creation
+        // exceptions: appsettings.json, LibationFiles dir, Settings.json
+
+        private PersistentDictionary persistentDictionary;
+
+        public T GetNonString<T>(string propertyName) => persistentDictionary.GetNonString<T>(propertyName);
+        public object GetObject(string propertyName) => persistentDictionary.GetObject(propertyName);
+        public void SetObject(string propertyName, object newValue) => persistentDictionary.SetNonString(propertyName, newValue);
+
+        /// <summary>WILL ONLY set if already present. WILL NOT create new</summary>
+        public void SetWithJsonPath(string jsonPath, string propertyName, string newValue, bool suppressLogging = false)
+        {
+            var settingWasChanged = persistentDictionary.SetWithJsonPath(jsonPath, propertyName, newValue, suppressLogging);
+            if (settingWasChanged)
+                configuration?.Reload();
+        }
+
+        public string SettingsFilePath => Path.Combine(LibationFiles, "Settings.json");
+
+        public static string GetDescription(string propertyName)
+        {
+            var attribute = typeof(Configuration)
+                .GetProperty(propertyName)
+                ?.GetCustomAttributes(typeof(DescriptionAttribute), true)
+                .SingleOrDefault()
+                as DescriptionAttribute;
+
+            return attribute?.Description;
+        }
+
+        public bool Exists(string propertyName) => persistentDictionary.Exists(propertyName);
+
+        [Description("Set cover art as the folder's icon. (Windows only)")]
+        public bool UseCoverAsFolderIcon
+        {
+            get => persistentDictionary.GetNonString<bool>(nameof(UseCoverAsFolderIcon));
+            set => persistentDictionary.SetNonString(nameof(UseCoverAsFolderIcon), value);
+        }
+
+        [Description("Use the beta version of Libation\r\nNew and experimental features, but probably buggy.\r\n(requires restart to take effect)")]
+        public bool BetaOptIn
+        {
+            get => persistentDictionary.GetNonString<bool>(nameof(BetaOptIn));
+            set => persistentDictionary.SetNonString(nameof(BetaOptIn), value);
+        }
+
+        [Description("Location for book storage. Includes destination of newly liberated books")]
+        public string Books
+        {
+            get => persistentDictionary.GetString(nameof(Books));
+            set => persistentDictionary.SetString(nameof(Books), value);
+        }
+
+        // temp/working dir(s) should be outside of dropbox
+        [Description("Temporary location of files while they're in process of being downloaded and decrypted.\r\nWhen decryption is complete, the final file will be in Books location\r\nRecommend not using a folder which is backed up real time. Eg: Dropbox, iCloud, Google Drive")]
+        public string InProgress
+        {
+            get => persistentDictionary.GetString(nameof(InProgress));
+            set => persistentDictionary.SetString(nameof(InProgress), value);
+        }
+
+        [Description("Allow Libation to fix up audiobook metadata")]
+        public bool AllowLibationFixup
+        {
+            get => persistentDictionary.GetNonString<bool>(nameof(AllowLibationFixup));
+            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("Merge Opening/End Credits into the following/preceding chapters")]
+        public bool MergeOpeningAndEndCredits
+        {
+            get => persistentDictionary.GetNonString<bool>(nameof(MergeOpeningAndEndCredits));
+            set => persistentDictionary.SetNonString(nameof(MergeOpeningAndEndCredits), value);
+        }
+
+        [Description("Strip \"(Unabridged)\" from audiobook metadata tags")]
+        public bool StripUnabridged
+        {
+            get => persistentDictionary.GetNonString<bool>(nameof(StripUnabridged));
+            set => persistentDictionary.SetNonString(nameof(StripUnabridged), value);
+        }
+
+        [Description("Strip audible branding from the start and end of audiobooks.\r\n(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("Lame encoder target. true = Bitrate, false = Quality")]
+        public bool LameTargetBitrate
+        {
+            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);
+        }
+
+        [Description("A Dictionary of GridView data property names and bool indicating its column's visibility in ProductsGrid")]
+        public Dictionary<string, bool> GridColumnsVisibilities
+        {
+            get => persistentDictionary.GetNonString<Dictionary<string, bool>>(nameof(GridColumnsVisibilities));
+            set => persistentDictionary.SetNonString(nameof(GridColumnsVisibilities), value);
+        }
+
+        [Description("A Dictionary of GridView data property names and int indicating its column's display index in ProductsGrid")]
+        public Dictionary<string, int> GridColumnsDisplayIndices
+        {
+            get => persistentDictionary.GetNonString<Dictionary<string, int>>(nameof(GridColumnsDisplayIndices));
+            set => persistentDictionary.SetNonString(nameof(GridColumnsDisplayIndices), value);
+        }
+
+        [Description("A Dictionary of GridView data property names and int indicating its column's width in ProductsGrid")]
+        public Dictionary<string, int> GridColumnsWidths
+        {
+            get => persistentDictionary.GetNonString<Dictionary<string, int>>(nameof(GridColumnsWidths));
+            set => persistentDictionary.SetNonString(nameof(GridColumnsWidths), value);
+        }
+
+        [Description("Save cover image alongside audiobook?")]
+        public bool DownloadCoverArt
+        {
+            get => persistentDictionary.GetNonString<bool>(nameof(DownloadCoverArt));
+            set => persistentDictionary.SetNonString(nameof(DownloadCoverArt), value);
+        }
+
+        public enum BadBookAction
+        {
+            [Description("Ask each time what action to take.")]
+            Ask = 0,
+            [Description("Stop processing books.")]
+            Abort = 1,
+            [Description("Retry book later. Skip for now. Continue processing books.")]
+            Retry = 2,
+            [Description("Permanently ignore book. Continue processing books. Do not try book again.")]
+            Ignore = 3
+        }
+
+        [Description("When liberating books and there is an error, Libation should:")]
+        public BadBookAction BadBook
+        {
+            get
+            {
+                var badBookStr = persistentDictionary.GetString(nameof(BadBook));
+                return Enum.TryParse<BadBookAction>(badBookStr, out var badBookEnum) ? badBookEnum : BadBookAction.Ask;
+            }
+            set => persistentDictionary.SetString(nameof(BadBook), value.ToString());
+        }
+
+        [Description("Show number of newly imported titles? When unchecked, no pop-up will appear after library scan.")]
+        public bool ShowImportedStats
+        {
+            get => persistentDictionary.GetNonString<bool>(nameof(ShowImportedStats));
+            set => persistentDictionary.SetNonString(nameof(ShowImportedStats), value);
+        }
+
+        [Description("Import episodes? (eg: podcasts) When unchecked, episodes will not be imported into Libation.")]
+        public bool ImportEpisodes
+        {
+            get => persistentDictionary.GetNonString<bool>(nameof(ImportEpisodes));
+            set => persistentDictionary.SetNonString(nameof(ImportEpisodes), value);
+        }
+
+        [Description("Download episodes? (eg: podcasts). When unchecked, episodes already in Libation will not be downloaded.")]
+        public bool DownloadEpisodes
+        {
+            get => persistentDictionary.GetNonString<bool>(nameof(DownloadEpisodes));
+            set => persistentDictionary.SetNonString(nameof(DownloadEpisodes), value);
+        }
+
+        public event EventHandler AutoScanChanged;
+
+        [Description("Automatically run periodic scans in the background?")]
+        public bool AutoScan
+        {
+            get => persistentDictionary.GetNonString<bool>(nameof(AutoScan));
+            set
+            {
+                if (AutoScan != value)
+                {
+                    persistentDictionary.SetNonString(nameof(AutoScan), value);
+                    AutoScanChanged?.Invoke(null, null);
+                }
+            }
+        }
+
+        [Description("Auto download episodes? After scan, download new books in 'checked' accounts.")]
+        public bool AutoDownloadEpisodes
+        {
+            get => persistentDictionary.GetNonString<bool>(nameof(AutoDownloadEpisodes));
+            set => persistentDictionary.SetNonString(nameof(AutoDownloadEpisodes), value);
+        }
+
+        [Description("Save all podcast episodes in a series to the series parent folder?")]
+        public bool SavePodcastsToParentFolder
+        {
+            get => persistentDictionary.GetNonString<bool>(nameof(SavePodcastsToParentFolder));
+            set => persistentDictionary.SetNonString(nameof(SavePodcastsToParentFolder), value);
+        }
+
+        #region templates: custom file naming
+
+        [Description("Edit how illegal filename characters are replaced")]
+        public ReplacementCharacters ReplacementCharacters
+        {
+            get => persistentDictionary.GetNonString<ReplacementCharacters>(nameof(ReplacementCharacters));
+            set => persistentDictionary.SetNonString(nameof(ReplacementCharacters), value);
+        }
+
+        [Description("How to format the folders in which files will be saved")]
+        public string FolderTemplate
+        {
+            get => getTemplate(nameof(FolderTemplate), Templates.Folder);
+            set => setTemplate(nameof(FolderTemplate), Templates.Folder, value);
+        }
+
+        [Description("How to format the saved pdf and audio files")]
+        public string FileTemplate
+        {
+            get => getTemplate(nameof(FileTemplate), Templates.File);
+            set => setTemplate(nameof(FileTemplate), Templates.File, value);
+        }
+
+        [Description("How to format the saved audio files when split by chapters")]
+        public string ChapterFileTemplate
+        {
+            get => getTemplate(nameof(ChapterFileTemplate), Templates.ChapterFile);
+            set => setTemplate(nameof(ChapterFileTemplate), Templates.ChapterFile, value);
+        }
+
+        [Description("How to format the file's Tile stored in metadata")]
+        public string ChapterTitleTemplate
+        {
+            get => getTemplate(nameof(ChapterTitleTemplate), Templates.ChapterTitle);
+            set => setTemplate(nameof(ChapterTitleTemplate), Templates.ChapterTitle, value);
+        }
+
+        private string getTemplate(string settingName, Templates templ) => templ.GetValid(persistentDictionary.GetString(settingName));
+        private void setTemplate(string settingName, Templates templ, string newValue)
+        {
+            var template = newValue?.Trim();
+            if (templ.IsValid(template))
+                persistentDictionary.SetString(settingName, template);
+        }
+        #endregion
+    }
+}

Source/LibationFileManager/Configuration.cs

@@ -1,20 +1,14 @@
 using System;
 using System.Collections.Generic;
-using System.ComponentModel;
 using System.IO;
 using System.Linq;
 using Dinah.Core;
-using Dinah.Core.Logging;
 using FileManager;
-using Microsoft.Extensions.Configuration;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
-using Serilog;
-using Serilog.Events;
+
 
 namespace LibationFileManager
 {
-	public class Configuration
+	public partial class Configuration
 	{
 		public bool LibationSettingsAreValid
 			=> File.Exists(APPSETTINGS_JSON)
@@ -37,519 +31,9 @@ namespace LibationFileManager
 			return true;
 		}
 
-		#region persistent configuration settings/values
-
-		// note: any potential file manager static ctors can't compensate if storage dir is changed at run time via settings. this is partly bad architecture. but the side effect is desirable. if changing LibationFiles location: restart app
-
-		// default setting and directory creation occur in class responsible for files.
-		// config class is only responsible for path. not responsible for setting defaults, dir validation, or dir creation
-		// exceptions: appsettings.json, LibationFiles dir, Settings.json
-
-		private PersistentDictionary persistentDictionary;
-
-		public T GetNonString<T>(string propertyName) => persistentDictionary.GetNonString<T>(propertyName);
-		public object GetObject(string propertyName) => persistentDictionary.GetObject(propertyName);
-		public void SetObject(string propertyName, object newValue) => persistentDictionary.SetNonString(propertyName, newValue);
-
-		/// <summary>WILL ONLY set if already present. WILL NOT create new</summary>
-		public void SetWithJsonPath(string jsonPath, string propertyName, string newValue, bool suppressLogging = false)
-		{
-			var settingWasChanged = persistentDictionary.SetWithJsonPath(jsonPath, propertyName, newValue, suppressLogging);
-			if (settingWasChanged)
-				configuration?.Reload();
-		}
-
-		public string SettingsFilePath => Path.Combine(LibationFiles, "Settings.json");
-
-		public static string GetDescription(string propertyName)
-		{
-			var attribute = typeof(Configuration)
-				.GetProperty(propertyName)
-				?.GetCustomAttributes(typeof(DescriptionAttribute), true)
-				.SingleOrDefault()
-				as DescriptionAttribute;
-
-			return attribute?.Description;
-		}
-
-		public bool Exists(string propertyName) => persistentDictionary.Exists(propertyName);       
-
-		[Description("Use the beta version of Libation\r\nNew and experimental features, but probably buggy.\r\n(requires restart to take effect)")]
-		public bool BetaOptIn
-		{
-			get => persistentDictionary.GetNonString<bool>(nameof(BetaOptIn));
-			set => persistentDictionary.SetNonString(nameof(BetaOptIn), value);
-		}
-
-		[Description("Location for book storage. Includes destination of newly liberated books")]
-		public string Books
-		{
-			get => persistentDictionary.GetString(nameof(Books));
-			set => persistentDictionary.SetString(nameof(Books), value);
-		}
-
-		// temp/working dir(s) should be outside of dropbox
-		[Description("Temporary location of files while they're in process of being downloaded and decrypted.\r\nWhen decryption is complete, the final file will be in Books location\r\nRecommend not using a folder which is backed up real time. Eg: Dropbox, iCloud, Google Drive")]
-		public string InProgress
-		{
-			get => persistentDictionary.GetString(nameof(InProgress));
-			set => persistentDictionary.SetString(nameof(InProgress), value);
-		}
-
-		[Description("Allow Libation to fix up audiobook metadata")]
-		public bool AllowLibationFixup
-		{
-			get => persistentDictionary.GetNonString<bool>(nameof(AllowLibationFixup));
-			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("Merge Opening/End Credits into the following/preceding chapters")]
-		public bool MergeOpeningAndEndCredits
-		{
-			get => persistentDictionary.GetNonString<bool>(nameof(MergeOpeningAndEndCredits));
-			set => persistentDictionary.SetNonString(nameof(MergeOpeningAndEndCredits), value);
-		}
-
-		[Description("Strip \"(Unabridged)\" from audiobook metadata tags")]
-		public bool StripUnabridged
-		{
-			get => persistentDictionary.GetNonString<bool>(nameof(StripUnabridged));
-			set => persistentDictionary.SetNonString(nameof(StripUnabridged), value);
-		}
-
-		[Description("Strip audible branding from the start and end of audiobooks.\r\n(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("Lame encoder target. true = Bitrate, false = Quality")]
-		public bool LameTargetBitrate
-		{
-			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);
-		}
-		
-		[Description("A Dictionary of GridView data property names and bool indicating its column's visibility in ProductsGrid")]
-		public Dictionary<string, bool> GridColumnsVisibilities
-		{
-			get => persistentDictionary.GetNonString<Dictionary<string, bool>>(nameof(GridColumnsVisibilities));
-			set => persistentDictionary.SetNonString(nameof(GridColumnsVisibilities), value);
-		}
-
-		[Description("A Dictionary of GridView data property names and int indicating its column's display index in ProductsGrid")]
-		public Dictionary<string, int> GridColumnsDisplayIndices
-		{
-			get => persistentDictionary.GetNonString<Dictionary<string,int>>(nameof(GridColumnsDisplayIndices));
-			set => persistentDictionary.SetNonString(nameof(GridColumnsDisplayIndices), value);
-		}
-
-		[Description("A Dictionary of GridView data property names and int indicating its column's width in ProductsGrid")]
-		public Dictionary<string, int> GridColumnsWidths
-		{
-			get => persistentDictionary.GetNonString<Dictionary<string,int>>(nameof(GridColumnsWidths));
-			set => persistentDictionary.SetNonString(nameof(GridColumnsWidths), value);
-		}
-		
-		[Description("Save cover image alongside audiobook?")]
-		public bool DownloadCoverArt
-		{
-			get => persistentDictionary.GetNonString<bool>(nameof(DownloadCoverArt));
-			set => persistentDictionary.SetNonString(nameof(DownloadCoverArt), value);
-		}
-
-		public enum BadBookAction
-		{
-			[Description("Ask each time what action to take.")]
-			Ask = 0,
-			[Description("Stop processing books.")]
-			Abort = 1,
-			[Description("Retry book later. Skip for now. Continue processing books.")]
-			Retry = 2,
-			[Description("Permanently ignore book. Continue processing books. Do not try book again.")]
-			Ignore = 3
-		}
-
-		[Description("When liberating books and there is an error, Libation should:")]
-		public BadBookAction BadBook
-		{
-			get
-			{
-				var badBookStr = persistentDictionary.GetString(nameof(BadBook));
-				return Enum.TryParse<BadBookAction>(badBookStr, out var badBookEnum) ? badBookEnum : BadBookAction.Ask;
-			}
-			set => persistentDictionary.SetString(nameof(BadBook), value.ToString());
-		}
-
-		[Description("Show number of newly imported titles? When unchecked, no pop-up will appear after library scan.")]
-		public bool ShowImportedStats
-		{
-			get => persistentDictionary.GetNonString<bool>(nameof(ShowImportedStats));
-			set => persistentDictionary.SetNonString(nameof(ShowImportedStats), value);
-		}
-
-		[Description("Import episodes? (eg: podcasts) When unchecked, episodes will not be imported into Libation.")]
-		public bool ImportEpisodes
-		{
-			get => persistentDictionary.GetNonString<bool>(nameof(ImportEpisodes));
-			set => persistentDictionary.SetNonString(nameof(ImportEpisodes), value);
-		}
-
-		[Description("Download episodes? (eg: podcasts). When unchecked, episodes already in Libation will not be downloaded.")]
-		public bool DownloadEpisodes
-		{
-			get => persistentDictionary.GetNonString<bool>(nameof(DownloadEpisodes));
-			set => persistentDictionary.SetNonString(nameof(DownloadEpisodes), value);
-		}
-
-		public event EventHandler AutoScanChanged;
-
-		[Description("Automatically run periodic scans in the background?")]
-		public bool AutoScan
-		{
-			get => persistentDictionary.GetNonString<bool>(nameof(AutoScan));
-			set
-			{
-				if (AutoScan != value)
-				{
-					persistentDictionary.SetNonString(nameof(AutoScan), value);
-					AutoScanChanged?.Invoke(null, null);
-				}
-			}
-		}
-
-		[Description("Auto download episodes? After scan, download new books in 'checked' accounts.")]
-		public bool AutoDownloadEpisodes
-		{
-			get => persistentDictionary.GetNonString<bool>(nameof(AutoDownloadEpisodes));
-			set => persistentDictionary.SetNonString(nameof(AutoDownloadEpisodes), value);
-		}
-
-		[Description("Save all podcast episodes in a series to the series parent folder?")]
-		public bool SavePodcastsToParentFolder
-		{
-			get => persistentDictionary.GetNonString<bool>(nameof(SavePodcastsToParentFolder));
-			set => persistentDictionary.SetNonString(nameof(SavePodcastsToParentFolder), value);
-		}
-
-		#region templates: custom file naming
-
-		[Description("Edit how illegal filename characters are replaced")]
-		public ReplacementCharacters ReplacementCharacters
-		{
-			get => persistentDictionary.GetNonString<ReplacementCharacters>(nameof(ReplacementCharacters));
-			set => persistentDictionary.SetNonString(nameof(ReplacementCharacters), value);
-		}
-
-		[Description("How to format the folders in which files will be saved")]
-		public string FolderTemplate
-		{
-			get => getTemplate(nameof(FolderTemplate), Templates.Folder);
-			set => setTemplate(nameof(FolderTemplate), Templates.Folder, value);
-		}
-
-		[Description("How to format the saved pdf and audio files")]
-		public string FileTemplate
-		{
-			get => getTemplate(nameof(FileTemplate), Templates.File);
-			set => setTemplate(nameof(FileTemplate), Templates.File, value);
-		}
-
-		[Description("How to format the saved audio files when split by chapters")]
-		public string ChapterFileTemplate
-		{
-			get => getTemplate(nameof(ChapterFileTemplate), Templates.ChapterFile);
-			set => setTemplate(nameof(ChapterFileTemplate), Templates.ChapterFile, value);
-		}
-
-		[Description("How to format the file's Tile stored in metadata")]
-		public string ChapterTitleTemplate
-		{
-			get => getTemplate(nameof(ChapterTitleTemplate), Templates.ChapterTitle);
-			set => setTemplate(nameof(ChapterTitleTemplate), Templates.ChapterTitle, value);
-		}
-
-		private string getTemplate(string settingName, Templates templ) => templ.GetValid(persistentDictionary.GetString(settingName));
-		private void setTemplate(string settingName, Templates templ, string newValue)
-		{
-			var template = newValue?.Trim();
-			if (templ.IsValid(template))
-				persistentDictionary.SetString(settingName, template);
-		}
-		#endregion
-
-		#endregion
-
-		#region known directories
-		public static string AppDir_Relative => $@".{Path.PathSeparator}{LIBATION_FILES_KEY}";
-		public static string AppDir_Absolute => Path.GetFullPath(Path.Combine(Path.GetDirectoryName(Exe.FileLocationOnDisk), LIBATION_FILES_KEY));
-		public static string MyDocs => Path.GetFullPath(Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments), "Libation"));
-		public static string WinTemp => Path.GetFullPath(Path.Combine(Path.GetTempPath(), "Libation"));
-		public static string UserProfile => Path.GetFullPath(Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile), "Libation"));
-
-		public enum KnownDirectories
-		{
-			None = 0,
-
-			[Description("My Users folder")]
-			UserProfile = 1,
-
-			[Description("The same folder that Libation is running from")]
-			AppDir = 2,
-
-			[Description("Windows temporary folder")]
-			WinTemp = 3,
-
-			[Description("My Documents")]
-			MyDocs = 4,
-
-			[Description("Your settings folder (aka: Libation Files)")]
-			LibationFiles = 5
-		}
-		// use func calls so we always get the latest value of LibationFiles
-		private static List<(KnownDirectories directory, Func<string> getPathFunc)> directoryOptionsPaths { get; } = new()
-		{
-			(KnownDirectories.None, () => null),
-			(KnownDirectories.UserProfile, () => UserProfile),
-			(KnownDirectories.AppDir, () => AppDir_Relative),
-			(KnownDirectories.WinTemp, () => WinTemp),
-			(KnownDirectories.MyDocs, () => MyDocs),
-			// this is important to not let very early calls try to accidentally load LibationFiles too early.
-			// also, keep this at bottom of this list
-			(KnownDirectories.LibationFiles, () => libationFilesPathCache)
-		};
-		public static string GetKnownDirectoryPath(KnownDirectories directory)
-		{
-			var dirFunc = directoryOptionsPaths.SingleOrDefault(dirFunc => dirFunc.directory == directory);
-			return dirFunc == default ? null : dirFunc.getPathFunc();
-		}
-		public static KnownDirectories GetKnownDirectory(string directory)
-		{
-			// especially important so a very early call doesn't match null => LibationFiles
-			if (string.IsNullOrWhiteSpace(directory))
-				return KnownDirectories.None;
-
-			// 'First' instead of 'Single' because LibationFiles could match other directories. eg: default value of LibationFiles == UserProfile.
-			// since it's a list, order matters and non-LibationFiles will be returned first
-			var dirFunc = directoryOptionsPaths.FirstOrDefault(dirFunc => dirFunc.getPathFunc() == directory);
-			return dirFunc == default ? KnownDirectories.None : dirFunc.directory;
-		}
-		#endregion
-
-		#region logging
-		private IConfigurationRoot configuration;
-
-		public void ConfigureLogging()
-		{
-			configuration = new ConfigurationBuilder()
-				.AddJsonFile(SettingsFilePath, optional: false, reloadOnChange: true)
-				.Build();
-			Log.Logger = new LoggerConfiguration()
-				.ReadFrom.Configuration(configuration)
-				.CreateLogger();
-		}
-
-		[Description("The importance of a log event")]
-		public LogEventLevel LogLevel
-		{
-			get
-			{
-				var logLevelStr = persistentDictionary.GetStringFromJsonPath("Serilog", "MinimumLevel");
-				return Enum.TryParse<LogEventLevel>(logLevelStr, out var logLevelEnum) ? logLevelEnum : LogEventLevel.Information;
-			}
-			set
-			{
-				var valueWasChanged = persistentDictionary.SetWithJsonPath("Serilog", "MinimumLevel", value.ToString());
-				if (!valueWasChanged)
-				{
-					Log.Logger.Debug("LogLevel.set attempt. No change");
-					return;
-				}
-
-				configuration.Reload();
-
-				Log.Logger.Information("Updated LogLevel MinimumLevel. {@DebugInfo}", new
-				{
-					LogLevel_Verbose_Enabled = Log.Logger.IsVerboseEnabled(),
-					LogLevel_Debug_Enabled = Log.Logger.IsDebugEnabled(),
-					LogLevel_Information_Enabled = Log.Logger.IsInformationEnabled(),
-					LogLevel_Warning_Enabled = Log.Logger.IsWarningEnabled(),
-					LogLevel_Error_Enabled = Log.Logger.IsErrorEnabled(),
-					LogLevel_Fatal_Enabled = Log.Logger.IsFatalEnabled()
-				});
-			}
-		}
-		#endregion
-
 		#region singleton stuff
 		public static Configuration Instance { get; } = new Configuration();
 		private Configuration() { }
 		#endregion
-
-		#region LibationFiles
-		private static string APPSETTINGS_JSON { get; } = Path.Combine(Path.GetDirectoryName(System.Reflection.Assembly.GetExecutingAssembly().Location), "appsettings.json");
-		private const string LIBATION_FILES_KEY = "LibationFiles";
-
-		[Description("Location for storage of program-created files")]
-		public string LibationFiles
-		{
-			get
-			{
-				if (libationFilesPathCache is not null)
-					return libationFilesPathCache;
-
-				// FIRST: must write here before SettingsFilePath in next step reads cache
-				libationFilesPathCache = getLibationFilesSettingFromJson();
-
-				// SECOND. before setting to json file with SetWithJsonPath, PersistentDictionary must exist
-				persistentDictionary = new PersistentDictionary(SettingsFilePath);
-
-				// Config init in ensureSerilogConfig() only happens when serilog setting is first created (prob on 1st run).
-				// This Set() enforces current LibationFiles every time we restart Libation or redirect LibationFiles
-				var logPath = Path.Combine(LibationFiles, "Log.log");
-
-				// BAD: Serilog.WriteTo[1].Args
-				//      "[1]" assumes ordinal position
-				// GOOD: Serilog.WriteTo[?(@.Name=='File')].Args
-				var jsonpath = "Serilog.WriteTo[?(@.Name=='File')].Args";
-
-				SetWithJsonPath(jsonpath, "path", logPath, true);
-
-				return libationFilesPathCache;
-			}
-		}
-
-		private static string libationFilesPathCache { get; set; }
-
-		private string getLibationFilesSettingFromJson()
-		{
-			string startingContents = null;
-			try
-			{
-				if (File.Exists(APPSETTINGS_JSON))
-				{
-					startingContents = File.ReadAllText(APPSETTINGS_JSON);
-					var startingJObj = JObject.Parse(startingContents);
-
-					if (startingJObj.ContainsKey(LIBATION_FILES_KEY))
-					{
-						var startingValue = startingJObj[LIBATION_FILES_KEY].Value<string>();
-						if (!string.IsNullOrWhiteSpace(startingValue))
-							return startingValue;
-					}
-				}
-			}
-			catch { }
-
-			// not found. write to file. read from file
-			var endingContents = new JObject { { LIBATION_FILES_KEY, UserProfile.ToString() } }.ToString(Formatting.Indented);
-			if (startingContents != endingContents)
-			{
-				File.WriteAllText(APPSETTINGS_JSON, endingContents);
-				System.Threading.Thread.Sleep(100);
-			}
-
-			// do not check whether directory exists. special/meta directory (eg: AppDir) is valid
-			// verify from live file. no try/catch. want failures to be visible
-			var jObjFinal = JObject.Parse(File.ReadAllText(APPSETTINGS_JSON));
-			var valueFinal = jObjFinal[LIBATION_FILES_KEY].Value<string>();
-			return valueFinal;
-		}
-
-		public void SetLibationFiles(string directory)
-		{
-			// ensure exists
-			if (!File.Exists(APPSETTINGS_JSON))
-			{
-				// getter creates new file, loads PersistentDictionary
-				var _ = LibationFiles;
-				System.Threading.Thread.Sleep(100);
-			}
-
-			libationFilesPathCache = null;
-
-			var startingContents = File.ReadAllText(APPSETTINGS_JSON);
-			var jObj = JObject.Parse(startingContents);
-
-			jObj[LIBATION_FILES_KEY] = directory;
-
-			var endingContents = JsonConvert.SerializeObject(jObj, Formatting.Indented);
-			if (startingContents == endingContents)
-				return;
-
-			// now it's set in the file again but no settings have moved yet
-			File.WriteAllText(APPSETTINGS_JSON, endingContents);
-
-			try
-			{
-				Log.Logger.Information("Libation files changed {@DebugInfo}", new { APPSETTINGS_JSON, LIBATION_FILES_KEY, directory });
-			}
-			catch { }
-		}
-		#endregion
 	}
 }

Source/LibationFileManager/IInteropFunctions.cs

@@ -0,0 +1,10 @@
+using System;
+
+namespace LibationFileManager
+{
+    public interface IInteropFunctions
+    {
+        void SetFolderIcon(string image, string directory);
+        void DeleteFolderIcon(string directory);
+    }
+}

Source/LibationFileManager/InteropFactory.cs

@@ -0,0 +1,158 @@
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.IO;
+using System.Linq;
+using System.Reflection;
+using System.Threading;
+using Dinah.Core;
+
+namespace LibationFileManager
+{
+    public static class InteropFactory
+    {
+        public static Type InteropFunctionsType { get; }
+
+        public static IInteropFunctions Create() => _create();
+
+        //// examples of the pattern which could be useful later
+        //public static IInteropFunctions Create(string str, int i) => _create(str, i);
+        //public static IInteropFunctions Create(params object[] values) => _create(values);
+
+        private static IInteropFunctions _create(params object[] values)
+            => InteropFunctionsType is null ? new NullInteropFunctions()
+            //: values is null || values.Length == 0 ? Activator.CreateInstance(InteropFunctionsType) as IInteropFunctions
+            : Activator.CreateInstance(InteropFunctionsType, values) as IInteropFunctions;
+
+        #region load types
+
+        public static Func<string, bool> MatchesOS { get; }
+            = Configuration.IsWindows ? a => Path.GetFileName(a).StartsWithInsensitive("win")
+            : Configuration.IsLinux ? a => Path.GetFileName(a).StartsWithInsensitive("linux")
+            : Configuration.IsMacOs ? a => Path.GetFileName(a).StartsWithInsensitive("mac") || Path.GetFileName(a).StartsWithInsensitive("osx")
+            : _ => false;
+
+        private const string CONFIG_APP_ENDING = "ConfigApp.dll";
+        private static List<ProcessModule> ModuleList { get; } = new();
+        static InteropFactory()
+        {
+            // searches file names for potential matches; doesn't run anything
+            var configApp = getOSConfigApp();
+
+            // nothing to load
+            if (configApp is null)
+            {
+                Serilog.Log.Logger.Error($"Unable to locate *{CONFIG_APP_ENDING}");
+                return;
+            }
+
+            /*
+            * Commented code used to locate assemblies from the *ConfigApp.exe's module list.
+            * Use this method to locate dependencies when they are not in Libation's program files directory.
+#if DEBUG
+
+           // runs the exe and gets the exe's loaded modules
+           ModuleList = LoadModuleList(Path.GetFileNameWithoutExtension(configApp))
+               .OrderBy(x => x.ModuleName)
+               .ToList();
+#endif
+            */
+
+            AppDomain.CurrentDomain.AssemblyResolve += CurrentDomain_AssemblyResolve;
+
+            var configAppAssembly = Assembly.LoadFrom(configApp);
+            var type = typeof(IInteropFunctions);
+            InteropFunctionsType = configAppAssembly
+                .GetTypes()
+                .FirstOrDefault(t => type.IsAssignableFrom(t));
+        }
+        private static string getOSConfigApp()
+        {
+            var here = Path.GetDirectoryName(Environment.ProcessPath);
+
+            // find '*ConfigApp.dll' files
+            var appName =
+                Directory.EnumerateFiles(here, $"*{CONFIG_APP_ENDING}", SearchOption.TopDirectoryOnly)
+                // sanity check. shouldn't ever be true
+                .Except(new[] { Environment.ProcessPath })
+                .FirstOrDefault(exe => MatchesOS(exe));
+
+            return appName;
+        }
+
+       /*
+        * Use this method to locate dependencies when they are not in Libation's program files directory.
+        * 
+        private static List<ProcessModule> LoadModuleList(string exeName)
+        {
+            var proc = new Process
+            {
+                StartInfo = new()
+                {
+                    FileName = exeName,
+                    RedirectStandardInput = true,
+                    RedirectStandardOutput = true,
+                    CreateNoWindow = true,
+                    WindowStyle = ProcessWindowStyle.Hidden,
+                    UseShellExecute = false
+                }
+            };
+
+            var waitHandle = new EventWaitHandle(false, EventResetMode.ManualReset);
+
+            proc.OutputDataReceived += (_, _) => waitHandle.Set();
+            proc.Start();
+            proc.BeginOutputReadLine();
+
+            //Let the win process know we're ready to receive its standard output
+            proc.StandardInput.WriteLine();
+
+            if (!waitHandle.WaitOne(2000))
+                throw new Exception("Failed to start program");
+
+            //The win process has finished loading and is now waiting inside Main().
+            //Copy it process module list.
+            var modules = proc.Modules.Cast<ProcessModule>().ToList();
+
+            //Let the win process know we're done reading its module list
+            proc.StandardInput.WriteLine();
+
+            return modules;
+        }
+        */
+
+        private static Assembly CurrentDomain_AssemblyResolve(object sender, ResolveEventArgs args)
+        {
+            // e.g. "System.Windows.Forms, Version=6.0.2.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"
+            var asmName = args.Name.Split(',')[0] + ".dll";
+
+
+            /*
+             * Commented code used to locate assemblies from the *ConfigApp.exe's module list.
+             * Use this method to locate dependencies when they are not in Libation's program files directory.
+ #if DEBUG
+
+            var modulePath = ModuleList.SingleOrDefault(m => m.ModuleName.EqualsInsensitive(asmName))?.FileName;
+ #else
+            */
+            var here = Path.GetDirectoryName(Environment.ProcessPath);
+
+            // find the requested assembly in the program files directory
+            var modulePath =
+                Directory.EnumerateFiles(here, asmName, SearchOption.TopDirectoryOnly)
+                .SingleOrDefault();
+
+            //#endif
+            if (modulePath is null)
+            {
+                //Let the runtime handle any dll not found exceptions.
+                Serilog.Log.Logger.Error($"Unable to load module {args.Name}");
+                return null;
+            }
+
+            return Assembly.LoadFrom(modulePath);
+        }
+
+        #endregion
+    }
+}

Source/LibationFileManager/LibationFileManager.csproj

@@ -14,12 +14,22 @@
     <ProjectReference Include="..\FileManager\FileManager.csproj" />
   </ItemGroup>
 
-	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-		<DebugType>embedded</DebugType>
-	</PropertyGroup>
+  <ItemGroup>
+    <Compile Update="Configuration.*.cs">
+      <DependentUpon>Configuration.cs</DependentUpon>
+    </Compile>
+  </ItemGroup>
+
+  <ItemGroup>
+    <Folder Include="OSInterop\" />
+  </ItemGroup>
+
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+    <DebugType>embedded</DebugType>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
+    <DebugType>embedded</DebugType>
+  </PropertyGroup>
 
-	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
-		<DebugType>embedded</DebugType>
-	</PropertyGroup>
-	
 </Project>

Source/LibationFileManager/NullInteropFunctions.cs

@@ -0,0 +1,13 @@
+using System;
+
+namespace LibationFileManager
+{
+    public class NullInteropFunctions : IInteropFunctions
+    {
+        public NullInteropFunctions() { }
+        public NullInteropFunctions(params object[] values) { }
+
+        public void SetFolderIcon(string image, string directory) => throw new PlatformNotSupportedException();
+        public void DeleteFolderIcon(string directory) => throw new PlatformNotSupportedException();
+    }
+}

Source/LibationFileManager/PictureStorage.cs

@@ -71,6 +71,12 @@ namespace LibationFileManager
 			}
 		}
 
+		public static string GetPicturePathSynchronously(PictureDefinition def)
+        {
+			GetPictureSynchronously(def);
+			return getPath(def);
+		}
+
 		public static byte[] GetPictureSynchronously(PictureDefinition def)
 		{
 			lock (cacheLocker)

Source/LibationFileManager/WindowsDirectory.cs

@@ -0,0 +1,40 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace LibationFileManager
+{
+    public static class WindowsDirectory
+    {
+        public static void SetCoverAsFolderIcon(string pictureId, string directory)
+        {
+            try
+            {
+                if (!Configuration.Instance.UseCoverAsFolderIcon || !Configuration.IsWindows)
+                    return;
+
+                // get path of cover art in Images dir. Download first if not exists
+                var coverArtPath = PictureStorage.GetPicturePathSynchronously(new(pictureId, PictureSize._300x300));
+
+                InteropFactory.Create().SetFolderIcon(image: coverArtPath, directory: directory);
+            }
+            catch (Exception ex)
+            {
+                // Failure to 'set cover as folder icon' should not be considered a failure to download the book
+                Serilog.Log.Logger.Error(ex, "Error setting cover art as folder icon. {@DebugInfo}", new { directory });
+
+                try
+                {
+                    InteropFactory.Create().DeleteFolderIcon(directory);
+                }
+                catch
+                {
+                    Serilog.Log.Logger.Error(ex, "Error rolling back: setting cover art as folder icon. {@DebugInfo}", new { directory });
+                }
+            }
+        }
+    }
+}

Source/LibationWinForms/Dialogs/BookDetailsDialog.cs

@@ -42,7 +42,7 @@ namespace LibationWinForms.Dialogs
 			this.Text = Book.Title;
 
 			(_, var picture) = PictureStorage.GetPicture(new PictureDefinition(Book.PictureId, PictureSize._80x80));
-			this.coverPb.Image = Dinah.Core.Drawing.ImageReader.ToImage(picture);
+			this.coverPb.Image = Dinah.Core.WindowsDesktop.Drawing.ImageReader.ToImage(picture);
 
 			var t = @$"
 Title: {Book.Title}
@@ -51,7 +51,7 @@ Narrator(s): {Book.NarratorNames()}
 Length: {(Book.LengthInMinutes == 0 ? "" : $"{Book.LengthInMinutes / 60} hr {Book.LengthInMinutes % 60} min")}
 Audio Bitrate: {Book.AudioFormat}
 Category: {string.Join(" > ", Book.CategoriesNames())}
-Purchase Date: {_libraryBook.DateAdded.ToString("d")}
+Purchase Date: {_libraryBook.DateAdded:d}
 Audible ID: {Book.AudibleProductId}
 ".Trim();
 

Source/LibationWinForms/Dialogs/SettingsDialog.DownloadDecrypt.cs

@@ -25,12 +25,13 @@ namespace LibationWinForms.Dialogs
 			editCharreplacementBtn.Text = desc(nameof(config.ReplacementCharacters));
 
 			badBookGb.Text = desc(nameof(config.BadBook));
-			badBookAskRb.Text = Configuration.BadBookAction.Ask.GetDescription();
+            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()
+            inProgressSelectControl.SetDirectoryItems(new()
 			{
 				Configuration.KnownDirectories.WinTemp,
 				Configuration.KnownDirectories.UserProfile,
@@ -56,7 +57,8 @@ namespace LibationWinForms.Dialogs
 			folderTemplateTb.Text = config.FolderTemplate;
 			fileTemplateTb.Text = config.FileTemplate;
 			chapterFileTemplateTb.Text = config.ChapterFileTemplate;
-		}
+			useCoverAsFolderIconCb.Checked = config.UseCoverAsFolderIcon;
+        }
 
 		private void Save_DownloadDecrypt(Configuration config)
 		{
@@ -72,6 +74,7 @@ namespace LibationWinForms.Dialogs
 			config.FolderTemplate = folderTemplateTb.Text;
 			config.FileTemplate = fileTemplateTb.Text;
 			config.ChapterFileTemplate = chapterFileTemplateTb.Text;
+			config.UseCoverAsFolderIcon = useCoverAsFolderIconCb.Checked;
 		}
 	}
 }

Source/LibationWinForms/Form1.Settings.cs

@@ -13,6 +13,6 @@ namespace LibationWinForms
         private void basicSettingsToolStripMenuItem_Click(object sender, EventArgs e) => new SettingsDialog().ShowDialog();
 
         private void aboutToolStripMenuItem_Click(object sender, EventArgs e)
-            => MessageBox.Show($"Running Libation version {AppScaffolding.LibationScaffolding.BuildVersion}", $"Libation v{AppScaffolding.LibationScaffolding.BuildVersion}");
+            => MessageBox.Show($"Libation {AppScaffolding.LibationScaffolding.Variety}{Environment.NewLine}Version {AppScaffolding.LibationScaffolding.BuildVersion}", $"Libation v{AppScaffolding.LibationScaffolding.BuildVersion}");
     }
 }

Source/LibationWinForms/Form1._NonUI.cs

@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using ApplicationServices;
-using Dinah.Core.Drawing;
+using Dinah.Core.WindowsDesktop.Drawing;
 using LibationFileManager;
 
 namespace LibationWinForms

Source/LibationWinForms/GridView/EditTagsDataGridViewImageButtonColumn.cs

@@ -1,6 +1,6 @@
-using Dinah.Core.Windows.Forms;
-using System.Drawing;
+using System.Drawing;
 using System.Windows.Forms;
+using Dinah.Core.WindowsDesktop.Forms;
 
 namespace LibationWinForms.GridView
 {

Source/LibationWinForms/GridView/GridEntry.cs

@@ -1,7 +1,7 @@
 using DataLayer;
 using Dinah.Core;
 using Dinah.Core.DataBinding;
-using Dinah.Core.Drawing;
+using Dinah.Core.WindowsDesktop.Drawing;
 using LibationFileManager;
 using System;
 using System.Collections;

Source/LibationWinForms/GridView/ImageDisplay.cs

@@ -9,7 +9,7 @@ namespace LibationWinForms.GridView
 	{
 		public string PictureFileName { get; set; }
 		public string BookSaveDirectory { get; set; }
-		public byte[] CoverPicture { get => _coverBytes; set => pictureBox1.Image = Dinah.Core.Drawing.ImageReader.ToImage(_coverBytes = value); }
+		public byte[] CoverPicture { get => _coverBytes; set => pictureBox1.Image = Dinah.Core.WindowsDesktop.Drawing.ImageReader.ToImage(_coverBytes = value); }
 
 		private byte[] _coverBytes;
 

Source/LibationWinForms/GridView/LiberateDataGridViewImageButtonColumn.cs

@@ -1,8 +1,8 @@
-using DataLayer;
-using Dinah.Core.Windows.Forms;
-using System;
+using System;
 using System.Drawing;
 using System.Windows.Forms;
+using DataLayer;
+using Dinah.Core.WindowsDesktop.Forms;
 
 namespace LibationWinForms.GridView
 {

Source/LibationWinForms/GridView/ProductsGrid.cs

@@ -1,12 +1,12 @@
-using DataLayer;
-using Dinah.Core.Windows.Forms;
-using LibationFileManager;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Data;
 using System.Drawing;
 using System.Linq;
 using System.Windows.Forms;
+using DataLayer;
+using Dinah.Core.WindowsDesktop.Forms;
+using LibationFileManager;
 
 namespace LibationWinForms.GridView
 {

Source/LibationWinForms/LibationWinForms.csproj

@@ -44,7 +44,7 @@
 
 	<ItemGroup>
 		<PackageReference Include="Autoupdater.NET.Official" Version="1.7.4" />
-		<PackageReference Include="Dinah.Core.WindowsDesktop" Version="4.2.3.1" />
+		<PackageReference Include="Dinah.Core.WindowsDesktop" Version="5.2.1.1" />
 	</ItemGroup>
 
 	<ItemGroup>
@@ -89,7 +89,7 @@
 		</EmbeddedResource>
 	</ItemGroup>
 
-	<Target Name="SpicNSpan"  AfterTargets="Clean">
+	<Target Name="SpicNSpan" AfterTargets="Clean">
 		<!-- Remove obj folder -->
 		<RemoveDir Directories="$(BaseIntermediateOutputPath)" />
 		<!-- Remove bin folder -->

Source/LibationWinForms/ProcessQueue/ProcessBook.cs

@@ -9,6 +9,7 @@ using System.Windows.Forms;
 using ApplicationServices;
 using DataLayer;
 using Dinah.Core;
+using Dinah.Core.WindowsDesktop.Drawing;
 using FileLiberator;
 using LibationFileManager;
 
@@ -80,7 +81,7 @@ namespace LibationWinForms.ProcessQueue
 
 			if (isDefault)
 				PictureStorage.PictureCached += PictureStorage_PictureCached;
-			_cover = Dinah.Core.Drawing.ImageReader.ToImage(picture);
+			_cover = ImageReader.ToImage(picture);
 
 		}
 
@@ -88,7 +89,7 @@ namespace LibationWinForms.ProcessQueue
 		{
 			if (e.Definition.PictureId == LibraryBook.Book.PictureId)
 			{
-				Cover = Dinah.Core.Drawing.ImageReader.ToImage(e.Picture);
+				Cover = ImageReader.ToImage(e.Picture);
 				PictureStorage.PictureCached -= PictureStorage_PictureCached;
 			}
 		}
@@ -240,7 +241,7 @@ namespace LibationWinForms.ProcessQueue
 
 		private void AudioDecodable_CoverImageDiscovered(object sender, byte[] coverArt)
 		{
-			Cover = Dinah.Core.Drawing.ImageReader.ToImage(coverArt);
+			Cover = ImageReader.ToImage(coverArt);
 		}
 
 		#endregion

Source/LibationWinForms/Properties/PublishProfiles/WindowsProfile.pubxml

@@ -6,7 +6,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
   <PropertyGroup>
     <Configuration>Release</Configuration>
     <Platform>Any CPU</Platform>
-    <PublishDir>..\bin\publish\</PublishDir>
+    <PublishDir>..\bin\Publish\classic</PublishDir>
     <PublishProtocol>FileSystem</PublishProtocol>
     <TargetFramework>net6.0-windows</TargetFramework>
     <RuntimeIdentifier>win-x64</RuntimeIdentifier>

Source/LoadByOS/LinuxConfigApp/LinuxConfigApp.csproj

@@ -0,0 +1,37 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>net6.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <PublishReadyToRun>true</PublishReadyToRun>
+    <RuntimeIdentifier>linux-x64</RuntimeIdentifier>
+    <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
+    <AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <!--
+    HACK FOR COMPILER BUG  2021-09-14. Hopefully will be fixed in future versions
+    - Not using SatelliteResourceLanguages will load all language packs: works
+    - Specifying 'en' semicolon 1 more should load 1 language pack: works
+    - Specifying only 'en' should load no language packs: broken, still loads all
+    -->
+    <SatelliteResourceLanguages>en;es</SatelliteResourceLanguages>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+    <OutputPath>..\..\bin\Avalonia\Debug</OutputPath>
+    <DebugType>embedded</DebugType>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
+    <OutputPath>..\..\bin\Avalonia\Release</OutputPath>
+    <DebugType>embedded</DebugType>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\AppScaffolding\AppScaffolding.csproj" />
+  </ItemGroup>
+
+</Project>

Source/LoadByOS/LinuxConfigApp/LinuxInterop.cs

@@ -0,0 +1,13 @@
+using LibationFileManager;
+
+namespace LinuxConfigApp
+{
+    internal class LinuxInterop : IInteropFunctions
+    {
+        public LinuxInterop() { }
+        public LinuxInterop(params object[] values) { }
+
+        public void SetFolderIcon(string image, string directory) => throw new PlatformNotSupportedException();
+        public void DeleteFolderIcon(string directory) => throw new PlatformNotSupportedException();
+    }
+}

Source/LoadByOS/LinuxConfigApp/Program.cs

@@ -0,0 +1,11 @@
+using AppScaffolding;
+
+namespace LinuxConfigApp
+{
+    class Program : OSConfigBase
+    {
+        public override Type InteropFunctionsType => typeof(LinuxInterop);
+
+        static void Main() => new Program().Run();
+    }
+}

Source/LoadByOS/LinuxConfigApp/PublishProfiles/LinuxProfile.pubxml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+https://go.microsoft.com/fwlink/?LinkID=208121.
+-->
+<Project>
+  <PropertyGroup>
+    <Configuration>Release</Configuration>
+    <Platform>Any CPU</Platform>
+    <PublishDir>..\..\bin\Publish\linux-chardonnay</PublishDir>
+    <PublishProtocol>FileSystem</PublishProtocol>
+    <TargetFramework>net6.0</TargetFramework>
+    <RuntimeIdentifier>linux-x64</RuntimeIdentifier>
+    <SelfContained>true</SelfContained>
+    <PublishSingleFile>false</PublishSingleFile>
+    <PublishTrimmed>false</PublishTrimmed>
+  </PropertyGroup>
+</Project>

Source/LoadByOS/MacOSConfigApp/MacOSConfigApp.csproj

@@ -0,0 +1,37 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>net6.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <PublishReadyToRun>true</PublishReadyToRun>
+    <RuntimeIdentifier>osx-x64</RuntimeIdentifier>
+    <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
+    <AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <!--
+    HACK FOR COMPILER BUG  2021-09-14. Hopefully will be fixed in future versions
+    - Not using SatelliteResourceLanguages will load all language packs: works
+    - Specifying 'en' semicolon 1 more should load 1 language pack: works
+    - Specifying only 'en' should load no language packs: broken, still loads all
+    -->
+    <SatelliteResourceLanguages>en;es</SatelliteResourceLanguages>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+    <OutputPath>..\..\bin\Avalonia\Debug</OutputPath>
+    <DebugType>embedded</DebugType>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
+    <OutputPath>..\..\bin\Avalonia\Release</OutputPath>
+    <DebugType>embedded</DebugType>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\AppScaffolding\AppScaffolding.csproj" />
+  </ItemGroup>
+
+</Project>

Source/LoadByOS/MacOSConfigApp/MacOSInterop.cs

@@ -0,0 +1,13 @@
+using LibationFileManager;
+
+namespace MacOSConfigApp
+{
+    internal class MacOSInterop : IInteropFunctions
+    {
+        public MacOSInterop() { }
+        public MacOSInterop(params object[] values) { }
+
+        public void SetFolderIcon(string image, string directory) => throw new PlatformNotSupportedException();
+        public void DeleteFolderIcon(string directory) => throw new PlatformNotSupportedException();
+    }
+}

Source/LoadByOS/MacOSConfigApp/Program.cs

@@ -0,0 +1,11 @@
+using AppScaffolding;
+
+namespace MacOSConfigApp
+{
+    class Program : OSConfigBase
+    {
+        public override Type InteropFunctionsType => typeof(MacOSInterop);
+
+        static void Main() => new Program().Run();
+    }
+}

Source/LoadByOS/MacOSConfigApp/PublishProfiles/MacOSProfile.pubxml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+https://go.microsoft.com/fwlink/?LinkID=208121.
+-->
+<Project>
+  <PropertyGroup>
+    <Configuration>Release</Configuration>
+    <Platform>Any CPU</Platform>
+    <PublishDir>..\..\bin\Publish\macos-chardonnay</PublishDir>
+    <PublishProtocol>FileSystem</PublishProtocol>
+    <TargetFramework>net6.0</TargetFramework>
+    <RuntimeIdentifier>osx-x64</RuntimeIdentifier>
+    <SelfContained>true</SelfContained>
+    <PublishSingleFile>false</PublishSingleFile>
+    <PublishTrimmed>false</PublishTrimmed>
+  </PropertyGroup>
+</Project>

Source/LoadByOS/README.txt

@@ -0,0 +1,7 @@
+Streamlined example is in \Source\_Demos\LoadByOS
+
+MUST follow naming conventions in InteropFactory
+
+Windows : Path.GetFileName(a).StartsWithInsensitive("win")
+Linux   : Path.GetFileName(a).StartsWithInsensitive("linux")
+MacOs   : Path.GetFileName(a).StartsWithInsensitive("mac") || a.StartsWithInsensitive("osx")

Source/LoadByOS/WindowsConfigApp/Form1.Designer.cs

@@ -0,0 +1,39 @@
+namespace WindowsConfigApp
+{
+    partial class Form1
+    {
+        /// <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.components = new System.ComponentModel.Container();
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(800, 450);
+            this.Text = "Form1";
+        }
+
+        #endregion
+    }
+}

Source/LoadByOS/WindowsConfigApp/Form1.cs

@@ -0,0 +1,10 @@
+namespace WindowsConfigApp
+{
+    public partial class Form1 : Form
+    {
+        public Form1()
+        {
+            InitializeComponent();
+        }
+    }
+}

Source/LoadByOS/WindowsConfigApp/Program.cs

@@ -0,0 +1,19 @@
+using AppScaffolding;
+
+namespace WindowsConfigApp
+{
+    class Program : OSConfigBase
+    {
+        public override Type InteropFunctionsType => typeof(WinInterop);
+        public override Type[] ReferencedTypes => new Type[]
+        {
+            typeof(Form1),
+            typeof(Bitmap),
+            typeof(Dinah.Core.WindowsDesktop.GitClient),
+            typeof(Accessibility.IAccIdentity),
+            typeof(Microsoft.Win32.SystemEvents)
+        };
+
+        static void Main() => new Program().Run();
+    }
+}

Source/LoadByOS/WindowsConfigApp/PublishProfiles/WindowsProfile.pubxml

@@ -6,12 +6,11 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
   <PropertyGroup>
     <Configuration>Release</Configuration>
     <Platform>Any CPU</Platform>
-    <PublishDir>..\bin\publish\</PublishDir>
+    <PublishDir>..\..\bin\Publish\classic</PublishDir>
     <PublishProtocol>FileSystem</PublishProtocol>
     <TargetFramework>net6.0-windows</TargetFramework>
     <RuntimeIdentifier>win-x64</RuntimeIdentifier>
     <SelfContained>true</SelfContained>
     <PublishSingleFile>false</PublishSingleFile>
-	  <PublishTrimmed>false</PublishTrimmed>
   </PropertyGroup>
 </Project>

Source/LoadByOS/WindowsConfigApp/WinInterop.cs

@@ -0,0 +1,39 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Threading.Tasks;
+using Dinah.Core.WindowsDesktop;
+using Dinah.Core.WindowsDesktop.Drawing;
+using LibationFileManager;
+
+namespace WindowsConfigApp
+{
+    internal class WinInterop : IInteropFunctions
+    {
+        public WinInterop() { }
+        public WinInterop(params object[] values) { }
+
+        public void SetFolderIcon(string image, string directory)
+        {
+            string iconPath = null;
+
+            try
+            {
+                var icon = ImageReader.ToIcon(image);
+                iconPath = Path.Combine(directory, $"{Guid.NewGuid()}.ico");
+                icon.Save(iconPath);
+
+                new DirectoryInfo(directory).SetIcon(iconPath, Directories.FolderTypes.Music);
+            }
+            finally
+            {
+                if (File.Exists(iconPath))
+                    File.Delete(iconPath);
+            }
+        }
+
+        public void DeleteFolderIcon(string directory)
+            => new DirectoryInfo(directory)?.DeleteIcon();
+    }
+}

Source/LoadByOS/WindowsConfigApp/WindowsConfigApp.csproj

@@ -0,0 +1,42 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>WinExe</OutputType>
+    <TargetFramework>net6.0-windows</TargetFramework>
+    <UseWindowsForms>true</UseWindowsForms>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <PublishReadyToRun>true</PublishReadyToRun>
+    <RuntimeIdentifier>win-x64</RuntimeIdentifier>
+    <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
+    <AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <!--
+    HACK FOR COMPILER BUG  2021-09-14. Hopefully will be fixed in future versions
+    - Not using SatelliteResourceLanguages will load all language packs: works
+    - Specifying 'en' semicolon 1 more should load 1 language pack: works
+    - Specifying only 'en' should load no language packs: broken, still loads all
+    -->
+    <SatelliteResourceLanguages>en;es</SatelliteResourceLanguages>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+    <OutputPath>..\..\bin\Debug</OutputPath>
+    <DebugType>embedded</DebugType>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
+    <OutputPath>..\..\bin\Release</OutputPath>
+    <DebugType>embedded</DebugType>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Dinah.Core.WindowsDesktop" Version="5.2.1.1" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\AppScaffolding\AppScaffolding.csproj" />
+  </ItemGroup>
+
+</Project>

Source/_AvaloniaUI Primer.txt

@@ -0,0 +1,114 @@
+I don't expect you'll fully understand everything I said in this writeup on your first read, but I think they'll make much more sense after you've poked around LibationAvalonia and started reading code and wonder 'WTF?'. These are the brief explanations I wish I had while I was learning.
+
+- Mbucari
+
+===================================
+
+Controls Basics
+===============
+Avalonia uses a xml layout with code-behind like WPF.  It's actually a port of WPF, thus most of the Avalonia controls are also WPF controls. There are lots of built-in controls that you can browse in the documentation, but more important than understanding every specific control is understanding the few base controls.
+
+*TemplatedControl - This base control allows you to define a layout template. The TemplatedControl.Template property is used to define the control's appearance. 
+
+*ContentControl - This base control is what allows other controls to be nested inside of it, like so:
+
+<ContentControl>
+	<Control />
+</ContentControl>
+
+Doing that in XML sets the ContentControl.Content property to the <Control />
+
+Common ContentContols:
+- Button
+- Label
+- UserControl
+
+*ItemsControl - This base control allows you to supply IEnumerable for content, and will display the items in the IEnumerable in some way, such as items in a ComboBox or ListBox, by setting the ItemsControl.Items property.
+
+Common ItemsControls:
+- DataGrid
+- ListBox
+- ComboBox
+
+Extending Controls
+==================
+
+If you want to customize an Avalonia control by extending it and adding custom functionality.  If you do this you MUST make your extended control inherit IStyleable.
+
+See LibationAvalonia.Controls.LinkLabel for an example.
+
+Data Binding
+============
+
+Every control implements IDataContextProvider. IDataContextProvider.DataContext is how you bind data to controls. It's null by default, but you need to set it for MVVM to work.
+
+The simplest way to use data binding is to set the window/controls' DataContext to it's own instance. Just add the following line to the window/controls' constructor
+
+	this.DataContext = this;
+
+Then, every public 'this' property is accessible in XML with data binding. For a simple example of that working, look at LibationAvalonia.Dialogs.Login.CaptchaDialog.
+
+CaptchaDialog.axaml.cs has 2 public properties:
+
+	public string Answer { get; set; }
+	public Bitmap CaptchaImage { get; }
+	
+Inside CaptchaDialog.axaml, I bound the Image control to CaptchaImage like so:
+
+	<Image Source="{Binding CaptchaImage}" />
+	
+and I bound the TextBox control to Answer like so:
+
+	<TextBox Text="{Binding Answer}" />
+	
+Because Answer has public getter and setter, the binding mode is TwoWay. That means that changes to the binding source (the CaptchaDialog.Answer property) go to the binding target (the TextBox Control), and changes to the binding target (caused by the user typing text into the textbox) get pushed back to the binding source.
+
+this example is lacking any change notifications, so the view will only get the Answer and CaptchaImage values on load. So those values MUST be set before the window is shown. If you change those properties' values while the window is shown, the view won't know they changed so it will not update to display the new values.
+	
+
+Data Binding to an INotifyPropertyChanged.
+=========================================
+
+One of the limitations of binding to 'this' is that you won't be able to notify the view that the value has changed.  Change notification works using the INotifyPropertyChanged interface that you're already familiar with. For your DataContext to be able to notify the view that a value has changed it must be INotifyPropertyChanged. Avalonia uses ReactiveUI for this, but it's the same interface. For a (somewhat) simple example of this, see LibationAvalonia.Dialogs.EditQuickFilters.
+
+In EditQuickFilters I set this.DataContext = _viewModel = new EditTemplateViewModel();
+
+EditTemplateViewModel inherits ViewModelBase, which inherits ReactiveObject. Because it inherits ReactiveObject, I can call the ReactiveUI extension methods for notifying the view that a property has changed:
+
+- this.RaiseAndSetIfChanged()
+- this.RaisePropertyChanged()
+
+Doing this will notify the view that the property has changed, and the view will update itself by getting the new value.
+
+NOTE: unlike winforms, calling RaisePropertyChanged() with an empty or incorrect property name will  not cause the whole view to update.  In Avalonia you MUST call RaisePropertyChanged() for every property you want updated, and everything must be spelled correctly.
+
+Binding to ItemsControl.Items
+=============================
+
+As I said above, the ItemsControl.Items property accepts an IEnumerable. You can bind a list to that property, and the ItemsControl will generate a new item for each list entry. Each generated item will be bound to its corresponding list entry.
+
+An example of this can be found in LibationAvalonia.Dialogs.EditTemplateDialog. I set EditTemplateDialog's DataContext = EditTemplateViewModel. EditTemplateViewModel.ListItems is a list of TemplateTags. In EditTemplateDialog.axaml, I bound EditTemplateViewModel.ListItems to DataGrid.Items like so:
+
+	<DataGrid Items="{Binding ListItems}" >
+	
+By doing that, the DataGrid generates a new row for every TemplateTags item in ListItems, and the rows's DataContext is set to the TemplateTags that generated it.
+
+That DataGrid has two column templates: Tag and Description.  The Tag column is bound to TemplateTags.TagName, and the Description column is bound to TagName.Description. Binding the DataGrid to a List<TemplateTags> and binding column templates to TemplateTags properties is all you need to do for all your data to be displayed in the grid. This works the same for all ItemsControl controls. For another example using the ListBox control, see LibationAvalonia.Dialogs.ScanAccountsDialog.
+
+Binding to ItemsControl.Items with notifications that the Items list has changed
+================================================================================
+
+Binding ItemsControl to a List is fine for a static display, but if you want changes to the list update the control (e.g. removing an Account from the accounts list or a Filter from the filters list in EditQuickFilters), you need to use an IEnumerable type that implements INotifyCollectionChanged. INotifyCollectionChanged is just like INotifyPropertyChanged but is for items in a collection.  C#'s built-in tracking collection is System.Collections.ObjectModel.ObservableCollection<T>. If you put all items in an ObservableCollection<T> and bind that collection to a ItemsControl.Items property, then adding or removing items from that collection will cause the view to add or remove items. This is similar to BindingList<T>, with one very important difference: The ObservableCollection<T> is not aware of changes made to any of its items, only changes made to the collection.
+
+For an example of binding ItemsControl.Items to an ObservableCollection<T>, see LibationAvalonia.Dialogs.EditQuickFilters.
+
+
+Putting the above into practice
+===============================
+
+See [ https://github.com/rmcrackan/Libation/pull/356 ] which added a new setting. This setting is a bool which required:
+
+* checkbox
+* description
+* OS-specific visibility
+* form height increase

Source/_Demos/LoadByOS/CrossPlatformClientExe/CrossPlatformClientExe.csproj

@@ -0,0 +1,23 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>net6.0</TargetFramework>
+	  <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
+	  <AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
+  </PropertyGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+		<OutputPath>..\bin\Debug</OutputPath>
+		<DebugType>embedded</DebugType>
+	</PropertyGroup>
+
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
+		<OutputPath>..\bin\Release</OutputPath>
+		<DebugType>embedded</DebugType>
+	</PropertyGroup>
+
+	<ItemGroup>
+	  <PackageReference Include="Dinah.Core" Version="5.1.0.1" />
+	</ItemGroup>
+
+</Project>

Source/_Demos/LoadByOS/CrossPlatformClientExe/IInteropFunctions.cs

@@ -0,0 +1,12 @@
+using System;
+
+namespace CrossPlatformClientExe
+{
+	public interface IInteropFunctions
+	{
+		public string TransformInit1();
+		public int TransformInit2();
+		public void CopyTextToClipboard(string text);
+		public void ShowForm();
+	}
+}