incr ver. updates for mac and linux

Mac App Bundle and added mp3 conversion support on mac

.github/workflows/build-linux.yml

@@ -66,7 +66,7 @@ jobs:
         id: zip
         working-directory: ./Source/bin/Publish/${{ matrix.os }}-${{ matrix.release_name }}
         run: |
-          delfiles=("libmp3lame.x86.dll" "libmp3lame.x64.dll" "ffmpegaac.x86.dll" "ffmpegaac.x64.dll" "ZipExtractor.exe")
+          delfiles=("libmp3lame.x86.dll" "libmp3lame.x64.dll" "ffmpegaac.x86.dll" "ffmpegaac.x64.dll")
           for n in "${delfiles[@]}"; do rm "$n"; done
           osbuild="$(echo '${{ matrix.os }}' | tr '[:upper:]' '[:lower:]')"
           artifact="Libation.${{ steps.get_version.outputs.version }}-${osbuild}-${{ matrix.release_name }}"

.github/workflows/bundle-linux.yml

@@ -0,0 +1,43 @@
+# build-linux.yml
+# Reusable workflow that builds the Libation installation bundles for Linux and MacOS.
+---
+name: bundle-linux
+
+on:
+  workflow_call:
+    inputs:
+      version:
+        type: string
+        description: 'Version number'
+        required: true
+
+jobs:
+  bundle:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        os: [linux, macos]
+        release_name: [chardonnay]
+    steps:
+      - uses: actions/checkout@v3
+      
+      - name: Download Artifact
+        uses: actions/download-artifact@v3
+        with:
+          name: "Libation.${{ inputs.version }}-${{ matrix.os }}-${{ matrix.release_name }}.tar.gz"
+          
+      - name: Build bundle
+        id: build
+        run: |
+          SCRIPT=targz2${{ matrix.os }}bundle.sh
+          chmod +rwx ./Scripts/${SCRIPT}
+          ./Scripts/${SCRIPT} "Libation.${{ inputs.version }}-${{ matrix.os }}-${{ matrix.release_name }}.tar.gz" ${{ inputs.version }}
+          artifact=$(ls ./bundle)
+          echo "artifact=${artifact}" >> "${GITHUB_OUTPUT}"
+          
+      - name: Publish bundle
+        uses: actions/upload-artifact@v3
+        with:
+          name: ${{ steps.build.outputs.artifact }}
+          path: ./bundle/${{ steps.build.outputs.artifact }}
+          if-no-files-found: error

.github/workflows/deb.yml

@@ -1,38 +0,0 @@
-# deb.yml
-# Reusable workflow that builds the Linux Debian package.
----
-name: deb
-
-on:
-  workflow_call:
-    inputs:
-      version:
-        type: string
-        description: 'Version number'
-        required: true
-
-env:
-  FILE_NAME: "Libation.${{ inputs.version }}-linux-chardonnay"
-  
-jobs:
-  build_deb:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-      
-      - name: Download Artifact
-        uses: actions/download-artifact@v3
-        with:
-          name: "${{ env.FILE_NAME }}.tar.gz"
-
-      - name: Build .deb
-        id: deb
-        run: |
-          ./Scripts/targz2deb.sh "${{ env.FILE_NAME }}.tar.gz" ${{ inputs.version }}
-      
-      - name: Publish .deb
-        uses: actions/upload-artifact@v3
-        with:
-          name: ${{ env.FILE_NAME }}.deb
-          path: ${{ env.FILE_NAME }}.deb
-          if-no-files-found: error

.github/workflows/release.yml

@@ -34,14 +34,14 @@ jobs:
       version_override: ${{ needs.prerelease.outputs.version }}
       run_unit_tests: false
 
-  deb:
+  bundle:
     needs: [prerelease,build]
-    uses: ./.github/workflows/deb.yml
+    uses: ./.github/workflows/bundle-linux.yml
     with:
       version: ${{ needs.prerelease.outputs.version }}
       
   release:
-    needs: [prerelease,build,deb]
+    needs: [prerelease,build,bundle]
     runs-on: ubuntu-latest
     steps:
       - name: Download artifacts
@@ -53,7 +53,7 @@ jobs:
         id: release
         uses: softprops/action-gh-release@v1
         with:
-          name: Libation ${{ needs.prerelease.outputs.version }}
+          name: Libation v${{ needs.prerelease.outputs.version }}
           body: <Put a body here>
           draft: true
           prerelease: false

.releaseindex.json

@@ -1,6 +1,6 @@
 {
   "WindowsClassic":  "Libation\\.\\d+\\.\\d+\\.\\d+-win(dows)?-classic\\.zip",
   "WindowsAvalonia": "Libation\\.\\d+\\.\\d+\\.\\d+-win(dows)?-chardonnay\\.zip",
-  "LinuxAvalonia":   "Libation\\.\\d+\\.\\d+\\.\\d+-linux-chardonnay",
-  "MacOSAvalonia":   "Libation\\.\\d+\\.\\d+\\.\\d+-macos-chardonnay"
+  "LinuxAvalonia":   "Libation\\.\\d+\\.\\d+\\.\\d+-linux-chardonnay\\.deb",
+  "MacOSAvalonia":   "Libation\\.app-macOS-x64-\\d+\\.\\d+\\.\\d+\\.tgz"
 }

Documentation/GettingStarted.md

@@ -20,6 +20,13 @@
 
 ### [Download Libation](https://github.com/rmcrackan/Libation/releases)
 
+##### Which version? Chardonnay vs Classic
+
+Nearly 100% of the difference is look and feel -- it's a matter of preference.
+
+Chardonnay has an updated look and will work and look the same on Windows, Mac, and Linux.  
+Classic is Windows only. It has an older look because it's built with older, duller, and more mature technology. This tech has built into it better support for things like accessibility for screen readers.
+
 ### Installation
 
 * Windows

Documentation/InstallOnMac.md

@@ -4,40 +4,36 @@
 ...or just tell more friends. As long as I'm maintaining this software, it will remain **free** and **open source**.
 
 
-
 # Run Libation on MacOS
 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
+- Download the `Libation.app-macOS-x64-x.x.x.tgz` file from the latest release and extract it. 
+- Move the extracted Libation app bundle to your applications folder.
+- Open a terminal (Go > Utilities > Terminal)
+- Copy/paste/run the following command (you'll be prompted to enter your password)
+  ```Console
+  sudo spctl --master-disable && sudo spctl --add --label "Libation" /Applications/Libation.app && open /Applications/Libation.app && sudo spctl --master-enable
+  ```
+- Close the terminal and use Libation!
 
-```console
-chmod +x ./Libation
-sudo spctl --add --label "Libation" ./Libation
-./Libation
+## Running Hangover
+
+Libation comes with a recovery app called Hangover. You can start it by running this command:
+```Console
+open /Applications/Libation.app --args hangover
 ```
 
-## Trouble with Gatekeeper?
+## Runnign LibationCli
 
-If Gatekeeper is giving you trouble with Libation:
+Libation comes with a command-line interface. Unfortunately, due to the way apps are sandboxed on mac, its use is somewhat limited. To open a new sandboxed terminal in LibationCli's directory, run the following command:
+```Console
+open /Applications/Libation.app --args cli
+```
+To use LibationCli from an unsandboxed terminal, you must disable gatekeeper again and run the program directly at `/Applications/Libation.app/Contents/MacOS/LibationCli`
 
-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
+Then use `./LibationCli` to execute a command.
 
 ## Get Libation running on Mac
 

Documentation/NamingTemplates.md

@@ -10,6 +10,7 @@ These templates apply to both GUI and CLI.
   - [Conditional Tags](#conditional-tags)
 - [Tag Formatters](#tag-formatters)
   - [Text Formatters](#text-formatters)
+  - [Name List Formatters](#name-list-formatters)
   - [Integer Formatters](#integer-formatters)
   - [Date Formatters](#date-formatters)
 
@@ -26,9 +27,9 @@ These tags will be replaced in the template with the audiobook's values.
 |\<id\> **†**|Audible book ID (ASIN)|Text|
 |\<title\>|Full title|Text|
 |\<title short\>|Title. Stop at first colon|Text|
-|\<author\>|Author(s)|Text|
+|\<author\>|Author(s)|Name List|
 |\<first author\>|First author|Text|
-|\<narrator\>|Narrator(s)|Text|
+|\<narrator\>|Narrator(s)|Name List|
 |\<first narrator\>|First narrator|Text|
 |\<series\>|Name of series|Text|
 |\<series#\>|Number order in series|Text|
@@ -73,7 +74,7 @@ As an example, this folder template will place all Liberated podcasts into a "Po
 
 
 # Tag Formatters
-**Text**, **Integer**, and **DateTime** tags can be optionally formatted using format text in square brackets after the tag name. Below is a list of supported formatters for each tag type.
+**Text**, **Name List**, **Integer**, and **DateTime** tags can be optionally formatted using format text in square brackets after the tag name. Below is a list of supported formatters for each tag type.
 
 ## Text Formatters
 |Formatter|Description|Example Usage|Example Result|
@@ -81,12 +82,18 @@ As an example, this folder template will place all Liberated podcasts into a "Po
 |L|Converts text to lowercase|\<title[L]\>|a study in scarlet꞉ a sherlock holmes novel|
 |U|Converts text to uppercase|\<title short[U]\>|A STUDY IN SCARLET|
 
+## Name List Formatters
+|Formatter|Description|Example Usage|Example Result|
+|-|-|-|-|
+|separator()|Speficy the text used to join multiple people's names.<br><br>Default is ", "|`<author[separator(; )]>`|Arthur Conan Doyle; Stephen Fry|
+|format(\{T \| F \| M \| L \| S\})|Formats the human name using the name part tags.<br>\{T\} = Title (e.g. "Dr.")<br>\{F\} = First name<br>\{M\} = Middle name<br>\{L\} = Last Name<br>\{S\} = Suffix (e.g. "PhD")<br><br>Default is \{P\} \{F\} \{M\} \{L\} \{S\} |`<author[format({L}, {F}) separator(; )]>`|Doyle, Arthur; Fry, Stephen|
+|sort(F \| M \| L)|Sorts the names by first, middle, or last name<br><br>Default is unsorted|`<author[sort(M)]>`|Stephen Fry, Arthur Conan Doyle|
+|max(#)|Only use the first # of names<br><br>Default is all names|`<author[max(1)]>`|Arthur Conan Doyle|
+
 ## Integer Formatters
 |Formatter|Description|Example Usage|Example Result|
 |-|-|-|-|
-|# (a number)|Zero-pads the number|\<bitrate[4]\><br>\<series#[3]\><br>\<samplerate[6]\>|0128<br>001<br>044100|
-
-**Text**, **Integer**, and **DateTime** tags can be optionally formatted using format text in square brackets after the tag name. Below is a list of supported formatters for each tag type.
+|# (a number)|Zero-pads the number|\<bitrate\[4\]\><br>\<series#\[3\]\><br>\<samplerate\[6\]\>|0128<br>001<br>044100|
 
 ## Date Formatters
 Form more standard formatters, [see this guide from Microsoft](https://learn.microsoft.com/en-us/dotnet/standard/base-types/standard-date-and-time-format-strings).

Scripts/targz2linuxbundle.sh

@@ -106,7 +106,10 @@ ln -s /usr/lib/libation/Hangover /usr/bin/hangover
 ln -s /usr/lib/libation/LibationCli /usr/bin/libationcli
 
 # Increase the maximum number of inotify instances
-echo fs.inotify.max_user_instances=524288 | tee -a /etc/sysctl.conf && sysctl -p
+
+if ! grep -q 'fs.inotify.max_user_instances=524288' /etc/sysctl.conf; then  
+  echo fs.inotify.max_user_instances=524288 | tee -a /etc/sysctl.conf && sysctl -p
+fi
 
 # workaround until this file is moved to the user's home directory
 touch /usr/lib/libation/appsettings.json
@@ -130,7 +133,10 @@ chmod +x "$FOLDER_DEBIAN/postinst"
 echo "Creating .deb file..."
 dpkg-deb -Zxz --build $FOLDER_MAIN
 
+mkdir bundle
+echo "moving to ./bundle/$FOLDER_MAIN.deb"
+mv "$FOLDER_MAIN.deb" "./bundle/$FOLDER_MAIN.deb"
+
 rm -r "$FOLDER_MAIN"
 
 echo "Done!"
-

Scripts/targz2macosbundle.sh

@@ -0,0 +1,84 @@
+#!/bin/bash
+
+FILE=$1; shift
+VERSION=$1; shift
+
+if [ -z "$FILE" ]
+then
+  echo "This script must be called with a the Libation macos bin zip file as an argument."
+  exit
+fi
+
+if [ ! -f "$FILE" ]
+then
+  echo "The file \"$FILE\" does not exist."
+  exit
+fi
+
+if [ -z "$VERSION" ]
+then
+  echo "This script must be called with the Libation version number as an argument."
+  exit
+fi
+
+contains() { case "$1" in *"$2"*) true ;; *) false ;; esac }
+
+if ! contains "$FILE" "$VERSION"
+then
+  echo "This script must be called with a Libation version number that is present in the filename passed."
+  exit
+fi
+
+BUNDLE="Libation.app"
+echo "Bundle dir: $BUNDLE"
+
+if [[ -d "$BUNDLE" ]]
+then
+  echo "$BUNDLE directory already exists, aborting."
+  exit
+fi
+
+BUNDLE_CONTENTS="$BUNDLE/Contents"
+echo "Bundle Contents dir: $BUNDLE_CONTENTS"
+
+BUNDLE_RESOURCES="$BUNDLE_CONTENTS/Resources"
+echo "Resources dir: $BUNDLE_RESOURCES"
+
+BUNDLE_MACOS="$BUNDLE_CONTENTS/MacOS"
+echo "MacOS dir: $BUNDLE_MACOS"
+
+mkdir -p "$BUNDLE_CONTENTS"
+mkdir -p "$BUNDLE_RESOURCES"
+mkdir -p "$BUNDLE_MACOS"
+
+echo "Extracting $FILE to $BUNDLE_MACOS..."
+tar -xzf ${FILE} -C ${BUNDLE_MACOS}
+
+if [ $? -ne 0 ]
+ then echo "Error extracting ${FILE}"
+ exit
+fi
+
+echo "Copying icon..."
+cp "$BUNDLE_MACOS/libation.icns" "$BUNDLE_RESOURCES/libation.icns"
+
+echo "Copying Info.plist file..."
+cp "$BUNDLE_MACOS/Info.plist" "$BUNDLE_CONTENTS/Info.plist"
+
+echo "Set Libation version number..."
+sed -i -e "s/VERSION_STRING/$VERSION/" "$BUNDLE_CONTENTS/Info.plist"
+
+echo "deleting unneeded files.."
+delfiles=("libmp3lame.x64.so" "ffmpegaac.x64.so" "libation.icns" "Info.plist")
+for n in "${delfiles[@]}"; do rm "$BUNDLE_MACOS/$n"; done
+
+echo "Creating app bundle: $BUNDLE-$VERSION.tar.gz"
+tar -czvf "$BUNDLE-$VERSION.tar.gz" "$BUNDLE"
+
+mkdir bundle
+echo "moving to ./bundle/$BUNDLE-$VERSION.tar.gz"
+mv "$BUNDLE-$VERSION.tar.gz" "./bundle/$BUNDLE-macOS-x64-$VERSION.tgz"
+
+rm -r "$BUNDLE"
+
+echo "Done!"

Source/AaxDecrypter/AaxDecrypter.csproj

@@ -13,7 +13,7 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-	  <PackageReference Include="AAXClean.Codecs" Version="0.5.12" />
+	  <PackageReference Include="AAXClean.Codecs" Version="0.5.13.2" />
 	</ItemGroup>
 
 	<ItemGroup>

Source/AaxDecrypter/AaxcDownloadConvertBase.cs

@@ -1,31 +1,15 @@
 using AAXClean;
-using Dinah.Core.Net.Http;
 using System;
 using System.Threading.Tasks;
 
 namespace AaxDecrypter
-{
+{	
 	public abstract class AaxcDownloadConvertBase : AudiobookDownloadBase
 	{
 		public event EventHandler<AppleTags> RetrievedMetadata;
 
 		protected AaxFile AaxFile { get; private set; }
-		private Mp4Operation aaxConversion;
-		protected Mp4Operation AaxConversion
-		{
-			get => aaxConversion;
-			set
-			{
-				if (aaxConversion is not null)
-					aaxConversion.ConversionProgressUpdate -= AaxFile_ConversionProgressUpdate;
-
-				if (value is not null)
-				{
-					aaxConversion = value;
-					aaxConversion.ConversionProgressUpdate += AaxFile_ConversionProgressUpdate;
-				}
-			}
-		}
+		protected Mp4Operation AaxConversion { get; set; }
 
 		protected AaxcDownloadConvertBase(string outFileName, string cacheDirectory, IDownloadOptions dlOptions)
 			: base(outFileName, cacheDirectory, dlOptions) { }
@@ -45,12 +29,6 @@ namespace AaxDecrypter
 			FinalizeDownload();
 		}
 
-		protected override void FinalizeDownload()
-		{
-			AaxConversion = null;
-			base.FinalizeDownload();
-		}
-
 		protected bool Step_GetMetadata()
 		{
 			AaxFile = new AaxFile(InputFileStream);
@@ -82,24 +60,5 @@ namespace AaxDecrypter
 
 			return !IsCanceled;
 		}
-
-		private void AaxFile_ConversionProgressUpdate(object sender, ConversionProgressEventArgs e)
-		{
-			var remainingSecsToProcess = (e.TotalDuration - e.ProcessPosition).TotalSeconds;
-			var estTimeRemaining = remainingSecsToProcess / e.ProcessSpeed;
-
-			if (double.IsNormal(estTimeRemaining))
-				OnDecryptTimeRemaining(TimeSpan.FromSeconds(estTimeRemaining));
-
-			var progressPercent = e.ProcessPosition / e.TotalDuration;
-
-			OnDecryptProgressUpdate(
-				new DownloadProgress
-				{
-					ProgressPercentage = 100 * progressPercent,
-					BytesReceived = (long)(InputFileStream.Length * progressPercent),
-					TotalBytesToReceive = InputFileStream.Length
-				});
-		}
 	}
 }

Source/AaxDecrypter/AaxcDownloadSingleConverter.cs

@@ -1,6 +1,8 @@
 using AAXClean;
 using AAXClean.Codecs;
+using Dinah.Core.Net.Http;
 using FileManager;
+using System;
 using System.IO;
 using System.Threading.Tasks;
 
@@ -8,6 +10,7 @@ namespace AaxDecrypter
 {
 	public class AaxcDownloadSingleConverter : AaxcDownloadConvertBase
 	{
+		private readonly AverageSpeed averageSpeed = new();
 		public AaxcDownloadSingleConverter(string outFileName, string cacheDirectory, IDownloadOptions dlOptions)
 			: base(outFileName, cacheDirectory, dlOptions)
 		{
@@ -35,7 +38,10 @@ namespace AaxDecrypter
 					&& DownloadOptions.OutputFormat is OutputFormat.M4b)
 				{
 					outputFile.Close();
-					await (AaxConversion = Mp4File.RelocateMoovAsync(OutputFileName));
+					AaxConversion = Mp4File.RelocateMoovAsync(OutputFileName);
+					AaxConversion.ConversionProgressUpdate += AaxConversion_MoovProgressUpdate;
+					await AaxConversion;
+					AaxConversion.ConversionProgressUpdate -= AaxConversion_MoovProgressUpdate;
 				}
 
 				return AaxConversion.IsCompletedSuccessfully;
@@ -46,6 +52,27 @@ namespace AaxDecrypter
 			}
 		}
 
+		private void AaxConversion_MoovProgressUpdate(object sender, ConversionProgressEventArgs e)
+		{
+			averageSpeed.AddPosition(e.ProcessPosition.TotalSeconds);
+
+			var remainingTimeToProcess = (e.TotalDuration - e.ProcessPosition).TotalSeconds;
+			var estTimeRemaining = remainingTimeToProcess / averageSpeed.Average;
+
+			if (double.IsNormal(estTimeRemaining))
+				OnDecryptTimeRemaining(TimeSpan.FromSeconds(estTimeRemaining));
+
+			var progressPercent = 100d * (1 - remainingTimeToProcess / e.TotalDuration.TotalSeconds);
+
+			OnDecryptProgressUpdate(
+				new DownloadProgress
+				{
+					ProgressPercentage = progressPercent,
+					BytesReceived = (long)(InputFileStream.Length * progressPercent),
+					TotalBytesToReceive = InputFileStream.Length
+				});
+		}
+
 		private Mp4Operation decryptAsync(Stream outputFile)
 			=> DownloadOptions.OutputFormat == OutputFormat.Mp3
 			? AaxFile.ConvertToMp3Async

Source/AaxDecrypter/AudiobookDownloadBase.cs

@@ -25,6 +25,7 @@ namespace AaxDecrypter
 		protected string OutputFileName { get; }
 		protected IDownloadOptions DownloadOptions { get; }
 		protected NetworkFileStream InputFileStream => nfsPersister.NetworkFileStream;
+		protected virtual long InputFilePosition => InputFileStream.Position;
 
 		private readonly NetworkFileStreamPersister nfsPersister;
 		private readonly DownloadProgress zeroProgress;
@@ -65,13 +66,47 @@ namespace AaxDecrypter
 
 		public async Task<bool> RunAsync()
 		{
+			var progressTask = Task.Run(reportProgress);
+
 			AsyncSteps[$"Cleanup"] = CleanupAsync;
 			(bool success, var elapsed) = await AsyncSteps.RunAsync();
 
+			await progressTask;
+
 			var speedup = DownloadOptions.RuntimeLength / elapsed;
 			Serilog.Log.Information($"Speedup is {speedup:F0}x realtime.");
 
 			return success;
+
+			async Task reportProgress()
+			{
+				AverageSpeed averageSpeed = new();
+
+				while (InputFileStream.CanRead && InputFileStream.Length > InputFilePosition && !InputFileStream.IsCancelled)
+				{
+					averageSpeed.AddPosition(InputFilePosition);
+
+					var estSecsRemaining = (InputFileStream.Length - InputFilePosition) / averageSpeed.Average;
+
+					if (double.IsNormal(estSecsRemaining))
+						OnDecryptTimeRemaining(TimeSpan.FromSeconds(estSecsRemaining));
+
+					var progressPercent = 100d * InputFilePosition / InputFileStream.Length;
+
+					OnDecryptProgressUpdate(
+						new DownloadProgress
+						{
+							ProgressPercentage = progressPercent,
+							BytesReceived = InputFilePosition,
+							TotalBytesToReceive = InputFileStream.Length
+						});
+
+					await Task.Delay(200);
+				}
+
+				OnDecryptTimeRemaining(TimeSpan.Zero);
+				OnDecryptProgressUpdate(zeroProgress);
+			}
 		}
 
 		public abstract Task CancelAsync();
@@ -101,6 +136,7 @@ namespace AaxDecrypter
 		protected virtual void FinalizeDownload()
 		{
 			nfsPersister?.Dispose();
+			OnDecryptTimeRemaining(TimeSpan.Zero);
 			OnDecryptProgressUpdate(zeroProgress);
 		}
 

Source/AaxDecrypter/AverageSpeed.cs

@@ -0,0 +1,171 @@
+using Dinah.Core;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace AaxDecrypter;
+
+public static class LinqStats
+{
+	public static (double mean, double stdDev) BasicStatisticsBy<T>(this IEnumerable<T> values, Func<T, double> selector)
+	{
+		var count = values.Count();
+		var mean = values.Average(selector);
+
+		return (mean, Math.Sqrt(values.Sum(s => Math.Pow(selector(s) - mean, 2)) / (count - 1)));
+	}
+
+	public static bool T_Test_2By<T>(this IEnumerable<T> values, Func<T, double> selector, IEnumerable<T> secondGroup, Significance confidence)
+	{
+		var n1 = values.Count();
+		var n2 = secondGroup.Count();
+		var n = n1 + n2;
+
+		if (n1 < 3 || n2 < 3) return false;
+
+		(var mean1, var stdDev1) = values.BasicStatisticsBy(selector);
+		(var mean2, var stdDev2) = secondGroup.BasicStatisticsBy(selector);
+
+		var pooledStdDev = Math.Sqrt((((n1 - 1) * (stdDev1 * stdDev1)) + ((n2 - 1) * (stdDev2 * stdDev2))) / (n1 + n2 - 2));
+
+		var testStat = Math.Abs(mean1 - mean2) / (pooledStdDev * Math.Sqrt(1d / n1 + 1d / n2));
+		var crit = T_Stat(Math.Min(n - 2, MAX_DEGREES_FREEDOM), confidence);
+
+		return testStat > crit;
+	}
+
+	public static bool T_Test_1By<T>(this IEnumerable<T> values, Func<T, double> selector, double testMean, Significance confidence)
+	{
+		var n = values.Count();
+
+		if (n < 2) return false;
+
+		(var sampleMean, var sampleStdDev) = values.BasicStatisticsBy(selector);
+
+		var testStat = Math.Abs(sampleMean - testMean) / (sampleStdDev / Math.Sqrt(n));
+		var crit = T_Stat(Math.Min(n - 1, MAX_DEGREES_FREEDOM), confidence);
+
+		return testStat > crit;
+	}
+
+	private static double T_Stat(int degreesFreedom, Significance confidence)
+	{
+		ArgumentValidator.EnsureBetweenInclusive(degreesFreedom, nameof(degreesFreedom), MIN_DEGREES_FREEDOM, MAX_DEGREES_FREEDOM);
+
+		return T_TABLE[(int)confidence][degreesFreedom - MIN_DEGREES_FREEDOM];
+	}
+
+	static LinqStats()
+	{
+		T_TABLE = new double[][] { T_Table_01, T_Table_05, T_Table_10, T_Table_15, T_Table_20, T_Table_25 };
+	}
+
+	private const int MIN_DEGREES_FREEDOM = 1;
+	private const int MAX_DEGREES_FREEDOM = 201;
+	/// <summary>
+	/// 2-tailed  t-Distribution critical values at 75%, 80%, 85%,
+	/// 90%, 95%, and 99% confidence for 1 - 201 degrees of freedom.
+	/// </summary>
+	private readonly static double[][] T_TABLE;
+	private readonly static double[] T_Table_25 = { 2.414213562, 1.603567451, 1.422625281, 1.344397556, 1.300949037, 1.273349309, 1.254278682, 1.240318261, 1.229659173, 1.221255395, 1.214460246, 1.208852542, 1.204146242, 1.200140298, 1.196689284, 1.193685414, 1.191047107, 1.188711483, 1.186629298, 1.184761434, 1.183076432, 1.181548697, 1.180157199, 1.178884497, 1.177716003, 1.176639425, 1.175644329, 1.174721803, 1.173864189, 1.173064871, 1.1723181, 1.17161886, 1.170962753, 1.17034591, 1.169764906, 1.169216709, 1.168698615, 1.168208212, 1.167743338, 1.167302049, 1.166882595, 1.166483396, 1.166103019, 1.165740162, 1.165393644, 1.165062385, 1.164745398, 1.164441782, 1.164150707, 1.163871412, 1.163603196, 1.163345413, 1.163097467, 1.162858803, 1.162628911, 1.162407316, 1.162193577, 1.161987283, 1.161788052, 1.161595527, 1.161409375, 1.161229286, 1.161054967, 1.160886145, 1.160722566, 1.160563987, 1.160410184, 1.160260944, 1.160116066, 1.159975363, 1.159838656, 1.159705777, 1.159576569, 1.15945088, 1.15932857, 1.159209503, 1.159093552, 1.158980598, 1.158870524, 1.158763222, 1.158658589, 1.158556526, 1.15845694, 1.158359742, 1.158264847, 1.158172173, 1.158081645, 1.157993188, 1.157906731, 1.157822209, 1.157739556, 1.157658712, 1.157579617, 1.157502216, 1.157426454, 1.157352281, 1.157279646, 1.157208502, 1.157138804, 1.157070509, 1.157003573, 1.156937958, 1.156873624, 1.156810534, 1.156748653, 1.156687945, 1.156628379, 1.156569922, 1.156512543, 1.156456213, 1.156400904, 1.156346587, 1.156293237, 1.156240827, 1.156189334, 1.156138733, 1.156089001, 1.156040117, 1.155992058, 1.155944804, 1.155898335, 1.155852631, 1.155807674, 1.155763446, 1.155719928, 1.155677105, 1.155634959, 1.155593475, 1.155552637, 1.15551243, 1.155472839, 1.155433851, 1.155395452, 1.155357629, 1.155320368, 1.155283658, 1.155247486, 1.155211841, 1.15517671, 1.155142084, 1.15510795, 1.1550743, 1.155041122, 1.155008406, 1.154976144, 1.154944326, 1.154912942, 1.154881984, 1.154851443, 1.154821311, 1.15479158, 1.154762241, 1.154733287, 1.154704711, 1.154676505, 1.154648662, 1.154621175, 1.154594037, 1.154567242, 1.154540783, 1.154514654, 1.154488849, 1.154463361, 1.154438185, 1.154413316, 1.154388747, 1.154364474, 1.15434049, 1.154316792, 1.154293373, 1.154270229, 1.154247355, 1.154224746, 1.154202398, 1.154180307, 1.154158467, 1.154136875, 1.154115526, 1.154094417, 1.154073543, 1.1540529, 1.154032485, 1.154012294, 1.153992323, 1.153972568, 1.153953027, 1.153933695, 1.15391457, 1.153895647, 1.153876925, 1.153858399, 1.153840066, 1.153821925, 1.15380397, 1.153786201, 1.153768613, 1.153751204, 1.153733972, 1.153716914, 1.153700026 };
+	private readonly static double[] T_Table_20 = { 3.077683537, 1.885618083, 1.637744354, 1.533206274, 1.475884049, 1.439755747, 1.414923928, 1.39681531, 1.383028738, 1.372183641, 1.363430318, 1.356217334, 1.350171289, 1.345030374, 1.340605608, 1.336757167, 1.33337939, 1.330390944, 1.327728209, 1.325340707, 1.323187874, 1.321236742, 1.31946024, 1.317835934, 1.316345073, 1.314971864, 1.313702913, 1.312526782, 1.311433647, 1.310415025, 1.309463549, 1.308572793, 1.307737124, 1.306951587, 1.306211802, 1.305513886, 1.304854381, 1.304230204, 1.303638589, 1.303077053, 1.302543359, 1.302035487, 1.301551608, 1.30109006, 1.300649332, 1.300228048, 1.299824947, 1.299438879, 1.299068785, 1.298713694, 1.298372713, 1.298045016, 1.297729843, 1.297426488, 1.2971343, 1.296852673, 1.296581044, 1.29631889, 1.296065725, 1.295821094, 1.295584571, 1.295355762, 1.295134294, 1.29491982, 1.294712013, 1.294510568, 1.294315197, 1.294125629, 1.293941609, 1.293762898, 1.293589269, 1.293420507, 1.293256413, 1.293096793, 1.292941469, 1.292790268, 1.292643029, 1.292499597, 1.292359828, 1.292223583, 1.29209073, 1.291961144, 1.291834705, 1.291711301, 1.291590824, 1.291473171, 1.291358243, 1.291245948, 1.291136195, 1.291028899, 1.290923979, 1.290821356, 1.290720956, 1.290622708, 1.290526543, 1.290432395, 1.290340202, 1.290249904, 1.290161442, 1.290074761, 1.289989809, 1.289906533, 1.289824884, 1.289744816, 1.289666283, 1.289589241, 1.289513648, 1.289439464, 1.289366649, 1.289295166, 1.289224979, 1.289156054, 1.289088355, 1.289021851, 1.28895651, 1.288892302, 1.288829199, 1.288767171, 1.288706191, 1.288646234, 1.288587273, 1.288529284, 1.288472243, 1.288416127, 1.288360913, 1.288306581, 1.288253109, 1.288200477, 1.288148665, 1.288097654, 1.288047427, 1.287997964, 1.287949248, 1.287901264, 1.287853994, 1.287807422, 1.287761534, 1.287716314, 1.287671748, 1.287627821, 1.287584521, 1.287541833, 1.287499745, 1.287458245, 1.287417319, 1.287376957, 1.287337146, 1.287297876, 1.287259135, 1.287220914, 1.2871832, 1.287145985, 1.287109259, 1.287073012, 1.287037235, 1.287001918, 1.286967053, 1.286932631, 1.286898644, 1.286865084, 1.286831942, 1.286799212, 1.286766884, 1.286734952, 1.286703409, 1.286672248, 1.286641461, 1.286611042, 1.286580985, 1.286551283, 1.286521929, 1.286492918, 1.286464244, 1.286435901, 1.286407882, 1.286380184, 1.286352799, 1.286325724, 1.286298952, 1.286272479, 1.286246299, 1.286220408, 1.286194801, 1.286169474, 1.286144421, 1.286119638, 1.286095122, 1.286070867, 1.28604687, 1.286023127, 1.285999633, 1.285976384, 1.285953377, 1.285930609, 1.285908074, 1.285885771, 1.285863694, 1.285841842, 1.285820209, 1.285798794 };
+	private readonly static double[] T_Table_15 = { 4.16529977, 2.281930588, 1.924319657, 1.778192164, 1.699362566, 1.650173154, 1.616591737, 1.59222144, 1.573735785, 1.559235933, 1.547559766, 1.537956495, 1.529919606, 1.523095061, 1.517227969, 1.51213017, 1.507659754, 1.503707672, 1.500188756, 1.497035518, 1.494193795, 1.491619612, 1.489276897, 1.487135783, 1.485171326, 1.483362535, 1.481691617, 1.48014339, 1.478704821, 1.477364662, 1.47611315, 1.474941772, 1.473843072, 1.47281049, 1.471838233, 1.470921166, 1.470054719, 1.469234815, 1.468457801, 1.467720399, 1.467019655, 1.466352901, 1.465717725, 1.465111933, 1.464533534, 1.463980712, 1.463451805, 1.462945295, 1.46245979, 1.461994009, 1.461546775, 1.461117, 1.460703683, 1.460305896, 1.45992278, 1.459553538, 1.45919743, 1.458853767, 1.458521908, 1.458201256, 1.457891251, 1.457591373, 1.457301133, 1.457020074, 1.456747768, 1.45648381, 1.456227824, 1.455979454, 1.455738365, 1.455504241, 1.455276784, 1.455055715, 1.454840767, 1.45463169, 1.454428246, 1.454230212, 1.454037373, 1.453849529, 1.453666487, 1.453488066, 1.453314093, 1.453144404, 1.452978842, 1.452817259, 1.452659513, 1.452505469, 1.452354998, 1.452207977, 1.452064289, 1.451923821, 1.451786468, 1.451652126, 1.451520697, 1.451392088, 1.451266209, 1.451142973, 1.451022299, 1.450904108, 1.450788323, 1.450674871, 1.450563684, 1.450454694, 1.450347836, 1.450243048, 1.450140271, 1.450039448, 1.449940523, 1.449843444, 1.449748158, 1.449654617, 1.449562773, 1.449472581, 1.449383997, 1.449296977, 1.449211481, 1.449127468, 1.449044902, 1.448963744, 1.448883959, 1.448805513, 1.448728372, 1.448652503, 1.448577876, 1.44850446, 1.448432226, 1.448361146, 1.448291192, 1.448222337, 1.448154557, 1.448087826, 1.44802212, 1.447957415, 1.447893688, 1.447830919, 1.447769085, 1.447708165, 1.44764814, 1.44758899, 1.447530695, 1.447473238, 1.447416601, 1.447360765, 1.447305715, 1.447251433, 1.447197905, 1.447145113, 1.447093044, 1.447041682, 1.446991013, 1.446941023, 1.446891698, 1.446843026, 1.446794994, 1.446747588, 1.446700797, 1.446654609, 1.446609012, 1.446563996, 1.446519548, 1.446475659, 1.446432318, 1.446389514, 1.446347238, 1.44630548, 1.44626423, 1.44622348, 1.44618322, 1.446143442, 1.446104137, 1.446065296, 1.446026911, 1.445988975, 1.44595148, 1.445914417, 1.44587778, 1.445841561, 1.445805753, 1.445770349, 1.445735343, 1.445700727, 1.445666495, 1.445632641, 1.445599159, 1.445566042, 1.445533284, 1.445500881, 1.445468825, 1.445437112, 1.445405736, 1.445374691, 1.445343973, 1.445313576, 1.445283495, 1.445253726, 1.445224264, 1.445195103, 1.445166239, 1.445137668, 1.445109385, 1.445081387 };
+	private readonly static double[] T_Table_10 = { 6.313751515, 2.91998558, 2.353363435, 2.131846786, 2.015048373, 1.943180281, 1.894578605, 1.859548038, 1.833112933, 1.812461123, 1.795884819, 1.782287556, 1.770933396, 1.761310136, 1.753050356, 1.745883676, 1.739606726, 1.734063607, 1.729132812, 1.724718243, 1.720742903, 1.717144374, 1.713871528, 1.71088208, 1.708140761, 1.70561792, 1.703288446, 1.701130934, 1.699127027, 1.697260887, 1.695518783, 1.693888748, 1.692360309, 1.690924255, 1.689572458, 1.688297714, 1.68709362, 1.68595446, 1.684875122, 1.683851013, 1.682878002, 1.681952357, 1.681070703, 1.680229977, 1.679427393, 1.678660414, 1.677926722, 1.677224196, 1.676550893, 1.675905025, 1.67528495, 1.674689154, 1.674116237, 1.673564906, 1.673033965, 1.672522303, 1.672028888, 1.671552762, 1.671093032, 1.670648865, 1.670219484, 1.669804163, 1.669402222, 1.669013025, 1.668635976, 1.668270514, 1.667916114, 1.667572281, 1.667238549, 1.666914479, 1.666599658, 1.666293696, 1.665996224, 1.665706893, 1.665425373, 1.665151353, 1.664884537, 1.664624645, 1.664371409, 1.664124579, 1.663883913, 1.663649184, 1.663420175, 1.663196679, 1.6629785, 1.662765449, 1.662557349, 1.662354029, 1.662155326, 1.661961084, 1.661771155, 1.661585397, 1.661403674, 1.661225855, 1.661051817, 1.66088144, 1.66071461, 1.660551217, 1.660391156, 1.660234326, 1.66008063, 1.659929976, 1.659782273, 1.659637437, 1.659495383, 1.659356034, 1.659219312, 1.659085144, 1.658953458, 1.658824187, 1.658697265, 1.658572629, 1.658450216, 1.658329969, 1.65821183, 1.658095744, 1.657981659, 1.657869522, 1.657759285, 1.657650899, 1.657544319, 1.657439499, 1.657336397, 1.65723497, 1.657135178, 1.657036982, 1.656940344, 1.656845226, 1.656751594, 1.656659413, 1.656568649, 1.65647927, 1.656391244, 1.656304542, 1.656219133, 1.656134988, 1.65605208, 1.655970382, 1.655889868, 1.655810511, 1.655732287, 1.655655173, 1.655579143, 1.655504177, 1.655430251, 1.655357345, 1.655285437, 1.655214506, 1.655144534, 1.6550755, 1.655007387, 1.654940175, 1.654873847, 1.654808385, 1.654743774, 1.654679996, 1.654617035, 1.654554875, 1.654493503, 1.654432901, 1.654373057, 1.654313957, 1.654255585, 1.654197929, 1.654140976, 1.654084713, 1.654029128, 1.653974208, 1.653919942, 1.653866317, 1.653813324, 1.653760949, 1.653709184, 1.653658017, 1.653607437, 1.653557435, 1.653508002, 1.653459126, 1.6534108, 1.653363013, 1.653315758, 1.653269024, 1.653222803, 1.653177088, 1.653131869, 1.653087138, 1.653042889, 1.652999113, 1.652955802, 1.652912949, 1.652870547, 1.652828589, 1.652787068, 1.652745977, 1.65270531, 1.652665059, 1.652625219, 1.652585784, 1.652546746, 1.652508101 };
+	private readonly static double[] T_Table_05 = { 12.70620474, 4.30265273, 3.182446305, 2.776445105, 2.570581836, 2.446911851, 2.364624252, 2.306004135, 2.262157163, 2.228138852, 2.20098516, 2.17881283, 2.160368656, 2.144786688, 2.131449546, 2.119905299, 2.109815578, 2.10092204, 2.093024054, 2.085963447, 2.079613845, 2.073873068, 2.06865761, 2.063898562, 2.059538553, 2.055529439, 2.051830516, 2.048407142, 2.045229642, 2.042272456, 2.039513446, 2.036933343, 2.034515297, 2.032244509, 2.030107928, 2.028094001, 2.026192463, 2.024394164, 2.02269092, 2.02107539, 2.01954097, 2.018081703, 2.016692199, 2.015367574, 2.014103389, 2.012895599, 2.011740514, 2.010634758, 2.009575237, 2.008559112, 2.00758377, 2.006646805, 2.005745995, 2.004879288, 2.004044783, 2.003240719, 2.002465459, 2.001717484, 2.000995378, 2.000297822, 1.999623585, 1.998971517, 1.998340543, 1.997729654, 1.997137908, 1.996564419, 1.996008354, 1.995468931, 1.994945415, 1.994437112, 1.993943368, 1.993463567, 1.992997126, 1.992543495, 1.992102154, 1.99167261, 1.991254395, 1.990847069, 1.99045021, 1.990063421, 1.989686323, 1.989318557, 1.98895978, 1.988609667, 1.988267907, 1.987934206, 1.987608282, 1.987289865, 1.9869787, 1.986674541, 1.986377154, 1.986086317, 1.985801814, 1.985523442, 1.985251004, 1.984984312, 1.984723186, 1.984467455, 1.984216952, 1.983971519, 1.983731003, 1.983495259, 1.983264145, 1.983037526, 1.982815274, 1.982597262, 1.98238337, 1.982173483, 1.98196749, 1.981765282, 1.981566757, 1.981371815, 1.981180359, 1.980992298, 1.980807541, 1.980626002, 1.980447599, 1.980272249, 1.980099876, 1.979930405, 1.979763763, 1.979599878, 1.979438685, 1.979280117, 1.979124109, 1.978970602, 1.978819535, 1.97867085, 1.978524491, 1.978380405, 1.978238539, 1.978098842, 1.977961264, 1.977825758, 1.977692277, 1.977560777, 1.977431212, 1.977303542, 1.977177724, 1.97705372, 1.976931489, 1.976810994, 1.976692198, 1.976575066, 1.976459563, 1.976345655, 1.976233309, 1.976122494, 1.976013178, 1.975905331, 1.975798924, 1.975693928, 1.975590315, 1.975488058, 1.975387131, 1.975287508, 1.975189163, 1.975092073, 1.974996213, 1.97490156, 1.974808092, 1.974715786, 1.974624621, 1.974534576, 1.97444563, 1.974357764, 1.974270957, 1.974185191, 1.974100447, 1.974016708, 1.973933954, 1.973852169, 1.973771337, 1.97369144, 1.973612462, 1.973534388, 1.973457202, 1.973380889, 1.973305434, 1.973230823, 1.973157042, 1.973084077, 1.973011915, 1.972940542, 1.972869946, 1.972800114, 1.972731033, 1.972662692, 1.972595079, 1.972528182, 1.97246199, 1.972396491, 1.972331676, 1.972267533, 1.972204051, 1.972141222, 1.972079034, 1.972017478, 1.971956544, 1.971896224 };
+	private readonly static double[] T_Table_01 = { 63.65674116, 9.924843201, 5.84090931, 4.604094871, 4.032142984, 3.707428021, 3.499483297, 3.355387331, 3.249835542, 3.169272673, 3.105806516, 3.054539589, 3.012275839, 2.976842734, 2.946712883, 2.920781622, 2.89823052, 2.878440473, 2.860934606, 2.84533971, 2.831359558, 2.818756061, 2.807335684, 2.796939505, 2.787435814, 2.778714533, 2.770682957, 2.763262455, 2.756385904, 2.749995654, 2.744041919, 2.738481482, 2.733276642, 2.728394367, 2.723805589, 2.71948463, 2.715408722, 2.711557602, 2.707913184, 2.704459267, 2.701181304, 2.698066186, 2.695102079, 2.692278266, 2.689585019, 2.687013492, 2.684555618, 2.682204027, 2.679951974, 2.677793271, 2.675722234, 2.673733631, 2.671822636, 2.669984796, 2.668215988, 2.666512398, 2.664870482, 2.663286954, 2.661758752, 2.660283029, 2.658857127, 2.657478565, 2.656145025, 2.654854337, 2.653604469, 2.652393515, 2.651219685, 2.650081299, 2.648976774, 2.647904624, 2.646863444, 2.645851913, 2.644868782, 2.643912872, 2.642983067, 2.642078313, 2.641197611, 2.640340015, 2.639504627, 2.638690596, 2.637897113, 2.63712341, 2.636368757, 2.635632458, 2.634913852, 2.634212309, 2.633527229, 2.632858038, 2.632204191, 2.631565166, 2.630940463, 2.630329608, 2.629732145, 2.629147638, 2.628575671, 2.628015844, 2.627467774, 2.626931096, 2.626405457, 2.625890521, 2.625385965, 2.624891476, 2.624406758, 2.623931523, 2.623465496, 2.623008411, 2.622560015, 2.622120061, 2.621688313, 2.621264543, 2.620848534, 2.620440073, 2.620038957, 2.619644989, 2.619257981, 2.618877749, 2.618504116, 2.618136914, 2.617775976, 2.617421145, 2.617072266, 2.616729191, 2.616391776, 2.616059883, 2.615733377, 2.615412127, 2.615096008, 2.614784899, 2.61447868, 2.614177238, 2.613880461, 2.613588242, 2.613300477, 2.613017065, 2.612737908, 2.61246291, 2.61219198, 2.611925028, 2.611661966, 2.611402711, 2.611147181, 2.610895295, 2.610646976, 2.61040215, 2.610160742, 2.609922682, 2.609687901, 2.609456331, 2.609227907, 2.609002566, 2.608780245, 2.608560883, 2.608344423, 2.608130807, 2.60791998, 2.607711886, 2.607506474, 2.607303692, 2.607103489, 2.606905817, 2.606710628, 2.606517876, 2.606327515, 2.606139501, 2.605953791, 2.605770342, 2.605589114, 2.605410067, 2.605233162, 2.605058359, 2.604885623, 2.604714916, 2.604546204, 2.60437945, 2.604214622, 2.604051686, 2.60389061, 2.603731363, 2.603573912, 2.603418229, 2.603264282, 2.603112045, 2.602961487, 2.602812582, 2.602665303, 2.602519622, 2.602375515, 2.602232955, 2.602091918, 2.60195238, 2.601814317, 2.601677705, 2.601542523, 2.601408747, 2.601276355, 2.601145327, 2.601015642, 2.600887278, 2.600760216, 2.600634436 };
+}
+
+public enum Significance
+{
+	P01,
+	P05,
+	P10,
+	P15,
+	P20,
+	P25
+}
+
+public class AverageSpeed
+{
+	/// <summary>Average speed in units per second</summary>
+	public double Average { get; private set; }
+	public TimeSpan SlowWindow { get; }
+	public TimeSpan FastWindow { get; }
+	public Significance SlowSignificance { get; }
+	public Significance FastSignificance { get; }
+
+	private DateTime start;
+	private TimeSpan lastTime;
+	private double lastPosition = double.NaN;
+
+	private readonly record struct Point(TimeSpan Time, double Velocity);
+	private readonly LinkedList<Point> speeds = new();
+	private const int MAX_SPEEDS = 200;
+
+	public AverageSpeed() : this(TimeSpan.FromSeconds(15), Significance.P10, TimeSpan.FromSeconds(3), Significance.P01) { }
+
+	/// <param name="slowWindow">Total moving average time window</param>
+	/// <param name="slowSignificance">T-test signifance level at which the newest speed will be considered different from the slow window's mean speed.</param>
+	/// <param name="fastWindow">A shorter moving window of the most resent speeds. The average speed in <paramref name="fastWindow"/> is compared to the average speed in the rest of <paramref name="slowWindow"/> to quickly detect large changes in speed.</param>
+	/// <param name="fastSignificance">T-test significance level at which the mean speed in <paramref name="fastWindow"/> will be considered different from the mean speed of the remainder of <paramref name="slowWindow"/>.</param>
+	public AverageSpeed(TimeSpan slowWindow, Significance slowSignificance, TimeSpan fastWindow, Significance fastSignificance)
+	{
+		SlowWindow = ArgumentValidator.EnsureGreaterThan(slowWindow, nameof(slowWindow), fastWindow);
+		FastWindow = ArgumentValidator.EnsureGreaterThan(fastWindow, nameof(fastWindow), TimeSpan.Zero);
+		SlowSignificance = slowSignificance;
+		FastSignificance = fastSignificance;
+	}
+
+	/// <summary>Add a new position to the moving average</summary>
+	public void AddPosition(double position)
+	{
+		var now = DateTime.Now;
+		if (start == default)
+			start = now;
+
+		var time = now - start;
+
+		while (speeds.Count > MAX_SPEEDS || (speeds.Count > 2 && time - speeds.First.Value.Time > SlowWindow))
+			speeds.RemoveFirst();
+
+		if (!double.IsNaN(lastPosition))
+		{
+			var newSpeed = (position - lastPosition) / (time - lastTime).TotalSeconds;
+			speeds.AddLast(new Point(time, newSpeed));
+		}
+
+		lastTime = time;
+		lastPosition = position;
+
+		Average = ComputeNextAverage();
+	}
+
+	private double ComputeNextAverage()
+	{
+		if (speeds.Count == 0)
+			return 0;
+		else if (speeds.Count == 1)
+			return speeds.Last.Value.Velocity;
+		else
+		{
+			var n_newest = speeds.Count(s => s.Time > lastTime.Subtract(FastWindow));
+
+			var n_oldest = speeds.Count - n_newest;
+
+			if (speeds.Take(n_oldest).T_Test_2By(s => s.Velocity, speeds.TakeLast(n_newest), FastSignificance))
+			{
+				//Speeds in FastWindow are significantly different from reset of speeds in SlowWindow.
+				//Discard older speeds and keep only speeds in FastWindow
+				for (; n_oldest > 0; n_oldest--)
+					speeds.RemoveFirst();
+
+				return speeds.Average(s => s.Velocity);
+			}
+			else
+				return
+					speeds.T_Test_1By(s => s.Velocity, Average, SlowSignificance)
+					? speeds.Average(s => s.Velocity)
+					: Average;
+		}
+	}
+}

Source/AaxDecrypter/NetworkFileStream.cs

@@ -238,10 +238,10 @@ namespace AaxDecrypter
 		#region Download Stream Reader
 
 		[JsonIgnore]
-		public override bool CanRead => true;
+		public override bool CanRead => _readFile.CanRead;
 
 		[JsonIgnore]
-		public override bool CanSeek => true;
+		public override bool CanSeek => _readFile.CanSeek;
 
 		[JsonIgnore]
 		public override bool CanWrite => false;

Source/AaxDecrypter/UnencryptedAudiobookDownloader.cs

@@ -1,5 +1,4 @@
-using Dinah.Core.Net.Http;
-using FileManager;
+using FileManager;
 using System;
 using System.Threading.Tasks;
 
@@ -7,6 +6,8 @@ namespace AaxDecrypter
 {
 	public class UnencryptedAudiobookDownloader : AudiobookDownloadBase
 	{
+		protected override long InputFilePosition => InputFileStream.WritePosition;
+
 		public UnencryptedAudiobookDownloader(string outFileName, string cacheDirectory, IDownloadOptions dlLic)
 			: base(outFileName, cacheDirectory, dlLic)
 		{
@@ -25,31 +26,9 @@ namespace AaxDecrypter
 
 		protected override async Task<bool> Step_DownloadAndDecryptAudiobookAsync()
 		{
-			DateTime startTime = DateTime.Now;
-
 			// MUST put InputFileStream.Length first, because it starts background downloader.
-
-			while (InputFileStream.Length > InputFileStream.WritePosition && !InputFileStream.IsCancelled)
-			{
-				var rate = InputFileStream.WritePosition / (DateTime.Now - startTime).TotalSeconds;
-
-				var estTimeRemaining = (InputFileStream.Length - InputFileStream.WritePosition) / rate;
-
-				if (double.IsNormal(estTimeRemaining))
-					OnDecryptTimeRemaining(TimeSpan.FromSeconds(estTimeRemaining));
-
-				var progressPercent = 100d * InputFileStream.WritePosition / InputFileStream.Length;
-
-				OnDecryptProgressUpdate(
-					new DownloadProgress
-					{
-						ProgressPercentage = progressPercent,
-						BytesReceived = InputFileStream.WritePosition,
-						TotalBytesToReceive = InputFileStream.Length
-					});
-
+			while (InputFileStream.Length > InputFilePosition && !InputFileStream.IsCancelled)
 				await Task.Delay(200);
-			}
 
 			if (IsCanceled)
 				return false;

Source/AppScaffolding/AppScaffolding.csproj

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

Source/AppScaffolding/UNSAFE_MigrationHelper.cs

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using Dinah.Core;
+using LibationFileManager;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 
@@ -25,9 +26,6 @@ namespace AppScaffolding
 			: value;
 
 		#region 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);
 
 		public static bool APPSETTINGS_TryGet(string key, out string value)
 		{
@@ -61,11 +59,7 @@ namespace AppScaffolding
 		/// <param name="save">True: save if contents changed. False: no not attempt save</param>
 		private static void process_APPSETTINGS_Json(Action<JObject> action, bool save = true)
 		{
-			// only insert if not exists
-			if (!APPSETTINGS_Json_Exists)
-				return;
-
-			var startingContents = File.ReadAllText(APPSETTINGS_JSON);
+			var startingContents = File.ReadAllText(Configuration.AppsettingsJsonFile);
 
 			JObject jObj;
 			try
@@ -88,7 +82,7 @@ namespace AppScaffolding
 			if (startingContents.EqualsInsensitive(endingContents_indented) || startingContents.EqualsInsensitive(endingContents_compact))
 				return;
 
-			File.WriteAllText(APPSETTINGS_JSON, endingContents_indented);
+			File.WriteAllText(Configuration.AppsettingsJsonFile, endingContents_indented);
 			System.Threading.Thread.Sleep(100);
 		}
 		#endregion

Source/AppScaffolding/UpgradeProperties.cs

@@ -1,11 +1,11 @@
-using System;
+using NPOI.XWPF.UserModel;
+using System;
 using System.Text.RegularExpressions;
 
 namespace AppScaffolding
 {
-	public record UpgradeProperties
+	public partial record UpgradeProperties
 	{
-		private static readonly Regex linkstripper = new Regex(@"\[(.*)\]\(.*\)");
 		public string ZipUrl { get; }
 		public string HtmlUrl { get; }
 		public string ZipName { get; }
@@ -18,17 +18,10 @@ namespace AppScaffolding
 			HtmlUrl = htmlUrl;
 			ZipUrl = zipUrl;
 			LatestRelease = latestRelease;
-			Notes = stripMarkdownLinks(notes);
+			Notes = LinkStripRegex().Replace(notes, "$1");
 		}
-		private string stripMarkdownLinks(string body)
-		{
-			body = body.Replace(@"\", "");
-			var matches = linkstripper.Matches(body);
 
-			foreach (Match match in matches)
-				body = body.Replace(match.Groups[0].Value, match.Groups[1].Value);
-
-			return body;
-		}
+		[GeneratedRegex(@"\[(.*)\]\(.*\)")]
+		private static partial Regex LinkStripRegex();
 	}
 }

Source/AudibleUtilities/AudibleUtilities.csproj

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

Source/DataLayer/DataLayer.csproj

@@ -10,7 +10,7 @@
   </PropertyGroup>
   
   <ItemGroup>
-    <PackageReference Include="Dinah.Core" Version="7.2.1.1" />
+    <PackageReference Include="Dinah.Core" Version="7.2.2.1" />
     <PackageReference Include="Dinah.EntityFrameworkCore" Version="7.1.1.1" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.2">
       <PrivateAssets>all</PrivateAssets>

Source/DataLayer/EfClasses/UserDefinedItem.cs

@@ -20,7 +20,7 @@ namespace DataLayer
         PartialDownload = 0x1000
     }
 
-    public class UserDefinedItem
+    public partial class UserDefinedItem
     {
         internal int BookId { get; private set; }
         public Book Book { get; private set; }
@@ -51,18 +51,23 @@ namespace DataLayer
 		public IEnumerable<string> TagsEnumerated => Tags == "" ? new string[0] : Tags.Split(null as char[], StringSplitOptions.RemoveEmptyEntries);
 
 		#region sanitize tags: space delimited. Inline/denormalized. Lower case. Alpha numeric and hyphen
-		// only legal chars are letters numbers underscores and separating whitespace
-		//
-		// technically, the only char.s which aren't easily supported are  \  [  ]
-		// however, whitelisting is far safer than blacklisting (eg: new lines, non-printable character)
-		// it's easy to expand whitelist as needed
-		// for lucene, ToLower() isn't needed because search is case-inspecific. for here, it prevents duplicates
-		//
-		// there are also other allowed but misleading characters. eg: the ^ operator defines a 'boost' score
-		// full list of characters which must be escaped:
-		//   + - && || ! ( ) { } [ ] ^ " ~ * ? : \
-		static Regex regex { get; } = new Regex(@"[^\w\d\s_]", RegexOptions.Compiled);
-        private static string sanitize(string input)
+
+		/// <summary>
+		/// only legal chars are letters numbers underscores and separating whitespace
+		/// 
+		/// technically, the only char.s which aren't easily supported are  \  [  ]
+		/// however, whitelisting is far safer than blacklisting (eg: new lines, non-printable character)
+		/// it's easy to expand whitelist as needed
+		/// for lucene, ToLower() isn't needed because search is case-inspecific. for here, it prevents duplicates
+		/// 
+		/// there are also other allowed but misleading characters. eg: the ^ operator defines a 'boost' score
+		/// full list of characters which must be escaped:
+		///     + - && || ! ( ) { } [ ] ^ " ~ * ? : \
+		/// </summary>
+
+		[GeneratedRegex(@"[^\w\d\s_]")]
+		private static partial Regex IllegalCharacterRegex();
+		private static string sanitize(string input)
         {
             if (string.IsNullOrWhiteSpace(input))
                 return "";
@@ -73,9 +78,9 @@ namespace DataLayer
                 // assume a hyphen is supposed to be an underscore
                 .Replace("-", "_");
 
-            var unique = regex
-                // turn illegal characters into a space. this will also take care of turning new lines into spaces
-                .Replace(str, " ")
+            var unique = IllegalCharacterRegex()
+				// turn illegal characters into a space. this will also take care of turning new lines into spaces
+				.Replace(str, " ")
                 // split and remove excess spaces
                 .Split(new[] { ' ' }, StringSplitOptions.RemoveEmptyEntries)
                 // de-dup

Source/FileLiberator/ConvertToMp3.cs

@@ -16,8 +16,7 @@ namespace FileLiberator
 	{
 		public override string Name => "Convert to Mp3";
 		private Mp4Operation Mp4Operation;
-		private TimeSpan bookDuration;
-		private long fileSize;
+		private readonly AaxDecrypter.AverageSpeed averageSpeed = new();
 		private static string Mp3FileName(string m4bPath) => Path.ChangeExtension(m4bPath ?? "", ".mp3");
 
 		public override Task CancelAsync() => Mp4Operation?.CancelAsync() ?? Task.CompletedTask;		
@@ -45,9 +44,6 @@ namespace FileLiberator
 
 					var m4bBook = await Task.Run(() => new Mp4File(m4bPath, FileAccess.Read));
 
-					bookDuration = m4bBook.Duration;
-					fileSize = m4bBook.InputStream.Length;
-
 					OnTitleDiscovered(m4bBook.AppleTags.Title);
 					OnAuthorsDiscovered(m4bBook.AppleTags.FirstAuthor);
 					OnNarratorsDiscovered(m4bBook.AppleTags.Narrator);
@@ -105,20 +101,22 @@ namespace FileLiberator
 
 		private void M4bBook_ConversionProgressUpdate(object sender, ConversionProgressEventArgs e)
 		{
-			var remainingSecsToProcess = (bookDuration - e.ProcessPosition).TotalSeconds;
-			var estTimeRemaining = remainingSecsToProcess / e.ProcessSpeed;
-				
+			averageSpeed.AddPosition(e.ProcessPosition.TotalSeconds);
+
+			var remainingTimeToProcess = (e.TotalDuration - e.ProcessPosition).TotalSeconds;
+			var estTimeRemaining = remainingTimeToProcess / averageSpeed.Average;
+
 			if (double.IsNormal(estTimeRemaining))
 				OnStreamingTimeRemaining(TimeSpan.FromSeconds(estTimeRemaining));
 
-			double progressPercent = 100 * e.ProcessPosition.TotalSeconds / bookDuration.TotalSeconds;
+			double progressPercent = 100 * e.ProcessPosition.TotalSeconds / e.TotalDuration.TotalSeconds;
 
 			OnStreamingProgressChanged(
 				new DownloadProgress
 				{
 					ProgressPercentage = progressPercent,
-					BytesReceived = (long)(fileSize * progressPercent),
-					TotalBytesToReceive = fileSize
+					BytesReceived = (long)e.ProcessPosition.TotalSeconds,
+					TotalBytesToReceive = (long)e.TotalDuration.TotalSeconds
 				});
 		}
 	}

Source/FileLiberator/_InternalsVisible.cs

@@ -1 +0,0 @@
-[assembly: System.Runtime.CompilerServices.InternalsVisibleTo(nameof(FileLiberator) + ".Tests")]

Source/FileManager/FileManager.csproj

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

Source/FileManager/LongPath.cs

@@ -62,10 +62,10 @@ namespace FileManager
 
 		public static implicit operator LongPath(string path)
 		{
-			if (!IsWindows) return new LongPath(path);
-
 			if (path is null) return null;
 
+			if (!IsWindows) return new LongPath(path);
+
 			//File I/O functions in the Windows API convert "/" to "\" as part of converting
 			//the name to an NT-style name, except when using the "\\?\" prefix 
 			path = path.Replace(System.IO.Path.AltDirectorySeparatorChar, System.IO.Path.DirectorySeparatorChar);

Source/FileManager/NamingTemplate/NamingTemplate.cs

@@ -9,14 +9,14 @@ public class NamingTemplate
 {
 	public string TemplateText { get; private set; }
 	public IEnumerable<ITemplateTag> TagsInUse => _tagsInUse;
-	public IEnumerable<ITemplateTag> TagsRegistered => Classes.SelectMany(t => t).DistinctBy(t => t.TagName);
+	public IEnumerable<ITemplateTag> TagsRegistered => TagCollections.SelectMany(t => t).DistinctBy(t => t.TagName);
 	public IEnumerable<string> Warnings => errors.Concat(warnings);
 	public IEnumerable<string> Errors => errors;
 
 	private Delegate templateToString;
 	private readonly List<string> warnings = new();
 	private readonly List<string> errors = new();
-	private readonly IEnumerable<TagCollection> Classes;
+	private readonly IEnumerable<TagCollection> TagCollections;
 	private readonly List<ITemplateTag> _tagsInUse = new();
 
 	public const string ERROR_NULL_IS_INVALID = "Null template is invalid.";
@@ -25,21 +25,18 @@ public class NamingTemplate
 	public const string WARNING_NO_TAGS = "Should use tags. Eg: <title>";
 
 	/// <summary>
-	/// Invoke the <see cref="NamingTemplate"/> to  
+	/// Invoke the <see cref="NamingTemplate"/>
 	/// </summary>
 	/// <param name="propertyClasses">Instances of the TClass used in <see cref="PropertyTagCollection{TClass}"/> and <see cref="ConditionalTagCollection{TClass}"/></param>
-	/// <returns></returns>
 	public TemplatePart Evaluate(params object[] propertyClasses)
 	{
-		//Match propertyClasses to the arguments required by templateToString.DynamicInvoke()
-		var delegateArgTypes = templateToString.GetType().GenericTypeArguments[..^1];
+		// Match propertyClasses to the arguments required by templateToString.DynamicInvoke(). 
+		// First parameter is "this", so ignore it.
+		var delegateArgTypes = templateToString.Method.GetParameters().Skip(1);
 
-		object[] args = new object[delegateArgTypes.Length];
-
-		for (int i = 0; i < delegateArgTypes.Length; i++)
-			args[i] = propertyClasses.First(o => o.GetType() == delegateArgTypes[i]);
-
-		if (args.Any(a => a is null))
+		object[] args = delegateArgTypes.Join(propertyClasses, o => o.ParameterType, i => i.GetType(), (_, i) => i).ToArray();
+		
+		if (args.Length != delegateArgTypes.Count())
 			throw new ArgumentException($"This instance of {nameof(NamingTemplate)} requires the following arguments: {string.Join(", ", delegateArgTypes.Select(t => t.Name).Distinct())}");
 
 		return ((TemplatePart)templateToString.DynamicInvoke(args)).FirstPart;
@@ -47,22 +44,17 @@ public class NamingTemplate
 
 	/// <summary>Parse a template string to a <see cref="NamingTemplate"/></summary>
 	/// <param name="template">The template string to parse</param>
-	/// <param name="tagClasses">A collection of <see cref="TagCollection"/> with
+	/// <param name="tagCollections">A collection of <see cref="TagCollection"/> with
 	/// properties registered to match to the <paramref name="template"/></param>
-	public static NamingTemplate Parse(string template, IEnumerable<TagCollection> tagClasses)
+	public static NamingTemplate Parse(string template, IEnumerable<TagCollection> tagCollections)
 	{
-		var namingTemplate = new NamingTemplate(tagClasses);
+		var namingTemplate = new NamingTemplate(tagCollections);
 		try
 		{
 			BinaryNode intermediate = namingTemplate.IntermediateParse(template);
 			Expression evalTree = GetExpressionTree(intermediate);
 
-			List<ParameterExpression> parameters = new();
-
-			foreach (var tagclass in tagClasses)
-					parameters.Add(tagclass.Parameter);
-
-			namingTemplate.templateToString = Expression.Lambda(evalTree, parameters).Compile();
+			namingTemplate.templateToString = Expression.Lambda(evalTree, tagCollections.Select(tc => tc.Parameter)).Compile();
 		}
 		catch(Exception ex)
 		{
@@ -73,7 +65,7 @@ public class NamingTemplate
 
 	private NamingTemplate(IEnumerable<TagCollection> properties)
 	{
-		Classes = properties;
+		TagCollections = properties;
 	}
 
 	/// <summary>Builds an <see cref="Expression"/> tree that will evaluate to a <see cref="TemplatePart"/></summary>
@@ -84,7 +76,7 @@ public class NamingTemplate
 		else if (node.IsConditional) return Expression.Condition(node.Expression, concatExpression(node), TemplatePart.Blank);
 		else return concatExpression(node);
 
-		Expression concatExpression(BinaryNode node)
+		static Expression concatExpression(BinaryNode node)
 			=> TemplatePart.CreateConcatenation(GetExpressionTree(node.LeftChild), GetExpressionTree(node.RightChild));
 	}
 
@@ -100,8 +92,8 @@ public class NamingTemplate
 
 		TemplateText = templateString;
 
-		BinaryNode currentNode = BinaryNode.CreateRoot();
-		BinaryNode topNode = currentNode;
+		BinaryNode topNode = BinaryNode.CreateRoot();
+		BinaryNode currentNode = topNode;
 		List<char> literalChars = new();
 
 		while (templateString.Length > 0)
@@ -170,7 +162,7 @@ public class NamingTemplate
 		{
 			if (literalChars.Count != 0)
 			{
-				currentNode = currentNode.AddNewNode(BinaryNode.CreateValue(new string(literalChars.ToArray())));
+				currentNode = currentNode.AddNewNode(BinaryNode.CreateValue(string.Concat(literalChars)));
 				literalChars.Clear();
 			}
 		}
@@ -178,7 +170,7 @@ public class NamingTemplate
 
 	private bool StartsWith(string template, out string exactName, out IPropertyTag propertyTag, out Expression valueExpression)
 	{
-		foreach (var pc in Classes)
+		foreach (var pc in TagCollections)
 		{
 			if (pc.StartsWith(template, out exactName, out propertyTag, out valueExpression))
 				return true;
@@ -192,7 +184,7 @@ public class NamingTemplate
 
 	private bool StartsWithClosing(string template, out string exactName, out IClosingPropertyTag closingPropertyTag)
 	{
-		foreach (var pc in Classes)
+		foreach (var pc in TagCollections)
 		{
 			if (pc.StartsWithClosing(template, out exactName, out closingPropertyTag))
 				return true;

Source/FileManager/NamingTemplate/PropertyTagCollection[TClass].cs

@@ -44,6 +44,7 @@ public class PropertyTagCollection<TClass> : TagCollection
 	/// <summary>
 	/// Register a nullable value type <typeparamref name="TClass"/> property.
 	/// </summary>
+	/// <typeparam name="TProperty">Type of the property from <see cref="TClass"/></typeparam>
 	/// <param name="propertyGetter">A Func to get the string property from <see cref="TClass"/></param>
 	/// <param name="toString">ToString function that accepts the <typeparamref name="TProperty"/> property and returnes a string</param>
 	public void Add<TProperty>(ITemplateTag templateTag, Func<TClass, TProperty?> propertyGetter, Func<TProperty, string> toString)
@@ -64,6 +65,7 @@ public class PropertyTagCollection<TClass> : TagCollection
 	/// <summary>
 	/// Register a <typeparamref name="TClass"/> property.
 	/// </summary>
+	/// <typeparam name="TProperty">Type of the property from <see cref="TClass"/></typeparam>
 	/// <param name="propertyGetter">A Func to get the string property from <see cref="TClass"/></param>
 	/// <param name="toString">ToString function that accepts the <typeparamref name="TProperty"/> property and returnes a string</param>
 	public void Add<TProperty>(ITemplateTag templateTag, Func<TClass, TProperty> propertyGetter, Func<TProperty, string> toString)
@@ -75,17 +77,26 @@ public class PropertyTagCollection<TClass> : TagCollection
 		ArgumentValidator.EnsureNotNull(templateTag, nameof(templateTag));
 		ArgumentValidator.EnsureNotNull(propertyGetter, nameof(propertyGetter));
 
-		formatter ??= GetDefaultFormatter<TPropertyValue>();
+		var expr = Expression.Call(Expression.Constant(propertyGetter.Target), propertyGetter.Method, Parameter);
 
-		if (formatter is null)
-			RegisterWithToString<TProperty, TPropertyValue>(templateTag, propertyGetter, null);
+		if ((formatter ??= GetDefaultFormatter<TPropertyValue>()) is null)
+			AddPropertyTag(new PropertyTag<TPropertyValue>(templateTag, Options, expr, ToStringFunc));
 		else
-		{
-			var expr = Expression.Call(Expression.Constant(propertyGetter.Target), propertyGetter.Method, Parameter);
-			AddPropertyTag(PropertyTag.Create(templateTag, Options, expr, formatter));
-		}
+			AddPropertyTag(new PropertyTag<TPropertyValue>(templateTag, Options, expr, formatter));
 	}
 
+	private void RegisterWithToString<TProperty, TPropertyValue>
+		(ITemplateTag templateTag, Func<TClass, TProperty> propertyGetter, Func<TPropertyValue, string> toString)
+	{
+		ArgumentValidator.EnsureNotNull(templateTag, nameof(templateTag));
+		ArgumentValidator.EnsureNotNull(propertyGetter, nameof(propertyGetter));
+
+		var expr = Expression.Call(Expression.Constant(propertyGetter.Target), propertyGetter.Method, Parameter);
+		AddPropertyTag(new PropertyTag<TPropertyValue>(templateTag, Options, expr, toString ?? ToStringFunc));
+	}
+
+	private static string ToStringFunc<T>(T propertyValue) => propertyValue?.ToString() ?? "";
+
 	private PropertyFormatter<T> GetDefaultFormatter<T>()
 	{
 		try
@@ -93,54 +104,35 @@ public class PropertyTagCollection<TClass> : TagCollection
 			var del = defaultFormatters.FirstOrDefault(kvp => kvp.Key == typeof(T)).Value;
 			return del is null ? null : Delegate.CreateDelegate(typeof(PropertyFormatter<T>), del.Target, del.Method) as PropertyFormatter<T>;
 		}
-		catch
-		{
-			return null;
-		}
+		catch { return null; }
 	}
 
-	private void RegisterWithToString<TProperty, TPropertyValue>
-		(ITemplateTag templateTag, Func<TClass, TProperty> propertyGetter, Func<TPropertyValue, string> toString)
+	private class PropertyTag<TPropertyValue> : TagBase
 	{
-		static string ToStringFunc(TPropertyValue value) => value?.ToString() ?? "";
-		ArgumentValidator.EnsureNotNull(templateTag, nameof(templateTag));
-		ArgumentValidator.EnsureNotNull(propertyGetter, nameof(propertyGetter));
+		private Func<Expression, string, Expression> CreateToStringExpression { get; }
 
-		var expr = Expression.Call(Expression.Constant(propertyGetter.Target), propertyGetter.Method, Parameter);
-		AddPropertyTag(PropertyTag.Create(templateTag, Options, expr, toString ?? ToStringFunc));
-	}
-
-	private class PropertyTag : TagBase
-	{
-		private Func<Expression, string, Expression> CreateToStringExpression { get; init; }
-		private PropertyTag(ITemplateTag templateTag, Expression propertyGetter) : base(templateTag, propertyGetter) { }
-
-		public static PropertyTag Create<TPropertyValue>(ITemplateTag templateTag, RegexOptions options, Expression propertyGetter, PropertyFormatter<TPropertyValue> formatter)
+		public PropertyTag(ITemplateTag templateTag, RegexOptions options, Expression propertyGetter, PropertyFormatter<TPropertyValue> formatter)
+			: base(templateTag, propertyGetter)
 		{
-			return new PropertyTag(templateTag, propertyGetter)
-			{
-				NameMatcher = new Regex(@$"^<{templateTag.TagName.Replace(" ", "\\s*?")}\s*?(?:\[([^\[\]]*?)\]\s*?)?>", options),
-				CreateToStringExpression = (expVal, format) =>
+			NameMatcher = new Regex(@$"^<{templateTag.TagName.Replace(" ", "\\s*?")}\s*?(?:\[([^\[\]]*?)\]\s*?)?>", options);
+			CreateToStringExpression = (expVal, format) =>
 				Expression.Call(
 					formatter.Target is null ? null : Expression.Constant(formatter.Target),
 					formatter.Method,
 					Expression.Constant(templateTag),
 					expVal,
-					Expression.Constant(format))
-			};
+					Expression.Constant(format));
 		}
 
-		public static PropertyTag Create<TPropertyValue>(ITemplateTag templateTag, RegexOptions options, Expression propertyGetter, Func<TPropertyValue, string> toString)
+		public PropertyTag(ITemplateTag templateTag, RegexOptions options, Expression propertyGetter, Func<TPropertyValue, string> toString)
+			: base(templateTag, propertyGetter)
 		{
-			return new PropertyTag(templateTag, propertyGetter)
-			{
-				NameMatcher = new Regex(@$"^<{templateTag.TagName}>", options),
-				CreateToStringExpression = (expVal, _) =>
+			NameMatcher = new Regex(@$"^<{templateTag.TagName.Replace(" ", "\\s*?")}>", options);
+			CreateToStringExpression = (expVal, _) =>
 					Expression.Call(
 						toString.Target is null ? null : Expression.Constant(toString.Target),
 						toString.Method,
-						expVal)
-			};
+						expVal);
 		}
 
 		protected override Expression GetTagExpression(string exactName, string formatString)

Source/FileManager/NamingTemplate/TagCollection.cs

@@ -10,11 +10,11 @@ namespace FileManager.NamingTemplate;
 /// <summary>A collection of <see cref="IPropertyTag"/>s registered to a single <see cref="Type"/>.</summary>
 public abstract class TagCollection : IEnumerable<ITemplateTag>
 {
-	/// <summary>The <see cref="ParameterExpression"/> of the <see cref="TagCollection"/>'s TClass type.</summary>
-	public ParameterExpression Parameter { get; }
 	/// <summary>The <see cref="ITemplateTag"/>s registered with this <see cref="TagCollection"/> </summary>
 	public IEnumerator<ITemplateTag> GetEnumerator() => PropertyTags.Select(p => p.TemplateTag).GetEnumerator();
 
+	/// <summary>The <see cref="ParameterExpression"/> of the <see cref="TagCollection"/>'s TClass type.</summary>
+	internal ParameterExpression Parameter { get; }
 	protected RegexOptions Options { get; } = RegexOptions.Compiled;
 	private List<IPropertyTag> PropertyTags { get; } = new();
 

Source/FileManager/_InternalsVisible.cs

@@ -1 +0,0 @@
-[assembly: System.Runtime.CompilerServices.InternalsVisibleTo(nameof(FileManager) + ".Tests")]

Source/HangoverAvalonia/ViewModels/MainVM.Database.cs

@@ -17,7 +17,7 @@ namespace HangoverAvalonia.ViewModels
 
 		private void Load_databaseVM()
 		{
-			_tab = new(new(() => SqlQuery, s => SqlResults = s, s => SqlResults = s));
+			_tab = new(new DatabaseTabCommands(() => SqlQuery, s => SqlResults += s, s => SqlResults = s));
 
 			_tab.LoadDatabaseFile();
 			if (_tab.DbFile is null)

Source/HangoverWinForms/HangoverWinForms.csproj

@@ -4,6 +4,7 @@
     <OutputType>WinExe</OutputType>
     <TargetFramework>net7.0-windows</TargetFramework>
     <EnableWindowsTargeting>true</EnableWindowsTargeting>
+	<AssemblyName>Hangover</AssemblyName>
     <UseWindowsForms>true</UseWindowsForms>
     <ApplicationIcon>hangover.ico</ApplicationIcon>
     <ImplicitUsings>enable</ImplicitUsings>

Source/Libation.sln

@@ -93,6 +93,14 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MacOSConfigApp", "LoadByOS\
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WindowsConfigApp", "LoadByOS\WindowsConfigApp\WindowsConfigApp.csproj", "{5F65A509-26E3-4B02-B403-EEB6F0EF391F}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibationUiBase", "LibationUiBase\LibationUiBase.csproj", "{E90C4651-AF11-41B4-A839-10082D0391F9}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Hangover", "Hangover", "{FDDABAFE-35AD-42FC-AC95-0B1FE0DF0DDE}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Libation UI", "Libation UI", "{53758A35-1C7E-4702-9B96-433ABA457B37}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Libation CLI", "Libation CLI", "{47E27674-595D-4F7A-8CFB-127E768E1D1E}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -207,6 +215,10 @@ Global
 		{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
+		{E90C4651-AF11-41B4-A839-10082D0391F9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E90C4651-AF11-41B4-A839-10082D0391F9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E90C4651-AF11-41B4-A839-10082D0391F9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E90C4651-AF11-41B4-A839-10082D0391F9}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -218,21 +230,21 @@ Global
 		{393B5B27-D15C-4F77-9457-FA14BA8F3C73} = {41CDCC73-9B81-49DD-9570-C54406E852AF}
 		{06882742-27A6-4347-97D9-56162CEC9C11} = {F0CBB7A7-D3FB-41FF-8F47-CF3F6A592249}
 		{2E1F5DB4-40CC-4804-A893-5DCE0193E598} = {41CDCC73-9B81-49DD-9570-C54406E852AF}
-		{635F00E1-AAD1-45F7-BEB7-D909AD33B9F6} = {8679CAC8-9164-4007-BDD2-F004810EDA14}
+		{635F00E1-AAD1-45F7-BEB7-D909AD33B9F6} = {53758A35-1C7E-4702-9B96-433ABA457B37}
 		{401865F5-1942-4713-B230-04544C0A97B0} = {41CDCC73-9B81-49DD-9570-C54406E852AF}
 		{B95650EA-25F0-449E-BA5D-99126BC5D730} = {41CDCC73-9B81-49DD-9570-C54406E852AF}
 		{C5B21768-C7C9-4FCB-AC1E-187B223D5A98} = {67E66E82-5532-4440-AFB3-9FB1DF9DEF53}
-		{428163C3-D558-4914-B570-A92069521877} = {8679CAC8-9164-4007-BDD2-F004810EDA14}
+		{428163C3-D558-4914-B570-A92069521877} = {47E27674-595D-4F7A-8CFB-127E768E1D1E}
 		{595E7C4D-506D-486D-98B7-5FDDF398D033} = {8679CAC8-9164-4007-BDD2-F004810EDA14}
 		{E86014F9-E4B3-4CD4-A210-2B3DB571DD86} = {43E3ACB3-E0BC-4370-8DBB-E3720C8C8FD1}
 		{788294BE-0D8E-40D4-9CEE-67896FBB52CE} = {67E66E82-5532-4440-AFB3-9FB1DF9DEF53}
 		{5B8FC827-BF58-4CB1-A59E-BDEB9C62A05E} = {67E66E82-5532-4440-AFB3-9FB1DF9DEF53}
 		{F2E04270-4551-41C4-99FF-E7125BED708C} = {67E66E82-5532-4440-AFB3-9FB1DF9DEF53}
 		{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}
+		{40C67036-C1A7-4FDF-AA83-8EC902E257F3} = {FDDABAFE-35AD-42FC-AC95-0B1FE0DF0DDE}
+		{F612D06F-3134-4B9B-95CD-EB3FC798AE60} = {53758A35-1C7E-4702-9B96-433ABA457B37}
+		{8A7B01D3-9830-44FD-91A1-D8D010996BEB} = {FDDABAFE-35AD-42FC-AC95-0B1FE0DF0DDE}
+		{5C7005BA-7D83-4E99-8073-D970943A7D61} = {FDDABAFE-35AD-42FC-AC95-0B1FE0DF0DDE}
 		{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}
@@ -241,6 +253,10 @@ Global
 		{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}
+		{E90C4651-AF11-41B4-A839-10082D0391F9} = {53758A35-1C7E-4702-9B96-433ABA457B37}
+		{FDDABAFE-35AD-42FC-AC95-0B1FE0DF0DDE} = {8679CAC8-9164-4007-BDD2-F004810EDA14}
+		{53758A35-1C7E-4702-9B96-433ABA457B37} = {8679CAC8-9164-4007-BDD2-F004810EDA14}
+		{47E27674-595D-4F7A-8CFB-127E768E1D1E} = {8679CAC8-9164-4007-BDD2-F004810EDA14}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {615E00ED-BAEF-4E8E-A92A-9B82D87942A9}

Source/LibationAvalonia/App.axaml.cs

@@ -11,7 +11,6 @@ using System.Threading.Tasks;
 using System.Collections.Generic;
 using System.IO;
 using ApplicationServices;
-using Dinah.Core;
 
 namespace LibationAvalonia
 {
@@ -53,7 +52,7 @@ namespace LibationAvalonia
 					// check for existing settings in default location
 					var defaultSettingsFile = Path.Combine(defaultLibationFilesDir, "Settings.json");
 					if (Configuration.SettingsFileIsValid(defaultSettingsFile))
-						config.SetLibationFiles(defaultLibationFilesDir);
+						Configuration.SetLibationFiles(defaultLibationFilesDir);
 
 					if (config.LibationSettingsAreValid)
 					{
@@ -86,7 +85,7 @@ namespace LibationAvalonia
 				// - error message, Exit()
 				if (setupDialog.IsNewUser)
 				{
-					setupDialog.Config.SetLibationFiles(Configuration.UserProfile);
+					Configuration.SetLibationFiles(Configuration.UserProfile);
 					ShowSettingsWindow(desktop, setupDialog.Config, OnSettingsCompleted);
 				}
 				else if (setupDialog.IsReturningUser)
@@ -178,7 +177,7 @@ namespace LibationAvalonia
 
 		private async void OnLibationFilesCompleted(IClassicDesktopStyleApplicationLifetime desktop, LibationFilesDialog libationFilesDialog, Configuration config)
 		{
-			config.SetLibationFiles(libationFilesDialog.SelectedDirectory);
+			Configuration.SetLibationFiles(libationFilesDialog.SelectedDirectory);
 			if (config.LibationSettingsAreValid)
 			{
 				await RunMigrationsAsync(config);

Source/LibationAvalonia/Dialogs/EditTemplateDialog.axaml.cs

@@ -29,7 +29,7 @@ namespace LibationAvalonia.Dialogs
 				var editor = TemplateEditor<Templates.FileTemplate>.CreateFilenameEditor(Configuration.Instance.Books, Configuration.Instance.FileTemplate);
 				_viewModel = new(Configuration.Instance, editor);
 				_viewModel.resetTextBox(editor.EditingTemplate.TemplateText);
-				Title = $"Edit {editor.EditingTemplate.Name}";
+				Title = $"Edit {editor.TemplateName}";
 				DataContext = _viewModel;
 			}
 		}
@@ -40,7 +40,7 @@ namespace LibationAvalonia.Dialogs
 
 			_viewModel = new EditTemplateViewModel(Configuration.Instance, templateEditor);
 			_viewModel.resetTextBox(templateEditor.EditingTemplate.TemplateText);
-			Title = $"Edit {templateEditor.EditingTemplate.Name}";
+			Title = $"Edit {templateEditor.TemplateName}";
 			DataContext = _viewModel;
 		}
 
@@ -82,7 +82,7 @@ namespace LibationAvalonia.Dialogs
 			{
 				config = configuration;
 				TemplateEditor = templates;
-				Description = templates.EditingTemplate.Description;
+				Description = templates.TemplateDescription;
 				ListItems
 				= new AvaloniaList<Tuple<string, string, string>>(
 					TemplateEditor

Source/LibationAvalonia/Dialogs/LocateAudiobooksDialog.axaml

@@ -0,0 +1,30 @@
+<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="600" d:DesignHeight="450"
+		Width="600" Height="450"
+		x:Class="LibationAvalonia.Dialogs.LocateAudiobooksDialog"
+        Title="Locate Audiobooks"
+		WindowStartupLocation="CenterOwner"
+		Icon="/Assets/libation.ico">
+
+	<Grid Margin="5" ColumnDefinitions="*,Auto" RowDefinitions="Auto,*">
+		<TextBlock Grid.Column="0" Text="Found Audiobooks" />
+		<StackPanel Grid.Column="1"  Orientation="Horizontal">
+
+			<TextBlock Text="IDs Found: " />
+			<TextBlock Text="{Binding FoundAsins}" />
+		</StackPanel>
+		<ListBox Margin="0,5,0,0" Grid.Row="1" Grid.ColumnSpan="2" Name="foundAudiobooksLB" Items="{Binding FoundFiles}" AutoScrollToSelectedItem="true">
+			<ListBox.ItemTemplate>
+				<DataTemplate>
+					<Grid ColumnDefinitions="Auto,*">
+						<TextBlock Grid.Column="0" Margin="0,0,10,0" Text="{Binding Item1}" />
+						<TextBlock Grid.Column="1" Text="{Binding Item2}" />
+					</Grid>
+				</DataTemplate>
+			</ListBox.ItemTemplate>
+		</ListBox>
+	</Grid>
+</Window>

Source/LibationAvalonia/Dialogs/LocateAudiobooksDialog.axaml.cs

@@ -0,0 +1,115 @@
+using ApplicationServices;
+using Avalonia.Collections;
+using Avalonia.Controls;
+using Avalonia.Platform.Storage;
+using Avalonia.Platform.Storage.FileIO;
+using DataLayer;
+using LibationAvalonia.ViewModels;
+using LibationFileManager;
+using ReactiveUI;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace LibationAvalonia.Dialogs
+{
+	public partial class LocateAudiobooksDialog : DialogWindow
+	{
+		private event EventHandler<FilePathCache.CacheEntry> FileFound;
+		private readonly CancellationTokenSource tokenSource = new();
+		private readonly List<string> foundAsins = new();
+		private readonly LocatedAudiobooksViewModel _viewModel;
+		public LocateAudiobooksDialog()
+		{
+			InitializeComponent();
+
+			DataContext = _viewModel = new();
+			this.RestoreSizeAndLocation(Configuration.Instance);
+
+			if (Design.IsDesignMode)
+			{
+				_viewModel.FoundFiles.Add(new("[0000001]", "Filename 1.m4b"));
+				_viewModel.FoundFiles.Add(new("[0000002]", "Filename 2.m4b"));
+			}
+			else
+			{
+				Opened += LocateAudiobooksDialog_Opened;
+				FileFound += LocateAudiobooks_FileFound;
+				Closing += LocateAudiobooksDialog_Closing;
+			}
+		}
+
+		private void LocateAudiobooksDialog_Closing(object sender, System.ComponentModel.CancelEventArgs e)
+		{
+			tokenSource.Cancel();
+			//If this dialog is closed before it's completed, Closing is fired
+			//once for the form closing and again for the MessageBox closing.
+			Closing -= LocateAudiobooksDialog_Closing;
+			this.SaveSizeAndLocation(Configuration.Instance);
+		}
+
+		private void LocateAudiobooks_FileFound(object sender, FilePathCache.CacheEntry e)
+		{
+			var newItem = new Tuple<string,string>($"[{e.Id}]", Path.GetFileName(e.Path));
+			_viewModel.FoundFiles.Add(newItem);
+			foundAudiobooksLB.SelectedItem = newItem;
+
+			if (!foundAsins.Any(asin => asin == e.Id))
+			{
+				foundAsins.Add(e.Id);
+				_viewModel.FoundAsins = foundAsins.Count;
+			}
+		}
+
+		private async void LocateAudiobooksDialog_Opened(object sender, EventArgs e)
+		{
+			var folderPicker = new FolderPickerOpenOptions
+			{
+				Title = "Select the folder to search for audiobooks",
+				AllowMultiple = false,
+				SuggestedStartLocation = new BclStorageFolder(Configuration.Instance.Books.PathWithoutPrefix) 
+			};
+
+			var selectedFolder = await StorageProvider.OpenFolderPickerAsync(folderPicker);
+
+			if (selectedFolder.FirstOrDefault().TryGetUri(out var uri) is not true || !Directory.Exists(uri.LocalPath))
+			{
+				await CancelAndCloseAsync();
+				return;
+			}
+
+			using var context = DbContexts.GetContext();
+
+			await foreach (var book in AudioFileStorage.FindAudiobooksAsync(uri.LocalPath, tokenSource.Token))
+			{
+				try
+				{
+					FilePathCache.Insert(book);
+
+					var lb = context.GetLibraryBook_Flat_NoTracking(book.Id);
+					if (lb.Book.UserDefinedItem.BookStatus is not LiberatedStatus.Liberated)
+						await Task.Run(() => lb.UpdateBookStatus(LiberatedStatus.Liberated));
+
+					FileFound?.Invoke(this, book);
+				}
+				catch (Exception ex)
+				{
+					Serilog.Log.Error(ex, "Error adding found audiobook file to Libation. {@audioFile}", book);
+				}
+			}
+
+			await MessageBox.Show(this, $"Libation has found {foundAsins.Count} unique audiobooks and added them to its database. ", $"Found {foundAsins.Count} Audiobooks");
+			await SaveAndCloseAsync();
+		}
+	}
+
+	public class LocatedAudiobooksViewModel : ViewModelBase
+	{
+		private int _foundAsins = 0;
+		public AvaloniaList<Tuple<string, string>> FoundFiles { get; } = new();
+		public int FoundAsins { get => _foundAsins; set => this.RaiseAndSetIfChanged(ref _foundAsins, value); }
+	}
+}

Source/LibationAvalonia/Dialogs/MessageBoxWindow.axaml

@@ -35,13 +35,13 @@
 			</DockPanel.Styles>
 			<StackPanel Orientation="Horizontal" HorizontalAlignment="Right" Margin="5" DockPanel.Dock="Bottom">
 				<Button Grid.Column="0" MinWidth="75" MinHeight="28" Name="Button1" Click="Button1_Click" Margin="5">
-					<TextBlock VerticalAlignment="Center" Text="{Binding Button1Text}"/>
+					<TextBlock VerticalAlignment="Center" HorizontalAlignment="Center" Text="{Binding Button1Text}"/>
 				</Button>
 				<Button Grid.Column="1" IsVisible="{Binding HasButton2}" MinWidth="75" MinHeight="28" Name="Button2" Click="Button2_Click" Margin="5">
-					<TextBlock VerticalAlignment="Center" Text="{Binding Button2Text}"/>
+					<TextBlock VerticalAlignment="Center" HorizontalAlignment="Center" Text="{Binding Button2Text}"/>
 				</Button>
 				<Button Grid.Column="2" IsVisible="{Binding HasButton3}" MinWidth="75" MinHeight="28" Name="Button3" Click="Button3_Click" Content="Cancel" Margin="5">
-					<TextBlock VerticalAlignment="Center" Text="{Binding Button3Text}"/>
+					<TextBlock VerticalAlignment="Center" HorizontalAlignment="Center" Text="{Binding Button3Text}"/>
 				</Button>
 			</StackPanel>
 		</DockPanel>

Source/LibationAvalonia/LibationAvalonia.csproj

@@ -9,9 +9,7 @@
 		<BuiltInComInteropSupport>true</BuiltInComInteropSupport>
 		<ApplicationIcon>libation.ico</ApplicationIcon>
 		<AssemblyName>Libation</AssemblyName>
-
 		<IsPublishable>true</IsPublishable>
-
 		<PublishReadyToRun>true</PublishReadyToRun>
 		<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
 		<AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
@@ -82,12 +80,6 @@
 		<None Remove="Assets\up.png" />
 	</ItemGroup>
 
-	<ItemGroup>
-		<ProjectReference Include="..\ApplicationServices\ApplicationServices.csproj" />
-		<ProjectReference Include="..\AppScaffolding\AppScaffolding.csproj" />
-		<ProjectReference Include="..\FileLiberator\FileLiberator.csproj" />
-	</ItemGroup>
-
 	<ItemGroup>
 		<Compile Update="Properties\Resources.Designer.cs">
 			<DesignTime>True</DesignTime>
@@ -117,24 +109,13 @@
 		<PackageReference Include="Avalonia.Diagnostics" Version="11.0.0-preview4 " />
 		<PackageReference Include="Avalonia.ReactiveUI" Version="11.0.0-preview4" />
 		<PackageReference Include="Avalonia.Themes.Fluent" Version="11.0.0-preview4" />
-		<PackageReference Include="Avalonia.Xaml.Behaviors" Version="11.0.0-preview4" />
 		<PackageReference Include="XamlNameReferenceGenerator" Version="1.5.1" />
 	</ItemGroup>
 
-
 	<ItemGroup>
-		<None Update="glass-with-glow_256.svg">
-			<CopyToOutputDirectory>Always</CopyToOutputDirectory>
-		</None>
-		<None Update="Libation.desktop">
-			<CopyToOutputDirectory>Always</CopyToOutputDirectory>
-		</None>
-		<None Update="ZipExtractor.exe">
-			<CopyToOutputDirectory>Always</CopyToOutputDirectory>
-		</None>
+	  <ProjectReference Include="..\LibationUiBase\LibationUiBase.csproj" />
 	</ItemGroup>
 
-
 	<Target Name="SpicNSpan" AfterTargets="Clean">
 		<!-- Remove obj folder -->
 		<RemoveDir Directories="$(BaseIntermediateOutputPath)" />

Source/LibationAvalonia/LogMe.cs

@@ -1,58 +0,0 @@
-using Avalonia.Threading;
-using System;
-using System.Threading.Tasks;
-
-namespace LibationAvalonia
-{
-	public interface ILogForm
-	{
-		void WriteLine(string text);
-	}
-
-	// decouple serilog and form. include convenience factory method
-	public class LogMe
-	{
-		public event EventHandler<string> LogInfo;
-		public event EventHandler<string> LogErrorString;
-		public event EventHandler<(Exception, string)> LogError;
-
-		private LogMe()
-		{
-			LogInfo += (_, text) => Serilog.Log.Logger.Information($"Automated backup: {text}");
-			LogErrorString += (_, text) => Serilog.Log.Logger.Error(text);
-			LogError += (_, tuple) => Serilog.Log.Logger.Error(tuple.Item1, tuple.Item2 ?? "Automated backup: error");
-		}
-		private static ILogForm LogForm;
-		public static LogMe RegisterForm<T>(T form) where T : ILogForm
-		{
-			var logMe = new LogMe();
-
-			if (form is null)
-				return logMe;
-
-			LogForm = form;
-
-			logMe.LogInfo += LogMe_LogInfo;
-			logMe.LogErrorString += LogMe_LogErrorString;
-			logMe.LogError += LogMe_LogError;
-
-			return logMe;
-		}
-
-		private static async void LogMe_LogError(object sender, (Exception, string) tuple)
-		{
-			await Dispatcher.UIThread.InvokeAsync(() => LogForm?.WriteLine(tuple.Item2 ?? "Automated backup: error"));
-			await Dispatcher.UIThread.InvokeAsync(() => LogForm?.WriteLine("ERROR: " + tuple.Item1.Message));
-		}
-
-		private static async void LogMe_LogErrorString(object sender, string text)
-			=> await Dispatcher.UIThread.InvokeAsync(() => LogForm?.WriteLine(text));
-
-		private static async void LogMe_LogInfo(object sender, string text)
-			=> await Dispatcher.UIThread.InvokeAsync(() => LogForm?.WriteLine(text));
-
-		public void Info(string text) => LogInfo?.Invoke(this, text);
-		public void Error(string text) => LogErrorString?.Invoke(this, text);
-		public void Error(Exception ex, string text = null) => LogError?.Invoke(this, (ex, text));
-	}
-}

Source/LibationAvalonia/MessageBox.cs

@@ -154,6 +154,7 @@ Libation.
 
 		private static async Task<DialogResult> ShowCoreAsync(Window owner, string message, string caption, MessageBoxButtons buttons, MessageBoxIcon icon, MessageBoxDefaultButton defaultButton, bool saveAndRestorePosition = true)
 		{
+			owner = owner?.IsLoaded is true ? owner : null;
 			var dialog = await Dispatcher.UIThread.InvokeAsync(() => CreateMessageBox(owner, message, caption, buttons, icon, defaultButton, saveAndRestorePosition));
 
 			return await DisplayWindow(dialog, owner);

Source/LibationAvalonia/Program.cs

@@ -2,6 +2,7 @@ using System;
 using System.Diagnostics;
 using System.IO;
 using System.Linq;
+using System.Reflection;
 using System.Threading.Tasks;
 using ApplicationServices;
 using Avalonia;
@@ -13,8 +14,30 @@ namespace LibationAvalonia
 {
 	static class Program
 	{
-		static void Main()
+		static void Main(string[] args)
 		{
+
+			if (Configuration.IsMacOs && args?.Length > 0 && args[0] == "hangover")
+			{
+				//Launch the Hangover app within the sandbox
+				//We can do this because we're already executing inside the sandbox.
+				//Any process created in the sandbox executes in the same sandbox.
+				//Unfortunately, all sandbox files are read/execute, so no writing!
+
+				Assembly asm = Assembly.GetExecutingAssembly();
+				string path = Path.GetDirectoryName(asm.Location);
+				Process.Start("Hangover" + (Configuration.IsWindows ? ".exe" : ""));
+				return;
+			}
+			if (Configuration.IsMacOs && args?.Length > 0 && args[0] == "cli")
+			{
+				//Open a new Terminal in the sandbox
+				Assembly asm2 = Assembly.GetExecutingAssembly();
+				string libationProgramFiles = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);
+				Process.Start("/System/Applications/Utilities/Terminal.app/Contents/MacOS/Terminal", $"\"{libationProgramFiles}\"");
+				return;
+			}
+
 			//***********************************************//
 			//                                               //
 			//   do not use Configuration before this line   //

Source/LibationAvalonia/ViewModels/GridEntry.cs

@@ -4,6 +4,7 @@ using DataLayer;
 using Dinah.Core;
 using FileLiberator;
 using LibationFileManager;
+using LibationUiBase;
 using ReactiveUI;
 using System;
 using System.Collections;

Source/LibationAvalonia/ViewModels/ProcessBookViewModel.cs

@@ -12,6 +12,7 @@ using Dinah.Core;
 using Dinah.Core.ErrorHandling;
 using FileLiberator;
 using LibationFileManager;
+using LibationUiBase;
 using ReactiveUI;
 
 namespace LibationAvalonia.ViewModels
@@ -394,7 +395,7 @@ $@"  Title: {libraryBook.Book.Title}
 			return ProcessBookResult.FailedRetry;
 		}
 
-		private string SkipDialogText => @"
+		private static string SkipDialogText => @"
 An error occurred while trying to process this book.
 {0}
 
@@ -404,9 +405,9 @@ An error occurred while trying to process this book.
 
 - IGNORE: Permanently ignore this book. Continue processing books. (Will not try this book again later.)
 ".Trim();
-		private MessageBoxButtons SkipDialogButtons => MessageBoxButtons.AbortRetryIgnore;
-		private MessageBoxDefaultButton SkipDialogDefaultButton => MessageBoxDefaultButton.Button1;
-		private DialogResult SkipResult => DialogResult.Ignore;
+		private static MessageBoxButtons SkipDialogButtons => MessageBoxButtons.AbortRetryIgnore;
+		private static MessageBoxDefaultButton SkipDialogDefaultButton => MessageBoxDefaultButton.Button1;
+		private static DialogResult SkipResult => DialogResult.Ignore;
 	}
 
 	#endregion

Source/LibationAvalonia/ViewModels/ProcessQueueViewModel.cs

@@ -3,6 +3,7 @@ using Avalonia.Controls;
 using Avalonia.Threading;
 using DataLayer;
 using LibationFileManager;
+using LibationUiBase;
 using ReactiveUI;
 using System;
 using System.Collections.Generic;
@@ -43,11 +44,11 @@ namespace LibationAvalonia.ViewModels
 		private bool _progressBarVisible;
 		private decimal _speedLimit;
 
-		public int CompletedCount { get => _completedCount; private set { this.RaiseAndSetIfChanged(ref _completedCount, value); this.RaisePropertyChanged(nameof(AnyCompleted)); } }
-		public int QueuedCount { get => _queuedCount; private set { this.RaiseAndSetIfChanged(ref _queuedCount, value); this.RaisePropertyChanged(nameof(AnyQueued)); } }
-		public int ErrorCount { get => _errorCount; private set { this.RaiseAndSetIfChanged(ref _errorCount, value); this.RaisePropertyChanged(nameof(AnyErrors)); } }
-		public string RunningTime { get => _runningTime; set { this.RaiseAndSetIfChanged(ref _runningTime, value); } }
-		public bool ProgressBarVisible { get => _progressBarVisible; set { this.RaiseAndSetIfChanged(ref _progressBarVisible, value); } }
+		public int CompletedCount { get => _completedCount; private set => Dispatcher.UIThread.Post(() => { this.RaiseAndSetIfChanged(ref _completedCount, value); this.RaisePropertyChanged(nameof(AnyCompleted)); }); }
+		public int QueuedCount { get => _queuedCount; private set => Dispatcher.UIThread.Post(() => { this.RaiseAndSetIfChanged(ref _queuedCount, value); this.RaisePropertyChanged(nameof(AnyQueued)); }); }
+		public int ErrorCount { get => _errorCount; private set => Dispatcher.UIThread.Post(() => { this.RaiseAndSetIfChanged(ref _errorCount, value); this.RaisePropertyChanged(nameof(AnyErrors)); }); }
+		public string RunningTime { get => _runningTime; set => Dispatcher.UIThread.Post(() => { this.RaiseAndSetIfChanged(ref _runningTime, value); }); }
+		public bool ProgressBarVisible { get => _progressBarVisible; set => Dispatcher.UIThread.Post(() => { this.RaiseAndSetIfChanged(ref _progressBarVisible, value); }); }
 		public bool AnyCompleted => CompletedCount > 0;
 		public bool AnyQueued => QueuedCount > 0;
 		public bool AnyErrors => ErrorCount > 0;
@@ -77,8 +78,11 @@ namespace LibationAvalonia.ViewModels
 					: _speedLimit > 1 ? 0.1m
 					: 0.01m;
 
-				this.RaisePropertyChanged(nameof(SpeedLimitIncrement));
-				this.RaisePropertyChanged();
+				Dispatcher.UIThread.Post(() =>
+				   {
+					   this.RaisePropertyChanged(nameof(SpeedLimitIncrement));
+					   this.RaisePropertyChanged();
+				   });
 			}
 		}
 
@@ -91,12 +95,12 @@ namespace LibationAvalonia.ViewModels
 
 			ErrorCount = errCount;
 			CompletedCount = completeCount;
-			this.RaisePropertyChanged(nameof(Progress));
+			Dispatcher.UIThread.Post(() => this.RaisePropertyChanged(nameof(Progress)));
 		}
 		private void Queue_QueuededCountChanged(object sender, int cueCount)
 		{
 			QueuedCount = cueCount;
-			this.RaisePropertyChanged(nameof(Progress));
+			Dispatcher.UIThread.Post(() => this.RaisePropertyChanged(nameof(Progress)));
 		}
 
 		public void WriteLine(string text)

Source/LibationAvalonia/Views/MainWindow.Export.cs

@@ -1,6 +1,7 @@
 using ApplicationServices;
 using Avalonia.Controls;
 using Avalonia.Platform.Storage;
+using FileManager;
 using LibationFileManager;
 using System;
 using System.Linq;
@@ -20,14 +21,14 @@ namespace LibationAvalonia.Views
 				{
 					Title = "Where to export Library",
 					SuggestedStartLocation = new Avalonia.Platform.Storage.FileIO.BclStorageFolder(Configuration.Instance.Books.PathWithoutPrefix),
-					SuggestedFileName = $"Libation Library Export {DateTime.Now:yyyy-MM-dd}.xlsx",
+					SuggestedFileName = $"Libation Library Export {DateTime.Now:yyyy-MM-dd}",
 					DefaultExtension = "xlsx",
 					ShowOverwritePrompt = true,
 					FileTypeChoices = new FilePickerFileType[]
 					{
-						new("Excel Workbook (*.xlsx)") { Patterns = new[] { "xlsx" } },
-						new("CSV files (*.csv)") { Patterns = new[] { "csv" } },
-						new("JSON files (*.json)") { Patterns = new[] { "json" } },
+						new("Excel Workbook (*.xlsx)") { Patterns = new[] { "*.xlsx" } },
+						new("CSV files (*.csv)") { Patterns = new[] { "*.csv" } },
+						new("JSON files (*.json)") { Patterns = new[] { "*.json" } },
 						new("All files (*.*)") { Patterns = new[] { "*" } },
 					}
 				};
@@ -36,17 +37,17 @@ namespace LibationAvalonia.Views
 
 				if (selectedFile?.TryGetUri(out var uri) is not true) return;
 
-				var ext = System.IO.Path.GetExtension(uri.LocalPath);
+				var ext = FileUtility.GetStandardizedExtension(System.IO.Path.GetExtension(uri.LocalPath));
 				switch (ext)
 				{
-					case "xlsx": // xlsx
+					case ".xlsx": // xlsx
 					default:
 						LibraryExporter.ToXlsx(uri.LocalPath);
 						break;
-					case "csv": // csv
+					case ".csv": // csv
 						LibraryExporter.ToCsv(uri.LocalPath);
 						break;
-					case "json": // json
+					case ".json": // json
 						LibraryExporter.ToJson(uri.LocalPath);
 						break;
 				}

Source/LibationAvalonia/Views/MainWindow.ScanManual.cs

@@ -1,6 +1,7 @@
 using ApplicationServices;
 using AudibleUtilities;
 using Avalonia.Controls;
+using LibationAvalonia.Dialogs;
 using LibationFileManager;
 using System;
 using System.Collections.Generic;
@@ -77,5 +78,11 @@ namespace LibationAvalonia.Views
 					ex);
 			}
 		}
+
+		private async void locateAudiobooksToolStripMenuItem_Click(object sender, Avalonia.Interactivity.RoutedEventArgs e)
+		{
+			var locateDialog = new LocateAudiobooksDialog();
+			await locateDialog.ShowDialog(this);
+		}
 	}
 }

Source/LibationAvalonia/Views/MainWindow.Settings.cs

@@ -1,5 +1,5 @@
-using System;
-using System.Linq;
+using LibationFileManager;
+using System;
 
 namespace LibationAvalonia.Views
 {
@@ -16,5 +16,17 @@ namespace LibationAvalonia.Views
 
 		public async void aboutToolStripMenuItem_Click(object sender, Avalonia.Interactivity.RoutedEventArgs e)
 			=> await MessageBox.Show($"Libation {AppScaffolding.LibationScaffolding.Variety}{Environment.NewLine}Version {AppScaffolding.LibationScaffolding.BuildVersion}", $"Libation v{AppScaffolding.LibationScaffolding.BuildVersion}");
+
+		public void launchHangoverToolStripMenuItem_Click(object sender, Avalonia.Interactivity.RoutedEventArgs e)
+		{
+			try
+			{
+				System.Diagnostics.Process.Start("Hangover" + (Configuration.IsWindows ? ".exe" : ""));
+			}
+			catch(Exception ex)
+			{
+				Serilog.Log.Logger.Error(ex, "Failed to launch Hangover");
+			}
+		}
 	}
 }

Source/LibationAvalonia/Views/MainWindow.Update.cs

@@ -14,7 +14,7 @@ namespace LibationAvalonia.Views
 			Opened += async (_, _) => await checkForUpdates();
 		}
 
-        private async Task checkForUpdates()
+		private async Task checkForUpdates()
 		{
 			async Task<string> downloadUpdate(UpgradeProperties upgradeProperties)
 			{
@@ -26,7 +26,7 @@ namespace LibationAvalonia.Views
 
 				//Silently download the update in the background, save it to a temp file.
 
-				var zipFile = Path.GetTempFileName();
+				var zipFile = Path.Combine(Path.GetTempPath(), Path.GetFileName(upgradeProperties.ZipUrl));
 				try
 				{
 					System.Net.Http.HttpClient cli = new();
@@ -42,36 +42,6 @@ namespace LibationAvalonia.Views
 				return zipFile;
 			}
 
-			void runWindowsUpgrader(string zipFile)
-			{
-				var thisExe = Environment.ProcessPath;
-				var thisDir = Path.GetDirectoryName(thisExe);
-
-				var zipExtractor = Path.Combine(Path.GetTempPath(), "ZipExtractor.exe");
-
-				File.Copy("ZipExtractor.exe", zipExtractor, overwrite: true);
-
-				var psi = new System.Diagnostics.ProcessStartInfo()
-				{
-					FileName = zipExtractor,
-					UseShellExecute = true,
-					Verb = "runas",
-					WindowStyle = System.Diagnostics.ProcessWindowStyle.Normal,
-					CreateNoWindow = true,
-					ArgumentList =
-					{
-						"--input",
-						zipFile,
-						"--output",
-						thisDir,
-						"--executable",
-						thisExe
-					}
-				};
-
-				System.Diagnostics.Process.Start(psi);
-			}
-
 			try
 			{
 				var upgradeProperties = await Task.Run(LibationScaffolding.GetLatestRelease);
@@ -83,26 +53,22 @@ namespace LibationAvalonia.Views
 				if (config.GetString(propertyName: ignoreUpdate) == upgradeProperties.LatestRelease.ToString())
 					return;
 
-				var notificationResult = await new UpgradeNotificationDialog(upgradeProperties, Configuration.IsWindows).ShowDialog<DialogResult>(this);
+				var interop = InteropFactory.Create();
+
+				var notificationResult = await new UpgradeNotificationDialog(upgradeProperties, interop.CanUpdate).ShowDialog<DialogResult>(this);
 
 				if (notificationResult == DialogResult.Ignore)
 					config.SetString(upgradeProperties.LatestRelease.ToString(), ignoreUpdate);
 
-				if (notificationResult != DialogResult.OK || !Configuration.IsWindows) return;
+				if (notificationResult != DialogResult.OK) return;
 
 				//Download the update file in the background,
-				//then wire up installaion on window close.
+				string updateBundle = await downloadUpdate(upgradeProperties);
 
-				string zipFile = await downloadUpdate(upgradeProperties);
+				if (string.IsNullOrEmpty(updateBundle) || !File.Exists(updateBundle)) return;
 
-				if (string.IsNullOrEmpty(zipFile) || !File.Exists(zipFile))
-					return;
-
-				Closed += (_, _) =>
-				{
-					if (File.Exists(zipFile))
-						runWindowsUpgrader(zipFile);
-				};
+				//Install the update
+				interop.InstallUpdate(updateBundle);
 			}
 			catch (Exception ex)
 			{

Source/LibationAvalonia/Views/MainWindow.axaml

@@ -51,6 +51,9 @@
 						<MenuItem IsVisible="{Binding OneAccount}" IsEnabled="{Binding RemoveMenuItemsEnabled}" Click="removeLibraryBooksToolStripMenuItem_Click" Header="_Remove Library Books" />
 						<MenuItem IsVisible="{Binding MultipleAccounts}" IsEnabled="{Binding RemoveMenuItemsEnabled}" Click="removeAllAccountsToolStripMenuItem_Click" Header="_Remove Books from All Accounts" />
 						<MenuItem IsVisible="{Binding MultipleAccounts}" IsEnabled="{Binding RemoveMenuItemsEnabled}" Click="removeSomeAccountsToolStripMenuItem_Click" Header="_Remove Books from Some Accounts" />
+						
+						<Separator />
+						<MenuItem Click="locateAudiobooksToolStripMenuItem_Click" Header="L_ocate Audiobooks" />
 
 					</MenuItem>
 					
@@ -128,6 +131,8 @@
 						<MenuItem Click="accountsToolStripMenuItem_Click" Header="_Accounts..." />
 						<MenuItem Click="basicSettingsToolStripMenuItem_Click" Header="_Settings..." />
 						<Separator />
+						<MenuItem Click="launchHangoverToolStripMenuItem_Click" Header="Launch _Hangover" />
+						<Separator />
 						<MenuItem Click="aboutToolStripMenuItem_Click" Header="A_bout..." />
 					</MenuItem>
 				</Menu>

Source/LibationAvalonia/Views/ProcessBookControl.axaml.cs

@@ -1,10 +1,10 @@
-using Avalonia;
 using System;
 using Avalonia.Controls;
 using Avalonia.Markup.Xaml;
 using LibationAvalonia.ViewModels;
 using ApplicationServices;
 using DataLayer;
+using LibationUiBase;
 
 namespace LibationAvalonia.Views
 {

Source/LibationAvalonia/Views/ProcessQueueControl.axaml.cs

@@ -5,6 +5,7 @@ using Avalonia.Data.Converters;
 using Avalonia.Markup.Xaml;
 using DataLayer;
 using LibationAvalonia.ViewModels;
+using LibationUiBase;
 using System;
 using System.Collections.Generic;
 using System.Globalization;

Source/LibationAvalonia/Views/ProductsDisplay.axaml.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Threading.Tasks;
 using ApplicationServices;
 using Avalonia;
 using Avalonia.Controls;
@@ -100,9 +101,9 @@ namespace LibationAvalonia.Views
                 setNotDownloadMenuItem.Click += (_, __) => entry.Book.UpdateBookStatus(LiberatedStatus.NotLiberated);
 
                 var removeMenuItem = new MenuItem() { Header = "_Remove from library" };
-                removeMenuItem.Click += (_, __) => LibraryCommands.RemoveBook(entry.AudibleProductId);
+				removeMenuItem.Click += async (_, __) => await Task.Run(() => LibraryCommands.RemoveBook(entry.AudibleProductId));
 
-                var locateFileMenuItem = new MenuItem() { Header = "_Locate file..." };
+				var locateFileMenuItem = new MenuItem() { Header = "_Locate file..." };
                 locateFileMenuItem.Click += async (_, __) =>
                 {
                     try

Source/LibationFileManager/AudibleFileStorage.cs

@@ -2,7 +2,11 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using System.Runtime.CompilerServices;
 using System.Text.RegularExpressions;
+using Dinah.Core;
+using System.Threading.Tasks;
+using System.Threading;
 using FileManager;
 
 namespace LibationFileManager
@@ -104,8 +108,14 @@ namespace LibationFileManager
 
         private static BackgroundFileSystem BookDirectoryFiles { get; set; }
         private static object bookDirectoryFilesLocker { get; } = new();
+		private static EnumerationOptions enumerationOptions { get; } = new()
+		{
+			RecurseSubdirectories = true,
+			IgnoreInaccessible = true,
+			MatchCasing = MatchCasing.CaseInsensitive
+		};
 
-        protected override LongPath GetFilePathCustom(string productId)
+		protected override LongPath GetFilePathCustom(string productId)
             => GetFilePathsCustom(productId).FirstOrDefault();
 
         protected override List<LongPath> GetFilePathsCustom(string productId)
@@ -122,5 +132,40 @@ namespace LibationFileManager
         public void Refresh() => BookDirectoryFiles.RefreshFiles();
 
         public LongPath GetPath(string productId) => GetFilePath(productId);
+
+		public static async IAsyncEnumerable<FilePathCache.CacheEntry> FindAudiobooksAsync(LongPath searchDirectory, [EnumeratorCancellation] CancellationToken cancellationToken)
+		{
+			ArgumentValidator.EnsureNotNull(searchDirectory, nameof(searchDirectory));
+
+			foreach (LongPath path in Directory.EnumerateFiles(searchDirectory, "*.M4B", enumerationOptions))
+			{
+				if (cancellationToken.IsCancellationRequested)
+					yield break;
+
+				FilePathCache.CacheEntry audioFile = default;
+
+				try
+				{
+					using var fileStream = File.OpenRead(path);
+
+					var mp4File = await Task.Run(() => new AAXClean.Mp4File(fileStream), cancellationToken);
+
+					if (mp4File?.AppleTags?.Asin is not null)
+						audioFile = new FilePathCache.CacheEntry(mp4File.AppleTags.Asin, FileType.Audio, path);
+
+				}
+				catch (Exception ex)
+				{
+					Serilog.Log.Error(ex, "Error checking for asin in {@file}", path);
+				}
+				finally
+				{
+					GC.Collect(GC.MaxGeneration, GCCollectionMode.Aggressive, true, true);
+				}
+
+				if (audioFile is not null)
+					yield return audioFile;
+			}
+		}
 	}
 }

Source/LibationFileManager/Configuration.LibationFiles.cs

@@ -5,20 +5,22 @@ using FileManager;
 using Newtonsoft.Json.Linq;
 using Newtonsoft.Json;
 using Serilog;
+using Dinah.Core.Logging;
 
 namespace LibationFileManager
 {
     public partial class Configuration
     {
-        private static string APPSETTINGS_JSON { get; } = Path.Combine(Path.GetDirectoryName(System.Reflection.Assembly.GetExecutingAssembly().Location), "appsettings.json");
-        private const string LIBATION_FILES_KEY = "LibationFiles";
+        public static string AppsettingsJsonFile { get; } = getOrCreateAppsettingsFile();
+
+		private const string LIBATION_FILES_KEY = "LibationFiles";
 
         [Description("Location for storage of program-created files")]
         public string LibationFiles
         {
             get
             {
-                if (libationFilesPathCache is not null)
+				if (libationFilesPathCache is not null)
                     return libationFilesPathCache;
 
                 // FIRST: must write here before SettingsFilePath in next step reads cache
@@ -44,54 +46,93 @@ namespace LibationFileManager
 
         private static string libationFilesPathCache { get; set; }
 
-        private string getLibationFilesSettingFromJson()
+		/// <summary>
+		/// Try to find appsettings.json in the following locations:
+		///  <list type="number">
+		///		<item>
+		///			<description>[App Directory]</description>
+		///		</item>
+		///		<item>
+		///			<description>%LocalAppData%\Libation</description>
+		///		</item>
+		///		<item>
+		///			<description>%AppData%\Libation</description>
+		///		</item>
+		///		<item>
+		///			<description>%Temp%\Libation</description>
+		///		</item>
+		///  </list>   
+		///    
+		/// If not found, try to create it in each of the same locations in-order until successful.
+		///  
+		/// <para>This method must complete successfully for Libation to continue.</para>
+		/// </summary>
+		/// <returns>appsettings.json file path</returns>
+		/// <exception cref="ApplicationException">appsettings.json could not be found or created.</exception>
+		private static string getOrCreateAppsettingsFile()
+		{
+			const string appsettings_filename = "appsettings.json";
+
+			//Possible appsettings.json locations, in order of preference.
+			string[] possibleAppsettingsFiles = new[]
+			{
+				Path.Combine(Path.GetDirectoryName(System.Reflection.Assembly.GetExecutingAssembly().Location), appsettings_filename),
+				Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), "Libation", appsettings_filename),
+				Path.Combine(UserProfile, appsettings_filename),
+				Path.Combine(Path.GetTempPath(), "Libation", appsettings_filename)
+			};
+
+			//Try to find and validate appsettings.json in each folder
+			foreach (var appsettingsFile in possibleAppsettingsFiles)
+			{
+				if (File.Exists(appsettingsFile))
+				{
+					try
+					{
+						var appSettings = JObject.Parse(File.ReadAllText(appsettingsFile));
+
+						if (appSettings.ContainsKey(LIBATION_FILES_KEY)
+							&& appSettings[LIBATION_FILES_KEY] is JValue jval
+							&& jval.Value is string settingsPath
+							&& !string.IsNullOrWhiteSpace(settingsPath))
+							return appsettingsFile;
+					}
+					catch { }
+				}
+			}
+
+			//Valid appsettings.json not found. Try to create it in each folder.
+			var endingContents = new JObject { { LIBATION_FILES_KEY, UserProfile } }.ToString(Formatting.Indented);
+			foreach (var appsettingsFile in possibleAppsettingsFiles)
+			{
+				try
+				{
+					File.WriteAllText(appsettingsFile, endingContents);
+					return appsettingsFile;
+				}
+				catch(Exception ex)
+				{
+					Log.Logger.TryLogError(ex, $"Failed to create {appsettingsFile}");
+				}
+			}
+
+			throw new ApplicationException($"Could not locate or create {appsettings_filename}");
+		}
+
+		private static string getLibationFilesSettingFromJson()
         {
-            string startingContents = null;
-            try
-            {
-                if (File.Exists(APPSETTINGS_JSON))
-                {
-                    startingContents = File.ReadAllText(APPSETTINGS_JSON);
-                    var startingJObj = JObject.Parse(startingContents);
-
-                    if (startingJObj.ContainsKey(LIBATION_FILES_KEY))
-                    {
-                        var startingValue = startingJObj[LIBATION_FILES_KEY].Value<string>();
-                        if (!string.IsNullOrWhiteSpace(startingValue))
-                            return startingValue;
-                    }
-                }
-            }
-            catch { }
-
-            // not found. write to file. read from file
-            var endingContents = new JObject { { LIBATION_FILES_KEY, UserProfile.ToString() } }.ToString(Formatting.Indented);
-            if (startingContents != endingContents)
-            {
-                File.WriteAllText(APPSETTINGS_JSON, endingContents);
-                System.Threading.Thread.Sleep(100);
-            }
-
             // do not check whether directory exists. special/meta directory (eg: AppDir) is valid
             // verify from live file. no try/catch. want failures to be visible
-            var jObjFinal = JObject.Parse(File.ReadAllText(APPSETTINGS_JSON));
+            var jObjFinal = JObject.Parse(File.ReadAllText(AppsettingsJsonFile));
             var valueFinal = jObjFinal[LIBATION_FILES_KEY].Value<string>();
             return valueFinal;
         }
 
-        public void SetLibationFiles(string directory)
+        public static void SetLibationFiles(string directory)
         {
-            // ensure exists
-            if (!File.Exists(APPSETTINGS_JSON))
-            {
-                // getter creates new file, loads PersistentDictionary
-                var _ = LibationFiles;
-                System.Threading.Thread.Sleep(100);
-            }
-
             libationFilesPathCache = null;
 
-            var startingContents = File.ReadAllText(APPSETTINGS_JSON);
+            var startingContents = File.ReadAllText(AppsettingsJsonFile);
             var jObj = JObject.Parse(startingContents);
 
             jObj[LIBATION_FILES_KEY] = directory;
@@ -100,14 +141,17 @@ namespace LibationFileManager
             if (startingContents == endingContents)
                 return;
 
-            // now it's set in the file again but no settings have moved yet
-            File.WriteAllText(APPSETTINGS_JSON, endingContents);
-
             try
             {
-                Log.Logger.Information("Libation files changed {@DebugInfo}", new { APPSETTINGS_JSON, LIBATION_FILES_KEY, directory });
-            }
-            catch { }
-        }
+                // now it's set in the file again but no settings have moved yet
+                File.WriteAllText(AppsettingsJsonFile, endingContents);
+
+				Log.Logger.TryLogInformation("Libation files changed {@DebugInfo}", new { AppsettingsJsonFile, LIBATION_FILES_KEY, directory });
+			}
+			catch (IOException ex)
+			{
+                Log.Logger.TryLogError(ex, "Failed to change Libation files location {@DebugInfo}", new { AppsettingsJsonFile, LIBATION_FILES_KEY, directory });
+			}
+		}
     }
 }

Source/LibationFileManager/Configuration.cs

@@ -9,9 +9,7 @@ namespace LibationFileManager
 {
 	public partial class Configuration : PropertyChangeFilter
 	{
-		public bool LibationSettingsAreValid
-			=> File.Exists(APPSETTINGS_JSON)
-			&& SettingsFileIsValid(SettingsFilePath);
+		public bool LibationSettingsAreValid => SettingsFileIsValid(SettingsFilePath);
 
 		public static bool SettingsFileIsValid(string settingsFile)
 		{

Source/LibationFileManager/FilePathCache.cs

@@ -86,7 +86,11 @@ namespace LibationFileManager
         public static void Insert(string id, string path)
 		{
 			var type = FileTypes.GetFileTypeFromPath(path);
-			var entry = new CacheEntry(id, type, path);
+			Insert(new CacheEntry(id, type, path));
+		}
+
+		public static void Insert(CacheEntry entry)
+		{
 			cache.Add(entry);
 			Inserted?.Invoke(null, entry);
 			save();

Source/LibationFileManager/IInteropFunctions.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Diagnostics;
 
 namespace LibationFileManager
 {
@@ -6,6 +7,8 @@ namespace LibationFileManager
     {
         void SetFolderIcon(string image, string directory);
         void DeleteFolderIcon(string directory);
-        void CopyTextToClipboard(string text);
+        Process RunAsRoot(string exe, string args);
+        void InstallUpdate(string updateBundle);
+        bool CanUpdate { get; }
     }
 }

Source/LibationFileManager/LibationFileManager.csproj

@@ -6,6 +6,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="7.0.0" />
+    <PackageReference Include="NameParserSharp" Version="1.5.0" />
     <PackageReference Include="Serilog.Exceptions" Version="8.4.0" />
   </ItemGroup>
 

Source/LibationFileManager/NameListFormat.cs

@@ -0,0 +1,95 @@
+using FileManager.NamingTemplate;
+using NameParser;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text.RegularExpressions;
+
+namespace LibationFileManager
+{
+	internal partial class NameListFormat
+	{
+		public static string Formatter(ITemplateTag _, IEnumerable<string> names, string formatString)
+		{
+			var humanNames = names.Select(n => new HumanName(RemoveSuffix(n), Prefer.FirstOverPrefix));
+
+			var sortedNames = Sort(humanNames, formatString);
+			var nameFormatString = Format(formatString, defaultValue: "{T} {F} {M} {L} {S}");
+			var separatorString = Separator(formatString, defaultValue: ", ");
+			var maxNames = Max(formatString, defaultValue: humanNames.Count());
+
+			var formattedNames = string.Join(separatorString, sortedNames.Take(maxNames).Select(n => FormatName(n, nameFormatString)));
+
+			while (formattedNames.Contains("  "))
+				formattedNames = formattedNames.Replace("  ", " ");
+
+			return formattedNames;
+		}
+
+		private static string RemoveSuffix(string namesString)
+		{
+			namesString = namesString.Replace('’', '\'').Replace(" - Ret.", ", Ret.");
+			int dashIndex = namesString.IndexOf(" - ");
+			return (dashIndex > 0 ? namesString[..dashIndex] : namesString).Trim();
+		}
+
+		private static IEnumerable<HumanName> Sort(IEnumerable<HumanName> humanNames, string formatString)
+		{
+			var sortMatch = SortRegex().Match(formatString);
+			return
+				sortMatch.Success
+				? sortMatch.Groups[1].Value == "F" ? humanNames.OrderBy(n => n.First)
+					: sortMatch.Groups[1].Value == "M" ? humanNames.OrderBy(n => n.Middle)
+					: sortMatch.Groups[1].Value == "L" ? humanNames.OrderBy(n => n.Last)
+					: humanNames
+				: humanNames;
+		}
+
+		private static string Format(string formatString, string defaultValue)
+		{
+			var formatMatch = FormatRegex().Match(formatString);
+			return formatMatch.Success ? formatMatch.Groups[1].Value : defaultValue;
+		}
+
+		private static string Separator(string formatString, string defaultValue)
+		{
+			var separatorMatch = SeparatorRegex().Match(formatString);
+			return separatorMatch.Success ? separatorMatch.Groups[1].Value : defaultValue;
+		}
+
+		private static int Max(string formatString, int defaultValue)
+		{
+			var maxMatch = MaxRegex().Match(formatString);
+			return maxMatch.Success && int.TryParse(maxMatch.Groups[1].Value, out var max) ? int.Max(1, max) : defaultValue;
+		}
+
+		private static string FormatName(HumanName humanName, string nameFormatString)
+		{
+			//Single-word names parse as first names. Use it as last name.
+			var lastName = string.IsNullOrWhiteSpace(humanName.Last) ? humanName.First : humanName.Last;
+
+			nameFormatString
+				= nameFormatString
+				.Replace("{T}", "{0}")
+				.Replace("{F}", "{1}")
+				.Replace("{M}", "{2}")
+				.Replace("{L}", "{3}")
+				.Replace("{S}", "{4}");
+
+			return string.Format(nameFormatString, humanName.Title, humanName.First, humanName.Middle, lastName, humanName.Suffix).Trim();
+		}
+
+		/// <summary> Sort must have exactly one of the characters F, M, or L </summary>
+		[GeneratedRegex(@"[Ss]ort\(\s*?([FML])\s*?\)")]
+		private static partial Regex SortRegex();
+		/// <summary> Format must have at least one of the string {T}, {F}, {M}, {L}, or {S} </summary>
+		[GeneratedRegex(@"[Ff]ormat\((.*?(?:{[TFMLS]})+.*?)\)")]
+		private static partial Regex FormatRegex();
+		/// <summary> Separator can be anything </summary>
+		[GeneratedRegex(@"[Ss]eparator\((.*?)\)")]
+		private static partial Regex SeparatorRegex();
+		/// <summary> Max must have a 1 or 2-digit number </summary>
+		[GeneratedRegex(@"[Mm]ax\(\s*?(\d{1,2})\s*?\)")]
+		private static partial Regex MaxRegex();
+	}
+}

Source/LibationFileManager/NullInteropFunctions.cs

@@ -1,14 +1,18 @@
 using System;
+using System.Diagnostics;
 
 namespace LibationFileManager
 {
     public class NullInteropFunctions : IInteropFunctions
     {
-        public NullInteropFunctions() { }
+
+		public NullInteropFunctions() { }
         public NullInteropFunctions(params object[] values) { }
 
         public void SetFolderIcon(string image, string directory) => throw new PlatformNotSupportedException();
         public void DeleteFolderIcon(string directory) => throw new PlatformNotSupportedException();
-        public void CopyTextToClipboard(string text) => throw new PlatformNotSupportedException();
-    }
+		public bool CanUpdate => throw new PlatformNotSupportedException();
+		public Process RunAsRoot(string exe, string args) => throw new PlatformNotSupportedException();
+		public void InstallUpdate(string updateBundle) => throw new PlatformNotSupportedException();
+	}
 }

Source/LibationFileManager/TemplateEditor[T].cs

@@ -12,6 +12,8 @@ namespace LibationFileManager
 		bool IsFilePath { get; }
 		LongPath BaseDirectory { get; }
 		string DefaultTemplate { get; }
+		string TemplateName { get; }
+		string TemplateDescription { get; }
 		Templates Folder { get; }
 		Templates File { get; }
 		Templates Name { get; }
@@ -28,6 +30,8 @@ namespace LibationFileManager
 		public bool IsFilePath => EditingTemplate is not Templates.ChapterTitleTemplate;
 		public LongPath BaseDirectory { get; private init; }
 		public string DefaultTemplate { get; private init; }
+		public string TemplateName { get; private init; }
+		public string TemplateDescription { get; private init; }
 		public Templates Folder { get; private set; }
 		public Templates File { get; private set; }
 		public Templates Name { get; private set; }
@@ -99,7 +103,10 @@ namespace LibationFileManager
 			{
 				_editingTemplate = template,
 				BaseDirectory = baseDir,
-				DefaultTemplate = T.DefaultTemplate
+				DefaultTemplate = T.DefaultTemplate,
+				TemplateName = T.Name,
+				TemplateDescription = T.Description
+				
 			};
 
 			if (!templateEditor.IsFolder && !templateEditor.IsFilePath)
@@ -118,7 +125,9 @@ namespace LibationFileManager
 			var templateEditor = new TemplateEditor<T>
 			{
 				_editingTemplate = nameTemplate,
-				DefaultTemplate = T.DefaultTemplate
+				DefaultTemplate = T.DefaultTemplate,
+				TemplateName = T.Name,
+				TemplateDescription = T.Description
 			};
 
 			if (templateEditor.IsFolder || templateEditor.IsFilePath)

Source/LibationFileManager/Templates.cs

@@ -6,11 +6,14 @@ using AaxDecrypter;
 using Dinah.Core;
 using FileManager;
 using FileManager.NamingTemplate;
+using NameParser;
 
 namespace LibationFileManager
 {
 	public interface ITemplate
 	{
+		static abstract string Name { get; }
+		static abstract string Description { get; }
 		static abstract string DefaultTemplate { get; }
 		static abstract IEnumerable<TagCollection> TagCollections { get; }
 	}
@@ -42,12 +45,12 @@ namespace LibationFileManager
 		{
 			var namingTemplate = NamingTemplate.Parse(templateText, T.TagCollections);
 
-			template = new() { Template = namingTemplate };
+			template = new() { NamingTemplate = namingTemplate };
 			return !namingTemplate.Errors.Any();
 		}
 
 		private static T GetDefaultTemplate<T>() where T : Templates, ITemplate, new()
-			=> new() { Template = NamingTemplate.Parse(T.DefaultTemplate, T.TagCollections) };
+			=> new() { NamingTemplate = NamingTemplate.Parse(T.DefaultTemplate, T.TagCollections) };
 
 		static Templates()
 		{
@@ -66,27 +69,28 @@ namespace LibationFileManager
 			Configuration.Instance.PropertyChanged +=
 				[PropertyChangeFilter(nameof(Configuration.ChapterTitleTemplate))]
 				(_, e) => _chapterTitle = GetTemplate<ChapterTitleTemplate>((string)e.NewValue);
+
+			HumanName.Suffixes.Add("ret");
+			HumanName.Titles.Add("professor");
 		}
 
 		#endregion
 
 		#region Template Properties
 
-		public IEnumerable<TemplateTags> TagsRegistered => Template.TagsRegistered.Cast<TemplateTags>();
-		public IEnumerable<TemplateTags> TagsInUse => Template.TagsInUse.Cast<TemplateTags>();
-		public abstract string Name { get; }
-		public abstract string Description { get; }
-		public string TemplateText => Template.TemplateText;
-		protected NamingTemplate Template { get; private set; }
+		public IEnumerable<TemplateTags> TagsRegistered => NamingTemplate.TagsRegistered.Cast<TemplateTags>();
+		public IEnumerable<TemplateTags> TagsInUse => NamingTemplate.TagsInUse.Cast<TemplateTags>();
+		public string TemplateText => NamingTemplate.TemplateText;
+		protected NamingTemplate NamingTemplate { get; private set; }
 
 		#endregion
 
 		#region validation
 
-		public virtual IEnumerable<string> Errors => Template.Errors;
+		public virtual IEnumerable<string> Errors => NamingTemplate.Errors;
 		public bool IsValid => !Errors.Any();
 
-		public virtual IEnumerable<string> Warnings => Template.Warnings;
+		public virtual IEnumerable<string> Warnings => NamingTemplate.Warnings;
 		public bool HasWarnings => Warnings.Any();
 
 		#endregion
@@ -97,7 +101,7 @@ namespace LibationFileManager
 		{
 			ArgumentValidator.EnsureNotNull(libraryBookDto, nameof(libraryBookDto));
 			ArgumentValidator.EnsureNotNull(multiChapProps, nameof(multiChapProps));
-			return string.Join("", Template.Evaluate(libraryBookDto, multiChapProps).Select(p => p.Value));
+			return string.Concat(NamingTemplate.Evaluate(libraryBookDto, multiChapProps).Select(p => p.Value));
 		}
 
 		public LongPath GetFilename(LibraryBookDto libraryBookDto, string baseDir, string fileExtension, ReplacementCharacters replacements = null, bool returnFirstExisting = false)
@@ -128,7 +132,7 @@ namespace LibationFileManager
 		{
 			fileExtension = FileUtility.GetStandardizedExtension(fileExtension);
 
-			var parts = Template.Evaluate(dtos).ToList();
+			var parts = NamingTemplate.Evaluate(dtos).ToList();
 			var pathParts = GetPathParts(GetTemplatePartsStrings(parts, replacements));
 
 			//Remove 1 character from the end of the longest filename part until
@@ -154,7 +158,7 @@ namespace LibationFileManager
 				}
 			}
 
-			var fullPath = Path.Combine(pathParts.Select(fileParts => string.Join("", fileParts)).Prepend(baseDir).ToArray());
+			var fullPath = Path.Combine(pathParts.Select(fileParts => string.Concat(fileParts)).Prepend(baseDir).ToArray());
 
 			return  FileUtility.GetValidFilename(fullPath, replacements, fileExtension, returnFirstExisting);
 		}
@@ -198,9 +202,9 @@ namespace LibationFileManager
 			{ TemplateTags.Id, lb => lb.AudibleProductId, v => v },
 			{ TemplateTags.Title, lb => lb.Title },
 			{ TemplateTags.TitleShort, lb => getTitleShort(lb.Title) },
-			{ TemplateTags.Author, lb => lb.AuthorNames },
+			{ TemplateTags.Author, lb => lb.Authors, NameListFormat.Formatter },
 			{ TemplateTags.FirstAuthor, lb => lb.FirstAuthor },
-			{ TemplateTags.Narrator, lb => lb.NarratorNames },
+			{ TemplateTags.Narrator, lb => lb.Narrators, NameListFormat.Formatter },
 			{ TemplateTags.FirstNarrator, lb => lb.FirstNarrator },
 			{ TemplateTags.Series, lb => lb.SeriesName },
 			{ TemplateTags.SeriesNumber, lb => lb.SeriesNumber },
@@ -286,8 +290,8 @@ namespace LibationFileManager
 
 		public class FolderTemplate : Templates, ITemplate
 		{
-			public override string Name => "Folder Template";
-			public override string Description => Configuration.GetDescription(nameof(Configuration.FolderTemplate));
+			public static string Name { get; }= "Folder Template";
+			public static string Description { get; } = Configuration.GetDescription(nameof(Configuration.FolderTemplate));
 			public static string DefaultTemplate { get; } = "<title short> [<id>]";
 			public static IEnumerable<TagCollection> TagCollections => new TagCollection[] { filePropertyTags, conditionalTags };
 
@@ -305,29 +309,29 @@ namespace LibationFileManager
 
 		public class FileTemplate : Templates, ITemplate
 		{
-			public override string Name => "File Template";
-			public override string Description => Configuration.GetDescription(nameof(Configuration.FileTemplate));
+			public static string Name { get; } = "File Template";
+			public static string Description { get; } = Configuration.GetDescription(nameof(Configuration.FileTemplate));
 			public static string DefaultTemplate { get; } = "<title> [<id>]";
 			public static IEnumerable<TagCollection> TagCollections { get; } = new TagCollection[] { filePropertyTags, conditionalTags };
 		}
 
 		public class ChapterFileTemplate : Templates, ITemplate
 		{
-			public override string Name => "Chapter File Template";
-			public override string Description => Configuration.GetDescription(nameof(Configuration.ChapterFileTemplate));
+			public static string Name { get; } = "Chapter File Template";
+			public static string Description { get; } = Configuration.GetDescription(nameof(Configuration.ChapterFileTemplate));
 			public static string DefaultTemplate { get; } = "<title> [<id>] - <ch# 0> - <ch title>";
 			public static IEnumerable<TagCollection> TagCollections { get; } = chapterPropertyTags.Append(filePropertyTags).Append(conditionalTags);
 
 			public override IEnumerable<string> Warnings
-				=> Template.TagsInUse.Any(t => t.TagName.In(TemplateTags.ChNumber.TagName, TemplateTags.ChNumber0.TagName))
+				=> NamingTemplate.TagsInUse.Any(t => t.TagName.In(TemplateTags.ChNumber.TagName, TemplateTags.ChNumber0.TagName))
 				? base.Warnings
 				: base.Warnings.Append(WARNING_NO_CHAPTER_NUMBER_TAG);
 		}
 
 		public class ChapterTitleTemplate : Templates, ITemplate
 		{
-			public override string Name => "Chapter Title Template";
-			public override string Description => Configuration.GetDescription(nameof(Configuration.ChapterTitleTemplate));
+			public static string Name { get; } = "Chapter Title Template";
+			public static string Description { get; } = Configuration.GetDescription(nameof(Configuration.ChapterTitleTemplate));
 			public static string DefaultTemplate => "<ch#> - <title short>: <ch title>";
 			public static IEnumerable<TagCollection> TagCollections { get; } = chapterPropertyTags.Append(conditionalTags);
 

Source/LibationFileManager/_InternalsVisible.cs

@@ -1 +0,0 @@
-[assembly: System.Runtime.CompilerServices.InternalsVisibleTo(nameof(LibationFileManager) + ".Tests")]

Source/LibationSearchEngine/LuceneRegex.cs

@@ -5,7 +5,7 @@ using System.Text.RegularExpressions;
 
 namespace LibationSearchEngine
 {
-    internal static class LuceneRegex
+    internal static partial class LuceneRegex
     {
         #region pattern pieces
         //  negative lookbehind: cannot be preceeded by an escaping \
@@ -38,28 +38,32 @@ namespace LibationSearchEngine
         private static string fieldPattern { get; } = NOT_ESCAPED + WORD_CAPTURE + FIELD_END;
         public static Regex FieldRegex { get; } = new Regex(fieldPattern, RegexOptions.IgnorePatternWhitespace | RegexOptions.Compiled);
 
-        // auto-pad numbers to 8 char.s. This will match int.s and dates (yyyyMMdd)
-        //   positive look behind: beginning  space  {  [  :
-        //   positive look ahead: end  space  ]  }
-        public static Regex NumbersRegex { get; } = new Regex(@"(?<=^|\s|\{|\[|:)(\d+\.?\d*)(?=$|\s|\]|\})", RegexOptions.Compiled);
+		/// <summary>
+		/// auto-pad numbers to 8 char.s. This will match int.s and dates (yyyyMMdd)
+		///   positive look behind: beginning  space  {  [  :
+		///   positive look ahead: end  space  ]  }
+		/// </summary>
 
-        /// <summary>
-        /// proper bools are single keywords which are turned into keyword:True
-        /// if bordered by colons or inside brackets, they are not stand-alone bool keywords
-        /// the negative lookbehind and lookahead patterns prevent bugs where a bool keyword is also a user-defined tag:
-        ///   [israted]
-        ///     parseTag => tags:israted
-        ///     replaceBools => tags:israted:True
-        ///   or
-        ///     [israted]
-        ///       replaceBools => israted:True
-        ///         parseTag => [israted:True]
-        /// also don't want to apply :True where the value already exists:
-        ///   israted:false => israted:false:True
-        ///   
-        /// despite using parans, lookahead and lookbehind are zero-length assertions which do not capture. therefore the bool search keyword is still $1 since it's the first and only capture
-        /// </summary>
-        private static string boolPattern_parameterized { get; }
+		[GeneratedRegex(@"(?<=^|\s|\{|\[|:)(\d+\.?\d*)(?=$|\s|\]|\})", RegexOptions.Compiled)]
+		public static partial Regex NumbersRegex();
+
+		/// <summary>
+		/// proper bools are single keywords which are turned into keyword:True
+		/// if bordered by colons or inside brackets, they are not stand-alone bool keywords
+		/// the negative lookbehind and lookahead patterns prevent bugs where a bool keyword is also a user-defined tag:
+		///   [israted]
+		///     parseTag => tags:israted
+		///     replaceBools => tags:israted:True
+		///   or
+		///     [israted]
+		///       replaceBools => israted:True
+		///         parseTag => [israted:True]
+		/// also don't want to apply :True where the value already exists:
+		///   israted:false => israted:false:True
+		///   
+		/// despite using parans, lookahead and lookbehind are zero-length assertions which do not capture. therefore the bool search keyword is still $1 since it's the first and only capture
+		/// </summary>
+		private static string boolPattern_parameterized { get; }
             = @"
 ### IMPORTANT: 'ignore whitespace' is only partially honored in character sets
 ### - new lines are ok
@@ -95,5 +99,5 @@ namespace LibationSearchEngine
 
             return regex;
         }
-    }
+	}
 }

Source/LibationSearchEngine/SearchEngine.cs

@@ -402,7 +402,7 @@ namespace LibationSearchEngine
         private static string padNumbers(string searchString)
         {
             var matches = LuceneRegex
-                .NumbersRegex
+                .NumbersRegex()
                 .Matches(searchString)
                 .Cast<Match>()
                 .OrderByDescending(m => m.Index);
@@ -410,7 +410,7 @@ namespace LibationSearchEngine
             foreach (var m in matches)
             {
                 var replaceString = double.Parse(m.ToString()).ToLuceneString();
-                searchString = LuceneRegex.NumbersRegex.Replace(searchString, replaceString, 1, m.Index);
+                searchString = LuceneRegex.NumbersRegex().Replace(searchString, replaceString, 1, m.Index);
             }
 
             return searchString;

Source/LibationUiBase/ILogForm.cs

@@ -1,6 +1,4 @@
-using System;
-
-namespace LibationWinForms.ProcessQueue
+namespace LibationUiBase
 {
 	public interface ILogForm
 	{

Source/LibationUiBase/LibationUiBase.csproj

@@ -0,0 +1,24 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+	<TargetFramework>net7.0</TargetFramework>
+	  <IsPublishable>true</IsPublishable>
+	  <PublishReadyToRun>true</PublishReadyToRun>
+	  <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
+	  <AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
+  </PropertyGroup>
+
+  <ItemGroup>
+	<ProjectReference Include="..\ApplicationServices\ApplicationServices.csproj" />
+	<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/LibationUiBase/LogMe.cs

@@ -1,10 +1,7 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using System.Threading.Tasks;
 
-namespace LibationWinForms.ProcessQueue
+namespace LibationUiBase
 {
 	// decouple serilog and form. include convenience factory method
 	public class LogMe

Source/LibationUiBase/ObjectComparer[T].cs

@@ -1,9 +1,9 @@
 using System;
 using System.Collections;
 
-namespace LibationAvalonia
+namespace LibationUiBase
 {
-	internal class ObjectComparer<T> : IComparer where T : IComparable
+	public class ObjectComparer<T> : IComparer where T : IComparable
 	{
 		public int Compare(object x, object y) => ((T)x).CompareTo(y);
 	}

Source/LibationWinForms/Dialogs/EditTemplateDialog.cs

@@ -37,9 +37,9 @@ namespace LibationWinForms.Dialogs
 
 			warningsLbl.Text = "";
 
-			this.Text = $"Edit {templateEditor.EditingTemplate.Name}";
+			this.Text = $"Edit {templateEditor.TemplateName}";
 
-			this.templateLbl.Text = templateEditor.EditingTemplate.Description;
+			this.templateLbl.Text = templateEditor.TemplateDescription;
 			resetTextBox(templateEditor.EditingTemplate.TemplateText);
 
 			// populate list view

Source/LibationWinForms/Dialogs/LocateAudiobooksDialog.Designer.cs

@@ -0,0 +1,107 @@
+namespace LibationWinForms.Dialogs
+{
+	partial class LocateAudiobooksDialog
+	{
+		/// <summary>
+		/// Required designer variable.
+		/// </summary>
+		private System.ComponentModel.IContainer components = null;
+
+		/// <summary>
+		/// Clean up any resources being used.
+		/// </summary>
+		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+		protected override void Dispose(bool disposing)
+		{
+			if (disposing && (components != null))
+			{
+				components.Dispose();
+			}
+			base.Dispose(disposing);
+		}
+
+		#region Windows Form Designer generated code
+
+		/// <summary>
+		/// Required method for Designer support - do not modify
+		/// the contents of this method with the code editor.
+		/// </summary>
+		private void InitializeComponent()
+		{
+			this.label1 = new System.Windows.Forms.Label();
+			this.foundAudiobooksLV = new System.Windows.Forms.ListView();
+			this.columnHeader1 = new System.Windows.Forms.ColumnHeader();
+			this.columnHeader2 = new System.Windows.Forms.ColumnHeader();
+			this.booksFoundLbl = new System.Windows.Forms.Label();
+			this.SuspendLayout();
+			// 
+			// label1
+			// 
+			this.label1.AutoSize = true;
+			this.label1.Location = new System.Drawing.Point(12, 9);
+			this.label1.Name = "label1";
+			this.label1.Size = new System.Drawing.Size(108, 15);
+			this.label1.TabIndex = 1;
+			this.label1.Text = "Found Audiobooks";
+			// 
+			// foundAudiobooksLV
+			// 
+			this.foundAudiobooksLV.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+			this.foundAudiobooksLV.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
+            this.columnHeader1,
+            this.columnHeader2});
+			this.foundAudiobooksLV.FullRowSelect = true;
+			this.foundAudiobooksLV.Location = new System.Drawing.Point(12, 33);
+			this.foundAudiobooksLV.Name = "foundAudiobooksLV";
+			this.foundAudiobooksLV.Size = new System.Drawing.Size(321, 261);
+			this.foundAudiobooksLV.TabIndex = 2;
+			this.foundAudiobooksLV.UseCompatibleStateImageBehavior = false;
+			this.foundAudiobooksLV.View = System.Windows.Forms.View.Details;
+			// 
+			// columnHeader1
+			// 
+			this.columnHeader1.Text = "Book ID";
+			this.columnHeader1.Width = 85;
+			// 
+			// columnHeader2
+			// 
+			this.columnHeader2.Text = "Title";
+			// 
+			// booksFoundLbl
+			// 
+			this.booksFoundLbl.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+			this.booksFoundLbl.AutoSize = true;
+			this.booksFoundLbl.Location = new System.Drawing.Point(253, 9);
+			this.booksFoundLbl.Name = "booksFoundLbl";
+			this.booksFoundLbl.Size = new System.Drawing.Size(80, 15);
+			this.booksFoundLbl.TabIndex = 3;
+			this.booksFoundLbl.Text = "IDs Found: {0}";
+			this.booksFoundLbl.TextAlign = System.Drawing.ContentAlignment.TopRight;
+			// 
+			// LocateAudiobooksDialog
+			// 
+			this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
+			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+			this.ClientSize = new System.Drawing.Size(345, 306);
+			this.Controls.Add(this.booksFoundLbl);
+			this.Controls.Add(this.foundAudiobooksLV);
+			this.Controls.Add(this.label1);
+			this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.SizableToolWindow;
+			this.Name = "LocateAudiobooksDialog";
+			this.Text = "Locate Audiobooks";
+			this.ResumeLayout(false);
+			this.PerformLayout();
+
+		}
+
+		#endregion
+
+		private System.Windows.Forms.Label label1;
+		private System.Windows.Forms.ListView foundAudiobooksLV;
+		private System.Windows.Forms.ColumnHeader columnHeader1;
+		private System.Windows.Forms.ColumnHeader columnHeader2;
+		private System.Windows.Forms.Label booksFoundLbl;
+	}
+}

Source/LibationWinForms/Dialogs/LocateAudiobooksDialog.cs

@@ -0,0 +1,98 @@
+using ApplicationServices;
+using DataLayer;
+using LibationFileManager;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace LibationWinForms.Dialogs
+{
+	public partial class LocateAudiobooksDialog : Form
+	{
+		private event EventHandler<FilePathCache.CacheEntry> FileFound;
+		private readonly CancellationTokenSource tokenSource = new();
+		private readonly List<string> foundAsins = new();
+		private readonly string labelFormatText;
+		public LocateAudiobooksDialog()
+		{
+			InitializeComponent();
+
+			labelFormatText = booksFoundLbl.Text;
+			setFoundBookCount(0);
+
+			this.SetLibationIcon();
+			this.RestoreSizeAndLocation(Configuration.Instance);
+
+			Shown += LocateAudiobooks_Shown;
+			FileFound += LocateAudiobooks_FileFound;
+			FormClosing += LocateAudiobooks_FormClosing;
+		}
+
+		private void setFoundBookCount(int count)
+			=> booksFoundLbl.Text = string.Format(labelFormatText, count);
+
+		private void LocateAudiobooks_FileFound(object sender, FilePathCache.CacheEntry e)
+		{
+			foundAudiobooksLV.Items
+				.Add(new ListViewItem(new string[] { $"[{e.Id}]", Path.GetFileName(e.Path) }))
+				.EnsureVisible();
+
+			foundAudiobooksLV.AutoResizeColumn(1, ColumnHeaderAutoResizeStyle.ColumnContent);
+
+			if (!foundAsins.Any(asin => asin == e.Id))
+			{
+				foundAsins.Add(e.Id);
+				setFoundBookCount(foundAsins.Count);
+			}
+		}
+
+		private void LocateAudiobooks_FormClosing(object sender, FormClosingEventArgs e)
+		{
+			tokenSource.Cancel();
+			this.SaveSizeAndLocation(Configuration.Instance);
+		}
+
+		private async void LocateAudiobooks_Shown(object sender, EventArgs e)
+		{
+			var fbd = new FolderBrowserDialog
+			{
+				Description = "Select the folder to search for audiobooks",
+				UseDescriptionForTitle = true,
+				InitialDirectory = Configuration.Instance.Books
+			};
+
+			if (fbd.ShowDialog() != DialogResult.OK || !Directory.Exists(fbd.SelectedPath))
+			{
+				Close();
+				return;
+			}
+
+			using var context = DbContexts.GetContext();
+
+			await foreach (var book in AudioFileStorage.FindAudiobooksAsync(fbd.SelectedPath, tokenSource.Token))
+			{
+				try
+				{
+					FilePathCache.Insert(book);
+
+					var lb = context.GetLibraryBook_Flat_NoTracking(book.Id);
+					if (lb.Book.UserDefinedItem.BookStatus is not LiberatedStatus.Liberated)
+						await Task.Run(() => lb.UpdateBookStatus(LiberatedStatus.Liberated));
+
+					this.Invoke(FileFound, this, book);
+				}
+				catch(Exception ex)
+				{
+					Serilog.Log.Error(ex, "Error adding found audiobook file to Libation. {@audioFile}", book);
+				}
+			}
+
+			MessageBox.Show(this, $"Libation has found {foundAsins.Count} unique audiobooks and added them to its database. ", $"Found {foundAsins.Count} Audiobooks");
+			Close();
+		}
+	}
+}

Source/LibationWinForms/Dialogs/LocateAudiobooksDialog.resx

@@ -0,0 +1,60 @@
+<root>
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>

Source/LibationWinForms/Dialogs/SettingsDialog.Important.cs

@@ -35,7 +35,7 @@ namespace LibationWinForms.Dialogs
 				},
 				Configuration.KnownDirectories.UserProfile,
 				"Books");
-			booksSelectControl.SelectDirectory(config.Books);
+			booksSelectControl.SelectDirectory(config.Books.PathWithoutPrefix);
 
 			saveEpisodesToSeriesFolderCbox.Checked = config.SavePodcastsToParentFolder;
 			betaOptInCbox.Checked = config.BetaOptIn;

Source/LibationWinForms/Form1.Designer.cs

@@ -60,8 +60,12 @@
             this.setBookDownloadedManualToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.setPdfDownloadedManualToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.setDownloadedAutoToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.removeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.settingsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator();
+			this.removeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.toolStripSeparator4 = new System.Windows.Forms.ToolStripSeparator();
+			this.launchHangoverToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.locateAudiobooksToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.settingsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.accountsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.basicSettingsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator();
@@ -149,7 +153,9 @@
             this.scanLibraryToolStripMenuItem,
             this.scanLibraryOfAllAccountsToolStripMenuItem,
             this.scanLibraryOfSomeAccountsToolStripMenuItem,
-            this.removeLibraryBooksToolStripMenuItem});
+            this.removeLibraryBooksToolStripMenuItem,
+            this.toolStripSeparator3,
+            this.locateAudiobooksToolStripMenuItem});
             this.importToolStripMenuItem.Name = "importToolStripMenuItem";
             this.importToolStripMenuItem.Size = new System.Drawing.Size(55, 20);
             this.importToolStripMenuItem.Text = "&Import";
@@ -374,6 +380,8 @@
             this.settingsToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.accountsToolStripMenuItem,
             this.basicSettingsToolStripMenuItem,
+			this.toolStripSeparator4,
+			this.launchHangoverToolStripMenuItem,
             this.toolStripSeparator2,
             this.aboutToolStripMenuItem});
             this.settingsToolStripMenuItem.Name = "settingsToolStripMenuItem";
@@ -560,10 +568,29 @@
             this.processBookQueue1.Name = "processBookQueue1";
             this.processBookQueue1.Size = new System.Drawing.Size(430, 640);
             this.processBookQueue1.TabIndex = 0;
-            // 
-            // Form1
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
+			// 
+			// locateAudiobooksToolStripMenuItem
+			// 
+			this.locateAudiobooksToolStripMenuItem.Name = "locateAudiobooksToolStripMenuItem";
+			this.locateAudiobooksToolStripMenuItem.Size = new System.Drawing.Size(247, 22);
+			this.locateAudiobooksToolStripMenuItem.Text = "L&ocate Audiobooks";
+			this.locateAudiobooksToolStripMenuItem.Click += new System.EventHandler(this.locateAudiobooksToolStripMenuItem_Click);
+			// 
+			// launchHangoverToolStripMenuItem
+			// 
+			this.launchHangoverToolStripMenuItem.Name = "launchHangoverToolStripMenuItem";
+			this.launchHangoverToolStripMenuItem.Size = new System.Drawing.Size(247, 22);
+			this.launchHangoverToolStripMenuItem.Text = "Launch &Hangover";
+			this.launchHangoverToolStripMenuItem.Click += new System.EventHandler(this.launchHangoverToolStripMenuItem_Click);
+			// 
+			// toolStripSeparator3
+			// 
+			this.toolStripSeparator3.Name = "toolStripSeparator3";
+			this.toolStripSeparator3.Size = new System.Drawing.Size(244, 6);
+			// 
+			// Form1
+			// 
+			this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.ClientSize = new System.Drawing.Size(1463, 640);
             this.Controls.Add(this.splitContainer1);
@@ -630,6 +657,10 @@
         private System.Windows.Forms.ToolStripMenuItem setBookDownloadedManualToolStripMenuItem;
         private System.Windows.Forms.ToolStripMenuItem setDownloadedAutoToolStripMenuItem;
         private System.Windows.Forms.ToolStripMenuItem removeToolStripMenuItem;
+		private System.Windows.Forms.ToolStripSeparator toolStripSeparator3;
+		private System.Windows.Forms.ToolStripMenuItem locateAudiobooksToolStripMenuItem;
+		private System.Windows.Forms.ToolStripSeparator toolStripSeparator4;
+		private System.Windows.Forms.ToolStripMenuItem launchHangoverToolStripMenuItem;
         private LibationWinForms.FormattableToolStripMenuItem liberateVisibleToolStripMenuItem_LiberateMenu;
 		private System.Windows.Forms.SplitContainer splitContainer1;
 		private LibationWinForms.ProcessQueue.ProcessQueueControl processBookQueue1;

Source/LibationWinForms/Form1.ScanManual.cs

@@ -89,5 +89,10 @@ namespace LibationWinForms
 					ex);
 			}
 		}
+
+		private void locateAudiobooksToolStripMenuItem_Click(object sender, EventArgs e)
+		{
+			new LocateAudiobooksDialog().ShowDialog();
+		}
 	}
 }

Source/LibationWinForms/Form1.Settings.cs

@@ -14,5 +14,17 @@ namespace LibationWinForms
 
         private void aboutToolStripMenuItem_Click(object sender, EventArgs e)
             => MessageBox.Show($"Libation {AppScaffolding.LibationScaffolding.Variety}{Environment.NewLine}Version {AppScaffolding.LibationScaffolding.BuildVersion}", $"Libation v{AppScaffolding.LibationScaffolding.BuildVersion}");
-    }
+
+		private void launchHangoverToolStripMenuItem_Click(object sender, EventArgs e)
+        {
+			try
+			{
+				System.Diagnostics.Process.Start("Hangover.exe");
+			}
+			catch (Exception ex)
+			{
+				Serilog.Log.Logger.Error(ex, "Failed to launch Hangover");
+			}
+		}
+	}
 }

Source/LibationWinForms/Form1.cs

@@ -7,6 +7,7 @@ using ApplicationServices;
 using Dinah.Core;
 using Dinah.Core.Threading;
 using LibationFileManager;
+using LibationWinForms.Dialogs;
 
 namespace LibationWinForms
 {

Source/LibationWinForms/GridView/GridEntry.cs

@@ -5,6 +5,7 @@ using Dinah.Core.DataBinding;
 using Dinah.Core.WindowsDesktop.Drawing;
 using FileLiberator;
 using LibationFileManager;
+using LibationUiBase;
 using System;
 using System.Collections;
 using System.Collections.Generic;

Source/LibationWinForms/GridView/ProductsGrid.cs

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Data;
 using System.Drawing;
 using System.Linq;
+using System.Threading.Tasks;
 using System.Windows.Forms;
 using ApplicationServices;
 using DataLayer;
@@ -122,7 +123,7 @@ namespace LibationWinForms.GridView
                     {
                         var dgv = (DataGridView)sender;
                         var text = dgv[e.ColumnIndex, e.RowIndex].FormattedValue.ToString();
-                        InteropFactory.Create().CopyTextToClipboard(text);
+						Clipboard.SetDataObject(text, false, 5, 150);
                     }
 					catch { }
                 });
@@ -152,7 +153,7 @@ namespace LibationWinForms.GridView
             setNotDownloadMenuItem.Click += (_, __) => entry.Book.UpdateBookStatus(LiberatedStatus.NotLiberated);
 
             var removeMenuItem = new ToolStripMenuItem() { Text = "&Remove from library" };
-            removeMenuItem.Click += (_, __) => LibraryCommands.RemoveBook(entry.AudibleProductId);
+			removeMenuItem.Click += async (_, __) => await Task.Run(() => LibraryCommands.RemoveBook(entry.AudibleProductId));
 
             var locateFileMenuItem = new ToolStripMenuItem() { Text = "&Locate file..." };
             locateFileMenuItem.Click += (_, __) =>

Source/LibationWinForms/LibationWinForms.csproj

@@ -45,13 +45,11 @@
 
 	<ItemGroup>
 		<PackageReference Include="Autoupdater.NET.Official" Version="1.7.6" />
-		<PackageReference Include="Dinah.Core.WindowsDesktop" Version="7.2.1.1" />
+		<PackageReference Include="Dinah.Core.WindowsDesktop" Version="7.2.2.1" />
 	</ItemGroup>
 
 	<ItemGroup>
-		<ProjectReference Include="..\ApplicationServices\ApplicationServices.csproj" />
-		<ProjectReference Include="..\AppScaffolding\AppScaffolding.csproj" />
-		<ProjectReference Include="..\FileLiberator\FileLiberator.csproj" />
+	  <ProjectReference Include="..\LibationUiBase\LibationUiBase.csproj" />
 	</ItemGroup>
 	<ItemGroup>
 		<Compile Update="Form1.*.cs">

Source/LibationWinForms/ObjectComparer[T].cs

@@ -1,10 +0,0 @@
-using System;
-using System.Collections;
-
-namespace LibationWinForms
-{
-	internal class ObjectComparer<T> : IComparer where T : IComparable
-	{
-		public int Compare(object x, object y) => ((T)x).CompareTo(y);
-	}
-}

Source/LibationWinForms/ProcessQueue/ProcessBook.cs

@@ -15,6 +15,7 @@ using Dinah.Core.ErrorHandling;
 using Dinah.Core.WindowsDesktop.Drawing;
 using FileLiberator;
 using LibationFileManager;
+using LibationUiBase;
 
 namespace LibationWinForms.ProcessQueue
 {

Source/LibationWinForms/ProcessQueue/ProcessQueueControl.cs

@@ -7,6 +7,7 @@ using System.Threading.Tasks;
 using System.Windows.Forms;
 using ApplicationServices;
 using LibationFileManager;
+using LibationUiBase;
 
 namespace LibationWinForms.ProcessQueue
 {

Source/LibationWinForms/Program.cs

@@ -92,7 +92,7 @@ namespace LibationWinForms
 			// check for existing settings in default location
 			var defaultSettingsFile = Path.Combine(defaultLibationFilesDir, "Settings.json");
 			if (Configuration.SettingsFileIsValid(defaultSettingsFile))
-				config.SetLibationFiles(defaultLibationFilesDir);
+				Configuration.SetLibationFiles(defaultLibationFilesDir);
 
 			if (config.LibationSettingsAreValid)
 				return;
@@ -112,7 +112,7 @@ namespace LibationWinForms
 			}
 
 			if (setupDialog.IsNewUser)
-				config.SetLibationFiles(defaultLibationFilesDir);
+				Configuration.SetLibationFiles(defaultLibationFilesDir);
 			else if (setupDialog.IsReturningUser)
 			{
 				var libationFilesDialog = new LibationFilesDialog();
@@ -123,7 +123,7 @@ namespace LibationWinForms
 					return;
 				}
 
-				config.SetLibationFiles(libationFilesDialog.SelectedDirectory);
+				Configuration.SetLibationFiles(libationFilesDialog.SelectedDirectory);
 				if (config.LibationSettingsAreValid)
 					return;
 

Source/LoadByOS/LinuxConfigApp/LinuxConfigApp.csproj

@@ -34,4 +34,28 @@
     <ProjectReference Include="..\..\AppScaffolding\AppScaffolding.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Compile Update="Properties\Resources.Designer.cs">
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Resources.resx</DependentUpon>
+    </Compile>
+  </ItemGroup>
+
+  <ItemGroup>
+    <EmbeddedResource Update="Properties\Resources.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
+  </ItemGroup>
+
+  <ItemGroup>
+    <None Update="glass-with-glow_256.svg">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Update="Libation.desktop">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
+
 </Project>

Source/LoadByOS/LinuxConfigApp/LinuxInterop.cs

@@ -1,14 +1,73 @@
 using LibationFileManager;
+using System.Diagnostics;
 
 namespace LinuxConfigApp
 {
     internal class LinuxInterop : IInteropFunctions
     {
-        public LinuxInterop() { }
+		//Different terminal apps possibly installed on a linux system
+		// [0] console executable
+		// [1] argument to set the concole's title
+		// [2] argument to pass a command to be executed to the terminal
+		static readonly string[][] consoleCommands =
+        {
+	        new[] {"konsole", "--title", "-e"},
+	        new[] {"gnome-terminal", "--title", "--"},
+	        new[] {"mate-terminal", "--title", "-x"},
+	        new[] {"xterm", "-T", "-e"},
+        };
+
+		public LinuxInterop() { }
         public LinuxInterop(params object[] values) { }
 
         public void SetFolderIcon(string image, string directory) => throw new PlatformNotSupportedException();
         public void DeleteFolderIcon(string directory) => throw new PlatformNotSupportedException();
-        public void CopyTextToClipboard(string text) => throw new PlatformNotSupportedException();
-    }
+
+		//only run the audo updater is the current app was installed from the
+		//.deb package. Try to detect this by checking if the symlink exists.
+		public bool CanUpdate => Directory.Exists("/usr/bin/libation");
+		public void InstallUpdate(string updateBundle)
+		{
+			RunAsRoot("apt", $"install '{updateBundle}'");
+		}
+
+		public Process RunAsRoot(string exe, string args)
+        {
+			//cribbed this script from VirtualBox's guest additions installer.
+			//It's designed to launch the system's gui superuser password
+			//prompt across multiple distributions and desktop environments.
+			const string runasroot = "/tmp/runasroot.sh";
+			File.WriteAllBytes(runasroot, Properties.Resources.runasroot);
+
+			string command = $"{exe ?? ""} {args ?? ""}".Trim();
+
+			foreach (var console in consoleCommands)
+			{
+				ProcessStartInfo psi = new()
+				{
+					FileName = console[0],
+					UseShellExecute = false,
+					ArgumentList =
+					{
+						console[1],
+						$"Running '{exe}' as root",
+						console[2],
+						"/bin/sh",
+						runasroot,
+						"Installing libation.deb",
+						command,
+						$"Please run '{command}' manually"
+					}
+				};
+
+
+				try
+				{
+					return Process.Start(psi);
+				}
+				catch { }
+			}
+			return null;
+		}
+	}
 }

Source/LoadByOS/LinuxConfigApp/Properties/Resources.Designer.cs

@@ -0,0 +1,73 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace LinuxConfigApp.Properties {
+    using System;
+    
+    
+    /// <summary>
+    ///   A strongly-typed resource class, for looking up localized strings, etc.
+    /// </summary>
+    // This class was auto-generated by the StronglyTypedResourceBuilder
+    // class via a tool like ResGen or Visual Studio.
+    // To add or remove a member, edit your .ResX file then rerun ResGen
+    // with the /str option, or rebuild your VS project.
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+    internal class Resources {
+        
+        private static global::System.Resources.ResourceManager resourceMan;
+        
+        private static global::System.Globalization.CultureInfo resourceCulture;
+        
+        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        internal Resources() {
+        }
+        
+        /// <summary>
+        ///   Returns the cached ResourceManager instance used by this class.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Resources.ResourceManager ResourceManager {
+            get {
+                if (object.ReferenceEquals(resourceMan, null)) {
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("LinuxConfigApp.Properties.Resources", typeof(Resources).Assembly);
+                    resourceMan = temp;
+                }
+                return resourceMan;
+            }
+        }
+        
+        /// <summary>
+        ///   Overrides the current thread's CurrentUICulture property for all
+        ///   resource lookups using this strongly typed resource class.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Globalization.CultureInfo Culture {
+            get {
+                return resourceCulture;
+            }
+            set {
+                resourceCulture = value;
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Byte[].
+        /// </summary>
+        internal static byte[] runasroot {
+            get {
+                object obj = ResourceManager.GetObject("runasroot", resourceCulture);
+                return ((byte[])(obj));
+            }
+        }
+    }
+}

Source/LoadByOS/LinuxConfigApp/Properties/Resources.resx

@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <data name="runasroot" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\runasroot.sh;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+</root>

Source/LoadByOS/LinuxConfigApp/Resources/runasroot.sh

@@ -0,0 +1,188 @@
+#!/bin/sh
+# $Id: runasroot.sh 153224 2022-08-22 17:43:14Z klaus $
+## @file
+# VirtualBox privileged execution helper script for Linux and Solaris
+#
+
+#
+# Copyright (C) 2009-2022 Oracle and/or its affiliates.
+#
+# This file is part of VirtualBox base platform packages, as
+# available from https://www.virtualbox.org.
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation, in version 3 of the
+# License.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, see <https://www.gnu.org/licenses>.
+#
+# SPDX-License-Identifier: GPL-3.0-only
+#
+
+# Deal with differing "which" semantics
+mywhich() {
+    which "$1" 2>/dev/null | grep -v "no $1"
+}
+
+# Get the name and execute switch for a useful terminal emulator
+#
+# Sets $gxtpath to the emulator path or empty
+# Sets $gxttitle to the "title" switch for that emulator
+# Sets $gxtexec to the "execute" switch for that emulator
+# May clobber $gtx*
+# Calls mywhich
+getxterm() {
+    # gnome-terminal uses -e differently to other emulators
+    for gxti in "konsole --title -e" "gnome-terminal --title -x" "xterm -T -e"; do
+        set $gxti
+        gxtpath="`mywhich $1`"
+        case "$gxtpath" in ?*)
+            gxttitle=$2
+            gxtexec=$3
+            return
+            ;;
+        esac
+    done
+}
+
+# Quotes its argument by inserting '\' in front of every character save
+# for 'A-Za-z0-9/'.  Prints the result to stdout.
+quotify() {
+    echo "$1" | sed -e 's/\([^a-zA-Z0-9/]\)/\\\1/g'
+}
+
+ostype=`uname -s`
+if test "$ostype" != "Linux" && test "$ostype" != "SunOS" ; then
+  echo "Linux/Solaris not detected."
+  exit 1
+fi
+
+HAS_TERMINAL=""
+case "$1" in "--has-terminal")
+    shift
+    HAS_TERMINAL="yes"
+    ;;
+esac
+
+case "$#" in "2"|"3")
+    ;;
+    *)
+    echo "Usage: `basename $0` DESCRIPTION COMMAND [ADVICE]" >&2
+    echo >&2
+    echo "Attempt to execute COMMAND with root privileges, displaying DESCRIPTION if" >&2
+    echo "possible and displaying ADVICE if possible if no su(1)-like tool is available." >&2
+    exit 1
+    ;;
+esac
+
+DESCRIPTION=$1
+COMMAND=$2
+ADVICE=$3
+PATH=$PATH:/bin:/usr/bin:/usr/local/bin:/sbin:/usr/sbin:/usr/local/sbin:/usr/X11/bin
+
+case "$ostype" in SunOS)
+    PATH=$PATH:/usr/sfw/bin:/usr/gnu/bin:/usr/xpg4/bin:/usr/xpg6/bin:/usr/openwin/bin:/usr/ucb
+    GKSU_SWITCHES="-au root"
+    ;;
+    *)
+    GKSU_SWITCHES=""
+    ;;
+esac
+
+case "$HAS_TERMINAL" in "")
+    case "$DISPLAY" in ?*)
+        KDESUDO="`mywhich kdesudo`"
+        case "$KDESUDO" in ?*)
+            eval "`quotify "$KDESUDO"` --comment `quotify "$DESCRIPTION"` -- $COMMAND"
+            exit
+            ;;
+        esac
+
+        KDESU="`mywhich kdesu`"
+        case "$KDESU" in ?*)
+            "$KDESU" -c "$COMMAND"
+            exit
+            ;;
+        esac
+
+        GKSU="`mywhich gksu`"
+        case "$GKSU" in ?*)
+            # Older gksu does not grok --description nor '--' and multiple args.
+            # @todo which versions do?
+            # "$GKSU" --description "$DESCRIPTION" -- "$@"
+            # Note that $GKSU_SWITCHES is NOT quoted in the following
+            "$GKSU" $GKSU_SWITCHES "$COMMAND"
+            exit
+            ;;
+        esac
+        ;;
+    esac # $DISPLAY
+    ;;
+esac # ! $HAS_TERMINAL
+
+# pkexec may work for ssh console sessions as well if the right agents
+# are installed.  However it is very generic and does not allow for any
+# custom messages.  Thus it comes after gksu.
+## @todo should we insist on either a display or a terminal?
+# case "$DISPLAY$HAS_TERMINAL" in ?*)
+PKEXEC="`mywhich pkexec`"
+case "$PKEXEC" in ?*)
+    eval "\"$PKEXEC\" $COMMAND"
+    exit
+    ;;
+esac
+#    ;;S
+#esac
+
+case "$HAS_TERMINAL" in ?*)
+        USE_SUDO=
+        grep -q Ubuntu /etc/lsb-release 2>/dev/null && USE_SUDO=true
+        # On Ubuntu we need sudo instead of su.  Assume this works, and is only
+        # needed for Ubuntu until proven wrong.
+        case $USE_SUDO in true)
+            SUDO_COMMAND="`quotify "$SUDO"` -- $COMMAND"
+            eval "$SUDO_COMMAND"
+            exit
+            ;;
+        esac
+
+    SU="`mywhich su`"
+    case "$SU" in ?*)
+        "$SU" - root -c "$COMMAND"
+        exit
+        ;;
+    esac
+    ;;
+esac
+
+# The ultimate fallback is running 'su -' within an xterm.  We use the
+# title of the xterm to tell what is going on.
+case "$DISPLAY" in ?*)
+    SU="`mywhich su`"
+    case "$SU" in ?*)
+        getxterm
+        case "$gxtpath" in ?*)
+            "$gxtpath" "$gxttitle" "$DESCRIPTION - su" "$gxtexec" su - root -c "$COMMAND"
+            exit
+            ;;
+        esac
+    esac
+esac # $DISPLAY
+
+# Failure...
+case "$DISPLAY" in ?*)
+    echo "Unable to locate 'pkexec', 'gksu' or 'su+xterm'. $ADVICE" >&2
+    ;;
+    *)
+    echo "Unable to locate 'pkexec'. $ADVICE" >&2
+    ;;
+esac
+
+exit 1

Source/LoadByOS/MacOSConfigApp/Info.plist

@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+
+<dict>
+	<key>CFBundleExecutable</key>
+	<string>Libation</string>
+	<key>CFBundleName</key>
+	<string>Libation</string>
+	<key>CFBundleIdentifier</key>
+	<string>org.libation.macos</string>
+	<key>NSHighResolutionCapable</key>
+	<true/>
+	<key>CFBundleIconFile</key>
+	<string>libation.icns</string>
+	<key>CFBundleVersion</key>
+	<string>VERSION_STRING</string>
+	<key>com.apple.security.app-sandbox</key>
+	<false/>	
+	<key>com.apple.security.cs.allow-jit</key>
+	<true/>
+	<key>com.apple.security.cs.allow-unsigned-executable-memory</key>
+	<true/>
+	<key>com.apple.security.cs.disable-library-validation</key>
+	<true/>
+	<key>com.apple.security.cs.disable-executable-page-protection</key>
+	<true/>
+	<key>com.apple.security.automation.apple-events</key>
+	<true/>
+</dict>
+</plist>

Source/LoadByOS/MacOSConfigApp/MacOSConfigApp.csproj

@@ -34,4 +34,13 @@
     <ProjectReference Include="..\..\AppScaffolding\AppScaffolding.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <None Update="Info.plist">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Update="libation.icns">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
+
 </Project>

Source/LoadByOS/MacOSConfigApp/MacOSInterop.cs

@@ -1,14 +1,78 @@
 using LibationFileManager;
+using System.Diagnostics;
 
 namespace MacOSConfigApp
 {
     internal class MacOSInterop : IInteropFunctions
-    {
-        public MacOSInterop() { }
+	{
+		private const string AppPath = "/Applications/Libation.app";
+		public MacOSInterop() { }
         public MacOSInterop(params object[] values) { }
 
-        public void SetFolderIcon(string image, string directory) => throw new PlatformNotSupportedException();
+		public void SetFolderIcon(string image, string directory) => throw new PlatformNotSupportedException();
         public void DeleteFolderIcon(string directory) => throw new PlatformNotSupportedException();
-        public void CopyTextToClipboard(string text) => throw new PlatformNotSupportedException();
-    }
+
+		//I haven't figured out how to find the app bundle's directory from within
+		//the running process, so don't update unless it's "installed" in /Applications
+		public bool CanUpdate => Directory.Exists(AppPath);
+
+		public void InstallUpdate(string updateBundle)
+		{
+			Serilog.Log.Information($"Extracting update bundle to {AppPath}");
+
+			//tar wil overwrite existing without elevated privileges
+			Process.Start("tar", $"-xzf \"{updateBundle}\" -C \"/Applications\"").WaitForExit();
+			
+			//For now, it seems like this step is unnecessary. We can overwrite and
+			//run Libation without needing to re-add the exception. This is insurance.
+			RunAsRoot(null, $"""
+sudo spctl --master-disable
+sudo spctl --add --label 'Libation' {AppPath}
+open {AppPath}
+sudo spctl --master-enable
+""");
+		}
+
+		//Using osascript -e '[script]' works from the terminal, but I haven't figured
+		//out the syntax for it to work from create_process, so write to stdin instead.
+		public Process RunAsRoot(string _, string command)
+		{
+			const string osascript = "osascript";
+			var fullCommand = $"do shell script \"{command}\" with administrator privileges";
+
+			var psi = new ProcessStartInfo()
+			{
+				FileName = osascript,
+				UseShellExecute = false,
+				Arguments = "-",
+				RedirectStandardError= true,
+				RedirectStandardOutput= true,
+				RedirectStandardInput= true,
+			};
+
+			Serilog.Log.Logger.Information($"running {osascript} as root: {{script}}", fullCommand);
+
+			var proc = Process.Start(psi);
+			proc.ErrorDataReceived += Proc_ErrorDataReceived;
+			proc.OutputDataReceived += Proc_OutputDataReceived;
+			proc.BeginErrorReadLine();
+			proc.BeginOutputReadLine();
+			proc.StandardInput.WriteLine(fullCommand);
+			proc.StandardInput.Close();
+
+			return proc;
+		}
+
+		private void Proc_OutputDataReceived(object sender, DataReceivedEventArgs e)
+		{
+			if (e.Data != null)
+				Serilog.Log.Logger.Information("stderr: {data}", e.Data);
+		}
+
+		private void Proc_ErrorDataReceived(object sender, DataReceivedEventArgs e)
+		{
+			if (e.Data!= null)
+				Serilog.Log.Logger.Information("stderr: {data}", e.Data);
+		}
+	}
 }

Source/LoadByOS/WindowsConfigApp/WinInterop.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
@@ -35,8 +36,31 @@ namespace WindowsConfigApp
 
         public void DeleteFolderIcon(string directory)
             => new DirectoryInfo(directory)?.DeleteIcon();
+        public bool CanUpdate => true;
+		public void InstallUpdate(string updateBundle)
+		{
+			var thisExe = Environment.ProcessPath;
+			var thisDir = Path.GetDirectoryName(thisExe);
+			var zipExtractor = Path.Combine(Path.GetTempPath(), "ZipExtractor.exe");
 
-        public void CopyTextToClipboard(string text)
-            => Clipboard.SetText(text);
+			File.Copy("ZipExtractor.exe", zipExtractor, overwrite: true);
+
+			RunAsRoot(zipExtractor, $"--input \"{updateBundle}\" --output \"{thisDir}\" --executable \"{thisExe}\"");
+		}
+
+		public Process RunAsRoot(string exe, string args)
+        {
+			var psi = new ProcessStartInfo()
+			{
+				FileName = exe,
+				UseShellExecute = true,
+				Verb = "runas",
+				WindowStyle = ProcessWindowStyle.Normal,
+				CreateNoWindow = true,
+				Arguments = args
+			};
+
+            return Process.Start(psi);
+		}
     }
 }

Source/LoadByOS/WindowsConfigApp/WindowsConfigApp.csproj

@@ -33,11 +33,17 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Dinah.Core.WindowsDesktop" Version="7.2.1.1" />
+    <PackageReference Include="Dinah.Core.WindowsDesktop" Version="7.2.2.1" />
   </ItemGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\..\AppScaffolding\AppScaffolding.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <None Update="ZipExtractor.exe">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
+
 </Project>