incr ver

Resolved Several Issues (It's not as bad as  2,453 lines suggests)

.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")
-          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/bundle-linux.yml

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

.github/workflows/release.yml

@@ -33,15 +33,9 @@ jobs:
     with:
       version_override: ${{ needs.prerelease.outputs.version }}
       run_unit_tests: false
-
-  bundle:
-    needs: [prerelease,build]
-    uses: ./.github/workflows/bundle-linux.yml
-    with:
-      version: ${{ needs.prerelease.outputs.version }}
       
   release:
-    needs: [prerelease,build,bundle]
+    needs: [prerelease,build]
     runs-on: ubuntu-latest
     steps:
       - name: Download artifacts

.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\\.deb",
-  "MacOSAvalonia":   "Libation\\.app-macOS-x64-\\d+\\.\\d+\\.\\d+\\.tgz"
+  "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**.
 
 

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

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,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,13 +9,16 @@ This walkthrough should get you up and running with Libation on your Mac.
 
 ## Install Libation
 
-- Download the `Libation.app-macOS-x64-x.x.x.tgz` file from the latest release and extract it. 
+- 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!
 
 ## Running Hangover

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

Scripts/Bundle_Linux.sh

@@ -1,17 +1,18 @@
 #!/bin/bash
 
-FILE=$1; shift
+BIN_DIR=$1; shift
 VERSION=$1; shift
+ARCH=$1; shift
 
-if [ -z "$FILE" ]
+if [ -z "$BIN_DIR" ]
 then
-  echo "This script must be called with a the Libation Linux bin zip file as an argument."
+  echo "This script must be called with a the Libation Linux bins directory as an argument."
   exit
 fi
 
-if [ ! -f "$FILE" ]
+if [ ! -d "$BIN_DIR" ]
 then
-  echo "The file \"$FILE\" does not exist."
+  echo "The directory \"$BIN_DIR\" does not exist."
   exit
 fi
 
@@ -21,122 +22,125 @@ then
   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 "$FILE" "$VERSION"
+if ! contains "$BIN_DIR" "$ARCH"
 then
-  echo "This script must be called with a Libation version number that is present in the filename passed."
+  echo "This script must be called with a Libation binaries for ${ARCH}."
   exit
 fi
 
-# remove trailing ".tar.gz"
-FOLDER_MAIN=${FILE::-7}
-echo "Working dir: $FOLDER_MAIN"
+ARCH=$(echo $ARCH | sed 's/x64/amd64/')
 
-if [[ -d "$FOLDER_MAIN" ]]
-then
-  echo "$FOLDER_MAIN directory already exists, aborting."
-  exit
-fi
+DEB_DIR=./deb
 
-FOLDER_EXEC="$FOLDER_MAIN/usr/lib/libation"
+FOLDER_EXEC=$DEB_DIR/usr/lib/libation
 echo "Exec dir: $FOLDER_EXEC"
+mkdir -p $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}
+echo "Moving bins from $BIN_DIR to $FOLDER_EXEC"
+mv "${BIN_DIR}/"* $FOLDER_EXEC
 
 if [ $? -ne 0 ]
- then echo "Error extracting ${FILE}"
+ 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/glass-with-glow_256.svg" "$FOLDER_ICON/libation.svg"
+cp $FOLDER_EXEC/libation_glass.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"
+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/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"
+" >> $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  
+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"
+" >> $FOLDER_DEBIAN/postinst
 
 echo "Creating control file..."
 echo "Package: Libation
 Version: $VERSION
-Architecture: all
+Architecture: $ARCH
 Essential: no
 Priority: optional
 Maintainer: github.com/rmcrackan
 Description: liberate your audiobooks
-" >> "$FOLDER_DEBIAN/control"
+" >> $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
+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
-echo "moving to ./bundle/$FOLDER_MAIN.deb"
-mv "$FOLDER_MAIN.deb" "./bundle/$FOLDER_MAIN.deb"
+mv $DEB_FILE ./bundle/$DEB_FILE
 
-rm -r "$FOLDER_MAIN"
+rm -r "$BIN_DIR"
 
-echo "Done!"
+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/targz2macosbundle.sh

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

Source/AaxDecrypter/AaxDecrypter.csproj

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

Source/AaxDecrypter/AaxcDownloadConvertBase.cs

@@ -40,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("©", "©");
+			}
 
 			//Finishing configuring lame encoder.
 			if (DownloadOptions.OutputFormat == OutputFormat.Mp3)

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

@@ -3,6 +3,7 @@ using AAXClean.Codecs;
 using Dinah.Core.Net.Http;
 using FileManager;
 using System;
+using System.Diagnostics;
 using System.IO;
 using System.Threading.Tasks;
 
@@ -14,12 +15,15 @@ namespace AaxDecrypter
 		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()
@@ -31,18 +35,7 @@ namespace AaxDecrypter
 
 			try
 			{
-				await (AaxConversion = decryptAsync(outputFile));
-
-				if (AaxConversion.IsCompletedSuccessfully
-					&& DownloadOptions.MoveMoovToBeginning
-					&& DownloadOptions.OutputFormat is OutputFormat.M4b)
-				{
-					outputFile.Close();
-					AaxConversion = Mp4File.RelocateMoovAsync(OutputFileName);
-					AaxConversion.ConversionProgressUpdate += AaxConversion_MoovProgressUpdate;
-					await AaxConversion;
-					AaxConversion.ConversionProgressUpdate -= AaxConversion_MoovProgressUpdate;
-				}
+				await (AaxConversion = decryptAsync(outputFile));				
 
 				return AaxConversion.IsCompletedSuccessfully;
 			}
@@ -52,23 +45,30 @@ 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.TotalDuration - e.ProcessPosition).TotalSeconds;
+			var remainingTimeToProcess = (e.EndTime - e.ProcessPosition).TotalSeconds;
 			var estTimeRemaining = remainingTimeToProcess / averageSpeed.Average;
 
 			if (double.IsNormal(estTimeRemaining))
 				OnDecryptTimeRemaining(TimeSpan.FromSeconds(estTimeRemaining));
 
-			var progressPercent = 100d * (1 - remainingTimeToProcess / e.TotalDuration.TotalSeconds);
-
 			OnDecryptProgressUpdate(
 				new DownloadProgress
 				{
-					ProgressPercentage = progressPercent,
-					BytesReceived = (long)(InputFileStream.Length * progressPercent),
+					ProgressPercentage = 100 * e.FractionCompleted,
+					BytesReceived = (long)(InputFileStream.Length * e.FractionCompleted),
 					TotalBytesToReceive = InputFileStream.Length
 				});
 		}
@@ -79,15 +79,13 @@ namespace AaxDecrypter
 			(
 				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

@@ -26,6 +26,7 @@ namespace AaxDecrypter
 		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;
@@ -58,7 +59,7 @@ namespace AaxDecrypter
 			{
 				BytesReceived = 0,
 				ProgressPercentage = 0,
-				TotalBytesToReceive = InputFileStream.Length
+				TotalBytesToReceive = 0
 			};
 
 			OnDecryptProgressUpdate(zeroProgress);
@@ -66,6 +67,7 @@ namespace AaxDecrypter
 
 		public async Task<bool> RunAsync()
 		{
+			await InputFileStream.BeginDownloadingAsync();
 			var progressTask = Task.Run(reportProgress);
 
 			AsyncSteps[$"Cleanup"] = CleanupAsync;
@@ -82,7 +84,11 @@ namespace AaxDecrypter
 			{
 				AverageSpeed averageSpeed = new();
 
-				while (InputFileStream.CanRead && InputFileStream.Length > InputFilePosition && !InputFileStream.IsCancelled)
+				while (
+					InputFileStream.CanRead
+					&& InputFileStream.Length > InputFilePosition
+					&& !InputFileStream.IsCancelled
+					&& !downloadFinished)
 				{
 					averageSpeed.AddPosition(InputFilePosition);
 
@@ -136,8 +142,7 @@ namespace AaxDecrypter
 		protected virtual void FinalizeDownload()
 		{
 			nfsPersister?.Dispose();
-			OnDecryptTimeRemaining(TimeSpan.Zero);
-			OnDecryptProgressUpdate(zeroProgress);
+			downloadFinished = true;
 		}
 
 		protected async Task<bool> Step_DownloadClipsBookmarksAsync()
@@ -219,6 +224,7 @@ namespace AaxDecrypter
 			}
 			finally
 			{
+				nfsp.NetworkFileStream.RequestHeaders["User-Agent"] = DownloadOptions.UserAgent;
 				nfsp.NetworkFileStream.SpeedLimit = DownloadOptions.DownloadSpeedBps;
 			}
 

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);
 			}
 		}
 
@@ -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

@@ -26,9 +26,11 @@ namespace AaxDecrypter
 
 		protected override async Task<bool> Step_DownloadAndDecryptAudiobookAsync()
 		{
-			// MUST put InputFileStream.Length first, because it starts background downloader.
-			while (InputFileStream.Length > InputFilePosition && !InputFileStream.IsCancelled)
-				await Task.Delay(200);
+			TaskCompletionSource completionSource = new();
+
+			InputFileStream.DownloadCompleted += (_, _) => completionSource.SetResult();
+
+			await completionSource.Task;
 
 			if (IsCanceled)
 				return false;

Source/AppScaffolding/AppScaffolding.csproj

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

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

@@ -242,18 +242,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 +273,7 @@ namespace ApplicationServices
             }
         }
 
-        public static int RestoreBooks(this List<LibraryBook> libraryBooks)
+        public static int RestoreBooks(this IEnumerable<LibraryBook> libraryBooks)
         {
             try
             {
@@ -303,6 +301,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 +369,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)

Source/AudibleUtilities/ApiExtended.cs

@@ -39,42 +39,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)
 		{

Source/AudibleUtilities/AudibleUtilities.csproj

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

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/EfClasses/UserDefinedItem.cs

@@ -24,8 +24,27 @@ namespace DataLayer
     {
         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));

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/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 =>
                 {
@@ -272,6 +272,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/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/ConvertToMp3.cs

@@ -103,20 +103,20 @@ namespace FileLiberator
 		{
 			averageSpeed.AddPosition(e.ProcessPosition.TotalSeconds);
 
-			var remainingTimeToProcess = (e.TotalDuration - 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 / e.TotalDuration.TotalSeconds;
+			double progressPercent = 100 * e.FractionCompleted;
 
 			OnStreamingProgressChanged(
 				new DownloadProgress
 				{
 					ProgressPercentage = progressPercent,
-					BytesReceived = (long)e.ProcessPosition.TotalSeconds,
-					TotalBytesToReceive = (long)e.TotalDuration.TotalSeconds
+					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;

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/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'">

Source/HangoverWinForms/HangoverWinForms.csproj

@@ -16,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/LibationAvalonia/App.axaml.cs

@@ -11,11 +11,13 @@ using System.Threading.Tasks;
 using System.Collections.Generic;
 using System.IO;
 using ApplicationServices;
+using Avalonia.Controls;
 
 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; }
@@ -213,7 +215,7 @@ namespace LibationAvalonia
 		private static void ShowMainWindow(IClassicDesktopStyleApplicationLifetime desktop)
 		{
 			var mainWindow = new MainWindow();
-			desktop.MainWindow = mainWindow;
+			desktop.MainWindow = MainWindow = mainWindow;
 			mainWindow.RestoreSizeAndLocation(Configuration.Instance);
 			mainWindow.OnLoad();
 			mainWindow.OnLibraryLoaded(LibraryTask.GetAwaiter().GetResult());

Source/LibationAvalonia/AvaloniaUtils.cs

@@ -1,8 +1,6 @@
 using Avalonia.Controls;
 using Avalonia.Media;
-using Avalonia.Threading;
-using System;
-using System.Threading;
+using LibationAvalonia.Dialogs;
 using System.Threading.Tasks;
 
 namespace LibationAvalonia
@@ -18,6 +16,9 @@ namespace LibationAvalonia
 			return defaultBrush;
 		}
 
+		public static Task<DialogResult> ShowDialogAsync(this DialogWindow dialogWindow, Window owner = null)
+			=> dialogWindow.ShowDialog<DialogResult>(owner ?? App.MainWindow);
+
 		public static Window GetParentWindow(this IControl control) => control.VisualRoot as Window;
 	}
 }

Source/LibationAvalonia/Controls/CheckedListBox.axaml

@@ -0,0 +1,30 @@
+<UserControl xmlns="https://github.com/avaloniaui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+			 mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
+             x:Class="LibationAvalonia.Controls.CheckedListBox">
+	
+	<UserControl.Resources>
+		<RecyclePool x:Key="RecyclePool" />
+		<DataTemplate x:Key="queuedBook">
+			<CheckBox HorizontalAlignment="Stretch" Margin="10,0,0,0" Content="{Binding Item}" IsChecked="{Binding IsChecked, Mode=TwoWay}" />
+		</DataTemplate>
+		<RecyclingElementFactory x:Key="elementFactory" RecyclePool="{StaticResource RecyclePool}">
+			<RecyclingElementFactory.Templates>
+				<StaticResource x:Key="queuedBook" ResourceKey="queuedBook" />
+			</RecyclingElementFactory.Templates>
+		</RecyclingElementFactory>
+	</UserControl.Resources>
+
+	<ScrollViewer
+		Name="scroller"
+		HorizontalScrollBarVisibility="Disabled"
+		VerticalScrollBarVisibility="Auto">
+		<ItemsRepeater IsVisible="True"
+			VerticalCacheLength="1.2"
+			HorizontalCacheLength="1"
+			Items="{Binding CheckboxItems}"
+			ItemTemplate="{StaticResource elementFactory}" />
+	</ScrollViewer>
+</UserControl>

Source/LibationAvalonia/Controls/CheckedListBox.axaml.cs

@@ -0,0 +1,46 @@
+using Avalonia;
+using Avalonia.Collections;
+using Avalonia.Controls;
+using LibationAvalonia.ViewModels;
+using ReactiveUI;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace LibationAvalonia.Controls
+{
+	public partial class CheckedListBox : UserControl
+	{
+		public static readonly StyledProperty<AvaloniaList<CheckBoxViewModel>> ItemsProperty =
+		AvaloniaProperty.Register<CheckedListBox, AvaloniaList<CheckBoxViewModel>>(nameof(Items));
+
+		public AvaloniaList<CheckBoxViewModel> Items { get => GetValue(ItemsProperty); set => SetValue(ItemsProperty, value); }
+		private CheckedListBoxViewModel _viewModel = new();	
+
+		public CheckedListBox()
+		{
+			InitializeComponent();
+			scroller.DataContext = _viewModel;
+		}
+		protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
+		{
+			if (change.Property.Name == nameof(Items) && Items != null)
+				_viewModel.CheckboxItems = Items;
+			base.OnPropertyChanged(change);
+		}
+
+		private class CheckedListBoxViewModel : ViewModelBase
+		{
+			private AvaloniaList<CheckBoxViewModel> _checkboxItems;
+			public AvaloniaList<CheckBoxViewModel> CheckboxItems { get => _checkboxItems; set => this.RaiseAndSetIfChanged(ref _checkboxItems, value); }
+		}
+	}
+
+	public class CheckBoxViewModel : ViewModelBase
+	{
+		private bool _isChecked;
+		public bool IsChecked { get => _isChecked; set => this.RaiseAndSetIfChanged(ref _isChecked, value); }
+		private object _bookText;
+		public object Item { get => _bookText; set => this.RaiseAndSetIfChanged(ref _bookText, value); }
+	}
+}

Source/LibationAvalonia/Controls/DirectoryOrCustomSelectControl.axaml.cs

@@ -133,7 +133,7 @@ namespace LibationAvalonia.Controls
 					: Configuration.GetKnownDirectoryPath(directorySelectControl.SelectedDirectory);
 			selectedDir ??= string.Empty;
 
-			Directory = customStates.CustomChecked ? selectedDir : System.IO.Path.Combine(selectedDir, SubDirectory);
+			Directory = customStates.CustomChecked ? selectedDir : System.IO.Path.Combine(selectedDir, SubDirectory ?? "");
 		}
 
 		private void DirectoryOrCustomSelectControl_PropertyChanged(object sender, AvaloniaPropertyChangedEventArgs e)

Source/LibationAvalonia/Dialogs/AccountsDialog.axaml

@@ -36,6 +36,7 @@
 								Width="60"
 								Height="30"
 								Content="X"
+								HorizontalContentAlignment="Center"
 								IsEnabled="{Binding !IsDefault}"
 								Click="DeleteButton_Clicked" />
 

Source/LibationAvalonia/Dialogs/AccountsDialog.axaml.cs

@@ -117,10 +117,13 @@ namespace LibationAvalonia.Dialogs
 			{
 				Title = $"Select the audible-cli [account].json file",
 				AllowMultiple = false,
-				SuggestedStartLocation = new BclStorageFolder(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData)),
 				FileTypeFilter = new FilePickerFileType[]
 				{
-					new("JSON files (*.json)") { Patterns = new[] { "*.json" } },
+						new("JSON files (*.json)")
+						{
+							Patterns = new[] { "*.json" },
+							AppleUniformTypeIdentifiers  = new[] { "public.json" }
+						}
 				}
 			};
 
@@ -274,13 +277,16 @@ namespace LibationAvalonia.Dialogs
 			var options = new FilePickerSaveOptions
 			{
 				Title = $"Save Sover Image",
-				SuggestedStartLocation = new BclStorageFolder(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData)),
 				SuggestedFileName = $"{acc.AccountId}.json",
 				DefaultExtension = "json",
 				ShowOverwritePrompt = true,
 				FileTypeChoices = new FilePickerFileType[]
 					{
-						new("JSON files (*.json)") { Patterns = new[] { "*.json" } },
+						new("JSON files (*.json)")
+						{
+							Patterns = new[] { "*.json" },
+							AppleUniformTypeIdentifiers  = new[] { "public.json" }
+						}
 					}
 			};
 

Source/LibationAvalonia/Dialogs/BookRecordsDialog.axaml.cs

@@ -153,10 +153,22 @@ namespace LibationAvalonia.Dialogs
 					ShowOverwritePrompt = true,
 					FileTypeChoices = new FilePickerFileType[]
 					{
-						new("Excel Workbook (*.xlsx)") { Patterns = new[] { "*.xlsx" } },
-						new("CSV files (*.csv)") { Patterns = new[] { "*.csv" } },
-						new("JSON files (*.json)") { Patterns = new[] { "*.json" } },
-						new("All files (*.*)") { Patterns = new[] { "*" } }
+						new("Excel Workbook (*.xlsx)")
+						{
+							Patterns = new[] { "*.xlsx" },
+							AppleUniformTypeIdentifiers = new[] { "org.openxmlformats.spreadsheetml.sheet" }
+						},
+						new("CSV files (*.csv)")
+						{
+							Patterns = new[] { "*.csv" },
+							AppleUniformTypeIdentifiers = new[] { "public.comma-separated-values-text" }
+						},
+						new("JSON files (*.json)")
+						{
+							Patterns = new[] { "*.json" },
+							AppleUniformTypeIdentifiers  = new[] { "public.json" }
+						},
+						new("All files (*.*)") { Patterns = new[] { "*" } },
 					}
 				});
 

Source/LibationAvalonia/Dialogs/ImageDisplayDialog.axaml.cs

@@ -56,7 +56,11 @@ namespace LibationAvalonia.Dialogs
 				ShowOverwritePrompt = true,
 				FileTypeChoices = new FilePickerFileType[]
 					{
-						new("Jpeg (*.jpg)") { Patterns = new[] { "jpg" } }
+						new("Jpeg (*.jpg)")
+						{
+							Patterns = new[] { "jpg" },
+							AppleUniformTypeIdentifiers = new[] { "public.jpeg" }
+						}
 					}
 			};
 

Source/LibationAvalonia/Dialogs/Login/AvaloniaLoginBase.cs

@@ -1,22 +0,0 @@
-using Avalonia;
-using Avalonia.Controls.ApplicationLifetimes;
-using System;
-using System.Threading.Tasks;
-
-namespace LibationAvalonia.Dialogs.Login
-{
-	public abstract class AvaloniaLoginBase
-	{
-
-		/// <returns>True if ShowDialog's DialogResult == OK</returns>
-		protected static async Task<bool> ShowDialog(DialogWindow dialog)
-		{
-			if (Application.Current.ApplicationLifetime is not IClassicDesktopStyleApplicationLifetime desktop)
-				return false;
-
-			var result = await dialog.ShowDialog<DialogResult>(desktop.MainWindow);
-			Serilog.Log.Logger.Debug("{@DebugInfo}", new { DialogResult = result });
-			return result == DialogResult.OK;
-		}
-	}
-}

Source/LibationAvalonia/Dialogs/Login/AvaloniaLoginCallback.cs

@@ -5,36 +5,38 @@ using AudibleUtilities;
 
 namespace LibationAvalonia.Dialogs.Login
 {
-	public class AvaloniaLoginCallback : AvaloniaLoginBase, ILoginCallback
+	public class AvaloniaLoginCallback : ILoginCallback
 	{
 		private Account _account { get; }
 
+		public string DeviceName { get; } = "Libation";
+
 		public AvaloniaLoginCallback(Account account)
 		{
 			_account = Dinah.Core.ArgumentValidator.EnsureNotNull(account, nameof(account));
 		}
 
-		public async Task<string> Get2faCodeAsync()
+		public async Task<string> Get2faCodeAsync(string prompt)
 		{
-			var dialog = new _2faCodeDialog();
-			if (await ShowDialog(dialog))
+			var dialog = new _2faCodeDialog(prompt);
+			if (await dialog.ShowDialogAsync() is DialogResult.OK)
 				return dialog.Code;
 
 			return null;
 		}
 
-		public async Task<string> GetCaptchaAnswerAsync(byte[] captchaImage)
+		public async Task<(string password, string guess)> GetCaptchaAnswerAsync(string password, byte[] captchaImage)
 		{
-			var dialog = new CaptchaDialog(captchaImage);
-			if (await ShowDialog(dialog))
-				return dialog.Answer;
-			return null;
+			var dialog = new CaptchaDialog(password, captchaImage);
+			if (await dialog.ShowDialogAsync() is DialogResult.OK)
+				return (dialog.Password, dialog.Answer);
+			return (null, null);
 		}
 
 		public async Task<(string name, string value)> GetMfaChoiceAsync(MfaConfig mfaConfig)
 		{
 			var dialog = new MfaDialog(mfaConfig);
-			if (await ShowDialog(dialog))
+			if (await dialog.ShowDialogAsync() is DialogResult.OK)
 				return (dialog.SelectedName, dialog.SelectedValue);
 			return (null, null);
 		}
@@ -42,7 +44,7 @@ namespace LibationAvalonia.Dialogs.Login
 		public async Task<(string email, string password)> GetLoginAsync()
 		{
 			var dialog = new LoginCallbackDialog(_account);
-			if (await ShowDialog(dialog))
+			if (await dialog.ShowDialogAsync() is DialogResult.OK)
 				return (_account.AccountId, dialog.Password);
 			return (null, null);
 		}
@@ -50,7 +52,7 @@ namespace LibationAvalonia.Dialogs.Login
 		public async Task ShowApprovalNeededAsync()
 		{
 			var dialog = new ApprovalNeededDialog();
-			await ShowDialog(dialog);
+			await dialog.ShowDialogAsync();
 		}
 	}
 }

Source/LibationAvalonia/Dialogs/Login/AvaloniaLoginChoiceEager.cs

@@ -5,14 +5,15 @@ using AudibleUtilities;
 
 namespace LibationAvalonia.Dialogs.Login
 {
-	public class AvaloniaLoginChoiceEager : AvaloniaLoginBase, ILoginChoiceEager
+	public class AvaloniaLoginChoiceEager : ILoginChoiceEager
 	{
 		/// <summary>Convenience method. Recommended when wiring up Winforms to <see cref="ApplicationServices.LibraryCommands.ImportAccountAsync"/></summary>
-		public static async Task<ApiExtended> ApiExtendedFunc(Account account) => await ApiExtended.CreateAsync(account, new AvaloniaLoginChoiceEager(account));
+		public static async Task<ApiExtended> ApiExtendedFunc(Account account)
+			=> await ApiExtended.CreateAsync(account, new AvaloniaLoginChoiceEager(account));
 
-		public ILoginCallback LoginCallback { get; private set; }
+		public ILoginCallback LoginCallback { get; }
 
-		private Account _account { get; }
+		private readonly Account _account;
 
 		public AvaloniaLoginChoiceEager(Account account)
 		{
@@ -24,10 +25,9 @@ namespace LibationAvalonia.Dialogs.Login
 		{
 			var dialog = new LoginChoiceEagerDialog(_account);
 
-			if (!await ShowDialog(dialog))
+			if (await dialog.ShowDialogAsync() is not DialogResult.OK)
 				return null;
 
-
 			switch (dialog.LoginMethod)
 			{
 				case LoginMethod.Api:
@@ -35,7 +35,7 @@ namespace LibationAvalonia.Dialogs.Login
 				case LoginMethod.External:
 					{
 						var externalDialog = new LoginExternalDialog(_account, choiceIn.LoginUrl);
-						return await ShowDialog(externalDialog)
+						return await externalDialog.ShowDialogAsync() is DialogResult.OK
 							? ChoiceOut.External(externalDialog.ResponseUrl)
 							: null;
 					}

Source/LibationAvalonia/Dialogs/Login/CaptchaDialog.axaml

@@ -2,22 +2,22 @@
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        mc:Ignorable="d" d:DesignWidth="220" d:DesignHeight="180"
-		MinWidth="220" MinHeight="180"
-		MaxWidth="220" MaxHeight="180"
+        mc:Ignorable="d" d:DesignWidth="220" d:DesignHeight="250"
+		MinWidth="220" MinHeight="250"
+		MaxWidth="220" MaxHeight="250"
         x:Class="LibationAvalonia.Dialogs.Login.CaptchaDialog"
         Title="CAPTCHA"
 		Icon="/Assets/libation.ico">
 
 	<Grid
-		RowDefinitions="Auto,Auto,*"
-		ColumnDefinitions="Auto,*">
+		RowDefinitions="Auto,Auto,Auto,Auto,*"
+		ColumnDefinitions="Auto,*" 
+			Margin="10">
 		
 		<Panel
 			Grid.Row="0"
 			Grid.Column="0"
 			Grid.ColumnSpan="2"
-			Margin="10"
 			MinWidth="200"
 			MinHeight="70"
 			Background="LightGray">
@@ -30,23 +30,40 @@
 		
 		<TextBlock
 			Grid.Row="1"
+			Margin="0,10,0,0"
+			VerticalAlignment="Center"
+			Text="Password:" />
+
+		<TextBox
+			Name="passwordBox"
+			Grid.Row="2"
 			Grid.Column="0"
-			Margin="10,0,10,0"
+			Grid.ColumnSpan="2"
+			Margin="0,10,0,0"
+			PasswordChar="*"
+			Text="{Binding Password, Mode=TwoWay}" />
+		
+		<TextBlock
+			Grid.Row="3"
+			Grid.Column="0"
+			Margin="0,10,10,0"
 			VerticalAlignment="Center"
 			Text="CAPTCHA&#xa;answer:" />
 		
 		<TextBox
-			Grid.Row="1"
+			Name="captchaBox"
+			Grid.Row="3"
 			Grid.Column="1"
-			Margin="10,0,10,0" Text="{Binding Answer}" />
+			Margin="0,10,0,0"
+			Text="{Binding Answer, Mode=TwoWay}" />
 		
 		<Button
-			Grid.Row="2"
+			Grid.Row="4"
 			Grid.Column="1"
-			Margin="10"
 			Padding="0,5,0,5"
 			VerticalAlignment="Bottom"
 			HorizontalAlignment="Stretch"
+			HorizontalContentAlignment="Center"
 			Content="Submit"
 			Click="Submit_Click" />
 		

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

@@ -1,5 +1,8 @@
+using Avalonia.Controls;
 using Avalonia.Markup.Xaml;
 using Avalonia.Media.Imaging;
+using LibationAvalonia.ViewModels;
+using ReactiveUI;
 using System.IO;
 using System.Threading.Tasks;
 
@@ -7,18 +10,43 @@ namespace LibationAvalonia.Dialogs.Login
 {
 	public partial class CaptchaDialog : DialogWindow
 	{
-		public string Answer { get; set; }
-		public Bitmap CaptchaImage { get; }
+		public string Password => _viewModel.Password;
+		public string Answer => _viewModel.Answer;
+
+		private readonly CaptchaDialogViewModel _viewModel;
 		public CaptchaDialog()
 		{
 			InitializeComponent();
+			passwordBox = this.FindControl<TextBox>(nameof(passwordBox));
+			captchaBox = this.FindControl<TextBox>(nameof(captchaBox));
 		}
 
-		public CaptchaDialog(byte[] captchaImage) :this()
+		public CaptchaDialog(string password, byte[] captchaImage) :this()
 		{
-			using var ms = new MemoryStream(captchaImage);
-			CaptchaImage = new Bitmap(ms);
-			DataContext = this;
+			//Avalonia doesn't support animated gifs.
+			//Deconstruct gifs into frames and manually switch them.
+			using var gif = SixLabors.ImageSharp.Image.Load(captchaImage);
+			var gifEncoder = new SixLabors.ImageSharp.Formats.Gif.GifEncoder();
+			var gifFrames = new Bitmap[gif.Frames.Count];
+			var frameDelayMs = new int[gif.Frames.Count];
+
+			for (int i = 0; i < gif.Frames.Count; i++)
+			{
+				var frameMetadata = gif.Frames[i].Metadata.GetFormatMetadata(SixLabors.ImageSharp.Formats.Gif.GifFormat.Instance);
+
+                using var clonedFrame = gif.Frames.CloneFrame(i);
+				using var framems = new MemoryStream();
+
+				clonedFrame.Save(framems, gifEncoder);
+				framems.Position = 0;
+
+				gifFrames[i] = new Bitmap(framems);
+				frameDelayMs[i] = frameMetadata.FrameDelay * 10;
+			}
+
+			DataContext = _viewModel = new(password, gifFrames, frameDelayMs);
+
+			Opened += (_, _) => (string.IsNullOrEmpty(password) ? passwordBox : captchaBox).Focus();
 		}
 
 		private void InitializeComponent()
@@ -26,15 +54,73 @@ namespace LibationAvalonia.Dialogs.Login
 			AvaloniaXamlLoader.Load(this);
 		}
 
-
-		protected override Task SaveAndCloseAsync()
+		protected override async Task SaveAndCloseAsync()
 		{
-			Serilog.Log.Logger.Information("Submit button clicked: {@DebugInfo}", new { Answer });
+			if (string.IsNullOrWhiteSpace(_viewModel.Password))
+			{
+				await MessageBox.Show(this, "Please re-enter your password");
+				return;
+			}
 
-			return base.SaveAndCloseAsync();
+			Serilog.Log.Logger.Information("Submit button clicked: {@DebugInfo}", new { _viewModel.Answer });
+
+			await _viewModel.StopAsync();
+			await base.SaveAndCloseAsync();
+		}
+
+		protected override async Task CancelAndCloseAsync()
+		{
+			await _viewModel.StopAsync();
+			await base.CancelAndCloseAsync();	
 		}
 
 		public async void Submit_Click(object sender, Avalonia.Interactivity.RoutedEventArgs e)
 			=> await SaveAndCloseAsync();
 	}
+
+	public class CaptchaDialogViewModel : ViewModelBase
+	{
+		public string Answer { get; set; }
+		public string Password { get; set; }
+		public Bitmap CaptchaImage { get => _captchaImage; private set => this.RaiseAndSetIfChanged(ref _captchaImage, value); }
+
+		private Bitmap _captchaImage;
+		private bool keepSwitching = true;
+		private readonly Task FrameSwitch;
+
+		public CaptchaDialogViewModel(string password, Bitmap[] gifFrames, int[] frameDelayMs)
+		{
+			Password = password;
+			if (gifFrames.Length == 1)
+			{
+				FrameSwitch = Task.CompletedTask;
+				CaptchaImage = gifFrames[0];
+			}
+			else
+			{
+				FrameSwitch = SwitchFramesAsync(gifFrames, frameDelayMs);
+			}
+		}
+
+		public async Task StopAsync()
+		{
+			keepSwitching = false;
+			await FrameSwitch;
+		}
+
+		private async Task SwitchFramesAsync(Bitmap[] gifFrames, int[] frameDelayMs)
+		{
+			int index = 0;
+			while(keepSwitching)
+			{
+				CaptchaImage = gifFrames[index];
+				await Task.Delay(frameDelayMs[index++]);
+
+				index %= gifFrames.Length;
+			}
+
+			foreach (var frame in gifFrames)
+				frame.Dispose();
+		}
+	}
 }

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

@@ -1,4 +1,3 @@
-using AudibleApi;
 using AudibleUtilities;
 using Avalonia;
 using Avalonia.Controls;
@@ -49,7 +48,7 @@ namespace LibationAvalonia.Dialogs.Login
 		protected override async Task SaveAndCloseAsync()
 		{
 			Serilog.Log.Logger.Information("Submit button clicked: {@DebugInfo}", new { ResponseUrl });
-			if (!Uri.TryCreate(ResponseUrl, UriKind.Absolute, out var result))
+			if (!Uri.TryCreate(ResponseUrl, UriKind.Absolute, out _))
 			{
 				await MessageBox.Show("Invalid response URL");
 				return;

Source/LibationAvalonia/Dialogs/Login/MfaDialog.axaml

@@ -2,9 +2,9 @@
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        mc:Ignorable="d" d:DesignWidth="400" d:DesignHeight="160"
-		MinWidth="400" MinHeight="160"
-		MaxWidth="400" MaxHeight="160"
+        mc:Ignorable="d" d:DesignWidth="400" d:DesignHeight="200"
+		MinWidth="400" MinHeight="200"
+		MaxWidth="400" MaxHeight="200"
         x:Class="LibationAvalonia.Dialogs.Login.MfaDialog"
         Title="Two-Step Verification"
 		Icon="/Assets/libation.ico">

Source/LibationAvalonia/Dialogs/Login/_2faCodeDialog.axaml

@@ -2,30 +2,41 @@
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        mc:Ignorable="d" d:DesignWidth="140" d:DesignHeight="100"
-		MinWidth="140" MinHeight="100"
-		MaxWidth="140" MaxHeight="100"
+        mc:Ignorable="d" d:DesignWidth="200" d:DesignHeight="200"
+		MinWidth="200" MinHeight="200"
+		MaxWidth="200" MaxHeight="200"
         x:Class="LibationAvalonia.Dialogs.Login._2faCodeDialog"
         Title="2FA Code"
 		Icon="/Assets/libation.ico">
 	
-	<Grid RowDefinitions="Auto,Auto,*">
+	<Grid
+		VerticalAlignment="Stretch"
+		ColumnDefinitions="*" Margin="5"
+		RowDefinitions="*,Auto,Auto,Auto">
+		
+		<TextBlock
+			TextAlignment="Center"
+			TextWrapping="Wrap"
+			Text="{Binding Prompt}" />
 		
 		<TextBlock
 			Margin="5"
+			Grid.Row="1"
 			TextAlignment="Center"
 			Text="Enter 2FA Code" />
-		
+
 		<TextBox
+			Name="_2FABox"
 			Margin="5,0,5,0"
-			Grid.Row="1"
+			Grid.Row="2"
+			HorizontalContentAlignment="Center"
 			Text="{Binding Code, Mode=TwoWay}" />
 		
 		<Button
 			Margin="5"
-			Grid.Row="2"
-			VerticalAlignment="Bottom"
+			Grid.Row="3"
 			HorizontalAlignment="Stretch"
+			HorizontalContentAlignment="Center"
 			Content="Submit"
 			Click="Submit_Click" />
 	</Grid>

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

@@ -1,4 +1,3 @@
-using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Markup.Xaml;
 using System.Threading.Tasks;
@@ -8,16 +7,20 @@ namespace LibationAvalonia.Dialogs.Login
 	public partial class _2faCodeDialog : DialogWindow
 	{
 		public string Code { get; set; }
+		public string Prompt { get; } = "For added security, please enter the One Time Password (OTP) generated by your Authenticator App";
+
 
 		public _2faCodeDialog()
 		{
-			InitializeComponent();
-			DataContext = this;
+			AvaloniaXamlLoader.Load(this);
+			_2FABox = this.FindControl<TextBox>(nameof(_2FABox));
 		}
 
-		private void InitializeComponent()
+		public _2faCodeDialog(string prompt) : this()
 		{
-			AvaloniaXamlLoader.Load(this);
+			Prompt = prompt;
+			DataContext = this;
+			Opened += (_, _) => _2FABox.Focus();
 		}
 
 		protected override Task SaveAndCloseAsync()

Source/LibationAvalonia/Dialogs/SettingsDialog.axaml

@@ -2,8 +2,8 @@
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        mc:Ignorable="d" d:DesignWidth="850" d:DesignHeight="620"
-		MinWidth="800" MinHeight="620"
+        mc:Ignorable="d" d:DesignWidth="900" d:DesignHeight="750"
+		MinWidth="900" MinHeight="700"
         x:Class="LibationAvalonia.Dialogs.SettingsDialog"
         xmlns:controls="clr-namespace:LibationAvalonia.Controls"
         Title="Edit Settings"
@@ -365,7 +365,6 @@
 									Text="{Binding DownloadDecryptSettings.InProgressDescriptionText}" />
 
 								<controls:DirectoryOrCustomSelectControl
-									SubDirectory="Libation"
 									Directory="{Binding DownloadDecryptSettings.InProgressDirectory, Mode=TwoWay}"
 									KnownDirectories="{Binding DownloadDecryptSettings.KnownDirectories}" />
 
@@ -377,7 +376,7 @@
 							Grid.Row="3"
 							Margin="5"
 							VerticalAlignment="Top"
-							IsVisible="{Binding IsWindows}"
+							IsVisible="{Binding !IsLinux}"
 							IsChecked="{Binding DownloadDecryptSettings.UseCoverAsFolderIcon, Mode=TwoWay}">
 
 							<TextBlock
@@ -604,6 +603,25 @@
 										</CheckBox>
 									</Grid>
 
+									<Grid Margin="5,5,5,0" RowDefinitions="Auto,Auto" ColumnDefinitions="Auto,*,Auto">
+
+										<TextBlock Margin="0,0,0,5" Text="Max audio sample rate:" />
+										<controls:WheelComboBox
+											Grid.Row="1"
+											HorizontalAlignment="Stretch"
+											Items="{Binding AudioSettings.SampleRates}"
+											SelectedItem="{Binding AudioSettings.SelectedSampleRate, Mode=TwoWay}"/>
+										
+										<TextBlock Margin="0,0,0,5" Grid.Column="2" Text="Encoder Quality:" />
+										
+										<controls:WheelComboBox
+											Grid.Column="2"
+											Grid.Row="1"
+											HorizontalAlignment="Stretch"
+											Items="{Binding AudioSettings.EncoderQualities}"
+											SelectedItem="{Binding AudioSettings.SelectedEncoderQuality, Mode=TwoWay}"/>
+									</Grid>
+
 									<controls:GroupBox
 										Margin="5,5,5,0"
 										BorderWidth="1"

Source/LibationAvalonia/Dialogs/SettingsDialog.axaml.cs

@@ -11,6 +11,7 @@ using System.Linq;
 using FileManager;
 using System.IO;
 using Avalonia.Collections;
+using LibationUiBase;
 
 namespace LibationAvalonia.Dialogs
 {
@@ -107,7 +108,8 @@ namespace LibationAvalonia.Dialogs
 			LoadSettings(config);
 		}
 
-		public bool IsWindows => AppScaffolding.LibationScaffolding.ReleaseIdentifier is AppScaffolding.ReleaseIdentifier.WindowsAvalonia;
+		public bool IsLinux => Configuration.IsLinux;
+		public bool IsWindows => Configuration.IsWindows;
 		public ImportantSettings ImportantSettings { get; private set; }
 		public ImportSettings ImportSettings { get; private set; }
 		public DownloadDecryptSettings DownloadDecryptSettings { get; private set; }
@@ -141,7 +143,7 @@ namespace LibationAvalonia.Dialogs
 
 		public void LoadSettings(Configuration config)
 		{
-			BooksDirectory = config.Books;
+			BooksDirectory = config.Books.PathWithoutPrefix;
 			SavePodcastsToParentFolder = config.SavePodcastsToParentFolder;
 			LoggingLevel = config.LogLevel;
 			BetaOptIn = config.BetaOptIn;
@@ -372,6 +374,31 @@ namespace LibationAvalonia.Dialogs
 		private int _lameBitrate;
 		private int _lameVBRQuality;
 		private string _chapterTitleTemplate;
+		public SampleRateSelection SelectedSampleRate { get; set; }
+		public NAudio.Lame.EncoderQuality SelectedEncoderQuality { get; set; }
+
+		public AvaloniaList<SampleRateSelection> SampleRates { get; }
+			= new(
+				new []
+				{
+					AAXClean.SampleRate.Hz_44100,
+					AAXClean.SampleRate.Hz_32000,
+					AAXClean.SampleRate.Hz_24000,
+					AAXClean.SampleRate.Hz_22050,
+					AAXClean.SampleRate.Hz_16000,
+					AAXClean.SampleRate.Hz_12000,
+				}
+				.Select(s => new SampleRateSelection(s)));
+
+		public AvaloniaList<NAudio.Lame.EncoderQuality> EncoderQualities { get; }
+		= new(
+			new[]
+			{
+				NAudio.Lame.EncoderQuality.High,
+				NAudio.Lame.EncoderQuality.Standard,
+				NAudio.Lame.EncoderQuality.Fast,
+			});
+
 
 		public AudioSettings(Configuration config)
 		{
@@ -398,6 +425,9 @@ namespace LibationAvalonia.Dialogs
 			LameMatchSource = config.LameMatchSourceBR;
 			LameBitrate = config.LameBitrate;
 			LameVBRQuality = config.LameVBRQuality;
+
+			SelectedSampleRate = SampleRates.FirstOrDefault(s => s.SampleRate == config.MaxSampleRate);
+			SelectedEncoderQuality = config.LameEncoderQuality;
 		}
 
 		public Task<bool> SaveSettingsAsync(Configuration config)
@@ -422,6 +452,9 @@ namespace LibationAvalonia.Dialogs
 			config.LameBitrate = LameBitrate;
 			config.LameVBRQuality = LameVBRQuality;
 
+			config.LameEncoderQuality = SelectedEncoderQuality;
+			config.MaxSampleRate = SelectedSampleRate?.SampleRate ?? config.MaxSampleRate;
+
 			return Task.FromResult(true);
 		}
 

Source/LibationAvalonia/Dialogs/TrashBinDialog.axaml

@@ -0,0 +1,66 @@
+<Window xmlns="https://github.com/avaloniaui"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        mc:Ignorable="d" d:DesignWidth="630" d:DesignHeight="480"
+        x:Class="LibationAvalonia.Dialogs.TrashBinDialog"
+		xmlns:controls="clr-namespace:LibationAvalonia.Controls"
+		MinWidth="630" MinHeight="480" 
+        Title="Trash Bin"
+		WindowStartupLocation="CenterOwner"
+		Icon="/Assets/libation.ico">
+	
+	<Grid
+		RowDefinitions="Auto,*,Auto">
+		
+		<TextBlock
+			Grid.Row="0"
+			Margin="5"
+			Text="Check books you want to permanently delete from or restore to Libation" />
+
+		<controls:CheckedListBox
+			Grid.Row="1"
+			Margin="5,0,5,0"
+			BorderThickness="1"
+			BorderBrush="Gray"
+			IsEnabled="{Binding	ControlsEnabled}"
+			Items="{Binding DeletedBooks}" />
+
+		<Grid
+			Grid.Row="2"
+			Margin="5"
+			ColumnDefinitions="Auto,Auto,*,Auto">
+
+			<CheckBox
+				IsEnabled="{Binding	ControlsEnabled}"
+				IsThreeState="True"
+				Margin="0,0,20,0"
+				IsChecked="{Binding EverythingChecked}"
+				Content="Everything" />
+			
+			<TextBlock
+				Grid.Column="1"
+				VerticalAlignment="Center"
+				Text="{Binding CheckedCountText}" />
+			
+			<Button
+				IsEnabled="{Binding	ControlsEnabled}"
+				Grid.Column="2"
+				Margin="0,0,20,0"
+				HorizontalAlignment="Right"
+				VerticalAlignment="Stretch"
+				VerticalContentAlignment="Center"
+				Content="Restore"
+				Click="Restore_Click" />
+			
+			<Button
+				IsEnabled="{Binding	ControlsEnabled}"
+				Grid.Column="3"
+				Click="EmptyTrash_Click" >
+				<TextBlock
+					TextAlignment="Center"
+					Text="Permanently Delete&#xa;from Libation" />
+			</Button>
+		</Grid>
+	</Grid>
+</Window>

Source/LibationAvalonia/Dialogs/TrashBinDialog.axaml.cs

@@ -0,0 +1,145 @@
+using ApplicationServices;
+using Avalonia.Collections;
+using Avalonia.Controls;
+using Avalonia.Threading;
+using DataLayer;
+using LibationAvalonia.Controls;
+using LibationAvalonia.ViewModels;
+using LibationFileManager;
+using ReactiveUI;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace LibationAvalonia.Dialogs
+{
+	public partial class TrashBinDialog : Window
+	{
+		TrashBinViewModel _viewModel;
+
+		public TrashBinDialog()
+		{
+			InitializeComponent();
+			this.RestoreSizeAndLocation(Configuration.Instance);
+			DataContext = _viewModel = new();
+
+			this.Closing += (_,_) => this.SaveSizeAndLocation(Configuration.Instance);
+		}
+
+		public async void EmptyTrash_Click(object sender, Avalonia.Interactivity.RoutedEventArgs e)
+			=> await _viewModel.PermanentlyDeleteCheckedAsync();
+		public async void Restore_Click(object sender, Avalonia.Interactivity.RoutedEventArgs e)
+			=> await _viewModel.RestoreCheckedAsync();
+	}
+
+	public class TrashBinViewModel : ViewModelBase, IDisposable
+	{
+		public AvaloniaList<CheckBoxViewModel> DeletedBooks { get; }
+		public string CheckedCountText => $"Checked : {_checkedBooksCount} of {_totalBooksCount}";
+
+		private bool _controlsEnabled = true;
+		public bool ControlsEnabled { get => _controlsEnabled; set=> this.RaiseAndSetIfChanged(ref _controlsEnabled, value); }
+
+		private bool? everythingChecked = false;
+		public bool? EverythingChecked
+		{
+			get => everythingChecked;
+			set
+			{
+				everythingChecked = value ?? false;
+
+				if (everythingChecked is true)
+					CheckAll();
+				else if (everythingChecked is false)
+					UncheckAll();
+			}
+		}
+
+		private int _totalBooksCount = 0;
+		private int _checkedBooksCount = -1;
+		public int CheckedBooksCount
+		{
+			get => _checkedBooksCount;
+			set
+			{
+				if (_checkedBooksCount != value)
+				{
+					_checkedBooksCount = value;
+					this.RaisePropertyChanged(nameof(CheckedCountText));
+				}
+
+				everythingChecked
+					= _checkedBooksCount == 0 || _totalBooksCount == 0 ? false
+					: _checkedBooksCount == _totalBooksCount ? true
+					: null;
+
+				this.RaisePropertyChanged(nameof(EverythingChecked));
+			}
+		}
+
+		public IEnumerable<LibraryBook> CheckedBooks => DeletedBooks.Where(i => i.IsChecked).Select(i => i.Item).Cast<LibraryBook>();
+
+		public TrashBinViewModel()
+		{
+			DeletedBooks = new()
+			{
+				ResetBehavior = ResetBehavior.Remove
+			};
+
+			tracker = DeletedBooks.TrackItemPropertyChanged(CheckboxPropertyChanged);
+			Reload();
+		}
+
+		public void CheckAll()
+		{
+			foreach (var item in DeletedBooks)
+				item.IsChecked = true;
+		}		
+
+		public void UncheckAll()
+		{
+			foreach (var item in DeletedBooks)
+				item.IsChecked = false;
+		}
+
+		public async Task RestoreCheckedAsync()
+		{
+			ControlsEnabled = false;
+			var qtyChanges = await Task.Run(CheckedBooks.RestoreBooks);
+			if (qtyChanges > 0)
+				Reload();
+			ControlsEnabled = true;
+		}
+
+		public async Task PermanentlyDeleteCheckedAsync()
+		{
+			ControlsEnabled = false;
+			var qtyChanges = await Task.Run(CheckedBooks.PermanentlyDeleteBooks);
+			if (qtyChanges > 0)
+				Reload();
+			ControlsEnabled = true;
+		}
+
+		private void Reload()
+		{
+			var deletedBooks = DbContexts.GetContext().GetDeletedLibraryBooks();
+
+			DeletedBooks.Clear();
+			DeletedBooks.AddRange(deletedBooks.Select(lb => new CheckBoxViewModel { Item = lb }));
+
+			_totalBooksCount = DeletedBooks.Count;
+			CheckedBooksCount = 0;
+		}
+
+		private IDisposable tracker;
+		private void CheckboxPropertyChanged(Tuple<object, PropertyChangedEventArgs> e)
+		{
+			if (e.Item2.PropertyName == nameof(CheckBoxViewModel.IsChecked))
+				CheckedBooksCount = DeletedBooks.Count(b => b.IsChecked);
+		}
+
+		public void Dispose() => tracker?.Dispose();
+	}
+}

Source/LibationAvalonia/LibationAvalonia.csproj

@@ -4,8 +4,6 @@
 	<PropertyGroup>
 		<OutputType>WinExe</OutputType>
 		<TargetFramework>net7.0</TargetFramework>
-		<!--Avalonia doesen't support TrimMode=link currently,but we are working on that https://github.com/AvaloniaUI/Avalonia/issues/6892 -->
-		<TrimMode>copyused</TrimMode>
 		<BuiltInComInteropSupport>true</BuiltInComInteropSupport>
 		<ApplicationIcon>libation.ico</ApplicationIcon>
 		<AssemblyName>Libation</AssemblyName>
@@ -17,13 +15,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'">
@@ -39,6 +31,8 @@
 	<ItemGroup>
 		<AvaloniaResource Include="Assets\**" />
 		<None Remove=".gitignore" />
+		<None Remove="Assets\Arrows_left.png" />
+		<None Remove="Assets\Arrows_right.png" />
 		<None Remove="Assets\Asterisk.png" />
 		<None Remove="Assets\cancel.png" />
 		<None Remove="Assets\completed.png" />
@@ -109,7 +103,7 @@
 		<PackageReference Include="Avalonia.Diagnostics" Version="11.0.0-preview4 " />
 		<PackageReference Include="Avalonia.ReactiveUI" Version="11.0.0-preview4" />
 		<PackageReference Include="Avalonia.Themes.Fluent" Version="11.0.0-preview4" />
-		<PackageReference Include="XamlNameReferenceGenerator" Version="1.5.1" />
+		<PackageReference Include="XamlNameReferenceGenerator" Version="1.6.1" />
 	</ItemGroup>
 
 	<ItemGroup>

Source/LibationAvalonia/Program.cs

@@ -2,9 +2,9 @@ using System;
 using System.Diagnostics;
 using System.IO;
 using System.Linq;
-using System.Reflection;
 using System.Threading.Tasks;
 using ApplicationServices;
+using AppScaffolding;
 using Avalonia;
 using Avalonia.Controls.ApplicationLifetimes;
 using Avalonia.ReactiveUI;
@@ -23,18 +23,15 @@ namespace LibationAvalonia
 				//We can do this because we're already executing inside the sandbox.
 				//Any process created in the sandbox executes in the same sandbox.
 				//Unfortunately, all sandbox files are read/execute, so no writing!
-
-				Assembly asm = Assembly.GetExecutingAssembly();
-				string path = Path.GetDirectoryName(asm.Location);
-				Process.Start("Hangover" + (Configuration.IsWindows ? ".exe" : ""));
+				Process.Start("Hangover");
 				return;
 			}
 			if (Configuration.IsMacOs && args?.Length > 0 && args[0] == "cli")
 			{
 				//Open a new Terminal in the sandbox
-				Assembly asm2 = Assembly.GetExecutingAssembly();
-				string libationProgramFiles = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);
-				Process.Start("/System/Applications/Utilities/Terminal.app/Contents/MacOS/Terminal", $"\"{libationProgramFiles}\"");
+				Process.Start(
+					"/System/Applications/Utilities/Terminal.app/Contents/MacOS/Terminal",
+					$"\"{Configuration.ProcessDirectory}\"");
 				return;
 			}
 
@@ -44,7 +41,7 @@ namespace LibationAvalonia
 			//                                               //
 			//***********************************************//
 			// Migrations which must occur before configuration is loaded for the first time. Usually ones which alter the Configuration
-			var config = AppScaffolding.LibationScaffolding.RunPreConfigMigrations();
+			var config = LibationScaffolding.RunPreConfigMigrations();
 
 			App.SetupRequired = !config.LibationSettingsAreValid;
 
@@ -52,13 +49,10 @@ namespace LibationAvalonia
 			var classicLifetimeTask = Task.Run(() => new ClassicDesktopStyleApplicationLifetime());
 			var appBuilderTask = Task.Run(BuildAvaloniaApp);
 
-			if (Configuration.IsWindows)
-				AppScaffolding.LibationScaffolding.SetReleaseIdentifier(AppScaffolding.ReleaseIdentifier.WindowsAvalonia);
-			else if (Configuration.IsLinux)
-				AppScaffolding.LibationScaffolding.SetReleaseIdentifier(AppScaffolding.ReleaseIdentifier.LinuxAvalonia);
-			else if (Configuration.IsMacOs)
-				AppScaffolding.LibationScaffolding.SetReleaseIdentifier(AppScaffolding.ReleaseIdentifier.MacOSAvalonia);
-			else return;
+			LibationScaffolding.SetReleaseIdentifier(Variety.Chardonnay);
+
+			if (LibationScaffolding.ReleaseIdentifier is ReleaseIdentifier.None)
+				return;
 
 
 			if (!App.SetupRequired)
@@ -85,8 +79,8 @@ namespace LibationAvalonia
 			try
 			{
 				// most migrations go in here
-				AppScaffolding.LibationScaffolding.RunPostConfigMigrations(config);
-				AppScaffolding.LibationScaffolding.RunPostMigrationScaffolding(config);
+				LibationScaffolding.RunPostConfigMigrations(config);
+				LibationScaffolding.RunPostMigrationScaffolding(config);
 
 				return true;
 			}

Source/LibationAvalonia/ViewModels/GridEntry.cs

@@ -35,18 +35,31 @@ namespace LibationAvalonia.ViewModels
 		#region Model properties exposed to the view
 
 		private Avalonia.Media.Imaging.Bitmap _cover;
-		public Avalonia.Media.Imaging.Bitmap Cover { get => _cover; protected set { this.RaiseAndSetIfChanged(ref _cover, value); } }
-		public string PurchaseDate { get; protected set; }
-		public string Series { get; protected set; }
-		public string Title { get; protected set; }
-		public string Length { get; protected set; }
-		public string Authors { get; protected set; }
-		public string Narrators { get; protected set; }
-		public string Category { get; protected set; }
-		public string Misc { get; protected set; }
-		public string Description { get; protected set; }
-		public Rating ProductRating { get; protected set; }
+		private string _purchasedate;
+		private string _series;
+		private string _title;
+		private string _length;
+		private string _authors;
+		private string _narrators;
+		private string _category;
+		private string _misc;
+		private LastDownloadStatus _lastDownload;
+		private string _description;
+		private Rating _productrating;
 		protected Rating _myRating;
+
+		public Avalonia.Media.Imaging.Bitmap Cover { get => _cover; protected set => this.RaiseAndSetIfChanged(ref _cover, value); }
+		public string PurchaseDate { get => _purchasedate; protected set => this.RaiseAndSetIfChanged(ref _purchasedate, value); }
+		public string Series { get => _series; protected set => this.RaiseAndSetIfChanged(ref _series, value); }
+		public string Title { get => _title; protected set => this.RaiseAndSetIfChanged(ref _title, value); }
+		public string Length { get => _length; protected set => this.RaiseAndSetIfChanged(ref _length, value); }
+		public string Authors { get => _authors; protected set => this.RaiseAndSetIfChanged(ref _authors, value); }
+		public string Narrators { get => _narrators; protected set => this.RaiseAndSetIfChanged(ref _narrators, value); }
+		public string Category { get => _category; protected set => this.RaiseAndSetIfChanged(ref _category, value); }
+		public LastDownloadStatus LastDownload { get => _lastDownload; protected set => this.RaiseAndSetIfChanged(ref _lastDownload, value); }
+		public string Misc { get => _misc; protected set => this.RaiseAndSetIfChanged(ref _misc, value); }
+		public string Description { get => _description; protected set => this.RaiseAndSetIfChanged(ref _description, value); }
+		public Rating ProductRating { get => _productrating; protected set => this.RaiseAndSetIfChanged(ref _productrating, value); }
 		public Rating MyRating
 		{
 			get => _myRating;
@@ -111,6 +124,7 @@ namespace LibationAvalonia.ViewModels
 			{ typeof(bool), new ObjectComparer<bool>() },
 			{ typeof(DateTime), new ObjectComparer<DateTime>() },
 			{ typeof(LiberateButtonStatus), new ObjectComparer<LiberateButtonStatus>() },
+			{ typeof(LastDownloadStatus), new ObjectComparer<LastDownloadStatus>() },
 		};
 
 		#endregion

Source/LibationAvalonia/ViewModels/LibraryBookEntry.cs

@@ -58,8 +58,22 @@ namespace LibationAvalonia.ViewModels
 
 		public LibraryBookEntry(LibraryBook libraryBook)
 		{
-			LibraryBook = libraryBook;
+			setLibraryBook(libraryBook);
 			LoadCover();
+		}
+
+		public void UpdateLibraryBook(LibraryBook libraryBook)
+		{
+			if (AudibleProductId != libraryBook.Book.AudibleProductId)
+				throw new Exception("Invalid grid entry update. IDs must match");
+
+			UserDefinedItem.ItemChanged -= UserDefinedItem_ItemChanged;
+			setLibraryBook(libraryBook);
+		}
+
+		private void setLibraryBook(LibraryBook libraryBook)
+		{
+			LibraryBook = libraryBook;
 
 			Title = Book.Title;
 			Series = Book.SeriesNames();
@@ -73,10 +87,12 @@ namespace LibationAvalonia.ViewModels
 			Narrators = Book.NarratorNames();
 			Category = string.Join(" > ", Book.CategoriesNames());
 			Misc = GetMiscDisplay(libraryBook);
+			LastDownload = new(Book.UserDefinedItem);
 			LongDescription = GetDescriptionDisplay(Book);
 			Description = TrimTextToWord(LongDescription, 62);
 			SeriesIndex = Book.SeriesLink.FirstOrDefault()?.Index ?? 0;
 
+			this.RaisePropertyChanged(nameof(MyRating));
 			UserDefinedItem.ItemChanged += UserDefinedItem_ItemChanged;
 		}
 
@@ -112,6 +128,10 @@ namespace LibationAvalonia.ViewModels
 					_pdfStatus = udi.PdfStatus;
 					this.RaisePropertyChanged(nameof(Liberate));
 					break;
+				case nameof(udi.LastDownloaded):
+					LastDownload = new(udi);
+					this.RaisePropertyChanged(nameof(LastDownload));
+					break;
 			}
 		}
 
@@ -134,6 +154,7 @@ namespace LibationAvalonia.ViewModels
 			{ nameof(Description), () => Description },
 			{ nameof(Category), () => Category },
 			{ nameof(Misc), () => Misc },
+			{ nameof(LastDownload), () => LastDownload },
 			{ nameof(BookTags), () => BookTags?.Tags ?? string.Empty },
 			{ nameof(Liberate), () => Liberate },
 			{ nameof(DateAdded), () => DateAdded },

Source/LibationAvalonia/ViewModels/MainWindowViewModel.cs

@@ -1,4 +1,5 @@
 using ApplicationServices;
+using Avalonia.Media.Imaging;
 using Dinah.Core;
 using LibationFileManager;
 using ReactiveUI;
@@ -25,6 +26,9 @@ namespace LibationAvalonia.ViewModels
 		public ProcessQueueViewModel ProcessQueue { get; } = new ProcessQueueViewModel();
 		public ProductsDisplayViewModel ProductsDisplay { get; } = new ProductsDisplayViewModel();
 
+		private double? _downloadProgress = null;
+		public double? DownloadProgress { get => _downloadProgress; set => this.RaiseAndSetIfChanged(ref _downloadProgress, value); }
+
 
 		/// <summary> Library filterting query </summary>
 		public string FilterString { get => _filterString; set => this.RaiseAndSetIfChanged(ref _filterString, value); }
@@ -132,15 +136,9 @@ namespace LibationAvalonia.ViewModels
 			set
 			{
 				this.RaiseAndSetIfChanged(ref _queueOpen, value);
-				QueueHideButtonText = _queueOpen? "❱❱❱" : "❰❰❰";
-				this.RaisePropertyChanged(nameof(QueueHideButtonText));
 			}
 		}
 
-		/// <summary> The Process Queue's Expand/Collapse button display text </summary>
-		public string QueueHideButtonText { get; private set; }
-
-
 
 		/// <summary> The number of books visible in the Product Display </summary>
 		public int VisibleCount

Source/LibationAvalonia/ViewModels/ProcessBookViewModel.cs

@@ -7,6 +7,7 @@ using AudibleApi;
 using AudibleApi.Common;
 using Avalonia.Media;
 using Avalonia.Media.Imaging;
+using Avalonia.Threading;
 using DataLayer;
 using Dinah.Core;
 using Dinah.Core.ErrorHandling;
@@ -60,12 +61,12 @@ namespace LibationAvalonia.ViewModels
 		#region Properties exposed to the view
 		public ProcessBookResult Result { get => _result; set { this.RaiseAndSetIfChanged(ref _result, value); this.RaisePropertyChanged(nameof(StatusText)); } }
 		public ProcessBookStatus Status { get => _status; set { this.RaiseAndSetIfChanged(ref _status, value); this.RaisePropertyChanged(nameof(BackgroundColor)); this.RaisePropertyChanged(nameof(IsFinished)); this.RaisePropertyChanged(nameof(IsDownloading)); this.RaisePropertyChanged(nameof(Queued)); } }
-		public string Narrator { get => _narrator; set { this.RaiseAndSetIfChanged(ref _narrator, value); } }
-		public string Author { get => _author; set { this.RaiseAndSetIfChanged(ref _author, value); } }
-		public string Title { get => _title; set { this.RaiseAndSetIfChanged(ref _title, value); } }
-		public int Progress { get => _progress; private set { this.RaiseAndSetIfChanged(ref _progress, value); } }
-		public string ETA { get => _eta; private set { this.RaiseAndSetIfChanged(ref _eta, value); } }
-		public Bitmap Cover { get => _cover; private set { this.RaiseAndSetIfChanged(ref _cover, value); } }
+		public string Narrator { get => _narrator; set => Dispatcher.UIThread.Post(() => this.RaiseAndSetIfChanged(ref _narrator, value)); }
+		public string Author { get => _author; set => Dispatcher.UIThread.Post(() => this.RaiseAndSetIfChanged(ref _author, value)); }
+		public string Title { get => _title; set => Dispatcher.UIThread.Post(() => this.RaiseAndSetIfChanged(ref _title, value)); }
+		public int Progress { get => _progress; private set => Dispatcher.UIThread.Post(() => this.RaiseAndSetIfChanged(ref _progress, value)); }
+		public string ETA { get => _eta; private  set => Dispatcher.UIThread.Post(() =>this.RaiseAndSetIfChanged(ref _eta, value)); }
+		public Bitmap Cover { get => _cover; private set => Dispatcher.UIThread.Post(() => this.RaiseAndSetIfChanged(ref _cover, value)); }
 		public bool IsFinished => Status is not ProcessBookStatus.Queued and not ProcessBookStatus.Working;
 		public bool IsDownloading => Status is ProcessBookStatus.Working;
 		public bool Queued => Status is ProcessBookStatus.Queued;
@@ -131,6 +132,7 @@ namespace LibationAvalonia.ViewModels
 		public async Task<ProcessBookResult> ProcessOneAsync()
 		{
 			string procName = CurrentProcessable.Name;
+			ProcessBookResult result = ProcessBookResult.None;
 			try
 			{
 				LinkProcessable(CurrentProcessable);
@@ -138,32 +140,34 @@ namespace LibationAvalonia.ViewModels
 				var statusHandler = await CurrentProcessable.ProcessSingleAsync(LibraryBook, validate: true);
 
 				if (statusHandler.IsSuccess)
-					return Result = ProcessBookResult.Success;
+					result = ProcessBookResult.Success;
 				else if (statusHandler.Errors.Contains("Cancelled"))
 				{
 					Logger.Info($"{procName}:  Process was cancelled - {LibraryBook.Book}");
-					return Result = ProcessBookResult.Cancelled;
+					result = ProcessBookResult.Cancelled;
 				}
 				else if (statusHandler.Errors.Contains("Validation failed"))
 				{
 					Logger.Info($"{procName}:  Validation failed - {LibraryBook.Book}");
-					return Result = ProcessBookResult.ValidationFail;
+					result = ProcessBookResult.ValidationFail;
+				}
+				else
+				{
+					foreach (var errorMessage in statusHandler.Errors)
+						Logger.Error($"{procName}:  {errorMessage}");
 				}
-
-				foreach (var errorMessage in statusHandler.Errors)
-					Logger.Error($"{procName}:  {errorMessage}");
 			}
 			catch (ContentLicenseDeniedException ldex)
 			{
 				if (ldex.AYCL?.RejectionReason is null or RejectionReason.GenericError)
 				{
 					Logger.Info($"{procName}:  Content license was denied, but this error appears to be caused by a temporary interruption of service. - {LibraryBook.Book}");
-					return Result = ProcessBookResult.LicenseDeniedPossibleOutage;
+					result = ProcessBookResult.LicenseDeniedPossibleOutage;
 				}
 				else
 				{
 					Logger.Info($"{procName}:  Content license denied. Check your Audible account to see if you have access to this title. - {LibraryBook.Book}");
-					return Result = ProcessBookResult.LicenseDenied;
+					result = ProcessBookResult.LicenseDenied;
 				}
 			}
 			catch (Exception ex)
@@ -172,18 +176,21 @@ namespace LibationAvalonia.ViewModels
 			}
 			finally
 			{
-				if (Result == ProcessBookResult.None)
-					Result = await showRetry(LibraryBook);
+				if (result == ProcessBookResult.None)
+					result = await showRetry(LibraryBook);
 
-				Status = Result switch
+				var status = result switch
 				{
 					ProcessBookResult.Success => ProcessBookStatus.Completed,
 					ProcessBookResult.Cancelled => ProcessBookStatus.Cancelled,
 					_ => ProcessBookStatus.Failed,
 				};
+
+				await Dispatcher.UIThread.InvokeAsync(() => Status = status);
 			}
 
-			return Result;
+			await Dispatcher.UIThread.InvokeAsync(() => Result = result);
+			return result;
 		}
 
 		public async Task CancelAsync()
@@ -294,9 +301,9 @@ namespace LibationAvalonia.ViewModels
 
 		#region Processable event handlers
 
-		private void Processable_Begin(object sender, LibraryBook libraryBook)
+		private async void Processable_Begin(object sender, LibraryBook libraryBook)
 		{
-			Status = ProcessBookStatus.Working;
+			await Dispatcher.UIThread.InvokeAsync(() => Status = ProcessBookStatus.Working);
 
 			Logger.Info($"{Environment.NewLine}{((Processable)sender).Name} Step, Begin: {libraryBook.Book}");
 

Source/LibationAvalonia/ViewModels/ProcessQueueViewModel.cs

@@ -1,4 +1,5 @@
 using ApplicationServices;
+using Avalonia.Collections;
 using Avalonia.Controls;
 using Avalonia.Threading;
 using DataLayer;
@@ -16,9 +17,8 @@ namespace LibationAvalonia.ViewModels
 	public class ProcessQueueViewModel : ViewModelBase, ILogForm
 	{
 		public ObservableCollection<LogEntry> LogEntries { get; } = new();
-		public TrackedQueue<ProcessBookViewModel> Items { get; } = new();
-
-		private TrackedQueue<ProcessBookViewModel> Queue => Items;
+		public AvaloniaList<ProcessBookViewModel> Items { get; } = new();
+		public TrackedQueue<ProcessBookViewModel> Queue { get; }
 		public ProcessBookViewModel SelectedItem { get; set; }
 		public Task QueueRunner { get; private set; }
 		public bool Running => !QueueRunner?.IsCompleted ?? false;
@@ -28,6 +28,7 @@ namespace LibationAvalonia.ViewModels
 		public ProcessQueueViewModel()
 		{
 			Logger = LogMe.RegisterForm(this);
+			Queue = new(Items);
 			Queue.QueuededCountChanged += Queue_QueuededCountChanged;
 			Queue.CompletedCountChanged += Queue_CompletedCountChanged;
 
@@ -88,19 +89,19 @@ namespace LibationAvalonia.ViewModels
 
 		public decimal SpeedLimitIncrement { get; private set; }
 
-		private void Queue_CompletedCountChanged(object sender, int e)
+		private async void Queue_CompletedCountChanged(object sender, int e)
 		{
 			int errCount = Queue.Completed.Count(p => p.Result is ProcessBookResult.FailedAbort or ProcessBookResult.FailedSkip or ProcessBookResult.FailedRetry or ProcessBookResult.ValidationFail);
 			int completeCount = Queue.Completed.Count(p => p.Result is ProcessBookResult.Success);
 
 			ErrorCount = errCount;
 			CompletedCount = completeCount;
-			Dispatcher.UIThread.Post(() => this.RaisePropertyChanged(nameof(Progress)));
+			await Dispatcher.UIThread.InvokeAsync(() => this.RaisePropertyChanged(nameof(Progress)));
 		}
-		private void Queue_QueuededCountChanged(object sender, int cueCount)
+		private async void Queue_QueuededCountChanged(object sender, int cueCount)
 		{
 			QueuedCount = cueCount;
-			Dispatcher.UIThread.Post(() => this.RaisePropertyChanged(nameof(Progress)));
+			await Dispatcher.UIThread.InvokeAsync(() => this.RaisePropertyChanged(nameof(Progress)));
 		}
 
 		public void WriteLine(string text)

Source/LibationAvalonia/ViewModels/ProductsDisplayViewModel.cs

@@ -10,8 +10,6 @@ using ApplicationServices;
 using AudibleUtilities;
 using LibationAvalonia.Dialogs.Login;
 using Avalonia.Collections;
-using LibationSearchEngine;
-using Octokit.Internal;
 
 namespace LibationAvalonia.ViewModels
 {
@@ -22,11 +20,11 @@ namespace LibationAvalonia.ViewModels
 		public event EventHandler<int> RemovableCountChanged;
 
 		/// <summary>Backing list of all grid entries</summary>
-		private readonly List<GridEntry> SOURCE = new();
+		private readonly AvaloniaList<GridEntry> SOURCE = new();
 		/// <summary>Grid entries included in the filter set. If null, all grid entries are shown</summary>
 		private List<GridEntry> FilteredInGridEntries;
 		public string FilterString { get; private set; }
-		public DataGridCollectionView GridEntries { get; }
+		public DataGridCollectionView GridEntries { get; private set; }
 
 		private bool _removeColumnVisivle;
 		public bool RemoveColumnVisivle { get => _removeColumnVisivle; private set => this.RaiseAndSetIfChanged(ref _removeColumnVisivle, value); }
@@ -44,58 +42,60 @@ namespace LibationAvalonia.ViewModels
 		public ProductsDisplayViewModel()
 		{
 			SearchEngineCommands.SearchEngineUpdated += SearchEngineCommands_SearchEngineUpdated;
-			GridEntries = new(SOURCE);
-			GridEntries.Filter = CollectionFilter;
+			VisibleCountChanged?.Invoke(this, 0);
+		}
 
-			GridEntries.CollectionChanged += (s, e)
-				=> VisibleCountChanged?.Invoke(this, GridEntries.OfType<LibraryBookEntry>().Count());
+		private static readonly System.Reflection.MethodInfo SetFlagsMethod;
+
+		/// <summary>
+		/// Tells the <see cref="DataGridCollectionView"/> whether it should process changes to the underlying collection
+		/// </summary>
+		/// <remarks> DataGridCollectionView.CollectionViewFlags.ShouldProcessCollectionChanged = 4</remarks>
+		private void SetShouldProcessCollectionChanged(bool flagSet)
+			=> SetFlagsMethod.Invoke(GridEntries, new object[] { 4, flagSet });
+
+		static ProductsDisplayViewModel()
+		{
+			/*
+			 * When a book is removed from the library, SearchEngineUpdated is fired before LibrarySizeChanged, so
+			 * the book is removed from the filtered set and the grid is refreshed before RemoveBooks() is ever
+			 * called.
+			 * 
+			 * To remove an item from DataGridCollectionView, it must be be in the current filtered view. If it's
+			 * not and you try to remove the book from the source list, the source will fire NotifyCollectionChanged
+			 * on an invalid item and the DataGridCollectionView will throw an exception. There are two ways to
+			 * remove an item that is filtered out of the DataGridCollectionView:
+			 * 
+			 * (1)  Re-add the item to the filtered-in list and refresh the grid so DataGridCollectionView knows
+			 *		that the item is present. This causes the whole grid to flicker to refresh twice in rapid
+			 *		succession, which is undesirable.
+			 *		
+			 * (2)  Remove it from the underlying collection and suppress NotifyCollectionChanged. This is the
+			 *		method used. Steps to complete a removal using this method:
+			 *		
+			 *		(a)	Set DataGridCollectionView.CollectionViewFlags.ShouldProcessCollectionChanged to false.
+			 *		(b) Remove the item from the source list. The source will fire NotifyCollectionChanged, but the
+			 *			DataGridCollectionView will ignore it.
+			 *		(c) Reset the flag to true.
+			 */
+
+			SetFlagsMethod =
+				typeof(DataGridCollectionView)
+				.GetMethod("SetFlag", System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Instance);
 		}
 
 		#region Display Functions
 
-		/// <summary>
-		/// Call when there's been a change to the library
-		/// </summary>
-		public async Task DisplayBooksAsync(List<LibraryBook> dbBooks)
+		internal void BindToGrid(List<LibraryBook> dbBooks)
 		{
-			try
+			GridEntries = new(SOURCE)
 			{
-				var existingSeriesEntries = SOURCE.SeriesEntries().ToList();
+				Filter = CollectionFilter
+			};
 
-				SOURCE.Clear();
-				SOURCE.AddRange(CreateGridEntries(dbBooks));
+			GridEntries.CollectionChanged += (_, _)
+				=> VisibleCountChanged?.Invoke(this, GridEntries.OfType<LibraryBookEntry>().Count());
 
-				//If replacing the list, preserve user's existing collapse/expand
-				//state. When resetting a list, default state is cosed.
-				foreach (var series in existingSeriesEntries)
-				{
-					var sEntry = SOURCE.FirstOrDefault(ge => ge.AudibleProductId == series.AudibleProductId);
-					if (sEntry is SeriesEntry se)
-						se.Liberate.Expanded = series.Liberate.Expanded;
-				}
-
-				//Run query on new list
-				FilteredInGridEntries = QueryResults(SOURCE, FilterString);
-
-				await refreshGrid();
-
-			}
-			catch (Exception ex)
-			{
-				Serilog.Log.Error(ex, "Error displaying library in {0}", nameof(ProductsDisplayViewModel));
-			}
-		}
-
-		private async Task refreshGrid()
-		{
-			if (GridEntries.IsEditingItem)
-				await Dispatcher.UIThread.InvokeAsync(GridEntries.CommitEdit);
-
-			await Dispatcher.UIThread.InvokeAsync(GridEntries.Refresh);
-		}
-
-		private static List<GridEntry> CreateGridEntries(IEnumerable<LibraryBook> dbBooks)
-		{
 			var geList = dbBooks
 				.Where(lb => lb.Book.IsProduct())
 				.Select(b => new LibraryBookEntry(b))
@@ -104,26 +104,159 @@ namespace LibationAvalonia.ViewModels
 
 			var episodes = dbBooks.Where(lb => lb.Book.IsEpisodeChild());
 
-			foreach (var parent in dbBooks.Where(lb => lb.Book.IsEpisodeParent()))
+			var seriesBooks = dbBooks.Where(lb => lb.Book.IsEpisodeParent()).ToList();
+
+			foreach (var parent in seriesBooks)
 			{
 				var seriesEpisodes = episodes.FindChildren(parent);
 
 				if (!seriesEpisodes.Any()) continue;
 
 				var seriesEntry = new SeriesEntry(parent, seriesEpisodes);
+				seriesEntry.Liberate.Expanded = false;
 
 				geList.Add(seriesEntry);
 				geList.AddRange(seriesEntry.Children);
 			}
 
-			var bookList =  geList.OrderByDescending(e => e.DateAdded).ToList();
+			//Create the filtered-in list before adding entries to avoid a refresh
+			FilteredInGridEntries = QueryResults(geList, FilterString);
+			SOURCE.AddRange(geList.OrderByDescending(e => e.DateAdded));
+		}
 
-			//ListIndex is used by RowComparer to make column sort stable
-			int index = 0;
-			foreach (GridEntry di in bookList)
-				di.ListIndex = index++;
+		/// <summary>
+		/// Call when there's been a change to the library
+		/// </summary>
+		internal async Task UpdateGridAsync(List<LibraryBook> dbBooks)
+		{
+			#region Add new or update existing grid entries
 
-			return bookList;
+			//Add absent entries to grid, or update existing entry
+			var allEntries = SOURCE.BookEntries();
+			var seriesEntries = SOURCE.SeriesEntries().ToList();
+			var parentedEpisodes = dbBooks.ParentedEpisodes();
+
+			await Dispatcher.UIThread.InvokeAsync(() =>
+			{
+				foreach (var libraryBook in dbBooks.OrderBy(e => e.DateAdded))
+				{
+					var existingEntry = allEntries.FindByAsin(libraryBook.Book.AudibleProductId);
+
+					if (libraryBook.Book.IsProduct())
+						UpsertBook(libraryBook, existingEntry);
+					else if (parentedEpisodes.Any(lb => lb == libraryBook))
+						//Only try to add or update is this LibraryBook is a know child of a parent
+						UpsertEpisode(libraryBook, existingEntry, seriesEntries, dbBooks);
+				}
+			});
+
+			#endregion
+
+			#region Remove entries no longer in the library
+
+			//Rapid successive book removals will cause changes to SOURCE after the update has
+			//begun but before it has completed, so perform all updates on a copy of the list.
+			var sourceSnapshot = SOURCE.ToList();
+
+			// remove deleted from grid.
+			// note: actual deletion from db must still occur via the RemoveBook feature. deleting from audible will not trigger this
+			var removedBooks =
+				sourceSnapshot
+				.BookEntries()
+				.ExceptBy(dbBooks.Select(lb => lb.Book.AudibleProductId), ge => ge.AudibleProductId);
+
+			//Remove books in series from their parents' Children list
+			foreach (var removed in removedBooks.Where(b => b.Parent is not null))
+				removed.Parent.RemoveChild(removed);
+
+			//Remove series that have no children
+			var removedSeries = sourceSnapshot.EmptySeries();
+
+			await Dispatcher.UIThread.InvokeAsync(() => RemoveBooks(removedBooks, removedSeries));
+
+			#endregion
+
+			await Filter(FilterString);
+			GC.Collect(GC.MaxGeneration, GCCollectionMode.Aggressive, true, true);
+		}
+
+		private void RemoveBooks(IEnumerable<LibraryBookEntry> removedBooks, IEnumerable<SeriesEntry> removedSeries)
+		{
+			foreach (var removed in removedBooks.Cast<GridEntry>().Concat(removedSeries).Where(b => b is not null).ToList())
+			{
+				if (GridEntries.PassesFilter(removed))
+					GridEntries.Remove(removed);
+				else
+				{
+					SetShouldProcessCollectionChanged(false);
+					SOURCE.Remove(removed);
+					SetShouldProcessCollectionChanged(true);
+				}
+			}
+		}
+
+		private void UpsertBook(LibraryBook book, LibraryBookEntry existingBookEntry)
+		{
+			if (existingBookEntry is null)
+				// Add the new product to top
+				SOURCE.Insert(0, new LibraryBookEntry(book));
+			else
+				// update existing
+				existingBookEntry.UpdateLibraryBook(book);
+		}
+
+		private void UpsertEpisode(LibraryBook episodeBook, LibraryBookEntry existingEpisodeEntry, List<SeriesEntry> seriesEntries, IEnumerable<LibraryBook> dbBooks)
+		{
+			if (existingEpisodeEntry is null)
+			{
+				LibraryBookEntry episodeEntry;
+
+				var seriesEntry = seriesEntries.FindSeriesParent(episodeBook);
+
+				if (seriesEntry is null)
+				{
+					//Series doesn't exist yet, so create and add it
+					var seriesBook = dbBooks.FindSeriesParent(episodeBook);
+
+					if (seriesBook is null)
+					{
+						//This is only possible if the user's db  has some malformed
+						//entries from earlier Libation releases that could not be
+						//automatically fixed. Log, but don't throw.
+						Serilog.Log.Logger.Error("Episode={0}, Episode Series: {1}", episodeBook, episodeBook.Book.SeriesNames());
+						return;
+					}
+
+					seriesEntry = new SeriesEntry(seriesBook, new[] { episodeBook });
+					seriesEntries.Add(seriesEntry);
+
+					episodeEntry = seriesEntry.Children[0];
+					seriesEntry.Liberate.Expanded = true;
+					SOURCE.Insert(0, seriesEntry);
+				}
+				else
+				{
+					//Series exists. Create and add episode child then update the SeriesEntry
+					episodeEntry = new(episodeBook) { Parent = seriesEntry };
+					seriesEntry.Children.Add(episodeEntry);
+					var seriesBook = dbBooks.Single(lb => lb.Book.AudibleProductId == seriesEntry.LibraryBook.Book.AudibleProductId);
+					seriesEntry.UpdateLibraryBook(seriesBook);
+				}
+
+				//Add episode to the grid beneath the parent
+				int seriesIndex = SOURCE.IndexOf(seriesEntry);
+				SOURCE.Insert(seriesIndex + 1, episodeEntry);
+			}
+			else
+				existingEpisodeEntry.UpdateLibraryBook(episodeBook);
+		}
+
+		private async Task refreshGrid()
+		{
+			if (GridEntries.IsEditingItem)
+				await Dispatcher.UIThread.InvokeAsync(GridEntries.CommitEdit);
+
+			await Dispatcher.UIThread.InvokeAsync(GridEntries.Refresh);
 		}
 
 		public async Task ToggleSeriesExpanded(SeriesEntry seriesEntry)
@@ -139,9 +272,6 @@ namespace LibationAvalonia.ViewModels
 
 		public async Task Filter(string searchString)
 		{
-			if (searchString == FilterString)
-				return;
-
 			FilterString = searchString;
 
 			if (SOURCE.Count == 0)
@@ -164,7 +294,7 @@ namespace LibationAvalonia.ViewModels
 			return FilteredInGridEntries.Contains(item);
 		}
 
-		private static List<GridEntry> QueryResults(List<GridEntry> entries, string searchString)
+		private static List<GridEntry> QueryResults(IEnumerable<GridEntry> entries, string searchString)
 		{
 			if (string.IsNullOrEmpty(searchString)) return null;
 
@@ -207,10 +337,10 @@ namespace LibationAvalonia.ViewModels
 			if (selectedBooks.Count == 0)
 				return;
 
-			var libraryBooks = selectedBooks.Select(rge => rge.LibraryBook).ToList();
+			var booksToRemove = selectedBooks.Select(rge => rge.LibraryBook).ToList();
 			var result = await MessageBox.ShowConfirmationDialog(
 				null,
-				libraryBooks,
+				booksToRemove,
 				// do not use `$` string interpolation. See impl.
 				"Are you sure you want to remove {0} from Libation's library?",
 				"Remove books from Libation?");
@@ -221,8 +351,6 @@ namespace LibationAvalonia.ViewModels
 			foreach (var book in selectedBooks)
 				book.PropertyChanged -= GridEntry_PropertyChanged;
 
-			var idsToRemove = libraryBooks.Select(lb => lb.Book.AudibleProductId).ToList();
-
 			void BindingList_CollectionChanged(object sender, System.Collections.Specialized.NotifyCollectionChangedEventArgs e)
 			{
 				if (e.Action != System.Collections.Specialized.NotifyCollectionChangedAction.Reset)
@@ -241,7 +369,7 @@ namespace LibationAvalonia.ViewModels
 
 			//The RemoveBooksAsync will fire LibrarySizeChanged, which calls ProductsDisplay2.Display(),
 			//so there's no need to remove books from the grid display here.
-			var removeLibraryBooks = await LibraryCommands.RemoveBooksAsync(idsToRemove);
+			await booksToRemove.RemoveBooksAsync();
 
 			RemovableCountChanged?.Invoke(this, 0);
 		}

Source/LibationAvalonia/ViewModels/QueryExtensions.cs

@@ -14,6 +14,12 @@ namespace LibationAvalonia.ViewModels
 		public static IEnumerable<SeriesEntry> SeriesEntries(this IEnumerable<GridEntry> gridEntries)
 			=> gridEntries.OfType<SeriesEntry>();
 
+		public static T? FindByAsin<T>(this IEnumerable<T> gridEntries, string audibleProductID) where T : GridEntry
+			=> gridEntries.FirstOrDefault(i => i.AudibleProductId == audibleProductID);
+
+		public static IEnumerable<SeriesEntry> EmptySeries(this IEnumerable<GridEntry> gridEntries)
+			=> gridEntries.SeriesEntries().Where(i => i.Children.Count == 0);
+
 		public static SeriesEntry? FindSeriesParent(this IEnumerable<GridEntry> gridEntries, LibraryBook seriesEpisode)
 		{
 			if (seriesEpisode.Book.SeriesLink is null) return null;

Source/LibationAvalonia/ViewModels/SeriesEntry.cs

@@ -56,15 +56,36 @@ namespace LibationAvalonia.ViewModels
 		{
 			Liberate = new LiberateButtonStatus(IsSeries);
 			SeriesIndex = -1;
-			LibraryBook = parent;
-
-			LoadCover();
 
 			Children = children
 				.Select(c => new LibraryBookEntry(c) { Parent = this })
 				.OrderBy(c => c.SeriesIndex)
 				.ToList();
 
+			setLibraryBook(parent);
+			LoadCover();
+		}
+
+		public void RemoveChild(LibraryBookEntry lbe)
+		{
+			Children.Remove(lbe);
+			PurchaseDate = Children.Min(c => c.LibraryBook.DateAdded).ToString("d");
+			int bookLenMins = Children.Sum(c => c.LibraryBook.Book.LengthInMinutes);
+			Length = bookLenMins == 0 ? "" : $"{bookLenMins / 60} hr {bookLenMins % 60} min";
+		}
+
+		public void UpdateLibraryBook(LibraryBook libraryBook)
+		{
+			if (AudibleProductId != libraryBook.Book.AudibleProductId)
+				throw new Exception("Invalid grid entry update. IDs must match");
+
+			setLibraryBook(libraryBook);
+		}
+
+		private void setLibraryBook(LibraryBook libraryBook)
+		{
+			LibraryBook = libraryBook;
+
 			Title = Book.Title;
 			Series = Book.SeriesNames();
 			//Ratings are changed using Update(), which is a problem for Avalonia data bindings because
@@ -75,12 +96,15 @@ namespace LibationAvalonia.ViewModels
 			Narrators = Book.NarratorNames();
 			Category = string.Join(" > ", Book.CategoriesNames());
 			Misc = GetMiscDisplay(LibraryBook);
+			LastDownload = new();
 			LongDescription = GetDescriptionDisplay(Book);
 			Description = TrimTextToWord(LongDescription, 62);
 
 			PurchaseDate = Children.Min(c => c.LibraryBook.DateAdded).ToString("d");
 			int bookLenMins = Children.Sum(c => c.LibraryBook.Book.LengthInMinutes);
 			Length = bookLenMins == 0 ? "" : $"{bookLenMins / 60} hr {bookLenMins % 60} min";
+
+			this.RaisePropertyChanged(nameof(MyRating));
 		}
 
 
@@ -101,6 +125,7 @@ namespace LibationAvalonia.ViewModels
 			{ nameof(Description), () => Description },
 			{ nameof(Category), () => Category },
 			{ nameof(Misc), () => Misc },
+			{ nameof(LastDownload), () => LastDownload },
 			{ nameof(BookTags), () => BookTags?.Tags ?? string.Empty },
 			{ nameof(Liberate), () => Liberate },
 			{ nameof(DateAdded), () => DateAdded },

Source/LibationAvalonia/Views/MainWindow.Export.cs

@@ -26,10 +26,23 @@ namespace LibationAvalonia.Views
 					ShowOverwritePrompt = true,
 					FileTypeChoices = new FilePickerFileType[]
 					{
-						new("Excel Workbook (*.xlsx)") { Patterns = new[] { "*.xlsx" } },
-						new("CSV files (*.csv)") { Patterns = new[] { "*.csv" } },
-						new("JSON files (*.json)") { Patterns = new[] { "*.json" } },
-						new("All files (*.*)") { Patterns = new[] { "*" } },
+						new("Excel Workbook (*.xlsx)")
+						{
+							Patterns = new[] { "*.xlsx" },
+							//https://gist.github.com/RhetTbull/7221ef3cfd9d746f34b2550d4419a8c2
+							AppleUniformTypeIdentifiers = new[] { "org.openxmlformats.spreadsheetml.sheet" }
+						},
+						new("CSV files (*.csv)")
+						{
+							Patterns = new[] { "*.csv" },
+							AppleUniformTypeIdentifiers = new[] { "public.comma-separated-values-text" }
+						},
+						new("JSON files (*.json)")
+						{
+							Patterns = new[] { "*.json" },
+							AppleUniformTypeIdentifiers = new[] { "public.json" }
+						},
+						new("All files (*.*)") { Patterns = new[] { "*" } }
 					}
 				};
 

Source/LibationAvalonia/Views/MainWindow.ProcessQueue.cs

@@ -47,6 +47,23 @@ namespace LibationAvalonia.Views
 				Serilog.Log.Logger.Error(ex, "An error occurred while handling the stop light button click for {libraryBook}", libraryBook);
 			}
 		}
+
+		public void ProductsDisplay_ConvertToMp3Clicked(object sender, LibraryBook libraryBook)
+		{
+			try
+			{
+				if (libraryBook.Book.UserDefinedItem.BookStatus is LiberatedStatus.Liberated)
+				{
+					Serilog.Log.Logger.Information("Begin single pdf backup of {libraryBook}", libraryBook);
+					SetQueueCollapseState(false);
+					_viewModel.ProcessQueue.AddConvertMp3(libraryBook);
+				}
+			}
+			catch (Exception ex)
+			{
+				Serilog.Log.Logger.Error(ex, "An error occurred while handling the stop light button click for {libraryBook}", libraryBook);
+			}
+		}
 		private void SetQueueCollapseState(bool collapsed)
 		{
 			_viewModel.QueueOpen = !collapsed;

Source/LibationAvalonia/Views/MainWindow.RemoveBooks.cs

@@ -1,4 +1,5 @@
 using AudibleUtilities;
+using LibationAvalonia.Dialogs;
 using System;
 using System.Linq;
 
@@ -15,6 +16,12 @@ namespace LibationAvalonia.Views
 			_viewModel.RemoveButtonsVisible = false;
 		}
 
+		public async void openTrashBinToolStripMenuItem_Click(object sender, Avalonia.Interactivity.RoutedEventArgs e)
+		{
+			var trash = new TrashBinDialog();
+			await trash.ShowDialog(this);
+		}
+
 		public void removeLibraryBooksToolStripMenuItem_Click(object sender, Avalonia.Interactivity.RoutedEventArgs e)
 		{
 			// if 0 accounts, this will not be visible

Source/LibationAvalonia/Views/MainWindow.ScanAuto.cs

@@ -9,7 +9,6 @@ using System.Linq;
 
 namespace LibationAvalonia.Views
 {
-	//DONE
 	public partial class MainWindow
 	{
 		private InterruptableTimer autoScanTimer;
@@ -17,11 +16,7 @@ namespace LibationAvalonia.Views
 		private void Configure_ScanAuto()
 		{
 			// creating InterruptableTimer inside 'Configure_' is a break from the pattern. As long as no one else needs to access or subscribe to it, this is ok
-			var hours = 0;
-			var minutes = 5;
-			var seconds = 0;
-			var _5_minutes = new TimeSpan(hours, minutes, seconds);
-			autoScanTimer = new InterruptableTimer(_5_minutes);
+			autoScanTimer = new InterruptableTimer(TimeSpan.FromMinutes(5));
 
 			// subscribe as async/non-blocking. I'd actually rather prefer blocking but real-world testing found that caused a deadlock in the AudibleAPI
 			autoScanTimer.Elapsed += async (_, __) =>
@@ -44,9 +39,9 @@ namespace LibationAvalonia.Views
 			};
 
 			_viewModel.AutoScanChecked = Configuration.Instance.AutoScan;
-
+			
 			// if enabled: begin on load
-			Load += startAutoScan;
+			Opened += startAutoScan;
 
 			// if new 'default' account is added, run autoscan
 			AccountsSettingsPersister.Saving += accountsPreSave;

Source/LibationAvalonia/Views/MainWindow.Update.cs

@@ -1,79 +0,0 @@
-using AppScaffolding;
-using LibationAvalonia.Dialogs;
-using LibationFileManager;
-using System;
-using System.IO;
-using System.Threading.Tasks;
-
-namespace LibationAvalonia.Views
-{
-    public partial class MainWindow
-    {
-		private void Configure_Update()
-		{
-			Opened += async (_, _) => await checkForUpdates();
-		}
-
-		private async Task checkForUpdates()
-		{
-			async Task<string> downloadUpdate(UpgradeProperties upgradeProperties)
-			{
-				if (upgradeProperties.ZipUrl is null)
-				{
-					Serilog.Log.Logger.Information("Download link for new version not found");
-					return null;
-				}
-
-				//Silently download the update in the background, save it to a temp file.
-
-				var zipFile = Path.Combine(Path.GetTempPath(), Path.GetFileName(upgradeProperties.ZipUrl));
-				try
-				{
-					System.Net.Http.HttpClient cli = new();
-					using var fs = File.OpenWrite(zipFile);
-					using var dlStream = await cli.GetStreamAsync(new Uri(upgradeProperties.ZipUrl));
-					await dlStream.CopyToAsync(fs);
-				}
-				catch (Exception ex)
-				{
-					Serilog.Log.Logger.Error(ex, "Failed to download the update: {pdate}", upgradeProperties.ZipUrl);
-					return null;
-				}
-				return zipFile;
-			}
-
-			try
-			{
-				var upgradeProperties = await Task.Run(LibationScaffolding.GetLatestRelease);
-				if (upgradeProperties is null) return;
-
-				const string ignoreUpdate = "IgnoreUpdate";
-				var config = Configuration.Instance;
-
-				if (config.GetString(propertyName: ignoreUpdate) == upgradeProperties.LatestRelease.ToString())
-					return;
-
-				var interop = InteropFactory.Create();
-
-				var notificationResult = await new UpgradeNotificationDialog(upgradeProperties, interop.CanUpdate).ShowDialog<DialogResult>(this);
-
-				if (notificationResult == DialogResult.Ignore)
-					config.SetString(upgradeProperties.LatestRelease.ToString(), ignoreUpdate);
-
-				if (notificationResult != DialogResult.OK) return;
-
-				//Download the update file in the background,
-				string updateBundle = await downloadUpdate(upgradeProperties);
-
-				if (string.IsNullOrEmpty(updateBundle) || !File.Exists(updateBundle)) return;
-
-				//Install the update
-				interop.InstallUpdate(updateBundle);
-			}
-			catch (Exception ex)
-			{
-				Serilog.Log.Logger.Error(ex, "An error occured while checking for app updates.");
-			}
-		}
-    }
-}

Source/LibationAvalonia/Views/MainWindow.Upgrade.cs

@@ -0,0 +1,34 @@
+using Avalonia.Threading;
+using LibationAvalonia.Dialogs;
+using LibationUiBase;
+using System.Threading.Tasks;
+
+namespace LibationAvalonia.Views
+{
+    public partial class MainWindow
+    {
+		private void Configure_Upgrade()
+		{
+			setProgressVisible(false);
+#if !DEBUG
+			async Task upgradeAvailable(UpgradeEventArgs e)
+			{
+				var notificationResult = await new UpgradeNotificationDialog(e.UpgradeProperties, e.CapUpgrade).ShowDialogAsync(this);
+
+				e.Ignore = notificationResult == DialogResult.Ignore;
+				e.InstallUpgrade = notificationResult == DialogResult.OK;
+			}
+
+			var upgrader = new Upgrader();
+			upgrader.DownloadProgress += async (_, e) => await Dispatcher.UIThread.InvokeAsync(() => _viewModel.DownloadProgress = e.ProgressPercentage);
+			upgrader.DownloadBegin += async (_, _) => await Dispatcher.UIThread.InvokeAsync(() => setProgressVisible(true));
+			upgrader.DownloadCompleted += async (_, _) => await Dispatcher.UIThread.InvokeAsync(() => setProgressVisible(false));
+
+			Opened += async (_, _) => await upgrader.CheckForUpgradeAsync(upgradeAvailable);
+#endif
+		}
+
+		private void setProgressVisible(bool visible) => _viewModel.DownloadProgress = visible ? 0 : null;
+
+	}
+}

Source/LibationAvalonia/Views/MainWindow.VisibleBooks.cs

@@ -144,11 +144,8 @@ namespace LibationAvalonia.Views
 				"Remove books from Libation?",
 				MessageBoxDefaultButton.Button2);
 
-			if (confirmationResult != DialogResult.Yes)
-				return;
-
-			var visibleIds = visibleLibraryBooks.Select(lb => lb.Book.AudibleProductId).ToList();
-			await LibraryCommands.RemoveBooksAsync(visibleIds);
+			if (confirmationResult is DialogResult.Yes)
+				await visibleLibraryBooks.RemoveBooksAsync();
 		}
 		public async void ProductsDisplay_VisibleCountChanged(object sender, int qty)
 		{

Source/LibationAvalonia/Views/MainWindow.axaml

@@ -131,6 +131,7 @@
 						<MenuItem Click="accountsToolStripMenuItem_Click" Header="_Accounts..." />
 						<MenuItem Click="basicSettingsToolStripMenuItem_Click" Header="_Settings..." />
 						<Separator />
+						<MenuItem Click="openTrashBinToolStripMenuItem_Click" Header="Trash Bin" />
 						<MenuItem Click="launchHangoverToolStripMenuItem_Click" Header="Launch _Hangover" />
 						<Separator />
 						<MenuItem Click="aboutToolStripMenuItem_Click" Header="A_bout..." />
@@ -172,7 +173,12 @@
 
 				<StackPanel Grid.Column="2" Height="30" Orientation="Horizontal">
 					<Button Click="filterBtn_Click" Height="30" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" Content="Filter"/>
-					<Button Padding="5,0,5,0" Click="ToggleQueueHideBtn_Click" Content="{Binding QueueHideButtonText}"/>
+					<Button Padding="5,0,5,0" Click="ToggleQueueHideBtn_Click">
+						<Panel>
+							<Image Stretch="None" IsVisible="{Binding !QueueOpen}" Source="/Assets/Arrows_left.png" />
+							<Image Stretch="None" IsVisible="{Binding QueueOpen}" Source="/Assets/Arrows_right.png" />
+						</Panel>
+					</Button>
 				</StackPanel>
 
 			</Grid>
@@ -188,14 +194,22 @@
 					<views:ProductsDisplay
 						Name="productsDisplay"
 						DataContext="{Binding ProductsDisplay}"						
-						LiberateClicked="ProductsDisplay_LiberateClicked"/>				
+						LiberateClicked="ProductsDisplay_LiberateClicked"
+						ConvertToMp3Clicked="ProductsDisplay_ConvertToMp3Clicked" />				
 				</SplitView>
 			</Border>
 
 			<!-- Bottom Status Strip -->
-			<Grid Grid.Row="3" Margin="0,10,0,0" VerticalAlignment="Bottom" ColumnDefinitions="*,Auto">
-				<TextBlock FontSize="14" Grid.Column="0" Text="{Binding VisibleCountText}" VerticalAlignment="Center" />
-				<TextBlock FontSize="14" Grid.Column="1" Text="{Binding StatusCountText}" VerticalAlignment="Center" HorizontalAlignment="Right" />		
+			<Grid Grid.Row="3" Margin="0,10,0,0" VerticalAlignment="Bottom" ColumnDefinitions="Auto,Auto,*,Auto">
+				<Grid.Styles>
+					<Style Selector="ProgressBar:horizontal">
+						<Setter Property="MinWidth" Value="100" />
+					</Style>
+				</Grid.Styles>
+				<TextBlock FontSize="14" Grid.Column="0" Text="Upgrading:" VerticalAlignment="Center" IsVisible="{Binding DownloadProgress, Converter={x:Static ObjectConverters.IsNotNull}}" />
+				<ProgressBar Grid.Column="1" Margin="5,0,10,0" VerticalAlignment="Stretch" Width="100" Value="{Binding DownloadProgress}" IsVisible="{Binding DownloadProgress, Converter={x:Static ObjectConverters.IsNotNull}}"/>
+				<TextBlock FontSize="14" Grid.Column="2" Text="{Binding VisibleCountText}" VerticalAlignment="Center" />
+				<TextBlock FontSize="14" Grid.Column="3" Text="{Binding StatusCountText}" VerticalAlignment="Center" />		
 			</Grid>
 		</Grid>
 	</Border>

Source/LibationAvalonia/Views/MainWindow.axaml.cs

@@ -40,9 +40,7 @@ namespace LibationAvalonia.Views
 			Configure_Export();
 			Configure_Settings();
 			Configure_ProcessQueue();
-#if !DEBUG
-			Configure_Update();
-#endif
+			Configure_Upgrade();
 			Configure_Filter();
 			// misc which belongs in winforms app but doesn't have a UI element
 			Configure_NonUI();
@@ -53,7 +51,7 @@ namespace LibationAvalonia.Views
 			{
 				this.LibraryLoaded += MainWindow_LibraryLoaded;
 
-				LibraryCommands.LibrarySizeChanged += async (_, _) => await _viewModel.ProductsDisplay.DisplayBooksAsync(DbContexts.GetLibrary_Flat_NoTracking(includeParents: true));
+				LibraryCommands.LibrarySizeChanged += async (_, _) => await _viewModel.ProductsDisplay.UpdateGridAsync(DbContexts.GetLibrary_Flat_NoTracking(includeParents: true));
 				Closing += (_, _) => this.SaveSizeAndLocation(Configuration.Instance);
 			}
 			Closing += MainWindow_Closing;
@@ -69,7 +67,7 @@ namespace LibationAvalonia.Views
 			if (QuickFilters.UseDefault)
 				await performFilter(QuickFilters.Filters.FirstOrDefault());
 
-			await _viewModel.ProductsDisplay.DisplayBooksAsync(dbBooks);
+			_viewModel.ProductsDisplay.BindToGrid(dbBooks);
 		}
 
 		private void InitializeComponent()

Source/LibationAvalonia/Views/ProcessQueueControl.axaml.cs

@@ -15,7 +15,7 @@ namespace LibationAvalonia.Views
 {
 	public partial class ProcessQueueControl : UserControl
     {
-		private TrackedQueue<ProcessBookViewModel> Queue => _viewModel.Items;
+		private TrackedQueue<ProcessBookViewModel> Queue => _viewModel.Queue;
 		private ProcessQueueViewModel _viewModel => DataContext as ProcessQueueViewModel;
 
 		public ProcessQueueControl()
@@ -76,14 +76,14 @@ namespace LibationAvalonia.Views
 					},
 				};
 
-				vm.Items.Enqueue(testList);
-				vm.Items.MoveNext();
-				vm.Items.MoveNext();
-				vm.Items.MoveNext();
-				vm.Items.MoveNext();
-				vm.Items.MoveNext();
-				vm.Items.MoveNext();
-				vm.Items.MoveNext();
+				vm.Queue.Enqueue(testList);
+				vm.Queue.MoveNext();
+				vm.Queue.MoveNext();
+				vm.Queue.MoveNext();
+				vm.Queue.MoveNext();
+				vm.Queue.MoveNext();
+				vm.Queue.MoveNext();
+				vm.Queue.MoveNext();
 				return;
 			}
 			#endregion

Source/LibationAvalonia/Views/ProductsDisplay.axaml

@@ -183,6 +183,16 @@
 						</DataTemplate>
 					</DataGridTemplateColumn.CellTemplate>
 				</controls:DataGridTemplateColumnExt>
+				
+				<controls:DataGridTemplateColumnExt Width="102" Header="Last&#xA;Download" CanUserSort="True" SortMemberPath="LastDownload" ClipboardContentBinding="{Binding LastDownload}">
+					<DataGridTemplateColumn.CellTemplate>
+						<DataTemplate>
+							<Panel Background="{Binding BackgroundBrush}" ToolTip.Tip="{Binding LastDownload.ToolTipText}" DoubleTapped="Version_DoubleClick">
+								<TextBlock Text="{Binding LastDownload}" TextWrapping="WrapWithOverflow" FontSize="10" />
+							</Panel>
+						</DataTemplate>
+					</DataGridTemplateColumn.CellTemplate>
+				</controls:DataGridTemplateColumnExt>
 
 				<controls:DataGridTemplateColumnExt CanUserSort="True" Width="100" Header="Tags" SortMemberPath="BookTags" ClipboardContentBinding="{Binding BookTags.Tags}">
 					<DataGridTemplateColumn.CellTemplate>

Source/LibationAvalonia/Views/ProductsDisplay.axaml.cs

@@ -19,6 +19,7 @@ namespace LibationAvalonia.Views
 	public partial class ProductsDisplay : UserControl
 	{
 		public event EventHandler<LibraryBook> LiberateClicked;
+		public event EventHandler<LibraryBook> ConvertToMp3Clicked;
 
 		private ProductsDisplayViewModel _viewModel => DataContext as ProductsDisplayViewModel;
 		ImageDisplayDialog imageDisplayDialog;
@@ -43,7 +44,7 @@ namespace LibationAvalonia.Views
 				};
 
 				var pdvm = new ProductsDisplayViewModel();
-				_ = pdvm.DisplayBooksAsync(sampleEntries);
+				pdvm.BindToGrid(sampleEntries);
 				DataContext = pdvm;
 
 				return;
@@ -101,7 +102,7 @@ namespace LibationAvalonia.Views
                 setNotDownloadMenuItem.Click += (_, __) => entry.Book.UpdateBookStatus(LiberatedStatus.NotLiberated);
 
                 var removeMenuItem = new MenuItem() { Header = "_Remove from library" };
-				removeMenuItem.Click += async (_, __) => await Task.Run(() => LibraryCommands.RemoveBook(entry.AudibleProductId));
+				removeMenuItem.Click += async (_, __) => await Task.Run(entry.LibraryBook.RemoveBook);
 
 				var locateFileMenuItem = new MenuItem() { Header = "_Locate file..." };
                 locateFileMenuItem.Click += async (_, __) =>
@@ -131,6 +132,12 @@ namespace LibationAvalonia.Views
                         await MessageBox.ShowAdminAlert(null, msg, msg, ex);
                     }
                 };
+				var convertToMp3MenuItem = new MenuItem
+				{
+					Header = "_Convert to Mp3",
+					IsEnabled = entry.Book.UserDefinedItem.BookStatus != LiberatedStatus.NotLiberated
+				};
+				convertToMp3MenuItem.Click += (_, _) => ConvertToMp3Clicked?.Invoke(this, entry.LibraryBook);
 
 				var bookRecordMenuItem = new MenuItem { Header = "View _Bookmarks/Clips" };
 				bookRecordMenuItem.Click += async (_, _) => await new BookRecordsDialog(entry.LibraryBook).ShowDialog(VisualRoot as Window);
@@ -141,6 +148,7 @@ namespace LibationAvalonia.Views
 					setNotDownloadMenuItem,
 					removeMenuItem,
 					locateFileMenuItem,
+					convertToMp3MenuItem,
 					new Separator(),
 					bookRecordMenuItem
 				});
@@ -298,6 +306,12 @@ namespace LibationAvalonia.Views
 				imageDisplayDialog.Close();
 		}
 
+		public void Version_DoubleClick(object sender, Avalonia.Input.TappedEventArgs args)
+		{
+			if (sender is Control panel && panel.DataContext is LibraryBookEntry lbe && lbe.LastDownload.IsValid)
+				lbe.LastDownload.OpenReleaseUrl();
+		}
+
 		public void Cover_Click(object sender, Avalonia.Input.TappedEventArgs args)
 		{
 			if (sender is not Image tblock || tblock.DataContext is not GridEntry gEntry)

Source/LibationCli/LibationCli.csproj

@@ -11,13 +11,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/LibationFileManager/Configuration.Environment.cs

@@ -6,16 +6,27 @@ using System.Threading.Tasks;
 
 namespace LibationFileManager
 {
-    public partial class Configuration
+	[Flags]
+	public enum OS
+	{
+		Unknown,
+		Windows = 0x100000,
+		Linux = 0x200000,
+		MacOS = 0x400000,
+	}
+
+	public partial class Configuration
     {
-        public static bool IsWindows { get; } = OperatingSystem.IsWindows();
+		public static bool IsWindows { get; } = OperatingSystem.IsWindows();
         public static bool IsLinux { get; } = OperatingSystem.IsLinux();
         public static bool IsMacOs { get; } = OperatingSystem.IsMacOS();
+		public static Version LibationVersion { get; private set; }
+		public static void SetLibationVersion(Version version) => LibationVersion = version;
 
-        public static string OS { get; }
-            = IsLinux ? "Linux"
-            : IsMacOs ? "MacOS"
-            : IsWindows ? "Windows"
-            : "UNKNOWN_OS";
+		public static OS OS { get; }
+			= IsLinux ? OS.Linux
+			: IsMacOs ? OS.MacOS
+			: IsWindows ? OS.Windows
+			: OS.Unknown;
     }
 }

Source/LibationFileManager/Configuration.KnownDirectories.cs

@@ -9,8 +9,9 @@ namespace LibationFileManager
 {
     public partial class Configuration
     {
-        public static string AppDir_Relative => $@".{Path.PathSeparator}{LIBATION_FILES_KEY}";
-        public static string AppDir_Absolute => Path.GetFullPath(Path.Combine(Path.GetDirectoryName(Exe.FileLocationOnDisk), LIBATION_FILES_KEY));
+        public static string ProcessDirectory { get; } = Path.GetDirectoryName(Exe.FileLocationOnDisk);
+		public static string AppDir_Relative => $@".{Path.PathSeparator}{LIBATION_FILES_KEY}";
+        public static string AppDir_Absolute => Path.GetFullPath(Path.Combine(ProcessDirectory, LIBATION_FILES_KEY));
         public static string MyDocs => Path.GetFullPath(Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments), "Libation"));
         public static string WinTemp => Path.GetFullPath(Path.Combine(Path.GetTempPath(), "Libation"));
         public static string UserProfile => Path.GetFullPath(Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile), "Libation"));

Source/LibationFileManager/Configuration.LibationFiles.cs

@@ -76,7 +76,7 @@ namespace LibationFileManager
 			//Possible appsettings.json locations, in order of preference.
 			string[] possibleAppsettingsFiles = new[]
 			{
-				Path.Combine(Path.GetDirectoryName(System.Reflection.Assembly.GetExecutingAssembly().Location), appsettings_filename),
+				Path.Combine(ProcessDirectory, appsettings_filename),
 				Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), "Libation", appsettings_filename),
 				Path.Combine(UserProfile, appsettings_filename),
 				Path.Combine(Path.GetTempPath(), "Libation", appsettings_filename)

Source/LibationFileManager/Configuration.PersistentSettings.cs

@@ -73,7 +73,7 @@ namespace LibationFileManager
 
 		public bool Exists(string propertyName) => persistentDictionary.Exists(propertyName);
 
-		[Description("Set cover art as the folder's icon. (Windows only)")]
+		[Description("Set cover art as the folder's icon. (Windows and macOS only)")]
 		public bool UseCoverAsFolderIcon { get => GetNonString(defaultValue: false); set => SetNonString(value); }
 
 		[Description("Use the beta version of Libation\r\nNew and experimental features, but probably buggy.\r\n(requires restart to take effect)")]
@@ -121,6 +121,12 @@ namespace LibationFileManager
 		[Description("Lame encoder target. true = Bitrate, false = Quality")]
 		public bool LameTargetBitrate { get => GetNonString(defaultValue: false); set => SetNonString(value); }
 
+		[Description("Maximum audio sample rate")]
+		public AAXClean.SampleRate MaxSampleRate { get => GetNonString(defaultValue: AAXClean.SampleRate.Hz_44100); set => SetNonString(value); }
+
+		[Description("Lame encoder quality")]
+		public NAudio.Lame.EncoderQuality LameEncoderQuality { get => GetNonString(defaultValue: NAudio.Lame.EncoderQuality.High); set => SetNonString(value); }
+
 		[Description("Lame encoder downsamples to mono")]
 		public bool LameDownsampleMono {  get => GetNonString(defaultValue: true); set => SetNonString(value); }
 

Source/LibationFileManager/IInteropFunctions.cs

@@ -8,7 +8,7 @@ namespace LibationFileManager
         void SetFolderIcon(string image, string directory);
         void DeleteFolderIcon(string directory);
         Process RunAsRoot(string exe, string args);
-        void InstallUpdate(string updateBundle);
-        bool CanUpdate { get; }
+        void InstallUpgrade(string upgradeBundle);
+        bool CanUpgrade { get; }
     }
 }