incr ver

Bump actions/configure-pages from 4 to 5

.github/workflows/build-linux.yml

@@ -6,63 +6,46 @@ name: build
 on:
   workflow_call:
     inputs:
-      version_override:
+      libation-version:
         type: string
-        description: "Version number override"
-        required: false
-      run_unit_tests:
+        required: true
+      dotnet-version:
+        type: string
+        required: true
+      run-unit-tests:
         type: boolean
-        description: "Skip running unit tests"
-        required: false
-        default: true
-      runs_on:
+      publish-r2r:
+        type: boolean
+      retention-days:
+        type: number
+      architecture:
         type: string
-        description: "The GitHub hosted runner to use"
+        description: "CPU architecture targeted by the build."
         required: true
       OS:
         type: string
         description: >
           The operating system targeted by the build.
-
+          
           There must be a corresponding Bundle_$OS.sh script file in ./Scripts
         required: true
-      architecture:
-        type: string
-        description: "CPU architecture targeted by the build."
-        required: true
-
-env:
-  DOTNET_CONFIGURATION: "Release"
-  DOTNET_VERSION: "9.0.x"
-  RELEASE_NAME: "chardonnay"
 
 jobs:
   build:
     name: "${{ inputs.OS }}-${{ inputs.architecture }}"
-    runs-on: ${{ inputs.runs_on }}
+    runs-on: ubuntu-latest
+    env:
+      RUNTIME_ID: "linux-${{ inputs.architecture }}"
     steps:
-      - uses: actions/checkout@v5
-      - name: Setup .NET
-        uses: actions/setup-dotnet@v5
+      - uses: actions/checkout@v6
+      
+      - uses: actions/setup-dotnet@v5
         with:
-          dotnet-version: ${{ env.DOTNET_VERSION }}
-        env:
-          NUGET_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Get version
-        id: get_version
-        run: |
-          inputVersion="${{ inputs.version_override }}"
-          if [[ "${#inputVersion}" -gt 0 ]]
-          then
-            version="${inputVersion}"
-          else
-            version="$(grep -Eio -m 1 '<Version>.*</Version>' ./Source/AppScaffolding/AppScaffolding.csproj | sed -r 's/<\/?Version>//g')"
-          fi
-          echo "version=${version}" >> "${GITHUB_OUTPUT}"
+          dotnet-version: ${{ inputs.dotnet-version }}
+          dotnet-quality: "ga"
 
       - name: Unit test
-        if: ${{ inputs.run_unit_tests }}
+        if: ${{ inputs.run-unit-tests }}
         working-directory: ./Source
         run: dotnet test
 
@@ -70,63 +53,31 @@ jobs:
         id: publish
         working-directory: ./Source
         run: |
-          if [[ "${{ inputs.OS }}" == "MacOS" ]]
-          then
-            display_os="macOS"
-            RUNTIME_ID="osx-${{ inputs.architecture }}"
-          else
-            display_os="Linux"
-            RUNTIME_ID="linux-${{ inputs.architecture }}"
-          fi
-
-          OUTPUT="bin/Publish/${display_os}-${{ inputs.architecture }}-${{ env.RELEASE_NAME }}"
-
-          echo "display_os=${display_os}" >> $GITHUB_OUTPUT
-          echo "Runtime Identifier: $RUNTIME_ID"
-          echo "Output Directory: $OUTPUT"
-
-          dotnet publish \
-              LibationAvalonia/LibationAvalonia.csproj \
-              --runtime $RUNTIME_ID \
-              --configuration ${{ env.DOTNET_CONFIGURATION }} \
-              --output $OUTPUT \
-              -p:PublishProfile=LibationAvalonia/Properties/PublishProfiles/${display_os}Profile.pubxml
-          dotnet publish \
-              LoadByOS/${display_os}ConfigApp/${display_os}ConfigApp.csproj \
-              --runtime $RUNTIME_ID \
-              --configuration ${{ env.DOTNET_CONFIGURATION }} \
-              --output $OUTPUT \
-              -p:PublishProfile=LoadByOS/Properties/${display_os}ConfigApp/PublishProfiles/${display_os}Profile.pubxml
-          dotnet publish \
-              LibationCli/LibationCli.csproj \
-              --runtime $RUNTIME_ID \
-              --configuration ${{ env.DOTNET_CONFIGURATION }} \
-              --output $OUTPUT \
-              -p:PublishProfile=LibationCli/Properties/PublishProfiles/${display_os}Profile.pubxml
-          dotnet publish \
-              HangoverAvalonia/HangoverAvalonia.csproj \
-              --runtime $RUNTIME_ID \
-              --configuration ${{ env.DOTNET_CONFIGURATION }} \
-              --output $OUTPUT \
-              -p:PublishProfile=HangoverAvalonia/Properties/PublishProfiles/${display_os}Profile.pubxml
+          PUBLISH_ARGS=(
+            '--runtime' '${{ env.RUNTIME_ID }}'
+            '--configuration' 'Release'
+            '--output' '../bin'
+            '-p:PublishProtocol=FileSystem'
+            "-p:PublishReadyToRun=${{ inputs.publish-r2r }}"
+            '-p:SelfContained=true')
+            
+          dotnet publish LibationAvalonia/LibationAvalonia.csproj "${PUBLISH_ARGS[@]}"
+          dotnet publish LoadByOS/LinuxConfigApp/LinuxConfigApp.csproj "${PUBLISH_ARGS[@]}"
+          dotnet publish LibationCli/LibationCli.csproj "${PUBLISH_ARGS[@]}"
+          dotnet publish HangoverAvalonia/HangoverAvalonia.csproj "${PUBLISH_ARGS[@]}"
 
       - name: Build bundle
         id: bundle
-        working-directory: ./Source/bin/Publish/${{ steps.publish.outputs.display_os }}-${{ inputs.architecture }}-${{ env.RELEASE_NAME }}
         run: |
-          BUNDLE_DIR=$(pwd)
-          echo "Bundle dir: ${BUNDLE_DIR}"
-          cd ..
-          SCRIPT=../../../Scripts/Bundle_${{ inputs.OS }}.sh
+          SCRIPT=./Scripts/Bundle_${{ inputs.OS }}.sh
           chmod +rx ${SCRIPT}
-          ${SCRIPT} "${BUNDLE_DIR}" "${{ steps.get_version.outputs.version }}" "${{ inputs.architecture }}"
+          ${SCRIPT} ./bin "${{ inputs.libation-version }}" "${{ inputs.architecture }}"
           artifact=$(ls ./bundle)
           echo "artifact=${artifact}" >> "${GITHUB_OUTPUT}"
 
-      - name: Publish bundle
-        uses: actions/upload-artifact@v5
+      - uses: actions/upload-artifact@v6
         with:
           name: ${{ steps.bundle.outputs.artifact }}
-          path: ./Source/bin/Publish/bundle/${{ steps.bundle.outputs.artifact }}
+          path: ./bundle/${{ steps.bundle.outputs.artifact }}
           if-no-files-found: error
-          retention-days: 7
+          retention-days: ${{ inputs.retention-days }}

.github/workflows/build-mac.yml

@@ -0,0 +1,104 @@
+# build-mac.yml
+# Reusable workflow that builds the MacOS (x64 and arm64) versions of Libation.
+---
+name: build
+
+on:
+  workflow_call:
+    inputs:
+      libation-version:
+        type: string
+        required: true
+      dotnet-version:
+        type: string
+        required: true
+      run-unit-tests:
+        type: boolean
+      publish-r2r:
+        type: boolean
+      retention-days:
+        type: number
+      sign-app:
+        type: boolean
+        description: "Wheather to sign an notorize the app bundle and dmg."
+      architecture:
+        type: string
+        description: "CPU architecture targeted by the build."
+        required: true
+
+jobs:
+  build:
+    name: "macOS-${{ inputs.architecture }}"
+    runs-on: macos-latest
+    env:
+      RUNTIME_ID: "osx-${{ inputs.architecture }}"
+      WAIT_FOR_NOTARIZE: ${{ vars.WAIT_FOR_NOTARIZE == 'true' }}
+    steps:    
+      - uses: apple-actions/import-codesign-certs@v6
+        if: ${{ inputs.sign-app }}
+        with: 
+          p12-file-base64: ${{ secrets.DISTRIBUTION_SIGNING_CERT }}
+          p12-password: ${{ secrets.DISTRIBUTION_SIGNING_CERT_PW }}       
+          
+      - uses: actions/checkout@v6
+      
+      - uses: actions/setup-dotnet@v5
+        with:
+          dotnet-version: ${{ inputs.dotnet-version }}
+          dotnet-quality: "ga"
+
+      - name: Unit test
+        if: ${{ inputs.run-unit-tests }}
+        working-directory: ./Source
+        run: dotnet test
+
+      - name: Publish
+        id: publish
+        working-directory: ./Source
+        run: |
+          PUBLISH_ARGS=(
+            '--runtime' '${{ env.RUNTIME_ID }}'
+            '--configuration' 'Release'
+            '--output' '../bin'
+            '-p:PublishProtocol=FileSystem'
+            "-p:PublishReadyToRun=${{ inputs.publish-r2r }}"
+            '-p:SelfContained=true')
+          
+          dotnet publish LibationAvalonia/LibationAvalonia.csproj "${PUBLISH_ARGS[@]}"
+          dotnet publish LoadByOS/MacOSConfigApp/MacOSConfigApp.csproj "${PUBLISH_ARGS[@]}"
+          dotnet publish LibationCli/LibationCli.csproj "${PUBLISH_ARGS[@]}"
+          dotnet publish HangoverAvalonia/HangoverAvalonia.csproj "${PUBLISH_ARGS[@]}"
+
+      - name: Build bundle
+        id: bundle
+        run: |
+          SCRIPT=./Scripts/Bundle_MacOS.sh
+          chmod +rx ${SCRIPT}
+          ${SCRIPT} ./bin "${{ inputs.libation-version }}" "${{ inputs.architecture }}" "${{ inputs.sign-app }}"
+          artifact=$(ls ./bundle)
+          echo "artifact=${artifact}" >> "${GITHUB_OUTPUT}"
+
+      - name: Notarize bundle
+        if: ${{ inputs.sign-app }}
+        run: |          
+          if [ ${{ vars.WAIT_FOR_NOTARIZE == 'true' }} ]; then
+            WAIT="--wait"
+          fi
+          echo "::debug::Submitting the disk image for notarization"
+          RESPONSE=$(xcrun notarytool submit ./bundle/${{ steps.bundle.outputs.artifact }} $WAIT --no-progress --apple-id ${{ vars.APPLE_DEV_EMAIL }} --password ${{ secrets.APPLE_DEV_PASSWORD }} --team-id ${{ secrets.APPLE_TEAM_ID }} 2>&1)
+          SUBMISSION_ID=$(echo "$RESPONSE" | awk '/id: / { print $2;exit; }')
+          
+          echo "$RESPONSE"
+          echo "::notice::Noraty Submission Id: $SUBMISSION_ID"
+          
+          if [ ${{ vars.WAIT_FOR_NOTARIZE == 'true' }} ]; then
+            echo "::debug::Stapling the notarization ticket to the disk image"
+            xcrun stapler staple "./bundle/${{ steps.bundle.outputs.artifact }}"
+          fi
+
+      - uses: actions/upload-artifact@v6
+        with:
+          name: ${{ steps.bundle.outputs.artifact }}
+          path: ./bundle/${{ steps.bundle.outputs.artifact }}
+          if-no-files-found: error
+          retention-days: ${{ inputs.retention-days }}

.github/workflows/build-windows.yml

@@ -6,113 +6,82 @@ name: build
 on:
   workflow_call:
     inputs:
-      version_override:
+      libation-version:
         type: string
-        description: "Version number override"
-        required: false
-      run_unit_tests:
-        type: boolean
-        description: "Skip running unit tests"
-        required: false
-        default: true
-      architecture:
-        type: string
-        description: "CPU architecture targeted by the build."
         required: true
-
-env:
-  DOTNET_CONFIGURATION: "Release"
-  DOTNET_VERSION: "9.0.x"
+      dotnet-version:
+        type: string
+        required: true
+      run-unit-tests:
+        type: boolean
+      publish-r2r:
+        type: boolean
+      retention-days:
+        type: number
 
 jobs:
   build:
-    name: "${{ matrix.os }}-${{ matrix.release_name }}-${{ inputs.architecture }}"
+    name: "Windows-${{ matrix.release_name }}-${{ matrix.architecture }} (${{ matrix.ui }})"
     runs-on: windows-latest
-    env:
-      OUTPUT_NAME: "${{ matrix.os }}-${{ matrix.release_name }}-${{ inputs.architecture }}"
-      RUNTIME_ID: "win-${{ inputs.architecture }}"
     strategy:
       matrix:
-        os: [Windows]
         ui: [Avalonia]
+        architecture: [x64]
         release_name: [chardonnay]
         include:
-          - os: Windows
+          - architecture: x64
             ui: WinForms
             release_name: classic
             prefix: Classic-
+          - architecture: arm64
+            ui: Avalonia
+            release_name: chardonnay
     steps:
-      - uses: actions/checkout@v5
-      - name: Setup .NET
-        uses: actions/setup-dotnet@v5
+      - uses: actions/checkout@v6
+      
+      - uses: actions/setup-dotnet@v5
         with:
-          dotnet-version: ${{ env.DOTNET_VERSION }}
-        env:
-          NUGET_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Get version
-        id: get_version
-        run: |
-          if ("${{ inputs.version_override }}".length -gt 0) {
-            $version = "${{ inputs.version_override }}"
-          } else {
-            $version = (Select-Xml -Path "./Source/AppScaffolding/AppScaffolding.csproj" -XPath "/Project/PropertyGroup/Version").Node.InnerXML.Trim()
-          }
-          "version=$version" >> $env:GITHUB_OUTPUT
+          dotnet-version: ${{ inputs.dotnet-version }}
+          dotnet-quality: "ga"
 
       - name: Unit test
-        if: ${{ inputs.run_unit_tests }}
+        if: ${{ inputs.run-unit-tests }}
         working-directory: ./Source
         run: dotnet test
-
+        
       - name: Publish
         working-directory: ./Source
         run: |
-          dotnet publish `
-              Libation${{ matrix.ui }}/Libation${{ matrix.ui }}.csproj `
-              --runtime ${{ env.RUNTIME_ID }} `
-              --configuration ${{ env.DOTNET_CONFIGURATION }} `
-              --output bin/Publish/${{ env.OUTPUT_NAME }} `
-              -p:PublishProfile=Libation${{ matrix.ui }}/Properties/PublishProfiles/${{ matrix.os }}Profile.pubxml
-          dotnet publish `
-              LoadByOS/${{ matrix.os }}ConfigApp/${{ matrix.os }}ConfigApp.csproj `
-              --runtime ${{ env.RUNTIME_ID }} `
-              --configuration ${{ env.DOTNET_CONFIGURATION }} `
-              --output bin/Publish/${{ env.OUTPUT_NAME }} `
-              -p:PublishProfile=LoadByOS/${{ matrix.os }}ConfigApp/PublishProfiles/${{ matrix.os }}Profile.pubxml
-          dotnet publish `
-              LibationCli/LibationCli.csproj `
-              --runtime ${{ env.RUNTIME_ID }} `
-              --configuration ${{ env.DOTNET_CONFIGURATION }} `
-              --output bin/Publish/${{ env.OUTPUT_NAME }} `
-              -p:DefineConstants="${{ matrix.release_name }}" `
-              -p:PublishProfile=LibationCli/Properties/PublishProfiles/${{ matrix.os }}Profile.pubxml
-          dotnet publish `
-              Hangover${{ matrix.ui }}/Hangover${{ matrix.ui }}.csproj `
-              --runtime ${{ env.RUNTIME_ID }} `
-              --configuration ${{ env.DOTNET_CONFIGURATION }} `
-              --output bin/Publish/${{ env.OUTPUT_NAME }} `
-              -p:PublishProfile=Hangover${{ matrix.ui }}/Properties/PublishProfiles/${{ matrix.os }}Profile.pubxml
+          $PUBLISH_ARGS=@(
+            "--runtime", "win-${{ matrix.architecture }}",
+            "--configuration", "Release",
+            "--output", "../bin",
+            "-p:PublishProtocol=FileSystem",
+            "-p:PublishReadyToRun=${{ inputs.publish-r2r }}",
+            "-p:SelfContained=true")            
+          
+          dotnet publish "Libation${{ matrix.ui }}/Libation${{ matrix.ui }}.csproj" $PUBLISH_ARGS
+          dotnet publish "LoadByOS/WindowsConfigApp/WindowsConfigApp.csproj" $PUBLISH_ARGS
+          dotnet publish "LibationCli/LibationCli.csproj" $PUBLISH_ARGS
+          dotnet publish "Hangover${{ matrix.ui }}/Hangover${{ matrix.ui }}.csproj" $PUBLISH_ARGS
 
       - name: Zip artifact
         id: zip
-        working-directory: ./Source/bin/Publish
+        working-directory: ./bin
         run: |
-          $bin_dir = "${{ env.OUTPUT_NAME }}\"
           $delfiles = @(
             "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 }}-${{ inputs.architecture }}"
+            "WindowsConfigApp.deps.json")
+          
+          foreach ($file in $delfiles){ if (test-path $file){ Remove-Item $file } }
+          $artifact="${{ matrix.prefix }}Libation.${{ inputs.libation-version }}-windows-${{ matrix.release_name }}-${{ matrix.architecture }}.zip"
           "artifact=$artifact" >> $env:GITHUB_OUTPUT
-          Compress-Archive -Path "${bin_dir}*" -DestinationPath "$artifact.zip"
+          Compress-Archive -Path * -DestinationPath "$artifact"
 
-      - name: Publish artifact
-        uses: actions/upload-artifact@v5
+      - uses: actions/upload-artifact@v6
         with:
-          name: ${{ steps.zip.outputs.artifact }}.zip
-          path: ./Source/bin/Publish/${{ steps.zip.outputs.artifact }}.zip
+          name: ${{ steps.zip.outputs.artifact }}
+          path: ./bin/${{ steps.zip.outputs.artifact }}
           if-no-files-found: error
-          retention-days: 7
+          retention-days: ${{ inputs.retention-days }}

.github/workflows/build.yml

@@ -6,26 +6,51 @@ name: build
 on:
   workflow_call:
     inputs:
-      version_override:
+      libation-version:
         type: string
-        description: "Version number override"
-        required: false
-      run_unit_tests:
+        description: "Libation version number"
+        required: true
+      dotnet-version:
+        type: string
+        default: "10.x"
+        description: ".NET version to target"
+      run-unit-tests:
         type: boolean
-        description: "Skip running unit tests"
-        required: false
-        default: true
+        description: "Whether to run unit tests prior to publishing."
+      publish-r2r:
+        type: boolean
+        description: "Whether to publish assemblies as ReadyToRun."
+      release:
+        type: boolean
+        description: "Whether this workflow is being called as a release"
+      retention-days:
+        type: number
+        description: "Number of days the artifacts are to be retained."
 
-jobs:
+jobs:    
   windows:
-    strategy:
-      matrix:
-        architecture: [x64]
     uses: ./.github/workflows/build-windows.yml
     with:
-      version_override: ${{ inputs.version_override }}
-      run_unit_tests: ${{ inputs.run_unit_tests }}
+      libation-version: ${{ inputs.libation-version }}
+      dotnet-version: ${{ inputs.dotnet-version }}
+      run-unit-tests: ${{ inputs.run-unit-tests }}
+      publish-r2r: ${{ inputs.publish-r2r }}
+      retention-days: ${{ inputs.retention-days }}
+      
+  macOS:
+    strategy:
+      matrix:
+        architecture: [x64, arm64]
+    uses: ./.github/workflows/build-mac.yml
+    with:
+      libation-version: ${{ inputs.libation-version }}
+      dotnet-version: ${{ inputs.dotnet-version }}
+      run-unit-tests: ${{ inputs.run-unit-tests }}
+      publish-r2r: ${{ inputs.publish-r2r }}
+      retention-days: ${{ inputs.retention-days }}
       architecture: ${{ matrix.architecture }}
+      sign-app: ${{ inputs.release || vars.SIGN_MAC_APP_ON_VALIDATE == 'true' }}
+    secrets: inherit
 
   linux:
     strategy:
@@ -34,20 +59,11 @@ jobs:
         architecture: [x64, arm64]
     uses: ./.github/workflows/build-linux.yml
     with:
-      version_override: ${{ inputs.version_override }}
-      runs_on: ubuntu-latest
+      libation-version: ${{ inputs.libation-version }}
+      dotnet-version: ${{ inputs.dotnet-version }}
+      run-unit-tests: ${{ inputs.run-unit-tests }}
+      publish-r2r: ${{ inputs.publish-r2r }}
+      retention-days: ${{ inputs.retention-days }}
+      architecture: ${{ matrix.architecture }}
       OS: ${{ matrix.OS }}
-      architecture: ${{ matrix.architecture }}
-      run_unit_tests: ${{ inputs.run_unit_tests }}
 
-  macos:
-    strategy:
-      matrix:
-        architecture: [x64, arm64]
-    uses: ./.github/workflows/build-linux.yml
-    with:
-      version_override: ${{ inputs.version_override }}
-      runs_on: macos-latest
-      OS: MacOS
-      architecture: ${{ matrix.architecture }}
-      run_unit_tests: ${{ inputs.run_unit_tests }}

.github/workflows/deploy.yml

@@ -0,0 +1,67 @@
+name: Deploy VitePress site to Pages
+
+on:
+  # Runs on pushes targeting the `main` branch. Change this to `master` if you're
+  # using the `master` branch as the default branch.
+  push:
+    branches: [master]
+    paths:
+      - .github/workflows/deploy.yml
+      - docs/**
+
+  # Allows you to run this workflow manually from the Actions tab
+  workflow_dispatch:
+
+# Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages
+permissions:
+  contents: read
+  pages: write
+  id-token: write
+
+# Allow only one concurrent deployment, skipping runs queued between the run in-progress and latest queued.
+# However, do NOT cancel in-progress runs as we want to allow these production deployments to complete.
+concurrency:
+  group: pages
+  cancel-in-progress: false
+
+jobs:
+  # Build job
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v6
+        with:
+          fetch-depth: 0 # Not needed if lastUpdated is not enabled
+      # - uses: pnpm/action-setup@v4 # Uncomment this block if you're using pnpm
+      #   with:
+      #     version: 9 # Not needed if you've set "packageManager" in package.json
+      # - uses: oven-sh/setup-bun@v1 # Uncomment this if you're using Bun
+      - name: Setup Node
+        uses: actions/setup-node@v6
+        with:
+          node-version: 24
+          cache: npm # or pnpm / yarn
+      - name: Setup Pages
+        uses: actions/configure-pages@v5
+      - name: Install dependencies
+        run: npm ci # or pnpm install / yarn install / bun install
+      - name: Build with VitePress
+        run: npm run docs:build # or pnpm docs:build / yarn docs:build / bun run docs:build
+      - name: Upload artifact
+        uses: actions/upload-pages-artifact@v4
+        with:
+          path: .vitepress/dist
+
+  # Deployment job
+  deploy:
+    environment:
+      name: github-pages
+      url: ${{ steps.deployment.outputs.page_url }}
+    needs: build
+    runs-on: ubuntu-latest
+    name: Deploy
+    steps:
+      - name: Deploy to GitHub Pages
+        id: deployment
+        uses: actions/deploy-pages@v4

.github/workflows/docker.yml

@@ -26,7 +26,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v3

.github/workflows/release.yml

@@ -8,7 +8,7 @@ on:
       - "v*"
 jobs:
   prerelease:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-slim
     outputs:
       version: ${{ steps.get_version.outputs.version }}
     steps:
@@ -31,16 +31,18 @@ jobs:
   build:
     needs: [prerelease]
     uses: ./.github/workflows/build.yml
+    secrets: inherit
     with:
-      version_override: ${{ needs.prerelease.outputs.version }}
-      run_unit_tests: false
+      libation-version: ${{ needs.prerelease.outputs.version }}
+      publish-r2r: true
+      release: true
 
   release:
     needs: [prerelease, build]
     runs-on: ubuntu-latest
     steps:
       - name: Download artifacts
-        uses: actions/download-artifact@v6
+        uses: actions/download-artifact@v7
         with:
           path: artifacts
           pattern: "*(Classic-)Libation.*"

.github/workflows/validate-appstream-metainfo.yaml

@@ -17,6 +17,6 @@ jobs:
     container:
       image: ghcr.io/flathub/flatpak-builder-lint:latest
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - name: Check the MetaInfo file
         run: flatpak-builder-lint appstream Source/LoadByOS/LinuxConfigApp/com.getlibation.Libation.metainfo.xml

.github/workflows/validate-desktop-file.yaml

@@ -15,7 +15,7 @@ jobs:
   validate-desktop-file:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - run: sudo apt --yes install desktop-file-utils
       - name: Check the desktop file
         run: desktop-file-validate Source/LoadByOS/LinuxConfigApp/Libation.desktop

.github/workflows/validate.yml

@@ -6,16 +6,41 @@ name: validate
 on:
   push:
     branches: [master]
+    paths:
+      - Source/**
+      - .github/workflows/**
   pull_request:
     branches: [master]
+    paths:
+      - Source/**
+      - .github/workflows/**
 
 jobs:
+  get_version:
+    runs-on: ubuntu-slim
+    outputs:
+      version: ${{ steps.get_version.outputs.version }}
+    steps:
+      - name: Get version
+        id: get_version
+        run: |
+          wget "https://raw.githubusercontent.com/${{ github.repository }}/${{ github.sha }}/Source/AppScaffolding/AppScaffolding.csproj"
+          version="$(grep -Eio -m 1 '<Version>.*</Version>' ./AppScaffolding.csproj | sed -r 's/<\/?Version>//g')"
+          echo "version=${version}" >> "${GITHUB_OUTPUT}"
   build:
+    needs: [get_version]
     uses: ./.github/workflows/build.yml
+    secrets: inherit
+    with:
+      libation-version: ${{ needs.get_version.outputs.version }}
+      retention-days: 14
+      run-unit-tests: true
+      
   docker:
+    needs: [get_version]
     uses: ./.github/workflows/docker.yml
     with:
-      version: ${GITHUB_SHA}
+      version: ${{ needs.get_version.outputs.version }}
       release: false
     secrets:
       docker_username: ${{ secrets.DOCKERHUB_USERNAME }}

.gitignore

@@ -370,4 +370,15 @@ FodyWeavers.xsd
 
 /__TODO.txt
 /DataLayer/LibationContext.db
-*/bin-Avalonia
+*/bin-Avalonia
+
+# macOS Directory Info
+.DS_Store
+
+# JetBrains Rider Settings
+**/.idea/
+
+# VitePress
+node_modules
+.vitepress/cache
+.vitepress/dist   

.releaseindex.json

@@ -1,10 +1,11 @@
 {
   "WindowsClassic":          "Classic-Libation\\.\\d+\\.\\d+\\.\\d+(?:\\.\\d+)?-win(?:dows)?-classic-x64\\.zip",
   "WindowsAvalonia":         "Libation\\.\\d+\\.\\d+\\.\\d+(?:\\.\\d+)?-win(?:dows)?-chardonnay-x64\\.zip",
+  "WindowsAvalonia_Arm64":         "Libation\\.\\d+\\.\\d+\\.\\d+(?:\\.\\d+)?-win(?:dows)?-chardonnay-arm64\\.zip",
   "LinuxAvalonia":           "Libation\\.\\d+\\.\\d+\\.\\d+(?:\\.\\d+)?-linux-chardonnay-amd64\\.deb",
   "LinuxAvalonia_RPM":       "Libation\\.\\d+\\.\\d+\\.\\d+(?:\\.\\d+)?-linux-chardonnay-amd64\\.rpm",
-  "MacOSAvalonia":           "Libation\\.\\d+\\.\\d+\\.\\d+(?:\\.\\d+)?-macOS-chardonnay-x64\\.tgz",
+  "MacOSAvalonia":           "Libation\\.\\d+\\.\\d+\\.\\d+(?:\\.\\d+)?-macOS-chardonnay-x64\\.dmg",
   "LinuxAvalonia_Arm64":     "Libation\\.\\d+\\.\\d+\\.\\d+(?:\\.\\d+)?-linux-chardonnay-arm64\\.deb",
   "LinuxAvalonia_Arm64_RPM": "Libation\\.\\d+\\.\\d+\\.\\d+(?:\\.\\d+)?-linux-chardonnay-arm64\\.rpm",
-  "MacOSAvalonia_Arm64":     "Libation\\.\\d+\\.\\d+\\.\\d+(?:\\.\\d+)?-macOS-chardonnay-arm64\\.tgz"
+  "MacOSAvalonia_Arm64":     "Libation\\.\\d+\\.\\d+\\.\\d+(?:\\.\\d+)?-macOS-chardonnay-arm64\\.dmg"
 }

.vitepress/config.js

@@ -0,0 +1,90 @@
+import { defineConfig } from "vitepress";
+
+// https://vitepress.dev/reference/site-config
+export default defineConfig({
+  title: "Libation",
+  description: "Libation: Liberate your Library - A free application for downloading your Audible audiobooks",
+  head: [["link", { rel: "icon", href: "/favicon.ico" }]],
+  cleanUrls: true,
+  themeConfig: {
+    // https://vitepress.dev/reference/default-theme-config
+    logo: {
+      light: "/libation_logo_light.svg",
+      dark: "/libation_logo_dark.svg",
+    },
+
+    footer: {
+      message: "Released under the GPLv3 License",
+    },
+
+    editLink: {
+      pattern: "https://github.com/rmcrackan/Libation/edit/main/:path",
+    },
+
+    lastUpdated: true,
+
+    nav: [
+      { text: "Getting Started", link: "/docs/getting-started" },
+      { text: "Docs", link: "/docs/index" },
+      { text: "Download", link: "https://github.com/rmcrackan/Libation/releases/latest" },
+      { text: "Issues & Requests", link: "https://github.com/rmcrackan/Libation/issues" },
+      { text: "Donate", link: "https://www.paypal.com/paypalme/mcrackan" },
+    ],
+    sidebar: [
+      {
+        items: [
+          { text: "Overview", link: "/docs/index"},
+          { text: "Getting Started", link: "/docs/getting-started" },
+          { text: "FAQ", link: "/docs/frequently-asked-questions" },
+          {
+            text: "Issues & Requests",
+            link: "https://github.com/rmcrackan/Libation/issues",
+          },
+          { text: "Donate", link: "https://www.paypal.com/paypalme/mcrackan" },
+        ],
+      },
+      {
+        text: "Installation",
+        collapsed: false,
+        items: [
+          { text: "Linux", link: "/docs/installation/linux" },
+          { text: "Mac", link: "/docs/installation/mac" },
+          { text: "Docker", link: "/docs/installation/docker" },
+        ],
+      },
+      {
+        text: "Features",
+        collapsed: false,
+        items: [
+          { text: "Audio File Formats", link: "/docs/features/audio-file-formats" },
+          { text: "Naming Templates", link: "/docs/features/naming-templates" },
+          {
+            text: "Searching & Filtering",
+            link: "/docs/features/searching-and-filtering",
+          },
+        ],
+      },
+      {
+        text: "Advanced",
+        collapsed: false,
+        items: [
+          { text: "Advanced Topics", link: "/docs/advanced/advanced" },
+          {
+            text: "Linux Development Setup",
+            link: "/docs/advanced/linux-development-setup-using-nix",
+          },
+        ],
+      },
+    ],
+
+    outline: {
+      level: "deep",
+    },
+
+    socialLinks: [{ icon: "github", link: "https://github.com/rmcrackan/Libation" }],
+
+    search: {
+      provider: "local",
+    },
+  },
+});

.vitepress/theme/custom.css

@@ -0,0 +1,15 @@
+/* Custom styles for Libation documentation */
+
+/* Hide certain nav items on tablet devices to prevent horizontal scroll */
+@media (min-width: 640px) and (max-width: 959px) {
+  /* Target specific nav items by their position */
+  /* Hide "Issues & Requests" and "Donate" links on tablet */
+  .VPNav .VPNavBar .nav .VPNavBarMenu .VPMenu:nth-child(3) {
+    display: none;
+  }
+
+  /* Alternative: Use a more specific selector if needed */
+  .VPNavBarMenuLink[href*="issues"] {
+    display: none;
+  }
+}

.vitepress/theme/index.js

@@ -0,0 +1,4 @@
+import DefaultTheme from 'vitepress/theme'
+import './custom.css'
+
+export default DefaultTheme

Directory.Build.props

@@ -0,0 +1,5 @@
+<Project>
+  <PropertyGroup>
+    <EnableMSTestRunner>true</EnableMSTestRunner>
+  </PropertyGroup>
+</Project>

Dockerfile

@@ -1,16 +1,19 @@
 # Dockerfile
-FROM --platform=${BUILDPLATFORM} mcr.microsoft.com/dotnet/sdk:9.0 AS build
+FROM --platform=${BUILDPLATFORM} mcr.microsoft.com/dotnet/sdk:10.0 AS build
 ARG TARGETARCH
 
 COPY Source /Source
 RUN dotnet publish \
     /Source/LibationCli/LibationCli.csproj \
+    --os linux \
     --arch ${TARGETARCH} \
     --configuration Release \
     --output /Source/bin/Publish/Linux-chardonnay \
-    -p:PublishProfile=/Source/LibationCli/Properties/PublishProfiles/LinuxProfile.pubxml
+    -p:PublishProtocol=FileSystem \
+    -p:PublishReadyToRun=true \
+    -p:SelfContained=true
 
-FROM mcr.microsoft.com/dotnet/runtime:9.0
+FROM mcr.microsoft.com/dotnet/runtime:10.0
 ARG USER_UID=1001
 ARG USER_GID=1001
 

Documentation/Advanced.md

@@ -1,112 +0,0 @@
-## [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 [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**.
-
-
-
-# Advanced: Table of Contents
-
-- [Files and folders](#files-and-folders)
-- [Settings](#settings)
-- [Custom File Naming](NamingTemplates.md)
-- [Command Line Interface](#command-line-interface)
-- [Custom Theme Colors](#custom-theme-colors) (Chardonnay Only)
-- [Audio Formats (Dolby Atmos, Widevine, Spacial Audio)](AudioFileFormats.md)
-
-
-
-### Files and folders
-
-To make upgrades and reinstalls easier, Libation separates all of its responsibilities to a few different folders. If you don't want to mess with this stuff: ignore it. Read on if you like a little more control over your files.
-
-* In Libation's initial folder are the files that make up the program. Since nothing else is here, just copy new files here to upgrade the program. Delete this folder to delete Libation.
-
-* In a separate folder, Libation keeps track of all of the files it creates like settings and downloaded images. After an upgrade, Libation might think that's its being run for the first time. Just click ADVANCED SETUP and point to this folder. Libation will reload your library and settings.
-
-* The last important folder is the "books location." This is where Libation looks for your downloaded and decrypted books. This is how it knows which books still need to be downloaded. The Audible id must be somewhere in the book's file or folder name for Libation to detect your downloaded book.
-
-### Settings
-
-* Allow Libation to fix up audiobook metadata. After decrypting a title, Libation attempts to fix details like chapters and cover art. Some power users and/or control freaks prefer to manage this themselves. By unchecking this setting, Libation will only decrypt the book and will leave metadata as-is, warts and all.
-
-In addition to the options that are enabled if you allow Libation to "fix up" the audiobook, it does the following:
-
-* Adds the `TCOM` (`@wrt` in M4B files) metadata tag for the narrators.
-* Sets the `©gen` metadata tag for the genres.
-* Unescapes the copyright symbol (replace `©` with `©`)
-* Replaces the recording copyright `(P)` string with `℗`
-* Replaces the chapter markers embedded in the aax file with the chapter markers retrieved from Audible's API.
-* Sets the embedded cover art image with the 500x500 px cover art retrieved from Audible
-
-### Command Line Interface
-
-Libationcli.exe allows limited access to Libation's functionalities as a CLI.
-
-Warnings about relying solely on on the CLI:
-* CLI will not perform any upgrades.
-* It will show that there is an upgrade, but that will likely scroll by too fast to notice.
-* It will not perform all post-upgrade migrations. Some migrations are only be possible by launching GUI.
-
-```
-help
-  libationcli --help
-  
-verb-specific help
-  libationcli scan --help
-  
-scan all libraries
-  libationcli scan
-scan only libraries for specific accounts
-  libationcli scan nickname1 nickname2
-  
-convert all m4b files to mp3
-  libationcli convert
-  
-liberate all books and pdfs
-  libationcli liberate
-liberate pdfs only
-  libationcli liberate --pdf
-  libationcli liberate -p
-  
-export library to file
-  libationcli export --path "C:\foo\bar\my.json" --json
-  libationcli export -p "C:\foo\bar\my.json" -j
-  libationcli export -p "C:\foo\bar\my.csv" --csv
-  libationcli export -p "C:\foo\bar\my.csv" -c
-  libationcli export -p "C:\foo\bar\my.xlsx" --xlsx
-  libationcli export -p "C:\foo\bar\my.xlsx" -x
-
-Set download statuses throughout library based on whether each book's audio file can be found.   
-Must include at least one flag: --downloaded , --not-downloaded.  
-Downloaded: If the audio file can be found, set download status to 'Downloaded'.  
-Not Downloaded: If the audio file cannot be found, set download status to 'Not Downloaded'  
-UI: Visible Books \> Set 'Downloaded' status automatically. Visible books. Prompts before saving changes  
-CLI: Full library. No prompt
-
-  libationcli set-status -d
-  libationcli set-status -n
-  libationcli set-status -d -n
-```
-### Custom Theme Colors
-
-In Libation Chardonnay (not Classic), you may adjust the app colors using the built-in theme editor. Open the Settings window (from the menu bar: Settings > Settings). On the "Important" settings tab, click "Edit Theme Colors".
-
-#### Theme Editor Window
-
-The theme editor has a list of style names and their currently assigned colors. To change a style color, click on the color swatch in the left-hand column to open the color editor for that style. Observe the color changes in real-time on the built-in preview panel on the right-hand side of the theme editor.
-
-You may import or export themes using the buttons at the bottom-left of the theme editor.
-"Cancel" or closing the window will revert any changes you've made in the theme editor.
-"Reset" will reset any changes you've made in the theme editor.
-"Defaults" will restore the application default colors for the active theme ("Light" or "Dark")
-"Save" will save the theme colors to the ChardonnayTheme.json file and close the editor.
-
-Note: you may only edit the currently applied theme ("Light" or "Dark").
-
-#### Video Walkthrough
-The below video demonstrates using the theme editor to make changes to the Dark theme color pallet.
-
-[](https://github.com/user-attachments/assets/05c0cb7f-578f-4465-9691-77d694111349)
-
-

Documentation/FrequentlyAskedQuestions.md

@@ -1,56 +0,0 @@
-## [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 [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**.
-
-
-
-# Frequently Asked Questions
-
-## Q: Where can I get help for my specific problem?
-
-**A:** [You can open an issue here](https://github.com/rmcrackan/Libation/issues) for bug reports, feature requests, or specialized help.
-
-## Q: What's the difference between 'Classic' and 'Chardonnay'?
-
-**A:** First and most importantly: Classic and Chardonnay have the exact same features.
-
-* **Classic** is Windows only. Its older 'grey boxes' look has a compact design which allows for more information on the screen. Notably, Classic was written using an older, more mature technology which has built-in support for screenreaders.
-
-* **Chardonnay** is available for Windows, Mac, and Linux. Its modern design has a more open look and feel.
-
-## Q: Now that I've downloaded my books, how can I listen to them?
-
-**A:** You can use any app which plays m4b files (or mp3 files if you used that setting). Here are just a few ideas. Disclaimer: I have no affiliation with any of these companies:
-
-* iOS: [BookPlayer](https://apps.apple.com/us/app/bookplayer/id1138219998)
-* iOS: [Bound](https://apps.apple.com/us/app/bound-audiobook-player/id1041727137)
-* Android: [Smart AudioBook Player](https://play.google.com/store/apps/details?id=ak.alizandro.smartaudiobookplayer&hl=en_US&gl=US)
-* Android: [Listen](https://play.google.com/store/apps/details?id=ru.litres.android.audio&hl=en_US&gl=US)
-* Desktop: [VLC](https://www.videolan.org/)
-* Windows Desktop: [Audibly](https://github.com/rstewa/Audibly) -- a desktop player build specifically for audiobooks
-
-Self-hosting online:
-
-* [audiobookshelf](https://www.audiobookshelf.org). On [reddit](https://www.reddit.com/r/audiobookshelf/)
-* [plex](https://www.plex.tv/). Listen with [Prologue](https://prologue.audio/) (iOS)
-
-## Q: I'm having trouble playing my non-spatial audiobook, how can I fix this?
-
-**A:** If you enabled the [Request xHE-AAC Codec](AudioFileFormats.md#request-xhe-aac-codec) option in settings, then the audiobook is being downloaded in the [xHE-AAC codec](AudioFileFormats.md#xhe-aac) which isn't widely supported. You have two options:
-1. Use a media player which supports the xHE-AAC codec. [See an incomplete list of media players which support xHE-AAC](AudioFileFormats.md#supported-media-players).
-2. Disable the [Request xHE-AAC Codec](AudioFileFormats.md#request-xhe-aac-codec) option in settings and re-download the audiobook. This will cause Libation to download audiobooks in the [AAC-LC codec](AudioFileFormats.md#aac-lc), which enjoys near-universal media player support.
-
-## Q: I'm having trouble playing my book with 4D, spatial audio, or Dolby Atmos, how can I fix this?
-
-**A:** Spatial audiobooks are delivered in two formats: [E-AC-3](AudioFileFormats.md#e-ac-3) and [AC-4](AudioFileFormats.md#ac-4). [See an incomplete list of media players which support those codecs](AudioFileFormats.md#supported-media-players).
-
-## Q: I'm having trouble loggin into my Brazil account.
-
-**A:** For reasons known only to Jeff Bezos and God, amazon and audible brazil handle logins slightly differently. The external browser login option is not possible for Brazil. [See this ticket for more details.](https://github.com/rmcrackan/Libation/issues/1103)
-
-## Q: How do I use Libation with a South Africa account?
-
-**A:** Like many countries, amazon gives South Africa it's own amazon site. [Unlike many other regions](https://www.audible.com/ep/country-selector) there is not South Africa specific audible site. Use `US` for your region -- ie: audible.com.
-
-(Not exactly a *frequently* asked question but it's come up more than once)

Documentation/InstallOnLinux.md

@@ -1,67 +0,0 @@
-## [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 [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**.
-
-
-## Packaging status
-
-[![Packaging status](https://repology.org/badge/vertical-allrepos/libation.svg)](https://repology.org/project/libation/versions)
-
-New Libation releases are automatically packed into `.deb` and `.rpm` package and are available from the [Libation repository's releases page](https://github.com/rmcrackan/Libation/releases).
-
-Run these commands in your terminal to download and install Libation. **Make sure you replace** `X.X.X` with the latest Libation version and `ARCH` with your CPU's architechture (either `amd64` or `arm64`).
-
-### Debian
-  ```Console
-  wget -O libation.deb https://github.com/rmcrackan/Libation/releases/download/vX.X.X/Libation.X.X.X-linux-chardonnay-ARCH.deb
-  sudo apt install ./libation.deb
-  ```
-### Redhat and CentOS
-  ```Console
-  wget -O libation.rpm https://github.com/rmcrackan/Libation/releases/download/vX.X.X/Libation.X.X.X-linux-chardonnay-ARCH.rpm
-  sudo yum install ./libation.rpm
-  ```
-### Fedora
-  ```Console
-  wget -O libation.rpm https://github.com/rmcrackan/Libation/releases/download/vX.X.X/Libation.X.X.X-linux-chardonnay-ARCH.rpm
-  sudo dnf5 install ./libation.rpm
-  ```
----
-### Arch Linux
-  ```Console
-  yay -S libation
-  ```
-  This package is available on [Arch User Repository](https://aur.archlinux.org/packages/libation), install via your choice of [AUR helpers](https://wiki.archlinux.org/title/AUR_helpers).
-  
-  Thanks to [mhdi](https://aur.archlinux.org/account/mhdi) for taking care of AUR package maintenance.
-### NixOS
-  - Install via `nix-shell`
-    ```Console
-    nix-shell -p libation
-    ```
-    A `nix-shell` will temporarily modify your $PATH environment variable. This can be used to try a piece of software before deciding to permanently install it.
-  - Install via NixOS configuration
-    ```Console
-    environment.systemPackages = [
-      pkgs.libation
-    ];
-    ```
-    Add the following Nix code to your NixOS Configuration, usually located in `/etc/nixos/configuration.nix`
-  - On NixOS via via `nix-env`
-    ```Console
-    nix-env -iA nixos.libation
-    ```
-  - On Non NixOS via `nix-env`
-    ```Console
-    nix-env -iA nixpkgs.libation
-    ```
-    Warning: Using `nix-env` permanently modifies a local profile of installed packages. This must be updated and maintained by the user in the same way as with a traditional package manager.
-
-    Thanks to [TomaSajt](https://github.com/tomasajt) for taking care of Nix package maintenance.
-
-If your desktop uses gtk, you should now see Libation among your applications.
-
-Additionally, you may launch Libation, LibationCli, and Hangover (the Libation recovery app) via the command line using 'libation, libationcli', and 'hangover' aliases respectively.
-
-Report bugs to https://github.com/rmcrackan/Libation/issues

Documentation/InstallOnMac.md

@@ -1,82 +0,0 @@
-## [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 [PayPal.me](https://paypal.me/mcrackan?locale.x=en_us)
-...or just tell more friends. As long as I'm maintaining this software, it will remain **free** and **open source**.
-
-
-
-# Run Libation on MacOS
-This walkthrough should get you up and running with Libation on your Mac.
-
-## Supports macOS 13 (Ventura) and above
-
-## Install Libation
-
-- Download the file from the latest release and extract it.
-  - Apple Silicon (M1, M2, ...): `Libation.x.x.x-macOS-chardonnay-`**arm64**`.tgz`
-  - Intel: `Libation.x.x.x-macOS-chardonnay-`**x64**`.tgz`
-- Move the extracted Libation app bundle to your applications folder.
-- Right-click on Libation and then click on open
-- The first time, it will not immediately show you an option to open it. Just dismiss the dialog and do the same thing again (right-click -> open) then you will get an option to run the unsigned application. This takes about 10 seconds.
-
-## If this doesn't work
-
-You can add Libation as a safe app without touching Gatekeeper.
-
-- Copy/paste/run the following command. Adjust the file path to the Libation.app on your computer if necessary.
-
-  ```Console
-  xattr -r -d com.apple.quarantine ~/Downloads/Libation.app
-  ```
-- Close the terminal and use Libation!
-
-## If this still doesn't work
-
-- Copy/paste/run the following command (you'll be prompted to enter your Mac 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!
-
-## "Apple can't check app for malicious software"
-
-From: [How to Open Anyway](https://support.apple.com/guide/mac-help/apple-cant-check-app-for-malicious-software-mchleab3a043/mac):
-
-* On your Mac, choose Apple menu > System Settings, then click Privacy & Security in the sidebar. (You may need to scroll down.)
-* Go to Security, then click Open.
-* Click Open Anyway. This button is available for about an hour after you try to open the app.
-* Enter your login password, then click OK.
-
-## Troubleshooting
-
-If Libation fails to start after completing the above steps, try the following:
-
-1. Right-click the Libation app in your applications folder and select _Show Package Contents_
-2. Open the `Contents` folder and then the `MacOS` folder.
-3. Find the file named `Libation`, right-click it, and then select _Open_.
-
-Libation _should_ launch, and you should now be able to open Libation by just double-clicking the app bundle in your applications folder.
-
-
-## Running Hangover
-
-Libation comes with a recovery app called Hangover. You can start it by running this command:
-```Console
-open /Applications/Libation.app --args hangover
-```
-
-## Running LibationCli
-
-Libation comes with a command-line interface. Unfortunately, due to the way apps are sandboxed on mac, its use is somewhat limited. To open a new sandboxed terminal in LibationCli's directory, run the following command:
-```Console
-open /Applications/Libation.app --args cli
-```
-To use LibationCli from an unsandboxed terminal, you must disable gatekeeper again and run the program directly at `/Applications/Libation.app/Contents/MacOS/LibationCli`
-
-Then use `./LibationCli` to execute a command.
-
-## Get Libation running on Mac
-
-[Run Libation on MacOS](https://user-images.githubusercontent.com/37587114/219271379-a922e4e1-48a0-48e4-bd81-48aa1226a4f5.mp4)

Documentation/NamingTemplates.md

@@ -1,178 +0,0 @@
-## [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 [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**.
-
-
-
-# Naming Templates
-File and Folder names can be customized using Libation's built-in tag template naming engine. To edit how folder and file names are created, go to Settings \> Download/Decrypt and edit the naming templates. If you're splitting your audiobook into multiple files by chapter, you can also use a custom template to set each chapter's title metadata tag by editing the template in Settings \> Audio File Options.
-
-These templates apply to both GUI and CLI.
-
-# Table of Contents
-
-- [Template Tags](#template-tags)
-  - [Property Tags](#property-tags)
-  - [Conditional Tags](#conditional-tags)
-- [Tag Formatters](#tag-formatters)
-  - [Text Formatters](#text-formatters)
-  - [Series Formatters](#series-formatters)
-  - [Series List Formatters](#series-list-formatters)
-  - [Name Formatters](#name-formatters)
-  - [Name List Formatters](#name-list-formatters)
-  - [Number Formatters](#number-formatters)
-  - [Date Formatters](#date-formatters)
-
-
-# Template Tags
-
-These are the naming template tags currently supported by Libation.
-
-## Property Tags
-These tags will be replaced in the template with the audiobook's values.
-
-|Tag|Description|Type|
-|-|-|-|
-|\<id\> **†**|Audible book ID (ASIN)|Text|
-|\<title\>|Full title with subtitle|[Text](#text-formatters)|
-|\<title short\>|Title. Stop at first colon|[Text](#text-formatters)|
-|\<audible title\>|Audible's title (does not include subtitle)|[Text](#text-formatters)|
-|\<audible subtitle\>|Audible's subtitle|[Text](#text-formatters)|
-|\<author\>|Author(s)|[Name List](#name-list-formatters)|
-|\<first author\>|First author|[Name](#name-formatters)|
-|\<narrator\>|Narrator(s)|[Name List](#name-list-formatters)|
-|\<first narrator\>|First narrator|[Name](#name-formatters)|
-|\<series\>|All series to which the book belongs (if any)|[Series List](#series-list-formatters)|
-|\<first series\>|First series|[Series](#series-formatters)|
-|\<series#\>|Number order in series (alias for \<first series[{#}]\>|[Number](#number-formatters)|
-|\<bitrate\>|Bitrate (kbps) of the last downloaded audiobook|[Number](#number-formatters)|
-|\<samplerate\>|Sample rate (Hz) of the last downloaded audiobook|[Number](#number-formatters)|
-|\<channels\>|Number of audio channels in the last downloaded audiobook|[Number](#number-formatters)|
-|\<codec\>|Audio codec of the last downloaded audiobook|[Text](#text-formatters)|
-|\<file version\>|Audible's file version number of the last downloaded audiobook|[Text](#text-formatters)|
-|\<libation version\>|Libation version used during last download of the audiobook|[Text](#text-formatters)|
-|\<account\>|Audible account of this book|[Text](#text-formatters)|
-|\<account nickname\>|Audible account nickname of this book|[Text](#text-formatters)|
-|\<locale\>|Region/country|[Text](#text-formatters)|
-|\<year\>|Year published|[Number](#number-formatters)|
-|\<language\>|Book's language|[Text](#text-formatters)|
-|\<language short\> **†**|Book's language abbreviated. Eg: ENG|Text|
-|\<file date\>|File creation date/time.|[DateTime](#date-formatters)|
-|\<pub date\>|Audiobook publication date|[DateTime](#date-formatters)|
-|\<date added\>|Date the book added to your Audible account|[DateTime](#date-formatters)|
-|\<ch count\> **‡**|Number of chapters|[Number](#number-formatters)|
-|\<ch title\> **‡**|Chapter title|[Text](#text-formatters)|
-|\<ch#\> **‡**|Chapter number|[Number](#number-formatters)|
-|\<ch# 0\> **‡**|Chapter number with leading zeros|[Number](#number-formatters)|
-
-**†** Does not support custom formatting
-
-**‡** Only valid for Chapter Filename and Chapter Tile Metadata
-
-To change how these properties are displayed, [read about custom formatters](#tag-formatters)
-
-## Conditional Tags
-Anything between the opening tag (`<tagname->`) and closing tag (`<-tagname>`) will only appear in the name if the condition evaluates to true. 
-
-|Tag|Description|Type|
-|-|-|-|
-|\<if series-\>...\<-if series\>|Only include if part of a book series or podcast|Conditional|
-|\<if podcast-\>...\<-if podcast\>|Only include if part of a podcast|Conditional|
-|\<if bookseries-\>...\<-if bookseries\>|Only include if part of a book series|Conditional|
-|\<if podcastparent-\>...\<-if podcastparent\>**†**|Only include if item is a podcast series parent|Conditional|
-|\<has PROPERTY-\>...\<-has\>|Only include if the PROPERTY has a value (i.e. not null or empty)|Conditional|
-
-**†** Only affects the podcast series folder naming if "Save all podcast episodes to the series parent folder" option is checked.
-
-For example, `<if podcast-><series><-if podcast>` will evaluate to the podcast's series name if the file is a podcast. For audiobooks that are not podcasts, that tag will be blank.
-
-You can invert the condition (instead of displaying the text when the condition is true, display the text when it is false) by playing a `!` symbol before the opening tag name. 
-
-|Inverted Tag|Description|Type|
-|-|-|-|
-|\<!if series-\>...\<-if series\>|Only include if *not* part of a book series or podcast|Conditional|
-|\<!if podcast-\>...\<-if podcast\>|Only include if *not* part of a podcast|Conditional|
-|\<!if bookseries-\>...\<-if bookseries\>|Only include if *not* part of a book series|Conditional|
-|\<!if podcastparent-\>...\<-if podcastparent\>**†**|Only include if item is *not* a podcast series parent|Conditional|
-|\<!has PROPERTY-\>...\<-has\>|Only include if the PROPERTY *does not* have a value (i.e. is null or empty)|Conditional|
-
-**†** Only affects the podcast series folder naming if "Save all podcast episodes to the series parent folder" option is checked.
-
-As an example, this folder template will place all Liberated podcasts into a "Podcasts" folder and all liberated books (not podcasts) into a "Books" folder.
-
-`<if podcast->Podcasts<-if podcast><!if podcast->Books<-if podcast>\<title>`
-
-This example will add a number if the `<series#\>` tag has a value:
-
-`<has series#><series#><-has>`
-
-This example will put non-series books in a "Standalones" folder:
-
-`<!if series->Standalones/<-if series>`
-
-And this example will customize the title based on whether the book has a subtitle:
-
-`<audible title><has audible subtitle->-<audible subtitle><-has>`
-
-# Tag Formatters
-**Text**, **Name List**, **Number**, and **DateTime** tags can be optionally formatted using format text in square brackets after the tag name. Below is a list of supported formatters for each tag type.
-
-## Text Formatters
-|Formatter|Description|Example Usage|Example Result|
-|-|-|-|-|
-|L|Converts text to lowercase|\<title[L]\>|a study in scarlet꞉ a sherlock holmes novel|
-|U|Converts text to uppercase|\<title short[U]\>|A STUDY IN SCARLET|
-
-## Series Formatters
-|Formatter|Description|Example Usage|Example Result|
-|-|-|-|-|
-|\{N \| # \| ID\}|Formats the series using<br>the series part tags.<br>\{N\} = Series Name<br>\{#\} = Number order in series<br>\{#:[Number_Formatter](#number-formatters)\} = Number order in series, formatted<br>\{ID\} = Audible Series ID<br><br>Default is \{N\}|`<first series>`<hr>`<first series[{N}]>`<hr>`<first series[{N}, {#}, {ID}]>`<hr>`<first series[{N}, {ID}, {#:00.0}]>`|Sherlock Holmes<hr>Sherlock Holmes<hr>Sherlock Holmes, 1-6, B08376S3R2<hr>Sherlock Holmes, B08376S3R2, 01.0-06.0|
-
-## Series List Formatters
-|Formatter|Description|Example Usage|Example Result|
-|-|-|-|-|
-|separator()|Speficy the text used to join<br>multiple series names.<br><br>Default is ", "|`<series[separator(; )]>`|Sherlock Holmes; Some Other Series|
-|format(\{N \| # \| ID\})|Formats the series properties<br>using the name series tags.<br>See [Series Formatter Usage](#series-formatters) above.|`<series[format({N}, {#})`<br>`separator(; )]>`<hr>`<series[format({ID}-{N}, {#:00.0})]>`|Sherlock Holmes, 1-6; Book Collection, 1<hr>B08376S3R2-Sherlock Holmes, 01.0-06.0, B000000000-Book Collection, 01.0|
-|max(#)|Only use the first # of series<br><br>Default is all series|`<series[max(1)]>`|Sherlock Holmes|
-
-## Name Formatters
-|Formatter|Description|Example Usage|Example Result|
-|-|-|-|-|
-|\{T \| F \| M \| L \| S \| ID\}|Formats the human name using<br>the name part tags.<br>\{T\} = Title (e.g. "Dr.")<br>\{F\} = First name<br>\{M\} = Middle name<br>\{L\} = Last Name<br>\{S\} = Suffix (e.g. "PhD")<br>\{ID\} = Audible Contributor ID<br><br>Default is \{P\} \{F\} \{M\} \{L\} \{S\}|`<first narrator[{L}, {F}]>`<hr>`<first author[{L}, {F} _{ID}_]>`|Fry, Stephen<hr>Doyle, Arthur \_B000AQ43GQ\_;<br>Fry, Stephen \_B000APAGVS\_|
-
-## Name List Formatters
-|Formatter|Description|Example Usage|Example Result|
-|-|-|-|-|
-|separator()|Speficy the text used to join<br>multiple people's names.<br><br>Default is ", "|`<author[separator(; )]>`|Arthur Conan Doyle; Stephen Fry|
-|format(\{T \| F \| M \| L \| S \| ID\})|Formats the human name using<br>the name part tags.<br>See [Name Formatter Usage](#name-formatters) above.|`<author[format({L}, {F})`<br>`separator(; )]>`<hr>`<author[format({L}, {F}`<br>`_{ID}_) separator(; )]>`|Doyle, Arthur; Fry, Stephen<hr>Doyle, Arthur \_B000AQ43GQ\_;<br>Fry, Stephen \_B000APAGVS\_|
-|sort(F \| M \| L)|Sorts the names by first, middle,<br>or last name<br><br>Default is unsorted|`<author[sort(M)]>`|Stephen Fry, Arthur Conan Doyle|
-|max(#)|Only use the first # of names<br><br>Default is all names|`<author[max(1)]>`|Arthur Conan Doyle|
-
-## Number Formatters
-For more custom formatters and examples, [see this guide from Microsoft](https://learn.microsoft.com/en-us/dotnet/standard/base-types/custom-numeric-format-strings).
-|Formatter|Description|Example Usage|Example Result|
-|-|-|-|-|
-|\[integer\]|Zero-pads the number|\<bitrate\[4\]\><br>\<series#\[3\]\><br>\<samplerate\[6\]\>|0128<br>001<br>044100|
-|0|Replaces the zero with the corresponding digit if one<br>is present; otherwise, zero appears in the result string.|\<series#\[000.0\]\>|001.0|
-|#|Replaces the "#" symbol with the corresponding digit if one<br> is present; otherwise, no digit appears in the result string|\<series#\[00.##\]\>|01|
-
-## Date Formatters
-Form more standard formatters, [see this guide from Microsoft](https://learn.microsoft.com/en-us/dotnet/standard/base-types/standard-date-and-time-format-strings).
-### Standard DateTime Formatters
-|Formatter|Description|Example Usage|Example Result|
-|-|-|-|-|
-|s|Sortable date/time pattern.|\<file date[s]\>|2023-02-14T13:45:30|
-|Y|Year month pattern.|\<file date[Y]\>|February 2023|
-
-### Custom DateTime Formatters
-You can use custom formatters to construct customized DateTime string. For more custom formatters and examples, [see this guide from Microsoft](https://learn.microsoft.com/en-us/dotnet/standard/base-types/custom-date-and-time-format-strings).
-|Formatter|Description|Example Usage|Example Result|
-|-|-|-|-|
-|yyyy|4-digit year|\<file date[yyyy]\>|2023|
-|yy|2-digit year|\<file date[yy]\>|23|
-|MM|2-digit month|\<file date[MM]\>|02|
-|dd|2-digit day of the month|\<file date[yyyy-MM-dd]\>|2023-02-14|
-|HH<br>mm|The hour, using a 24-hour clock from 00 to 23<br>The minute, from 00 through 59.|\<file date[HH:mm]\>|14:45|
-
-

README.md

@@ -3,73 +3,40 @@
 ## [Download Libation](https://github.com/rmcrackan/Libation/releases/latest)
 
 ### If you found this useful, tell a friend. If you found this REALLY useful, you can click here to [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**.
 
+## Getting started with Libation
 
+All documentation has been moved to our new site: [getlibation.com](https://getlibation.com). Or jump to the important bits:
 
-# Table of Contents
-
-- [Audible audiobook manager](#audible-audiobook-manager)
-    - [The good](#the-good)
-    - [The bad](#the-bad)
-    - [The ugly](#the-ugly)
-- [Getting started](Documentation/GettingStarted.md)
-    - [Download Libation](Documentation/GettingStarted.md#download-libation-1)
-    - [Installation](Documentation/GettingStarted.md#installation)
-    - [Create Accounts](Documentation/GettingStarted.md#create-accounts)
-    - [Import your library](Documentation/GettingStarted.md#import-your-library)
-    - [Download your books -- DRM-free!](Documentation/GettingStarted.md#download-your-books----drm-free)
-    - [Download PDF attachments](Documentation/GettingStarted.md#download-pdf-attachments)
-    - [Details of downloaded files](Documentation/GettingStarted.md#details-of-downloaded-files)
-    - [Export your library](Documentation/GettingStarted.md#export-your-library)
-    - If you still need help, [you can open an issue here](https://github.com/rmcrackan/Libation/issues) for bug reports, feature requests, or specialized help.
-- [Searching and filtering](Documentation/SearchingAndFiltering.md)
-    - [Tags](Documentation/SearchingAndFiltering.md#tags)
-    - [Searches](Documentation/SearchingAndFiltering.md#searches)
-    - [Search examples](Documentation/SearchingAndFiltering.md#search-examples)
-    - [Filters](Documentation/SearchingAndFiltering.md#filters)
-- [Advanced](Documentation/Advanced.md)
-    - [Files and folders](Documentation/Advanced.md#files-and-folders)
-    - [Settings](Documentation/Advanced.md#settings)
-    - [Custom File Naming](Documentation/NamingTemplates.md)
-    - [Command Line Interface](Documentation/Advanced.md#command-line-interface)
-    - [Custom Theme Colors](Documentation/Advanced.md#custom-theme-colors) (Chardonnay Only)
-    - [Audio Formats (Dolby Atmos, Widevine, Spacial Audio)](Documentation/AudioFileFormats.md)
-- [Docker](Documentation/Docker.md)
-- [Frequently Asked Questions](Documentation/FrequentlyAskedQuestions.md)
-
-## Getting started
-
+* [Getting Started](https://getlibation.com/docs/getting-started)
 * [Download](https://github.com/rmcrackan/Libation/releases/latest)
-* [Step-by-step walk-through](Documentation/GettingStarted.md)
+* [Issues, bugs, and requests](https://github.com/rmcrackan/Libation/issues)
+* [Documentation](https://getlibation.com/docs/index)
 
-## Audible audiobook manager
+## Development
 
-### The good
+### Documentation
 
-* Import library from audible, including cover art
-* Download and remove DRM from all books
-* Download accompanying PDFs
-* Add tags to books for better organization
-* Powerful advanced search built on the Lucene search engine
-* Customizable saved filters for common searches
-* Open source
-* Supports most regions: US, UK, Canada, Germany, France, Australia, Japan, India, and Spain
-* Fully supported in Windows, Mac, and Linux
+The documentation is built with [VitePress](https://vitepress.dev/) and located in the `docs` directory. For more information like [markdown syntax](https://vitepress.dev/guide/markdown#advanced-configuration) and [routing](https://vitepress.dev/guide/routing) or other features, refer [VitePress documentation](https://vitepress.dev/guide).
 
-<a name="theBad"/>
+**Prerequisites**: Node.js 18+
 
-### The bad
+**Commands**:
 
-* Large file size
-* Made by a programmer, not a designer so the goals are function rather than beauty. And it shows
+```bash
+# Install dependencies
+npm install
 
-### The ugly
+# Start local dev server (http://localhost:5173)
+npm run docs:dev
 
-* Documentation? Yer lookin' at it
-* This is a single-developer personal passion project. Support, response, updates, enhancements, bug fixes etc are as my free time allows
-* I have a full-time job, a life, and a finite attention span. Therefore a lot of time can potentially go by with no improvements of any kind
+# Build for production (output: docs/.vitepress/dist)
+npm run docs:build
 
-Disclaimer: I've made every good-faith effort to include nothing insecure, malicious, anti-privacy, or destructive. That said: use at your own risk.
+# Preview production build
+npm run docs:preview
+```
 
-I made this for myself and I want to share it with the great programming and audible/audiobook communities which have been so generous with their time and help.
+**Note**: New pages are automatically routed based on their folder structure (e.g., `docs/docs/index.md` maps to `/docs/index`). To add them to the sidebar, update the `sidebar` configuration in `.vitepress/config.js`.

Scripts/Bundle_Debian.sh

@@ -28,14 +28,6 @@ then
   exit
 fi
 
-contains() { case "$1" in *"$2"*) true ;; *) false ;; esac }
-
-if ! contains "$BIN_DIR" "$ARCH"
-then
-  echo "This script must be called with a Libation binaries for ${ARCH}."
-  exit
-fi
-
 ARCH=$(echo $ARCH | sed 's/x64/amd64/')
 
 DEB_DIR=./deb
@@ -113,6 +105,7 @@ Essential: no
 Priority: optional
 Maintainer: github.com/rmcrackan
 Description: liberate your audiobooks
+Recommends: libgtk-3-0, libwebkit2gtk-4.1-0
 " >> $FOLDER_DEBIAN/control
 
 echo "Changing permissions for pre- and post-install files..."

Scripts/Bundle_MacOS.sh

@@ -3,6 +3,7 @@
 BIN_DIR=$1; shift
 VERSION=$1; shift
 ARCH=$1; shift
+SIGN_WITH_KEY=$1; shift
 
 if [ -z "$BIN_DIR" ]
 then
@@ -28,12 +29,9 @@ then
   exit
 fi
 
-contains() { case "$1" in *"$2"*) true ;; *) false ;; esac }
-
-if ! contains "$BIN_DIR" $ARCH
+if [ "$SIGN_WITH_KEY" != "true" ]
 then
-  echo "This script must be called with a Libation binaries for ${ARCH}."
-  exit
+  echo "::warning:: App will fail Gatekeeper verification without valid Apple Team information."
 fi
 
 BUNDLE=./Libation.app
@@ -74,6 +72,15 @@ mv $BUNDLE_MACOS/libation.icns $BUNDLE_RESOURCES/libation.icns
 echo "Moving Info.plist file..."
 mv $BUNDLE_MACOS/Info.plist $BUNDLE_CONTENTS/Info.plist
 
+echo "Moving Libation_DS_Store file..."
+mv $BUNDLE_MACOS/Libation_DS_Store ./Libation_DS_Store
+
+echo "Moving background.png file..."
+mv $BUNDLE_MACOS/background.png ./background.png
+
+echo "Moving background.png file..."
+mv $BUNDLE_MACOS/Libation.entitlements ./Libation.entitlements
+
 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
@@ -81,27 +88,45 @@ 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=('MacOSConfigApp' 'MacOSConfigApp.deps.json' 'MacOSConfigApp.runtimeconfig.json')
-
 for n in "${delfiles[@]}"
 do
   echo "Deleting $n"
   rm $BUNDLE_MACOS/$n
 done
 
-APP_FILE=Libation.${VERSION}-macOS-chardonnay-${ARCH}.tgz
+DMG_FILE="Libation.${VERSION}-macOS-chardonnay-${ARCH}.dmg"
 
-echo "Signing executables in: $BUNDLE"
-codesign --force --deep -s - $BUNDLE
+all_identities=$(security find-identity -v -p codesigning)
+identity=$(echo ${all_identities} | sed -n 's/.*"\(.*\)".*/\1/p')
 
-echo "Creating app bundle: $APP_FILE"
-tar -czvf $APP_FILE $BUNDLE
+if [ "$SIGN_WITH_KEY" == "true" ]; then
+  echo "Signing executables in: $BUNDLE"
+  codesign --force --deep --timestamp --options=runtime --entitlements "./Libation.entitlements" --sign "${identity}" "$BUNDLE"
+  codesign --verify --verbose "$BUNDLE"
+else
+  echo "Signing with empty key: $BUNDLE"
+  codesign --force --deep -s - $BUNDLE
+fi
 
-mkdir bundle
-echo "moving to ./bundle/$APP_FILE"
-mv $APP_FILE ./bundle/$APP_FILE
+echo "Creating app disk image: $DMG_FILE"
+mkdir Libation
+mv $BUNDLE ./Libation/$BUNDLE
+mv Libation_DS_Store Libation/.DS_Store
+mkdir Libation/.background
+mv background.png Libation/.background/
+ln -s /Applications "./Libation/ "
+mkdir ./bundle
+hdiutil create -srcFolder ./Libation -o "./bundle/$DMG_FILE"
+# Create a .DS_Store by:
+#  - mounting an existing image in shadow mode (hdiutil attach Libation.dmg -shadow junk.dmg)
+#  - Open the folder and edit it to your liking.
+#  - Copy the .DS_Store from the directory and save it to Libation_DS_Store
 
-rm -r $BUNDLE
+
+if [ "$SIGN_WITH_KEY" == "true" ]; then
+  echo "Signing $DMG_FILE"
+  codesign --deep --sign "${identity}" "./bundle/$DMG_FILE"
+fi
 
 echo "Done!"

Scripts/Bundle_Redhat.sh

@@ -28,14 +28,6 @@ then
   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
-
 BASEDIR=$(pwd)
 
 delfiles=('LinuxConfigApp' 'LinuxConfigApp.deps.json' 'LinuxConfigApp.runtimeconfig.json')
@@ -62,7 +54,7 @@ License:        GPLv3+
 URL:            https://github.com/rmcrackan/Libation
 Source0:        https://github.com/rmcrackan/Libation   
 
-Requires:       bash
+Requires:       bash gtk3 webkit2gtk4.1
 
 
 %define __os_install_post %{nil}

Source/AaxDecrypter/AaxDecrypter.csproj

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

Source/AaxDecrypter/AudiobookDownloadBase.cs

@@ -26,7 +26,17 @@ namespace AaxDecrypter
 		protected string OutputDirectory { get; }
 		public IDownloadOptions DownloadOptions { get; }
 		protected NetworkFileStream InputFileStream => NfsPersister.NetworkFileStream;
-		protected virtual long InputFilePosition => InputFileStream.Position;
+		protected virtual long InputFilePosition
+		{
+			get
+			{
+				//Use try/catch instread of checking CanRead to avoid
+				//a race with the background download completing
+				//between the check and the Position call.
+				try { return InputFileStream.Position; }
+				catch { return InputFileStream.Length; }
+			}
+		}
 		private bool downloadFinished;
 
 		private NetworkFileStreamPersister? m_nfsPersister;

Source/AaxDecrypter/IDownloadOptions.cs

@@ -15,6 +15,7 @@ namespace AaxDecrypter
             KeyPart2 = keyPart2;
         }
 
+        [Newtonsoft.Json.JsonConstructor]
         public KeyData(string keyPart1, string? keyPart2 = null)
         {
             ArgumentNullException.ThrowIfNull(keyPart1, nameof(keyPart1));

Source/AaxDecrypter/NetworkFileStream.cs

@@ -209,6 +209,12 @@ namespace AaxDecrypter
 					}
 				}
 			}
+			catch (Exception ex)
+			{
+				//Don't throw from DownloadTask.
+				//This task gets awaited in Dispose() and we don't want to have an unhandled exception there.
+				Serilog.Log.Error(ex, "An error was encountered during the download process.");
+			}
 			finally
 			{
 				_writeFile.Dispose();
@@ -306,7 +312,7 @@ namespace AaxDecrypter
 				if (WritePosition > endPosition)
 					throw new WebException($"Downloaded size (0x{WritePosition:X10}) is greater than {nameof(ContentLength)} (0x{ContentLength:X10}).");
 			}
-			catch (TaskCanceledException)
+			catch (OperationCanceledException)
 			{
 				Serilog.Log.Information("Download was cancelled");
 			}
@@ -402,7 +408,7 @@ namespace AaxDecrypter
 		 */
 		protected override void Dispose(bool disposing)
 		{
-			if (disposing && !disposed)
+			if (disposing && !Interlocked.CompareExchange(ref disposed, true, false))
 			{
 				_cancellationSource.Cancel();
 				DownloadTask?.GetAwaiter().GetResult();
@@ -413,7 +419,6 @@ namespace AaxDecrypter
 				OnUpdate(waitForWrite: true);
 			}
 
-			disposed = true;
 			base.Dispose(disposing);
 		}
 

Source/AaxDecrypter/UnencryptedAudiobookDownloader.cs

@@ -1,6 +1,6 @@
 using FileManager;
 using System.Threading.Tasks;
-
+#nullable enable
 namespace AaxDecrypter
 {
 	public class UnencryptedAudiobookDownloader : AudiobookDownloadBase

Source/AppScaffolding/AppScaffolding.csproj

@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
-    <Version>12.6.0.1</Version>
+    <TargetFramework>net10.0</TargetFramework>
+    <Version>13.0.0.1</Version>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Octokit" Version="14.0.0" />
     <!-- Do not remove unused Serilog.Sinks -->
     <!-- Only File sink is currently used. By user request (June 2024) others packages are included for experimental use. -->
-    <PackageReference Include="Serilog.Sinks.Console" Version="6.0.0" />
+    <PackageReference Include="Serilog.Sinks.Console" Version="6.1.1" />
     <PackageReference Include="Serilog.Sinks.File" Version="7.0.0" />
   </ItemGroup>
   <ItemGroup>

Source/AppScaffolding/LibationScaffolding.cs

@@ -24,7 +24,8 @@ namespace AppScaffolding
 		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
+		MacOSAvalonia_Arm64 = OS.MacOS | Variety.Chardonnay | Architecture.Arm64,
+		WindowsAvalonia_Arm64 = OS.Windows | 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
@@ -79,8 +80,18 @@ namespace AppScaffolding
 		}
 
 		/// <summary>most migrations go in here</summary>
-		public static void RunPostConfigMigrations(Configuration config)
+		public static void RunPostConfigMigrations(Configuration config, bool ephemeralSettings = false)
 		{
+			if (ephemeralSettings)
+			{
+				var settings = JObject.Parse(File.ReadAllText(config.LibationFiles.SettingsFilePath));
+				config.LoadEphemeralSettings(settings);
+			}
+			else
+			{
+				config.LoadPersistentSettings(config.LibationFiles.SettingsFilePath);
+			}
+			DeleteOpenSqliteFiles(config);
 			AudibleApiStorage.EnsureAccountsSettingsFileExists();
 
 			//
@@ -93,6 +104,39 @@ namespace AppScaffolding
 			Migrations.migrate_to_v12_0_1(config);
 		}
 
+		/// <summary>
+		/// Delete shared memory and write-ahead log SQLite database files which may prevent access to the database.
+		/// These file may or may not cause libation to hang on CreateContext,
+		/// so try our luck by swallowing any exceptions and continuing.
+		/// </summary>
+		private static void DeleteOpenSqliteFiles(Configuration config)
+		{
+			var walFile = SqliteStorage.DatabasePath + "-wal";
+			var shmFile = SqliteStorage.DatabasePath + "-shm";
+			if (File.Exists(walFile))
+			{
+				try
+				{
+					FileManager.FileUtility.SaferDelete(walFile);
+				}
+				catch(Exception ex)
+				{
+					Log.Logger.Warning(ex, "Could not delete SQLite WAL file: {@WalFile}", walFile);
+				}
+			}
+			if (File.Exists(shmFile))
+			{
+				try
+				{
+					FileManager.FileUtility.SaferDelete(shmFile);
+				}
+				catch (Exception ex)
+				{
+					Log.Logger.Warning(ex, "Could not delete SQLite SHM file: {@ShmFile}", shmFile);
+				}
+			}
+		}
+
 		/// <summary>Initialize logging. Wire-up events. Run after migration</summary>
 		public static void RunPostMigrationScaffolding(Variety variety, Configuration config)
 		{
@@ -150,7 +194,7 @@ namespace AppScaffolding
 								new JObject
 								{
 									// for this sink to work, a path must be provided. we override this below
-									{ "path", Path.Combine(config.LibationFiles, "Log.log") },
+									{ "path", Path.Combine(config.LibationFiles.Location, "Log.log") },
 									{ "rollingInterval", "Month" },
 									// Serilog template formatting examples
 									// - default:                    "{Timestamp:yyyy-MM-dd HH:mm:ss.fff zzz} [{Level:u3}] {Message:lj}{NewLine}{Exception}"
@@ -234,6 +278,7 @@ namespace AppScaffolding
             //Log.Logger.Here().Debug("Begin Libation. Debug with line numbers");
         }
 
+#nullable enable
 		private static void logStartupState(Configuration config)
 		{
 #if DEBUG
@@ -247,9 +292,11 @@ namespace AppScaffolding
 			// begin logging session with a form feed
 			Log.Logger.Information("\r\n\f");
 
-			static int fileCount(FileManager.LongPath longPath)
+			static int fileCount(FileManager.LongPath? longPath)
             {
-                try { return FileManager.FileUtility.SaferEnumerateFiles(longPath).Count(); }
+				if (longPath is null)
+					return -1;
+				try { return FileManager.FileUtility.SaferEnumerateFiles(longPath).Count(); }
                 catch { return -1; }
             }
 
@@ -289,8 +336,8 @@ namespace AppScaffolding
 			if (InteropFactory.InteropFunctionsType is null)
                 Serilog.Log.Logger.Warning("WARNING: OSInteropProxy.InteropFunctionsType is null");
         }
-
-        private static void wireUpSystemEvents(Configuration configuration)
+#nullable restore
+		private static void wireUpSystemEvents(Configuration configuration)
 		{
 			LibraryCommands.LibrarySizeChanged += (object _, List<DataLayer.LibraryBook> libraryBooks)
 				=> SearchEngineCommands.FullReIndex(libraryBooks);
@@ -433,8 +480,8 @@ namespace AppScaffolding
 			const string FILENAME_V1 = "FileLocations.json";
 			const string FILENAME_V2 = "FileLocationsV2.json";
 
-			var jsonFileV1 = Path.Combine(Configuration.Instance.LibationFiles, FILENAME_V1);
-			var jsonFileV2 = Path.Combine(Configuration.Instance.LibationFiles, FILENAME_V2);
+			var jsonFileV1 = Path.Combine(Configuration.Instance.LibationFiles.Location, FILENAME_V1);
+			var jsonFileV2 = Path.Combine(Configuration.Instance.LibationFiles.Location, FILENAME_V2);
 
 			if (!File.Exists(jsonFileV2) && File.Exists(jsonFileV1))
 			{

Source/AppScaffolding/UNSAFE_MigrationHelper.cs

@@ -7,6 +7,7 @@ using LibationFileManager;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 
+#nullable enable
 namespace AppScaffolding
 {
 	/// <summary>
@@ -20,21 +21,21 @@ namespace AppScaffolding
 	/// </summary>
 	public static class UNSAFE_MigrationHelper
 	{
-		public static string SettingsDirectory
-			=> !APPSETTINGS_TryGet(LIBATION_FILES_KEY, out var value) || value is null
+		public static string? SettingsDirectory
+			=> !APPSETTINGS_TryGet(LibationFiles.LIBATION_FILES_KEY, out var value) || value is null
 			? null
 			: value;
 
 		#region appsettings.json
 
-		public static bool APPSETTINGS_TryGet(string key, out string value)
+		public static bool APPSETTINGS_TryGet(string key, out string? value)
 		{
 			bool success = false;
-			JToken val = null;
+			JToken? val = null;
 
 			process_APPSETTINGS_Json(jObj => success = jObj.TryGetValue(key, out val), false);
 
-			value = success ? val.Value<string>() : null;
+			value = success ? val?.Value<string>() : null;
 			return success;
 		}
 
@@ -59,7 +60,10 @@ namespace AppScaffolding
 		/// <param name="save">True: save if contents changed. False: no not attempt save</param>
 		private static void process_APPSETTINGS_Json(Action<JObject> action, bool save = true)
 		{
-			var startingContents = File.ReadAllText(Configuration.AppsettingsJsonFile);
+			if (Configuration.Instance.LibationFiles.AppsettingsJsonFile is not string appSettingsFile)
+				return;
+
+			var startingContents = File.ReadAllText(appSettingsFile);
 
 			JObject jObj;
 			try
@@ -82,40 +86,37 @@ namespace AppScaffolding
 			if (startingContents.EqualsInsensitive(endingContents_indented) || startingContents.EqualsInsensitive(endingContents_compact))
 				return;
 
-			File.WriteAllText(Configuration.AppsettingsJsonFile, endingContents_indented);
+			File.WriteAllText(Configuration.Instance.LibationFiles.AppsettingsJsonFile, endingContents_indented);
 			System.Threading.Thread.Sleep(100);
 		}
 		#endregion
 		#region Settings.json
-		public const string LIBATION_FILES_KEY = "LibationFiles";
-		private const string SETTINGS_JSON = "Settings.json";
 
-		public static string SettingsJsonPath => SettingsDirectory is null ? null : Path.Combine(SettingsDirectory, SETTINGS_JSON);
-		public static bool SettingsJson_Exists => SettingsJsonPath is not null && File.Exists(SettingsJsonPath);
+		public static string? SettingsJsonPath => SettingsDirectory is null ? null : Path.Combine(SettingsDirectory, LibationFiles.SETTINGS_JSON);
 
-		public static bool Settings_TryGet(string key, out string value)
+		public static bool Settings_TryGet(string key, out string? value)
 		{
 			bool success = false;
-			JToken val = null;
+			JToken? val = null;
 
 			process_SettingsJson(jObj => success = jObj.TryGetValue(key, out val), false);
 
-			value = success ? val.Value<string>() : null;
+			value = success ? val?.Value<string>() : null;
 			return success;
 		}
 
 		public static bool Settings_JsonPathIsType(string jsonPath, JTokenType jTokenType)
 		{
-			JToken val = null;
+			JToken? val = null;
 
 			process_SettingsJson(jObj => val = jObj.SelectToken(jsonPath), false);
 
 			return val?.Type == jTokenType;
 		}
 
-		public static bool Settings_TryGetFromJsonPath(string jsonPath, out string value)
+		public static bool Settings_TryGetFromJsonPath(string jsonPath, out string? value)
 		{
-			JToken val = null;
+			JToken? val = null;
 
 			process_SettingsJson(jObj => val = jObj.SelectToken(jsonPath), false);
 
@@ -157,10 +158,10 @@ namespace AppScaffolding
 			if (!Settings_JsonPathIsType(jsonPath, JTokenType.Array))
 				return false;
 
-			JArray array = null;
-			process_SettingsJson(jObj => array = (JArray)jObj.SelectToken(jsonPath));
+			JArray? array = null;
+			process_SettingsJson(jObj => array = jObj.SelectToken(jsonPath) as JArray);
 
-			length = array.Count;
+			length = array?.Count ?? 0;
 			return true;
 		}
 
@@ -171,8 +172,7 @@ namespace AppScaffolding
 
 			process_SettingsJson(jObj =>
 			{
-				var array = (JArray)jObj.SelectToken(jsonPath);
-				array.Add(newValue);
+				(jObj.SelectToken(jsonPath) as JArray)?.Add(newValue);
 			});
 		}
 
@@ -200,8 +200,7 @@ namespace AppScaffolding
 
 			process_SettingsJson(jObj =>
 			{
-				var array = (JArray)jObj.SelectToken(jsonPath);
-				if (position < array.Count)
+				if (jObj.SelectToken(jsonPath) is JArray array && position < array.Count)
 					array.RemoveAt(position);
 			});
 		}
@@ -228,7 +227,7 @@ namespace AppScaffolding
 		private static void process_SettingsJson(Action<JObject> action, bool save = true)
 		{
 			// only insert if not exists
-			if (!SettingsJson_Exists)
+			if (!File.Exists(SettingsJsonPath))
 				return;
 
 			var startingContents = File.ReadAllText(SettingsJsonPath);
@@ -260,7 +259,7 @@ namespace AppScaffolding
 		#endregion
 		#region LibationContext.db
 		public const string LIBATION_CONTEXT = "LibationContext.db";
-		public static string DatabaseFile => SettingsDirectory is null ? null : Path.Combine(SettingsDirectory, LIBATION_CONTEXT);
+		public static string? DatabaseFile => SettingsDirectory is null ? null : Path.Combine(SettingsDirectory, LIBATION_CONTEXT);
 		public static bool DatabaseFile_Exists => DatabaseFile is not null && File.Exists(DatabaseFile);
 		#endregion
 	}

Source/ApplicationServices/ApplicationServices.csproj

@@ -1,12 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="CsvHelper" Version="33.1.0" />
-    <PackageReference Include="NPOI" Version="2.7.4" />
+	<PackageReference Include="ClosedXML" Version="0.105.0" />
   </ItemGroup>
 
   <ItemGroup>

Source/ApplicationServices/BulkSetDownloadStatus.cs

@@ -69,10 +69,10 @@ namespace ApplicationServices
             return Count;
         }
 
-        public void Execute()
+        public async Task ExecuteAsync()
         {
             foreach (var a in actionSets)
-                a.LibraryBooks.UpdateBookStatus(a.newStatus);
+                await a.LibraryBooks.UpdateBookStatusAsync(a.newStatus);
         }
     }
 }

Source/ApplicationServices/DbContexts.cs

@@ -3,20 +3,20 @@ using LibationFileManager;
 using Microsoft.EntityFrameworkCore;
 using System.Collections.Generic;
 
+#nullable enable
 namespace ApplicationServices
 {
     public static class DbContexts
     {
         /// <summary>Use for fully functional context, incl. SaveChanges(). For query-only, use the other method</summary>
         public static LibationContext GetContext()
-            => InstanceQueue<LibationContext>.WaitToCreateInstance(() =>
-            {
-                var context = !string.IsNullOrEmpty(Configuration.Instance.PostgresqlConnectionString)
-                    ? LibationContextFactory.CreatePostgres(Configuration.Instance.PostgresqlConnectionString)
-                    : LibationContextFactory.CreateSqlite(SqliteStorage.ConnectionString);
-                context.Database.Migrate();
-                return context;
-            });
+        {
+            var context = !string.IsNullOrEmpty(Configuration.Instance.PostgresqlConnectionString)
+                ? LibationContextFactory.CreatePostgres(Configuration.Instance.PostgresqlConnectionString)
+                : LibationContextFactory.CreateSqlite(SqliteStorage.ConnectionString);
+            context.Database.Migrate();
+            return context;
+        }
 
         /// <summary>Use for full library querying. No lazy loading</summary>
         public static List<LibraryBook> GetLibrary_Flat_NoTracking(bool includeParents = false)
@@ -24,5 +24,17 @@ namespace ApplicationServices
             using var context = GetContext();
             return context.GetLibrary_Flat_NoTracking(includeParents);
         }
-    }
+
+        public static List<LibraryBook> GetDeletedLibraryBooks()
+        {
+            using var context = GetContext();
+            return context.GetDeletedLibraryBooks();
+        }
+
+		public static LibraryBook? GetLibraryBook_Flat_NoTracking(string productId, bool caseSensative = true)
+        {
+			using var context = GetContext();
+			return context.GetLibraryBook_Flat_NoTracking(productId, caseSensative);
+		}
+	}
 }

Source/ApplicationServices/LibraryCommands.cs

@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using AudibleApi;
+using AudibleApi;
 using AudibleUtilities;
 using DataLayer;
 using Dinah.Core;
@@ -11,8 +6,14 @@ using Dinah.Core.Logging;
 using DtoImporterService;
 using FileManager;
 using LibationFileManager;
+using Microsoft.Extensions.DependencyModel;
 using Newtonsoft.Json.Linq;
 using Serilog;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
 using static DtoImporterService.PerfLogger;
 
 #nullable enable
@@ -70,7 +71,7 @@ namespace ApplicationServices
             }
             catch (AudibleApi.Authentication.LoginFailedException lfEx)
             {
-                lfEx.SaveFiles(Configuration.Instance.LibationFiles);
+                lfEx.SaveFiles(Configuration.Instance.LibationFiles.Location);
 
                 // nuget Serilog.Exceptions would automatically log custom properties
                 //   However, it comes with a scary warning when used with EntityFrameworkCore which I'm not yet ready to implement:
@@ -141,16 +142,16 @@ namespace ApplicationServices
                     return default;
 
                 Log.Logger.Information("Begin long-running import");
-                logTime($"pre {nameof(importIntoDbAsync)}");
-                newCount = await importIntoDbAsync(importItems);
-                logTime($"post {nameof(importIntoDbAsync)}");
+                logTime($"pre {nameof(ImportIntoDbAsync)}");
+                newCount = await Task.Run(() => ImportIntoDbAsync(importItems));
+                logTime($"post {nameof(ImportIntoDbAsync)}");
                 Log.Logger.Information($"Import complete. New count {newCount}");
 
                 return (totalCount, newCount);
             }
             catch (AudibleApi.Authentication.LoginFailedException lfEx)
             {
-                lfEx.SaveFiles(Configuration.Instance.LibationFiles);
+                lfEx.SaveFiles(Configuration.Instance.LibationFiles.Location);
 
                 // nuget Serilog.Exceptions would automatically log custom properties
                 //   However, it comes with a scary warning when used with EntityFrameworkCore which I'm not yet ready to implement:
@@ -180,7 +181,8 @@ namespace ApplicationServices
             }
         }
 
-        public static async Task<int> ImportSingleToDbAsync(AudibleApi.Common.Item item, string accountId, string localeName)
+        public static Task<int> ImportSingleToDbAsync(AudibleApi.Common.Item item, string accountId, string localeName) => Task.Run(() => importSingleToDb(item, accountId, localeName));
+		private static int importSingleToDb(AudibleApi.Common.Item item, string accountId, string localeName)
         {
             ArgumentValidator.EnsureNotNull(item, "item");
             ArgumentValidator.EnsureNotNull(accountId, "accountId");
@@ -203,35 +205,23 @@ namespace ApplicationServices
                 return 0;
             }
 
-            using var context = DbContexts.GetContext();
+			return DoDbSizeChangeOperation(ctx =>
+			{
+				var bookImporter = new BookImporter(ctx);
+				bookImporter.Import(importItems);
+				var book = ctx.LibraryBooks.FirstOrDefault(lb => lb.Book.AudibleProductId == importItem.DtoItem.ProductId);
 
-            var bookImporter = new BookImporter(context);
-            await Task.Run(() => bookImporter.Import(importItems));
-            var book = await Task.Run(() => context.LibraryBooks.FirstOrDefault(lb => lb.Book.AudibleProductId == importItem.DtoItem.ProductId));
-            
-            if (book is null)
-            {
-                book = new LibraryBook(bookImporter.Cache[importItem.DtoItem.ProductId], importItem.DtoItem.DateAdded, importItem.AccountId);
-                context.LibraryBooks.Add(book);
-            }
-            else
-            {
-                book.AbsentFromLastScan = false;
-            }
-
-            try
-            {
-                int qtyChanged = await Task.Run(() => SaveContext(context));
-                if (qtyChanged > 0)
-                    await Task.Run(() => finalizeLibrarySizeChange(context));
-                return qtyChanged;
-            }
-            catch (Exception ex)
-            {
-                Log.Logger.Error(ex, "Error adding single library book to DB. {@DebugInfo}", new { item, accountId, localeName });
-                return 0;
-            }
-        }
+				if (book is null)
+				{
+					book = new LibraryBook(bookImporter.Cache[importItem.DtoItem.ProductId], importItem.DtoItem.DateAdded, importItem.AccountId);
+					ctx.LibraryBooks.Add(book);
+				}
+				else
+				{
+					book.AbsentFromLastScan = false;
+				}
+			});
+		}
 
 		private static LogArchiver? openLogArchive(string? archivePath)
         {
@@ -268,7 +258,7 @@ namespace ApplicationServices
 
            await using LogArchiver? archiver
                 = Log.Logger.IsDebugEnabled()
-                ? openLogArchive(System.IO.Path.Combine(Configuration.Instance.LibationFiles, "LibraryScans.zip"))
+                ? openLogArchive(System.IO.Path.Combine(Configuration.Instance.LibationFiles.Location, "LibraryScans.zip"))
                 : default;
 
 			archiver?.DeleteAllButNewestN(20);
@@ -309,7 +299,7 @@ namespace ApplicationServices
 
             try
             {
-                var dtoItems = await apiExtended.GetLibraryValidatedAsync(libraryOptions, Configuration.Instance.ImportEpisodes);
+                var dtoItems = await apiExtended.GetLibraryValidatedAsync(libraryOptions);
 
                 logTime($"post scanAccountAsync {account.AccountName} qty: {dtoItems.Count}");
                 
@@ -347,23 +337,21 @@ namespace ApplicationServices
 			}
         }
 
-        private static async Task<int> importIntoDbAsync(List<ImportItem> importItems)
+        private static async Task<int> ImportIntoDbAsync(List<ImportItem> importItems) => await Task.Run(() => importIntoDb(importItems));
+		private static int importIntoDb(List<ImportItem> importItems)
         {
-            logTime("importIntoDbAsync -- pre db");
-            using var context = DbContexts.GetContext();
-            var libraryBookImporter = new LibraryBookImporter(context);
-            var newCount = await Task.Run(() => libraryBookImporter.Import(importItems));
-            logTime("importIntoDbAsync -- post Import()");
-            int qtyChanges = SaveContext(context);
-            logTime("importIntoDbAsync -- post SaveChanges");
+			logTime("importIntoDbAsync -- pre db");
 
-            // this is any changes at all to the database, not just new books
-            if (qtyChanges > 0)
-                await Task.Run(() => finalizeLibrarySizeChange(context));
-            logTime("importIntoDbAsync -- post finalizeLibrarySizeChange");
+            int newCount = 0;
 
-            return newCount;
-        }
+            DoDbSizeChangeOperation(ctx =>
+			{
+				var libraryBookImporter = new LibraryBookImporter(ctx);
+				newCount = libraryBookImporter.Import(importItems);
+				logTime("importIntoDbAsync -- post Import()");
+			});
+			return newCount;
+		}
 
         public static int SaveContext(LibationContext context)
         {
@@ -389,57 +377,58 @@ namespace ApplicationServices
 
         #region remove/restore books
         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 (removeLibraryBooks is null || !removeLibraryBooks.Any())
-                    return 0;
-
-                using var context = DbContexts.GetContext();
+		{
+			if (removeLibraryBooks is null || !removeLibraryBooks.Any())
+				return 0;
 
+			return DoDbSizeChangeOperation(ctx =>
+			{
 				// Entry() NoTracking entities before SaveChanges()
 				foreach (var lb in removeLibraryBooks)
-                {
+				{
 					lb.IsDeleted = true;
-					context.Entry(lb).State = Microsoft.EntityFrameworkCore.EntityState.Modified;
+					ctx.Entry(lb).State = Microsoft.EntityFrameworkCore.EntityState.Modified;
 				}
+			});			
+        }
 
-                var qtyChanges = context.SaveChanges();
-                if (qtyChanges > 0)
-                    finalizeLibrarySizeChange(context);
-
-                return qtyChanges;
-            }
+		public static Task<int> RestoreBooksAsync(this IEnumerable<LibraryBook> idsToRemove) => Task.Run(() => restoreBooks(idsToRemove));
+		private static int restoreBooks(this IEnumerable<LibraryBook> libraryBooks)
+		{
+			if (libraryBooks is null || !libraryBooks.Any())
+				return 0;
+			try
+            {
+				return DoDbSizeChangeOperation(ctx =>
+				{
+					// Entry() NoTracking entities before SaveChanges()
+					foreach (var lb in libraryBooks)
+					{
+						lb.IsDeleted = false;
+						ctx.Entry(lb).State = Microsoft.EntityFrameworkCore.EntityState.Modified;
+					}
+				});
+			}
             catch (Exception ex)
             {
-                Log.Logger.Error(ex, "Error removing books");
+                Log.Logger.Error(ex, "Error restoring books");
                 throw;
             }
         }
 
-        public static int RestoreBooks(this IEnumerable<LibraryBook> libraryBooks)
-        {
-            try
+		public static Task<int> PermanentlyDeleteBooksAsync(this IEnumerable<LibraryBook> idsToRemove) => Task.Run(() => permanentlyDeleteBooks(idsToRemove));
+		private static int permanentlyDeleteBooks(this IEnumerable<LibraryBook> libraryBooks)
+		{
+			if (libraryBooks is null || !libraryBooks.Any())
+				return 0;
+			try
             {
-                if (libraryBooks is null || !libraryBooks.Any())
-                    return 0;
-
-                using var context = DbContexts.GetContext();
-
-				// Entry() NoTracking entities before SaveChanges()
-				foreach (var lb in libraryBooks)
-				{
-					lb.IsDeleted = false;
-					context.Entry(lb).State = Microsoft.EntityFrameworkCore.EntityState.Modified;
-				}
-
-                var qtyChanges = context.SaveChanges();
-                if (qtyChanges > 0)
-                    finalizeLibrarySizeChange(context);
-
-                return qtyChanges;
+				return DoDbSizeChangeOperation(ctx =>
+                {
+					ctx.LibraryBooks.RemoveRange(libraryBooks);
+					ctx.Books.RemoveRange(libraryBooks.Select(lb => lb.Book));
+				});
             }
             catch (Exception ex)
             {
@@ -448,36 +437,40 @@ namespace ApplicationServices
             }
         }
 
-        public static int PermanentlyDeleteBooks(this IEnumerable<LibraryBook> libraryBooks)
+        static int DoDbSizeChangeOperation(Action<LibationContext> action)
         {
-            try
-            {
-                if (libraryBooks is null || !libraryBooks.Any())
-                    return 0;
+			try
+			{
+				int qtyChanges;
+				List<LibraryBook>? library;
 
-                using var context = DbContexts.GetContext();
+				using (var context = DbContexts.GetContext())
+				{
+					action?.Invoke(context);
 
-				context.LibraryBooks.RemoveRange(libraryBooks);
-				context.Books.RemoveRange(libraryBooks.Select(lb => lb.Book));				
+					qtyChanges = SaveContext(context);
+					logTime("importIntoDbAsync -- post SaveChanges");
+					library = qtyChanges == 0 ? null : context.GetLibrary_Flat_NoTracking(includeParents: true);
+				}
 
-                var qtyChanges = context.SaveChanges();
-				if (qtyChanges > 0)
-					finalizeLibrarySizeChange(context);
+				if (library is not null)
+					finalizeLibrarySizeChange(library);
+				logTime("importIntoDbAsync -- post finalizeLibrarySizeChange");
 
 				return qtyChanges;
-            }
-            catch (Exception ex)
-            {
-                Log.Logger.Error(ex, "Error restoring books");
-                throw;
-            }
-        }
+			}
+			catch (Exception ex)
+			{
+				Log.Logger.Error(ex, "Error performing DB Size change operation");
+				throw;
+			}
+		}
+
         #endregion
 
         // call this whenever books are added or removed from library
-        private static void finalizeLibrarySizeChange(LibationContext context)
+        private static void finalizeLibrarySizeChange(List<LibraryBook> library)
         {
-            var library = context.GetLibrary_Flat_NoTracking(includeParents: true);
             LibrarySizeChanged?.Invoke(null, library);
         }
 
@@ -490,21 +483,21 @@ namespace ApplicationServices
         public static event EventHandler<IEnumerable<LibraryBook>>? BookUserDefinedItemCommitted;
 
         #region Update book details
-        public static int UpdateUserDefinedItem(
+        public static async Task<int> UpdateUserDefinedItemAsync(
             this LibraryBook lb,
             string? tags = null,
             LiberatedStatus? bookStatus = null,
             LiberatedStatus? pdfStatus = null,
             Rating? rating = null)
-            => new[] { lb }.UpdateUserDefinedItem(tags, bookStatus, pdfStatus, rating);
+            => await UpdateUserDefinedItemAsync([lb], tags, bookStatus, pdfStatus, rating);
 
-        public static int UpdateUserDefinedItem(
+        public static async Task<int> UpdateUserDefinedItemAsync(
             this IEnumerable<LibraryBook> lb,
             string? tags = null,
             LiberatedStatus? bookStatus = null,
             LiberatedStatus? pdfStatus = null,
             Rating? rating = null)
-            => updateUserDefinedItem(
+            => await UpdateUserDefinedItemAsync(
                 lb,
                 udi => {
                     // blank tags are expected. null tags are not
@@ -521,52 +514,54 @@ namespace ApplicationServices
                         udi.UpdateRating(rating.OverallRating, rating.PerformanceRating, rating.StoryRating);
 				});
 
-        public static int UpdateBookStatus(this LibraryBook lb, LiberatedStatus bookStatus, Version? libationVersion, AudioFormat audioFormat, string audioVersion)
-            => lb.UpdateUserDefinedItem(udi => { udi.BookStatus = bookStatus; udi.SetLastDownloaded(libationVersion, audioFormat, audioVersion); });
+        public static async Task<int> UpdateBookStatusAsync(this LibraryBook lb, LiberatedStatus bookStatus, Version? libationVersion, AudioFormat audioFormat, string audioVersion)
+            => await lb.UpdateUserDefinedItemAsync(udi => { udi.BookStatus = bookStatus; udi.SetLastDownloaded(libationVersion, audioFormat, audioVersion); });
 
-        public static int UpdateBookStatus(this LibraryBook libraryBook, LiberatedStatus bookStatus)
-            => libraryBook.UpdateUserDefinedItem(udi => udi.BookStatus = bookStatus);
-        public static int UpdateBookStatus(this IEnumerable<LibraryBook> libraryBooks, LiberatedStatus bookStatus)
-            => libraryBooks.UpdateUserDefinedItem(udi => udi.BookStatus = bookStatus);
+        public static async Task<int> UpdateBookStatusAsync(this LibraryBook libraryBook, LiberatedStatus bookStatus)
+            => await libraryBook.UpdateUserDefinedItemAsync(udi => udi.BookStatus = bookStatus);
+        public static async Task<int> UpdateBookStatusAsync(this IEnumerable<LibraryBook> libraryBooks, LiberatedStatus bookStatus)
+            => await libraryBooks.UpdateUserDefinedItemAsync(udi => udi.BookStatus = bookStatus);
 
-        public static int UpdatePdfStatus(this LibraryBook libraryBook, LiberatedStatus pdfStatus)
-            => libraryBook.UpdateUserDefinedItem(udi => udi.SetPdfStatus(pdfStatus));
-        public static int UpdatePdfStatus(this IEnumerable<LibraryBook> libraryBooks, LiberatedStatus pdfStatus)
-            => libraryBooks.UpdateUserDefinedItem(udi => udi.SetPdfStatus(pdfStatus));
+        public static async Task<int> UpdatePdfStatusAsync(this LibraryBook libraryBook, LiberatedStatus pdfStatus)
+            => await libraryBook.UpdateUserDefinedItemAsync(udi => udi.SetPdfStatus(pdfStatus));
+        public static async Task<int> UpdatePdfStatusAsync(this IEnumerable<LibraryBook> libraryBooks, LiberatedStatus pdfStatus)
+            => await libraryBooks.UpdateUserDefinedItemAsync(udi => udi.SetPdfStatus(pdfStatus));
 
-        public static int UpdateTags(this LibraryBook libraryBook, string tags)
-            => libraryBook.UpdateUserDefinedItem(udi => udi.Tags = tags);
-        public static int UpdateTags(this IEnumerable<LibraryBook> libraryBooks, string tags)
-            => libraryBooks.UpdateUserDefinedItem(udi => udi.Tags = tags);
+        public static async Task<int> UpdateTagsAsync(this LibraryBook libraryBook, string tags)
+            => await libraryBook.UpdateUserDefinedItemAsync(udi => udi.Tags = tags);
+        public static async Task<int> UpdateTagsAsync(this IEnumerable<LibraryBook> libraryBooks, string tags)
+            => await libraryBooks.UpdateUserDefinedItemAsync(udi => udi.Tags = tags);
 
-        public static int UpdateUserDefinedItem(this LibraryBook libraryBook, Action<UserDefinedItem> action)
-            => libraryBook.updateUserDefinedItem(action);
-        public static int UpdateUserDefinedItem(this IEnumerable<LibraryBook> libraryBooks, Action<UserDefinedItem> action)
-            => libraryBooks.updateUserDefinedItem(action);
+		public static async Task<int> UpdateUserDefinedItemAsync(this LibraryBook libraryBook, Action<UserDefinedItem> action)
+            => await UpdateUserDefinedItemAsync([libraryBook], action);
 
-        private static int updateUserDefinedItem(this LibraryBook libraryBook, Action<UserDefinedItem> action) => new[] { libraryBook }.updateUserDefinedItem(action);
-        private static int updateUserDefinedItem(this IEnumerable<LibraryBook> libraryBooks, Action<UserDefinedItem> action)
+		public static Task<int> UpdateUserDefinedItemAsync(this IEnumerable<LibraryBook> libraryBooks, Action<UserDefinedItem> action)
+            => Task.Run(() => libraryBooks.updateUserDefinedItem(action));
+
+		private static int updateUserDefinedItem(this IEnumerable<LibraryBook> libraryBooks, Action<UserDefinedItem> action)
         {
             try
             {
                 if (libraryBooks is null || !libraryBooks.Any())
                     return 0;
 
-                using var context = DbContexts.GetContext();
-
-				// Entry() instead of Attach() due to possible stack overflow with large tables
-				foreach (var book in libraryBooks)
+                int qtyChanges;
+                using (var context = DbContexts.GetContext())
                 {
-					action?.Invoke(book.Book.UserDefinedItem);
+                    // Entry() instead of Attach() due to possible stack overflow with large tables
+                    foreach (var book in libraryBooks)
+                    {
+                        action?.Invoke(book.Book.UserDefinedItem);
 
-					var udiEntity = context.Entry(book.Book.UserDefinedItem);
+                        var udiEntity = context.Entry(book.Book.UserDefinedItem);
 
-					udiEntity.State = Microsoft.EntityFrameworkCore.EntityState.Modified;
-                    if (udiEntity.Reference(udi => udi.Rating).TargetEntry is Microsoft.EntityFrameworkCore.ChangeTracking.EntityEntry<Rating> ratingEntry)
-                        ratingEntry.State = Microsoft.EntityFrameworkCore.EntityState.Modified;
-				}
+                        udiEntity.State = Microsoft.EntityFrameworkCore.EntityState.Modified;
+                        if (udiEntity.Reference(udi => udi.Rating).TargetEntry is Microsoft.EntityFrameworkCore.ChangeTracking.EntityEntry<Rating> ratingEntry)
+                            ratingEntry.State = Microsoft.EntityFrameworkCore.EntityState.Modified;
+                    }
 
-                var qtyChanges = context.SaveChanges();
+                    qtyChanges = context.SaveChanges();
+                }
                 if (qtyChanges > 0)
                     BookUserDefinedItemCommitted?.Invoke(null, libraryBooks);
 
@@ -582,7 +577,7 @@ namespace ApplicationServices
 
         // must be here instead of in db layer due to AaxcExists
         public static LiberatedStatus Liberated_Status(Book book)
-            => book.Audio_Exists() ? book.UserDefinedItem.BookStatus
+            => book.AudioExists ? book.UserDefinedItem.BookStatus
             : AudibleFileStorage.AaxcExists(book.AudibleProductId) ? LiberatedStatus.PartialDownload
             : LiberatedStatus.NotLiberated;
 
@@ -591,7 +586,7 @@ namespace ApplicationServices
 
         // below are queries, not commands. maybe I should make a LibraryQueries. except there's already one of those...
 
-        public record LibraryStats(int booksFullyBackedUp, int booksDownloadedOnly, int booksNoProgress, int booksError, int booksUnavailable, int pdfsDownloaded, int pdfsNotDownloaded, int pdfsUnavailable)
+        public record LibraryStats(int booksFullyBackedUp, int booksDownloadedOnly, int booksNoProgress, int booksError, int booksUnavailable, int pdfsDownloaded, int pdfsNotDownloaded, int pdfsUnavailable, IEnumerable<LibraryBook> LibraryBooks)
         {
             public int PendingBooks => booksNoProgress + booksDownloadedOnly;
             public bool HasPendingBooks => PendingBooks > 0;
@@ -650,7 +645,7 @@ namespace ApplicationServices
 
             var pdfResults = libraryBooks
                 .AsParallel()
-                .Where(lb => lb.Book.HasPdf())
+                .Where(lb => lb.Book.HasPdf)
                 .Select(lb => new { absent = lb.AbsentFromLastScan, status = Pdf_Status(lb.Book) })
                 .ToList();
 
@@ -660,7 +655,7 @@ namespace ApplicationServices
 
 			Log.Logger.Information("PDF counts. {@DebugInfo}", new { total = pdfResults.Count, pdfsDownloaded, pdfsNotDownloaded, pdfsUnavailable });
 
-            return new(booksFullyBackedUp, booksDownloadedOnly, booksNoProgress, booksError, booksUnavailable, pdfsDownloaded, pdfsNotDownloaded, pdfsUnavailable);
+            return new(booksFullyBackedUp, booksDownloadedOnly, booksNoProgress, booksError, booksUnavailable, pdfsDownloaded, pdfsNotDownloaded, pdfsUnavailable, libraryBooks);
         }
     }
 }

Source/ApplicationServices/LibraryExporter.cs

@@ -1,11 +1,12 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
+using ClosedXML.Excel;
 using CsvHelper;
 using CsvHelper.Configuration.Attributes;
 using DataLayer;
 using Newtonsoft.Json;
-using NPOI.XSSF.UserModel;
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
 
 namespace ApplicationServices
 {
@@ -149,12 +150,12 @@ namespace ApplicationServices
 				Locale = a.Book.Locale,
 				Title = a.Book.Title,
 				Subtitle = a.Book.Subtitle,
-				AuthorNames = a.Book.AuthorNames(),
-				NarratorNames = a.Book.NarratorNames(),
+				AuthorNames = a.Book.AuthorNames,
+				NarratorNames = a.Book.NarratorNames,
 				LengthInMinutes = a.Book.LengthInMinutes,
 				Description = a.Book.Description,
 				Publisher = a.Book.Publisher,
-				HasPdf = a.Book.HasPdf(),
+				HasPdf = a.Book.HasPdf,
 				SeriesNames = a.Book.SeriesNames(),
 				SeriesOrder = a.Book.SeriesLink.Any() ? a.Book.SeriesLink?.Select(sl => $"{sl.Order} : {sl.Series.Name}").Aggregate((a, b) => $"{a}, {b}") : "",
 				CommunityRatingOverall = a.Book.Rating?.OverallRating.ZeroIsNull(),
@@ -208,19 +209,11 @@ namespace ApplicationServices
 		{
 			var dtos = DbContexts.GetLibrary_Flat_NoTracking().ToDtos();
 
-			var workbook = new XSSFWorkbook();
-			var sheet = workbook.CreateSheet("Library");
+			using var workbook = new XLWorkbook();
+			var sheet = workbook.AddWorksheet("Library");
 
-			var detailSubtotalFont = workbook.CreateFont();
-			detailSubtotalFont.IsBold = true;
-
-			var detailSubtotalCellStyle = workbook.CreateCellStyle();
-			detailSubtotalCellStyle.SetFont(detailSubtotalFont);
 
 			// headers
-			var rowIndex = 0;
-			var row = sheet.CreateRow(rowIndex);
-
 			var columns = new[] {
 				nameof(ExportDto.Account),
 				nameof(ExportDto.DateAdded),
@@ -261,81 +254,71 @@ namespace ApplicationServices
                 nameof(ExportDto.ChannelCount),
                 nameof(ExportDto.BitRate)
             };
-			var col = 0;
+
+			int rowIndex = 1, col = 1;
+			var headerRow = sheet.Row(rowIndex++);
 			foreach (var c in columns)
 			{
-				var cell = row.CreateCell(col++);
-				var name = ExportDto.GetName(c);
-				cell.SetCellValue(name);
-				cell.CellStyle = detailSubtotalCellStyle;
+				var headerCell = headerRow.Cell(col++);
+				headerCell.Value = ExportDto.GetName(c);
+				headerCell.Style.Font.Bold = true;
 			}
 
-			var dateFormat = workbook.CreateDataFormat();
-			var dateStyle = workbook.CreateCellStyle();
-			dateStyle.DataFormat = dateFormat.GetFormat("MM/dd/yyyy HH:mm:ss");
-
-			rowIndex++;
+			var dateFormat = CultureInfo.CurrentCulture.DateTimeFormat.ShortDatePattern + " HH:mm:ss";
 
 			// Add data rows
 			foreach (var dto in dtos)
 			{
-				col = 0;
-				row = sheet.CreateRow(rowIndex++);
+				col = 1;
+				var row = sheet.Row(rowIndex++);
 
-				row.CreateCell(col++).SetCellValue(dto.Account);
-				row.CreateCell(col++).SetCellValue(dto.DateAdded).CellStyle = dateStyle;
-				row.CreateCell(col++).SetCellValue(dto.AudibleProductId);
-				row.CreateCell(col++).SetCellValue(dto.Locale);
-				row.CreateCell(col++).SetCellValue(dto.Title);
-				row.CreateCell(col++).SetCellValue(dto.Subtitle);
-				row.CreateCell(col++).SetCellValue(dto.AuthorNames);
-				row.CreateCell(col++).SetCellValue(dto.NarratorNames);
-				row.CreateCell(col++).SetCellValue(dto.LengthInMinutes);
-				row.CreateCell(col++).SetCellValue(dto.Description);
-				row.CreateCell(col++).SetCellValue(dto.Publisher);
-				row.CreateCell(col++).SetCellValue(dto.HasPdf);
-				row.CreateCell(col++).SetCellValue(dto.SeriesNames);
-				row.CreateCell(col++).SetCellValue(dto.SeriesOrder);
-				row.CreateCell(col++).SetCellValue(dto.CommunityRatingOverall);
-				row.CreateCell(col++).SetCellValue(dto.CommunityRatingPerformance);
-				row.CreateCell(col++).SetCellValue(dto.CommunityRatingStory);
-				row.CreateCell(col++).SetCellValue(dto.PictureId);
-				row.CreateCell(col++).SetCellValue(dto.IsAbridged);
-				row.CreateCell(col++).SetCellValue(dto.DatePublished).CellStyle = dateStyle;
-				row.CreateCell(col++).SetCellValue(dto.CategoriesNames);
-				row.CreateCell(col++).SetCellValue(dto.MyRatingOverall);
-				row.CreateCell(col++).SetCellValue(dto.MyRatingPerformance);
-				row.CreateCell(col++).SetCellValue(dto.MyRatingStory);
-				row.CreateCell(col++).SetCellValue(dto.MyLibationTags);
-				row.CreateCell(col++).SetCellValue(dto.BookStatus);
-				row.CreateCell(col++).SetCellValue(dto.PdfStatus);
-				row.CreateCell(col++).SetCellValue(dto.ContentType);
-				row.CreateCell(col++).SetCellValue(dto.Language);
-				row.CreateCell(col++).SetCellValue(dto.LastDownloaded).CellStyle = dateStyle;
-				row.CreateCell(col++).SetCellValue(dto.LastDownloadedVersion);
-				row.CreateCell(col++).SetCellValue(dto.IsFinished);
-				row.CreateCell(col++).SetCellValue(dto.IsSpatial);
-				row.CreateCell(col++).SetCellValue(dto.LastDownloadedFileVersion);
-				row.CreateCell(col++).SetCellValue(dto.CodecString);
-				row.CreateCell(col++).SetCellValue(dto.SampleRate);
-				row.CreateCell(col++).SetCellValue(dto.ChannelCount);
-				row.CreateCell(col++).SetCellValue(dto.BitRate);
+				row.Cell(col++).Value = dto.Account;
+				row.Cell(col++).SetDate(dto.DateAdded, dateFormat);
+				row.Cell(col++).Value = dto.AudibleProductId;
+				row.Cell(col++).Value = dto.Locale;
+				row.Cell(col++).Value = dto.Title;
+				row.Cell(col++).Value = dto.Subtitle;
+				row.Cell(col++).Value = dto.AuthorNames;
+				row.Cell(col++).Value = dto.NarratorNames;
+				row.Cell(col++).Value = dto.LengthInMinutes;
+				row.Cell(col++).Value = dto.Description;
+				row.Cell(col++).Value = dto.Publisher;
+				row.Cell(col++).Value = dto.HasPdf;
+				row.Cell(col++).Value = dto.SeriesNames;
+				row.Cell(col++).Value = dto.SeriesOrder;
+				row.Cell(col++).Value = dto.CommunityRatingOverall;
+				row.Cell(col++).Value = dto.CommunityRatingPerformance;
+				row.Cell(col++).Value = dto.CommunityRatingStory;
+				row.Cell(col++).Value = dto.PictureId;
+				row.Cell(col++).Value = dto.IsAbridged;
+				row.Cell(col++).SetDate(dto.DatePublished, dateFormat);
+				row.Cell(col++).Value = dto.CategoriesNames;
+				row.Cell(col++).Value = dto.MyRatingOverall;
+				row.Cell(col++).Value = dto.MyRatingPerformance;
+				row.Cell(col++).Value = dto.MyRatingStory;
+				row.Cell(col++).Value = dto.MyLibationTags;
+				row.Cell(col++).Value = dto.BookStatus;
+				row.Cell(col++).Value = dto.PdfStatus;
+				row.Cell(col++).Value = dto.ContentType;
+				row.Cell(col++).Value = dto.Language;
+				row.Cell(col++).SetDate(dto.LastDownloaded, dateFormat);
+				row.Cell(col++).Value = dto.LastDownloadedVersion;
+				row.Cell(col++).Value = dto.IsFinished;
+				row.Cell(col++).Value = dto.IsSpatial;
+				row.Cell(col++).Value = dto.LastDownloadedFileVersion;
+				row.Cell(col++).Value = dto.CodecString;
+				row.Cell(col++).Value = dto.SampleRate;
+				row.Cell(col++).Value = dto.ChannelCount;
+				row.Cell(col++).Value = dto.BitRate;
 			}
 
-			using var fileData = new System.IO.FileStream(saveFilePath, System.IO.FileMode.Create);
-			workbook.Write(fileData);
+			workbook.SaveAs(saveFilePath);
 		}
 
-		private static NPOI.SS.UserModel.ICell SetCellValue(this NPOI.SS.UserModel.ICell cell, DateTime? nullableDate)
-			=> nullableDate.HasValue ? cell.SetCellValue(nullableDate.Value)
-			: cell.SetCellType(NPOI.SS.UserModel.CellType.Numeric);
-
-		private static NPOI.SS.UserModel.ICell SetCellValue(this NPOI.SS.UserModel.ICell cell, int? nullableInt)
-			=> nullableInt.HasValue ? cell.SetCellValue(nullableInt.Value)
-			: cell.SetCellType(NPOI.SS.UserModel.CellType.Numeric);
-
-		private static NPOI.SS.UserModel.ICell SetCellValue(this NPOI.SS.UserModel.ICell cell, float? nullableFloat)
-			=> nullableFloat.HasValue ? cell.SetCellValue(nullableFloat.Value)
-			: cell.SetCellType(NPOI.SS.UserModel.CellType.Numeric);
+		private static void SetDate(this IXLCell cell, DateTime? value, string dateFormat)
+		{
+			cell.Value = value;
+			cell.Style.DateFormat.Format = dateFormat;
+		}
 	}
 }

Source/ApplicationServices/RecordExporter.cs

@@ -1,10 +1,11 @@
 using AudibleApi.Common;
+using ClosedXML.Excel;
 using CsvHelper;
 using DataLayer;
 using Newtonsoft.Json.Linq;
-using NPOI.XSSF.UserModel;
 using System;
 using System.Collections.Generic;
+using System.Globalization;
 using System.Linq;
 
 namespace ApplicationServices
@@ -16,19 +17,10 @@ namespace ApplicationServices
 			if (!records.Any())
 				return;
 
-			using var workbook = new XSSFWorkbook();
-			var sheet = workbook.CreateSheet("Records");
-
-			var detailSubtotalFont = workbook.CreateFont();
-			detailSubtotalFont.IsBold = true;
-
-			var detailSubtotalCellStyle = workbook.CreateCellStyle();
-			detailSubtotalCellStyle.SetFont(detailSubtotalFont);
+			using var workbook = new XLWorkbook();
+			var worksheet = workbook.AddWorksheet("Records");
 
 			// headers
-			var rowIndex = 0;
-			var row = sheet.CreateRow(rowIndex);
-
 			var columns = new List<string>
 			{
 				nameof(Type.Name),
@@ -49,56 +41,52 @@ namespace ApplicationServices
 			if (records.OfType<Clip>().Any())
 				columns.Add(nameof(Clip.Title));
 
-			var col = 0;
+			int rowIndex = 1, col = 1;
+			var headerRow = worksheet.Row(rowIndex++);
 			foreach (var c in columns)
 			{
-				var cell = row.CreateCell(col++);
-				cell.SetCellValue(c);
-				cell.CellStyle = detailSubtotalCellStyle;
+				var headerCell = headerRow.Cell(col++);
+				headerCell.Value = c;
+				headerCell.Style.Font.Bold = true;
 			}
 
-			var dateFormat = workbook.CreateDataFormat();
-			var dateStyle = workbook.CreateCellStyle();
-			dateStyle.DataFormat = dateFormat.GetFormat("MM/dd/yyyy HH:mm:ss");
+			var dateFormat = CultureInfo.CurrentCulture.DateTimeFormat.ShortDatePattern + " HH:mm:ss";
 
 			// Add data rows
 			foreach (var record in records)
 			{
-				col = 0;
+				col = 1;
+				var row = worksheet.Row(rowIndex++);
 
-				row = sheet.CreateRow(++rowIndex);
-
-				row.CreateCell(col++).SetCellValue(record.GetType().Name);
-
-				var dateCreatedCell = row.CreateCell(col++);
-				dateCreatedCell.CellStyle = dateStyle;
-				dateCreatedCell.SetCellValue(record.Created.DateTime);
-
-				row.CreateCell(col++).SetCellValue(record.Start.TotalMilliseconds);
+				row.Cell(col++).Value = record.GetType().Name;
+				row.Cell(col++).SetDate(record.Created.DateTime, dateFormat);
+				row.Cell(col++).Value = record.Start.TotalMilliseconds;
 
 				if (record is IAnnotation annotation)
 				{
-					row.CreateCell(col++).SetCellValue(annotation.AnnotationId);
 
-					var lastModifiedCell = row.CreateCell(col++);
-					lastModifiedCell.CellStyle = dateStyle;
-					lastModifiedCell.SetCellValue(annotation.LastModified.DateTime);
+					row.Cell(col++).Value = annotation.AnnotationId;
+					row.Cell(col++).SetDate(annotation.LastModified.DateTime, dateFormat);
 
 					if (annotation is IRangeAnnotation rangeAnnotation)
 					{
-						row.CreateCell(col++).SetCellValue(rangeAnnotation.End.TotalMilliseconds);
-						row.CreateCell(col++).SetCellValue(rangeAnnotation.Text);
+						row.Cell(col++).Value = rangeAnnotation.End.TotalMilliseconds;
+						row.Cell(col++).Value = rangeAnnotation.Text;
 
 						if (rangeAnnotation is Clip clip)
-							row.CreateCell(col++).SetCellValue(clip.Title);
+							row.Cell(col++).Value = clip.Title;
 					}
 				}
 			}
 
-			using var fileData = new System.IO.FileStream(saveFilePath, System.IO.FileMode.Create);
-			workbook.Write(fileData);
+			workbook.SaveAs(saveFilePath);
 		}
 
+		private static void SetDate(this IXLCell cell, DateTime? value, string dateFormat)
+		{
+			cell.Value = value;
+			cell.Style.DateFormat.Format = dateFormat;
+		}
 		public static void ToJson(string saveFilePath, LibraryBook libraryBook, IEnumerable<IRecord> records)
 		{
 			if (!records.Any())

Source/AudibleUtilities/Account.cs

@@ -18,68 +18,64 @@ namespace AudibleUtilities
 		public string AccountId { get; }
 
 		// user-friendly, non-canonical name. mutable
-		private string _accountName;
 		public string AccountName
 		{
-			get => _accountName;
+			get => field;
 			set
 			{
 				if (string.IsNullOrWhiteSpace(value))
 					return;
 				var v = value.Trim();
-				if (v == _accountName)
+				if (v == field)
 					return;
-				_accountName = v;
+				field = v;
 				update();
 			}
 		}
 
 		// whether to include this account when scanning libraries.
 		// technically this is an app setting; not an attribute of account. but since it's managed with accounts, it makes sense to put this exception-to-the-rule here
-		private bool _libraryScan = true;
 		public bool LibraryScan
 		{
-			get => _libraryScan;
+			get => field;
 			set
 			{
-				if (value == _libraryScan)
+				if (value == field)
 					return;
-				_libraryScan = value;
+				field = value;
 				update();
 			}
 		}
 
-		private string _decryptKey = "";
 		/// <summary>aka: activation bytes</summary>
 		public string DecryptKey
 		{
-			get => _decryptKey;
+			get => field ?? "";
 			set
 			{
 				var v = (value ?? "").Trim();
-				if (v == _decryptKey)
+				if (v == field)
 					return;
-				_decryptKey = v;
+				field = v;
 				update();
 			}
 		}
 
-		private Identity _identity;
 		public Identity IdentityTokens
 		{
-			get => _identity;
+			get => field;
 			set
 			{
-				if (_identity is null && value is null)
+				if (field is null && value is null)
 					return;
 
-				if (_identity is not null)
-					_identity.Updated -= update;
+				if (field is not null)
+					field.Updated -= update;
 
 				if (value is not null)
 					value.Updated += update;
 
-				_identity = value;
+				field = value;
 				update();
 			}
 		}

Source/AudibleUtilities/AccountsSettings.cs

@@ -6,6 +6,7 @@ using AudibleApi.Authorization;
 using Dinah.Core;
 using Newtonsoft.Json;
 
+#nullable enable
 namespace AudibleUtilities
 {
 	// 'AccountsSettings' is intentionally NOT IEnumerable<> so that properties can be added/extended
@@ -14,8 +15,8 @@ namespace AudibleUtilities
 	//   JSON :  Array (properties on the collection will not be serialized)
 	public class AccountsSettings : IUpdatable
 	{
-		public event EventHandler Updated;
-		private void update(object sender = null, EventArgs e = null)
+		public event EventHandler? Updated;
+		private void update(object? sender = null, EventArgs? e = null)
 		{
 			foreach (var account in Accounts)
 				validate(account);
@@ -48,9 +49,9 @@ namespace AudibleUtilities
 			}
 		}
 
-		private string _cdm;
+		private string? _cdm;
 		[JsonProperty]
-		public string Cdm
+		public string? Cdm
 		{
 			get => _cdm;
 			set
@@ -68,7 +69,7 @@ namespace AudibleUtilities
 		#endregion
 
 		#region de/serialize
-		public static AccountsSettings FromJson(string json)
+		public static AccountsSettings? FromJson(string json)
 			=> JsonConvert.DeserializeObject<AccountsSettings>(json, Identity.GetJsonSerializerSettings());
 
 		public string ToJson(Formatting formatting = Formatting.Indented)
@@ -107,7 +108,7 @@ namespace AudibleUtilities
 			account.Updated += update;
 		}
 
-		public Account GetAccount(string accountId, string locale)
+		public Account? GetAccount(string accountId, string? locale)
 		{
 			if (locale is null)
 				return null;

Source/AudibleUtilities/ApiExtended.cs

@@ -10,6 +10,7 @@ using Dinah.Core;
 using Polly;
 using Polly.Retry;
 using System.Threading;
+using LibationFileManager;
 
 #nullable enable
 namespace AudibleUtilities
@@ -72,16 +73,16 @@ namespace AudibleUtilities
 			// 2 retries == 3 total
 			.RetryAsync(2);
 
-		public Task<List<Item>> GetLibraryValidatedAsync(LibraryOptions libraryOptions, bool importEpisodes = true)
+		public Task<List<Item>> GetLibraryValidatedAsync(LibraryOptions libraryOptions)
 		{
 			// bug on audible's side. the 1st time after a long absence, a query to get library will return without titles or authors. a subsequent identical query will be successful. this is true whether or not tokens are refreshed
 			// worse, this 1st dummy call doesn't seem to help:
 			//    var page = await api.GetLibraryAsync(new AudibleApi.LibraryOptions { NumberOfResultPerPage = 1, PageNumber = 1, PurchasedAfter = DateTime.Now.AddYears(-20), ResponseGroups = AudibleApi.LibraryOptions.ResponseGroupOptions.ALL_OPTIONS });
 			// i don't want to incur the cost of making a full dummy call every time because it fails sometimes
-			return policy.ExecuteAsync(() => getItemsAsync(libraryOptions, importEpisodes));
+			return policy.ExecuteAsync(() => getItemsAsync(libraryOptions));
 		}
 
-		private async Task<List<Item>> getItemsAsync(LibraryOptions libraryOptions, bool importEpisodes)
+		private async Task<List<Item>> getItemsAsync(LibraryOptions libraryOptions)
 		{
 			Serilog.Log.Logger.Debug("Beginning library scan.");
 
@@ -95,12 +96,12 @@ namespace AudibleUtilities
 
 			//Scan the library for all added books.
 			//Get relationship asins from episode-type items and write them to episodeChannel where they will be batched and queried.
-			await foreach (var item in Api.GetLibraryItemsPagesAsync(libraryOptions, BatchSize, semaphore))
+			await foreach (var itemsBatch in Api.GetLibraryItemsPagesAsync(libraryOptions, BatchSize, semaphore))
 			{
-				if (importEpisodes)
+				if (Configuration.Instance.ImportEpisodes)
 				{
-					var episodes = item.Where(i => i.IsEpisodes).ToList();
-					var series = item.Where(i => i.IsSeriesParent).ToList();
+					var episodes = itemsBatch.Where(i => i.IsEpisodes).ToList();
+					var series = itemsBatch.Where(i => i.IsSeriesParent).ToList();
 
 					var parentAsins = episodes
 						.SelectMany(i => i.Relationships)
@@ -119,7 +120,11 @@ namespace AudibleUtilities
 					items.AddRange(series);
 				}
 
-				items.AddRange(item.Where(i => !i.IsSeriesParent && !i.IsEpisodes));
+				var booksInBatch
+					= itemsBatch
+					.Where(i => !i.IsSeriesParent && !i.IsEpisodes)
+					.Where(i => i.IsAyce is not true || Configuration.Instance.ImportPlusTitles);
+				items.AddRange(booksInBatch);
 			}
 
 			sw.Stop();

Source/AudibleUtilities/AudibleApiStorage.cs

@@ -25,7 +25,7 @@ namespace AudibleUtilities
 
 	public static class AudibleApiStorage
 	{
-		public static string AccountsSettingsFile => Path.Combine(Configuration.Instance.LibationFiles, "AccountsSettings.json");
+		public static string AccountsSettingsFile => Path.Combine(Configuration.Instance.LibationFiles.Location, "AccountsSettings.json");
 
 		public static event EventHandler<AccountSettingsLoadErrorEventArgs> LoadError;
 

Source/AudibleUtilities/AudibleUtilities.csproj

@@ -1,12 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="AudibleApi" Version="9.4.5.1" />
-    <PackageReference Include="Google.Protobuf" Version="3.32.0" />
+    <PackageReference Include="AudibleApi" Version="10.1.2.1" />
+    <PackageReference Include="Google.Protobuf" Version="3.33.2" />
   </ItemGroup>
 
   <ItemGroup>

Source/DataLayer.Postgres/DataLayer.Postgres.csproj

@@ -1,23 +1,19 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
   </PropertyGroup>
 
   <PropertyGroup>
     <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
     <OutputType>Library</OutputType>
   </PropertyGroup>
-  
   <ItemGroup>
-    <PackageReference Include="Dinah.Core" Version="9.0.3.1" />
-    <PackageReference Include="Dinah.EntityFrameworkCore" Version="9.0.0.1" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="9.0.8">
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="10.0.0">
       <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <IncludeAssets>runtime; build; native; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="9.0.4" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="9.0.8">
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="10.0.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

Source/DataLayer.Sqlite/DataLayer.Sqlite.csproj

@@ -1,23 +1,19 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
   </PropertyGroup>
 
   <PropertyGroup>
     <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
     <OutputType>Library</OutputType>
   </PropertyGroup>
-  
   <ItemGroup>
-    <PackageReference Include="Dinah.Core" Version="9.0.3.1" />
-    <PackageReference Include="Dinah.EntityFrameworkCore" Version="9.0.0.1" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="9.0.8">
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="10.0.0">
       <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <IncludeAssets>runtime; build; native; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="9.0.8" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="9.0.8">
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="10.0.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

Source/DataLayer.Sqlite/SqliteContextFactory.cs

@@ -1,6 +1,6 @@
 using Microsoft.EntityFrameworkCore.Design;
 
-namespace DataLayer.Postgres
+namespace DataLayer.Sqlite
 {
     public class SqliteContextFactory : IDesignTimeDbContextFactory<LibationContext>
     {

Source/DataLayer/DataLayer.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
   </PropertyGroup>
 
   <PropertyGroup>
@@ -10,15 +10,15 @@
   </PropertyGroup>
   
   <ItemGroup>
-    <PackageReference Include="Dinah.Core" Version="9.0.3.1" />
-    <PackageReference Include="Dinah.EntityFrameworkCore" Version="9.0.0.1" />
-    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="9.0.4" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="9.0.8" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="9.0.8">
+    <PackageReference Include="Dinah.Core" Version="10.0.0.1" />
+    <PackageReference Include="Dinah.EntityFrameworkCore" Version="10.0.0.1" />
+	<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="10.0.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="10.0.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="10.0.0">
       <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <IncludeAssets>runtime; build; native; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="9.0.8">
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="10.0.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

Source/DataLayer/EntityExtensions.cs

@@ -13,69 +13,74 @@ namespace DataLayer
 				.Where(a => a.Role == role)
 				.OrderBy(a => a.Order);
 
-		public static string TitleSortable(this Book book) => Formatters.GetSortName(book.Title + book.Subtitle);
 
-        public static string AuthorNames(this Book book) => string.Join(", ", book.Authors.Select(a => a.Name));
-        public static string NarratorNames(this Book book) => string.Join(", ", book.Narrators.Select(n => n.Name));
+		extension(Book book)
+		{
+			public string SeriesSortable() => Formatters.GetSortName(book.SeriesNames(true));
+			public string TitleSortable() => Formatters.GetSortName(book.Title + book.Subtitle);
 
-        /// <summary>True if IsLiberated or Error. False if NotLiberated</summary>
-        public static bool Audio_Exists(this Book book) => book.UserDefinedItem.BookStatus != LiberatedStatus.NotLiberated;
-        /// <summary>True if exists and IsLiberated. Else false</summary>
-        public static bool PDF_Exists(this Book book) => book.UserDefinedItem.PdfStatus == LiberatedStatus.Liberated;
+			public string AuthorNames => string.Join(", ", book.Authors.Select(a => a.Name));
+			public string NarratorNames => string.Join(", ", book.Narrators.Select(n => n.Name));
+			/// <summary>True if IsLiberated or Error. False if NotLiberated</summary>
+			public bool AudioExists => book.UserDefinedItem.BookStatus is LiberatedStatus.Liberated or LiberatedStatus.Error;
+			/// <summary>True if exists and IsLiberated. Else false</summary>
+			public bool PdfExists => book.UserDefinedItem.PdfStatus is LiberatedStatus.Liberated;
+			/// <summary> Whether the book has any supplements </summary>
+			public bool HasPdf => book.Supplements.Any();
 
-        public static string SeriesSortable(this Book book) => Formatters.GetSortName(book.SeriesNames(true));
-		public static bool HasPdf(this Book book) => book.Supplements.Any();
-        public static string SeriesNames(this Book book, bool includeIndex = false)
-        {
-            if (book.SeriesLink is null)
-                return "";
+			public string SeriesNames(bool includeIndex = false)
+			{
+				if (book.SeriesLink is null)
+					return "";
 
-            // first: alphabetical by name
-            var withNames = book.SeriesLink
-                .Where(s => !string.IsNullOrWhiteSpace(s.Series.Name))
-                .Select(getSeriesNameString)
-                .OrderBy(a => a)
-                .ToList();
-            // then un-named are alpha by series id
-            var nullNames = book.SeriesLink
-                .Where(s => string.IsNullOrWhiteSpace(s.Series.Name))
-                .Select(s => s.Series.AudibleSeriesId)
-                .OrderBy(a => a)
-                .ToList();
+				// first: alphabetical by name
+				var withNames = book.SeriesLink
+					.Where(s => !string.IsNullOrWhiteSpace(s.Series.Name))
+					.Select(getSeriesNameString)
+					.OrderBy(a => a)
+					.ToList();
+				// then un-named are alpha by series id
+				var nullNames = book.SeriesLink
+					.Where(s => string.IsNullOrWhiteSpace(s.Series.Name))
+					.Select(s => s.Series.AudibleSeriesId)
+					.OrderBy(a => a)
+					.ToList();
 
-            var all = withNames.Union(nullNames).ToList();
-            return string.Join(", ", all);
+				var all = withNames.Union(nullNames).ToList();
+				return string.Join(", ", all);
 
-            string getSeriesNameString(SeriesBook sb)
-                => includeIndex && !string.IsNullOrWhiteSpace(sb.Order) && sb.Order != "-1"
-                ? $"{sb.Series.Name} (#{sb.Order})"
-                : sb.Series.Name;
+				string getSeriesNameString(SeriesBook sb)
+					=> includeIndex && !string.IsNullOrWhiteSpace(sb.Order) && sb.Order != "-1"
+					? $"{sb.Series.Name} (#{sb.Order})"
+					: sb.Series.Name;
+			}
+
+			public string[] LowestCategoryNames()
+				=> book.CategoriesLink?.Any() is not true ? Array.Empty<string>()
+				: book
+					.CategoriesLink
+					.Select(cl => cl.CategoryLadder.Categories.LastOrDefault()?.Name)
+					.Where(c => c is not null)
+					.Distinct()
+					.ToArray();
+
+			public string[] AllCategoryNames()
+				=> book.CategoriesLink?.Any() is not true ? Array.Empty<string>()
+				: book
+					.CategoriesLink
+					.SelectMany(cl => cl.CategoryLadder.Categories)
+					.Select(c => c.Name)
+					.ToArray();
+
+			public string[] AllCategoryIds()
+				=> book.CategoriesLink?.Any() is not true ? null
+				: book
+					.CategoriesLink
+					.SelectMany(cl => cl.CategoryLadder.Categories)
+					.Select(c => c.AudibleCategoryId)
+					.ToArray();
 		}
 
-        public static string[] LowestCategoryNames(this Book book)
-            => book.CategoriesLink?.Any() is not true ? Array.Empty<string>()
-			: book
-                .CategoriesLink
-                .Select(cl => cl.CategoryLadder.Categories.LastOrDefault()?.Name)
-                .Where(c => c is not null)
-                .Distinct()
-                .ToArray();
-
-        public static string[] AllCategoryNames(this Book book)
-            => book.CategoriesLink?.Any() is not true ? Array.Empty<string>()
-            : book
-                .CategoriesLink
-                .SelectMany(cl => cl.CategoryLadder.Categories)
-                .Select(c => c.Name)
-                .ToArray();
-
-		public static string[] AllCategoryIds(this Book book)
-            => book.CategoriesLink?.Any() is not true ? null
-            : book
-                .CategoriesLink
-                .SelectMany(cl => cl.CategoryLadder.Categories)
-                .Select(c => c.AudibleCategoryId)
-                .ToArray();
 
         public static string AggregateTitles(this IEnumerable<LibraryBook> libraryBooks, int max = 5)
 		{
@@ -93,7 +98,7 @@ namespace DataLayer
 			return titlesAgg;
 		}
 
-        public static float FirstScore(this Rating rating)
+		public static float FirstScore(this Rating rating)
             => rating.OverallRating > 0 ? rating.OverallRating
             : rating.PerformanceRating > 0 ? rating.PerformanceRating
             : rating.StoryRating;

Source/DataLayer/MockLibraryBook.cs

@@ -0,0 +1,116 @@
+using System;
+using System.Linq;
+using System.Reflection;
+using System.Text;
+
+#nullable enable
+namespace DataLayer;
+public class MockLibraryBook : LibraryBook
+{
+	protected MockLibraryBook(Book book, DateTime dateAdded, string account, DateTime? includedUntil)
+		: base(book, dateAdded, account)
+	{
+		SetIncludedUntil(includedUntil);
+	}
+
+	public MockLibraryBook AddSeries(string seriesName, int order)
+	{
+		var series = new Series(new AudibleSeriesId(CalculateAsin(seriesName)), seriesName);
+		Book.UpsertSeries(series, order.ToString());
+		return this;
+	}
+
+	public MockLibraryBook AddCategoryLadder(params string[] ladder)
+	{
+		var newLadder = new CategoryLadder(ladder.Select(c => new Category(new AudibleCategoryId(CalculateAsin(c)), c)).ToList());
+		Book.SetCategoryLadders(Book.Categories.Select(c => c.CategoryLadder).Append(newLadder));
+		return this;
+	}
+
+	public MockLibraryBook AddNarrator(string name)
+	{
+		var newNarrator = new Contributor(name, CalculateAsin(name));
+		Book.ReplaceNarrators(Book.Narrators.Append(newNarrator));
+		return this;
+	}
+
+	public MockLibraryBook AddAuthor(string name)
+	{
+		var newAuthor = new Contributor(name, CalculateAsin(name));
+		Book.ReplaceAuthors(Book.Authors.Append(newAuthor));
+		return this;
+	}
+
+	public MockLibraryBook WithBookStatus(LiberatedStatus liberatedStatus)
+	{
+		//Set the backing field directly to preserve LiberatedStatus.PartialDownload
+		typeof(UserDefinedItem)
+			.GetField("_bookStatus", BindingFlags.NonPublic | BindingFlags.Instance)
+			?.SetValue(Book.UserDefinedItem, liberatedStatus);
+		return this;
+	}
+
+	public MockLibraryBook WithPdfStatus(LiberatedStatus liberatedStatus)
+	{
+		Book.UserDefinedItem.PdfStatus = liberatedStatus;
+		return this;
+	}
+
+	public MockLibraryBook WithLastDownloaded(Version? lastVersion = null, AudioFormat? format = null, string audioVersion = "1")
+	{
+		lastVersion ??= new Version(10, 0, 0, 0);
+		format ??= AudioFormat.Default;
+		Book.UserDefinedItem.SetLastDownloaded(lastVersion, format, audioVersion);
+		return this;
+	}
+
+	public MockLibraryBook WithMyRating(float overallRating = 4, float performanceRating = 4.5f, float storyRating = 5)
+	{
+		Book.UserDefinedItem.UpdateRating(overallRating, performanceRating, storyRating);
+		return this;
+	}
+
+	public static MockLibraryBook CreateBook(
+		string account = "someone@email.co",
+		bool absetFromLastScan = false,
+		DateTime? dateAdded = null,
+		DateTime? datePublished = null,
+		DateTime? includedUntil = null,
+		string title = "Mock Book Title",
+		string subtitle = "Mock Book Subtitle",
+		string description = "This is a mock book description.",
+		int lengthInMinutes = 1400,
+		ContentType contentType = ContentType.Product,
+		string firstAuthor = "Author One",
+		string firstNarrator = "Narrator One",
+		string localeName = "us",
+		bool isAbridged = false,
+		bool isSpatial = false,
+		string language = "English")
+	{
+		var book = new Book(
+			new AudibleProductId(CalculateAsin(title + subtitle)),
+			title,
+			subtitle,
+			description,
+			lengthInMinutes,
+			contentType,
+			[new Contributor(firstAuthor, CalculateAsin(firstAuthor))],
+			[new Contributor(firstNarrator, CalculateAsin(firstNarrator))],
+			localeName);
+
+		book.UpdateBookDetails(isAbridged, isSpatial, datePublished ?? DateTime.Now, language);
+
+		return new MockLibraryBook(
+			book,
+			dateAdded ?? DateTime.Now,
+			account,
+			includedUntil)
+		{
+			AbsentFromLastScan = absetFromLastScan
+		};
+	}
+
+	private static string CalculateAsin(string name) 
+		=> Convert.ToHexString(System.Security.Cryptography.MD5.HashData(Encoding.UTF8.GetBytes(name))).Substring(0, 10);
+}

Source/DataLayer/QueryObjects/LibraryBookQueries.cs

@@ -25,16 +25,17 @@ namespace DataLayer
 				.Where(c => !c.Book.IsEpisodeParent() || includeParents)
 				.ToList();
 
-        public static LibraryBook? GetLibraryBook_Flat_NoTracking(this LibationContext context, string productId)
-            => context
+        public static LibraryBook? GetLibraryBook_Flat_NoTracking(this LibationContext context, string productId, bool caseSensative = true)
+        {
+            var libraryQuery
+                = context
                 .LibraryBooks
                 .AsNoTrackingWithIdentityResolution()
-                .GetLibraryBook(productId);
+                .GetLibrary();
 
-        public static LibraryBook? GetLibraryBook(this IQueryable<LibraryBook> library, string productId)
-            => library
-                .GetLibrary()
-                .SingleOrDefault(lb => lb.Book.AudibleProductId == productId);
+            return caseSensative ? libraryQuery.SingleOrDefault(lb => lb.Book.AudibleProductId == productId)
+                : libraryQuery.SingleOrDefault(lb => EF.Functions.Collate(lb.Book.AudibleProductId, "NOCASE") == productId);
+		}
 
         /// <summary>This is still IQueryable. YOU MUST CALL ToList() YOURSELF</summary>
         public static IQueryable<LibraryBook> GetLibrary(this IQueryable<LibraryBook> library)

Source/DtoImporterService/BookImporter.cs

@@ -48,9 +48,21 @@ namespace DtoImporterService
 				.Distinct()
 				.ToHashSet();
 
-			Cache = DbContext.Books
-				.GetBooks(b => productIds.Contains(b.AudibleProductId))
-				.ToDictionarySafe(b => b.AudibleProductId);
+			if (productIds.Count > 100)
+			{
+				//For large imports, it is faster to get the whole library and filter in memory.
+				Cache = DbContext.Books
+					.GetBooks()
+					.ToArray()
+					.Where(b => productIds.Contains(b.AudibleProductId))
+					.ToDictionarySafe(b => b.AudibleProductId);
+			}
+			else
+			{
+				Cache = DbContext.Books
+					.GetBooks(b => productIds.Contains(b.AudibleProductId))
+					.ToDictionarySafe(b => b.AudibleProductId);
+			}
 		}
 
 		private int upsertBooks(IEnumerable<ImportItem> importItems)

Source/DtoImporterService/DtoImporterService.csproj

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

Source/FileLiberator/AudioFileStorageExt.cs

@@ -16,16 +16,15 @@ namespace FileLiberator
 		/// Path: directory nested inside of Books directory
 		/// File name: n/a
 		/// </summary>
-		public static string GetDestinationDirectory(this AudioFileStorage _, LibraryBook libraryBook)
+		public static string GetDestinationDirectory(this AudioFileStorage _, LibraryBook libraryBook, Configuration config = null)
 		{
-			if (libraryBook.Book.IsEpisodeChild() && Configuration.Instance.SavePodcastsToParentFolder)
+			config ??= Configuration.Instance;
+			if (libraryBook.Book.IsEpisodeChild() && config.SavePodcastsToParentFolder)
 			{
 				var series = libraryBook.Book.SeriesLink.SingleOrDefault();
 				if (series is not null)
 				{
-					using var context = ApplicationServices.DbContexts.GetContext();
-					var seriesParent = context.GetLibraryBook_Flat_NoTracking(series.Series.AudibleSeriesId);
-
+					LibraryBook seriesParent = ApplicationServices.DbContexts.GetLibraryBook_Flat_NoTracking(series.Series.AudibleSeriesId);					
 					if (seriesParent is not null)
 					{
 						return Templates.Folder.GetFilename(seriesParent.ToDto(), AudibleFileStorage.BooksDirectory, "");

Source/FileLiberator/ConvertToMp3.cs

@@ -13,7 +13,7 @@ using LibationFileManager;
 
 namespace FileLiberator
 {
-	public class ConvertToMp3 : AudioDecodable
+	public class ConvertToMp3 : AudioDecodable, IProcessable<ConvertToMp3>
 	{
 		public override string Name => "Convert to Mp3";
 		private Mp4Operation Mp4Operation;
@@ -72,15 +72,14 @@ namespace FileLiberator
 					OnNarratorsDiscovered(m4bBook.AppleTags.Narrator);
 					OnCoverImageDiscovered(m4bBook.AppleTags.Cover);
 
-					var config = Configuration.Instance;
-					var lameConfig = DownloadOptions.GetLameOptions(config);
+					var lameConfig = DownloadOptions.GetLameOptions(Configuration);
 					var chapters = m4bBook.GetChaptersFromMetadata();
 					//Finishing configuring lame encoder.
 					AaxDecrypter.MpegUtil.ConfigureLameOptions(
 						m4bBook,
 						lameConfig,
-						config.LameDownsampleMono,
-						config.LameMatchSourceBR,
+						Configuration.LameDownsampleMono,
+						Configuration.LameMatchSourceBR,
 						chapters);
 
 					if (m4bBook.AppleTags.Tracks is (int trackNum, int trackCount))
@@ -108,9 +107,9 @@ namespace FileLiberator
 								= FileUtility.SaferMoveToValidPath(
 									tempPath,
 									entry.proposedMp3Path,
-									Configuration.Instance.ReplacementCharacters,
+									Configuration.ReplacementCharacters,
 									extension: "mp3",
-									Configuration.Instance.OverwriteExisting);
+									Configuration.OverwriteExisting);
 
 						SetFileTime(libraryBook, realMp3Path);
 						SetDirectoryTime(libraryBook, Path.GetDirectoryName(realMp3Path));
@@ -169,5 +168,7 @@ namespace FileLiberator
 					TotalBytesToReceive = totalInputSize
 				});
 		}
+		public static ConvertToMp3 Create(Configuration config) => new() { Configuration = config };
+		private ConvertToMp3() { }
 	}
 }

Source/FileLiberator/DownloadDecryptBook.cs

@@ -17,13 +17,18 @@ using System.Threading.Tasks;
 #nullable enable
 namespace FileLiberator
 {
-	public class DownloadDecryptBook : AudioDecodable
+	public class DownloadDecryptBook : AudioDecodable, IProcessable<DownloadDecryptBook>
 	{
 		public override string Name => "Download & Decrypt";
 		private CancellationTokenSource? cancellationTokenSource;
 		private AudiobookDownloadBase? abDownloader;
 
-		public override bool Validate(LibraryBook libraryBook) => !libraryBook.Book.Audio_Exists();
+		/// <summary>
+		/// Optional override to supply license info directly instead of querying the api based on Configuration options
+		/// </summary>
+		public DownloadOptions.LicenseInfo? LicenseInfo { get; set; }
+
+		public override bool Validate(LibraryBook libraryBook) => !libraryBook.Book.AudioExists;
 		public override async Task CancelAsync()
 		{
 			if (abDownloader is not null) await abDownloader.CancelAsync();
@@ -38,13 +43,17 @@ namespace FileLiberator
 
 			try
 			{
-				if (libraryBook.Book.Audio_Exists())
+				if (libraryBook.Book.AudioExists)
 					return new StatusHandler { "Cannot find decrypt. Final audio file already exists" };
 
 				DownloadValidation(libraryBook);
 
 				var api = await libraryBook.GetApiAsync();
-				using var downloadOptions = await DownloadOptions.InitiateDownloadAsync(api, Configuration.Instance, libraryBook, cancellationToken);
+
+				//Processable instances are reusable, so don't set LicenseInfo
+				//override from within a DownloadDecryptBook instance.
+				var license = LicenseInfo ?? await DownloadOptions.GetDownloadLicenseAsync(api, libraryBook, Configuration, cancellationToken);
+				using var downloadOptions = DownloadOptions.BuildDownloadOptions(libraryBook, Configuration, license);
 				var result = await DownloadAudiobookAsync(api, downloadOptions, cancellationToken);
 
 				if (!result.Success || getFirstAudioFile(result.ResultFiles) is not TempFile audioFile)
@@ -55,7 +64,7 @@ namespace FileLiberator
 					return new StatusHandler { "Decrypt failed" };
 				}
 
-				if (Configuration.Instance.RetainAaxFile)
+				if (Configuration.RetainAaxFile)
 				{
 					//Add the cached aaxc and key files to the entries list to be moved to the Books directory.
 					result.ResultFiles.AddRange(getAaxcFiles(result.CacheFiles));
@@ -63,13 +72,16 @@ namespace FileLiberator
 
 				//Set the last downloaded information on the book so that it can be used in the naming templates,
 				//but don't persist it until everything completes successfully (in the finally block)
+				Serilog.Log.Verbose("Setting last downloaded info for {@Book}", libraryBook.LogFriendly());
 				var audioFormat = GetFileFormatInfo(downloadOptions, audioFile);
 				var audioVersion = downloadOptions.ContentMetadata.ContentReference.Version;
 				libraryBook.Book.UserDefinedItem.SetLastDownloaded(Configuration.LibationVersion, audioFormat, audioVersion);
 
+				//Verbose logging inside getDestinationDirectory
 				var finalStorageDir = getDestinationDirectory(libraryBook);
 
 				//post-download tasks done in parallel.
+				Serilog.Log.Verbose("Starting post-liberation finalization tasks");
 				var moveFilesTask = Task.Run(() => MoveFilesToBooksDir(libraryBook, finalStorageDir, result.ResultFiles, cancellationToken));
 				Task[] finalTasks =
 				[
@@ -82,19 +94,26 @@ namespace FileLiberator
 
 				try
 				{
+					Serilog.Log.Verbose("Awaiting post-liberation finalization tasks");
 					await Task.WhenAll(finalTasks);
 				}
-				catch when (!moveFilesTask.IsFaulted)
+				catch (Exception ex)
 				{
+					Serilog.Log.Verbose(ex, "An error occurred in the post-liberation finalization tasks");
 					//Swallow DownloadCoverArt, DownloadRecordsAsync, DownloadMetadataAsync, and SetCoverAsFolderIcon exceptions.
 					//Only fail if the downloaded audio files failed to move to Books directory
+					if (moveFilesTask.IsFaulted)
+						throw;
 				}
 				finally
 				{
 					if (moveFilesTask.IsCompletedSuccessfully && !cancellationToken.IsCancellationRequested)
 					{
-						libraryBook.UpdateBookStatus(LiberatedStatus.Liberated, Configuration.LibationVersion, audioFormat, audioVersion);
+						Serilog.Log.Verbose("Updating liberated status for {@Book}", libraryBook.LogFriendly());
+						await libraryBook.UpdateBookStatusAsync(LiberatedStatus.Liberated, Configuration.LibationVersion, audioFormat, audioVersion);
+						Serilog.Log.Verbose("Setting directory time for {@Book}", libraryBook.LogFriendly());
 						SetDirectoryTime(libraryBook, finalStorageDir);
+						Serilog.Log.Verbose("Deleting cache files for {@Book}", libraryBook.LogFriendly());
 						foreach (var cacheFile in result.CacheFiles.Where(f => File.Exists(f.FilePath)))
 						{
 							//Delete cache files only after the download/decrypt operation completes successfully.
@@ -103,6 +122,7 @@ namespace FileLiberator
 					}
 				}
 
+				Serilog.Log.Verbose("Returning successful status handler for {@Book}", libraryBook.LogFriendly());
 				return new StatusHandler();
 			}
 			catch when (cancellationToken.IsCancellationRequested)
@@ -122,20 +142,21 @@ namespace FileLiberator
 
 		private async Task<AudiobookDecryptResult> DownloadAudiobookAsync(AudibleApi.Api api, DownloadOptions dlOptions, CancellationToken cancellationToken)
 		{
-			var outpoutDir = AudibleFileStorage.DecryptInProgressDirectory;
-			var cacheDir = AudibleFileStorage.DownloadsInProgressDirectory;
+			//Directories are validated prior to beginning download/decrypt
+			var outputDir = AudibleFileStorage.DecryptInProgressDirectory!;
+			var cacheDir = AudibleFileStorage.DownloadsInProgressDirectory!;
 			var result = new AudiobookDecryptResult(false, [], []);
 
 			try
 			{
 				if (dlOptions.DrmType is not DrmType.Adrm and not DrmType.Widevine)
-					abDownloader = new UnencryptedAudiobookDownloader(outpoutDir, cacheDir, dlOptions);
+					abDownloader = new UnencryptedAudiobookDownloader(outputDir, cacheDir, dlOptions);
 				else
 				{
 					AaxcDownloadConvertBase converter
 						= dlOptions.Config.SplitFilesByChapter && dlOptions.ChapterInfo.Count > 1 ?
-						new AaxcDownloadMultiConverter(outpoutDir, cacheDir, dlOptions) :
-						new AaxcDownloadSingleConverter(outpoutDir, cacheDir, dlOptions);
+						new AaxcDownloadMultiConverter(outputDir, cacheDir, dlOptions) :
+						new AaxcDownloadSingleConverter(outputDir, cacheDir, dlOptions);
 
 					if (dlOptions.Config.AllowLibationFixup)
 						converter.RetrievedMetadata += Converter_RetrievedMetadata;
@@ -169,7 +190,7 @@ namespace FileLiberator
 
 			void AbDownloader_TempFileCreated(object? sender, TempFile e)
 			{
-				if (Path.GetDirectoryName(e.FilePath) == outpoutDir)
+				if (Path.GetDirectoryName(e.FilePath) == outputDir)
 				{
 					result.ResultFiles.Add(e);
 				}
@@ -237,7 +258,7 @@ namespace FileLiberator
 
 		private void AaxcDownloader_RetrievedCoverArt(object? sender, byte[]? e)
 		{
-			if (Configuration.Instance.AllowLibationFixup && sender is AaxcDownloadConvertBase downloader)
+			if (Configuration.AllowLibationFixup && sender is AaxcDownloadConvertBase downloader)
 			{
 				try
 				{
@@ -326,15 +347,15 @@ namespace FileLiberator
 						destinationDir,
 						entry.Extension,
 						entry.PartProperties,
-						Configuration.Instance.OverwriteExisting);
+						Configuration.OverwriteExisting);
 
 				var realDest
 					= FileUtility.SaferMoveToValidPath(
 						entry.FilePath,
 						destFileName,
-						Configuration.Instance.ReplacementCharacters,
+						Configuration.ReplacementCharacters,
 						entry.Extension,
-						Configuration.Instance.OverwriteExisting);
+						Configuration.OverwriteExisting);
 
 				#region File Move Progress
 				totalBytesMoved += new FileInfo(realDest).Length;
@@ -384,7 +405,7 @@ namespace FileLiberator
 						options.LibraryBook,
 						destinationDir,
 						extension: ".jpg",
-						returnFirstExisting: Configuration.Instance.OverwriteExisting);
+						returnFirstExisting: Configuration.OverwriteExisting);
 
 				if (File.Exists(coverPath))
 					FileUtility.SaferDelete(coverPath);
@@ -421,7 +442,7 @@ namespace FileLiberator
 						options.LibraryBook,
 						destinationDir,
 						extension: formatExtension,
-						returnFirstExisting: Configuration.Instance.OverwriteExisting);
+						returnFirstExisting: Configuration.OverwriteExisting);
 
 				if (File.Exists(recordsPath))
 					FileUtility.SaferDelete(recordsPath);
@@ -468,7 +489,7 @@ namespace FileLiberator
 						options.LibraryBook,
 						destinationDir,
 						extension: ".metadata.json",
-						returnFirstExisting: Configuration.Instance.OverwriteExisting);
+						returnFirstExisting: Configuration.OverwriteExisting);
 
 				if (File.Exists(metadataPath))
 					FileUtility.SaferDelete(metadataPath);
@@ -493,11 +514,17 @@ namespace FileLiberator
 		#endregion
 
 		#region Macros
-		private static string getDestinationDirectory(LibraryBook libraryBook)
+		private string getDestinationDirectory(LibraryBook libraryBook)
 		{
-			var destinationDir = AudibleFileStorage.Audio.GetDestinationDirectory(libraryBook);
+			Serilog.Log.Verbose("Getting destination directory for {@Book}", libraryBook.LogFriendly());
+			var destinationDir = AudibleFileStorage.Audio.GetDestinationDirectory(libraryBook, Configuration);
+			Serilog.Log.Verbose("Got destination directory for {@Book}. {@Directory}", libraryBook.LogFriendly(), destinationDir);
 			if (!Directory.Exists(destinationDir))
+			{
+				Serilog.Log.Verbose("Creating destination {@Directory}", destinationDir);
 				Directory.CreateDirectory(destinationDir);
+				Serilog.Log.Verbose("Created destination {@Directory}", destinationDir);
+			}
 			return destinationDir;
 		}
 
@@ -508,5 +535,8 @@ namespace FileLiberator
 		private static IEnumerable<TempFile> getAaxcFiles(IEnumerable<TempFile> entries)
 			=> entries.Where(f => File.Exists(f.FilePath) && (getFileType(f) is FileType.AAXC || f.Extension.Equals(".key", StringComparison.OrdinalIgnoreCase)));
 		#endregion
+
+		public static DownloadDecryptBook Create(Configuration config) => new() { Configuration = config };
+		private DownloadDecryptBook() { }
 	}
 }

Source/FileLiberator/DownloadOptions.Factory.cs

@@ -3,8 +3,10 @@ using AudibleApi;
 using AudibleApi.Common;
 using AudibleUtilities.Widevine;
 using DataLayer;
+using Dinah.Core;
 using LibationFileManager;
 using NAudio.Lame;
+using Newtonsoft.Json;
 using System;
 using System.Collections.Generic;
 using System.IO;
@@ -19,30 +21,64 @@ namespace FileLiberator;
 public partial class DownloadOptions
 {
 	/// <summary>
-	/// Initiate an audiobook download from the audible api.
+	/// Requests a download license from the Api using the Configuration settings to choose the appropriate content.
 	/// </summary>
-	public static async Task<DownloadOptions> InitiateDownloadAsync(Api api, Configuration config, LibraryBook libraryBook, CancellationToken token)
+	public static async Task<LicenseInfo> GetDownloadLicenseAsync(Api api, LibraryBook libraryBook, Configuration config, CancellationToken token)
 	{
 		var license = await ChooseContent(api, libraryBook, config, token);
+		Serilog.Log.Logger.Debug("Content License {@License}", new
+		{
+			license.DrmType,
+			license.ContentMetadata.ContentReference
+		});
+
 		token.ThrowIfCancellationRequested();
 
 		//Some audiobooks will have incorrect chapters in the metadata returned from the license request,
 		//but the metadata returned by the content metadata endpoint will be correct. Call the content
-		//metadata endpoint and use its chapters. Only replace the license request chapters if the total
-		//lengths match (defensive against different audio formats having slightly different lengths).
-		var metadata = await api.GetContentMetadataAsync(libraryBook.Book.AudibleProductId);
-		if (metadata.ChapterInfo.RuntimeLengthMs == license.ContentMetadata.ChapterInfo.RuntimeLengthMs)
+		//metadata endpoint and use its chapters. Only replace the license request chapters if the content
+		//references match (defensive against different audio formats having slightly different lengths).
+		var metadata = await api.GetContentMetadataAsync(
+		   libraryBook.Book.AudibleProductId,
+		   license.DrmType,
+		   license.ContentMetadata.ContentReference.Acr,
+		   license.ContentMetadata.ContentReference.FileVersion);
+
+		if (metadata is null)
+		{
+			Serilog.Log.Logger.Warning("Unable to retrieve metadata for {@FileReference}", new
+			{
+				libraryBook.Book.AudibleProductId,
+				license.DrmType,
+				license.ContentMetadata.ContentReference.Acr,
+				license.ContentMetadata.ContentReference.FileVersion
+			});
+		}
+		else if (metadata.ContentReference != license.ContentMetadata.ContentReference)
+		{
+			Serilog.Log.Logger.Warning("Metadata ContentReference does not match License ContentReference with drm_type = {@DrmType}. {@Metadata}. {@License} ",
+			license.DrmType,
+			metadata.ContentReference,
+			license.ContentMetadata.ContentReference);
+		}
+		else
 			license.ContentMetadata.ChapterInfo = metadata.ChapterInfo;
 
 		token.ThrowIfCancellationRequested();
-		return BuildDownloadOptions(libraryBook, config, license);
+		return license;
 	}
 
-	private class LicenseInfo
+	public class LicenseInfo
 	{
-		public DrmType DrmType { get; }
+		public DrmType DrmType { get; set; }
 		public ContentMetadata ContentMetadata { get; set; }
-		public KeyData[]? DecryptionKeys { get; }
+		public KeyData[]? DecryptionKeys { get; set; }
+
+		[JsonConstructor]
+		private LicenseInfo()
+		{
+			ContentMetadata = null!;
+		}
 		public LicenseInfo(ContentLicense license, IEnumerable<KeyData>? keys = null)
 		{
 			DrmType = license.DrmType;
@@ -56,10 +92,28 @@ public partial class DownloadOptions
 
 	private static async Task<LicenseInfo> ChooseContent(Api api, LibraryBook libraryBook, Configuration config, CancellationToken token)
 	{
+		Serilog.Log.Logger.Information("Download Settings {@Settings}", new
+		{
+			config.FileDownloadQuality,
+			config.UseWidevine,
+			config.Request_xHE_AAC,
+			config.RequestSpatial,
+			config.SpatialAudioCodec
+		});
+
 		var dlQuality = config.FileDownloadQuality == Configuration.DownloadQuality.Normal ? DownloadQuality.Normal : DownloadQuality.High;
 
-		if (!config.UseWidevine || await Cdm.GetCdmAsync() is not Cdm cdm)
+		bool canUseWidevine = api.SupportsWidevine();
+		if (!config.UseWidevine || !canUseWidevine || await Cdm.GetCdmAsync() is not Cdm cdm)
 		{
+			if (config.UseWidevine)
+			{
+				if (canUseWidevine)
+					Serilog.Log.Logger.Warning("Unable to get a Widevine CDM. Falling back to ADRM.");
+				else
+					Serilog.Log.Logger.Warning("Account {@account} is not registered as an android device, so content will not be downloaded with Widevine DRM. Remove and re-add the account in Libation to fix.", libraryBook.Account.ToMask());
+			}
+
 			token.ThrowIfCancellationRequested();
 			var license = await api.GetDownloadLicenseAsync(libraryBook.Book.AudibleProductId, dlQuality);
 			return new LicenseInfo(license);
@@ -71,7 +125,7 @@ public partial class DownloadOptions
 			//try to request a widevine content license using the user's audio settings
 			var aacCodecChoice = config.Request_xHE_AAC ? Codecs.xHE_AAC : Codecs.AAC_LC;
 			//Always use the ec+3 codec if converting to mp3
-			var spatialCodecChoice = config.SpatialAudioCodec is Configuration.SpatialCodec.AC_4 && !config.DecryptToLossy ? Codecs.AC_4 : Codecs.EC_3;
+			var spatialCodecChoice = config.SpatialAudioCodec is Configuration.SpatialCodec.AC_4 ? Codecs.AC_4 : Codecs.EC_3;
 
 			var contentLic
 				= await api.GetDownloadLicenseAsync(
@@ -111,7 +165,10 @@ public partial class DownloadOptions
 		}
 	}
 
-	private static DownloadOptions BuildDownloadOptions(LibraryBook libraryBook, Configuration config, LicenseInfo licInfo)
+	/// <summary>
+	/// Builds DownloadOptions from the given LibraryBook, Configuration, and LicenseInfo.
+	/// </summary>
+	public static DownloadOptions BuildDownloadOptions(LibraryBook libraryBook, Configuration config, LicenseInfo licInfo)
 	{
 		long chapterStartMs
 			= config.StripAudibleBrandAudio
@@ -254,8 +311,11 @@ public partial class DownloadOptions
 
 	*/
 
-	public static List<Chapter> flattenChapters(IList<Chapter> chapters, string? titleConcat = ": ")
+	public static List<Chapter> flattenChapters(IList<Chapter>? chapters, string? titleConcat = ": ")
 	{
+		if (chapters is null)
+			return [];
+
 		List<Chapter> chaps = new();
 
 		foreach (var c in chapters)

Source/FileLiberator/DownloadOptions.cs

@@ -74,7 +74,7 @@ namespace FileLiberator
 			//If DrmType is not Adrm or Widevine, the delivered file is an unencrypted mp3.
 			OutputFormat
 				= licInfo.DrmType is not AudibleApi.Common.DrmType.Adrm and not AudibleApi.Common.DrmType.Widevine ||
-				(config.AllowLibationFixup && config.DecryptToLossy && licInfo.ContentMetadata.ContentReference.Codec != AudibleApi.Codecs.AC_4)
+				(config.AllowLibationFixup && config.DecryptToLossy)
 				? OutputFormat.Mp3
 				: OutputFormat.M4b;
 

Source/FileLiberator/DownloadPdf.cs

@@ -13,12 +13,12 @@ using LibationFileManager;
 
 namespace FileLiberator
 {
-	public class DownloadPdf : Processable
+	public class DownloadPdf : Processable, IProcessable<DownloadPdf>
 	{
 		public override string Name => "Download Pdf";
 		public override bool Validate(LibraryBook libraryBook)
 			=> !string.IsNullOrWhiteSpace(getdownloadUrl(libraryBook))
-			&& !libraryBook.Book.PDF_Exists();
+			&& !libraryBook.Book.PdfExists;
 
 		public override async Task<StatusHandler> ProcessAsync(LibraryBook libraryBook)
 		{
@@ -35,7 +35,7 @@ namespace FileLiberator
 					SetFileTime(libraryBook, actualDownloadedFilePath);
 					SetDirectoryTime(libraryBook, Path.GetDirectoryName(actualDownloadedFilePath));
 				}
-				libraryBook.UpdatePdfStatus(result.IsSuccess ? LiberatedStatus.Liberated : LiberatedStatus.NotLiberated);
+				await libraryBook.UpdatePdfStatusAsync(result.IsSuccess ? LiberatedStatus.Liberated : LiberatedStatus.NotLiberated);
 
                 return result;
             }
@@ -89,5 +89,8 @@ namespace FileLiberator
 			=> !File.Exists(actualDownloadedFilePath)
 			? new StatusHandler { "Downloaded PDF cannot be found" }
 			: new StatusHandler();
+
+		public static DownloadPdf Create(Configuration config) => new() { Configuration = config };
+		private DownloadPdf() { }
 	}
 }

Source/FileLiberator/FileLiberator.csproj

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

Source/FileLiberator/Processable.cs

@@ -9,24 +9,36 @@ using Dinah.Core.ErrorHandling;
 using Dinah.Core.Net.Http;
 using LibationFileManager;
 
+#nullable enable
 namespace FileLiberator
 {
-    public abstract class Processable
+    public interface IProcessable<T>  where T : IProcessable<T>
+	{
+		/// <summary>
+		/// Create a new instance of the Processable which uses a specific Configuration
+		/// </summary>
+		/// <param name="config">The <see cref="Configuration"/> this <typeparamref name="T"/> will use</param>
+		static abstract T Create(Configuration config);
+	}
+	public abstract class Processable
     {
         public abstract string Name { get; }
-        public event EventHandler<LibraryBook> Begin;
+        public event EventHandler<LibraryBook>? Begin;
 
         /// <summary>General string message to display. DON'T rely on this for success, failure, or control logic</summary>
-        public event EventHandler<string> StatusUpdate;
+        public event EventHandler<string>? StatusUpdate;
         /// <summary>Fired when a file is successfully saved to disk</summary>
-        public event EventHandler<(string id, string path)> FileCreated;
-        public event EventHandler<DownloadProgress> StreamingProgressChanged;
-        public event EventHandler<TimeSpan> StreamingTimeRemaining;
+        public event EventHandler<(string id, string path)>? FileCreated;
+        public event EventHandler<DownloadProgress>? StreamingProgressChanged;
+        public event EventHandler<TimeSpan>? StreamingTimeRemaining;
 
-        public event EventHandler<LibraryBook> Completed;
+        public event EventHandler<LibraryBook>? Completed;
 
-        /// <returns>True == Valid</returns>
-        public abstract bool Validate(LibraryBook libraryBook);
+        public required Configuration Configuration{ get; init; }
+        protected Processable() { }
+
+		/// <returns>True == Valid</returns>
+		public abstract bool Validate(LibraryBook libraryBook);
 
         /// <returns>True == success</returns>
         public abstract Task<StatusHandler> ProcessAsync(LibraryBook libraryBook);
@@ -35,7 +47,7 @@ namespace FileLiberator
         public IEnumerable<LibraryBook> GetValidLibraryBooks(IEnumerable<LibraryBook> library)
             => library.Where(libraryBook =>
                 Validate(libraryBook)
-                && (!libraryBook.Book.IsEpisodeChild() || Configuration.Instance.DownloadEpisodes)
+                && (!libraryBook.Book.IsEpisodeChild() || Configuration.DownloadEpisodes)
                 );
 
         public async Task<StatusHandler> ProcessSingleAsync(LibraryBook libraryBook, bool validate)
@@ -86,12 +98,12 @@ namespace FileLiberator
 
         protected void OnStreamingProgressChanged(DownloadProgress progress)
             => OnStreamingProgressChanged(null, progress);
-        protected void OnStreamingProgressChanged(object _, DownloadProgress progress)
+        protected void OnStreamingProgressChanged(object? _, DownloadProgress progress)
             => StreamingProgressChanged?.Invoke(this, progress);
 
         protected void OnStreamingTimeRemaining(TimeSpan timeRemaining)
             => OnStreamingTimeRemaining(null, timeRemaining);
-        protected void OnStreamingTimeRemaining(object _, TimeSpan timeRemaining)
+        protected void OnStreamingTimeRemaining(object? _, TimeSpan timeRemaining)
             => StreamingTimeRemaining?.Invoke(this, timeRemaining);
 
         protected void OnCompleted(LibraryBook libraryBook)
@@ -100,17 +112,17 @@ namespace FileLiberator
             Completed?.Invoke(this, libraryBook);
         }
 
-		protected static void SetFileTime(LibraryBook libraryBook, string file)
+		protected void SetFileTime(LibraryBook libraryBook, string file)
 			=> setFileSystemTime(libraryBook, new FileInfo(file));
-		protected static void SetDirectoryTime(LibraryBook libraryBook, string file)
+		protected void SetDirectoryTime(LibraryBook libraryBook, string file)
 			=> setFileSystemTime(libraryBook, new DirectoryInfo(file));
 
-		private static void setFileSystemTime(LibraryBook libraryBook, FileSystemInfo fileInfo)
+		private void setFileSystemTime(LibraryBook libraryBook, FileSystemInfo fileInfo)
 		{
 			if (!fileInfo.Exists) return;
 
-            fileInfo.CreationTimeUtc = getTimeValue(Configuration.Instance.CreationTime) ?? fileInfo.CreationTimeUtc;
-            fileInfo.LastWriteTimeUtc = getTimeValue(Configuration.Instance.LastWriteTime) ?? fileInfo.LastWriteTimeUtc;			
+            fileInfo.CreationTimeUtc = getTimeValue(Configuration.CreationTime) ?? fileInfo.CreationTimeUtc;
+            fileInfo.LastWriteTimeUtc = getTimeValue(Configuration.LastWriteTime) ?? fileInfo.LastWriteTimeUtc;			
 
 			DateTime? getTimeValue(Configuration.DateTimeSource source) => source switch
 			{

Source/FileLiberator/UtilityExtensions.cs

@@ -7,6 +7,7 @@ using DataLayer;
 using Dinah.Core;
 using LibationFileManager;
 using LibationFileManager.Templates;
+using System.Security.Authentication;
 
 #nullable enable
 namespace FileLiberator
@@ -25,14 +26,22 @@ namespace FileLiberator
 
 		public static async Task<AudibleApi.Api> GetApiAsync(this LibraryBook libraryBook)
 		{
-			Account account;
-			using (var accounts = AudibleApiStorage.GetAccountsSettingsPersister())
-				account = accounts.AccountsSettings.GetAccount(libraryBook.Account, libraryBook.Book.Locale);
+			using var accounts = AudibleApiStorage.GetAccountsSettingsPersister();
+			var account = accounts.AccountsSettings.GetAccount(libraryBook.Account, libraryBook.Book.Locale)
+				?? throw new InvalidCredentialException($"No account found for '{libraryBook.Account}' and locale '{libraryBook.Book.Locale}'");
 
 			var apiExtended = await ApiExtended.CreateAsync(account);
 			return apiExtended.Api;
 		}
 
+		public static bool SupportsWidevine(this AudibleApi.Api api)
+		{
+			//TODO: Expose Api's identity maintainer directly instead of using reflection.
+			var identityProperty = api.GetType().GetProperty("_identityMaintainer", System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Instance);
+			return identityProperty?.GetValue(api) is AudibleApi.Authorization.IIdentityMaintainer identityMaintainer
+				&& identityMaintainer.DeviceType == AudibleApi.Resources.DeviceType;
+		}
+
 		public static LibraryBookDto ToDto(this LibraryBook libraryBook)
 		{
 			using var persister = AudibleApiStorage.GetAccountsSettingsPersister();

Source/FileManager/BackgroundFileSystem.cs

@@ -3,17 +3,18 @@ using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using System.Threading;
 using System.Threading.Tasks;
 
 #nullable enable
 namespace FileManager
 {
-    /// <summary>
-    /// Tracks actual locations of files.
-    /// </summary>
-    public class BackgroundFileSystem
+	/// <summary>
+	/// Tracks actual locations of files.
+	/// </summary>
+	public class BackgroundFileSystem : IDisposable
     {
-        public LongPath RootDirectory { get; private set; }
+        public LongPath? RootDirectory { get; private set; }
         public string SearchPattern { get; private set; }
         public SearchOption SearchOption { get; private set; }
 
@@ -21,7 +22,7 @@ namespace FileManager
         private BlockingCollection<FileSystemEventArgs>? directoryChangesEvents { get; set; }
         private Task? backgroundScanner { get; set; }
 
-        private object fsCacheLocker { get; } = new();
+        private Lock fsCacheLocker { get; } = new();
         private List<LongPath> fsCache { get; } = new();
 
         public BackgroundFileSystem(LongPath rootDirectory, string searchPattern, SearchOption searchOptions)
@@ -50,7 +51,8 @@ namespace FileManager
             lock (fsCacheLocker)
             {
                 fsCache.Clear();
-                fsCache.AddRange(SafestEnumerateFiles(RootDirectory));
+                if (Directory.Exists(RootDirectory))
+                    fsCache.AddRange(SafestEnumerateFiles(RootDirectory));
             }
         }
 
@@ -59,7 +61,14 @@ namespace FileManager
             Stop();
 
             lock (fsCacheLocker)
-                fsCache.AddRange(SafestEnumerateFiles(RootDirectory));
+            {
+                if (!Directory.Exists(RootDirectory))
+                {
+                    RootDirectory = null;
+					return;
+                }
+				fsCache.AddRange(SafestEnumerateFiles(RootDirectory));
+            }
 
             directoryChangesEvents = new BlockingCollection<FileSystemEventArgs>();
 			fileSystemWatcher = new FileSystemWatcher(RootDirectory)
@@ -100,7 +109,6 @@ namespace FileManager
 
         private void FileSystemWatcher_Error(object sender, ErrorEventArgs e)
         {
-            Stop();
             Init();
         }
 
@@ -181,8 +189,12 @@ namespace FileManager
                 fsCache.Add(newFile);
         }
 
-        #endregion
+		#endregion
 
-        ~BackgroundFileSystem() => Stop();
-    }
+		public void Dispose()
+		{
+			Stop();
+			GC.SuppressFinalize(this);
+		}
+	}
 }

Source/FileManager/FileManager.csproj

@@ -1,12 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Dinah.Core" Version="9.0.3.1" />
-    <PackageReference Include="Polly" Version="8.6.2" />
+    <PackageReference Include="Dinah.Core" Version="10.0.0.1" />
+    <PackageReference Include="Polly" Version="8.6.5" />
   </ItemGroup>
 
 	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">

Source/FileManager/FileSystemTest.cs

@@ -1,6 +1,7 @@
 using System;
 using System.IO;
 
+#nullable enable
 namespace FileManager
 {
 	public static class FileSystemTest
@@ -15,8 +16,10 @@ namespace FileManager
 		/// <summary>
 		/// Test if the directory supports filenames with characters that are invalid on Windows (:, *, ?, &lt;, &gt;, |).
 		/// </summary>
-		public static bool CanWriteWindowsInvalidChars(LongPath directoryName)
+		public static bool CanWriteWindowsInvalidChars(LongPath? directoryName)
 		{
+			if (directoryName is null)
+				return false;
 			var testFile = Path.Combine(directoryName, AdditionalInvalidWindowsFilenameCharacters + Guid.NewGuid().ToString());
 			return CanWriteFile(testFile);
 		}
@@ -24,8 +27,10 @@ namespace FileManager
 		/// <summary>
 		/// Test if the directory supports filenames with 255 unicode characters.
 		/// </summary>
-		public static bool CanWrite255UnicodeChars(LongPath directoryName)
+		public static bool CanWrite255UnicodeChars(LongPath? directoryName)
 		{
+			if (directoryName is null)
+				return false;
 			const char unicodeChar = 'ü';
 			var testFileName = new string(unicodeChar, 255);
 			var testFile = Path.Combine(directoryName, testFileName);

Source/FileManager/FileUtility.cs

@@ -56,15 +56,18 @@ namespace FileManager
 
 			fileExtension = GetStandardizedExtension(fileExtension);
 
-			// remove invalid chars
-			path = GetSafePath(path, replacements);
+			var pathStr = removeInvalidWhitespace(path.Path);
+			var pathWithoutExtension = pathStr.EndsWithInsensitive(fileExtension)
+				? pathStr[..^fileExtension.Length]
+				: path.Path;
+
+			// remove invalid chars, but leave file extension untouched
+			pathWithoutExtension = GetSafePath(pathWithoutExtension, replacements);
 
 			// ensure uniqueness and check lengths
-			var dir = Path.GetDirectoryName(path)?.TruncateFilename(LongPath.MaxDirectoryLength) ?? string.Empty;
+			var dir = Path.GetDirectoryName(pathWithoutExtension)?.TruncateFilename(LongPath.MaxDirectoryLength) ?? string.Empty;
 
-			var fileName = Path.GetFileName(path);
-			var extIndex = fileName.LastIndexOf(fileExtension, StringComparison.OrdinalIgnoreCase);
-			var filenameWithoutExtension = extIndex >= 0 ? fileName.Remove(extIndex, fileExtension.Length) : fileName;
+			var filenameWithoutExtension = Path.GetFileName(pathWithoutExtension);
 			var fileStem
 				= Path.Combine(dir, filenameWithoutExtension.TruncateFilename(LongPath.MaxFilenameLength - fileExtension.Length))
 				.TruncateFilename(LongPath.MaxPathLength - fileExtension.Length);
@@ -263,5 +266,27 @@ namespace FileManager
 
 			return foundFiles;
 		}
+
+		/// <summary>
+		/// Creates a subdirectory or subdirectories on the specified path.
+		/// The specified path can be relative to this instance of the <see cref="DirectoryInfo"/> class.
+		/// <para/>
+		/// Fixes an issue with <see cref="DirectoryInfo.CreateSubdirectory(string)"/> where it fails when the parent <see cref="DirectoryInfo"/> is a drive root.
+		/// </summary>
+		/// <param name="path">The specified path. This cannot be a different disk volume or Universal Naming Convention (UNC) name.</param>
+		/// <returns>The last directory specified in <paramref name="path"/></returns>
+		public static DirectoryInfo CreateSubdirectoryEx(this DirectoryInfo parent, string path)
+		{
+			if (parent.Root.FullName != parent.FullName || Path.IsPathRooted(path))
+				return parent.CreateSubdirectory(path);
+
+			// parent is a drive root and subDirectory is relative
+			//Solves a problem with DirectoryInfo.CreateSubdirectory where it fails
+			//If the parent DirectoryInfo is a drive root.
+			var fullPath = Path.GetFullPath(Path.Combine(parent.FullName, path));
+			var directoryInfo = new DirectoryInfo(fullPath);
+			directoryInfo.Create();
+			return directoryInfo;
+		}
 	}
 }

Source/FileManager/IJsonBackedDictionary.cs

@@ -0,0 +1,41 @@
+using Newtonsoft.Json.Linq;
+using System;
+using System.Linq;
+
+#nullable enable
+namespace FileManager;
+
+public interface IJsonBackedDictionary
+{
+	JObject GetJObject();
+	bool Exists(string propertyName);
+	string? GetString(string propertyName, string? defaultValue = null);
+	T? GetNonString<T>(string propertyName, T? defaultValue = default);
+	object? GetObject(string propertyName);
+	void SetString(string propertyName, string? newValue);
+	void SetNonString(string propertyName, object? newValue);
+	bool RemoveProperty(string propertyName);
+	bool SetWithJsonPath(string jsonPath, string propertyName, string? newValue, bool suppressLogging = false);
+	string? GetStringFromJsonPath(string jsonPath);
+
+	string? GetStringFromJsonPath(string jsonPath, string propertyName)
+		=> GetStringFromJsonPath($"{jsonPath}.{propertyName}");
+
+	static T? UpCast<T>(object obj)
+	{
+		if (obj.GetType().IsAssignableTo(typeof(T))) return (T)obj;
+		if (obj is JObject jObject) return jObject.ToObject<T>();
+		if (obj is JValue jValue)
+		{
+			if (typeof(T).IsAssignableTo(typeof(Enum)))
+			{
+				return
+					Enum.TryParse(typeof(T), jValue.Value<string>(), out var enumVal)
+					? (T)enumVal
+					: Enum.GetValues(typeof(T)).Cast<T>().First();
+			}
+			return jValue.Value<T>();
+		}
+		throw new InvalidCastException($"{obj.GetType()} is not convertible to {typeof(T)}");
+	}
+}

Source/FileManager/PersistentDictionary.cs

@@ -2,14 +2,13 @@
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 using System.IO;
-using System.Linq;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 
 #nullable enable
 namespace FileManager
 {
-    public class PersistentDictionary
+    public class PersistentDictionary : IJsonBackedDictionary
     {
         public string Filepath { get; }
         public bool IsReadOnly { get; }
@@ -60,21 +59,8 @@ namespace FileManager
                 objectCache[propertyName] = defaultValue;
                 return defaultValue;
             }
-            if (obj.GetType().IsAssignableTo(typeof(T))) return (T)obj;
-            if (obj is JObject jObject) return jObject.ToObject<T>();
-            if (obj is JValue jValue)
-            {
-                if (typeof(T).IsAssignableTo(typeof(Enum)))
-                {
-                    return
-                        Enum.TryParse(typeof(T), jValue.Value<string>(), out var enumVal)
-                        ? (T)enumVal
-                        : Enum.GetValues(typeof(T)).Cast<T>().First();
-                }
-                return jValue.Value<T>();
-            }
-            throw new InvalidCastException($"{obj.GetType()} is not convertible to {typeof(T)}");
-        }
+            return IJsonBackedDictionary.UpCast<T>(obj);
+		}
 
         public object? GetObject(string propertyName)
         {
@@ -89,7 +75,6 @@ namespace FileManager
             return objectCache[propertyName];
         }
 
-        public string? GetStringFromJsonPath(string jsonPath, string propertyName) => GetStringFromJsonPath($"{jsonPath}.{propertyName}");
         public string? GetStringFromJsonPath(string jsonPath)
         {
             if (!stringCache.ContainsKey(jsonPath))
@@ -288,5 +273,7 @@ namespace FileManager
         {
             File.WriteAllText(Filepath, "{}");
         }
-    }
+
+		public JObject GetJObject() => readFile();
+	}
 }

Source/HangoverAvalonia/HangoverAvalonia.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
 		<OutputType>WinExe</OutputType>
-		<TargetFramework>net9.0</TargetFramework>
+		<TargetFramework>net10.0</TargetFramework>
 		<RuntimeIdentifier>win-x64</RuntimeIdentifier>
 		<!--Avalonia doesen't support TrimMode=link currently,but we are working on that https://github.com/AvaloniaUI/Avalonia/issues/6892 -->
 		<TrimMode>copyused</TrimMode>
@@ -70,13 +70,11 @@
 		<TrimmableAssembly Include="Avalonia.Themes.Default" />
 	</ItemGroup>
 	<ItemGroup>
-
-		<PackageReference Include="Avalonia" Version="11.3.3" />
-		<PackageReference Include="Avalonia.Desktop" Version="11.3.3" />
+		<PackageReference Include="Avalonia.Desktop" Version="11.3.9" />
 		<!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
-		<PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.3.3" />
-		<PackageReference Include="Avalonia.ReactiveUI" Version="11.3.3" />
-		<PackageReference Include="Avalonia.Themes.Fluent" Version="11.3.3" />
+		<PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.3.9" />
+		<PackageReference Include="ReactiveUI.Avalonia" Version="11.3.8" />
+		<PackageReference Include="Avalonia.Themes.Fluent" Version="11.3.9" />
 	</ItemGroup>
 	<ItemGroup>
 		<ProjectReference Include="..\HangoverBase\HangoverBase.csproj" />

Source/HangoverAvalonia/Program.cs

@@ -1,5 +1,5 @@
 using Avalonia;
-using Avalonia.ReactiveUI;
+using ReactiveUI.Avalonia;
 using System;
 
 namespace HangoverAvalonia

Source/HangoverAvalonia/Properties/PublishProfiles/LinuxProfile.pubxml

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-https://go.microsoft.com/fwlink/?LinkID=208121.
--->
-<Project>
-  <PropertyGroup>
-    <Configuration>Release</Configuration>
-    <Platform>Any CPU</Platform>
-    <PublishDir>..\bin\Publish\Linux-chardonnay</PublishDir>
-    <PublishProtocol>FileSystem</PublishProtocol>
-    <TargetFramework>net9.0</TargetFramework>
-    <RuntimeIdentifier>linux-x64</RuntimeIdentifier>
-    <SelfContained>true</SelfContained>
-    <PublishSingleFile>false</PublishSingleFile>
-    <PublishTrimmed>false</PublishTrimmed>
-  </PropertyGroup>
-</Project>

Source/HangoverAvalonia/Properties/PublishProfiles/MacOSProfile.pubxml

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-https://go.microsoft.com/fwlink/?LinkID=208121.
--->
-<Project>
-  <PropertyGroup>
-    <Configuration>Release</Configuration>
-    <Platform>Any CPU</Platform>
-    <PublishDir>..\bin\Publish\MacOS-chardonnay</PublishDir>
-    <PublishProtocol>FileSystem</PublishProtocol>
-    <TargetFramework>net9.0</TargetFramework>
-    <RuntimeIdentifier>osx-x64</RuntimeIdentifier>
-    <SelfContained>true</SelfContained>
-    <PublishSingleFile>false</PublishSingleFile>
-    <PublishTrimmed>false</PublishTrimmed>
-  </PropertyGroup>
-</Project>

Source/HangoverAvalonia/Properties/PublishProfiles/WindowsProfile.pubxml

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-https://go.microsoft.com/fwlink/?LinkID=208121.
--->
-<Project>
-  <PropertyGroup>
-    <Configuration>Release</Configuration>
-    <Platform>Any CPU</Platform>
-    <PublishDir>..\bin\Publish\Windows-chardonnay</PublishDir>
-    <PublishProtocol>FileSystem</PublishProtocol>
-    <TargetFramework>net9.0</TargetFramework>
-    <RuntimeIdentifier>win-x64</RuntimeIdentifier>
-    <SelfContained>true</SelfContained>
-    <PublishSingleFile>false</PublishSingleFile>
-    <PublishTrimmed>false</PublishTrimmed>
-  </PropertyGroup>
-</Project>

Source/HangoverAvalonia/ViewModels/TrashBinViewModel.cs

@@ -80,7 +80,7 @@ public class TrashBinViewModel : ViewModelBase, IDisposable
 	public async Task RestoreCheckedAsync()
 	{
 		ControlsEnabled = false;
-		var qtyChanges = await Task.Run(CheckedBooks.RestoreBooks);
+		var qtyChanges = await CheckedBooks.RestoreBooksAsync();
 		if (qtyChanges > 0)
 			Reload();
 		ControlsEnabled = true;
@@ -89,7 +89,7 @@ public class TrashBinViewModel : ViewModelBase, IDisposable
 	public async Task PermanentlyDeleteCheckedAsync()
 	{
 		ControlsEnabled = false;
-		var qtyChanges = await Task.Run(CheckedBooks.PermanentlyDeleteBooks);
+		var qtyChanges = await CheckedBooks.PermanentlyDeleteBooksAsync();
 		if (qtyChanges > 0)
 			Reload();
 		ControlsEnabled = true;
@@ -97,7 +97,7 @@ public class TrashBinViewModel : ViewModelBase, IDisposable
 
 	public void Reload()
 	{
-		var deletedBooks = DbContexts.GetContext().GetDeletedLibraryBooks();
+		var deletedBooks = DbContexts.GetDeletedLibraryBooks();
 
 		DeletedBooks.Clear();
 		DeletedBooks.AddRange(deletedBooks.Select(lb => new CheckBoxViewModel { Item = lb }));

Source/HangoverBase/HangoverBase.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
 

Source/HangoverWinForms/Form1.Deleted.cs

@@ -39,19 +39,22 @@ namespace HangoverWinForms
                 deletedCbl.SetItemChecked(i, false);
         }
 
-        private void saveBtn_Click(object sender, EventArgs e)
+        private async void saveBtn_Click(object sender, EventArgs e)
         {
             var libraryBooksToRestore = deletedCbl.CheckedItems.Cast<LibraryBook>().ToList();
-            var qtyChanges = libraryBooksToRestore.RestoreBooks();
+            saveBtn.Enabled = false;
+			var qtyChanges = await libraryBooksToRestore.RestoreBooksAsync();
             if (qtyChanges > 0)
-                reload();
-        }
+				Invoke(reload);
+            Invoke(() => saveBtn.Enabled = true);
+		}
 
         private void reload()
         {
             deletedCbl.Items.Clear();
-            var deletedBooks = DbContexts.GetContext().GetDeletedLibraryBooks();
-            foreach (var lb in deletedBooks)
+            List<LibraryBook> deletedBooks = DbContexts.GetDeletedLibraryBooks();
+
+			foreach (var lb in deletedBooks)
                 deletedCbl.Items.Add(lb);
 
             setLabel();

Source/HangoverWinForms/HangoverWinForms.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework>net9.0-windows7.0</TargetFramework>
+    <TargetFramework>net10.0-windows7.0</TargetFramework>
     <EnableWindowsTargeting>true</EnableWindowsTargeting>
 	<AssemblyName>Hangover</AssemblyName>
     <UseWindowsForms>true</UseWindowsForms>

Source/HangoverWinForms/Properties/PublishProfiles/WindowsProfile.pubxml

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-https://go.microsoft.com/fwlink/?LinkID=208121.
--->
-<Project>
-  <PropertyGroup>
-    <Configuration>Release</Configuration>
-    <Platform>Any CPU</Platform>
-    <PublishDir>..\bin\Publish\classic</PublishDir>
-    <PublishProtocol>FileSystem</PublishProtocol>
-    <TargetFramework>net9.0-windows</TargetFramework>
-    <RuntimeIdentifier>win-x64</RuntimeIdentifier>
-    <SelfContained>true</SelfContained>
-    <PublishSingleFile>false</PublishSingleFile>
-    <PublishTrimmed>false</PublishTrimmed>
-  </PropertyGroup>
-</Project>

Source/Libation.sln

@@ -1,287 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 17
-VisualStudioVersion = 17.0.31903.59
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "_Solution Items", "_Solution Items", "{03C8835F-936C-4AF7-87AE-FF92BDBE8B9B}"
-	ProjectSection(SolutionItems) = preProject
-		add-migrations.ps1 = add-migrations.ps1
-		REFERENCE.txt = REFERENCE.txt
-		Upgrading dotnet version.txt = Upgrading dotnet version.txt
-		_ARCHITECTURE NOTES.txt = _ARCHITECTURE NOTES.txt
-		_AvaloniaUI Primer.txt = _AvaloniaUI Primer.txt
-		_DB_NOTES.txt = _DB_NOTES.txt
-		__README - COLLABORATORS.txt = __README - COLLABORATORS.txt
-	EndProjectSection
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "5 Domain Utilities (db aware)", "5 Domain Utilities (db aware)", "{41CDCC73-9B81-49DD-9570-C54406E852AF}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "6 Application", "6 Application", "{8679CAC8-9164-4007-BDD2-F004810EDA14}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "1 Core Libraries", "1 Core Libraries", "{43E3ACB3-E0BC-4370-8DBB-E3720C8C8FD1}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "4 Domain (db)", "4 Domain (db)", "{751093DD-5DBA-463E-ADBE-E05FAFB6983E}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "2 Utilities (domain ignorant)", "2 Utilities (domain ignorant)", "{7FBBB086-0807-4998-85BF-6D1A49C8AD05}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AaxDecrypter", "AaxDecrypter\AaxDecrypter.csproj", "{8BD8E012-F44F-4EE2-A234-D66C14D5FE4B}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibationFileManager", "LibationFileManager\LibationFileManager.csproj", "{1AE65B61-9C05-4C80-ABFF-48F16E22FDF1}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DataLayer", "DataLayer\DataLayer.csproj", "{59A10DF3-63EC-43F1-A3BF-4000CFA118D2}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FileLiberator", "FileLiberator\FileLiberator.csproj", "{393B5B27-D15C-4F77-9457-FA14BA8F3C73}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AudibleUtilities", "AudibleUtilities\AudibleUtilities.csproj", "{06882742-27A6-4347-97D9-56162CEC9C11}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "3 Domain Internal Utilities (db ignorant)", "3 Domain Internal Utilities (db ignorant)", "{F0CBB7A7-D3FB-41FF-8F47-CF3F6A592249}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibationSearchEngine", "LibationSearchEngine\LibationSearchEngine.csproj", "{2E1F5DB4-40CC-4804-A893-5DCE0193E598}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibationWinForms", "LibationWinForms\LibationWinForms.csproj", "{635F00E1-AAD1-45F7-BEB7-D909AD33B9F6}"
-	ProjectSection(ProjectDependencies) = postProject
-		{40C67036-C1A7-4FDF-AA83-8EC902E257F3} = {40C67036-C1A7-4FDF-AA83-8EC902E257F3}
-		{428163C3-D558-4914-B570-A92069521877} = {428163C3-D558-4914-B570-A92069521877}
-	EndProjectSection
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DtoImporterService", "DtoImporterService\DtoImporterService.csproj", "{401865F5-1942-4713-B230-04544C0A97B0}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ApplicationServices", "ApplicationServices\ApplicationServices.csproj", "{B95650EA-25F0-449E-BA5D-99126BC5D730}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "_Tests", "_Tests", "{67E66E82-5532-4440-AFB3-9FB1DF9DEF53}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibationSearchEngine.Tests", "_Tests\LibationSearchEngine.Tests\LibationSearchEngine.Tests.csproj", "{C5B21768-C7C9-4FCB-AC1E-187B223D5A98}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibationCli", "LibationCli\LibationCli.csproj", "{428163C3-D558-4914-B570-A92069521877}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AppScaffolding", "AppScaffolding\AppScaffolding.csproj", "{595E7C4D-506D-486D-98B7-5FDDF398D033}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FileManager", "FileManager\FileManager.csproj", "{E86014F9-E4B3-4CD4-A210-2B3DB571DD86}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AudibleUtilities.Tests", "_Tests\AudibleUtilities.Tests\AudibleUtilities.Tests.csproj", "{788294BE-0D8E-40D4-9CEE-67896FBB52CE}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FileLiberator.Tests", "_Tests\FileLiberator.Tests\FileLiberator.Tests.csproj", "{5B8FC827-BF58-4CB1-A59E-BDEB9C62A05E}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FileManager.Tests", "_Tests\FileManager.Tests\FileManager.Tests.csproj", "{F2E04270-4551-41C4-99FF-E7125BED708C}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibationFileManager.Tests", "_Tests\LibationFileManager.Tests\LibationFileManager.Tests.csproj", "{EB781571-8548-477E-82AD-FB9FAB548D2F}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HangoverWinForms", "HangoverWinForms\HangoverWinForms.csproj", "{40C67036-C1A7-4FDF-AA83-8EC902E257F3}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibationAvalonia", "LibationAvalonia\LibationAvalonia.csproj", "{F612D06F-3134-4B9B-95CD-EB3FC798AE60}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HangoverAvalonia", "HangoverAvalonia\HangoverAvalonia.csproj", "{8A7B01D3-9830-44FD-91A1-D8D010996BEB}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HangoverBase", "HangoverBase\HangoverBase.csproj", "{5C7005BA-7D83-4E99-8073-D970943A7D61}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "_Demos", "_Demos", "{185AC9FF-381E-4AA1-B649-9771F4917214}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "LoadByOS", "LoadByOS", "{59DF46F3-ECD0-43CA-AD12-3FEE8FCF9E4F}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CrossPlatformClientExe", "_Demos\LoadByOS\CrossPlatformClientExe\CrossPlatformClientExe.csproj", "{CC275937-DFE4-4383-B1BF-1D5D42B70C98}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LinuxConfigApp", "_Demos\LoadByOS\LinuxConfigApp\LinuxConfigApp.csproj", "{47325742-5B38-48E7-95FB-CD94E6E07332}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WindowsConfigApp", "_Demos\LoadByOS\WindowsConfigApp\WindowsConfigApp.csproj", "{0520760A-9CFB-48A8-BCE4-6E951AFD6BE9}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "LoadByOS", "LoadByOS", "{9B906374-1142-4D69-86FF-B384806CA5FE}"
-	ProjectSection(SolutionItems) = preProject
-		LoadByOS\README.txt = LoadByOS\README.txt
-	EndProjectSection
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LinuxConfigApp", "LoadByOS\LinuxConfigApp\LinuxConfigApp.csproj", "{357DF797-4EC2-4DBD-A4BD-D045277F2666}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MacOSConfigApp", "LoadByOS\MacOSConfigApp\MacOSConfigApp.csproj", "{ECED4E13-B676-4277-8A8F-C8B2507B7D8C}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WindowsConfigApp", "LoadByOS\WindowsConfigApp\WindowsConfigApp.csproj", "{5F65A509-26E3-4B02-B403-EEB6F0EF391F}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibationUiBase", "LibationUiBase\LibationUiBase.csproj", "{E90C4651-AF11-41B4-A839-10082D0391F9}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Hangover", "Hangover", "{FDDABAFE-35AD-42FC-AC95-0B1FE0DF0DDE}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Libation UI", "Libation UI", "{53758A35-1C7E-4702-9B96-433ABA457B37}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Libation CLI", "Libation CLI", "{47E27674-595D-4F7A-8CFB-127E768E1D1E}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AssertionHelper", "_Tests\AssertionHelper\AssertionHelper.csproj", "{CFE7A0E5-37FE-40BE-A70B-41B5104181C4}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DataLayer.Postgres", "DataLayer.Postgres\DataLayer.Postgres.csproj", "{0E480D2D-C7C1-A6FE-8C90-8A6F0DBCEAC2}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DataLayer.Sqlite", "DataLayer.Sqlite\DataLayer.Sqlite.csproj", "{1E689E85-279E-39D4-7D97-3E993FB6D95B}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{8BD8E012-F44F-4EE2-A234-D66C14D5FE4B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8BD8E012-F44F-4EE2-A234-D66C14D5FE4B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8BD8E012-F44F-4EE2-A234-D66C14D5FE4B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8BD8E012-F44F-4EE2-A234-D66C14D5FE4B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{1AE65B61-9C05-4C80-ABFF-48F16E22FDF1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1AE65B61-9C05-4C80-ABFF-48F16E22FDF1}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1AE65B61-9C05-4C80-ABFF-48F16E22FDF1}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{1AE65B61-9C05-4C80-ABFF-48F16E22FDF1}.Release|Any CPU.Build.0 = Release|Any CPU
-		{59A10DF3-63EC-43F1-A3BF-4000CFA118D2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{59A10DF3-63EC-43F1-A3BF-4000CFA118D2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{59A10DF3-63EC-43F1-A3BF-4000CFA118D2}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{59A10DF3-63EC-43F1-A3BF-4000CFA118D2}.Release|Any CPU.Build.0 = Release|Any CPU
-		{393B5B27-D15C-4F77-9457-FA14BA8F3C73}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{393B5B27-D15C-4F77-9457-FA14BA8F3C73}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{393B5B27-D15C-4F77-9457-FA14BA8F3C73}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{393B5B27-D15C-4F77-9457-FA14BA8F3C73}.Release|Any CPU.Build.0 = Release|Any CPU
-		{06882742-27A6-4347-97D9-56162CEC9C11}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{06882742-27A6-4347-97D9-56162CEC9C11}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{06882742-27A6-4347-97D9-56162CEC9C11}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{06882742-27A6-4347-97D9-56162CEC9C11}.Release|Any CPU.Build.0 = Release|Any CPU
-		{2E1F5DB4-40CC-4804-A893-5DCE0193E598}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2E1F5DB4-40CC-4804-A893-5DCE0193E598}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2E1F5DB4-40CC-4804-A893-5DCE0193E598}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{2E1F5DB4-40CC-4804-A893-5DCE0193E598}.Release|Any CPU.Build.0 = Release|Any CPU
-		{635F00E1-AAD1-45F7-BEB7-D909AD33B9F6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{635F00E1-AAD1-45F7-BEB7-D909AD33B9F6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{635F00E1-AAD1-45F7-BEB7-D909AD33B9F6}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{635F00E1-AAD1-45F7-BEB7-D909AD33B9F6}.Release|Any CPU.Build.0 = Release|Any CPU
-		{401865F5-1942-4713-B230-04544C0A97B0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{401865F5-1942-4713-B230-04544C0A97B0}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{401865F5-1942-4713-B230-04544C0A97B0}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{401865F5-1942-4713-B230-04544C0A97B0}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B95650EA-25F0-449E-BA5D-99126BC5D730}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B95650EA-25F0-449E-BA5D-99126BC5D730}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B95650EA-25F0-449E-BA5D-99126BC5D730}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B95650EA-25F0-449E-BA5D-99126BC5D730}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C5B21768-C7C9-4FCB-AC1E-187B223D5A98}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C5B21768-C7C9-4FCB-AC1E-187B223D5A98}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C5B21768-C7C9-4FCB-AC1E-187B223D5A98}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C5B21768-C7C9-4FCB-AC1E-187B223D5A98}.Release|Any CPU.Build.0 = Release|Any CPU
-		{428163C3-D558-4914-B570-A92069521877}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{428163C3-D558-4914-B570-A92069521877}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{428163C3-D558-4914-B570-A92069521877}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{428163C3-D558-4914-B570-A92069521877}.Release|Any CPU.Build.0 = Release|Any CPU
-		{595E7C4D-506D-486D-98B7-5FDDF398D033}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{595E7C4D-506D-486D-98B7-5FDDF398D033}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{595E7C4D-506D-486D-98B7-5FDDF398D033}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{595E7C4D-506D-486D-98B7-5FDDF398D033}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E86014F9-E4B3-4CD4-A210-2B3DB571DD86}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E86014F9-E4B3-4CD4-A210-2B3DB571DD86}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E86014F9-E4B3-4CD4-A210-2B3DB571DD86}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E86014F9-E4B3-4CD4-A210-2B3DB571DD86}.Release|Any CPU.Build.0 = Release|Any CPU
-		{788294BE-0D8E-40D4-9CEE-67896FBB52CE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{788294BE-0D8E-40D4-9CEE-67896FBB52CE}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{788294BE-0D8E-40D4-9CEE-67896FBB52CE}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{788294BE-0D8E-40D4-9CEE-67896FBB52CE}.Release|Any CPU.Build.0 = Release|Any CPU
-		{5B8FC827-BF58-4CB1-A59E-BDEB9C62A05E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5B8FC827-BF58-4CB1-A59E-BDEB9C62A05E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5B8FC827-BF58-4CB1-A59E-BDEB9C62A05E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{5B8FC827-BF58-4CB1-A59E-BDEB9C62A05E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F2E04270-4551-41C4-99FF-E7125BED708C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F2E04270-4551-41C4-99FF-E7125BED708C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F2E04270-4551-41C4-99FF-E7125BED708C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F2E04270-4551-41C4-99FF-E7125BED708C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{EB781571-8548-477E-82AD-FB9FAB548D2F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{EB781571-8548-477E-82AD-FB9FAB548D2F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{EB781571-8548-477E-82AD-FB9FAB548D2F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{EB781571-8548-477E-82AD-FB9FAB548D2F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{40C67036-C1A7-4FDF-AA83-8EC902E257F3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{40C67036-C1A7-4FDF-AA83-8EC902E257F3}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{40C67036-C1A7-4FDF-AA83-8EC902E257F3}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{40C67036-C1A7-4FDF-AA83-8EC902E257F3}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F612D06F-3134-4B9B-95CD-EB3FC798AE60}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F612D06F-3134-4B9B-95CD-EB3FC798AE60}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F612D06F-3134-4B9B-95CD-EB3FC798AE60}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F612D06F-3134-4B9B-95CD-EB3FC798AE60}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8A7B01D3-9830-44FD-91A1-D8D010996BEB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8A7B01D3-9830-44FD-91A1-D8D010996BEB}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8A7B01D3-9830-44FD-91A1-D8D010996BEB}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8A7B01D3-9830-44FD-91A1-D8D010996BEB}.Release|Any CPU.Build.0 = Release|Any CPU
-		{5C7005BA-7D83-4E99-8073-D970943A7D61}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5C7005BA-7D83-4E99-8073-D970943A7D61}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5C7005BA-7D83-4E99-8073-D970943A7D61}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{5C7005BA-7D83-4E99-8073-D970943A7D61}.Release|Any CPU.Build.0 = Release|Any CPU
-		{CC275937-DFE4-4383-B1BF-1D5D42B70C98}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{CC275937-DFE4-4383-B1BF-1D5D42B70C98}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{CC275937-DFE4-4383-B1BF-1D5D42B70C98}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{CC275937-DFE4-4383-B1BF-1D5D42B70C98}.Release|Any CPU.Build.0 = Release|Any CPU
-		{47325742-5B38-48E7-95FB-CD94E6E07332}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{47325742-5B38-48E7-95FB-CD94E6E07332}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{47325742-5B38-48E7-95FB-CD94E6E07332}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{47325742-5B38-48E7-95FB-CD94E6E07332}.Release|Any CPU.Build.0 = Release|Any CPU
-		{0520760A-9CFB-48A8-BCE4-6E951AFD6BE9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0520760A-9CFB-48A8-BCE4-6E951AFD6BE9}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0520760A-9CFB-48A8-BCE4-6E951AFD6BE9}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{0520760A-9CFB-48A8-BCE4-6E951AFD6BE9}.Release|Any CPU.Build.0 = Release|Any CPU
-		{357DF797-4EC2-4DBD-A4BD-D045277F2666}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{357DF797-4EC2-4DBD-A4BD-D045277F2666}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{357DF797-4EC2-4DBD-A4BD-D045277F2666}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{357DF797-4EC2-4DBD-A4BD-D045277F2666}.Release|Any CPU.Build.0 = Release|Any CPU
-		{ECED4E13-B676-4277-8A8F-C8B2507B7D8C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{ECED4E13-B676-4277-8A8F-C8B2507B7D8C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{ECED4E13-B676-4277-8A8F-C8B2507B7D8C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{ECED4E13-B676-4277-8A8F-C8B2507B7D8C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{5F65A509-26E3-4B02-B403-EEB6F0EF391F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5F65A509-26E3-4B02-B403-EEB6F0EF391F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5F65A509-26E3-4B02-B403-EEB6F0EF391F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{5F65A509-26E3-4B02-B403-EEB6F0EF391F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E90C4651-AF11-41B4-A839-10082D0391F9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E90C4651-AF11-41B4-A839-10082D0391F9}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E90C4651-AF11-41B4-A839-10082D0391F9}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E90C4651-AF11-41B4-A839-10082D0391F9}.Release|Any CPU.Build.0 = Release|Any CPU
-		{CFE7A0E5-37FE-40BE-A70B-41B5104181C4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{CFE7A0E5-37FE-40BE-A70B-41B5104181C4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{CFE7A0E5-37FE-40BE-A70B-41B5104181C4}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{CFE7A0E5-37FE-40BE-A70B-41B5104181C4}.Release|Any CPU.Build.0 = Release|Any CPU
-		{0E480D2D-C7C1-A6FE-8C90-8A6F0DBCEAC2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0E480D2D-C7C1-A6FE-8C90-8A6F0DBCEAC2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0E480D2D-C7C1-A6FE-8C90-8A6F0DBCEAC2}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{0E480D2D-C7C1-A6FE-8C90-8A6F0DBCEAC2}.Release|Any CPU.Build.0 = Release|Any CPU
-		{1E689E85-279E-39D4-7D97-3E993FB6D95B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1E689E85-279E-39D4-7D97-3E993FB6D95B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1E689E85-279E-39D4-7D97-3E993FB6D95B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{1E689E85-279E-39D4-7D97-3E993FB6D95B}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{8BD8E012-F44F-4EE2-A234-D66C14D5FE4B} = {7FBBB086-0807-4998-85BF-6D1A49C8AD05}
-		{1AE65B61-9C05-4C80-ABFF-48F16E22FDF1} = {F0CBB7A7-D3FB-41FF-8F47-CF3F6A592249}
-		{59A10DF3-63EC-43F1-A3BF-4000CFA118D2} = {751093DD-5DBA-463E-ADBE-E05FAFB6983E}
-		{393B5B27-D15C-4F77-9457-FA14BA8F3C73} = {41CDCC73-9B81-49DD-9570-C54406E852AF}
-		{06882742-27A6-4347-97D9-56162CEC9C11} = {F0CBB7A7-D3FB-41FF-8F47-CF3F6A592249}
-		{2E1F5DB4-40CC-4804-A893-5DCE0193E598} = {41CDCC73-9B81-49DD-9570-C54406E852AF}
-		{635F00E1-AAD1-45F7-BEB7-D909AD33B9F6} = {53758A35-1C7E-4702-9B96-433ABA457B37}
-		{401865F5-1942-4713-B230-04544C0A97B0} = {41CDCC73-9B81-49DD-9570-C54406E852AF}
-		{B95650EA-25F0-449E-BA5D-99126BC5D730} = {41CDCC73-9B81-49DD-9570-C54406E852AF}
-		{C5B21768-C7C9-4FCB-AC1E-187B223D5A98} = {67E66E82-5532-4440-AFB3-9FB1DF9DEF53}
-		{428163C3-D558-4914-B570-A92069521877} = {47E27674-595D-4F7A-8CFB-127E768E1D1E}
-		{595E7C4D-506D-486D-98B7-5FDDF398D033} = {8679CAC8-9164-4007-BDD2-F004810EDA14}
-		{E86014F9-E4B3-4CD4-A210-2B3DB571DD86} = {43E3ACB3-E0BC-4370-8DBB-E3720C8C8FD1}
-		{788294BE-0D8E-40D4-9CEE-67896FBB52CE} = {67E66E82-5532-4440-AFB3-9FB1DF9DEF53}
-		{5B8FC827-BF58-4CB1-A59E-BDEB9C62A05E} = {67E66E82-5532-4440-AFB3-9FB1DF9DEF53}
-		{F2E04270-4551-41C4-99FF-E7125BED708C} = {67E66E82-5532-4440-AFB3-9FB1DF9DEF53}
-		{EB781571-8548-477E-82AD-FB9FAB548D2F} = {67E66E82-5532-4440-AFB3-9FB1DF9DEF53}
-		{40C67036-C1A7-4FDF-AA83-8EC902E257F3} = {FDDABAFE-35AD-42FC-AC95-0B1FE0DF0DDE}
-		{F612D06F-3134-4B9B-95CD-EB3FC798AE60} = {53758A35-1C7E-4702-9B96-433ABA457B37}
-		{8A7B01D3-9830-44FD-91A1-D8D010996BEB} = {FDDABAFE-35AD-42FC-AC95-0B1FE0DF0DDE}
-		{5C7005BA-7D83-4E99-8073-D970943A7D61} = {FDDABAFE-35AD-42FC-AC95-0B1FE0DF0DDE}
-		{59DF46F3-ECD0-43CA-AD12-3FEE8FCF9E4F} = {185AC9FF-381E-4AA1-B649-9771F4917214}
-		{CC275937-DFE4-4383-B1BF-1D5D42B70C98} = {59DF46F3-ECD0-43CA-AD12-3FEE8FCF9E4F}
-		{47325742-5B38-48E7-95FB-CD94E6E07332} = {59DF46F3-ECD0-43CA-AD12-3FEE8FCF9E4F}
-		{0520760A-9CFB-48A8-BCE4-6E951AFD6BE9} = {59DF46F3-ECD0-43CA-AD12-3FEE8FCF9E4F}
-		{9B906374-1142-4D69-86FF-B384806CA5FE} = {8679CAC8-9164-4007-BDD2-F004810EDA14}
-		{357DF797-4EC2-4DBD-A4BD-D045277F2666} = {9B906374-1142-4D69-86FF-B384806CA5FE}
-		{ECED4E13-B676-4277-8A8F-C8B2507B7D8C} = {9B906374-1142-4D69-86FF-B384806CA5FE}
-		{5F65A509-26E3-4B02-B403-EEB6F0EF391F} = {9B906374-1142-4D69-86FF-B384806CA5FE}
-		{E90C4651-AF11-41B4-A839-10082D0391F9} = {53758A35-1C7E-4702-9B96-433ABA457B37}
-		{FDDABAFE-35AD-42FC-AC95-0B1FE0DF0DDE} = {8679CAC8-9164-4007-BDD2-F004810EDA14}
-		{53758A35-1C7E-4702-9B96-433ABA457B37} = {8679CAC8-9164-4007-BDD2-F004810EDA14}
-		{47E27674-595D-4F7A-8CFB-127E768E1D1E} = {8679CAC8-9164-4007-BDD2-F004810EDA14}
-		{CFE7A0E5-37FE-40BE-A70B-41B5104181C4} = {67E66E82-5532-4440-AFB3-9FB1DF9DEF53}
-		{0E480D2D-C7C1-A6FE-8C90-8A6F0DBCEAC2} = {751093DD-5DBA-463E-ADBE-E05FAFB6983E}
-		{1E689E85-279E-39D4-7D97-3E993FB6D95B} = {751093DD-5DBA-463E-ADBE-E05FAFB6983E}
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {615E00ED-BAEF-4E8E-A92A-9B82D87942A9}
-	EndGlobalSection
-EndGlobal

Source/Libation.slnx

@@ -0,0 +1,72 @@
+<Solution>
+  <Folder Name="/1 Core Libraries/">
+    <Project Path="FileManager/FileManager.csproj" />
+  </Folder>
+  <Folder Name="/2 Utilities (domain ignorant)/">
+    <Project Path="AaxDecrypter/AaxDecrypter.csproj" />
+  </Folder>
+  <Folder Name="/3 Domain Internal Utilities (db ignorant)/">
+    <Project Path="AudibleUtilities/AudibleUtilities.csproj" />
+    <Project Path="LibationFileManager/LibationFileManager.csproj" />
+  </Folder>
+  <Folder Name="/4 Domain (db)/">
+    <Project Path="DataLayer.Postgres/DataLayer.Postgres.csproj" />
+    <Project Path="DataLayer.Sqlite/DataLayer.Sqlite.csproj" />
+    <Project Path="DataLayer/DataLayer.csproj" />
+  </Folder>
+  <Folder Name="/5 Domain Utilities (db aware)/">
+    <Project Path="ApplicationServices/ApplicationServices.csproj" />
+    <Project Path="DtoImporterService/DtoImporterService.csproj" />
+    <Project Path="FileLiberator/FileLiberator.csproj" />
+    <Project Path="LibationSearchEngine/LibationSearchEngine.csproj" />
+  </Folder>
+  <Folder Name="/6 Application/">
+    <Project Path="AppScaffolding/AppScaffolding.csproj" />
+  </Folder>
+  <Folder Name="/6 Application/Hangover/">
+    <Project Path="HangoverAvalonia/HangoverAvalonia.csproj" />
+    <Project Path="HangoverBase/HangoverBase.csproj" />
+    <Project Path="HangoverWinForms/HangoverWinForms.csproj" />
+  </Folder>
+  <Folder Name="/6 Application/Libation CLI/">
+    <Project Path="LibationCli/LibationCli.csproj" />
+  </Folder>
+  <Folder Name="/6 Application/Libation UI/">
+    <Project Path="LibationAvalonia/LibationAvalonia.csproj" />
+    <Project Path="LibationUiBase/LibationUiBase.csproj" />
+    <Project Path="LibationWinForms/LibationWinForms.csproj">
+      <BuildDependency Project="HangoverWinForms/HangoverWinForms.csproj" />
+      <BuildDependency Project="LibationCli/LibationCli.csproj" />
+    </Project>
+  </Folder>
+  <Folder Name="/6 Application/LoadByOS/">
+    <File Path="LoadByOS/README.txt" />
+    <Project Path="LoadByOS/LinuxConfigApp/LinuxConfigApp.csproj" />
+    <Project Path="LoadByOS/MacOSConfigApp/MacOSConfigApp.csproj" />
+    <Project Path="LoadByOS/WindowsConfigApp/WindowsConfigApp.csproj" />
+  </Folder>
+  <Folder Name="/_Demos/" />
+  <Folder Name="/_Demos/LoadByOS/">
+    <Project Path="_Demos/LoadByOS/CrossPlatformClientExe/CrossPlatformClientExe.csproj" />
+    <Project Path="_Demos/LoadByOS/LinuxConfigApp/LinuxConfigApp.csproj" />
+    <Project Path="_Demos/LoadByOS/WindowsConfigApp/WindowsConfigApp.csproj" />
+  </Folder>
+  <Folder Name="/_Solution Items/">
+    <File Path="add-migrations.ps1" />
+    <File Path="REFERENCE.txt" />
+    <File Path="Upgrading dotnet version.txt" />
+    <File Path="_ARCHITECTURE NOTES.txt" />
+    <File Path="_AvaloniaUI Primer.txt" />
+    <File Path="_DB_NOTES.txt" />
+    <File Path="__README - COLLABORATORS.txt" />
+  </Folder>
+  <Folder Name="/_Tests/">
+    <Project Path="_Tests/AssertionHelper/AssertionHelper.csproj" />
+    <Project Path="_Tests/AudibleUtilities.Tests/AudibleUtilities.Tests.csproj" />
+    <Project Path="_Tests/FileLiberator.Tests/FileLiberator.Tests.csproj" />
+    <Project Path="_Tests/FileManager.Tests/FileManager.Tests.csproj" />
+    <Project Path="_Tests/LibationFileManager.Tests/LibationFileManager.Tests.csproj" />
+    <Project Path="_Tests/LibationSearchEngine.Tests/LibationSearchEngine.Tests.csproj" />
+    <Project Path="_Tests/LibationUiBase.Tests/LibationUiBase.Tests.csproj" />
+  </Folder>
+</Solution>

Source/LibationAvalonia/App.axaml

@@ -84,6 +84,9 @@
 				<Setter Property="Foreground" Value="{DynamicResource SystemChromeAltLowColor}" />
 			</Style>
 		</Style>
+		<Style Selector="Button.SaveButton">
+			<Setter Property="Padding" Value="30,6" />
+		</Style>
 		<Style Selector="ScrollBar">
 			<!-- It's called AutoHide, but this is really the mouseover shrink/expand. -->
             <Setter Property="AllowAutoHide" Value="false"/>
@@ -97,7 +100,11 @@
 					<ContentPresenter Background="{DynamicResource SystemRegionColor}" Content="{TemplateBinding Content}" />
 				</ControlTemplate>
 			</Setter>
-		</Style>		
+			<Style Selector="^ Button:focus">
+				<Setter Property="BorderBrush" Value="{DynamicResource SystemAccentColor}" />
+				<Setter Property="BorderThickness" Value="2" />
+			</Style>
+		</Style>
 	</Application.Styles>
 
 	<NativeMenu.Menu>

Source/LibationAvalonia/App.axaml.cs

@@ -1,261 +1,158 @@
 using ApplicationServices;
+using AppScaffolding;
 using Avalonia;
+using Avalonia.Controls;
 using Avalonia.Controls.ApplicationLifetimes;
+using Avalonia.Data.Core.Plugins;
 using Avalonia.Markup.Xaml;
 using Avalonia.Platform;
 using Avalonia.Styling;
+using Avalonia.Threading;
+using Dinah.Core;
 using LibationAvalonia.Dialogs;
+using LibationAvalonia.Themes;
 using LibationAvalonia.Views;
 using LibationFileManager;
+using LibationUiBase;
+using LibationUiBase.Forms;
 using System;
 using System.Collections.Generic;
 using System.IO;
-using System.Threading.Tasks;
-using Avalonia.Threading;
-using Dinah.Core;
-using LibationAvalonia.Themes;
-using Avalonia.Data.Core.Plugins;
 using System.Linq;
-using LibationUiBase.Forms;
-using Avalonia.Controls;
+using System.Threading.Tasks;
 
 #nullable enable
-namespace LibationAvalonia
+namespace LibationAvalonia;
+
+public class App : Application
 {
-	public class App : Application
+	public static Task<List<DataLayer.LibraryBook>>? LibraryTask { get; set; }
+	public static ChardonnayTheme? DefaultThemeColors { get; private set; }
+	public static MainWindow? MainWindow { get; private set; }
+	public static Uri AssetUriBase { get; } = new("avares://Libation/Assets/");
+	public static new Application Current => Application.Current ?? throw new InvalidOperationException("The Avalonia app hasn't started yet.");
+
+	public static Stream OpenAsset(string assetRelativePath)
+		=> AssetLoader.Open(new Uri(AssetUriBase, assetRelativePath));
+
+	public override void Initialize() => AvaloniaXamlLoader.Load(this);
+
+	public override void OnFrameworkInitializationCompleted()
 	{
-		public static Task<List<DataLayer.LibraryBook>>? LibraryTask { get; set; }
-		public static ChardonnayTheme? DefaultThemeColors { get; private set; }
-		public static MainWindow? MainWindow { get; private set; }
-		public static Uri AssetUriBase { get; } = new("avares://Libation/Assets/");
-		public static new Application Current => Application.Current ?? throw new InvalidOperationException("The Avalonia app hasn't started yet.");
+		DefaultThemeColors = ChardonnayTheme.GetLiveTheme();
 
-		public static Stream OpenAsset(string assetRelativePath)
-			=> AssetLoader.Open(new Uri(AssetUriBase, assetRelativePath));
-
-		public override void Initialize()
+		if (ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop)
 		{
-			AvaloniaXamlLoader.Load(this);
+			// Chardonnay uses the OnExplicitShutdown shutdown mode. The application will stay alive until
+			// Shutdown() is called on App.Current.ApplicationLifetime.
+			MessageBoxBase.ShowAsyncImpl = (owner, message, caption, buttons, icon, defaultButton, saveAndRestorePosition) =>
+				MessageBox.Show(owner as Window, message, caption, buttons, icon, defaultButton, saveAndRestorePosition);
+
+			// Avoid duplicate validations from both Avalonia and the CommunityToolkit. 
+			// More info: https://docs.avaloniaui.net/docs/guides/development-guides/data-validation#manage-validationplugins
+			DisableAvaloniaDataAnnotationValidation();
+			RunSetupIfNeededAsync(desktop, Configuration.Instance);
 		}
 
-		public override void OnFrameworkInitializationCompleted()
+		base.OnFrameworkInitializationCompleted();
+	}
+
+	private static async void RunSetupIfNeededAsync(IClassicDesktopStyleApplicationLifetime desktop, Configuration config)
+	{
+		var setup = new LibationSetup(config.LibationFiles)
 		{
-			DefaultThemeColors = ChardonnayTheme.GetLiveTheme();
-
-			if (ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop)
-			{
-				MessageBoxBase.ShowAsyncImpl = (owner, message, caption, buttons, icon, defaultButton, saveAndRestorePosition) =>
-					MessageBox.Show(owner as Window, message, caption, buttons, icon, defaultButton, saveAndRestorePosition);
-
-				// Avoid duplicate validations from both Avalonia and the CommunityToolkit. 
-				// More info: https://docs.avaloniaui.net/docs/guides/development-guides/data-validation#manage-validationplugins
-				DisableAvaloniaDataAnnotationValidation();
-
-				var config = Configuration.Instance;
-
-				if (!config.LibationSettingsAreValid)
-				{
-					var defaultLibationFilesDir = Configuration.DefaultLibationFilesDirectory;
-
-					// check for existing settings in default location
-					var defaultSettingsFile = Path.Combine(defaultLibationFilesDir, "Settings.json");
-					if (Configuration.SettingsFileIsValid(defaultSettingsFile))
-						Configuration.SetLibationFiles(defaultLibationFilesDir);
-
-					if (config.LibationSettingsAreValid)
-					{
-						LibraryTask = Task.Run(() => DbContexts.GetLibrary_Flat_NoTracking(includeParents: true));
-						ShowMainWindow(desktop);
-					}
-					else
-					{
-						var setupDialog = new SetupDialog { Config = config };
-						setupDialog.Closing += Setup_Closing;
-						desktop.MainWindow = setupDialog;
-					}
-				}
-				else
-					ShowMainWindow(desktop);
-			}
-
-			base.OnFrameworkInitializationCompleted();
+			SetupPromptAsync =() => ShowSetupAsync(desktop),
+			SelectFolderPromptAsync = () => SelectInstallLocation(desktop, config.LibationFiles)
+		};
+		if (await setup.RunSetupIfNeededAsync())
+		{
+			// setup succeeded or wasn't needed and LibationFiles are valid
+			await RunMigrationsAsync(config);
+			LibraryTask = Task.Run(() => DbContexts.GetLibrary_Flat_NoTracking(includeParents: true));
+			ShowMainWindow(desktop);
 		}
-		private void DisableAvaloniaDataAnnotationValidation()
+		else
 		{
-			// Get an array of plugins to remove
-			var dataValidationPluginsToRemove =
-				BindingPlugins.DataValidators.OfType<DataAnnotationsValidationPlugin>().ToArray();
-
-			// remove each entry found
-			foreach (var plugin in dataValidationPluginsToRemove)
-			{
-				BindingPlugins.DataValidators.Remove(plugin);
-			}
+			await MessageBox.Show("Initial set up cancelled.", "Cancelled", MessageBoxButtons.OK, MessageBoxIcon.Warning);
+			desktop.Shutdown(-1);
 		}
+	}
 
-		private async void Setup_Closing(object? sender, System.ComponentModel.CancelEventArgs e)
+	static async Task<ILibationSetup> ShowSetupAsync(IClassicDesktopStyleApplicationLifetime desktop)
+	{
+		var tcs = new TaskCompletionSource<ILibationSetup>();
+		var setupDialog = new SetupDialog();
+		desktop.MainWindow = setupDialog;
+		setupDialog.Closed += (_, _) => tcs.SetResult(setupDialog);
+		setupDialog.Show();
+		return await tcs.Task;
+	}
+
+	static async Task<ILibationInstallLocation?> SelectInstallLocation(IClassicDesktopStyleApplicationLifetime desktop, LibationFiles libationFiles)
+	{
+		var tcs = new TaskCompletionSource<ILibationInstallLocation>();
+		var libationFilesDialog = new LibationFilesDialog(libationFiles.Location.PathWithoutPrefix);
+		desktop.MainWindow = libationFilesDialog;
+		libationFilesDialog.Closed += (_, _) => tcs.SetResult(libationFilesDialog);
+		libationFilesDialog.Show();
+		return await tcs.Task;
+	}
+
+	private static async Task RunMigrationsAsync(Configuration config)
+	{
+		// most migrations go in here
+		LibationScaffolding.RunPostConfigMigrations(config);
+		await MessageBox.VerboseLoggingWarning_ShowIfTrue();
+		// logging is init'd here
+		LibationScaffolding.RunPostMigrationScaffolding(Variety.Chardonnay, config);
+	}
+
+	private void DisableAvaloniaDataAnnotationValidation()
+	{
+		// Get an array of plugins to remove
+		DataAnnotationsValidationPlugin[] dataValidationPluginsToRemove =
+			BindingPlugins.DataValidators.OfType<DataAnnotationsValidationPlugin>().ToArray();
+
+		// remove each entry found
+		foreach (DataAnnotationsValidationPlugin? plugin in dataValidationPluginsToRemove)
 		{
-			if (sender is not SetupDialog setupDialog || ApplicationLifetime is not IClassicDesktopStyleApplicationLifetime desktop)
-				return;
-
-			try
-			{
-				// all returns should be preceded by either:
-				// - if config.LibationSettingsAreValid
-				// - error message, Exit()				
-				if (setupDialog.IsNewUser)
-				{
-					Configuration.SetLibationFiles(Configuration.DefaultLibationFilesDirectory);
-					setupDialog.Config.Books = Configuration.DefaultBooksDirectory;
-
-					if (setupDialog.Config.LibationSettingsAreValid)
-					{
-						string? theme = setupDialog.SelectedTheme.Content as string;
-
-						setupDialog.Config.SetString(theme, nameof(ThemeVariant));
-
-						await RunMigrationsAsync(setupDialog.Config);
-						LibraryTask = Task.Run(() => DbContexts.GetLibrary_Flat_NoTracking(includeParents: true));
-						AudibleUtilities.AudibleApiStorage.EnsureAccountsSettingsFileExists();
-						ShowMainWindow(desktop);
-					}
-					else
-					{
-						e.Cancel = true;
-						await CancelInstallation(setupDialog);
-					}
-				}
-				else if (setupDialog.IsReturningUser)
-				{
-					ShowLibationFilesDialog(desktop, setupDialog.Config, OnLibationFilesCompleted);
-				}
-				else
-				{
-					e.Cancel = true;
-					await CancelInstallation(setupDialog);
-					return;
-				}
-
-			}
-			catch (Exception ex)
-			{
-				var title = "Fatal error, pre-logging";
-				var body = "An unrecoverable error occurred. Since this error happened before logging could be initialized, this error can not be written to the log file.";
-				try
-				{
-					await MessageBox.ShowAdminAlert(setupDialog, body, title, ex);
-				}
-				catch
-				{
-					await MessageBox.Show(setupDialog, $"{body}\r\n\r\n{ex.Message}\r\n\r\n{ex.StackTrace}", title, MessageBoxButtons.OK, MessageBoxIcon.Error);
-				}
-				return;
-			}
+			BindingPlugins.DataValidators.Remove(plugin);
 		}
+	}
 
-		private async Task RunMigrationsAsync(Configuration config)
+	private static void ShowMainWindow(IClassicDesktopStyleApplicationLifetime desktop)
+	{
+		Configuration.Instance.PropertyChanged += ThemeVariant_PropertyChanged;
+		Current.ActualThemeVariantChanged += OnActualThemeVariantChanged;
+		OnActualThemeVariantChanged(Current, EventArgs.Empty);
+
+		MainWindow mainWindow = new();
+		desktop.MainWindow = MainWindow = mainWindow;
+		mainWindow.Loaded += MainWindow_Loaded;
+		mainWindow.Closed += (_, _) => desktop.Shutdown();
+		mainWindow.RestoreSizeAndLocation(Configuration.Instance);
+		mainWindow.Show();
+	}
+
+	[PropertyChangeFilter(nameof(ThemeVariant))]
+	private static void ThemeVariant_PropertyChanged(object sender, PropertyChangedEventArgsEx e)
+		=> OpenAndApplyTheme(e.NewValue as Configuration.Theme? ?? Configuration.Theme.System);
+
+	private static void OnActualThemeVariantChanged(object? sender, EventArgs e)
+		=> OpenAndApplyTheme(Configuration.Instance.ThemeVariant);
+
+	private static void OpenAndApplyTheme(Configuration.Theme themeVariant)
+	{
+		using ChardonnayThemePersister? themePersister = ChardonnayThemePersister.Create();
+		themePersister?.Target.ApplyTheme(themeVariant);
+	}
+
+	private static async void MainWindow_Loaded(object? sender, Avalonia.Interactivity.RoutedEventArgs e)
+	{
+		if (LibraryTask is not null && MainWindow is not null)
 		{
-			// most migrations go in here
-			AppScaffolding.LibationScaffolding.RunPostConfigMigrations(config);
-
-			await MessageBox.VerboseLoggingWarning_ShowIfTrue();
-
-			// logging is init'd here
-			AppScaffolding.LibationScaffolding.RunPostMigrationScaffolding(AppScaffolding.Variety.Chardonnay, config);
-		}
-
-		private void ShowLibationFilesDialog(IClassicDesktopStyleApplicationLifetime desktop, Configuration config, Action<IClassicDesktopStyleApplicationLifetime, LibationFilesDialog, Configuration> OnClose)
-		{
-			var libationFilesDialog = new LibationFilesDialog();
-			desktop.MainWindow = libationFilesDialog;
-			libationFilesDialog.Show();
-
-			void WindowClosing(object? sender, System.ComponentModel.CancelEventArgs e)
-			{
-				libationFilesDialog.Closing -= WindowClosing;
-				e.Cancel = true;
-				OnClose?.Invoke(desktop, libationFilesDialog, config);
-			}
-			libationFilesDialog.Closing += WindowClosing;
-		}
-
-		private async void OnLibationFilesCompleted(IClassicDesktopStyleApplicationLifetime desktop, LibationFilesDialog libationFilesDialog, Configuration config)
-		{
-			Configuration.SetLibationFiles(libationFilesDialog.SelectedDirectory);
-			if (config.LibationSettingsAreValid)
-			{
-				await RunMigrationsAsync(config);
-
-				LibraryTask = Task.Run(() => DbContexts.GetLibrary_Flat_NoTracking(includeParents: true));
-				AudibleUtilities.AudibleApiStorage.EnsureAccountsSettingsFileExists();
-				ShowMainWindow(desktop);
-			}
-			else
-			{
-				// path did not result in valid settings
-				var continueResult = await MessageBox.Show(
-					libationFilesDialog,
-					$"No valid settings were found at this location.\r\nWould you like to create a new install settings in this folder?\r\n\r\n{libationFilesDialog.SelectedDirectory}",
-					"New install?",
-					MessageBoxButtons.YesNo,
-					MessageBoxIcon.Question);
-
-				if (continueResult == DialogResult.Yes)
-				{
-					config.Books = Configuration.DefaultBooksDirectory;
-
-					if (config.LibationSettingsAreValid)
-					{
-						await RunMigrationsAsync(config);
-						LibraryTask = Task.Run(() => DbContexts.GetLibrary_Flat_NoTracking(includeParents: true));
-						AudibleUtilities.AudibleApiStorage.EnsureAccountsSettingsFileExists();
-						ShowMainWindow(desktop);
-					}
-					else
-						await CancelInstallation(libationFilesDialog);
-				}
-				else
-					await CancelInstallation(libationFilesDialog);
-			}
-
-			libationFilesDialog.Close();
-		}
-
-		static async Task CancelInstallation(Window window)
-		{
-			await MessageBox.Show(window, "Initial set up cancelled.", "Cancelled", MessageBoxButtons.OK, MessageBoxIcon.Warning);
-			Environment.Exit(0);
-		}
-
-		private static void ShowMainWindow(IClassicDesktopStyleApplicationLifetime desktop)
-		{
-			Configuration.Instance.PropertyChanged += ThemeVariant_PropertyChanged;
-			OpenAndApplyTheme(Configuration.Instance.GetString(propertyName: nameof(ThemeVariant)));
-
-			var mainWindow = new MainWindow();
-			desktop.MainWindow = MainWindow = mainWindow;
-			mainWindow.Loaded += MainWindow_Loaded;
-			mainWindow.RestoreSizeAndLocation(Configuration.Instance);
-			mainWindow.Show();
-		}
-
-		[PropertyChangeFilter(nameof(ThemeVariant))]
-		private static void ThemeVariant_PropertyChanged(object sender, PropertyChangedEventArgsEx e)
-			=> OpenAndApplyTheme(e.NewValue as string);
-
-		private static void OpenAndApplyTheme(string? themeVariant)
-		{
-			using var themePersister = ChardonnayThemePersister.Create();
-			themePersister?.Target.ApplyTheme(themeVariant);
-		}
-
-		private static async void MainWindow_Loaded(object? sender, Avalonia.Interactivity.RoutedEventArgs e)
-		{
-			if (LibraryTask is not null && MainWindow is not null)
-			{
-				var library = await LibraryTask;
-				await Dispatcher.UIThread.InvokeAsync(() => MainWindow.OnLibraryLoadedAsync(library));
-			}
+			List<DataLayer.LibraryBook> library = await LibraryTask;
+			await Dispatcher.UIThread.InvokeAsync(() => MainWindow.OnLibraryLoadedAsync(library));
 		}
 	}
 }

Source/LibationAvalonia/Assets/LibationVectorIcons.xaml

@@ -117,6 +117,52 @@
 		   a 168,305 -35 0 0 104,-136
 	   </StreamGeometry>
 	   
+	   <StreamGeometry  x:Key="DolbyAtmosLogoVertical">
+		   M261.017,370.954h-13.752l38.363-88.449h11.241l37.967,88.449h-13.984l-8.988-21.733h-41.977
+	L261.017,370.954z M274.257,338.352h33.109l-16.497-41.484L274.257,338.352z M390.748,293.373h28.364v-10.868h-69.087v10.868h28.353
+	v77.581h12.37V293.373z M472.258,282.505h-19.229v88.449h11.985v-73.959h0.246l29.236,73.959h7.87l29.354-73.959h0.255v73.959
+	h12.368v-88.449h-19.229l-26.12,67.955h-0.257L472.258,282.505z M668.11,326.61c0,6.502-1.138,12.46-3.394,17.883
+	c-2.253,5.425-5.369,10.094-9.316,14.018c-3.966,3.92-8.678,6.966-14.135,9.146c-5.477,2.169-11.411,3.255-17.824,3.255
+	s-12.337-1.086-17.751-3.255c-5.434-2.181-10.114-5.227-14.08-9.146c-3.968-3.924-7.041-8.593-9.266-14.018
+	c-2.222-5.423-3.328-11.381-3.328-17.883c0-6.567,1.106-12.567,3.328-17.99c2.225-5.425,5.298-10.051,9.266-13.901
+	c3.966-3.838,8.646-6.826,14.08-8.971c5.414-2.132,11.338-3.2,17.751-3.2s12.348,1.068,17.824,3.2
+	c5.457,2.145,10.169,5.133,14.135,8.971c3.947,3.851,7.063,8.477,9.316,13.901C666.973,314.043,668.11,320.043,668.11,326.61
+	 M655.4,326.61c0-4.595-0.765-8.919-2.254-13.003c-1.522-4.073-3.647-7.667-6.424-10.752c-2.776-3.089-6.116-5.52-10.039-7.308
+	c-3.914-1.774-8.34-2.669-13.242-2.669c-4.828,0-9.21,0.895-13.124,2.669c-3.913,1.788-7.253,4.219-9.976,7.308
+	c-2.734,3.085-4.851,6.679-6.359,10.752c-1.5,4.084-2.256,8.408-2.256,13.003c0,4.674,0.756,9.071,2.256,13.188
+	c1.509,4.115,3.647,7.698,6.413,10.752c2.773,3.047,6.104,5.445,9.974,7.185c3.883,1.743,8.244,2.615,13.072,2.615
+	s9.221-0.872,13.178-2.615c3.967-1.739,7.327-4.138,10.104-7.185c2.776-3.054,4.901-6.637,6.424-10.752
+	C654.636,335.682,655.4,331.284,655.4,326.61 M751.896,292.173c-2.606-2.931-6.063-5.26-10.327-7.003
+	c-4.276-1.739-8.87-2.612-13.771-2.612c-3.479,0-6.945,0.457-10.403,1.361c-3.436,0.915-6.529,2.361-9.252,4.334
+	c-2.734,1.984-4.956,4.478-6.659,7.481c-1.701,3.016-2.542,6.611-2.542,10.817c0,3.877,0.629,7.12,1.894,9.726
+	c1.266,2.611,2.926,4.813,4.989,6.6c2.052,1.771,4.401,3.244,7.008,4.387c2.606,1.144,5.265,2.123,7.955,2.92
+	c2.691,0.861,5.244,1.706,7.658,2.547c2.415,0.829,4.541,1.84,6.349,3.025c1.831,1.191,3.266,2.638,4.339,4.335
+	c1.075,1.702,1.607,3.823,1.607,6.349c0,2.542-0.521,4.695-1.554,6.472c-1.021,1.787-2.35,3.266-3.966,4.457
+	c-1.627,1.185-3.436,2.057-5.402,2.611c-1.989,0.558-3.968,0.829-5.935,0.829c-3.895,0-7.488-0.904-10.817-2.723
+	c-3.328-1.819-5.977-4.196-7.955-7.126l-9.146,7.71c3.243,4.042,7.338,7.094,12.282,9.152c4.958,2.057,10.073,3.078,15.391,3.078
+	c3.722,0,7.327-0.51,10.859-1.531c3.531-1.037,6.637-2.595,9.328-4.696c2.688-2.099,4.849-4.747,6.476-7.96
+	c1.607-3.2,2.425-6.981,2.425-11.337c0-4.196-0.744-7.657-2.255-10.39c-1.498-2.734-3.434-5-5.816-6.829
+	c-2.372-1.818-5.032-3.275-7.955-4.393c-2.936-1.106-5.819-2.101-8.669-2.966c-2.383-0.799-4.604-1.575-6.711-2.325
+	c-2.105-0.74-3.925-1.654-5.456-2.723c-1.543-1.068-2.776-2.383-3.69-3.919c-0.903-1.548-1.361-3.462-1.361-5.765
+	c0-2.371,0.489-4.408,1.478-6.115c0.99-1.701,2.277-3.128,3.862-4.27c1.585-1.145,3.349-1.984,5.284-2.495
+	c1.937-0.521,3.86-0.775,5.766-0.775c3.563,0,6.764,0.733,9.613,2.201c2.851,1.457,5.105,3.345,6.775,5.631L751.896,292.173z
+	 M0,194.145h28.652c53.454,0,97.049-43.594,97.049-97.068c0-53.481-43.595-97.065-97.049-97.065H0V194.145z M276.172,0.011h-28.641
+	c-53.476,0-97.061,43.584-97.061,97.065c0,53.475,43.584,97.068,97.061,97.068h28.641V0.011z M405.074,0h-70.108v194.145h70.108
+	c53.517,0,97.069-43.552,97.069-97.068C502.144,43.552,458.591,0,405.074,0 M405.063,164.711h-19.952h-20.729V29.434h20.729h19.952
+	c37.268,0,67.641,30.375,67.641,67.643C472.704,134.336,442.331,164.711,405.063,164.711 M584.346,59.797
+	c-37.106,0-67.27,30.168-67.27,67.265c0,37.102,30.163,67.269,67.27,67.269c37.095,0,67.259-30.167,67.259-67.269
+	C651.604,89.965,621.44,59.797,584.346,59.797 M584.346,167.376c-22.506,0-40.554-18.305-40.554-40.56
+	c0-22.51,18.294-40.553,40.554-40.553c22.248,0,40.553,18.294,40.553,40.553C624.898,149.322,606.594,167.376,584.346,167.376
+	 M670.643,194.374h29.428V0.031h-29.428V194.374z M792.759,59.809c-14.295,0-27.546,4.488-38.459,12.124V0.031h-29.491l0.01,194.343
+	H754.3v-12.161c10.913,7.63,24.164,12.129,38.459,12.129c37.095,0,67.278-30.179,67.278-67.271
+	C860.037,89.977,829.854,59.809,792.759,59.809 M792.759,167.376c-17.985,0-33.119-11.704-38.459-27.78
+	c-1.339-4.021-2.095-8.312-2.095-12.768c0-4.483,0.756-8.785,2.095-12.806c5.383-16.171,20.634-27.759,38.459-27.759
+	c22.259,0,40.562,18.305,40.562,40.564C833.32,149.333,815.018,167.376,792.759,167.376 M967.85,59.84l-38.329,86.201L891.169,59.84
+	h-32.151l54.41,122.304l-1.084,2.376l-0.385,0.846l-11.782,26.61l-0.075,0.207c-3.53,7.907-12.836,11.486-20.729,7.961l-4.223-1.872
+	l-8.222,18.469l-3.657,8.188h0.01l0.044,0.021l10.188,4.541c19.133,8.541,41.7-0.143,50.262-19.318
+	c0.076-0.164,69.684-155.714,76.225-170.333H967.85z
+	   </StreamGeometry>
+	   
    </ResourceDictionary>
   </Styles.Resources>
 </Styles>

Source/LibationAvalonia/AvaloniaUtils.cs

@@ -23,11 +23,6 @@ namespace LibationAvalonia
 			? dialogWindow.ShowDialog<DialogResult>(window)
 			: Task.FromResult(DialogResult.None);
 
-		public static Task<DialogResult> ShowDialogAsync(this Dialogs.Login.WebLoginDialog dialogWindow, Window? owner = null)
-			=> ((owner ?? App.MainWindow) is Window window)
-			? dialogWindow.ShowDialog<DialogResult>(window)
-			: Task.FromResult(DialogResult.None);
-
 		public static Window? GetParentWindow(this Control control) => control.GetVisualRoot() as Window;
 
 

Source/LibationAvalonia/Controls/CheckedListBox.axaml.cs

@@ -21,9 +21,7 @@ namespace LibationAvalonia.Controls
 
 	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); }
+		public bool IsChecked { get => field; set => this.RaiseAndSetIfChanged(ref field, value); }
+		public object Item { get => field; set => this.RaiseAndSetIfChanged(ref field, value); }
 	}
 }

Source/LibationAvalonia/Controls/DataGridTextColumnExt.cs

@@ -0,0 +1,25 @@
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Interactivity;
+
+namespace LibationAvalonia.Controls;
+internal class DataGridTextColumnExt : DataGridTextColumn
+{
+	public static readonly StyledProperty<int> MaxLengthProperty =
+	AvaloniaProperty.Register<DataGridTextColumnExt, int>(nameof(MaxLength));
+
+	public int MaxLength
+	{
+		get => GetValue(MaxLengthProperty);
+		set => SetValue(MaxLengthProperty, value);
+	}
+
+	protected override object PrepareCellForEdit(Control editingElement, RoutedEventArgs editingEventArgs)
+	{
+		if (editingElement is TextBox textBox)
+		{
+			textBox.MaxLength = MaxLength;
+		}
+		return base.PrepareCellForEdit(editingElement, editingEventArgs);
+	}
+}

Source/LibationAvalonia/Controls/DirectoryOrCustomSelectControl.axaml

@@ -6,29 +6,63 @@
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
              x:Class="LibationAvalonia.Controls.DirectoryOrCustomSelectControl">
 	
-	<Grid ColumnDefinitions="Auto,*" RowDefinitions="Auto,Auto" Name="grid">
-		<controls:DirectorySelectControl
-			Grid.Column="1"
-			Grid.Row="0"
-			IsEnabled="{Binding KnownChecked}"
-			SelectedDirectory="{Binding SelectedDirectory, Mode=TwoWay}"
-			SubDirectory="{Binding $parent[1].SubDirectory}"
-			KnownDirectories="{Binding $parent[1].KnownDirectories}" />
+    <Grid
+        RowDefinitions="Auto,Auto,Auto"
+        ColumnDefinitions="Auto,*,Auto">
 
-		<RadioButton
-			Grid.Column="0"
-			Grid.Row="0"
-			IsChecked="{Binding KnownChecked, Mode=TwoWay}"/>
+        <RadioButton
+            Grid.RowSpan="2"
+            Name="rbKnown" />
 
-		<RadioButton
-			Grid.Column="0"
-			Grid.Row="1"
-			IsChecked="{Binding CustomChecked, Mode=TwoWay}"/>
+        <TextBlock
+            Grid.Column="1"
+            Grid.ColumnSpan="2"
+            VerticalAlignment="Center"
+            Margin="10,0"
+            IsEnabled="False"
+            IsVisible="{Binding #cmbKnownDirs.SelectedItem, Converter={x:Static ObjectConverters.IsNull}}"
+            Text="Select Known Directory:" />
 
-		<Grid Grid.Column="1" Grid.Row="1" ColumnDefinitions="*,Auto"
-			  IsEnabled="{Binding CustomChecked}">
-			<TextBox Grid.Column="0" IsReadOnly="True" Text="{Binding CustomDir, Mode=TwoWay}" />
-			<Button Grid.Column="1" Content="..." Margin="5,0,0,0" Padding="10,0,10,0" Click="CustomDirBrowseBtn_Click" VerticalAlignment="Stretch" />
-		</Grid>
-	</Grid>
+		<controls:WheelComboBox
+            Grid.Column="1"
+            Grid.ColumnSpan="2"
+            HorizontalAlignment="Stretch"
+            Margin="0,0,0,3"
+            IsEnabled="{Binding #rbKnown.IsChecked}"
+            Name="cmbKnownDirs" />
+
+        <TextBox
+            Grid.Row="1"
+            Grid.Column="1"
+            Grid.ColumnSpan="2"
+            IsReadOnly="True"
+            Margin="0,0,0,8"
+            Name="tboxKnownDirPath"
+            IsEnabled="{Binding #rbKnown.IsChecked}"
+            Text="{Binding #cmbKnownDirs.SelectedItem.Directory}" />
+
+        
+        <RadioButton
+            Grid.Row="2"
+            Name="rbCustom" />
+
+        <TextBox
+        Grid.Row="2"
+            Grid.Column="1"
+            HorizontalAlignment="Stretch"
+            Name="tboxCustomDirPath"
+            Margin="0,0,10,0"
+            VerticalAlignment="Center"
+            Text="{Binding $parent[1].Directory, Mode=OneWayToSource}"
+            IsEnabled="{Binding #rbCustom.IsChecked}"/>
+
+        <Button
+             Grid.Row="2"
+             Grid.Column="2"
+             Name="btnBrowse"
+             IsEnabled="{Binding #rbCustom.IsChecked}">
+                <TextBlock Text="..." />
+        </Button>
+
+    </Grid>
 </UserControl>

Source/LibationAvalonia/Controls/DirectoryOrCustomSelectControl.axaml.cs

@@ -1,142 +1,182 @@
 using Avalonia;
+using Avalonia.Collections;
 using Avalonia.Controls;
 using Avalonia.Platform.Storage;
 using Dinah.Core;
 using LibationFileManager;
 using ReactiveUI;
 using System.Collections.Generic;
+using System.IO;
 using System.Linq;
 
+#nullable enable
 namespace LibationAvalonia.Controls
 {
 	public partial class DirectoryOrCustomSelectControl : UserControl
 	{
-		public static readonly StyledProperty<List<Configuration.KnownDirectories>> KnownDirectoriesProperty =
-		AvaloniaProperty.Register<DirectorySelectControl, List<Configuration.KnownDirectories>>(nameof(KnownDirectories), DirectorySelectControl.DefaultKnownDirectories);
+		public static readonly StyledProperty<IList<Configuration.KnownDirectories>?> KnownDirectoriesProperty =
+		AvaloniaProperty.Register<DirectoryOrCustomSelectControl, IList<Configuration.KnownDirectories>?>(nameof(KnownDirectories), DefaultKnownDirectories);
 
-		public static readonly StyledProperty<string> SubDirectoryProperty =
-		AvaloniaProperty.Register<DirectorySelectControl, string>(nameof(SubDirectory));
+		public static readonly StyledProperty<string?> SubDirectoryProperty =
+		AvaloniaProperty.Register<DirectoryOrCustomSelectControl, string?>(nameof(SubDirectory));
 
-		public static readonly StyledProperty<string> DirectoryProperty =
-		AvaloniaProperty.Register<DirectorySelectControl, string>(nameof(Directory));
+		public static readonly StyledProperty<string?> DirectoryProperty =
+		AvaloniaProperty.Register<DirectoryOrCustomSelectControl, string?>(nameof(Directory));
 
-		public List<Configuration.KnownDirectories> KnownDirectories
+		public IList<Configuration.KnownDirectories>? KnownDirectories
 		{
 			get => GetValue(KnownDirectoriesProperty);
 			set => SetValue(KnownDirectoriesProperty, value);
 		}
 
-		public string Directory
+		public string? Directory
 		{
 			get => GetValue(DirectoryProperty);
 			set => SetValue(DirectoryProperty, value);
 		}
 
-		public string SubDirectory
+		public string? SubDirectory
 		{
 			get => GetValue(SubDirectoryProperty);
 			set => SetValue(SubDirectoryProperty, value);
 		}
 
-		private readonly DirectoryState directoryState = new();
+		public static IList<Configuration.KnownDirectories> DefaultKnownDirectories => [
+			Configuration.KnownDirectories.WinTemp,
+			Configuration.KnownDirectories.UserProfile,
+			Configuration.KnownDirectories.ApplicationData,
+			Configuration.KnownDirectories.AppDir,
+			Configuration.KnownDirectories.MyMusic,
+			Configuration.KnownDirectories.MyDocs,
+			Configuration.KnownDirectories.LibationFiles];
 
+		private readonly AvaloniaList<KnownDirectoryItem> _knownDirNames;
 		public DirectoryOrCustomSelectControl()
 		{
 			InitializeComponent();
-
-			grid.DataContext = directoryState;
-
-			directoryState.PropertyChanged += DirectoryState_PropertyChanged;
-			PropertyChanged += DirectoryOrCustomSelectControl_PropertyChanged;
+			_knownDirNames = new(GetKnownDirectories(DefaultKnownDirectories));
+			cmbKnownDirs.ItemsSource = _knownDirNames;
+			cmbKnownDirs.SelectionChanged += CmbKnownDirs_SelectionChanged;
+			btnBrowse.Click += Browse_Click;
 		}
 
-		private void DirectoryState_PropertyChanged(object sender, System.ComponentModel.PropertyChangedEventArgs e)
+		private void CmbKnownDirs_SelectionChanged(object? sender, SelectionChangedEventArgs e)
 		{
-			if (e.PropertyName is nameof(DirectoryState.SelectedDirectory) or nameof(DirectoryState.KnownChecked) &&
-				directoryState.KnownChecked &&
-				directoryState.SelectedDirectory is Configuration.KnownDirectories kdir &&
-				kdir is not Configuration.KnownDirectories.None)
+			if (cmbKnownDirs.SelectedItem is KnownDirectoryItem item && item.Directory is not null)
 			{
-				Directory = kdir is Configuration.KnownDirectories.AppDir ? Configuration.AppDir_Absolute : Configuration.GetKnownDirectoryPath(kdir);
-			}
-			else if (e.PropertyName is nameof(DirectoryState.CustomDir) or nameof(DirectoryState.CustomChecked) &&
-				directoryState.CustomChecked &&
-				directoryState.CustomDir is not null)
-			{
-				Directory = directoryState.CustomDir;
+				Directory = item.Directory;
 			}
 		}
 
-		private class DirectoryState : ViewModels.ViewModelBase
-		{
-			private string _customDir;
-			private string _subDirectory;
-			private bool _knownChecked;
-			private bool _customChecked;
-			private Configuration.KnownDirectories? _selectedDirectory;
-			public string CustomDir { get => _customDir; set => this.RaiseAndSetIfChanged(ref _customDir, value); }
-			public string SubDirectory { get => _subDirectory; set => this.RaiseAndSetIfChanged(ref _subDirectory, value); }
-			public bool KnownChecked { get => _knownChecked; set => this.RaiseAndSetIfChanged(ref _knownChecked, value); }
-			public bool CustomChecked { get => _customChecked; set => this.RaiseAndSetIfChanged(ref _customChecked, value); }
+		private IEnumerable<KnownDirectoryItem> GetKnownDirectories(IEnumerable<Configuration.KnownDirectories> knownDirs)
+			=> knownDirs.Select(k => new KnownDirectoryItem(k, SubDirectory)).Where(k => k.Directory is not null);
 
-			public Configuration.KnownDirectories? SelectedDirectory { get => _selectedDirectory; set => this.RaiseAndSetIfChanged(ref _selectedDirectory, value); }
+		protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
+		{
+			if (change.Property == SubDirectoryProperty)
+			{
+				foreach (var item in _knownDirNames)
+				{
+					item.SubDirectory = SubDirectory;
+				}
+				VerifyAndApplyDirectory(Directory);
+			}
+			else if (change.Property == KnownDirectoriesProperty)
+			{
+				var knownDirs = KnownDirectories?.Count > 0 ? KnownDirectories : DefaultKnownDirectories;
+				if (!_knownDirNames.Select(k => k.KnownDirectory).SequenceEqual(knownDirs))
+				{
+					_knownDirNames.Clear();
+					_knownDirNames.AddRange(GetKnownDirectories(knownDirs));
+				}
+				VerifyAndApplyDirectory(Directory);
+			}
+			else if (change.Property == DirectoryProperty)
+			{
+				VerifyAndApplyDirectory(Directory);
+			}
+
+			base.OnPropertyChanged(change);
 		}
 
-		private async void CustomDirBrowseBtn_Click(object sender, Avalonia.Interactivity.RoutedEventArgs e)
+		private void VerifyAndApplyDirectory(string? directory)
 		{
-			var options = new Avalonia.Platform.Storage.FolderPickerOpenOptions
+			if (string.IsNullOrWhiteSpace(Directory))
+				return;
+
+			bool dirIsKnown = false;
+			foreach (var item in _knownDirNames)
+			{
+				if (item.IsSamePathAs(directory))
+				{
+					rbKnown.IsChecked = true;
+					Directory = item.Directory;
+					cmbKnownDirs.SelectedItem = item;
+					dirIsKnown = true;
+					break;
+				}
+			}
+			if (!dirIsKnown)
+			{
+				tboxCustomDirPath.Text = directory;
+				rbCustom.IsChecked = true;
+			}
+		}
+
+		public async void Browse_Click(object? sender, Avalonia.Interactivity.RoutedEventArgs e)
+		{
+			if (VisualRoot is not Window window)
+				return;
+
+			var options = new FolderPickerOpenOptions
 			{
 				AllowMultiple = false
 			};
 
-			var selectedFolders = await (VisualRoot as Window).StorageProvider.OpenFolderPickerAsync(options);
-
-			directoryState.CustomDir = selectedFolders.SingleOrDefault()?.TryGetLocalPath() ?? directoryState.CustomDir;
+			var selectedFolders = await window.StorageProvider.OpenFolderPickerAsync(options);
+			Directory = selectedFolders.SingleOrDefault()?.TryGetLocalPath() ?? Directory;
 		}
 
-		private void DirectoryOrCustomSelectControl_PropertyChanged(object sender, AvaloniaPropertyChangedEventArgs e)
+		private class KnownDirectoryItem : ReactiveObject
 		{
-			if (e.Property == DirectoryProperty)
+			public Configuration.KnownDirectories KnownDirectory { get; set; }
+			public string? Directory { get => field; set => this.RaiseAndSetIfChanged(ref field, value); }
+			public string? Name { get; }
+			public string? SubDirectory
 			{
-				var directory = Directory?.Trim() ?? "";
-
-				var noSubDir = RemoveSubDirectoryFromPath(directory);
-				var known = Configuration.GetKnownDirectory(noSubDir);
-
-				if (known == Configuration.KnownDirectories.None && noSubDir == Configuration.AppDir_Absolute)
-					known = Configuration.KnownDirectories.AppDir;
-
-				if (known is Configuration.KnownDirectories.None)
+				get => field;
+				set
 				{
-					directoryState.CustomDir = directory;
-					directoryState.CustomChecked = true;
-				}
-				else
-				{
-					directoryState.SelectedDirectory = known;
-					directoryState.KnownChecked = true;
+					field = value;
+					if (Configuration.GetKnownDirectoryPath(KnownDirectory) is string dir)
+					{
+						Directory = Path.Combine(dir, field ?? "");
+					}
 				}
 			}
-			else if (e.Property == KnownDirectoriesProperty &&
-					KnownDirectories.Count > 0 &&
-					directoryState.SelectedDirectory is null or Configuration.KnownDirectories.None)
-				directoryState.SelectedDirectory = KnownDirectories[0];
-		}
 
-		private string RemoveSubDirectoryFromPath(string path)
-		{
-			if (string.IsNullOrWhiteSpace(SubDirectory))
-				return path;
+			public KnownDirectoryItem(Configuration.KnownDirectories known, string? subDir)
+			{
+				Name = known.GetDescription();
+				KnownDirectory = known;
+				SubDirectory = subDir;
+			}
 
-			path = path?.Trim() ?? "";
-			if (string.IsNullOrWhiteSpace(path))
-				return path;
+			public bool IsSamePathAs(string? otherPath)
+			{
+				if (string.IsNullOrWhiteSpace(otherPath) || string.IsNullOrWhiteSpace(Directory))
+					return false;
 
-			var bottomDir = System.IO.Path.GetFileName(path);
-			if (SubDirectory.EqualsInsensitive(bottomDir))
-				return System.IO.Path.GetDirectoryName(path);
+				try
+				{
+					var p1 = Path.GetFullPath(Directory);
+					var p2 = Path.GetFullPath(otherPath);
+					return p1.Equals(p2, System.StringComparison.OrdinalIgnoreCase);
+				}
+				catch { return false; }
+			}
 
-			return path;
+			public override string? ToString() => Name?.ToString();
 		}
 	}
 }

Source/LibationAvalonia/Controls/NativeWebView.cs

@@ -1,176 +0,0 @@
-using Avalonia.Controls;
-using Avalonia.Input;
-using Avalonia.Platform;
-using Avalonia;
-using LibationFileManager;
-using System;
-using System.Threading.Tasks;
-
-namespace LibationAvalonia.Controls;
-
-#nullable enable
-public class NativeWebView : NativeControlHost, IWebView
-{
-	private IWebViewAdapter? _webViewAdapter;
-	private Uri? _delayedSource;
-	private TaskCompletionSource _webViewReadyCompletion = new();
-
-	public event EventHandler<WebViewNavigationEventArgs>? NavigationCompleted;
-
-	public event EventHandler<WebViewNavigationEventArgs>? NavigationStarted;
-	public event EventHandler? DOMContentLoaded;
-
-	public bool CanGoBack => _webViewAdapter?.CanGoBack ?? false;
-
-	public bool CanGoForward => _webViewAdapter?.CanGoForward ?? false;
-
-	public Uri? Source
-	{
-		get => _webViewAdapter?.Source ?? throw new InvalidOperationException("Control was not initialized");
-		set
-		{
-			if (_webViewAdapter is null)
-			{
-				_delayedSource = value;
-				return;
-			}
-			_webViewAdapter.Source = value;
-		}
-	}
-
-
-	public bool GoBack()
-	{
-		return _webViewAdapter?.GoBack() ?? throw new InvalidOperationException("Control was not initialized");
-	}
-
-	public bool GoForward()
-	{
-		return _webViewAdapter?.GoForward() ?? throw new InvalidOperationException("Control was not initialized");
-	}
-
-	public Task<string?> InvokeScriptAsync(string scriptName)
-	{
-		return _webViewAdapter is null
-			? throw new InvalidOperationException("Control was not initialized")
-			: _webViewAdapter.InvokeScriptAsync(scriptName);
-	}
-
-	public void Navigate(Uri url)
-	{
-		(_webViewAdapter ?? throw new InvalidOperationException("Control was not initialized"))
-			.Navigate(url);
-	}
-
-	public Task NavigateToString(string text)
-	{
-		return (_webViewAdapter ?? throw new InvalidOperationException("Control was not initialized"))
-			.NavigateToString(text);
-	}
-
-	public void Refresh()
-	{
-		(_webViewAdapter ?? throw new InvalidOperationException("Control was not initialized"))
-			.Refresh();
-	}
-
-	public void Stop()
-	{
-		(_webViewAdapter ?? throw new InvalidOperationException("Control was not initialized"))
-			.Stop();
-	}
-
-	public Task WaitForNativeHost()
-	{
-		return _webViewReadyCompletion.Task;
-	}
-
-	private class PlatformHandle : IPlatformHandle
-	{
-		public nint Handle { get; init; }
-
-		public string? HandleDescriptor { get; init; }
-	}
-
-	protected override IPlatformHandle CreateNativeControlCore(IPlatformHandle parent)
-	{
-		_webViewAdapter = InteropFactory.Create().CreateWebViewAdapter();
-
-		if (_webViewAdapter is null)
-			return base.CreateNativeControlCore(parent);
-		else
-		{
-			SubscribeOnEvents();
-			var handle = new PlatformHandle
-			{
-				Handle = _webViewAdapter.PlatformHandle.Handle,
-				HandleDescriptor = _webViewAdapter.PlatformHandle.HandleDescriptor
-			};
-
-			if (_delayedSource is not null)
-			{
-				_webViewAdapter.Source = _delayedSource;
-			}
-
-			_webViewReadyCompletion.TrySetResult();
-
-			return handle;
-		}
-	}
-
-	private void SubscribeOnEvents()
-	{
-		if (_webViewAdapter is not null)
-		{
-			_webViewAdapter.NavigationStarted += WebViewAdapterOnNavigationStarted;
-			_webViewAdapter.NavigationCompleted += WebViewAdapterOnNavigationCompleted;
-			_webViewAdapter.DOMContentLoaded += _webViewAdapter_DOMContentLoaded;
-		}
-	}
-
-	private void _webViewAdapter_DOMContentLoaded(object? sender, EventArgs e)
-	{
-		DOMContentLoaded?.Invoke(this, e);
-	}
-
-	private void WebViewAdapterOnNavigationStarted(object? sender, WebViewNavigationEventArgs e)
-	{
-		NavigationStarted?.Invoke(this, e);
-	}
-
-	private void WebViewAdapterOnNavigationCompleted(object? sender, WebViewNavigationEventArgs e)
-	{
-		NavigationCompleted?.Invoke(this, e);
-	}
-
-	protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
-	{
-		base.OnPropertyChanged(change);
-		if (change.Property == BoundsProperty && change.NewValue is Rect rect)
-		{
-			var scaling = (float)(VisualRoot?.RenderScaling ?? 1.0f);
-			_webViewAdapter?.HandleResize((int)(rect.Width * scaling), (int)(rect.Height * scaling), scaling);
-		}
-	}
-
-	protected override void OnKeyDown(KeyEventArgs e)
-	{
-		if (_webViewAdapter != null)
-		{
-			e.Handled = _webViewAdapter.HandleKeyDown((uint)e.Key, (uint)e.KeyModifiers);
-		}
-
-		base.OnKeyDown(e);
-	}
-
-	protected override void DestroyNativeControlCore(IPlatformHandle control)
-	{
-		if (_webViewAdapter is not null)
-		{
-			_webViewReadyCompletion = new TaskCompletionSource();
-			_webViewAdapter.NavigationStarted -= WebViewAdapterOnNavigationStarted;
-			_webViewAdapter.NavigationCompleted -= WebViewAdapterOnNavigationCompleted;
-			(_webViewAdapter as IDisposable)?.Dispose();
-		}
-	}
-}

Source/LibationAvalonia/Controls/Settings/Audio.axaml

@@ -92,7 +92,6 @@
 						Margin="5,0,0,0"
 						Grid.Column="1"
 						VerticalAlignment="Center"
-						SelectionChanged="SpatialCodec_SelectionChanged"
 						ItemsSource="{CompiledBinding SpatialAudioCodecs}"
 						SelectedItem="{CompiledBinding SpatialAudioCodec}"/>
 				</Grid>
@@ -412,7 +411,7 @@
 				<Button
 					Grid.Column="1"
 					Content="Edit"
-					Padding="30,0"
+					Classes="SaveButton"
 					Margin="10,0,0,0"
 					VerticalAlignment="Stretch"
 					Click="EditChapterTitleTemplateButton_Click" />

Source/LibationAvalonia/Controls/Settings/Audio.axaml.cs

@@ -19,17 +19,7 @@ namespace LibationAvalonia.Controls.Settings
 			InitializeComponent();
 			if (Design.IsDesignMode)
 			{
-				_ = Configuration.Instance.LibationFiles;
-				DataContext = new AudioSettingsVM(Configuration.Instance);
-			}
-		}
-
-		private void SpatialCodec_SelectionChanged(object sender, SelectionChangedEventArgs e)
-		{
-			if (_viewModel.SpatialAudioCodec.Value is Configuration.SpatialCodec.AC_4 && _viewModel.DecryptToLossy)
-			{
-				_viewModel.SpatialAudioCodec = _viewModel.SpatialAudioCodecs[0];
-				_viewModel.RaisePropertyChanged(nameof(AudioSettingsVM.SpatialAudioCodec));
+				DataContext = new AudioSettingsVM(Configuration.CreateMockInstance());
 			}
 		}
 
@@ -39,7 +29,7 @@ namespace LibationAvalonia.Controls.Settings
 			{
 				using var accounts = AudibleApiStorage.GetAccountsSettingsPersister();
 
-				if (!accounts.AccountsSettings.Accounts.Any(a => a.IdentityTokens.DeviceType == AudibleApi.Resources.DeviceType))
+				if (!accounts.AccountsSettings.Accounts.All(a => a.IdentityTokens.DeviceType == AudibleApi.Resources.DeviceType))
 				{
 					if (VisualRoot is Window parent)
 					{

Source/LibationAvalonia/Controls/Settings/DownloadDecrypt.axaml.cs

@@ -16,8 +16,7 @@ namespace LibationAvalonia.Controls.Settings
 			InitializeComponent();
 			if (Design.IsDesignMode)
 			{
-				_ = Configuration.Instance.LibationFiles;
-				DataContext = new DownloadDecryptSettingsVM(Configuration.Instance);
+				DataContext = new DownloadDecryptSettingsVM(Configuration.CreateMockInstance());
 			}
 		}
 

Source/LibationAvalonia/Controls/Settings/Import.axaml

@@ -30,6 +30,10 @@
 			<TextBlock Text="{CompiledBinding ImportEpisodesText}" />
 		</CheckBox>
 
+		<CheckBox IsChecked="{CompiledBinding ImportPlusTitles, Mode=TwoWay}">
+			<TextBlock Text="{CompiledBinding ImportPlusTitlesText}" />
+		</CheckBox>
+
 		<CheckBox IsChecked="{CompiledBinding DownloadEpisodes, Mode=TwoWay}">
 			<TextBlock Text="{CompiledBinding DownloadEpisodesText}" />
 		</CheckBox>

Source/LibationAvalonia/Controls/Settings/Import.axaml.cs

@@ -12,8 +12,7 @@ namespace LibationAvalonia.Controls.Settings
 
 			if (Design.IsDesignMode)
 			{
-				_ = Configuration.Instance.LibationFiles;
-				DataContext = new ImportSettingsVM(Configuration.Instance);
+				DataContext = new ImportSettingsVM(Configuration.CreateMockInstance());
 			}
 		}
 	}

Source/LibationAvalonia/Controls/Settings/Important.axaml

@@ -8,7 +8,7 @@
 			 x:DataType="vm:ImportantSettingsVM"
              x:Class="LibationAvalonia.Controls.Settings.Important">
 
-	<Grid RowDefinitions="Auto,Auto,Auto,*">
+	<Grid RowDefinitions="Auto,Auto,Auto,Auto,*">
 		<controls:GroupBox
 			Grid.Row="0"
 			Margin="5"
@@ -69,9 +69,16 @@
 			</StackPanel>
 
 		</controls:GroupBox>
+		<CheckBox
+			Grid.Row="1"
+			Margin="10,5"
+			IsChecked="{CompiledBinding UseWebView, Mode=TwoWay}">
+			<TextBlock Text="{CompiledBinding UseWebViewText}" />
+
+			</CheckBox>
 
 		<StackPanel
-			Grid.Row="1" Margin="5"
+			Grid.Row="2" Margin="5"
 			Orientation="Horizontal">
 
 			<TextBlock
@@ -96,7 +103,7 @@
 		</StackPanel>
 
 		<controls:GroupBox
-			Grid.Row="2"
+			Grid.Row="3"
 			Margin="5"
 			Label="Display Settings">
 			<Grid
@@ -151,7 +158,7 @@
 		</controls:GroupBox>
 
 		<Grid
-			Grid.Row="3"
+			Grid.Row="4"
 			ColumnDefinitions="Auto,Auto,*"
 			Margin="10"
 			VerticalAlignment="Bottom">

Source/LibationAvalonia/Controls/Settings/Important.axaml.cs

@@ -18,8 +18,7 @@ namespace LibationAvalonia.Controls.Settings
 			InitializeComponent();
 			if (Design.IsDesignMode)
 			{
-				_ = Configuration.Instance.LibationFiles;
-				DataContext = new ImportantSettingsVM(Configuration.Instance);
+				DataContext = new ImportantSettingsVM(Configuration.CreateMockInstance());
 			}
 
 			ThemeComboBox.SelectionChanged += ThemeComboBox_SelectionChanged;
@@ -53,7 +52,8 @@ namespace LibationAvalonia.Controls.Settings
 			var parent = ThemeComboBox.Parent as Panel;
 			if (parent?.Children.Remove(ThemeComboBox) ?? false)
 			{
-				Configuration.Instance.SetString(ViewModel?.ThemeVariant, nameof(ViewModel.ThemeVariant));
+
+				Configuration.Instance.ThemeVariant = ViewModel?.ThemeVariant.Value ?? Configuration.Theme.System;
 				parent.Children.Add(ThemeComboBox);
 			}
 			ThemeComboBox.SelectionChanged += ThemeComboBox_SelectionChanged;