.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

@@ -41,9 +41,9 @@ jobs:
     name: "${{ inputs.OS }}-${{ inputs.architecture }}"
     runs-on: ${{ inputs.runs_on }}
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v4
       - name: Setup .NET
-        uses: actions/setup-dotnet@v5
+        uses: actions/setup-dotnet@v4
         with:
           dotnet-version: ${{ env.DOTNET_VERSION }}
         env:

.github/workflows/build-windows.yml

@@ -15,10 +15,6 @@ on:
         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"
@@ -26,11 +22,8 @@ env:
 
 jobs:
   build:
-    name: "${{ matrix.os }}-${{ matrix.release_name }}-${{ inputs.architecture }}"
+    name: "${{ matrix.os }}-${{ matrix.release_name }}"
     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 +35,9 @@ jobs:
             release_name: classic
             prefix: Classic-
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v4
       - name: Setup .NET
-        uses: actions/setup-dotnet@v5
+        uses: actions/setup-dotnet@v4
         with:
           dotnet-version: ${{ env.DOTNET_VERSION }}
         env:
@@ -70,42 +63,46 @@ 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 }} `
+              --output bin/Publish/${{ matrix.os }}-${{ matrix.release_name }} `
               -p:PublishProfile=LoadByOS/${{ matrix.os }}ConfigApp/PublishProfiles/${{ matrix.os }}Profile.pubxml
           dotnet publish `
               LibationCli/LibationCli.csproj `
-              --runtime ${{ env.RUNTIME_ID }} `
               --configuration ${{ env.DOTNET_CONFIGURATION }} `
-              --output bin/Publish/${{ env.OUTPUT_NAME }} `
+              --output bin/Publish/${{ matrix.os }}-${{ matrix.release_name }} `
               -p:DefineConstants="${{ matrix.release_name }}" `
               -p:PublishProfile=LibationCli/Properties/PublishProfiles/${{ matrix.os }}Profile.pubxml
           dotnet publish `
               Hangover${{ matrix.ui }}/Hangover${{ matrix.ui }}.csproj `
-              --runtime ${{ env.RUNTIME_ID }} `
               --configuration ${{ env.DOTNET_CONFIGURATION }} `
-              --output bin/Publish/${{ env.OUTPUT_NAME }} `
+              --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"
 

.github/workflows/build.yml

@@ -18,14 +18,10 @@ on:
 
 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:

.github/workflows/docker.yml

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

.github/workflows/release.yml

@@ -40,7 +40,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Download artifacts
-        uses: actions/download-artifact@v5
+        uses: actions/download-artifact@v4
         with:
           path: artifacts
           pattern: "*(Classic-)Libation.*"
@@ -51,8 +51,13 @@ jobs:
         with:
           name: Libation ${{ 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@v2
+        env:
+          GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
+        with:
+          release_id: "${{ steps.release.outputs.id }}"
+          assets_path: ./artifacts

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

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

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

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

.releaseindex.json

@@ -1,10 +1,10 @@
 {
-  "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",
+  "LinuxAvalonia_RPM":       "Libation\\.\\d+\\.\\d+\\.\\d+-linux-chardonnay-amd64\\.rpm",
+  "MacOSAvalonia":           "Libation\\.\\d+\\.\\d+\\.\\d+-macOS-chardonnay-x64\\.tgz",
+  "LinuxAvalonia_Arm64":     "Libation\\.\\d+\\.\\d+\\.\\d+-linux-chardonnay-arm64\\.deb",
+  "LinuxAvalonia_Arm64_RPM": "Libation\\.\\d+\\.\\d+\\.\\d+-linux-chardonnay-arm64\\.rpm",
+  "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/liberate.sh

@@ -124,7 +124,7 @@ main() {
   init_config_file Settings.json
   
   info "loading settings"
-  update_settings Settings.json Books "${LIBATION_BOOKS_DIR:-/data}"
+  update_settings Settings.json Books /data
   update_settings Settings.json InProgress /tmp
 
   info "loading database"

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)
 
 
 
@@ -88,25 +86,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

@@ -69,8 +69,3 @@ If the user it's running as is correct, and it still cannot write, be sure to ch
 
 ### 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

@@ -7,10 +7,6 @@
 
 # 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.
@@ -35,19 +31,9 @@ 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)
+For reasons known only to Jeff Bezos and God, amazon and audible brazil handle logins slightly differently. [See this ticket for more details.](https://github.com/rmcrackan/Libation/issues/1103)
 
 ## Q: How do I use Libation with a South Africa account?
 

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

@@ -8,25 +8,20 @@
 
 [![Packaging status](https://repology.org/badge/vertical-allrepos/libation.svg)](https://repology.org/project/libation/versions)
 
-New Libation releases are automatically packed into `.deb` and `.rpm` package and are available from the [Libation repository's releases page](https://github.com/rmcrackan/Libation/releases).
+New Libation releases are automatically packed into `.deb` and `.rpm` package and are available from the Libation repository's releases page.
 
-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`).
+Run this command in your terminal to download and install Libation, replacing the url with the latest Libation package url:
 
 ### Debian
   ```Console
-  wget -O libation.deb https://github.com/rmcrackan/Libation/releases/download/vX.X.X/Libation.X.X.X-linux-chardonnay-ARCH.deb
+  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
   ```
 ### 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
+  wget -O libation.rpm https://github.com/rmcrackan/Libation/releases/download/vX.X.X/Libation.X.X.X-linux-chardonnay.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

Documentation/InstallOnMac.md

@@ -8,12 +8,12 @@
 # Run Libation on MacOS
 This walkthrough should get you up and running with Libation on your Mac.
 
-## Supports macOS 13 (Ventura) and above
+## Supports macOS 10.15 (Catalina) 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

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

@@ -17,9 +17,6 @@ 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)
   - [Date Formatters](#date-formatters)
@@ -35,36 +32,32 @@ 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 with subtitle|Text|
+|\<title short\>|Title. Stop at first colon|Text|
+|\<audible title\>|Audible's title (does not include subtitle)|Text|
+|\<audible subtitle\>|Audible's subtitle|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|Number|
+|\<bitrate\>|File's original bitrate (Kbps)|Number|
+|\<samplerate\>|File's original audio sample rate|Number|
+|\<channels\>|Number of audio channels|Number|
+|\<account\>|Audible account of this book|Text|
+|\<account nickname\>|Audible account nickname of this book|Text|
+|\<locale\>|Region/country|Text|
+|\<year\>|Year published|Number|
+|\<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|Number|
+|\<ch title\> **‡**|Chapter title|Text|
+|\<ch#\> **‡**|Chapter number|Number|
+|\<ch# 0\> **‡**|Chapter number with leading zeros|Number|
 
 **†** Does not support custom formatting
 
@@ -81,39 +74,17 @@ Anything between the opening tag (`<tagname->`) and closing tag (`<-tagname>`) w
 |\<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.
@@ -124,28 +95,11 @@ 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\_|
+|format(\{T \| F \| M \| L \| S\})|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><br>Default is \{P\} \{F\} \{M\} \{L\} \{S\}|`<author[format({L}, {F})`<br>`separator(; )]>`|Doyle, Arthur; Fry, Stephen|
 |sort(F \| M \| L)|Sorts the names by first, middle,<br>or last name<br><br>Default is unsorted|`<author[sort(M)]>`|Stephen Fry, Arthur Conan Doyle|
 |max(#)|Only use the first # of names<br><br>Default is all names|`<author[max(1)]>`|Arthur Conan Doyle|
 

Images/libation_glass.svg

@@ -1,36 +1,34 @@
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 288 288" enable-background="new 0 0 288 288">
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 524 524" enable-background="new 0 0 524 524">
 	<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
+			<path fill-rule="evenodd" d=
+				"M262,8
+					h-117
+					a 192,200 0 0 0 -36,82
+					a 222,334 41 0 0 138,236
+					v158
+					h-81
+					a 16,16 0 0 0 0,32
+					h192
+					a 16 16 0 0 0 0,-32
+					h-81
+					v-158
+					a 222,334 -41 0 0 138,-236
+					a 192,200 0 0 0 -36,-82
+					h-117
+				m-99,30
+					a 192,200 0 0 0 -26,95
+					a 187.5,334 35 0 0 125,159
+					a 187.5,334 -35 0 0 125,-159
+					a 192,200 0 0 0 -26,-95
+					h-198
 				z"/>
 		</g>
-		<g transform="translate(16 16)" id="wine-level">
+		<g 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
+				"M158,136
+					a 168,305 35 0 0 104,136
+					a 168,305 -35 0 0 104,-136
 				z"/>
 		</g>
 	</defs>	

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

@@ -22,7 +22,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,8 +32,6 @@
     - [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)
 

Scripts/Bundle_Debian.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

Scripts/Bundle_MacOS.sh

@@ -82,7 +82,18 @@ 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')
+  mv $BUNDLE_MACOS/ffmpegaac.arm64.dylib  $BUNDLE_MACOS/ffmpegaac.dylib
+  mv $BUNDLE_MACOS/libmp3lame.arm64.dylib  $BUNDLE_MACOS/libmp3lame.dylib
+else
+  delfiles+=('libmp3lame.arm64.dylib' 'ffmpegaac.arm64.dylib')
+  mv $BUNDLE_MACOS/ffmpegaac.x64.dylib  $BUNDLE_MACOS/ffmpegaac.dylib
+  mv $BUNDLE_MACOS/libmp3lame.x64.dylib  $BUNDLE_MACOS/libmp3lame.dylib
+fi
+
 
 for n in "${delfiles[@]}"
 do

Scripts/Bundle_Redhat.sh

@@ -38,12 +38,14 @@ fi
 
 BASEDIR=$(pwd)
 
-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" == "x64" ]]
 then
+  delfiles+=('libmp3lame.arm64.so' 'ffmpegaac.arm64.so')
   ARCH_RPM="x86_64"
   ARCH="amd64"
 else
+  delfiles+=('libmp3lame.x64.so' 'ffmpegaac.x64.so')
   ARCH_RPM="aarch64"
 fi
 

Source/AaxDecrypter/AaxDecrypter.csproj

@@ -13,7 +13,7 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-	  <PackageReference Include="AAXClean.Codecs" Version="2.0.2.2" />
+	  <PackageReference Include="AAXClean.Codecs" Version="1.1.4" />
 	</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,19 @@ 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();
+			AaxFile = new AaxFile(InputFileStream);
 
-			RetrievedMetadata?.Invoke(this, AaxFile.AppleTags);
+			if (DownloadOptions.AudibleKey?.Length == 8 && DownloadOptions.AudibleIV is null)
+				AaxFile.SetDecryptionKey(DownloadOptions.AudibleKey);
+			else
+				AaxFile.SetDecryptionKey(DownloadOptions.AudibleKey, DownloadOptions.AudibleIV);
 
 			if (DownloadOptions.StripUnabridged)
 			{
@@ -126,15 +77,17 @@ namespace AaxDecrypter
 				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);
+				if (DownloadOptions.SeriesNumber is float part)
+					AaxFile.AppleTags.AppleListBox.EditOrAddFreeformTag(tagDomain, "PART", part.ToString());
 			}
 
-			OnRetrievedTitle(AaxFile.AppleTags.TitleSansUnabridged);
-			OnRetrievedAuthors(AaxFile.AppleTags.FirstAuthor);
-			OnRetrievedNarrators(AaxFile.AppleTags.Narrator);
-			OnRetrievedCoverArt(AaxFile.AppleTags.Cover);
 			OnInitialized();
+			OnRetrievedTitle(AaxFile.AppleTags.TitleSansUnabridged);
+			OnRetrievedAuthors(AaxFile.AppleTags.FirstAuthor ?? "[unknown]");
+			OnRetrievedNarrators(AaxFile.AppleTags.Narrator ?? "[unknown]");
+			OnRetrievedCoverArt(AaxFile.AppleTags.Cover);
+
+			RetrievedMetadata?.Invoke(this, AaxFile.AppleTags);
 
 			return !IsCanceled;
 		}

Source/AaxDecrypter/AaxcDownloadMultiConverter.cs

@@ -5,20 +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;
+			AsyncSteps["Step 3: Download Clips and Bookmarks"] = Step_DownloadClipsBookmarksAsync;
 		}
 
 		protected override void OnInitialized()
@@ -59,7 +59,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 +83,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 +97,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 +151,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

@@ -6,16 +6,13 @@ using System;
 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,6 +21,7 @@ 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;
 		}
 
@@ -41,16 +39,14 @@ namespace AaxDecrypter
 
 		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 +58,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 +84,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,54 @@ 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)
+
+		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 +171,39 @@ namespace AaxDecrypter
 			return !IsCanceled;
 		}
 
+		private async Task<bool> CleanupAsync()
+		{
+			if (IsCanceled) return false;
+
+			FileUtility.SaferDelete(jsonDownloadState);
+
+			if (!string.IsNullOrEmpty(DownloadOptions.AudibleKey) &&
+				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);
+
+				if (string.IsNullOrEmpty(DownloadOptions.AudibleIV))
+					await File.WriteAllTextAsync(keyPath, $"ActivationBytes={DownloadOptions.AudibleKey}");
+				else
+					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 +217,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,39 @@
 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; }
+		string AudibleProductId { get; }
+		string Title { get; }
+		string Subtitle { get; }
+		string Publisher { get; }
+		string Language { get; }
+		string SeriesName { get; }
+		float? SeriesNumber { 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/NetworkFileStream.cs

@@ -55,20 +55,18 @@ namespace AaxDecrypter
 		private CancellationTokenSource _cancellationSource { get; } = new();
 		private EventWaitHandle _downloadedPiece { get; set; }
 
-		private DateTime NextUpdateTime { 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 +98,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 +108,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)
 			{
@@ -149,6 +135,7 @@ namespace AaxDecrypter
 				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>
@@ -164,103 +151,39 @@ namespace AaxDecrypter
 			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);
-		}
+			//Download the file in the background.
 
-		private readonly record struct BlockResponse(HttpResponseMessage Response, long BlockSize, long FileSize) : IDisposable
-		{
-			public void Dispose() => Response?.Dispose();
+			DownloadTask = 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 +208,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 +234,10 @@ namespace AaxDecrypter
 			}
 			finally
 			{
+				networkStream.Close();
+				_writeFile.Close();
 				_downloadedPiece.Set();
-				OnUpdate(waitForWrite: true);
+				OnUpdate();
 			}
 		}
 
@@ -410,7 +334,7 @@ namespace AaxDecrypter
 				_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,12 +8,20 @@ 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()
@@ -24,9 +33,8 @@ namespace AaxDecrypter
 			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

@@ -2,14 +2,15 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>net9.0</TargetFramework>
-    <Version>12.5.3.1</Version>
+    <Version>12.0.0.1</Version>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Octokit" Version="14.0.0" />
     <!-- Do not remove unused Serilog.Sinks -->
-    <!-- Only File sink is currently used. By user request (June 2024) others packages are included for experimental use. -->
+    <!-- Only ZipFile 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="Serilog.Sinks.File" Version="6.0.0" />
+    <PackageReference Include="Serilog.Sinks.ZipFile" Version="3.1.1" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\ApplicationServices\ApplicationServices.csproj" />

Source/AppScaffolding/LibationScaffolding.cs

@@ -90,7 +90,6 @@ 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>
@@ -115,22 +114,11 @@ namespace AppScaffolding
 		{
 			if (config.GetObject("Serilog") is JObject serilog)
 			{
-				bool fileChanged = false;
-				if (serilog.SelectToken("$.WriteTo[?(@.Name == 'ZipFile')]", false) is JObject zipFileSink)
+				if (serilog["WriteTo"] is JArray sinks && sinks.FirstOrDefault(s => s["Name"].Value<string>() is "File") is JToken fileSink)
 				{
-					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)
+					fileSink["Name"] = "ZipFile";
 					config.SetNonString(serilog.DeepClone(), "Serilog");
+				}
 				return;
 			}
 
@@ -140,17 +128,17 @@ namespace AppScaffolding
 				{ "WriteTo", new JArray
 					{
 						// ABOUT SINKS
-						// Only File sink is currently used. By user request (June 2024) others packages are included for experimental use.
+						// Only ZipFile 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
 						{
-							{ "Name", "File" },
+							{ "Name", "ZipFile" },
 							{ "Args",
 								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 +146,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}" }
 								}
 							}
 						}
@@ -286,40 +273,46 @@ namespace AppScaffolding
                 disableIPv6 = AppContext.TryGetSwitch("System.Net.DisableIPv6", out bool disableIPv6Value),
 			});
 
-			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,23 +326,15 @@ 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));
@@ -367,7 +352,10 @@ namespace AppScaffolding
 
 			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)));
 		}
 	}
 
@@ -426,81 +414,6 @@ namespace AppScaffolding
             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)

Source/ApplicationServices/ApplicationServices.csproj

@@ -5,8 +5,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="CsvHelper" Version="33.1.0" />
-    <PackageReference Include="NPOI" Version="2.7.4" />
+    <PackageReference Include="CsvHelper" Version="33.0.1" />
+    <PackageReference Include="NPOI" Version="2.7.2" />
   </ItemGroup>
 
   <ItemGroup>

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();
 
@@ -131,7 +130,7 @@ namespace ApplicationServices
                         | LibraryOptions.ResponseGroupOptions.IsFinished,
 					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 +222,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 +232,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 +248,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 +266,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 +294,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 +329,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 +369,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 +398,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 +432,7 @@ namespace ApplicationServices
 
                 var qtyChanges = context.SaveChanges();
 				if (qtyChanges > 0)
-					finalizeLibrarySizeChange(context);
+					finalizeLibrarySizeChange();
 
 				return qtyChanges;
             }
@@ -475,35 +445,31 @@ 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<LibraryBook>> BookUserDefinedItemCommitted;
 
         #region Update book details
         public static int UpdateUserDefinedItem(
             this LibraryBook lb,
-            string? tags = null,
+            string tags = null,
             LiberatedStatus? bookStatus = null,
             LiberatedStatus? pdfStatus = null,
-            Rating? rating = null)
+            Rating rating = null)
             => new[] { lb }.UpdateUserDefinedItem(tags, bookStatus, pdfStatus, rating);
 
         public static int UpdateUserDefinedItem(
             this IEnumerable<LibraryBook> lb,
-            string? tags = null,
+            string tags = null,
             LiberatedStatus? bookStatus = null,
             LiberatedStatus? pdfStatus = null,
-            Rating? rating = null)
+            Rating rating = null)
             => updateUserDefinedItem(
                 lb,
                 udi => {
@@ -521,8 +487,8 @@ 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 LibraryBook lb, LiberatedStatus bookStatus, Version libationVersion)
+            => lb.UpdateUserDefinedItem(udi => { udi.BookStatus = bookStatus; udi.SetLastDownloaded(libationVersion); });
 
         public static int UpdateBookStatus(this LibraryBook libraryBook, LiberatedStatus bookStatus)
             => libraryBook.UpdateUserDefinedItem(udi => udi.BookStatus = bookStatus);
@@ -552,19 +518,17 @@ namespace ApplicationServices
                 if (libraryBooks is null || !libraryBooks.Any())
                     return 0;
 
+                foreach (var book in libraryBooks)
+                    action?.Invoke(book.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 libraryBooks)
                 {
-					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.Book.UserDefinedItem).State = Microsoft.EntityFrameworkCore.EntityState.Modified;
+                    context.Attach(book.Book.UserDefinedItem.Rating).State = Microsoft.EntityFrameworkCore.EntityState.Modified;
+                }
 
                 var qtyChanges = context.SaveChanges();
                 if (qtyChanges > 0)
@@ -629,15 +593,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
 {
@@ -104,6 +104,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; }
 
@@ -115,29 +118,7 @@ namespace ApplicationServices
 
 		[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)
@@ -157,30 +138,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.LowestCategoryNames().Any() ? a.Book.LowestCategoryNames().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;
+                IsFinished = a.Book.UserDefinedItem.IsFinished
+            }).ToList();
 	}
 	public static class LibraryExporter
 	{
@@ -189,6 +166,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 +178,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);
 		}
 
@@ -250,16 +228,11 @@ 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)
+                nameof(ExportDto.IsFinished)
             };
 			var col = 0;
 			foreach (var c in columns)
@@ -280,10 +253,15 @@ 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);
@@ -296,46 +274,57 @@ 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);
+                row.CreateCell(++col).SetCellValue(dto.IsFinished);
+
+                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/SearchEngineCommands.cs

@@ -48,8 +48,6 @@ 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 =>
 			{
@@ -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>()

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/AudibleUtilities.csproj

@@ -5,8 +5,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="AudibleApi" Version="9.4.5.1" />
-    <PackageReference Include="Google.Protobuf" Version="3.32.0" />
+    <PackageReference Include="AudibleApi" Version="9.3.0.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/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/BookConfig.cs

@@ -13,11 +13,13 @@ 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.AudioFormat));
             entity.Ignore(nameof(Book.TitleWithSubtitle));
             entity.Ignore(b => b.Categories);
 
@@ -49,11 +51,6 @@ 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);

Source/DataLayer/DataLayer.csproj

@@ -10,14 +10,14 @@
   </PropertyGroup>
   
   <ItemGroup>
-    <PackageReference Include="Dinah.Core" Version="9.0.3.1" />
+    <PackageReference Include="Dinah.Core" Version="9.0.0.1" />
     <PackageReference Include="Dinah.EntityFrameworkCore" Version="9.0.0.1" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="9.0.8">
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="9.0.2">
       <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="9.0.2" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="9.0.2">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

Source/DataLayer/EfClasses/AudioFormat.cs

@@ -0,0 +1,65 @@
+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,
+		AAX_22_32 = LC_32_22050_stereo,
+		AAX_22_64 = LC_64_22050_stereo,
+		AAX_44_64 = LC_64_44100_stereo,
+		AAX_44_128 = LC_128_44100_stereo
+	}
+
+    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

@@ -43,13 +43,16 @@ namespace DataLayer
         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; }
 
@@ -237,11 +240,10 @@ 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;
         }

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() { }

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/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,7 +15,7 @@ namespace DataLayer.Migrations
         protected override void BuildModel(ModelBuilder modelBuilder)
         {
 #pragma warning disable 612, 618
-            modelBuilder.HasAnnotation("ProductVersion", "9.0.7");
+            modelBuilder.HasAnnotation("ProductVersion", "8.0.5");
 
             modelBuilder.Entity("CategoryCategoryLadder", b =>
                 {
@@ -53,9 +53,6 @@ namespace DataLayer.Migrations
                     b.Property<bool>("IsAbridged")
                         .HasColumnType("INTEGER");
 
-                    b.Property<bool>("IsSpatial")
-                        .HasColumnType("INTEGER");
-
                     b.Property<string>("Language")
                         .HasColumnType("TEXT");
 
@@ -77,6 +74,9 @@ namespace DataLayer.Migrations
                     b.Property<string>("Title")
                         .HasColumnType("TEXT");
 
+                    b.Property<long>("_audioFormat")
+                        .HasColumnType("INTEGER");
+
                     b.HasKey("BookId");
 
                     b.HasIndex("AudibleProductId");
@@ -318,12 +318,6 @@ namespace DataLayer.Migrations
                             b1.Property<DateTime?>("LastDownloaded")
                                 .HasColumnType("TEXT");
 
-                            b1.Property<string>("LastDownloadedFileVersion")
-                                .HasColumnType("TEXT");
-
-                            b1.Property<long?>("LastDownloadedFormat")
-                                .HasColumnType("INTEGER");
-
                             b1.Property<string>("LastDownloadedVersion")
                                 .HasColumnType("TEXT");
 

Source/DataLayer/QueryObjects/BookQueries.cs

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

@@ -137,6 +137,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());
 
@@ -152,6 +154,9 @@ namespace DtoImporterService
 			// 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)
 				book.PictureId = item.PictureId;
@@ -164,9 +169,8 @@ namespace DtoImporterService
 
             // 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),

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/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
 {
@@ -35,17 +33,24 @@ namespace FileLiberator
 			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);
 	}
 }

Source/FileLiberator/AudioFormatDecoder.cs

@@ -1,242 +0,0 @@
-using AAXClean;
-using DataLayer;
-using FileManager;
-using Mpeg4Lib.Boxes;
-using Mpeg4Lib.Util;
-using NAudio.Lame.ID3;
-using System;
-using System.Collections.Generic;
-using System.IO;
-
-#nullable enable
-namespace AaxDecrypter;
-
-/// <summary> Read audio codec, bitrate, sample rate, and channel count from MP4 and MP3 audio files. </summary>
-internal static class AudioFormatDecoder
-{
-	public static AudioFormat FromMpeg4(string filename)
-	{
-		using var fileStream = File.Open(filename, FileMode.Open, FileAccess.Read, FileShare.Read);
-		return FromMpeg4(new Mp4File(fileStream));
-	}
-
-	public static AudioFormat FromMpeg4(Mp4File mp4File)
-	{
-		Codec codec;
-		if (mp4File.AudioSampleEntry.Dac4 is not null)
-		{
-			codec = Codec.AC_4;
-		}
-		else if (mp4File.AudioSampleEntry.Dec3 is not null)
-		{
-			codec = Codec.EC_3;
-		}
-		else if (mp4File.AudioSampleEntry.Esds is EsdsBox esds)
-		{
-			var objectType = esds.ES_Descriptor.DecoderConfig.AudioSpecificConfig.AudioObjectType;
-			codec
-				= objectType == 2 ? Codec.AAC_LC
-				: objectType == 42 ? Codec.xHE_AAC
-				: Codec.Unknown;
-		}
-		else
-			return AudioFormat.Default;
-
-		var bitrate = (int)Math.Round(mp4File.AverageBitrate / 1024d);
-
-		return new AudioFormat(codec, bitrate, mp4File.TimeScale, mp4File.AudioChannels);
-	}
-
-	public static AudioFormat FromMpeg3(LongPath mp3Filename)
-	{
-		using var mp3File = File.Open(mp3Filename, FileMode.Open, FileAccess.Read, FileShare.Read);
-		if (Id3Header.Create(mp3File) is Id3Header id3header)
-			id3header.SeekForwardToPosition(mp3File, mp3File.Position + id3header.Size);
-		else
-		{
-			Serilog.Log.Logger.Debug("File appears not to have ID3 tags.");
-			mp3File.Position = 0;
-		}
-
-		if (!SeekToFirstKeyFrame(mp3File))
-		{
-			Serilog.Log.Logger.Warning("Invalid frame sync read from file at end of ID3 tag.");
-			return AudioFormat.Default;
-		}
-
-		var mpegSize = mp3File.Length - mp3File.Position;
-		if (mpegSize < 64)
-		{
-			Serilog.Log.Logger.Warning("Remaining file length is too short to contain any mp3 frames. {@File}", mp3Filename);
-			return AudioFormat.Default;
-		}
-
-		#region read first mp3 frame header
-		//https://www.codeproject.com/Articles/8295/MPEG-Audio-Frame-Header#VBRIHeader
-		var reader = new BitReader(mp3File.ReadBlock(4));
-		reader.Position = 11; //Skip frame header magic bits
-		var versionId = (Version)reader.Read(2);
-		var layerDesc = (Layer)reader.Read(2);
-
-		if (layerDesc is not Layer.Layer_3)
-		{
-			Serilog.Log.Logger.Warning("Could not read mp3 data from {@layerVersion} file.", layerDesc.ToString());
-			return AudioFormat.Default;
-		}
-
-		if (versionId is Version.Reserved)
-		{
-			Serilog.Log.Logger.Warning("Mp3 data data cannot be read from a file with version = 'Reserved'");
-			return AudioFormat.Default;
-		}
-
-		var protectionBit = reader.ReadBool();
-		var bitrateIndex = reader.Read(4);
-		var freqIndex = reader.Read(2);
-		_ = reader.ReadBool();                  //Padding bit
-		_ = reader.ReadBool();                  //Private bit
-		var channelMode = reader.Read(2);
-		_ = reader.Read(2);                     //Mode extension
-		_ = reader.ReadBool();                  //Copyright
-		_ = reader.ReadBool();                  //Original
-		_ = reader.Read(2);                     //Emphasis
-		#endregion
-
-		//Read the sample rate,and channels from the first frame's header.
-		var sampleRate = Mp3SampleRateIndex[versionId][freqIndex];
-		var channelCount = channelMode == 3 ? 1 : 2;
-
-		//Try to read variable bitrate info from the first frame.
-		//Revert to fixed bitrate from frame header if not found.
-		var bitrate
-			= TryReadXingBitrate(out var br) ? br
-			: TryReadVbriBitrate(out br) ? br
-			: Mp3BitrateIndex[versionId][bitrateIndex];
-
-		return new AudioFormat(Codec.Mp3, bitrate, sampleRate, channelCount);
-
-		#region Variable bitrate header readers
-		bool TryReadXingBitrate(out int bitrate)
-		{
-			const int XingHeader = 0x58696e67;
-			const int InfoHeader = 0x496e666f;
-
-			var sideInfoSize = GetSideInfo(channelCount == 2, versionId) + (protectionBit ? 0 : 2);
-			mp3File.Position += sideInfoSize;
-
-			if (mp3File.ReadUInt32BE() is XingHeader or InfoHeader)
-			{
-				//Xing or Info header (common)
-				var flags = mp3File.ReadUInt32BE();
-				bool hasFramesField = (flags & 1) == 1;
-				bool hasBytesField = (flags & 2) == 2;
-
-				if (hasFramesField)
-				{
-					var numFrames = mp3File.ReadUInt32BE();
-					if (hasBytesField)
-					{
-						mpegSize = mp3File.ReadUInt32BE();
-					}
-
-					var samplesPerFrame = GetSamplesPerFrame(sampleRate);
-					var duration = samplesPerFrame * numFrames / sampleRate;
-					bitrate = (short)(mpegSize / duration / 1024 * 8);
-					return true;
-				}
-			}
-			else
-				mp3File.Position -= sideInfoSize + 4;
-
-			bitrate = 0;
-			return false;
-		}
-
-		bool TryReadVbriBitrate(out int bitrate)
-		{
-			const int VBRIHeader = 0x56425249;
-
-			mp3File.Position += 32;
-
-			if (mp3File.ReadUInt32BE() is VBRIHeader)
-			{
-				//VBRI header (rare)
-				_ = mp3File.ReadBlock(6);
-				mpegSize = mp3File.ReadUInt32BE();
-				var numFrames = mp3File.ReadUInt32BE();
-
-				var samplesPerFrame = GetSamplesPerFrame(sampleRate);
-				var duration = samplesPerFrame * numFrames / sampleRate;
-				bitrate = (short)(mpegSize / duration / 1024 * 8);
-				return true;
-			}
-			bitrate = 0;
-			return false;
-		}
-		#endregion
-	}
-
-	#region MP3 frame decoding helpers
-	private static bool SeekToFirstKeyFrame(Stream file)
-	{
-		//Frame headers begin with first 11 bits set.
-		const int MaxSeekBytes = 4096;
-		var maxPosition = Math.Min(file.Length, file.Position + MaxSeekBytes) - 2;
-
-		while (file.Position < maxPosition)
-		{
-			if (file.ReadByte() == 0xff)
-			{
-				if ((file.ReadByte() & 0xe0) == 0xe0)
-				{
-					file.Position -= 2;
-					return true;
-				}
-				file.Position--;
-			}
-		}
-		return false;
-	}
-
-	private enum Version
-	{
-		Version_2_5,
-		Reserved,
-		Version_2,
-		Version_1
-	}
-
-	private enum Layer
-	{
-		Reserved,
-		Layer_3,
-		Layer_2,
-		Layer_1
-	}
-
-	private static double GetSamplesPerFrame(int sampleRate) => sampleRate >= 32000 ? 1152 : 576;
-
-	private static byte GetSideInfo(bool stereo, Version version) => (stereo, version) switch
-	{
-		(true,  Version.Version_1)                        => 32,
-		(true,  Version.Version_2 or Version.Version_2_5) => 17,
-		(false, Version.Version_1)                        => 17,
-		(false, Version.Version_2 or Version.Version_2_5) =>  9,
-		_ => 0,
-	};
-
-	private static readonly Dictionary<Version, ushort[]> Mp3SampleRateIndex = new()
-	{
-		{ Version.Version_2_5, [11025, 12000,  8000] },
-		{ Version.Version_2,   [22050, 24000, 16000] },
-		{ Version.Version_1,   [44100, 48000, 32000] },
-	};
-
-	private static readonly Dictionary<Version, short[]> Mp3BitrateIndex = new()
-	{
-		{ Version.Version_2_5, [-1, 8,16,24,32,40,48,56, 64, 80, 96,112,128,144,160,-1]},
-		{ Version.Version_2,   [-1, 8,16,24,32,40,48,56, 64, 80, 96,112,128,144,160,-1]},
-		{ Version.Version_1,   [-1,32,40,48,56,64,80,96,112,128,160,192,224,256,320,-1]}
-	};
-	#endregion
-}

Source/FileLiberator/ConvertToMp3.cs

@@ -1,7 +1,6 @@
 using System;
 using System.IO;
 using System.Linq;
-using System.Threading;
 using System.Threading.Tasks;
 using AAXClean;
 using AAXClean.Codecs;
@@ -20,13 +19,7 @@ namespace FileLiberator
 		private readonly AaxDecrypter.AverageSpeed averageSpeed = new();
 		private static string Mp3FileName(string m4bPath) => Path.ChangeExtension(m4bPath ?? "", ".mp3");
 
-		private CancellationTokenSource CancellationTokenSource { get; set; }
-		public override async Task CancelAsync()
-		{
-			await CancellationTokenSource.CancelAsync();
-			if (Mp4Operation is not null)
-				await Mp4Operation.CancelAsync();
-		}
+		public override Task CancelAsync() => Mp4Operation?.CancelAsync() ?? Task.CompletedTask;		
 
 		public static bool ValidateMp3(LibraryBook libraryBook)
 		{
@@ -39,33 +32,17 @@ namespace FileLiberator
 		public override async Task<StatusHandler> ProcessAsync(LibraryBook libraryBook)
 		{
 			OnBegin(libraryBook);
-			var cancellationToken = (CancellationTokenSource = new()).Token;
 
 			try
 			{
-				var m4bPaths = AudibleFileStorage.Audio.GetPaths(libraryBook.Book.AudibleProductId)
-					.Where(m4bPath => File.Exists(m4bPath))
-					.Select(m4bPath => new { m4bPath, proposedMp3Path = Mp3FileName(m4bPath), m4bSize = new FileInfo(m4bPath).Length })
-					.Where(p => !File.Exists(p.proposedMp3Path))
-					.ToArray();
+				var m4bPaths = AudibleFileStorage.Audio.GetPaths(libraryBook.Book.AudibleProductId);
 
-				long totalInputSize = m4bPaths.Sum(p => p.m4bSize);
-				long sizeOfCompletedFiles = 0L;
-				foreach (var entry in m4bPaths)
+				foreach (var m4bPath in m4bPaths)
 				{
-					cancellationToken.ThrowIfCancellationRequested();
-					if (File.Exists(entry.proposedMp3Path) || !File.Exists(entry.m4bPath))
-					{
-						sizeOfCompletedFiles += entry.m4bSize;
-						continue;
-					}
+					var proposedMp3Path = Mp3FileName(m4bPath);
+					if (File.Exists(proposedMp3Path) || !File.Exists(m4bPath)) continue;
 
-					using var m4bFileStream = File.Open(entry.m4bPath, FileMode.Open, FileAccess.Read, FileShare.Read);
-					var m4bBook = new Mp4File(m4bFileStream);
-
-					//AAXClean.Codecs only supports decoding AAC and E-AC-3 audio.
-					if (m4bBook.AudioSampleEntry.Esds is null && m4bBook.AudioSampleEntry.Dec3 is null)
-						continue;
+					var m4bBook = await Task.Run(() => new Mp4File(m4bPath, FileAccess.Read));
 
 					OnTitleDiscovered(m4bBook.AppleTags.Title);
 					OnAuthorsDiscovered(m4bBook.AppleTags.FirstAuthor);
@@ -73,7 +50,7 @@ namespace FileLiberator
 					OnCoverImageDiscovered(m4bBook.AppleTags.Cover);
 
 					var config = Configuration.Instance;
-					var lameConfig = DownloadOptions.GetLameOptions(config);
+					var lameConfig = GetLameOptions(config);
 					var chapters = m4bBook.GetChaptersFromMetadata();
 					//Finishing configuring lame encoder.
 					AaxDecrypter.MpegUtil.ConfigureLameOptions(
@@ -88,85 +65,74 @@ namespace FileLiberator
 						lameConfig.ID3.Track = trackCount > 0 ? $"{trackNum}/{trackCount}" : trackNum.ToString();
 					}
 
-					long currentFileNumBytesProcessed = 0;
+					using var mp3File = File.Open(Path.GetTempFileName(), FileMode.OpenOrCreate, FileAccess.ReadWrite);
 					try
 					{
-						var tempPath = Path.GetTempFileName();
-						using (var mp3File = File.Open(tempPath, FileMode.OpenOrCreate, FileAccess.ReadWrite))
+						Mp4Operation = m4bBook.ConvertToMp3Async(mp3File, lameConfig, chapters);
+						Mp4Operation.ConversionProgressUpdate += M4bBook_ConversionProgressUpdate;
+						await Mp4Operation;
+
+						if (Mp4Operation.IsCanceled)
 						{
-							Mp4Operation = m4bBook.ConvertToMp3Async(mp3File, lameConfig, chapters);
-							Mp4Operation.ConversionProgressUpdate += m4bBook_ConversionProgressUpdate;
-							await Mp4Operation;
+							FileUtility.SaferDelete(mp3File.Name);
+							return new StatusHandler { "Cancelled" };
 						}
-
-						if (cancellationToken.IsCancellationRequested)
-							FileUtility.SaferDelete(tempPath);
-
-						cancellationToken.ThrowIfCancellationRequested();
-
-						var realMp3Path
+						else
+						{
+							var realMp3Path
 								= FileUtility.SaferMoveToValidPath(
-									tempPath,
-									entry.proposedMp3Path,
+									mp3File.Name,
+									proposedMp3Path,
 									Configuration.Instance.ReplacementCharacters,
 									extension: "mp3",
 									Configuration.Instance.OverwriteExisting);
 
-						SetFileTime(libraryBook, realMp3Path);
-						SetDirectoryTime(libraryBook, Path.GetDirectoryName(realMp3Path));
-						OnFileCreated(libraryBook, realMp3Path);
+							SetFileTime(libraryBook, realMp3Path);
+							SetDirectoryTime(libraryBook, Path.GetDirectoryName(realMp3Path));
+
+							OnFileCreated(libraryBook, realMp3Path);
+						}
+					}
+					catch (Exception ex)
+					{
+						Serilog.Log.Error(ex, "AAXClean error");
+						return new StatusHandler { "Conversion failed" };
 					}
 					finally
 					{
 						if (Mp4Operation is not null)
-							Mp4Operation.ConversionProgressUpdate -= m4bBook_ConversionProgressUpdate;
+							Mp4Operation.ConversionProgressUpdate -= M4bBook_ConversionProgressUpdate;
 
-						sizeOfCompletedFiles += entry.m4bSize;
-					}
-					void m4bBook_ConversionProgressUpdate(object sender, ConversionProgressEventArgs e)
-					{
-						currentFileNumBytesProcessed = (long)(e.FractionCompleted * entry.m4bSize);
-						var bytesCompleted = sizeOfCompletedFiles + currentFileNumBytesProcessed;
-						ConversionProgressUpdate(totalInputSize, bytesCompleted);
+						m4bBook.InputStream.Close();
+						mp3File.Close();
 					}
 				}
-				return new StatusHandler();
-			}
-			catch (Exception ex)
-			{
-				if (!cancellationToken.IsCancellationRequested)
-				{
-					Serilog.Log.Error(ex, "AAXClean error");
-					return new StatusHandler { "Conversion failed" };
-				}
-				return new StatusHandler { "Cancelled" };
 			}
 			finally
 			{
 				OnCompleted(libraryBook);
-				CancellationTokenSource.Dispose();
-				CancellationTokenSource = null;
 			}
+			return new StatusHandler();
 		}
 
-		private void ConversionProgressUpdate(long totalInputSize, long bytesCompleted)
+		private void M4bBook_ConversionProgressUpdate(object sender, ConversionProgressEventArgs e)
 		{
-			averageSpeed.AddPosition(bytesCompleted);
+			averageSpeed.AddPosition(e.ProcessPosition.TotalSeconds);
 
-			var remainingBytes = (totalInputSize - bytesCompleted);
-			var estTimeRemaining = remainingBytes / averageSpeed.Average;
+			var remainingTimeToProcess = (e.EndTime - e.ProcessPosition).TotalSeconds;
+			var estTimeRemaining = remainingTimeToProcess / averageSpeed.Average;
 
 			if (double.IsNormal(estTimeRemaining))
 				OnStreamingTimeRemaining(TimeSpan.FromSeconds(estTimeRemaining));
 
-			double progressPercent = 100 * bytesCompleted / totalInputSize;
+			double progressPercent = 100 * e.FractionCompleted;
 
 			OnStreamingProgressChanged(
 				new DownloadProgress
 				{
 					ProgressPercentage = progressPercent,
-					BytesReceived = bytesCompleted,
-					TotalBytesToReceive = totalInputSize
+					BytesReceived = (long)(e.ProcessPosition - e.StartTime).TotalSeconds,
+					TotalBytesToReceive = (long)(e.EndTime - e.StartTime).TotalSeconds
 				});
 		}
 	}

Source/FileLiberator/DownloadDecryptBook.cs

@@ -1,512 +1,468 @@
-using AaxDecrypter;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Threading.Tasks;
+using AaxDecrypter;
 using ApplicationServices;
 using AudibleApi.Common;
 using DataLayer;
 using Dinah.Core;
 using Dinah.Core.ErrorHandling;
-using Dinah.Core.Net.Http;
 using FileManager;
 using LibationFileManager;
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
 
-#nullable enable
 namespace FileLiberator
 {
-	public class DownloadDecryptBook : AudioDecodable
-	{
-		public override string Name => "Download & Decrypt";
-		private CancellationTokenSource? cancellationTokenSource;
-		private AudiobookDownloadBase? abDownloader;
+    public class DownloadDecryptBook : AudioDecodable
+    {
+        public override string Name => "Download & Decrypt";
+        private AudiobookDownloadBase abDownloader;
 
-		public override bool Validate(LibraryBook libraryBook) => !libraryBook.Book.Audio_Exists();
-		public override async Task CancelAsync()
-		{
-			if (abDownloader is not null) await abDownloader.CancelAsync();
-			if (cancellationTokenSource is not null) await cancellationTokenSource.CancelAsync();
-		}
+        public override bool Validate(LibraryBook libraryBook) => !libraryBook.Book.Audio_Exists();
 
-		public override async Task<StatusHandler> ProcessAsync(LibraryBook libraryBook)
-		{
-			OnBegin(libraryBook);
-			cancellationTokenSource = new CancellationTokenSource();
-			var cancellationToken = cancellationTokenSource.Token;
+        public override Task CancelAsync() => abDownloader?.CancelAsync() ?? Task.CompletedTask;
 
-			try
-			{
-				if (libraryBook.Book.Audio_Exists())
-					return new StatusHandler { "Cannot find decrypt. Final audio file already exists" };
+        public override async Task<StatusHandler> ProcessAsync(LibraryBook libraryBook)
+        {
+            var entries = new List<FilePathCache.CacheEntry>();
+            // these only work so minimally b/c CacheEntry is a record.
+            // in case of parallel decrypts, only capture the ones for this book id.
+            // if user somehow starts multiple decrypts of the same book in parallel: on their own head be it
+            void FilePathCache_Inserted(object sender, FilePathCache.CacheEntry e)
+            {
+                if (e.Id.EqualsInsensitive(libraryBook.Book.AudibleProductId))
+                    entries.Add(e);
+            }
+            void FilePathCache_Removed(object sender, FilePathCache.CacheEntry e)
+            {
+                if (e.Id.EqualsInsensitive(libraryBook.Book.AudibleProductId))
+                    entries.Remove(e);
+            }
 
-				DownloadValidation(libraryBook);
+            OnBegin(libraryBook);
 
-				var api = await libraryBook.GetApiAsync();
-				using var downloadOptions = await DownloadOptions.InitiateDownloadAsync(api, Configuration.Instance, libraryBook, cancellationToken);
-				var result = await DownloadAudiobookAsync(api, downloadOptions, cancellationToken);
+            try
+            {
+                if (libraryBook.Book.Audio_Exists())
+                    return new StatusHandler { "Cannot find decrypt. Final audio file already exists" };
 
-				if (!result.Success || getFirstAudioFile(result.ResultFiles) is not TempFile audioFile)
-				{
-					// decrypt failed. Delete all output entries but leave the cache files.
-					result.ResultFiles.ForEach(f => FileUtility.SaferDelete(f.FilePath));
-					cancellationToken.ThrowIfCancellationRequested();
-					return new StatusHandler { "Decrypt failed" };
-				}
+                bool success = false;
+                try
+                {
+                    FilePathCache.Inserted += FilePathCache_Inserted;
+                    FilePathCache.Removed += FilePathCache_Removed;
 
-				if (Configuration.Instance.RetainAaxFile)
-				{
-					//Add the cached aaxc and key files to the entries list to be moved to the Books directory.
-					result.ResultFiles.AddRange(getAaxcFiles(result.CacheFiles));
-				}
+                    success = await downloadAudiobookAsync(libraryBook);
+                }
+                finally
+                {
+                    FilePathCache.Inserted -= FilePathCache_Inserted;
+                    FilePathCache.Removed -= FilePathCache_Removed;
+                }
 
-				//Set the last downloaded information on the book so that it can be used in the naming templates,
-				//but don't persist it until everything completes successfully (in the finally block)
-				var audioFormat = GetFileFormatInfo(downloadOptions, audioFile);
-				var audioVersion = downloadOptions.ContentMetadata.ContentReference.Version;
-				libraryBook.Book.UserDefinedItem.SetLastDownloaded(Configuration.LibationVersion, audioFormat, audioVersion);
+                // decrypt failed
+                if (!success || getFirstAudioFile(entries) == default)
+                {
+                    await Task.WhenAll(
+                        entries
+                        .Where(f => f.FileType != FileType.AAXC)
+                        .Select(f => Task.Run(() => FileUtility.SaferDelete(f.Path))));
 
-				var finalStorageDir = getDestinationDirectory(libraryBook);
+                    return
+                        abDownloader?.IsCanceled is true
+                        ? new StatusHandler { "Cancelled" }
+                        : new StatusHandler { "Decrypt failed" };
+                }
 
-				//post-download tasks done in parallel.
-				var moveFilesTask = Task.Run(() => MoveFilesToBooksDir(libraryBook, finalStorageDir, result.ResultFiles, cancellationToken));
-				Task[] finalTasks =
-				[
-					moveFilesTask,
-					Task.Run(() => DownloadCoverArt(finalStorageDir, downloadOptions, cancellationToken)),
-					Task.Run(() => DownloadRecordsAsync(api, finalStorageDir, downloadOptions, cancellationToken)),
-					Task.Run(() => DownloadMetadataAsync(api, finalStorageDir, downloadOptions, cancellationToken)),
-					Task.Run(() => WindowsDirectory.SetCoverAsFolderIcon(libraryBook.Book.PictureId, finalStorageDir, cancellationToken))
-				];
+                var finalStorageDir = getDestinationDirectory(libraryBook);
+
+                var moveFilesTask = Task.Run(() => moveFilesToBooksDir(libraryBook, entries));
+                Task[] finalTasks = new[]
+                {
+                    Task.Run(() => downloadCoverArt(libraryBook)),
+                    moveFilesTask,
+                    Task.Run(() => WindowsDirectory.SetCoverAsFolderIcon(libraryBook.Book.PictureId, finalStorageDir))
+                };
 
 				try
-				{
-					await Task.WhenAll(finalTasks);
-				}
-				catch when (!moveFilesTask.IsFaulted)
-				{
-					//Swallow DownloadCoverArt, DownloadRecordsAsync, DownloadMetadataAsync, and SetCoverAsFolderIcon exceptions.
-					//Only fail if the downloaded audio files failed to move to Books directory
-				}
-				finally
-				{
-					if (moveFilesTask.IsCompletedSuccessfully && !cancellationToken.IsCancellationRequested)
-					{
-						libraryBook.UpdateBookStatus(LiberatedStatus.Liberated, Configuration.LibationVersion, audioFormat, audioVersion);
+                {
+                    await Task.WhenAll(finalTasks);
+                }
+                catch
+                {
+					//Swallow downloadCoverArt and SetCoverAsFolderIcon exceptions.
+                    //Only fail if the downloaded audio files failed to move to Books directory
+					if (moveFilesTask.IsFaulted)
+                    {
+                        throw;
+                    }
+                }
+                finally
+                {
+                    if (moveFilesTask.IsCompletedSuccessfully)
+                    {
+                        await Task.Run(() => libraryBook.UpdateBookStatus(LiberatedStatus.Liberated, Configuration.LibationVersion));
+
 						SetDirectoryTime(libraryBook, finalStorageDir);
-						foreach (var cacheFile in result.CacheFiles.Where(f => File.Exists(f.FilePath)))
-						{
-							//Delete cache files only after the download/decrypt operation completes successfully.
-							FileUtility.SaferDelete(cacheFile.FilePath);
-						}
 					}
 				}
 
 				return new StatusHandler();
-			}
-			catch when (cancellationToken.IsCancellationRequested)
-			{
-				Serilog.Log.Logger.Information("Download/Decrypt was cancelled. {@Book}", libraryBook.LogFriendly());
-				return new StatusHandler { "Cancelled" };
-			}
-			finally
-			{
-				OnCompleted(libraryBook);
-				cancellationTokenSource.Dispose();
-				cancellationTokenSource = null;
-			}
-		}
+            }
+            finally
+            {
+                OnCompleted(libraryBook);
+            }
+        }
 
-		private record AudiobookDecryptResult(bool Success, List<TempFile> ResultFiles, List<TempFile> CacheFiles);
+        private async Task<bool> downloadAudiobookAsync(LibraryBook libraryBook)
+        {
+            var config = Configuration.Instance;
 
-		private async Task<AudiobookDecryptResult> DownloadAudiobookAsync(AudibleApi.Api api, DownloadOptions dlOptions, CancellationToken cancellationToken)
-		{
-			var outpoutDir = AudibleFileStorage.DecryptInProgressDirectory;
-			var cacheDir = AudibleFileStorage.DownloadsInProgressDirectory;
-			var result = new AudiobookDecryptResult(false, [], []);
+            downloadValidation(libraryBook);
 
-			try
-			{
-				if (dlOptions.DrmType is not DrmType.Adrm and not DrmType.Widevine)
-					abDownloader = new UnencryptedAudiobookDownloader(outpoutDir, cacheDir, dlOptions);
-				else
-				{
-					AaxcDownloadConvertBase converter
-						= dlOptions.Config.SplitFilesByChapter && dlOptions.ChapterInfo.Count > 1 ?
-						new AaxcDownloadMultiConverter(outpoutDir, cacheDir, dlOptions) :
-						new AaxcDownloadSingleConverter(outpoutDir, cacheDir, dlOptions);
+            var quality = (AudibleApi.DownloadQuality)config.FileDownloadQuality;
+            var api = await libraryBook.GetApiAsync();
+            var contentLic = await api.GetDownloadLicenseAsync(libraryBook.Book.AudibleProductId, quality);
+			using var dlOptions = BuildDownloadOptions(libraryBook, config, contentLic);
 
-					if (dlOptions.Config.AllowLibationFixup)
-						converter.RetrievedMetadata += Converter_RetrievedMetadata;
+            var outFileName = AudibleFileStorage.Audio.GetInProgressFilename(libraryBook, dlOptions.OutputFormat.ToString().ToLower());
+            var cacheDir = AudibleFileStorage.DownloadsInProgressDirectory;
 
-					abDownloader = converter;
-				}
+            if (contentLic.DrmType != DrmType.Adrm)
+                abDownloader = new UnencryptedAudiobookDownloader(outFileName, cacheDir, dlOptions);
+            else
+            {
+                AaxcDownloadConvertBase converter
+                    = config.SplitFilesByChapter ?
+                    new AaxcDownloadMultiConverter(outFileName, cacheDir, dlOptions) :
+                    new AaxcDownloadSingleConverter(outFileName, cacheDir, dlOptions);
 
-				abDownloader.DecryptProgressUpdate += OnStreamingProgressChanged;
-				abDownloader.DecryptTimeRemaining += OnStreamingTimeRemaining;
-				abDownloader.RetrievedTitle += OnTitleDiscovered;
-				abDownloader.RetrievedAuthors += OnAuthorsDiscovered;
-				abDownloader.RetrievedNarrators += OnNarratorsDiscovered;
-				abDownloader.RetrievedCoverArt += AaxcDownloader_RetrievedCoverArt;
-				abDownloader.TempFileCreated += AbDownloader_TempFileCreated;
+                if (config.AllowLibationFixup)
+                    converter.RetrievedMetadata += (_, tags) => tags.Generes = string.Join(", ", libraryBook.Book.LowestCategoryNames());
 
-				// REAL WORK DONE HERE
-				bool success = await abDownloader.RunAsync();
-				return result with { Success = success };
-			}
-			catch (Exception ex)
-			{
-				if (!cancellationToken.IsCancellationRequested)
-					Serilog.Log.Logger.Error(ex, "Error downloading audiobook {@Book}", dlOptions.LibraryBook.LogFriendly());
-				//don't throw any exceptions so the caller can delete any temp files.
-				return result;
-			}
-			finally
-			{
-				OnStreamingProgressChanged(new() { ProgressPercentage = 100 });
-			}
+                abDownloader = converter;
+            }
 
-			void AbDownloader_TempFileCreated(object? sender, TempFile e)
-			{
-				if (Path.GetDirectoryName(e.FilePath) == outpoutDir)
-				{
-					result.ResultFiles.Add(e);
-				}
-				else if (Path.GetDirectoryName(e.FilePath) == cacheDir)
-				{
-					result.CacheFiles.Add(e);
-					// Notify that the aaxc file has been created so that
-					// the UI can know about partially-downloaded files
-					if (getFileType(e) is FileType.AAXC)
-						OnFileCreated(dlOptions.LibraryBook, e.FilePath);
-				}
-			}
-		}
+            abDownloader.DecryptProgressUpdate += OnStreamingProgressChanged;
+            abDownloader.DecryptTimeRemaining += OnStreamingTimeRemaining;
+            abDownloader.RetrievedTitle += OnTitleDiscovered;
+            abDownloader.RetrievedAuthors += OnAuthorsDiscovered;
+            abDownloader.RetrievedNarrators += OnNarratorsDiscovered;
+            abDownloader.RetrievedCoverArt += AaxcDownloader_RetrievedCoverArt;
+            abDownloader.FileCreated += (_, path) => OnFileCreated(libraryBook, path);
 
-		#region Decryptor event handlers
-		private void Converter_RetrievedMetadata(object? sender, AAXClean.AppleTags tags)
-		{
-			if (sender is not AaxcDownloadConvertBase converter ||
-				converter.AaxFile is not AAXClean.Mp4File aaxFile ||
-				converter.DownloadOptions is not DownloadOptions options ||
-				options.ChapterInfo.Chapters is not List<AAXClean.Chapter> chapters)
-				return;
+            // REAL WORK DONE HERE
+            var success = await abDownloader.RunAsync();
 
-			#region Prevent erroneous truncation due to incorrect chapter info
+			if (success && config.SaveMetadataToFile)
+            {
+                var metadataFile = Templates.File.GetFilename(dlOptions.LibraryBookDto, Path.GetDirectoryName(outFileName), ".metadata.json");
 
-			//Sometimes the chapter info is not accurate. Since AAXClean trims audio
-			//files to the chapters start and end, if the last chapter's end time is
-			//before the end of the audio file, the file will be truncated to match
-			//the chapter. This is never desirable, so pad the last chapter to match
-			//the original audio length.
+                var item = await api.GetCatalogProductAsync(libraryBook.Book.AudibleProductId, AudibleApi.CatalogOptions.ResponseGroupOptions.ALL_OPTIONS);
+				item.SourceJson.Add(nameof(ContentMetadata.ChapterInfo), Newtonsoft.Json.Linq.JObject.FromObject(contentLic.ContentMetadata.ChapterInfo));
+				item.SourceJson.Add(nameof(ContentMetadata.ContentReference), Newtonsoft.Json.Linq.JObject.FromObject(contentLic.ContentMetadata.ContentReference));
 
-			var fileDuration = aaxFile.Duration;
-			if (options.Config.StripAudibleBrandAudio)
-				fileDuration -= TimeSpan.FromMilliseconds(options.ContentMetadata.ChapterInfo.BrandOutroDurationMs);
+				File.WriteAllText(metadataFile, item.SourceJson.ToString());
+				OnFileCreated(libraryBook, metadataFile);
+			}            
+			return success;
+        }
 
-			var durationDelta = fileDuration - options.ChapterInfo.EndOffset;
-			//Remove the last chapter and re-add it with the durationDelta that will
-			//make the chapter's end coincide with the end of the audio file.
-			var lastChapter = chapters[^1];
+		private DownloadOptions BuildDownloadOptions(LibraryBook libraryBook, Configuration config, ContentLicense contentLic)
+        {
+			//If DrmType != Adrm the delivered file is an unencrypted mp3.
 
-			chapters.Remove(lastChapter);
-			options.ChapterInfo.Add(lastChapter.Title, lastChapter.Duration + durationDelta);
-			
-			#endregion
+            var outputFormat
+                = contentLic.DrmType != DrmType.Adrm || (config.AllowLibationFixup && config.DecryptToLossy)
+                ? OutputFormat.Mp3
+                : OutputFormat.M4b;
 
-			tags.Title ??= options.LibraryBookDto.TitleWithSubtitle;
-			tags.Album ??= tags.Title;
-			tags.Artist ??= string.Join("; ", options.LibraryBook.Book.Authors.Select(a => a.Name));
-			tags.AlbumArtists ??= tags.Artist;
-			tags.Generes = string.Join(", ", options.LibraryBook.Book.LowestCategoryNames());
-			tags.ProductID ??= options.ContentMetadata.ContentReference.Sku;
-			tags.Comment ??= options.LibraryBook.Book.Description;
-			tags.LongDescription ??= tags.Comment;
-			tags.Publisher ??= options.LibraryBook.Book.Publisher;
-			tags.Narrator ??= string.Join("; ", options.LibraryBook.Book.Narrators.Select(n => n.Name));
-			tags.Asin = options.LibraryBook.Book.AudibleProductId;
-			tags.Acr = options.ContentMetadata.ContentReference.Acr;
-			tags.Version = options.ContentMetadata.ContentReference.Version;
-			if (options.LibraryBook.Book.DatePublished is DateTime pubDate)
-			{
-				tags.Year ??= pubDate.Year.ToString();
-				tags.ReleaseDate ??= pubDate.ToString("dd-MMM-yyyy");
-			}
-		}
+            long chapterStartMs
+                = config.StripAudibleBrandAudio
+                ? contentLic.ContentMetadata.ChapterInfo.BrandIntroDurationMs
+                : 0;
 
-		private void AaxcDownloader_RetrievedCoverArt(object? sender, byte[]? e)
-		{
-			if (Configuration.Instance.AllowLibationFixup && sender is AaxcDownloadConvertBase downloader)
-			{
-				try
-				{
-					e = OnRequestCoverArt();
-					downloader.SetCoverArt(e);
-				}
-				catch (Exception ex)
-				{
-					Serilog.Log.Logger.Error(ex, "Failed to retrieve cover art from server.");
-				}
-			}
+            //Set the requested AudioFormat for use in file naming templates
+			libraryBook.Book.AudioFormat = AudioFormat.FromString(contentLic.ContentMetadata.ContentReference.ContentFormat);
 
-			if (e is not null)
-				OnCoverImageDiscovered(e);
-		}
-		#endregion
-
-		#region Validation
-
-		private static void DownloadValidation(LibraryBook libraryBook)
-		{
-			string errorString(string field)
-				=> $"{errorTitle()}\r\nCannot download book. {field} is not known. Try re-importing the account which owns this book.";
-
-			string errorTitle()
-			{
-				var title
-					= (libraryBook.Book.TitleWithSubtitle.Length > 53)
-					? $"{libraryBook.Book.TitleWithSubtitle.Truncate(50)}..."
-					: libraryBook.Book.TitleWithSubtitle;
-				var errorBookTitle = $"{title} [{libraryBook.Book.AudibleProductId}]";
-				return errorBookTitle;
+			var dlOptions = new DownloadOptions(config, libraryBook, contentLic?.ContentMetadata?.ContentUrl?.OfflineUrl)
+            {
+                AudibleKey = contentLic?.Voucher?.Key,
+                AudibleIV = contentLic?.Voucher?.Iv,
+				OutputFormat = outputFormat,
+				LameConfig = GetLameOptions(config),
+				ChapterInfo = new AAXClean.ChapterInfo(TimeSpan.FromMilliseconds(chapterStartMs)),
+				RuntimeLength = TimeSpan.FromMilliseconds(contentLic?.ContentMetadata?.ChapterInfo?.RuntimeLengthMs ?? 0),
 			};
 
-			if (string.IsNullOrWhiteSpace(libraryBook.Account))
-				throw new InvalidOperationException(errorString("Account"));
+            var titleConcat = config.CombineNestedChapterTitles ? ": " : null;
+            var chapters
+                = flattenChapters(contentLic.ContentMetadata.ChapterInfo.Chapters, titleConcat)
+                .OrderBy(c => c.StartOffsetMs)
+                .ToList();
 
-			if (string.IsNullOrWhiteSpace(libraryBook.Book.Locale))
-				throw new InvalidOperationException(errorString("Locale"));
-		}
-		#endregion
+            if (config.MergeOpeningAndEndCredits)
+                combineCredits(chapters);
 
-		#region Post-success routines
-		/// <summary>Read the audio format from the audio file's metadata.</summary>
-		public AudioFormat GetFileFormatInfo(DownloadOptions options, TempFile firstAudioFile)
-		{
-			try
-			{
-				return firstAudioFile.Extension.ToLowerInvariant() switch
+            for (int i = 0; i < chapters.Count; i++)
+            {
+                var chapter = chapters[i];
+                long chapLenMs = chapter.LengthMs;
+
+                if (i == 0)
+                    chapLenMs -= chapterStartMs;
+
+                if (config.StripAudibleBrandAudio && i == chapters.Count - 1)
+                    chapLenMs -= contentLic.ContentMetadata.ChapterInfo.BrandOutroDurationMs;
+
+                dlOptions.ChapterInfo.AddChapter(chapter.Title, TimeSpan.FromMilliseconds(chapLenMs));
+            }
+
+            return dlOptions;
+        }
+
+        /*
+
+		Flatten Audible's new hierarchical chapters, combining children into parents.
+
+		Audible may deliver chapters like this:
+
+		00:00 - 00:10	Opening Credits
+		00:10 - 00:12	Book 1
+		00:12 - 00:14	|	Part 1
+		00:14 - 01:40	|	|	Chapter 1
+		01:40 - 03:20	|	|	Chapter 2
+		03:20 - 03:22	|	Part 2
+		03:22 - 05:00	|	|	Chapter 3
+		05:00 - 06:40	|	|	Chapter 4
+		06:40 - 06:42	Book 2
+		06:42 - 06:44	|	Part 3
+		06:44 - 08:20	|	|	Chapter 5
+		08:20 - 10:00	|	|	Chapter 6
+		10:00 - 10:02	|	Part 4
+		10:02 - 11:40	|	|	Chapter 7
+		11:40 - 13:20	|	|	Chapter 8
+		13:20 - 13:30	End Credits
+
+		And flattenChapters will combine them into this:
+
+		00:00 - 00:10	Opening Credits
+		00:10 - 01:40	Book 1: Part 1: Chapter 1
+		01:40 - 03:20	Book 1: Part 1: Chapter 2
+		03:20 - 05:00	Book 1: Part 2: Chapter 3
+		05:00 - 06:40	Book 1: Part 2: Chapter 4
+		06:40 - 08:20	Book 2: Part 3: Chapter 5
+		08:20 - 10:00	Book 2: Part 3: Chapter 6
+		10:00 - 11:40	Book 2: Part 4: Chapter 7
+		11:40 - 13:20	Book 2: Part 4: Chapter 8
+		13:20 - 13:40	End Credits
+
+		However, if one of the parent chapters is longer than 10000 milliseconds, it's kept as its own
+		chapter. A duration longer than a few seconds implies that the chapter contains more than just
+		the narrator saying the chapter title, so it should probably be preserved as a separate chapter.
+		Using the example above, if "Book 1" was 15 seconds long and "Part 3" was 20 seconds long:
+
+		00:00 - 00:10	Opening Credits
+		00:10 - 00:25	Book 1
+		00:25 - 00:27	|	Part 1
+		00:27 - 01:40	|	|	Chapter 1
+		01:40 - 03:20	|	|	Chapter 2
+		03:20 - 03:22	|	Part 2
+		03:22 - 05:00	|	|	Chapter 3
+		05:00 - 06:40	|	|	Chapter 4
+		06:40 - 06:42	Book 2
+		06:42 - 07:02	|	Part 3
+		07:02 - 08:20	|	|	Chapter 5
+		08:20 - 10:00	|	|	Chapter 6
+		10:00 - 10:02	|	Part 4
+		10:02 - 11:40	|	|	Chapter 7
+		11:40 - 13:20	|	|	Chapter 8
+		13:20 - 13:30	End Credits
+
+		then flattenChapters will combine them into this:
+
+		00:00 - 00:10	Opening Credits
+		00:10 - 00:25	Book 1
+		00:25 - 01:40	Book 1: Part 1: Chapter 1
+		01:40 - 03:20	Book 1: Part 1: Chapter 2
+		03:20 - 05:00	Book 1: Part 2: Chapter 3
+		05:00 - 06:40	Book 1: Part 2: Chapter 4
+		06:40 - 07:02	Book 2: Part 3
+		07:02 - 08:20	Book 2: Part 3: Chapter 5
+		08:20 - 10:00	Book 2: Part 3: Chapter 6
+		10:00 - 11:40	Book 2: Part 4: Chapter 7
+		11:40 - 13:20	Book 2: Part 4: Chapter 8
+		13:20 - 13:40	End Credits
+
+		*/
+
+        public static List<Chapter> flattenChapters(IList<Chapter> chapters, string titleConcat = ": ")
+        {
+            List<Chapter> chaps = new();
+
+            foreach (var c in chapters)
+            {
+                if (c.Chapters is null)
+					chaps.Add(c);
+                else if (titleConcat is null)
+                {
+                    chaps.Add(c);
+					chaps.AddRange(flattenChapters(c.Chapters));
+                }
+				else
 				{
-					".m4b" or ".m4a" or ".mp4" => GetMp4AudioFormat(),
-					".mp3" => AudioFormatDecoder.FromMpeg3(firstAudioFile.FilePath),
-					_ => AudioFormat.Default
-				};
-			}
-			catch (Exception ex)
-			{
-				//Failure to determine output audio format should not be considered a failure to download the book
-				Serilog.Log.Logger.Error(ex, "Error determining output audio format for {@Book}. File = '{@audioFile}'", options.LibraryBook, firstAudioFile);
-				return AudioFormat.Default;
-			}
+                    if (c.LengthMs < 10000)
+                    {
+                        c.Chapters[0].StartOffsetMs = c.StartOffsetMs;
+                        c.Chapters[0].StartOffsetSec = c.StartOffsetSec;
+                        c.Chapters[0].LengthMs += c.LengthMs;
+                    }
+                    else
+                        chaps.Add(c);
 
-			AudioFormat GetMp4AudioFormat()
-				=> abDownloader is AaxcDownloadConvertBase converter && converter.AaxFile is AAXClean.Mp4File mp4File
-				? AudioFormatDecoder.FromMpeg4(mp4File)
-				: AudioFormatDecoder.FromMpeg4(firstAudioFile.FilePath);
+                    var children = flattenChapters(c.Chapters);
+
+                    foreach (var child in children)
+                        child.Title = $"{c.Title}{titleConcat}{child.Title}";
+
+                    chaps.AddRange(children);
+                }
+            }
+            return chaps;
+        }
+
+        public static void combineCredits(IList<Chapter> chapters)
+        {
+            if (chapters.Count > 1 && chapters[0].Title == "Opening Credits")
+            {
+                chapters[1].StartOffsetMs = chapters[0].StartOffsetMs;
+                chapters[1].StartOffsetSec = chapters[0].StartOffsetSec;
+                chapters[1].LengthMs += chapters[0].LengthMs;
+                chapters.RemoveAt(0);
+            }
+            if (chapters.Count > 1 && chapters[^1].Title == "End Credits")
+            {
+                chapters[^2].LengthMs += chapters[^1].LengthMs;
+                chapters.Remove(chapters[^1]);
+            }
+        }
+
+        private static void downloadValidation(LibraryBook libraryBook)
+        {
+            string errorString(string field)
+                => $"{errorTitle()}\r\nCannot download book. {field} is not known. Try re-importing the account which owns this book.";
+
+            string errorTitle()
+            {
+                var title
+                    = (libraryBook.Book.TitleWithSubtitle.Length > 53)
+                    ? $"{libraryBook.Book.TitleWithSubtitle.Truncate(50)}..."
+                    : libraryBook.Book.TitleWithSubtitle;
+                var errorBookTitle = $"{title} [{libraryBook.Book.AudibleProductId}]";
+                return errorBookTitle;
+            };
+
+            if (string.IsNullOrWhiteSpace(libraryBook.Account))
+                throw new Exception(errorString("Account"));
+
+            if (string.IsNullOrWhiteSpace(libraryBook.Book.Locale))
+                throw new Exception(errorString("Locale"));
+        }
+
+        private void AaxcDownloader_RetrievedCoverArt(object _, byte[] e)
+        {
+            if (Configuration.Instance.AllowLibationFixup)
+            {
+                try
+                {
+                    e = OnRequestCoverArt();
+                    abDownloader.SetCoverArt(e);
+                }
+                catch (Exception ex)
+                {
+                    Serilog.Log.Logger.Error(ex, "Failed to retrieve cover art from server.");
+                }
+            }
+            
+            if (e is not null)
+                OnCoverImageDiscovered(e);
 		}
 
-		/// <summary>Move new files to 'Books' directory</summary>
-		/// <returns>Return directory if audiobook file(s) were successfully created and can be located on disk. Else null.</returns>
-		private void MoveFilesToBooksDir(LibraryBook libraryBook, LongPath destinationDir, List<TempFile> entries, CancellationToken cancellationToken)
-		{
-			cancellationToken.ThrowIfCancellationRequested();
-			AverageSpeed averageSpeed = new();
-
-			var totalSizeToMove = entries.Sum(f => new FileInfo(f.FilePath).Length);
-			long totalBytesMoved = 0;
+        /// <summary>Move new files to 'Books' directory</summary>
+        /// <returns>Return directory if audiobook file(s) were successfully created and can be located on disk. Else null.</returns>
+        private static void moveFilesToBooksDir(LibraryBook libraryBook, List<FilePathCache.CacheEntry> entries)
+        {
+            // create final directory. move each file into it
+            var destinationDir = getDestinationDirectory(libraryBook);
 
 			for (var i = 0; i < entries.Count; i++)
-			{
-				var entry = entries[i];
+            {
+                var entry = entries[i];
 
-				var destFileName
-					= AudibleFileStorage.Audio.GetCustomDirFilename(
-						libraryBook,
-						destinationDir,
-						entry.Extension,
-						entry.PartProperties,
-						Configuration.Instance.OverwriteExisting);
+                var realDest
+                    = FileUtility.SaferMoveToValidPath(
+                        entry.Path,
+                        Path.Combine(destinationDir, Path.GetFileName(entry.Path)),
+                        Configuration.Instance.ReplacementCharacters,
+                        overwrite: Configuration.Instance.OverwriteExisting);
 
-				var realDest
-					= FileUtility.SaferMoveToValidPath(
-						entry.FilePath,
-						destFileName,
-						Configuration.Instance.ReplacementCharacters,
-						entry.Extension,
-						Configuration.Instance.OverwriteExisting);
+                SetFileTime(libraryBook, realDest);
+				FilePathCache.Insert(libraryBook.Book.AudibleProductId, realDest);
 
-				#region File Move Progress
-				totalBytesMoved += new FileInfo(realDest).Length;
-				averageSpeed.AddPosition(totalBytesMoved);
-				var estSecsRemaining = (totalSizeToMove - totalBytesMoved) / averageSpeed.Average;
+                // propagate corrected path. Must update cache with corrected path. Also want updated path for cue file (after this for-loop)
+                entries[i] = entry with { Path = realDest };
+            }
 
-				if (double.IsNormal(estSecsRemaining))
-					OnStreamingTimeRemaining(TimeSpan.FromSeconds(estSecsRemaining));
-
-				OnStreamingProgressChanged(new DownloadProgress
-					{
-						ProgressPercentage = 100d * totalBytesMoved / totalSizeToMove,
-						BytesReceived = totalBytesMoved,
-						TotalBytesToReceive = totalSizeToMove
-					});
-				#endregion
-
-				// propagate corrected path for cue file (after this for-loop)
-				entries[i] = entry with { FilePath = realDest };
-
-				SetFileTime(libraryBook, realDest);
-				OnFileCreated(libraryBook, realDest);
-				cancellationToken.ThrowIfCancellationRequested();
+			var cue = entries.FirstOrDefault(f => f.FileType == FileType.Cue);
+            if (cue != default)
+            {
+                Cue.UpdateFileName(cue.Path, getFirstAudioFile(entries).Path);
+				SetFileTime(libraryBook, cue.Path);
 			}
 
-			if (entries.FirstOrDefault(f => getFileType(f) is FileType.Cue) is TempFile cue
-				&& getFirstAudioFile(entries)?.FilePath is LongPath audioFilePath)
-			{
-				Cue.UpdateFileName(cue.FilePath, audioFilePath);
-				SetFileTime(libraryBook, cue.FilePath);
-			}
+            AudibleFileStorage.Audio.Refresh();
+        }
 
-			cancellationToken.ThrowIfCancellationRequested();
-			AudibleFileStorage.Audio.Refresh();
-		}
-
-		private void DownloadCoverArt(LongPath destinationDir, DownloadOptions options, CancellationToken cancellationToken)
-		{
-			if (!options.Config.DownloadCoverArt) return;
-
-			var coverPath = "[null]";
-
-			try
-			{
-				coverPath
-					= AudibleFileStorage.Audio.GetCustomDirFilename(
-						options.LibraryBook,
-						destinationDir,
-						extension: ".jpg",
-						returnFirstExisting: Configuration.Instance.OverwriteExisting);
-
-				if (File.Exists(coverPath))
-					FileUtility.SaferDelete(coverPath);
-
-				var picBytes = PictureStorage.GetPictureSynchronously(new(options.LibraryBook.Book.PictureLarge ?? options.LibraryBook.Book.PictureId, PictureSize.Native), cancellationToken);
-				if (picBytes.Length > 0)
-				{
-					File.WriteAllBytes(coverPath, picBytes);
-					SetFileTime(options.LibraryBook, coverPath);
-					OnFileCreated(options.LibraryBook, coverPath);
-				}
-			}
-			catch (Exception ex)
-			{
-				//Failure to download cover art should not be considered a failure to download the book
-				if (!cancellationToken.IsCancellationRequested)
-					Serilog.Log.Logger.Error(ex, "Error downloading cover art for {@Book} to {@metadataFile}.", options.LibraryBook, coverPath);
-				throw;
-			}
-		}
-
-		public async Task DownloadRecordsAsync(AudibleApi.Api api, LongPath destinationDir, DownloadOptions options, CancellationToken cancellationToken)
-		{
-			if (!options.Config.DownloadClipsBookmarks) return;
-
-			var recordsPath = "[null]";
-			var format = options.Config.ClipsBookmarksFileFormat;
-			var formatExtension = FileUtility.GetStandardizedExtension(format.ToString().ToLowerInvariant());
-
-			try
-			{
-				recordsPath
-					= AudibleFileStorage.Audio.GetCustomDirFilename(
-						options.LibraryBook,
-						destinationDir,
-						extension: formatExtension,
-						returnFirstExisting: Configuration.Instance.OverwriteExisting);
-
-				if (File.Exists(recordsPath))
-					FileUtility.SaferDelete(recordsPath);
-
-				var records = await api.GetRecordsAsync(options.AudibleProductId);
-
-				switch (format)
-				{
-					case Configuration.ClipBookmarkFormat.CSV:
-						RecordExporter.ToCsv(recordsPath, records);
-						break;
-					case Configuration.ClipBookmarkFormat.Xlsx:
-						RecordExporter.ToXlsx(recordsPath, records);
-						break;
-					case Configuration.ClipBookmarkFormat.Json:
-						RecordExporter.ToJson(recordsPath, options.LibraryBook, records);
-						break;
-					default:
-						throw new NotSupportedException($"Unsupported record export format: {format}");
-				}
-
-				SetFileTime(options.LibraryBook, recordsPath);
-				OnFileCreated(options.LibraryBook, recordsPath);
-			}
-			catch (Exception ex)
-			{
-				//Failure to download records should not be considered a failure to download the book
-				if (!cancellationToken.IsCancellationRequested)
-					Serilog.Log.Logger.Error(ex, "Error downloading clips and bookmarks for {@Book} to {@recordsPath}.", options.LibraryBook, recordsPath);
-				throw;
-			}
-		}
-
-		private async Task DownloadMetadataAsync(AudibleApi.Api api, LongPath destinationDir, DownloadOptions options, CancellationToken cancellationToken)
-		{
-			if (!options.Config.SaveMetadataToFile) return;
-
-			string metadataPath = "[null]";
-
-			try
-			{
-				metadataPath
-					= AudibleFileStorage.Audio.GetCustomDirFilename(
-						options.LibraryBook,
-						destinationDir,
-						extension: ".metadata.json",
-						returnFirstExisting: Configuration.Instance.OverwriteExisting);
-
-				if (File.Exists(metadataPath))
-					FileUtility.SaferDelete(metadataPath);
-
-				var item = await api.GetCatalogProductAsync(options.LibraryBook.Book.AudibleProductId, AudibleApi.CatalogOptions.ResponseGroupOptions.ALL_OPTIONS);
-				item.SourceJson.Add(nameof(ContentMetadata.ChapterInfo), Newtonsoft.Json.Linq.JObject.FromObject(options.ContentMetadata.ChapterInfo));
-				item.SourceJson.Add(nameof(ContentMetadata.ContentReference), Newtonsoft.Json.Linq.JObject.FromObject(options.ContentMetadata.ContentReference));
-
-				cancellationToken.ThrowIfCancellationRequested();
-				File.WriteAllText(metadataPath, item.SourceJson.ToString());
-				SetFileTime(options.LibraryBook, metadataPath);
-				OnFileCreated(options.LibraryBook, metadataPath);
-			}
-			catch (Exception ex)
-			{
-				//Failure to download metadata should not be considered a failure to download the book
-				if (!cancellationToken.IsCancellationRequested)
-					Serilog.Log.Logger.Error(ex, "Error downloading metdatat of {@Book} to {@metadataFile}.", options.LibraryBook, metadataPath);
-				throw;
-			}
-		}
-		#endregion
-
-		#region Macros
-		private static string getDestinationDirectory(LibraryBook libraryBook)
-		{
+        private static string getDestinationDirectory(LibraryBook libraryBook)
+        {
 			var destinationDir = AudibleFileStorage.Audio.GetDestinationDirectory(libraryBook);
-			if (!Directory.Exists(destinationDir))
-				Directory.CreateDirectory(destinationDir);
-			return destinationDir;
+            if (!Directory.Exists(destinationDir))
+                Directory.CreateDirectory(destinationDir);
+            return destinationDir;
 		}
 
-		private static FileType getFileType(TempFile file)
-			=> FileTypes.GetFileTypeFromPath(file.FilePath);
-		private static TempFile? getFirstAudioFile(IEnumerable<TempFile> entries)
-			=> entries.FirstOrDefault(f => File.Exists(f.FilePath) && getFileType(f) is FileType.Audio);
-		private static IEnumerable<TempFile> getAaxcFiles(IEnumerable<TempFile> entries)
-			=> entries.Where(f => File.Exists(f.FilePath) && (getFileType(f) is FileType.AAXC || f.Extension.Equals(".key", StringComparison.OrdinalIgnoreCase)));
-		#endregion
-	}
+		private static FilePathCache.CacheEntry getFirstAudioFile(IEnumerable<FilePathCache.CacheEntry> entries)
+            => entries.FirstOrDefault(f => f.FileType == FileType.Audio);
+
+		private static void downloadCoverArt(LibraryBook libraryBook)
+        {
+			if (!Configuration.Instance.DownloadCoverArt) return;
+
+            var coverPath = "[null]";
+
+            try
+            {
+                var destinationDir = getDestinationDirectory(libraryBook);
+                coverPath = AudibleFileStorage.Audio.GetBooksDirectoryFilename(libraryBook, ".jpg");
+                coverPath = Path.Combine(destinationDir, Path.GetFileName(coverPath));
+
+                if (File.Exists(coverPath))
+                    FileUtility.SaferDelete(coverPath);
+
+                var picBytes = PictureStorage.GetPictureSynchronously(new(libraryBook.Book.PictureLarge ?? libraryBook.Book.PictureId, PictureSize.Native));
+                if (picBytes.Length > 0)
+                {
+                    File.WriteAllBytes(coverPath, picBytes);
+                    SetFileTime(libraryBook, coverPath);
+                }
+            }
+            catch (Exception ex)
+            {
+                //Failure to download cover art should not be considered a failure to download the book
+                Serilog.Log.Logger.Error(ex, $"Error downloading cover art of {libraryBook.Book.AudibleProductId} to {coverPath} catalog product.");
+            }
+        }
+    }
 }

Source/FileLiberator/DownloadOptions.Factory.cs

@@ -1,307 +0,0 @@
-using AaxDecrypter;
-using AudibleApi;
-using AudibleApi.Common;
-using AudibleUtilities.Widevine;
-using DataLayer;
-using LibationFileManager;
-using NAudio.Lame;
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Net.Http;
-using System.Threading;
-using System.Threading.Tasks;
-
-#nullable enable
-namespace FileLiberator;
-
-public partial class DownloadOptions
-{
-	/// <summary>
-	/// Initiate an audiobook download from the audible api.
-	/// </summary>
-	public static async Task<DownloadOptions> InitiateDownloadAsync(Api api, Configuration config, LibraryBook libraryBook, CancellationToken token)
-	{
-		var license = await ChooseContent(api, libraryBook, config, token);
-		token.ThrowIfCancellationRequested();
-
-		//Some audiobooks will have incorrect chapters in the metadata returned from the license request,
-		//but the metadata returned by the content metadata endpoint will be correct. Call the content
-		//metadata endpoint and use its chapters. Only replace the license request chapters if the total
-		//lengths match (defensive against different audio formats having slightly different lengths).
-		var metadata = await api.GetContentMetadataAsync(libraryBook.Book.AudibleProductId);
-		if (metadata.ChapterInfo.RuntimeLengthMs == license.ContentMetadata.ChapterInfo.RuntimeLengthMs)
-			license.ContentMetadata.ChapterInfo = metadata.ChapterInfo;
-
-		token.ThrowIfCancellationRequested();
-		return BuildDownloadOptions(libraryBook, config, license);
-	}
-
-	private class LicenseInfo
-	{
-		public DrmType DrmType { get; }
-		public ContentMetadata ContentMetadata { get; set; }
-		public KeyData[]? DecryptionKeys { get; }
-		public LicenseInfo(ContentLicense license, IEnumerable<KeyData>? keys = null)
-		{
-			DrmType = license.DrmType;
-			ContentMetadata = license.ContentMetadata;
-			DecryptionKeys = keys?.ToArray() ?? ToKeys(license.Voucher);
-		}
-
-		private static KeyData[]? ToKeys(VoucherDtoV10? voucher)
-			=> voucher is null ? null : [new KeyData(voucher.Key, voucher.Iv)];
-	}
-
-	private static async Task<LicenseInfo> ChooseContent(Api api, LibraryBook libraryBook, Configuration config, CancellationToken token)
-	{
-		var dlQuality = config.FileDownloadQuality == Configuration.DownloadQuality.Normal ? DownloadQuality.Normal : DownloadQuality.High;
-
-		if (!config.UseWidevine || await Cdm.GetCdmAsync() is not Cdm cdm)
-		{
-			token.ThrowIfCancellationRequested();
-			var license = await api.GetDownloadLicenseAsync(libraryBook.Book.AudibleProductId, dlQuality);
-			return new LicenseInfo(license);
-		}
-
-		token.ThrowIfCancellationRequested();
-		try
-		{
-			//try to request a widevine content license using the user's audio settings
-			var aacCodecChoice = config.Request_xHE_AAC ? Codecs.xHE_AAC : Codecs.AAC_LC;
-			//Always use the ec+3 codec if converting to mp3
-			var spatialCodecChoice = config.SpatialAudioCodec is Configuration.SpatialCodec.AC_4 && !config.DecryptToLossy ? Codecs.AC_4 : Codecs.EC_3;
-
-			var contentLic
-				= await api.GetDownloadLicenseAsync(
-					libraryBook.Book.AudibleProductId,
-					dlQuality,
-					ChapterTitlesType.Tree,
-					DrmType.Widevine,
-					config.RequestSpatial,
-					aacCodecChoice,
-					spatialCodecChoice);
-
-			if (contentLic.DrmType is not DrmType.Widevine)
-				return new LicenseInfo(contentLic);
-
-			using var client = new HttpClient();
-			using var mpdResponse = await client.GetAsync(contentLic.LicenseResponse, token);
-			var dash = new MpegDash(mpdResponse.Content.ReadAsStream(token));
-
-			if (!dash.TryGetUri(new Uri(contentLic.LicenseResponse), out var contentUri))
-				throw new InvalidDataException("Failed to get mpeg-dash content download url.");
-
-			contentLic.ContentMetadata.ContentUrl = new() { OfflineUrl = contentUri.ToString() };
-
-			using var session = cdm.OpenSession();
-			var challenge = session.GetLicenseChallenge(dash);
-			var licenseMessage = await api.WidevineDrmLicense(libraryBook.Book.AudibleProductId, challenge);
-			var keys = session.ParseLicense(licenseMessage);
-			return new LicenseInfo(contentLic, keys.Select(k => new KeyData(k.Kid.ToByteArray(bigEndian: true), k.Key)));
-		}
-		catch (Exception ex)
-		{
-			Serilog.Log.Logger.Error(ex, "Failed to request a Widevine license.");
-			//We failed to get a widevine content license. Depending on the
-			//failure reason, users can potentially still download this audiobook
-			//by disabling the "Use Widevine DRM" feature.
-			throw;
-		}
-	}
-
-	private static DownloadOptions BuildDownloadOptions(LibraryBook libraryBook, Configuration config, LicenseInfo licInfo)
-	{
-		long chapterStartMs
-			= config.StripAudibleBrandAudio
-			? licInfo.ContentMetadata.ChapterInfo.BrandIntroDurationMs
-			: 0;
-
-		var dlOptions = new DownloadOptions(config, libraryBook, licInfo)
-		{
-			ChapterInfo = new AAXClean.ChapterInfo(TimeSpan.FromMilliseconds(chapterStartMs)),
-			RuntimeLength = TimeSpan.FromMilliseconds(licInfo.ContentMetadata.ChapterInfo.RuntimeLengthMs),
-		};
-
-		var titleConcat = config.CombineNestedChapterTitles ? ": " : null;
-		var chapters
-			= flattenChapters(licInfo.ContentMetadata.ChapterInfo.Chapters, titleConcat)
-			.OrderBy(c => c.StartOffsetMs)
-			.ToList();
-
-		if (config.MergeOpeningAndEndCredits)
-			combineCredits(chapters);
-
-		for (int i = 0; i < chapters.Count; i++)
-		{
-			var chapter = chapters[i];
-			long chapLenMs = chapter.LengthMs;
-
-			if (i == 0)
-				chapLenMs -= chapterStartMs;
-
-			if (config.StripAudibleBrandAudio && i == chapters.Count - 1)
-				chapLenMs -= licInfo.ContentMetadata.ChapterInfo.BrandOutroDurationMs;
-
-			dlOptions.ChapterInfo.AddChapter(chapter.Title, TimeSpan.FromMilliseconds(chapLenMs));
-		}
-
-		return dlOptions;
-	}
-
-	public static 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;
-	}
-
-	/*
-
-	Flatten Audible's new hierarchical chapters, combining children into parents.
-
-	Audible may deliver chapters like this:
-
-	00:00 - 00:10	Opening Credits
-	00:10 - 00:12	Book 1
-	00:12 - 00:14	|	Part 1
-	00:14 - 01:40	|	|	Chapter 1
-	01:40 - 03:20	|	|	Chapter 2
-	03:20 - 03:22	|	Part 2
-	03:22 - 05:00	|	|	Chapter 3
-	05:00 - 06:40	|	|	Chapter 4
-	06:40 - 06:42	Book 2
-	06:42 - 06:44	|	Part 3
-	06:44 - 08:20	|	|	Chapter 5
-	08:20 - 10:00	|	|	Chapter 6
-	10:00 - 10:02	|	Part 4
-	10:02 - 11:40	|	|	Chapter 7
-	11:40 - 13:20	|	|	Chapter 8
-	13:20 - 13:30	End Credits
-
-	And flattenChapters will combine them into this:
-
-	00:00 - 00:10	Opening Credits
-	00:10 - 01:40	Book 1: Part 1: Chapter 1
-	01:40 - 03:20	Book 1: Part 1: Chapter 2
-	03:20 - 05:00	Book 1: Part 2: Chapter 3
-	05:00 - 06:40	Book 1: Part 2: Chapter 4
-	06:40 - 08:20	Book 2: Part 3: Chapter 5
-	08:20 - 10:00	Book 2: Part 3: Chapter 6
-	10:00 - 11:40	Book 2: Part 4: Chapter 7
-	11:40 - 13:20	Book 2: Part 4: Chapter 8
-	13:20 - 13:40	End Credits
-
-	However, if one of the parent chapters is longer than 10000 milliseconds, it's kept as its own
-	chapter. A duration longer than a few seconds implies that the chapter contains more than just
-	the narrator saying the chapter title, so it should probably be preserved as a separate chapter.
-	Using the example above, if "Book 1" was 15 seconds long and "Part 3" was 20 seconds long:
-
-	00:00 - 00:10	Opening Credits
-	00:10 - 00:25	Book 1
-	00:25 - 00:27	|	Part 1
-	00:27 - 01:40	|	|	Chapter 1
-	01:40 - 03:20	|	|	Chapter 2
-	03:20 - 03:22	|	Part 2
-	03:22 - 05:00	|	|	Chapter 3
-	05:00 - 06:40	|	|	Chapter 4
-	06:40 - 06:42	Book 2
-	06:42 - 07:02	|	Part 3
-	07:02 - 08:20	|	|	Chapter 5
-	08:20 - 10:00	|	|	Chapter 6
-	10:00 - 10:02	|	Part 4
-	10:02 - 11:40	|	|	Chapter 7
-	11:40 - 13:20	|	|	Chapter 8
-	13:20 - 13:30	End Credits
-
-	then flattenChapters will combine them into this:
-
-	00:00 - 00:10	Opening Credits
-	00:10 - 00:25	Book 1
-	00:25 - 01:40	Book 1: Part 1: Chapter 1
-	01:40 - 03:20	Book 1: Part 1: Chapter 2
-	03:20 - 05:00	Book 1: Part 2: Chapter 3
-	05:00 - 06:40	Book 1: Part 2: Chapter 4
-	06:40 - 07:02	Book 2: Part 3
-	07:02 - 08:20	Book 2: Part 3: Chapter 5
-	08:20 - 10:00	Book 2: Part 3: Chapter 6
-	10:00 - 11:40	Book 2: Part 4: Chapter 7
-	11:40 - 13:20	Book 2: Part 4: Chapter 8
-	13:20 - 13:40	End Credits
-
-	*/
-
-	public static List<Chapter> flattenChapters(IList<Chapter> chapters, string? titleConcat = ": ")
-	{
-		List<Chapter> chaps = new();
-
-		foreach (var c in chapters)
-		{
-			if (c.Chapters is null)
-				chaps.Add(c);
-			else if (titleConcat is null)
-			{
-				chaps.Add(c);
-				chaps.AddRange(flattenChapters(c.Chapters, titleConcat));
-			}
-			else
-			{
-				if (c.LengthMs < 10000)
-				{
-					c.Chapters[0].StartOffsetMs = c.StartOffsetMs;
-					c.Chapters[0].StartOffsetSec = c.StartOffsetSec;
-					c.Chapters[0].LengthMs += c.LengthMs;
-				}
-				else
-					chaps.Add(c);
-
-				var children = flattenChapters(c.Chapters, titleConcat);
-
-				foreach (var child in children)
-					child.Title = $"{c.Title}{titleConcat}{child.Title}";
-
-				chaps.AddRange(children);
-			}
-		}
-		return chaps;
-	}
-
-	public static void combineCredits(IList<Chapter> chapters)
-	{
-		if (chapters.Count > 1 && chapters[0].Title == "Opening Credits")
-		{
-			chapters[1].StartOffsetMs = chapters[0].StartOffsetMs;
-			chapters[1].StartOffsetSec = chapters[0].StartOffsetSec;
-			chapters[1].LengthMs += chapters[0].LengthMs;
-			chapters.RemoveAt(0);
-		}
-		if (chapters.Count > 1 && chapters[^1].Title == "End Credits")
-		{
-			chapters[^2].LengthMs += chapters[^1].LengthMs;
-			chapters.Remove(chapters[^1]);
-		}
-	}
-}

Source/FileLiberator/DownloadOptions.cs

@@ -3,84 +3,94 @@ using AAXClean;
 using Dinah.Core;
 using DataLayer;
 using LibationFileManager;
+using System.Threading.Tasks;
 using System;
 using System.IO;
-using LibationFileManager.Templates;
+using ApplicationServices;
 
-#nullable enable
 namespace FileLiberator
 {
-	public partial class DownloadOptions : IDownloadOptions, IDisposable
+	public class DownloadOptions : IDownloadOptions, IDisposable
 	{
-		public event EventHandler<long>? DownloadSpeedChanged;
+		public event EventHandler<long> DownloadSpeedChanged;
 		public LibraryBook LibraryBook { get; }
 		public LibraryBookDto LibraryBookDto { get; }
 		public string DownloadUrl { get; }
-		public KeyData[]? DecryptionKeys { get; }
-		public required TimeSpan RuntimeLength { get; init; }
-		public OutputFormat OutputFormat { get; }
-		public required ChapterInfo ChapterInfo { get; init; }
+		public string AudibleKey { get; init; }
+		public string AudibleIV { get; init; }
+		public TimeSpan RuntimeLength { get; init; }
+		public OutputFormat OutputFormat { get; init; }
+		public ChapterInfo ChapterInfo { get; init; }
 		public string Title => LibraryBook.Book.Title;
 		public string Subtitle => LibraryBook.Book.Subtitle;
 		public string Publisher => LibraryBook.Book.Publisher;
 		public string Language => LibraryBook.Book.Language;
-		public string? AudibleProductId => LibraryBookDto.AudibleProductId;
-		public string? SeriesName => LibraryBookDto.FirstSeries?.Name;
-		public string? SeriesNumber => LibraryBookDto.FirstSeries?.Order?.ToString();
-		public NAudio.Lame.LameConfig? LameConfig { get; }
+		public string AudibleProductId => LibraryBookDto.AudibleProductId;
+		public string SeriesName => LibraryBookDto.SeriesName;
+		public float? SeriesNumber => LibraryBookDto.SeriesNumber;
+		public NAudio.Lame.LameConfig LameConfig { get; init; }
 		public string UserAgent => AudibleApi.Resources.Download_User_Agent;
-		public bool StripUnabridged => Config.AllowLibationFixup && Config.StripUnabridged;
-		public bool CreateCueSheet => Config.CreateCueSheet;
-		public long DownloadSpeedBps => Config.DownloadSpeedLimit;
-		public bool FixupFile => Config.AllowLibationFixup;
-		public bool Downsample => Config.AllowLibationFixup && Config.LameDownsampleMono;
-		public bool MatchSourceBitrate => Config.AllowLibationFixup && Config.LameMatchSourceBR && Config.LameTargetBitrate;
-		public bool MoveMoovToBeginning => Config.MoveMoovToBeginning;
-		public AAXClean.FileType? InputType { get; }
-		public AudibleApi.Common.DrmType DrmType { get; }
-		public AudibleApi.Common.ContentMetadata ContentMetadata { get; }
+		public bool TrimOutputToChapterLength => config.AllowLibationFixup && config.StripAudibleBrandAudio;
+		public bool StripUnabridged => config.AllowLibationFixup && config.StripUnabridged;
+		public bool CreateCueSheet => config.CreateCueSheet;
+		public bool DownloadClipsBookmarks => config.DownloadClipsBookmarks;
+		public long DownloadSpeedBps => config.DownloadSpeedLimit;
+		public bool RetainEncryptedFile => config.RetainAaxFile;
+		public bool FixupFile => config.AllowLibationFixup;
+		public bool Downsample => config.AllowLibationFixup && config.LameDownsampleMono;
+		public bool MatchSourceBitrate => config.AllowLibationFixup && config.LameMatchSourceBR && config.LameTargetBitrate;
+		public bool MoveMoovToBeginning => config.MoveMoovToBeginning;
+
+		public string GetMultipartFileName(MultiConvertFileProperties props)
+		{
+			var baseDir = Path.GetDirectoryName(props.OutputFileName);
+			var extension = Path.GetExtension(props.OutputFileName);
+			return Templates.ChapterFile.GetFilename(LibraryBookDto, props, baseDir, extension);
+		}
 
 		public string GetMultipartTitle(MultiConvertFileProperties props)
 			=> Templates.ChapterTitle.GetName(LibraryBookDto, props);
 
-		public Configuration Config { get; }
-		private readonly IDisposable cancellation;
-		public void Dispose()
+		public async Task<string> SaveClipsAndBookmarksAsync(string fileName)
 		{
-			cancellation?.Dispose();
-			GC.SuppressFinalize(this);
+			if (DownloadClipsBookmarks)
+			{
+				var format = config.ClipsBookmarksFileFormat;
+
+				var formatExtension = format.ToString().ToLowerInvariant();
+				var filePath = Path.ChangeExtension(fileName, formatExtension);
+
+				var api = await LibraryBook.GetApiAsync();
+				var records = await api.GetRecordsAsync(LibraryBook.Book.AudibleProductId);
+
+				switch(format)
+				{
+					case Configuration.ClipBookmarkFormat.CSV:
+						RecordExporter.ToCsv(filePath, records);
+						break;
+					case Configuration.ClipBookmarkFormat.Xlsx:
+						RecordExporter.ToXlsx(filePath, records);
+						break;
+					case Configuration.ClipBookmarkFormat.Json:
+						RecordExporter.ToJson(filePath, LibraryBook, records);
+						break;
+				}
+				return filePath;
+			}
+			return string.Empty;
 		}
 
-		private DownloadOptions(Configuration config, LibraryBook libraryBook, LicenseInfo licInfo)
+		private readonly Configuration config;
+		private readonly IDisposable cancellation;
+		public void Dispose() => cancellation?.Dispose();
+
+		public DownloadOptions(Configuration config, LibraryBook libraryBook, string downloadUrl)
 		{
-			Config = ArgumentValidator.EnsureNotNull(config, nameof(config));
+			this.config = ArgumentValidator.EnsureNotNull(config, nameof(config));
 			LibraryBook = ArgumentValidator.EnsureNotNull(libraryBook, nameof(libraryBook));
-
-			ArgumentValidator.EnsureNotNull(licInfo, nameof(licInfo));
-
-			if (licInfo.ContentMetadata.ContentUrl.OfflineUrl is not string licUrl)
-				throw new InvalidDataException("Content license doesn't contain an offline Url");
-
-			DownloadUrl = licUrl;
-			DecryptionKeys = licInfo.DecryptionKeys;
-			DrmType = licInfo.DrmType;
-			ContentMetadata = licInfo.ContentMetadata;
-			InputType
-			= licInfo.DrmType is AudibleApi.Common.DrmType.Widevine ? AAXClean.FileType.Dash
-			: licInfo.DrmType is AudibleApi.Common.DrmType.Adrm && licInfo.DecryptionKeys?.Length == 1 && licInfo.DecryptionKeys[0].KeyPart1.Length == 4 && licInfo.DecryptionKeys[0].KeyPart2 is null ? AAXClean.FileType.Aax
-			: licInfo.DrmType is AudibleApi.Common.DrmType.Adrm && licInfo.DecryptionKeys?.Length == 1 && licInfo.DecryptionKeys[0].KeyPart1.Length == 16 && licInfo.DecryptionKeys[0].KeyPart2?.Length == 16 ? AAXClean.FileType.Aaxc
-			: null;
-
-			//If DrmType is not Adrm or Widevine, the delivered file is an unencrypted mp3.
-			OutputFormat
-				= licInfo.DrmType is not AudibleApi.Common.DrmType.Adrm and not AudibleApi.Common.DrmType.Widevine ||
-				(config.AllowLibationFixup && config.DecryptToLossy && licInfo.ContentMetadata.ContentReference.Codec != AudibleApi.Codecs.AC_4)
-				? OutputFormat.Mp3
-				: OutputFormat.M4b;
-
-			LameConfig = OutputFormat == OutputFormat.Mp3 ? GetLameOptions(config) : null;
-
+			DownloadUrl = ArgumentValidator.EnsureNotNullOrEmpty(downloadUrl, nameof(downloadUrl));
 			// no null/empty check for key/iv. unencrypted files do not have them
+
 			LibraryBookDto = LibraryBook.ToDto();
 
 			cancellation =

Source/FileLiberator/FileLiberator.csproj

@@ -19,10 +19,5 @@
 		<DebugType>embedded</DebugType>
 	</PropertyGroup>
 
-	<ItemGroup>
-		<Compile Update="DownloadOptions.*.cs">
-			<DependentUpon>DownloadOptions.cs</DependentUpon>
-		</Compile>
-	</ItemGroup>
 
 </Project>

Source/FileLiberator/UtilityExtensions.cs

@@ -6,9 +6,7 @@ using AudibleUtilities;
 using DataLayer;
 using Dinah.Core;
 using LibationFileManager;
-using LibationFileManager.Templates;
 
-#nullable enable
 namespace FileLiberator
 {
 	public static class UtilityExtensions
@@ -21,15 +19,9 @@ namespace FileLiberator
 			account: libraryBook.Account.ToMask()
 			);
 
-		public static Func<Account, Task<ApiExtended>>? ApiExtendedFunc { get; set; }
-
 		public static async Task<AudibleApi.Api> GetApiAsync(this LibraryBook libraryBook)
 		{
-			Account account;
-			using (var accounts = AudibleApiStorage.GetAccountsSettingsPersister())
-				account = accounts.AccountsSettings.GetAccount(libraryBook.Account, libraryBook.Book.Locale);
-
-			var apiExtended = await ApiExtended.CreateAsync(account);
+			var apiExtended = await ApiExtended.CreateAsync(libraryBook.Account, libraryBook.Book.Locale);
 			return apiExtended.Api;
 		}
 
@@ -55,37 +47,20 @@ namespace FileLiberator
 				YearPublished = libraryBook.Book.DatePublished?.Year,
 				DatePublished = libraryBook.Book.DatePublished,
 
-				Authors = libraryBook.Book.Authors.Select(c => new ContributorDto(c.Name, c.AudibleContributorId)).ToList(),
-				Narrators = libraryBook.Book.Narrators.Select(c => new ContributorDto(c.Name, c.AudibleContributorId)).ToList(),
+				Authors = libraryBook.Book.Authors.Select(c => c.Name).ToList(),
 
-				Series = getSeries(libraryBook.Book.SeriesLink),
+				Narrators = libraryBook.Book.Narrators.Select(c => c.Name).ToList(),
+
+				SeriesName = libraryBook.Book.SeriesLink.FirstOrDefault()?.Series.Name,
+				SeriesNumber = libraryBook.Book.SeriesLink.FirstOrDefault()?.Index,
 				IsPodcastParent = libraryBook.Book.IsEpisodeParent(),
 				IsPodcast = libraryBook.Book.IsEpisodeChild() || libraryBook.Book.IsEpisodeParent(),
 
-				Language = libraryBook.Book.Language,
-				Codec = libraryBook.Book.UserDefinedItem.LastDownloadedFormat?.CodecString,
-				BitRate = libraryBook.Book.UserDefinedItem.LastDownloadedFormat?.BitRate,
-				SampleRate = libraryBook.Book.UserDefinedItem.LastDownloadedFormat?.SampleRate,
-				Channels = libraryBook.Book.UserDefinedItem.LastDownloadedFormat?.ChannelCount,
-				LibationVersion = libraryBook.Book.UserDefinedItem.LastDownloadedVersion?.ToVersionString(),
-				FileVersion = libraryBook.Book.UserDefinedItem.LastDownloadedFileVersion
+				BitRate = libraryBook.Book.AudioFormat.Bitrate,
+				SampleRate = libraryBook.Book.AudioFormat.SampleRate,
+				Channels = libraryBook.Book.AudioFormat.Channels,
+				Language = libraryBook.Book.Language
 			};
 		}
-
-		private static List<SeriesDto>? getSeries(IEnumerable<SeriesBook> seriesBooks)
-		{
-			if (!seriesBooks.Any())
-				return null;
-
-			//I don't remember why or if there was a good reason not to have series numbers for
-			//podcast parents, but preserving the behavior for backwards compatibility.
-			return seriesBooks
-				.Select(sb
-					=> new SeriesDto(
-						sb.Series.Name,
-						sb.Book.IsEpisodeParent() ? null : sb.Order,
-						sb.Series.AudibleSeriesId)
-				).ToList();
-		}
 	}
 }

Source/FileManager/FileManager.csproj

@@ -5,8 +5,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Dinah.Core" Version="9.0.3.1" />
-    <PackageReference Include="Polly" Version="8.6.2" />
+    <PackageReference Include="Dinah.Core" Version="9.0.0.1" />
+    <PackageReference Include="Polly" Version="8.5.2" />
   </ItemGroup>
 
 	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">

Source/FileManager/FileSystemTest.cs

@@ -1,74 +0,0 @@
-using System;
-using System.IO;
-
-namespace FileManager
-{
-	public static class FileSystemTest
-	{
-		/// <summary>
-		/// Additional characters which are illegal for filenames in Windows environments.
-		/// Double quotes and slashes are already illegal filename characters on all platforms,
-		/// so they are not included here.
-		/// </summary>
-		public static string AdditionalInvalidWindowsFilenameCharacters { get; } = "<>|:*?";
-
-		/// <summary>
-		/// Test if the directory supports filenames with characters that are invalid on Windows (:, *, ?, &lt;, &gt;, |).
-		/// </summary>
-		public static bool CanWriteWindowsInvalidChars(LongPath directoryName)
-		{
-			var testFile = Path.Combine(directoryName, AdditionalInvalidWindowsFilenameCharacters + Guid.NewGuid().ToString());
-			return CanWriteFile(testFile);
-		}
-
-		/// <summary>
-		/// Test if the directory supports filenames with 255 unicode characters.
-		/// </summary>
-		public static bool CanWrite255UnicodeChars(LongPath directoryName)
-		{
-			const char unicodeChar = 'ü';
-			var testFileName = new string(unicodeChar, 255);
-			var testFile = Path.Combine(directoryName, testFileName);
-			return CanWriteFile(testFile);
-		}
-
-		/// <summary>
-		/// Test if a directory has write access by attempting to create an empty file in it.
-		/// <para/>Returns true even if the temporary file can not be deleted.
-		/// </summary>
-		public static bool CanWriteDirectory(LongPath directoryName)
-		{
-			if (!Directory.Exists(directoryName))
-				return false;
-
-			Serilog.Log.Logger.Debug("Testing write permissions for directory: {@DirectoryName}", directoryName);
-			var testFilePath = Path.Combine(directoryName, Guid.NewGuid().ToString());
-			return CanWriteFile(testFilePath);
-		}
-
-		private static bool CanWriteFile(LongPath filename)
-		{
-			try
-			{
-				Serilog.Log.Logger.Debug("Testing ability to write filename: {@filename}", filename);
-				File.WriteAllBytes(filename, []);
-				Serilog.Log.Logger.Debug("Deleting test file after successful write: {@filename}", filename);
-				try
-				{
-					FileUtility.SaferDelete(filename);
-				}
-				catch (Exception ex)
-				{
-					//An error deleting the file doesn't constitute a write failure.
-					Serilog.Log.Logger.Debug(ex, "Error deleting test file: {@filename}", filename);
-				}
-				return true;
-			}
-			catch (Exception ex)
-			{
-				Serilog.Log.Logger.Debug(ex, "Error writing test file: {@filename}", filename);
-				return false;
-			}
-		}
-	}
-}

Source/FileManager/FileUtility.cs

@@ -157,7 +157,7 @@ namespace FileManager
 		/// <param name="extension">File extension override to use for <paramref name="destination"/></param>
 		/// <param name="overwrite">If <c>false</c> and <paramref name="destination"/> exists, append " (n)" to filename and try again.</param>
 		/// <returns>The actual destination filename</returns>
-		public static LongPath SaferMoveToValidPath(
+		public static string SaferMoveToValidPath(
 			LongPath source,
 			LongPath destination,
 			ReplacementCharacters replacements,

Source/FileManager/LogArchiver.cs

@@ -56,7 +56,7 @@ namespace FileManager
 		{
 			ArgumentValidator.EnsureNotNull(name, nameof(name));
 
-			name = ReplacementCharacters.Barebones(true).ReplaceFilenameChars(name);
+			name = ReplacementCharacters.Barebones.ReplaceFilenameChars(name);
 			return Task.Run(() => AddFileInternal(name, contents.Span, comment));			
 		}
 

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

@@ -22,8 +22,6 @@ internal interface IClosingPropertyTag : IPropertyTag
 	bool StartsWithClosing(string templateString, [NotNullWhen(true)] out string? exactName, [NotNullWhen(true)] out IClosingPropertyTag? propertyTag);
 }
 
-public delegate bool Conditional<T>(ITemplateTag templateTag, T value, string condition);
-
 public class ConditionalTagCollection<TClass> : TagCollection
 {
 	public ConditionalTagCollection(bool caseSensative = true) :base(typeof(TClass), caseSensative) { }
@@ -34,18 +32,9 @@ public class ConditionalTagCollection<TClass> : TagCollection
 	/// <param name="propertyGetter">A Func to get the condition's <see cref="bool"/> value from <see cref="TClass"/></param>
 	public void Add(ITemplateTag templateTag, Func<TClass, bool> propertyGetter)
 	{
-		var target = propertyGetter.Target is null ? null : Expression.Constant(propertyGetter.Target);
-		var expr = Expression.Call(target, propertyGetter.Method, Parameter);
-		AddPropertyTag(new ConditionalTag(templateTag, Options, expr));
-	}
+		var expr = Expression.Call(Expression.Constant(propertyGetter.Target), propertyGetter.Method, Parameter);
 
-	/// <summary>
-	/// Register a conditional tag.
-	/// </summary>
-	/// <param name="conditional">A <see cref="Conditional{TClass}"/> to get the condition's <see cref="bool"/> value</param>
-	public void Add(ITemplateTag templateTag, Conditional<TClass> conditional)
-	{
-		AddPropertyTag(new ConditionalTag(templateTag, Options, Parameter, conditional));
+		AddPropertyTag(new ConditionalTag(templateTag, Options, expr));
 	}
 	
 	private class ConditionalTag : TagBase, IClosingPropertyTag
@@ -53,30 +42,11 @@ public class ConditionalTagCollection<TClass> : TagCollection
 		public override Regex NameMatcher { get; }
 		public Regex NameCloseMatcher { get; }
 
-		private Func<string?, Expression> CreateConditionExpression { get; }
-
 		public ConditionalTag(ITemplateTag templateTag, RegexOptions options, Expression conditionExpression)
 			: base(templateTag, conditionExpression)
 		{
-			NameMatcher = new Regex(@$"^<(!)?{templateTag.TagName}->", options);
+			NameMatcher = new Regex($"^<(!)?{templateTag.TagName}->", options);
 			NameCloseMatcher = new Regex($"^<-{templateTag.TagName}>", options);
-			CreateConditionExpression = _ => conditionExpression;
-		}
-
-		public ConditionalTag(ITemplateTag templateTag, RegexOptions options, ParameterExpression parameter, Conditional<TClass> conditional)
-			: base(templateTag, Expression.Constant(false))
-		{
-			NameMatcher = new Regex(@$"^<(!)?{templateTag.TagName}(?:\s+?(.*?)\s*?)?->", options);
-			NameCloseMatcher = new Regex($"^<-{templateTag.TagName}>", options);
-
-			var target = conditional.Target is null ? null : Expression.Constant(conditional.Target);
-			CreateConditionExpression = condition
-				=> Expression.Call(
-					conditional.Target is null ? null : Expression.Constant(conditional.Target),
-					conditional.Method,
-					Expression.Constant(templateTag),
-					parameter,
-					Expression.Constant(condition));
 		}
 
 		public bool StartsWithClosing(string templateString, [NotNullWhen(true)] out string? exactName, [NotNullWhen(true)] out IClosingPropertyTag? propertyTag)
@@ -94,13 +64,6 @@ public class ConditionalTagCollection<TClass> : TagCollection
 			return false;
 		}
 
-		protected override Expression GetTagExpression(string exactName, string[] extraData)
-		{
-			if (extraData.Length is not (1 or 2) || extraData[0] is not ("!" or "") || extraData.Length == 2 && string.IsNullOrWhiteSpace(extraData[1]))
-				return Expression.Constant(false);
-
-			var getBool = extraData.Length == 2 ? CreateConditionExpression(extraData[1]) : CreateConditionExpression(null);
-			return extraData[0] == "!" ? Expression.Not(getBool) : getBool;
-		}
+		protected override Expression GetTagExpression(string exactName, string formatter) => formatter == "!" ? Expression.Not(ValueExpression) : ValueExpression;
 	}
 }

Source/FileManager/NamingTemplate/NamingTemplate.cs

@@ -30,7 +30,7 @@ public class NamingTemplate
 	/// Invoke the <see cref="NamingTemplate"/>
 	/// </summary>
 	/// <param name="propertyClasses">Instances of the TClass used in <see cref="PropertyTagCollection{TClass}"/> and <see cref="ConditionalTagCollection{TClass}"/></param>
-	public TemplatePart Evaluate(params object?[] propertyClasses)
+	public TemplatePart Evaluate(params object[] propertyClasses)
 	{
 		if (templateToString is null)
 			throw new InvalidOperationException();
@@ -38,8 +38,8 @@ public class NamingTemplate
 		// Match propertyClasses to the arguments required by templateToString.DynamicInvoke(). 
 		// First parameter is "this", so ignore it.
 		var delegateArgTypes = templateToString.Method.GetParameters().Skip(1);
-		
-		object?[] args = delegateArgTypes.Join(propertyClasses, o => o.ParameterType, i => i?.GetType(), (_, i) => i).ToArray();
+
+		object[] args = delegateArgTypes.Join(propertyClasses, o => o.ParameterType, i => i.GetType(), (_, i) => i).ToArray();
 		
 		if (args.Length != delegateArgTypes.Count())
 			throw new ArgumentException($"This instance of {nameof(NamingTemplate)} requires the following arguments: {string.Join(", ", delegateArgTypes.Select(t => t.Name).Distinct())}");

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

@@ -1,7 +1,6 @@
 using Dinah.Core;
 using System;
 using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using System.Linq.Expressions;
 using System.Text.RegularExpressions;
@@ -110,25 +109,6 @@ public class PropertyTagCollection<TClass> : TagCollection
 		catch { return null; }
 	}
 
-	/// <summary>
-	/// Try to get the default (unformatted) value of a property tag.
-	/// </summary>
-	/// <param name="tagName">Name of the tag value to get</param>
-	/// <param name="object">The property class from which the tag's value is read</param>
-	/// <param name="value"><paramref name="tagName"/>'s string value if it is in this collection, otherwise null</param>
-	/// <returns>True if the <paramref name="tagName"/> is in this collection, otherwise false</returns>
-	public bool TryGetValue(string tagName, TClass @object, [NotNullWhen(true)] out string? value)
-	{
-		value = null;
-
-		if (!StartsWith($"<{tagName}>", out var exactName, out var propertyTag, out var valueExpression))
-			return false;
-
-		var func = Expression.Lambda<Func<TClass, string>>(valueExpression, Parameter).Compile();
-		value = func(@object);
-		return true;
-	}
-
 	private class PropertyTag<TPropertyValue> : TagBase
 	{
 		public override Regex NameMatcher { get; }
@@ -158,13 +138,8 @@ public class PropertyTagCollection<TClass> : TagCollection
 						expVal);
 		}
 
-		protected override Expression GetTagExpression(string exactName, string[] extraData)
+		protected override Expression GetTagExpression(string exactName, string formatString)
 		{
-			if (extraData.Length is not (0 or 1))
-				return Expression.Constant(exactName);
-
-			string formatString = extraData.Length == 1 ? extraData[0] : "";
-
 			Expression toStringExpression
 				= !ReturnType.IsValueType
 				? Expression.Condition(

Source/FileManager/NamingTemplate/TagBase.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Diagnostics.CodeAnalysis;
-using System.Linq;
 using System.Linq.Expressions;
 using System.Text.RegularExpressions;
 
@@ -43,8 +42,8 @@ internal abstract class TagBase : IPropertyTag
 
 	/// <summary>Create an <see cref="Expression"/> that returns the property's value.</summary>
 	/// <param name="exactName">The exact string that was matched to <see cref="ITemplateTag"/></param>
-	/// <param name="extraData">Optional extra data parsed from the tag, such as a format string in the match the square brackets, logical negation, and conditional options</param>
-	protected abstract Expression GetTagExpression(string exactName, string[] extraData);
+	/// <param name="formatter">The optional format string in the match inside the square brackets</param>
+	protected abstract Expression GetTagExpression(string exactName, string formatter);
 
 	public bool StartsWith(string templateString, [NotNullWhen(true)] out string? exactName, [NotNullWhen(true)] out Expression? propertyValue)
 	{
@@ -52,7 +51,7 @@ internal abstract class TagBase : IPropertyTag
 		if (match.Success)
 		{
 			exactName = match.Value;
-			propertyValue = GetTagExpression(exactName, match.Groups.Values.Skip(1).Select(v => v.Value.Trim()).ToArray());
+			propertyValue = GetTagExpression(exactName, match.Groups.Count == 2 ? match.Groups[1].Value.Trim() : "");
 			return true;
 		}
 

Source/FileManager/NamingTemplate/TagCollection.cs

@@ -18,7 +18,7 @@ public abstract class TagCollection : IEnumerable<ITemplateTag>
 	/// <summary>The <see cref="ParameterExpression"/> of the <see cref="TagCollection"/>'s TClass type.</summary>
 	internal ParameterExpression Parameter { get; }
 	protected RegexOptions Options { get; } = RegexOptions.Compiled;
-	internal List<IPropertyTag> PropertyTags { get; } = new();
+	private List<IPropertyTag> PropertyTags { get; } = new();
 
 	protected TagCollection(Type classType, bool caseSensative = true)
 	{

Source/FileManager/ReplacementCharacters.cs

@@ -74,14 +74,12 @@ namespace FileManager
 		}
 		public override int GetHashCode() => Replacements.GetHashCode();
 
-		public static ReplacementCharacters Default(bool ntfs) => ntfs ? HiFi_NTFS : HiFi_Other;
-		public static ReplacementCharacters LoFiDefault(bool ntfs) => ntfs ? LoFi_NTFS : LoFi_Other;
-		public static ReplacementCharacters Barebones(bool ntfs) => ntfs ? BareBones_NTFS : BareBones_Other;
-
-		#region Defaults
-		private static readonly ReplacementCharacters HiFi_NTFS = new()
-		{
-			Replacements = [
+		public static readonly ReplacementCharacters Default
+			= IsWindows
+			? new()
+			{
+				Replacements = new Replacement[]
+				{
 					Replacement.OtherInvalid("_"),
 					Replacement.FilenameForwardSlash("∕"),
 					Replacement.FilenameBackSlash(""),
@@ -93,23 +91,28 @@ namespace FileManager
 					Replacement.Colon("_"),
 					Replacement.Asterisk("✱"),
 					Replacement.QuestionMark("？"),
-					Replacement.Pipe("⏐")]
-		};
-
-		private static readonly ReplacementCharacters HiFi_Other = new()
-		{
-			Replacements = [
+					Replacement.Pipe("⏐"),
+				}
+			}
+			: new()
+			{
+				Replacements = new Replacement[]
+				{
 					Replacement.OtherInvalid("_"),
 					Replacement.FilenameForwardSlash("∕"),
 					Replacement.FilenameBackSlash("\\"),
 					Replacement.OpenQuote("“"),
 					Replacement.CloseQuote("”"),
-					Replacement.OtherQuote("\"")]
-		};
+					Replacement.OtherQuote("\"")
+				}
+			};
 
-		private static readonly ReplacementCharacters LoFi_NTFS = new()
-		{
-			Replacements = [
+		public static readonly ReplacementCharacters LoFiDefault
+			= IsWindows
+			? new()
+			{
+				Replacements = new Replacement[]
+				{
 					Replacement.OtherInvalid("_"),
 					Replacement.FilenameForwardSlash("_"),
 					Replacement.FilenameBackSlash("_"),
@@ -118,54 +121,56 @@ namespace FileManager
 					Replacement.OtherQuote("'"),
 					Replacement.OpenAngleBracket("{"),
 					Replacement.CloseAngleBracket("}"),
-					Replacement.Colon("-")]
-		};
-
-		private static readonly ReplacementCharacters LoFi_Other = new()
-		{
-			Replacements = [
+					Replacement.Colon("-"),
+				}
+			}
+			: new ()
+			{
+				Replacements = new Replacement[]
+				{
 					Replacement.OtherInvalid("_"),
 					Replacement.FilenameForwardSlash("_"),
 					Replacement.FilenameBackSlash("\\"),
 					Replacement.OpenQuote("\""),
 					Replacement.CloseQuote("\""),
-					Replacement.OtherQuote("\"")]
-		};
+					Replacement.OtherQuote("\"")
+				}
+			};
 
-		private static readonly ReplacementCharacters BareBones_NTFS = new()
-		{
-			Replacements = [
+		public static readonly ReplacementCharacters Barebones
+			= IsWindows
+			? new ()
+			{
+				Replacements = new Replacement[]
+				{
 					Replacement.OtherInvalid("_"),
 					Replacement.FilenameForwardSlash("_"),
 					Replacement.FilenameBackSlash("_"),
 					Replacement.OpenQuote("_"),
 					Replacement.CloseQuote("_"),
-					Replacement.OtherQuote("_")]
-		};
-
-		private static readonly ReplacementCharacters BareBones_Other = new()
-		{
-			Replacements = [
+					Replacement.OtherQuote("_")
+				}
+			}
+			: new ()
+			{
+				Replacements = new Replacement[]
+				{
 					Replacement.OtherInvalid("_"),
 					Replacement.FilenameForwardSlash("_"),
 					Replacement.FilenameBackSlash("\\"),
 					Replacement.OpenQuote("\""),
 					Replacement.CloseQuote("\""),
-					Replacement.OtherQuote("\"")]
-		};
-		#endregion
-		/// <summary>
-		/// Characters to consider invalid in filenames in addition to those returned by <see cref="Path.GetInvalidFileNameChars()"/>
-		/// </summary>
-		public static char[] AdditionalInvalidFilenameCharacters { get; set; } = [];
+					Replacement.OtherQuote("\"")
+				}
+			};
 
-		internal static bool IsWindows => Environment.OSVersion.Platform is PlatformID.Win32NT;
+		private static bool IsWindows => Environment.OSVersion.Platform is PlatformID.Win32NT;
 
-		private static char[] invalidPathChars { get; } = Path.GetInvalidFileNameChars().Except(new[] {
+		private static readonly char[] invalidPathChars = Path.GetInvalidFileNameChars().Except(new[] {
 				Path.DirectorySeparatorChar, Path.AltDirectorySeparatorChar
 			}).ToArray();
 
-		private static char[] invalidSlashes { get; } = Path.GetInvalidFileNameChars().Intersect(new[] {
+		private static readonly char[] invalidSlashes = Path.GetInvalidFileNameChars().Intersect(new[] {
 				Path.DirectorySeparatorChar, Path.AltDirectorySeparatorChar
 			}).ToArray();
 
@@ -224,11 +229,8 @@ namespace FileManager
 			return DefaultReplacement;
 		}
 
-		private static bool CharIsPathInvalid(char c)
-			=> invalidPathChars.Contains(c) || AdditionalInvalidFilenameCharacters.Contains(c);
-
 		public static bool ContainsInvalidPathChar(string path)
-			=> path.Any(CharIsPathInvalid);
+			=> path.Any(c => invalidPathChars.Contains(c));
 		public static bool ContainsInvalidFilenameChar(string path)
 			=> ContainsInvalidPathChar(path) || path.Any(c => invalidSlashes.Contains(c));
 
@@ -240,7 +242,7 @@ namespace FileManager
 			{
 				var c = fileName[i];
 
-				if (CharIsPathInvalid(c)
+				if (invalidPathChars.Contains(c)
 					|| invalidSlashes.Contains(c)
 					|| Replacements.Any(r => r.CharacterToReplace == c) /* Replace any other legal characters that they user wants. */ )
 				{
@@ -265,14 +267,14 @@ namespace FileManager
 
 				if (
 					(
-						CharIsPathInvalid(c)
-						|| (    // Replace any other legal characters that they user wants.
+						invalidPathChars.Contains(c)
+						|| (	// Replace any other legal characters that they user wants.
 								c != Path.DirectorySeparatorChar
 								&& c != Path.AltDirectorySeparatorChar
 								&& Replacements.Any(r => r.CharacterToReplace == c)
 							)
 					)
-					&& !(   // replace all colons except drive letter designator on Windows
+					&& !(	// replace all colons except drive letter designator on Windows
 							c == ':'
 							&& i == 1
 							&& Path.IsPathRooted(pathStr)
@@ -280,9 +282,9 @@ namespace FileManager
 					)
 				)
 				{
-					char preceding = i > 0 ? pathStr[i - 1] : default;
-					char succeeding = i < pathStr.Length - 1 ? pathStr[i + 1] : default;
-					builder.Append(GetPathCharReplacement(c, preceding, succeeding));
+						char preceding = i > 0 ? pathStr[i - 1] : default;
+						char succeeding = i < pathStr.Length - 1 ? pathStr[i + 1] : default;
+						builder.Append(GetPathCharReplacement(c, preceding, succeeding));
 				}
 				else
 					builder.Append(c);
@@ -299,21 +301,23 @@ namespace FileManager
 
 		public override object ReadJson(JsonReader reader, Type objectType, object? existingValue, JsonSerializer serializer)
 		{
-			var defaults = ReplacementCharacters.Default(ReplacementCharacters.IsWindows).Replacements;
-
 			var jObj = JObject.Load(reader);
 			var replaceArr = jObj[nameof(Replacement)];
-			var dict = replaceArr?.ToObject<Replacement[]>()?.ToList() ?? defaults;
+			var dict
+				= replaceArr?.ToObject<Replacement[]>()?.ToList()
+				?? ReplacementCharacters.Default.Replacements;
+
 
 			//Ensure that the first 6 replacements are for the expected chars and that all replacement strings are valid.
 			//If not, reset to default.
+
 			for (int i = 0; i < Replacement.FIXED_COUNT; i++)
 			{
 				if (dict.Count < Replacement.FIXED_COUNT
-					|| dict[i].CharacterToReplace != defaults[i].CharacterToReplace
-					|| dict[i].Description != defaults[i].Description)
+					|| dict[i].CharacterToReplace != ReplacementCharacters.Barebones.Replacements[i].CharacterToReplace
+					|| dict[i].Description != ReplacementCharacters.Barebones.Replacements[i].Description)
 				{
-					dict = defaults;
+					dict = ReplacementCharacters.Default.Replacements;
 					break;
 				}
 

Source/HangoverAvalonia/App.axaml

@@ -6,30 +6,7 @@
         <local:ViewLocator/>
     </Application.DataTemplates>
 
-	<Application.Styles>
-		<FluentTheme>
-			<FluentTheme.Palettes>
-				<ColorPaletteResources x:Key="Light" />
-				<ColorPaletteResources x:Key="Dark" />
-			</FluentTheme.Palettes>
-		</FluentTheme>
-
-		<Style Selector="TextBox[IsReadOnly=true]">
-			<Setter Property="Background" Value="{DynamicResource SystemChromeDisabledHighColor}" />
-			<Setter Property="CaretBrush" Value="{DynamicResource SystemControlTransparentBrush}" />
-			<Style Selector="^ /template/ Border#PART_BorderElement">
-				<Setter Property="Background" Value="{DynamicResource SystemChromeDisabledHighColor}" />
-			</Style>
-		</Style>
-		<Style Selector="Button">
-			<Setter Property="VerticalContentAlignment" Value="Center"/>
-			<Style Selector="^">
-				<Setter Property="Foreground" Value="{DynamicResource SystemChromeAltLowColor}" />
-			</Style>
-		</Style>
-		<Style Selector="ScrollBar">
-			<!-- It's called AutoHide, but this is really the mouseover shrink/expand. -->
-			<Setter Property="AllowAutoHide" Value="false"/>
-		</Style>
-	</Application.Styles>
+    <Application.Styles>
+        <FluentTheme/>
+    </Application.Styles>
 </Application>

Source/HangoverAvalonia/Controls/CheckedListBox.axaml

@@ -4,16 +4,27 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
 			 mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
              x:Class="HangoverAvalonia.Controls.CheckedListBox">
+	
+	<UserControl.Resources>
+		<RecyclePool x:Key="RecyclePool" />
+		<DataTemplate x:Key="queuedBook">
+			<CheckBox HorizontalAlignment="Stretch" Margin="10,0,0,0" Content="{Binding Item}" IsChecked="{Binding IsChecked, Mode=TwoWay}" />
+		</DataTemplate>
+		<RecyclingElementFactory x:Key="elementFactory" RecyclePool="{StaticResource RecyclePool}">
+			<RecyclingElementFactory.Templates>
+				<StaticResource x:Key="queuedBook" ResourceKey="queuedBook" />
+			</RecyclingElementFactory.Templates>
+		</RecyclingElementFactory>
+	</UserControl.Resources>
 
 	<ScrollViewer
+		Name="scroller"
 		HorizontalScrollBarVisibility="Disabled"
 		VerticalScrollBarVisibility="Auto">
-		<ItemsControl ItemsSource="{Binding $parent[1].Items}">
-			<ItemsControl.ItemTemplate>
-				<DataTemplate>
-					<CheckBox HorizontalAlignment="Stretch" Margin="10,0,0,0" Content="{Binding Item}" IsChecked="{Binding IsChecked, Mode=TwoWay}" />
-				</DataTemplate>
-			</ItemsControl.ItemTemplate>
-		</ItemsControl>
+		<ItemsRepeater IsVisible="True"
+			VerticalCacheLength="1.2"
+			HorizontalCacheLength="1"
+			ItemsSource="{Binding CheckboxItems}"
+			ItemTemplate="{StaticResource elementFactory}" />
 	</ScrollViewer>
 </UserControl>

Source/HangoverAvalonia/Controls/CheckedListBox.axaml.cs

@@ -2,18 +2,103 @@ using Avalonia;
 using Avalonia.Collections;
 using Avalonia.Controls;
 using HangoverAvalonia.ViewModels;
+using ReactiveUI;
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
 
-namespace HangoverAvalonia.Controls;
-
-public partial class CheckedListBox : UserControl
+namespace HangoverAvalonia.Controls
 {
-	public static readonly StyledProperty<AvaloniaList<CheckBoxViewModel>> ItemsProperty =
-	AvaloniaProperty.Register<CheckedListBox, AvaloniaList<CheckBoxViewModel>>(nameof(Items));
-
-	public AvaloniaList<CheckBoxViewModel> Items { get => GetValue(ItemsProperty); set => SetValue(ItemsProperty, value); }
-
-	public CheckedListBox()
+	public partial class CheckedListBox : UserControl
 	{
-		InitializeComponent();
+		public event EventHandler<ItemCheckEventArgs> ItemCheck;
+
+		public static readonly StyledProperty<IEnumerable> ItemsProperty =
+		AvaloniaProperty.Register<CheckedListBox, IEnumerable>(nameof(Items));
+
+		public IEnumerable Items { get => GetValue(ItemsProperty); set => SetValue(ItemsProperty, value); }
+		private CheckedListBoxViewModel _viewModel = new();
+
+		public IEnumerable<object> CheckedItems =>
+			_viewModel
+			.CheckboxItems
+			.Where(i => i.IsChecked)
+			.Select(i => i.Item);
+
+		public void SetItemChecked(int i, bool isChecked) => _viewModel.CheckboxItems[i].IsChecked = isChecked;
+		public void SetItemChecked(object item, bool isChecked)
+		{
+			var obj = _viewModel.CheckboxItems.SingleOrDefault(i => i.Item == item);
+			if (obj is not null)
+				obj.IsChecked = isChecked;
+		}
+
+		public CheckedListBox()
+		{
+			InitializeComponent();
+			scroller.DataContext = _viewModel;
+			_viewModel.CheckedChanged += _viewModel_CheckedChanged;
+		}
+
+		private void _viewModel_CheckedChanged(object sender, CheckBoxViewModel e)
+		{
+			var args = new ItemCheckEventArgs { Item = e.Item, ItemIndex = _viewModel.CheckboxItems.IndexOf(e), IsChecked = e.IsChecked };
+			ItemCheck?.Invoke(this, args);
+		}
+
+		protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
+		{
+			if (change.Property.Name == nameof(Items) && Items != null)
+				_viewModel.SetItems(Items);
+			base.OnPropertyChanged(change);
+		}
+
+		public class CheckedListBoxViewModel : ViewModelBase
+		{
+			public event EventHandler<CheckBoxViewModel> CheckedChanged;
+			public AvaloniaList<CheckBoxViewModel> CheckboxItems { get; private set; }
+
+			public void SetItems(IEnumerable items)
+			{
+				UnsubscribeFromItems(CheckboxItems);
+				CheckboxItems = new(items.OfType<object>().Select(o => new CheckBoxViewModel { Item = o }));
+				SubscribeToItems(CheckboxItems);
+				this.RaisePropertyChanged(nameof(CheckboxItems));
+			}
+
+			private void SubscribeToItems(IEnumerable objects)
+			{
+				foreach (var i in objects.OfType<INotifyPropertyChanged>())
+					i.PropertyChanged += I_PropertyChanged;
+			}
+
+			private void UnsubscribeFromItems(AvaloniaList<CheckBoxViewModel> objects)
+			{
+				if (objects is null) return;
+
+				foreach (var i in objects)
+					i.PropertyChanged -= I_PropertyChanged;
+			}
+			private void I_PropertyChanged(object sender, PropertyChangedEventArgs e)
+			{
+				CheckedChanged?.Invoke(this, (CheckBoxViewModel)sender);
+			}
+		}
+		public class CheckBoxViewModel : ViewModelBase
+		{
+			private bool _isChecked;
+			public bool IsChecked { get => _isChecked; set => this.RaiseAndSetIfChanged(ref _isChecked, value); }
+			private object _bookText;
+			public object Item { get => _bookText; set => this.RaiseAndSetIfChanged(ref _bookText, value); }
+		}
+	}
+
+	public class ItemCheckEventArgs : EventArgs
+	{
+		public int ItemIndex { get; init; }
+		public bool IsChecked { get; init; }
+		public object Item { get; init; }
 	}
 }

Source/HangoverAvalonia/HangoverAvalonia.csproj

@@ -71,12 +71,13 @@
 	</ItemGroup>
 	<ItemGroup>
 
-		<PackageReference Include="Avalonia" Version="11.3.3" />
-		<PackageReference Include="Avalonia.Desktop" Version="11.3.3" />
+		<PackageReference Include="Avalonia" Version="11.2.4" />
+		<PackageReference Include="Avalonia.Desktop" Version="11.2.4" />
 		<!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
-		<PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.3.3" />
-		<PackageReference Include="Avalonia.ReactiveUI" Version="11.3.3" />
-		<PackageReference Include="Avalonia.Themes.Fluent" Version="11.3.3" />
+		<PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.2.4" />
+		<PackageReference Include="Avalonia.ReactiveUI" Version="11.2.4" />
+		<PackageReference Include="Avalonia.Controls.ItemsRepeater" Version="11.1.5" />
+		<PackageReference Include="Avalonia.Themes.Fluent" Version="11.2.4" />
 	</ItemGroup>
 	<ItemGroup>
 		<ProjectReference Include="..\HangoverBase\HangoverBase.csproj" />

Source/HangoverAvalonia/ViewModels/CheckBoxViewModel.cs

@@ -1,11 +0,0 @@
-using ReactiveUI;
-
-namespace HangoverAvalonia.ViewModels;
-
-public class CheckBoxViewModel : ViewModelBase
-{
-	private bool _isChecked;
-	public bool IsChecked { get => _isChecked; set => this.RaiseAndSetIfChanged(ref _isChecked, value); }
-	private object _bookText;
-	public object Item { get => _bookText; set => this.RaiseAndSetIfChanged(ref _bookText, value); }
-}

Source/HangoverAvalonia/ViewModels/MainVM.Deleted.cs

@@ -1,8 +1,41 @@
-namespace HangoverAvalonia.ViewModels;
+using ApplicationServices;
+using DataLayer;
+using ReactiveUI;
+using System.Collections.Generic;
 
-public partial class MainVM
+namespace HangoverAvalonia.ViewModels
 {
-	public TrashBinViewModel TrashBinViewModel { get; } = new();
+	public partial class MainVM
+	{
+		private List<LibraryBook> _deletedBooks;
+		public List<LibraryBook> DeletedBooks { get => _deletedBooks; set => this.RaiseAndSetIfChanged(ref _deletedBooks, value); }
+		public string CheckedCountText => $"Checked : {_checkedBooksCount} of {_totalBooksCount}";
 
-	private void Load_deletedVM() { }
+		private int _totalBooksCount = 0;
+		private int _checkedBooksCount = 0;
+		public int CheckedBooksCount
+		{
+			get => _checkedBooksCount;
+			set
+			{
+				if (_checkedBooksCount != value)
+				{
+					_checkedBooksCount = value;
+					this.RaisePropertyChanged(nameof(CheckedCountText));
+				}
+			}
+		}
+		private void Load_deletedVM()
+		{
+			reload();
+		}
+
+		public void reload()
+		{
+			DeletedBooks = DbContexts.GetContext().GetDeletedLibraryBooks();
+			_checkedBooksCount = 0;
+			_totalBooksCount = DeletedBooks.Count;
+			this.RaisePropertyChanged(nameof(CheckedCountText));
+		}
+	}
 }

Source/HangoverAvalonia/ViewModels/TrashBinViewModel.cs

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