.cdmurls.json

@@ -1,5 +0,0 @@
-{
-  "CdmUrls": [
-    "https://ollj0gz40d.execute-api.us-west-2.amazonaws.com/default/AudibleCdm"
-  ]
-}

.github/ISSUE_TEMPLATE/bug_report.md

@@ -6,14 +6,10 @@ labels: bug
 assignees: ''
 ---
 
-PLEASE FILL OUT THE FOLLOWING. Bug reports with limited information or lacking an attached log file may get limited or delayed help.
-
-___
-
-## Describe the bug  
+**Describe the bug**
 A clear and concise description of what the bug is.
 
-## To Reproduce  
+**To Reproduce**
 Steps to reproduce the behavior:
 
 1. Go to '...'
@@ -21,23 +17,15 @@ Steps to reproduce the behavior:
 3. Scroll down to '....'
 4. See error
 
-## Expected behavior  
+**Expected behavior**
 A clear and concise description of what you expected to happen.
 
-## Screenshots  
+**Screenshots**
 If applicable, add screenshots to help explain your problem.
 
-## Platform  
+**Platform**
+
 [e.g. Windows 10, Windows 11, Mac, Linux (State distribution)]
 
-## Log Files
-Attach your Libation log file here. If your user folder contains the file "LibationCrash.log", attach that also.
-
-**Default Log File Locations**
-|Platform|Folder|
-|-|-|
-|Windows|`%userprofile%\Libation`|
-|macOS|`~/Library/Application Support/Libation`|
-|Linux|`~/.local/share/Libation`|
-
-Alternative, you may open the log file folder from within Libation. Open Libation's settings, and on the first tab in Settings you can click the button 'Open log folder'. 
+**Log Files**
+Attach your Libation log file here.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -6,26 +6,14 @@ labels: enhancement
 assignees: ''
 ---
 
-**No-go ideas**  
-There are lots of great ideas and many are beyond what we intend to do for Libation. Some good ideas which we do not intend to pursue:
-
-* comprehensive api/cli
-* aax/audiobook import
-* bulk rename of existing files
-* general metadata/tag editor
-* playback features
-* web gui
-* supporting non-audible vendors
-* official docker support
-
-**Is your feature request related to a problem? Please describe.**  
+**Is your feature request related to a problem? Please describe.**
 A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
 
-**Describe the solution you'd like**  
+**Describe the solution you'd like**
 A clear and concise description of what you want to happen.
 
-**Describe alternatives you've considered**  
+**Describe alternatives you've considered**
 A clear and concise description of any alternative solutions or features you've considered.
 
-**Additional context**  
+**Additional context**
 Add any other context or screenshots about the feature request here.

.github/workflows/build-linux.yml

@@ -8,42 +8,30 @@ on:
     inputs:
       version_override:
         type: string
-        description: "Version number override"
+        description: 'Version number override'
         required: false
       run_unit_tests:
         type: boolean
-        description: "Skip running unit tests"
+        description: 'Skip running unit tests'
         required: false
         default: true
-      runs_on:
-        type: string
-        description: "The GitHub hosted runner to use"
-        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"
+  DOTNET_CONFIGURATION: 'Release'
+  DOTNET_VERSION: '7.0.x'
+  RELEASE_NAME: 'chardonnay'
 
 jobs:
   build:
-    name: "${{ inputs.OS }}-${{ inputs.architecture }}"
-    runs-on: ${{ inputs.runs_on }}
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ubuntu-latest, macos-latest]
+        arch: [x64, arm64]
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v3
       - name: Setup .NET
-        uses: actions/setup-dotnet@v5
+        uses: actions/setup-dotnet@v3
         with:
           dotnet-version: ${{ env.DOTNET_VERSION }}
         env:
@@ -60,7 +48,6 @@ jobs:
             version="$(grep -Eio -m 1 '<Version>.*</Version>' ./Source/AppScaffolding/AppScaffolding.csproj | sed -r 's/<\/?Version>//g')"
           fi
           echo "version=${version}" >> "${GITHUB_OUTPUT}"
-
       - name: Unit test
         if: ${{ inputs.run_unit_tests }}
         working-directory: ./Source
@@ -70,63 +57,51 @@ 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 }}"
-
+          os=${{ matrix.os }}
+          target_os="$(echo ${os/-latest/} | sed 's/ubuntu/linux/')"
+          display_os="$(echo ${target_os/macos/macOS} | sed 's/linux/Linux/')"
           echo "display_os=${display_os}" >> $GITHUB_OUTPUT
-          echo "Runtime Identifier: $RUNTIME_ID"
-          echo "Output Directory: $OUTPUT"
-
+          RUNTIME_IDENTIFIER="$(echo ${target_os/macos/osx})-${{ matrix.arch }}"
+          echo "$RUNTIME_IDENTIFIER"
           dotnet publish \
               LibationAvalonia/LibationAvalonia.csproj \
-              --runtime $RUNTIME_ID \
+              --runtime "$RUNTIME_IDENTIFIER" \
               --configuration ${{ env.DOTNET_CONFIGURATION }} \
-              --output $OUTPUT \
+              --output bin/Publish/${display_os}-${{ matrix.arch }}-${{ env.RELEASE_NAME }} \
               -p:PublishProfile=LibationAvalonia/Properties/PublishProfiles/${display_os}Profile.pubxml
           dotnet publish \
               LoadByOS/${display_os}ConfigApp/${display_os}ConfigApp.csproj \
-              --runtime $RUNTIME_ID \
+              --runtime "$RUNTIME_IDENTIFIER" \
               --configuration ${{ env.DOTNET_CONFIGURATION }} \
-              --output $OUTPUT \
+              --output bin/Publish/${display_os}-${{ matrix.arch }}-${{ env.RELEASE_NAME }} \
               -p:PublishProfile=LoadByOS/Properties/${display_os}ConfigApp/PublishProfiles/${display_os}Profile.pubxml
           dotnet publish \
               LibationCli/LibationCli.csproj \
-              --runtime $RUNTIME_ID \
+              --runtime "$RUNTIME_IDENTIFIER" \
               --configuration ${{ env.DOTNET_CONFIGURATION }} \
-              --output $OUTPUT \
+              --output bin/Publish/${display_os}-${{ matrix.arch }}-${{ env.RELEASE_NAME }} \
               -p:PublishProfile=LibationCli/Properties/PublishProfiles/${display_os}Profile.pubxml
           dotnet publish \
               HangoverAvalonia/HangoverAvalonia.csproj \
-              --runtime $RUNTIME_ID \
+              --runtime "$RUNTIME_IDENTIFIER" \
               --configuration ${{ env.DOTNET_CONFIGURATION }} \
-              --output $OUTPUT \
+              --output bin/Publish/${display_os}-${{ matrix.arch }}-${{ env.RELEASE_NAME }} \
               -p:PublishProfile=HangoverAvalonia/Properties/PublishProfiles/${display_os}Profile.pubxml
-
       - name: Build bundle
         id: bundle
-        working-directory: ./Source/bin/Publish/${{ steps.publish.outputs.display_os }}-${{ inputs.architecture }}-${{ env.RELEASE_NAME }}
+        working-directory: ./Source/bin/Publish/${{ steps.publish.outputs.display_os }}-${{ matrix.arch }}-${{ env.RELEASE_NAME }}
         run: |
           BUNDLE_DIR=$(pwd)
           echo "Bundle dir: ${BUNDLE_DIR}"
           cd ..
-          SCRIPT=../../../Scripts/Bundle_${{ inputs.OS }}.sh
+          SCRIPT=../../../Scripts/Bundle_${{ steps.publish.outputs.display_os }}.sh
           chmod +rx ${SCRIPT}
-          ${SCRIPT} "${BUNDLE_DIR}" "${{ steps.get_version.outputs.version }}" "${{ inputs.architecture }}"
+          ${SCRIPT} "${BUNDLE_DIR}" "${{ steps.get_version.outputs.version }}" "${{ matrix.arch }}"
           artifact=$(ls ./bundle)
           echo "artifact=${artifact}" >> "${GITHUB_OUTPUT}"
-
       - name: Publish bundle
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v3
         with:
           name: ${{ steps.bundle.outputs.artifact }}
           path: ./Source/bin/Publish/bundle/${{ steps.bundle.outputs.artifact }}
-          if-no-files-found: error
-          retention-days: 7
+          if-no-files-found: error

.github/workflows/build-windows.yml

@@ -8,29 +8,21 @@ on:
     inputs:
       version_override:
         type: string
-        description: "Version number override"
+        description: 'Version number override'
         required: false
       run_unit_tests:
         type: boolean
-        description: "Skip running unit tests"
+        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_CONFIGURATION: 'Release'
+  DOTNET_VERSION: '7.0.x'
 
 jobs:
   build:
-    name: "${{ matrix.os }}-${{ matrix.release_name }}-${{ inputs.architecture }}"
     runs-on: windows-latest
-    env:
-      OUTPUT_NAME: "${{ matrix.os }}-${{ matrix.release_name }}-${{ inputs.architecture }}"
-      RUNTIME_ID: "win-${{ inputs.architecture }}"
     strategy:
       matrix:
         os: [Windows]
@@ -42,9 +34,9 @@ jobs:
             release_name: classic
             prefix: Classic-
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v3
       - name: Setup .NET
-        uses: actions/setup-dotnet@v5
+        uses: actions/setup-dotnet@v3
         with:
           dotnet-version: ${{ env.DOTNET_VERSION }}
         env:
@@ -70,49 +62,52 @@ jobs:
         run: |
           dotnet publish `
               Libation${{ matrix.ui }}/Libation${{ matrix.ui }}.csproj `
-              --runtime ${{ env.RUNTIME_ID }} `
               --configuration ${{ env.DOTNET_CONFIGURATION }} `
-              --output bin/Publish/${{ env.OUTPUT_NAME }} `
+              --output bin/Publish/${{ matrix.os }}-${{ matrix.release_name }} `
               -p:PublishProfile=Libation${{ matrix.ui }}/Properties/PublishProfiles/${{ matrix.os }}Profile.pubxml
           dotnet publish `
               LoadByOS/${{ matrix.os }}ConfigApp/${{ matrix.os }}ConfigApp.csproj `
-              --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
+              --output bin/Publish/${{ matrix.os }}-${{ matrix.release_name }} `
+              -p:PublishProfile=LoadByOS/Properties/${{ matrix.os }}ConfigApp/PublishProfiles/${{ matrix.os }}Profile.pubxml
           dotnet publish `
               LibationCli/LibationCli.csproj `
-              --runtime ${{ env.RUNTIME_ID }} `
               --configuration ${{ env.DOTNET_CONFIGURATION }} `
-              --output bin/Publish/${{ env.OUTPUT_NAME }} `
-              -p:DefineConstants="${{ matrix.release_name }}" `
+              --output bin/Publish/${{ matrix.os }}-${{ matrix.release_name }} `
               -p:PublishProfile=LibationCli/Properties/PublishProfiles/${{ matrix.os }}Profile.pubxml
           dotnet publish `
               Hangover${{ matrix.ui }}/Hangover${{ matrix.ui }}.csproj `
-              --runtime ${{ env.RUNTIME_ID }} `
               --configuration ${{ env.DOTNET_CONFIGURATION }} `
-              --output bin/Publish/${{ env.OUTPUT_NAME }} `
+              --output bin/Publish/${{ matrix.os }}-${{ matrix.release_name }} `
               -p:PublishProfile=Hangover${{ matrix.ui }}/Properties/PublishProfiles/${{ matrix.os }}Profile.pubxml
 
       - name: Zip artifact
         id: zip
         working-directory: ./Source/bin/Publish
         run: |
-          $bin_dir = "${{ env.OUTPUT_NAME }}\"
+          $bin_dir = "${{ matrix.os }}-${{ matrix.release_name }}\"
           $delfiles = @(
+            "libmp3lame.x64.so",
+            "libmp3lame.arm64.so",
+            "libmp3lame.x64.dylib",
+            "libmp3lame.arm64.dylib",
+            "ffmpegaac.x64.so",
+            "ffmpegaac.arm64.so",
+            "ffmpegaac.x64.dylib",
+            "ffmpegaac.arm64.dylib",
             "WindowsConfigApp.exe",
             "WindowsConfigApp.runtimeconfig.json",
             "WindowsConfigApp.deps.json"
             )
           foreach ($file in $delfiles){ if (test-path $bin_dir$file){ Remove-Item $bin_dir$file } }
-          $artifact="${{ matrix.prefix }}Libation.${{ steps.get_version.outputs.version }}-" + "${{ matrix.os }}".ToLower() + "-${{ matrix.release_name }}-${{ inputs.architecture }}"
+          $artifact="${{ matrix.prefix }}Libation.${{ steps.get_version.outputs.version }}-" + "${{ matrix.os }}".ToLower() + "-${{ matrix.release_name }}"
           "artifact=$artifact" >> $env:GITHUB_OUTPUT
           Compress-Archive -Path "${bin_dir}*" -DestinationPath "$artifact.zip"
 
       - name: Publish artifact
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v3
         with:
           name: ${{ steps.zip.outputs.artifact }}.zip
           path: ./Source/bin/Publish/${{ steps.zip.outputs.artifact }}.zip
           if-no-files-found: error
-          retention-days: 7
+          

.github/workflows/build.yml

@@ -8,46 +8,23 @@ on:
     inputs:
       version_override:
         type: string
-        description: "Version number override"
+        description: 'Version number override'
         required: false
       run_unit_tests:
         type: boolean
-        description: "Skip running unit tests"
+        description: 'Skip running unit tests'
         required: false
-        default: true
+        default: true        
 
 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 }}
-      architecture: ${{ matrix.architecture }}
 
   linux:
-    strategy:
-      matrix:
-        OS: [Redhat, Debian]
-        architecture: [x64, arm64]
     uses: ./.github/workflows/build-linux.yml
     with:
       version_override: ${{ inputs.version_override }}
-      runs_on: ubuntu-latest
-      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 }}
+      run_unit_tests: ${{ inputs.run_unit_tests }}     

.github/workflows/docker.yml

@@ -8,11 +8,7 @@ on:
     inputs:
       version:
         type: string
-        description: "Version number"
-        required: true
-      release:
-        type: boolean
-        description: "Is this a release build?"
+        description: 'Version number'
         required: true
     secrets:
       docker_username:
@@ -20,44 +16,31 @@ on:
       docker_token:
         required: true
 
-jobs:
-  build_and_push:
-    runs-on: ubuntu-latest
+env:
+  DOCKER_IMAGE: ${{ secrets.docker_username }}/libation
 
+jobs:
+  docker:
+    runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v3
 
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
+        uses: docker/setup-qemu-action@v2
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
+        uses: docker/setup-buildx-action@v2
 
       - name: Login to Docker Hub
-        if: ${{ inputs.release }}
-        uses: docker/login-action@v3
+        uses: docker/login-action@v2
         with:
           username: ${{ secrets.docker_username }}
           password: ${{ secrets.docker_token }}
 
-      - name: Generate docker image tags
-        id: metadata
-        uses: docker/metadata-action@v5
+      - name: Build and push
+        uses: docker/build-push-action@v4
         with:
-          flavor: |
-            latest=true
-          images: |
-            name=${{ secrets.docker_username }}/libation
-          tags: |
-            type=raw,value=${{ inputs.version }},enable=${{ inputs.release }}
-
-      - name: Build and push image
-        uses: docker/build-push-action@v6
-        with:
-          platforms: linux/amd64,linux/arm64
-          push: ${{ steps.metadata.outputs.tags != ''}}
-          cache-from: type=gha
-          cache-to: type=gha,mode=max
-          tags: ${{ steps.metadata.outputs.tags }}
-          labels: ${{ steps.metadata.outputs.labels }}
+          push: true
+          build-args: 'FOLDER_NAME=Linux-chardonnay'
+          tags: ${{ env.DOCKER_IMAGE }}:latest,${{ env.DOCKER_IMAGE }}:${{ inputs.version }}

.github/workflows/release.yml

@@ -5,7 +5,7 @@ name: release
 on:
   push:
     tags:
-      - "v*"
+      - 'v*'
 jobs:
   prerelease:
     runs-on: ubuntu-latest
@@ -15,7 +15,7 @@ jobs:
       - name: Get tag version
         id: get_version
         run: |
-          export TAG="${{ github.ref_name }}"
+          export TAG='${{ github.ref_name }}'
           echo "version=${TAG#v}" >> "${GITHUB_OUTPUT}"
 
   docker:
@@ -23,7 +23,6 @@ jobs:
     uses: ./.github/workflows/docker.yml
     with:
       version: ${{ needs.prerelease.outputs.version }}
-      release: true
     secrets:
       docker_username: ${{ secrets.DOCKERHUB_USERNAME }}
       docker_token: ${{ secrets.DOCKERHUB_TOKEN }}
@@ -34,25 +33,29 @@ jobs:
     with:
       version_override: ${{ needs.prerelease.outputs.version }}
       run_unit_tests: false
-
+      
   release:
-    needs: [prerelease, build]
+    needs: [prerelease,build]
     runs-on: ubuntu-latest
     steps:
       - name: Download artifacts
-        uses: actions/download-artifact@v5
+        uses: actions/download-artifact@v3
         with:
           path: artifacts
-          pattern: "*(Classic-)Libation.*"
 
       - name: Release
         id: release
-        uses: softprops/action-gh-release@v2
+        uses: softprops/action-gh-release@v1
         with:
-          name: Libation ${{ needs.prerelease.outputs.version }}
+          name: Libation v${{ needs.prerelease.outputs.version }}
           body: <Put a body here>
-          token: ${{ secrets.GITHUB_TOKEN }}
           draft: true
           prerelease: false
-          files: |
-            artifacts/*/*
+
+      - name: Upload release assets
+        uses: dwenegar/upload-release-assets@v1
+        env:
+          GITHUB_TOKEN: '${{ secrets.GITHUB_TOKEN }}'
+        with:
+          release_id: '${{ steps.release.outputs.id }}'
+          assets_path: ./artifacts

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

@@ -1,22 +0,0 @@
-name: Validate MetaInfo
-"on":
-  pull_request:
-    branches: ["master"]
-    paths:
-      - .github/workflows/validate-appstream-metainfo.yml
-      - Source/LoadByOS/LinuxConfigApp/com.getlibation.Libation.metainfo.xml
-  push:
-    branches: ["master"]
-    paths:
-      - .github/workflows/validate-appstream-metainfo.yml
-      - Source/LoadByOS/LinuxConfigApp/com.getlibation.Libation.metainfo.xml
-
-jobs:
-  validate-appstream-metainfo:
-    runs-on: ubuntu-latest
-    container:
-      image: ghcr.io/flathub/flatpak-builder-lint:latest
-    steps:
-      - uses: actions/checkout@v5
-      - name: Check the MetaInfo file
-        run: flatpak-builder-lint appstream Source/LoadByOS/LinuxConfigApp/com.getlibation.Libation.metainfo.xml

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

@@ -1,21 +0,0 @@
-name: Check desktop file
-"on":
-  pull_request:
-    branches: ["master"]
-    paths:
-      - .github/workflows/validate-desktop-file.yml
-      - Source/LoadByOS/LinuxConfigApp/Libation.desktop
-  push:
-    branches: ["master"]
-    paths:
-      - .github/workflows/validate-desktop-file.yml
-      - Source/LoadByOS/LinuxConfigApp/Libation.desktop
-
-jobs:
-  validate-desktop-file:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v5
-      - 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

@@ -1,5 +1,5 @@
 # validate.yml
-# Validates that Libation will build on a pull request or push to master.
+# Validates that Libation will build on a pull request or push to master. 
 ---
 name: validate
 
@@ -12,11 +12,3 @@ on:
 jobs:
   build:
     uses: ./.github/workflows/build.yml
-  docker:
-    uses: ./.github/workflows/docker.yml
-    with:
-      version: ${GITHUB_SHA}
-      release: false
-    secrets:
-      docker_username: ${{ secrets.DOCKERHUB_USERNAME }}
-      docker_token: ${{ secrets.DOCKERHUB_TOKEN }}

.releaseindex.json

@@ -1,10 +1,8 @@
 {
-  "WindowsClassic":          "Classic-Libation\\.\\d+\\.\\d+\\.\\d+(?:\\.\\d+)?-win(?:dows)?-classic-x64\\.zip",
-  "WindowsAvalonia":         "Libation\\.\\d+\\.\\d+\\.\\d+(?:\\.\\d+)?-win(?:dows)?-chardonnay-x64\\.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",
-  "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"
+  "WindowsClassic":      "Classic-Libation\\.\\d+\\.\\d+\\.\\d+-win(dows)?-classic\\.zip",
+  "WindowsAvalonia":     "Libation\\.\\d+\\.\\d+\\.\\d+-win(dows)?-chardonnay\\.zip",
+  "LinuxAvalonia":       "Libation\\.\\d+\\.\\d+\\.\\d+-linux-chardonnay-amd64\\.deb",
+  "MacOSAvalonia":       "Libation\\.\\d+\\.\\d+\\.\\d+-macOS-chardonnay-x64\\.tgz",
+  "LinuxAvalonia_Arm64": "Libation\\.\\d+\\.\\d+\\.\\d+-linux-chardonnay-arm64\\.deb",
+  "MacOSAvalonia_Arm64": "Libation\\.\\d+\\.\\d+\\.\\d+-macOS-chardonnay-arm64\\.tgz"
 }

.vscode/launch.json

@@ -6,7 +6,7 @@
     "configurations": [
 
         {
-            "name": ".NET Core Launch (console) Windows",
+            "name": ".NET Core Launch (console)",
             "type": "coreclr",
             "request": "launch",
             "preLaunchTask": "build",
@@ -15,17 +15,6 @@
             "cwd": "${workspaceFolder}",
             "stopAtEntry": false,
             "console": "internalConsole"
-        },
-        {
-            "name": ".NET Core Launch (console) Linux",
-            "type": "coreclr",
-            "request": "launch",
-            "preLaunchTask": "build_linux",
-            "program": "${workspaceFolder}/Source/bin/Avalonia/Debug/Libation.dll",
-            "args": [],
-            "cwd": "${workspaceFolder}",
-            "stopAtEntry": false,
-            "console": "internalConsole"
         }
 
     ]

.vscode/tasks.json

@@ -37,23 +37,6 @@
                 //"reveal": "silent"
             },
             "problemMatcher": "$msCompile"
-        },
-        {
-           "label": "build_linux",
-            "type": "shell",
-            "command": "dotnet",
-            "args": [
-                "build",
-                "${workspaceFolder}/Source/LibationAvalonia/LibationAvalonia.csproj",
-                "-p:TargetFramework=net9.0",
-                "-p:TargetFrameworks=net9.0",
-                "-p:RuntimeIdentifier=linux-x64"
-            ],
-            "group": "build",
-            "presentation": {
-                //"reveal": "silent"
-            },
-            "problemMatcher": "$msCompile"
         }
     ]
 }

Docker/appsettings.json

@@ -1,3 +0,0 @@
-{
-  "LibationFiles": "/config-internal"
-}

Docker/liberate.sh

@@ -1,174 +1,68 @@
 #!/bin/bash
 
-error() {
-  log "ERROR" "$1"
-}
-
-warn() {
-  log "WARNING" "$1"
-}
-
-info() {
-  log "info" "$1"
-}
-
-debug() {
-  if [ "${LOG_LEVEL}" = "debug" ]; then
-    log "debug" "$1"
-  fi
-}
-
-log() {
-  LEVEL=$1
-  MESSAGE=$2
-  printf "$(date '+%F %T') %s: %s\n" "${LEVEL}" "${MESSAGE}"
-}
-
-init_config_file() {
-  FILE=$1
-  FULLPATH=${LIBATION_CONFIG_DIR}/${FILE}
-  if [ -f ${FULLPATH} ]; then
-    info "loading ${FILE}"
-    cp ${FULLPATH} ${LIBATION_CONFIG_INTERNAL}/
-    return 0
-  else
-    warn "${FULLPATH} not found, creating empty file"
-    echo "{}" > ${LIBATION_CONFIG_INTERNAL}/${FILE}
-    return 1
-  fi
-}
-
-update_settings() {
-  FILE=$1
-  KEY=$2
-  VALUE=$3
-  info "setting ${KEY} to ${VALUE}"
-  echo $(jq --arg k "${KEY}" --arg v "${VALUE}" '.[$k] = $v' ${LIBATION_CONFIG_INTERNAL}/${FILE}) > ${LIBATION_CONFIG_INTERNAL}/${FILE}.tmp
-  mv ${LIBATION_CONFIG_INTERNAL}/${FILE}.tmp ${LIBATION_CONFIG_INTERNAL}/${FILE}
-}
-
-is_mounted() {
-  DIR=$1
-  if grep -qs "${DIR} " /proc/mounts;
-  then
-    return 0
-  else
-    return 1
-  fi
-}
-
-create_db() {
-  DBFILE=$1
-  if [ -f "${DBFILE}" ]; then
-    warn "prexisting database found when creating"
-    return 0
-  else
-    if ! touch "${DBFILE}"; then
-      error "unable to create database, check permissions on host"
-      exit 1
+# Rewire echo to print date time
+echo() {
+    if [[ -n $1  ]]; then
+        printf "$(date '+%F %T'): %s\n" "$1"
     fi
-    return 1
-  fi
 }
 
-setup_db() {
-  DBPATH=$1
-  dbpattern="*.db"
+# ################################
+# Setup
+# ################################
+echo "Starting"
+if [[ -z "${SLEEP_TIME}" ]]; then
+  echo "No sleep time passed in. Will run once and exit."
+else
+  echo "Sleep time is set to ${SLEEP_TIME}"
+fi
 
-  debug "using database directory ${DBPATH}"
+echo ""
 
-  # Figure out the right databse file
-  if [[ -z "${LIBATION_DB_FILE}" ]];
-  then
-    dbCount=$(find "${DBPATH}" -maxdepth 1 -type f -name "${dbpattern}" | wc -l)
-    if [ "${dbCount}" -gt 1 ];
-    then
-      error "too many database files found, set LIBATION_DB_FILE to the filename you wish to use"
-      exit 1
-    elif [ "${dbCount}" -eq 1 ];
-    then
-      files=( ${DBPATH}/${dbpattern} )
-      FILE=${files[0]}
-    else
-      FILE="${DBPATH}/LibationContext.db"
-    fi
-  else
-    FILE="${DBPATH}/${LIBATION_DB_FILE}"
-  fi
+# Check if the config directory is passed in, and there is no link to it then create the link.
+if [ -d "/config" ] && [ ! -d "/root/Libation" ]; then
+    echo "Linking config directory to the Libation config directory"
+    ln -s /config/ /root/Libation
+fi
 
-  debug "planning to use database ${FILE}"
-
-  if [ -f "${FILE}" ]; then
-    info "database found at ${FILE}"
-  elif [ ${LIBATION_CREATE_DB} = "true" ];
-  then
-    warn "database not found, creating one at ${FILE}"
-    create_db ${FILE}
-  else
-    error "database not found and creation is disabled"
+# If no config error and exit
+if [ ! -d "/config" ]; then
+    echo "ERROR: No /config directory. You must pass in a volume containing your config mapped to /config"
     exit 1
-  fi
-  ln -s "${FILE}" "${LIBATION_CONFIG_INTERNAL}/LibationContext.db"
-}
+fi
 
-run() {
-  info "scanning accounts"
-  /libation/LibationCli scan
-  info "liberating books"
-  /libation/LibationCli liberate
-}
+# If user passes in db from a /db/ folder and a db does not already exist / is not already linked
+FILE=/db/LibationContext.db
+if [ -f "${FILE}" ] && [ ! -f "/config/LibationContext.db" ]; then
+    echo "Linking passed in Libation database from /db/ to the Libation config directory"
+    ln -s $FILE /config/LibationContext.db
+fi
 
-main() {
-  info "initializing libation"
-  init_config_file AccountsSettings.json
-  init_config_file Settings.json
-  
-  info "loading settings"
-  update_settings Settings.json Books "${LIBATION_BOOKS_DIR:-/data}"
-  update_settings Settings.json InProgress /tmp
+# Confirm we have a db in the config direcotry.
+if [ ! -f "/config/LibationContext.db" ]; then
+    echo "ERROR: No Libation database detected, exiting."
+    exit 1
+fi
 
-  info "loading database"
-  # If user provides a separate database mount, use that
-  if is_mounted "${LIBATION_DB_DIR}";
-  then
-    DB_LOCATION=${LIBATION_DB_DIR}
-  # Otherwise, use the config directory
-  else
-    DB_LOCATION=${LIBATION_CONFIG_DIR}
-  fi
-  setup_db ${DB_LOCATION}
-
-  # Try to warn if books dir wasn't mounted in
-  if ! is_mounted "${LIBATION_BOOKS_DIR}";
-  then
-    warn "${LIBATION_BOOKS_DIR} does not appear to be mounted, books will not be saved"
-  fi
-
-  # Let the user know what the run type will be
-  if [[ -z "${SLEEP_TIME}" ]]; then
-    SLEEP_TIME=-1
-  fi
-
-  if [ "${SLEEP_TIME}" == -1 ]; then
-    info "running once"
-  else
-    info "running every ${SLEEP_TIME}"
-  fi
-
-  # loop
-  while true
-  do
-    run
+# ################################
+# Loop and liberate
+# ################################
+while true
+do
+    echo ""
+    echo "Scanning accounts"
+    /libation/LibationCli scan
+    echo "Liberating books"
+    /libation/LibationCli liberate
+    echo ""
     
     # Liberate only once if SLEEP_TIME was set to -1
-    if [ "${SLEEP_TIME}" == -1 ]; then
+    if [ "${SLEEP_TIME}" = -1 ]; then
       break  
     fi
 
+    echo "Sleeping for ${SLEEP_TIME}"
     sleep "${SLEEP_TIME}"
-  done
+done
 
-  info "exiting"
-}
-
-main
+echo "Exiting"

Dockerfile

@@ -1,39 +1,22 @@
 # Dockerfile
-FROM --platform=${BUILDPLATFORM} mcr.microsoft.com/dotnet/sdk:9.0 AS build
-ARG TARGETARCH
+FROM mcr.microsoft.com/dotnet/sdk:7.0 as build-env
 
 COPY Source /Source
-RUN dotnet publish \
-    /Source/LibationCli/LibationCli.csproj \
-    --arch ${TARGETARCH} \
-    --configuration Release \
-    --output /Source/bin/Publish/Linux-chardonnay \
-    -p:PublishProfile=/Source/LibationCli/Properties/PublishProfiles/LinuxProfile.pubxml
-
-FROM mcr.microsoft.com/dotnet/runtime:9.0
-ARG USER_UID=1001
-ARG USER_GID=1001
-
-# Set the character set that will be used for folder and filenames when liberating
-ENV LANG=C.UTF-8
-ENV LC_ALL=C.UTF-8
-
-ENV SLEEP_TIME=-1
-ENV LIBATION_CONFIG_INTERNAL=/config-internal
-ENV LIBATION_CONFIG_DIR=/config
-ENV LIBATION_DB_DIR=/db
-ENV LIBATION_DB_FILE=
-ENV LIBATION_CREATE_DB=true
-ENV LIBATION_BOOKS_DIR=/data
+RUN dotnet publish -c Release -o /Source/bin/Publish/Linux-chardonnay /Source/LibationCli/LibationCli.csproj -p:PublishProfile=/Source/LibationCli/Properties/PublishProfiles/LinuxProfile.pubxml
+COPY Docker/liberate.sh /Source/bin/Publish/Linux-chardonnay
 
 
-RUN apt-get update && apt-get -y upgrade && \
-    apt-get install -y jq && \
-    mkdir -m777 ${LIBATION_CONFIG_INTERNAL} ${LIBATION_BOOKS_DIR}
+FROM mcr.microsoft.com/dotnet/runtime:7.0
 
-COPY --from=build /Source/bin/Publish/Linux-chardonnay /libation
-COPY Docker/* /libation
+ENV SLEEP_TIME "30m"
 
-USER ${USER_UID}:${USER_GID}
+# Sets the character set that will be used for folder and filenames when liberating
+ENV LANG C.UTF-8
+ENV LC_ALL C.UTF-8
 
-CMD ["/libation/liberate.sh"]
+RUN mkdir /db /config /data
+
+COPY --from=build-env /Source/bin/Publish/Linux-chardonnay /libation
+
+
+CMD ["./libation/liberate.sh"]

Documentation/Advanced.md

@@ -11,8 +11,6 @@
 - [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)
 
 
 
@@ -30,15 +28,6 @@ To make upgrades and reinstalls easier, Libation separates all of its responsibi
 
 * Allow Libation to fix up audiobook metadata. After decrypting a title, Libation attempts to fix details like chapters and cover art. Some power users and/or control freaks prefer to manage this themselves. By unchecking this setting, Libation will only decrypt the book and will leave metadata as-is, warts and all.
 
-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.
@@ -88,25 +77,3 @@ CLI: Full library. No prompt
   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/AudioFileFormats.md

@@ -1,104 +0,0 @@
-# Audio Formats Produced by Libation
-
-Libation will download audio in a number of different audio formats, depending on the settings you choose within Libation and the per-title availability of audio formats from Audible. The Libation settings which affect the format downloaded by Libation are shown in the Settings menu screenshot below.
-
-Notes:
-- Audiobook file extensions are either `.m4b` or `.mp3`. Libation uses the `.m4b` file extension for all non-MP3 files, regardless of the audio codec contained therein. Some media players don't recognize the `.m4b` file extension and may require the extension be changed to `.m4a` or `.mp4`.
-- Most (but not all) podcasts are delivered by Audible as native MP3 files. None of the following audio formats and settings discussions pertain to those podcasts because MP3s have no DRM, and those episodes are copied directly to their output folders.
-
-![Audio format settings menu](images/AudioFormatSettings.png)
-
-## Settings Summary
-### Audio quality to request from Audible
-Audiobooks can be requested from Audible as "Normal" quality or "High" quality, matching the settings in the Audible mobile apps. This setting affects the audio bitrate and, sometimes, the number of audio channels. This setting has no effect on the _audio codec_.
-
-### Use Widevine DRM
-When this setting is disabled, all audiobooks will be downloaded using Audible's in-house DRM (AAX(C)) in the [AAC-LC](#aac-lc) format.
-When this setting is enabled, Libation will request audio files protected by Google's Widevine Digital Rights Managements scheme, and two additional settings will be unlocked: [Request xHE-AAC Codec](#request-xhe-aac-codec) and [Request Spatial Audio](#request-spatial-audio) (explained further below).
-
-If you don't enable either of those additional options, then enabling 'Use Widevine DRM' will have no pratcical effect in nearly all circumstances. Audiobooks will be downloaded in the same [AAC-LC](#aac-lc) format with the same bitrate and the same number of audio channels. On rare occasions, enabling 'Use Widevine DRM' without the other two options will result in audio files with a different bitrate.
-
-### Request xHE-AAC Codec
-Enable this setting to request audiobooks in the [xHE-AAC](#xhe-aac) format. This codec is generally better quality than the [AAC-LC](#aac-lc) codec at the same bitrate, but it isn't as commonly supported by media players, so you may have some difficulty playing these audiobooks. The highest bitrate version of some audiobooks is only available as [xHE-AAC](#xhe-aac).
-
-### Request Spatial Audio
-Enable this setting to request audiobooks in a "spatial" ([Dolby Atmos](#dolby-atmos)) audio format. If an audiobook is not available in a spatial format, it will instead be downloaded in the [xHE-AAC codec](#xhe-aac).
-
-### Spatial audio codec
-Choose whether spatial audiobooks are downloaded in the [E-AC-3](#e-ac-3) or [AC-4](#ac-4) format.
-
-### Download my books in the original audio format (Lossless)
-If selected, Audiobooks will be downloaded and saved in the format delivered by audible (which depends on the settings explained above). Libation will not change the audio.
-
-### Download my books as .MP3 files (transcode if necessary).
-If selected, Libation will decode [AAC-LC](#aac-lc), [xHE-AAC](#xhe-aac), and [E-AC-3](#e-ac-3) audiobooks and re-encode them as MP3s using the MP3 encoder settings ([read about LAME MP3 encoder settings](https://lame.sourceforge.io/lame_ui_example.php)). Note that Libation cannot convert [AC-4](#ac-4) audio to MP3.
-
-# Audio Formats
-
-## Traditional Mono and Stereo Formats
-
-### AAC-LC
-#### _Full Name_
-Advanced Audio Coding - Low Complexity
-#### _Description_
-This is the base profile for AAC audio and has existed since AAC's initial release in 1997. It enjoys wide support on nearly every conceivable platform capable of playing digital audio, as ubiquitous as MP3.
-If Widevine support is not enabled, or if the book is not available in the more high-definition formats, Libation will download audiobooks in this format.
-
-### MP3
-#### _Full Name_
-MPEG-1 Audio Layer III or MPEG-2 Audio Layer III
-#### _Description_
-An older (released in 1991) but still nearly universally supported audio codec. Its audio quality is generally worse than AAC-LC at similar bitrates. Audible delivers some podcasts in MP3 format, but no audiobooks are natively availble as MP3. Libation supports converting Audiobooks delivered in other audio formats to MP3. Note that the MP3 format supports a maximum of two audio channels, so multichannel E-AC-3 audio will be downsampled to stereo or mono (depending on the Libation's settings). [AC-4](#ac-4) cannot be converted to MP3.
-
-### xHE-AAC
-#### _Full Name_
-Extended High-Efficiency Advanced Audio Coding
-#### _Description_
-This is a proprietary codec created by the [Fraunhofer Institute for Integrated Circuits IIS](https://www.iis.fraunhofer.de/en/ff/amm/broadcast-streaming/xheaac.html). It combines features of the HE-AAC v2 and the baseline USAC (Unified Speech and Audio Coding) profiles with the parts of the MPEG-D DRC Loudness Control Profile or Dynamic Range Control Profile. Therefore, USAC and xHE-AAC are not synonymous and should not be used interchangeably. A player capable of decoding USAC will not necessarily be able to decode xHE-AAC.
-
-xHE-AAC boasts significantly higher quality audio at low bitrates. Though it has existed since at least 2016, playback support is still quite limited. FFmpeg has recently added partial decoder support for the USAC profiles, but it is insufficient to decode the xHE-AAC audio files acquired from Audible (due to FFmpeg's lack of support for MPEG Surround for Mono to Stereo Upmixing; ISO 23003-3:2012 §7.11)
-
-Note that the xHE-AAC files authored by Audible have some USAC conformance errors including:
-- Number of samples per frame not matching the UsacConfig coreCoderFrameLength value.
-- Disagreement between stts and UsacFrame usacIndependencyFlag value.
-- Stts indicating a frame is an immediate play-out frame, but USAC AudioPreRoll is absent.
-
-## Dolby Atmos
-Atmos is a surround sound technology that expands on existing surround sound systems by adding height channels as well as free-moving sound objects. Audible delivers Dolby Atmos in two formats: E-AC-3 and AC-4.
-
-Your device's ability to play audio from these formats does not necessarily mean that the audio you are hearing is Atmos (spatial). For instance, downloading the AC-4 codec for Windows ([links in the [Supported media Players](#supported-media-players) section) will enable you to play AC-4 audiobooks, but you'll still need to download [Dolby Access](https://apps.microsoft.com/detail/9n0866fs04w8?hl=en-US&gl=US) and pay $15 to enable _Dolby Atmos For Headphones_. Please refer to [this comment](https://github.com/rmcrackan/Libation/pull/1331#discussion_r2268660524) for additional context.
-
-### E-AC-3
-#### _Full Name_
-Dolby Digital Plus (a.k.a Enhanced AC-3, DDP, DD+, and EC-3)
-#### _Description_
-A proprietary digital audio compression scheme developed by Dolby Digital for the transport and storage of multichannel audio. This format can be extended to add support for Atmos, making the codec _Dolby Digital Plus Atmos_. _Dolby Digital Plus Atmos_ is backwards compatible with Dolby Digital Plus, so any media player capable of playing Dolby Digital Plus can play _Dolby Digital Plus Atmos_. Audible spatial audiobooks downloaded in the E-AC-3 format are _Dolby Digital Plus Atmos_. If they are played by a media player that supports Atmos, they will play as Atmos audio. If they are played by a media player that does not support Atmos, they will be played as traditional 5.1 surround audio.
-
-### AC-4
-#### _Full Name_
-Dolby AC-4
-#### _Description_
-A proprietary audio compression technology developed by Dolby Digital for the transport and storage of audio channels and/or audio objects. Audible spatial audiobooks downloaded in the AC-4 format are 2-channel AC-4 Immersive Stereo (AC4-IMS) audio, intended for playback in headphones or earbuds (though apparently [not supported on Apple devices](https://github.com/rmcrackan/Libation/issues/996#issuecomment-3169574514)).
-
-# Supported Media Players
-Below is an incomplete matrix of codec support across various media players and platforms.
-| Player | [AAC-LC](#aac-lc) | [xHE-AAC](#xhe-aac) | [E-AC-3](#e-ac-3) | [AC-4](#ac-4) |
-| :--- | :---: | :---: | :---: | :---: |
-|Windows Native Support|Yes|Yes<sup>1</sup>|Yes<sup>2,3</sup>|Yes<sup>4</sup>|
-|macOS Native Support|Yes|Yes|Yes<sup>3</sup>| |
-|Android Native Support<sup>5</sup>|Yes|Yes| | |
-|FFmpeg (all platforms)|Yes|Yes<sup>6</sup>|Yes<sup>3</sup>||
-|[VLC](https://www.videolan.org/vlc/) (Windows)|Yes| |Yes<sup>3</sup> | |
-|[foobar2000](https://www.foobar2000.org/components) (Windows and Mac)|Yes|Yes<sup>7</sup> | | |
-|[PotPlayer](https://potplayer.daum.net/) (Windows)|Yes|Yes|Yes<sup>3</sup>| |
-|[Samsung Media Player](https://play.google.com/store/apps/details?id=com.sec.android.app.music)<sup>8</sup> (Samsung devices) |Yes|Yes|Yes|Yes|
-
-1. Windows 11 22H2 and later
-2. On Windows [prior to Windows 11, version 24H2](https://support.microsoft.com/en-us/windows/codecs-in-media-player-d5c2cdcd-83a2-4805-abb0-c6888138e456). You can still get the codec by running the following command from a Windows PowerShell console: `winget install --id 9nvjqjbdkn97`
-3. As mentioned in the [Dolby Atmos](#dolby-atmos) section, just because a media player can play a file does not mean it's rendering Atmos. _Dolby Digital Plus Atmos_ is backwards compatible with _Dolby Digital Plus_, so media players which only support _Dolby Digital Plus_ will play E-AC-3 audio files as regular 5.1 surround without rendering the Atmos spatial qualities. Additional software or hardware support may be required for Dolby Atmos playback.
-4. You can download the AC-4 codec for Windows from 3rd party sites like [Major Geeks](https://www.majorgeeks.com/files/details/dolby_ac_3ac_4_installer.html) and [Free-Codecs](https://www.free-codecs.com/dolby-ac-4-decoder_download.htm). Once you install the codec bundle from one of those sources, the Windows store app will keep it updated. Read more about the process [in this comment](https://github.com/rmcrackan/Libation/pull/1331#discussion_r2268660524).
-5. All Android devices will support AAC-LC and xHE-AAC. Some manufactures (such as Samsung) will include Dolby codecs for playing E-AC-3 and AC-4 audio.
-6. requires FFmpeg to be [built with fdk-aac](https://trac.ffmpeg.org/wiki/Encode/AAC#fdk_aac). You will almost certainly not find pre-build binaries in the wild due to licensing restrictions.
-7. Requires the [fdk-aac plugin](https://www.foobar2000.org/components/view/foo_pd_aac) (Windows only)
-8. Requires audio file extensions to be `.m4a` or `.mp4`. Libation sets the file extensions to `.m4b`, so you must manually change it to `.m4a` by renaming the audio file.
-

Documentation/Docker.md

@@ -3,30 +3,26 @@
 ### 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**.
 
-> [!WARNING]
-> ## Breaking Changes
-> * The docker image now runs as user 1001 and group 1001. Make sure that the permissions on your volumes allow user 1001 to read and write to them or see the User section below for other options, or if you're not sure.
-> * `SLEEP_TIME` is now set to `-1` by default. This means the image will run once and exit. If you were relying on the previous default, you'll need to explicitly set the `SLEEP_TIME` environment variable to `30m` to replicate the previous behavior.
-> * The docker image now ignores the values in `Settings.json` for `Books` and `InProgress`. You can now change the folder that books are saved to by using the `LIBATION_BOOKS_DIR` environment variable.
 
-# Disclaimer
-The docker image is provided as-is. We hope it can be useful to you but it is not officially supported.
+### Setup
+In order to use the docker image, you'll need to provide it with a copy of the `AccountsSettings.json`, `Settings.json`, and `LibationContext.db` files. These files can usually be found in the Libation folder in your user's home directory. If you haven't run Libation yet, you'll need to launch it to generate these files and setup your accounts. Once you have them, copy these files to a new location, such as `/opt/libation/config`. Before using them we'll need to make a couple edits so that the filepaths referenced are correct when running from the docker image.
 
-### Configuration
-Configuration in Libation is handled by two files, `AccountsSettings.json` and `Settings.json`. These files can usually be found in the Libation folder in your user's home directory. The easiest way to configure these is to run the desktop version of Libation and then copy them into a folder, such as `/opt/libation/config`, that you'll volume mount into the image. `Settings.json` is technically optional, and, if not provided, Libation will run using the default settings. Additionally, the `Books` and `InProgress` settings in `Settings.json` will be ignored and the image will instead substitute it's own values.
+In Settings.json, make the following changes:
+* Change `Books` to `/data`
+* Change `InProgress` to `/tmp`
 
 ### Running
-Once the configuration files are copied, the docker image can be run with the following command.
+Once the configuration files are copied and edited, the docker image can be run with the following command.
 ```
 sudo docker run -d \
   -v /opt/libation/config:/config \
   -v /opt/libation/books:/data \
   --name libation \
   --restart=always \
-  rmcrackan/libation:latest
+  rmcrackan/libation
 ```
 
-By default the container will scan for new books once and download any new ones. This is configurable by passing in a value for the `SLEEP_TIME` environment variable. For example, if you pass in `10m` it will keep running, scan for new books, and download them every 10 minutes.
+By default the container will scan for new books every 30 minutes and download any new ones. This is configurable by passing in a value for the `SLEEP_TIME` environment variable. Additionally, if you pass in `-1` it will scan and download books once and then exit.
 
 ```
 sudo docker run -d \
@@ -35,42 +31,6 @@ sudo docker run -d \
   -e SLEEP_TIME='10m' \
   --name libation \
   --restart=always \
-  rmcrackan/libation:latest
+  rmcrackan/libation
 ```
 
-### Environment Variables
-| Env Var  | Default | Description |
-| -------- | ------- | ----------- |
-| SLEEP_TIME  | -1 | Length of time to sleep before doing another scan/download. Set to -1 to run one. |
-| LIBATION_BOOKS_DIR | /data | Folder where books will be saved |
-| LIBATION_CONFIG_DIR | /config | Folder to read configuration from. |
-| LIBATION_DB_DIR    | /db | Optional folder to load database from. If not mounted, will load database from `LIBATION_CONFIG_DIR`. |
-| LIBATION_DB_FILE | | Name of database file to load. By default it will look for all `.db` files and load one if there is only one present. |
-| LIBATION_CREATE_DB | true | Whether or not the image should create a database file if none are found. |
-
-### User
-This docker image runs as user `1001`. In order for the image to function properly, user `1001` must be able to read and write the volumes that are mounted in. If they are not, you will see errors, including [sqlite error](#1060), [Microsoft.Data.Sqlite.SqliteException](#1110), [unable to open database file](#1113), [Microsoft.EntityFrameworkCore.DbUpdateException](#1049)
-
-If you're not sure what your user number is, check the output of the `id` command. Docker should normally run with the number of the user who configured and ran it.
-
-If you want to change the user the image runs as, you can specify `-u <uid>:<gid>`. For example, to run it as user `2000` and group `3000`, you could do the following:
-
-```
-sudo docker run -d \
-  -u 2000:3000 \
-  -v /opt/libation/config:/config \
-  -v /opt/libation/books:/data \
-  --name libation \
-  --restart=always \
-  rmcrackan/libation:latest
-```
-
-If the user it's running as is correct, and it still cannot write, be sure to check whether the files and/or folders might be owned by the wrong user. You can use the `chown` command to change the owner of the file to the correct user and group number, for example: `chown -R 1001:1001 /mnt/audiobooks /mnt/libation-config`
-
-### Advanced Database Options
-The docker image supports an optional database mount location defined by `LIBATION_DB_DIR`. This allows the database to be mounted as read/write, while allowing the rest of the configuration files to be mounted as read only. This is specifically useful if running in Kubernetes where you can use Configmaps and Secrets to define the configuration. If the `LIBATION_DB_DIR` is mounted, it will be used, otherwise it will look for the database in `LIBATION_CONFIG_DIR`. If it does not find the database in the expected location, it will attempt to make an empty database there.
-
-### Getting help
-As mentioned above: docker is not officially supported. I'm adding this at the bottom of the page for anyone serious enough to have read this far. If you've tried everything above and would still like help, you can open an [issue](https://github.com/rmcrackan/Libation/issues). Please include `[docker]` in the title. There are also some docker folks who have offered occasional assistance who you can tag within your issue: `@ducamagnifico` , `@wtanksleyjr` , `@CLHatch`.
-
-**Reminder** that these are just friendly users who are sometimes around. They're *not* our customer support.

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/GettingStarted.md

@@ -15,7 +15,6 @@
 - [Download PDF attachments](#download-pdf-attachments)
 - [Details of downloaded files](#details-of-downloaded-files)
 - [Export your library](#export-your-library)
-- [I still need help](#i-still-need-help)
 
 
 
@@ -34,7 +33,7 @@ Classic is Windows only. It has an older look because it's built with older, dul
 
 Extract the zip file to a folder and then run `Libation.exe` from inside of that folder. Do not put it in Program Files. The inability to edit files from there causes problems with configuration and updating.
 
-* [Linux](InstallOnLinux.md)
+* [Ubuntu Linux](InstallOnLinux.md)
 * [MacOS](InstallOnMac.md)
 
 ### Create Accounts
@@ -149,7 +148,3 @@ When you set up Libation, you'll specify a Books directory. Libation looks insid
 ![Export](images/Export.png)
 
 Export your library to Excel, CSV, or JSON
-
-### I still need help
-
-[You can open an issue here](https://github.com/rmcrackan/Libation/issues) for bug reports, feature requests, or specialized help.

Documentation/InstallOnLinux.md

@@ -4,63 +4,18 @@
 ...or just tell more friends. As long as I'm maintaining this software, it will remain **free** and **open source**.
 
 
-## Packaging status
+### Install and Run Libation on Ubuntu
 
-[![Packaging status](https://repology.org/badge/vertical-allrepos/libation.svg)](https://repology.org/project/libation/versions)
+New Libation releases are automatically packed into a debian package and are available from the Libation repository's releases page.
 
-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 this command in your terminal to dowbnload and install Libation, replacing the url with the Latest Libation .deb package url:
 
-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`).
+```Console
+wget -O libation.deb https://github.com/rmcrackan/Libation/releases/download/vX.X.X/Libation.X.X.X-linux-chardonnay.deb &&
+sudo apt install ./libation.deb
+```
 
-### 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.
+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.
 

Documentation/InstallOnMac.md

@@ -4,61 +4,22 @@
 ...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`
+  - Apple Silicon (M1, M2, ...): `Libation.9.4.2-macOS-chardonnay-`**arm64**`.tgz`
   - Intel: `Libation.x.x.x-macOS-chardonnay-`**x64**`.tgz`
 - Move the extracted Libation app bundle to your applications folder.
-- 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)
-
+- Open a terminal (Go > Utilities > Terminal)
+- Copy/paste/run the following command (you'll be prompted to enter your password)
+  
   ```Console
   sudo spctl --master-disable && sudo spctl --add --label "Libation" /Applications/Libation.app && open /Applications/Libation.app && sudo spctl --master-enable
-  ```
-
-* Close the terminal and use Libation!
-
-## "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.
-
+  ```  
+- Close the terminal and use Libation!
 
 ## Running Hangover
 
@@ -67,7 +28,7 @@ Libation comes with a recovery app called Hangover. You can start it by running
 open /Applications/Libation.app --args hangover
 ```
 
-## Running LibationCli
+## Runnign 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

Documentation/LinuxDevelopmentSetupUsingNix.md

@@ -1,64 +0,0 @@
-# Development Environment Setup using Nix or Nix Flakes on Linux x86_64
-[Nix flakes](https://nixos.wiki/wiki/Flakes) can be used to provide version controlled reproducible and cross-platform development environments. The key files are:
-- `flake.nix`: Defines the flake inputs and outputs, including development shells.
-- `shell.nix`: This file defines the dependencies and additionally adds support for the Impure `nix-shell` method. This is used by the flake to create the dev environment.
-- `flake.lock`: Locks the versions of inputs for reproducibility.
----
-## Prerequisites
-- [Nix](https://nixos.org/download.html) the package manager or NixOs installed on Linux (x86_64-linux)
-- Optional: flakes support enabled. 
----
-## Using the Development Shell
-You have two primary ways to enter the development shell with Nix:
-### 1. Using `nix develop` (flake-native command)
-This is the recommended way if you have Nix with flakes support. Flake guarantee the versions of the dependencies and can be controlled through `flake.nix` and `flake.lock`.
-```
-nix develop
-```
-This will open a shell with all dependencies and environment configured as per the `flake.nix` for (`x86_64-linux`) systems only at this time.
-
----
-### 2. Using `nix-shell` (that's why shell.nix is a separate file)
-If you want to use traditional `nix-shell` tooling which uses the nixpkgs version of your system:
-```
-nix-shell
-```
-This will drop you into the shell environment defined in `shell.nix`. Note that this is not flake-native method and does not use the locked nixpkgs in `flake.lock` so exact versions of the dependancies is not guaranteed.
-
----
-## What’s inside the dev shell?
-- The environment variables and packages configured in `shell.nix` will be available.
-- The package set (`pkgs`) used aligns with the versions locked in `flake.lock` to ensure reproducibility.
-
----
-## Example Workflow using flakes
-```
-# Navigate to the project root folder which contains the flake.nix, flake.lock and shell.nix files.
-cd /home/user/dev/Libation
-# Enter the flake development shell (Linux x86_64)
-nix develop
-# run VSCode or VSCodium from the current shell environment
-code .
-# Run or Debug using VSCode and VSCodium using the linux Launch configuration.
-```
-![Debug using VSCode and VSCodium](./images/StartingDebuggingInVSCode.png)
-
-You can also Build and run your application inside the shell.
-``` 
-dotnet build ./Source/LibationAvalonia/LibationAvalonia.csproj -p:TargetFrameworks=net9.0 -p:TargetFramework=net9.0 -p:RuntimeIdentifier=linux-x64
-```
-
----
-
-## Notes
-- Leaving the current shell environemnt will drop all added dependancies and you will not be able to run or debug the program unless your system has those dependancies defined globally.
-- To exit the shell environment voluntarily use `exit` inside the shell.
-- Ensure you have no conflicting `nix.conf` or `global.json` that might affect SDK versions or runtime identifiers.
-- Keep your `flake.lock` file committed to ensure builds are reproducible for all collaborators.
-
----
-## References
-
-- [Nix Flakes - NixOS Wiki](https://nixos.wiki/wiki/Flakes)
-- [Nix.dev - Introduction to Nix flakes](https://nix.dev/manual/nix/2.28/command-ref/new-cli/nix3-flake-init)
-- [Nix-shell Manual](https://nixos.org/manual/nix/stable/command-ref/nix-shell.html)

Documentation/NamingTemplates.md

@@ -1,10 +1,3 @@
-## [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.
 
@@ -17,11 +10,8 @@ These templates apply to both GUI and CLI.
   - [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)
+  - [Integer Formatters](#integer-formatters)
   - [Date Formatters](#date-formatters)
 
 
@@ -35,36 +25,29 @@ 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)|
+|\<title\>|Full title|Text|
+|\<title short\>|Title. Stop at first colon|Text|
+|\<author\>|Author(s)|Name List|
+|\<first author\>|First author|Text|
+|\<narrator\>|Narrator(s)|Name List|
+|\<first narrator\>|First narrator|Text|
+|\<series\>|Name of series|Text|
+|\<series#\>|Number order in series|Text|
+|\<bitrate\>|File's original bitrate (Kbps)|Integer|
+|\<samplerate\>|File's original audio sample rate|Integer|
+|\<channels\>|Number of audio channels|Integer|
+|\<account\>|Audible account of this book|Text|
+|\<locale\>|Region/country|Text|
+|\<year\>|Year published|Integer|
+|\<language\>|Book's language|Text|
 |\<language short\> **†**|Book's language abbreviated. Eg: ENG|Text|
-|\<file date\>|File creation date/time.|[DateTime](#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)|
+|\<file date\>|File creation date/time.|DateTime|
+|\<pub date\>|Audiobook publication date|DateTime|
+|\<date added\>|Date the book added to your Audible account|DateTime|
+|\<ch count\> **‡**|Number of chapters|Integer|
+|\<ch title\> **‡**|Chapter title|Text|
+|\<ch#\> **‡**|Chapter number|Integer|
+|\<ch# 0\> **‡**|Chapter number with leading zeros|Integer|
 
 **†** Does not support custom formatting
 
@@ -80,43 +63,18 @@ Anything between the opening tag (`<tagname->`) and closing tag (`<-tagname>`) w
 |\<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.
 
-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.
+You can invert the condition (instead of displaying the text when the condition is true, display the text when it is false) by playing a '!' symbol before the opening tag name.
 
 As an example, this folder template will place all Liberated podcasts into a "Podcasts" folder and all liberated books (not podcasts) into a "Books" folder.
 
-`<if podcast->Podcasts<-if podcast><!if podcast->Books<-if podcast>\<title>`
+\<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**, **Name List**, **Integer**, and **DateTime** tags can be optionally formatted using format text in square brackets after the tag name. Below is a list of supported formatters for each tag type.
 
 ## Text Formatters
 |Formatter|Description|Example Usage|Example Result|
@@ -124,38 +82,18 @@ And this example will customize the title based on whether the book has a subtit
 |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|
+|separator()|Speficy the text used to join multiple people's names.<br><br>Default is ", "|`<author[separator(; )]>`|Arthur Conan Doyle; Stephen Fry|
+|format(\{T \| F \| M \| L \| S\})|Formats the human name using the name part tags.<br>\{T\} = Title (e.g. "Dr.")<br>\{F\} = First name<br>\{M\} = Middle name<br>\{L\} = Last Name<br>\{S\} = Suffix (e.g. "PhD")<br><br>Default is \{P\} \{F\} \{M\} \{L\} \{S\} |`<author[format({L}, {F}) separator(; )]>`|Doyle, Arthur; Fry, Stephen|
+|sort(F \| M \| L)|Sorts the names by first, middle, or last name<br><br>Default is unsorted|`<author[sort(M)]>`|Stephen Fry, Arthur Conan Doyle|
 |max(#)|Only use the first # of names<br><br>Default is all names|`<author[max(1)]>`|Arthur Conan Doyle|
 
-## 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).
+## Integer Formatters
 |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|
+|# (a number)|Zero-pads the number|\<bitrate\[4\]\><br>\<series#\[3\]\><br>\<samplerate\[6\]\>|0128<br>001<br>044100|
 
 ## Date Formatters
 Form more standard formatters, [see this guide from Microsoft](https://learn.microsoft.com/en-us/dotnet/standard/base-types/standard-date-and-time-format-strings).

Images/libation_glass.svg

@@ -1,41 +1,28 @@
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 288 288" enable-background="new 0 0 288 288">
-	<defs>
-		<g id="glass">
-			<path transform="translate(16 16)" fill-rule="evenodd" d=
-				"M177,16
-					H79
-					A 32.0781 63.7932 -1.5106 0 0 66 80
-					A 158.789 471.1259 41.9466 0 0 90 131
-					A 81.7197 122.0515 35.3745 0 0 128 143.3484
-					A 81.7197 122.0515 -35.3745 0 0 166 131
-					A 158.789 471.1259 -41.9466 0 0 190 80
-					A 32.0781 63.7932 1.5106 0 0 177 16
-					L 184 0
-					A 44.7901 78.5247 1.1521 0 1 194 122
-					A 97.0039 135.3148 -36.2124 0 1 136 159
-					V 240
-					H 176
-					A 8 8 0 0 1 176 256
-					H 80
-					A 8 8 0 0 1 80 240
-					H 120
-					V 159					
-					A 97.0039 135.3148 36.2124 0 1 62 122
-					A 44.7901 78.5247 -1.1521 0 1 72 0
-					H184
-				z"/>
-		</g>
-		<g transform="translate(16 16)" id="wine-level">
-			<path d=
-				"M182,64
-					H 74
-					A 115.9979 308.8033 38.9474 0 0 128 134.4277
-					A 115.9979 308.8033 -38.9474 0 0 182,64
-				z"/>
-		</g>
-	</defs>	
-	<use href="#glass" stroke="#ffffffa0" stroke-width="16" fill="Transparent" />
-	<use href="#wine-level" stroke="#ffffffa0" stroke-width="16" fill="Transparent" />
-	<use href="#glass" fill="Black" />
-	<use href="#wine-level" fill="Black" />
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 512 512" enable-background="new 0 0 512 512">
+<path id="glass" d=
+"M139,2
+	A 192,200 0 0 0 103,84
+	A 222,334 41 0 0 241,320
+	V478
+	H160
+	A 16,16 0 0 0 160,510
+	H352
+	A16 16 0 0 0 352,478
+	H271
+	V320
+	A 222,334 -41 0 0 409,84
+	A 192,200 0 0 0 373,2
+M355,32
+	A 192,200 0 0 1 381,127
+	A 187.5,334 -35 0 1 256,286
+	A 187.5,334 35 0 1 131,127
+	A 192,200 0 0 1 157,32
+	H355
+z" />
+
+<path id="wine-level" d=
+"M146,128
+	A 168,300 35 0 0 256,270
+	A 168,300 -35 0 0 366,128
+z"/>
 </svg>

Images/libation_hangover.svg

@@ -1,31 +1,30 @@
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 288 288" enable-background="new 0 0 288 288">
-	<g>
-		<path transform="rotate(90 128,128) translate(60 -16)" fill-rule="evenodd" d=
-			"M177,16
-				H79
-				A 32.0781 63.7932 -1.5106 0 0 66 80
-				A 158.789 471.1259 41.9466 0 0 90 131
-				A 81.7197 122.0515 35.3745 0 0 128 143.3484
-				A 81.7197 122.0515 -35.3745 0 0 166 131
-				A 158.789 471.1259 -41.9466 0 0 190 80
-				A 32.0781 63.7932 1.5106 0 0 177 16
-				L 184 0
-				A 44.7901 78.5247 1.1521 0 1 194 122
-				A 97.0039 135.3148 -36.2124 0 1 136 159
-				V 240
-				H 176
-				A 8 8 0 0 1 176 256
-				H 80
-				A 8 8 0 0 1 80 240
-				H 120
-				V 159					
-				A 97.0039 135.3148 36.2124 0 1 62 122
-				A 44.7901 78.5247 -1.1521 0 1 72 0
-				H184
-			M170,115
-				V24
-				A 19.5181 45.9183 -3.3549 0 1 182.4322 69.5
-				A 19.5181 45.9183 3.3549 0 1 170 115
-			z"/>
-	</g>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 512 512" enable-background="new 0 0 512 512">
+
+<g transform="translate(0 80) rotate(90 256,256)">
+<path id="glass" d=
+"M139,2
+	A 192,200 0 0 0 103,84
+	A 222,334 41 0 0 241,320
+	V478
+	H160
+	A 16,16 0 0 0 160,510
+	H352
+	A16 16 0 0 0 352,478
+	H271
+	V320
+	A 222,334 -41 0 0 409,84
+	A 192,200 0 0 0 373,2
+M355,32
+	A 192,200 0 0 1 381,127
+	A 187.5,334 -35 0 1 256,286
+	A 187.5,334 35 0 1 131,127
+	A 192,200 0 0 1 157,32
+	H355
+z" />
+<path id="wine-level" d=
+"M345,44
+	A 192,184 0 0 1 366,126
+	A 320,180 55 0 1 345,226
+z"/>
+</g>
 </svg>

README.md

@@ -5,8 +5,6 @@
 ### If you found this useful, tell a friend. If you found this REALLY useful, you can click here to [PayPal.me](https://paypal.me/mcrackan?locale.x=en_us)
 ...or just tell more friends. As long as I'm maintaining this software, it will remain **free** and **open source**.
 
-
-
 # Table of Contents
 
 - [Audible audiobook manager](#audible-audiobook-manager)
@@ -22,7 +20,6 @@
     - [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)
@@ -33,10 +30,7 @@
     - [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
 
@@ -55,12 +49,12 @@
 * 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
 
 <a name="theBad"/>
 
 ### The bad
 
+* Only fully supported in Windows. (Mac and Linux are in beta)
 * Large file size
 * Made by a programmer, not a designer so the goals are function rather than beauty. And it shows
 

Scripts/Bundle_Linux.sh

@@ -53,7 +53,13 @@ if [ $? -ne 0 ]
 fi
 
 
-delfiles=('LinuxConfigApp' 'LinuxConfigApp.deps.json' 'LinuxConfigApp.runtimeconfig.json')
+delfiles=('libmp3lame.arm64.dylib' 'libmp3lame.x64.dylib' 'libmp3lame.x64.dll' 'libmp3lame.x86.dll' 'ffmpegaac.arm64.dylib' 'ffmpegaac.x64.dylib' 'ffmpegaac.x64.dll' 'ffmpegaac.x86.dll' 'LinuxConfigApp' 'LinuxConfigApp.deps.json' 'LinuxConfigApp.runtimeconfig.json')
+if [[ "$ARCH" == "arm64" ]]
+then
+  delfiles+=('libmp3lame.x64.so' 'ffmpegaac.x64.so')
+else
+  delfiles+=('libmp3lame.arm64.so' 'ffmpegaac.arm64.so')
+fi
 
 for n in "${delfiles[@]}"
 do
@@ -103,6 +109,9 @@ ln -s /usr/lib/libation/LibationCli /usr/bin/libationcli
 if ! grep -q 'fs.inotify.max_user_instances=524288' /etc/sysctl.conf; then
   echo fs.inotify.max_user_instances=524288 | tee -a /etc/sysctl.conf && sysctl -p
 fi
+# workaround until this file is moved to the user's home directory
+touch /usr/lib/libation/appsettings.json
+chmod 666 /usr/lib/libation/appsettings.json
 " >> $FOLDER_DEBIAN/postinst
 
 echo "Creating control file..."

Scripts/Bundle_MacOS.sh

@@ -82,7 +82,14 @@ echo "Set CFBundleVersion to $VERSION"
 sed -i -e "s/VERSION_STRING/$VERSION/" $BUNDLE_CONTENTS/Info.plist
 
 
-delfiles=('MacOSConfigApp' 'MacOSConfigApp.deps.json' 'MacOSConfigApp.runtimeconfig.json')
+delfiles=( 'libmp3lame.arm64.so' 'libmp3lame.x64.so' 'libmp3lame.x64.dll' 'libmp3lame.x86.dll' 'ffmpegaac.arm64.so' 'ffmpegaac.x64.so' 'ffmpegaac.x64.dll' 'ffmpegaac.x86.dll' 'MacOSConfigApp' 'MacOSConfigApp.deps.json' 'MacOSConfigApp.runtimeconfig.json')
+if [[ "$ARCH" == "arm64" ]]
+then
+  delfiles+=('libmp3lame.x64.dylib' 'ffmpegaac.x64.dylib')
+else
+  delfiles+=('libmp3lame.arm64.dylib' 'ffmpegaac.arm64.dylib')
+fi
+
 
 for n in "${delfiles[@]}"
 do
@@ -104,4 +111,4 @@ mv $APP_FILE ./bundle/$APP_FILE
 
 rm -r $BUNDLE
 
-echo "Done!"
+echo "Done!"

Scripts/Bundle_Redhat.sh

@@ -1,141 +0,0 @@
-#!/bin/bash
-
-BIN_DIR=$1; shift
-VERSION=$1; shift
-ARCH=$1; shift
-
-if [ -z "$BIN_DIR" ]
-then
-  echo "This script must be called with a the Libation Linux bins directory as an argument."
-  exit
-fi
-
-if [ ! -d "$BIN_DIR" ]
-then
-  echo "The directory \"$BIN_DIR\" does not exist."
-  exit
-fi
-
-if [ -z "$VERSION" ]
-then
-  echo "This script must be called with the Libation version number as an argument."
-  exit
-fi
-
-if [ -z "$ARCH" ]
-then
-  echo "This script must be called with the Libation cpu architecture as an argument."
-  exit
-fi
-
-contains() { case "$1" in *"$2"*) true ;; *) false ;; esac }
-
-if ! contains "$BIN_DIR" "$ARCH"
-then
-  echo "This script must be called with a Libation binaries for ${ARCH}."
-  exit
-fi
-
-BASEDIR=$(pwd)
-
-delfiles=('LinuxConfigApp' 'LinuxConfigApp.deps.json' 'LinuxConfigApp.runtimeconfig.json')
-if [[ "$ARCH" == "x64" ]]
-then
-  ARCH_RPM="x86_64"
-  ARCH="amd64"
-else
-  ARCH_RPM="aarch64"
-fi
-
-notinstalled=('libcoreclrtraceptprovider.so' 'libation_glass.svg' 'Libation.desktop')
-
-mkdir -p ~/rpmbuild/SPECS
-mkdir ~/rpmbuild/BUILD
-mkdir ~/rpmbuild/RPMS
-
-echo "Name:           libation
-Version:        ${VERSION}
-Release:        1
-Summary:        Liberate your Audible Library
-
-License:        GPLv3+
-URL:            https://github.com/rmcrackan/Libation
-Source0:        https://github.com/rmcrackan/Libation   
-
-Requires:       bash
-
-
-%define __os_install_post %{nil}
-
-%description
-Liberate your Audible Library
-
-%install
-mkdir -p %{buildroot}%{_libdir}/%{name}
-mkdir -p %{buildroot}%{_datadir}/icons/hicolor/scalable/apps
-mkdir -p %{buildroot}%{_datadir}/applications
-
-if test -f 'libcoreclrtraceptprovider.so'; then
-    rm 'libcoreclrtraceptprovider.so'
-fi
-
-
-install -m 666 libation_glass.svg %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/libation.svg
-install -m 666 Libation.desktop %{buildroot}%{_datadir}/applications/Libation.desktop
-
-rm libation_glass.svg
-rm Libation.desktop
-
-install * %{buildroot}%{_libdir}/%{name}/
-
-%post
-
-if [ \$1 -eq 1 ] ; then
-  # Initial installation
-  
-  ln -s %{_libdir}/%{name}/Libation %{_bindir}/libation
-  ln -s %{_libdir}/%{name}/Hangover %{_bindir}/hangover
-  ln -s %{_libdir}/%{name}/LibationCli %{_bindir}/libationcli
-
-  gtk-update-icon-cache -f %{_datadir}/icons/hicolor/
-    
-  if ! grep -q 'fs.inotify.max_user_instances=524288' /etc/sysctl.conf; then
-    echo fs.inotify.max_user_instances=524288 | tee -a /etc/sysctl.conf && sysctl -p
-  fi
-fi
-
-%postun
-if [ \$1 -eq 0 ] ; then
-  # Uninstall
-  rm %{_bindir}/libation
-  rm %{_bindir}/hangover
-  rm %{_bindir}/libationcli
-fi
-
-%files
-%{_datadir}/icons/hicolor/scalable/apps/libation.svg
-%{_datadir}/applications/Libation.desktop" >> ~/rpmbuild/SPECS/libation.spec
-
-
-cd "$BIN_DIR"
-
-for f in *; do
-  if [[ " ${delfiles[*]} " =~ " ${f} " ]]; then
-    echo "Deleting $f"
-  elif [[ ! " ${notinstalled[*]} " =~ " ${f} " ]]; then
-    echo "%{_libdir}/%{name}/${f}" >> ~/rpmbuild/SPECS/libation.spec
-    cp $f ~/rpmbuild/BUILD/
-  else
-    cp $f ~/rpmbuild/BUILD/
-  fi
-done
-
-cd ~/rpmbuild/SPECS/
-rpmbuild -bb --target $ARCH_RPM libation.spec
-
-cd $BASEDIR
-RPM_FILE=$(ls ~/rpmbuild/RPMS/${ARCH_RPM})
-
-mkdir bundle
-
-mv ~/rpmbuild/RPMS/${ARCH_RPM}/$RPM_FILE "./bundle/Libation.${VERSION}-linux-chardonnay-${ARCH}.rpm"

Source/AaxDecrypter/AaxDecrypter.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
+    <TargetFramework>net7.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="1.0.1" />
 	</ItemGroup>
 
 	<ItemGroup>

Source/AaxDecrypter/AaxcDownloadConvertBase.cs

@@ -1,21 +1,18 @@
 using AAXClean;
 using System;
-using System.IO;
-using System.Linq;
 using System.Threading.Tasks;
 
-#nullable enable
 namespace AaxDecrypter
 {	
 	public abstract class AaxcDownloadConvertBase : AudiobookDownloadBase
 	{
-		public event EventHandler<AppleTags>? RetrievedMetadata;
+		public event EventHandler<AppleTags> RetrievedMetadata;
 
-		public Mp4File? AaxFile { get; private set; }
-		protected Mp4Operation? AaxConversion { get; set; }
+		protected AaxFile AaxFile { get; private set; }
+		protected Mp4Operation AaxConversion { get; set; }
 
-		protected AaxcDownloadConvertBase(string outDirectory, string cacheDirectory, IDownloadOptions dlOptions)
-			: base(outDirectory, cacheDirectory, dlOptions) { }
+		protected AaxcDownloadConvertBase(string outFileName, string cacheDirectory, IDownloadOptions dlOptions)
+			: base(outFileName, cacheDirectory, dlOptions) { }
 
 		/// <summary>Setting cover art by this method will insert the art into the audiobook metadata</summary>
 		public override void SetCoverArt(byte[] coverArt)
@@ -27,65 +24,15 @@ namespace AaxDecrypter
 
 		public override async Task CancelAsync()
 		{
-			await base.CancelAsync();
+			IsCanceled = true;
 			await (AaxConversion?.CancelAsync() ?? Task.CompletedTask);
-		}
-
-		private Mp4File Open()
-		{
-			if (DownloadOptions.DecryptionKeys is not KeyData[] keys || keys.Length == 0)
-				throw new InvalidOperationException($"{nameof(DownloadOptions.DecryptionKeys)} cannot be null or empty for a '{DownloadOptions.InputType}' file.");
-			else if (DownloadOptions.InputType is FileType.Dash)
-			{
-				//We may have multiple keys , so use the key whose key ID matches
-				//the dash files default Key ID.
-				var keyIds = keys.Select(k => new Guid(k.KeyPart1, bigEndian: true)).ToArray();
-
-				var dash = new DashFile(InputFileStream);
-				var kidIndex = Array.IndexOf(keyIds, dash.Tenc.DefaultKID);
-
-				if (kidIndex == -1)
-					throw new InvalidOperationException($"None of the {keyIds.Length} key IDs match the dash file's default KeyID of {dash.Tenc.DefaultKID}");
-
-				keys[0] = keys[kidIndex];
-				var keyId = keys[kidIndex].KeyPart1;
-				var key = keys[kidIndex].KeyPart2 ?? throw new InvalidOperationException($"{nameof(DownloadOptions.DecryptionKeys)} for '{DownloadOptions.InputType}' must have a non-null decryption key (KeyPart2).");
-				dash.SetDecryptionKey(keyId, key);
-				WriteKeyFile($"KeyId={Convert.ToHexString(keyId)}{Environment.NewLine}Key={Convert.ToHexString(key)}");
-				return dash;
-			}
-			else if (DownloadOptions.InputType is FileType.Aax)
-			{
-				var aax = new AaxFile(InputFileStream);
-				var key = keys[0].KeyPart1;
-				aax.SetDecryptionKey(keys[0].KeyPart1);
-				WriteKeyFile($"ActivationBytes={Convert.ToHexString(key)}");
-				return aax;
-			}
-			else if (DownloadOptions.InputType is FileType.Aaxc)
-			{
-				var aax = new AaxFile(InputFileStream);
-				var key = keys[0].KeyPart1;
-				var iv = keys[0].KeyPart2 ?? throw new InvalidOperationException($"{nameof(DownloadOptions.DecryptionKeys)} for '{DownloadOptions.InputType}' must have a non-null initialization vector (KeyPart2).");
-				aax.SetDecryptionKey(keys[0].KeyPart1, iv);
-				WriteKeyFile($"Key={Convert.ToHexString(key)}{Environment.NewLine}IV={Convert.ToHexString(iv)}");
-				return aax;
-			}
-			else throw new InvalidOperationException($"{nameof(DownloadOptions.InputType)} of '{DownloadOptions.InputType}' is unknown.");
-
-			void WriteKeyFile(string contents)
-			{
-				var keyFile = Path.Combine(Path.ChangeExtension(InputFileStream.SaveFilePath, ".key"));
-				File.WriteAllText(keyFile, contents + Environment.NewLine);
-				OnTempFileCreated(new(keyFile));
-			}
+			FinalizeDownload();
 		}
 
 		protected bool Step_GetMetadata()
 		{
-			AaxFile = Open();
-
-			RetrievedMetadata?.Invoke(this, AaxFile.AppleTags);
+			AaxFile = new AaxFile(InputFileStream);
+			AaxFile.SetDecryptionKey(DownloadOptions.AudibleKey, DownloadOptions.AudibleIV);
 
 			if (DownloadOptions.StripUnabridged)
 			{
@@ -96,49 +43,28 @@ namespace AaxDecrypter
 			if (DownloadOptions.FixupFile)
 			{
 				if (!string.IsNullOrWhiteSpace(AaxFile.AppleTags.Narrator))
-					AaxFile.AppleTags.AppleListBox.EditOrAddTag("©wrt", AaxFile.AppleTags.Narrator);
+					AaxFile.AppleTags.AppleListBox.EditOrAddTag("TCOM", AaxFile.AppleTags.Narrator);
 
 				if (!string.IsNullOrWhiteSpace(AaxFile.AppleTags.Copyright))
 					AaxFile.AppleTags.Copyright = AaxFile.AppleTags.Copyright.Replace("(P)", "℗").Replace("&#169;", "©");
-
-				//Add audiobook shelf tags
-				//https://github.com/advplyr/audiobookshelf/issues/1794#issuecomment-1565050213
-				const string tagDomain = "com.pilabor.tone";
-
-				AaxFile.AppleTags.Title = DownloadOptions.Title;
-
-				if (DownloadOptions.Subtitle is string subtitle)
-					AaxFile.AppleTags.AppleListBox.EditOrAddFreeformTag(tagDomain, "SUBTITLE", subtitle);
-
-				if (DownloadOptions.Publisher is string publisher)
-					AaxFile.AppleTags.AppleListBox.EditOrAddFreeformTag(tagDomain, "PUBLISHER", publisher);
-
-				if (DownloadOptions.Language is string language)
-					AaxFile.AppleTags.AppleListBox.EditOrAddFreeformTag(tagDomain, "LANGUAGE", language);
-
-				if (DownloadOptions.AudibleProductId is string asin)
-				{
-					AaxFile.AppleTags.Asin = asin;
-					AaxFile.AppleTags.AppleListBox.EditOrAddTag("asin", asin);
-					AaxFile.AppleTags.AppleListBox.EditOrAddFreeformTag(tagDomain, "AUDIBLE_ASIN", asin);
-				}
-
-				if (DownloadOptions.SeriesName is string series)
-					AaxFile.AppleTags.AppleListBox.EditOrAddFreeformTag(tagDomain, "SERIES", series);
-
-				if (DownloadOptions.SeriesNumber is string part)
-					AaxFile.AppleTags.AppleListBox.EditOrAddFreeformTag(tagDomain, "PART", part);
 			}
 
+			//Finishing configuring lame encoder.
+			if (DownloadOptions.OutputFormat == OutputFormat.Mp3)
+				MpegUtil.ConfigureLameOptions(
+					AaxFile,
+					DownloadOptions.LameConfig,
+					DownloadOptions.Downsample,
+					DownloadOptions.MatchSourceBitrate);
+
 			OnRetrievedTitle(AaxFile.AppleTags.TitleSansUnabridged);
-			OnRetrievedAuthors(AaxFile.AppleTags.FirstAuthor);
-			OnRetrievedNarrators(AaxFile.AppleTags.Narrator);
+			OnRetrievedAuthors(AaxFile.AppleTags.FirstAuthor ?? "[unknown]");
+			OnRetrievedNarrators(AaxFile.AppleTags.Narrator ?? "[unknown]");
 			OnRetrievedCoverArt(AaxFile.AppleTags.Cover);
-			OnInitialized();
+
+			RetrievedMetadata?.Invoke(this, AaxFile.AppleTags);
 
 			return !IsCanceled;
 		}
-
-		protected virtual void OnInitialized() { }
 	}
 }

Source/AaxDecrypter/AaxcDownloadMultiConverter.cs

@@ -5,32 +5,20 @@ using System;
 using System.IO;
 using System.Threading.Tasks;
 
-#nullable enable
 namespace AaxDecrypter
 {
 	public class AaxcDownloadMultiConverter : AaxcDownloadConvertBase
 	{
 		private static readonly TimeSpan minChapterLength = TimeSpan.FromSeconds(3);
-		private FileStream? workingFileStream;
+		private FileStream workingFileStream;
 
-		public AaxcDownloadMultiConverter(string outDirectory, string cacheDirectory, IDownloadOptions dlOptions)
-			: base(outDirectory, cacheDirectory, dlOptions)
+		public AaxcDownloadMultiConverter(string outFileName, string cacheDirectory, IDownloadOptions dlOptions)
+			: base(outFileName, cacheDirectory, dlOptions)
 		{
 			AsyncSteps.Name = $"Download, Convert Aaxc To {DownloadOptions.OutputFormat}, and Split";
 			AsyncSteps["Step 1: Get Aaxc Metadata"] = () => Task.Run(Step_GetMetadata);
 			AsyncSteps["Step 2: Download Decrypted Audiobook"] = Step_DownloadAndDecryptAudiobookAsync;
-		}
-
-		protected override void OnInitialized()
-		{
-			//Finishing configuring lame encoder.
-			if (DownloadOptions.OutputFormat == OutputFormat.Mp3)
-				MpegUtil.ConfigureLameOptions(
-					AaxFile,
-					DownloadOptions.LameConfig,
-					DownloadOptions.Downsample,
-					DownloadOptions.MatchSourceBitrate,
-					chapters: null);
+			AsyncSteps["Step 3: Download Clips and Bookmarks"] = Step_DownloadClipsBookmarksAsync;
 		}
 
 		/*
@@ -59,7 +47,6 @@ That naming may not be desirable for everyone, but it's an easy change to instea
 		 */
 		protected async override Task<bool> Step_DownloadAndDecryptAudiobookAsync()
 		{
-			if (AaxFile is null) return false;
 			var chapters = DownloadOptions.ChapterInfo.Chapters;
 
 			// Ensure split files are at least minChapterLength in duration.
@@ -84,10 +71,10 @@ That naming may not be desirable for everyone, but it's an easy change to instea
 
 			try
 			{
-				await (AaxConversion = decryptMultiAsync(AaxFile, splitChapters));
+				await (AaxConversion = decryptMultiAsync(splitChapters));
 
 				if (AaxConversion.IsCompletedSuccessfully)
-					await moveMoovToBeginning(AaxFile, workingFileStream?.Name);
+					await moveMoovToBeginning(workingFileStream?.Name);
 
 				return AaxConversion.IsCompletedSuccessfully;
 			}
@@ -98,51 +85,52 @@ That naming may not be desirable for everyone, but it's an easy change to instea
 			}
 		}
 
-		private Mp4Operation decryptMultiAsync(Mp4File aaxFile, ChapterInfo splitChapters)
+		private Mp4Operation decryptMultiAsync(ChapterInfo splitChapters)
 		{
 			var chapterCount = 0;
 			return
 				DownloadOptions.OutputFormat == OutputFormat.M4b
-				? aaxFile.ConvertToMultiMp4aAsync
+				? AaxFile.ConvertToMultiMp4aAsync
 				(
 					splitChapters,
 					newSplitCallback => newSplit(++chapterCount, splitChapters, newSplitCallback)
 				)
-				: aaxFile.ConvertToMultiMp3Async
+				: AaxFile.ConvertToMultiMp3Async
 				(
 					splitChapters,
 					newSplitCallback => newSplit(++chapterCount, splitChapters, newSplitCallback),
 					DownloadOptions.LameConfig
 				);
 
-			void newSplit(int currentChapter, ChapterInfo splitChapters, INewSplitCallback newSplitCallback)
+			void newSplit(int currentChapter, ChapterInfo splitChapters, NewSplitCallback newSplitCallback)
 			{
-				moveMoovToBeginning(aaxFile, workingFileStream?.Name).GetAwaiter().GetResult();
-				var newTempFile = GetNewTempFilePath(DownloadOptions.OutputFormat.ToString());
 				MultiConvertFileProperties props = new()
 				{
-					OutputFileName = newTempFile.FilePath,
+					OutputFileName = OutputFileName,
 					PartsPosition = currentChapter,
 					PartsTotal = splitChapters.Count,
-					Title = newSplitCallback.Chapter?.Title,
+					Title = newSplitCallback?.Chapter?.Title,
 				};
 
+				moveMoovToBeginning(workingFileStream?.Name).GetAwaiter().GetResult();
+
 				newSplitCallback.OutputFile = workingFileStream = createOutputFileStream(props);
 				newSplitCallback.TrackTitle = DownloadOptions.GetMultipartTitle(props);
 				newSplitCallback.TrackNumber = currentChapter;
 				newSplitCallback.TrackCount = splitChapters.Count;
 
-				OnTempFileCreated(newTempFile with { PartProperties = props });
+				OnFileCreated(workingFileStream.Name);
 			}
 
 			FileStream createOutputFileStream(MultiConvertFileProperties multiConvertFileProperties)
 			{
-				FileUtility.SaferDelete(multiConvertFileProperties.OutputFileName);
-				return File.Open(multiConvertFileProperties.OutputFileName, FileMode.OpenOrCreate, FileAccess.ReadWrite);
+				var fileName = DownloadOptions.GetMultipartFileName(multiConvertFileProperties);
+				FileUtility.SaferDelete(fileName);
+				return File.Open(fileName, FileMode.OpenOrCreate, FileAccess.ReadWrite);
 			}
 		}
 
-		private Mp4Operation moveMoovToBeginning(Mp4File aaxFile, string? filename)
+		private Mp4Operation moveMoovToBeginning(string filename)
 		{
 			if (DownloadOptions.OutputFormat is OutputFormat.M4b
 				&& DownloadOptions.MoveMoovToBeginning
@@ -151,7 +139,7 @@ That naming may not be desirable for everyone, but it's an easy change to instea
 			{
 				return Mp4File.RelocateMoovAsync(filename);
 			}
-			else return Mp4Operation.FromCompleted(aaxFile);
+			else return Mp4Operation.CompletedOperation;
 		}
 	}
 }

Source/AaxDecrypter/AaxcDownloadSingleConverter.cs

@@ -3,19 +3,17 @@ using AAXClean.Codecs;
 using Dinah.Core.Net.Http;
 using FileManager;
 using System;
+using System.Diagnostics;
 using System.IO;
 using System.Threading.Tasks;
 
-#nullable enable
 namespace AaxDecrypter
 {
 	public class AaxcDownloadSingleConverter : AaxcDownloadConvertBase
 	{
 		private readonly AverageSpeed averageSpeed = new();
-		private TempFile? outputTempFile;
-
-		public AaxcDownloadSingleConverter(string outDirectory, string cacheDirectory, IDownloadOptions dlOptions)
-			: base(outDirectory, cacheDirectory, dlOptions)
+		public AaxcDownloadSingleConverter(string outFileName, string cacheDirectory, IDownloadOptions dlOptions)
+			: base(outFileName, cacheDirectory, dlOptions)
 		{
 			var step = 1;
 
@@ -24,33 +22,20 @@ namespace AaxDecrypter
 			AsyncSteps[$"Step {step++}: Download Decrypted Audiobook"] = Step_DownloadAndDecryptAudiobookAsync;
 			if (DownloadOptions.MoveMoovToBeginning && DownloadOptions.OutputFormat is OutputFormat.M4b)
 				AsyncSteps[$"Step {step++}: Move moov atom to beginning"] = Step_MoveMoov;
+			AsyncSteps[$"Step {step++}: Download Clips and Bookmarks"] = Step_DownloadClipsBookmarksAsync;
 			AsyncSteps[$"Step {step++}: Create Cue"] = Step_CreateCueAsync;
 		}
 
-		protected override void OnInitialized()
-		{
-			//Finishing configuring lame encoder.
-			if (DownloadOptions.OutputFormat == OutputFormat.Mp3)
-				MpegUtil.ConfigureLameOptions(
-					AaxFile,
-					DownloadOptions.LameConfig,
-					DownloadOptions.Downsample,
-					DownloadOptions.MatchSourceBitrate,
-					DownloadOptions.ChapterInfo);
-		}
-
 		protected async override Task<bool> Step_DownloadAndDecryptAudiobookAsync()
 		{
-			if (AaxFile is null) return false;
-			outputTempFile = GetNewTempFilePath(DownloadOptions.OutputFormat.ToString());
-			FileUtility.SaferDelete(outputTempFile.FilePath);
+			FileUtility.SaferDelete(OutputFileName);
 
-			using var outputFile = File.Open(outputTempFile.FilePath, FileMode.OpenOrCreate, FileAccess.ReadWrite);
-			OnTempFileCreated(outputTempFile);
+			using var outputFile = File.Open(OutputFileName, FileMode.OpenOrCreate, FileAccess.ReadWrite);
+			OnFileCreated(OutputFileName);
 
 			try
 			{
-				await (AaxConversion = decryptAsync(AaxFile, outputFile));				
+				await (AaxConversion = decryptAsync(outputFile));				
 
 				return AaxConversion.IsCompletedSuccessfully;
 			}
@@ -62,15 +47,14 @@ namespace AaxDecrypter
 
 		private async Task<bool> Step_MoveMoov()
 		{
-			if (outputTempFile is null) return false;
-			AaxConversion = Mp4File.RelocateMoovAsync(outputTempFile.FilePath);
+			AaxConversion = Mp4File.RelocateMoovAsync(OutputFileName);
 			AaxConversion.ConversionProgressUpdate += AaxConversion_MoovProgressUpdate;
 			await AaxConversion;
 			AaxConversion.ConversionProgressUpdate -= AaxConversion_MoovProgressUpdate;
 			return AaxConversion.IsCompletedSuccessfully;
 		}
 
-		private void AaxConversion_MoovProgressUpdate(object? sender, ConversionProgressEventArgs e)
+		private void AaxConversion_MoovProgressUpdate(object sender, ConversionProgressEventArgs e)
 		{
 			averageSpeed.AddPosition(e.ProcessPosition.TotalSeconds);
 
@@ -89,20 +73,20 @@ namespace AaxDecrypter
 				});
 		}
 
-		private Mp4Operation decryptAsync(Mp4File aaxFile, Stream outputFile)
+		private Mp4Operation decryptAsync(Stream outputFile)
 			=> DownloadOptions.OutputFormat == OutputFormat.Mp3
-			? aaxFile.ConvertToMp3Async
+			? AaxFile.ConvertToMp3Async
 			(
 				outputFile,
 				DownloadOptions.LameConfig,
 				DownloadOptions.ChapterInfo
 			)
 			: DownloadOptions.FixupFile
-			? aaxFile.ConvertToMp4aAsync
+			? AaxFile.ConvertToMp4aAsync
 			(
 				outputFile,
 				DownloadOptions.ChapterInfo
 			)
-			: aaxFile.ConvertToMp4aAsync(outputFile);
+			: AaxFile.ConvertToMp4aAsync(outputFile);
 	}
 }

Source/AaxDecrypter/AudiobookDownloadBase.cs

@@ -6,50 +6,55 @@ using System;
 using System.IO;
 using System.Threading.Tasks;
 
-#nullable enable
 namespace AaxDecrypter
 {
 	public enum OutputFormat { M4b, Mp3 }
 
 	public abstract class AudiobookDownloadBase
 	{
-		public event EventHandler<string?>? RetrievedTitle;
-		public event EventHandler<string?>? RetrievedAuthors;
-		public event EventHandler<string?>? RetrievedNarrators;
-		public event EventHandler<byte[]?>? RetrievedCoverArt;
-		public event EventHandler<DownloadProgress>? DecryptProgressUpdate;
-		public event EventHandler<TimeSpan>? DecryptTimeRemaining;
-		public event EventHandler<TempFile>? TempFileCreated;
+		public event EventHandler<string> RetrievedTitle;
+		public event EventHandler<string> RetrievedAuthors;
+		public event EventHandler<string> RetrievedNarrators;
+		public event EventHandler<byte[]> RetrievedCoverArt;
+		public event EventHandler<DownloadProgress> DecryptProgressUpdate;
+		public event EventHandler<TimeSpan> DecryptTimeRemaining;
+		public event EventHandler<string> FileCreated;
 
 		public bool IsCanceled { get; protected set; }
 		protected AsyncStepSequence AsyncSteps { get; } = new();
-		protected string OutputDirectory { get; }
-		public IDownloadOptions DownloadOptions { get; }
-		protected NetworkFileStream InputFileStream => NfsPersister.NetworkFileStream;
+		protected string OutputFileName { get; }
+		protected IDownloadOptions DownloadOptions { get; }
+		protected NetworkFileStream InputFileStream => nfsPersister.NetworkFileStream;
 		protected virtual long InputFilePosition => InputFileStream.Position;
 		private bool downloadFinished;
 
-		private NetworkFileStreamPersister? m_nfsPersister;
-		private NetworkFileStreamPersister NfsPersister => m_nfsPersister ??= OpenNetworkFileStream();
+		private readonly NetworkFileStreamPersister nfsPersister;
 		private readonly DownloadProgress zeroProgress;
 		private readonly string jsonDownloadState;
 		private readonly string tempFilePath;
 
-		protected AudiobookDownloadBase(string outDirectory, string cacheDirectory, IDownloadOptions dlOptions)
-		{			
-			OutputDirectory = ArgumentValidator.EnsureNotNullOrWhiteSpace(outDirectory, nameof(outDirectory));
-			DownloadOptions = ArgumentValidator.EnsureNotNull(dlOptions, nameof(dlOptions));
-			DownloadOptions.DownloadSpeedChanged += (_, speed) => InputFileStream.SpeedLimit = speed;
+		protected AudiobookDownloadBase(string outFileName, string cacheDirectory, IDownloadOptions dlOptions)
+		{
+			OutputFileName = ArgumentValidator.EnsureNotNullOrWhiteSpace(outFileName, nameof(outFileName));
 
-			if (!Directory.Exists(OutputDirectory))
-				Directory.CreateDirectory(OutputDirectory);
+			var outDir = Path.GetDirectoryName(OutputFileName);
+			if (!Directory.Exists(outDir))
+				Directory.CreateDirectory(outDir);
 
 			if (!Directory.Exists(cacheDirectory))
 				Directory.CreateDirectory(cacheDirectory);
 
-			jsonDownloadState = Path.Combine(cacheDirectory, $"{DownloadOptions.AudibleProductId}.json");
+			jsonDownloadState = Path.Combine(cacheDirectory, Path.GetFileName(Path.ChangeExtension(OutputFileName, ".json")));
 			tempFilePath = Path.ChangeExtension(jsonDownloadState, ".aaxc");
 
+			DownloadOptions = ArgumentValidator.EnsureNotNull(dlOptions, nameof(dlOptions));
+			DownloadOptions.DownloadSpeedChanged += (_, speed) => InputFileStream.SpeedLimit = speed;
+
+			// delete file after validation is complete
+			FileUtility.SaferDelete(OutputFileName);
+
+			nfsPersister = OpenNetworkFileStream();
+
 			zeroProgress = new DownloadProgress
 			{
 				BytesReceived = 0,
@@ -60,30 +65,19 @@ namespace AaxDecrypter
 			OnDecryptProgressUpdate(zeroProgress);
 		}
 
-		protected TempFile GetNewTempFilePath(string extension)
-		{
-			extension = FileUtility.GetStandardizedExtension(extension);
-			var path = Path.Combine(OutputDirectory, Guid.NewGuid().ToString("N") + extension);
-			return new(path, extension);
-		}
-
 		public async Task<bool> RunAsync()
 		{
 			await InputFileStream.BeginDownloadingAsync();
 			var progressTask = Task.Run(reportProgress);
 
+			AsyncSteps[$"Cleanup"] = CleanupAsync;
 			(bool success, var elapsed) = await AsyncSteps.RunAsync();
 
-			//Stop the downloader so it doesn't keep running in the background.
-			if (!success)
-				NfsPersister.Dispose();
-
 			await progressTask;
 
 			var speedup = DownloadOptions.RuntimeLength / elapsed;
 			Serilog.Log.Information($"Speedup is {speedup:F0}x realtime.");
 
-			NfsPersister.Dispose();
 			return success;
 
 			async Task reportProgress()
@@ -121,52 +115,58 @@ namespace AaxDecrypter
 			}
 		}
 
-		public virtual Task CancelAsync()
-		{
-			IsCanceled = true;
-			FinalizeDownload();
-			return Task.CompletedTask;
-		}
+		public abstract Task CancelAsync();
 		protected abstract Task<bool> Step_DownloadAndDecryptAudiobookAsync();
 
-		public virtual void SetCoverArt(byte[] coverArt) { }
-		protected void OnRetrievedTitle(string? title)
+		public virtual void SetCoverArt(byte[] coverArt)
+		{
+			if (coverArt is not null)
+				OnRetrievedCoverArt(coverArt);
+		}
+
+		protected void OnRetrievedTitle(string title)
 			=> RetrievedTitle?.Invoke(this, title);
-		protected void OnRetrievedAuthors(string? authors)
+		protected void OnRetrievedAuthors(string authors)
 			=> RetrievedAuthors?.Invoke(this, authors);
-		protected void OnRetrievedNarrators(string? narrators)
+		protected void OnRetrievedNarrators(string narrators)
 			=> RetrievedNarrators?.Invoke(this, narrators);
-		protected void OnRetrievedCoverArt(byte[]? coverArt)
+		protected void OnRetrievedCoverArt(byte[] coverArt)
 			=> RetrievedCoverArt?.Invoke(this, coverArt);
 		protected void OnDecryptProgressUpdate(DownloadProgress downloadProgress)
 			=> DecryptProgressUpdate?.Invoke(this, downloadProgress);
 		protected void OnDecryptTimeRemaining(TimeSpan timeRemaining)
 			=> DecryptTimeRemaining?.Invoke(this, timeRemaining);
-		public void OnTempFileCreated(TempFile path)
-			=> TempFileCreated?.Invoke(this, path);
+		protected void OnFileCreated(string path)
+			=> FileCreated?.Invoke(this, path);
 
 		protected virtual void FinalizeDownload()
 		{
-			NfsPersister.Dispose();
+			nfsPersister?.Dispose();
 			downloadFinished = true;
 		}
 
+		protected async Task<bool> Step_DownloadClipsBookmarksAsync()
+		{
+			if (!IsCanceled && DownloadOptions.DownloadClipsBookmarks)
+			{
+				var recordsFile = await DownloadOptions.SaveClipsAndBookmarksAsync(OutputFileName);
+
+				if (File.Exists(recordsFile))
+					OnFileCreated(recordsFile);
+			}
+			return !IsCanceled;
+		}
+
 		protected async Task<bool> Step_CreateCueAsync()
 		{
 			if (!DownloadOptions.CreateCueSheet) return !IsCanceled;
 
-			if (DownloadOptions.ChapterInfo.Count <= 1)
-			{
-				Serilog.Log.Logger.Information($"Skipped creating .cue because book has no chapters.");
-				return !IsCanceled;
-			}
-
 			// not a critical step. its failure should not prevent future steps from running
 			try
 			{
-				var tempFile = GetNewTempFilePath(".cue");
-				await File.WriteAllTextAsync(tempFile.FilePath, Cue.CreateContents(Path.GetFileName(tempFile.FilePath), DownloadOptions.ChapterInfo));
-				OnTempFileCreated(tempFile);
+				var path = Path.ChangeExtension(OutputFileName, ".cue");
+				await File.WriteAllTextAsync(path, Cue.CreateContents(Path.GetFileName(OutputFileName), DownloadOptions.ChapterInfo));
+				OnFileCreated(path);
 			}
 			catch (Exception ex)
 			{
@@ -175,9 +175,36 @@ namespace AaxDecrypter
 			return !IsCanceled;
 		}
 
+		private async Task<bool> CleanupAsync()
+		{
+			if (IsCanceled) return false;
+
+			FileUtility.SaferDelete(jsonDownloadState);
+
+			if (!string.IsNullOrEmpty(DownloadOptions.AudibleKey) &&
+				!string.IsNullOrEmpty(DownloadOptions.AudibleIV) &&
+				DownloadOptions.RetainEncryptedFile)
+			{
+				string aaxPath = Path.ChangeExtension(tempFilePath, ".aax");
+				FileUtility.SaferMove(tempFilePath, aaxPath);
+
+				//Write aax decryption key
+				string keyPath = Path.ChangeExtension(aaxPath, ".key");
+				FileUtility.SaferDelete(keyPath);
+				await File.WriteAllTextAsync(keyPath, $"Key={DownloadOptions.AudibleKey}{Environment.NewLine}IV={DownloadOptions.AudibleIV}");
+
+				OnFileCreated(aaxPath);
+				OnFileCreated(keyPath);
+			}
+			else
+				FileUtility.SaferDelete(tempFilePath);
+
+			return !IsCanceled;
+		}
+
 		private NetworkFileStreamPersister OpenNetworkFileStream()
 		{
-			NetworkFileStreamPersister? nfsp = default;
+			NetworkFileStreamPersister nfsp = default;
 			try
 			{
 				if (!File.Exists(jsonDownloadState))
@@ -191,21 +218,14 @@ namespace AaxDecrypter
 			}
 			catch
 			{
-				nfsp?.Target?.Dispose();
 				FileUtility.SaferDelete(jsonDownloadState);
 				FileUtility.SaferDelete(tempFilePath);
 				return nfsp = newNetworkFilePersister();
 			}
 			finally
 			{
-				//nfsp will only be null when an unhandled exception occurs. Let the caller handle it.
-				if (nfsp is not null)
-				{
-					nfsp.NetworkFileStream.RequestHeaders["User-Agent"] = DownloadOptions.UserAgent;
-					nfsp.NetworkFileStream.SpeedLimit = DownloadOptions.DownloadSpeedBps;
-					OnTempFileCreated(new(tempFilePath, DownloadOptions.InputType.ToString()));
-					OnTempFileCreated(new(jsonDownloadState));
-				}
+				nfsp.NetworkFileStream.RequestHeaders["User-Agent"] = DownloadOptions.UserAgent;
+				nfsp.NetworkFileStream.SpeedLimit = DownloadOptions.DownloadSpeedBps;
 			}
 
 			NetworkFileStreamPersister newNetworkFilePersister()

Source/AaxDecrypter/AverageSpeed.cs

@@ -105,7 +105,7 @@ public class AverageSpeed
 	public AverageSpeed() : this(TimeSpan.FromSeconds(15), Significance.P10, TimeSpan.FromSeconds(3), Significance.P01) { }
 
 	/// <param name="slowWindow">Total moving average time window</param>
-	/// <param name="slowSignificance">T-test significance level at which the newest speed will be considered different from the slow window's mean speed.</param>
+	/// <param name="slowSignificance">T-test signifance level at which the newest speed will be considered different from the slow window's mean speed.</param>
 	/// <param name="fastWindow">A shorter moving window of the most resent speeds. The average speed in <paramref name="fastWindow"/> is compared to the average speed in the rest of <paramref name="slowWindow"/> to quickly detect large changes in speed.</param>
 	/// <param name="fastSignificance">T-test significance level at which the mean speed in <paramref name="fastWindow"/> will be considered different from the mean speed of the remainder of <paramref name="slowWindow"/>.</param>
 	public AverageSpeed(TimeSpan slowWindow, Significance slowSignificance, TimeSpan fastWindow, Significance fastSignificance)
@@ -119,7 +119,7 @@ public class AverageSpeed
 	/// <summary>Add a new position to the moving average</summary>
 	public void AddPosition(double position)
 	{
-		var now = DateTime.UtcNow;
+		var now = DateTime.Now;
 		if (start == default)
 			start = now;
 

Source/AaxDecrypter/IDownloadOptions.cs

@@ -1,54 +1,32 @@
 using AAXClean;
 using System;
+using System.Threading.Tasks;
 
-#nullable enable
 namespace AaxDecrypter
 {
-    public class KeyData
-    {
-        public byte[] KeyPart1 { get; }
-        public byte[]? KeyPart2 { get; }
-
-        public KeyData(byte[] keyPart1, byte[]? keyPart2 = null)
-        {
-            KeyPart1 = keyPart1;
-            KeyPart2 = keyPart2;
-        }
-
-        public KeyData(string keyPart1, string? keyPart2 = null)
-        {
-            ArgumentNullException.ThrowIfNull(keyPart1, nameof(keyPart1));
-            KeyPart1 = Convert.FromHexString(keyPart1);
-            if (keyPart2 != null)
-                KeyPart2 = Convert.FromHexString(keyPart2);
-        }
-	}    
-
-	public interface IDownloadOptions
+    public interface IDownloadOptions
     {
         event EventHandler<long> DownloadSpeedChanged;
         string DownloadUrl { get; }
         string UserAgent { get; }
-		KeyData[]? DecryptionKeys { get; }
+        string AudibleKey { get; }
+        string AudibleIV { get; }
         TimeSpan RuntimeLength { get; }
         OutputFormat OutputFormat { get; }
+        bool TrimOutputToChapterLength { get; }
+        bool RetainEncryptedFile { get; }
         bool StripUnabridged { get; }
         bool CreateCueSheet { get; }
+        bool DownloadClipsBookmarks { get; }
         long DownloadSpeedBps { get; }
         ChapterInfo ChapterInfo { get; }
         bool FixupFile { get; }
-		string? AudibleProductId { get; }
-		string? Title { get; }
-		string? Subtitle { get; }
-		string? Publisher { get; }
-		string? Language { get; }
-		string? SeriesName { get; }
-		string? SeriesNumber { get; }
-		NAudio.Lame.LameConfig? LameConfig { get; }
+        NAudio.Lame.LameConfig LameConfig { get; }
         bool Downsample { get; }
         bool MatchSourceBitrate { get; }
         bool MoveMoovToBeginning { get; }
+        string GetMultipartFileName(MultiConvertFileProperties props);
         string GetMultipartTitle(MultiConvertFileProperties props);
-        public FileType? InputType { get; }
+        Task<string> SaveClipsAndBookmarksAsync(string fileName);
     }
 }

Source/AaxDecrypter/MpegUtil.cs

@@ -1,5 +1,4 @@
 using AAXClean;
-using AAXClean.Codecs;
 using NAudio.Lame;
 using System;
 
@@ -7,13 +6,7 @@ namespace AaxDecrypter
 {
 	public static class MpegUtil
 	{
-		private const string TagDomain = "com.pilabor.tone";
-		public static void ConfigureLameOptions(
-			Mp4File mp4File,
-			LameConfig lameConfig,
-			bool downsample,
-			bool matchSourceBitrate,
-			ChapterInfo chapters)
+		public static void ConfigureLameOptions(Mp4File mp4File, LameConfig lameConfig, bool downsample, bool matchSourceBitrate)
 		{
 			double bitrateMultiple = 1;
 
@@ -43,27 +36,6 @@ namespace AaxDecrypter
 				else if (lameConfig.VBR == VBRMode.ABR)
 					lameConfig.ABRRateKbps = kbps;
 			}
-
-			//Setup metadata tags
-			lameConfig.ID3 = mp4File.AppleTags.ToIDTags();
-
-			if (mp4File.AppleTags.AppleListBox.GetFreeformTagString(TagDomain, "SUBTITLE") is string subtitle)
-				lameConfig.ID3.Subtitle = subtitle;
-
-			if (mp4File.AppleTags.AppleListBox.GetFreeformTagString(TagDomain, "LANGUAGE") is string lang)
-				lameConfig.ID3.UserDefinedText.Add("LANGUAGE", lang);
-
-			if (mp4File.AppleTags.AppleListBox.GetFreeformTagString(TagDomain, "SERIES") is string series)
-				lameConfig.ID3.UserDefinedText.Add("SERIES", series);
-
-			if (mp4File.AppleTags.AppleListBox.GetFreeformTagString(TagDomain, "PART") is string part)
-				lameConfig.ID3.UserDefinedText.Add("PART", part);
-
-			if (chapters?.Count > 0)
-			{
-				var cue = Cue.CreateContents(lameConfig.ID3.Title + ".mp3", chapters);
-				lameConfig.ID3.UserDefinedText.Add("CUESHEET", cue);
-			}
 		}
 	}
 }

Source/AaxDecrypter/NetworkFileStream.cs

@@ -14,6 +14,7 @@ namespace AaxDecrypter
 	public class NetworkFileStream : Stream, IUpdatable
 	{
 		public event EventHandler Updated;
+		public event EventHandler DownloadCompleted;
 
 		#region Public Properties
 
@@ -40,9 +41,6 @@ namespace AaxDecrypter
 		[JsonIgnore]
 		public bool IsCancelled => _cancellationSource.IsCancellationRequested;
 
-		[JsonIgnore]
-		public Task DownloadTask { get; private set; }
-
 		private long _speedLimit = 0;
 		/// <summary>bytes per second</summary>
 		public long SpeedLimit { get => _speedLimit; set => _speedLimit = value <= 0 ? 0 : Math.Max(value, MIN_BYTES_PER_SECOND); }
@@ -54,21 +52,20 @@ namespace AaxDecrypter
 		private FileStream _readFile { get; }
 		private CancellationTokenSource _cancellationSource { get; } = new();
 		private EventWaitHandle _downloadedPiece { get; set; }
-
-		private DateTime NextUpdateTime { get; set; }
+		private Task _backgroundDownloadTask { get; set; }
 
 		#endregion
 
 		#region Constants
 
-		//Download memory buffer size
-		private const int DOWNLOAD_BUFF_SZ = 8 * 1024;
+		//Download buffer size
+		private const int DOWNLOAD_BUFF_SZ = 32 * 1024;
 
 		//NetworkFileStream will flush all data in _writeFile to disk after every
 		//DATA_FLUSH_SZ bytes are written to the file stream.
 		private const int DATA_FLUSH_SZ = 1024 * 1024;
 
-		//Number of times per second the download rate is checked and throttled
+		//Number of times per second the download rate is checkd and throttled
 		private const int THROTTLE_FREQUENCY = 8;
 
 		//Minimum throttle rate. The minimum amount of data that can be throttled
@@ -100,12 +97,6 @@ namespace AaxDecrypter
 				Position = WritePosition
 			};
 
-			if (_writeFile.Length < WritePosition)
-			{
-				_writeFile.Dispose();
-				throw new InvalidDataException($"{SaveFilePath} file length is shorter than {WritePosition}");
-			}
-
 			_readFile = new FileStream(SaveFilePath, FileMode.Open, FileAccess.Read, FileShare.ReadWrite);
 
 			SetUriForSameFile(uri);
@@ -116,18 +107,12 @@ namespace AaxDecrypter
 		#region Downloader
 
 		/// <summary> Update the <see cref="Dinah.Core.IO.JsonFilePersister{T}"/>. </summary>
-		private void OnUpdate(bool waitForWrite = false)
+		private void OnUpdate()
 		{
+			RequestHeaders["Range"] = $"bytes={WritePosition}-";
 			try
 			{
-				if (waitForWrite || DateTime.UtcNow > NextUpdateTime)
-				{
-					Updated?.Invoke(this, EventArgs.Empty);
-					//JsonFilePersister Will not allow update intervals shorter than 100 milliseconds
-					//If an update is called less than 100 ms since the last update, persister will
-					//sleep the thread until 100 ms has elapsed.
-					NextUpdateTime = DateTime.UtcNow.AddMilliseconds(110);
-				}
+				Updated?.Invoke(this, EventArgs.Empty);
 			}
 			catch (Exception ex)
 			{
@@ -141,14 +126,13 @@ namespace AaxDecrypter
 		{
 			ArgumentValidator.EnsureNotNullOrWhiteSpace(uriToSameFile?.AbsoluteUri, nameof(uriToSameFile));
 
-			if (Path.GetFileName(uriToSameFile.LocalPath) != Path.GetFileName(Uri.LocalPath))
-				throw new ArgumentException($"New uri to the same file must have the same file name.");
 			if (uriToSameFile.Host != Uri.Host)
 				throw new ArgumentException($"New uri to the same file must have the same host.\r\n Old Host :{Uri.Host}\r\nNew Host: {uriToSameFile.Host}");
-			if (DownloadTask is not null)
+			if (_backgroundDownloadTask is not null)
 				throw new InvalidOperationException("Cannot change Uri after download has started.");
 
 			Uri = uriToSameFile;
+			RequestHeaders["Range"] = $"bytes={WritePosition}-";
 		}
 
 		/// <summary> Begins downloading <see cref="Uri"/> to <see cref="SaveFilePath"/> in a background thread. </summary>
@@ -157,110 +141,45 @@ namespace AaxDecrypter
 		{
 			if (ContentLength != 0 && WritePosition == ContentLength)
 			{
-				DownloadTask = Task.CompletedTask;
+				_backgroundDownloadTask = Task.CompletedTask;
 				return;
 			}
 
 			if (ContentLength != 0 && WritePosition > ContentLength)
 				throw new WebException($"Specified write position (0x{WritePosition:X10}) is larger than  {nameof(ContentLength)} (0x{ContentLength:X10}).");
 
-			//Initiate connection with the first request block and
-			//get the total content length before returning.
-			var client = new HttpClient();
-			var response = await RequestNextByteRangeAsync(client);
-
-			if (ContentLength != 0 && ContentLength != response.FileSize)
-				throw new WebException($"Content length of 0x{response.FileSize:X10} differs from partially downloaded content length of 0x{ContentLength:X10}");
-			
-			ContentLength = response.FileSize;
-
-			_downloadedPiece = new EventWaitHandle(false, EventResetMode.AutoReset);
-			//Hand off the client and the open request to the downloader to download and write data to file.
-			DownloadTask = Task.Run(() => DownloadLoopInternal(client , response), _cancellationSource.Token);
-		}
-
-		private async Task DownloadLoopInternal(HttpClient client, BlockResponse blockResponse)
-		{
-			try
-			{
-				long startPosition = WritePosition;
-
-				while (WritePosition < ContentLength && !IsCancelled)
-				{
-					try
-					{
-						await DownloadToFile(blockResponse);
-					}
-					catch (HttpIOException e)
-						when (e.HttpRequestError is HttpRequestError.ResponseEnded
-								&& WritePosition != startPosition
-								&& WritePosition < ContentLength && !IsCancelled)
-					{
-						Serilog.Log.Logger.Debug($"The download connection ended before the file completed downloading all 0x{ContentLength:X10} bytes");
-
-						//the download made *some* progress since the last attempt.
-						//Try again to complete the download from where it left off.
-						//Make sure to rewind file to last flush position.
-						_writeFile.Position = startPosition = WritePosition;
-						blockResponse.Dispose();
-						blockResponse = await RequestNextByteRangeAsync(client);
-
-						Serilog.Log.Logger.Debug($"Resuming the file download starting at position 0x{WritePosition:X10}.");
-					}
-				}
-			}
-			finally
-			{
-				_writeFile.Dispose();
-				blockResponse.Dispose();
-				client.Dispose();
-			}
-		}
-
-		private async Task<BlockResponse> RequestNextByteRangeAsync(HttpClient client)
-		{
-			using var request = new HttpRequestMessage(HttpMethod.Get, Uri);
-
-			//Just in case it snuck in the saved json (Issue #1232)
-			RequestHeaders.Remove("Range");
+			var request = new HttpRequestMessage(HttpMethod.Get, Uri);
 
 			foreach (var header in RequestHeaders)
 				request.Headers.Add(header.Key, header.Value);
 
-			request.Headers.Add("Range", $"bytes={WritePosition}-");
-
-			var response = await client.SendAsync(request, HttpCompletionOption.ResponseHeadersRead, _cancellationSource.Token);
+			var response = await new HttpClient().SendAsync(request, HttpCompletionOption.ResponseHeadersRead, _cancellationSource.Token);
 
 			if (response.StatusCode != HttpStatusCode.PartialContent)
 				throw new WebException($"Server at {Uri.Host} responded with unexpected status code: {response.StatusCode}.");
 
-			var totalSize = response.Content.Headers.ContentRange?.Length ??
-				throw new WebException("The response did not contain a total content length.");
+			//Content length is the length of the range request, and it is only equal
+			//to the complete file length if requesting Range: bytes=0-
+			if (WritePosition == 0)
+				ContentLength = response.Content.Headers.ContentLength.GetValueOrDefault();
 
-			var rangeSize = response.Content.Headers.ContentLength ??
-				throw new WebException($"The response did not contain a {nameof(response.Content.Headers.ContentLength)};");
+			var networkStream = await response.Content.ReadAsStreamAsync(_cancellationSource.Token);
+			_downloadedPiece = new EventWaitHandle(false, EventResetMode.AutoReset);
 
-			return new BlockResponse(response, rangeSize, totalSize);
-		}
-
-		private readonly record struct BlockResponse(HttpResponseMessage Response, long BlockSize, long FileSize) : IDisposable
-		{
-			public void Dispose() => Response?.Dispose();
+			//Download the file in the background.
+			_backgroundDownloadTask = Task.Run(() => DownloadFile(networkStream), _cancellationSource.Token);
 		}
 
 		/// <summary> Download <see cref="Uri"/> to <see cref="SaveFilePath"/>.</summary>
-		private async Task DownloadToFile(BlockResponse block)
+		private async Task DownloadFile(Stream networkStream)
 		{
-			var endPosition = WritePosition + block.BlockSize;
-			using var networkStream = await block.Response.Content.ReadAsStreamAsync(_cancellationSource.Token);
-
 			var downloadPosition = WritePosition;
 			var nextFlush = downloadPosition + DATA_FLUSH_SZ;
 			var buff = new byte[DOWNLOAD_BUFF_SZ];
 
 			try
 			{
-				DateTime startTime = DateTime.UtcNow;
+				DateTime startTime = DateTime.Now;
 				long bytesReadSinceThrottle = 0;
 				int bytesRead;
 				do
@@ -285,25 +204,24 @@ namespace AaxDecrypter
 
 					if (SpeedLimit >= MIN_BYTES_PER_SECOND && bytesReadSinceThrottle > SpeedLimit / THROTTLE_FREQUENCY)
 					{
-						var delayMS = (int)(startTime.AddSeconds(1d / THROTTLE_FREQUENCY) - DateTime.UtcNow).TotalMilliseconds;
+						var delayMS = (int)(startTime.AddSeconds(1d / THROTTLE_FREQUENCY) - DateTime.Now).TotalMilliseconds;
 						if (delayMS > 0)
 							await Task.Delay(delayMS, _cancellationSource.Token);
 
-						startTime = DateTime.UtcNow;
+						startTime = DateTime.Now;
 						bytesReadSinceThrottle = 0;
 					}
 
 					#endregion
 
-				} while (downloadPosition < endPosition && !IsCancelled && bytesRead > 0);
+				} while (downloadPosition < ContentLength && !IsCancelled && bytesRead > 0);
 
-				await _writeFile.FlushAsync(_cancellationSource.Token);
 				WritePosition = downloadPosition;
 
-				if (!IsCancelled && WritePosition < endPosition)
+				if (!IsCancelled && WritePosition < ContentLength)
 					throw new WebException($"Downloaded size (0x{WritePosition:X10}) is less than {nameof(ContentLength)} (0x{ContentLength:X10}).");
 
-				if (WritePosition > endPosition)
+				if (WritePosition > ContentLength)
 					throw new WebException($"Downloaded size (0x{WritePosition:X10}) is greater than {nameof(ContentLength)} (0x{ContentLength:X10}).");
 			}
 			catch (TaskCanceledException)
@@ -312,8 +230,11 @@ namespace AaxDecrypter
 			}
 			finally
 			{
+				networkStream.Close();
+				_writeFile.Close();
 				_downloadedPiece.Set();
-				OnUpdate(waitForWrite: true);
+				OnUpdate();
+				DownloadCompleted?.Invoke(this, null);
 			}
 		}
 
@@ -335,7 +256,7 @@ namespace AaxDecrypter
 		{
 			get
 			{
-				if (DownloadTask is null)
+				if (_backgroundDownloadTask is null)
 					throw new InvalidOperationException($"Background downloader must first be started by calling {nameof(BeginDownloadingAsync)}");
 				return ContentLength;
 			}
@@ -359,7 +280,7 @@ namespace AaxDecrypter
 
 		public override int Read(byte[] buffer, int offset, int count)
 		{
-			if (DownloadTask is null)
+			if (_backgroundDownloadTask is null)
 				throw new InvalidOperationException($"Background downloader must first be started by calling {nameof(BeginDownloadingAsync)}");
 
 			var toRead = Math.Min(count, Length - Position);
@@ -385,7 +306,7 @@ namespace AaxDecrypter
 		private void WaitToPosition(long requiredPosition)
 		{
 			while (WritePosition < requiredPosition
-				&& DownloadTask?.IsCompleted is false
+				&& _backgroundDownloadTask?.IsCompleted is false
 				&& !IsCancelled)
 			{
 				_downloadedPiece.WaitOne(50);
@@ -405,12 +326,12 @@ namespace AaxDecrypter
 			if (disposing && !disposed)
 			{
 				_cancellationSource.Cancel();
-				DownloadTask?.GetAwaiter().GetResult();
+				_backgroundDownloadTask?.GetAwaiter().GetResult();
 				_downloadedPiece?.Dispose();
 				_cancellationSource?.Dispose();
 				_readFile.Dispose();
 				_writeFile.Dispose();
-				OnUpdate(waitForWrite: true);
+				OnUpdate();
 			}
 
 			disposed = true;

Source/AaxDecrypter/TempFile.cs

@@ -1,17 +0,0 @@
-using FileManager;
-
-#nullable enable
-namespace AaxDecrypter;
-
-public record TempFile
-{
-	public LongPath FilePath { get; init; }
-	public string Extension { get; }
-	public MultiConvertFileProperties? PartProperties { get; init; }
-	public TempFile(LongPath filePath, string? extension = null)
-	{
-		FilePath = filePath;
-		extension ??= System.IO.Path.GetExtension(filePath);
-		Extension = FileUtility.GetStandardizedExtension(extension).ToLowerInvariant();
-	}
-}

Source/AaxDecrypter/UnencryptedAudiobookDownloader.cs

@@ -1,4 +1,5 @@
 using FileManager;
+using System;
 using System.Threading.Tasks;
 
 namespace AaxDecrypter
@@ -7,26 +8,37 @@ namespace AaxDecrypter
 	{
 		protected override long InputFilePosition => InputFileStream.WritePosition;
 
-		public UnencryptedAudiobookDownloader(string outDirectory, string cacheDirectory, IDownloadOptions dlLic)
-			: base(outDirectory, cacheDirectory, dlLic)
+		public UnencryptedAudiobookDownloader(string outFileName, string cacheDirectory, IDownloadOptions dlLic)
+			: base(outFileName, cacheDirectory, dlLic)
 		{
 			AsyncSteps.Name = "Download Unencrypted Audiobook";
 			AsyncSteps["Step 1: Download Audiobook"] = Step_DownloadAndDecryptAudiobookAsync;
-			AsyncSteps["Step 2: Create Cue"] = Step_CreateCueAsync;
+			AsyncSteps["Step 2: Download Clips and Bookmarks"] = Step_DownloadClipsBookmarksAsync;
+			AsyncSteps["Step 3: Create Cue"] = Step_CreateCueAsync;
+		}
+
+		public override Task CancelAsync()
+		{
+			IsCanceled = true;
+			FinalizeDownload();
+			return Task.CompletedTask;
 		}
 
 		protected override async Task<bool> Step_DownloadAndDecryptAudiobookAsync()
 		{
-			await InputFileStream.DownloadTask;
+			TaskCompletionSource completionSource = new();
+
+			InputFileStream.DownloadCompleted += (_, _) => completionSource.SetResult();
+
+			await completionSource.Task;
 
 			if (IsCanceled)
 				return false;
 			else
 			{
 				FinalizeDownload();
-				var tempFile = GetNewTempFilePath(DownloadOptions.OutputFormat.ToString());
-				FileUtility.SaferMove(InputFileStream.SaveFilePath, tempFile.FilePath);
-				OnTempFileCreated(tempFile);
+				FileUtility.SaferMove(InputFileStream.SaveFilePath, OutputFileName);
+				OnFileCreated(OutputFileName);
 				return true;
 			}
 		}

Source/AppScaffolding/AppScaffolding.csproj

@@ -1,15 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
-    <Version>12.5.3.1</Version>
+    <TargetFramework>net7.0</TargetFramework>
+    <Version>10.0.2.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.File" Version="7.0.0" />
+    <PackageReference Include="Octokit" Version="5.0.2" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\ApplicationServices\ApplicationServices.csproj" />
@@ -22,4 +18,4 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
     <DebugType>embedded</DebugType>
   </PropertyGroup>
-</Project>
+</Project>

Source/AppScaffolding/LibationScaffolding.cs

@@ -1,22 +1,21 @@
-using ApplicationServices;
-using AudibleUtilities;
-using Dinah.Core.IO;
-using Dinah.Core.Logging;
-using LibationFileManager;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
-using Serilog;
-using System;
+using System;
 using System.Collections.Generic;
-using System.Diagnostics;
 using System.IO;
 using System.Linq;
 using System.Reflection;
+using ApplicationServices;
+using AudibleUtilities;
+using Dinah.Core;
+using Dinah.Core.IO;
+using Dinah.Core.Logging;
+using LibationFileManager;
 using System.Runtime.InteropServices;
+using Newtonsoft.Json.Linq;
+using Serilog;
 
 namespace AppScaffolding
 {
-    public enum ReleaseIdentifier
+	public enum ReleaseIdentifier
 	{
 		None,
 		WindowsClassic = OS.Windows | Variety.Classic | Architecture.X64,
@@ -44,6 +43,21 @@ namespace AppScaffolding
 		public static ReleaseIdentifier ReleaseIdentifier { get; private set; }
 		public static Variety Variety { get; private set; }
 
+		public static void SetReleaseIdentifier(Variety varietyType)
+		{
+			Variety = Enum.IsDefined(varietyType) ? varietyType : Variety.None;
+
+			var releaseID = (ReleaseIdentifier)((int)varietyType | (int)Configuration.OS | (int)RuntimeInformation.ProcessArchitecture);
+
+			if (Enum.IsDefined(releaseID))
+				ReleaseIdentifier = releaseID;
+			else
+			{
+				ReleaseIdentifier = ReleaseIdentifier.None;
+				Serilog.Log.Logger.Warning("Unknown release identifier @{DebugInfo}", new { Variety = varietyType, Configuration.OS, RuntimeInformation.ProcessArchitecture });
+			}
+		}
+
 		// AppScaffolding
 		private static Assembly _executingAssembly;
 		private static Assembly ExecutingAssembly
@@ -88,20 +102,11 @@ namespace AppScaffolding
 			//
 
 			Migrations.migrate_to_v6_6_9(config);
-            Migrations.migrate_to_v11_5_0(config);
-			Migrations.migrate_to_v11_6_5(config);
-			Migrations.migrate_to_v12_0_1(config);
 		}
 
 		/// <summary>Initialize logging. Wire-up events. Run after migration</summary>
-		public static void RunPostMigrationScaffolding(Variety variety, Configuration config)
+		public static void RunPostMigrationScaffolding(Configuration config)
 		{
-			Variety = Enum.IsDefined(variety) ? variety : Variety.None;
-
-			var releaseID = (ReleaseIdentifier)((int)variety | (int)Configuration.OS | (int)RuntimeInformation.ProcessArchitecture);
-
-			ReleaseIdentifier = Enum.IsDefined(releaseID) ? releaseID : ReleaseIdentifier.None;
-
 			ensureSerilogConfig(config);
 			configureLogging(config);
 			logStartupState(config);
@@ -113,35 +118,14 @@ namespace AppScaffolding
 
 		private static void ensureSerilogConfig(Configuration config)
 		{
-			if (config.GetObject("Serilog") is JObject serilog)
-			{
-				bool fileChanged = false;
-				if (serilog.SelectToken("$.WriteTo[?(@.Name == 'ZipFile')]", false) is JObject zipFileSink)
-				{
-					zipFileSink["Name"] = "File";
-					fileChanged = true;
-				}
-				var hooks = typeof(FileSinkHook).AssemblyQualifiedName;
-				if (serilog.SelectToken("$.WriteTo[?(@.Name == 'File')].Args", false) is JObject fileSinkArgs
-					&& fileSinkArgs["hooks"]?.Value<string>() != hooks)
-				{
-					fileSinkArgs["hooks"] = hooks;
-					fileChanged = true;
-				}
-
-				if (fileChanged)
-					config.SetNonString(serilog.DeepClone(), "Serilog");
+			if (config.GetObject("Serilog") is not null)
 				return;
-			}
 
 			var serilogObj = new JObject
 			{
 				{ "MinimumLevel", "Information" },
 				{ "WriteTo", new JArray
 					{
-						// ABOUT SINKS
-						// Only File sink is currently used. By user request (June 2024) others packages are included for experimental use.
-
 						// new JObject { {"Name", "Console" } }, // this has caused more problems than it's solved
 						new JObject
 						{
@@ -150,7 +134,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, "_Log.log") },
 									{ "rollingInterval", "Month" },
 									// Serilog template formatting examples
 									// - default:                    "{Timestamp:yyyy-MM-dd HH:mm:ss.fff zzz} [{Level:u3}] {Message:lj}{NewLine}{Exception}"
@@ -158,8 +142,7 @@ namespace AppScaffolding
 									// - with class and method info: "{Timestamp:yyyy-MM-dd HH:mm:ss.fff zzz} [{Level:u3}] (at {Caller}) {Message:lj}{NewLine}{Exception}";
 									//   output example:             2019-11-26 08:48:40.224 -05:00 [DBG] (at LibationWinForms.Program.init()) Begin Libation
 									// {Properties:j} needed for expanded exception logging
-									{ "outputTemplate", "{Timestamp:yyyy-MM-dd HH:mm:ss.fff zzz} [{Level:u3}] (at {Caller}) {Message:lj}{NewLine}{Exception} {Properties:j}" },
-									{ "hooks", typeof(FileSinkHook).AssemblyQualifiedName }, // for FileSinkHook
+									{ "outputTemplate", "{Timestamp:yyyy-MM-dd HH:mm:ss.fff zzz} [{Level:u3}] (at {Caller}) {Message:lj}{NewLine}{Exception} {Properties:j}" }
 								}
 							}
 						}
@@ -246,20 +229,12 @@ namespace AppScaffolding
 
 			// begin logging session with a form feed
 			Log.Logger.Information("\r\n\f");
-
-			static int fileCount(FileManager.LongPath longPath)
-            {
-                try { return FileManager.FileUtility.SaferEnumerateFiles(longPath).Count(); }
-                catch { return -1; }
-            }
-
-            Log.Logger.Information("Begin. {@DebugInfo}", new
+			Log.Logger.Information("Begin. {@DebugInfo}", new
 			{
 				AppName = EntryAssembly.GetName().Name,
 				Version = BuildVersion.ToString(),
 				ReleaseIdentifier,
 				Configuration.OS,
-                Environment.OSVersion,
                 InteropFactory.InteropFunctionsType,
                 Mode = mode,
 				LogLevel_Verbose_Enabled = Log.Logger.IsVerboseEnabled(),
@@ -269,7 +244,6 @@ namespace AppScaffolding
 				LogLevel_Error_Enabled = Log.Logger.IsErrorEnabled(),
 				LogLevel_Fatal_Enabled = Log.Logger.IsFatalEnabled(),
 
-                config.AutoScan,
                 config.BetaOptIn,
                 config.UseCoverAsFolderIcon,
                 config.LibationFiles,
@@ -278,48 +252,52 @@ namespace AppScaffolding
 				config.InProgress,
 
 				AudibleFileStorage.DownloadsInProgressDirectory,
-				DownloadsInProgressFiles = fileCount(AudibleFileStorage.DownloadsInProgressDirectory),
+				DownloadsInProgressFiles = FileManager.FileUtility.SaferEnumerateFiles(AudibleFileStorage.DownloadsInProgressDirectory).Count(),
 
 				AudibleFileStorage.DecryptInProgressDirectory,
-				DecryptInProgressFiles = fileCount(AudibleFileStorage.DecryptInProgressDirectory),
-
-                disableIPv6 = AppContext.TryGetSwitch("System.Net.DisableIPv6", out bool disableIPv6Value),
+				DecryptInProgressFiles = FileManager.FileUtility.SaferEnumerateFiles(AudibleFileStorage.DecryptInProgressDirectory).Count(),
 			});
 
-			if (InteropFactory.InteropFunctionsType is null)
+            if (InteropFactory.InteropFunctionsType is null)
                 Serilog.Log.Logger.Warning("WARNING: OSInteropProxy.InteropFunctionsType is null");
         }
 
         private static void wireUpSystemEvents(Configuration configuration)
 		{
-			LibraryCommands.LibrarySizeChanged += (object _, List<DataLayer.LibraryBook> libraryBooks)
-				=> SearchEngineCommands.FullReIndex(libraryBooks);
-
-			LibraryCommands.BookUserDefinedItemCommitted += (_, books)
-				=> SearchEngineCommands.UpdateBooks(books);
+			LibraryCommands.LibrarySizeChanged += (_, __) => SearchEngineCommands.FullReIndex();
+			LibraryCommands.BookUserDefinedItemCommitted += (_, books) => SearchEngineCommands.UpdateBooks(books);
 		}
 
 		public static UpgradeProperties GetLatestRelease()
 		{
 			// timed out
-			(var version, var latest, var zip) = getLatestRelease(TimeSpan.FromSeconds(10));
+			(var latest, var zip) = getLatestRelease(TimeSpan.FromSeconds(10));
 
-			if (version is null || latest is null || zip is null)
+			if (latest is null || zip is null)
+				return null;
+
+			var latestVersionString = latest.TagName.Trim('v');
+			if (!Version.TryParse(latestVersionString, out var latestRelease))
+				return null;
+
+			// we're up to date
+			if (latestRelease <= BuildVersion)
 				return null;
 
 			// we have an update
+
 			var zipUrl = zip?.BrowserDownloadUrl;
 
 			Log.Logger.Information("Update available: {@DebugInfo}", new
 			{
-				latestRelease = version.ToString(),
+				latestRelease = latestRelease.ToString(),
 				latest.HtmlUrl,
 				zipUrl
 			});
 
-			return new(zipUrl, latest.HtmlUrl, zip.Name, version, latest.Body);
+			return new(zipUrl, latest.HtmlUrl, zip.Name, latestRelease, latest.Body);
 		}
-		private static (Version releaseVersion, Octokit.Release, Octokit.ReleaseAsset) getLatestRelease(TimeSpan timeout)
+		private static (Octokit.Release, Octokit.ReleaseAsset) getLatestRelease(TimeSpan timeout)
 		{
 			try
 			{
@@ -333,41 +311,25 @@ namespace AppScaffolding
 			{
 				Log.Logger.Error(aggEx, "Checking for new version too often");
 			}
-			return (null, null, null);
+			return (null, null);
 		}
-		private static async System.Threading.Tasks.Task<(Version releaseVersion, Octokit.Release, Octokit.ReleaseAsset)> getLatestRelease()
+		private static async System.Threading.Tasks.Task<(Octokit.Release, Octokit.ReleaseAsset)> getLatestRelease()
 		{
 			const string ownerAccount = "rmcrackan";
 			const string repoName = "Libation";
 
 			var gitHubClient = new Octokit.GitHubClient(new Octokit.ProductHeaderValue(repoName));
 
-			//https://docs.github.com/en/rest/releases/releases?apiVersion=2022-11-28#get-the-latest-release
-			var latestRelease = await gitHubClient.Repository.Release.GetLatest(ownerAccount, repoName);
-
-			//Ensure that latest release is greater than the current version
-			var latestVersionString = latestRelease.TagName.Trim('v');
-			if (!Version.TryParse(latestVersionString, out var releaseVersion) || releaseVersion <= BuildVersion)
-				return (null, null, null);
-
 			//Download the release index
 			var bts = await gitHubClient.Repository.Content.GetRawContent(ownerAccount, repoName, ".releaseindex.json");
 			var releaseIndex = JObject.Parse(System.Text.Encoding.ASCII.GetString(bts));
-
-			string regexPattern;
-
-			try
-			{
-				regexPattern = releaseIndex.Value<string>(InteropFactory.Create().ReleaseIdString);
-			}
-			catch
-			{
-				regexPattern = releaseIndex.Value<string>(ReleaseIdentifier.ToString());
-			}
-
+			var regexPattern = releaseIndex.Value<string>(ReleaseIdentifier.ToString());
 			var regex = new System.Text.RegularExpressions.Regex(regexPattern, System.Text.RegularExpressions.RegexOptions.IgnoreCase);
 
-			return (releaseVersion, latestRelease, latestRelease?.Assets?.FirstOrDefault(a => regex.IsMatch(a.Name)));
+			//https://docs.github.com/en/rest/releases/releases?apiVersion=2022-11-28#get-the-latest-release
+			var latestRelease = await gitHubClient.Repository.Release.GetLatest(ownerAccount, repoName);
+
+			return (latestRelease, latestRelease?.Assets?.FirstOrDefault(a => regex.IsMatch(a.Name)));
 		}
 	}
 
@@ -419,139 +381,5 @@ namespace AppScaffolding
 				UNSAFE_MigrationHelper.Settings_AddUniqueToArray("Serilog.Enrich", "WithExceptionDetails");
 			}
 		}
-
-        class FilterState_6_6_9
-        {
-            public bool UseDefault { get; set; }
-            public List<string> Filters { get; set; } = new();
-        }
-
-		public static void migrate_to_v12_0_1(Configuration config)
-		{
-#nullable enable
-			//Migrate from version 1 file cache to the dictionary-based version 2 cache
-			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);
-
-			if (!File.Exists(jsonFileV2) && File.Exists(jsonFileV1))
-			{
-				try
-				{
-					//FilePathCache loads the cache in its static constructor,
-					//so perform migration without using FilePathCache.CacheEntry
-					if (JArray.Parse(File.ReadAllText(jsonFileV1)) is not JArray v1Cache || v1Cache.Count == 0)
-						return;
-
-					Dictionary<string, JArray> cache = new();
-
-					//Convert to c# objects to speed up searching by ID inside the iterator 
-					var allItems
-						= v1Cache
-						.Select(i => new
-						{
-							Id = i["Id"]?.Value<string>(),
-							Path = i["Path"]?["Path"]?.Value<string>()
-						}).Where(i => i.Id != null)
-						.ToArray();
-
-					foreach (var id in allItems.Select(i => i.Id).OfType<string>().Distinct())
-					{
-						//Use this opportunity to purge non-existent files and re-classify file types
-						//(due to *.aax files previously not being classified as FileType.AAXC)
-						var items = allItems
-							.Where(i => i.Id == id && File.Exists(i.Path))
-							.Select(i => new JObject
-							{
-								{ "Id", i.Id },
-								{ "FileType", (int)FileTypes.GetFileTypeFromPath(i.Path) },
-								{ "Path", new JObject{ { "Path", i.Path } } }
-							})
-							.ToArray();
-
-						if (items.Length == 0)
-							continue;
-
-						cache[id] = new JArray(items);
-					}
-
-					var cacheJson = new JObject { { "Dictionary", JObject.FromObject(cache) } };
-					var cacheFileText = cacheJson.ToString(Formatting.Indented);
-
-					void migrate()
-					{
-						File.WriteAllText(jsonFileV2, cacheFileText);
-						File.Delete(jsonFileV1);
-					}
-
-					try { migrate(); }
-					catch (IOException)
-					{
-						try { migrate(); }
-						catch (IOException)
-						{
-							migrate();
-						}
-					}
-				}
-				catch { /* eat */ }
-			}
-#nullable restore
-		}
-
-		public static void migrate_to_v11_6_5(Configuration config)
-		{
-			//Settings migration for unsupported sample rates (#1116)
-			if (config.MaxSampleRate < AAXClean.SampleRate.Hz_8000)
-				config.MaxSampleRate = AAXClean.SampleRate.Hz_8000;
-			else if (config.MaxSampleRate > AAXClean.SampleRate.Hz_48000)
-				config.MaxSampleRate = AAXClean.SampleRate.Hz_48000;
-		}
-
-		public static void migrate_to_v11_5_0(Configuration config)
-        {
-            // Read file, but convert old format to new (with Name field) as necessary.
-            if (!File.Exists(QuickFilters.JsonFile))
-            {
-                QuickFilters.InMemoryState = new();
-                return;
-            }
-
-            try
-            {
-                if (JsonConvert.DeserializeObject<QuickFilters.FilterState>(File.ReadAllText(QuickFilters.JsonFile))
-                    is QuickFilters.FilterState inMemState)
-                {
-                    QuickFilters.InMemoryState = inMemState;
-                    return;
-                }
-            }
-            catch
-            {
-                // Eat
-            }
-
-            try
-            {
-                if (JsonConvert.DeserializeObject<FilterState_6_6_9>(File.ReadAllText(QuickFilters.JsonFile))
-                    is FilterState_6_6_9 inMemState)
-                {
-                    // Copy old structure to new.
-                    QuickFilters.InMemoryState = new();
-                    QuickFilters.InMemoryState.UseDefault = inMemState.UseDefault;
-                    foreach (var oldFilter in inMemState.Filters)
-                        QuickFilters.InMemoryState.Filters.Add(new QuickFilters.NamedFilter(oldFilter, null));
-
-                    return;
-                }
-                Debug.Assert(false, "Should not get here, QuickFilters.json deserialization issue");
-            }
-            catch
-            {
-				// Eat
-            }
-        }
-    }
+	}
 }

Source/ApplicationServices/ApplicationServices.csproj

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

Source/ApplicationServices/BulkSetDownloadStatus.cs

@@ -10,7 +10,7 @@ namespace ApplicationServices
 {
     public class BulkSetDownloadStatus
     {
-        private List<(string message, LiberatedStatus newStatus, IEnumerable<LibraryBook> LibraryBooks)> actionSets { get; } = new();
+        private List<(string message, LiberatedStatus newStatus, IEnumerable<Book> Books)> actionSets { get; } = new();
 
         public int Count => actionSets.Count;
 
@@ -33,7 +33,7 @@ namespace ApplicationServices
             var bookExistsList = _libraryBooks
                 .Select(libraryBook => new
                 {
-					LibraryBook = libraryBook,
+                    libraryBook.Book,
                     FileExists = AudibleFileStorage.Audio.GetPath(libraryBook.Book.AudibleProductId) is not null
                 })
                 .ToList();
@@ -41,8 +41,8 @@ namespace ApplicationServices
             if (_setDownloaded)
             {
                 var books2change = bookExistsList
-                    .Where(a => a.FileExists && a.LibraryBook.Book.UserDefinedItem.BookStatus != LiberatedStatus.Liberated)
-                    .Select(a => a.LibraryBook)
+                    .Where(a => a.FileExists && a.Book.UserDefinedItem.BookStatus != LiberatedStatus.Liberated)
+                    .Select(a => a.Book)
                     .ToList();
 
                 if (books2change.Any())
@@ -55,8 +55,8 @@ namespace ApplicationServices
             if (_setNotDownloaded)
             {
                 var books2change = bookExistsList
-                    .Where(a => !a.FileExists && a.LibraryBook.Book.UserDefinedItem.BookStatus != LiberatedStatus.NotLiberated)
-                    .Select(a => a.LibraryBook)
+                    .Where(a => !a.FileExists && a.Book.UserDefinedItem.BookStatus != LiberatedStatus.NotLiberated)
+                    .Select(a => a.Book)
                     .ToList();
 
                 if (books2change.Any())
@@ -72,7 +72,7 @@ namespace ApplicationServices
         public void Execute()
         {
             foreach (var a in actionSets)
-                a.LibraryBooks.UpdateBookStatus(a.newStatus);
+                a.Books.UpdateBookStatus(a.newStatus);
         }
     }
 }

Source/ApplicationServices/LibraryCommands.cs

@@ -15,13 +15,12 @@ using Newtonsoft.Json.Linq;
 using Serilog;
 using static DtoImporterService.PerfLogger;
 
-#nullable enable
 namespace ApplicationServices
 {
     public static class LibraryCommands
     {
-        public static event EventHandler<int>? ScanBegin;
-        public static event EventHandler<int>? ScanEnd;
+        public static event EventHandler<int> ScanBegin;
+        public static event EventHandler<int> ScanEnd;
 
         public static bool Scanning { get; private set; }
         private static object _lock { get; } = new();
@@ -32,7 +31,7 @@ namespace ApplicationServices
             ScanEnd += (_, __) => Scanning = false;
         }
 
-        public static async Task<List<LibraryBook>> FindInactiveBooks(IEnumerable<LibraryBook> existingLibrary, params Account[] accounts)
+        public static async Task<List<LibraryBook>> FindInactiveBooks(Func<Account, Task<ApiExtended>> apiExtendedfunc, IEnumerable<LibraryBook> existingLibrary, params Account[] accounts)
         {
             logRestart();
 
@@ -58,7 +57,7 @@ namespace ApplicationServices
             try
             {
                 logTime($"pre {nameof(scanAccountsAsync)} all");
-                var libraryItems = await scanAccountsAsync(accounts, libraryOptions);
+                var libraryItems = await scanAccountsAsync(apiExtendedfunc, accounts, libraryOptions);
                 logTime($"post {nameof(scanAccountsAsync)} all");
 
                 var totalCount = libraryItems.Count;
@@ -101,7 +100,7 @@ namespace ApplicationServices
         }
 
         #region FULL LIBRARY scan and import
-        public static async Task<(int totalCount, int newCount)> ImportAccountAsync(params Account[]? accounts)
+        public static async Task<(int totalCount, int newCount)> ImportAccountAsync(Func<Account, Task<ApiExtended>> apiExtendedfunc, params Account[] accounts)
         {
             logRestart();
 
@@ -120,18 +119,11 @@ namespace ApplicationServices
 
                 logTime($"pre {nameof(scanAccountsAsync)} all");
                 var libraryOptions = new LibraryOptions
-				{
-					ResponseGroups
-					    = LibraryOptions.ResponseGroupOptions.Rating | LibraryOptions.ResponseGroupOptions.Media
-					    | LibraryOptions.ResponseGroupOptions.Relationships | LibraryOptions.ResponseGroupOptions.ProductDesc
-					    | LibraryOptions.ResponseGroupOptions.Contributors | LibraryOptions.ResponseGroupOptions.ProvidedReview
-					    | LibraryOptions.ResponseGroupOptions.ProductPlans | LibraryOptions.ResponseGroupOptions.Series
-					    | LibraryOptions.ResponseGroupOptions.CategoryLadders | LibraryOptions.ResponseGroupOptions.ProductExtendedAttrs
-					    | LibraryOptions.ResponseGroupOptions.PdfUrl | LibraryOptions.ResponseGroupOptions.OriginAsin
-                        | LibraryOptions.ResponseGroupOptions.IsFinished,
-					ImageSizes = LibraryOptions.ImageSizeOptions._500 | LibraryOptions.ImageSizeOptions._1215
+                {
+                    ResponseGroups = LibraryOptions.ResponseGroupOptions.ALL_OPTIONS,
+                    ImageSizes = LibraryOptions.ImageSizeOptions._500 | LibraryOptions.ImageSizeOptions._1215
                 };
-                var importItems = await scanAccountsAsync(accounts, libraryOptions);
+                var importItems = await scanAccountsAsync(apiExtendedfunc, accounts, libraryOptions);
                 logTime($"post {nameof(scanAccountsAsync)} all");
 
                 var totalCount = importItems.Count;
@@ -223,7 +215,7 @@ namespace ApplicationServices
             {
                 int qtyChanged = await Task.Run(() => SaveContext(context));
                 if (qtyChanged > 0)
-                    await Task.Run(() => finalizeLibrarySizeChange(context));
+                    await Task.Run(finalizeLibrarySizeChange);
                 return qtyChanged;
             }
             catch (Exception ex)
@@ -233,42 +225,13 @@ namespace ApplicationServices
             }
         }
 
-		private static LogArchiver? openLogArchive(string? archivePath)
-        {
-            if (string.IsNullOrWhiteSpace(archivePath))
-                return null;
-
-            try
-            {
-                return new LogArchiver(archivePath);
-            }
-            catch (System.IO.InvalidDataException)
-            {
-                try
-                {
-					Log.Logger.Warning($"Deleting corrupted {nameof(LogArchiver)} at {archivePath}");
-                    FileUtility.SaferDelete(archivePath);
-					return new LogArchiver(archivePath);
-				}
-                catch (Exception ex)
-				{
-					Log.Logger.Error(ex, $"Failed to open {nameof(LogArchiver)} at {archivePath}");
-				}
-            }
-            catch (Exception ex)
-            {
-                Log.Logger.Error(ex, $"Failed to open {nameof(LogArchiver)} at {archivePath}");
-            }
-            return null;
-        }
-
-		private static async Task<List<ImportItem>> scanAccountsAsync(Account[] accounts, LibraryOptions libraryOptions)
+		private static async Task<List<ImportItem>> scanAccountsAsync(Func<Account, Task<ApiExtended>> apiExtendedfunc, Account[] accounts, LibraryOptions libraryOptions)
         {
             var tasks = new List<Task<List<ImportItem>>>();
 
-           await using LogArchiver? archiver
+           await using LogArchiver archiver
                 = Log.Logger.IsDebugEnabled()
-                ? openLogArchive(System.IO.Path.Combine(Configuration.Instance.LibationFiles, "LibraryScans.zip"))
+                ? new LogArchiver(System.IO.Path.Combine(Configuration.Instance.LibationFiles, "LibraryScans.zip"))
                 : default;
 
 			archiver?.DeleteAllButNewestN(20);
@@ -278,7 +241,7 @@ namespace ApplicationServices
                 try
                 {
                     // get APIs in serial b/c of logins. do NOT move inside of parallel (Task.WhenAll)
-                    var apiExtended = await ApiExtended.CreateAsync(account);
+                    var apiExtended = await apiExtendedfunc(account);
 
                     // add scanAccountAsync as a TASK: do not await
                     tasks.Add(scanAccountAsync(apiExtended, account, libraryOptions, archiver));
@@ -296,13 +259,13 @@ namespace ApplicationServices
             return importItems;
         }
 
-        private static async Task<List<ImportItem>> scanAccountAsync(ApiExtended apiExtended, Account account, LibraryOptions libraryOptions, LogArchiver? archiver)
+        private static async Task<List<ImportItem>> scanAccountAsync(ApiExtended apiExtended, Account account, LibraryOptions libraryOptions, LogArchiver archiver)
         {
             ArgumentValidator.EnsureNotNull(account, nameof(account));
 
             Log.Logger.Information("ImportLibraryAsync. {@DebugInfo}", new
             {
-                Account = account.MaskedLogEntry ?? "[null]"
+                Account = account?.MaskedLogEntry ?? "[null]"
             });
 
             logTime($"pre scanAccountAsync {account.AccountName}");
@@ -324,7 +287,7 @@ namespace ApplicationServices
 				throw new AggregateException(ex.InnerExceptions);
             }
 
-            async Task logDtoItemsAsync(IEnumerable<AudibleApi.Common.Item> dtoItems, IEnumerable<Exception>? exceptions = null)
+            async Task logDtoItemsAsync(IEnumerable<AudibleApi.Common.Item> dtoItems, IEnumerable<Exception> exceptions = null)
             {
 				if (archiver is not null)
 				{
@@ -359,7 +322,7 @@ namespace ApplicationServices
 
             // this is any changes at all to the database, not just new books
             if (qtyChanges > 0)
-                await Task.Run(() => finalizeLibrarySizeChange(context));
+                await Task.Run(() => finalizeLibrarySizeChange());
             logTime("importIntoDbAsync -- post finalizeLibrarySizeChange");
 
             return newCount;
@@ -399,16 +362,16 @@ namespace ApplicationServices
 
                 using var context = DbContexts.GetContext();
 
-				// Entry() NoTracking entities before SaveChanges()
-				foreach (var lb in removeLibraryBooks)
+                // Attach() NoTracking entities before SaveChanges()
+                foreach (var lb in removeLibraryBooks)
                 {
-					lb.IsDeleted = true;
-					context.Entry(lb).State = Microsoft.EntityFrameworkCore.EntityState.Modified;
-				}
+                    lb.IsDeleted = true;
+                    context.Attach(lb).State = Microsoft.EntityFrameworkCore.EntityState.Modified;
+                }
 
                 var qtyChanges = context.SaveChanges();
                 if (qtyChanges > 0)
-                    finalizeLibrarySizeChange(context);
+                    finalizeLibrarySizeChange();
 
                 return qtyChanges;
             }
@@ -428,16 +391,16 @@ namespace ApplicationServices
 
                 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;
-				}
+                // Attach() NoTracking entities before SaveChanges()
+                foreach (var lb in libraryBooks)
+                {
+                    lb.IsDeleted = false;
+                    context.Attach(lb).State = Microsoft.EntityFrameworkCore.EntityState.Modified;
+                }
 
                 var qtyChanges = context.SaveChanges();
                 if (qtyChanges > 0)
-                    finalizeLibrarySizeChange(context);
+                    finalizeLibrarySizeChange();
 
                 return qtyChanges;
             }
@@ -462,7 +425,7 @@ namespace ApplicationServices
 
                 var qtyChanges = context.SaveChanges();
 				if (qtyChanges > 0)
-					finalizeLibrarySizeChange(context);
+					finalizeLibrarySizeChange();
 
 				return qtyChanges;
             }
@@ -475,37 +438,33 @@ namespace ApplicationServices
         #endregion
 
         // call this whenever books are added or removed from library
-        private static void finalizeLibrarySizeChange(LibationContext context)
-        {
-            var library = context.GetLibrary_Flat_NoTracking(includeParents: true);
-            LibrarySizeChanged?.Invoke(null, library);
-        }
+        private static void finalizeLibrarySizeChange() => LibrarySizeChanged?.Invoke(null, null);
 
         /// <summary>Occurs when the size of the library changes. ie: books are added or removed</summary>
-        public static event EventHandler<List<LibraryBook>>? LibrarySizeChanged;
+        public static event EventHandler LibrarySizeChanged;
 
         /// <summary>
         /// Occurs when the size of the library does not change but book(s) details do. Especially when <see cref="UserDefinedItem.Tags"/>, <see cref="UserDefinedItem.BookStatus"/>, or <see cref="UserDefinedItem.PdfStatus"/> changed values are successfully persisted.
         /// </summary>
-        public static event EventHandler<IEnumerable<LibraryBook>>? BookUserDefinedItemCommitted;
+        public static event EventHandler<IEnumerable<Book>> BookUserDefinedItemCommitted;
 
         #region Update book details
         public static int UpdateUserDefinedItem(
-            this LibraryBook lb,
-            string? tags = null,
+            this Book book,
+            string tags = null,
             LiberatedStatus? bookStatus = null,
             LiberatedStatus? pdfStatus = null,
-            Rating? rating = null)
-            => new[] { lb }.UpdateUserDefinedItem(tags, bookStatus, pdfStatus, rating);
+            Rating rating = null)
+            => new[] { book }.UpdateUserDefinedItem(tags, bookStatus, pdfStatus, rating);
 
         public static int UpdateUserDefinedItem(
-            this IEnumerable<LibraryBook> lb,
-            string? tags = null,
+            this IEnumerable<Book> books,
+            string tags = null,
             LiberatedStatus? bookStatus = null,
             LiberatedStatus? pdfStatus = null,
-            Rating? rating = null)
+            Rating rating = null)
             => updateUserDefinedItem(
-                lb,
+                books,
                 udi => {
                     // blank tags are expected. null tags are not
                     if (tags is not null)
@@ -521,54 +480,66 @@ 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 int UpdateBookStatus(this Book book, LiberatedStatus bookStatus, Version libationVersion)
+            => book.UpdateUserDefinedItem(udi => { udi.BookStatus = bookStatus; udi.SetLastDownloaded(libationVersion); });
+        public static int UpdateBookStatus(this Book book, LiberatedStatus bookStatus)
+            => book.UpdateUserDefinedItem(udi => udi.BookStatus = bookStatus);
+        public static int UpdateBookStatus(this IEnumerable<Book> books, LiberatedStatus bookStatus)
+            => books.UpdateUserDefinedItem(udi => udi.BookStatus = bookStatus);
         public static int UpdateBookStatus(this LibraryBook libraryBook, LiberatedStatus bookStatus)
             => libraryBook.UpdateUserDefinedItem(udi => udi.BookStatus = bookStatus);
         public static int UpdateBookStatus(this IEnumerable<LibraryBook> libraryBooks, LiberatedStatus bookStatus)
             => libraryBooks.UpdateUserDefinedItem(udi => udi.BookStatus = bookStatus);
 
+        public static int UpdatePdfStatus(this Book book, LiberatedStatus pdfStatus)
+            => book.UpdateUserDefinedItem(udi => udi.SetPdfStatus(pdfStatus));
+        public static int UpdatePdfStatus(this IEnumerable<Book> books, LiberatedStatus pdfStatus)
+            => books.UpdateUserDefinedItem(udi => udi.SetPdfStatus(pdfStatus));
         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 int UpdateTags(this Book book, string tags)
+            => book.UpdateUserDefinedItem(udi => udi.Tags = tags);
+        public static int UpdateTags(this IEnumerable<Book> books, string tags)
+            => books.UpdateUserDefinedItem(udi => udi.Tags = tags);
         public static int UpdateTags(this LibraryBook libraryBook, string tags)
             => libraryBook.UpdateUserDefinedItem(udi => udi.Tags = tags);
         public static int UpdateTags(this IEnumerable<LibraryBook> libraryBooks, string tags)
             => libraryBooks.UpdateUserDefinedItem(udi => udi.Tags = tags);
 
         public static int UpdateUserDefinedItem(this LibraryBook libraryBook, Action<UserDefinedItem> action)
-            => libraryBook.updateUserDefinedItem(action);
+            => libraryBook.Book.updateUserDefinedItem(action);
         public static int UpdateUserDefinedItem(this IEnumerable<LibraryBook> libraryBooks, Action<UserDefinedItem> action)
-            => libraryBooks.updateUserDefinedItem(action);
+            => libraryBooks.Select(lb => lb.Book).updateUserDefinedItem(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 int UpdateUserDefinedItem(this Book book, Action<UserDefinedItem> action) => book.updateUserDefinedItem(action);
+        public static int UpdateUserDefinedItem(this IEnumerable<Book> books, Action<UserDefinedItem> action) => books.updateUserDefinedItem(action);
+
+        private static int updateUserDefinedItem(this Book book, Action<UserDefinedItem> action) => new[] { book }.updateUserDefinedItem(action);
+        private static int updateUserDefinedItem(this IEnumerable<Book> books, Action<UserDefinedItem> action)
         {
             try
             {
-                if (libraryBooks is null || !libraryBooks.Any())
+                if (books is null || !books.Any())
                     return 0;
 
+                foreach (var book in books)
+                    action?.Invoke(book.UserDefinedItem);
+
                 using var context = DbContexts.GetContext();
 
-				// Entry() instead of Attach() due to possible stack overflow with large tables
-				foreach (var book in libraryBooks)
+                // Attach() NoTracking entities before SaveChanges()
+                foreach (var book in books)
                 {
-					action?.Invoke(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;
-				}
+                    context.Attach(book.UserDefinedItem).State = Microsoft.EntityFrameworkCore.EntityState.Modified;
+                    context.Attach(book.UserDefinedItem.Rating).State = Microsoft.EntityFrameworkCore.EntityState.Modified;
+                }
 
                 var qtyChanges = context.SaveChanges();
                 if (qtyChanges > 0)
-                    BookUserDefinedItemCommitted?.Invoke(null, libraryBooks);
+                    BookUserDefinedItemCommitted?.Invoke(null, books);
 
                 return qtyChanges;
             }
@@ -629,15 +600,13 @@ namespace ApplicationServices
                 return sb.ToString();
 			}
 		}
-
-        public static LibraryStats GetCounts(IEnumerable<LibraryBook>? libraryBooks = null)
+        public static LibraryStats GetCounts(IEnumerable<LibraryBook> libraryBooks = null)
         {
             libraryBooks ??= DbContexts.GetLibrary_Flat_NoTracking();
 
             var results = libraryBooks
                 .AsParallel()
-				.WithoutParents()
-				.Select(lb => new { absent = lb.AbsentFromLastScan, status = Liberated_Status(lb.Book) })
+                .Select(lb => new { absent = lb.AbsentFromLastScan, status = Liberated_Status(lb.Book) })
                 .ToList();
 
             var booksFullyBackedUp = results.Count(r => r.status == LiberatedStatus.Liberated);

Source/ApplicationServices/LibraryExporter.cs

@@ -4,8 +4,8 @@ using System.Linq;
 using CsvHelper;
 using CsvHelper.Configuration.Attributes;
 using DataLayer;
-using Newtonsoft.Json;
 using NPOI.XSSF.UserModel;
+using Serilog;
 
 namespace ApplicationServices
 {
@@ -35,9 +35,6 @@ namespace ApplicationServices
 		[Name("Title")]
 		public string Title { get; set; }
 
-		[Name("Subtitle")]
-		public string Subtitle { get; set; }
-
 		[Name("Authors")]
 		public string AuthorNames { get; set; }
 
@@ -104,6 +101,9 @@ namespace ApplicationServices
 		[Name("Content Type")]
 		public string ContentType { get; set; }
 
+        [Name("Audio Format")]
+		public string AudioFormat { get; set; }
+
 		[Name("Language")]
         public string Language { get; set; }
 
@@ -112,32 +112,7 @@ namespace ApplicationServices
 
 		[Name("LastDownloadedVersion")]
         public string LastDownloadedVersion { get; set; }
-
-		[Name("IsFinished")]
-        public bool IsFinished { get; set; }
-
-		[Name("IsSpatial")]
-		public bool IsSpatial { get; set; }
-
-		[Name("Last Downloaded File Version")]
-		public string LastDownloadedFileVersion { get; set; }
-
-		[Ignore /* csv ignore */]
-		public AudioFormat LastDownloadedFormat { get; set; }
-
-		[Name("Last Downloaded Codec"), JsonIgnore]
-		public string CodecString => LastDownloadedFormat?.CodecString ?? "";
-
-		[Name("Last Downloaded Sample rate"), JsonIgnore]
-		public int? SampleRate => LastDownloadedFormat?.SampleRate;
-
-		[Name("Last Downloaded Audio Channels"), JsonIgnore]
-		public int? ChannelCount => LastDownloadedFormat?.ChannelCount;
-
-		[Name("Last Downloaded Bitrate"), JsonIgnore]
-		public int? BitRate => LastDownloadedFormat?.BitRate;
-	}
-
+    }
 	public static class LibToDtos
 	{
 		public static List<ExportDto> ToDtos(this IEnumerable<LibraryBook> library)
@@ -148,7 +123,6 @@ namespace ApplicationServices
 				AudibleProductId = a.Book.AudibleProductId,
 				Locale = a.Book.Locale,
 				Title = a.Book.Title,
-				Subtitle = a.Book.Subtitle,
 				AuthorNames = a.Book.AuthorNames(),
 				NarratorNames = a.Book.NarratorNames(),
 				LengthInMinutes = a.Book.LengthInMinutes,
@@ -157,30 +131,26 @@ namespace ApplicationServices
 				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(),
-				CommunityRatingPerformance = a.Book.Rating?.PerformanceRating.ZeroIsNull(),
-				CommunityRatingStory = a.Book.Rating?.StoryRating.ZeroIsNull(),
+				CommunityRatingOverall = a.Book.Rating?.OverallRating,
+				CommunityRatingPerformance = a.Book.Rating?.PerformanceRating,
+				CommunityRatingStory = a.Book.Rating?.StoryRating,
 				PictureId = a.Book.PictureId,
 				IsAbridged = a.Book.IsAbridged,
 				DatePublished = a.Book.DatePublished,
-				CategoriesNames = string.Join("; ", a.Book.LowestCategoryNames()),
-				MyRatingOverall = a.Book.UserDefinedItem.Rating.OverallRating.ZeroIsNull(),
-				MyRatingPerformance = a.Book.UserDefinedItem.Rating.PerformanceRating.ZeroIsNull(),
-				MyRatingStory = a.Book.UserDefinedItem.Rating.StoryRating.ZeroIsNull(),
+				CategoriesNames = a.Book.CategoriesNames().Any() ? a.Book.CategoriesNames().Aggregate((a, b) => $"{a}, {b}") : "",
+				MyRatingOverall = a.Book.UserDefinedItem.Rating.OverallRating,
+				MyRatingPerformance = a.Book.UserDefinedItem.Rating.PerformanceRating,
+				MyRatingStory = a.Book.UserDefinedItem.Rating.StoryRating,
 				MyLibationTags = a.Book.UserDefinedItem.Tags,
 				BookStatus = a.Book.UserDefinedItem.BookStatus.ToString(),
 				PdfStatus = a.Book.UserDefinedItem.PdfStatus.ToString(),
 				ContentType = a.Book.ContentType.ToString(),
+				AudioFormat = a.Book.AudioFormat.ToString(),
 				Language = a.Book.Language,
 				LastDownloaded = a.Book.UserDefinedItem.LastDownloaded,
 				LastDownloadedVersion = a.Book.UserDefinedItem.LastDownloadedVersion?.ToString() ?? "",
-				IsFinished = a.Book.UserDefinedItem.IsFinished,
-				IsSpatial = a.Book.IsSpatial,
-				LastDownloadedFileVersion = a.Book.UserDefinedItem.LastDownloadedFileVersion ?? "",
-				LastDownloadedFormat = a.Book.UserDefinedItem.LastDownloadedFormat
-			}).ToList();
 
-		private static float? ZeroIsNull(this float value) => value is 0 ? null : value;
+			}).ToList();
 	}
 	public static class LibraryExporter
 	{
@@ -189,6 +159,7 @@ namespace ApplicationServices
 			var dtos = DbContexts.GetLibrary_Flat_NoTracking().ToDtos();
 			if (!dtos.Any())
 				return;
+
 			using var writer = new System.IO.StreamWriter(saveFilePath);
 			using var csv = new CsvWriter(writer, System.Globalization.CultureInfo.CurrentCulture);
 
@@ -200,7 +171,7 @@ namespace ApplicationServices
 		public static void ToJson(string saveFilePath)
 		{
 			var dtos = DbContexts.GetLibrary_Flat_NoTracking().ToDtos();
-			var json = JsonConvert.SerializeObject(dtos, Formatting.Indented);
+			var json = Newtonsoft.Json.JsonConvert.SerializeObject(dtos, Newtonsoft.Json.Formatting.Indented);
 			System.IO.File.WriteAllText(saveFilePath, json);
 		}
 
@@ -227,7 +198,6 @@ namespace ApplicationServices
 				nameof(ExportDto.AudibleProductId),
 				nameof(ExportDto.Locale),
 				nameof(ExportDto.Title),
-				nameof(ExportDto.Subtitle),
 				nameof(ExportDto.AuthorNames),
 				nameof(ExportDto.NarratorNames),
 				nameof(ExportDto.LengthInMinutes),
@@ -250,16 +220,10 @@ namespace ApplicationServices
 				nameof(ExportDto.BookStatus),
 				nameof(ExportDto.PdfStatus),
 				nameof(ExportDto.ContentType),
+				nameof(ExportDto.AudioFormat),
                 nameof(ExportDto.Language),
                 nameof(ExportDto.LastDownloaded),
                 nameof(ExportDto.LastDownloadedVersion),
-                nameof(ExportDto.IsFinished),
-                nameof(ExportDto.IsSpatial),
-                nameof(ExportDto.LastDownloadedFileVersion),
-                nameof(ExportDto.CodecString),
-                nameof(ExportDto.SampleRate),
-                nameof(ExportDto.ChannelCount),
-                nameof(ExportDto.BitRate)
             };
 			var col = 0;
 			foreach (var c in columns)
@@ -280,14 +244,18 @@ namespace ApplicationServices
 			foreach (var dto in dtos)
 			{
 				col = 0;
-				row = sheet.CreateRow(rowIndex++);
+
+				row = sheet.CreateRow(rowIndex);
 
 				row.CreateCell(col++).SetCellValue(dto.Account);
-				row.CreateCell(col++).SetCellValue(dto.DateAdded).CellStyle = dateStyle;
+
+				var dateCell = row.CreateCell(col++);
+				dateCell.CellStyle = dateStyle;
+				dateCell.SetCellValue(dto.DateAdded);
+
 				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);
@@ -296,46 +264,56 @@ namespace ApplicationServices
 				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);
+
+				col = createCell(row, col, dto.CommunityRatingOverall);
+				col = createCell(row, col, dto.CommunityRatingPerformance);
+				col = createCell(row, col, dto.CommunityRatingStory);
+
 				row.CreateCell(col++).SetCellValue(dto.PictureId);
 				row.CreateCell(col++).SetCellValue(dto.IsAbridged);
-				row.CreateCell(col++).SetCellValue(dto.DatePublished).CellStyle = dateStyle;
+
+				var datePubCell = row.CreateCell(col++);
+				datePubCell.CellStyle = dateStyle;
+				if (dto.DatePublished.HasValue)
+					datePubCell.SetCellValue(dto.DatePublished.Value);
+				else
+					datePubCell.SetCellValue("");
+
 				row.CreateCell(col++).SetCellValue(dto.CategoriesNames);
-				row.CreateCell(col++).SetCellValue(dto.MyRatingOverall);
-				row.CreateCell(col++).SetCellValue(dto.MyRatingPerformance);
-				row.CreateCell(col++).SetCellValue(dto.MyRatingStory);
+
+				col = createCell(row, col, dto.MyRatingOverall);
+				col = createCell(row, col, dto.MyRatingPerformance);
+				col = createCell(row, col, 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.CreateCell(col++).SetCellValue(dto.AudioFormat);
+                row.CreateCell(col++).SetCellValue(dto.Language);
+
+				if (dto.LastDownloaded.HasValue)
+				{
+					dateCell = row.CreateCell(col);
+					dateCell.CellStyle = dateStyle;
+					dateCell.SetCellValue(dto.LastDownloaded.Value);
+				}
+
+                row.CreateCell(++col).SetCellValue(dto.LastDownloadedVersion);
+
+                rowIndex++;
 			}
 
 			using var fileData = new System.IO.FileStream(saveFilePath, System.IO.FileMode.Create);
 			workbook.Write(fileData);
 		}
-
-		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 int createCell(NPOI.SS.UserModel.IRow row, int col, float? nullableFloat)
+		{
+			if (nullableFloat.HasValue)
+				row.CreateCell(col++).SetCellValue(nullableFloat.Value);
+			else
+				row.CreateCell(col++).SetCellValue("");
+			return col;
+		}
 	}
 }

Source/ApplicationServices/RecordExporter.cs

@@ -108,7 +108,7 @@ namespace ApplicationServices
 
 			var recordsObj = new JObject
 			{
-				{ "title", libraryBook.Book.TitleWithSubtitle},
+				{ "title", libraryBook.Book.Title},
 				{ "asin", libraryBook.Book.AudibleProductId},
 				{ "exportTime", DateTime.Now},
 				{ "records", JArray.FromObject(recordsEx) }

Source/ApplicationServices/SearchEngineCommands.cs

@@ -34,7 +34,7 @@ namespace ApplicationServices
 		#region Update
 		private static bool isUpdating;
 
-		public static void UpdateBooks(IEnumerable<LibraryBook> books)
+		public static void UpdateBooks(IEnumerable<Book> books)
 		{
 			// Semi-arbitrary. At some point it's more worth it to do a full re-index than to do one offs.
 			// I did not benchmark before choosing the number here
@@ -48,13 +48,11 @@ namespace ApplicationServices
 		}
 
 		public static void FullReIndex() => performSafeCommand(fullReIndex);
-		public static void FullReIndex(List<LibraryBook> libraryBooks)
-			=> performSafeCommand(se => fullReIndex(se, libraryBooks.WithoutParents()));
 
-		internal static void UpdateUserDefinedItems(LibraryBook book) => performSafeCommand(e =>
+		internal static void UpdateUserDefinedItems(Book book) => performSafeCommand(e =>
 			{
 				e.UpdateLiberatedStatus(book);
-				e.UpdateTags(book.Book.AudibleProductId, book.Book.UserDefinedItem.Tags);
+				e.UpdateTags(book.AudibleProductId, book.UserDefinedItem.Tags);
 				e.UpdateUserRatings(book);
 			}
 		);
@@ -96,11 +94,8 @@ namespace ApplicationServices
 		private static void fullReIndex(SearchEngine engine)
 		{
 			var library = DbContexts.GetLibrary_Flat_NoTracking();
-			fullReIndex(engine, library);
+			engine.CreateNewIndex(library);
 		}
-
-		private static void fullReIndex(SearchEngine engine, IEnumerable<LibraryBook> libraryBooks)
-		=> engine.CreateNewIndex(libraryBooks);
 		#endregion
 	}
 }

Source/AudibleUtilities/AccountsSettings.cs

@@ -47,22 +47,6 @@ namespace AudibleUtilities
 				update_no_validate();
 			}
 		}
-
-		private string _cdm;
-		[JsonProperty]
-		public string Cdm
-		{
-			get => _cdm;
-			set
-			{
-				if (value is null)
-					return;
-
-				_cdm = value;
-				update_no_validate();
-			}
-		}
-
 		[JsonIgnore]
 		public IReadOnlyList<Account> Accounts => _accounts_json.AsReadOnly();
 		#endregion

Source/AudibleUtilities/ApiExtended.cs

@@ -11,13 +11,11 @@ using Polly;
 using Polly.Retry;
 using System.Threading;
 
-#nullable enable
 namespace AudibleUtilities
 {
 	/// <summary>USE THIS from within Libation. It wraps the call with correct JSONPath</summary>
 	public class ApiExtended
 	{
-		public static Func<Account, ILoginChoiceEager>? LoginChoiceFactory { get; set; }
 		public Api Api { get; private set; }
 
 		private const int MaxConcurrency = 10;
@@ -26,46 +24,52 @@ namespace AudibleUtilities
 		private ApiExtended(Api api) => Api = api;
 
 		/// <summary>Get api from existing tokens else login with 'eager' choice. External browser url is provided. Response can be external browser login or continuing with native api callbacks.</summary>
+		public static async Task<ApiExtended> CreateAsync(Account account, ILoginChoiceEager loginChoiceEager)
+		{
+			Serilog.Log.Logger.Information("{@DebugInfo}", new
+			{
+				LoginType = nameof(ILoginChoiceEager),
+				Account = account?.MaskedLogEntry ?? "[null]",
+				LocaleName = account?.Locale?.Name
+			});
+
+			var api = await EzApiCreator.GetApiAsync(
+				loginChoiceEager,
+				account.Locale,
+				AudibleApiStorage.AccountsSettingsFile,
+				account.GetIdentityTokensJsonPath());
+			return new ApiExtended(api);
+		}
+
+		/// <summary>Get api from existing tokens. Assumes you have valid login tokens. Else exception</summary>
 		public static async Task<ApiExtended> CreateAsync(Account account)
 		{
 			ArgumentValidator.EnsureNotNull(account, nameof(account));
-			ArgumentValidator.EnsureNotNull(account.AccountId, nameof(account.AccountId));
 			ArgumentValidator.EnsureNotNull(account.Locale, nameof(account.Locale));
 
-			try
+			Serilog.Log.Logger.Information("{@DebugInfo}", new
 			{
-				Serilog.Log.Logger.Information("{@DebugInfo}", new
-				{
-					AccountMaskedLogEntry = account.MaskedLogEntry
-				});
+				AccountMaskedLogEntry = account.MaskedLogEntry
+			});
 
-				var api = await EzApiCreator.GetApiAsync(
-						account.Locale,
-						AudibleApiStorage.AccountsSettingsFile,
-						account.GetIdentityTokensJsonPath());
-				return new ApiExtended(api);
-			}
-			catch
+			return await CreateAsync(account.AccountId, account.Locale.Name);
+		}
+
+		/// <summary>Get api from existing tokens. Assumes you have valid login tokens. Else exception</summary>
+		public static async Task<ApiExtended> CreateAsync(string username, string localeName)
+		{
+			Serilog.Log.Logger.Information("{@DebugInfo}", new
 			{
-				if (LoginChoiceFactory is null)
-					throw new InvalidOperationException($"The UI module must first set {nameof(LoginChoiceFactory)} before attempting to create the api");
+				Username = username.ToMask(),
+				LocaleName = localeName,
+			});
 
-				Serilog.Log.Logger.Information("{@DebugInfo}", new
-				{
-					LoginType = nameof(ILoginChoiceEager),
-					Account = account.MaskedLogEntry ?? "[null]",
-					LocaleName = account.Locale?.Name
-				});
-
-				var api = await EzApiCreator.GetApiAsync(
-					LoginChoiceFactory(account),
-					account.Locale,
+			var api = await EzApiCreator.GetApiAsync(
+					Localization.Get(localeName),
 					AudibleApiStorage.AccountsSettingsFile,
-					account.GetIdentityTokensJsonPath());
-
-				return new ApiExtended(api);
-			}
-		}	
+					AudibleApiStorage.GetIdentityTokensJsonPath(username, localeName));
+			return new ApiExtended(api);
+		}
 
 		private static AsyncRetryPolicy policy { get; }
 			= Policy.Handle<Exception>()
@@ -203,11 +207,7 @@ namespace AudibleUtilities
 			try
 			{
 				var sw = Stopwatch.StartNew();
-				var items = await Api.GetCatalogProductsAsync(asins, CatalogOptions.ResponseGroupOptions.Rating | CatalogOptions.ResponseGroupOptions.Media
-					| CatalogOptions.ResponseGroupOptions.Relationships | CatalogOptions.ResponseGroupOptions.ProductDesc
-					| CatalogOptions.ResponseGroupOptions.Contributors | CatalogOptions.ResponseGroupOptions.ProvidedReview
-					| CatalogOptions.ResponseGroupOptions.ProductPlans | CatalogOptions.ResponseGroupOptions.Series
-					| CatalogOptions.ResponseGroupOptions.CategoryLadders | CatalogOptions.ResponseGroupOptions.ProductExtendedAttrs);
+				var items = await Api.GetCatalogProductsAsync(asins, CatalogOptions.ResponseGroupOptions.ALL_OPTIONS);
 				sw.Stop();
 
 				Serilog.Log.Logger.Debug($"Batch {batchNum} End: Retrieved {items.Count} items in {sw.ElapsedMilliseconds} ms");
@@ -249,26 +249,8 @@ namespace AudibleUtilities
 				}
 			}
 
-			int lastEpNum = -1, dupeCount = 0;
-			foreach (var child in children.OrderBy(i => i.EpisodeNumber).ThenBy(i => i.PublicationDateTime))
+			foreach (var child in children)
 			{
-				string sequence;
-				if (child.EpisodeNumber is null)
-				{
-					// This should properly be Single() not FirstOrDefault(), but FirstOrDefault is defensive for malformed data from audible
-					sequence = parent.Relationships.FirstOrDefault(r => r.Asin == child.Asin)?.Sort?.ToString() ?? "0";
-				}
-				else
-				{
-					//multipart episodes may have the same episode number
-					if (child.EpisodeNumber == lastEpNum)
-						dupeCount++;
-					else
-						lastEpNum = child.EpisodeNumber.Value;
-
-					sequence = (lastEpNum + dupeCount).ToString();
-				}
-
 				// use parent's 'DateAdded'. DateAdded is just a convenience prop for: PurchaseDate.UtcDateTime
 				child.PurchaseDate = parent.PurchaseDate;
 				// parent is essentially a series
@@ -277,7 +259,8 @@ namespace AudibleUtilities
 					new Series
 					{
 						Asin = parent.Asin,
-						Sequence = sequence,
+						// This should properly be Single() not FirstOrDefault(), but FirstOrDefault is defensive for malformed data from audible
+						Sequence = parent.Relationships.FirstOrDefault(r => r.Asin == child.Asin)?.Sort?.ToString() ?? "0",
 						Title = parent.TitleWithSubtitle
 					}
 				};

Source/AudibleUtilities/AudibleApiStorage.cs

@@ -5,58 +5,19 @@ using Newtonsoft.Json;
 
 namespace AudibleUtilities
 {
-	public class AccountSettingsLoadErrorEventArgs : ErrorEventArgs
-	{
-		/// <summary>
-		/// Create a new, empty <see cref="AccountsSettings"/> file if true, otherwise throw
-		/// </summary>
-		public bool Handled { get; set; }
-		/// <summary>
-		/// The file path of the AccountsSettings.json file
-		/// </summary>
-		public string SettingsFilePath { get; }
-
-		public AccountSettingsLoadErrorEventArgs(string path, Exception exception)
-			: base(exception)
-		{
-			SettingsFilePath = path;
-		}
-	}
-
 	public static class AudibleApiStorage
 	{
 		public static string AccountsSettingsFile => Path.Combine(Configuration.Instance.LibationFiles, "AccountsSettings.json");
 
-		public static event EventHandler<AccountSettingsLoadErrorEventArgs> LoadError;
-
 		public static void EnsureAccountsSettingsFileExists()
 		{
 			// saves. BEWARE: this will overwrite an existing file
 			if (!File.Exists(AccountsSettingsFile))
-			{
-				//Save the JSON file manually so that AccountsSettingsPersister.Saving and AccountsSettingsPersister.Saved
-				//are not fired. There's no need to fire those events on an empty AccountsSettings file.
-				var accountSerializerSettings = AudibleApi.Authorization.Identity.GetJsonSerializerSettings();
-				File.WriteAllText(AccountsSettingsFile, JsonConvert.SerializeObject(new AccountsSettings(), Formatting.Indented, accountSerializerSettings));
-			}
+				_ = new AccountsSettingsPersister(new AccountsSettings(), AccountsSettingsFile);
 		}
 
 		/// <summary>If you use this, be a good citizen and DISPOSE of it</summary>
-		public static AccountsSettingsPersister GetAccountsSettingsPersister()
-		{
-			try
-			{
-				return new AccountsSettingsPersister(AccountsSettingsFile);
-			}
-			catch (Exception ex)
-			{
-				var args = new AccountSettingsLoadErrorEventArgs(AccountsSettingsFile, ex);
-				LoadError?.Invoke(null, args);
-				if (args.Handled)
-					return GetAccountsSettingsPersister();
-				throw;
-			}
-		}
+		public static AccountsSettingsPersister GetAccountsSettingsPersister() => new AccountsSettingsPersister(AccountsSettingsFile);
 
 		public static string GetIdentityTokensJsonPath(this Account account)
 			=> GetIdentityTokensJsonPath(account.AccountId, account.Locale?.Name);

Source/AudibleUtilities/AudibleApiValidators.cs

@@ -90,10 +90,8 @@ namespace AudibleUtilities
 			var distinct = items.GetSeriesDistinct();
 			if (distinct.Any(s => s.SeriesId is null))
 				exceptions.Add(new ArgumentException($"Collection contains {nameof(Item.Series)} with null {nameof(Series.SeriesId)}", nameof(items)));
-
-			//// unfortunately, a user has a series with no name
-			//if (distinct.Any(s => s.SeriesName is null))
-			//    exceptions.Add(new ArgumentException($"Collection contains {nameof(Item.Series)} with null {nameof(Series.SeriesName)}", nameof(items)));
+			if (distinct.Any(s => s.SeriesName is null))
+				exceptions.Add(new ArgumentException($"Collection contains {nameof(Item.Series)} with null {nameof(Series.SeriesName)}", nameof(items)));
 
 			return exceptions;
 		}

Source/AudibleUtilities/AudibleUtilities.csproj

@@ -1,12 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="AudibleApi" Version="9.4.5.1" />
-    <PackageReference Include="Google.Protobuf" Version="3.32.0" />
+    <PackageReference Include="AudibleApi" Version="8.2.3.1" />
   </ItemGroup>
 
   <ItemGroup>
@@ -21,9 +20,4 @@
 		<DebugType>embedded</DebugType>
 	</PropertyGroup>
 
-	<ItemGroup>
-		<Compile Update="Widevine\Cdm.*.cs">
-			<DependentUpon>Cdm.cs</DependentUpon>
-		</Compile>
-	</ItemGroup>
 </Project>

Source/AudibleUtilities/Mkb79Auth.cs

@@ -43,9 +43,6 @@ namespace AudibleUtilities
 		[JsonProperty("locale_code")]
 		public string LocaleCode { get; private set; }
 
-		[JsonProperty("with_username")]
-		public bool WithUsername { get; private set; }
-
 		[JsonProperty("activation_bytes")]
 		public string ActivationBytes { get; private set; }
 
@@ -71,8 +68,7 @@ namespace AudibleUtilities
 		}
 
 		[JsonIgnore] public ISystemDateTime SystemDateTime { get; } = new SystemDateTime();
-		[JsonIgnore]
-		public Locale Locale => Localization.Locales.Where(l => l.WithUsername == WithUsername).Single(l => l.CountryCode == LocaleCode);
+		[JsonIgnore] public Locale Locale => Localization.Get(LocaleCode);
 		[JsonIgnore] public string DeviceSerialNumber => DeviceInfo.DeviceSerialNumber;
 		[JsonIgnore] public string DeviceType => DeviceInfo.DeviceType;
 		[JsonIgnore] public string AmazonAccountId => CustomerInfo.UserId;
@@ -181,7 +177,6 @@ namespace AudibleUtilities
 				DevicePrivateKey = account.IdentityTokens.PrivateKey,
 				AccessTokenExpires = account.IdentityTokens.ExistingAccessToken.Expires,
 				LocaleCode = account.Locale.CountryCode,
-				WithUsername = account.Locale.WithUsername,
 				RefreshToken = account.IdentityTokens.RefreshToken.Value,				
 				StoreAuthenticationCookie = account.IdentityTokens.StoreAuthenticationCookie,
 				WebsiteCookies = new(account.IdentityTokens.Cookies),

Source/AudibleUtilities/Widevine/Cdm.Api.cs

@@ -1,189 +0,0 @@
-using AudibleApi;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using System.Net.Http;
-using AudibleApi.Cryptography;
-using Newtonsoft.Json.Linq;
-using Dinah.Core.Net.Http;
-using System.Text.Json.Nodes;
-
-#nullable enable
-namespace AudibleUtilities.Widevine;
-
-public partial class Cdm
-{
-	/// <summary>
-	/// Get a <see cref="Cdm"/> from <see cref="AccountsSettings"/> or from the API.
-	/// </summary>
-	/// <returns>A <see cref="Cdm"/> if successful, otherwise <see cref="null"/></returns>
-	public static async Task<Cdm?> GetCdmAsync()
-	{
-		using var persister = AudibleApiStorage.GetAccountsSettingsPersister();
-
-		//Check if there are any Android accounts. If not, we can't use Widevine.
-		if (!persister.Target.Accounts.Any(a => a.IdentityTokens.DeviceType == Resources.DeviceType))
-			return null;
-
-		if (!string.IsNullOrEmpty(persister.Target.Cdm))
-		{
-			try
-			{
-				var cdm = Convert.FromBase64String(persister.Target.Cdm);
-				return new Cdm(new Device(cdm));
-			}
-			catch (Exception ex)
-			{
-				Serilog.Log.Logger.Error(ex, "Error loading CDM from account settings.");
-				persister.Target.Cdm = string.Empty;
-				//Clear the stored Cdm and try getting a fresh one from the server.
-			}
-		}
-
-		if (string.IsNullOrEmpty(persister.Target.Cdm))
-		{
-			using var client = new HttpClient();
-			if (await GetCdmUris(client) is not Uri[] uris)
-				return null;
-
-			//try to get a CDM file for any account that's registered as an android device.
-			//CDMs are not account-specific, so it doesn't matter which account we're successful with.
-			foreach (var account in persister.Target.Accounts.Where(a => a.IdentityTokens.DeviceType == Resources.DeviceType))
-			{
-				try
-				{
-					var requestMessage = CreateApiRequest(account);
-
-					await TestApiRequest(client, new JsonObject { { "body", requestMessage.ToString() } });
-
-					//Try all CDM URIs until a CDM has been retrieved successfully
-					foreach (var uri in uris)
-					{
-						try
-						{
-							var resp = await client.PostAsync(uri, ((HttpBody)requestMessage).Content);
-
-							if (!resp.IsSuccessStatusCode)
-							{
-								var message = await resp.Content.ReadAsStringAsync();
-								throw new ApiErrorException(uri, null, message);
-							}
-
-							var cdmBts = await resp.Content.ReadAsByteArrayAsync();
-							var device = new Device(cdmBts);
-							persister.Target.Cdm = Convert.ToBase64String(cdmBts);
-							return new Cdm(device);
-						}
-						catch (Exception ex)
-						{
-							Serilog.Log.Logger.Error(ex, "Error getting a CDM from URI: " + uri);
-							//try the next URI
-						}
-					}
-				}
-				catch (Exception ex)
-				{
-					Serilog.Log.Logger.Error(ex, "Error getting a CDM for account: " + account.MaskedLogEntry);
-					//try the next Account
-				}
-			}
-		}
-
-		return null;
-	}
-
-	/// <summary>
-	/// Get a list of CDM API URIs from the main Gitgub repository's .cdmurls.json file.
-	/// </summary>
-	/// <returns>If successful, an array of URIs to try. Otherwise null</returns>
-	private static async Task<Uri[]?> GetCdmUris(HttpClient httpClient)
-	{
-		const string CdmUrlListFile = "https://raw.githubusercontent.com/rmcrackan/Libation/refs/heads/master/.cdmurls.json";
-
-		try
-		{
-			var fileContents = await httpClient.GetStringAsync(CdmUrlListFile);
-			var releaseIndex = JObject.Parse(fileContents);
-			var urlArray = releaseIndex["CdmUrls"] as JArray;
-			if (urlArray is null)
-				throw new System.IO.InvalidDataException("CDM url list not found in JSON: " + fileContents);
-
-			var uris = urlArray.Select(u => u.Value<string>()).OfType<string>().Select(u => new Uri(u)).ToArray();
-
-			if (uris.Length == 0)
-				throw  new System.IO.InvalidDataException("No CDM url found in JSON: " + fileContents);
-
-			return uris;
-		}
-		catch (Exception ex)
-		{
-			Serilog.Log.Logger.Error(ex, "Error getting CDM URLs");
-			return null;
-		}
-	}
-
-
-	static readonly string[] TLDs = ["com", "co.uk", "com.au", "com.br", "ca", "fr", "de", "in", "it", "co.jp", "es"];
-
-	//Ensure that the request can be made successfully before sending it to the API
-	//The API uses System.Text.Json, so perform test with same.
-	private static async Task TestApiRequest(HttpClient client, JsonObject input)
-	{
-		if (input["body"]?.GetValue<string>() is not string body
-				|| JsonNode.Parse(body) is not JsonNode bodyJson)
-			throw new Exception("Api request doesn't contain a body");
-
-		if (bodyJson?["Url"]?.GetValue<string>() is not string url
-			|| !Uri.TryCreate(url, UriKind.Absolute, out var uri))
-			throw new Exception("Api request doesn't contain a url");
-
-		if (!TLDs.Select(tld => "api.audible." + tld).Contains(uri.Host.ToLower()))
-			throw new Exception($"Unknown Audible Api domain: {uri.Host}");
-
-		if (bodyJson?["Headers"] is not JsonObject headers)
-			throw new Exception($"Api request doesn't contain any headers");
-
-		using var request = new HttpRequestMessage(HttpMethod.Get, uri);
-
-		Dictionary<string, string>? headersDict = null;
-		try
-		{
-			headersDict = System.Text.Json.JsonSerializer.Deserialize<Dictionary<string, string>>(headers);
-		}
-		catch (Exception ex)
-		{
-			throw new Exception("Failed to read Audible Api headers.", ex);
-		}
-
-		if (headersDict is null)
-			throw new Exception("Failed to read Audible Api headers.");
-
-		foreach (var kvp in headersDict)
-			request.Headers.Add(kvp.Key, kvp.Value);
-
-		using var resp = await client.SendAsync(request);
-		resp.EnsureSuccessStatusCode();
-	}
-
-	/// <summary>
-	/// Create a request body to send to the API
-	/// </summary>
-	/// <param name="account">An authenticated account</param>
-	private static JObject CreateApiRequest(Account account)
-	{
-		const string ACCOUNT_INFO_PATH = "/1.0/account/information";
-
-		var message = new HttpRequestMessage(HttpMethod.Get, ACCOUNT_INFO_PATH);
-		message.SignRequest(
-					DateTime.UtcNow,
-					account.IdentityTokens.AdpToken,
-					account.IdentityTokens.PrivateKey);
-
-		return new JObject
-		{
-			{ "Url", new Uri(account.Locale.AudibleApiUri(), ACCOUNT_INFO_PATH) },
-			{ "Headers", JObject.FromObject(message.Headers.ToDictionary(kvp => kvp.Key, kvp => kvp.Value.Single())) }
-		};
-	}
-}

Source/AudibleUtilities/Widevine/Cdm.cs

@@ -1,300 +0,0 @@
-using Google.Protobuf;
-using System;
-using System.Collections.Concurrent;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Security.Cryptography;
-using System.Text;
-
-#nullable enable
-namespace AudibleUtilities.Widevine;
-
-public enum KeyType
-{
-	/// <summary>
-	/// Exactly one key of this type must appear.
-	/// </summary>
-	Signing = 1,
-	/// <summary>
-	/// Content key.
-	/// </summary>
-	Content = 2,
-	/// <summary>
-	/// Key control block for license renewals. No key.
-	/// </summary>
-	KeyControl = 3,
-	/// <summary>
-	/// wrapped keys for auxiliary crypto operations.
-	/// </summary>
-	OperatorSession = 4,
-	/// <summary>
-	/// Entitlement keys.
-	/// </summary>
-	Entitlement = 5,
-	/// <summary>
-	/// Partner-specific content key.
-	/// </summary>
-	OemContent = 6,
-}
-
-public interface ISession : IDisposable
-{
-	string? GetLicenseChallenge(MpegDash dash);
-	WidevineKey[] ParseLicense(string licenseMessage);
-}
-
-public class WidevineKey
-{
-	public Guid Kid { get; }
-	public KeyType Type { get; }
-	public byte[] Key { get; }
-	internal WidevineKey(Guid kid, License.Types.KeyContainer.Types.KeyType type, byte[] key)
-	{
-		Kid = kid;
-		Type = (KeyType)type;
-		Key = key;
-	}
-	public override string ToString() => $"{Convert.ToHexString(Kid.ToByteArray(bigEndian: true)).ToLower()}:{Convert.ToHexString(Key).ToLower()}";
-}
-
-public partial class Cdm
-{
-	public static Guid WidevineContentProtection { get; } = new("edef8ba9-79d6-4ace-a3c8-27dcd51d21ed");
-	private const int MAX_NUM_OF_SESSIONS = 16;
-	internal Device Device { get; }
-
-	private ConcurrentDictionary<Guid, Session> Sessions { get; } = new(-1, MAX_NUM_OF_SESSIONS);
-
-	internal Cdm(Device device)
-	{
-		Device = device;
-	}
-
-	public ISession OpenSession()
-	{
-		if (Sessions.Count == MAX_NUM_OF_SESSIONS)
-			throw new Exception("Too Many Sessions");
-
-		var session = new Session(Sessions.Count + 1, this);
-
-		var ddd = Sessions.TryAdd(session.Id, session);
-		return session;
-	}
-
-	#region Session
-
-	internal class Session : ISession
-	{
-		public Guid Id { get; } = Guid.NewGuid();
-		private int SessionNumber { get; }
-		private Cdm Cdm { get; }
-		private byte[]? EncryptionContext { get; set; }
-		private byte[]? AuthenticationContext { get; set; }
-
-		public Session(int number, Cdm cdm)
-		{
-			SessionNumber = number;
-			Cdm = cdm;
-		}
-
-		private string GetRequestId()
-			=> $"{RandomUint():x8}00000000{Convert.ToHexString(BitConverter.GetBytes((long)SessionNumber)).ToLowerInvariant()}";
-
-		public void Dispose()
-		{
-			if (Cdm.Sessions.ContainsKey(Id))
-				Cdm.Sessions.TryRemove(Id, out var session);
-		}
-
-		public string? GetLicenseChallenge(MpegDash dash)
-		{
-			if (!dash.TryGetPssh(Cdm.WidevineContentProtection, out var pssh))
-				return null;
-
-			var licRequest = new LicenseRequest
-			{
-				ClientId = Cdm.Device.ClientId,
-				ContentId = new()
-				{
-					WidevinePsshData = new()
-					{
-						LicenseType = LicenseType.Offline,
-						RequestId = ByteString.CopyFrom(GetRequestId(), Encoding.ASCII)
-					}
-				},
-				Type = LicenseRequest.Types.RequestType.New,
-				RequestTime = DateTimeOffset.UtcNow.ToUnixTimeSeconds(),
-				ProtocolVersion = ProtocolVersion.Version21,
-				KeyControlNonce = RandomUint()
-			};
-
-			licRequest.ContentId.WidevinePsshData.PsshData.Add(ByteString.CopyFrom(pssh.InitData));
-
-			var licRequestBts = licRequest.ToByteArray();
-			EncryptionContext = CreateContext("ENCRYPTION", 128, licRequestBts);
-			AuthenticationContext = CreateContext("AUTHENTICATION", 512, licRequestBts);
-
-			var signedMessage = new SignedMessage
-			{
-				Type = SignedMessage.Types.MessageType.LicenseRequest,
-				Msg = ByteString.CopyFrom(licRequestBts),
-				Signature = ByteString.CopyFrom(Cdm.Device.SignMessage(licRequestBts))
-			};
-
-			return Convert.ToBase64String(signedMessage.ToByteArray());
-		}
-
-		public WidevineKey[] ParseLicense(string licenseMessage)
-		{
-			if (EncryptionContext is null || AuthenticationContext is null)
-				throw new InvalidOperationException($"{nameof(GetLicenseChallenge)}() must be called before calling {nameof(ParseLicense)}()");
-
-			var signedMessage = SignedMessage.Parser.ParseFrom(Convert.FromBase64String(licenseMessage));
-			if (signedMessage.Type != SignedMessage.Types.MessageType.License)
-				throw new InvalidDataException("Invalid license");
-
-			var sessionKey = Cdm.Device.DecryptSessionKey(signedMessage.SessionKey.ToByteArray());
-
-			if (!VerifySignature(signedMessage, AuthenticationContext, sessionKey))
-				throw new InvalidDataException("Message signature is invalid");
-
-			var license = License.Parser.ParseFrom(signedMessage.Msg);
-			var keyToTheKeys = DeriveKey(sessionKey, EncryptionContext, 1);
-
-			return DecryptKeys(keyToTheKeys, license.Key);
-		}
-
-		private static WidevineKey[] DecryptKeys(byte[] keyToTheKeys, IList<License.Types.KeyContainer> licenseKeys)
-		{
-			using var aes = Aes.Create();
-			aes.Key = keyToTheKeys;
-			var keys = new WidevineKey[licenseKeys.Count];
-
-			for (int i = 0; i < licenseKeys.Count; i++)
-			{
-				var keyContainer = licenseKeys[i];
-
-				var keyBytes = aes.DecryptCbc(keyContainer.Key.ToByteArray(), keyContainer.Iv.ToByteArray(), PaddingMode.PKCS7);
-				var id = keyContainer.Id.ToByteArray();
-
-				if (id.Length > 16)
-				{
-					var tryB64 = new byte[id.Length * 3 / 4];
-					if (Convert.TryFromBase64String(Encoding.ASCII.GetString(id), tryB64, out int bytesWritten))
-					{
-						id = tryB64;
-					}
-					Array.Resize(ref id, 16);
-				}
-				else if (id.Length < 16)
-				{
-					id = id.Append(new byte[16 - id.Length]);
-				}
-
-				keys[i] = new WidevineKey(new Guid(id,bigEndian: true), keyContainer.Type, keyBytes);
-			}
-			return keys;
-		}
-
-		private static bool VerifySignature(SignedMessage signedMessage, byte[] authContext, byte[] sessionKey)
-		{
-			var mac_key_server = DeriveKey(sessionKey, authContext, 1).Append(DeriveKey(sessionKey, authContext, 2));
-
-			var hmacData = (signedMessage.OemcryptoCoreMessage?.ToByteArray() ?? []).Append(signedMessage.Msg?.ToByteArray() ?? []);
-
-			var computed_signature = HMACSHA256.HashData(mac_key_server, hmacData);
-
-			return computed_signature.SequenceEqual(signedMessage.Signature);
-		}
-
-		private static byte[] DeriveKey(byte[] session_key, byte[] context, int counter)
-		{
-			var data = new byte[context.Length + 1];
-			Array.Copy(context, 0, data, 1, context.Length);
-			data[0] = (byte)counter;
-
-			return AESCMAC(session_key, data);
-		}
-
-		private static byte[] AESCMAC(byte[] key, byte[] data)
-		{
-			using var aes = Aes.Create();
-			aes.Key = key;
-
-			// SubKey generation
-			// step 1, AES-128 with key K is applied to an all-zero input block.
-			byte[] subKey = aes.EncryptCbc(new byte[16], new byte[16], PaddingMode.None);
-
-			nextSubKey();
-
-			// MAC computing
-			if ((data.Length == 0) || (data.Length % 16 != 0))
-			{
-				// If the size of the input message block is not equal to a positive
-				// multiple of the block size (namely, 128 bits), the last block shall
-				// be padded with 10^i
-				nextSubKey();
-				var padLen = 16 - data.Length % 16;
-				Array.Resize(ref data, data.Length + padLen);
-				data[^padLen] = 0x80;
-			}
-
-			// the last block shall be exclusive-OR'ed with K1 before processing
-			for (int j = 0; j < subKey.Length; j++)
-				data[data.Length - 16 + j] ^= subKey[j];
-
-			// The result of the previous process will be the input of the last encryption.
-			byte[] encResult = aes.EncryptCbc(data, new byte[16], PaddingMode.None);
-
-			byte[] HashValue = new byte[16];
-			Array.Copy(encResult, encResult.Length - HashValue.Length, HashValue, 0, HashValue.Length);
-
-			return HashValue;
-
-			void nextSubKey()
-			{
-				const byte const_Rb = 0x87;
-				if (Rol(subKey) != 0)
-					subKey[15] ^= const_Rb;
-
-				static int Rol(byte[] b)
-				{
-					int carry = 0;
-
-					for (int i = b.Length - 1; i >= 0; i--)
-					{
-						ushort u = (ushort)(b[i] << 1);
-						b[i] = (byte)((u & 0xff) + carry);
-						carry = (u & 0xff00) >> 8;
-					}
-					return carry;
-				}
-			}
-		}
-
-		private static byte[] CreateContext(string label, int keySize, byte[] licRequestBts)
-		{
-			var contextSize = label.Length + 1 + licRequestBts.Length + sizeof(int);
-
-			var context = new byte[contextSize];
-			var numChars = Encoding.ASCII.GetBytes(label.AsSpan(), context);
-			Array.Copy(licRequestBts, 0, context, numChars + 1, licRequestBts.Length);
-
-			var numBts = BitConverter.GetBytes(keySize);
-			if (BitConverter.IsLittleEndian)
-				Array.Reverse(numBts);
-			Array.Copy(numBts, 0, context, context.Length - sizeof(int), sizeof(int));
-			return context;
-		}
-
-		private static uint RandomUint()
-		{
-			var bts = new byte[4];
-			new Random().NextBytes(bts);
-			return BitConverter.ToUInt32(bts, 0);
-		}
-	}
-
-	#endregion
-}

Source/AudibleUtilities/Widevine/Device.cs

@@ -1,155 +0,0 @@
-using System;
-using System.IO;
-using System.Numerics;
-using System.Security.Cryptography;
-
-#nullable enable
-namespace AudibleUtilities.Widevine;
-
-internal enum DeviceTypes : byte
-{
-	Unknown = 0,
-	Chrome = 1,
-	Android = 2
-}
-
-internal class Device
-{
-	public DeviceTypes Type { get; }
-	public int FileVersion { get; }
-	public int SecurityLevel { get; }
-	public int Flags { get; }
-
-	public RSA CdmKey { get; }
-	internal ClientIdentification ClientId { get; }
-
-	public Device(Span<byte> fileData)
-	{
-		if (fileData.Length < 7 || fileData[0] != 'W' || fileData[1] != 'V' || fileData[2] != 'D')
-			throw new InvalidDataException();
-
-		FileVersion = fileData[3];
-		Type = (DeviceTypes)fileData[4];
-		SecurityLevel = fileData[5];
-		Flags = fileData[6];
-
-		if (FileVersion != 2)
-			throw new InvalidDataException($"Unknown CDM File Version: '{FileVersion}'");
-		if (Type != DeviceTypes.Android)
-			throw new InvalidDataException($"Unknown CDM Type: '{Type}'");
-		if (SecurityLevel != 3)
-			throw new InvalidDataException($"Unknown CDM Security Level: '{SecurityLevel}'");
-
-		var privateKeyLength = (fileData[7] << 8) | fileData[8];
-
-		if (privateKeyLength <= 0 || fileData.Length < 9 + privateKeyLength + 2)
-			throw new InvalidDataException($"Invalid private key length: '{privateKeyLength}'");
-
-		var clientIdLength = (fileData[9 + privateKeyLength] << 8) | fileData[10 + privateKeyLength];
-
-		if (clientIdLength <= 0 || fileData.Length < 11 + privateKeyLength + clientIdLength)
-			throw new InvalidDataException($"Invalid client id length: '{clientIdLength}'");
-
-		ClientId = ClientIdentification.Parser.ParseFrom(fileData.Slice(11 + privateKeyLength));
-		CdmKey = RSA.Create();
-		CdmKey.ImportRSAPrivateKey(fileData.Slice(9, privateKeyLength), out _);
-	}
-
-	public byte[] SignMessage(byte[] message)
-	{
-		var digestion = SHA1.HashData(message);
-		return PssSha1Signer.SignHash(CdmKey, digestion);
-	}
-
-	public bool VerifyMessage(byte[] message, byte[] signature)
-	{
-		var digestion = SHA1.HashData(message);
-		return CdmKey.VerifyHash(digestion, signature, HashAlgorithmName.SHA1, RSASignaturePadding.Pss);
-	}
-
-	public byte[] DecryptSessionKey(byte[] sessionKey)
-		=> CdmKey.Decrypt(sessionKey, RSAEncryptionPadding.OaepSHA1);
-
-    /// <summary>
-    /// Completely managed implementation of RSASSA-PSS using SHA-1.
-    /// https://github.com/bcgit/bc-csharp/blob/master/crypto/src/crypto/signers/PssSigner.cs
-    /// 
-    /// Absolutely nobody anywhere should use this RSASSA-PSS implementation in anything where they care about security at all. We completely skipped the random salt part of it because libation doesn't need security; it only needs to satisfy Audible server's challenge-response requirements.
-	/// </summary>
-	private static class PssSha1Signer
-	{
-		private const int Sha1DigestSize = 20;
-		private const int Trailer = 0xBC;
-
-		public static byte[] SignHash(RSA rsa, ReadOnlySpan<byte> hash)
-		{
-			ArgumentOutOfRangeException.ThrowIfNotEqual(hash.Length, Sha1DigestSize);
-
-			var parameters = rsa.ExportParameters(true);
-			var Modulus = new BigInteger(parameters.Modulus, isUnsigned: true, isBigEndian: true);
-			var Exponent = new BigInteger(parameters.D, isUnsigned: true, isBigEndian: true);
-			var emBits = rsa.KeySize - 1;
-			var block = new byte[(emBits + 7) / 8];
-			var firstByteMask = (byte)(0xFFU >> ((block.Length * 8) - emBits));
-
-			Span<byte> mDash = new byte[8 + 2 * Sha1DigestSize];
-
-			hash.CopyTo(mDash.Slice(8));
-			var h = SHA1.HashData(mDash);
-
-			block[^(2 * (Sha1DigestSize + 1))] = 1;
-			byte[] dbMask = MaskGeneratorFunction1(h, 0, h.Length, block.Length - Sha1DigestSize - 1);
-			for (int i = 0; i != dbMask.Length; i++)
-				block[i] ^= dbMask[i];
-
-			h.CopyTo(block, block.Length - Sha1DigestSize - 1);
-
-			block[0] &= firstByteMask;
-			block[^1] = Trailer;
-
-			var input = new BigInteger(block, isUnsigned: true, isBigEndian: true);
-			var result = BigInteger.ModPow(input, Exponent, Modulus);
-			return result.ToByteArray(isUnsigned: true, isBigEndian: true);
-		}
-
-		private static byte[] MaskGeneratorFunction1(byte[] Z, int zOff, int zLen, int length)
-		{
-			byte[] mask = new byte[length];
-			byte[] hashBuf = new byte[Sha1DigestSize];
-			byte[] C = new byte[4];
-			int counter = 0;
-
-			using var sha = SHA1.Create();
-
-			for (; counter < (length / Sha1DigestSize); counter++)
-			{
-				ItoOSP(counter, C);
-
-				sha.TransformBlock(Z, zOff, zLen, null, 0);
-				sha.TransformFinalBlock(C, 0, C.Length);
-
-				sha.Hash!.CopyTo(mask, counter * Sha1DigestSize);
-			}
-
-			if ((counter * Sha1DigestSize) < length)
-			{
-				ItoOSP(counter, C);
-
-				sha.TransformBlock(Z, zOff, zLen, null, 0);
-				sha.TransformFinalBlock(C, 0, C.Length);
-
-				Array.Copy(sha.Hash!, 0, mask, counter * Sha1DigestSize, mask.Length - (counter * Sha1DigestSize));
-			}
-
-			return mask;
-		}
-
-		private static void ItoOSP(int i, byte[] sp)
-		{
-			sp[0] = (byte)((uint)i >> 24);
-			sp[1] = (byte)((uint)i >> 16);
-			sp[2] = (byte)((uint)i >> 8);
-			sp[3] = (byte)((uint)i >> 0);
-		}
-	}
-}

Source/AudibleUtilities/Widevine/Extensions.cs

@@ -1,15 +0,0 @@
-using System;
-
-#nullable enable
-namespace AudibleUtilities.Widevine;
-
-internal static class Extensions
-{
-	public static T[] Append<T>(this T[] message, T[] appendData)
-	{
-		var origLength = message.Length;
-		Array.Resize(ref message, origLength + appendData.Length);
-		Array.Copy(appendData, 0, message, origLength, appendData.Length);
-		return message;
-	}
-}

Source/AudibleUtilities/Widevine/MpegDash.cs

@@ -1,70 +0,0 @@
-using Mpeg4Lib.Boxes;
-using System;
-using System.Diagnostics.CodeAnalysis;
-using System.IO;
-using System.Xml;
-using System.Xml.Linq;
-using System.Xml.XPath;
-
-#nullable enable
-namespace AudibleUtilities.Widevine;
-
-public class MpegDash
-{
-	private const string MpegDashNamespace = "urn:mpeg:dash:schema:mpd:2011";
-	private const string CencNamespace = "urn:mpeg:cenc:2013";
-	private const string UuidPreamble = "urn:uuid:";
-	private XElement DashMpd { get; }
-	private static XmlNamespaceManager NamespaceManager { get; } = new(new NameTable());
-	static MpegDash()
-	{
-		NamespaceManager.AddNamespace("dash", MpegDashNamespace);
-		NamespaceManager.AddNamespace("cenc", CencNamespace);
-	}
-
-	public MpegDash(Stream contents)
-	{
-		DashMpd = XElement.Load(contents);
-	}
-
-	public bool TryGetUri(Uri baseUri, [NotNullWhen(true)] out Uri? fileUri)
-	{
-		foreach (var baseUrl in DashMpd.XPathSelectElements("/dash:Period/dash:AdaptationSet/dash:Representation/dash:BaseURL", NamespaceManager))
-		{
-			try
-			{
-				fileUri = new Uri(baseUri, baseUrl.Value);
-				return true;
-			}
-			catch
-			{
-				fileUri = null;
-				return false;
-			}
-		}
-		fileUri = null;
-		return false;
-	}
-
-	public bool TryGetPssh(Guid protectionSystemId, [NotNullWhen(true)] out PsshBox? pssh)
-	{
-		foreach (var psshEle in DashMpd.XPathSelectElements("/dash:Period/dash:AdaptationSet/dash:ContentProtection/cenc:pssh", NamespaceManager))
-		{
-			if (psshEle?.Value?.Trim() is string psshStr
-				&& psshEle.Parent?.Attribute(XName.Get("schemeIdUri")) is XAttribute scheme
-				&& scheme.Value is string uuid
-				&& uuid.Equals(UuidPreamble + protectionSystemId.ToString(), StringComparison.OrdinalIgnoreCase))
-			{
-				Span<byte> buffer = new byte[psshStr.Length * 3 / 4];
-				if (Convert.TryFromBase64String(psshStr, buffer, out var written))
-				{
-					using var ms = new MemoryStream(buffer.Slice(0, written).ToArray());
-					pssh = BoxFactory.CreateBox(ms, null) as PsshBox;
-					return pssh is not null;
-				}
-			}
-		}
-		pssh = null;
-		return false;
-	}
-}

Source/DataLayer/AudioFormat.cs

@@ -1,70 +0,0 @@
-#nullable enable
-using Newtonsoft.Json;
-
-namespace DataLayer;
-
-public enum Codec : byte
-{
-	Unknown,
-	Mp3,
-	AAC_LC,
-	xHE_AAC,
-	EC_3,
-	AC_4
-}
-
-public class AudioFormat
-{
-	public static AudioFormat Default => new(Codec.Unknown, 0, 0, 0);
-	[JsonIgnore]
-	public bool IsDefault => Codec is Codec.Unknown && BitRate == 0 && SampleRate == 0 && ChannelCount == 0;
-	[JsonIgnore]
-	public Codec Codec { get; set; }
-	public int SampleRate { get; set; }
-	public int ChannelCount { get; set; }
-	public int BitRate { get; set; }
-
-	public AudioFormat(Codec codec, int bitRate, int sampleRate, int channelCount)
-	{
-		Codec = codec;
-		BitRate = bitRate;
-		SampleRate = sampleRate;
-		ChannelCount = channelCount;
-	}
-
-	public string CodecString => Codec switch
-	{
-		Codec.Mp3 => "mp3",
-		Codec.AAC_LC => "AAC-LC",
-		Codec.xHE_AAC => "xHE-AAC",
-		Codec.EC_3 => "EC-3",
-		Codec.AC_4 => "AC-4",
-		Codec.Unknown or _ => "[Unknown]",
-	};
-
-	//Property     | Start | Num  |   Max   | Current Max |
-	//             |  Bit  | Bits |  Value  | Value Used  |
-	//-----------------------------------------------------
-	//Codec	       |   35  |   4  |      15 |         5   |
-	//BitRate      |   23  |  12  |   4_095 |       768   |
-	//SampleRate   |    5  |  18  | 262_143 |    48_000   |
-	//ChannelCount |    0  |   5  |      31 |         6   |
-	public long Serialize() =>
-		((long)Codec << 35) |
-		((long)BitRate << 23) |
-		((long)SampleRate << 5) |
-		(long)ChannelCount;
-
-	public static AudioFormat Deserialize(long value)
-	{
-		var codec = (Codec)((value >> 35) & 15);
-		var bitRate = (int)((value >> 23) & 4_095);
-		var sampleRate = (int)((value >> 5) & 262_143);
-		var channelCount = (int)(value & 31);
-		return new AudioFormat(codec, bitRate, sampleRate, channelCount);
-	}
-
-	public override string ToString()
-		=> IsDefault ? "[Unknown Audio Format]"
-		: $"{CodecString} ({ChannelCount}ch | {SampleRate:N0}Hz | {BitRate}kbps)";
-}

Source/DataLayer/Configurations/BookCategoryConfig.cs

@@ -1,26 +0,0 @@
-using Microsoft.EntityFrameworkCore.Metadata.Builders;
-using Microsoft.EntityFrameworkCore;
-
-namespace DataLayer.Configurations
-{
-	internal class BookCategoryConfig : IEntityTypeConfiguration<BookCategory>
-	{
-		public void Configure(EntityTypeBuilder<BookCategory> entity)
-		{
-			entity.HasKey(bc => new { bc.BookId, bc.CategoryLadderId });
-
-			entity.HasIndex(bc => bc.BookId);
-			entity.HasIndex(bc => bc.CategoryLadderId);
-
-			entity
-				.HasOne(bc => bc.Book)
-				.WithMany(b => b.CategoriesLink)
-				.HasForeignKey(bc => bc.BookId);
-
-			entity
-				.HasOne(bc => bc.CategoryLadder)
-				.WithMany(c => c.BooksLink)
-				.HasForeignKey(bc => bc.CategoryLadderId);
-		}
-	}
-}

Source/DataLayer/Configurations/BookConfig.cs

@@ -13,13 +13,17 @@ namespace DataLayer.Configurations
 
             entity.OwnsOne(b => b.Rating);
 
+            entity.Property(nameof(Book._audioFormat));
             //
             // CRUCIAL: ignore unmapped collections, even get-only
             //
             entity.Ignore(nameof(Book.Authors));
             entity.Ignore(nameof(Book.Narrators));
-            entity.Ignore(nameof(Book.TitleWithSubtitle));
-            entity.Ignore(b => b.Categories);
+            entity.Ignore(nameof(Book.AudioFormat));
+            //// these don't seem to matter
+            //entity.Ignore(nameof(Book.AuthorNames));
+            //entity.Ignore(nameof(Book.NarratorNames));
+            //entity.Ignore(nameof(Book.HasPdfs));
 
             // OwnsMany: "Can only ever appear on navigation properties of other entity types.
             //  Are automatically loaded, and can only be tracked by a DbContext alongside their owner."
@@ -49,15 +53,27 @@ namespace DataLayer.Configurations
                     b_udi
                         .Property(udi => udi.LastDownloadedVersion)
                         .HasConversion(ver => ver.ToString(), str => Version.Parse(str));
-                    b_udi
-                        .Property(udi => udi.LastDownloadedFormat)
-                        .HasConversion(af => af.Serialize(), str => AudioFormat.Deserialize(str));
-
-					b_udi.Property(udi => udi.LastDownloadedFileVersion);
 
                     // owns it 1:1, store in same table
                     b_udi.OwnsOne(udi => udi.Rating);
                 });
+
+            entity
+                .Metadata
+                .FindNavigation(nameof(Book.ContributorsLink))
+                // PropertyAccessMode.Field : Contributions is a get-only property, not a field, so use its backing field
+                .SetPropertyAccessMode(PropertyAccessMode.Field);
+
+            entity
+                .Metadata
+                .FindNavigation(nameof(Book.SeriesLink))
+                // PropertyAccessMode.Field : Series is a get-only property, not a field, so use its backing field
+                .SetPropertyAccessMode(PropertyAccessMode.Field);
+
+            entity
+                .HasOne(b => b.Category)
+                .WithMany()
+                .HasForeignKey(b => b.CategoryId);
         }
     }
 }

Source/DataLayer/Configurations/CategoryConfig.cs

@@ -10,11 +10,8 @@ namespace DataLayer.Configurations
             entity.HasKey(c => c.CategoryId);
             entity.HasIndex(c => c.AudibleCategoryId);
 
-            entity.Ignore(c => c.CategoryLadders);
-
-            entity
-                .HasMany(e => e._categoryLadders)
-                .WithMany(e => e._categories);
+            // seeds go here. examples in Dinah.EntityFrameworkCore.Tests\DbContextFactoryExample.cs
+            entity.HasData(Category.GetEmpty());
         }
     }
 }

Source/DataLayer/Configurations/CategoryLadderConfig.cs

@@ -1,24 +0,0 @@
-using Microsoft.EntityFrameworkCore.Metadata.Builders;
-using Microsoft.EntityFrameworkCore;
-
-namespace DataLayer.Configurations
-{
-	internal class CategoryLadderConfig : IEntityTypeConfiguration<CategoryLadder>
-	{
-		public void Configure(EntityTypeBuilder<CategoryLadder> entity)
-		{
-			entity.HasKey(cl => cl.CategoryLadderId);
-
-			entity.Ignore(cl => cl.Categories);
-
-			entity
-				.HasMany(cl => cl._categories)
-				.WithMany(c => c._categoryLadders);
-
-			entity
-				.Metadata
-				.FindNavigation(nameof(CategoryLadder.BooksLink))
-				.SetPropertyAccessMode(PropertyAccessMode.Field);
-		}
-	}
-}

Source/DataLayer/DataLayer.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
   </PropertyGroup>
 
   <PropertyGroup>
@@ -10,14 +10,14 @@
   </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="Dinah.Core" Version="7.2.2.1" />
+    <PackageReference Include="Dinah.EntityFrameworkCore" Version="7.1.1.1" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.4">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="9.0.8" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="9.0.8">
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="7.0.4" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.4">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

Source/DataLayer/EfClasses/AudioFormat.cs

@@ -0,0 +1,61 @@
+using System;
+
+namespace DataLayer
+{
+    internal enum AudioFormatEnum : long
+    {
+        //Defining the enum this way ensures that when comparing:
+        //LC_128_44100_stereo > LC_64_44100_stereo > LC_64_22050_stereo > LC_64_22050_stereo
+        //This matches how audible interprets these codecs when specifying quality using AudibleApi.DownloadQuality
+        //I've never seen mono formats.
+        Unknown = 0,
+        LC_32_22050_stereo = (32L << 18) | (22050 << 2) | 2,
+        LC_64_22050_stereo = (64L << 18) | (22050 << 2) | 2,
+        LC_64_44100_stereo = (64L << 18) | (44100 << 2) | 2,
+        LC_128_44100_stereo = (128L << 18) | (44100 << 2) | 2,
+    }
+
+    public class AudioFormat : IComparable<AudioFormat>, IComparable
+    {
+        internal int AudioFormatID { get; private set; }
+        public int Bitrate { get; private init; }
+        public int SampleRate { get; private init; }
+        public int Channels { get; private init; }
+        public bool IsValid => Bitrate != 0 && SampleRate != 0 && Channels != 0;
+
+        public static AudioFormat FromString(string formatStr)
+        {
+            if (Enum.TryParse(formatStr, ignoreCase: true, out AudioFormatEnum enumVal))
+                return FromEnum(enumVal);
+            return FromEnum(AudioFormatEnum.Unknown);
+        }
+
+        internal static AudioFormat FromEnum(AudioFormatEnum enumVal)
+        {
+            var val = (long)enumVal;
+
+            return new()
+            {
+                Bitrate = (int)(val >> 18),
+                SampleRate = (int)(val >> 2) & ushort.MaxValue,
+                Channels = (int)(val & 3)
+            };
+        }
+        internal AudioFormatEnum ToEnum()
+        {
+            var val = (AudioFormatEnum)(((long)Bitrate << 18) | ((long)SampleRate << 2) | (long)Channels);
+
+            return Enum.IsDefined(val) ?
+                val : AudioFormatEnum.Unknown;
+        }
+
+        public override string ToString()
+            => IsValid ?
+            $"{Bitrate} Kbps, {SampleRate / 1000d:F1} kHz, {(Channels == 2 ? "Stereo" : Channels)}" :
+            "Unknown";
+
+        public int CompareTo(AudioFormat other) => ToEnum().CompareTo(other.ToEnum());
+
+        public int CompareTo(object obj) => CompareTo(obj as AudioFormat);
+    }
+}

Source/DataLayer/EfClasses/Book.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.ObjectModel;
 using System.Linq;
 using Dinah.Core;
 using Microsoft.EntityFrameworkCore;
@@ -35,24 +34,28 @@ namespace DataLayer
         // immutable
         public string AudibleProductId { get; private set; }
         public string Title { get; private set; }
-        public string Subtitle { get; private set; }
-        private string _titleWithSubtitle;
-        public string TitleWithSubtitle => _titleWithSubtitle ??= string.IsNullOrEmpty(Subtitle) ? Title : $"{Title}: {Subtitle}";
         public string Description { get; private set; }
         public int LengthInMinutes { get; private set; }
         public ContentType ContentType { get; private set; }
         public string Locale { get; private set; }
 
+        internal AudioFormatEnum _audioFormat;
+
+        public AudioFormat AudioFormat { get => AudioFormat.FromEnum(_audioFormat); set => _audioFormat = value.ToEnum(); }
+
         // mutable
         public string PictureId { get; set; }
         public string PictureLarge { get; set; }
 
         // book details
         public bool IsAbridged { get; private set; }
-        public bool IsSpatial { get; private set; }
         public DateTime? DatePublished { get; private set; }
         public string Language { get; private set; }
 
+        // non-null. use "empty pattern"
+        internal int CategoryId { get; private set; }
+        public Category Category { get; private set; }
+
         // is owned, not optional 1:1
         public UserDefinedItem UserDefinedItem { get; private set; }
 
@@ -67,12 +70,12 @@ namespace DataLayer
         public Book(
             AudibleProductId audibleProductId,
             string title,
-            string subtitle,
             string description,
             int lengthInMinutes,
             ContentType contentType,
-            IEnumerable<Contributor> authors,
-            IEnumerable<Contributor> narrators,
+			IEnumerable<Contributor> authors,
+			IEnumerable<Contributor> narrators,
+			Category category,
             string localeName)
         {
             // validate
@@ -80,7 +83,7 @@ namespace DataLayer
             var productId = audibleProductId.Id;
             ArgumentValidator.EnsureNotNullOrWhiteSpace(productId, nameof(productId));
 
-            // assign as soon as possible. stuff below relies on this
+			// assign as soon as possible. stuff below relies on this
             AudibleProductId = productId;
             Locale = localeName;
 
@@ -88,13 +91,14 @@ namespace DataLayer
 
             // non-ef-ctor init.s
             UserDefinedItem = new UserDefinedItem(this);
-            ContributorsLink = new HashSet<BookContributor>();
-            CategoriesLink = new HashSet<BookCategory>();
+            _contributorsLink = new HashSet<BookContributor>();
             _seriesLink = new HashSet<SeriesBook>();
             _supplements = new HashSet<Supplement>();
 
+			Category = category;
+
             // simple assigns
-            UpdateTitle(title, subtitle);
+            Title = title.Trim() ?? "";
             Description = description?.Trim() ?? "";
             LengthInMinutes = lengthInMinutes;
             ContentType = contentType;
@@ -102,24 +106,22 @@ namespace DataLayer
             // assigns with biz logic
             ReplaceAuthors(authors);
             ReplaceNarrators(narrators);
-        }
+		}
 
-        public void UpdateTitle(string title, string subtitle)
-        {
-            Title = title?.Trim() ?? "";
-            Subtitle = subtitle?.Trim() ?? "";
-            _titleWithSubtitle = null;
-        }
+        #region contributors, authors, narrators
+        // use uninitialised backing fields - this means we can detect if the collection was loaded
+        private HashSet<BookContributor> _contributorsLink;
+        // i'd like this to be internal but migration throws this exception when i try:
+        //   Value cannot be null.
+        //   Parameter name: property
+        public IEnumerable<BookContributor> ContributorsLink
+            => _contributorsLink?
+                .OrderBy(bc => bc.Order)
+                .ToList();
 
-        public void UpdateLengthInMinutes(int lengthInMinutes)
-            => LengthInMinutes = lengthInMinutes;
-
-		#region contributors, authors, narrators
-		internal HashSet<BookContributor> ContributorsLink { get; private set; }
-
-        public IEnumerable<Contributor> Authors => ContributorsLink.ByRole(Role.Author).Select(bc => bc.Contributor).ToList();
-        public IEnumerable<Contributor> Narrators => ContributorsLink.ByRole(Role.Narrator).Select(bc => bc.Contributor).ToList();
-        public string Publisher => ContributorsLink.ByRole(Role.Publisher).SingleOrDefault()?.Contributor.Name;
+        public IEnumerable<Contributor> Authors => getContributions(Role.Author).Select(bc => bc.Contributor).ToList();
+        public IEnumerable<Contributor> Narrators => getContributions(Role.Narrator).Select(bc => bc.Contributor).ToList();
+        public string Publisher => getContributions(Role.Publisher).SingleOrDefault()?.Contributor.Name;
 
         public void ReplaceAuthors(IEnumerable<Contributor> authors, DbContext context = null)
             => replaceContributors(authors, Role.Author, context);
@@ -132,70 +134,47 @@ namespace DataLayer
             ArgumentValidator.EnsureEnumerableNotNullOrEmpty(newContributors, nameof(newContributors));
 
             // the edge cases of doing local-loaded vs remote-only got weird. just load it
-            if (ContributorsLink is null)
-                getEntry(context).Collection(s => s.ContributorsLink).Load();
-
-            var isIdentical
-                = ContributorsLink
-                .ByRole(role)
-                .Select(c => c.Contributor)
-                .SequenceEqual(newContributors);
+            if (_contributorsLink is null)
+				getEntry(context).Collection(s => s.ContributorsLink).Load();
 
+			var roleContributions = getContributions(role);
+            var isIdentical = roleContributions.Select(c => c.Contributor).SequenceEqual(newContributors);
             if (isIdentical)
                 return;
 
-            ContributorsLink.RemoveWhere(bc => bc.Role == role);
+            _contributorsLink.RemoveWhere(bc => bc.Role == role);
             addNewContributors(newContributors, role);
         }
 
-        private void addNewContributors(IEnumerable<Contributor> newContributors, Role role)
+		private void addNewContributors(IEnumerable<Contributor> newContributors, Role role)
         {
             byte order = 0;
             var newContributionsEnum = newContributors.Select(c => new BookContributor(this, c, role, order++));
             var newContributions = new HashSet<BookContributor>(newContributionsEnum);
-            ContributorsLink.UnionWith(newContributions);
+            _contributorsLink.UnionWith(newContributions);
         }
 
+        private List<BookContributor> getContributions(Role role)
+            => ContributorsLink
+                .Where(a => a.Role == role)
+                .OrderBy(a => a.Order)
+                .ToList();
         #endregion
 
-        private Microsoft.EntityFrameworkCore.ChangeTracking.EntityEntry<Book> getEntry(DbContext context)
-        {
-            ArgumentValidator.EnsureNotNull(context, nameof(context));
-
-            var entry = context.Entry(this);
-
-            if (!entry.IsKeySet)
-                throw new InvalidOperationException("Could not load a valid Book from database");
-
-            return entry;
-        }
-
-        #region categories
-        internal HashSet<BookCategory> CategoriesLink { get; private set; }
-
-        private ReadOnlyCollection<BookCategory> _categoriesReadOnly;
-        public ReadOnlyCollection<BookCategory> Categories
-        {
-            get
-            {
-                if (_categoriesReadOnly?.SequenceEqual(CategoriesLink) is not true)
-                    _categoriesReadOnly = CategoriesLink.ToList().AsReadOnly();
-                return _categoriesReadOnly;
-            }
-        }
-		public void SetCategoryLadders(IEnumerable<CategoryLadder> ladders)
+		private Microsoft.EntityFrameworkCore.ChangeTracking.EntityEntry<Book> getEntry(DbContext context)
 		{
-			ArgumentValidator.EnsureNotNull(ladders, nameof(ladders));
+			ArgumentValidator.EnsureNotNull(context, nameof(context));
 
-			//Replace all existing category ladders.
-            //Some books make have duplicate ladders
-			CategoriesLink.Clear();
-            CategoriesLink.UnionWith(ladders.Distinct().Select(l => new BookCategory(this, l)));
+			var entry = context.Entry(this);
+
+			if (!entry.IsKeySet)
+				throw new InvalidOperationException("Could not load a valid Book from database");
+
+			return entry;
 		}
-		#endregion
 
-		#region series
-		private HashSet<SeriesBook> _seriesLink;
+        #region series
+        private HashSet<SeriesBook> _seriesLink;
         public IEnumerable<SeriesBook> SeriesLink => _seriesLink?.ToList();
 
         public void UpsertSeries(Series series, string order, DbContext context = null)
@@ -237,15 +216,23 @@ namespace DataLayer
         public void UpdateProductRating(float overallRating, float performanceRating, float storyRating)
             => Rating.Update(overallRating, performanceRating, storyRating);
 
-        public void UpdateBookDetails(bool isAbridged, bool? isSpatial, DateTime? datePublished, string language)
+        public void UpdateBookDetails(bool isAbridged, DateTime? datePublished, string language)
         {
             // don't overwrite with default values
             IsAbridged |= isAbridged;
-            IsSpatial = isSpatial ?? IsSpatial;
             DatePublished = datePublished ?? DatePublished;
             Language = language?.FirstCharToUpper() ?? Language;
         }
 
-        public override string ToString() => $"[{AudibleProductId}] {TitleWithSubtitle}";
+        public void UpdateCategory(Category category, DbContext context = null)
+		{
+			// since category is never null, nullity means it hasn't been loaded
+			if (Category is null)
+				getEntry(context).Reference(s => s.Category).Load();
+
+			Category = category;
+        }
+
+        public override string ToString() => $"[{AudibleProductId}] {Title}";
 	}
 }

Source/DataLayer/EfClasses/BookCategory.cs

@@ -1,20 +0,0 @@
-using Dinah.Core;
-
-namespace DataLayer
-{
-	public class BookCategory
-	{
-		internal int BookId { get; private set; }
-		internal int CategoryLadderId { get; private set; }
-
-		public Book Book { get; private set; }
-		public CategoryLadder CategoryLadder { get; private set; }
-		private BookCategory() { }
-
-		internal BookCategory(Book book, CategoryLadder categoriesList)
-		{
-			Book = ArgumentValidator.EnsureNotNull(book, nameof(book));
-			CategoryLadder = ArgumentValidator.EnsureNotNull(categoriesList, nameof(categoriesList));
-		}
-	}
-}

Source/DataLayer/EfClasses/Category.cs

@@ -1,9 +1,9 @@
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
+using System;
+using System.Collections.Generic;
 using System.Linq;
 using Dinah.Core;
+using Microsoft.EntityFrameworkCore;
 
-#nullable enable
 namespace DataLayer
 {
     public class AudibleCategoryId
@@ -15,29 +15,20 @@ namespace DataLayer
             Id = id;
         }
     }
-
     public class Category
     {
+        // Empty is a special case. use private ctor w/o validation
+        public static Category GetEmpty() => new() { CategoryId = -1, AudibleCategoryId = "", Name = "" };
+
         internal int CategoryId { get; private set; }
-        public string? AudibleCategoryId { get; private set; }
+        public string AudibleCategoryId { get; private set; }
 
-        public string? Name { get; internal set; }
+        public string Name { get; private set; }
+        public Category ParentCategory { get; private set; }
 
-        internal List<CategoryLadder> _categoryLadders = new();
-        private ReadOnlyCollection<CategoryLadder>? _categoryLaddersReadOnly;
-        public ReadOnlyCollection<CategoryLadder> CategoryLadders
-		{
-			get
-			{
-				if (_categoryLaddersReadOnly?.SequenceEqual(_categoryLadders) is not true)
-					_categoryLaddersReadOnly = _categoryLadders.AsReadOnly();
-				return _categoryLaddersReadOnly;
-			}
-		}
-
-		private Category() { }
+        private Category() { }
         /// <summary>special id class b/c it's too easy to get string order mixed up</summary>
-        public Category(AudibleCategoryId audibleSeriesId, string name)
+        public Category(AudibleCategoryId audibleSeriesId, string name, Category parentCategory = null)
         {
             ArgumentValidator.EnsureNotNull(audibleSeriesId, nameof(audibleSeriesId));
             var id = audibleSeriesId.Id;
@@ -46,6 +37,15 @@ namespace DataLayer
 
             AudibleCategoryId = id;
             Name = name;
+
+            UpdateParentCategory(parentCategory);
+        }
+
+        public void UpdateParentCategory(Category parentCategory)
+        {
+            // don't overwrite with null but not an error
+            if (parentCategory is not null)
+                ParentCategory = parentCategory;
         }
 
 		public override string ToString() => $"[{AudibleCategoryId}] {Name}";

Source/DataLayer/EfClasses/CategoryLadder.cs

@@ -1,58 +0,0 @@
-using Dinah.Core;
-using System;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Linq;
-
-#nullable enable
-namespace DataLayer
-{
-	public class CategoryLadder : IEquatable<CategoryLadder>
-	{
-		internal int CategoryLadderId { get; private set; }
-
-		internal List<Category> _categories;
-		private ReadOnlyCollection<Category>? _categoriesReadOnly;
-		public ReadOnlyCollection<Category> Categories
-		{
-			get
-			{
-				if (_categoriesReadOnly?.SequenceEqual(_categories) is not true)
-					_categoriesReadOnly = _categories.AsReadOnly();
-				return _categoriesReadOnly;
-			}
-		}
-
-		private HashSet<BookCategory>? _booksLink;
-		public IEnumerable<BookCategory>? BooksLink => _booksLink?.ToList();
-		private CategoryLadder() { _categories = new(); }
-		public CategoryLadder(List<Category> categories)
-		{
-			ArgumentValidator.EnsureNotNull(categories, nameof(categories));
-			ArgumentValidator.EnsureGreaterThan(categories.Count, nameof(categories), 0);
-			_booksLink = new HashSet<BookCategory>();
-			_categories = categories;
-		}
-
-		public override int GetHashCode()
-		{
-			HashCode hashCode = default;
-			foreach (var category in _categories)
-				hashCode.Add(category.AudibleCategoryId);
-			return hashCode.ToHashCode();
-		}
-
-		public bool Equals(CategoryLadder? other)
-			=> other?._categories is not null
-			&& Equals(other._categories.Select(c => c.AudibleCategoryId));
-
-		public bool Equals(IEnumerable<string?>? categoryIds)
-			=> categoryIds is not null
-			&& _categories.Select(c => c.AudibleCategoryId).SequenceEqual(categoryIds);
-
-		public override bool Equals(object? obj)
-			=> obj is CategoryLadder other && Equals(other);
-
-		public override string ToString() => string.Join(" > ", _categories.Select(c => c.Name));
-	}
-}

Source/DataLayer/EfClasses/Contributor.cs

@@ -43,7 +43,5 @@ namespace DataLayer
 		}
 
 		public override string ToString() => Name;
-		public void SetAudibleContributorId(string audibleContributorId)
-			=> AudibleContributorId = audibleContributorId;
 	}
 }

Source/DataLayer/EfClasses/UserDefinedItem.cs

@@ -24,52 +24,24 @@ namespace DataLayer
     {
         internal int BookId { get; private set; }
         public Book Book { get; private set; }
-		/// <summary>
-		/// Date the audio file was last downloaded.
-		/// </summary>
-		public DateTime? LastDownloaded { get; private set; }
-		/// <summary>
-		/// Version of Libation used the last time the audio file was downloaded.
-		/// </summary>
-		public Version LastDownloadedVersion { get; private set; }
-		/// <summary>
-		/// Audio format of the last downloaded audio file.
-		/// </summary>
-		public AudioFormat LastDownloadedFormat { get; private set; }
-		/// <summary>
-		/// Version of the audio file that was last downloaded.
-		/// </summary>
-		public string LastDownloadedFileVersion { get; private set; }
+        public DateTime? LastDownloaded { get; private set; }
+        public Version LastDownloadedVersion { get; private set; }
 
-        public void SetLastDownloaded(Version libationVersion, AudioFormat audioFormat, string audioVersion)
+        public void SetLastDownloaded(Version version)
         {
-            if (LastDownloadedVersion != libationVersion)
+            if (LastDownloadedVersion != version)
             {
-                LastDownloadedVersion = libationVersion;
+                LastDownloadedVersion = version;
 				OnItemChanged(nameof(LastDownloadedVersion));
 			}
-            if (LastDownloadedFormat != audioFormat)
-            {
-                LastDownloadedFormat = audioFormat;
-				OnItemChanged(nameof(LastDownloadedFormat));
-			}
-            if (LastDownloadedFileVersion != audioVersion)
-            {
-				LastDownloadedFileVersion = audioVersion;
-				OnItemChanged(nameof(LastDownloadedFileVersion));
-			}
 
-            if (libationVersion is null)
-            {
+            if (version is null)
                 LastDownloaded = null;
-                LastDownloadedFormat = null;
-                LastDownloadedFileVersion = null;
-            }
             else
             {
-                LastDownloaded = DateTime.Now;
+				LastDownloaded = DateTime.Now;
                 OnItemChanged(nameof(LastDownloaded));
-            }
+			}
 		}
 
 		private UserDefinedItem() { }
@@ -223,23 +195,7 @@ namespace DataLayer
                 }
             }
         }
-        #endregion
-
-        #region IsFinished
-        private bool _isFinished;
-        public bool IsFinished
-        {
-            get => _isFinished;
-            set
-            {
-                if (value != _isFinished)
-                {
-                    _isFinished = value;
-                    OnItemChanged(nameof(IsFinished));
-                }
-            }
-        }
-        #endregion
+		#endregion
 
         public override string ToString() => $"{Book} {Rating} {Tags}";
 	}

Source/DataLayer/EntityExtensions.cs

@@ -7,13 +7,8 @@ using System.Threading.Tasks;
 namespace DataLayer
 {
     public static class EntityExtensions
-	{
-		public static IEnumerable<BookContributor> ByRole(this IEnumerable<BookContributor> contributors, Role role)
-			=> contributors
-				.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 TitleSortable(this Book book) => Formatters.GetSortName(book.Title);
 
         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));
@@ -51,31 +46,14 @@ namespace DataLayer
                 ? $"{sb.Series.Name} (#{sb.Order})"
                 : sb.Series.Name;
 		}
-
-        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[] CategoriesNames(this Book book)
+            => book.Category is null ? new string[0]
+            : book.Category.ParentCategory is null ? new[] { book.Category.Name }
+            : new[] { book.Category.ParentCategory.Name, book.Category.Name };
+        public static string[] CategoriesIds(this Book book)
+            => book.Category is null ? null
+            : book.Category.ParentCategory is null ? new[] { book.Category.AudibleCategoryId }
+            : new[] { book.Category.ParentCategory.AudibleCategoryId, book.Category.AudibleCategoryId };
 
         public static string AggregateTitles(this IEnumerable<LibraryBook> libraryBooks, int max = 5)
 		{
@@ -84,7 +62,7 @@ namespace DataLayer
 
 			max = Math.Max(max, 1);
 
-			var titles = libraryBooks.Select(lb => "- " + lb.Book.TitleWithSubtitle).ToList();
+			var titles = libraryBooks.Select(lb => "- " + lb.Book.Title).ToList();
 			var titlesAgg = titles.Take(max).Aggregate((a, b) => $"{a}\r\n{b}");
 			if (titles.Count == max + 1)
 				titlesAgg += $"\r\n\r\nand 1 other";

Source/DataLayer/LibationContext.cs

@@ -23,7 +23,6 @@ namespace DataLayer
         public DbSet<Contributor> Contributors { get; private set; }
         public DbSet<Series> Series { get; private set; }
         public DbSet<Category> Categories { get; private set; }
-        public DbSet<CategoryLadder> CategoryLadders { get; private set; }
 
         public static LibationContext Create(string connectionString)
         {
@@ -40,15 +39,13 @@ namespace DataLayer
         {
             base.OnModelCreating(modelBuilder);
 
-			modelBuilder.ApplyConfiguration(new BookConfig());
+            modelBuilder.ApplyConfiguration(new BookConfig());
             modelBuilder.ApplyConfiguration(new ContributorConfig());
             modelBuilder.ApplyConfiguration(new BookContributorConfig());
             modelBuilder.ApplyConfiguration(new LibraryBookConfig());
             modelBuilder.ApplyConfiguration(new SeriesConfig());
             modelBuilder.ApplyConfiguration(new SeriesBookConfig());
             modelBuilder.ApplyConfiguration(new CategoryConfig());
-			modelBuilder.ApplyConfiguration(new CategoryLadderConfig());
-			modelBuilder.ApplyConfiguration(new BookCategoryConfig());
 
 			// views are now supported via "keyless entity types" (instead of "entity types" or the prev "query types"):
 			// https://docs.microsoft.com/en-us/ef/core/modeling/keyless-entity-types

Source/DataLayer/LibationContextFactory.cs

@@ -1,14 +1,11 @@
 using Dinah.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Diagnostics;
 
 namespace DataLayer
 {
     public class LibationContextFactory : DesignTimeDbContextFactoryBase<LibationContext>
     {
         protected override LibationContext CreateNewInstance(DbContextOptions<LibationContext> options) => new LibationContext(options);
-        protected override void UseDatabaseEngine(DbContextOptionsBuilder optionsBuilder, string connectionString)
-            => optionsBuilder.ConfigureWarnings(w => w.Ignore(RelationalEventId.PendingModelChangesWarning))
-            .UseSqlite(connectionString, ob => ob.UseQuerySplittingBehavior(QuerySplittingBehavior.SplitQuery));
+        protected override void UseDatabaseEngine(DbContextOptionsBuilder optionsBuilder, string connectionString) => optionsBuilder.UseSqlite(connectionString);
     }
 }

Source/DataLayer/Migrations/20230626171442_AddBookSubtitle.Designer.cs

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

Source/DataLayer/Migrations/20230626171442_AddBookSubtitle.cs

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

Source/DataLayer/Migrations/20230718214617_AddCategoryLadder.Designer.cs

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

Source/DataLayer/Migrations/20230718214617_AddCategoryLadder.cs

@@ -1,174 +0,0 @@
-using Microsoft.EntityFrameworkCore.Migrations;
-
-#nullable disable
-
-namespace DataLayer.Migrations
-{
-    /// <inheritdoc />
-    public partial class AddCategoryLadder : Migration
-    {
-        /// <inheritdoc />
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropForeignKey(
-                name: "FK_Books_Categories_CategoryId",
-                table: "Books");
-
-            migrationBuilder.DropForeignKey(
-                name: "FK_Categories_Categories_ParentCategoryCategoryId",
-                table: "Categories");
-
-            migrationBuilder.DropIndex(
-                name: "IX_Categories_ParentCategoryCategoryId",
-                table: "Categories");
-
-            migrationBuilder.DropIndex(
-                name: "IX_Books_CategoryId",
-                table: "Books");
-
-            migrationBuilder.DeleteData(
-                table: "Categories",
-                keyColumn: "CategoryId",
-                keyValue: -1);
-
-            migrationBuilder.DropColumn(
-                name: "ParentCategoryCategoryId",
-                table: "Categories");
-
-            migrationBuilder.DropColumn(
-                name: "CategoryId",
-                table: "Books");
-
-            migrationBuilder.CreateTable(
-                name: "CategoryLadders",
-                columns: table => new
-                {
-                    CategoryLadderId = table.Column<int>(type: "INTEGER", nullable: false)
-                        .Annotation("Sqlite:Autoincrement", true)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_CategoryLadders", x => x.CategoryLadderId);
-                });
-
-            migrationBuilder.CreateTable(
-                name: "BookCategory",
-                columns: table => new
-                {
-                    BookId = table.Column<int>(type: "INTEGER", nullable: false),
-                    CategoryLadderId = table.Column<int>(type: "INTEGER", nullable: false)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_BookCategory", x => new { x.BookId, x.CategoryLadderId });
-                    table.ForeignKey(
-                        name: "FK_BookCategory_Books_BookId",
-                        column: x => x.BookId,
-                        principalTable: "Books",
-                        principalColumn: "BookId",
-                        onDelete: ReferentialAction.Cascade);
-                    table.ForeignKey(
-                        name: "FK_BookCategory_CategoryLadders_CategoryLadderId",
-                        column: x => x.CategoryLadderId,
-                        principalTable: "CategoryLadders",
-                        principalColumn: "CategoryLadderId",
-                        onDelete: ReferentialAction.Cascade);
-                });
-
-            migrationBuilder.CreateTable(
-                name: "CategoryCategoryLadder",
-                columns: table => new
-                {
-                    _categoriesCategoryId = table.Column<int>(type: "INTEGER", nullable: false),
-                    _categoryLaddersCategoryLadderId = table.Column<int>(type: "INTEGER", nullable: false)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_CategoryCategoryLadder", x => new { x._categoriesCategoryId, x._categoryLaddersCategoryLadderId });
-                    table.ForeignKey(
-                        name: "FK_CategoryCategoryLadder_Categories__categoriesCategoryId",
-                        column: x => x._categoriesCategoryId,
-                        principalTable: "Categories",
-                        principalColumn: "CategoryId",
-                        onDelete: ReferentialAction.Cascade);
-                    table.ForeignKey(
-                        name: "FK_CategoryCategoryLadder_CategoryLadders__categoryLaddersCategoryLadderId",
-                        column: x => x._categoryLaddersCategoryLadderId,
-                        principalTable: "CategoryLadders",
-                        principalColumn: "CategoryLadderId",
-                        onDelete: ReferentialAction.Cascade);
-                });
-
-            migrationBuilder.CreateIndex(
-                name: "IX_BookCategory_BookId",
-                table: "BookCategory",
-                column: "BookId");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_BookCategory_CategoryLadderId",
-                table: "BookCategory",
-                column: "CategoryLadderId");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_CategoryCategoryLadder__categoryLaddersCategoryLadderId",
-                table: "CategoryCategoryLadder",
-                column: "_categoryLaddersCategoryLadderId");
-        }
-
-        /// <inheritdoc />
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropTable(
-                name: "BookCategory");
-
-            migrationBuilder.DropTable(
-                name: "CategoryCategoryLadder");
-
-            migrationBuilder.DropTable(
-                name: "CategoryLadders");
-
-            migrationBuilder.AddColumn<int>(
-                name: "ParentCategoryCategoryId",
-                table: "Categories",
-                type: "INTEGER",
-                nullable: true);
-
-            migrationBuilder.AddColumn<int>(
-                name: "CategoryId",
-                table: "Books",
-                type: "INTEGER",
-                nullable: false,
-                defaultValue: 0);
-
-            migrationBuilder.InsertData(
-                table: "Categories",
-                columns: new[] { "CategoryId", "AudibleCategoryId", "Name", "ParentCategoryCategoryId" },
-                values: new object[] { -1, "", "", null });
-
-            migrationBuilder.CreateIndex(
-                name: "IX_Categories_ParentCategoryCategoryId",
-                table: "Categories",
-                column: "ParentCategoryCategoryId");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_Books_CategoryId",
-                table: "Books",
-                column: "CategoryId");
-
-            migrationBuilder.AddForeignKey(
-                name: "FK_Books_Categories_CategoryId",
-                table: "Books",
-                column: "CategoryId",
-                principalTable: "Categories",
-                principalColumn: "CategoryId",
-                onDelete: ReferentialAction.Cascade);
-
-            migrationBuilder.AddForeignKey(
-                name: "FK_Categories_Categories_ParentCategoryCategoryId",
-                table: "Categories",
-                column: "ParentCategoryCategoryId",
-                principalTable: "Categories",
-                principalColumn: "CategoryId");
-        }
-    }
-}

Source/DataLayer/Migrations/20240911114741_MyComment.Designer.cs

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

Source/DataLayer/Migrations/20240911114741_MyComment.cs

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

Source/DataLayer/Migrations/20250725074123_AddAudioFormatData.Designer.cs

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

Source/DataLayer/Migrations/20250725074123_AddAudioFormatData.cs

@@ -1,48 +0,0 @@
-using Microsoft.EntityFrameworkCore.Migrations;
-
-#nullable disable
-
-namespace DataLayer.Migrations
-{
-    /// <inheritdoc />
-    public partial class AddAudioFormatData : Migration
-    {
-        /// <inheritdoc />
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.RenameColumn(
-                name: "_audioFormat",
-                table: "Books",
-                newName: "IsSpatial");
-
-            migrationBuilder.AddColumn<string>(
-                name: "LastDownloadedFileVersion",
-                table: "UserDefinedItem",
-                type: "TEXT",
-                nullable: true);
-
-            migrationBuilder.AddColumn<long>(
-                name: "LastDownloadedFormat",
-                table: "UserDefinedItem",
-                type: "INTEGER",
-                nullable: true);
-        }
-
-        /// <inheritdoc />
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropColumn(
-                name: "LastDownloadedFileVersion",
-                table: "UserDefinedItem");
-
-            migrationBuilder.DropColumn(
-                name: "LastDownloadedFormat",
-                table: "UserDefinedItem");
-
-            migrationBuilder.RenameColumn(
-                name: "IsSpatial",
-                table: "Books",
-                newName: "_audioFormat");
-        }
-    }
-}

Source/DataLayer/Migrations/LibationContextModelSnapshot.cs

@@ -15,22 +15,7 @@ namespace DataLayer.Migrations
         protected override void BuildModel(ModelBuilder modelBuilder)
         {
 #pragma warning disable 612, 618
-            modelBuilder.HasAnnotation("ProductVersion", "9.0.7");
-
-            modelBuilder.Entity("CategoryCategoryLadder", b =>
-                {
-                    b.Property<int>("_categoriesCategoryId")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<int>("_categoryLaddersCategoryLadderId")
-                        .HasColumnType("INTEGER");
-
-                    b.HasKey("_categoriesCategoryId", "_categoryLaddersCategoryLadderId");
-
-                    b.HasIndex("_categoryLaddersCategoryLadderId");
-
-                    b.ToTable("CategoryCategoryLadder");
-                });
+            modelBuilder.HasAnnotation("ProductVersion", "7.0.3");
 
             modelBuilder.Entity("DataLayer.Book", b =>
                 {
@@ -41,6 +26,9 @@ namespace DataLayer.Migrations
                     b.Property<string>("AudibleProductId")
                         .HasColumnType("TEXT");
 
+                    b.Property<int>("CategoryId")
+                        .HasColumnType("INTEGER");
+
                     b.Property<int>("ContentType")
                         .HasColumnType("INTEGER");
 
@@ -53,9 +41,6 @@ namespace DataLayer.Migrations
                     b.Property<bool>("IsAbridged")
                         .HasColumnType("INTEGER");
 
-                    b.Property<bool>("IsSpatial")
-                        .HasColumnType("INTEGER");
-
                     b.Property<string>("Language")
                         .HasColumnType("TEXT");
 
@@ -71,36 +56,21 @@ namespace DataLayer.Migrations
                     b.Property<string>("PictureLarge")
                         .HasColumnType("TEXT");
 
-                    b.Property<string>("Subtitle")
-                        .HasColumnType("TEXT");
-
                     b.Property<string>("Title")
                         .HasColumnType("TEXT");
 
+                    b.Property<long>("_audioFormat")
+                        .HasColumnType("INTEGER");
+
                     b.HasKey("BookId");
 
                     b.HasIndex("AudibleProductId");
 
+                    b.HasIndex("CategoryId");
+
                     b.ToTable("Books");
                 });
 
-            modelBuilder.Entity("DataLayer.BookCategory", b =>
-                {
-                    b.Property<int>("BookId")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<int>("CategoryLadderId")
-                        .HasColumnType("INTEGER");
-
-                    b.HasKey("BookId", "CategoryLadderId");
-
-                    b.HasIndex("BookId");
-
-                    b.HasIndex("CategoryLadderId");
-
-                    b.ToTable("BookCategory");
-                });
-
             modelBuilder.Entity("DataLayer.BookContributor", b =>
                 {
                     b.Property<int>("BookId")
@@ -136,22 +106,24 @@ namespace DataLayer.Migrations
                     b.Property<string>("Name")
                         .HasColumnType("TEXT");
 
+                    b.Property<int?>("ParentCategoryCategoryId")
+                        .HasColumnType("INTEGER");
+
                     b.HasKey("CategoryId");
 
                     b.HasIndex("AudibleCategoryId");
 
+                    b.HasIndex("ParentCategoryCategoryId");
+
                     b.ToTable("Categories");
-                });
 
-            modelBuilder.Entity("DataLayer.CategoryLadder", b =>
-                {
-                    b.Property<int>("CategoryLadderId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("INTEGER");
-
-                    b.HasKey("CategoryLadderId");
-
-                    b.ToTable("CategoryLadders");
+                    b.HasData(
+                        new
+                        {
+                            CategoryId = -1,
+                            AudibleCategoryId = "",
+                            Name = ""
+                        });
                 });
 
             modelBuilder.Entity("DataLayer.Contributor", b =>
@@ -241,23 +213,14 @@ namespace DataLayer.Migrations
                     b.ToTable("SeriesBook");
                 });
 
-            modelBuilder.Entity("CategoryCategoryLadder", b =>
-                {
-                    b.HasOne("DataLayer.Category", null)
-                        .WithMany()
-                        .HasForeignKey("_categoriesCategoryId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.HasOne("DataLayer.CategoryLadder", null)
-                        .WithMany()
-                        .HasForeignKey("_categoryLaddersCategoryLadderId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-                });
-
             modelBuilder.Entity("DataLayer.Book", b =>
                 {
+                    b.HasOne("DataLayer.Category", "Category")
+                        .WithMany()
+                        .HasForeignKey("CategoryId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
                     b.OwnsOne("DataLayer.Rating", "Rating", b1 =>
                         {
                             b1.Property<int>("BookId")
@@ -312,18 +275,9 @@ namespace DataLayer.Migrations
                             b1.Property<int>("BookStatus")
                                 .HasColumnType("INTEGER");
 
-                            b1.Property<bool>("IsFinished")
-                                .HasColumnType("INTEGER");
-
                             b1.Property<DateTime?>("LastDownloaded")
                                 .HasColumnType("TEXT");
 
-                            b1.Property<string>("LastDownloadedFileVersion")
-                                .HasColumnType("TEXT");
-
-                            b1.Property<long?>("LastDownloadedFormat")
-                                .HasColumnType("INTEGER");
-
                             b1.Property<string>("LastDownloadedVersion")
                                 .HasColumnType("TEXT");
 
@@ -367,6 +321,8 @@ namespace DataLayer.Migrations
                             b1.Navigation("Rating");
                         });
 
+                    b.Navigation("Category");
+
                     b.Navigation("Rating");
 
                     b.Navigation("Supplements");
@@ -374,25 +330,6 @@ namespace DataLayer.Migrations
                     b.Navigation("UserDefinedItem");
                 });
 
-            modelBuilder.Entity("DataLayer.BookCategory", b =>
-                {
-                    b.HasOne("DataLayer.Book", "Book")
-                        .WithMany("CategoriesLink")
-                        .HasForeignKey("BookId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.HasOne("DataLayer.CategoryLadder", "CategoryLadder")
-                        .WithMany("BooksLink")
-                        .HasForeignKey("CategoryLadderId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.Navigation("Book");
-
-                    b.Navigation("CategoryLadder");
-                });
-
             modelBuilder.Entity("DataLayer.BookContributor", b =>
                 {
                     b.HasOne("DataLayer.Book", "Book")
@@ -412,6 +349,15 @@ namespace DataLayer.Migrations
                     b.Navigation("Contributor");
                 });
 
+            modelBuilder.Entity("DataLayer.Category", b =>
+                {
+                    b.HasOne("DataLayer.Category", "ParentCategory")
+                        .WithMany()
+                        .HasForeignKey("ParentCategoryCategoryId");
+
+                    b.Navigation("ParentCategory");
+                });
+
             modelBuilder.Entity("DataLayer.LibraryBook", b =>
                 {
                     b.HasOne("DataLayer.Book", "Book")
@@ -444,18 +390,11 @@ namespace DataLayer.Migrations
 
             modelBuilder.Entity("DataLayer.Book", b =>
                 {
-                    b.Navigation("CategoriesLink");
-
                     b.Navigation("ContributorsLink");
 
                     b.Navigation("SeriesLink");
                 });
 
-            modelBuilder.Entity("DataLayer.CategoryLadder", b =>
-                {
-                    b.Navigation("BooksLink");
-                });
-
             modelBuilder.Entity("DataLayer.Contributor", b =>
                 {
                     b.Navigation("BooksLink");

Source/DataLayer/QueryObjects/BookQueries.cs

@@ -34,7 +34,7 @@ namespace DataLayer
                 // owned items are always loaded. eg: book.UserDefinedItem, book.Supplements
                 .Include(b => b.SeriesLink).ThenInclude(sb => sb.Series)
                 .Include(b => b.ContributorsLink).ThenInclude(c => c.Contributor)
-                .Include(b => b.CategoriesLink).ThenInclude(c => c.CategoryLadder).ThenInclude(c => c._categories);
+                .Include(b => b.Category).ThenInclude(c => c.ParentCategory);
 
         public static bool IsProduct(this Book book)
             => book.ContentType is not ContentType.Episode and not ContentType.Parent;
@@ -44,11 +44,7 @@ namespace DataLayer
 
         public static bool IsEpisodeParent(this Book book)
             => book.ContentType is ContentType.Parent;
-
-        public static IEnumerable<LibraryBook> WithoutParents(this IEnumerable<LibraryBook> libraryBooks)
-            => libraryBooks.Where(lb => !lb.Book.IsEpisodeParent());
-
-		public static bool HasLiberated(this Book book)
+        public static bool HasLiberated(this Book book)
             => book.UserDefinedItem.BookStatus is LiberatedStatus.Liberated ||
             book.UserDefinedItem.PdfStatus is not null and LiberatedStatus.Liberated;
     }

Source/DataLayer/QueryObjects/CategoryQueries.cs

@@ -1,11 +0,0 @@
-using Microsoft.EntityFrameworkCore;
-using System.Linq;
-
-namespace DataLayer
-{
-	public static class CategoryQueries
-	{
-		public static IQueryable<CategoryLadder> GetCategoryLadders(this LibationContext context)
-			=> context.CategoryLadders.Include(c => c._categories);
-	}
-}

Source/DataLayer/QueryObjects/LibraryBookQueries.cs

@@ -2,7 +2,6 @@
 using System.Linq;
 using Microsoft.EntityFrameworkCore;
 
-#nullable enable
 namespace DataLayer
 {
     // only library importing should use tracking. All else should be NoTracking.
@@ -22,16 +21,16 @@ namespace DataLayer
                 .AsNoTrackingWithIdentityResolution()
                 .GetLibrary()
                 .AsEnumerable()
-				.Where(c => !c.Book.IsEpisodeParent() || includeParents)
-				.ToList();
+                .Where(lb => !lb.Book.IsEpisodeParent() || includeParents)
+                .ToList();
 
-        public static LibraryBook? GetLibraryBook_Flat_NoTracking(this LibationContext context, string productId)
+        public static LibraryBook GetLibraryBook_Flat_NoTracking(this LibationContext context, string productId)
             => context
                 .LibraryBooks
                 .AsNoTrackingWithIdentityResolution()
                 .GetLibraryBook(productId);
 
-        public static LibraryBook? GetLibraryBook(this IQueryable<LibraryBook> library, string productId)
+        public static LibraryBook GetLibraryBook(this IQueryable<LibraryBook> library, string productId)
             => library
                 .GetLibrary()
                 .SingleOrDefault(lb => lb.Book.AudibleProductId == productId);
@@ -56,7 +55,7 @@ namespace DataLayer
                 // owned items are always loaded. eg: book.UserDefinedItem, book.Supplements
                 .Include(le => le.Book).ThenInclude(b => b.SeriesLink).ThenInclude(sb => sb.Series)
                 .Include(le => le.Book).ThenInclude(b => b.ContributorsLink).ThenInclude(c => c.Contributor)
-                .Include(le => le.Book).ThenInclude(b => b.CategoriesLink).ThenInclude(c => c.CategoryLadder).ThenInclude(c => c._categories);
+                .Include(le => le.Book).ThenInclude(b => b.Category).ThenInclude(c => c.ParentCategory);
 
         public static IEnumerable<LibraryBook> ParentedEpisodes(this IEnumerable<LibraryBook> libraryBooks)
             => libraryBooks.Where(lb => lb.Book.IsEpisodeParent()).SelectMany(libraryBooks.FindChildren);
@@ -92,7 +91,7 @@ namespace DataLayer
         }
 #nullable disable
 
-        public static List<LibraryBook> FindChildren(this IEnumerable<LibraryBook> bookList, LibraryBook parent)
+        public static IEnumerable<LibraryBook> FindChildren(this IEnumerable<LibraryBook> bookList, LibraryBook parent)
             => bookList
             .Where(
                 lb => 
@@ -104,11 +103,13 @@ namespace DataLayer
                         ) == true
                     ).ToList();
 
-		public static bool NeedsPdfDownload(this LibraryBook libraryBook)
-			=> !libraryBook.AbsentFromLastScan && libraryBook.Book.UserDefinedItem.PdfStatus is LiberatedStatus.NotLiberated;
-		public static bool NeedsBookDownload(this LibraryBook libraryBook)
-			=> !libraryBook.AbsentFromLastScan && libraryBook.Book.UserDefinedItem.BookStatus is LiberatedStatus.NotLiberated or LiberatedStatus.PartialDownload;
-		public static IEnumerable<LibraryBook> UnLiberated(this IEnumerable<LibraryBook> bookList)
-            => bookList.Where(lb => lb.NeedsPdfDownload() || lb.NeedsBookDownload());
+        public static IEnumerable<LibraryBook> UnLiberated(this IEnumerable<LibraryBook> bookList)
+            => bookList
+                .Where(
+                    lb =>
+                        !lb.AbsentFromLastScan &&
+                        (lb.Book.UserDefinedItem.BookStatus is LiberatedStatus.NotLiberated or LiberatedStatus.PartialDownload
+                        || lb.Book.UserDefinedItem.PdfStatus is LiberatedStatus.NotLiberated or LiberatedStatus.PartialDownload)
+                    );
     }
 }

Source/DtoImporterService/BookImporter.cs

@@ -99,18 +99,32 @@ namespace DtoImporterService
                     .Select(n => contributorImporter.Cache[n.Name])
 					.ToList();
 
+			// categories are laid out for a breadcrumb. category is 1st, subcategory is 2nd
+			// absence of categories is also possible
+
+			// CATEGORY HACK: only use the 1st 2 categories
+			// after we support full arbitrary-depth category trees and multiple categories per book, the real impl will be something like this
+			//   var lastCategory = item.Categories.LastOrDefault()?.CategoryId ?? "";
+			var lastCategory
+				= item.Categories.Length == 0 ? ""
+				: item.Categories.Length == 1 ? item.Categories[0].CategoryId
+				// 2+
+				: item.Categories[1].CategoryId;
+
+			var category = categoryImporter.Cache[lastCategory];
+
 			Book book;
 			try
 			{
 				book = DbContext.Books.Add(new Book(
 					new AudibleProductId(item.ProductId),
-					item.Title,
-					item.Subtitle,
+					item.TitleWithSubtitle,
 					item.Description,
 					item.LengthInMinutes,
 					contentType,
 					authors,
 					narrators,
+					category,
 					importItem.LocaleName)
 					).Entity;
 				Cache.Add(book.AudibleProductId, book);
@@ -125,6 +139,7 @@ namespace DtoImporterService
 					contentType,
 					QtyAuthors = authors?.Count,
 					QtyNarrators = narrators?.Count,
+					Category = category?.Name,
 					importItem.LocaleName
 				});
 				throw;
@@ -137,6 +152,8 @@ namespace DtoImporterService
 				book.ReplacePublisher(publisher);
 			}
 
+            book.UpdateBookDetails(item.IsAbridged, item.DatePublished, item.Language);
+
             if (item.PdfUrl is not null)
 				book.AddSupplementDownloadUrl(item.PdfUrl.ToString());
 
@@ -147,10 +164,8 @@ namespace DtoImporterService
 		{
 			var item = importItem.DtoItem;
 
-			book.UpdateLengthInMinutes(item.LengthInMinutes);
-
-			// Update the book titles, since formatting can change
-			book.UpdateTitle(item.Title, item.Subtitle);
+			var codec = item.AvailableCodecs?.Max(f => AudioFormat.FromString(f.EnhancedCodec)) ?? new AudioFormat();
+			book.AudioFormat = codec;
 
 			// set/update book-specific info which may have changed
 			if (item.PictureId is not null)
@@ -159,14 +174,10 @@ namespace DtoImporterService
 			if (item.PictureLarge is not null)
 				book.PictureLarge = item.PictureLarge;
 
-			if (item.IsFinished is not null)
-                book.UserDefinedItem.IsFinished = item.IsFinished.Value;
-
             // 2023-02-01
             // updateBook must update language on books which were imported before the migration which added language.
-            // 2025-07-30
-            // updateBook must update isSpatial on books which were imported before the migration which added isSpatial.
-            book.UpdateBookDetails(item.IsAbridged, item.AssetDetails?.Any(a => a.IsSpatial), item.DatePublished, item.Language);
+            // Can eventually delete this
+            book.UpdateBookDetails(item.IsAbridged, item.DatePublished, item.Language);
 
             book.UpdateProductRating(
 				(float)(item.Rating?.OverallDistribution?.AverageRating ?? 0),
@@ -186,19 +197,6 @@ namespace DtoImporterService
 					book.UpsertSeries(series, seriesEntry.Sequence);
 				}
 			}
-
-			if (item.CategoryLadders is not null)
-			{
-				var ladders = new List<DataLayer.CategoryLadder>();
-				foreach (var ladder in item.CategoryLadders.Select(cl => cl.Ladder).Where(l => l?.Length > 0))
-				{
-					var categoryIds = ladder.Select(l => l.CategoryId).ToList();
-					ladders.Add(categoryImporter.LadderCache.Single(c => c.Equals(categoryIds)));
-				}
-				//Set all ladders at once so ladders that have been
-				//removed by audible can be removed from the DB
-				book.SetCategoryLadders(ladders);
-			}
 		}
 
 		private static DataLayer.ContentType GetContentType(Item item)

Source/DtoImporterService/CategoryImporter.cs

@@ -12,86 +12,76 @@ namespace DtoImporterService
 	{
 		protected override IValidator Validator => new CategoryValidator();
 
-		private Dictionary<string, Category> CategoryCache { get; set; } = new();
-		public HashSet<DataLayer.CategoryLadder> LadderCache { get; private set; } = new();
+		public Dictionary<string, Category> Cache { get; private set; } = new();
 
 		public CategoryImporter(LibationContext context) : base(context) { }
 
 		protected override int DoImport(IEnumerable<ImportItem> importItems)
 		{
-			// load db existing => .Local
-			loadLocal_categories();
-
-			// upsert
-			//Import item may not have no (null) categories
-			var categoryLadders = importItems
-				.Where(i => i.DtoItem.CategoryLadders is not null)
-				.SelectMany(i => i.DtoItem.CategoryLadders)
-				.Select(cl => cl?.Ladder)
-				.Where(l => l?.Length > 0)
+			// get distinct
+			var categoryIds = importItems
+				.Select(i => i.DtoItem)
+				.GetCategoriesDistinct()
+				.Select(c => c.CategoryId)
+				.Distinct()
 				.ToList();
 
-			var qtyNew = upsertCategories(categoryLadders);
+			// load db existing => .Local
+			loadLocal_categories(categoryIds);
+
+			// upsert
+			var categoryPairs = importItems
+				.Select(i => i.DtoItem)
+				.GetCategoryPairsDistinct()
+				.ToList();
+			var qtyNew = upsertCategories(categoryPairs);
 			return qtyNew;
 		}
 
-		private void loadLocal_categories()
+		private void loadLocal_categories(List<string> categoryIds)
 		{
+			// must include default/empty/missing
+			categoryIds.Add(Category.GetEmpty().AudibleCategoryId);
+
 			// load existing => local
-			LadderCache = DbContext.GetCategoryLadders().ToHashSet();
-			CategoryCache = LadderCache.SelectMany(cl => cl.Categories).ToDictionarySafe(c => c.AudibleCategoryId);
+			Cache = DbContext.Categories
+				.Where(c => categoryIds.Contains(c.AudibleCategoryId))
+				.ToDictionarySafe(c => c.AudibleCategoryId);
 		}
 
 		// only use after loading contributors => local
-		private int upsertCategories(List<Ladder[]> ladders)
+		private int upsertCategories(List<Ladder[]> categoryPairs)
 		{
 			var qtyNew = 0;
 
-			foreach (var ladder in ladders)
+			foreach (var pair in categoryPairs)
 			{
-				var categories = new List<Category>(ladder.Length);
-
-				for (var i = 0; i < ladder.Length; i++)
+				for (var i = 0; i < pair.Length; i++)
 				{
-					var id = ladder[i].CategoryId;
-					var name = ladder[i].CategoryName;
+					// CATEGORY HACK: not yet supported: depth beyond 0 and 1
+					if (i > 1)
+						break;
 
-					if (!CategoryCache.TryGetValue(id, out var category))
+					var id = pair[i].CategoryId;
+					var name = pair[i].CategoryName;
+
+					Category parentCategory = null;
+					if (i == 1)
+						Cache.TryGetValue(pair[0].CategoryId, out parentCategory);
+
+					if (!Cache.TryGetValue(id, out var category))
 					{
 						category = addCategory(id, name);
+						qtyNew++;
 					}
 
-					categories.Add(category);
-				}
-
-				var categoryLadder = new DataLayer.CategoryLadder(categories);
-				if (!LadderCache.Contains(categoryLadder))
-				{
-					addCategoryLadder(categoryLadder);
-					qtyNew++;
+					category.UpdateParentCategory(parentCategory);
 				}
 			}
 
 			return qtyNew;
 		}
 
-		private DataLayer.CategoryLadder addCategoryLadder(DataLayer.CategoryLadder categoryList)
-		{
-			try
-			{
-				var entityEntry = DbContext.CategoryLadders.Add(categoryList);
-				var entity = entityEntry.Entity;
-
-				LadderCache.Add(entity);
-				return entity;
-			}
-			catch (Exception ex)
-			{
-				Serilog.Log.Logger.Error(ex, "Error adding category ladder. {@DebugInfo}", categoryList);
-				throw;
-			}
-		}
-
 		private Category addCategory(string id, string name)
 		{
 			try
@@ -101,7 +91,7 @@ namespace DtoImporterService
 				var entityEntry = DbContext.Categories.Add(category);
 				var entity = entityEntry.Entity;
 
-				CategoryCache.Add(entity.AudibleCategoryId, entity);
+				Cache.Add(entity.AudibleCategoryId, entity);
 				return entity;
 			}
 			catch (Exception ex)

Source/DtoImporterService/ContributorImporter.cs

@@ -61,19 +61,19 @@ namespace DtoImporterService
 
 		private int upsertPeople(List<Person> people)
 		{
-			var qtyNew = 0;
-			foreach (var person in people)
-			{
-				if (!Cache.TryGetValue(person.Name, out var contributor))
-				{
-					contributor = createContributor(person.Name, person.Asin);
-					qtyNew++;
-				}
+			var hash = people
+				// new people only
+				.Where(p => !Cache.ContainsKey(p.Name))
+				// remove duplicates by Name. first in wins
+				.ToDictionarySafe(p => p.Name);
 
-				updateContributor(person, contributor);
+			foreach (var kvp in hash)
+			{
+				var person = kvp.Value;
+				addContributor(person.Name, person.Asin);
 			}
 
-			return qtyNew;
+			return hash.Count;
 		}
 
 		// only use after loading contributors => local
@@ -86,22 +86,16 @@ namespace DtoImporterService
 				.ToHashSet();
 
 			foreach (var pub in hash)
-				createContributor(pub);
+				addContributor(pub);
 
 			return hash.Count;
 		}
 
-		private void updateContributor(Person person, Contributor contributor)
-		{
-			if (person.Asin != contributor.AudibleContributorId)
-				contributor.SetAudibleContributorId(person.Asin);
-		}
-
-		private Contributor createContributor(string name, string id = null)
+		private Contributor addContributor(string name, string id = null)
 		{
 			try
 			{
-				var newContrib = new Contributor(name, id);
+				var newContrib = new Contributor(name);
 
 				var entityEntry = DbContext.Contributors.Add(newContrib);
 				var entity = entityEntry.Entity;

Source/DtoImporterService/DtoImporterService.csproj

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

Source/DtoImporterService/LibraryBookImporter.cs

@@ -62,7 +62,7 @@ namespace DtoImporterService
 						existing.SetAccount(item.AccountId);
 					}
 
-					existing.AbsentFromLastScan = isUnavailable(item);
+					existing.AbsentFromLastScan = isPlusTitleUnavailable(item);
 				}
 				else
 				{
@@ -71,7 +71,7 @@ namespace DtoImporterService
 						item.DtoItem.DateAdded,
 						item.AccountId)
 						{
-							AbsentFromLastScan = isUnavailable(item)
+							AbsentFromLastScan = isPlusTitleUnavailable(item)
 						};
 
 					try
@@ -113,13 +113,7 @@ namespace DtoImporterService
 		}
 
 		private static ImportItem tieBreak(ImportItem item1, ImportItem item2)
-			=> isUnavailable(item1) && !isUnavailable(item2) ? item2 : item1;
-
-		private static bool isUnavailable(ImportItem item)
-			=> isFutureRelease(item) || isPlusTitleUnavailable(item);
-
-        private static bool isFutureRelease(ImportItem item)
-			=> item.DtoItem.IssueDate is DateTimeOffset dt && dt > DateTimeOffset.UtcNow;
+			=> isPlusTitleUnavailable(item1) && !isPlusTitleUnavailable(item2) ? item2 : item1;
 
 		private static bool isPlusTitleUnavailable(ImportItem item)
 			=> item.DtoItem.ContentType is null

Source/FileLiberator/AudioDecodable.cs

@@ -15,28 +15,53 @@ namespace FileLiberator
         public event EventHandler<byte[]> CoverImageDiscovered;
         public abstract Task CancelAsync();
 
+        protected LameConfig GetLameOptions(Configuration config)
+        {
+			LameConfig lameConfig = new()
+			{
+				Mode = MPEGMode.Mono,
+				Quality = config.LameEncoderQuality,
+                OutputSampleRate = (int)config.MaxSampleRate
+			};
+
+			if (config.LameTargetBitrate)
+            {
+                if (config.LameConstantBitrate)
+                    lameConfig.BitRate = config.LameBitrate;
+                else
+                {
+                    lameConfig.ABRRateKbps = config.LameBitrate;
+                    lameConfig.VBR = VBRMode.ABR;
+                    lameConfig.WriteVBRTag = true;
+                }
+            }
+            else
+            {
+                lameConfig.VBR = VBRMode.Default;
+                lameConfig.VBRQuality = config.LameVBRQuality;
+                lameConfig.WriteVBRTag = true;
+            }
+            return lameConfig;
+        }
         protected void OnTitleDiscovered(string title) => OnTitleDiscovered(null, title);
         protected void OnTitleDiscovered(object _, string title)
 		{
             Serilog.Log.Logger.Debug("Event fired {@DebugInfo}", new { Name = nameof(TitleDiscovered), Title = title });
-            if (title != null)
-                TitleDiscovered?.Invoke(this, title);
+            TitleDiscovered?.Invoke(this, title);
 		}
 
         protected void OnAuthorsDiscovered(string authors) => OnAuthorsDiscovered(null, authors);
         protected void OnAuthorsDiscovered(object _, string authors)
 		{
             Serilog.Log.Logger.Debug("Event fired {@DebugInfo}", new { Name = nameof(AuthorsDiscovered), Authors = authors });
-			if (authors != null)
-				AuthorsDiscovered?.Invoke(this, authors);
+            AuthorsDiscovered?.Invoke(this, authors);
 		}
 
         protected void OnNarratorsDiscovered(string narrators) => OnNarratorsDiscovered(null, narrators);
         protected void OnNarratorsDiscovered(object _, string narrators)
 		{
             Serilog.Log.Logger.Debug("Event fired {@DebugInfo}", new { Name = nameof(NarratorsDiscovered), Narrators = narrators });
-			if (narrators != null)
-				NarratorsDiscovered?.Invoke(this, narrators);
+            NarratorsDiscovered?.Invoke(this, narrators);
 		}
 
         protected byte[] OnRequestCoverArt()

Source/FileLiberator/AudioFileStorageExt.cs

@@ -1,10 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using AaxDecrypter;
 using DataLayer;
 using LibationFileManager;
-using LibationFileManager.Templates;
 
 namespace FileLiberator
 {
@@ -23,29 +21,36 @@ namespace FileLiberator
 				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);
+					var seriesParent = ApplicationServices.DbContexts.GetContext().GetLibraryBook_Flat_NoTracking(series.Series.AudibleSeriesId);
 
 					if (seriesParent is not null)
 					{
-						return Templates.Folder.GetFilename(seriesParent.ToDto(), AudibleFileStorage.BooksDirectory, "");
+						var baseDir = Templates.Folder.GetFilename(seriesParent.ToDto(), AudibleFileStorage.BooksDirectory, "");
+						return Templates.Folder.GetFilename(libraryBook.ToDto(), baseDir, "");
 					}
 				}
 			}
 			return Templates.Folder.GetFilename(libraryBook.ToDto(), AudibleFileStorage.BooksDirectory, "");
 		}
 
+		/// <summary>
+		/// DownloadDecryptBook:
+		/// Path: in progress directory.
+		/// File name: final file name.
+		/// </summary>
+		public static string GetInProgressFilename(this AudioFileStorage _, LibraryBook libraryBook, string extension)
+			=> Templates.File.GetFilename(libraryBook.ToDto(), AudibleFileStorage.DecryptInProgressDirectory, extension, returnFirstExisting: true);
+
 		/// <summary>
 		/// PDF: audio file does not exist
 		/// </summary>
-		public static string GetBooksDirectoryFilename(this AudioFileStorage _, LibraryBook libraryBook, string extension, bool returnFirstExisting = false)
-			=> Templates.File.GetFilename(libraryBook.ToDto(), AudibleFileStorage.BooksDirectory, extension, returnFirstExisting: returnFirstExisting);
+		public static string GetBooksDirectoryFilename(this AudioFileStorage _, LibraryBook libraryBook, string extension)
+			=> Templates.File.GetFilename(libraryBook.ToDto(), AudibleFileStorage.BooksDirectory, extension);
 
 		/// <summary>
 		/// PDF: audio file already exists
 		/// </summary>
-		public static string GetCustomDirFilename(this AudioFileStorage _, LibraryBook libraryBook, string dirFullPath, string extension, MultiConvertFileProperties partProperties = null, bool returnFirstExisting = false)
-			=> partProperties is null ? Templates.File.GetFilename(libraryBook.ToDto(), dirFullPath, extension, returnFirstExisting: returnFirstExisting)
-			: Templates.ChapterFile.GetFilename(libraryBook.ToDto(), partProperties, dirFullPath, extension, returnFirstExisting: returnFirstExisting);
+		public static string GetCustomDirFilename(this AudioFileStorage _, LibraryBook libraryBook, string dirFullPath, string extension)
+			=> Templates.File.GetFilename(libraryBook.ToDto(), dirFullPath, extension);
 	}
 }