publish debugging. create new version

disclaimer: don't install in Program Files

.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.

.github/workflows/dotnet-build.yml

@@ -0,0 +1,44 @@
+# # This workflow will build a .NET project
+# # For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-net
+# 
+# name: build
+# 
+# on:
+#   workflow_call:
+# 
+# env:
+#   DOTNET_CONFIGURATION: 'Release'
+# 
+# jobs:
+#   build:
+#     runs-on: windows-latest
+#     strategy:
+#       matrix:
+#         os: [Linux, MacOS, Windows]
+#         ui: [Avalonia]
+#         release_name: [chardonnay]
+#         include:
+#           - os: Windows
+#             ui: WinForms
+#             release_name: classic
+#     steps:
+#     - uses: actions/checkout@v3
+#     - name: Setup .NET
+#       uses: actions/setup-dotnet@v3
+#       with:
+#         dotnet-version: '7.x'
+#       env:
+#         NUGET_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+#     - name: Build
+#       working-directory: ./Source
+#       run: |
+#         dotnet publish -c ${{ env.DOTNET_CONFIGURATION }} -o bin\Publish\${{ matrix.os }}-${{ matrix.release_name }} Libation${{ matrix.ui }}\Libation${{ matrix.ui }}.csproj -p:PublishProfile=Libation${{ matrix.ui }}\Properties\PublishProfiles\${{ matrix.os }}Profile.pubxml
+#         dotnet publish -c ${{ env.DOTNET_CONFIGURATION }} -o bin\Publish\${{ matrix.os }}-${{ matrix.release_name }} LoadByOS\${{ matrix.os }}ConfigApp\${{ matrix.os }}ConfigApp.csproj -p:PublishProfile=LoadByOS\Properties\${{ matrix.os }}ConfigApp\PublishProfiles\${{ matrix.os }}Profile.pubxml
+#         dotnet publish -c ${{ env.DOTNET_CONFIGURATION }} -o bin\Publish\${{ matrix.os }}-${{ matrix.release_name }} LibationCli\LibationCli.csproj -p:PublishProfile=LibationCli\Properties\PublishProfiles\${{ matrix.os }}Profile.pubxml
+#         dotnet publish -c ${{ env.DOTNET_CONFIGURATION }} -o bin\Publish\${{ matrix.os }}-${{ matrix.release_name }} Hangover${{ matrix.ui }}\Hangover${{ matrix.ui }}.csproj -p:PublishProfile=Hangover${{ matrix.ui }}\Properties\PublishProfiles\${{ matrix.os }}Profile.pubxml
+#     - name: Publish artifact
+#       uses: actions/upload-artifact@v3
+#       with:
+#         name: ${{ matrix.os }}-${{ matrix.release_name }}
+#         path: ./Source/bin/Publish/${{ matrix.os }}-${{ matrix.release_name }}/*
+#         if-no-files-found: error

.github/workflows/dotnet-release.yml

@@ -0,0 +1,67 @@
+# # This workflow will build a .NET project
+# # For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-net
+# name: release
+# 
+# on:
+#   push:
+#     tags:
+#       - 'v*'
+# 
+# env:
+#   DOTNET_VERSION: '7' # The .NET SDK version to use
+#   DOTNET_SOURCE: './Source'
+#   DOTNET_CONFIGURATION: 'Release'
+# 
+# jobs:
+#   build:
+#     uses: ./.github/workflows/dotnet-build.yml
+# 
+#   release:
+#     needs: build
+#     runs-on: ubuntu-latest
+#     steps:
+#       - name: Calculate version
+#         id: version
+#         run: |
+#           export TAG=${{ github.ref_name }}
+#           echo "version=${TAG#v}" >> $GITHUB_OUTPUT
+# 
+#       - name: Download artifacts
+#         uses: actions/download-artifact@v3
+#         with:
+#           path: artifacts
+# 
+#       - name: Rename artifacts
+#         id: rename
+#         working-directory: ./artifacts
+#         run: |
+#           for FILENAME in *; do mv ${FILENAME} Libation.${{ steps.version.outputs.version }}-${FILENAME,,}; done
+#           mv Libation.${{ steps.version.outputs.version }}-windows-classic Classic-Libation.${{ steps.version.outputs.version }}-windows-classic
+# 
+#       - name: Zip assets
+#         working-directory: ./artifacts
+#         run:  |
+#           for FILENAME in *; do zip -r ${FILENAME}.zip ${FILENAME}; done
+#           mkdir ./assets
+#           mv *.zip ./assets
+# 
+#       - name: Create release
+#         id: create_release
+#         uses: actions/create-release@v1
+#         env:
+#           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # This token is provided by Actions, you do not need to create your own token
+#         with:
+#           tag_name: ${{ github.ref }}
+#           release_name: Libation ${{ steps.version.outputs.version }}
+#           body: <Put a body here>
+#           draft: true
+#           prerelease: false
+# 
+#       - name: Upload release assets
+#         uses: dwenegar/upload-release-assets@v1
+#         env:
+#           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+#         with:
+#           release_id: ${{ steps.create_release.outputs.id }}
+#           assets_path: ./artifacts/assets
+# 

.github/workflows/dotnet-validate.yml

@@ -0,0 +1,20 @@
+# # This workflow will build a .NET project
+# # For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-net
+# 
+# name: validate
+# 
+# on:
+#   push:
+#     branches: [ "master" ]
+#   pull_request:
+#     branches: [ "master" ]
+# 
+# env:
+#   DOTNET_VERSION: '7' # The .NET SDK version to use
+#   DOTNET_SLN: './Source/Libation.sln'
+#   DOTNET_CONFIGURATION: 'Release'
+# 
+# jobs:
+#   build:
+#     uses: ./.github/workflows/dotnet-build.yml
+# 

.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"
+   "WindowsClassic": "Libation\\.\\d+\\.\\d+\\.\\d+-windows-classic\\.zip",
+   "WindowsAvalonia":"Libation\\.\\d+\\.\\d+\\.\\d+-windows-chardonnay\\.zip",
+   "LinuxAvalonia":  "Libation\\.\\d+\\.\\d+\\.\\d+-linux-chardonnay",
+   "MacOSAvalonia":  "Libation\\.\\d+\\.\\d+\\.\\d+-macos-chardonnay"
 }

Documentation/Advanced.md

@@ -8,7 +8,6 @@
 # Advanced: Table of Contents
 
 - [Files and folders](#files-and-folders)
-- [Linux and Mac (unofficial)](#linux-and-mac)
 - [Settings](#settings)
 - [Custom File Naming](#custom-file-naming)
 - [Command Line Interface](#command-line-interface)
@@ -25,10 +24,6 @@ To make upgrades and reinstalls easier, Libation separates all of its responsibi
 
 * The last important folder is the "books location." This is where Libation looks for your downloaded and decrypted books. This is how it knows which books still need to be downloaded. The Audible id must be somewhere in the book's file or folder name for Libation to detect your downloaded book.
 
-### Linux and Mac
-
-Although Libation only currently officially supports Windows, some users have had success with WINE. ([Linux](https://github.com/rmcrackan/Libation/issues/28#issuecomment-890594158), [OSX Crossover and WINE](https://github.com/rmcrackan/Libation/issues/150#issuecomment-1004918592), [Linux and WINE](https://github.com/rmcrackan/Libation/issues/28#issuecomment-1161111014))
-
 ### Settings
 
 * Allow Libation to fix up audiobook metadata. After decrypting a title, Libation attempts to fix details like chapters and cover art. Some power users and/or control freaks prefer to manage this themselves. By unchecking this setting, Libation will only decrypt the book and will leave metadata as-is, warts and all.
@@ -76,4 +71,15 @@ export library to file
   libationcli export -p "C:\foo\bar\my.csv" -c
   libationcli export -p "C:\foo\bar\my.xlsx" --xlsx
   libationcli export -p "C:\foo\bar\my.xlsx" -x
+
+Set download statuses throughout library based on whether each book's audio file can be found.   
+Must include at least one flag: --downloaded , --not-downloaded.  
+Downloaded: If the audio file can be found, set download status to 'Downloaded'.  
+Not Downloaded: If the audio file cannot be found, set download status to 'Not Downloaded'  
+UI: Visible Books \> Set 'Downloaded' status automatically. Visible books. Prompts before saving changes  
+CLI: Full library. No prompt
+
+  libationcli set-status -d
+  libationcli set-status -n
+  libationcli set-status -d -n
 ```

Documentation/GettingStarted.md

@@ -22,7 +22,12 @@
 
 ### Installation
 
-To install Libation, extract the zip file to a folder, for example `C:\Libation`, and then run Libation.exe from that folder to begin the configuration process and configure your account(s).
+* Windows
+
+Extract the zip file to a folder and then run `Libation.exe` from inside of that folder. Do not put it in Program Files. The inability to edit files from there causes problems with configuration and updating.
+
+* [Ubuntu Linux (beta)](InstallOnLinux.md)
+* [MacOS (beta)](InstallOnMac.md)
 
 ### Create Accounts
 

Documentation/InstallOnLinux.md

@@ -1,57 +1,19 @@
-# Run Libation on Ubuntu
+## [Download Libation](https://github.com/rmcrackan/Libation/releases/latest)
+
+### If you found this useful, tell a friend. If you found this REALLY useful, you can click here to [PalPal.me](https://paypal.me/mcrackan?locale.x=en_us)
+...or just tell more friends. As long as I'm maintaining this software, it will remain **free** and **open source**.
+
+
+
+# Run Libation on Ubuntu (Beta)
 This walkthrough should get you up and running with Libation on your Ubuntu machine.
 
 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 +29,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 +38,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 +60,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 +79,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>
 

Documentation/InstallOnMac.md

@@ -0,0 +1,40 @@
+## [Download Libation](https://github.com/rmcrackan/Libation/releases/latest)
+
+### If you found this useful, tell a friend. If you found this REALLY useful, you can click here to [PalPal.me](https://paypal.me/mcrackan?locale.x=en_us)
+...or just tell more friends. As long as I'm maintaining this software, it will remain **free** and **open source**.
+
+
+
+# Run Libation on MacOS (Beta)
+This walkthrough should get you up and running with Libation on your Mac.
+
+## Install Libation
+
+- Download latest MacOS zip to downloads folder
+- Extract and rename folder to Libation
+- in terminal type cd and then drag your folder of libation to terminal so it looks like `cd/users/YourName/Downloads/Libation`
+- Type following commands
+
+```console
+chmod +x ./Libation
+sudo spctl --add --label "Libation" ./Libation
+./Libation
+```
+
+## Trouble with Gatekeeper?
+
+If Gatekeeper is giving you trouble with Libation:
+
+Disable the block
+
+`sudo spctl --master-disable`
+
+Launch Libation and login, etc. and allow the rules to update then re-enable the block.
+
+`sudo spctl --master-enable`
+
+Once Gatekeeper reenabled, you can open Libation again without it being blocked.
+
+Thanks [joseph-holland](https://github.com/rmcrackan/Libation/issues/327#issuecomment-1268993349)!
+
+Report bugs to https://github.com/rmcrackan/Libation/issues

README.md

@@ -14,7 +14,6 @@
 - [Getting started](Documentation/GettingStarted.md)
     - [Download Libation](Documentation/GettingStarted.md#download-libation-1)
     - [Installation](Documentation/GettingStarted.md#installation)
-    - [Installation on Ubuntu](Source/LibationAvalonia/README.md)
     - [Create Accounts](Documentation/GettingStarted.md#create-accounts)
     - [Import your library](Documentation/GettingStarted.md#import-your-library)
     - [Download your books -- DRM-free!](Documentation/GettingStarted.md#download-your-books----drm-free)
@@ -28,7 +27,6 @@
     - [Filters](Documentation/SearchingAndFiltering.md#filters)
 - [Advanced](Documentation/Advanced.md)
     - [Files and folders](Documentation/Advanced.md#files-and-folders)
-    - [Linux and Mac (unofficial)](Documentation/Advanced.md#linux-and-mac)
     - [Settings](Documentation/Advanced.md#settings)
     - [Custom File Naming](Documentation/Advanced.md#custom-file-naming)
     - [Command Line Interface](Documentation/Advanced.md#command-line-interface)
@@ -55,7 +53,7 @@
 
 ### The bad
 
-* Windows only
+* Only fully supported in Windows. (Mac and Linux are in beta)
 * Large file size
 * Made by a programmer, not a designer so the goals are function rather than beauty. And it shows
 

Source/AaxDecrypter/AaxDecrypter.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
   </PropertyGroup>
 
 	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
@@ -13,7 +13,7 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-	  <PackageReference Include="AAXClean.Codecs" Version="0.2.12" />
+	  <PackageReference Include="AAXClean.Codecs" Version="0.2.14" />
 	</ItemGroup>
 
 	<ItemGroup>

Source/AppScaffolding/AppScaffolding.csproj

@@ -1,16 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
-    <Version>8.3.0.1</Version>
+    <TargetFramework>net7.0</TargetFramework>
+    <Version>8.6.3.1</Version>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Octokit" Version="1.0.0" />
+    <PackageReference Include="Octokit" Version="4.0.3" />
   </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/ApplicationServices/ApplicationServices.csproj

@@ -1,12 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="CsvHelper" Version="28.0.1" />
-    <PackageReference Include="NPOI" Version="2.5.6" />
+    <PackageReference Include="CsvHelper" Version="30.0.1" />
+    <PackageReference Include="NPOI" Version="2.6.0" />
   </ItemGroup>
 
   <ItemGroup>

Source/ApplicationServices/BulkSetDownloadStatus.cs

@@ -0,0 +1,78 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using DataLayer;
+using Dinah.Core;
+using LibationFileManager;
+
+namespace ApplicationServices
+{
+    public class BulkSetDownloadStatus
+    {
+        private List<(string message, LiberatedStatus newStatus, IEnumerable<Book> Books)> actionSets { get; } = new();
+
+        public int Count => actionSets.Count;
+
+        public IEnumerable<string> Messages => actionSets.Select(a => a.message);
+        public string AggregateMessage => $"Are you sure you want to set {Messages.Aggregate((a, b) => $"{a} and {b}")}?";
+
+        private List<LibraryBook> _libraryBooks;
+        private bool _setDownloaded;
+        private bool _setNotDownloaded;
+
+        public BulkSetDownloadStatus(List<LibraryBook> libraryBooks, bool setDownloaded, bool setNotDownloaded)
+        {
+            _libraryBooks = libraryBooks;
+            _setDownloaded = setDownloaded;
+            _setNotDownloaded = setNotDownloaded;
+        }
+
+        public int Discover()
+        {
+            var bookExistsList = _libraryBooks
+                .Select(libraryBook => new
+                {
+                    libraryBook.Book,
+                    FileExists = AudibleFileStorage.Audio.GetPath(libraryBook.Book.AudibleProductId) is not null
+                })
+                .ToList();
+
+            if (_setDownloaded)
+            {
+                var books2change = bookExistsList
+                    .Where(a => a.FileExists && a.Book.UserDefinedItem.BookStatus != LiberatedStatus.Liberated)
+                    .Select(a => a.Book)
+                    .ToList();
+
+                if (books2change.Any())
+                    actionSets.Add((
+                        $"{"book".PluralizeWithCount(books2change.Count)} to 'Downloaded'",
+                        LiberatedStatus.Liberated,
+                        books2change));
+            }
+
+            if (_setNotDownloaded)
+            {
+                var books2change = bookExistsList
+                    .Where(a => !a.FileExists && a.Book.UserDefinedItem.BookStatus != LiberatedStatus.NotLiberated)
+                    .Select(a => a.Book)
+                    .ToList();
+
+                if (books2change.Any())
+                    actionSets.Add((
+                        $"{"book".PluralizeWithCount(books2change.Count)} to 'Not Downloaded'",
+                        LiberatedStatus.NotLiberated,
+                        books2change));
+            }
+
+            return Count;
+        }
+
+        public void Execute()
+        {
+            foreach (var a in actionSets)
+                a.Books.UpdateBookStatus(a.newStatus);
+        }
+    }
+}

Source/ApplicationServices/LibraryCommands.cs

@@ -9,6 +9,7 @@ using Dinah.Core;
 using DtoImporterService;
 using LibationFileManager;
 using Serilog;
+using static System.Reflection.Metadata.BlobBuilder;
 using static DtoImporterService.PerfLogger;
 
 namespace ApplicationServices
@@ -366,74 +367,101 @@ namespace ApplicationServices
 		public static event EventHandler<IEnumerable<Book>> BookUserDefinedItemCommitted;
 
 		#region Update book details
-		public static int UpdateBookStatus(this Book book, LiberatedStatus bookStatus)
-		{
-			book.UserDefinedItem.BookStatus = bookStatus;
-			return UpdateUserDefinedItem(book);
-		}
-		public static int UpdatePdfStatus(this Book book, LiberatedStatus pdfStatus)
-		{
-			book.UserDefinedItem.PdfStatus = pdfStatus;
-			return UpdateUserDefinedItem(book);
-		}
-		public static int UpdateBook(
+		public static int UpdateUserDefinedItem(
 			this Book book,
 			string tags = null,
 			LiberatedStatus? bookStatus = null,
 			LiberatedStatus? pdfStatus = null)
-			=> UpdateBooks(tags, bookStatus, pdfStatus, book);
-		public static int UpdateBooks(
+			=> new[] { book }.UpdateUserDefinedItem(tags, bookStatus, pdfStatus);
+
+		public static int UpdateUserDefinedItem(
+			this IEnumerable<Book> books,
 			string tags = null,
 			LiberatedStatus? bookStatus = null,
-			LiberatedStatus? pdfStatus = null,
-			params Book[] books)
+			LiberatedStatus? pdfStatus = null)
+            => updateUserDefinedItem(
+				books,
+                udi => {
+                    // blank tags are expected. null tags are not
+                    if (tags is not null && udi.Tags != tags)
+                        udi.Tags = tags;
+
+                    if (bookStatus is not null && udi.BookStatus != bookStatus.Value)
+                        udi.BookStatus = bookStatus.Value;
+
+                    // even though PdfStatus is nullable, there's no case where we'd actually overwrite with null
+                    if (pdfStatus is not null && udi.PdfStatus != pdfStatus.Value)
+                        udi.PdfStatus = pdfStatus.Value;
+                });
+
+        public static int UpdateBookStatus(this Book book, LiberatedStatus bookStatus)
+			=> book.UpdateUserDefinedItem(udi => udi.BookStatus = bookStatus);
+        public static int UpdateBookStatus(this IEnumerable<Book> books, LiberatedStatus bookStatus)
+			=> books.UpdateUserDefinedItem(udi => udi.BookStatus = bookStatus);
+        public static int UpdateBookStatus(this LibraryBook libraryBook, LiberatedStatus bookStatus)
+			=> libraryBook.UpdateUserDefinedItem(udi => udi.BookStatus = bookStatus);
+        public static int UpdateBookStatus(this IEnumerable<LibraryBook> libraryBooks, LiberatedStatus bookStatus)
+			=> libraryBooks.UpdateUserDefinedItem(udi => udi.BookStatus = bookStatus);
+
+        public static int UpdatePdfStatus(this Book book, LiberatedStatus pdfStatus)
+			=> book.UpdateUserDefinedItem(udi => udi.PdfStatus = pdfStatus);
+        public static int UpdatePdfStatus(this IEnumerable<Book> books, LiberatedStatus pdfStatus)
+			=> books.UpdateUserDefinedItem(udi => udi.PdfStatus = pdfStatus);
+        public static int UpdatePdfStatus(this LibraryBook libraryBook, LiberatedStatus pdfStatus)
+			=> libraryBook.UpdateUserDefinedItem(udi => udi.PdfStatus = pdfStatus);
+        public static int UpdatePdfStatus(this IEnumerable<LibraryBook> libraryBooks, LiberatedStatus pdfStatus)
+			=> libraryBooks.UpdateUserDefinedItem(udi => udi.PdfStatus = pdfStatus);
+
+        public static int UpdateTags(this Book book, string tags)
+            => book.UpdateUserDefinedItem(udi => udi.Tags = tags);
+        public static int UpdateTags(this IEnumerable<Book> books, string tags)
+            => books.UpdateUserDefinedItem(udi => udi.Tags = tags);
+        public static int UpdateTags(this LibraryBook libraryBook, string tags)
+            => libraryBook.UpdateUserDefinedItem(udi => udi.Tags = tags);
+        public static int UpdateTags(this IEnumerable<LibraryBook> libraryBooks, string tags)
+            => libraryBooks.UpdateUserDefinedItem(udi => udi.Tags = tags);
+
+        public static int UpdateUserDefinedItem(this LibraryBook libraryBook, Action<UserDefinedItem> action)
+			=> libraryBook.Book.updateUserDefinedItem(action);
+        public static int UpdateUserDefinedItem(this IEnumerable<LibraryBook> libraryBooks, Action<UserDefinedItem> action)
+			=> libraryBooks.Select(lb => lb.Book).updateUserDefinedItem(action);
+
+        public static int UpdateUserDefinedItem(this Book book, Action<UserDefinedItem> action) => book.updateUserDefinedItem(action);
+        public static int UpdateUserDefinedItem(this IEnumerable<Book> books, Action<UserDefinedItem> action) => books.updateUserDefinedItem(action);
+
+        private static int updateUserDefinedItem(this Book book, Action<UserDefinedItem> action) => new[] { book }.updateUserDefinedItem(action);
+        private static int updateUserDefinedItem(this IEnumerable<Book> books, Action<UserDefinedItem> action)
         {
-			foreach (var book in books)
-			{
-				// blank tags are expected. null tags are not
-				if (tags is not null && book.UserDefinedItem.Tags != tags)
-					book.UserDefinedItem.Tags = tags;
+            try
+            {
+                if (books is null || !books.Any())
+                    return 0;
 
-				if (bookStatus is not null && book.UserDefinedItem.BookStatus != bookStatus.Value)
-					book.UserDefinedItem.BookStatus = bookStatus.Value;
-
-				// even though PdfStatus is nullable, there's no case where we'd actually overwrite with null
-				if (pdfStatus is not null && book.UserDefinedItem.PdfStatus != pdfStatus.Value)
-					book.UserDefinedItem.PdfStatus = pdfStatus.Value;
-			}
-
-			return UpdateUserDefinedItem(books);
-		}
-		public static int UpdateUserDefinedItem(params Book[] books) => UpdateUserDefinedItem(books.ToList());
-		public static int UpdateUserDefinedItem(IEnumerable<Book> books)
-		{
-			try
-			{
-				if (books is null || !books.Any())
-					return 0;
-
-				using var context = DbContexts.GetContext();
-
-				// Attach() NoTracking entities before SaveChanges()
 				foreach (var book in books)
-					context.Attach(book.UserDefinedItem).State = Microsoft.EntityFrameworkCore.EntityState.Modified;
+                    action?.Invoke(book.UserDefinedItem);
 
-				var qtyChanges = context.SaveChanges();
-				if (qtyChanges > 0)
-					BookUserDefinedItemCommitted?.Invoke(null, books);
+                using var context = DbContexts.GetContext();
 
-				return qtyChanges;
-			}
-			catch (Exception ex)
-			{
-				Log.Logger.Error(ex, $"Error updating {nameof(Book.UserDefinedItem)}");
-				throw;
-			}
-		}
-		#endregion
+                // Attach() NoTracking entities before SaveChanges()
+                foreach (var book in books)
+                    context.Attach(book.UserDefinedItem).State = Microsoft.EntityFrameworkCore.EntityState.Modified;
 
-		// must be here instead of in db layer due to AaxcExists
-		public static LiberatedStatus Liberated_Status(Book book)
+                var qtyChanges = context.SaveChanges();
+                if (qtyChanges > 0)
+                    BookUserDefinedItemCommitted?.Invoke(null, books);
+
+                return qtyChanges;
+            }
+            catch (Exception ex)
+            {
+                Log.Logger.Error(ex, $"Error updating {nameof(Book.UserDefinedItem)}");
+                throw;
+            }
+        }
+        #endregion
+
+        // must be here instead of in db layer due to AaxcExists
+        public static LiberatedStatus Liberated_Status(Book book)
 			=> book.Audio_Exists() ? book.UserDefinedItem.BookStatus
 			: AudibleFileStorage.AaxcExists(book.AudibleProductId) ? LiberatedStatus.PartialDownload
 			: LiberatedStatus.NotLiberated;

Source/AudibleUtilities/AudibleUtilities.csproj

@@ -1,11 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="AudibleApi" Version="4.5.0.1" />
+    <PackageReference Include="AudibleApi" Version="7.0.0.5" />
   </ItemGroup>
 
   <ItemGroup>

Source/DataLayer/DataLayer.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
   </PropertyGroup>
 
   <PropertyGroup>
@@ -10,13 +10,14 @@
   </PropertyGroup>
   
   <ItemGroup>
-    <PackageReference Include="Dinah.EntityFrameworkCore" Version="4.1.1.1" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="6.0.7">
+    <PackageReference Include="Dinah.Core" Version="7.0.0.2" />
+    <PackageReference Include="Dinah.EntityFrameworkCore" Version="7.0.0.2" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="6.0.7" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="6.0.7">
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="7.0.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
@@ -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/DtoImporterService/DtoImporterService.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">

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/FileLiberator/DownloadPdf.cs

@@ -24,7 +24,7 @@ namespace FileLiberator
 		{
 			OnBegin(libraryBook);
 
-			try
+            try
 			{
 				var proposedDownloadFilePath = getProposedDownloadFilePath(libraryBook);
 				var actualDownloadedFilePath = await downloadPdfAsync(libraryBook, proposedDownloadFilePath);
@@ -32,13 +32,22 @@ namespace FileLiberator
 
 				libraryBook.Book.UpdatePdfStatus(result.IsSuccess ? LiberatedStatus.Liberated : LiberatedStatus.NotLiberated);
 
-				return result;
-			}
+                return result;
+            }
+			catch (Exception ex)
+            {
+                Serilog.Log.Logger.Error(ex, "Error downloading PDF");
+
+                var result = new StatusHandler();
+                result.AddError($"Error downloading PDF. See log for details. Error summary: {ex.Message}");
+
+                return result;
+            }
 			finally
 			{
 				OnCompleted(libraryBook);
-			}
-		}
+            }
+        }
 
 		private static string getProposedDownloadFilePath(LibraryBook libraryBook)
 		{

Source/FileLiberator/FileLiberator.csproj

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

Source/FileLiberator/UtilityExtensions.cs

@@ -31,6 +31,7 @@ namespace FileLiberator
 			AudibleProductId = libraryBook.Book.AudibleProductId,
 			Title = libraryBook.Book.Title ?? "",
 			Locale = libraryBook.Book.Locale,
+			YearPublished = libraryBook.Book.DatePublished?.Year,
 
 			Authors = libraryBook.Book.Authors.Select(c => c.Name).ToList(),
 

Source/FileManager/FileManager.csproj

@@ -1,11 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Dinah.Core" Version="4.4.1.1" />
+    <PackageReference Include="Dinah.Core" Version="7.0.0.2" />
     <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/FileManager/FileUtility.cs

@@ -212,25 +212,23 @@ namespace FileManager
 		{
 			var foundFiles = Enumerable.Empty<LongPath>();
 
-			if (searchOption == SearchOption.AllDirectories)
+			try
 			{
-				try
+				if (searchOption == SearchOption.AllDirectories)
 				{
-					IEnumerable <LongPath> subDirs = Directory.EnumerateDirectories(path).Select(p => (LongPath)p);
+					IEnumerable<LongPath> subDirs = Directory.EnumerateDirectories(path).Select(p => (LongPath)p);
 					// Add files in subdirectories recursively to the list
 					foreach (string dir in subDirs)
 						foundFiles = foundFiles.Concat(SaferEnumerateFiles(dir, searchPattern, searchOption));
 				}
-				catch (UnauthorizedAccessException) { }
-				catch (PathTooLongException) { }
-			}
 
-			try
-			{
 				// Add files from the current directory
 				foundFiles = foundFiles.Concat(Directory.EnumerateFiles(path, searchPattern).Select(f => (LongPath)f));
 			}
 			catch (UnauthorizedAccessException) { }
+			catch (PathTooLongException) { }
+            // Symbolic links will result in DirectoryNotFoundException. Ohter logical directories might also. Just skip them. Don't want to risk (or have to handle) infinite recursion
+            catch (DirectoryNotFoundException) { }
 
 			return foundFiles;
 		}

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>net7.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.18" />
+		<PackageReference Include="Avalonia.Desktop" Version="0.10.18" />
+		<!--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.18" />
+		<PackageReference Include="Avalonia.ReactiveUI" Version="0.10.18" />
+		<PackageReference Include="XamlNameReferenceGenerator" Version="1.5.1" />
+	</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>net7.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>net7.0</TargetFramework>
+    <RuntimeIdentifier>osx-x64</RuntimeIdentifier>
+    <SelfContained>true</SelfContained>
+    <PublishSingleFile>false</PublishSingleFile>
+    <PublishTrimmed>false</PublishTrimmed>
+  </PropertyGroup>
+</Project>

Source/HangoverAvalonia/Properties/PublishProfiles/WindowsProfile.pubxml

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

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>net7.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

@@ -2,10 +2,11 @@
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework>net6.0-windows</TargetFramework>
+    <TargetFramework>net7.0-windows</TargetFramework>
     <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

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

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/Assets/LibationStyles.xaml

@@ -9,4 +9,8 @@
 		<SolidColorBrush x:Key="ProcessQueueBookDefaultBrush" Color="{StaticResource SystemAltHighColor}" />
 		<SolidColorBrush x:Key="ProcessQueueBookBorderBrush" Color="Gray" />
 	</Styles.Resources>
+	<Style Selector="TextBox[IsReadOnly=true]">
+		<Setter Property="Background" Value="LightGray" />
+		<Setter Property="CaretBrush" Value="#00000000" />
+	</Style>
 </Styles>

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

@@ -66,7 +66,7 @@
 				<DataGridTextColumn
 					Width="2*"
 					Binding="{Binding AccountId, Mode=TwoWay}"
-					Header="Autible&#xa;email/login"/>
+					Header="Audible&#xa;email/login"/>
 
 				<DataGridTemplateColumn Width="Auto" Header="Locale">
 					<DataGridTemplateColumn.CellTemplate>

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.UpdateUserDefinedItem(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;
 			}
 
@@ -138,6 +138,7 @@ namespace LibationAvalonia.Dialogs
 					AudibleProductId = "123456789",
 					Title = "A Study in Scarlet: A Sherlock Holmes Novel",
 					Locale = "us",
+					YearPublished = 2017,
 					Authors = new List<string> { "Arthur Conan Doyle", "Stephen Fry - introductions" },
 					Narrators = new List<string> { "Stephen Fry" },
 					SeriesName = "Sherlock Holmes",

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

@@ -0,0 +1,53 @@
+<Window xmlns="https://github.com/avaloniaui"
+        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="400" d:DesignHeight="120"
+		xmlns:controls="clr-namespace:LibationAvalonia.Controls"
+        x:Class="LibationAvalonia.Dialogs.LiberatedStatusBatchAutoDialog"
+        Title="Liberated status: Whether the book has been downloaded"
+		MinHeight="100" MaxHeight="165"
+		MinWidth="600" MaxWidth="800"
+		WindowStartupLocation="CenterOwner"
+		Icon="/Assets/libation.ico">
+
+	<Grid RowDefinitions="Auto,Auto,Auto">
+		
+		<StackPanel
+			Grid.Row="0"
+			Orientation="Horizontal">
+
+			<CheckBox
+				Margin="0,0,0,10"
+				IsChecked="{Binding SetDownloaded, Mode=TwoWay}">
+
+				<TextBlock
+					TextWrapping="Wrap"
+					Text="If the audio file can be found, set download status to 'Downloaded'" />
+			</CheckBox>
+		</StackPanel>
+
+		<StackPanel
+			Grid.Row="1"
+			Orientation="Horizontal">
+
+			<CheckBox
+				Margin="0,0,0,10"
+				IsChecked="{Binding SetNotDownloaded, Mode=TwoWay}">
+
+				<TextBlock
+					TextWrapping="Wrap"
+					Text="If the audio file cannot be found, set download status to 'Not Downloaded'" />
+			</CheckBox>
+		</StackPanel>
+		
+		<Button
+			Grid.Row="2"
+			Padding="30,0,30,0"
+			Margin="10,0,10,10"
+			HorizontalAlignment="Right"
+			Height="25"
+			Content="Save"
+			Click="SaveButton_Clicked"/>
+	</Grid>
+</Window>

Source/LibationAvalonia/Dialogs/LiberatedStatusBatchAutoDialog.axaml.cs

@@ -0,0 +1,23 @@
+using Avalonia.Markup.Xaml;
+
+namespace LibationAvalonia.Dialogs
+{
+	public partial class LiberatedStatusBatchAutoDialog : DialogWindow
+    {
+        public bool SetDownloaded { get; set; }
+        public bool SetNotDownloaded { get; set; }
+
+        public LiberatedStatusBatchAutoDialog()
+		{
+			InitializeComponent();
+			DataContext = this;
+		}
+		private void InitializeComponent()
+		{
+			AvaloniaXamlLoader.Load(this);
+		}
+
+		public void SaveButton_Clicked(object sender, Avalonia.Interactivity.RoutedEventArgs e)
+			=> SaveAndClose();
+	}
+}

Source/LibationAvalonia/Dialogs/LiberatedStatusBatchManualDialog.axaml

@@ -4,7 +4,7 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         mc:Ignorable="d" d:DesignWidth="400" d:DesignHeight="120"
 		xmlns:controls="clr-namespace:LibationAvalonia.Controls"
-        x:Class="LibationAvalonia.Dialogs.LiberatedStatusBatchDialog"
+        x:Class="LibationAvalonia.Dialogs.LiberatedStatusBatchManualDialog"
         Title="Liberated status: Whether the book has been downloaded"
 		MinWidth="400" MinHeight="120"
 		MaxWidth="400" MaxHeight="120"

Source/LibationAvalonia/Dialogs/LiberatedStatusBatchManualDialog.axaml.cs

@@ -5,7 +5,7 @@ using System.Collections.Generic;
 
 namespace LibationAvalonia.Dialogs
 {
-	public partial class LiberatedStatusBatchDialog : DialogWindow
+	public partial class LiberatedStatusBatchManualDialog : DialogWindow
 	{
 		private class liberatedComboBoxItem
 		{
@@ -34,7 +34,7 @@ namespace LibationAvalonia.Dialogs
 			new liberatedComboBoxItem { Status = LiberatedStatus.NotLiberated, Text = "Not Downloaded" },
 		};
 
-		public LiberatedStatusBatchDialog()
+		public LiberatedStatusBatchManualDialog()
 		{
 			InitializeComponent();
 			SelectedItem = BookStatuses[0] as liberatedComboBoxItem;

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

@@ -3,26 +3,38 @@
 
 	<PropertyGroup>
 		<OutputType>WinExe</OutputType>
-		<TargetFramework>net6.0</TargetFramework>
+		<TargetFramework>net7.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>
 		<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>
@@ -82,6 +92,12 @@
   </ItemGroup>
 
   <ItemGroup>
+    <Compile Update="Dialogs\LiberatedStatusBatchAutoDialog.axaml.cs">
+      <DependentUpon>LiberatedStatusBatchAutoDialog.axaml</DependentUpon>
+    </Compile>
+    <Compile Update="Dialogs\LiberatedStatusBatchManualDialog.axaml.cs">
+      <DependentUpon>LiberatedStatusBatchManualDialog.axaml</DependentUpon>
+    </Compile>
     <Compile Update="Views\ProcessBookControl.axaml.cs">
       <DependentUpon>ProcessBookControl.axaml</DependentUpon>
     </Compile>
@@ -114,12 +130,12 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Avalonia" Version="0.10.17" />
-    <PackageReference Include="Avalonia.Controls.DataGrid" Version="0.10.17" />
-    <PackageReference Include="Avalonia.Desktop" Version="0.10.17" />
-    <PackageReference Include="Avalonia.Diagnostics" Version="0.10.17" />
-    <PackageReference Include="Avalonia.ReactiveUI" Version="0.10.17" />
-	  <PackageReference Include="XamlNameReferenceGenerator" Version="1.3.4" />
+    <PackageReference Include="Avalonia" Version="0.10.18" />
+    <PackageReference Include="Avalonia.Controls.DataGrid" Version="0.10.18" />
+    <PackageReference Include="Avalonia.Desktop" Version="0.10.18" />
+    <PackageReference Include="Avalonia.Diagnostics" Version="0.10.18" />
+    <PackageReference Include="Avalonia.ReactiveUI" Version="0.10.18" />
+    <PackageReference Include="XamlNameReferenceGenerator" Version="1.5.1" />
   </ItemGroup>
 
   <ItemGroup>
@@ -134,4 +150,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,10 @@ 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)
+        /// <summary>
+        /// Note: the format field should use {0} and NOT use the `$` string interpolation. Formatting is done inside this method.
+        /// </summary>
+        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 +120,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 +135,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 +149,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 +193,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 +215,7 @@ Libation.
 					};
 
 					window.Show();
-					var result = toDisplay.ShowDialogSynchronously<DialogResult>(window);
+					var result = await toDisplay.ShowDialog<DialogResult>(window);
 					window.Close();
 					return result;
 				}
@@ -217,7 +223,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>
+    <TargetFramework>net7.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>net7.0</TargetFramework>
+    <RuntimeIdentifier>osx-x64</RuntimeIdentifier>
+    <SelfContained>true</SelfContained>
+    <PublishSingleFile>false</PublishSingleFile>
+    <PublishTrimmed>false</PublishTrimmed>
+  </PropertyGroup>
+</Project>

Source/LibationAvalonia/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\Windows-chardonnay</PublishDir>
+    <PublishProtocol>FileSystem</PublishProtocol>
+    <TargetFramework>net7.0</TargetFramework>
+    <RuntimeIdentifier>win-x64</RuntimeIdentifier>
+    <SelfContained>true</SelfContained>
+    <PublishSingleFile>false</PublishSingleFile>
+    <PublishTrimmed>false</PublishTrimmed>
+  </PropertyGroup>
+</Project>