Incr ver so bug fixes can be released. New features will also be announced in upcoming new major ver

Lots of Bug Fixes and 2 New Features.

.github/workflows/build-linux.yml

@@ -1,5 +1,5 @@
 # build-linux.yml
-# Reusable workflow that builds the Linux and MacOS versions of Libation.
+# Reusable workflow that builds the Linux and MacOS (x64 and arm64) versions of Libation.
 ---
 name: build
 
@@ -19,15 +19,15 @@ on:
 env:
   DOTNET_CONFIGURATION: 'Release'
   DOTNET_VERSION: '7.0.x'
+  RELEASE_NAME: 'chardonnay'
 
 jobs:
   build:
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [Linux, MacOS]
-        ui: [Avalonia]
-        release_name: [chardonnay]
+        os: [ubuntu-latest, macos-latest]
+        arch: [x64, arm64]
     steps:
       - uses: actions/checkout@v3
       - name: Setup .NET
@@ -45,37 +45,63 @@ jobs:
           then
             version="${inputVersion}"
           else
-            version="$(grep -oP '(?<=<Version>).*(?=</Version)' ./Source/AppScaffolding/AppScaffolding.csproj)"
+            version="$(grep -Eio -m 1 '<Version>.*</Version>' ./Source/AppScaffolding/AppScaffolding.csproj | sed -r 's/<\/?Version>//g')"
           fi
           echo "version=${version}" >> "${GITHUB_OUTPUT}"
-
       - name: Unit test
         if: ${{ inputs.run_unit_tests }}
         working-directory: ./Source
         run: dotnet test
 
       - name: Publish
+        id: publish
         working-directory: ./Source
         run: |
-          dotnet publish -c ${{ env.DOTNET_CONFIGURATION }} -o bin/Publish/${{ matrix.os }}-${{ matrix.release_name }} Libation${{ matrix.ui }}/Libation${{ matrix.ui }}.csproj -p:PublishProfile=Libation${{ matrix.ui }}/Properties/PublishProfiles/${{ matrix.os }}Profile.pubxml
-          dotnet publish -c ${{ env.DOTNET_CONFIGURATION }} -o bin/Publish/${{ matrix.os }}-${{ matrix.release_name }} LoadByOS/${{ matrix.os }}ConfigApp/${{ matrix.os }}ConfigApp.csproj -p:PublishProfile=LoadByOS/Properties/${{ matrix.os }}ConfigApp/PublishProfiles/${{ matrix.os }}Profile.pubxml
-          dotnet publish -c ${{ env.DOTNET_CONFIGURATION }} -o bin/Publish/${{ matrix.os }}-${{ matrix.release_name }} LibationCli/LibationCli.csproj -p:PublishProfile=LibationCli/Properties/PublishProfiles/${{ matrix.os }}Profile.pubxml
-          dotnet publish -c ${{ env.DOTNET_CONFIGURATION }} -o bin/Publish/${{ matrix.os }}-${{ matrix.release_name }} Hangover${{ matrix.ui }}/Hangover${{ matrix.ui }}.csproj -p:PublishProfile=Hangover${{ matrix.ui }}/Properties/PublishProfiles/${{ matrix.os }}Profile.pubxml
-
-      - name: Zip artifact
-        id: zip
-        working-directory: ./Source/bin/Publish/${{ matrix.os }}-${{ matrix.release_name }}
+          os=${{ matrix.os }}
+          target_os="$(echo ${os/-latest/} | sed 's/ubuntu/linux/')"
+          display_os="$(echo ${target_os/macos/macOS} | sed 's/linux/Linux/')"
+          echo "display_os=${display_os}" >> $GITHUB_OUTPUT
+          RUNTIME_IDENTIFIER="$(echo ${target_os/macos/osx})-${{ matrix.arch }}"
+          echo "$RUNTIME_IDENTIFIER"
+          dotnet publish \
+              LibationAvalonia/LibationAvalonia.csproj \
+              --runtime "$RUNTIME_IDENTIFIER" \
+              --configuration ${{ env.DOTNET_CONFIGURATION }} \
+              --output bin/Publish/${display_os}-${{ matrix.arch }}-${{ env.RELEASE_NAME }} \
+              -p:PublishProfile=LibationAvalonia/Properties/PublishProfiles/${display_os}Profile.pubxml
+          dotnet publish \
+              LoadByOS/${display_os}ConfigApp/${display_os}ConfigApp.csproj \
+              --runtime "$RUNTIME_IDENTIFIER" \
+              --configuration ${{ env.DOTNET_CONFIGURATION }} \
+              --output bin/Publish/${display_os}-${{ matrix.arch }}-${{ env.RELEASE_NAME }} \
+              -p:PublishProfile=LoadByOS/Properties/${display_os}ConfigApp/PublishProfiles/${display_os}Profile.pubxml
+          dotnet publish \
+              LibationCli/LibationCli.csproj \
+              --runtime "$RUNTIME_IDENTIFIER" \
+              --configuration ${{ env.DOTNET_CONFIGURATION }} \
+              --output bin/Publish/${display_os}-${{ matrix.arch }}-${{ env.RELEASE_NAME }} \
+              -p:PublishProfile=LibationCli/Properties/PublishProfiles/${display_os}Profile.pubxml
+          dotnet publish \
+              HangoverAvalonia/HangoverAvalonia.csproj \
+              --runtime "$RUNTIME_IDENTIFIER" \
+              --configuration ${{ env.DOTNET_CONFIGURATION }} \
+              --output bin/Publish/${display_os}-${{ matrix.arch }}-${{ env.RELEASE_NAME }} \
+              -p:PublishProfile=HangoverAvalonia/Properties/PublishProfiles/${display_os}Profile.pubxml
+      - name: Build bundle
+        id: bundle
+        working-directory: ./Source/bin/Publish/${{ steps.publish.outputs.display_os }}-${{ matrix.arch }}-${{ env.RELEASE_NAME }}
         run: |
-          delfiles=("libmp3lame.x86.dll" "libmp3lame.x64.dll" "ffmpegaac.x86.dll" "ffmpegaac.x64.dll" "ZipExtractor.exe")
-          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 }}"
+          BUNDLE_DIR=$(pwd)
+          echo "Bundle dir: ${BUNDLE_DIR}"
+          cd ..
+          SCRIPT=../../../Scripts/Bundle_${{ steps.publish.outputs.display_os }}.sh
+          chmod +rx ${SCRIPT}
+          ${SCRIPT} "${BUNDLE_DIR}" "${{ steps.get_version.outputs.version }}" "${{ matrix.arch }}"
+          artifact=$(ls ./bundle)
           echo "artifact=${artifact}" >> "${GITHUB_OUTPUT}"
-          tar -zcvf "../${artifact}.tar.gz" .
-
-      - name: Publish artifact
+      - name: Publish bundle
         uses: actions/upload-artifact@v3
         with:
-          name: ${{ steps.zip.outputs.artifact }}.tar.gz
-          path: ./Source/bin/Publish/${{ steps.zip.outputs.artifact }}.tar.gz
-          if-no-files-found: error
+          name: ${{ steps.bundle.outputs.artifact }}
+          path: ./Source/bin/Publish/bundle/${{ steps.bundle.outputs.artifact }}
+          if-no-files-found: error

.github/workflows/build-windows.yml

@@ -60,21 +60,49 @@ jobs:
       - name: Publish
         working-directory: ./Source
         run: |
-          dotnet publish -c ${{ env.DOTNET_CONFIGURATION }} -o bin/Publish/${{ matrix.os }}-${{ matrix.release_name }} Libation${{ matrix.ui }}/Libation${{ matrix.ui }}.csproj -p:PublishProfile=Libation${{ matrix.ui }}/Properties/PublishProfiles/${{ matrix.os }}Profile.pubxml
-          dotnet publish -c ${{ env.DOTNET_CONFIGURATION }} -o bin/Publish/${{ matrix.os }}-${{ matrix.release_name }} LoadByOS/${{ matrix.os }}ConfigApp/${{ matrix.os }}ConfigApp.csproj -p:PublishProfile=LoadByOS/Properties/${{ matrix.os }}ConfigApp/PublishProfiles/${{ matrix.os }}Profile.pubxml
-          dotnet publish -c ${{ env.DOTNET_CONFIGURATION }} -o bin/Publish/${{ matrix.os }}-${{ matrix.release_name }} LibationCli/LibationCli.csproj -p:PublishProfile=LibationCli/Properties/PublishProfiles/${{ matrix.os }}Profile.pubxml
-          dotnet publish -c ${{ env.DOTNET_CONFIGURATION }} -o bin/Publish/${{ matrix.os }}-${{ matrix.release_name }} Hangover${{ matrix.ui }}/Hangover${{ matrix.ui }}.csproj -p:PublishProfile=Hangover${{ matrix.ui }}/Properties/PublishProfiles/${{ matrix.os }}Profile.pubxml
+          dotnet publish `
+              Libation${{ matrix.ui }}/Libation${{ matrix.ui }}.csproj `
+              --configuration ${{ env.DOTNET_CONFIGURATION }} `
+              --output bin/Publish/${{ matrix.os }}-${{ matrix.release_name }} `
+              -p:PublishProfile=Libation${{ matrix.ui }}/Properties/PublishProfiles/${{ matrix.os }}Profile.pubxml
+          dotnet publish `
+              LoadByOS/${{ matrix.os }}ConfigApp/${{ matrix.os }}ConfigApp.csproj `
+              --configuration ${{ env.DOTNET_CONFIGURATION }} `
+              --output bin/Publish/${{ matrix.os }}-${{ matrix.release_name }} `
+              -p:PublishProfile=LoadByOS/Properties/${{ matrix.os }}ConfigApp/PublishProfiles/${{ matrix.os }}Profile.pubxml
+          dotnet publish `
+              LibationCli/LibationCli.csproj `
+              --configuration ${{ env.DOTNET_CONFIGURATION }} `
+              --output bin/Publish/${{ matrix.os }}-${{ matrix.release_name }} `
+              -p:PublishProfile=LibationCli/Properties/PublishProfiles/${{ matrix.os }}Profile.pubxml
+          dotnet publish `
+              Hangover${{ matrix.ui }}/Hangover${{ matrix.ui }}.csproj `
+              --configuration ${{ env.DOTNET_CONFIGURATION }} `
+              --output bin/Publish/${{ matrix.os }}-${{ matrix.release_name }} `
+              -p:PublishProfile=Hangover${{ matrix.ui }}/Properties/PublishProfiles/${{ matrix.os }}Profile.pubxml
 
       - name: Zip artifact
         id: zip
         working-directory: ./Source/bin/Publish
         run: |
-          $dir = "${{ matrix.os }}-${{ matrix.release_name }}\"
-          $delfiles = @("libmp3lame.so", "ffmpegaac.so", "glass-with-glow_256.svg", "Libation.desktop")
-          foreach ($file in $delfiles){ if (test-path $dir$file){ Remove-Item $dir$file } }
+          $bin_dir = "${{ matrix.os }}-${{ matrix.release_name }}\"
+          $delfiles = @(
+            "libmp3lame.x64.so",
+            "libmp3lame.arm64.so",
+            "libmp3lame.x64.dylib",
+            "libmp3lame.arm64.dylib",
+            "ffmpegaac.x64.so",
+            "ffmpegaac.arm64.so",
+            "ffmpegaac.x64.dylib",
+            "ffmpegaac.arm64.dylib",
+            "WindowsConfigApp.exe",
+            "WindowsConfigApp.runtimeconfig.json",
+            "WindowsConfigApp.deps.json"
+            )
+          foreach ($file in $delfiles){ if (test-path $bin_dir$file){ Remove-Item $bin_dir$file } }
           $artifact="${{ matrix.prefix }}Libation.${{ steps.get_version.outputs.version }}-" + "${{ matrix.os }}".ToLower() + "-${{ matrix.release_name }}"
           "artifact=$artifact" >> $env:GITHUB_OUTPUT
-          Compress-Archive -Path "${dir}*" -DestinationPath "$artifact.zip"
+          Compress-Archive -Path "${bin_dir}*" -DestinationPath "$artifact.zip"
 
       - name: Publish artifact
         uses: actions/upload-artifact@v3

.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

@@ -33,15 +33,9 @@ jobs:
     with:
       version_override: ${{ needs.prerelease.outputs.version }}
       run_unit_tests: false
-
-  deb:
-    needs: [prerelease,build]
-    uses: ./.github/workflows/deb.yml
-    with:
-      version: ${{ needs.prerelease.outputs.version }}
       
   release:
-    needs: [prerelease,build,deb]
+    needs: [prerelease,build]
     runs-on: ubuntu-latest
     steps:
       - name: Download artifacts
@@ -53,7 +47,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,8 @@
 {
-  "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"
+  "WindowsClassic":      "Classic-Libation\\.\\d+\\.\\d+\\.\\d+-win(dows)?-classic\\.zip",
+  "WindowsAvalonia":     "Libation\\.\\d+\\.\\d+\\.\\d+-win(dows)?-chardonnay\\.zip",
+  "LinuxAvalonia":       "Libation\\.\\d+\\.\\d+\\.\\d+-linux-chardonnay-amd64\\.deb",
+  "MacOSAvalonia":       "Libation\\.\\d+\\.\\d+\\.\\d+-macOS-chardonnay-x64\\.tgz",
+  "LinuxAvalonia_Arm64": "Libation\\.\\d+\\.\\d+\\.\\d+-linux-chardonnay-arm64\\.deb",
+  "MacOSAvalonia_Arm64": "Libation\\.\\d+\\.\\d+\\.\\d+-macOS-chardonnay-arm64\\.tgz"
 }

.vscode/launch.json

@@ -0,0 +1,21 @@
+{
+    // Use IntelliSense to learn about possible attributes.
+    // Hover to view descriptions of existing attributes.
+    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [
+
+        {
+            "name": ".NET Core Launch (console)",
+            "type": "coreclr",
+            "request": "launch",
+            "preLaunchTask": "build",
+            "program": "${workspaceFolder}/Source/bin/Avalonia/Debug/Libation.dll",
+            "args": [],
+            "cwd": "${workspaceFolder}",
+            "stopAtEntry": false,
+            "console": "internalConsole"
+        }
+
+    ]
+}

.vscode/tasks.json

@@ -0,0 +1,42 @@
+{
+    // See https://go.microsoft.com/fwlink/?LinkId=733558
+    // for the documentation about the tasks.json format
+    "version": "2.0.0",
+    "tasks": [
+        {
+            "label": "build",
+            "dependsOn": [
+                "build_libation",
+                "build_linuxconfigapp"
+            ]
+        },
+        {
+            "label": "build_libation",
+            "type": "shell",
+            "command": "dotnet",
+            "args": [
+                "build",
+                "${workspaceFolder}/Source/LibationAvalonia/LibationAvalonia.csproj"
+            ],
+            "group": "build",
+            "presentation": {
+                //"reveal": "silent"
+            },
+            "problemMatcher": "$msCompile"
+        },
+        {
+            "label": "build_linuxconfigapp",
+            "type": "shell",
+            "command": "dotnet",
+            "args": [
+                "build",
+                "${workspaceFolder}/Source/LoadByOS/LinuxConfigApp/LinuxConfigApp.csproj"
+            ],
+            "group": "build",
+            "presentation": {
+                //"reveal": "silent"
+            },
+            "problemMatcher": "$msCompile"
+        }
+    ]
+}

Documentation/Advanced.md

@@ -1,6 +1,6 @@
 ## [Download Libation](https://github.com/rmcrackan/Libation/releases/latest)
 
-### If you found this useful, tell a friend. If you found this REALLY useful, you can click here to [PalPal.me](https://paypal.me/mcrackan?locale.x=en_us)
+### If you found this useful, tell a friend. If you found this REALLY useful, you can click here to [PayPal.me](https://paypal.me/mcrackan?locale.x=en_us)
 ...or just tell more friends. As long as I'm maintaining this software, it will remain **free** and **open source**.
 
 
@@ -9,7 +9,7 @@
 
 - [Files and folders](#files-and-folders)
 - [Settings](#settings)
-- [Custom File Naming](#custom-file-naming)
+- [Custom File Naming](NamingTemplates.md)
 - [Command Line Interface](#command-line-interface)
 
 
@@ -28,12 +28,6 @@ To make upgrades and reinstalls easier, Libation separates all of its responsibi
 
 * Allow Libation to fix up audiobook metadata. After decrypting a title, Libation attempts to fix details like chapters and cover art. Some power users and/or control freaks prefer to manage this themselves. By unchecking this setting, Libation will only decrypt the book and will leave metadata as-is, warts and all.
 
-### Custom File Naming
-
-In Settings, on the Download/Decrypt tab, you can specify the format in which you want your files to be named. As you edit these templates, a live example will be shown. Parameters are listed for folders, files, and files split by chapter including an explanation of what each naming option means. For instance: you can use template `<title short> - <ch# 0> of <ch count> - <ch title>` to create the file `A Study in Scarlet - 04 of 10 - A Flight for Life.m4b`.
-
-These templates apply to GUI and CLI.
-
 ### Command Line Interface
 
 Libationcli.exe allows limited access to Libation's functionalities as a CLI.

Documentation/Docker.md

@@ -1,6 +1,6 @@
 ## [Download Libation](https://github.com/rmcrackan/Libation/releases/latest)
 
-### If you found this useful, tell a friend. If you found this REALLY useful, you can click here to [PalPal.me](https://paypal.me/mcrackan?locale.x=en_us)
+### If you found this useful, tell a friend. If you found this REALLY useful, you can click here to [PayPal.me](https://paypal.me/mcrackan?locale.x=en_us)
 ...or just tell more friends. As long as I'm maintaining this software, it will remain **free** and **open source**.
 
 

Documentation/GettingStarted.md

@@ -1,6 +1,6 @@
 ## [Download Libation](https://github.com/rmcrackan/Libation/releases/latest)
 
-### If you found this useful, tell a friend. If you found this REALLY useful, you can click here to [PalPal.me](https://paypal.me/mcrackan?locale.x=en_us)
+### If you found this useful, tell a friend. If you found this REALLY useful, you can click here to [PayPal.me](https://paypal.me/mcrackan?locale.x=en_us)
 ...or just tell more friends. As long as I'm maintaining this software, it will remain **free** and **open source**.
 
 
@@ -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/InstallOnLinux.md

@@ -1,6 +1,6 @@
 ## [Download Libation](https://github.com/rmcrackan/Libation/releases/latest)
 
-### If you found this useful, tell a friend. If you found this REALLY useful, you can click here to [PalPal.me](https://paypal.me/mcrackan?locale.x=en_us)
+### If you found this useful, tell a friend. If you found this REALLY useful, you can click here to [PayPal.me](https://paypal.me/mcrackan?locale.x=en_us)
 ...or just tell more friends. As long as I'm maintaining this software, it will remain **free** and **open source**.
 
 

Documentation/InstallOnMac.md

@@ -1,44 +1,43 @@
 ## [Download Libation](https://github.com/rmcrackan/Libation/releases/latest)
 
-### If you found this useful, tell a friend. If you found this REALLY useful, you can click here to [PalPal.me](https://paypal.me/mcrackan?locale.x=en_us)
+### If you found this useful, tell a friend. If you found this REALLY useful, you can click here to [PayPal.me](https://paypal.me/mcrackan?locale.x=en_us)
 ...or just tell more friends. As long as I'm maintaining this software, it will remain **free** and **open source**.
 
 
-
 # Run Libation on MacOS
 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 file from the latest release and extract it.
+  - Apple Silicon (M1, M2, ...): `Libation.9.4.2-macOS-chardonnay-`**arm64**`.tgz`
+  - Intel: `Libation.x.x.x-macOS-chardonnay-`**x64**`.tgz`
+- 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
 
-[Run Libation on MacOS](https://user-images.githubusercontent.com/37587114/213933357-983d8ede-2738-4b32-9c6e-40de21ff09c2.mp4)
+[Run Libation on MacOS](https://user-images.githubusercontent.com/37587114/219271379-a922e4e1-48a0-48e4-bd81-48aa1226a4f5.mp4)

Documentation/NamingTemplates.md

@@ -0,0 +1,116 @@
+# Naming Templates
+File and Folder names can be customized using Libation's built-in tag template naming engine. To edit how folder and file names are created, go to Settings \> Download/Decrypt and edit the naming templates. If you're splitting your audiobook into multiple files by chapter, you can also use a custom template to set each chapter's title metadata tag by editing the template in Settings \> Audio File Options.
+
+These templates apply to both GUI and CLI.
+
+# Table of Contents
+
+- [Template Tags](#template-tags)
+  - [Property Tags](#property-tags)
+  - [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)
+
+
+# Template Tags
+
+These are the naming template tags currently supported by Libation.
+
+## Property Tags
+These tags will be replaced in the template with the audiobook's values.
+
+|Tag|Description|Type|
+|-|-|-|
+|\<id\> **†**|Audible book ID (ASIN)|Text|
+|\<title\>|Full title|Text|
+|\<title short\>|Title. Stop at first colon|Text|
+|\<author\>|Author(s)|Name List|
+|\<first author\>|First author|Text|
+|\<narrator\>|Narrator(s)|Name List|
+|\<first narrator\>|First narrator|Text|
+|\<series\>|Name of series|Text|
+|\<series#\>|Number order in series|Text|
+|\<bitrate\>|File's original bitrate (Kbps)|Integer|
+|\<samplerate\>|File's original audio sample rate|Integer|
+|\<channels\>|Number of audio channels|Integer|
+|\<account\>|Audible account of this book|Text|
+|\<locale\>|Region/country|Text|
+|\<year\>|Year published|Integer|
+|\<language\>|Book's language|Text|
+|\<language short\> **†**|Book's language abbreviated. Eg: ENG|Text|
+|\<file date\>|File creation date/time.|DateTime|
+|\<pub date\>|Audiobook publication date|DateTime|
+|\<date added\>|Date the book added to your Audible account|DateTime|
+|\<ch count\> **‡**|Number of chapters|Integer|
+|\<ch title\> **‡**|Chapter title|Text|
+|\<ch#\> **‡**|Chapter number|Integer|
+|\<ch# 0\> **‡**|Chapter number with leading zeros|Integer|
+
+**†** Does not support custom formatting
+
+**‡** Only valid for Chapter Filename and Chapter Tile Metadata
+
+To change how these properties are displayed, [read about custom formatters](#tag-formatters)
+
+## Conditional Tags
+Anything between the opening tag (`<tagname->`) and closing tag (`<-tagname>`) will only appear in the name if the condition evaluates to true. 
+
+|Tag|Description|Type|
+|-|-|-|
+|\<if series-\>...\<-if series\>|Only include if part of a book series or podcast|Conditional|
+|\<if podcast-\>...\<-if podcast\>|Only include if part of a podcast|Conditional|
+|\<if bookseries-\>...\<-if bookseries\>|Only include if part of a book series|Conditional|
+
+For example, <if podcast-\>\<series\>\<-if podcast\> will evaluate to the podcast's series name if the file is a podcast. For audiobooks that are not podcasts, that tag will be blank.
+
+You can invert the condition (instead of displaying the text when the condition is true, display the text when it is false) by playing a '!' symbol before the opening tag name.
+
+As an example, this folder template will place all Liberated podcasts into a "Podcasts" folder and all liberated books (not podcasts) into a "Books" folder.
+
+\<if podcast-\>Podcasts<-if podcast\>\<!if podcast-\>Books\<-if podcast\>\\\<title\>
+
+
+# Tag Formatters
+**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|
+|-|-|-|-|
+|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|
+
+## 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).
+### Standard DateTime Formatters
+|Formatter|Description|Example Usage|Example Result|
+|-|-|-|-|
+|s|Sortable date/time pattern.|\<file date[s]\>|2023-02-14T13:45:30|
+|Y|Year month pattern.|\<file date[Y]\>|February 2023|
+
+### Custom DateTime Formatters
+You can use custom formatters to construct customized DateTime string. For more custom formatters and examples, [see this guide from Microsoft](https://learn.microsoft.com/en-us/dotnet/standard/base-types/custom-date-and-time-format-strings).
+|Formatter|Description|Example Usage|Example Result|
+|-|-|-|-|
+|yyyy|4-digit year|\<file date[yyyy]\>|2023|
+|yy|2-digit year|\<file date[yy]\>|23|
+|MM|2-digit month|\<file date[MM]\>|02|
+|dd|2-digit day of the month|\<file date[yyyy-MM-dd]\>|2023-02-14|
+|HH<br>mm|The hour, using a 24-hour clock from 00 to 23<br>The minute, from 00 through 59.|\<file date[HH:mm]\>|14:45|
+
+

Documentation/SearchingAndFiltering.md

@@ -1,6 +1,6 @@
 ## [Download Libation](https://github.com/rmcrackan/Libation/releases/latest)
 
-### If you found this useful, tell a friend. If you found this REALLY useful, you can click here to [PalPal.me](https://paypal.me/mcrackan?locale.x=en_us)
+### If you found this useful, tell a friend. If you found this REALLY useful, you can click here to [PayPal.me](https://paypal.me/mcrackan?locale.x=en_us)
 ...or just tell more friends. As long as I'm maintaining this software, it will remain **free** and **open source**.
 
 

Images/libation_cheers.svg

@@ -0,0 +1,32 @@
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 512 512" width="512px" enable-background="new 0 0 512 512">
+<path id="slosh" transform=
+	"translate(-50 23)
+	scale(0.7, 0.7)
+	rotate(12 256,256)"
+d=
+"M139,2
+	A 192,200 0 0 0 103,84
+	A 222,334 41 0 0 241,320
+	V478
+	H160
+	A 16,16 0 0 0 160,510
+	H352
+	A16 16 0 0 0 352,478
+	H271
+	V320
+	A 222,334 -41 0 0 409,84
+	A 192,200 0 0 0 373,2
+M355,32
+	A 192,200 0 0 1 381,127
+	A 187.5,334 -35 0 1 256,286
+	A 187.5,334 35 0 1 131,127
+	A 192,200 0 0 1 157,32
+	H355
+M146,147
+	A 168,300 35 0 0 256,270
+	A 168,300 -35 0 0 366,128
+	S 360,50 280,110
+	S 192,128 147,147
+z" />
+<use href="#slosh" transform="translate(512 0) scale(-1 1)" />
+</svg>

Images/libation_glass.svg

@@ -0,0 +1,28 @@
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 512 512" enable-background="new 0 0 512 512">
+<path id="glass" d=
+"M139,2
+	A 192,200 0 0 0 103,84
+	A 222,334 41 0 0 241,320
+	V478
+	H160
+	A 16,16 0 0 0 160,510
+	H352
+	A16 16 0 0 0 352,478
+	H271
+	V320
+	A 222,334 -41 0 0 409,84
+	A 192,200 0 0 0 373,2
+M355,32
+	A 192,200 0 0 1 381,127
+	A 187.5,334 -35 0 1 256,286
+	A 187.5,334 35 0 1 131,127
+	A 192,200 0 0 1 157,32
+	H355
+z" />
+
+<path id="wine-level" d=
+"M146,128
+	A 168,300 35 0 0 256,270
+	A 168,300 -35 0 0 366,128
+z"/>
+</svg>

Images/libation_hangover.svg

@@ -0,0 +1,30 @@
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 512 512" enable-background="new 0 0 512 512">
+
+<g transform="translate(0 80) rotate(90 256,256)">
+<path id="glass" d=
+"M139,2
+	A 192,200 0 0 0 103,84
+	A 222,334 41 0 0 241,320
+	V478
+	H160
+	A 16,16 0 0 0 160,510
+	H352
+	A16 16 0 0 0 352,478
+	H271
+	V320
+	A 222,334 -41 0 0 409,84
+	A 192,200 0 0 0 373,2
+M355,32
+	A 192,200 0 0 1 381,127
+	A 187.5,334 -35 0 1 256,286
+	A 187.5,334 35 0 1 131,127
+	A 192,200 0 0 1 157,32
+	H355
+z" />
+<path id="wine-level" d=
+"M345,44
+	A 192,184 0 0 1 366,126
+	A 320,180 55 0 1 345,226
+z"/>
+</g>
+</svg>

Images/libation_slosh.svg

@@ -0,0 +1,33 @@
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 512 512" enable-background="new 0 0 512 512">
+<path
+transform=
+	"rotate(15 256,256)
+	translate(0 25)
+	scale(0.93, 0.93)"
+d=
+"M139,2
+	A 192,200 0 0 0 103,84
+	A 222,334 41 0 0 241,320
+	V478
+	H160
+	A 16,16 0 0 0 160,510
+	H352
+	A16 16 0 0 0 352,478
+	H271
+	V320
+	A 222,334 -41 0 0 409,84
+	A 192,200 0 0 0 373,2
+M355,32
+	A 192,200 0 0 1 381,127
+	A 187.5,334 -35 0 1 256,286
+	A 187.5,334 35 0 1 131,127
+	A 192,200 0 0 1 157,32
+	H355
+M146,147
+	A 168,300 35 0 0 256,270
+	A 168,300 -35 0 0 366,128
+	S 360,50 280,110
+	S 192,128 147,147
+z" />
+
+</svg>

README.md

@@ -2,7 +2,7 @@
 
 ## [Download Libation](https://github.com/rmcrackan/Libation/releases/latest)
 
-### If you found this useful, tell a friend. If you found this REALLY useful, you can click here to [PalPal.me](https://paypal.me/mcrackan?locale.x=en_us)
+### If you found this useful, tell a friend. If you found this REALLY useful, you can click here to [PayPal.me](https://paypal.me/mcrackan?locale.x=en_us)
 ...or just tell more friends. As long as I'm maintaining this software, it will remain **free** and **open source**.
 
 # Table of Contents
@@ -28,7 +28,7 @@
 - [Advanced](Documentation/Advanced.md)
     - [Files and folders](Documentation/Advanced.md#files-and-folders)
     - [Settings](Documentation/Advanced.md#settings)
-    - [Custom File Naming](Documentation/Advanced.md#custom-file-naming)
+    - [Custom File Naming](Documentation/NamingTemplates.md)
     - [Command Line Interface](Documentation/Advanced.md#command-line-interface)
 - [Docker](Documentation/Docker.md)
 

Scripts/Bundle_Linux.sh

@@ -0,0 +1,146 @@
+#!/bin/bash
+
+BIN_DIR=$1; shift
+VERSION=$1; shift
+ARCH=$1; shift
+
+if [ -z "$BIN_DIR" ]
+then
+  echo "This script must be called with a the Libation Linux bins directory as an argument."
+  exit
+fi
+
+if [ ! -d "$BIN_DIR" ]
+then
+  echo "The directory \"$BIN_DIR\" 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
+
+if [ -z "$ARCH" ]
+then
+  echo "This script must be called with the Libation cpu architecture as an argument."
+  exit
+fi
+
+contains() { case "$1" in *"$2"*) true ;; *) false ;; esac }
+
+if ! contains "$BIN_DIR" "$ARCH"
+then
+  echo "This script must be called with a Libation binaries for ${ARCH}."
+  exit
+fi
+
+ARCH=$(echo $ARCH | sed 's/x64/amd64/')
+
+DEB_DIR=./deb
+
+FOLDER_EXEC=$DEB_DIR/usr/lib/libation
+echo "Exec dir: $FOLDER_EXEC"
+mkdir -p $FOLDER_EXEC
+
+echo "Moving bins from $BIN_DIR to $FOLDER_EXEC"
+mv "${BIN_DIR}/"* $FOLDER_EXEC
+
+if [ $? -ne 0 ]
+ then echo "Error moving ${BIN_DIR} files"
+ exit
+fi
+
+
+delfiles=('libmp3lame.arm64.dylib' 'libmp3lame.x64.dylib' 'libmp3lame.x64.dll' 'libmp3lame.x86.dll' 'ffmpegaac.arm64.dylib' 'ffmpegaac.x64.dylib' 'ffmpegaac.x64.dll' 'ffmpegaac.x86.dll' 'LinuxConfigApp' 'LinuxConfigApp.deps.json' 'LinuxConfigApp.runtimeconfig.json')
+if [[ "$ARCH" == "arm64" ]]
+then
+  delfiles+=('libmp3lame.x64.so' 'ffmpegaac.x64.so')
+else
+  delfiles+=('libmp3lame.arm64.so' 'ffmpegaac.arm64.so')
+fi
+
+for n in "${delfiles[@]}"
+do
+  echo "Deleting $n"
+  rm $FOLDER_EXEC/$n
+done
+
+FOLDER_ICON=$DEB_DIR/usr/share/icons/hicolor/scalable/apps/
+echo "Icon dir: $FOLDER_ICON"
+
+FOLDER_DESKTOP=$DEB_DIR/usr/share/applications
+echo "Desktop dir: $FOLDER_DESKTOP"
+
+FOLDER_DEBIAN=$DEB_DIR/DEBIAN
+echo "Debian dir: $FOLDER_DEBIAN"
+
+mkdir -p $FOLDER_ICON
+mkdir -p $FOLDER_DESKTOP
+mkdir -p $FOLDER_DEBIAN
+
+echo "Copying icon..."
+cp $FOLDER_EXEC/libation_glass.svg $FOLDER_ICON/libation.svg
+
+echo "Copying desktop file..."
+cp $FOLDER_EXEC/Libation.desktop $FOLDER_DESKTOP/Libation.desktop
+
+echo "Creating pre-install file..."
+echo "#!/bin/bash
+# Pre-install script, removes previous installation program files and sym links
+echo \"Removing previously created symlinks...\"
+rm /usr/bin/libation
+rm /usr/bin/hangover
+rm /usr/bin/libationcli
+echo \"Removing previously installed Libation files...\"
+rm -r /usr/lib/libation
+# making sure it won't stop installation
+exit 0
+" >> $FOLDER_DEBIAN/preinst
+
+echo "Creating post-install file..."
+echo "#!/bin/bash
+gtk-update-icon-cache -f /usr/share/icons/hicolor/
+ln -s /usr/lib/libation/Libation /usr/bin/libation
+ln -s /usr/lib/libation/Hangover /usr/bin/hangover
+ln -s /usr/lib/libation/LibationCli /usr/bin/libationcli
+# Increase the maximum number of inotify instances
+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
+chmod 666 /usr/lib/libation/appsettings.json
+" >> $FOLDER_DEBIAN/postinst
+
+echo "Creating control file..."
+echo "Package: Libation
+Version: $VERSION
+Architecture: $ARCH
+Essential: no
+Priority: optional
+Maintainer: github.com/rmcrackan
+Description: liberate your audiobooks
+" >> $FOLDER_DEBIAN/control
+
+echo "Changing permissions for pre- and post-install files..."
+chmod +x "$FOLDER_DEBIAN/preinst"
+chmod +x "$FOLDER_DEBIAN/postinst"
+
+if [ "$(uname -s)" == "Darwin" ]; then
+  echo "macOS detected, installing dpkg"
+  brew install dpkg
+fi
+
+DEB_FILE=Libation.${VERSION}-linux-chardonnay-${ARCH}.deb
+echo "Creating $DEB_FILE"
+dpkg-deb -Zxz --build $DEB_DIR ./$DEB_FILE
+
+echo "moving to ./bundle/$DEB_FILE"
+mkdir bundle
+mv $DEB_FILE ./bundle/$DEB_FILE
+
+rm -r "$BIN_DIR"
+
+echo "Done!"

Scripts/Bundle_MacOS.sh

@@ -0,0 +1,114 @@
+#!/bin/bash
+
+BIN_DIR=$1; shift
+VERSION=$1; shift
+ARCH=$1; shift
+
+if [ -z "$BIN_DIR" ]
+then
+  echo "This script must be called with a the Libation macos bins directory as an argument."
+  exit
+fi
+
+if [ ! -d "$BIN_DIR" ]
+then
+  echo "The directory \"$BIN_DIR\" 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
+
+if [ -z $ARCH ]
+then
+  echo "This script must be called with the Libation cpu architecture as an argument."
+  exit
+fi
+
+contains() { case "$1" in *"$2"*) true ;; *) false ;; esac }
+
+if ! contains "$BIN_DIR" $ARCH
+then
+  echo "This script must be called with a Libation binaries for ${ARCH}."
+  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
+
+mv "${BIN_DIR}/"*  $BUNDLE_MACOS
+
+if [ $? -ne 0 ]
+ then echo "Error moving ${BIN_DIR} files"
+ exit
+fi
+
+echo "Make fileicon executable..."
+chmod +x $BUNDLE_MACOS/fileicon
+
+echo "Moving icon..."
+mv $BUNDLE_MACOS/libation.icns $BUNDLE_RESOURCES/libation.icns
+
+echo "Moving Info.plist file..."
+mv $BUNDLE_MACOS/Info.plist $BUNDLE_CONTENTS/Info.plist
+
+PLIST_ARCH=$(echo $ARCH | sed 's/x64/x86_64/')
+echo "Set LSArchitecturePriority to $PLIST_ARCH"
+sed -i -e "s/ARCHITECTURE_STRING/$PLIST_ARCH/" $BUNDLE_CONTENTS/Info.plist
+
+echo "Set CFBundleVersion to $VERSION"
+sed -i -e "s/VERSION_STRING/$VERSION/" $BUNDLE_CONTENTS/Info.plist
+
+
+delfiles=( 'libmp3lame.arm64.so' 'libmp3lame.x64.so' 'libmp3lame.x64.dll' 'libmp3lame.x86.dll' 'ffmpegaac.arm64.so' 'ffmpegaac.x64.so' 'ffmpegaac.x64.dll' 'ffmpegaac.x86.dll' 'MacOSConfigApp' 'MacOSConfigApp.deps.json' 'MacOSConfigApp.runtimeconfig.json')
+if [[ "$ARCH" == "arm64" ]]
+then
+  delfiles+=('libmp3lame.x64.dylib' 'ffmpegaac.x64.dylib')
+else
+  delfiles+=('libmp3lame.arm64.dylib' 'ffmpegaac.arm64.dylib')
+fi
+
+
+for n in "${delfiles[@]}"
+do
+  echo "Deleting $n"
+  rm $BUNDLE_MACOS/$n
+done
+
+APP_FILE=Libation.${VERSION}-macOS-chardonnay-${ARCH}.tgz
+
+echo "Signing executables in: $BUNDLE"
+codesign --force --deep -s - $BUNDLE
+
+echo "Creating app bundle: $APP_FILE"
+tar -czvf $APP_FILE $BUNDLE
+
+mkdir bundle
+echo "moving to ./bundle/$APP_FILE"
+mv $APP_FILE ./bundle/$APP_FILE
+
+rm -r $BUNDLE
+
+echo "Done!"

Scripts/targz2deb.sh

@@ -1,136 +0,0 @@
-#!/bin/bash
-
-FILE=$1; shift
-VERSION=$1; shift
-
-if [ -z "$FILE" ]
-then
-  echo "This script must be called with a the Libation Linux 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
-
-# remove trailing ".tar.gz"
-FOLDER_MAIN=${FILE::-7}
-echo "Working dir: $FOLDER_MAIN"
-
-if [[ -d "$FOLDER_MAIN" ]]
-then
-  echo "$FOLDER_MAIN directory already exists, aborting."
-  exit
-fi
-
-FOLDER_EXEC="$FOLDER_MAIN/usr/lib/libation"
-echo "Exec dir: $FOLDER_EXEC"
-
-FOLDER_ICON="$FOLDER_MAIN/usr/share/icons/hicolor/scalable/apps/"
-echo "Icon dir: $FOLDER_ICON"
-
-FOLDER_DESKTOP="$FOLDER_MAIN/usr/share/applications"
-echo "Desktop dir: $FOLDER_DESKTOP"
-
-FOLDER_DEBIAN="$FOLDER_MAIN/DEBIAN"
-echo "Debian dir: $FOLDER_DEBIAN"
-
-mkdir -p "$FOLDER_EXEC"
-mkdir -p "$FOLDER_ICON"
-mkdir -p "$FOLDER_DESKTOP"
-mkdir -p "$FOLDER_DEBIAN"
-
-echo "Extracting $FILE to $FOLDER_EXEC..."
-tar -xzf ${FILE} -C ${FOLDER_EXEC}
-
-if [ $? -ne 0 ]
- then echo "Error extracting ${FILE}"
- exit
-fi
-
-echo "Copying icon..."
-cp "$FOLDER_EXEC/glass-with-glow_256.svg" "$FOLDER_ICON/libation.svg"
-
-echo "Copying desktop file..."
-cp "$FOLDER_EXEC/Libation.desktop" "$FOLDER_DESKTOP/Libation.desktop"
-
-echo "Workaround for desktop file..."
-sed -i '/^Exec=Libation/c\Exec=/usr/bin/libation' "$FOLDER_DESKTOP/Libation.desktop"
-
-echo "Creating pre-install file..."
-echo "#!/bin/bash
-
-# Pre-install script, removes previous installation program files and sym links
-
-echo \"Removing previously created symlinks...\"
-
-rm /usr/bin/libation
-rm /usr/bin/Libation
-rm /usr/bin/hangover
-rm /usr/bin/Hangover
-rm /usr/bin/libationcli
-rm /usr/bin/LibationCli
-
-echo \"Removing previously installed Libation files...\"
-
-rm -r /usr/lib/libation
-rm -r /usr/lib/Libation
-
-# making sure it won't stop installation
-exit 0
-" >> "$FOLDER_DEBIAN/preinst"
-
-echo "Creating post-install file..."
-echo "#!/bin/bash
-
-gtk-update-icon-cache -f /usr/share/icons/hicolor/
-
-ln -s /usr/lib/libation/Libation /usr/bin/libation
-ln -s /usr/lib/libation/Hangover /usr/bin/hangover
-ln -s /usr/lib/libation/LibationCli /usr/bin/libationcli
-
-# Increase the maximum number of inotify instances
-echo fs.inotify.max_user_instances=524288 | tee -a /etc/sysctl.conf && sysctl -p
-
-# workaround until this file is moved to the user's home directory
-touch /usr/lib/libation/appsettings.json
-chmod 666 /usr/lib/libation/appsettings.json
-" >> "$FOLDER_DEBIAN/postinst"
-
-echo "Creating control file..."
-echo "Package: Libation
-Version: $VERSION
-Architecture: all
-Essential: no
-Priority: optional
-Maintainer: github.com/rmcrackan
-Description: liberate your audiobooks
-" >> "$FOLDER_DEBIAN/control"
-
-echo "Changing permissions for pre- and post-install files..."
-chmod +x "$FOLDER_DEBIAN/preinst"
-chmod +x "$FOLDER_DEBIAN/postinst"
-
-echo "Creating .deb file..."
-dpkg-deb -Zxz --build $FOLDER_MAIN
-
-rm -r "$FOLDER_MAIN"
-
-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="1.0.1" />
 	</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);
@@ -62,8 +40,14 @@ namespace AaxDecrypter
 				AaxFile.AppleTags.Album = AaxFile.AppleTags.Album?.Replace(" (Unabridged)", "");
 			}
 
-			if (DownloadOptions.FixupFile && !string.IsNullOrWhiteSpace(AaxFile.AppleTags.Narrator))
-				AaxFile.AppleTags.AppleListBox.EditOrAddTag("TCOM", AaxFile.AppleTags.Narrator);
+			if (DownloadOptions.FixupFile)
+			{
+				if (!string.IsNullOrWhiteSpace(AaxFile.AppleTags.Narrator))
+					AaxFile.AppleTags.AppleListBox.EditOrAddTag("TCOM", AaxFile.AppleTags.Narrator);
+
+				if (!string.IsNullOrWhiteSpace(AaxFile.AppleTags.Copyright))
+					AaxFile.AppleTags.Copyright = AaxFile.AppleTags.Copyright.Replace("(P)", "℗").Replace("&#169;", "©");
+			}
 
 			//Finishing configuring lame encoder.
 			if (DownloadOptions.OutputFormat == OutputFormat.Mp3)
@@ -82,24 +66,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/AaxcDownloadMultiConverter.cs

@@ -93,15 +93,13 @@ That naming may not be desirable for everyone, but it's an easy change to instea
 				? AaxFile.ConvertToMultiMp4aAsync
 				(
 					splitChapters,
-					newSplitCallback => newSplit(++chapterCount, splitChapters, newSplitCallback),
-					DownloadOptions.TrimOutputToChapterLength
+					newSplitCallback => newSplit(++chapterCount, splitChapters, newSplitCallback)
 				)
 				: AaxFile.ConvertToMultiMp3Async
 				(
 					splitChapters,
 					newSplitCallback => newSplit(++chapterCount, splitChapters, newSplitCallback),
-					DownloadOptions.LameConfig,
-					DownloadOptions.TrimOutputToChapterLength
+					DownloadOptions.LameConfig
 				);
 
 			void newSplit(int currentChapter, ChapterInfo splitChapters, NewSplitCallback newSplitCallback)

Source/AaxDecrypter/AaxcDownloadSingleConverter.cs

@@ -1,6 +1,9 @@
 using AAXClean;
 using AAXClean.Codecs;
+using Dinah.Core.Net.Http;
 using FileManager;
+using System;
+using System.Diagnostics;
 using System.IO;
 using System.Threading.Tasks;
 
@@ -8,15 +11,19 @@ namespace AaxDecrypter
 {
 	public class AaxcDownloadSingleConverter : AaxcDownloadConvertBase
 	{
+		private readonly AverageSpeed averageSpeed = new();
 		public AaxcDownloadSingleConverter(string outFileName, string cacheDirectory, IDownloadOptions dlOptions)
 			: base(outFileName, cacheDirectory, dlOptions)
 		{
+			var step = 1;
 
 			AsyncSteps.Name = $"Download and Convert Aaxc To {DownloadOptions.OutputFormat}";
-			AsyncSteps["Step 1: Get Aaxc Metadata"] = () => Task.Run(Step_GetMetadata);
-			AsyncSteps["Step 2: Download Decrypted Audiobook"] = Step_DownloadAndDecryptAudiobookAsync;
-			AsyncSteps["Step 3: Download Clips and Bookmarks"] = Step_DownloadClipsBookmarksAsync;
-			AsyncSteps["Step 4: Create Cue"] = Step_CreateCueAsync;
+			AsyncSteps[$"Step {step++}: Get Aaxc Metadata"] = () => Task.Run(Step_GetMetadata);
+			AsyncSteps[$"Step {step++}: Download Decrypted Audiobook"] = Step_DownloadAndDecryptAudiobookAsync;
+			if (DownloadOptions.MoveMoovToBeginning && DownloadOptions.OutputFormat is OutputFormat.M4b)
+				AsyncSteps[$"Step {step++}: Move moov atom to beginning"] = Step_MoveMoov;
+			AsyncSteps[$"Step {step++}: Download Clips and Bookmarks"] = Step_DownloadClipsBookmarksAsync;
+			AsyncSteps[$"Step {step++}: Create Cue"] = Step_CreateCueAsync;
 		}
 
 		protected async override Task<bool> Step_DownloadAndDecryptAudiobookAsync()
@@ -28,15 +35,7 @@ namespace AaxDecrypter
 
 			try
 			{
-				await (AaxConversion = decryptAsync(outputFile));
-
-				if (AaxConversion.IsCompletedSuccessfully
-					&& DownloadOptions.MoveMoovToBeginning
-					&& DownloadOptions.OutputFormat is OutputFormat.M4b)
-				{
-					outputFile.Close();
-					await (AaxConversion = Mp4File.RelocateMoovAsync(OutputFileName));
-				}
+				await (AaxConversion = decryptAsync(outputFile));				
 
 				return AaxConversion.IsCompletedSuccessfully;
 			}
@@ -46,21 +45,47 @@ namespace AaxDecrypter
 			}
 		}
 
+		private async Task<bool> Step_MoveMoov()
+		{
+			AaxConversion = Mp4File.RelocateMoovAsync(OutputFileName);
+			AaxConversion.ConversionProgressUpdate += AaxConversion_MoovProgressUpdate;
+			await AaxConversion;
+			AaxConversion.ConversionProgressUpdate -= AaxConversion_MoovProgressUpdate;
+			return AaxConversion.IsCompletedSuccessfully;
+		}
+
+		private void AaxConversion_MoovProgressUpdate(object sender, ConversionProgressEventArgs e)
+		{
+			averageSpeed.AddPosition(e.ProcessPosition.TotalSeconds);
+
+			var remainingTimeToProcess = (e.EndTime - e.ProcessPosition).TotalSeconds;
+			var estTimeRemaining = remainingTimeToProcess / averageSpeed.Average;
+
+			if (double.IsNormal(estTimeRemaining))
+				OnDecryptTimeRemaining(TimeSpan.FromSeconds(estTimeRemaining));
+
+			OnDecryptProgressUpdate(
+				new DownloadProgress
+				{
+					ProgressPercentage = 100 * e.FractionCompleted,
+					BytesReceived = (long)(InputFileStream.Length * e.FractionCompleted),
+					TotalBytesToReceive = InputFileStream.Length
+				});
+		}
+
 		private Mp4Operation decryptAsync(Stream outputFile)
 			=> DownloadOptions.OutputFormat == OutputFormat.Mp3
 			? AaxFile.ConvertToMp3Async
 			(
 				outputFile,
 				DownloadOptions.LameConfig,
-				DownloadOptions.ChapterInfo,
-				DownloadOptions.TrimOutputToChapterLength
+				DownloadOptions.ChapterInfo
 			)
 			: DownloadOptions.FixupFile
 			? AaxFile.ConvertToMp4aAsync
 			(
 				outputFile,
-				DownloadOptions.ChapterInfo,
-				DownloadOptions.TrimOutputToChapterLength
+				DownloadOptions.ChapterInfo
 			)
 			: AaxFile.ConvertToMp4aAsync(outputFile);
 	}

Source/AaxDecrypter/AudiobookDownloadBase.cs

@@ -25,6 +25,8 @@ namespace AaxDecrypter
 		protected string OutputFileName { get; }
 		protected IDownloadOptions DownloadOptions { get; }
 		protected NetworkFileStream InputFileStream => nfsPersister.NetworkFileStream;
+		protected virtual long InputFilePosition => InputFileStream.Position;
+		private bool downloadFinished;
 
 		private readonly NetworkFileStreamPersister nfsPersister;
 		private readonly DownloadProgress zeroProgress;
@@ -57,7 +59,7 @@ namespace AaxDecrypter
 			{
 				BytesReceived = 0,
 				ProgressPercentage = 0,
-				TotalBytesToReceive = InputFileStream.Length
+				TotalBytesToReceive = 0
 			};
 
 			OnDecryptProgressUpdate(zeroProgress);
@@ -65,13 +67,52 @@ namespace AaxDecrypter
 
 		public async Task<bool> RunAsync()
 		{
+			await InputFileStream.BeginDownloadingAsync();
+			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
+					&& !downloadFinished)
+				{
+					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,7 +142,7 @@ namespace AaxDecrypter
 		protected virtual void FinalizeDownload()
 		{
 			nfsPersister?.Dispose();
-			OnDecryptProgressUpdate(zeroProgress);
+			downloadFinished = true;
 		}
 
 		protected async Task<bool> Step_DownloadClipsBookmarksAsync()
@@ -183,6 +224,7 @@ namespace AaxDecrypter
 			}
 			finally
 			{
+				nfsp.NetworkFileStream.RequestHeaders["User-Agent"] = DownloadOptions.UserAgent;
 				nfsp.NetworkFileStream.SpeedLimit = DownloadOptions.DownloadSpeedBps;
 			}
 

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/MpegUtil.cs

@@ -1,5 +1,6 @@
 using AAXClean;
 using NAudio.Lame;
+using System;
 
 namespace AaxDecrypter
 {
@@ -9,17 +10,26 @@ namespace AaxDecrypter
 		{
 			double bitrateMultiple = 1;
 
+			if (mp4File.TimeScale < lameConfig.OutputSampleRate)
+			{
+				lameConfig.OutputSampleRate = mp4File.TimeScale;
+			}
+			else if (mp4File.TimeScale > lameConfig.OutputSampleRate)
+			{
+				bitrateMultiple *= (double)lameConfig.OutputSampleRate / mp4File.TimeScale;
+			}
+
 			if (mp4File.AudioChannels == 2)
 			{
 				if (downsample)
-					bitrateMultiple = 0.5;
+					bitrateMultiple /= 2;
 				else
 					lameConfig.Mode = MPEGMode.Stereo;
 			}
 
 			if (matchSourceBitrate)
 			{
-				int kbps = (int)(mp4File.AverageBitrate * bitrateMultiple / 1024);
+				int kbps = (int)Math.Round(mp4File.AverageBitrate * bitrateMultiple / 1024);
 
 				if (lameConfig.VBR is null)
 					lameConfig.BitRate = kbps;

Source/AaxDecrypter/NetworkFileStream.cs

@@ -14,6 +14,7 @@ namespace AaxDecrypter
 	public class NetworkFileStream : Stream, IUpdatable
 	{
 		public event EventHandler Updated;
+		public event EventHandler DownloadCompleted;
 
 		#region Public Properties
 
@@ -136,10 +137,13 @@ namespace AaxDecrypter
 
 		/// <summary> Begins downloading <see cref="Uri"/> to <see cref="SaveFilePath"/> in a background thread. </summary>
 		/// <returns>The downloader <see cref="Task"/></returns>
-		private Task BeginDownloading()
+		public async Task BeginDownloadingAsync()
 		{
 			if (ContentLength != 0 && WritePosition == ContentLength)
-				return Task.CompletedTask;
+			{
+				_backgroundDownloadTask = Task.CompletedTask;
+				return;
+			}
 
 			if (ContentLength != 0 && WritePosition > ContentLength)
 				throw new WebException($"Specified write position (0x{WritePosition:X10}) is larger than  {nameof(ContentLength)} (0x{ContentLength:X10}).");
@@ -149,7 +153,7 @@ namespace AaxDecrypter
 			foreach (var header in RequestHeaders)
 				request.Headers.Add(header.Key, header.Value);
 
-			var response = new HttpClient().Send(request, HttpCompletionOption.ResponseHeadersRead, _cancellationSource.Token);
+			var response = await new HttpClient().SendAsync(request, HttpCompletionOption.ResponseHeadersRead, _cancellationSource.Token);
 
 			if (response.StatusCode != HttpStatusCode.PartialContent)
 				throw new WebException($"Server at {Uri.Host} responded with unexpected status code: {response.StatusCode}.");
@@ -159,11 +163,11 @@ namespace AaxDecrypter
 			if (WritePosition == 0)
 				ContentLength = response.Content.Headers.ContentLength.GetValueOrDefault();
 
-			var networkStream = response.Content.ReadAsStream(_cancellationSource.Token);
+			var networkStream = await response.Content.ReadAsStreamAsync(_cancellationSource.Token);
 			_downloadedPiece = new EventWaitHandle(false, EventResetMode.AutoReset);
 
 			//Download the file in the background.
-			return Task.Run(() => DownloadFile(networkStream), _cancellationSource.Token);
+			_backgroundDownloadTask = Task.Run(() => DownloadFile(networkStream), _cancellationSource.Token);
 		}
 
 		/// <summary> Download <see cref="Uri"/> to <see cref="SaveFilePath"/>.</summary>
@@ -230,6 +234,7 @@ namespace AaxDecrypter
 				_writeFile.Close();
 				_downloadedPiece.Set();
 				OnUpdate();
+				DownloadCompleted?.Invoke(this, null);
 			}
 		}
 
@@ -238,10 +243,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;
@@ -251,7 +256,8 @@ namespace AaxDecrypter
 		{
 			get
 			{
-				_backgroundDownloadTask ??= BeginDownloading();
+				if (_backgroundDownloadTask is null)
+					throw new InvalidOperationException($"Background downloader must first be started by calling {nameof(BeginDownloadingAsync)}");
 				return ContentLength;
 			}
 		}
@@ -274,7 +280,8 @@ namespace AaxDecrypter
 
 		public override int Read(byte[] buffer, int offset, int count)
 		{
-			_backgroundDownloadTask ??= BeginDownloading();
+			if (_backgroundDownloadTask is null)
+				throw new InvalidOperationException($"Background downloader must first be started by calling {nameof(BeginDownloadingAsync)}");
 
 			var toRead = Math.Min(count, Length - Position);
 			WaitToPosition(Position + toRead);

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,11 @@ namespace AaxDecrypter
 
 		protected override async Task<bool> Step_DownloadAndDecryptAudiobookAsync()
 		{
-			DateTime startTime = DateTime.Now;
+			TaskCompletionSource completionSource = new();
 
-			// MUST put InputFileStream.Length first, because it starts background downloader.
+			InputFileStream.DownloadCompleted += (_, _) => completionSource.SetResult();
 
-			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
-					});
-
-				await Task.Delay(200);
-			}
+			await completionSource.Task;
 
 			if (IsCanceled)
 				return false;

Source/AppScaffolding/AppScaffolding.csproj

@@ -2,10 +2,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>net7.0</TargetFramework>
-    <Version>9.2.0.1</Version>
+    <Version>9.4.7.1</Version>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Octokit" Version="5.0.0" />
+    <PackageReference Include="Octokit" Version="5.0.2" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\ApplicationServices\ApplicationServices.csproj" />

Source/AppScaffolding/LibationScaffolding.cs

@@ -9,7 +9,7 @@ using Dinah.Core;
 using Dinah.Core.IO;
 using Dinah.Core.Logging;
 using LibationFileManager;
-using Microsoft.EntityFrameworkCore;
+using System.Runtime.InteropServices;
 using Newtonsoft.Json.Linq;
 using Serilog;
 
@@ -18,14 +18,22 @@ namespace AppScaffolding
 	public enum ReleaseIdentifier
 	{
 		None,
-		WindowsClassic,
-		WindowsAvalonia,
-		LinuxAvalonia,
-		MacOSAvalonia
+		WindowsClassic = OS.Windows | Variety.Classic | Architecture.X64,
+		WindowsAvalonia = OS.Windows | Variety.Chardonnay | Architecture.X64,
+		LinuxAvalonia = OS.Linux | Variety.Chardonnay | Architecture.X64,
+		MacOSAvalonia = OS.MacOS | Variety.Chardonnay | Architecture.X64,
+		LinuxAvalonia_Arm64 = OS.Linux | Variety.Chardonnay | Architecture.Arm64,
+		MacOSAvalonia_Arm64 = OS.MacOS | Variety.Chardonnay | Architecture.Arm64
 	}
 
 	// I know I'm taking the wine metaphor a bit far by naming this "Variety", but I don't know what else to call it
-	public enum VarietyType { None, Classic, Chardonnay }
+	[Flags]
+	public enum Variety
+	{
+		None,
+		Classic = 0x10000,
+		Chardonnay = 0x20000,
+	}
 
 	public static class LibationScaffolding
 	{
@@ -33,13 +41,22 @@ namespace AppScaffolding
 		public const string WebsiteUrl = "ht" + "tps://getlibation.com";
 		public const string RepositoryLatestUrl = "ht" + "tps://github.com/rmcrackan/Libation/releases/latest";
 		public static ReleaseIdentifier ReleaseIdentifier { get; private set; }
-		public static VarietyType Variety
-			=> ReleaseIdentifier == ReleaseIdentifier.WindowsClassic ? VarietyType.Classic
-			: ReleaseIdentifier.In(ReleaseIdentifier.WindowsAvalonia, ReleaseIdentifier.LinuxAvalonia, ReleaseIdentifier.MacOSAvalonia) ? VarietyType.Chardonnay
-			: VarietyType.None;
+		public static Variety Variety { get; private set; }
 
-		public static void SetReleaseIdentifier(ReleaseIdentifier releaseID)
-			=> ReleaseIdentifier = releaseID;
+		public static void SetReleaseIdentifier(Variety varietyType)
+		{
+			Variety = Enum.IsDefined(varietyType) ? varietyType : Variety.None;
+
+			var releaseID = (ReleaseIdentifier)((int)varietyType | (int)Configuration.OS | (int)RuntimeInformation.ProcessArchitecture);
+
+			if (Enum.IsDefined(releaseID))
+				ReleaseIdentifier = releaseID;
+			else
+			{
+				ReleaseIdentifier = ReleaseIdentifier.None;
+				Serilog.Log.Logger.Warning("Unknown release identifier @{DebugInfo}", new { Variety = varietyType, Configuration.OS, RuntimeInformation.ProcessArchitecture });
+			}
+		}
 
 		// AppScaffolding
 		private static Assembly _executingAssembly;
@@ -58,13 +75,15 @@ namespace AppScaffolding
 			??= new[] { ExecutingAssembly.GetName(), EntryAssembly.GetName() }
 			.Max(a => a.Version);
 
-        /// <summary>Run migrations before loading Configuration for the first time. Then load and return Configuration</summary>
-        public static Configuration RunPreConfigMigrations()
+		/// <summary>Run migrations before loading Configuration for the first time. Then load and return Configuration</summary>
+		public static Configuration RunPreConfigMigrations()
 		{
 			// must occur before access to Configuration instance
 			// // outdated. kept here as an example of what belongs in this area
 			// // Migrations.migrate_to_v5_2_0__pre_config();
 
+			Configuration.SetLibationVersion(BuildVersion);
+
 			//***********************************************//
 			//                                               //
 			//   do not use Configuration before this line   //
@@ -296,8 +315,8 @@ namespace AppScaffolding
 		}
 		private static async System.Threading.Tasks.Task<(Octokit.Release, Octokit.ReleaseAsset)> getLatestRelease()
 		{
-			var ownerAccount = "rmcrackan";
-			var repoName = "Libation";
+			const string ownerAccount = "rmcrackan";
+			const string repoName = "Libation";
 
 			var gitHubClient = new Octokit.GitHubClient(new Octokit.ProductHeaderValue(repoName));
 
@@ -305,12 +324,11 @@ namespace AppScaffolding
 			var bts = await gitHubClient.Repository.Content.GetRawContent(ownerAccount, repoName, ".releaseindex.json");
 			var releaseIndex = JObject.Parse(System.Text.Encoding.ASCII.GetString(bts));
 			var regexPattern = releaseIndex.Value<string>(ReleaseIdentifier.ToString());
-
-			// https://octokitnet.readthedocs.io/en/latest/releases/
-			var releases = await gitHubClient.Repository.Release.GetAll(ownerAccount, repoName);
-
 			var regex = new System.Text.RegularExpressions.Regex(regexPattern, System.Text.RegularExpressions.RegexOptions.IgnoreCase);
-			var latestRelease = releases.FirstOrDefault(r => !r.Draft && !r.Prerelease && r.Assets.Any(a => regex.IsMatch(a.Name)));
+
+			//https://docs.github.com/en/rest/releases/releases?apiVersion=2022-11-28#get-the-latest-release
+			var latestRelease = await gitHubClient.Repository.Release.GetLatest(ownerAccount, repoName);
+
 			return (latestRelease, latestRelease?.Assets?.FirstOrDefault(a => regex.IsMatch(a.Name)));
 		}
 	}

Source/AppScaffolding/OSConfigBase.cs

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

Source/AppScaffolding/UNSAFE_MigrationHelper.cs

@@ -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/ApplicationServices/LibraryCommands.cs

@@ -1,13 +1,18 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Text;
 using System.Threading.Tasks;
 using AudibleApi;
 using AudibleUtilities;
 using DataLayer;
 using Dinah.Core;
+using Dinah.Core.Logging;
 using DtoImporterService;
+using FileManager;
 using LibationFileManager;
+using Newtonsoft.Json.Linq;
+using NPOI.OpenXmlFormats.Spreadsheet;
 using Serilog;
 using static DtoImporterService.PerfLogger;
 
@@ -91,7 +96,8 @@ namespace ApplicationServices
                 stop();
                 var putBreakPointHere = logOutput;
                 ScanEnd?.Invoke(null, null);
-            }
+				GC.Collect(GC.MaxGeneration, GCCollectionMode.Aggressive, true, true);
+			}
         }
 
         #region FULL LIBRARY scan and import
@@ -162,28 +168,98 @@ namespace ApplicationServices
                 stop();
                 var putBreakPointHere = logOutput;
                 ScanEnd?.Invoke(null, null);
+                GC.Collect(GC.MaxGeneration, GCCollectionMode.Aggressive, true, true);
             }
         }
 
-        private static async Task<List<ImportItem>> scanAccountsAsync(Func<Account, Task<ApiExtended>> apiExtendedfunc, Account[] accounts, LibraryOptions libraryOptions)
+        public static async Task<int> ImportSingleToDbAsync(AudibleApi.Common.Item item, string accountId, string localeName)
+        {
+            ArgumentValidator.EnsureNotNull(item, "item");
+            ArgumentValidator.EnsureNotNull(accountId, "accountId");
+            ArgumentValidator.EnsureNotNull(localeName, "localeName");
+
+            var importItem = new ImportItem
+            {
+                DtoItem = item,
+                AccountId = accountId,
+                LocaleName = localeName
+            };
+
+            var importItems = new List<ImportItem> { importItem };
+            var validator = new LibraryValidator();
+            var exceptions = validator.Validate(importItems.Select(i => i.DtoItem));
+
+            if (exceptions?.Any() ?? false)
+            {
+                Log.Logger.Error(new AggregateException(exceptions), "Error validating library book. {@DebugInfo}", new { item, accountId, localeName });
+                return 0;
+            }
+
+            using var context = DbContexts.GetContext();
+
+            var bookImporter = new BookImporter(context);
+            await Task.Run(() => bookImporter.Import(importItems));
+            var book = await Task.Run(() => context.LibraryBooks.FirstOrDefault(lb => lb.Book.AudibleProductId == importItem.DtoItem.ProductId));
+            
+            if (book is null)
+            {
+                book = new LibraryBook(bookImporter.Cache[importItem.DtoItem.ProductId], importItem.DtoItem.DateAdded, importItem.AccountId);
+                context.LibraryBooks.Add(book);
+            }
+            else
+            {
+                book.AbsentFromLastScan = false;
+            }
+
+            try
+            {
+                int qtyChanged = await Task.Run(() => SaveContext(context));
+                if (qtyChanged > 0)
+                    await Task.Run(finalizeLibrarySizeChange);
+                return qtyChanged;
+            }
+            catch (Exception ex)
+            {
+                Log.Logger.Error(ex, "Error adding single library book to DB. {@DebugInfo}", new { item, accountId, localeName });
+                return 0;
+            }
+        }
+
+		private static async Task<List<ImportItem>> scanAccountsAsync(Func<Account, Task<ApiExtended>> apiExtendedfunc, Account[] accounts, LibraryOptions libraryOptions)
         {
             var tasks = new List<Task<List<ImportItem>>>();
-            foreach (var account in accounts)
-            {
-                // get APIs in serial b/c of logins. do NOT move inside of parallel (Task.WhenAll)
-                var apiExtended = await apiExtendedfunc(account);
 
-                // add scanAccountAsync as a TASK: do not await
-                tasks.Add(scanAccountAsync(apiExtended, account, libraryOptions));
+           await using LogArchiver archiver
+                = Log.Logger.IsDebugEnabled()
+                ? new LogArchiver(System.IO.Path.Combine(Configuration.Instance.LibationFiles, "LibraryScans.zip"))
+                : default;
+
+			archiver?.DeleteAllButNewestN(20);
+
+			foreach (var account in accounts)
+            {
+                try
+                {
+                    // get APIs in serial b/c of logins. do NOT move inside of parallel (Task.WhenAll)
+                    var apiExtended = await apiExtendedfunc(account);
+
+                    // add scanAccountAsync as a TASK: do not await
+                    tasks.Add(scanAccountAsync(apiExtended, account, libraryOptions, archiver));
+                }
+                catch(Exception ex)
+                {
+                    //Catch to allow other accounts to continue scanning.
+                    Log.Logger.Error(ex, "Failed to scan account");
+                }
             }
 
             // import library in parallel
-            var arrayOfLists = await Task.WhenAll(tasks);
-            var importItems = arrayOfLists.SelectMany(a => a).ToList();
+            var arrayOfLists = await Task.WhenAll(tasks);            
+			var importItems = arrayOfLists.SelectMany(a => a).ToList();
             return importItems;
         }
 
-        private static async Task<List<ImportItem>> scanAccountAsync(ApiExtended apiExtended, Account account, LibraryOptions libraryOptions)
+        private static async Task<List<ImportItem>> scanAccountAsync(ApiExtended apiExtended, Account account, LibraryOptions libraryOptions, LogArchiver archiver)
         {
             ArgumentValidator.EnsureNotNull(account, nameof(account));
 
@@ -194,11 +270,43 @@ namespace ApplicationServices
 
             logTime($"pre scanAccountAsync {account.AccountName}");
 
-            var dtoItems = await apiExtended.GetLibraryValidatedAsync(libraryOptions, Configuration.Instance.ImportEpisodes);
+            try
+            {
+                var dtoItems = await apiExtended.GetLibraryValidatedAsync(libraryOptions, Configuration.Instance.ImportEpisodes);
 
-            logTime($"post scanAccountAsync {account.AccountName} qty: {dtoItems.Count}");
+                logTime($"post scanAccountAsync {account.AccountName} qty: {dtoItems.Count}");
+                
+                await logDtoItemsAsync(dtoItems);
 
-            return dtoItems.Select(d => new ImportItem { DtoItem = d, AccountId = account.AccountId, LocaleName = account.Locale?.Name }).ToList();
+				return dtoItems.Select(d => new ImportItem { DtoItem = d, AccountId = account.AccountId, LocaleName = account.Locale?.Name }).ToList();
+            }
+            catch(ImportValidationException ex)
+			{
+				await logDtoItemsAsync(ex.Items, ex.InnerExceptions.ToArray());
+				throw;
+            }
+
+            async Task logDtoItemsAsync(IEnumerable<AudibleApi.Common.Item> dtoItems, IEnumerable<Exception> exceptions = null)
+            {
+				if (archiver is not null)
+				{
+					var fileName = $"{DateTime.Now:u} {account.MaskedLogEntry}.json";
+					var items = await Task.Run(() => JArray.FromObject(dtoItems.Select(i => i.SourceJson)));
+
+					var scanFile = new JObject
+				    {
+					    { "Account", account.MaskedLogEntry },
+					    { "ScannedDateTime", DateTime.Now.ToString("u") },
+				    };
+
+					if (exceptions?.Any() is true)
+                        scanFile.Add("Exceptions", JArray.FromObject(exceptions));
+
+					scanFile.Add("Items", items);
+
+					await archiver.AddFileAsync(fileName, scanFile);
+				}
+			}
         }
 
         private static async Task<int> importIntoDbAsync(List<ImportItem> importItems)
@@ -242,18 +350,16 @@ namespace ApplicationServices
         #endregion
 
         #region remove/restore books
-        public static Task<int> RemoveBooksAsync(List<string> idsToRemove) => Task.Run(() => removeBooks(idsToRemove));
-        public static int RemoveBook(string idToRemove) => removeBooks(new() { idToRemove });
-        private static int removeBooks(List<string> idsToRemove)
+        public static Task<int> RemoveBooksAsync(this IEnumerable<LibraryBook> idsToRemove) => Task.Run(() => removeBooks(idsToRemove));
+        public static int RemoveBook(this LibraryBook idToRemove) => removeBooks(new[] { idToRemove });
+        private static int removeBooks(IEnumerable<LibraryBook> removeLibraryBooks)
         {
             try
             {
-                if (idsToRemove is null || !idsToRemove.Any())
+                if (removeLibraryBooks is null || !removeLibraryBooks.Any())
                     return 0;
 
                 using var context = DbContexts.GetContext();
-                var libBooks = context.GetLibrary_Flat_NoTracking();
-                var removeLibraryBooks = libBooks.Where(lb => idsToRemove.Contains(lb.Book.AudibleProductId)).ToList();
 
                 // Attach() NoTracking entities before SaveChanges()
                 foreach (var lb in removeLibraryBooks)
@@ -275,7 +381,7 @@ namespace ApplicationServices
             }
         }
 
-        public static int RestoreBooks(this List<LibraryBook> libraryBooks)
+        public static int RestoreBooks(this IEnumerable<LibraryBook> libraryBooks)
         {
             try
             {
@@ -303,6 +409,31 @@ namespace ApplicationServices
                 throw;
             }
         }
+
+        public static int PermanentlyDeleteBooks(this IEnumerable<LibraryBook> libraryBooks)
+        {
+            try
+            {
+                if (libraryBooks is null || !libraryBooks.Any())
+                    return 0;
+
+                using var context = DbContexts.GetContext();
+
+				context.LibraryBooks.RemoveRange(libraryBooks);
+				context.Books.RemoveRange(libraryBooks.Select(lb => lb.Book));				
+
+                var qtyChanges = context.SaveChanges();
+				if (qtyChanges > 0)
+					finalizeLibrarySizeChange();
+
+				return qtyChanges;
+            }
+            catch (Exception ex)
+            {
+                Log.Logger.Error(ex, "Error restoring books");
+                throw;
+            }
+        }
         #endregion
 
         // call this whenever books are added or removed from library
@@ -346,8 +477,10 @@ namespace ApplicationServices
 
                     if (rating is not null)
                         udi.UpdateRating(rating.OverallRating, rating.PerformanceRating, rating.StoryRating);
-                });
+				});
 
+        public static int UpdateBookStatus(this Book book, LiberatedStatus bookStatus, Version libationVersion)
+            => book.UpdateUserDefinedItem(udi => { udi.BookStatus = bookStatus; udi.SetLastDownloaded(libationVersion); });
         public static int UpdateBookStatus(this Book book, LiberatedStatus bookStatus)
             => book.UpdateUserDefinedItem(udi => udi.BookStatus = bookStatus);
         public static int UpdateBookStatus(this IEnumerable<Book> books, LiberatedStatus bookStatus)
@@ -428,40 +561,74 @@ namespace ApplicationServices
 
         // below are queries, not commands. maybe I should make a LibraryQueries. except there's already one of those...
 
-        public record LibraryStats(int booksFullyBackedUp, int booksDownloadedOnly, int booksNoProgress, int booksError, int pdfsDownloaded, int pdfsNotDownloaded)
+        public record LibraryStats(int booksFullyBackedUp, int booksDownloadedOnly, int booksNoProgress, int booksError, int booksUnavailable, int pdfsDownloaded, int pdfsNotDownloaded, int pdfsUnavailable)
         {
             public int PendingBooks => booksNoProgress + booksDownloadedOnly;
             public bool HasPendingBooks => PendingBooks > 0;
 
-            public bool HasBookResults => 0 < (booksFullyBackedUp + booksDownloadedOnly + booksNoProgress + booksError);
-            public bool HasPdfResults => 0 < (pdfsNotDownloaded + pdfsDownloaded);
-        }
-        public static LibraryStats GetCounts()
+            public bool HasBookResults => 0 < (booksFullyBackedUp + booksDownloadedOnly + booksNoProgress + booksError + booksUnavailable);
+            public bool HasPdfResults => 0 < (pdfsNotDownloaded + pdfsDownloaded + pdfsUnavailable);
+
+			public string StatusString => HasPdfResults ? $"{toBookStatusString()}  |  {toPdfStatusString()}" : toBookStatusString();
+
+			private string toBookStatusString()
+			{
+                if (!HasBookResults) return "No books. Begin by importing your library";
+
+                if (!HasPendingBooks && booksError + booksUnavailable == 0) return $"All {"book".PluralizeWithCount(booksFullyBackedUp)} backed up";
+
+				var sb = new StringBuilder($"BACKUPS: No progress: {booksNoProgress}  In process: {booksDownloadedOnly}  Fully backed up: {booksFullyBackedUp}");
+
+                if (booksError > 0)
+                    sb.Append($"  Errors: {booksError}");
+                if (booksUnavailable > 0)
+					sb.Append($"  Unavailable: {booksUnavailable}");
+
+				return sb.ToString();
+			}
+
+			private string toPdfStatusString()
+            {
+                if (pdfsNotDownloaded + pdfsUnavailable == 0) return $"All {pdfsDownloaded} PDFs downloaded";
+
+                var sb = new StringBuilder($"PDFs: NOT d/l'ed: {pdfsNotDownloaded}  Downloaded: {pdfsDownloaded}");
+
+                if (pdfsUnavailable > 0)
+					sb.Append($"  Unavailable: {pdfsUnavailable}");
+
+                return sb.ToString();
+			}
+		}
+        public static LibraryStats GetCounts(IEnumerable<LibraryBook> libraryBooks = null)
         {
-            var libraryBooks = DbContexts.GetLibrary_Flat_NoTracking();
+            libraryBooks ??= DbContexts.GetLibrary_Flat_NoTracking();
 
             var results = libraryBooks
                 .AsParallel()
-                .Select(lb => Liberated_Status(lb.Book))
+                .Select(lb => new { absent = lb.AbsentFromLastScan, status = Liberated_Status(lb.Book) })
                 .ToList();
-            var booksFullyBackedUp = results.Count(r => r == LiberatedStatus.Liberated);
-            var booksDownloadedOnly = results.Count(r => r == LiberatedStatus.PartialDownload);
-            var booksNoProgress = results.Count(r => r == LiberatedStatus.NotLiberated);
-            var booksError = results.Count(r => r == LiberatedStatus.Error);
 
-            Log.Logger.Information("Book counts. {@DebugInfo}", new { total = results.Count, booksFullyBackedUp, booksDownloadedOnly, booksNoProgress, booksError });
+            var booksFullyBackedUp = results.Count(r => r.status == LiberatedStatus.Liberated);
+            var booksDownloadedOnly = results.Count(r => !r.absent && r.status == LiberatedStatus.PartialDownload);
+            var booksNoProgress = results.Count(r => !r.absent && r.status == LiberatedStatus.NotLiberated);
+            var booksError = results.Count(r => r.status == LiberatedStatus.Error);
+            var booksUnavailable = results.Count(r => r.absent && r.status is LiberatedStatus.NotLiberated or LiberatedStatus.PartialDownload);
 
-            var boolResults = libraryBooks
+			Log.Logger.Information("Book counts. {@DebugInfo}", new { total = results.Count, booksFullyBackedUp, booksDownloadedOnly, booksNoProgress, booksError, booksUnavailable });
+
+            var pdfResults = libraryBooks
                 .AsParallel()
                 .Where(lb => lb.Book.HasPdf())
-                .Select(lb => Pdf_Status(lb.Book))
+                .Select(lb => new { absent = lb.AbsentFromLastScan, status = Pdf_Status(lb.Book) })
                 .ToList();
-            var pdfsDownloaded = boolResults.Count(r => r == LiberatedStatus.Liberated);
-            var pdfsNotDownloaded = boolResults.Count(r => r == LiberatedStatus.NotLiberated);
 
-            Log.Logger.Information("PDF counts. {@DebugInfo}", new { total = boolResults.Count, pdfsDownloaded, pdfsNotDownloaded });
+            var pdfsDownloaded = pdfResults.Count(r => r.status == LiberatedStatus.Liberated);
+            var pdfsNotDownloaded = pdfResults.Count(r => !r.absent && r.status == LiberatedStatus.NotLiberated);
+            var pdfsUnavailable = pdfResults.Count(r => r.absent && r.status == LiberatedStatus.NotLiberated);
 
-            return new(booksFullyBackedUp, booksDownloadedOnly, booksNoProgress, booksError, pdfsDownloaded, pdfsNotDownloaded);
+			Log.Logger.Information("PDF counts. {@DebugInfo}", new { total = pdfResults.Count, pdfsDownloaded, pdfsNotDownloaded, pdfsUnavailable });
+
+            return new(booksFullyBackedUp, booksDownloadedOnly, booksNoProgress, booksError, booksUnavailable, pdfsDownloaded, pdfsNotDownloaded, pdfsUnavailable);
         }
     }
 }

Source/ApplicationServices/LibraryExporter.cs

@@ -106,6 +106,12 @@ namespace ApplicationServices
 
 		[Name("Language")]
         public string Language { get; set; }
+
+		[Name("LastDownloaded")]
+		public DateTime? LastDownloaded { get; set; }
+
+		[Name("LastDownloadedVersion")]
+        public string LastDownloadedVersion { get; set; }
     }
 	public static class LibToDtos
 	{
@@ -140,7 +146,10 @@ namespace ApplicationServices
 				PdfStatus = a.Book.UserDefinedItem.PdfStatus.ToString(),
 				ContentType = a.Book.ContentType.ToString(),
 				AudioFormat = a.Book.AudioFormat.ToString(),
-				Language = a.Book.Language
+				Language = a.Book.Language,
+				LastDownloaded = a.Book.UserDefinedItem.LastDownloaded,
+				LastDownloadedVersion = a.Book.UserDefinedItem.LastDownloadedVersion?.ToString() ?? "",
+
 			}).ToList();
 	}
 	public static class LibraryExporter
@@ -212,7 +221,9 @@ namespace ApplicationServices
 				nameof(ExportDto.PdfStatus),
 				nameof(ExportDto.ContentType),
 				nameof(ExportDto.AudioFormat),
-                nameof(ExportDto.Language)
+                nameof(ExportDto.Language),
+                nameof(ExportDto.LastDownloaded),
+                nameof(ExportDto.LastDownloadedVersion),
             };
 			var col = 0;
 			foreach (var c in columns)
@@ -238,9 +249,9 @@ namespace ApplicationServices
 
 				row.CreateCell(col++).SetCellValue(dto.Account);
 
-				var dateAddedCell = row.CreateCell(col++);
-				dateAddedCell.CellStyle = dateStyle;
-				dateAddedCell.SetCellValue(dto.DateAdded);
+				var dateCell = row.CreateCell(col++);
+				dateCell.CellStyle = dateStyle;
+				dateCell.SetCellValue(dto.DateAdded);
 
 				row.CreateCell(col++).SetCellValue(dto.AudibleProductId);
 				row.CreateCell(col++).SetCellValue(dto.Locale);
@@ -281,6 +292,15 @@ namespace ApplicationServices
                 row.CreateCell(col++).SetCellValue(dto.AudioFormat);
                 row.CreateCell(col++).SetCellValue(dto.Language);
 
+				if (dto.LastDownloaded.HasValue)
+				{
+					dateCell = row.CreateCell(col);
+					dateCell.CellStyle = dateStyle;
+					dateCell.SetCellValue(dto.LastDownloaded.Value);
+				}
+
+                row.CreateCell(++col).SetCellValue(dto.LastDownloadedVersion);
+
                 rowIndex++;
 			}
 

Source/AudibleUtilities/ApiExtended.cs

@@ -1,16 +1,15 @@
 using System;
 using System.Collections.Generic;
-using System.Globalization;
 using System.Linq;
-using System.Threading;
+using System.Threading.Channels;
 using System.Threading.Tasks;
+using System.Diagnostics;
 using AudibleApi;
 using AudibleApi.Common;
 using Dinah.Core;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Converters;
 using Polly;
 using Polly.Retry;
+using System.Threading;
 
 namespace AudibleUtilities
 {
@@ -19,6 +18,9 @@ namespace AudibleUtilities
 	{
 		public Api Api { get; private set; }
 
+		private const int MaxConcurrency = 10;
+		private const int BatchSize = 50;
+
 		private ApiExtended(Api api) => Api = api;
 
 		/// <summary>Get api from existing tokens else login with 'eager' choice. External browser url is provided. Response can be external browser login or continuing with native api callbacks.</summary>
@@ -39,42 +41,6 @@ namespace AudibleUtilities
 			return new ApiExtended(api);
 		}
 
-		/// <summary>Get api from existing tokens else login with native api callbacks.</summary>
-		public static async Task<ApiExtended> CreateAsync(Account account, ILoginCallback loginCallback)
-		{
-			Serilog.Log.Logger.Information("{@DebugInfo}", new
-			{
-				LoginType = nameof(ILoginCallback),
-				Account = account?.MaskedLogEntry ?? "[null]",
-				LocaleName = account?.Locale?.Name
-			});
-
-			var api = await EzApiCreator.GetApiAsync(
-				loginCallback,
-				account.Locale,
-				AudibleApiStorage.AccountsSettingsFile,
-				account.GetIdentityTokensJsonPath());
-			return new ApiExtended(api);
-		}
-
-		/// <summary>Get api from existing tokens else login with external browser</summary>
-		public static async Task<ApiExtended> CreateAsync(Account account, ILoginExternal loginExternal)
-		{
-			Serilog.Log.Logger.Information("{@DebugInfo}", new
-			{
-				LoginType = nameof(ILoginExternal),
-				Account = account?.MaskedLogEntry ?? "[null]",
-				LocaleName = account?.Locale?.Name
-			});
-
-			var api = await EzApiCreator.GetApiAsync(
-				loginExternal,
-				account.Locale,
-				AudibleApiStorage.AccountsSettingsFile,
-				account.GetIdentityTokensJsonPath());
-			return new ApiExtended(api);
-		}
-
 		/// <summary>Get api from existing tokens. Assumes you have valid login tokens. Else exception</summary>
 		public static async Task<ApiExtended> CreateAsync(Account account)
 		{
@@ -121,226 +87,180 @@ namespace AudibleUtilities
 
 		private async Task<List<Item>> getItemsAsync(LibraryOptions libraryOptions, bool importEpisodes)
 		{
-			var items = new List<Item>();
-
 			Serilog.Log.Logger.Debug("Beginning library scan.");
 
-			List<Task<List<Item>>> getChildEpisodesTasks = new();
+			List<Item> items = new();
+			var sw = Stopwatch.StartNew();
+			var totalTime = TimeSpan.Zero;
+			using var semaphore = new SemaphoreSlim(MaxConcurrency);
 
-			int count = 0, maxConcurrentEpisodeScans = 5;
-			using SemaphoreSlim concurrencySemaphore = new(maxConcurrentEpisodeScans);
+			var episodeChannel = Channel.CreateUnbounded<string>(new UnboundedChannelOptions { SingleReader = true, SingleWriter = true });
+			var batchReaderTask = readAllAsinsAsync(episodeChannel.Reader, semaphore);
 
-			await foreach (var item in Api.GetLibraryItemAsyncEnumerable(libraryOptions))
+			//Scan the library for all added books.
+			//Get relationship asins from episode-type items and write them to episodeChannel where they will be batched and queried.
+			await foreach (var item in Api.GetLibraryItemsPagesAsync(libraryOptions, BatchSize, semaphore))
 			{
-				if ((item.IsEpisodes || item.IsSeriesParent) && importEpisodes)
+				if (importEpisodes)
 				{
-					//Get child episodes asynchronously and await all at the end
-					getChildEpisodesTasks.Add(getChildEpisodesAsync(concurrencySemaphore, item));
+					var episodes = item.Where(i => i.IsEpisodes).ToList();
+					var series = item.Where(i => i.IsSeriesParent).ToList();
+
+					var parentAsins = episodes
+						.SelectMany(i => i.Relationships)
+						.Where(r => r.RelationshipToProduct == RelationshipToProduct.Parent)
+						.Select(r => r.Asin);
+
+					var episodeAsins = series
+						.SelectMany(i => i.Relationships)
+						.Where(r => r.RelationshipToProduct == RelationshipToProduct.Child && r.RelationshipType == RelationshipType.Episode)
+						.Select(r => r.Asin);
+
+					foreach (var asin in parentAsins.Concat(episodeAsins))
+						episodeChannel.Writer.TryWrite(asin);
+
+					items.AddRange(episodes);
+					items.AddRange(series);
 				}
-				else if (!item.IsEpisodes && !item.IsSeriesParent)
-					items.Add(item);
 
-				count++;
+				items.AddRange(item.Where(i => !i.IsSeriesParent && !i.IsEpisodes));
 			}
 
-			Serilog.Log.Logger.Debug("Library scan complete. Found {count} books and series. Waiting on {getChildEpisodesTasksCount} series episode scans to complete.", count, getChildEpisodesTasks.Count);
+			sw.Stop();
+			totalTime += sw.Elapsed;
+			Serilog.Log.Logger.Debug("Library scan complete after {elappsed_ms} ms. Found {count} books and series. Waiting on series episode scans to complete.", sw.ElapsedMilliseconds, items.Count);
+			sw.Restart();
 
-			//await and add all episodes from all parents
-			foreach (var epList in await Task.WhenAll(getChildEpisodesTasks))
-				items.AddRange(epList);
+			//Signal that we're done adding asins
+			episodeChannel.Writer.Complete();
 
-			Serilog.Log.Logger.Debug("Completed library scan.");
+			//Wait for all episodes/parents to be retrived
+			var allEps = await batchReaderTask;
 
-#if DEBUG
-			//// this will not work for multi accounts
-			//var library_json = "library.json";
-			//library_json = System.IO.Path.GetFullPath(library_json);
-			//if (System.IO.File.Exists(library_json))
-			//    items = AudibleApi.Common.Converter.FromJson<List<Item>>(System.IO.File.ReadAllText(library_json));
-			//System.IO.File.WriteAllText(library_json, AudibleApi.Common.Converter.ToJson(items));
-#endif
-			var validators = new List<IValidator>();
-			validators.AddRange(getValidators());
-			foreach (var v in validators)
+			sw.Stop();
+			totalTime += sw.Elapsed;
+			Serilog.Log.Logger.Debug("Episode scan complete after {elappsed_ms} ms. Found {count} episodes and series .", sw.ElapsedMilliseconds, allEps.Count);
+			sw.Restart();
+
+			Serilog.Log.Logger.Debug("Begin indexing series episodes");
+			items.AddRange(allEps);
+
+			//Set the Item.Series info for episodes and parents.
+			foreach (var parent in items.Where(i => i.IsSeriesParent))
 			{
-				var exceptions = v.Validate(items);
-				if (exceptions is not null && exceptions.Any())
-					throw new AggregateException(exceptions);
+				var children = items.Where(i => i.IsEpisodes && i.Relationships.Any(r => r.Asin == parent.Asin));
+				SetSeries(parent, children);
 			}
+
+			sw.Stop();
+			totalTime += sw.Elapsed;
+			Serilog.Log.Logger.Information("Completed indexing series episodes after {elappsed_ms} ms.", sw.ElapsedMilliseconds);
+			Serilog.Log.Logger.Information($"Completed library scan in {totalTime.TotalMilliseconds:F0} ms.");
+
+			var allExceptions = IValidator.GetAllValidators().SelectMany(v => v.Validate(items));
+			if (allExceptions?.Any() is true)
+				throw new ImportValidationException(items, allExceptions);
+
 			return items;
 		}
 
-		private static List<IValidator> getValidators()
-		{
-			var type = typeof(IValidator);
-			var types = AppDomain.CurrentDomain.GetAssemblies()
-				.SelectMany(s => s.GetTypes())
-				.Where(p => type.IsAssignableFrom(p) && !p.IsInterface);
-
-			return types.Select(t => Activator.CreateInstance(t) as IValidator).ToList();
-		}
-
 		#region episodes and podcasts
 
-		private async Task<List<Item>> getChildEpisodesAsync(SemaphoreSlim concurrencySemaphore, Item parent)
+		/// <summary>
+		/// Read asins from the channel and request catalog item info in batches of <see cref="BatchSize"/>. Blocks until <paramref name="channelReader"/> is closed.
+		/// </summary>
+		/// <param name="channelReader">Input asins to batch</param>
+		/// <param name="semaphore">Shared semaphore to limit concurrency</param>
+		/// <returns>All <see cref="Item"/>s of asins written to the channel.</returns>
+		private async Task<List<Item>> readAllAsinsAsync(ChannelReader<string> channelReader, SemaphoreSlim semaphore)
 		{
-			await concurrencySemaphore.WaitAsync();
+			int batchNum = 1;
+			List<Task<List<Item>>> getTasks = new();
 
+			while (await channelReader.WaitToReadAsync())
+			{
+				List<string> asins = new();
+
+				while (asins.Count < BatchSize && await channelReader.WaitToReadAsync())
+				{
+					var asin = await channelReader.ReadAsync();
+
+					if (!asins.Contains(asin))
+						asins.Add(asin);
+				}
+				await semaphore.WaitAsync();
+				getTasks.Add(getProductsAsync(batchNum++, asins, semaphore));
+			}
+
+			var completed = await Task.WhenAll(getTasks);
+			//We only want Series parents and Series episodes. Explude other relationship types (e.g. 'season')
+			return completed.SelectMany(l => l).Where(i => i.IsSeriesParent || i.IsEpisodes).ToList();
+		}
+
+		private async Task<List<Item>> getProductsAsync(int batchNum, List<string> asins, SemaphoreSlim semaphore)
+		{
+			Serilog.Log.Logger.Debug($"Batch {batchNum} Begin: Fetching {asins.Count} asins");
 			try
 			{
-				Serilog.Log.Logger.Debug("Beginning episode scan for {parent}", parent);
+				var sw = Stopwatch.StartNew();
+				var items = await Api.GetCatalogProductsAsync(asins, CatalogOptions.ResponseGroupOptions.ALL_OPTIONS);
+				sw.Stop();
 
-				List<Item> children;
+				Serilog.Log.Logger.Debug($"Batch {batchNum} End: Retrieved {items.Count} items in {sw.ElapsedMilliseconds} ms");
 
-				if (parent.IsEpisodes)
+				return items;
+			}
+			catch (Exception ex)
+			{
+				Serilog.Log.Logger.Error(ex, "Error fetching batch of episodes. {@DebugInfo}", new { asins });
+				throw;
+			}
+			finally { semaphore.Release(); }
+		}
+
+		public static void SetSeries(Item parent, IEnumerable<Item> children)
+		{
+			ArgumentValidator.EnsureNotNull(parent, nameof(parent));
+			ArgumentValidator.EnsureNotNull(children, nameof(children));
+
+			//A series parent will always have exactly 1 Series
+			parent.Series = new[]
+			{
+				new Series
 				{
-					//The 'parent' is a single episode that was added to the library.
-					//Get the episode's parent and add it to the database.
-
-					Serilog.Log.Logger.Debug("Supplied Parent is an episode. Beginning parent scan for {parent}", parent);
-
-					children = new() { parent };
-
-					var parentAsins = parent.Relationships
-						.Where(r => r.RelationshipToProduct == RelationshipToProduct.Parent)
-						.Select(p => p.Asin);
-
-					var seriesParents = await Api.GetCatalogProductsAsync(parentAsins, CatalogOptions.ResponseGroupOptions.ALL_OPTIONS);
-
-					int numSeriesParents = seriesParents.Count(p => p.IsSeriesParent);
-					if (numSeriesParents != 1)
-					{
-						//There should only ever be 1 top-level parent per episode. If not, log
-						//so we can figure out what to do about those special cases, and don't
-						//import the episode.
-						JsonSerializerSettings Settings = new()
-						{
-							MetadataPropertyHandling = MetadataPropertyHandling.Ignore,
-							DateParseHandling = DateParseHandling.None,
-							Converters =
-							{
-								new IsoDateTimeConverter { DateTimeStyles = DateTimeStyles.AssumeUniversal }
-							},
-						};
-						Serilog.Log.Logger.Error($"Found {numSeriesParents} parents for {parent.Asin}\r\nEpisode Product:\r\n{JsonConvert.SerializeObject(parent, Formatting.None, Settings)}");
-						return new List<Item>();
-					}
-
-					var realParent = seriesParents.Single(p => p.IsSeriesParent);
-					realParent.PurchaseDate = parent.PurchaseDate;
-
-					Serilog.Log.Logger.Debug("Completed parent scan for {parent}", parent); 
-					parent = realParent;
+					Asin = parent.Asin,
+					Sequence = "-1",
+					Title = parent.TitleWithSubtitle
 				}
-				else
+			};
+
+			if (parent.PurchaseDate == default)
+			{
+				parent.PurchaseDate = children.Select(c => c.PurchaseDate).Order().FirstOrDefault(d => d != default);
+
+				if (parent.PurchaseDate == default)
 				{
-					children = await getEpisodeChildrenAsync(parent);
-					if (!children.Any())
-						return new();
+					Serilog.Log.Logger.Warning("{series} doesn't have a purchase date. Using UtcNow", parent);
+					parent.PurchaseDate = DateTimeOffset.UtcNow;
 				}
+			}
 
-				//A series parent will always have exactly 1 Series
-				parent.Series = new Series[]
+			foreach (var child in children)
+			{
+				// use parent's 'DateAdded'. DateAdded is just a convenience prop for: PurchaseDate.UtcDateTime
+				child.PurchaseDate = parent.PurchaseDate;
+				// parent is essentially a series
+				child.Series = new[]
 				{
 					new Series
 					{
 						Asin = parent.Asin,
-						Sequence = "-1",
+						// This should properly be Single() not FirstOrDefault(), but FirstOrDefault is defensive for malformed data from audible
+						Sequence = parent.Relationships.FirstOrDefault(r => r.Asin == child.Asin)?.Sort?.ToString() ?? "0",
 						Title = parent.TitleWithSubtitle
 					}
 				};
-
-				foreach (var child in children)
-				{
-					// use parent's 'DateAdded'. DateAdded is just a convenience prop for: PurchaseDate.UtcDateTime
-					child.PurchaseDate = parent.PurchaseDate;
-					// parent is essentially a series
-					child.Series = new Series[]
-					{
-						new Series
-						{
-							Asin = parent.Asin,
-							// This should properly be Single() not FirstOrDefault(), but FirstOrDefault is defensive for malformed data from audible
-							Sequence = parent.Relationships.FirstOrDefault(r => r.Asin == child.Asin)?.Sort?.ToString() ?? "0",
-							Title = parent.TitleWithSubtitle
-						}
-					};
-				}
-
-				children.Add(parent);
-
-				Serilog.Log.Logger.Debug("Completed episode scan for {parent}", parent);
-
-				return children;
 			}
-			finally
-			{
-				concurrencySemaphore.Release();
-			}
-		}
-
-		private async Task<List<Item>> getEpisodeChildrenAsync(Item parent)
-		{
-			var childrenIds = parent.Relationships
-				.Where(r => r.RelationshipToProduct == RelationshipToProduct.Child && r.RelationshipType == RelationshipType.Episode)
-				.Select(r => r.Asin)
-				.ToList();
-
-			// fetch children in batches
-			const int batchSize = 20;
-
-			var results = new List<Item>();
-
-			for (var i = 1; ; i++)
-			{
-				var idBatch = childrenIds.Skip((i - 1) * batchSize).Take(batchSize).ToList();
-				if (!idBatch.Any())
-					break;
-
-				List<Item> childrenBatch;
-				try
-				{
-					childrenBatch = await Api.GetCatalogProductsAsync(idBatch, CatalogOptions.ResponseGroupOptions.ALL_OPTIONS);
-#if DEBUG
-					//var childrenBatchDebug = childrenBatch.Select(i => i.ToJson()).Aggregate((a, b) => $"{a}\r\n\r\n{b}");
-					//System.IO.File.WriteAllText($"children of {parent.Asin}.json", childrenBatchDebug);
-#endif
-				}
-				catch (Exception ex)
-				{
-					Serilog.Log.Logger.Error(ex, "Error fetching batch of episodes. {@DebugInfo}", new
-					{
-						ParentId = parent.Asin,
-						ParentTitle = parent.Title,
-						BatchNumber = i,
-						ChildIdBatch = idBatch
-					});
-					throw;
-				}
-
-				Serilog.Log.Logger.Debug($"Batch {i}: {childrenBatch.Count} results\t({{parent}})", parent);
-				// the service returned no results. probably indicates an error. stop running batches
-				if (!childrenBatch.Any())
-					break;
-
-				results.AddRange(childrenBatch);
-			}
-
-			Serilog.Log.Logger.Debug("Parent episodes/podcasts series. Children found. {@DebugInfo}", new
-			{
-				ParentId = parent.Asin,
-				ParentTitle = parent.Title,
-				ChildCount = childrenIds.Count
-			});
-
-			if (childrenIds.Count != results.Count)
-			{
-				var ex = new ApplicationException($"Mis-match: Children defined by parent={childrenIds.Count}. Children returned by batches={results.Count}");
-				Serilog.Log.Logger.Error(ex, "{parent} - Quantity of series episodes defined by parent does not match quantity returned by batch fetching.", parent);
-				throw ex;
-			}
-
-			return results;
 		}
 		#endregion
 	}

Source/AudibleUtilities/AudibleApiValidators.cs

@@ -8,7 +8,18 @@ namespace AudibleUtilities
 	public interface IValidator
 	{
 		IEnumerable<Exception> Validate(IEnumerable<Item> items);
+
+		public static IValidator[] GetAllValidators()
+			=> new IValidator[]
+			{
+				new LibraryValidator(),
+				new BookValidator(),
+				new CategoryValidator(),
+				new ContributorValidator(),
+				new SeriesValidator(),
+			};
 	}
+
 	public class LibraryValidator : IValidator
 	{
 		public IEnumerable<Exception> Validate(IEnumerable<Item> items)

Source/AudibleUtilities/AudibleUtilities.csproj

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

Source/AudibleUtilities/ImportValidationException.cs

@@ -0,0 +1,15 @@
+using AudibleApi.Common;
+using System;
+using System.Collections.Generic;
+
+namespace AudibleUtilities
+{
+	public class ImportValidationException : AggregateException
+	{
+		public List<Item> Items { get; }
+		public ImportValidationException(List<Item> items, IEnumerable<Exception> exceptions) : base(exceptions)
+		{
+			Items = items;
+		}
+	}
+}

Source/AudibleUtilities/Mkb79Auth.cs

@@ -4,6 +4,7 @@ using System.Linq;
 using System.Threading.Tasks;
 using AudibleApi;
 using AudibleApi.Authorization;
+using AudibleApi.Cryptography;
 using Dinah.Core;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
@@ -178,7 +179,7 @@ namespace AudibleUtilities
 				LocaleCode = account.Locale.CountryCode,
 				RefreshToken = account.IdentityTokens.RefreshToken.Value,				
 				StoreAuthenticationCookie = account.IdentityTokens.StoreAuthenticationCookie,
-				WebsiteCookies = new(account.IdentityTokens.Cookies.ToKeyValuePair()),
+				WebsiteCookies = new(account.IdentityTokens.Cookies),
 			};
 	}
 

Source/DataLayer/Configurations/BookConfig.cs

@@ -1,5 +1,6 @@
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Metadata.Builders;
+using System;
 
 namespace DataLayer.Configurations
 {
@@ -19,40 +20,45 @@ namespace DataLayer.Configurations
             entity.Ignore(nameof(Book.Authors));
             entity.Ignore(nameof(Book.Narrators));
             entity.Ignore(nameof(Book.AudioFormat));
-			//// these don't seem to matter
-			//entity.Ignore(nameof(Book.AuthorNames));
-			//entity.Ignore(nameof(Book.NarratorNames));
-			//entity.Ignore(nameof(Book.HasPdfs));
+            //// these don't seem to matter
+            //entity.Ignore(nameof(Book.AuthorNames));
+            //entity.Ignore(nameof(Book.NarratorNames));
+            //entity.Ignore(nameof(Book.HasPdfs));
 
-			// OwnsMany: "Can only ever appear on navigation properties of other entity types.
-			//  Are automatically loaded, and can only be tracked by a DbContext alongside their owner."
-			entity
-				.OwnsMany(b => b.Supplements, b_s =>
-				{
-					b_s.WithOwner(s => s.Book)
-						.HasForeignKey(s => s.BookId);
-					b_s.HasKey(s => s.SupplementId);
-				});
+            // OwnsMany: "Can only ever appear on navigation properties of other entity types.
+            //  Are automatically loaded, and can only be tracked by a DbContext alongside their owner."
+            entity
+                .OwnsMany(b => b.Supplements, b_s =>
+                {
+                    b_s.WithOwner(s => s.Book)
+                        .HasForeignKey(s => s.BookId);
+                    b_s.HasKey(s => s.SupplementId);
+                });
             // even though it's owned, we need to map its backing field
             entity
                 .Metadata
                 .FindNavigation(nameof(Book.Supplements))
                 .SetPropertyAccessMode(PropertyAccessMode.Field);
 
-			// owns it 1:1, store in separate table
-			entity
-				.OwnsOne(b => b.UserDefinedItem, b_udi =>
-				{
-					b_udi.WithOwner(udi => udi.Book)
-						.HasForeignKey(udi => udi.BookId);
-					b_udi.Property(udi => udi.BookId).ValueGeneratedNever();
-					b_udi.ToTable(nameof(Book.UserDefinedItem));
+            // owns it 1:1, store in separate table
+            entity
+                .OwnsOne(b => b.UserDefinedItem, b_udi =>
+                {
+                    b_udi.WithOwner(udi => udi.Book)
+                        .HasForeignKey(udi => udi.BookId);
+                    b_udi.Property(udi => udi.BookId).ValueGeneratedNever();
+                    b_udi.ToTable(nameof(Book.UserDefinedItem));
 
-					// owns it 1:1, store in same table
-					b_udi.OwnsOne(udi => udi.Rating);
-				});
+                    b_udi.Property(udi => udi.LastDownloaded);
+                    b_udi
+                        .Property(udi => udi.LastDownloadedVersion)
+                        .HasConversion(ver => ver.ToString(), str => Version.Parse(str));
 
-			entity
+                    // owns it 1:1, store in same table
+                    b_udi.OwnsOne(udi => udi.Rating);
+                });
+
+            entity
                 .Metadata
                 .FindNavigation(nameof(Book.ContributorsLink))
                 // PropertyAccessMode.Field : Contributions is a get-only property, not a field, so use its backing field
@@ -68,6 +74,6 @@ namespace DataLayer.Configurations
                 .HasOne(b => b.Category)
                 .WithMany()
                 .HasForeignKey(b => b.CategoryId);
-		}
+        }
     }
 }

Source/DataLayer/DataLayer.csproj

@@ -10,14 +10,14 @@
   </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">
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.4">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="7.0.2" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.2">
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="7.0.4" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.4">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

Source/DataLayer/EfClasses/LibraryBook.cs

@@ -12,6 +12,7 @@ namespace DataLayer
         public string Account { get; private set; }
 
         public bool IsDeleted { get; set; }
+        public bool AbsentFromLastScan { get; set; }
 
         private LibraryBook() { }
         public LibraryBook(Book book, DateTime dateAdded, string account)
@@ -24,6 +25,8 @@ namespace DataLayer
             Account = account;
         }
 
-        public override string ToString() => $"{DateAdded:d} {Book}";
+        public void SetAccount(string account) => Account = account;
+
+		public override string ToString() => $"{DateAdded:d} {Book}";
 	}
 }

Source/DataLayer/EfClasses/Rating.cs

@@ -5,7 +5,7 @@ using Dinah.Core;
 namespace DataLayer
 {
     /// <summary>Parameterless ctor and setters should be used by EF only. Everything else should treat it as immutable</summary>
-    public class Rating : ValueObject_Static<Rating>
+    public class Rating : ValueObject_Static<Rating>, IComparable<Rating>, IComparable
     {
         public float OverallRating { get; private set; }
         public float PerformanceRating { get; private set; }
@@ -38,6 +38,16 @@ namespace DataLayer
             yield return StoryRating;
         }
 
-		public override string ToString() => $"Overall={OverallRating} Perf={PerformanceRating} Story={StoryRating}";
-	}
+        public override string ToString() => $"Overall={OverallRating} Perf={PerformanceRating} Story={StoryRating}";
+
+        public int CompareTo(Rating other)
+        {
+            var compare = OverallRating.CompareTo(other.OverallRating);
+            if (compare != 0) return compare;
+            compare = PerformanceRating.CompareTo(other.PerformanceRating);
+            if (compare != 0) return compare;
+            return StoryRating.CompareTo(other.StoryRating);
+        }
+        public int CompareTo(object obj) => obj is Rating second ? CompareTo(second) : -1;
+    }
 }

Source/DataLayer/EfClasses/UserDefinedItem.cs

@@ -20,12 +20,31 @@ namespace DataLayer
         PartialDownload = 0x1000
     }
 
-    public class UserDefinedItem
+    public partial class UserDefinedItem
     {
         internal int BookId { get; private set; }
         public Book Book { get; private set; }
+        public DateTime? LastDownloaded { get; private set; }
+        public Version LastDownloadedVersion { get; private set; }
 
-        private UserDefinedItem() { }
+        public void SetLastDownloaded(Version version)
+        {
+            if (LastDownloadedVersion != version)
+            {
+                LastDownloadedVersion = version;
+				OnItemChanged(nameof(LastDownloadedVersion));
+			}
+
+            if (version is null)
+                LastDownloaded = null;
+            else
+            {
+				LastDownloaded = DateTime.Now;
+                OnItemChanged(nameof(LastDownloaded));
+			}
+		}
+
+		private UserDefinedItem() { }
         internal UserDefinedItem(Book book)
 		{
 			ArgumentValidator.EnsureNotNull(book, nameof(book));
@@ -51,18 +70,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 +97,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
@@ -98,7 +122,11 @@ namespace DataLayer
         public Rating Rating { get; private set; } = new Rating(0, 0, 0);
 
         public void UpdateRating(float overallRating, float performanceRating, float storyRating)
-            => Rating.Update(overallRating, performanceRating, storyRating);
+        {
+            var changed = Rating.OverallRating != overallRating || Rating.PerformanceRating != performanceRating || Rating.StoryRating != storyRating;
+			Rating.Update(overallRating, performanceRating, storyRating);
+            if (changed) OnItemChanged(nameof(Rating));
+		}
         #endregion
 
         #region LiberatedStatuses

Source/DataLayer/EntityExtensions.cs

@@ -18,9 +18,9 @@ namespace DataLayer
         /// <summary>True if exists and IsLiberated. Else false</summary>
         public static bool PDF_Exists(this Book book) => book.UserDefinedItem.PdfStatus == LiberatedStatus.Liberated;
 
-        public static string SeriesSortable(this Book book) => Formatters.GetSortName(book.SeriesNames());
+        public static string SeriesSortable(this Book book) => Formatters.GetSortName(book.SeriesNames(true));
 		public static bool HasPdf(this Book book) => book.Supplements.Any();
-        public static string SeriesNames(this Book book)
+        public static string SeriesNames(this Book book, bool includeIndex = false)
         {
             if (book.SeriesLink is null)
                 return "";
@@ -28,7 +28,7 @@ namespace DataLayer
             // first: alphabetical by name
             var withNames = book.SeriesLink
                 .Where(s => !string.IsNullOrWhiteSpace(s.Series.Name))
-                .Select(s => s.Series.Name)
+                .Select(getSeriesNameString)
                 .OrderBy(a => a)
                 .ToList();
             // then un-named are alpha by series id
@@ -40,7 +40,12 @@ namespace DataLayer
 
             var all = withNames.Union(nullNames).ToList();
             return string.Join(", ", all);
-        }
+
+            string getSeriesNameString(SeriesBook sb)
+                => includeIndex && !string.IsNullOrWhiteSpace(sb.Order) && sb.Order != "-1"
+                ? $"{sb.Series.Name} (#{sb.Order})"
+                : sb.Series.Name;
+		}
         public static string[] CategoriesNames(this Book book)
             => book.Category is null ? new string[0]
             : book.Category.ParentCategory is null ? new[] { book.Category.Name }

Source/DataLayer/Migrations/20230302220539_AddLastDownloadedInfo.Designer.cs

@@ -0,0 +1,410 @@
+// <auto-generated />
+using System;
+using DataLayer;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+
+#nullable disable
+
+namespace DataLayer.Migrations
+{
+    [DbContext(typeof(LibationContext))]
+    [Migration("20230302220539_AddLastDownloadedInfo")]
+    partial class AddLastDownloadedInfo
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder.HasAnnotation("ProductVersion", "7.0.3");
+
+            modelBuilder.Entity("DataLayer.Book", b =>
+                {
+                    b.Property<int>("BookId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("AudibleProductId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("CategoryId")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("ContentType")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<DateTime?>("DatePublished")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("IsAbridged")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Language")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("LengthInMinutes")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Locale")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("PictureId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("PictureLarge")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Title")
+                        .HasColumnType("TEXT");
+
+                    b.Property<long>("_audioFormat")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("BookId");
+
+                    b.HasIndex("AudibleProductId");
+
+                    b.HasIndex("CategoryId");
+
+                    b.ToTable("Books");
+                });
+
+            modelBuilder.Entity("DataLayer.BookContributor", b =>
+                {
+                    b.Property<int>("BookId")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("ContributorId")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("Role")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<byte>("Order")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("BookId", "ContributorId", "Role");
+
+                    b.HasIndex("BookId");
+
+                    b.HasIndex("ContributorId");
+
+                    b.ToTable("BookContributor");
+                });
+
+            modelBuilder.Entity("DataLayer.Category", b =>
+                {
+                    b.Property<int>("CategoryId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("AudibleCategoryId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int?>("ParentCategoryCategoryId")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("CategoryId");
+
+                    b.HasIndex("AudibleCategoryId");
+
+                    b.HasIndex("ParentCategoryCategoryId");
+
+                    b.ToTable("Categories");
+
+                    b.HasData(
+                        new
+                        {
+                            CategoryId = -1,
+                            AudibleCategoryId = "",
+                            Name = ""
+                        });
+                });
+
+            modelBuilder.Entity("DataLayer.Contributor", b =>
+                {
+                    b.Property<int>("ContributorId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("AudibleContributorId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("ContributorId");
+
+                    b.HasIndex("Name");
+
+                    b.ToTable("Contributors");
+
+                    b.HasData(
+                        new
+                        {
+                            ContributorId = -1,
+                            Name = ""
+                        });
+                });
+
+            modelBuilder.Entity("DataLayer.LibraryBook", b =>
+                {
+                    b.Property<int>("BookId")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Account")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("DateAdded")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("BookId");
+
+                    b.ToTable("LibraryBooks");
+                });
+
+            modelBuilder.Entity("DataLayer.Series", b =>
+                {
+                    b.Property<int>("SeriesId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("AudibleSeriesId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("SeriesId");
+
+                    b.HasIndex("AudibleSeriesId");
+
+                    b.ToTable("Series");
+                });
+
+            modelBuilder.Entity("DataLayer.SeriesBook", b =>
+                {
+                    b.Property<int>("SeriesId")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("BookId")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Order")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("SeriesId", "BookId");
+
+                    b.HasIndex("BookId");
+
+                    b.HasIndex("SeriesId");
+
+                    b.ToTable("SeriesBook");
+                });
+
+            modelBuilder.Entity("DataLayer.Book", b =>
+                {
+                    b.HasOne("DataLayer.Category", "Category")
+                        .WithMany()
+                        .HasForeignKey("CategoryId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.OwnsOne("DataLayer.Rating", "Rating", b1 =>
+                        {
+                            b1.Property<int>("BookId")
+                                .HasColumnType("INTEGER");
+
+                            b1.Property<float>("OverallRating")
+                                .HasColumnType("REAL");
+
+                            b1.Property<float>("PerformanceRating")
+                                .HasColumnType("REAL");
+
+                            b1.Property<float>("StoryRating")
+                                .HasColumnType("REAL");
+
+                            b1.HasKey("BookId");
+
+                            b1.ToTable("Books");
+
+                            b1.WithOwner()
+                                .HasForeignKey("BookId");
+                        });
+
+                    b.OwnsMany("DataLayer.Supplement", "Supplements", b1 =>
+                        {
+                            b1.Property<int>("SupplementId")
+                                .ValueGeneratedOnAdd()
+                                .HasColumnType("INTEGER");
+
+                            b1.Property<int>("BookId")
+                                .HasColumnType("INTEGER");
+
+                            b1.Property<string>("Url")
+                                .HasColumnType("TEXT");
+
+                            b1.HasKey("SupplementId");
+
+                            b1.HasIndex("BookId");
+
+                            b1.ToTable("Supplement");
+
+                            b1.WithOwner("Book")
+                                .HasForeignKey("BookId");
+
+                            b1.Navigation("Book");
+                        });
+
+                    b.OwnsOne("DataLayer.UserDefinedItem", "UserDefinedItem", b1 =>
+                        {
+                            b1.Property<int>("BookId")
+                                .HasColumnType("INTEGER");
+
+                            b1.Property<int>("BookStatus")
+                                .HasColumnType("INTEGER");
+
+                            b1.Property<DateTime?>("LastDownloaded")
+                                .HasColumnType("TEXT");
+
+                            b1.Property<string>("LastDownloadedVersion")
+                                .HasColumnType("TEXT");
+
+                            b1.Property<int?>("PdfStatus")
+                                .HasColumnType("INTEGER");
+
+                            b1.Property<string>("Tags")
+                                .HasColumnType("TEXT");
+
+                            b1.HasKey("BookId");
+
+                            b1.ToTable("UserDefinedItem", (string)null);
+
+                            b1.WithOwner("Book")
+                                .HasForeignKey("BookId");
+
+                            b1.OwnsOne("DataLayer.Rating", "Rating", b2 =>
+                                {
+                                    b2.Property<int>("UserDefinedItemBookId")
+                                        .HasColumnType("INTEGER");
+
+                                    b2.Property<float>("OverallRating")
+                                        .HasColumnType("REAL");
+
+                                    b2.Property<float>("PerformanceRating")
+                                        .HasColumnType("REAL");
+
+                                    b2.Property<float>("StoryRating")
+                                        .HasColumnType("REAL");
+
+                                    b2.HasKey("UserDefinedItemBookId");
+
+                                    b2.ToTable("UserDefinedItem");
+
+                                    b2.WithOwner()
+                                        .HasForeignKey("UserDefinedItemBookId");
+                                });
+
+                            b1.Navigation("Book");
+
+                            b1.Navigation("Rating");
+                        });
+
+                    b.Navigation("Category");
+
+                    b.Navigation("Rating");
+
+                    b.Navigation("Supplements");
+
+                    b.Navigation("UserDefinedItem");
+                });
+
+            modelBuilder.Entity("DataLayer.BookContributor", b =>
+                {
+                    b.HasOne("DataLayer.Book", "Book")
+                        .WithMany("ContributorsLink")
+                        .HasForeignKey("BookId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("DataLayer.Contributor", "Contributor")
+                        .WithMany("BooksLink")
+                        .HasForeignKey("ContributorId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Book");
+
+                    b.Navigation("Contributor");
+                });
+
+            modelBuilder.Entity("DataLayer.Category", b =>
+                {
+                    b.HasOne("DataLayer.Category", "ParentCategory")
+                        .WithMany()
+                        .HasForeignKey("ParentCategoryCategoryId");
+
+                    b.Navigation("ParentCategory");
+                });
+
+            modelBuilder.Entity("DataLayer.LibraryBook", b =>
+                {
+                    b.HasOne("DataLayer.Book", "Book")
+                        .WithOne()
+                        .HasForeignKey("DataLayer.LibraryBook", "BookId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Book");
+                });
+
+            modelBuilder.Entity("DataLayer.SeriesBook", b =>
+                {
+                    b.HasOne("DataLayer.Book", "Book")
+                        .WithMany("SeriesLink")
+                        .HasForeignKey("BookId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("DataLayer.Series", "Series")
+                        .WithMany("BooksLink")
+                        .HasForeignKey("SeriesId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Book");
+
+                    b.Navigation("Series");
+                });
+
+            modelBuilder.Entity("DataLayer.Book", b =>
+                {
+                    b.Navigation("ContributorsLink");
+
+                    b.Navigation("SeriesLink");
+                });
+
+            modelBuilder.Entity("DataLayer.Contributor", b =>
+                {
+                    b.Navigation("BooksLink");
+                });
+
+            modelBuilder.Entity("DataLayer.Series", b =>
+                {
+                    b.Navigation("BooksLink");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}

Source/DataLayer/Migrations/20230302220539_AddLastDownloadedInfo.cs

@@ -0,0 +1,39 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace DataLayer.Migrations
+{
+    /// <inheritdoc />
+    public partial class AddLastDownloadedInfo : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<DateTime>(
+                name: "LastDownloaded",
+                table: "UserDefinedItem",
+                type: "TEXT",
+                nullable: true);
+
+            migrationBuilder.AddColumn<string>(
+                name: "LastDownloadedVersion",
+                table: "UserDefinedItem",
+                type: "TEXT",
+                nullable: true);
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "LastDownloaded",
+                table: "UserDefinedItem");
+
+            migrationBuilder.DropColumn(
+                name: "LastDownloadedVersion",
+                table: "UserDefinedItem");
+        }
+    }
+}

Source/DataLayer/Migrations/20230308013410_AddAbsentFromLastScan.Designer.cs

@@ -0,0 +1,413 @@
+// <auto-generated />
+using System;
+using DataLayer;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+
+#nullable disable
+
+namespace DataLayer.Migrations
+{
+    [DbContext(typeof(LibationContext))]
+    [Migration("20230308013410_AddAbsentFromLastScan")]
+    partial class AddAbsentFromLastScan
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder.HasAnnotation("ProductVersion", "7.0.3");
+
+            modelBuilder.Entity("DataLayer.Book", b =>
+                {
+                    b.Property<int>("BookId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("AudibleProductId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("CategoryId")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("ContentType")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<DateTime?>("DatePublished")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("IsAbridged")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Language")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("LengthInMinutes")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Locale")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("PictureId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("PictureLarge")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Title")
+                        .HasColumnType("TEXT");
+
+                    b.Property<long>("_audioFormat")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("BookId");
+
+                    b.HasIndex("AudibleProductId");
+
+                    b.HasIndex("CategoryId");
+
+                    b.ToTable("Books");
+                });
+
+            modelBuilder.Entity("DataLayer.BookContributor", b =>
+                {
+                    b.Property<int>("BookId")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("ContributorId")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("Role")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<byte>("Order")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("BookId", "ContributorId", "Role");
+
+                    b.HasIndex("BookId");
+
+                    b.HasIndex("ContributorId");
+
+                    b.ToTable("BookContributor");
+                });
+
+            modelBuilder.Entity("DataLayer.Category", b =>
+                {
+                    b.Property<int>("CategoryId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("AudibleCategoryId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int?>("ParentCategoryCategoryId")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("CategoryId");
+
+                    b.HasIndex("AudibleCategoryId");
+
+                    b.HasIndex("ParentCategoryCategoryId");
+
+                    b.ToTable("Categories");
+
+                    b.HasData(
+                        new
+                        {
+                            CategoryId = -1,
+                            AudibleCategoryId = "",
+                            Name = ""
+                        });
+                });
+
+            modelBuilder.Entity("DataLayer.Contributor", b =>
+                {
+                    b.Property<int>("ContributorId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("AudibleContributorId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("ContributorId");
+
+                    b.HasIndex("Name");
+
+                    b.ToTable("Contributors");
+
+                    b.HasData(
+                        new
+                        {
+                            ContributorId = -1,
+                            Name = ""
+                        });
+                });
+
+            modelBuilder.Entity("DataLayer.LibraryBook", b =>
+                {
+                    b.Property<int>("BookId")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("AbsentFromLastScan")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Account")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("DateAdded")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("BookId");
+
+                    b.ToTable("LibraryBooks");
+                });
+
+            modelBuilder.Entity("DataLayer.Series", b =>
+                {
+                    b.Property<int>("SeriesId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("AudibleSeriesId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("SeriesId");
+
+                    b.HasIndex("AudibleSeriesId");
+
+                    b.ToTable("Series");
+                });
+
+            modelBuilder.Entity("DataLayer.SeriesBook", b =>
+                {
+                    b.Property<int>("SeriesId")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("BookId")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Order")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("SeriesId", "BookId");
+
+                    b.HasIndex("BookId");
+
+                    b.HasIndex("SeriesId");
+
+                    b.ToTable("SeriesBook");
+                });
+
+            modelBuilder.Entity("DataLayer.Book", b =>
+                {
+                    b.HasOne("DataLayer.Category", "Category")
+                        .WithMany()
+                        .HasForeignKey("CategoryId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.OwnsOne("DataLayer.Rating", "Rating", b1 =>
+                        {
+                            b1.Property<int>("BookId")
+                                .HasColumnType("INTEGER");
+
+                            b1.Property<float>("OverallRating")
+                                .HasColumnType("REAL");
+
+                            b1.Property<float>("PerformanceRating")
+                                .HasColumnType("REAL");
+
+                            b1.Property<float>("StoryRating")
+                                .HasColumnType("REAL");
+
+                            b1.HasKey("BookId");
+
+                            b1.ToTable("Books");
+
+                            b1.WithOwner()
+                                .HasForeignKey("BookId");
+                        });
+
+                    b.OwnsMany("DataLayer.Supplement", "Supplements", b1 =>
+                        {
+                            b1.Property<int>("SupplementId")
+                                .ValueGeneratedOnAdd()
+                                .HasColumnType("INTEGER");
+
+                            b1.Property<int>("BookId")
+                                .HasColumnType("INTEGER");
+
+                            b1.Property<string>("Url")
+                                .HasColumnType("TEXT");
+
+                            b1.HasKey("SupplementId");
+
+                            b1.HasIndex("BookId");
+
+                            b1.ToTable("Supplement");
+
+                            b1.WithOwner("Book")
+                                .HasForeignKey("BookId");
+
+                            b1.Navigation("Book");
+                        });
+
+                    b.OwnsOne("DataLayer.UserDefinedItem", "UserDefinedItem", b1 =>
+                        {
+                            b1.Property<int>("BookId")
+                                .HasColumnType("INTEGER");
+
+                            b1.Property<int>("BookStatus")
+                                .HasColumnType("INTEGER");
+
+                            b1.Property<DateTime?>("LastDownloaded")
+                                .HasColumnType("TEXT");
+
+                            b1.Property<string>("LastDownloadedVersion")
+                                .HasColumnType("TEXT");
+
+                            b1.Property<int?>("PdfStatus")
+                                .HasColumnType("INTEGER");
+
+                            b1.Property<string>("Tags")
+                                .HasColumnType("TEXT");
+
+                            b1.HasKey("BookId");
+
+                            b1.ToTable("UserDefinedItem", (string)null);
+
+                            b1.WithOwner("Book")
+                                .HasForeignKey("BookId");
+
+                            b1.OwnsOne("DataLayer.Rating", "Rating", b2 =>
+                                {
+                                    b2.Property<int>("UserDefinedItemBookId")
+                                        .HasColumnType("INTEGER");
+
+                                    b2.Property<float>("OverallRating")
+                                        .HasColumnType("REAL");
+
+                                    b2.Property<float>("PerformanceRating")
+                                        .HasColumnType("REAL");
+
+                                    b2.Property<float>("StoryRating")
+                                        .HasColumnType("REAL");
+
+                                    b2.HasKey("UserDefinedItemBookId");
+
+                                    b2.ToTable("UserDefinedItem");
+
+                                    b2.WithOwner()
+                                        .HasForeignKey("UserDefinedItemBookId");
+                                });
+
+                            b1.Navigation("Book");
+
+                            b1.Navigation("Rating");
+                        });
+
+                    b.Navigation("Category");
+
+                    b.Navigation("Rating");
+
+                    b.Navigation("Supplements");
+
+                    b.Navigation("UserDefinedItem");
+                });
+
+            modelBuilder.Entity("DataLayer.BookContributor", b =>
+                {
+                    b.HasOne("DataLayer.Book", "Book")
+                        .WithMany("ContributorsLink")
+                        .HasForeignKey("BookId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("DataLayer.Contributor", "Contributor")
+                        .WithMany("BooksLink")
+                        .HasForeignKey("ContributorId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Book");
+
+                    b.Navigation("Contributor");
+                });
+
+            modelBuilder.Entity("DataLayer.Category", b =>
+                {
+                    b.HasOne("DataLayer.Category", "ParentCategory")
+                        .WithMany()
+                        .HasForeignKey("ParentCategoryCategoryId");
+
+                    b.Navigation("ParentCategory");
+                });
+
+            modelBuilder.Entity("DataLayer.LibraryBook", b =>
+                {
+                    b.HasOne("DataLayer.Book", "Book")
+                        .WithOne()
+                        .HasForeignKey("DataLayer.LibraryBook", "BookId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Book");
+                });
+
+            modelBuilder.Entity("DataLayer.SeriesBook", b =>
+                {
+                    b.HasOne("DataLayer.Book", "Book")
+                        .WithMany("SeriesLink")
+                        .HasForeignKey("BookId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("DataLayer.Series", "Series")
+                        .WithMany("BooksLink")
+                        .HasForeignKey("SeriesId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Book");
+
+                    b.Navigation("Series");
+                });
+
+            modelBuilder.Entity("DataLayer.Book", b =>
+                {
+                    b.Navigation("ContributorsLink");
+
+                    b.Navigation("SeriesLink");
+                });
+
+            modelBuilder.Entity("DataLayer.Contributor", b =>
+                {
+                    b.Navigation("BooksLink");
+                });
+
+            modelBuilder.Entity("DataLayer.Series", b =>
+                {
+                    b.Navigation("BooksLink");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}

Source/DataLayer/Migrations/20230308013410_AddAbsentFromLastScan.cs

@@ -0,0 +1,29 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace DataLayer.Migrations
+{
+    /// <inheritdoc />
+    public partial class AddAbsentFromLastScan : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<bool>(
+                name: "AbsentFromLastScan",
+                table: "LibraryBooks",
+                type: "INTEGER",
+                nullable: false,
+                defaultValue: false);
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "AbsentFromLastScan",
+                table: "LibraryBooks");
+        }
+    }
+}

Source/DataLayer/Migrations/LibationContextModelSnapshot.cs

@@ -15,7 +15,7 @@ namespace DataLayer.Migrations
         protected override void BuildModel(ModelBuilder modelBuilder)
         {
 #pragma warning disable 612, 618
-            modelBuilder.HasAnnotation("ProductVersion", "7.0.2");
+            modelBuilder.HasAnnotation("ProductVersion", "7.0.3");
 
             modelBuilder.Entity("DataLayer.Book", b =>
                 {
@@ -157,6 +157,9 @@ namespace DataLayer.Migrations
                     b.Property<int>("BookId")
                         .HasColumnType("INTEGER");
 
+                    b.Property<bool>("AbsentFromLastScan")
+                        .HasColumnType("INTEGER");
+
                     b.Property<string>("Account")
                         .HasColumnType("TEXT");
 
@@ -272,6 +275,12 @@ namespace DataLayer.Migrations
                             b1.Property<int>("BookStatus")
                                 .HasColumnType("INTEGER");
 
+                            b1.Property<DateTime?>("LastDownloaded")
+                                .HasColumnType("TEXT");
+
+                            b1.Property<string>("LastDownloadedVersion")
+                                .HasColumnType("TEXT");
+
                             b1.Property<int?>("PdfStatus")
                                 .HasColumnType("INTEGER");
 

Source/DataLayer/QueryObjects/LibraryBookQueries.cs

@@ -107,8 +107,9 @@ namespace DataLayer
             => bookList
                 .Where(
                     lb =>
-                        lb.Book.UserDefinedItem.BookStatus is LiberatedStatus.NotLiberated or LiberatedStatus.PartialDownload
-                        || lb.Book.UserDefinedItem.PdfStatus is LiberatedStatus.NotLiberated or LiberatedStatus.PartialDownload
+                        !lb.AbsentFromLastScan &&
+                        (lb.Book.UserDefinedItem.BookStatus is LiberatedStatus.NotLiberated or LiberatedStatus.PartialDownload
+                        || lb.Book.UserDefinedItem.PdfStatus is LiberatedStatus.NotLiberated or LiberatedStatus.PartialDownload)
                     );
     }
 }

Source/DtoImporterService/ImportItem.cs

@@ -8,5 +8,7 @@ namespace DtoImporterService
 		public Item DtoItem { get; set; }
 		public string AccountId { get; set; }
 		public string LocaleName { get; set; }
+		public override string ToString()
+			=> DtoItem is null ? base.ToString() : $"[{DtoItem.ProductId}] {DtoItem.Title}";
 	}
 }

Source/DtoImporterService/LibraryBookImporter.cs

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using AudibleUtilities;
 using DataLayer;
+using Dinah.Core;
 using Dinah.Core.Collections.Generic;
 
 namespace DtoImporterService
@@ -40,34 +41,75 @@ namespace DtoImporterService
 			//
 			// CURRENT SOLUTION: don't re-insert
 
-			var currentLibraryProductIds = DbContext.LibraryBooks.Select(l => l.Book.AudibleProductId).ToList();
-			var newItems = importItems
-				.Where(dto => !currentLibraryProductIds.Contains(dto.DtoItem.ProductId))
-				.ToList();
+			var existingEntries = DbContext.LibraryBooks.AsEnumerable().Where(l => l.Book is not null).ToDictionary(l => l.Book.AudibleProductId);
+			var hash = ToDictionarySafe(importItems, dto => dto.DtoItem.ProductId, tieBreak);
+			int qtyNew = 0;
 
-			// if 2 accounts try to import the same book in the same transaction: error since we're only tracking and pulling by asin.
-			// just use the first
-			var hash = newItems.ToDictionarySafe(dto => dto.DtoItem.ProductId);
-			foreach (var kvp in hash)
+			foreach (var item in hash.Values)
 			{
-				var newItem = kvp.Value;
+				if (existingEntries.TryGetValue(item.DtoItem.ProductId, out LibraryBook existing))
+				{
+					if (existing.Account != item.AccountId)
+					{
+						//Book is absent from the existing LibraryBook's account. Use the alternate account.
+						existing.SetAccount(item.AccountId);
+					}
 
-				var libraryBook = new LibraryBook(
-					bookImporter.Cache[newItem.DtoItem.ProductId],
-					newItem.DtoItem.DateAdded,
-					newItem.AccountId);
-				try
-				{
-					DbContext.LibraryBooks.Add(libraryBook);
+					existing.AbsentFromLastScan = isPlusTitleUnavailable(item);
 				}
-				catch (Exception ex)
+				else
 				{
-					Serilog.Log.Logger.Error(ex, "Error adding library book. {@DebugInfo}", new { libraryBook.Book, libraryBook.Account });
+					var libraryBook = new LibraryBook(
+						bookImporter.Cache[item.DtoItem.ProductId],
+						item.DtoItem.DateAdded,
+						item.AccountId)
+						{
+							AbsentFromLastScan = isPlusTitleUnavailable(item)
+						};
+
+					try
+					{
+						DbContext.LibraryBooks.Add(libraryBook);
+						qtyNew++;
+					}
+					catch (Exception ex)
+					{
+						Serilog.Log.Logger.Error(ex, "Error adding library book. {@DebugInfo}", new { libraryBook.Book, libraryBook.Account });
+					}
 				}
 			}
 
-			var qtyNew = hash.Count;
+			var scannedAccounts = importItems.Select(i => i.AccountId).Distinct().ToList();
+
+			//If an existing Book wasn't found in the import, the owning LibraryBook's Book will be null.
+			//Only change AbsentFromLastScan for LibraryBooks of accounts that were scanned.
+			foreach (var nullBook in DbContext.LibraryBooks.AsEnumerable().Where(lb => lb.Book is null && lb.Account.In(scannedAccounts)))
+				nullBook.AbsentFromLastScan = true;
+
 			return qtyNew;
+		}		
+
+		private static Dictionary<TKey, TSource> ToDictionarySafe<TKey, TSource>(IEnumerable<TSource> source, Func<TSource, TKey> keySelector, Func<TSource, TSource, TSource> tieBreaker)
+		{
+			var dictionary = new Dictionary<TKey, TSource>();
+
+			foreach (TSource newItem in source)
+			{
+				TKey key = keySelector(newItem);
+
+				dictionary[key]
+					= dictionary.TryGetValue(key, out TSource existingItem)
+					? tieBreaker(existingItem, newItem)
+					: newItem;
+			}
+			return dictionary;
 		}
+
+		private static ImportItem tieBreak(ImportItem item1, ImportItem item2)
+			=> isPlusTitleUnavailable(item1) && !isPlusTitleUnavailable(item2) ? item2 : item1;
+
+		private static bool isPlusTitleUnavailable(ImportItem item)
+			=> item.DtoItem.IsAyce is true
+			&& item.DtoItem.Plans?.Any(p => p.IsAyce) is not true;
 	}
 }

Source/FileLiberator/AudioDecodable.cs

@@ -17,10 +17,14 @@ namespace FileLiberator
 
         protected LameConfig GetLameOptions(Configuration config)
         {
-            LameConfig lameConfig = new();
-            lameConfig.Mode = MPEGMode.Mono;
+			LameConfig lameConfig = new()
+			{
+				Mode = MPEGMode.Mono,
+				Quality = config.LameEncoderQuality,
+                OutputSampleRate = (int)config.MaxSampleRate
+			};
 
-            if (config.LameTargetBitrate)
+			if (config.LameTargetBitrate)
             {
                 if (config.LameConstantBitrate)
                     lameConfig.BitRate = config.LameBitrate;

Source/FileLiberator/AudioFileStorageExt.cs

@@ -25,13 +25,12 @@ namespace FileLiberator
 
 					if (seriesParent is not null)
 					{
-						var baseDir = Templates.Folder.GetFilename(seriesParent.ToDto());
-						return Templates.Folder.GetFilename(libraryBook.ToDto(), baseDir);
+						var baseDir = Templates.Folder.GetFilename(seriesParent.ToDto(), AudibleFileStorage.BooksDirectory, "");
+						return Templates.Folder.GetFilename(libraryBook.ToDto(), baseDir, "");
 					}
 				}
 			}
-
-			return Templates.Folder.GetFilename(libraryBook.ToDto());
+			return Templates.Folder.GetFilename(libraryBook.ToDto(), AudibleFileStorage.BooksDirectory, "");
 		}
 
 		/// <summary>

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.EndTime - 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.FractionCompleted;
 
 			OnStreamingProgressChanged(
 				new DownloadProgress
 				{
 					ProgressPercentage = progressPercent,
-					BytesReceived = (long)(fileSize * progressPercent),
-					TotalBytesToReceive = fileSize
+					BytesReceived = (long)(e.ProcessPosition - e.StartTime).TotalSeconds,
+					TotalBytesToReceive = (long)(e.EndTime - e.StartTime).TotalSeconds
 				});
 		}
 	}

Source/FileLiberator/DownloadDecryptBook.cs

@@ -41,7 +41,7 @@ namespace FileLiberator
 
             OnBegin(libraryBook);
 
-            try
+			try
             {
                 if (libraryBook.Book.Audio_Exists())
                     return new StatusHandler { "Cannot find decrypt. Final audio file already exists" };
@@ -61,31 +61,30 @@ namespace FileLiberator
                 }
 
                 // decrypt failed
-                if (!success)
+                if (!success || getFirstAudioFile(entries) == default)
                 {
-                    foreach (var tmpFile in entries.Where(f => f.FileType != FileType.AAXC))
-                        FileUtility.SaferDelete(tmpFile.Path);
+                    await Task.WhenAll(
+                        entries
+                        .Where(f => f.FileType != FileType.AAXC)
+                        .Select(f => Task.Run(() => FileUtility.SaferDelete(f.Path))));
 
-                    return abDownloader?.IsCanceled == true ?
-                        new StatusHandler { "Cancelled" } :
-                        new StatusHandler { "Decrypt failed" };
+                    return
+                        abDownloader?.IsCanceled is true
+                        ? new StatusHandler { "Cancelled" }
+                        : new StatusHandler { "Decrypt failed" };
                 }
 
-                // moves new files from temp dir to final dest.
-                // This could take a few seconds if moving hundreds of files.
-                var finalStorageDir = await Task.Run(() => moveFilesToBooksDir(libraryBook, entries));
+                var finalStorageDir = getDestinationDirectory(libraryBook);
 
-                // decrypt failed
-                if (finalStorageDir is null)
-                    return new StatusHandler { "Cannot find final audio file after decryption" };
+				Task[] finalTasks = new[]
+                {
+					Task.Run(() => downloadCoverArt(libraryBook)),
+					Task.Run(() => moveFilesToBooksDir(libraryBook, entries)),
+					Task.Run(() => libraryBook.Book.UpdateBookStatus(LiberatedStatus.Liberated, Configuration.LibationVersion)),
+					Task.Run(() => WindowsDirectory.SetCoverAsFolderIcon(libraryBook.Book.PictureId, finalStorageDir))
+				};
 
-                if (Configuration.Instance.DownloadCoverArt)
-                    downloadCoverArt(libraryBook);
-
-                // contains logic to check for config setting and OS
-                WindowsDirectory.SetCoverAsFolderIcon(pictureId: libraryBook.Book.PictureId, directory: finalStorageDir);
-
-                libraryBook.Book.UpdateBookStatus(LiberatedStatus.Liberated);
+				await Task.WhenAll(finalTasks);
 
                 return new StatusHandler();
             }
@@ -131,8 +130,8 @@ namespace FileLiberator
             abDownloader.RetrievedCoverArt += AaxcDownloader_RetrievedCoverArt;
             abDownloader.FileCreated += (_, path) => OnFileCreated(libraryBook, path);
 
-            // REAL WORK DONE HERE
-            return await abDownloader.RunAsync();
+			// REAL WORK DONE HERE
+			return await abDownloader.RunAsync();
         }
 
         private DownloadOptions BuildDownloadOptions(LibraryBook libraryBook, Configuration config, AudibleApi.Common.ContentLicense contentLic)
@@ -335,18 +334,12 @@ namespace FileLiberator
 
         /// <summary>Move new files to 'Books' directory</summary>
         /// <returns>Return directory if audiobook file(s) were successfully created and can be located on disk. Else null.</returns>
-        private static string moveFilesToBooksDir(LibraryBook libraryBook, List<FilePathCache.CacheEntry> entries)
+        private static void moveFilesToBooksDir(LibraryBook libraryBook, List<FilePathCache.CacheEntry> entries)
         {
             // create final directory. move each file into it
-            var destinationDir = AudibleFileStorage.Audio.GetDestinationDirectory(libraryBook);
-            Directory.CreateDirectory(destinationDir);
+            var destinationDir = getDestinationDirectory(libraryBook);
 
-            FilePathCache.CacheEntry getFirstAudio() => entries.FirstOrDefault(f => f.FileType == FileType.Audio);
-
-            if (getFirstAudio() == default)
-                return null;
-
-            for (var i = 0; i < entries.Count; i++)
+			for (var i = 0; i < entries.Count; i++)
             {
                 var entry = entries[i];
 
@@ -357,22 +350,33 @@ namespace FileLiberator
                 entries[i] = entry with { Path = realDest };
             }
 
-            var cue = entries.FirstOrDefault(f => f.FileType == FileType.Cue);
+			var cue = entries.FirstOrDefault(f => f.FileType == FileType.Cue);
             if (cue != default)
-                Cue.UpdateFileName(cue.Path, getFirstAudio().Path);
+                Cue.UpdateFileName(cue.Path, getFirstAudioFile(entries).Path);
 
             AudibleFileStorage.Audio.Refresh();
-
-            return destinationDir;
         }
 
-        private static void downloadCoverArt(LibraryBook libraryBook)
+        private static string getDestinationDirectory(LibraryBook libraryBook)
         {
+			var destinationDir = AudibleFileStorage.Audio.GetDestinationDirectory(libraryBook);
+            if (!Directory.Exists(destinationDir))
+                Directory.CreateDirectory(destinationDir);
+            return destinationDir;
+		}
+
+		private static FilePathCache.CacheEntry getFirstAudioFile(IEnumerable<FilePathCache.CacheEntry> entries)
+            => entries.FirstOrDefault(f => f.FileType == FileType.Audio);
+
+		private static void downloadCoverArt(LibraryBook libraryBook)
+        {
+            if (!Configuration.Instance.DownloadCoverArt) return;
+
             var coverPath = "[null]";
 
             try
             {
-                var destinationDir = AudibleFileStorage.Audio.GetDestinationDirectory(libraryBook);
+                var destinationDir = getDestinationDirectory(libraryBook);
                 coverPath = AudibleFileStorage.Audio.GetBooksDirectoryFilename(libraryBook, ".jpg");
                 coverPath = Path.Combine(destinationDir, Path.GetFileName(coverPath));
 

Source/FileLiberator/DownloadOptions.cs

@@ -22,7 +22,7 @@ namespace FileLiberator
 		public OutputFormat OutputFormat { get; init; }
 		public ChapterInfo ChapterInfo { get; init; }
 		public NAudio.Lame.LameConfig LameConfig { get; init; }
-		public string UserAgent => AudibleApi.Resources.USER_AGENT;
+		public string UserAgent => AudibleApi.Resources.Download_User_Agent;
 		public bool TrimOutputToChapterLength => config.AllowLibationFixup && config.StripAudibleBrandAudio;
 		public bool StripUnabridged => config.AllowLibationFixup && config.StripUnabridged;
 		public bool CreateCueSheet => config.CreateCueSheet;
@@ -35,10 +35,14 @@ namespace FileLiberator
 		public bool MoveMoovToBeginning => config.MoveMoovToBeginning;
 
 		public string GetMultipartFileName(MultiConvertFileProperties props)
-			=> Templates.ChapterFile.GetFilename(LibraryBookDto, props);
+		{
+			var baseDir = Path.GetDirectoryName(props.OutputFileName);
+			var extension = Path.GetExtension(props.OutputFileName);
+			return Templates.ChapterFile.GetFilename(LibraryBookDto, props, baseDir, extension);
+		}
 
 		public string GetMultipartTitle(MultiConvertFileProperties props)
-			=> Templates.ChapterTitle.GetTitle(LibraryBookDto, props);
+			=> Templates.ChapterTitle.GetName(LibraryBookDto, props);
 
 		public async Task<string> SaveClipsAndBookmarksAsync(string fileName)
 		{

Source/FileLiberator/Processable.cs

@@ -54,6 +54,8 @@ namespace FileLiberator
                 = (await ProcessAsync(libraryBook))
                 ?? new StatusHandler { "Processable should never return a null status" };
 
+            GC.Collect(GC.MaxGeneration, GCCollectionMode.Aggressive, true, true);
+
             return status;
         }
         

Source/FileLiberator/UtilityExtensions.cs

@@ -40,7 +40,8 @@ namespace FileLiberator
 			Narrators = libraryBook.Book.Narrators.Select(c => c.Name).ToList(),
 
 			SeriesName = libraryBook.Book.SeriesLink.FirstOrDefault()?.Series.Name,
-			SeriesNumber = libraryBook.Book.SeriesLink.FirstOrDefault()?.Order,
+			SeriesNumber = (int?)libraryBook.Book.SeriesLink.FirstOrDefault()?.Index,
+			IsPodcast = libraryBook.Book.IsEpisodeChild(),
 
 			BitRate = libraryBook.Book.AudioFormat.Bitrate,
 			SampleRate = libraryBook.Book.AudioFormat.SampleRate,

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/FileNamingTemplate.cs

@@ -1,123 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Text;
-
-namespace FileManager
-{
-	/// <summary>Get valid filename. Advanced features incl. parameterized template</summary>
-	public class FileNamingTemplate : NamingTemplate
-	{
-		public ReplacementCharacters ReplacementCharacters { get; }
-		/// <param name="template">Proposed file name with optional html-styled template tags.</param>
-		public FileNamingTemplate(string template, ReplacementCharacters replacement) : base(template)
-		{
-			ReplacementCharacters = replacement ?? ReplacementCharacters.Default;
-		}
-
-		/// <summary>Generate a valid path for this file or directory</summary>
-		public LongPath GetFilePath(string fileExtension, bool returnFirstExisting = false)
-		{
-			string fileName = 
-				Template.EndsWith(Path.DirectorySeparatorChar) || Template.EndsWith(Path.AltDirectorySeparatorChar) ?
-					FileUtility.RemoveLastCharacter(Template) : 
-					Template;
-
-			List<string> pathParts = new();
-
-			var paramReplacements = ParameterReplacements.ToDictionary(r => $"<{formatKey(r.Key)}>", r => formatValue(r.Value, ReplacementCharacters));
-
-			while (!string.IsNullOrEmpty(fileName))
-			{
-				var file = Path.GetFileName(fileName);
-
-				if (Path.IsPathRooted(Template) && file == string.Empty)
-				{
-					pathParts.Add(fileName);
-					break;
-				}
-				else
-				{
-					pathParts.Add(file);
-					fileName = Path.GetDirectoryName(fileName);
-				}
-			}
-
-			pathParts.Reverse();
-			var fileNamePart = pathParts[^1];
-			pathParts.Remove(fileNamePart);
-
-			fileNamePart = fileNamePart[..^fileExtension.Length];
-
-			LongPath directory = Path.Join(pathParts.Select(p => replaceFileName(p, paramReplacements, LongPath.MaxFilenameLength)).ToArray());
-
-			//If file already exists, GetValidFilename will append " (n)" to the filename.
-			//This could cause the filename length to exceed MaxFilenameLength, so reduce
-			//allowable filename length by 5 chars, allowing for up to 99 duplicates.
-			return FileUtility
-			.GetValidFilename(
-				Path.Join(directory, replaceFileName(fileNamePart, paramReplacements, LongPath.MaxFilenameLength - fileExtension.Length - 5)) + fileExtension,
-				ReplacementCharacters,
-				fileExtension,
-				returnFirstExisting
-				);
-		}
-
-		private static string replaceFileName(string filename, Dictionary<string,string> paramReplacements, int maxFilenameLength)
-		{
-			List<StringBuilder> filenameParts = new();
-			//Build the filename in parts, replacing replacement parameters with
-			//their values, and storing the parts in a list.
-			while (!string.IsNullOrEmpty(filename))
-			{
-				int openIndex = filename.IndexOf('<');
-				int closeIndex = filename.IndexOf('>');
-
-				if (openIndex == 0 && closeIndex > 0)
-				{
-					var key = filename[..(closeIndex + 1)];
-
-					if (paramReplacements.ContainsKey(key))
-						filenameParts.Add(new StringBuilder(paramReplacements[key]));
-					else
-						filenameParts.Add(new StringBuilder(key));
-
-					filename = filename[(closeIndex + 1)..];
-				}
-				else if (openIndex > 0 && closeIndex > openIndex)
-				{
-					var other = filename[..openIndex];
-					filenameParts.Add(new StringBuilder(other));
-					filename = filename[openIndex..];
-				}
-				else
-				{
-					filenameParts.Add(new StringBuilder(filename));
-					filename = string.Empty;
-				}
-			}
-
-			//Remove 1 character from the end of the longest filename part until
-			//the total filename is less than max filename length
-			while (filenameParts.Sum(p => LongPath.GetFilesystemStringLength(p)) > maxFilenameLength)
-			{
-				int maxLength = filenameParts.Max(p => p.Length);
-				var maxEntry = filenameParts.First(p => p.Length == maxLength);
-
-				maxEntry.Remove(maxLength - 1, 1);
-			}
-			return string.Join("", filenameParts);
-		}
-
-		private static string formatValue(object value, ReplacementCharacters replacements)
-		{
-			if (value is null)
-				return "";
-
-			// Other illegal characters will be taken care of later. Must take care of slashes now so params can't introduce new folders.
-			// Esp important for file templates.
-			return replacements.ReplaceFilenameChars(value.ToString());
-		}
-	}
-}

Source/FileManager/LogArchiver.cs

@@ -0,0 +1,77 @@
+using Dinah.Core;
+using Newtonsoft.Json.Linq;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.IO.Compression;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace FileManager
+{
+	public sealed class LogArchiver : IAsyncDisposable
+	{
+		public Encoding Encoding { get; set; }
+		public string FileName { get; }
+		private readonly ZipArchive archive;
+
+		public LogArchiver(string filename) : this(filename, Encoding.UTF8) { }
+		public LogArchiver(string filename, Encoding encoding)
+		{
+			FileName = ArgumentValidator.EnsureNotNull(filename, nameof(filename));
+			Encoding = ArgumentValidator.EnsureNotNull(encoding, nameof(encoding));
+			archive = new ZipArchive(File.Open(FileName, FileMode.OpenOrCreate, FileAccess.ReadWrite, FileShare.ReadWrite), ZipArchiveMode.Update, false, Encoding);
+		}
+
+		public void DeleteOlderThan(DateTime cutoffDate)
+			=> DeleteEntries(archive.Entries.Where(e => e.LastWriteTime < cutoffDate).ToList());
+
+		public void DeleteOldestN(int quantity)
+			=> DeleteEntries(archive.Entries.OrderBy(e => e.LastWriteTime).Take(quantity).ToList());
+		
+		public void DeleteAllButNewestN(int quantity)
+			=> DeleteEntries(archive.Entries.OrderByDescending(e => e.LastWriteTime).Skip(quantity).ToList());
+		
+		private void DeleteEntries(List<ZipArchiveEntry> entries)
+		{
+			foreach (var e in entries)
+				e.Delete();
+		}
+
+		public async Task AddFileAsync(string name, JObject contents, string comment = null)
+		{
+			ArgumentValidator.EnsureNotNull(contents, nameof(contents));
+			await AddFileAsync(name, Encoding.GetBytes(contents.ToString(Newtonsoft.Json.Formatting.Indented)), comment);
+		}
+
+		public async Task AddFileAsync(string name, string contents, string comment = null)
+		{
+			ArgumentValidator.EnsureNotNull(contents, nameof(contents));
+			await AddFileAsync(name, Encoding.GetBytes(contents), comment);
+		}
+
+		public Task AddFileAsync(string name, ReadOnlyMemory<byte> contents, string comment = null)
+		{
+			ArgumentValidator.EnsureNotNull(name, nameof(name));
+
+			name = ReplacementCharacters.Barebones.ReplaceFilenameChars(name);
+			return Task.Run(() => AddfileInternal(name, contents.Span, comment));			
+		}
+
+		private readonly object lockObj = new();
+		private void AddfileInternal(string name, ReadOnlySpan<byte> contents, string comment)
+		{
+			lock (lockObj)
+			{
+				var entry = archive.CreateEntry(name, CompressionLevel.SmallestSize);
+
+				entry.Comment = comment;
+				using var entryStream = entry.Open();
+				entryStream.Write(contents);
+			}
+		}
+
+		public async ValueTask DisposeAsync() => await Task.Run(archive.Dispose);
+	}
+}

Source/FileManager/LongPath.cs

@@ -56,16 +56,16 @@ namespace FileManager
 		//don't care about encoding, so how unicode characters are encoded is
 		///a choice made by the linux kernel. As best as I can tell, pretty
 		//much everyone uses UTF-8.
-		public static int GetFilesystemStringLength(StringBuilder filename)
+		public static int GetFilesystemStringLength(string filename)
 			=> IsWindows ? filename.Length
-			: Encoding.UTF8.GetByteCount(filename.ToString());
+			: Encoding.UTF8.GetByteCount(filename);
 
 		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/MetadataNamingTemplate.cs

@@ -1,20 +0,0 @@
-using System;
-using System.Linq;
-
-namespace FileManager
-{
-	public class MetadataNamingTemplate : NamingTemplate
-	{
-		public MetadataNamingTemplate(string template) : base(template) { }
-
-		public string GetTagContents()
-		{
-			var tagValue = Template;
-
-			foreach (var r in ParameterReplacements)
-				tagValue = tagValue.Replace($"<{formatKey(r.Key)}>", r.Value?.ToString() ?? "");
-
-			return tagValue;
-		}
-	}
-}

Source/FileManager/NamingTemplate.cs

@@ -1,28 +0,0 @@
-using Dinah.Core;
-using System;
-using System.Collections.Generic;
-
-namespace FileManager
-{
-	public class NamingTemplate
-	{
-		/// <summary>Proposed full name. May contain optional html-styled template tags. Eg: &lt;name&gt;</summary>
-		public string Template { get; }
-
-		/// <param name="template">Proposed file name with optional html-styled template tags.</param>
-		public NamingTemplate(string template) => Template = ArgumentValidator.EnsureNotNullOrWhiteSpace(template, nameof(template));
-
-		/// <summary>Optional step 1: Replace html-styled template tags with parameters. Eg {"name", "Bill Gates"} => /&lt;name&gt;/ => /Bill Gates/</summary>
-		public Dictionary<string, object> ParameterReplacements { get; } = new Dictionary<string, object>();
-
-		/// <summary>Convenience method</summary>
-		public void AddParameterReplacement(string key, object value)
-			// using .Add() instead of "[key] = value" will make unintended overwriting throw exception
-			=> ParameterReplacements.Add(key, value);
-
-		protected static string formatKey(string key)
-			=> key
-			.Replace("<", "")
-			.Replace(">", "");
-	}
-}

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

@@ -0,0 +1,66 @@
+using System;
+using System.Linq.Expressions;
+using System.Text.RegularExpressions;
+
+namespace FileManager.NamingTemplate;
+
+internal interface IClosingPropertyTag : IPropertyTag
+{
+	/// <summary>The <see cref="Regex"/> used to match the closing <see cref="IPropertyTag.TemplateTag"/> in template strings.</summary>
+	public Regex NameCloseMatcher { get; }
+
+	/// <summary>
+	/// Determine if the template string starts with <see cref="IPropertyTag.TemplateTag"/>'s closing tag signature,
+	/// and if it does output the matching tag's <see cref="ITemplateTag"/>
+	/// </summary>
+	/// <param name="templateString">Template string</param>
+	/// <param name="exactName">The <paramref name="templateString"/> substring that was matched.</param>
+	/// <param name="propertyTag">The registered <see cref="IPropertyTag"/></param>
+	/// <returns>True if the <paramref name="templateString"/> starts with this tag.</returns>
+	bool StartsWithClosing(string templateString, out string exactName, out IClosingPropertyTag propertyTag);
+}
+
+public class ConditionalTagCollection<TClass> : TagCollection
+{
+	public ConditionalTagCollection(bool caseSensative = true) :base(typeof(TClass), caseSensative) { }
+
+	/// <summary>
+	/// Register a conditional tag.
+	/// </summary>
+	/// <param name="propertyGetter">A Func to get the condition's <see cref="bool"/> value from <see cref="TClass"/></param>
+	public void Add(ITemplateTag templateTag, Func<TClass, bool> propertyGetter)
+	{
+		var expr = Expression.Call(Expression.Constant(propertyGetter.Target), propertyGetter.Method, Parameter);
+
+		AddPropertyTag(new ConditionalTag(templateTag, Options, expr));
+	}
+	
+	private class ConditionalTag : TagBase, IClosingPropertyTag
+	{
+		public Regex NameCloseMatcher { get; }
+
+		public ConditionalTag(ITemplateTag templateTag, RegexOptions options, Expression conditionExpression)
+			: base(templateTag, conditionExpression)
+		{
+			NameMatcher = new Regex($"^<(!)?{templateTag.TagName}->", options);
+			NameCloseMatcher = new Regex($"^<-{templateTag.TagName}>", options);
+		}
+
+		public bool StartsWithClosing(string templateString, out string exactName, out IClosingPropertyTag propertyTag)
+		{
+			var match = NameCloseMatcher.Match(templateString);
+			if (match.Success)
+			{
+				exactName = match.Value;
+				propertyTag = this;
+				return true;
+			}
+
+			exactName = null;
+			propertyTag = null;
+			return false;
+		}
+
+		protected override Expression GetTagExpression(string exactName, string formatter) => formatter == "!" ? Expression.Not(ValueExpression) : ValueExpression;
+	}
+}

Source/FileManager/NamingTemplate/ITemplateTag.cs

@@ -0,0 +1,6 @@
+namespace FileManager.NamingTemplate;
+
+public interface ITemplateTag
+{
+	string TagName { get; }
+}

Source/FileManager/NamingTemplate/NamingTemplate.cs

@@ -0,0 +1,267 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Linq.Expressions;
+
+namespace FileManager.NamingTemplate;
+
+public class NamingTemplate
+{
+	public string TemplateText { get; private set; }
+	public IEnumerable<ITemplateTag> TagsInUse => _tagsInUse;
+	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> TagCollections;
+	private readonly List<ITemplateTag> _tagsInUse = new();
+
+	public const string ERROR_NULL_IS_INVALID = "Null template is invalid.";
+	public const string WARNING_EMPTY = "Template is empty.";
+	public const string WARNING_WHITE_SPACE = "Template is white space.";
+	public const string WARNING_NO_TAGS = "Should use tags. Eg: <title>";
+
+	/// <summary>
+	/// 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>
+	public TemplatePart Evaluate(params object[] propertyClasses)
+	{
+		// 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 = 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;
+	}
+
+	/// <summary>Parse a template string to a <see cref="NamingTemplate"/></summary>
+	/// <param name="template">The template string to parse</param>
+	/// <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> tagCollections)
+	{
+		var namingTemplate = new NamingTemplate(tagCollections);
+		try
+		{
+			BinaryNode intermediate = namingTemplate.IntermediateParse(template);
+			Expression evalTree = GetExpressionTree(intermediate);
+
+			namingTemplate.templateToString = Expression.Lambda(evalTree, tagCollections.Select(tc => tc.Parameter)).Compile();
+		}
+		catch(Exception ex)
+		{
+			namingTemplate.errors.Add(ex.Message);
+		}
+		return namingTemplate;
+	}
+
+	private NamingTemplate(IEnumerable<TagCollection> properties)
+	{
+		TagCollections = properties;
+	}
+
+	/// <summary>Builds an <see cref="Expression"/> tree that will evaluate to a <see cref="TemplatePart"/></summary>
+	private static Expression GetExpressionTree(BinaryNode node)
+	{
+		if (node is null) return TemplatePart.Blank;
+		else if (node.IsValue) return node.Expression;
+		else if (node.IsConditional) return Expression.Condition(node.Expression, concatExpression(node), TemplatePart.Blank);
+		else return concatExpression(node);
+
+		static Expression concatExpression(BinaryNode node)
+			=> TemplatePart.CreateConcatenation(GetExpressionTree(node.LeftChild), GetExpressionTree(node.RightChild));
+	}
+
+	/// <summary>Parse a template string into a <see cref="BinaryNode"/> tree</summary>
+	private BinaryNode IntermediateParse(string templateString)
+	{
+		if (templateString is null)
+			throw new NullReferenceException(ERROR_NULL_IS_INVALID);
+		else if (string.IsNullOrEmpty(templateString))
+			warnings.Add(WARNING_EMPTY);
+		else if (string.IsNullOrWhiteSpace(templateString))
+			warnings.Add(WARNING_WHITE_SPACE);
+
+		TemplateText = templateString;
+
+		BinaryNode topNode = BinaryNode.CreateRoot();
+		BinaryNode currentNode = topNode;
+		List<char> literalChars = new();
+
+		while (templateString.Length > 0)
+		{
+			if (StartsWith(templateString, out string exactPropertyName, out var propertyTag, out var valueExpression))
+			{
+				checkAndAddLiterals();
+
+				if (propertyTag is IClosingPropertyTag)
+					currentNode = currentNode.AddNewNode(BinaryNode.CreateConditional(propertyTag.TemplateTag, valueExpression));
+				else
+				{
+					currentNode = currentNode.AddNewNode(BinaryNode.CreateValue(propertyTag.TemplateTag, valueExpression));
+					_tagsInUse.Add(propertyTag.TemplateTag);
+				}
+
+				templateString = templateString[exactPropertyName.Length..];
+			}
+			else if (StartsWithClosing(templateString, out exactPropertyName, out var closingPropertyTag))
+			{
+				checkAndAddLiterals();
+
+				BinaryNode lastParenth = currentNode;
+
+				while (lastParenth?.IsConditional is false)
+					lastParenth = lastParenth.Parent;
+
+				if (lastParenth?.Parent is null)
+				{
+					warnings.Add($"Missing <{closingPropertyTag.TemplateTag.TagName}-> open conditional.");
+					break;
+				}
+				else if (lastParenth.Name != closingPropertyTag.TemplateTag.TagName)
+				{
+					warnings.Add($"Missing <-{lastParenth.Name}> closing conditional.");
+					break;
+				}
+
+				currentNode = lastParenth.Parent;
+				templateString = templateString[exactPropertyName.Length..];
+			}
+			else
+			{
+				//templateString does not start with a tag, so the first
+				//character is a literal and not part of a tag expression.
+				literalChars.Add(templateString[0]);
+				templateString = templateString[1..];
+			}
+		}
+		checkAndAddLiterals();
+
+		//Check for any conditionals that haven't been closed
+		while (currentNode is not null)
+		{
+			if (currentNode.IsConditional)
+				warnings.Add($"Missing <-{currentNode.Name}> closing conditional.");
+			currentNode = currentNode.Parent;
+		}
+
+		if (!_tagsInUse.Any())
+			warnings.Add(WARNING_NO_TAGS);
+
+		return topNode;
+
+		void checkAndAddLiterals()
+		{
+			if (literalChars.Count != 0)
+			{
+				currentNode = currentNode.AddNewNode(BinaryNode.CreateValue(string.Concat(literalChars)));
+				literalChars.Clear();
+			}
+		}
+	}
+
+	private bool StartsWith(string template, out string exactName, out IPropertyTag propertyTag, out Expression valueExpression)
+	{
+		foreach (var pc in TagCollections)
+		{
+			if (pc.StartsWith(template, out exactName, out propertyTag, out valueExpression))
+				return true;
+		}
+
+		exactName = null;
+		valueExpression = null;
+		propertyTag = null;
+		return false;
+	}
+
+	private bool StartsWithClosing(string template, out string exactName, out IClosingPropertyTag closingPropertyTag)
+	{
+		foreach (var pc in TagCollections)
+		{
+			if (pc.StartsWithClosing(template, out exactName, out closingPropertyTag))
+				return true;
+		}
+
+		exactName = null;
+		closingPropertyTag = null;
+		return false;
+	}
+
+	private class BinaryNode
+	{
+		public string Name { get; }
+		public BinaryNode Parent { get; private set; }
+		public BinaryNode RightChild { get; private set; }
+		public BinaryNode LeftChild { get; private set; }
+		public Expression Expression { get; private init; }
+		public bool IsConditional { get; private init; } = false;
+		public bool IsValue { get; private init; } = false;
+
+		public static BinaryNode CreateRoot() => new("Root");
+
+		public static BinaryNode CreateValue(string literal) => new("Literal")
+		{
+			IsValue = true,
+			Expression = TemplatePart.CreateLiteral(literal)
+		};
+
+		public static BinaryNode CreateValue(ITemplateTag templateTag, Expression property) => new(templateTag.TagName)
+		{
+			IsValue = true,
+			Expression = TemplatePart.CreateProperty(templateTag, property)
+		};
+
+		public static BinaryNode CreateConditional(ITemplateTag templateTag, Expression property) => new(templateTag.TagName)
+		{
+			IsConditional = true,
+			Expression = property
+		};
+
+		private static BinaryNode CreateConcatenation(BinaryNode left, BinaryNode right)
+		{
+			var newNode = new BinaryNode("Concatenation")
+			{
+				LeftChild = left,
+				RightChild = right
+			};
+			newNode.LeftChild.Parent = newNode;
+			newNode.RightChild.Parent = newNode;
+			return newNode;
+		}
+
+		private BinaryNode(string name) => Name = name;
+		public override string ToString() => Name;
+
+		public BinaryNode AddNewNode(BinaryNode newNode)
+		{
+			BinaryNode currentNode = this;
+
+			if (LeftChild is null)
+			{
+				newNode.Parent = currentNode;
+				LeftChild = newNode;
+			}
+			else if (RightChild is null)
+			{
+				newNode.Parent = currentNode;
+				RightChild = newNode;
+			}
+			else
+			{
+				RightChild = CreateConcatenation(RightChild, newNode);
+				RightChild.Parent = currentNode;
+				currentNode = RightChild;
+			}
+
+			return newNode.IsConditional ? newNode : currentNode;
+		}
+	}
+}

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

@@ -0,0 +1,156 @@
+using Dinah.Core;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Linq.Expressions;
+using System.Text.RegularExpressions;
+
+namespace FileManager.NamingTemplate;
+
+public delegate string PropertyFormatter<T>(ITemplateTag templateTag, T value, string formatString);
+
+public class PropertyTagCollection<TClass> : TagCollection
+{
+	private readonly Dictionary<Type, MulticastDelegate> defaultFormatters = new();
+
+	public PropertyTagCollection(bool caseSensative = true, params MulticastDelegate[] defaultFormatters) : base(typeof(TClass), caseSensative)
+	{
+		foreach (var formatter in defaultFormatters)
+		{
+			var parameters = formatter.Method.GetParameters();
+
+			if (formatter.Method.ReturnType != typeof(string)
+				|| parameters.Length != 3
+				|| parameters[0].ParameterType != typeof(ITemplateTag)
+				|| parameters[2].ParameterType != typeof(string))
+				throw new ArgumentException($"{nameof(defaultFormatters)} must have a signature of [{nameof(String)} PropertyFormatter<T>({nameof(ITemplateTag)}, T, {nameof(String)})]");
+
+			this.defaultFormatters[parameters[1].ParameterType] = formatter;
+		}
+	}
+
+	/// <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 property value from <see cref="TClass"/></param>
+	/// <param name="formatter">Optional formatting function that accepts the <typeparamref name="TProperty"/> property
+	/// and a formatting string and returnes the value the formatted string. If <see cref="null"/>, use the default
+	/// <typeparamref name="TProperty"/> formatter if present, or <see cref="object.ToString"/></param>
+	public void Add<TProperty>(ITemplateTag templateTag, Func<TClass, TProperty?> propertyGetter, PropertyFormatter<TProperty> formatter = null)
+		where TProperty : struct
+		=> RegisterWithFormatter(templateTag, propertyGetter, formatter);
+
+	/// <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)
+		where TProperty : struct
+		=> RegisterWithToString(templateTag, propertyGetter, toString);
+
+	/// <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 property value from <see cref="TClass"/></param>
+	/// <param name="formatter">Optional formatting function that accepts the <typeparamref name="TProperty"/> property
+	/// and a formatting string and returnes the value formatted to string. If <see cref="null"/>, use the default
+	/// <typeparamref name="TProperty"/> formatter if present, or <see cref="object.ToString"/></param>
+	public void Add<TProperty>(ITemplateTag templateTag, Func<TClass, TProperty> propertyGetter, PropertyFormatter<TProperty> formatter = null)
+		=> RegisterWithFormatter(templateTag, propertyGetter, formatter);
+
+	/// <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)
+		=> RegisterWithToString(templateTag, propertyGetter, toString);
+
+	private void RegisterWithFormatter<TProperty, TPropertyValue>
+		(ITemplateTag templateTag, Func<TClass, TProperty> propertyGetter, PropertyFormatter<TPropertyValue> formatter)
+	{
+		ArgumentValidator.EnsureNotNull(templateTag, nameof(templateTag));
+		ArgumentValidator.EnsureNotNull(propertyGetter, nameof(propertyGetter));
+
+		var expr = Expression.Call(Expression.Constant(propertyGetter.Target), propertyGetter.Method, Parameter);
+
+		if ((formatter ??= GetDefaultFormatter<TPropertyValue>()) is null)
+			AddPropertyTag(new PropertyTag<TPropertyValue>(templateTag, Options, expr, ToStringFunc));
+		else
+			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
+		{
+			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; }
+	}
+
+	private class PropertyTag<TPropertyValue> : TagBase
+	{
+		private Func<Expression, string, Expression> CreateToStringExpression { get; }
+
+		public PropertyTag(ITemplateTag templateTag, RegexOptions options, Expression propertyGetter, PropertyFormatter<TPropertyValue> formatter)
+			: base(templateTag, propertyGetter)
+		{
+			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));
+		}
+
+		public PropertyTag(ITemplateTag templateTag, RegexOptions options, Expression propertyGetter, Func<TPropertyValue, string> toString)
+			: base(templateTag, propertyGetter)
+		{
+			NameMatcher = new Regex(@$"^<{templateTag.TagName.Replace(" ", "\\s*?")}>", options);
+			CreateToStringExpression = (expVal, _) =>
+					Expression.Call(
+						toString.Target is null ? null : Expression.Constant(toString.Target),
+						toString.Method,
+						expVal);
+		}
+
+		protected override Expression GetTagExpression(string exactName, string formatString)
+		{
+			Expression toStringExpression
+				= !ReturnType.IsValueType
+				? Expression.Condition(
+					Expression.Equal(ValueExpression, Expression.Constant(null)),
+					Expression.Constant(""),
+					CreateToStringExpression(ValueExpression, formatString))
+				: Nullable.GetUnderlyingType(ReturnType) is null
+				? CreateToStringExpression(ValueExpression, formatString)
+				: Expression.Condition(
+					Expression.PropertyOrField(ValueExpression, "HasValue"),
+					CreateToStringExpression(Expression.PropertyOrField(ValueExpression, "Value"), formatString),
+					Expression.Constant(""));
+
+			return Expression.TryCatch(toStringExpression, Expression.Catch(typeof(Exception), Expression.Constant(exactName)));
+		}
+	}
+}

Source/FileManager/NamingTemplate/TagBase.cs

@@ -0,0 +1,65 @@
+using System;
+using System.Linq.Expressions;
+using System.Text.RegularExpressions;
+
+namespace FileManager.NamingTemplate;
+
+internal interface IPropertyTag
+{
+	/// <summary>The tag that will be matched in a tag string</summary>
+	ITemplateTag TemplateTag { get; }
+
+	/// <summary><see cref="TemplateTag"/>'s <see cref="Type"/></summary>
+	Type ReturnType { get; }
+
+	/// <summary>The <see cref="Regex"/> used to match <see cref="TemplateTag"/> in template strings.</summary>
+	Regex NameMatcher { get; }
+
+	/// <summary>
+	/// Determine if the template string starts with <see cref="TemplateTag"/>, and if it does parse the tag to an <see cref="Expression"/>
+	/// </summary>
+	/// <param name="templateString">Template string</param>
+	/// <param name="exactName">The <paramref name="templateString"/> substring that was matched.</param>
+	/// <param name="propertyValue">The <see cref="Expression"/> that returns the property's value</param>
+	/// <returns>True if the <paramref name="templateString"/> starts with this tag.</returns>
+	bool StartsWith(string templateString, out string exactName, out Expression propertyValue);
+}
+
+internal abstract class TagBase : IPropertyTag
+{
+	public ITemplateTag TemplateTag { get; }
+	public Regex NameMatcher { get; protected init; }
+	public Type ReturnType => ValueExpression.Type;
+	protected Expression ValueExpression { get; }
+
+	protected TagBase(ITemplateTag templateTag, Expression propertyExpression)
+	{
+		TemplateTag = templateTag;
+		ValueExpression = propertyExpression;
+	}
+
+	/// <summary>Create an <see cref="Expression"/> that returns the property's value.</summary>
+	/// <param name="exactName">The exact string that was matched to <see cref="ITemplateTag"/></param>
+	/// <param name="formatter">The optional format string in the match inside the square brackets</param>
+	protected abstract Expression GetTagExpression(string exactName, string formatter);
+
+	public bool StartsWith(string templateString, out string exactName, out Expression propertyValue)
+	{
+		var match = NameMatcher.Match(templateString);
+		if (match.Success)
+		{
+			exactName = match.Value;
+			propertyValue = GetTagExpression(exactName, match.Groups.Count == 2 ? match.Groups[1].Value.Trim() : "");
+			return true;
+		}
+
+		exactName = null;
+		propertyValue = null;
+		return false;
+	}
+
+	public override string ToString()
+	{
+		return $"[Name = {TemplateTag.TagName}, Type = {ReturnType.Name}]";
+	}
+}

Source/FileManager/NamingTemplate/TagCollection.cs

@@ -0,0 +1,80 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
+using System.Linq.Expressions;
+using System.Text.RegularExpressions;
+
+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="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();
+
+	protected TagCollection(Type classType, bool caseSensative = true)
+	{
+		Parameter = Expression.Parameter(classType, classType.Name);
+		Options |= caseSensative ? RegexOptions.None : RegexOptions.IgnoreCase;
+	}
+
+	/// <summary>
+	/// Determine if the template string starts with any of the <see cref="TemplateTags"/>s' <see cref="ITemplateTag"/> signatures,
+	/// and if it does parse the tag to an <see cref="Expression"/>
+	/// </summary>
+	/// <param name="templateString">Template string</param>
+	/// <param name="exactName">The <paramref name="templateString"/> substring that was matched.</param>
+	/// <param name="propertyValue">The <see cref="Expression"/> that returns the <paramref name="propertyTag"/>'s value</param>
+	/// <returns>True if the <paramref name="templateString"/> starts with a tag registered in this class.</returns>
+	internal bool StartsWith(string templateString, out string exactName, out IPropertyTag propertyTag, out Expression propertyValue)
+	{
+		foreach (var p in PropertyTags)
+		{
+			if (p.StartsWith(templateString, out exactName, out propertyValue))
+			{
+				propertyTag = p;
+				return true;
+			}
+		}
+
+		propertyValue = null;
+		propertyTag = null;
+		exactName = null;
+		return false;
+	}
+
+	/// <summary>
+	/// Determine if the template string starts with <see cref="IPropertyTag.TemplateTag"/>'s closing tag signature,
+	/// and if it does output the matching tag's <see cref="ITemplateTag"/>
+	/// </summary>
+	/// <param name="templateString">Template string</param>
+	/// <param name="exactName">The <paramref name="templateString"/> substring that was matched.</param>
+	/// <param name="closingPropertyTag">The registered <see cref="IClosingPropertyTag"/></param>
+	/// <returns>True if the <paramref name="templateString"/> starts with this tag.</returns>
+	internal bool StartsWithClosing(string templateString, out string exactName, out IClosingPropertyTag closingPropertyTag)
+	{
+		foreach (var  cg in PropertyTags.OfType<IClosingPropertyTag>())
+		{
+			if (cg.StartsWithClosing(templateString, out exactName, out closingPropertyTag))
+				return true;
+		}
+
+		closingPropertyTag = null;
+		exactName = null;
+		return false;
+	}
+
+	private protected void AddPropertyTag(IPropertyTag propertyTag)
+	{
+		if (!PropertyTags.Any(c => c.TemplateTag.TagName == propertyTag.TemplateTag.TagName))
+			PropertyTags.Add(propertyTag);
+	}
+
+	IEnumerator IEnumerable.GetEnumerator() => GetEnumerator();
+}

Source/FileManager/NamingTemplate/TemplatePart.cs

@@ -0,0 +1,109 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Reflection;
+
+namespace FileManager.NamingTemplate;
+
+/// <summary>Represents one part of an evaluated <see cref="NamingTemplate"/>.</summary>
+public class TemplatePart : IEnumerable<TemplatePart>
+{
+	/// <summary>The <see cref="TemplatePart"/> name. If <see cref="TemplatePart"/> is
+	/// a registered property, this value is <see cref="ITemplateTag.TagName"/></summary>
+	public string TagName { get; }
+
+	/// <summary> The <see cref="IPropertyTag"/>'s <see cref="ITemplateTag"/> if <see cref="TemplatePart"/> is
+	/// a registered property, otherwise <see cref="null"/> for string literals. </summary>
+	public ITemplateTag TemplateTag { get; }
+
+	/// <summary>The evaluated string.</summary>
+	public string Value { get; }
+
+	private TemplatePart previous;
+	private TemplatePart next;
+	private TemplatePart(string name, string value)
+	{
+		TagName = name;
+		Value = value;
+	}
+	private TemplatePart(ITemplateTag templateTag, string value)
+	{
+		TemplateTag = templateTag;
+		TagName = templateTag.TagName;
+		Value = value;
+	}
+
+	internal static Expression Blank
+		=> CreateExpression("Blank", Expression.Constant(""));
+
+	internal static Expression CreateLiteral(string constant)
+		=> CreateExpression("Literal", Expression.Constant(constant));
+
+	internal static Expression CreateProperty(ITemplateTag templateTag, Expression property)
+		=> Expression.New(tagTemplateConstructorInfo, Expression.Constant(templateTag), property);
+
+	internal static Expression CreateConcatenation(Expression left, Expression right)
+	{
+		if (left.Type != typeof(TemplatePart) || right.Type != typeof(TemplatePart))
+			throw new InvalidOperationException($"Cannot concatenate expressions of types {left.Type.Name} and {right.Type.Name}");
+		return Expression.Add(left, right, addMethodInfo);
+	}
+
+	private static Expression CreateExpression(string name, Expression value)
+		=> Expression.New(constructorInfo, Expression.Constant(name), value);
+
+	private static readonly ConstructorInfo constructorInfo
+		= typeof(TemplatePart).GetConstructor(BindingFlags.NonPublic | BindingFlags.Instance, new Type[] { typeof(string), typeof(string) });
+
+	private static readonly ConstructorInfo tagTemplateConstructorInfo
+		= typeof(TemplatePart).GetConstructor(BindingFlags.NonPublic | BindingFlags.Instance, new Type[] { typeof(ITemplateTag), typeof(string)	});
+
+	private static readonly MethodInfo addMethodInfo
+		= typeof(TemplatePart).GetMethod(nameof(Concatenate), BindingFlags.NonPublic | BindingFlags.Static, new Type[] { typeof(TemplatePart), typeof(TemplatePart) });
+
+	public IEnumerator<TemplatePart> GetEnumerator()
+	{
+		var firstPart = FirstPart;
+
+		do
+		{
+			if (firstPart.TemplateTag is not null || firstPart.TagName is not "Blank")
+				yield return firstPart;
+			firstPart = firstPart.next;
+		}
+		while (firstPart is not null);
+	}
+
+	IEnumerator IEnumerable.GetEnumerator() => GetEnumerator();
+
+	internal TemplatePart FirstPart
+	{
+		get
+		{
+			var part = this;
+			while (part.previous is not null)
+				part = part.previous;
+			return part;
+		}
+	}
+
+	private TemplatePart LastPart
+	{
+		get
+		{
+			var part = this;
+			while (part.next is not null)
+				part = part.next;
+			return part;
+		}
+	}
+
+	private static TemplatePart Concatenate(TemplatePart left, TemplatePart right)
+	{
+		var last = left.LastPart;
+		last.next = right;
+		right.previous = last;
+		return left.FirstPart;
+	}
+}

Source/FileManager/_InternalsVisible.cs

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

Source/HangoverAvalonia/App.axaml

@@ -7,6 +7,6 @@
     </Application.DataTemplates>
 
     <Application.Styles>
-        <FluentTheme Mode="Light"/>
+        <FluentTheme/>
     </Application.Styles>
 </Application>

Source/HangoverAvalonia/HangoverAvalonia.csproj

@@ -21,13 +21,7 @@
 	</PropertyGroup>
 
   <PropertyGroup>
-    <!--
-    HACK FOR COMPILER BUG  2021-09-14. Hopefully will be fixed in future versions
-    - Not using SatelliteResourceLanguages will load all language packs: works
-    - Specifying 'en' semicolon 1 more should load 1 language pack: works
-    - Specifying only 'en' should load no language packs: broken, still loads all
-    -->
-    <SatelliteResourceLanguages>en;es</SatelliteResourceLanguages>
+    <SatelliteResourceLanguages>en</SatelliteResourceLanguages>
   </PropertyGroup>
 
 	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
@@ -72,13 +66,13 @@
 	</ItemGroup>
 	<ItemGroup>
 
-		<PackageReference Include="Avalonia" Version="11.0.0-preview4" />
-		<PackageReference Include="Avalonia.Desktop" Version="11.0.0-preview4" />
+		<PackageReference Include="Avalonia" Version="11.0.0-preview6" />
+		<PackageReference Include="Avalonia.Desktop" Version="11.0.0-preview6" />
 		<!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
-		<PackageReference Condition="'$(Configuration)' == 'Debug'" 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="XamlNameReferenceGenerator" Version="1.5.1" />
+		<PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.0.0-preview6" />
+		<PackageReference Include="Avalonia.ReactiveUI" Version="11.0.0-preview6" />
+		<PackageReference Include="Avalonia.Controls.ItemsRepeater" Version="11.0.0-preview6" />
+		<PackageReference Include="Avalonia.Themes.Fluent" Version="11.0.0-preview6" />
 	</ItemGroup>
 	<ItemGroup>
 		<ProjectReference Include="..\HangoverBase\HangoverBase.csproj" />

Source/HangoverAvalonia/ViewLocator.cs

@@ -7,7 +7,7 @@ namespace HangoverAvalonia
 {
 	public class ViewLocator : IDataTemplate
 	{
-		public IControl Build(object data)
+		public Control Build(object data)
 		{
 			var name = data.GetType().FullName!.Replace("ViewModel", "View");
 			var type = Type.GetType(name);

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/HangoverBase/DatabaseTab.cs

@@ -64,7 +64,8 @@ namespace HangoverBase
 
             try
             {
-                var sql = _commands.SqlInput().Trim();
+                var sql = _commands.SqlInput()?.Trim();
+                if (sql is null) return;
 
                 #region // explanation
                 // Routing statements to non-query is a convenience.

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>
@@ -15,13 +16,7 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <!--
-    HACK FOR COMPILER BUG  2021-09-14. Hopefully will be fixed in future versions
-    - Not using SatelliteResourceLanguages will load all language packs: works
-    - Specifying 'en' semicolon 1 more should load 1 language pack: works
-    - Specifying only 'en' should load no language packs: broken, still loads all
-    -->
-    <SatelliteResourceLanguages>en;es</SatelliteResourceLanguages>
+    <SatelliteResourceLanguages>en</SatelliteResourceLanguages>
   </PropertyGroup>
 
   <!--

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

@@ -2,16 +2,71 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:local="using:LibationAvalonia"
 			 x:Class="LibationAvalonia.App">
-	
+
 	<Application.DataTemplates>
 		<local:ViewLocator/>
 	</Application.DataTemplates>
-	
-    <Application.Styles>
-		<FluentTheme Mode="Light"/>
-		<StyleInclude Source="avares://Avalonia.Themes.Fluent/FluentLight.xaml"/>
-		<StyleInclude Source="avares://Avalonia.Themes.Fluent/Accents/BaseLight.xaml"/>
-		<StyleInclude Source="/Assets/DataGridTheme.xaml"/>
-		<StyleInclude Source="/Assets/LibationStyles.xaml"/>
+
+	<Application.Resources>
+
+		<ResourceDictionary>
+			<ResourceDictionary.ThemeDictionaries>
+				<ResourceDictionary x:Key="Light">
+					<SolidColorBrush x:Key="SeriesEntryGridBackgroundBrush" Opacity="0.3" Color="#abffab" />
+					<SolidColorBrush x:Key="ProcessQueueBookFailedBrush" Color="LightCoral" />
+					<SolidColorBrush x:Key="ProcessQueueBookCompletedBrush" Color="PaleGreen" />
+					<SolidColorBrush x:Key="ProcessQueueBookCancelledBrush" Color="Khaki" />
+					<SolidColorBrush x:Key="HyperlinkNew" Color="Blue" />
+					<SolidColorBrush x:Key="HyperlinkVisited" Color="Purple" />
+					<SolidColorBrush x:Key="ProcessQueueBookDefaultBrush" Color="White" />
+					<SolidColorBrush x:Key="SystemOpaqueBase" Color="White" />
+
+					<SolidColorBrush x:Key="CancelRed" Color="FireBrick" />
+					<SolidColorBrush x:Key="IconFill" Color="#231F20" />
+					<SolidColorBrush x:Key="StoplightRed" Color="#F06060" />
+					<SolidColorBrush x:Key="StoplightYellow" Color="#F0E160" />
+					<SolidColorBrush x:Key="StoplightGreen" Color="#70FA70" />
+
+					<SolidColorBrush x:Key="DisabledGrayBrush" Opacity="0.4"  Color="{StaticResource SystemChromeMediumColor}" />
+
+				</ResourceDictionary>
+				<ResourceDictionary x:Key="Dark">
+					<SolidColorBrush x:Key="SeriesEntryGridBackgroundBrush" Opacity="0.3" Color="#bed2fa" />
+					<SolidColorBrush x:Key="ProcessQueueBookFailedBrush" Color="#502727" />
+					<SolidColorBrush x:Key="ProcessQueueBookCompletedBrush" Color="#1c3e20" />
+					<SolidColorBrush x:Key="ProcessQueueBookCancelledBrush" Color="#4e4b15" />
+					<SolidColorBrush x:Key="HyperlinkNew" Color="CornflowerBlue" />
+					<SolidColorBrush x:Key="HyperlinkVisited" Color="Orchid" />
+					<SolidColorBrush x:Key="ProcessQueueBookDefaultBrush" Color="Black" />
+					<SolidColorBrush x:Key="SystemOpaqueBase" Color="Black" />
+
+					<SolidColorBrush x:Key="CancelRed" Color="#802727" />
+					<SolidColorBrush x:Key="IconFill" Color="#DCE0DF" />
+					<SolidColorBrush x:Key="StoplightRed" Color="#5F0707" />
+					<SolidColorBrush x:Key="StoplightYellow" Color="#5F5B1A" />
+					<SolidColorBrush x:Key="StoplightGreen" Color="#174E15" />
+
+
+					<SolidColorBrush x:Key="DisabledGrayBrush" Opacity="0.4"  Color="{StaticResource SystemChromeMediumColor}" />
+					
+				</ResourceDictionary>
+			</ResourceDictionary.ThemeDictionaries>
+			
+</ResourceDictionary>
+	</Application.Resources>
+
+	<Application.Styles>
+		<FluentTheme />
+		<StyleInclude Source="avares://Avalonia.Themes.Fluent/FluentTheme.xaml"/>
+		<StyleInclude Source="/Assets/DataGridFluentTheme.xaml"/>
+		<StyleInclude Source="/Assets/LibationVectorIcons.xaml"/>
+
+		<Style Selector="TextBox[IsReadOnly=true]">
+			<Setter Property="Background" Value="{DynamicResource SystemControlBackgroundBaseLowBrush}" />
+			<Setter Property="CaretBrush" Value="{DynamicResource SystemControlTransparentBrush}" />
+			<Style Selector="^ /template/ Border#PART_BorderElement">
+				<Setter Property="Background" Value="{DynamicResource SystemControlBackgroundBaseLowBrush}" />
+			</Style>
+		</Style>
 	</Application.Styles>
 </Application>

Source/LibationAvalonia/App.axaml.cs

@@ -11,17 +11,20 @@ using System.Threading.Tasks;
 using System.Collections.Generic;
 using System.IO;
 using ApplicationServices;
-using Dinah.Core;
+using Avalonia.Controls;
+using Avalonia.Styling;
 
 namespace LibationAvalonia
 {
 	public class App : Application
 	{
+		public static Window MainWindow { get;private set; }
 		public static IBrush ProcessQueueBookFailedBrush { get; private set; }
 		public static IBrush ProcessQueueBookCompletedBrush { get; private set; }
 		public static IBrush ProcessQueueBookCancelledBrush { get; private set; }
 		public static IBrush ProcessQueueBookDefaultBrush { get; private set; }
 		public static IBrush SeriesEntryGridBackgroundBrush { get; private set; }
+		public static IBrush HyperlinkVisited { get; private set; }
 
 		public static IAssetLoader AssetLoader { get; private set; }
 
@@ -53,11 +56,11 @@ 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)
 					{
-						LibraryTask = Task.Run(() => DbContexts.GetLibrary_Flat_NoTracking(includeParents: true));
+						LibraryTask = Task.Run(() => DbContexts.GetLibrary_Flat_NoTracking(includeParents: true));						
 						ShowMainWindow(desktop);
 					}
 					else
@@ -86,7 +89,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 +181,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);
@@ -213,8 +216,12 @@ namespace LibationAvalonia
 
 		private static void ShowMainWindow(IClassicDesktopStyleApplicationLifetime desktop)
 		{
+			Current.RequestedThemeVariant = Configuration.Instance.GetString(propertyName: nameof(ThemeVariant)) is "Dark" ? ThemeVariant.Dark : ThemeVariant.Light;
+
+			//Reload colors for current theme
+			LoadStyles();
 			var mainWindow = new MainWindow();
-			desktop.MainWindow = mainWindow;
+			desktop.MainWindow = MainWindow = mainWindow;
 			mainWindow.RestoreSizeAndLocation(Configuration.Instance);
 			mainWindow.OnLoad();
 			mainWindow.OnLibraryLoaded(LibraryTask.GetAwaiter().GetResult());
@@ -226,8 +233,9 @@ namespace LibationAvalonia
 			ProcessQueueBookFailedBrush = AvaloniaUtils.GetBrushFromResources("ProcessQueueBookFailedBrush");
 			ProcessQueueBookCompletedBrush = AvaloniaUtils.GetBrushFromResources("ProcessQueueBookCompletedBrush");
 			ProcessQueueBookCancelledBrush = AvaloniaUtils.GetBrushFromResources("ProcessQueueBookCancelledBrush");
-			ProcessQueueBookDefaultBrush = AvaloniaUtils.GetBrushFromResources("ProcessQueueBookDefaultBrush");
 			SeriesEntryGridBackgroundBrush = AvaloniaUtils.GetBrushFromResources("SeriesEntryGridBackgroundBrush");
+			ProcessQueueBookDefaultBrush = AvaloniaUtils.GetBrushFromResources("ProcessQueueBookDefaultBrush");
+			HyperlinkVisited = AvaloniaUtils.GetBrushFromResources(nameof(HyperlinkVisited));
 		}
 	}
 }

Source/LibationAvalonia/Assets/DataGridFluentTheme.xaml

@@ -0,0 +1,588 @@
+<Styles xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:collections="using:Avalonia.Collections">
+  <Styles.Resources>
+   <ResourceDictionary>
+    <ResourceDictionary.ThemeDictionaries>
+        <ResourceDictionary x:Key="Dark">
+          <SolidColorBrush x:Key="DataGridColumnHeaderForegroundBrush" Color="{DynamicResource SystemBaseMediumColor}" />
+          <SolidColorBrush x:Key="DataGridColumnHeaderBackgroundBrush" Color="{DynamicResource SystemAltHighColor}" />
+          <SolidColorBrush x:Key="DataGridColumnHeaderHoveredBackgroundBrush" Color="{DynamicResource SystemListLowColor}" />
+          <SolidColorBrush x:Key="DataGridColumnHeaderPressedBackgroundBrush" Color="{DynamicResource SystemListMediumColor}" />
+          <SolidColorBrush x:Key="DataGridColumnHeaderDraggedBackgroundBrush" Color="{DynamicResource SystemChromeMediumLowColor}" />
+          <SolidColorBrush x:Key="DataGridRowGroupHeaderBackgroundBrush" Color="{DynamicResource SystemChromeMediumColor}" />
+          <SolidColorBrush x:Key="DataGridRowGroupHeaderPressedBackgroundBrush" Color="{DynamicResource SystemListMediumColor}" />
+          <SolidColorBrush x:Key="DataGridRowGroupHeaderForegroundBrush" Color="{DynamicResource SystemBaseHighColor}" />
+          <SolidColorBrush x:Key="DataGridRowGroupHeaderHoveredBackgroundBrush" Color="{DynamicResource SystemListLowColor}" />
+          <SolidColorBrush x:Key="DataGridRowHoveredBackgroundColor" Color="{DynamicResource SystemListLowColor}" />
+          <SolidColorBrush x:Key="DataGridRowInvalidBrush" Color="{DynamicResource SystemErrorTextColor}" />
+          <SolidColorBrush x:Key="DataGridCellFocusVisualPrimaryBrush" Color="{DynamicResource SystemBaseHighColor}" />
+          <SolidColorBrush x:Key="DataGridCellFocusVisualSecondaryBrush" Color="{DynamicResource SystemAltMediumColor}" />
+          <SolidColorBrush x:Key="DataGridCellInvalidBrush" Color="{DynamicResource SystemErrorTextColor}" />
+          <SolidColorBrush x:Key="DataGridGridLinesBrush" Opacity="0.4" Color="{DynamicResource SystemBaseMediumLowColor}" />
+          <SolidColorBrush x:Key="DataGridDetailsPresenterBackgroundBrush" Color="{DynamicResource SystemChromeMediumLowColor}" />
+
+        </ResourceDictionary>
+        <ResourceDictionary x:Key="Default">
+          <SolidColorBrush x:Key="DataGridColumnHeaderForegroundBrush" Color="{DynamicResource SystemBaseMediumColor}" />
+          <SolidColorBrush x:Key="DataGridColumnHeaderBackgroundBrush" Color="{DynamicResource SystemAltHighColor}" />
+          <SolidColorBrush x:Key="DataGridColumnHeaderHoveredBackgroundBrush" Color="{DynamicResource SystemListLowColor}" />
+          <SolidColorBrush x:Key="DataGridColumnHeaderPressedBackgroundBrush" Color="{DynamicResource SystemListMediumColor}" />
+          <SolidColorBrush x:Key="DataGridColumnHeaderDraggedBackgroundBrush" Color="{DynamicResource SystemChromeMediumLowColor}" />
+          <SolidColorBrush x:Key="DataGridRowGroupHeaderBackgroundBrush" Color="{DynamicResource SystemChromeMediumColor}" />
+          <SolidColorBrush x:Key="DataGridRowGroupHeaderPressedBackgroundBrush" Color="{DynamicResource SystemListMediumColor}" />
+          <SolidColorBrush x:Key="DataGridRowGroupHeaderForegroundBrush" Color="{DynamicResource SystemBaseHighColor}" />
+          <SolidColorBrush x:Key="DataGridRowGroupHeaderHoveredBackgroundBrush" Color="{DynamicResource SystemListLowColor}" />
+          <SolidColorBrush x:Key="DataGridRowHoveredBackgroundColor" Color="{DynamicResource SystemListLowColor}" />
+          <SolidColorBrush x:Key="DataGridRowInvalidBrush" Color="{DynamicResource SystemErrorTextColor}" />
+          <SolidColorBrush x:Key="DataGridCellFocusVisualPrimaryBrush" Color="{DynamicResource SystemBaseHighColor}" />
+          <SolidColorBrush x:Key="DataGridCellFocusVisualSecondaryBrush" Color="{DynamicResource SystemAltMediumColor}" />
+          <SolidColorBrush x:Key="DataGridCellInvalidBrush" Color="{DynamicResource SystemErrorTextColor}" />
+          <SolidColorBrush x:Key="DataGridGridLinesBrush" Opacity="0.4" Color="{DynamicResource SystemBaseMediumLowColor}" />
+          <SolidColorBrush x:Key="DataGridDetailsPresenterBackgroundBrush" Color="{DynamicResource SystemChromeMediumLowColor}" />
+
+        </ResourceDictionary>
+    </ResourceDictionary.ThemeDictionaries>
+    
+    <x:Double x:Key="ListAccentLowOpacity">0.6</x:Double>
+    <x:Double x:Key="ListAccentMediumOpacity">0.8</x:Double>
+
+    <StreamGeometry x:Key="DataGridSortIconDescendingPath">M1875 1011l-787 787v-1798h-128v1798l-787 -787l-90 90l941 941l941 -941z</StreamGeometry>
+    <StreamGeometry x:Key="DataGridSortIconAscendingPath">M1965 947l-941 -941l-941 941l90 90l787 -787v1798h128v-1798l787 787z</StreamGeometry>
+    <StreamGeometry x:Key="DataGridRowGroupHeaderIconClosedPath">M515 93l930 931l-930 931l90 90l1022 -1021l-1022 -1021z</StreamGeometry>
+    <StreamGeometry x:Key="DataGridRowGroupHeaderIconOpenedPath">M109 486 19 576 1024 1581 2029 576 1939 486 1024 1401z</StreamGeometry>
+
+    <StaticResource x:Key="DataGridRowBackgroundBrush" ResourceKey="SystemControlTransparentBrush" />
+    <SolidColorBrush x:Key="DataGridRowSelectedBackgroundBrush" Color="{DynamicResource SystemAccentColor}" />
+    <StaticResource x:Key="DataGridRowSelectedBackgroundOpacity" ResourceKey="ListAccentLowOpacity" />
+    <SolidColorBrush x:Key="DataGridRowSelectedHoveredBackgroundBrush" Color="{DynamicResource SystemAccentColor}" />
+    <StaticResource x:Key="DataGridRowSelectedHoveredBackgroundOpacity" ResourceKey="ListAccentMediumOpacity" />
+    <SolidColorBrush x:Key="DataGridRowSelectedUnfocusedBackgroundBrush" Color="{DynamicResource SystemAccentColor}" />
+    <StaticResource x:Key="DataGridRowSelectedUnfocusedBackgroundOpacity" ResourceKey="ListAccentLowOpacity" />
+    <SolidColorBrush x:Key="DataGridRowSelectedHoveredUnfocusedBackgroundBrush" Color="{DynamicResource SystemAccentColor}" />
+    <StaticResource x:Key="DataGridRowSelectedHoveredUnfocusedBackgroundOpacity" ResourceKey="ListAccentMediumOpacity" />
+    <StaticResource x:Key="DataGridCellBackgroundBrush" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="DataGridCurrencyVisualPrimaryBrush" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="DataGridFillerColumnGridLinesBrush" ResourceKey="SystemControlTransparentBrush" />
+
+    <ControlTheme x:Key="DataGridCellTextBlockTheme" TargetType="TextBlock">
+      <Setter Property="Margin" Value="12,0,12,0" />
+      <Setter Property="VerticalAlignment" Value="Center" />
+    </ControlTheme>
+    <ControlTheme x:Key="DataGridCellTextBoxTheme" TargetType="TextBox" BasedOn="{StaticResource {x:Type TextBox}}">
+      <Setter Property="VerticalAlignment" Value="Stretch" />
+      <Setter Property="Background" Value="Transparent" />
+      <Style Selector="^ /template/ DataValidationErrors">
+        <Setter Property="Theme" Value="{StaticResource TooltipDataValidationErrors}" />
+      </Style>
+    </ControlTheme>
+
+    <ControlTheme x:Key="{x:Type DataGridCell}" TargetType="DataGridCell">
+      <Setter Property="Background" Value="{DynamicResource DataGridCellBackgroundBrush}" />
+      <Setter Property="HorizontalContentAlignment" Value="Stretch" />
+      <Setter Property="VerticalContentAlignment" Value="Stretch" />
+      <Setter Property="FontSize" Value="15" />
+      <Setter Property="MinHeight" Value="32" />
+      <Setter Property="Focusable" Value="False" />
+      <Setter Property="Template">
+        <ControlTemplate>
+          <Border x:Name="CellBorder"
+                  Background="{TemplateBinding Background}"
+                  BorderBrush="{TemplateBinding BorderBrush}"
+                  BorderThickness="{TemplateBinding BorderThickness}"
+                  CornerRadius="{TemplateBinding CornerRadius}">
+            <Grid x:Name="PART_CellRoot" ColumnDefinitions="*,Auto">
+
+              <Rectangle x:Name="CurrencyVisual"
+                         IsVisible="False"
+                         HorizontalAlignment="Stretch"
+                         VerticalAlignment="Stretch"
+                         Fill="Transparent"
+                         IsHitTestVisible="False"
+                         Stroke="{DynamicResource DataGridCurrencyVisualPrimaryBrush}"
+                         StrokeThickness="1" />
+              <Grid Grid.Column="0" x:Name="FocusVisual" IsHitTestVisible="False"
+                    IsVisible="False">
+                <Rectangle HorizontalAlignment="Stretch"
+                           VerticalAlignment="Stretch"
+                           Fill="Transparent"
+                           IsHitTestVisible="False"
+                           Stroke="{DynamicResource DataGridCellFocusVisualPrimaryBrush}"
+                           StrokeThickness="2" />
+                <Rectangle Margin="2"
+                           HorizontalAlignment="Stretch"
+                           VerticalAlignment="Stretch"
+                           Fill="Transparent"
+                           IsHitTestVisible="False"
+                           Stroke="{DynamicResource DataGridCellFocusVisualSecondaryBrush}"
+                           StrokeThickness="1" />
+              </Grid>
+
+              <ContentPresenter Grid.Column="0" Margin="{TemplateBinding Padding}"
+                                HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                Content="{TemplateBinding Content}"
+                                ContentTemplate="{TemplateBinding ContentTemplate}"
+                                Foreground="{TemplateBinding Foreground}" />
+
+              <Rectangle Grid.Column="0" x:Name="InvalidVisualElement"
+                         IsVisible="False"
+                         HorizontalAlignment="Stretch"
+                         VerticalAlignment="Stretch"
+                         IsHitTestVisible="False"
+                         Stroke="{DynamicResource DataGridCellInvalidBrush}"
+                         StrokeThickness="1" />
+
+              <Rectangle Name="PART_RightGridLine"
+                         Grid.Column="1"
+                         Width="1"
+                         VerticalAlignment="Stretch"
+                         Fill="{DynamicResource DataGridFillerColumnGridLinesBrush}" />
+            </Grid>
+          </Border>
+        </ControlTemplate>
+      </Setter>
+      <Style Selector="^:current /template/ Rectangle#CurrencyVisual">
+        <Setter Property="IsVisible" Value="True" />
+      </Style>
+      <Style Selector="^:focus /template/ Grid#FocusVisual">
+        <Setter Property="IsVisible" Value="True" />
+      </Style>
+      <Style Selector="^:invalid /template/ Rectangle#InvalidVisualElement">
+        <Setter Property="IsVisible" Value="True" />
+      </Style>
+    </ControlTheme>
+
+    <ControlTheme x:Key="{x:Type DataGridColumnHeader}" TargetType="DataGridColumnHeader">
+      <Setter Property="Foreground" Value="{DynamicResource DataGridColumnHeaderForegroundBrush}" />
+      <Setter Property="Background" Value="{DynamicResource DataGridColumnHeaderBackgroundBrush}" />
+      <Setter Property="HorizontalContentAlignment" Value="Stretch" />
+      <Setter Property="VerticalContentAlignment" Value="Center" />
+      <Setter Property="Focusable" Value="False" />
+      <Setter Property="SeparatorBrush" Value="{DynamicResource DataGridGridLinesBrush}" />
+      <Setter Property="Padding" Value="8,0,0,0" />
+      <Setter Property="FontSize" Value="12" />
+      <Setter Property="MinHeight" Value="32" />
+      <Setter Property="Template">
+        <ControlTemplate>
+          <Border x:Name="HeaderBorder"
+                  Background="{TemplateBinding Background}"
+                  BorderBrush="{TemplateBinding BorderBrush}"
+                  BorderThickness="{TemplateBinding BorderThickness}"
+                  CornerRadius="{TemplateBinding CornerRadius}">
+            <Grid Name="PART_ColumnHeaderRoot" ColumnDefinitions="*,Auto">
+
+              <Grid Margin="{TemplateBinding Padding}"
+                    HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                    VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
+                <Grid.ColumnDefinitions>
+                  <ColumnDefinition Width="*" />
+                  <ColumnDefinition Width="16" />
+                </Grid.ColumnDefinitions>
+
+                <ContentPresenter Content="{TemplateBinding Content}"
+                                  ContentTemplate="{TemplateBinding ContentTemplate}" />
+
+                <Path Name="SortIcon"
+                      IsVisible="False"
+                      Grid.Column="1"
+                      Height="12"
+                      HorizontalAlignment="Left"
+                      VerticalAlignment="Center"
+                      Fill="{TemplateBinding Foreground}"
+                      Stretch="Uniform" />
+              </Grid>
+
+              <Rectangle Name="VerticalSeparator"
+                         Grid.Column="1"
+                         Width="1"
+                         VerticalAlignment="Stretch"
+                         Fill="{TemplateBinding SeparatorBrush}"
+                         IsVisible="{TemplateBinding AreSeparatorsVisible}" />
+
+              <Grid x:Name="FocusVisual" IsHitTestVisible="False"
+                    IsVisible="False">
+                <Rectangle x:Name="FocusVisualPrimary"
+                           HorizontalAlignment="Stretch"
+                           VerticalAlignment="Stretch"
+                           Fill="Transparent"
+                           IsHitTestVisible="False"
+                           Stroke="{DynamicResource DataGridCellFocusVisualPrimaryBrush}"
+                           StrokeThickness="2" />
+                <Rectangle x:Name="FocusVisualSecondary"
+                           Margin="2"
+                           HorizontalAlignment="Stretch"
+                           VerticalAlignment="Stretch"
+                           Fill="Transparent"
+                           IsHitTestVisible="False"
+                           Stroke="{DynamicResource DataGridCellFocusVisualSecondaryBrush}"
+                           StrokeThickness="1" />
+              </Grid>
+            </Grid>
+          </Border>
+        </ControlTemplate>
+      </Setter>
+
+      <Style Selector="^:focus-visible /template/ Grid#FocusVisual">
+        <Setter Property="IsVisible" Value="True" />
+      </Style>
+
+      <Style Selector="^:pointerover /template/ Grid#PART_ColumnHeaderRoot">
+        <Setter Property="Background" Value="{DynamicResource DataGridColumnHeaderHoveredBackgroundBrush}" />
+      </Style>
+
+      <Style Selector="^:pressed /template/ Grid#PART_ColumnHeaderRoot">
+        <Setter Property="Background" Value="{DynamicResource DataGridColumnHeaderPressedBackgroundBrush}" />
+      </Style>
+
+      <Style Selector="^:dragIndicator">
+        <Setter Property="Opacity" Value="0.5" />
+      </Style>
+
+      <Style Selector="^:sortascending /template/ Path#SortIcon">
+        <Setter Property="IsVisible" Value="True" />
+        <Setter Property="Data" Value="{StaticResource DataGridSortIconAscendingPath}" />
+      </Style>
+
+      <Style Selector="^:sortdescending /template/ Path#SortIcon">
+        <Setter Property="IsVisible" Value="True" />
+        <Setter Property="Data" Value="{StaticResource DataGridSortIconDescendingPath}" />
+      </Style>
+    </ControlTheme>
+
+    <ControlTheme x:Key="DataGridTopLeftColumnHeader" TargetType="DataGridColumnHeader" BasedOn="{StaticResource {x:Type DataGridColumnHeader}}">
+      <Setter Property="Template">
+        <ControlTemplate>
+          <Grid x:Name="TopLeftHeaderRoot"
+                RowDefinitions="*,*,Auto">
+            <Border Grid.RowSpan="2"
+                    BorderThickness="0,0,1,0"
+                    BorderBrush="{DynamicResource DataGridGridLinesBrush}" />
+            <Rectangle Grid.Row="0" Grid.RowSpan="2"
+                       VerticalAlignment="Bottom"
+                       StrokeThickness="1"
+                       Height="1"
+                       Fill="{DynamicResource DataGridGridLinesBrush}" />
+          </Grid>
+        </ControlTemplate>
+      </Setter>
+    </ControlTheme>
+
+    <ControlTheme x:Key="{x:Type DataGridRowHeader}" TargetType="DataGridRowHeader">
+      <Setter Property="Focusable" Value="False" />
+      <Setter Property="SeparatorBrush" Value="{DynamicResource DataGridGridLinesBrush}" />
+      <Setter Property="AreSeparatorsVisible" Value="False" />
+      <Setter Property="Template">
+        <ControlTemplate>
+          <Grid x:Name="PART_Root"
+                RowDefinitions="*,*,Auto"
+                ColumnDefinitions="Auto,*">
+            <Border Grid.RowSpan="3"
+                    Grid.ColumnSpan="2"
+                    BorderBrush="{TemplateBinding SeparatorBrush}"
+                    BorderThickness="0,0,1,0">
+              <Grid Background="{TemplateBinding Background}">
+                <Rectangle x:Name="RowInvalidVisualElement"
+                           Opacity="0"
+                           Fill="{DynamicResource DataGridRowInvalidBrush}"
+                           Stretch="Fill" />
+                <Rectangle x:Name="BackgroundRectangle"
+                           Fill="{DynamicResource DataGridRowBackgroundBrush}"
+                           Stretch="Fill" />
+              </Grid>
+            </Border>
+            <Rectangle x:Name="HorizontalSeparator"
+                       Grid.Row="2"
+                       Grid.ColumnSpan="2"
+                       Height="1"
+                       Margin="1,0,1,0"
+                       HorizontalAlignment="Stretch"
+                       Fill="{TemplateBinding SeparatorBrush}"
+                       IsVisible="{TemplateBinding AreSeparatorsVisible}" />
+
+            <ContentPresenter Grid.RowSpan="2"
+                              Grid.Column="1"
+                              HorizontalAlignment="Center"
+                              VerticalAlignment="Center"
+                              Content="{TemplateBinding Content}" />
+          </Grid>
+        </ControlTemplate>
+      </Setter>
+    </ControlTheme>
+
+    <ControlTheme x:Key="{x:Type DataGridRow}" TargetType="DataGridRow">
+      <Setter Property="Focusable" Value="False" />
+      <Setter Property="Background" Value="{Binding $parent[DataGrid].RowBackground}" />
+      <Setter Property="Template">
+        <ControlTemplate>
+          <Border x:Name="RowBorder"
+                  Background="{TemplateBinding Background}"
+                  BorderBrush="{TemplateBinding BorderBrush}"
+                  BorderThickness="{TemplateBinding BorderThickness}"
+                  CornerRadius="{TemplateBinding CornerRadius}">
+            <DataGridFrozenGrid Name="PART_Root"
+                                ColumnDefinitions="Auto,*"
+                                RowDefinitions="*,Auto,Auto">
+
+              <Rectangle Name="BackgroundRectangle"
+                         Fill="{DynamicResource DataGridRowBackgroundBrush}"
+                         Grid.RowSpan="2"
+                         Grid.ColumnSpan="2" />
+              <Rectangle x:Name="InvalidVisualElement"
+                         Opacity="0"
+                         Grid.ColumnSpan="2"
+                         Fill="{DynamicResource DataGridRowInvalidBrush}" />
+
+              <DataGridRowHeader Name="PART_RowHeader"
+                                 Grid.RowSpan="3"
+                                 DataGridFrozenGrid.IsFrozen="True" />
+              <DataGridCellsPresenter Name="PART_CellsPresenter"
+                                      Grid.Column="1"
+                                      DataGridFrozenGrid.IsFrozen="True" />
+              <DataGridDetailsPresenter Name="PART_DetailsPresenter"
+                                        Grid.Row="1"
+                                        Grid.Column="1"
+                                        Background="{DynamicResource DataGridDetailsPresenterBackgroundBrush}" />
+              <Rectangle Name="PART_BottomGridLine"
+                         Grid.Row="2"
+                         Grid.Column="1"
+                         Height="1"
+                         HorizontalAlignment="Stretch" />
+
+            </DataGridFrozenGrid>
+          </Border>
+        </ControlTemplate>
+      </Setter>
+
+      <Style Selector="^:invalid">
+        <Style Selector="^ /template/ Rectangle#InvalidVisualElement">
+          <Setter Property="Opacity" Value="0.4" />
+        </Style>
+        <Style Selector="^ /template/ Rectangle#BackgroundRectangle">
+          <Setter Property="Opacity" Value="0" />
+        </Style>
+      </Style>
+
+      <Style Selector="^:pointerover /template/ Rectangle#BackgroundRectangle">
+        <Setter Property="Fill" Value="{DynamicResource DataGridRowHoveredBackgroundColor}" />
+      </Style>
+
+      <Style Selector="^:selected">
+        <Style Selector="^ /template/ Rectangle#BackgroundRectangle">
+          <Setter Property="Fill" Value="{DynamicResource DataGridRowSelectedUnfocusedBackgroundBrush}" />
+          <Setter Property="Opacity" Value="{DynamicResource DataGridRowSelectedUnfocusedBackgroundOpacity}" />
+        </Style>
+        <Style Selector="^:pointerover /template/ Rectangle#BackgroundRectangle">
+          <Setter Property="Fill" Value="{DynamicResource DataGridRowSelectedHoveredUnfocusedBackgroundBrush}" />
+          <Setter Property="Opacity" Value="{DynamicResource DataGridRowSelectedHoveredUnfocusedBackgroundOpacity}" />
+        </Style>
+        <Style Selector="^:focus /template/ Rectangle#BackgroundRectangle">
+          <Setter Property="Fill" Value="{DynamicResource DataGridRowSelectedBackgroundBrush}" />
+          <Setter Property="Opacity" Value="{DynamicResource DataGridRowSelectedBackgroundOpacity}" />
+        </Style>
+        <Style Selector="^:pointerover:focus /template/ Rectangle#BackgroundRectangle">
+          <Setter Property="Fill" Value="{DynamicResource DataGridRowSelectedHoveredBackgroundBrush}" />
+          <Setter Property="Opacity" Value="{DynamicResource DataGridRowSelectedHoveredBackgroundOpacity}" />
+        </Style>
+      </Style>
+    </ControlTheme>
+
+    <ControlTheme x:Key="FluentDataGridRowGroupExpanderButtonTheme" TargetType="ToggleButton">
+      <Setter Property="Template">
+        <ControlTemplate>
+          <Border Width="12"
+                  Height="12"
+                  Background="Transparent"
+                  HorizontalAlignment="Center"
+                  VerticalAlignment="Center">
+            <Path Fill="{TemplateBinding Foreground}"
+                  Data="{StaticResource DataGridRowGroupHeaderIconClosedPath}"
+                  HorizontalAlignment="Right"
+                  VerticalAlignment="Center"
+                  Stretch="Uniform" />
+          </Border>
+        </ControlTemplate>
+      </Setter>
+      <Style Selector="^:checked /template/ Path">
+        <Setter Property="Data" Value="{StaticResource DataGridRowGroupHeaderIconOpenedPath}" />
+      </Style>
+    </ControlTheme>
+
+    <ControlTheme x:Key="{x:Type DataGridRowGroupHeader}" TargetType="DataGridRowGroupHeader">
+      <Setter Property="Focusable" Value="False" />
+      <Setter Property="Foreground" Value="{DynamicResource DataGridRowGroupHeaderForegroundBrush}" />
+      <Setter Property="Background" Value="{DynamicResource DataGridRowGroupHeaderBackgroundBrush}" />
+      <Setter Property="FontSize" Value="15" />
+      <Setter Property="MinHeight" Value="32" />
+      <Setter Property="Template">
+        <ControlTemplate x:DataType="collections:DataGridCollectionViewGroup">
+          <DataGridFrozenGrid Name="PART_Root"
+                              Background="{TemplateBinding Background}"
+                              MinHeight="{TemplateBinding MinHeight}"
+                              ColumnDefinitions="Auto,Auto,Auto,Auto,*"
+                              RowDefinitions="*,Auto">
+
+            <Rectangle Name="PART_IndentSpacer"
+                       Grid.Column="1" />
+            <ToggleButton Name="PART_ExpanderButton"
+                          Grid.Column="2"
+                          Width="12"
+                          Height="12"
+                          Margin="12,0,0,0"
+                          Theme="{StaticResource FluentDataGridRowGroupExpanderButtonTheme}"
+                          BorderBrush="{TemplateBinding BorderBrush}"
+                          BorderThickness="{TemplateBinding BorderThickness}"
+                          Background="{TemplateBinding Background}"
+                          CornerRadius="{TemplateBinding CornerRadius}"
+                          Focusable="False"
+                          Foreground="{TemplateBinding Foreground}" />
+
+            <StackPanel Grid.Column="3"
+                        Orientation="Horizontal"
+                        VerticalAlignment="Center"
+                        Margin="12,0,0,0">
+              <TextBlock Name="PART_PropertyNameElement"
+                         Margin="4,0,0,0"
+                         IsVisible="{TemplateBinding IsPropertyNameVisible}"
+                         Foreground="{TemplateBinding Foreground}" />
+              <TextBlock Margin="4,0,0,0"
+                         Text="{Binding Key}"
+                         Foreground="{TemplateBinding Foreground}" />
+              <TextBlock Name="PART_ItemCountElement"
+                         Margin="4,0,0,0"
+                         IsVisible="{TemplateBinding IsItemCountVisible}"
+                         Foreground="{TemplateBinding Foreground}" />
+            </StackPanel>
+
+            <Rectangle x:Name="CurrencyVisual"
+                       Grid.ColumnSpan="5"
+                       IsVisible="False"
+                       HorizontalAlignment="Stretch"
+                       VerticalAlignment="Stretch"
+                       Fill="Transparent"
+                       IsHitTestVisible="False"
+                       Stroke="{DynamicResource DataGridCurrencyVisualPrimaryBrush}"
+                       StrokeThickness="1" />
+            <Grid x:Name="FocusVisual"
+                  Grid.ColumnSpan="5"
+                  IsVisible="False"
+                  IsHitTestVisible="False">
+              <Rectangle HorizontalAlignment="Stretch"
+                         VerticalAlignment="Stretch"
+                         Fill="Transparent"
+                         IsHitTestVisible="False"
+                         Stroke="{DynamicResource DataGridCellFocusVisualPrimaryBrush}"
+                         StrokeThickness="2" />
+              <Rectangle Margin="2"
+                         HorizontalAlignment="Stretch"
+                         VerticalAlignment="Stretch"
+                         Fill="Transparent"
+                         IsHitTestVisible="False"
+                         Stroke="{DynamicResource DataGridCellFocusVisualSecondaryBrush}"
+                         StrokeThickness="1" />
+            </Grid>
+
+            <DataGridRowHeader Name="PART_RowHeader"
+                               Grid.RowSpan="2"
+                               DataGridFrozenGrid.IsFrozen="True" />
+
+            <Rectangle x:Name="PART_BottomGridLine"
+                       Grid.Row="1"
+                       Grid.ColumnSpan="5"
+                       Height="1" />
+          </DataGridFrozenGrid>
+        </ControlTemplate>
+      </Setter>
+    </ControlTheme>
+
+    <ControlTheme x:Key="{x:Type DataGrid}" TargetType="DataGrid">
+      <Setter Property="RowBackground" Value="Transparent" />
+      <Setter Property="HeadersVisibility" Value="Column" />
+      <Setter Property="HorizontalScrollBarVisibility" Value="Auto" />
+      <Setter Property="VerticalScrollBarVisibility" Value="Auto" />
+      <Setter Property="SelectionMode" Value="Extended" />
+      <Setter Property="GridLinesVisibility" Value="None" />
+      <Setter Property="HorizontalGridLinesBrush" Value="{DynamicResource DataGridGridLinesBrush}" />
+      <Setter Property="VerticalGridLinesBrush" Value="{DynamicResource DataGridGridLinesBrush}" />
+      <Setter Property="DropLocationIndicatorTemplate">
+        <Template>
+          <Rectangle Fill="{DynamicResource DataGridDropLocationIndicatorBackground}"
+                     Width="2" />
+        </Template>
+      </Setter>
+      <Setter Property="Template">
+        <ControlTemplate>
+          <Border x:Name="DataGridBorder"
+                  Background="{TemplateBinding Background}"
+                  BorderBrush="{TemplateBinding BorderBrush}"
+                  BorderThickness="{TemplateBinding BorderThickness}"
+                  CornerRadius="{TemplateBinding CornerRadius}">
+            <Grid ColumnDefinitions="Auto,*,Auto" 
+                  RowDefinitions="Auto,*,Auto,Auto"
+                  ClipToBounds="True">
+              <DataGridColumnHeader Name="PART_TopLeftCornerHeader"
+                                    Theme="{StaticResource DataGridTopLeftColumnHeader}" />
+              <DataGridColumnHeadersPresenter Name="PART_ColumnHeadersPresenter"
+                                              Grid.Column="1"
+                                              Grid.Row="0" Grid.ColumnSpan="2" />
+              <Rectangle Name="PART_ColumnHeadersAndRowsSeparator"
+                         Grid.Row="0" Grid.ColumnSpan="3" Grid.Column="0"
+                         VerticalAlignment="Bottom"
+                         Height="1"
+                         Fill="{DynamicResource DataGridGridLinesBrush}" />
+
+              <DataGridRowsPresenter Name="PART_RowsPresenter"
+                                     Grid.Row="1"
+                                     Grid.RowSpan="2"
+                                     Grid.ColumnSpan="3" Grid.Column="0">
+                <DataGridRowsPresenter.GestureRecognizers>
+                  <ScrollGestureRecognizer CanHorizontallyScroll="True" CanVerticallyScroll="True" />
+                </DataGridRowsPresenter.GestureRecognizers>
+              </DataGridRowsPresenter>
+              <Rectangle Name="PART_BottomRightCorner"
+                         Fill="{DynamicResource DataGridScrollBarsSeparatorBackground}"
+                         Grid.Column="2"
+                         Grid.Row="2" />
+              <ScrollBar Name="PART_VerticalScrollbar"
+                         Orientation="Vertical"
+                         Grid.Column="2"
+                         Grid.Row="1"
+                         Width="{DynamicResource ScrollBarSize}" />
+
+              <Grid Grid.Column="1"
+                    Grid.Row="2"
+                    ColumnDefinitions="Auto,*">
+                <Rectangle Name="PART_FrozenColumnScrollBarSpacer" />
+                <ScrollBar Name="PART_HorizontalScrollbar"
+                           Grid.Column="1"
+                           Orientation="Horizontal"
+                           Height="{DynamicResource ScrollBarSize}" />
+              </Grid>
+              <Border x:Name="PART_DisabledVisualElement"
+                      Grid.ColumnSpan="3" Grid.Column="0"
+                      Grid.Row="0" Grid.RowSpan="4"
+                      IsHitTestVisible="False"
+                      HorizontalAlignment="Stretch"
+                      VerticalAlignment="Stretch"
+                      CornerRadius="2"
+                      Background="{DynamicResource DataGridDisabledVisualElementBackground}"
+                      IsVisible="{Binding !$parent[DataGrid].IsEnabled}" />
+            </Grid>
+          </Border>
+        </ControlTemplate>
+      </Setter>
+
+      <Style Selector="^:empty-columns">
+        <Style Selector="^ /template/ DataGridColumnHeader#PART_TopLeftCornerHeader">
+          <Setter Property="IsVisible" Value="False" />
+        </Style>
+        <Style Selector="^ /template/ DataGridColumnHeadersPresenter#PART_ColumnHeadersPresenter">
+          <Setter Property="IsVisible" Value="False" />
+        </Style>
+        <Style Selector="^ /template/ Rectangle#PART_ColumnHeadersAndRowsSeparator">
+          <Setter Property="IsVisible" Value="False" />
+        </Style>
+      </Style>
+    </ControlTheme>
+   </ResourceDictionary>
+  </Styles.Resources>
+</Styles>

Source/LibationAvalonia/Assets/DataGridTheme.xaml

@@ -1,658 +0,0 @@
-<Styles xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-  <Styles.Resources>
-    <x:Double x:Key="ListAccentLowOpacity">0.6</x:Double>
-    <x:Double x:Key="ListAccentMediumOpacity">0.8</x:Double>
-    <Thickness x:Key="DataGridTextColumnCellTextBlockMargin">12,0,12,0</Thickness>
-
-    <StreamGeometry x:Key="DataGridSortIconDescendingPath">M1875 1011l-787 787v-1798h-128v1798l-787 -787l-90 90l941 941l941 -941z</StreamGeometry>
-    <StreamGeometry x:Key="DataGridRowGroupHeaderIconClosedPath">M515 93l930 931l-930 931l90 90l1022 -1021l-1022 -1021z</StreamGeometry>
-    <StreamGeometry x:Key="DataGridRowGroupHeaderIconOpenedPath">M1939 1581l90 -90l-1005 -1005l-1005 1005l90 90l915 -915z</StreamGeometry>
-
-    <SolidColorBrush x:Key="DataGridColumnHeaderForegroundBrush" Color="{DynamicResource SystemBaseMediumColor}" />
-    <SolidColorBrush x:Key="DataGridColumnHeaderBackgroundBrush" Color="{DynamicResource SystemAltHighColor}" />
-    <SolidColorBrush x:Key="DataGridColumnHeaderHoveredBackgroundBrush" Color="{DynamicResource SystemListLowColor}" />
-    <SolidColorBrush x:Key="DataGridColumnHeaderPressedBackgroundBrush" Color="{DynamicResource SystemListMediumColor}" />
-    <SolidColorBrush x:Key="DataGridColumnHeaderDraggedBackgroundBrush" Color="{DynamicResource SystemChromeMediumLowColor}" />
-
-    <SolidColorBrush x:Key="DataGridRowGroupHeaderBackgroundBrush" Color="{DynamicResource SystemChromeMediumColor}" />
-    <SolidColorBrush x:Key="DataGridRowGroupHeaderPressedBackgroundBrush" Color="{DynamicResource SystemListMediumColor}" />
-    <SolidColorBrush x:Key="DataGridRowGroupHeaderForegroundBrush" Color="{DynamicResource SystemBaseHighColor}" />
-    <SolidColorBrush x:Key="DataGridRowGroupHeaderHoveredBackgroundBrush" Color="{DynamicResource SystemListLowColor}" />
-
-    <StaticResource x:Key="DataGridRowBackgroundBrush" ResourceKey="SystemControlTransparentBrush" />
-    <SolidColorBrush x:Key="DataGridRowSelectedBackgroundBrush" Color="{DynamicResource SystemAccentColor}" />
-    <StaticResource x:Key="DataGridRowSelectedBackgroundOpacity" ResourceKey="ListAccentLowOpacity" />
-    <SolidColorBrush x:Key="DataGridRowSelectedHoveredBackgroundBrush" Color="{DynamicResource SystemAccentColor}" />
-    <StaticResource x:Key="DataGridRowSelectedHoveredBackgroundOpacity" ResourceKey="ListAccentMediumOpacity" />
-    <SolidColorBrush x:Key="DataGridRowSelectedUnfocusedBackgroundBrush" Color="{DynamicResource SystemAccentColor}" />
-    <StaticResource x:Key="DataGridRowSelectedUnfocusedBackgroundOpacity" ResourceKey="ListAccentLowOpacity" />
-    <SolidColorBrush x:Key="DataGridRowSelectedHoveredUnfocusedBackgroundBrush" Color="{DynamicResource SystemAccentColor}" />
-    <StaticResource x:Key="DataGridRowSelectedHoveredUnfocusedBackgroundOpacity" ResourceKey="ListAccentMediumOpacity" />
-    <SolidColorBrush x:Key="DataGridRowHoveredBackgroundColor" Color="{DynamicResource SystemListLowColor}" />
-    <SolidColorBrush x:Key="DataGridRowInvalidBrush" Color="{DynamicResource SystemErrorTextColor}" />
-
-    <SolidColorBrush x:Key="DataGridRowHeaderForegroundBrush" Color="{DynamicResource SystemBaseMediumColor}" />
-    <SolidColorBrush x:Key="DataGridRowHeaderBackgroundBrush" Color="{DynamicResource SystemAltHighColor}" />
-
-    <StaticResource x:Key="DataGridCellBackgroundBrush" ResourceKey="SystemControlTransparentBrush" />
-    <SolidColorBrush x:Key="DataGridCellFocusVisualPrimaryBrush" Color="{DynamicResource SystemBaseHighColor}" />
-    <SolidColorBrush x:Key="DataGridCellFocusVisualSecondaryBrush" Color="{DynamicResource SystemAltMediumColor}" />
-    <SolidColorBrush x:Key="DataGridCellInvalidBrush" Color="{DynamicResource SystemErrorTextColor}" />
-
-    <SolidColorBrush x:Key="DataGridGridLinesBrush"
-                     Opacity="0.4"
-                     Color="{DynamicResource SystemBaseMediumLowColor}" />
-    <StaticResource x:Key="DataGridCurrencyVisualPrimaryBrush" ResourceKey="SystemControlTransparentBrush" />
-    <SolidColorBrush x:Key="DataGridDetailsPresenterBackgroundBrush" Color="{DynamicResource SystemChromeMediumLowColor}" />
-    <StaticResource x:Key="DataGridFillerColumnGridLinesBrush" ResourceKey="SystemControlTransparentBrush" />
-  </Styles.Resources>
-
-  <Style Selector="DataGridCell">
-    <Setter Property="Background" Value="{DynamicResource DataGridCellBackgroundBrush}" />
-    <Setter Property="HorizontalContentAlignment" Value="Stretch" />
-    <Setter Property="VerticalContentAlignment" Value="Stretch" />
-    <Setter Property="FontSize" Value="12" />
-    <Setter Property="MinHeight" Value="32" />
-    <Setter Property="Focusable" Value="False" />
-    <Setter Property="Template">
-      <ControlTemplate>
-        <Border x:Name="CellBorder"
-                Background="{TemplateBinding Background}"
-                BorderBrush="{TemplateBinding BorderBrush}"
-                BorderThickness="{TemplateBinding BorderThickness}"
-                CornerRadius="{TemplateBinding CornerRadius}">
-          <Grid x:Name="PART_CellRoot" ColumnDefinitions="*,Auto">
-
-            <Rectangle x:Name="CurrencyVisual"
-                       HorizontalAlignment="Stretch"
-                       VerticalAlignment="Stretch"
-                       Fill="Transparent"
-                       IsHitTestVisible="False"
-                       Stroke="{DynamicResource DataGridCurrencyVisualPrimaryBrush}"
-                       StrokeThickness="1" />
-            <Grid x:Name="FocusVisual" IsHitTestVisible="False">
-              <Rectangle HorizontalAlignment="Stretch"
-                         VerticalAlignment="Stretch"
-                         Fill="Transparent"
-                         IsHitTestVisible="False"
-                         Stroke="{DynamicResource DataGridCellFocusVisualPrimaryBrush}"
-                         StrokeThickness="2" />
-              <Rectangle Margin="2"
-                         HorizontalAlignment="Stretch"
-                         VerticalAlignment="Stretch"
-                         Fill="Transparent"
-                         IsHitTestVisible="False"
-                         Stroke="{DynamicResource DataGridCellFocusVisualSecondaryBrush}"
-                         StrokeThickness="1" />
-				
-            </Grid>
-
-            <ContentPresenter Margin="{TemplateBinding Padding}"
-                              HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                              VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                              Content="{TemplateBinding Content}"
-                              ContentTemplate="{TemplateBinding ContentTemplate}"/>
-
-            <Rectangle x:Name="InvalidVisualElement"
-                       HorizontalAlignment="Stretch"
-                       VerticalAlignment="Stretch"
-                       IsHitTestVisible="False"
-                       Stroke="{DynamicResource DataGridCellInvalidBrush}"
-                       StrokeThickness="1" />
-
-            <Rectangle Name="PART_RightGridLine"
-                       Grid.Column="1"
-                       Width="1"
-                       VerticalAlignment="Stretch"
-                       Fill="{DynamicResource DataGridFillerColumnGridLinesBrush}" />
-          </Grid>
-        </Border>
-      </ControlTemplate>
-    </Setter>
-  </Style>
-
-  <Style Selector="DataGridCell > TextBlock#CellTextBlock">
-    <Setter Property="Margin" Value="{DynamicResource DataGridTextColumnCellTextBlockMargin}" />
-    <Setter Property="VerticalAlignment" Value="Center" />
-  </Style>
-  
-  <Style Selector="DataGridCell /template/ Rectangle#CurrencyVisual">
-    <Setter Property="IsVisible" Value="False" />
-  </Style>
-  <Style Selector="DataGridCell /template/ Grid#FocusVisual">
-    <Setter Property="IsVisible" Value="False" />
-  </Style>
-  <Style Selector="DataGridCell:current /template/ Rectangle#CurrencyVisual">
-    <Setter Property="IsVisible" Value="True" />
-  </Style>
-  <Style Selector="DataGrid:focus DataGridCell:current /template/ Grid#FocusVisual">
-    <Setter Property="IsVisible" Value="True" />
-  </Style>
-  <Style Selector="DataGridCell /template/ Rectangle#InvalidVisualElement">
-    <Setter Property="IsVisible" Value="False" />
-  </Style>
-  <Style Selector="DataGridCell:invalid /template/ Rectangle#InvalidVisualElement">
-    <Setter Property="IsVisible" Value="True" />
-  </Style>
-  <Style Selector="DataGridCell > TextBox DataValidationErrors">
-    <Setter Property="Template" Value="{DynamicResource TooltipDataValidationContentTemplate}" />
-    <Setter Property="ErrorTemplate" Value="{DynamicResource TooltipDataValidationErrorTemplate}" />
-  </Style>
-
-  <Style Selector="DataGridColumnHeader">
-    <Setter Property="Foreground" Value="{DynamicResource DataGridColumnHeaderForegroundBrush}" />
-    <Setter Property="Background" Value="{DynamicResource DataGridColumnHeaderBackgroundBrush}" />
-    <Setter Property="HorizontalContentAlignment" Value="Stretch" />
-    <Setter Property="VerticalContentAlignment" Value="Center" />
-    <Setter Property="Focusable" Value="False" />
-    <Setter Property="SeparatorBrush" Value="{DynamicResource DataGridGridLinesBrush}" />
-    <Setter Property="Padding" Value="6,0,0,0" />
-    <Setter Property="FontSize" Value="12" />
-    <Setter Property="MinHeight" Value="40" />
-    <Setter Property="Template">
-      <ControlTemplate>
-        <Border x:Name="HeaderBorder"
-                Background="{TemplateBinding Background}"
-                BorderBrush="{TemplateBinding BorderBrush}"
-                BorderThickness="{TemplateBinding BorderThickness}"
-                CornerRadius="{TemplateBinding CornerRadius}">
-          <Grid Name="PART_ColumnHeaderRoot" ColumnDefinitions="*,Auto">
-
-            <Grid Grid.Column="0" Margin="{TemplateBinding Padding}"
-                  HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                  VerticalAlignment="{TemplateBinding VerticalContentAlignment}" ColumnDefinitions="*,12">
- 
-              <ContentPresenter Grid.Column="0"			  
-                    HorizontalAlignment="Left"
-                    VerticalAlignment="Center"
-					Content="{TemplateBinding Content}"
-					ContentTemplate="{TemplateBinding ContentTemplate}" />
-
-              <Path Name="SortIcon"
-                    Grid.Column="1"
-                    Height="12"
-                    Width="8"
-                    HorizontalAlignment="Right"
-                    VerticalAlignment="Center"
-                    Fill="{TemplateBinding Foreground}"
-                    Stretch="Uniform"
-                    Margin="0,0,4,0"
-					Data="F1 M -5.215,6.099L 5.215,6.099L 0,0L -5.215,6.099 Z "/>
-            </Grid>
-
-            <Rectangle Name="VerticalSeparator"
-                       Grid.Column="1"
-                       Width="1"
-                       VerticalAlignment="Stretch"
-                       Fill="{TemplateBinding SeparatorBrush}"
-                       IsVisible="{TemplateBinding AreSeparatorsVisible}" />
-
-            <Grid x:Name="FocusVisual" IsHitTestVisible="False">
-              <Rectangle x:Name="FocusVisualPrimary"
-                         HorizontalAlignment="Stretch"
-                         VerticalAlignment="Stretch"
-                         Fill="Transparent"
-                         IsHitTestVisible="False"
-                         Stroke="{DynamicResource DataGridCellFocusVisualPrimaryBrush}"
-                         StrokeThickness="2" />
-              <Rectangle x:Name="FocusVisualSecondary"
-                         Margin="2"
-                         HorizontalAlignment="Stretch"
-                         VerticalAlignment="Stretch"
-                         Fill="Transparent"
-                         IsHitTestVisible="False"
-                         Stroke="{DynamicResource DataGridCellFocusVisualSecondaryBrush}"
-                         StrokeThickness="1" />
-            </Grid>
-          </Grid>
-        </Border>
-      </ControlTemplate>
-    </Setter>
-  </Style>
-
-  <Style Selector="DataGridColumnHeader /template/ Grid#FocusVisual">
-    <Setter Property="IsVisible" Value="False" />
-  </Style>
-  <Style Selector="DataGridColumnHeader:focus-visible /template/ Grid#FocusVisual">
-    <Setter Property="IsVisible" Value="True" />
-  </Style>
-
-  <Style Selector="DataGridColumnHeader:pointerover /template/ Grid#PART_ColumnHeaderRoot">
-    <Setter Property="Background" Value="{DynamicResource DataGridColumnHeaderHoveredBackgroundBrush}" />
-  </Style>
-  <Style Selector="DataGridColumnHeader:pressed /template/ Grid#PART_ColumnHeaderRoot">
-    <Setter Property="Background" Value="{DynamicResource DataGridColumnHeaderPressedBackgroundBrush}" />
-  </Style>
-
-  <Style Selector="DataGridColumnHeader:dragIndicator">
-    <Setter Property="Opacity" Value="0.5" />
-  </Style>
-
-  <Style Selector="DataGridColumnHeader /template/ Path#SortIcon">
-    <Setter Property="IsVisible" Value="False" />
-	<Setter Property="RenderTransform">
-      <Setter.Value>
-        <ScaleTransform ScaleX="0.9" ScaleY="0.9" />
-      </Setter.Value>
-    </Setter>
-  </Style>
-
-  <Style Selector="DataGridColumnHeader:sortascending /template/ Path#SortIcon">
-    <Setter Property="IsVisible" Value="True" />
-  </Style>
-
-  <Style Selector="DataGridColumnHeader:sortdescending /template/ Path#SortIcon">
-    <Setter Property="IsVisible" Value="True" />
-    <Setter Property="RenderTransform">
-      <Setter.Value>
-        <ScaleTransform ScaleX="0.9" ScaleY="-0.9" />
-      </Setter.Value>
-    </Setter>
-  </Style>
-
-  <Style Selector="DataGridRow">
-    <Setter Property="Focusable" Value="False" />
-    <Setter Property="Template">
-      <ControlTemplate>
-        <Border x:Name="RowBorder"
-                Background="{TemplateBinding Background}"
-                BorderBrush="{TemplateBinding BorderBrush}"
-                BorderThickness="{TemplateBinding BorderThickness}"
-                CornerRadius="{TemplateBinding CornerRadius}">
-          <DataGridFrozenGrid Name="PART_Root"
-                              ColumnDefinitions="Auto,*"
-                              RowDefinitions="*,Auto,Auto">
-
-            <Rectangle Name="BackgroundRectangle"
-                       Grid.RowSpan="2"
-                       Grid.ColumnSpan="2" />
-            <Rectangle x:Name="InvalidVisualElement"
-                       Grid.ColumnSpan="2"
-                       Fill="{DynamicResource DataGridRowInvalidBrush}" />
-
-            <DataGridRowHeader Name="PART_RowHeader"
-                               Grid.RowSpan="3"
-                               DataGridFrozenGrid.IsFrozen="True" />
-            <DataGridCellsPresenter Name="PART_CellsPresenter"
-                                    Grid.Column="1"
-                                    DataGridFrozenGrid.IsFrozen="True" />
-            <DataGridDetailsPresenter Name="PART_DetailsPresenter"
-                                      Grid.Row="1"
-                                      Grid.Column="1"
-                                      Background="{DynamicResource DataGridDetailsPresenterBackgroundBrush}" />
-            <Rectangle Name="PART_BottomGridLine"
-                       Grid.Row="2"
-                       Grid.Column="1"
-                       Height="1"
-                       HorizontalAlignment="Stretch" />
-
-          </DataGridFrozenGrid>
-        </Border>
-      </ControlTemplate>
-    </Setter>
-  </Style>
-
-  <Style Selector="DataGridRow">
-    <Setter Property="Background" Value="{Binding $parent[DataGrid].RowBackground}" />
-  </Style>
-  <Style Selector="DataGridRow:nth-child(even)">
-    <Setter Property="Background" Value="{Binding $parent[DataGrid].AlternatingRowBackground}" />
-  </Style>
-
-  <Style Selector="DataGridRow /template/ Rectangle#InvalidVisualElement">
-    <Setter Property="Opacity" Value="0" />
-  </Style>
-  <Style Selector="DataGridRow:invalid /template/ Rectangle#InvalidVisualElement">
-    <Setter Property="Opacity" Value="0.4" />
-  </Style>
-  <Style Selector="DataGridRow:invalid /template/ Rectangle#BackgroundRectangle">
-    <Setter Property="Opacity" Value="0" />
-  </Style>
-
-  <Style Selector="DataGridRow /template/ Rectangle#BackgroundRectangle">
-    <Setter Property="Fill" Value="{DynamicResource DataGridRowBackgroundBrush}" />
-  </Style>
-  <Style Selector="DataGridRow:pointerover /template/ Rectangle#BackgroundRectangle">
-    <Setter Property="Fill" Value="{DynamicResource DataGridRowHoveredBackgroundColor}" />
-  </Style>
-  <Style Selector="DataGridRow:selected /template/ Rectangle#BackgroundRectangle">
-    <Setter Property="Fill" Value="{DynamicResource DataGridRowSelectedUnfocusedBackgroundBrush}" />
-    <Setter Property="Opacity" Value="{DynamicResource DataGridRowSelectedUnfocusedBackgroundOpacity}" />
-  </Style>
-  <Style Selector="DataGridRow:selected:pointerover /template/ Rectangle#BackgroundRectangle">
-    <Setter Property="Fill" Value="{DynamicResource DataGridRowSelectedHoveredUnfocusedBackgroundBrush}" />
-    <Setter Property="Opacity" Value="{DynamicResource DataGridRowSelectedHoveredUnfocusedBackgroundOpacity}" />
-  </Style>
-  <Style Selector="DataGridRow:selected:focus /template/ Rectangle#BackgroundRectangle">
-    <Setter Property="Fill" Value="{DynamicResource DataGridRowSelectedBackgroundBrush}" />
-    <Setter Property="Opacity" Value="{DynamicResource DataGridRowSelectedBackgroundOpacity}" />
-  </Style>
-  <Style Selector="DataGridRow:selected:pointerover:focus /template/ Rectangle#BackgroundRectangle">
-    <Setter Property="Fill" Value="{DynamicResource DataGridRowSelectedHoveredBackgroundBrush}" />
-    <Setter Property="Opacity" Value="{DynamicResource DataGridRowSelectedHoveredBackgroundOpacity}" />
-  </Style>
-
-  <Style Selector="DataGridRowHeader">
-    <Setter Property="Foreground" Value="{DynamicResource DataGridRowHeaderForegroundBrush}" />
-    <Setter Property="Background" Value="{DynamicResource DataGridRowHeaderBackgroundBrush}" />
-    <Setter Property="Focusable" Value="False" />
-    <Setter Property="SeparatorBrush" Value="{DynamicResource DataGridGridLinesBrush}" />
-    <Setter Property="AreSeparatorsVisible" Value="False" />
-    <Setter Property="Template">
-      <ControlTemplate>
-        <Grid x:Name="PART_Root"
-              RowDefinitions="*,*,Auto"
-              ColumnDefinitions="Auto,*">
-          <Border Grid.RowSpan="3"
-                  Grid.ColumnSpan="2"
-                  BorderBrush="{TemplateBinding SeparatorBrush}"
-                  BorderThickness="0,0,1,0">
-            <Grid Background="{TemplateBinding Background}">
-              <Rectangle x:Name="RowInvalidVisualElement"
-                         Fill="{DynamicResource DataGridRowInvalidBrush}"
-                         Stretch="Fill" />
-              <Rectangle x:Name="BackgroundRectangle"
-                         Stretch="Fill" />
-            </Grid>
-          </Border>
-          <Rectangle x:Name="HorizontalSeparator"
-                     Grid.Row="2"
-                     Grid.ColumnSpan="2"
-                     Height="1"
-                     Margin="1,0,1,0"
-                     HorizontalAlignment="Stretch"
-                     Fill="{TemplateBinding SeparatorBrush}"
-                     IsVisible="{TemplateBinding AreSeparatorsVisible}" />
-
-          <ContentPresenter Grid.RowSpan="2"
-                            Grid.Column="1"
-                            HorizontalAlignment="Center"
-                            VerticalAlignment="Center"
-                            Content="{TemplateBinding Content}" />
-        </Grid>
-      </ControlTemplate>
-    </Setter>
-  </Style>
-
-  <Style Selector="DataGridRowHeader /template/ Rectangle#RowInvalidVisualElement">
-    <Setter Property="Opacity" Value="0" />
-  </Style>
-  <Style Selector="DataGridRowHeader:invalid /template/ Rectangle#RowInvalidVisualElement">
-    <Setter Property="Opacity" Value="0.4" />
-  </Style>
-  <Style Selector="DataGridRowHeader:invalid /template/ Rectangle#BackgroundRectangle">
-    <Setter Property="Opacity" Value="0" />
-  </Style>
-
-  <Style Selector="DataGridRowHeader /template/ Rectangle#BackgroundRectangle">
-    <Setter Property="Fill" Value="{DynamicResource DataGridRowBackgroundBrush}" />
-  </Style>
-  <Style Selector="DataGridRow:pointerover DataGridRowHeader /template/ Rectangle#BackgroundRectangle">
-    <Setter Property="Fill" Value="{DynamicResource DataGridRowHoveredBackgroundColor}" />
-  </Style>
-  <Style Selector="DataGridRowHeader:selected /template/ Rectangle#BackgroundRectangle">
-    <Setter Property="Fill" Value="{DynamicResource DataGridRowSelectedUnfocusedBackgroundBrush}" />
-    <Setter Property="Opacity" Value="{DynamicResource DataGridRowSelectedUnfocusedBackgroundOpacity}" />
-  </Style>
-  <Style Selector="DataGridRow:pointerover DataGridRowHeader:selected /template/ Rectangle#BackgroundRectangle">
-    <Setter Property="Fill" Value="{DynamicResource DataGridRowSelectedHoveredUnfocusedBackgroundBrush}" />
-    <Setter Property="Opacity" Value="{DynamicResource DataGridRowSelectedHoveredUnfocusedBackgroundOpacity}" />
-  </Style>
-  <Style Selector="DataGridRowHeader:selected:focus /template/ Rectangle#BackgroundRectangle">
-    <Setter Property="Fill" Value="{DynamicResource DataGridRowSelectedBackgroundBrush}" />
-    <Setter Property="Opacity" Value="{DynamicResource DataGridRowSelectedBackgroundOpacity}" />
-  </Style>
-  <Style Selector="DataGridRow:pointerover DataGridRowHeader:selected:focus /template/ Rectangle#BackgroundRectangle">
-    <Setter Property="Fill" Value="{DynamicResource DataGridRowSelectedHoveredBackgroundBrush}" />
-    <Setter Property="Opacity" Value="{DynamicResource DataGridRowSelectedHoveredBackgroundOpacity}" />
-  </Style>
-
-  <Style Selector="DataGridRowGroupHeader">
-    <Setter Property="Focusable" Value="False" />
-    <Setter Property="Foreground" Value="{DynamicResource DataGridRowGroupHeaderForegroundBrush}" />
-    <Setter Property="Background" Value="{DynamicResource DataGridRowGroupHeaderBackgroundBrush}" />
-    <Setter Property="FontSize" Value="15" />
-    <Setter Property="MinHeight" Value="32" />
-    <Setter Property="Template">
-      <ControlTemplate>
-        <DataGridFrozenGrid Name="PART_Root"
-                            MinHeight="{TemplateBinding MinHeight}"
-                            ColumnDefinitions="Auto,Auto,Auto,Auto,*"
-                            RowDefinitions="*,Auto">
-
-          <Rectangle Name="IndentSpacer"
-                     Grid.Column="1" />
-          <ToggleButton Name="ExpanderButton"
-                        Grid.Column="2"
-                        Width="12"
-                        Height="12"
-                        Margin="12,0,0,0"
-                        BorderBrush="{TemplateBinding BorderBrush}"
-                        BorderThickness="{TemplateBinding BorderThickness}"
-                        Background="{TemplateBinding Background}"
-                        CornerRadius="{TemplateBinding CornerRadius}"
-                        Focusable="False"
-                        Foreground="{TemplateBinding Foreground}" />
-
-          <StackPanel Grid.Column="3"
-                      Orientation="Horizontal"
-                      VerticalAlignment="Center"
-                      Margin="12,0,0,0">
-            <TextBlock Name="PropertyNameElement"
-                       Margin="4,0,0,0"
-                       IsVisible="{TemplateBinding IsPropertyNameVisible}"
-                       Foreground="{TemplateBinding Foreground}" />
-            <TextBlock Margin="4,0,0,0"
-                       Text="{Binding Key}"
-                       Foreground="{TemplateBinding Foreground}" />
-            <TextBlock Name="ItemCountElement"
-                       Margin="4,0,0,0"
-                       IsVisible="{TemplateBinding IsItemCountVisible}"
-                       Foreground="{TemplateBinding Foreground}" />
-          </StackPanel>
-
-          <Rectangle x:Name="CurrencyVisual"
-                     Grid.ColumnSpan="5"
-                     HorizontalAlignment="Stretch"
-                     VerticalAlignment="Stretch"
-                     Fill="Transparent"
-                     IsHitTestVisible="False"
-                     Stroke="{DynamicResource DataGridCurrencyVisualPrimaryBrush}"
-                     StrokeThickness="1" />
-          <Grid x:Name="FocusVisual"
-                Grid.ColumnSpan="5"
-                IsHitTestVisible="False">
-            <Rectangle HorizontalAlignment="Stretch"
-                       VerticalAlignment="Stretch"
-                       Fill="Transparent"
-                       IsHitTestVisible="False"
-                       Stroke="{DynamicResource DataGridCellFocusVisualPrimaryBrush}"
-                       StrokeThickness="2" />
-            <Rectangle Margin="2"
-                       HorizontalAlignment="Stretch"
-                       VerticalAlignment="Stretch"
-                       Fill="Transparent"
-                       IsHitTestVisible="False"
-                       Stroke="{DynamicResource DataGridCellFocusVisualSecondaryBrush}"
-                       StrokeThickness="1" />
-          </Grid>
-
-          <DataGridRowHeader Name="PART_RowHeader"
-                             Grid.RowSpan="2"
-                             DataGridFrozenGrid.IsFrozen="True" />
-
-          <Rectangle x:Name="PART_BottomGridLine"
-                     Grid.Row="1"
-                     Grid.ColumnSpan="5"
-                     Height="1" />
-        </DataGridFrozenGrid>
-      </ControlTemplate>
-    </Setter>
-  </Style>
-
-  <Style Selector="DataGridRowGroupHeader /template/ ToggleButton#ExpanderButton">
-    <Setter Property="Template">
-      <ControlTemplate>
-        <Border Grid.Column="0"
-                Width="12"
-                Height="12"
-                Background="Transparent"
-                HorizontalAlignment="Center"
-                VerticalAlignment="Center">
-          <Path Fill="{TemplateBinding Foreground}"
-                HorizontalAlignment="Right"
-                VerticalAlignment="Center"
-                Stretch="Uniform" />
-        </Border>
-      </ControlTemplate>
-    </Setter>
-  </Style>
-
-  <Style Selector="DataGridRowGroupHeader /template/ ToggleButton#ExpanderButton /template/ Path">
-    <Setter Property="Data" Value="{StaticResource DataGridRowGroupHeaderIconOpenedPath}" />
-    <Setter Property="Stretch" Value="Uniform" />
-  </Style>
-
-  <Style Selector="DataGridRowGroupHeader /template/ ToggleButton#ExpanderButton:checked /template/ Path">
-    <Setter Property="Data" Value="{StaticResource DataGridRowGroupHeaderIconClosedPath}" />
-    <Setter Property="Stretch" Value="UniformToFill" />
-  </Style>
-
-  <Style Selector="DataGridRowGroupHeader /template/ DataGridFrozenGrid#PART_Root">
-    <Setter Property="Background" Value="{Binding $parent[DataGridRowGroupHeader].Background}" />
-  </Style>
-  <Style Selector="DataGridRowGroupHeader:pointerover /template/ DataGridFrozenGrid#PART_Root">
-    <Setter Property="Background" Value="{DynamicResource DataGridRowGroupHeaderHoveredBackgroundBrush}" />
-  </Style>
-  <Style Selector="DataGridRowGroupHeader:pressed /template/ DataGridFrozenGrid#PART_Root">
-    <Setter Property="Background" Value="{DynamicResource DataGridRowGroupHeaderPressedBackgroundBrush}" />
-  </Style>
-
-  <Style Selector="DataGridRowGroupHeader /template/ Rectangle#CurrencyVisual">
-    <Setter Property="IsVisible" Value="False" />
-  </Style>
-  <Style Selector="DataGridRowGroupHeader /template/ Grid#FocusVisual">
-    <Setter Property="IsVisible" Value="False" />
-  </Style>
-  <Style Selector="DataGridRowGroupHeader:current /template/ Rectangle#CurrencyVisual">
-    <Setter Property="IsVisible" Value="True" />
-  </Style>
-  <Style Selector="DataGrid:focus DataGridRowGroupHeader:current /template/ Grid#FocusVisual">
-    <Setter Property="IsVisible" Value="True" />
-  </Style>
-
-  <Style Selector="DataGrid">
-    <Setter Property="RowBackground" Value="Transparent" />
-    <Setter Property="AlternatingRowBackground" Value="Transparent" />
-    <Setter Property="HeadersVisibility" Value="Column" />
-    <Setter Property="HorizontalScrollBarVisibility" Value="Auto" />
-    <Setter Property="VerticalScrollBarVisibility" Value="Auto" />
-    <Setter Property="SelectionMode" Value="Extended" />
-    <Setter Property="GridLinesVisibility" Value="None" />
-    <Setter Property="HorizontalGridLinesBrush" Value="{DynamicResource DataGridGridLinesBrush}" />
-    <Setter Property="VerticalGridLinesBrush" Value="{DynamicResource DataGridGridLinesBrush}" />
-    <Setter Property="DropLocationIndicatorTemplate">
-      <Template>
-        <Rectangle Fill="{DynamicResource DataGridDropLocationIndicatorBackground}"
-                   Width="2" />
-      </Template>
-    </Setter>
-    <Setter Property="Template">
-      <ControlTemplate>
-        <Border x:Name="DataGridBorder"
-                Background="{TemplateBinding Background}"
-                BorderBrush="{TemplateBinding BorderBrush}"
-                BorderThickness="{TemplateBinding BorderThickness}"
-                CornerRadius="{TemplateBinding CornerRadius}">
-          <Grid ColumnDefinitions="Auto,*,Auto" RowDefinitions="Auto,*,Auto,Auto">
-            <Grid.Resources>
-              <ControlTemplate x:Key="TopLeftHeaderTemplate"
-                               TargetType="DataGridColumnHeader">
-                <Grid x:Name="TopLeftHeaderRoot"
-                      RowDefinitions="*,*,Auto">
-                  <Border Grid.RowSpan="2"
-                          BorderThickness="0,0,1,0"
-                          BorderBrush="{DynamicResource DataGridGridLinesBrush}" />
-                  <Rectangle Grid.RowSpan="2"
-                             VerticalAlignment="Bottom"
-                             StrokeThickness="1"
-                             Height="1"
-                             Fill="{DynamicResource DataGridGridLinesBrush}" />
-                </Grid>
-              </ControlTemplate>
-              <ControlTemplate x:Key="TopRightHeaderTemplate"
-                               TargetType="DataGridColumnHeader">
-                <Grid x:Name="RootElement" />
-              </ControlTemplate>
-            </Grid.Resources>
-
-            <DataGridColumnHeader Name="PART_TopLeftCornerHeader"
-                                  Template="{StaticResource TopLeftHeaderTemplate}" />
-            <DataGridColumnHeadersPresenter Name="PART_ColumnHeadersPresenter"
-                                            Grid.Column="1"
-                                            Grid.ColumnSpan="2" />
-            <!--<DataGridColumnHeader Name="PART_TopRightCornerHeader"
-                                  Grid.Column="2"
-                                  Template="{StaticResource TopRightHeaderTemplate}" />-->
-            <Rectangle Name="PART_ColumnHeadersAndRowsSeparator"
-                       Grid.ColumnSpan="3"
-                       VerticalAlignment="Bottom"
-                       Height="1"
-                       Fill="{DynamicResource DataGridGridLinesBrush}" />
-
-            <DataGridRowsPresenter Name="PART_RowsPresenter"
-                                   Grid.Row="1"
-                                   Grid.RowSpan="2"
-                                   Grid.ColumnSpan="3">
-              <DataGridRowsPresenter.GestureRecognizers>
-                <ScrollGestureRecognizer CanHorizontallyScroll="True" CanVerticallyScroll="True" />
-              </DataGridRowsPresenter.GestureRecognizers>
-            </DataGridRowsPresenter>
-            <Rectangle Name="PART_BottomRightCorner"
-                       Fill="{DynamicResource DataGridScrollBarsSeparatorBackground}"
-                       Grid.Column="2"
-                       Grid.Row="2" />
-            <!--<Rectangle Name="BottomLeftCorner"
-                       Fill="{DynamicResource DataGridScrollBarsSeparatorBackground}"
-                       Grid.Row="2"
-                       Grid.ColumnSpan="2" />-->
-            <ScrollBar Name="PART_VerticalScrollbar"
-                       Orientation="Vertical"
-                       Grid.Column="2"
-                       Grid.Row="1"
-                       Width="{DynamicResource ScrollBarSize}" />
-
-            <Grid Grid.Column="1"
-                  Grid.Row="2"
-                  ColumnDefinitions="Auto,*">
-              <Rectangle Name="PART_FrozenColumnScrollBarSpacer" />
-              <ScrollBar Name="PART_HorizontalScrollbar"
-                         Grid.Column="1"
-                         Orientation="Horizontal"
-                         Height="{DynamicResource ScrollBarSize}" />
-            </Grid>
-            <Border x:Name="PART_DisabledVisualElement"
-                    Grid.ColumnSpan="3"
-                    Grid.RowSpan="4"
-                    IsHitTestVisible="False"
-                    HorizontalAlignment="Stretch"
-                    VerticalAlignment="Stretch"
-                    CornerRadius="2"
-                    Background="{DynamicResource DataGridDisabledVisualElementBackground}"
-                    IsVisible="{Binding !$parent[DataGrid].IsEnabled}" />
-          </Grid>
-        </Border>
-      </ControlTemplate>
-    </Setter>
-  </Style>
-
-  <Style Selector="DataGrid:empty-columns /template/ DataGridColumnHeader#PART_TopLeftCornerHeader">
-    <Setter Property="IsVisible" Value="False" />
-  </Style>
-  <Style Selector="DataGrid:empty-columns /template/ DataGridColumnHeadersPresenter#PART_ColumnHeadersPresenter">
-    <Setter Property="IsVisible" Value="False" />
-  </Style>
-  <Style Selector="DataGrid:empty-columns /template/ Rectangle#PART_ColumnHeadersAndRowsSeparator">
-    <Setter Property="IsVisible" Value="False" />
-  </Style>
-</Styles>

Source/LibationAvalonia/Assets/LibationStyles.xaml

@@ -1,16 +0,0 @@
-<Styles xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-	<Styles.Resources>
-		<Color x:Key="SeriesEntryGridBackgroundColor">#cdffcd</Color>
-
-		<SolidColorBrush x:Key="SeriesEntryGridBackgroundBrush" Opacity="0.5" Color="{StaticResource SeriesEntryGridBackgroundColor}" />
-		<SolidColorBrush x:Key="ProcessQueueBookFailedBrush" Color="LightCoral" />
-		<SolidColorBrush x:Key="ProcessQueueBookCompletedBrush" Color="PaleGreen" />
-		<SolidColorBrush x:Key="ProcessQueueBookCancelledBrush" Color="Khaki" />
-		<SolidColorBrush x:Key="ProcessQueueBookDefaultBrush" Color="{StaticResource SystemAltHighColor}" />
-		<SolidColorBrush x:Key="ProcessQueueBookBorderBrush" Color="Gray" />
-	</Styles.Resources>
-	<Style Selector="TextBox[IsReadOnly=true]">
-		<Setter Property="Background" Value="LightGray" />
-		<Setter Property="CaretBrush" Value="#00000000" />
-	</Style>
-</Styles>

Source/LibationAvalonia/Assets/LibationVectorIcons.xaml

@@ -0,0 +1,69 @@
+<Styles xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:collections="using:Avalonia.Collections">
+  <Styles.Resources>
+   <ResourceDictionary>   
+		<StreamGeometry x:Key="LeftArrows">M30,0 H60 L30,50 L60,100 H30 L0,50 M85,0 H115 L85,50 L115,100 H85 L55,50 M140,0 H170 L140,50 L170,100 H140 L110,50</StreamGeometry>
+		<StreamGeometry x:Key="FirstButtonIcon">M0,0 H100 V12 H53 L100,46 H0 L47,12 H0</StreamGeometry>
+		<StreamGeometry x:Key="UpButtonIcon">M0,36.66 L50,0 L100,36.66</StreamGeometry>
+		<StreamGeometry x:Key="DownButtonIcon">M0,0 L100,0 L50,36.66</StreamGeometry>
+		<StreamGeometry x:Key="LastButtonIcon">M0,0 H100 L53,34 H100 V46 H0 V34 H47</StreamGeometry>
+		<StreamGeometry x:Key="CancelButtonIcon">M30,0 H50 V30 H80 V50 H50 V80 H30 V50 H0 V30 H30</StreamGeometry>
+		<StreamGeometry x:Key="QueuedIcon">M31,0 H49 V100 H31 M58,0 H76 V100 H58 M85,0 H103 V100 H85 M8,85 V122 H129 V85 H117 V109 H20 V85 H8 M0,36 V66 L24,51 M114,36 V66 L138,51</StreamGeometry>
+		<StreamGeometry x:Key="QueueCompletedIcon">M0,0 H100 V100 H0 V0 M2,50 L36,82 L 93,27 L81,15 L36,59 L14,38</StreamGeometry>
+		<StreamGeometry x:Key="QueueErrorIcon">M0,0 H100 V100 H0 V0 M15,71 L29,85 L50,64 L71,85 L85,71 L64,50 L85,29 L71,15 L50,36 L29,15 L15,29 L36,50</StreamGeometry>
+		<StreamGeometry x:Key="BookErrorIcon">M32,0 a 32,32 0 0 1 0,64 a 32,32 0 0 1 0,-64 m 0,4 a 28,28 0 0 1 0,56 a 28,28 0 0 1 0,-56 m-21,24 h42 a 1,1 0 0 1 1,1 v6 a 1,1 0 0 1 -1,1 h-42 a 1,1 0 0 1 -1,-1 v-6 a 1,1 0 0 1 1,-1</StreamGeometry>
+
+		<RotateTransform x:Key="Rotate45Transform" Angle="45" />
+
+		<StreamGeometry x:Key="EditTagsIcon">
+			M39,35 L50,24 H11
+			A 11,11 0 0 0 0,35 V89 A 11,11 0 0 0 11,100 H64 A 11,11 0 0 0 75,89 V52 L64,63 V89 H11 V35
+			M 51,65 H36 V50
+			M 90.5,26.5 L55,62 L 39,45 L74,10
+			M 78,6 L81.5,2.5 A 8,8 0 0 1 91.5,2 L98.5,9 A 8,8 0 0 1 97.5,19.5 L94,23
+		</StreamGeometry>
+
+		<StreamGeometry x:Key="CollapseIcon">
+			M0,2 A 2,2 0 0 1 2,0 H62 A2,2 0 0 1 64,2 V62 A 2,2 0 0 1 62,64 H 2 A 2,2 0 0 1 0,62 V2
+			M 2,2 H62 V62 H2 V2
+			M11,28 h42 a 1,1 0 0 1 1,1 v6 a 1,1 0 0 1 -1,1 h-42 a 1,1 0 0 1 -1,-1 v-6 a 1,1 0 0 1 1,-1
+		</StreamGeometry>
+	   <StreamGeometry x:Key="VerticalBarIcon">M28,53 v-42 a 1,1 0 0 1 1,-1 h6 a 1,1 0 0 1 1,1 v42 a 1,1 0 0 1 -1,1 h-6 a 1,1 0 0 1 -1,-1</StreamGeometry>
+
+
+	   <CombinedGeometry x:Key="ExpandIcon" Geometry1="{StaticResource CollapseIcon}" Geometry2="{StaticResource VerticalBarIcon}" />
+
+		<StreamGeometry x:Key="StoplightBodyIcon">
+			M0,12 A 12,12 0 0 1 12,0 H34 A 12,12 0 0 1 46,12 V88 A 12,12 0 0 1 34,100 H12 A 12,12 0 0 1 0,88 V12
+			M20,8 H26 A 12,12 0 0 1 26,32 H20 A 12,12 0 0 1 20,8
+			M20,38 H26 A 12,12 0 0 1 26,62 H20 A 12,12 0 0 1 20,38
+			M20,68 H26 A 12,12 0 0 1 26,92 H20 A 12,12 0 0 1 20,68
+		</StreamGeometry>
+
+		<StreamGeometry x:Key="PdfDownloadedIcon">
+			M4,38.5 H3 A 3,3 0 0 1 0,35.5 V21.4 A 3,3 0 0 1 3,18.4 H4 V2 A 2,2 0 0 1 6,0 H30.5 L41,12 V18.4 A 3,3 0 0 1 45,21.4 V35.5 A 3,3 0 0 1 42,38.5 H41 V48.5 A 2,2 0 0 1 39,50.5 H6 A 2,2 0 0 1 4,48.5
+			M6,38.5 H39 V48.5 H6 V38.5
+			M6,18.4 V2 H29 V12 A 1,1 0 0 0 30,13 H39 V18.4
+			M 4.3179,36 c 0,0 0.122,-14.969 0.122,-14.969 1.469,-0.194 2.939,-0.388 4.5,-0.362 1.561,0.026 3.214,0.27 4.357,0.944 1.143,0.674 1.775,1.776 2.015,2.959 0.24,1.184 0.087,2.449 -0.5,3.52 -0.587,1.071 -1.607,1.949 -2.816,2.352 -1.209,0.403 -2.607,0.332 -4.005,0.26 0,0 -0.031,5.265 -0.031,5.265 0,0 -3.673,0.122 -3.673,0.122 0,0 0.031,-0.092 0.031,-0.092
+			m 3.643,-12.428 c 0,0 0.031,4.286 0.031,4.286 0.735,0.051 1.47,0.102 2.107,-0.056 0.638,-0.158 1.178,-0.526 1.459,-1.122 0.281,-0.597 0.301,-1.423 0.01,-2.005 -0.291,-0.582 -0.893,-0.918 -1.546,-1.061 -0.653,-0.143 -1.357,-0.092 -1.709,-0.066 -0.352,0.026 -0.352,0.026 -0.352,0.026
+			m 9.428,12.428 c 2.265,0.245 4.531,0.49 6.674,0.066 2.143,-0.424 4.163,-1.515 5.285,-3.081 1.122,-1.566 1.347,-3.607 1.27,-5.306 -0.076,-1.699 -0.454,-3.056 -1.454,-4.219 -1,-1.163 -2.622,-2.133 -4.704,-2.505 -2.082,-0.373 -4.623,-0.148 -7.164,0.076 0,0 0.092,14.969 0.092,14.969
+			m 3.49,-12.398 c 0,0 0,9.673 0,9.673 0.888,0.02 1.776,0.041 2.653,-0.179 0.877,-0.219 1.745,-0.679 2.367,-1.541 0.622,-0.862 1,-2.127 0.98,-3.403 -0.02,-1.275 -0.439,-2.561 -1.193,-3.337 -0.755,-0.776 -1.847,-1.041 -2.704,-1.158 -0.857,-0.117 -1.48,-0.087 -2.102,-0.056
+			m 11.908,12.245 v-14.785 h8.969 v2.51 h-5.786 v3.612 h5.388 v2.51 h-5.449 v6.092
+		</StreamGeometry>
+
+		<StreamGeometry x:Key="PdfDownArrowIcon">
+			M29,44 V58.7498 H35.0491 A 1.5,1.5 0 0 1 36.1342,61.2861 L23.5607,73.8595 A 1.5,1.5 0 0 1 21.4393,73.8595 L8.8658,61.2861 A 1.5,1.5 0 0 1 9.9509,58.7498 H16 V44 A 1.5,1.5 0 0 1 17.5,42.5 H27.5 A 1.5,1.5 0 0 1 29,44
+		</StreamGeometry>			
+
+		<CombinedGeometry x:Key="PdfNotDownloadedIcon" Geometry1="{StaticResource PdfDownloadedIcon}" Geometry2="{StaticResource PdfDownArrowIcon}" />
+
+	   <StreamGeometry  x:Key="ImportIcon">
+		   M5.65,4.3 h-2.75 a2.9,2.25 0 0 0 -2.9,2.25 v7.2
+		   a2.9,2.25 0 0 0 2.9,2.25 h10.2 a2.9,2.25 0 0 0 2.9,-2.25 v-7.2 a2.9,2.25 0 0 0 -2.9,-2.25
+		   h-2.75 v1.6 h2.75 a1.3,0.65 0 0 1 1.3,0.65 v7.2 a1.3,0.65 0 0 1 -1.3,0.65 h-10.2 a1.3,0.65 0 0 1 -1.3,-0.65 v-7.2 a1.3,0.65 0 0 1 1.3,-0.65 h2.75 v-1.6
+		   M7.2,0.8 a 0.8,0.8 0 0 1 1.6,0 v8 l0.9929,-0.9929 a 0.8,0.8 0 0 1 1.1314,1.1314 l-2.3586,2.3586
+		   a 0.8,0.8 0 0 1 -1.1314,0 l-2.3586,-2.3586  a 0.8,0.8 0 0 1 1.1314,-1.1314 l0.9929,0.9929 v8
+	   </StreamGeometry>
+   </ResourceDictionary>
+  </Styles.Resources>
+</Styles>