Bug fix #361 : import would break when audible erroneous duplicates a name in the author list or a name in the narrator list. (Note: the same name as both author and narrator has always been ok.)

* incr ver

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,31 @@
+---
+name: Bug report
+about: Create a report to help us improve Libation
+title: ''
+labels: bug
+assignees: ''
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Platform**
+
+[e.g. Windows 10, Windows 11, Mac, Linux (State distribution)]
+
+**Log Files**
+Attach your Libation log file here.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,19 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: enhancement
+assignees: ''
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.

.releaseindex.json

@@ -1,5 +1,6 @@
 {
    "WindowsClassic": "Libation\\.\\d+\\.\\d+\\.\\d+-win-classic\\.zip",
    "WindowsAvalonia":"Libation\\.\\d+\\.\\d+\\.\\d+-win-chardonnay\\.zip",
-   "LinuxAvalonia":  "Libation\\.\\d+\\.\\d+\\.\\d+-linux-chardonnay"
+   "LinuxAvalonia":  "Libation\\.\\d+\\.\\d+\\.\\d+-linux-chardonnay",
+   "MacOSAvalonia":  "Libation\\.\\d+\\.\\d+\\.\\d+-macos-chardonnay"
 }

Source/AppScaffolding/AppScaffolding.csproj

@@ -2,15 +2,16 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
-    <Version>8.3.0.1</Version>
+    <Version>8.4.2.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" />
     <ProjectReference Include="..\AudibleUtilities\AudibleUtilities.csproj" />
   </ItemGroup>
+	
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
     <DebugType>embedded</DebugType>
   </PropertyGroup>

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;
@@ -14,8 +15,29 @@ using Serilog;
 
 namespace AppScaffolding
 {
+	public enum ReleaseIdentifier
+	{
+		None,
+		WindowsClassic,
+		WindowsAvalonia,
+		LinuxAvalonia,
+		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 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;
+
 		// AppScaffolding
 		private static Assembly _executingAssembly;
 		private static Assembly ExecutingAssembly
@@ -33,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
@@ -66,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)))
@@ -91,20 +116,20 @@ namespace AppScaffolding
 				config.DecryptToLossy = false;
 
 			if (!config.Exists(nameof(config.LameTargetBitrate)))
-				config.LameTargetBitrate = false;			
-			
+				config.LameTargetBitrate = false;
+
 			if (!config.Exists(nameof(config.LameDownsampleMono)))
 				config.LameDownsampleMono = true;
-			
+
 			if (!config.Exists(nameof(config.LameBitrate)))
 				config.LameBitrate = 64;
-			
+
 			if (!config.Exists(nameof(config.LameConstantBitrate)))
 				config.LameConstantBitrate = false;
-			
+
 			if (!config.Exists(nameof(config.LameMatchSourceBR)))
 				config.LameMatchSourceBR = true;
-			
+
 			if (!config.Exists(nameof(config.LameVBRQuality)))
 				config.LameVBRQuality = 2;
 
@@ -161,6 +186,8 @@ namespace AppScaffolding
 			configureLogging(config);
 			logStartupState(config);
 
+			// all else should occur after logging
+
 			wireUpSystemEvents(config);
 		}
 
@@ -218,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
@@ -258,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)
 		{
@@ -281,7 +308,10 @@ namespace AppScaffolding
 			{
 				AppName = EntryAssembly.GetName().Name,
 				Version = BuildVersion.ToString(),
-				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(),
@@ -289,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,
@@ -301,26 +332,23 @@ 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);
 		}
 
-		public enum ReleaseIdentifier
-		{
-			WindowsClassic,
-			WindowsAvalonia,
-			LinuxAvalonia
-		}
-
-		public static UpgradeProperties GetLatestRelease(ReleaseIdentifier releaseID = ReleaseIdentifier.WindowsClassic)
+		public static UpgradeProperties GetLatestRelease()
 		{
 			// timed out
-			var latest = getLatestRelease(TimeSpan.FromSeconds(10), releaseID);
-			if (latest is null)
+			(var latest, var zip) = getLatestRelease(TimeSpan.FromSeconds(10));
+
+			if (latest is null || zip is null)
 				return null;
 
 			var latestVersionString = latest.TagName.Trim('v');
@@ -332,7 +360,7 @@ namespace AppScaffolding
 				return null;
 
 			// we have an update
-			var zip = latest.Assets.FirstOrDefault(a => a.BrowserDownloadUrl.EndsWith(".zip"));
+
 			var zipUrl = zip?.BrowserDownloadUrl;
 
 			Log.Logger.Information("Update available: {@DebugInfo}", new
@@ -344,11 +372,11 @@ namespace AppScaffolding
 
 			return new(zipUrl, latest.HtmlUrl, zip.Name, latestRelease);
 		}
-		private static Octokit.Release getLatestRelease(TimeSpan timeout, ReleaseIdentifier releaseID)
+		private static (Octokit.Release, Octokit.ReleaseAsset) getLatestRelease(TimeSpan timeout)
 		{
 			try
 			{
-				var task = getLatestRelease(releaseID);
+				var task = getLatestRelease();
 				if (task.Wait(timeout))
 					return task.Result;
 
@@ -358,9 +386,9 @@ namespace AppScaffolding
 			{
 				Log.Logger.Error(aggEx, "Checking for new version too often");
 			}
-			return null;
+			return (null, null);
 		}
-		private static async System.Threading.Tasks.Task<Octokit.Release> getLatestRelease(ReleaseIdentifier releaseID)
+		private static async System.Threading.Tasks.Task<(Octokit.Release, Octokit.ReleaseAsset)> getLatestRelease()
 		{
 			var ownerAccount = "rmcrackan";
 			var repoName = "Libation";
@@ -370,14 +398,14 @@ namespace AppScaffolding
 			//Download the release index
 			var bts = await gitHubClient.Repository.Content.GetRawContent(ownerAccount, repoName, ".releaseindex.json");
 			var releaseIndex = JObject.Parse(System.Text.Encoding.ASCII.GetString(bts));
-			var regexPattern = releaseIndex.Value<string>(releaseID.ToString());
+			var regexPattern = releaseIndex.Value<string>(ReleaseIdentifier.ToString());
 
 			// https://octokitnet.readthedocs.io/en/latest/releases/
 			var releases = await gitHubClient.Repository.Release.GetAll(ownerAccount, repoName);
 
 			var regex = new System.Text.RegularExpressions.Regex(regexPattern, System.Text.RegularExpressions.RegexOptions.IgnoreCase);
-			var latest = releases.FirstOrDefault(r => !r.Draft && !r.Prerelease && r.Assets.Any(a => regex.IsMatch(a.Name)));
-			return latest;
+			var latestRelease = releases.FirstOrDefault(r => !r.Draft && !r.Prerelease && r.Assets.Any(a => regex.IsMatch(a.Name)));
+			return (latestRelease, latestRelease?.Assets?.FirstOrDefault(a => regex.IsMatch(a.Name)));
 		}
 	}
 

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.5.0.1" />
+    <PackageReference Include="AudibleApi" Version="4.6.3.1" />
   </ItemGroup>
 
   <ItemGroup>

Source/DataLayer/DataLayer.csproj

@@ -10,7 +10,8 @@
   </PropertyGroup>
   
   <ItemGroup>
-    <PackageReference Include="Dinah.EntityFrameworkCore" Version="4.1.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>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
@@ -29,10 +30,6 @@
 	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
 		<DebugType>embedded</DebugType>
 	</PropertyGroup>
-
-	<ItemGroup>
-    <ProjectReference Include="..\LibationFileManager\LibationFileManager.csproj" />
-  </ItemGroup>
   
   <ItemGroup>
     <None Update="migrate.json">

Source/DataLayer/EfClasses/Series.cs

@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using Dinah.Core;
-using Microsoft.EntityFrameworkCore;
 
 namespace DataLayer
 {

Source/DataLayer/EfClasses/UserDefinedItem.cs

@@ -30,10 +30,6 @@ namespace DataLayer
 		{
 			ArgumentValidator.EnsureNotNull(book, nameof(book));
             Book = book;
-
-			// import previously saved tags
-			ArgumentValidator.EnsureNotNullOrWhiteSpace(book.AudibleProductId, nameof(book.AudibleProductId));
-			Tags = LibationFileManager.TagsPersistence.GetTags(book.AudibleProductId);
 		}
 
         #region Tags

Source/DataLayer/LibationContext.cs

@@ -1,10 +1,9 @@
 using DataLayer.Configurations;
-using Dinah.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore;
 
 namespace DataLayer
 {
-    public class LibationContext : InterceptableDbContext
+    public class LibationContext : DbContext
     {
         // IMPORTANT: USING DbSet<>
         // ========================
@@ -35,14 +34,6 @@ namespace DataLayer
         // see DesignTimeDbContextFactoryBase for info about ctors and connection strings/OnConfiguring()
         internal LibationContext(DbContextOptions options) : base(options) { }
 
-        // called on each instantiation
-        protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
-        {
-            AddInterceptor(new TagPersistenceInterceptor());
-
-            base.OnConfiguring(optionsBuilder);
-        }
-
         // typically only called once per execution; NOT once per instantiation
         protected override void OnModelCreating(ModelBuilder modelBuilder)
         {

Source/DataLayer/TagPersistenceInterceptor.cs

@@ -1,30 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using Dinah.Core.Collections.Generic;
-using Dinah.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore;
-
-namespace DataLayer
-{
-    internal class TagPersistenceInterceptor : IDbInterceptor
-    {
-        public void Executed(DbContext context) { }
-
-        public void Executing(DbContext context)
-		{
-			var tagsCollection
-				= context
-				.ChangeTracker
-				.Entries()
-				.Where(e => e.State.In(EntityState.Modified, EntityState.Added))
-				.Select(e => e.Entity as UserDefinedItem)
-				.Where(udi => udi is not null)
-				// do NOT filter out entires with blank tags. blank is the valid way to show the absence of tags
-				.Select(t => (t.Book.AudibleProductId, t.Tags))
-				.ToList();
-
-			LibationFileManager.TagsPersistence.Save(tagsCollection);
-		}
-	}
-}

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/App.axaml

@@ -0,0 +1,12 @@
+<Application xmlns="https://github.com/avaloniaui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:local="using:HangoverAvalonia"
+             x:Class="HangoverAvalonia.App">
+    <Application.DataTemplates>
+        <local:ViewLocator/>
+    </Application.DataTemplates>
+
+    <Application.Styles>
+        <FluentTheme Mode="Light"/>
+    </Application.Styles>
+</Application>

Source/HangoverAvalonia/App.axaml.cs

@@ -0,0 +1,29 @@
+using Avalonia;
+using Avalonia.Controls.ApplicationLifetimes;
+using Avalonia.Markup.Xaml;
+using HangoverAvalonia.ViewModels;
+using HangoverAvalonia.Views;
+
+namespace HangoverAvalonia
+{
+	public partial class App : Application
+	{
+		public override void Initialize()
+		{
+			AvaloniaXamlLoader.Load(this);
+		}
+
+		public override void OnFrameworkInitializationCompleted()
+		{
+			if (ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop)
+			{
+				desktop.MainWindow = new MainWindow
+				{
+					DataContext = new MainWindowViewModel(),
+				};
+			}
+
+			base.OnFrameworkInitializationCompleted();
+		}
+	}
+}

Source/HangoverAvalonia/HangoverAvalonia.csproj

@@ -0,0 +1,85 @@
+<Project Sdk="Microsoft.NET.Sdk">
+	<PropertyGroup>
+		<OutputType>WinExe</OutputType>
+		<TargetFramework>net6.0</TargetFramework>
+		<!--Avalonia doesen't support TrimMode=link currently,but we are working on that https://github.com/AvaloniaUI/Avalonia/issues/6892 -->
+		<TrimMode>copyused</TrimMode>
+		<BuiltInComInteropSupport>true</BuiltInComInteropSupport>
+		<IsPublishable>true</IsPublishable>
+		<AssemblyName>Hangover</AssemblyName>
+		<PublishReadyToRun>true</PublishReadyToRun>
+		<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
+		<AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
+		<StartupObject />
+		<IsPublishable>true</IsPublishable>
+
+		<PublishReadyToRun>true</PublishReadyToRun>
+		<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
+		<AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
+
+		<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>
+	</PropertyGroup>
+
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
+		<OutputPath>..\bin\Avalonia\Release</OutputPath>
+		<DebugType>embedded</DebugType>
+	</PropertyGroup>
+
+	<ItemGroup>
+		<AvaloniaResource Include="Assets\**" />
+		<AvaloniaXaml Remove="Models\**" />
+		<Compile Remove="Models\**" />
+		<EmbeddedResource Remove="Models\**" />
+		<None Remove="Models\**" />
+		<None Remove=".gitignore" />
+		<None Remove="Assets\hangover.ico" />
+		<None Remove="hangover.ico" />
+	</ItemGroup>
+
+
+	<ItemGroup>
+		<AvaloniaResource Include="hangover.ico" />
+	</ItemGroup>
+	<ItemGroup>
+		<!--This helps with theme dll-s trimming.
+	If you will publish your application in self-contained mode with p:PublishTrimmed=true and it will use Fluent theme Default theme will be trimmed from the output and vice versa.
+	https://github.com/AvaloniaUI/Avalonia/issues/5593 -->
+		<TrimmableAssembly Include="Avalonia.Themes.Fluent" />
+		<TrimmableAssembly Include="Avalonia.Themes.Default" />
+	</ItemGroup>
+	<ItemGroup>
+		<PackageReference Include="Avalonia" Version="0.10.17" />
+		<PackageReference Include="Avalonia.Desktop" Version="0.10.17" />
+		<!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
+		<PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="0.10.17" />
+		<PackageReference Include="Avalonia.ReactiveUI" Version="0.10.17" />
+		<PackageReference Include="XamlNameReferenceGenerator" Version="1.3.4" />
+	</ItemGroup>
+	<ItemGroup>
+		<ProjectReference Include="..\HangoverBase\HangoverBase.csproj" />
+	</ItemGroup>
+
+
+	<Target Name="SpicNSpan" AfterTargets="Clean">
+		<!-- Remove obj folder -->
+		<RemoveDir Directories="$(BaseIntermediateOutputPath)" />
+		<!-- Remove bin folder -->
+		<RemoveDir Directories="$(BaseOutputPath)" />
+	</Target>
+
+</Project>

Source/HangoverAvalonia/Program.cs

@@ -0,0 +1,24 @@
+using Avalonia;
+using Avalonia.Controls.ApplicationLifetimes;
+using Avalonia.ReactiveUI;
+using System;
+
+namespace HangoverAvalonia
+{
+	internal class Program
+	{
+		// Initialization code. Don't use any Avalonia, third-party APIs or any
+		// SynchronizationContext-reliant code before AppMain is called: things aren't initialized
+		// yet and stuff might break.
+		[STAThread]
+		public static void Main(string[] args) => BuildAvaloniaApp()
+			.StartWithClassicDesktopLifetime(args);
+
+		// Avalonia configuration, don't remove; also used by visual designer.
+		public static AppBuilder BuildAvaloniaApp()
+			=> AppBuilder.Configure<App>()
+				.UsePlatformDetect()
+				.LogToTrace()
+				.UseReactiveUI();
+	}
+}

Source/HangoverAvalonia/Properties/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/HangoverAvalonia/Properties/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/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\publish\linux-x64\</PublishDir>
+    <PublishDir>..\bin\Publish\win-chardonnay</PublishDir>
     <PublishProtocol>FileSystem</PublishProtocol>
     <TargetFramework>net6.0</TargetFramework>
     <RuntimeIdentifier>win-x64</RuntimeIdentifier>

Source/HangoverAvalonia/ViewLocator.cs

@@ -0,0 +1,30 @@
+using Avalonia.Controls;
+using Avalonia.Controls.Templates;
+using HangoverAvalonia.ViewModels;
+using System;
+
+namespace HangoverAvalonia
+{
+	public class ViewLocator : IDataTemplate
+	{
+		public IControl Build(object data)
+		{
+			var name = data.GetType().FullName!.Replace("ViewModel", "View");
+			var type = Type.GetType(name);
+
+			if (type != null)
+			{
+				return (Control)Activator.CreateInstance(type)!;
+			}
+			else
+			{
+				return new TextBlock { Text = "Not Found: " + name };
+			}
+		}
+
+		public bool Match(object data)
+		{
+			return data is ViewModelBase;
+		}
+	}
+}

Source/HangoverAvalonia/ViewModels/MainWindowViewModel.cs

@@ -0,0 +1,37 @@
+using System;
+using HangoverBase;
+using ReactiveUI;
+
+namespace HangoverAvalonia.ViewModels
+{
+	public class MainWindowViewModel : ViewModelBase
+    {
+        private DatabaseTab _tab;
+
+        private string _databaseFileText;
+        private bool _databaseFound;
+        private string _sqlResults;
+        public string DatabaseFileText { get => _databaseFileText; set => this.RaiseAndSetIfChanged(ref _databaseFileText, value); }
+        public string SqlQuery { get; set; }
+        public bool DatabaseFound { get => _databaseFound; set => this.RaiseAndSetIfChanged(ref _databaseFound, value); }
+        public string SqlResults { get => _sqlResults; set => this.RaiseAndSetIfChanged(ref _sqlResults, value); }
+
+        public MainWindowViewModel()
+        {
+            _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: {_tab.DbFile}";
+            DatabaseFound = true;
+        }
+
+        public void ExecuteQuery() => _tab.ExecuteQuery();
+    }
+}

Source/HangoverAvalonia/ViewModels/ViewModelBase.cs

@@ -0,0 +1,11 @@
+using ReactiveUI;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace HangoverAvalonia.ViewModels
+{
+	public class ViewModelBase : ReactiveObject
+	{
+	}
+}

Source/HangoverAvalonia/Views/MainWindow.axaml

@@ -0,0 +1,75 @@
+<Window xmlns="https://github.com/avaloniaui"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:vm="using:HangoverAvalonia.ViewModels"
+        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="500"
+		Width="800" Height="500"
+        x:Class="HangoverAvalonia.Views.MainWindow"
+        Icon="/Assets/hangover.ico "
+        Title="Hangover: Libation debug and recovery tool">
+
+	<Design.DataContext>
+		<vm:MainWindowViewModel/>
+	</Design.DataContext>
+	
+	<TabControl Grid.Row="0">
+		<TabControl.Styles>
+			<Style Selector="ItemsPresenter#PART_ItemsPresenter">
+				<Setter Property="Height" Value="18"/>
+			</Style>
+			<Style Selector="TabItem">
+				<Setter Property="MinHeight" Value="30"/>
+				<Setter Property="Height" Value="30"/>
+				<Setter Property="Padding" Value="8,2,8,0"/>
+			</Style>
+			<Style Selector="TabItem#Header TextBlock">
+				<Setter Property="MinHeight" Value="5"/>
+			</Style>
+		</TabControl.Styles>
+		
+		<!-- Database Tab -->
+		<TabItem>
+			<TabItem.Header>
+				<TextBlock FontSize="14" VerticalAlignment="Center">Database</TextBlock>
+			</TabItem.Header>
+
+			<Grid RowDefinitions="Auto,Auto,*,Auto,2*">
+				
+				<TextBlock
+					Margin="0,10,0,5"
+					Grid.Row="0"
+					Text="{Binding DatabaseFileText}" />
+				
+				<TextBlock
+					Margin="0,5,0,5"
+					Grid.Row="1"
+					Text="SQL (database command)" />
+				
+				<TextBox
+					Margin="0,5,0,5"
+					Grid.Row="2" Text="{Binding SqlQuery, Mode=OneWayToSource}" />
+				
+				<Button
+					Grid.Row="3"
+					Padding="20,5,20,5"
+					Content="Execute"
+					IsEnabled="{Binding DatabaseFound}"
+					Click="Execute_Click" />
+				
+				<TextBox
+					Margin="0,5,0,10"
+					IsReadOnly="True"
+					Grid.Row="4"
+					Text="{Binding SqlResults}" />
+			</Grid>
+			
+		</TabItem>
+		<!-- Command Line Interface Tab -->
+		<TabItem>
+			<TabItem.Header>
+				<TextBlock FontSize="14" VerticalAlignment="Center">Command Line Interface</TextBlock>
+			</TabItem.Header>			
+		</TabItem>
+	</TabControl>
+</Window>

Source/HangoverAvalonia/Views/MainWindow.axaml.cs

@@ -0,0 +1,19 @@
+using Avalonia.Controls;
+using HangoverAvalonia.ViewModels;
+
+namespace HangoverAvalonia.Views
+{
+	public partial class MainWindow : Window
+	{
+		MainWindowViewModel _viewModel => DataContext as MainWindowViewModel;
+		public MainWindow()
+		{
+			InitializeComponent();
+		}
+
+		public void Execute_Click(object sender, Avalonia.Interactivity.RoutedEventArgs e)
+		{
+			_viewModel.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

@@ -6,6 +6,7 @@
     <UseWindowsForms>true</UseWindowsForms>
     <ApplicationIcon>hangover.ico</ApplicationIcon>
     <ImplicitUsings>enable</ImplicitUsings>
+	<IsPublishable>true</IsPublishable>
     <PublishReadyToRun>true</PublishReadyToRun>
     <RuntimeIdentifier>win-x64</RuntimeIdentifier>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
@@ -43,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>
@@ -54,4 +53,11 @@
     </Compile>
   </ItemGroup>
 
+	<Target Name="SpicNSpan" AfterTargets="Clean">
+		<!-- Remove obj folder -->
+		<RemoveDir Directories="$(BaseIntermediateOutputPath)" />
+		<!-- Remove bin folder -->
+		<RemoveDir Directories="$(BaseOutputPath)" />
+	</Target>
+
 </Project>

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,10 +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
@@ -150,6 +175,38 @@ Global
 		{F612D06F-3134-4B9B-95CD-EB3FC798AE60}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{F612D06F-3134-4B9B-95CD-EB3FC798AE60}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{F612D06F-3134-4B9B-95CD-EB3FC798AE60}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8A7B01D3-9830-44FD-91A1-D8D010996BEB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{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
@@ -174,6 +231,16 @@ Global
 		{EB781571-8548-477E-82AD-FB9FAB548D2F} = {67E66E82-5532-4440-AFB3-9FB1DF9DEF53}
 		{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

@@ -17,10 +17,6 @@ namespace LibationAvalonia
 {
 	public class App : Application
 	{
-		public static bool IsWindows => PlatformID is PlatformID.Win32NT;
-		public static bool IsUnix => PlatformID is PlatformID.Unix;
-
-		public static readonly PlatformID PlatformID = Environment.OSVersion.Platform;
 		public static IBrush ProcessQueueBookFailedBrush { get; private set; }
 		public static IBrush ProcessQueueBookCompletedBrush { get; private set; }
 		public static IBrush ProcessQueueBookCancelledBrush { get; private set; }
@@ -29,35 +25,10 @@ namespace LibationAvalonia
 
 		public static IAssetLoader AssetLoader { get; private set; }
 
-		public static readonly Uri AssetUriBase = new Uri("avares://Libation/Assets/");
+		public static readonly Uri AssetUriBase = new("avares://Libation/Assets/");
 		public static Stream OpenAsset(string assetRelativePath)
 			=> AssetLoader.Open(new Uri(AssetUriBase, assetRelativePath));
 
-
-		public static bool GoToFile(string path)
-			=> PlatformID is PlatformID.Win32NT ? Go.To.File(path)
-			: GoToFolder(path is null ? string.Empty : Path.GetDirectoryName(path));
-
-		public static bool GoToFolder(string path)
-		{
-			if (PlatformID is PlatformID.Win32NT)
-				return Go.To.Folder(path);
-			else
-			{
-				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;
-			}
-		}
-
 		public override void Initialize()
 		{
 			AvaloniaXamlLoader.Load(this);
@@ -74,7 +45,6 @@ namespace LibationAvalonia
 			var SEGOEUI = new Typeface(new FontFamily(new Uri("avares://Libation/Assets/WINGDING.TTF"), "SEGOEUI_Local"));
 			var gtf = FontManager.Current.GetOrAddGlyphTypeface(SEGOEUI);
 
-
 			if (ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop)
 			{
 				if (SetupRequired)
@@ -107,7 +77,7 @@ namespace LibationAvalonia
 			base.OnFrameworkInitializationCompleted();
 		}
 
-		private void Setup_Closing(object sender, System.ComponentModel.CancelEventArgs e)
+		private async void Setup_Closing(object sender, System.ComponentModel.CancelEventArgs e)
 		{
 			var setupDialog = sender as SetupDialog;
 			var desktop = ApplicationLifetime as IClassicDesktopStyleApplicationLifetime;
@@ -117,28 +87,21 @@ namespace LibationAvalonia
 				// all returns should be preceded by either:
 				// - if config.LibationSettingsAreValid
 				// - error message, Exit()
-
-				if ((!setupDialog.IsNewUser
-					&& !setupDialog.IsReturningUser) ||
-					!RunInstall(setupDialog))
+				if (setupDialog.IsNewUser)
 				{
-					CancelInstallation();
+					setupDialog.Config.SetLibationFiles(Configuration.UserProfile);
+					ShowSettingsWindow(desktop, setupDialog.Config, OnSettingsCompleted);
+				}
+				else if (setupDialog.IsReturningUser)
+				{
+					ShowLibationFilesDialog(desktop, setupDialog.Config, OnLibationFilesCompleted);
+				}
+				else
+				{
+					await CancelInstallation();
 					return;
 				}
 
-
-				// most migrations go in here
-				AppScaffolding.LibationScaffolding.RunPostConfigMigrations(setupDialog.Config);
-
-				MessageBox.VerboseLoggingWarning_ShowIfTrue();
-
-#if !DEBUG
-				//AutoUpdater.NET only works for WinForms or WPF application projects.
-				//checkForUpdate();
-#endif
-				// logging is init'd here
-				AppScaffolding.LibationScaffolding.RunPostMigrationScaffolding(setupDialog.Config);
-
 			}
 			catch (Exception ex)
 			{
@@ -146,63 +109,110 @@ namespace LibationAvalonia
 				var body = "An unrecoverable error occurred. Since this error happened before logging could be initialized, this error can not be written to the log file.";
 				try
 				{
-					MessageBox.ShowAdminAlert(null, body, title, ex);
+					await MessageBox.ShowAdminAlert(null, body, title, ex);
 				}
 				catch
 				{
-					MessageBox.Show($"{body}\r\n\r\n{ex.Message}\r\n\r\n{ex.StackTrace}", title, MessageBoxButtons.OK, MessageBoxIcon.Error);
+					await MessageBox.Show($"{body}\r\n\r\n{ex.Message}\r\n\r\n{ex.StackTrace}", title, MessageBoxButtons.OK, MessageBoxIcon.Error);
 				}
 				return;
 			}
-
-			LibraryTask = Task.Run(() => DbContexts.GetLibrary_Flat_NoTracking(includeParents: true));
-			AudibleUtilities.AudibleApiStorage.EnsureAccountsSettingsFileExists();
-			ShowMainWindow(desktop);
 		}
 
-		private static bool RunInstall(SetupDialog setupDialog)
+		private async Task RunMigrationsAsync(Configuration config)
 		{
-			var config = setupDialog.Config;
+			// most migrations go in here
+			AppScaffolding.LibationScaffolding.RunPostConfigMigrations(config);
 
-			if (setupDialog.IsNewUser)
+			await MessageBox.VerboseLoggingWarning_ShowIfTrue();
+
+			// logging is init'd here
+			AppScaffolding.LibationScaffolding.RunPostMigrationScaffolding(config);
+		}
+
+		private void ShowSettingsWindow(IClassicDesktopStyleApplicationLifetime desktop, Configuration config, Action<IClassicDesktopStyleApplicationLifetime, SettingsDialog, Configuration> OnClose)
+		{
+			config.Books ??= Path.Combine(Configuration.UserProfile, "Books");
+
+			AppScaffolding.LibationScaffolding.PopulateMissingConfigValues(config);
+
+			var settingsDialog = new SettingsDialog();
+			desktop.MainWindow = settingsDialog;
+			settingsDialog.RestoreSizeAndLocation(Configuration.Instance);
+			settingsDialog.Show();
+
+			void WindowClosing(object sender, System.ComponentModel.CancelEventArgs e)
 			{
-				config.SetLibationFiles(Configuration.UserProfile);
+				settingsDialog.Closing -= WindowClosing;
+				e.Cancel = true;
+				OnClose?.Invoke(desktop, settingsDialog, config);
 			}
-			else if (setupDialog.IsReturningUser)
+			settingsDialog.Closing += WindowClosing;
+		}
+
+		private async void OnSettingsCompleted(IClassicDesktopStyleApplicationLifetime desktop, SettingsDialog settingsDialog, Configuration config)
+		{
+			if (config.LibationSettingsAreValid)
 			{
+				await RunMigrationsAsync(config);
+				LibraryTask = Task.Run(() => DbContexts.GetLibrary_Flat_NoTracking(includeParents: true));
+				AudibleUtilities.AudibleApiStorage.EnsureAccountsSettingsFileExists();
+				ShowMainWindow(desktop);
+			}
+			else
+				await CancelInstallation();
 
-				var libationFilesDialog = new LibationFilesDialog();
+			settingsDialog.Close();
+		}
 
-				if (libationFilesDialog.ShowDialogSynchronously<DialogResult>(setupDialog) != DialogResult.OK)
-					return false;
 
-				config.SetLibationFiles(libationFilesDialog.SelectedDirectory);
-				if (config.LibationSettingsAreValid)
-					return true;
+		private void ShowLibationFilesDialog(IClassicDesktopStyleApplicationLifetime desktop, Configuration config, Action<IClassicDesktopStyleApplicationLifetime, LibationFilesDialog, Configuration> OnClose)
+		{
+			var libationFilesDialog = new LibationFilesDialog();
+			desktop.MainWindow = libationFilesDialog;
+			libationFilesDialog.Show();
 
+			void WindowClosing(object sender, System.ComponentModel.CancelEventArgs e)
+			{
+				libationFilesDialog.Closing -= WindowClosing;
+				e.Cancel = true;
+				OnClose?.Invoke(desktop, libationFilesDialog, config);
+			}
+			libationFilesDialog.Closing += WindowClosing;
+		}
+
+		private async void OnLibationFilesCompleted(IClassicDesktopStyleApplicationLifetime desktop, LibationFilesDialog libationFilesDialog, Configuration config)
+		{
+			config.SetLibationFiles(libationFilesDialog.SelectedDirectory);
+			if (config.LibationSettingsAreValid)
+			{
+				await RunMigrationsAsync(config);
+
+				LibraryTask = Task.Run(() => DbContexts.GetLibrary_Flat_NoTracking(includeParents: true));
+				AudibleUtilities.AudibleApiStorage.EnsureAccountsSettingsFileExists();
+				ShowMainWindow(desktop);
+			}
+			else
+			{
 				// path did not result in valid settings
-				var continueResult = MessageBox.Show(
+				var continueResult = await MessageBox.Show(
 					$"No valid settings were found at this location.\r\nWould you like to create a new install settings in this folder?\r\n\r\n{libationFilesDialog.SelectedDirectory}",
 					"New install?",
 					MessageBoxButtons.YesNo,
 					MessageBoxIcon.Question);
 
-				if (continueResult != DialogResult.Yes)
-					return false;
+				if (continueResult == DialogResult.Yes)
+					ShowSettingsWindow(desktop, config, OnSettingsCompleted);
+				else
+					await CancelInstallation();
+
 			}
-
-			// INIT DEFAULT SETTINGS
-			// if 'new user' was clicked, or if 'returning user' chose new install: show basic settings dialog
-			config.Books ??= Path.Combine(Configuration.UserProfile, "Books");
-
-			AppScaffolding.LibationScaffolding.PopulateMissingConfigValues(config);
-			return new SettingsDialog().ShowDialogSynchronously<DialogResult>(setupDialog) == DialogResult.OK
-				&& config.LibationSettingsAreValid;
+			libationFilesDialog.Close();
 		}
 
-		static void CancelInstallation()
+		static async Task CancelInstallation()
 		{
-			MessageBox.Show("Initial set up cancelled.", "Cancelled", MessageBoxButtons.OK, MessageBoxIcon.Warning);
+			await MessageBox.Show("Initial set up cancelled.", "Cancelled", MessageBoxButtons.OK, MessageBoxIcon.Warning);
 			Environment.Exit(0);
 		}
 
@@ -225,4 +235,4 @@ namespace LibationAvalonia
 			SeriesEntryGridBackgroundBrush = AvaloniaUtils.GetBrushFromResources("SeriesEntryGridBackgroundBrush");
 		}
 	}
-}
+}

Source/LibationAvalonia/AvaloniaUtils.cs

@@ -1,4 +1,5 @@
 using Avalonia.Media;
+using Avalonia.Threading;
 using System;
 using System.Threading;
 using System.Threading.Tasks;
@@ -15,14 +16,5 @@ namespace LibationAvalonia
 				return brush;
 			return defaultBrush;
 		}
-
-		public static T ShowDialogSynchronously<T>(this Avalonia.Controls.Window window, Avalonia.Controls.Window owner)
-		{
-			using var source = new CancellationTokenSource();
-			var dialogTask = window.ShowDialog<T>(owner);
-			dialogTask.ContinueWith(t => source.Cancel(), TaskScheduler.FromCurrentSynchronizationContext());
-			Avalonia.Threading.Dispatcher.UIThread.MainLoop(source.Token);
-			return dialogTask.Result;
-		}
 	}
 }

Source/LibationAvalonia/Controls/DirectoryOrCustomSelectControl.axaml.cs

@@ -38,6 +38,7 @@ namespace LibationAvalonia.Controls
 			set => SetValue(SubDirectoryProperty, value);
 		}
 		CustomState customStates = new();
+
 		public DirectoryOrCustomSelectControl()
 		{
 			InitializeComponent();
@@ -53,9 +54,8 @@ namespace LibationAvalonia.Controls
 			customDirBrowseBtn.Click += CustomDirBrowseBtn_Click;
 			PropertyChanged += DirectoryOrCustomSelectControl_PropertyChanged;
 			directorySelectControl.PropertyChanged += DirectorySelectControl_PropertyChanged;
-			
-
 		}
+
 		private class CustomState: ViewModels.ViewModelBase
 		{
 			private string _customDir;
@@ -116,12 +116,13 @@ namespace LibationAvalonia.Controls
 
 		private void setDirectory()
 		{
-			var path1
+			var selectedDir
 				= customStates.CustomChecked ? customStates.CustomDir
 					: directorySelectControl.SelectedDirectory is Configuration.KnownDirectories.AppDir ? Configuration.AppDir_Absolute
 					: Configuration.GetKnownDirectoryPath(directorySelectControl.SelectedDirectory);
-			Directory
-					= System.IO.Path.Combine(path1 ?? string.Empty, SubDirectory);
+			selectedDir ??= string.Empty;
+
+			Directory = customStates.CustomChecked ? selectedDir : System.IO.Path.Combine(selectedDir, SubDirectory);
 		}
 
 
@@ -140,7 +141,7 @@ namespace LibationAvalonia.Controls
 				if (known is Configuration.KnownDirectories.None)
 				{
 					customStates.CustomChecked = true;
-					customStates.CustomDir = noSubDir;
+					customStates.CustomDir = directory;
 				}
 				else
 				{

Source/LibationAvalonia/Dialogs/AccountsDialog.axaml.cs

@@ -136,7 +136,7 @@ namespace LibationAvalonia.Dialogs
 
 				if (persister.AccountsSettings.Accounts.Any(a => a.AccountId == account.AccountId && a.IdentityTokens.Locale.Name == account.Locale.Name))
 				{
-					MessageBox.Show(this, $"An account with that account id and country already exists.\r\n\r\nAccount ID: {account.AccountId}\r\nCountry: {account.Locale.Name}", "Cannot Add Duplicate Account");
+					await MessageBox.Show(this, $"An account with that account id and country already exists.\r\n\r\nAccount ID: {account.AccountId}\r\nCountry: {account.Locale.Name}", "Cannot Add Duplicate Account");
 					return;
 				}
 
@@ -146,7 +146,7 @@ namespace LibationAvalonia.Dialogs
 			}
 			catch (Exception ex)
 			{
-				MessageBox.ShowAdminAlert(
+				await MessageBox.ShowAdminAlert(
 						this,
 						$"An error occurred while importing an account from:\r\n{filePath[0]}\r\n\r\nIs the file encrypted?",
 						"Error Importing Account",
@@ -160,11 +160,11 @@ namespace LibationAvalonia.Dialogs
 				Export(acc);
 		}
 
-		protected override void SaveAndClose()
+		protected override async Task SaveAndCloseAsync()
 		{
 			try
 			{
-				if (!inputIsValid())
+				if (!await inputIsValid())
 					return;
 
 				// without transaction, accounts persister will write ANY EDIT immediately to file
@@ -178,7 +178,7 @@ namespace LibationAvalonia.Dialogs
 			}
 			catch (Exception ex)
 			{
-				MessageBox.ShowAdminAlert(this, "Error attempting to save accounts", "Error saving accounts", ex);
+				await MessageBox.ShowAdminAlert(this, "Error attempting to save accounts", "Error saving accounts", ex);
 			}
 		}
 
@@ -221,7 +221,7 @@ namespace LibationAvalonia.Dialogs
 					: dto.AccountName.Trim();
 			}
 		}
-		private bool inputIsValid()
+		private async Task<bool> inputIsValid()
 		{
 			foreach (var dto in Accounts.ToList())
 			{
@@ -233,13 +233,13 @@ namespace LibationAvalonia.Dialogs
 
 				if (string.IsNullOrWhiteSpace(dto.AccountId))
 				{
-					MessageBox.Show(this, "Account id cannot be blank. Please enter an account id for all accounts.", "Blank account", MessageBoxButtons.OK, MessageBoxIcon.Error);
+					await MessageBox.Show(this, "Account id cannot be blank. Please enter an account id for all accounts.", "Blank account", MessageBoxButtons.OK, MessageBoxIcon.Error);
 					return false;
 				}
 
 				if (string.IsNullOrWhiteSpace(dto.SelectedLocale?.Name))
 				{
-					MessageBox.Show(this, "Please select a locale (i.e.: country or region) for all accounts.", "Blank region", MessageBoxButtons.OK, MessageBoxIcon.Error);
+					await MessageBox.Show(this, "Please select a locale (i.e.: country or region) for all accounts.", "Blank region", MessageBoxButtons.OK, MessageBoxIcon.Error);
 					return false;
 				}
 			}
@@ -259,7 +259,7 @@ namespace LibationAvalonia.Dialogs
 
 			if (account.IdentityTokens?.IsValid != true)
 			{
-				MessageBox.Show(this, "This account hasn't been authenticated yet. First scan your library to log into your account, then try exporting again.", "Account Not Authenticated");
+				await MessageBox.Show(this, "This account hasn't been authenticated yet. First scan your library to log into your account, then try exporting again.", "Account Not Authenticated");
 				return;
 			}
 
@@ -282,11 +282,11 @@ namespace LibationAvalonia.Dialogs
 
 				File.WriteAllText(fileName, jsonText);
 
-				MessageBox.Show(this, $"Successfully exported {account.AccountName} to\r\n\r\n{fileName}", "Success!");
+				await MessageBox.Show(this, $"Successfully exported {account.AccountName} to\r\n\r\n{fileName}", "Success!");
 			}
 			catch (Exception ex)
 			{
-				MessageBox.ShowAdminAlert(
+				await MessageBox.ShowAdminAlert(
 					this,
 					$"An error occurred while exporting account:\r\n{account.AccountName}",
 					"Error Exporting Account",

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/EditTemplateDialog.axaml.cs

@@ -64,7 +64,7 @@ namespace LibationAvalonia.Dialogs
 		}
 		protected override async Task SaveAndCloseAsync()
 		{
-			if (!_viewModel.Validate())
+			if (!await _viewModel.Validate())
 				return;
 
 			TemplateText = _viewModel.workingTemplateText;
@@ -115,7 +115,7 @@ namespace LibationAvalonia.Dialogs
 
 			public void resetTextBox(string value) => workingTemplateText = value;
 
-			public bool Validate()
+			public async Task<bool> Validate()
 			{
 				if (template.IsValid(workingTemplateText))
 					return true;
@@ -123,7 +123,7 @@ namespace LibationAvalonia.Dialogs
 					.GetErrors(workingTemplateText)
 					.Select(err => $"- {err}")
 					.Aggregate((a, b) => $"{a}\r\n{b}");
-				MessageBox.Show($"This template text is not valid. Errors:\r\n{errors}", "Invalid", MessageBoxButtons.OK, MessageBoxIcon.Error);
+				await MessageBox.Show($"This template text is not valid. Errors:\r\n{errors}", "Invalid", MessageBoxButtons.OK, MessageBoxIcon.Error);
 				return false;
 			}
 

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
-				= App.IsUnix ? null
+				= !LibationFileManager.Configuration.IsWindows ? null
 				: Directory.Exists(BookSaveDirectory) ? BookSaveDirectory
 				: Path.GetDirectoryName(BookSaveDirectory);
 
@@ -67,7 +67,7 @@ namespace LibationAvalonia.Dialogs
 			catch (Exception ex)
 			{
 				Serilog.Log.Logger.Error(ex, $"Failed to save picture to {fileName}");
-				MessageBox.Show(this, $"An error was encountered while trying to save the picture\r\n\r\n{ex.Message}", "Failed to save picture", MessageBoxButtons.OK, MessageBoxIcon.Error, MessageBoxDefaultButton.Button1);
+				await MessageBox.Show(this, $"An error was encountered while trying to save the picture\r\n\r\n{ex.Message}", "Failed to save picture", MessageBoxButtons.OK, MessageBoxIcon.Error, MessageBoxDefaultButton.Button1);
 			}
 		}
 

Source/LibationAvalonia/Dialogs/LibationFilesDialog.axaml

@@ -7,6 +7,7 @@
 		MinWidth="800" MaxWidth="800"
         x:Class="LibationAvalonia.Dialogs.LibationFilesDialog"
         xmlns:controls="clr-namespace:LibationAvalonia.Controls"
+		WindowStartupLocation="CenterScreen"
         Title="Book Details"
 		Icon="/Assets/libation.ico">
 	

Source/LibationAvalonia/Dialogs/LibationFilesDialog.axaml.cs

@@ -23,6 +23,7 @@ namespace LibationAvalonia.Dialogs
 		}
 		private DirSelectOptions dirSelectOptions;
 		public string SelectedDirectory => dirSelectOptions.Directory;
+		public DialogResult DialogResult { get; private set; }
 		public LibationFilesDialog()
 		{
 			InitializeComponent();
@@ -33,18 +34,19 @@ namespace LibationAvalonia.Dialogs
 			DataContext = dirSelectOptions = new();
 		}
 
-		public void SaveButton_Click(object sender, Avalonia.Interactivity.RoutedEventArgs e)
+		public async void SaveButton_Click(object sender, Avalonia.Interactivity.RoutedEventArgs e)
 		{
 
 			var libationDir = dirSelectOptions.Directory;
 
 			if (!System.IO.Directory.Exists(libationDir))
 			{
-				MessageBox.Show("Not saving change to Libation Files location. This folder does not exist:\r\n" + libationDir, "Folder does not exist", MessageBoxButtons.OK, MessageBoxIcon.Error, saveAndRestorePosition: false);
+				await MessageBox.Show("Not saving change to Libation Files location. This folder does not exist:\r\n" + libationDir, "Folder does not exist", MessageBoxButtons.OK, MessageBoxIcon.Error, saveAndRestorePosition: false);
 				return;
 			}
 
-			Close(DialogResult.OK);
+			DialogResult = DialogResult.OK;
+			Close(DialogResult);
 		}
 
 		private void InitializeComponent()

Source/LibationAvalonia/Dialogs/Login/AvaloniaLoginBase.cs

@@ -9,12 +9,12 @@ namespace LibationAvalonia.Dialogs.Login
 	{
 
 		/// <returns>True if ShowDialog's DialogResult == OK</returns>
-		protected static bool ShowDialog(DialogWindow dialog)
+		protected static async Task<bool> ShowDialog(DialogWindow dialog)
 		{
 			if (Application.Current.ApplicationLifetime is not IClassicDesktopStyleApplicationLifetime desktop)
 				return false;
 
-			var result = dialog.ShowDialogSynchronously<DialogResult>(desktop.MainWindow);
+			var result = await dialog.ShowDialog<DialogResult>(desktop.MainWindow);
 			Serilog.Log.Logger.Debug("{@DebugInfo}", new { DialogResult = result });
 			return result == DialogResult.OK;
 		}

Source/LibationAvalonia/Dialogs/Login/AvaloniaLoginCallback.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Threading.Tasks;
 using AudibleApi;
 using AudibleUtilities;
 
@@ -13,43 +14,43 @@ namespace LibationAvalonia.Dialogs.Login
 			_account = Dinah.Core.ArgumentValidator.EnsureNotNull(account, nameof(account));
 		}
 
-		public string Get2faCode()
+		public async Task<string> Get2faCodeAsync()
 		{
 			var dialog = new _2faCodeDialog();
-			if (ShowDialog(dialog))
+			if (await ShowDialog(dialog))
 				return dialog.Code;
 
 			return null;
 		}
 
-		public string GetCaptchaAnswer(byte[] captchaImage)
+		public async Task<string> GetCaptchaAnswerAsync(byte[] captchaImage)
 		{
 			var dialog = new CaptchaDialog(captchaImage);
-			if (ShowDialog(dialog))
+			if (await ShowDialog(dialog))
 				return dialog.Answer;
 			return null;
 		}
 
-		public (string name, string value) GetMfaChoice(MfaConfig mfaConfig)
+		public async Task<(string name, string value)> GetMfaChoiceAsync(MfaConfig mfaConfig)
 		{
 			var dialog = new MfaDialog(mfaConfig);
-			if (ShowDialog(dialog))
+			if (await ShowDialog(dialog))
 				return (dialog.SelectedName, dialog.SelectedValue);
 			return (null, null);
 		}
 
-		public (string email, string password) GetLogin()
+		public async Task<(string email, string password)> GetLoginAsync()
 		{
 			var dialog = new LoginCallbackDialog(_account);
-			if (ShowDialog(dialog))
+			if (await ShowDialog(dialog))
 				return (_account.AccountId, dialog.Password);
 			return (null, null);
 		}
 
-		public void ShowApprovalNeeded()
+		public async Task ShowApprovalNeededAsync()
 		{
 			var dialog = new ApprovalNeededDialog();
-			ShowDialog(dialog);
+			await ShowDialog(dialog);
 		}
 	}
 }

Source/LibationAvalonia/Dialogs/Login/AvaloniaLoginChoiceEager.cs

@@ -20,11 +20,11 @@ namespace LibationAvalonia.Dialogs.Login
 			LoginCallback = new AvaloniaLoginCallback(_account);
 		}
 
-		public ChoiceOut Start(ChoiceIn choiceIn)
+		public async Task<ChoiceOut> StartAsync(ChoiceIn choiceIn)
 		{
 			var dialog = new LoginChoiceEagerDialog(_account);
 
-			if (!ShowDialog(dialog))
+			if (!await ShowDialog(dialog))
 				return null;
 
 
@@ -33,15 +33,16 @@ namespace LibationAvalonia.Dialogs.Login
 				case LoginMethod.Api:
 					return ChoiceOut.WithApi(dialog.Account.AccountId, dialog.Password);
 				case LoginMethod.External:
-				{
-					var externalDialog = new LoginExternalDialog(_account, choiceIn.LoginUrl);
-					return ShowDialog(externalDialog)
-						? ChoiceOut.External(externalDialog.ResponseUrl)
-						: null;
-				}
+					{
+						var externalDialog = new LoginExternalDialog(_account, choiceIn.LoginUrl);
+						return await ShowDialog(externalDialog)
+							? ChoiceOut.External(externalDialog.ResponseUrl)
+							: null;
+					}
 				default:
 					throw new Exception($"Unknown {nameof(LoginMethod)} value");
 			}
 		}
+
 	}
 }

Source/LibationAvalonia/Dialogs/Login/LoginExternalDialog.axaml.cs

@@ -51,7 +51,7 @@ namespace LibationAvalonia.Dialogs.Login
 			Serilog.Log.Logger.Information("Submit button clicked: {@DebugInfo}", new { ResponseUrl });
 			if (!Uri.TryCreate(ResponseUrl, UriKind.Absolute, out var result))
 			{
-				MessageBox.Show("Invalid response URL");
+				await MessageBox.Show("Invalid response URL");
 				return;
 			}
 			await base.SaveAndCloseAsync();

Source/LibationAvalonia/Dialogs/Login/MfaDialog.axaml.cs

@@ -82,7 +82,7 @@ namespace LibationAvalonia.Dialogs.Login
 			});
 			if (selected is null)
 			{
-				MessageBox.Show("No MFA option selected", "None selected", MessageBoxButtons.OK, MessageBoxIcon.Error);
+				await MessageBox.Show("No MFA option selected", "None selected", MessageBoxButtons.OK, MessageBoxIcon.Error);
 				return;
 			}
 

Source/LibationAvalonia/Dialogs/MessageBoxAlertAdminDialog.axaml.cs

@@ -28,7 +28,7 @@ namespace LibationAvalonia.Dialogs
 			DataContext = this;
 		}
 
-		private void GoToGithub_Tapped(object sender, Avalonia.Interactivity.RoutedEventArgs e)
+		private async void GoToGithub_Tapped(object sender, Avalonia.Interactivity.RoutedEventArgs e)
 		{
 			var url = "https://github.com/rmcrackan/Libation/issues";
 			try
@@ -37,11 +37,11 @@ namespace LibationAvalonia.Dialogs
 			}
 			catch
 			{
-				MessageBox.Show($"Error opening url\r\n{url}", "Error opening url", MessageBoxButtons.OK, MessageBoxIcon.Error);
+				await MessageBox.Show($"Error opening url\r\n{url}", "Error opening url", MessageBoxButtons.OK, MessageBoxIcon.Error);
 			}
 		}
 
-		private void GoToLogs_Tapped(object sender, Avalonia.Interactivity.RoutedEventArgs e)
+		private async void GoToLogs_Tapped(object sender, Avalonia.Interactivity.RoutedEventArgs e)
 		{
 			LongPath dir = "";
 			try
@@ -52,11 +52,11 @@ namespace LibationAvalonia.Dialogs
 
 			try
 			{
-				App.GoToFolder(dir.ShortPathName);
+				Go.To.Folder(dir.ShortPathName);
 			}
 			catch
 			{
-				MessageBox.Show($"Error opening folder\r\n{dir}", "Error opening folder", MessageBoxButtons.OK, MessageBoxIcon.Error);
+				await MessageBox.Show($"Error opening folder\r\n{dir}", "Error opening folder", MessageBoxButtons.OK, MessageBoxIcon.Error);
 			}
 		}
 

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>
@@ -495,6 +509,7 @@
 
 									<RadioButton
 										Margin="0,5,0,5"
+										IsEnabled="{Binding AudioSettings.IsMp3Supported}"
 										IsChecked="{Binding AudioSettings.DecryptToLossy, Mode=TwoWay}">
 
 										<TextBlock
@@ -508,6 +523,7 @@
 
 						<StackPanel
 							Grid.Row="0"
+							IsVisible="{Binding AudioSettings.IsMp3Supported}"
 							Grid.Column="1">
 
 							<controls:GroupBox

Source/LibationAvalonia/Dialogs/SettingsDialog.axaml.cs

@@ -33,10 +33,10 @@ namespace LibationAvalonia.Dialogs
 
 		protected override async Task SaveAndCloseAsync()
 		{
-			if (!settingsDisp.SaveSettings(config))
+			if (!await settingsDisp.SaveSettingsAsync(config))
 				return;
 
-			MessageBox.VerboseLoggingWarning_ShowIfTrue();
+			await MessageBox.VerboseLoggingWarning_ShowIfTrue();
 			await base.SaveAndCloseAsync();
 		}
 
@@ -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)
@@ -97,7 +97,7 @@ namespace LibationAvalonia.Dialogs
 	internal interface ISettingsDisplay
 	{
 		void LoadSettings(Configuration config);
-		bool SaveSettings(Configuration config);
+		Task<bool> SaveSettingsAsync(Configuration config);
 	}
 
 	public class SettingsPages : ISettingsDisplay
@@ -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; }
@@ -120,12 +121,12 @@ namespace LibationAvalonia.Dialogs
 			AudioSettings = new(config);
 		}
 
-		public bool SaveSettings(Configuration config)
+		public async Task<bool> SaveSettingsAsync(Configuration config)
 		{
-			var result = ImportantSettings.SaveSettings(config);
-			result &= ImportSettings.SaveSettings(config);
-			result &= DownloadDecryptSettings.SaveSettings(config);
-			result &= AudioSettings.SaveSettings(config);
+			var result = await ImportantSettings.SaveSettingsAsync(config);
+			result &= await ImportSettings.SaveSettingsAsync(config);
+			result &= await DownloadDecryptSettings.SaveSettingsAsync(config);
+			result &= await AudioSettings.SaveSettingsAsync(config);
 
 			return result;
 		}
@@ -146,13 +147,13 @@ namespace LibationAvalonia.Dialogs
 			BetaOptIn = config.BetaOptIn;
 		}
 
-		public bool SaveSettings(Configuration config)
+		public async Task<bool> SaveSettingsAsync(Configuration config)
 		{
 			#region validation
 
 			if (string.IsNullOrWhiteSpace(BooksDirectory))
 			{
-				MessageBox.Show("Cannot set Books Location to blank", "Location is blank", MessageBoxButtons.OK, MessageBoxIcon.Error);
+				await MessageBox.Show("Cannot set Books Location to blank", "Location is blank", MessageBoxButtons.OK, MessageBoxIcon.Error);
 				return false;
 			}
 
@@ -204,14 +205,14 @@ namespace LibationAvalonia.Dialogs
 			AutoDownloadEpisodes = config.AutoDownloadEpisodes;
 		}
 
-		public bool SaveSettings(Configuration config)
+		public Task<bool> SaveSettingsAsync(Configuration config)
 		{
 			config.AutoScan = AutoScan;
 			config.ShowImportedStats = ShowImportedStats;
 			config.ImportEpisodes = ImportEpisodes;
 			config.DownloadEpisodes = DownloadEpisodes;
 			config.AutoDownloadEpisodes = AutoDownloadEpisodes;
-			return true;
+			return Task.FromResult(true);
 		}
 
 		public string AutoScanText { get; } = Configuration.GetDescription(nameof(Configuration.AutoScan));
@@ -257,27 +258,28 @@ namespace LibationAvalonia.Dialogs
 			InProgressDirectory
 				= config.InProgress == Configuration.AppDir_Absolute ? Configuration.KnownDirectories.AppDir
 				: Configuration.GetKnownDirectory(config.InProgress);
+			UseCoverAsFolderIcon = config.UseCoverAsFolderIcon;
 		}
 
-		public bool SaveSettings(Configuration config)
+		public async Task<bool> SaveSettingsAsync(Configuration config)
 		{
-			static void validationError(string text, string caption)
+			static Task validationError(string text, string caption)
 				=> MessageBox.Show(text, caption, MessageBoxButtons.OK, MessageBoxIcon.Error);
 
 			// these 3 should do nothing. Configuration will only init these with a valid value. EditTemplateDialog ensures valid before returning
 			if (!Templates.Folder.IsValid(FolderTemplate))
 			{
-				validationError($"Not saving change to folder naming template. Invalid format.", "Invalid folder template");
+				await validationError($"Not saving change to folder naming template. Invalid format.", "Invalid folder template");
 				return false;
 			}
 			if (!Templates.File.IsValid(FileTemplate))
 			{
-				validationError($"Not saving change to file naming template. Invalid format.", "Invalid file template");
+				await validationError($"Not saving change to file naming template. Invalid format.", "Invalid file template");
 				return false;
 			}
 			if (!Templates.ChapterFile.IsValid(ChapterFileTemplate))
 			{
-				validationError($"Not saving change to chapter file naming template. Invalid format.", "Invalid chapter file template");
+				await validationError($"Not saving change to chapter file naming template. Invalid format.", "Invalid chapter file template");
 				return false;
 			}
 
@@ -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,6 +387,8 @@ namespace LibationAvalonia.Dialogs
 		private int _lameVBRQuality;
 		private string _chapterTitleTemplate;
 
+		public bool IsMp3Supported => Configuration.IsLinux || Configuration.IsWindows;
+
 		public AudioSettings(Configuration config)
 		{
 			LoadSettings(config);
@@ -405,7 +413,7 @@ namespace LibationAvalonia.Dialogs
 			LameVBRQuality = config.LameVBRQuality;
 		}
 
-		public bool SaveSettings(Configuration config)
+		public Task<bool> SaveSettingsAsync(Configuration config)
 		{
 			config.CreateCueSheet = CreateCueSheet;
 			config.AllowLibationFixup = AllowLibationFixup;
@@ -424,7 +432,7 @@ namespace LibationAvalonia.Dialogs
 			config.LameBitrate = LameBitrate;
 			config.LameVBRQuality = LameVBRQuality;
 
-			return true;
+			return Task.FromResult(true);
 		}
 
 		public string CreateCueSheetText { get; } = Configuration.GetDescription(nameof(Configuration.CreateCueSheet));

Source/LibationAvalonia/FormSaveExtension.cs

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

Source/LibationAvalonia/LibationAvalonia.csproj

@@ -10,19 +10,31 @@
 		<ApplicationIcon>libation.ico</ApplicationIcon>
 		<AssemblyName>Libation</AssemblyName>
 
+		<IsPublishable>true</IsPublishable>
+
 		<PublishReadyToRun>true</PublishReadyToRun>
 		<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
 		<AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
 		<StartupObject />
 	</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>
+	  <OutputPath>..\bin\Avalonia\Debug</OutputPath>
     <DebugType>embedded</DebugType>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
-	  <OutputPath>..\bin-Avalonia\Release</OutputPath>
+	  <OutputPath>..\bin\Avalonia\Release</OutputPath>
     <DebugType>embedded</DebugType>
   </PropertyGroup>
 	
@@ -71,8 +83,6 @@
     <None Remove="Assets\SEGOEUI.TTF" />
     <None Remove="Assets\up.png" />
     <None Remove="Assets\WINGDING.TTF" />
-    <None Remove="MessageBox.cs~RF105afb8d.TMP" />
-    <None Remove="Views\MainWindow\MainWindow.Export.axaml.cs~RF10732d95.TMP" />
   </ItemGroup>
 
   <ItemGroup>
@@ -134,4 +144,12 @@
     </None>
   </ItemGroup>
 
+
+	<Target Name="SpicNSpan"  AfterTargets="Clean">
+		<!-- Remove obj folder -->
+		<RemoveDir Directories="$(BaseIntermediateOutputPath)" />
+		<!-- Remove bin folder -->
+		<RemoveDir Directories="$(BaseOutputPath)" />
+	</Target>
+
 </Project>

Source/LibationAvalonia/MessageBox.cs

@@ -9,6 +9,8 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
+using System.Threading;
+using Avalonia.Threading;
 
 namespace LibationAvalonia
 {
@@ -60,34 +62,34 @@ namespace LibationAvalonia
 	public class MessageBox
 	{
 
-		public static DialogResult Show(string text, string caption, MessageBoxButtons buttons, MessageBoxIcon icon, MessageBoxDefaultButton defaultButton)
+		public static Task<DialogResult> Show(string text, string caption, MessageBoxButtons buttons, MessageBoxIcon icon, MessageBoxDefaultButton defaultButton)
 			=> ShowCoreAsync(null, text, caption, buttons, icon, defaultButton);
-public static DialogResult Show(string text, string caption, MessageBoxButtons buttons, MessageBoxIcon icon, bool saveAndRestorePosition = true)
+public static Task<DialogResult> Show(string text, string caption, MessageBoxButtons buttons, MessageBoxIcon icon, bool saveAndRestorePosition = true)
 			=> ShowCoreAsync(null, text, caption, buttons, icon, MessageBoxDefaultButton.Button1, saveAndRestorePosition);
-public static DialogResult Show(string text, string caption, MessageBoxButtons buttons)
+public static Task<DialogResult> Show(string text, string caption, MessageBoxButtons buttons)
 			=> ShowCoreAsync(null, text, caption, buttons, MessageBoxIcon.None, MessageBoxDefaultButton.Button1);
-	public static DialogResult Show(string text, string caption)
+	public static Task<DialogResult> Show(string text, string caption)
 			=> ShowCoreAsync(null, text, caption, MessageBoxButtons.OK, MessageBoxIcon.None, MessageBoxDefaultButton.Button1);
-	public static DialogResult Show(string text)
+	public static Task<DialogResult> Show(string text)
 			=> ShowCoreAsync(null, text, string.Empty, MessageBoxButtons.OK, MessageBoxIcon.None, MessageBoxDefaultButton.Button1);
-public static DialogResult Show(Window owner, string text, string caption, MessageBoxButtons buttons, MessageBoxIcon icon, MessageBoxDefaultButton defaultButton)
+public static Task<DialogResult> Show(Window owner, string text, string caption, MessageBoxButtons buttons, MessageBoxIcon icon, MessageBoxDefaultButton defaultButton)
 			=> ShowCoreAsync(owner, text, caption, buttons, icon, defaultButton);
 
-public static DialogResult Show(Window owner, string text, string caption, MessageBoxButtons buttons, MessageBoxIcon icon)
+public static Task<DialogResult> Show(Window owner, string text, string caption, MessageBoxButtons buttons, MessageBoxIcon icon)
 			=> ShowCoreAsync(owner, text, caption, buttons, icon, MessageBoxDefaultButton.Button1);
-	public static DialogResult Show(Window owner, string text, string caption, MessageBoxButtons buttons)
+	public static Task<DialogResult> Show(Window owner, string text, string caption, MessageBoxButtons buttons)
 			=> ShowCoreAsync(owner, text, caption, buttons, MessageBoxIcon.None, MessageBoxDefaultButton.Button1);
-	public static DialogResult Show(Window owner, string text, string caption)
+	public static Task<DialogResult> Show(Window owner, string text, string caption)
 			=> ShowCoreAsync(owner, text, caption, MessageBoxButtons.OK, MessageBoxIcon.None, MessageBoxDefaultButton.Button1);
-		public static DialogResult Show(Window owner, string text)
+		public static Task<DialogResult> Show(Window owner, string text)
 			=> ShowCoreAsync(owner, text, string.Empty, MessageBoxButtons.OK, MessageBoxIcon.None, MessageBoxDefaultButton.Button1);
 
 
-		public static void VerboseLoggingWarning_ShowIfTrue()
+		public static async Task VerboseLoggingWarning_ShowIfTrue()
 		{
 			// when turning on debug (and especially Verbose) to share logs, some privacy settings may not be obscured
 			if (Serilog.Log.Logger.IsVerboseEnabled())
-				Show(@"
+				await Show(@"
 Warning: verbose logging is enabled.
 
 This should be used for debugging only. It creates many
@@ -100,7 +102,7 @@ Libation.
 ".Trim(), "Verbose logging enabled", MessageBoxButtons.OK, MessageBoxIcon.Warning);
 		}
 
-		public static DialogResult ShowConfirmationDialog(Window owner, IEnumerable<LibraryBook> libraryBooks, string format, string title, MessageBoxDefaultButton defaultButton = MessageBoxDefaultButton.Button1)
+		public static async Task<DialogResult> ShowConfirmationDialog(Window owner, IEnumerable<LibraryBook> libraryBooks, string format, string title, MessageBoxDefaultButton defaultButton = MessageBoxDefaultButton.Button1)
 		{
 			if (libraryBooks is null || !libraryBooks.Any())
 				return DialogResult.Cancel;
@@ -115,7 +117,7 @@ Libation.
 				= string.Format(format, $"{thisThese} {count} {bookBooks}")
 				+ $"\r\n\r\n{titlesAgg}";
 
-			return ShowCoreAsync(owner, 
+			return await ShowCoreAsync(owner, 
 				message,
 				title,
 				MessageBoxButtons.YesNo,
@@ -130,7 +132,7 @@ Libation.
 		/// <param name="text">The text to display in the message box.</param>
 		/// <param name="caption">The text to display in the title bar of the message box.</param>
 		/// <param name="exception">Exception to log.</param>
-		public static void ShowAdminAlert(Window owner, string text, string caption, Exception exception)
+		public static async Task ShowAdminAlert(Window owner, string text, string caption, Exception exception)
 		{
 			// for development and debugging, show me what broke!
 			if (System.Diagnostics.Debugger.IsAttached)
@@ -144,16 +146,18 @@ Libation.
 
 			var form = new MessageBoxAlertAdminDialog(text, caption, exception);
 
-			DisplayWindow(form, owner);
+			await DisplayWindow(form, owner);
 		}
 
-
-		private static DialogResult ShowCoreAsync(Window owner, string message, string caption, MessageBoxButtons buttons, MessageBoxIcon icon, MessageBoxDefaultButton defaultButton, bool saveAndRestorePosition = true)
-			=> Avalonia.Threading.Dispatcher.UIThread.InvokeAsync(() => ShowCoreAsync2(owner, message, caption, buttons, icon, defaultButton, saveAndRestorePosition)).GetAwaiter().GetResult();
-
-		private static DialogResult ShowCoreAsync2(Window owner, string message, string caption, MessageBoxButtons buttons, MessageBoxIcon icon, MessageBoxDefaultButton defaultButton, bool saveAndRestorePosition = true)
+		private static async Task<DialogResult> ShowCoreAsync(Window owner, string message, string caption, MessageBoxButtons buttons, MessageBoxIcon icon, MessageBoxDefaultButton defaultButton, bool saveAndRestorePosition = true)
 		{
+			var dialog = await Dispatcher.UIThread.InvokeAsync(() => CreateMessageBox(owner, message, caption, buttons, icon, defaultButton, saveAndRestorePosition));
 
+			return await DisplayWindow(dialog, owner);
+		}
+
+		private static MessageBoxWindow CreateMessageBox(Window owner, string message, string caption, MessageBoxButtons buttons, MessageBoxIcon icon, MessageBoxDefaultButton defaultButton, bool saveAndRestorePosition = true)
+		{
 			owner ??= (Application.Current.ApplicationLifetime as IClassicDesktopStyleApplicationLifetime).MainWindow;
 
 			var dialog = new MessageBoxWindow(saveAndRestorePosition);
@@ -186,16 +190,15 @@ Libation.
 			dialog.MaxWidth = dialog.MinWidth;
 			dialog.Height = dialog.MinHeight;
 			dialog.Width = dialog.MinWidth;
-
-			return DisplayWindow(dialog, owner);
+			return dialog;
 		}
-		private static DialogResult DisplayWindow(Window toDisplay, Window owner)
+		private static async Task<DialogResult> DisplayWindow(Window toDisplay, Window owner)
 		{
 			if (owner is null)
 			{
 				if (Application.Current.ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop)
 				{
-					return toDisplay.ShowDialogSynchronously<DialogResult>(desktop.MainWindow);
+					return await toDisplay.ShowDialog<DialogResult>(desktop.MainWindow);
 				}
 				else
 				{
@@ -209,7 +212,7 @@ Libation.
 					};
 
 					window.Show();
-					var result = toDisplay.ShowDialogSynchronously<DialogResult>(window);
+					var result = await toDisplay.ShowDialog<DialogResult>(window);
 					window.Close();
 					return result;
 				}
@@ -217,7 +220,7 @@ Libation.
 			}
 			else
 			{
-				return toDisplay.ShowDialogSynchronously<DialogResult>(owner);
+				return await toDisplay.ShowDialog<DialogResult>(owner);
 			}
 		}
 

Source/LibationAvalonia/Program.cs

@@ -14,7 +14,7 @@ namespace LibationAvalonia
 	{
 		private static string EXE_DIR = Path.GetDirectoryName(System.Reflection.Assembly.GetExecutingAssembly().Location);
 
-		static async Task Main()
+		static void Main()
 		{
 			//***********************************************//
 			//                                               //
@@ -30,6 +30,14 @@ namespace LibationAvalonia
 			var classicLifetimeTask = Task.Run(() => new ClassicDesktopStyleApplicationLifetime());
 			var appBuilderTask = Task.Run(BuildAvaloniaApp);
 
+			if (Configuration.IsWindows)
+				AppScaffolding.LibationScaffolding.SetReleaseIdentifier(AppScaffolding.ReleaseIdentifier.WindowsAvalonia);
+			else if (Configuration.IsLinux)
+				AppScaffolding.LibationScaffolding.SetReleaseIdentifier(AppScaffolding.ReleaseIdentifier.LinuxAvalonia);
+			else if (Configuration.IsMacOs)
+				AppScaffolding.LibationScaffolding.SetReleaseIdentifier(AppScaffolding.ReleaseIdentifier.MacOSAvalonia);
+			else return;
+
 
 			if (!App.SetupRequired)
 			{
@@ -39,9 +47,7 @@ namespace LibationAvalonia
 				App.LibraryTask = Task.Run(() => DbContexts.GetLibrary_Flat_NoTracking(includeParents: true));
 			}
 
-
-
-			(await appBuilderTask).SetupWithLifetime(await classicLifetimeTask);
+			(appBuilderTask.GetAwaiter().GetResult()).SetupWithLifetime(classicLifetimeTask.GetAwaiter().GetResult());
 
 			classicLifetimeTask.Result.Start(null);
 		}

Source/LibationAvalonia/Properties/PublishProfiles/LinuxProfile.pubxml

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

Source/LibationAvalonia/Properties/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/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\publish\</PublishDir>
+    <PublishDir>..\bin\Publish\win-chardonnay</PublishDir>
     <PublishProtocol>FileSystem</PublishProtocol>
     <TargetFramework>net6.0</TargetFramework>
     <RuntimeIdentifier>win-x64</RuntimeIdentifier>

Source/LibationAvalonia/README.md

@@ -4,54 +4,9 @@ This walkthrough should get you up and running with Libation on your Ubuntu mach
 Some limitations of the linux release are:
 - Cannot customize how illegial filename characters are replaced.
 - The Auto-update function is unavailable
-- The "Hangover" app for debugging is not yet available.
 
 ## Dependencies
-### Dotnet Runtime
-You must install the dotnet 6.0 runtime on your machine.
 
-First, add the Microsoft package signing key to your list of trusted keys and add the package repository.
-
-<details>
-  <summary>Ubuntu 22.04</summary>
-  
-  ```console
-  wget https://packages.microsoft.com/config/ubuntu/22.04/packages-microsoft-prod.deb -O packages-microsoft-prod.deb
-  sudo dpkg -i packages-microsoft-prod.deb
-  rm packages-microsoft-prod.deb
-  ```
-</details>
-
-<details>
-  <summary>Ubuntu 21.10</summary>
-  
-  ```console
-  wget https://packages.microsoft.com/config/ubuntu/21.10/packages-microsoft-prod.deb -O packages-microsoft-prod.deb
-  sudo dpkg -i packages-microsoft-prod.deb
-  rm packages-microsoft-prod.deb
-  ```
-</details>
-
-<details>
-  <summary>Ubuntu 20.04</summary>
-  
-  ```console
-  wget https://packages.microsoft.com/config/ubuntu/20.04/packages-microsoft-prod.deb -O packages-microsoft-prod.deb
-  sudo dpkg -i packages-microsoft-prod.deb
-  rm packages-microsoft-prod.deb
-  ```
-</details>
-
-For other distributions, see [Microsoft's instructions for installing .NET on Linux](https://docs.microsoft.com/en-us/dotnet/core/install/linux).
-
-Then install the dotnet 6.0 runtime
-
-```console
-sudo apt-get update; \
-  sudo apt-get install -y apt-transport-https && \
-  sudo apt-get update && \
-  sudo apt-get install -y dotnet-runtime-6.0
-```
 ### FFMpeg (Optional)
 If you want to convert your audiobooks to mp3, install FFMpeg using the following command:
 
@@ -67,8 +22,7 @@ Download the most recent linux-64 binaries zip file and save it as `libation-lin
   <summary>install-libation.sh</summary>
   
   ```BASH
-   #!/bin/bash
-
+  #!/bin/bash
 
   FILE=$1
 
@@ -77,10 +31,10 @@ Download the most recent linux-64 binaries zip file and save it as `libation-lin
    exit
   fi
 
-if [ "$EUID" -ne 0 ]
- then echo "Please run as root"
- exit
-fi
+  if [[ "$EUID" -ne 0 ]]
+    then echo "Please run as root"
+    exit
+  fi
 
   if [ ! -f "$FILE" ]
    then echo "The file \"$FILE\" does not exist."
@@ -99,12 +53,13 @@ fi
    exit
   fi
 
-
   sudo -u $SUDO_USER chmod +700 ${FOLDER}/Libation
+  sudo -u $SUDO_USER chmod +700 ${FOLDER}/Hangover
   sudo -u $SUDO_USER chmod +700 ${FOLDER}/LibationCli
 
   #Remove previous installation program files and sym link
   rm /usr/bin/Libation
+  rm /usr/bin/Hangover
   rm /usr/bin/LibationCli
   rm /usr/bin/libationcli
   rm /usr/lib/libation -r
@@ -117,11 +72,11 @@ fi
   chmod +666 /usr/share/icons/hicolor/scalable/apps/libation.svg
   gtk-update-icon-cache -f /usr/share/icons/hicolor/
   ln -s /usr/lib/libation/Libation /usr/bin/Libation
+  ln -s /usr/lib/libation/Hangover /usr/bin/Hangover
   ln -s /usr/lib/libation/LibationCli /usr/bin/LibationCli
   ln -s /usr/lib/libation/LibationCli /usr/bin/libationcli
 
   echo "Done!"
-
   ```
 </details>
 

Source/LibationAvalonia/ViewModels/MainWindowViewModel.cs

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

Source/LibationAvalonia/ViewModels/ProcessBookViewModel.cs

@@ -152,7 +152,7 @@ namespace LibationAvalonia.ViewModels
 			finally
 			{
 				if (Result == ProcessBookResult.None)
-					Result = showRetry(LibraryBook);
+					Result = await showRetry(LibraryBook);
 
 				Status = Result switch
 				{
@@ -313,7 +313,7 @@ namespace LibationAvalonia.ViewModels
 
 		#region Failure Handler
 
-		private ProcessBookResult showRetry(LibraryBook libraryBook)
+		private async Task<ProcessBookResult> showRetry(LibraryBook libraryBook)
 		{
 			Logger.Error("ERROR. All books have not been processed. Most recent book: processing failed");
 
@@ -346,7 +346,7 @@ $@"  Title: {libraryBook.Book.Title}
 			}
 
 			// if null then ask user
-			dialogResult ??= MessageBox.Show(string.Format(SkipDialogText + "\r\n\r\nSee Settings to avoid this box in the future.", details), "Skip importing this book?", SkipDialogButtons, MessageBoxIcon.Question, SkipDialogDefaultButton);
+			dialogResult ??= await MessageBox.Show(string.Format(SkipDialogText + "\r\n\r\nSee Settings to avoid this box in the future.", details), "Skip importing this book?", SkipDialogButtons, MessageBoxIcon.Question, SkipDialogDefaultButton);
 
 			if (dialogResult == DialogResult.Abort)
 				return ProcessBookResult.FailedAbort;

Source/LibationAvalonia/ViewModels/ProductsDisplayViewModel.cs

@@ -244,7 +244,7 @@ namespace LibationAvalonia.ViewModels
 				return;
 
 			var libraryBooks = selectedBooks.Select(rge => rge.LibraryBook).ToList();
-			var result = MessageBox.ShowConfirmationDialog(
+			var result = await MessageBox.ShowConfirmationDialog(
 				null,
 				libraryBooks,
 				$"Are you sure you want to remove {selectedBooks.Count} books from Libation's library?",
@@ -317,7 +317,7 @@ namespace LibationAvalonia.ViewModels
 			}
 			catch (Exception ex)
 			{
-				MessageBox.ShowAdminAlert(
+				await MessageBox.ShowAdminAlert(
 					null,
 					"Error scanning library. You may still manually select books to remove from Libation's library.",
 					"Error scanning library",

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

@@ -41,11 +41,11 @@ namespace LibationAvalonia.Views
 						break;
 				}
 
-				MessageBox.Show("Library exported to:\r\n" + fileName, "Library Exported");
+				await MessageBox.Show("Library exported to:\r\n" + fileName, "Library Exported");
 			}
 			catch (Exception ex)
 			{
-				MessageBox.ShowAdminAlert(this, "Error attempting to export your library.", "Error exporting", ex);
+				await MessageBox.ShowAdminAlert(this, "Error attempting to export your library.", "Error exporting", ex);
 			}
 		}
 	}

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

@@ -39,7 +39,7 @@ namespace LibationAvalonia.Views
 			}
 			catch (Exception ex)
 			{
-				MessageBox.Show($"Bad filter string:\r\n\r\n{ex.Message}", "Bad filter string", MessageBoxButtons.OK, MessageBoxIcon.Error);
+				await MessageBox.Show($"Bad filter string:\r\n\r\n{ex.Message}", "Bad filter string", MessageBoxButtons.OK, MessageBoxIcon.Error);
 
 				// re-apply last good filter
 				await performFilter(lastGoodFilter);

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

@@ -40,7 +40,7 @@ namespace LibationAvalonia.Views
 
 		public async void convertAllM4bToMp3ToolStripMenuItem_Click(object sender, Avalonia.Interactivity.RoutedEventArgs args)
 		{
-			var result = MessageBox.Show(
+			var result = await MessageBox.Show(
 				"This converts all m4b titles in your library to mp3 files. Original files are not deleted."
 				+ "\r\nFor large libraries this will take a long time and will take up more disk space."
 				+ "\r\n\r\nContinue?"

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

@@ -15,7 +15,7 @@ namespace LibationAvalonia.Views
 			SetQueueCollapseState(collapseState);
 		}
 
-		public void ProductsDisplay_LiberateClicked(object sender, LibraryBook libraryBook)
+		public async void ProductsDisplay_LiberateClicked(object sender, LibraryBook libraryBook)
 		{
 			try
 			{
@@ -36,10 +36,10 @@ 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}";
-						MessageBox.Show($"File not found" + suffix);
+						await MessageBox.Show($"File not found" + suffix);
 					}
 				}
 			}

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

@@ -26,7 +26,7 @@ namespace LibationAvalonia.Views
 
 		public async void noAccountsYetAddAccountToolStripMenuItem_Click(object sender, Avalonia.Interactivity.RoutedEventArgs e)
 		{
-			MessageBox.Show("To load your Audible library, come back here to the Import menu after adding your account");
+			await MessageBox.Show("To load your Audible library, come back here to the Import menu after adding your account");
 			await new Dialogs.AccountsDialog().ShowDialog(this);
 		}
 
@@ -66,11 +66,11 @@ namespace LibationAvalonia.Views
 
 				// this is here instead of ScanEnd so that the following is only possible when it's user-initiated, not automatic loop
 				if (Configuration.Instance.ShowImportedStats && newAdded > 0)
-					MessageBox.Show($"Total processed: {totalProcessed}\r\nNew: {newAdded}");
+					await MessageBox.Show($"Total processed: {totalProcessed}\r\nNew: {newAdded}");
 			}
 			catch (Exception ex)
 			{
-				MessageBox.ShowAdminAlert(
+				await MessageBox.ShowAdminAlert(
 					this,
 					"Error importing library. Please try again. If this still happens after 2 or 3 tries, stop and contact administrator",
 					"Error importing library",

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

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

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

@@ -47,7 +47,7 @@ namespace LibationAvalonia.Views
 
 			var visibleLibraryBooks = _viewModel.ProductsDisplay.GetVisibleBookEntries();
 
-			var confirmationResult = MessageBox.ShowConfirmationDialog(
+			var confirmationResult = await MessageBox.ShowConfirmationDialog(
 				this,
 				visibleLibraryBooks,
 				"Are you sure you want to replace tags in {0}?",
@@ -70,7 +70,7 @@ namespace LibationAvalonia.Views
 
 			var visibleLibraryBooks = _viewModel.ProductsDisplay.GetVisibleBookEntries();
 
-			var confirmationResult = MessageBox.ShowConfirmationDialog(
+			var confirmationResult = await MessageBox.ShowConfirmationDialog(
 				this,
 				visibleLibraryBooks,
 				"Are you sure you want to replace downloaded status in {0}?",
@@ -88,7 +88,7 @@ namespace LibationAvalonia.Views
 		{
 			var visibleLibraryBooks = _viewModel.ProductsDisplay.GetVisibleBookEntries();
 
-			var confirmationResult = MessageBox.ShowConfirmationDialog(
+			var confirmationResult = await MessageBox.ShowConfirmationDialog(
 				this,
 				visibleLibraryBooks,
 				"Are you sure you want to remove {0} from Libation's library?",

Source/LibationAvalonia/Views/MainWindow/MainWindow.axaml

@@ -65,7 +65,7 @@
 						</MenuItem.Styles>
 						<MenuItem Click="beginBookBackupsToolStripMenuItem_Click" Header="{Binding BookBackupsToolStripText}" />
 						<MenuItem Click="beginPdfBackupsToolStripMenuItem_Click" Header="{Binding PdfBackupsToolStripText}" />
-						<MenuItem Click="convertAllM4bToMp3ToolStripMenuItem_Click" Header="Convert all _M4b to Mp3 [Long-running]..." />
+						<MenuItem Click="convertAllM4bToMp3ToolStripMenuItem_Click" Header="Convert all _M4b to Mp3 [Long-running]..." IsVisible="{Binding IsMp3Supported}" />
 						<MenuItem Click="liberateVisible" Header="{Binding LiberateVisibleToolStripText}" IsEnabled="{Binding AnyVisibleNotLiberated}" />
 					</MenuItem>
 

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

@@ -9,6 +9,7 @@ using LibationFileManager;
 using DataLayer;
 using System.Collections.Generic;
 using System.Threading.Tasks;
+using AppScaffolding;
 
 namespace LibationAvalonia.Views
 {
@@ -53,7 +54,7 @@ namespace LibationAvalonia.Views
 				this.LibraryLoaded += MainWindow_LibraryLoaded;
 
 				LibraryCommands.LibrarySizeChanged += async (_, _) => await _viewModel.ProductsDisplay.DisplayBooks(DbContexts.GetLibrary_Flat_NoTracking(includeParents: true));
-				Closing += (_,_) => this.SaveSizeAndLocation(Configuration.Instance);
+				Closing += (_, _) => this.SaveSizeAndLocation(Configuration.Instance);
 			}
 			Opened += MainWindow_Opened;
 			Closing += MainWindow_Closing;
@@ -67,50 +68,72 @@ namespace LibationAvalonia.Views
 		private async void MainWindow_Opened(object sender, EventArgs e)
 		{
 #if !DEBUG
-			if (App.IsWindows)
+			//This is temporaty until we have a solution for linux/mac so that
+			//Libation doesn't download a zip every time it runs.
+			if (!Configuration.IsWindows)
+				return;
+
+			try
 			{
-				try
-				{
-					await Task.Run(checkForAndDownloadUpdate);
-				}
-				catch(Exception ex)
-				{
-					Serilog.Log.Logger.Error(ex, "An error occured while checking for app updates.");
+				(string zipFile, UpgradeProperties upgradeProperties) = await Task.Run(() => downloadUpdate());
+
+				if (string.IsNullOrEmpty(zipFile) || !System.IO.File.Exists(zipFile))
 					return;
+
+				var result = await MessageBox.Show($"{upgradeProperties.HtmlUrl}\r\n\r\nWould you like to upgrade now?", "New version available", MessageBoxButtons.YesNo, MessageBoxIcon.Question, MessageBoxDefaultButton.Button1);
+
+				if (result != DialogResult.Yes)
+					return;
+
+				if (Configuration.IsWindows)
+				{
+					runWindowsUpgrader(zipFile);
 				}
+				else if (Configuration.IsLinux)
+				{
+
+				}
+				else if (Configuration.IsMacOs)
+				{
+
+				}
+			}
+			catch (Exception ex)
+			{
+				Serilog.Log.Logger.Error(ex, "An error occured while checking for app updates.");
+				return;
 			}
 #endif
 		}
 
-		private async Task checkForAndDownloadUpdate()
+		private async Task<(string zipFile, UpgradeProperties release)> downloadUpdate()
 		{
-			AppScaffolding.UpgradeProperties upgradeProperties;
+			UpgradeProperties upgradeProperties;
 			try
 			{
-				upgradeProperties = AppScaffolding.LibationScaffolding.GetLatestRelease(AppScaffolding.LibationScaffolding.ReleaseIdentifier.WindowsAvalonia);
-
+				upgradeProperties = LibationScaffolding.GetLatestRelease();
 				if (upgradeProperties is null)
-					return;
+					return (null,null);
 			}
 			catch (Exception ex)
 			{
 				Serilog.Log.Logger.Error(ex, "Failed to check for update");
-				return;
+				return (null, null);
 			}
 
 			if (upgradeProperties.ZipUrl is null)
 			{
 				Serilog.Log.Logger.Information("Download link for new version not found");
-				return;
+				return (null, null);
 			}
 
 			//Silently download the update in the background, save it to a temp file.
 
-			var zipPath = System.IO.Path.GetTempFileName();
+			var zipFile = System.IO.Path.GetTempFileName();
 			try
 			{
 				System.Net.Http.HttpClient cli = new();
-				using (var fs = System.IO.File.OpenWrite(zipPath))
+				using (var fs = System.IO.File.OpenWrite(zipFile))
 				{
 					using (var dlStream = await cli.GetStreamAsync(new Uri(upgradeProperties.ZipUrl)))
 						await dlStream.CopyToAsync(fs);
@@ -119,18 +142,17 @@ namespace LibationAvalonia.Views
 			catch (Exception ex)
 			{
 				Serilog.Log.Logger.Error(ex, "Failed to download the update: {pdate}", upgradeProperties.ZipUrl);
-				return;
+				return (null, null);
 			}
+			return (zipFile, upgradeProperties);
+		}
 
-			var result = MessageBox.Show($"{upgradeProperties.HtmlUrl}\r\n\r\nWould you like to upgrade now?", "New version available", MessageBoxButtons.YesNo, MessageBoxIcon.Question, MessageBoxDefaultButton.Button1);
-
-			if (result != DialogResult.Yes)
-				return;
-
-			var thisExe = System.Diagnostics.Process.GetCurrentProcess().MainModule.FileName;
+		private void runWindowsUpgrader(string zipFile)
+		{
+			var thisExe = Environment.ProcessPath;
 			var thisDir = System.IO.Path.GetDirectoryName(thisExe);
 
-			var args = $"--input {zipPath} --output {thisDir} --executable {thisExe}";
+			var args = $"--input {zipFile} --output {thisDir} --executable {thisExe}";
 
 			var zipExtractor = System.IO.Path.Combine(System.IO.Path.GetTempPath(), "ZipExtractor.exe");
 
@@ -147,7 +169,7 @@ namespace LibationAvalonia.Views
 			};
 
 			System.Diagnostics.Process.Start(psi);
-			Environment.Exit(0);		
+			Environment.Exit(0);
 		}
 
 		public void ProductsDisplay_Initialized1(object sender, EventArgs e)

Source/LibationCli/LibationCli.csproj

@@ -1,27 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
-    <PublishReadyToRun>true</PublishReadyToRun>
-    <RuntimeIdentifier>win-x64</RuntimeIdentifier>
-    <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
-    <AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
-    <IsPublishable>True</IsPublishable>
-  </PropertyGroup>
+	<PropertyGroup>
+		<OutputType>Exe</OutputType>
+		<TargetFramework>net6.0</TargetFramework>
+		<PublishReadyToRun>true</PublishReadyToRun>
+		<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
+		<AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
+		<IsPublishable>True</IsPublishable>
+	</PropertyGroup>
 
-  <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>
+		<SatelliteResourceLanguages>en;es</SatelliteResourceLanguages>
+	</PropertyGroup>
 
-  <!--
+	<!--
   When LibationWinForms and LibationCli output to the same dir, LibationCli must build before LibationWinForms
 
   VS > rt-clk solution > Properties
@@ -31,24 +30,31 @@
 
   edit debug and release output paths
   -->
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-	  <OutputPath>..\bin\Debug</OutputPath>
-	  <DebugType>embedded</DebugType>
-  </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>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
+		<OutputPath>..\bin\Release</OutputPath>
+		<DebugType>embedded</DebugType>
+	</PropertyGroup>
 
-  <ItemGroup>
-    <PackageReference Include="CommandLineParser" Version="2.9.1" />
-  </ItemGroup>
+	<ItemGroup>
+		<PackageReference Include="CommandLineParser" Version="2.9.1" />
+	</ItemGroup>
 
-  <ItemGroup>
-	  <ProjectReference Include="..\ApplicationServices\ApplicationServices.csproj" />
-    <ProjectReference Include="..\AppScaffolding\AppScaffolding.csproj" />
-    <ProjectReference Include="..\FileLiberator\FileLiberator.csproj" />
-  </ItemGroup>
+	<Target Name="SpicNSpan"  AfterTargets="Clean">
+		<!-- Remove obj folder -->
+		<RemoveDir Directories="$(BaseIntermediateOutputPath)" />
+		<!-- Remove bin folder -->
+		<RemoveDir Directories="$(BaseOutputPath)" />
+	</Target>
+
+	<ItemGroup>
+		<ProjectReference Include="..\ApplicationServices\ApplicationServices.csproj" />
+		<ProjectReference Include="..\AppScaffolding\AppScaffolding.csproj" />
+		<ProjectReference Include="..\FileLiberator\FileLiberator.csproj" />
+	</ItemGroup>
 
 </Project>

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

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

Source/LibationCli/Properties/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/LibationCli/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\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()
+                });
+            }
+        }
+    }
+}