.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,14 @@ 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. Logs are typically in your `[user]\Libation` folder. (For example, on windows: `C:\my_username\Libation`) Also within Libation, on the first tab in Settings you can click the button 'Open log folder'

.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,38 @@ 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 = @(
             "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.*"

.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

@@ -12,7 +12,6 @@
 - [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)
 
 
 

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/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. The external browser login option is not possible for Brazil. [See this ticket for more details.](https://github.com/rmcrackan/Libation/issues/1103)
 
 ## Q: How do I use Libation with a South Africa account?
 

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,23 +8,23 @@
 
 [![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
+  wget -O libation.rpm https://github.com/rmcrackan/Libation/releases/download/vX.X.X/Libation.X.X.X-linux-chardonnay.rpm &&
   sudo dnf5 install ./libation.rpm
   ```
 ---

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

@@ -46,12 +46,9 @@ These tags will be replaced in the template with the audiobook's values.
 |\<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)|
+|\<bitrate\>|File's original bitrate (Kbps)|[Number](#number-formatters)|
+|\<samplerate\>|File's original audio sample rate|[Number](#number-formatters)|
+|\<channels\>|Number of audio channels|[Number](#number-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)|
@@ -81,39 +78,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.
@@ -127,13 +102,13 @@ And this example will customize the title based on whether the book has a subtit
 ## 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|
+|\{N \| # \| ID\}|Formats the series using<br>the series part tags.<br>\{N\} = Series Name<br>\{#\} = Number order in series<br>\{ID\} = Audible Series ID<br><br>Default is \{N\}|`<first series>`<hr>`<first series[{N}]>`<hr>`<first series[{N}, {#}, {ID}]>`|Sherlock Holmes<hr>Sherlock Holmes<hr>Sherlock Holmes, 1, B08376S3R2|
 
 ## 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|
+|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>`<author[format({L}, {ID}) separator(; )]>`|Sherlock Holmes, 1; Some Other Series, 1<hr>herlock Holmes, B08376S3R2; Some Other Series, B000000000|
 |max(#)|Only use the first # of series<br><br>Default is all series|`<series[max(1)]>`|Sherlock Holmes|
 
 ## Name Formatters

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)
@@ -34,7 +33,6 @@
     - [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)
 

Source/AaxDecrypter/AaxDecrypter.csproj

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

Source/AaxDecrypter/AaxcDownloadConvertBase.cs

@@ -1,21 +1,19 @@
 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; }
+		public Mp4File 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,19 +25,18 @@ namespace AaxDecrypter
 
 		public override async Task CancelAsync()
 		{
-			await base.CancelAsync();
+			IsCanceled = true;
 			await (AaxConversion?.CancelAsync() ?? Task.CompletedTask);
+			FinalizeDownload();
 		}
 
 		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)
+			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 keyIds = DownloadOptions.DecryptionKeys.Select(k => new Guid(k.KeyPart1, bigEndian: true)).ToArray();
 
 				var dash = new DashFile(InputFileStream);
 				var kidIndex = Array.IndexOf(keyIds, dash.Tenc.DefaultKID);
@@ -47,38 +44,26 @@ namespace AaxDecrypter
 				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).");
+				DownloadOptions.DecryptionKeys[0] = DownloadOptions.DecryptionKeys[kidIndex];
+				var keyId = DownloadOptions.DecryptionKeys[kidIndex].KeyPart1;
+				var key = DownloadOptions.DecryptionKeys[kidIndex].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)}");
+				aax.SetDecryptionKey(DownloadOptions.DecryptionKeys[0].KeyPart1);
 				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)}");
+				aax.SetDecryptionKey(DownloadOptions.DecryptionKeys[0].KeyPart1, DownloadOptions.DecryptionKeys[0].KeyPart2);
 				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));
-			}
 		}
 
 		protected bool Step_GetMetadata()
@@ -126,15 +111,15 @@ 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());
 			}
 
+			OnInitialized();
 			OnRetrievedTitle(AaxFile.AppleTags.TitleSansUnabridged);
 			OnRetrievedAuthors(AaxFile.AppleTags.FirstAuthor);
 			OnRetrievedNarrators(AaxFile.AppleTags.Narrator);
 			OnRetrievedCoverArt(AaxFile.AppleTags.Cover);
-			OnInitialized();
 
 			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,17 +97,17 @@ 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),
@@ -117,32 +116,33 @@ That naming may not be desirable for everyone, but it's an easy change to instea
 
 			void newSplit(int currentChapter, ChapterInfo splitChapters, INewSplitCallback 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.FromCompleted(AaxFile);
 		}
 	}
 }

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; }
+		protected string OutputFileName { get; }
 		public IDownloadOptions DownloadOptions { get; }
-		protected NetworkFileStream InputFileStream => NfsPersister.NetworkFileStream;
+		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)
+		protected AudiobookDownloadBase(string outFileName, string cacheDirectory, IDownloadOptions dlOptions)
 		{
-			OutputDirectory = ArgumentValidator.EnsureNotNullOrWhiteSpace(outDirectory, nameof(outDirectory));
-			DownloadOptions = ArgumentValidator.EnsureNotNull(dlOptions, nameof(dlOptions));
-			DownloadOptions.DownloadSpeedChanged += (_, speed) => InputFileStream.SpeedLimit = speed;
+			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,24 @@ 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();
+				nfsPersister.Dispose();
 
 			await progressTask;
 
 			var speedup = DownloadOptions.RuntimeLength / elapsed;
 			Serilog.Log.Information($"Speedup is {speedup:F0}x realtime.");
 
-			NfsPersister.Dispose();
+			nfsPersister.Dispose();
 			return success;
 
 			async Task reportProgress()
@@ -121,52 +120,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 +176,58 @@ namespace AaxDecrypter
 			return !IsCanceled;
 		}
 
+		private async Task<bool> CleanupAsync()
+		{
+			if (IsCanceled) return false;
+
+			FileUtility.SaferDelete(jsonDownloadState);
+
+			if (DownloadOptions.DecryptionKeys != null &&
+				DownloadOptions.RetainEncryptedFile &&
+				DownloadOptions.InputType is AAXClean.FileType fileType)
+			{
+				//Write aax decryption key
+				string keyPath = Path.ChangeExtension(tempFilePath, ".key");
+				FileUtility.SaferDelete(keyPath);
+				string aaxPath;
+
+				if (fileType is AAXClean.FileType.Aax)
+				{
+					await File.WriteAllTextAsync(keyPath, $"ActivationBytes={Convert.ToHexString(DownloadOptions.DecryptionKeys[0].KeyPart1)}");
+					aaxPath = Path.ChangeExtension(tempFilePath, ".aax");
+				}
+				else if (fileType is AAXClean.FileType.Aaxc)
+				{
+					await File.WriteAllTextAsync(keyPath,
+						$"Key={Convert.ToHexString(DownloadOptions.DecryptionKeys[0].KeyPart1)}{Environment.NewLine}" +
+						$"IV={Convert.ToHexString(DownloadOptions.DecryptionKeys[0].KeyPart2)}");
+					aaxPath = Path.ChangeExtension(tempFilePath, ".aaxc");
+				}
+				else if (fileType is AAXClean.FileType.Dash)
+				{
+					await File.WriteAllTextAsync(keyPath,
+						$"KeyId={Convert.ToHexString(DownloadOptions.DecryptionKeys[0].KeyPart1)}{Environment.NewLine}" +
+						$"Key={Convert.ToHexString(DownloadOptions.DecryptionKeys[0].KeyPart2)}");
+					aaxPath = Path.ChangeExtension(tempFilePath, ".dash");
+				}
+				else
+					throw new InvalidOperationException($"Unknown file type: {fileType}");
+
+				if (tempFilePath != aaxPath)
+					FileUtility.SaferMove(tempFilePath, aaxPath);
+
+				OnFileCreated(aaxPath);
+				OnFileCreated(keyPath);
+			}
+			else
+				FileUtility.SaferDelete(tempFilePath);
+
+			return !IsCanceled;
+		}
+
 		private NetworkFileStreamPersister OpenNetworkFileStream()
 		{
-			NetworkFileStreamPersister? nfsp = default;
+			NetworkFileStreamPersister nfsp = default;
 			try
 			{
 				if (!File.Exists(jsonDownloadState))
@@ -197,15 +247,9 @@ namespace AaxDecrypter
 				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));
-				}
 			}
 
 			NetworkFileStreamPersister newNetworkFilePersister()

Source/AaxDecrypter/IDownloadOptions.cs

@@ -1,5 +1,6 @@
 using AAXClean;
 using System;
+using System.Threading.Tasks;
 
 #nullable enable
 namespace AaxDecrypter
@@ -32,8 +33,11 @@ namespace AaxDecrypter
 		KeyData[]? DecryptionKeys { 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; }
@@ -43,12 +47,14 @@ namespace AaxDecrypter
 		string? Publisher { get; }
 		string? Language { get; }
 		string? SeriesName { get; }
-		string? SeriesNumber { 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);
+        Task<string> SaveClipsAndBookmarksAsync(string fileName);
         public FileType? InputType { get; }
     }
 }

Source/AaxDecrypter/NetworkFileStream.cs

@@ -100,12 +100,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);

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.4.4.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.ZipFile" Version="3.1.1" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\ApplicationServices\ApplicationServices.csproj" />

Source/AppScaffolding/LibationScaffolding.cs

@@ -115,22 +115,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 +129,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 +147,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}" }
 								}
 							}
 						}
@@ -302,24 +290,33 @@ namespace AppScaffolding
 		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 +330,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 +356,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)));
 		}
 	}
 

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.3" />
   </ItemGroup>
 
   <ItemGroup>

Source/ApplicationServices/LibraryCommands.cs

@@ -521,8 +521,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);

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
 {
@@ -115,29 +115,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,16 +135,16 @@ 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(),
+				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(),
@@ -174,13 +152,8 @@ namespace ApplicationServices
 				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
+                IsFinished = a.Book.UserDefinedItem.IsFinished
             }).ToList();
-
-		private static float? ZeroIsNull(this float value) => value is 0 ? null : value;
 	}
 	public static class LibraryExporter
 	{
@@ -189,6 +162,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 +174,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);
 		}
 
@@ -253,13 +227,7 @@ namespace ApplicationServices
                 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 +248,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 +269,56 @@ namespace ApplicationServices
 				row.CreateCell(col++).SetCellValue(dto.HasPdf);
 				row.CreateCell(col++).SetCellValue(dto.SeriesNames);
 				row.CreateCell(col++).SetCellValue(dto.SeriesOrder);
-				row.CreateCell(col++).SetCellValue(dto.CommunityRatingOverall);
-				row.CreateCell(col++).SetCellValue(dto.CommunityRatingPerformance);
-				row.CreateCell(col++).SetCellValue(dto.CommunityRatingStory);
+
+				col = createCell(row, col, dto.CommunityRatingOverall);
+				col = createCell(row, col, dto.CommunityRatingPerformance);
+				col = createCell(row, col, dto.CommunityRatingStory);
+
 				row.CreateCell(col++).SetCellValue(dto.PictureId);
 				row.CreateCell(col++).SetCellValue(dto.IsAbridged);
-				row.CreateCell(col++).SetCellValue(dto.DatePublished).CellStyle = dateStyle;
+
+				var datePubCell = row.CreateCell(col++);
+				datePubCell.CellStyle = dateStyle;
+				if (dto.DatePublished.HasValue)
+					datePubCell.SetCellValue(dto.DatePublished.Value);
+				else
+					datePubCell.SetCellValue("");
+
 				row.CreateCell(col++).SetCellValue(dto.CategoriesNames);
-				row.CreateCell(col++).SetCellValue(dto.MyRatingOverall);
-				row.CreateCell(col++).SetCellValue(dto.MyRatingPerformance);
-				row.CreateCell(col++).SetCellValue(dto.MyRatingStory);
+
+				col = createCell(row, col, dto.MyRatingOverall);
+				col = createCell(row, col, dto.MyRatingPerformance);
+				col = createCell(row, col, dto.MyRatingStory);
+
 				row.CreateCell(col++).SetCellValue(dto.MyLibationTags);
 				row.CreateCell(col++).SetCellValue(dto.BookStatus);
 				row.CreateCell(col++).SetCellValue(dto.PdfStatus);
 				row.CreateCell(col++).SetCellValue(dto.ContentType);
                 row.CreateCell(col++).SetCellValue(dto.Language);
-				row.CreateCell(col++).SetCellValue(dto.LastDownloaded).CellStyle = dateStyle;
-				row.CreateCell(col++).SetCellValue(dto.LastDownloadedVersion);
-				row.CreateCell(col++).SetCellValue(dto.IsFinished);
-				row.CreateCell(col++).SetCellValue(dto.IsSpatial);
-				row.CreateCell(col++).SetCellValue(dto.LastDownloadedFileVersion);
-				row.CreateCell(col++).SetCellValue(dto.CodecString);
-				row.CreateCell(col++).SetCellValue(dto.SampleRate);
-				row.CreateCell(col++).SetCellValue(dto.ChannelCount);
-				row.CreateCell(col++).SetCellValue(dto.BitRate);
+
+				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/AudibleUtilities/AudibleUtilities.csproj

@@ -5,8 +5,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="AudibleApi" Version="9.4.5.1" />
-    <PackageReference Include="Google.Protobuf" Version="3.32.0" />
+    <PackageReference Include="AudibleApi" Version="9.4.1.1" />
+    <PackageReference Include="Google.Protobuf" Version="3.30.2" />
   </ItemGroup>
 
   <ItemGroup>

Source/AudibleUtilities/Widevine/Device.cs

@@ -1,6 +1,5 @@
 using System;
 using System.IO;
-using System.Numerics;
 using System.Security.Cryptography;
 
 #nullable enable
@@ -57,99 +56,18 @@ internal class Device
 
 	public byte[] SignMessage(byte[] message)
 	{
-		var digestion = SHA1.HashData(message);
-		return PssSha1Signer.SignHash(CdmKey, digestion);
+		using var sha1 = SHA1.Create();
+		var digestion = sha1.ComputeHash(message);
+		return CdmKey.SignHash(digestion, HashAlgorithmName.SHA1, RSASignaturePadding.Pss);
 	}
 
 	public bool VerifyMessage(byte[] message, byte[] signature)
 	{
-		var digestion = SHA1.HashData(message);
+		using var sha1 = SHA1.Create();
+		var digestion = sha1.ComputeHash(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/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,6 +13,7 @@ namespace DataLayer.Configurations
 
             entity.OwnsOne(b => b.Rating);
 
+            entity.Property(nameof(Book._audioFormat));
             //
             // CRUCIAL: ignore unmapped collections, even get-only
             //
@@ -49,11 +50,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.1.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.4">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="9.0.8" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="9.0.8">
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="9.0.4" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="9.0.4">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

Source/DataLayer/EfClasses/Book.cs

@@ -43,13 +43,18 @@ namespace DataLayer
         public ContentType ContentType { get; private set; }
         public string Locale { get; private set; }
 
+		//This field is now unused, however, there is little sense in adding a
+		//database migration to remove an unused field. Leave it for compatibility.
+#pragma warning disable CS0649 // Field 'Book._audioFormat' is never assigned to, and will always have its default value 0
+		internal long _audioFormat;
+#pragma warning restore CS0649
+
         // 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 +242,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/UserDefinedItem.cs

@@ -24,47 +24,19 @@ 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 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;

Source/DataLayer/LibationContextFactory.cs

@@ -1,6 +1,5 @@
 using Dinah.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Diagnostics;
 
 namespace DataLayer
 {
@@ -8,7 +7,6 @@ namespace DataLayer
     {
         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));
+            => optionsBuilder.UseSqlite(connectionString, ob => ob.UseQuerySplittingBehavior(QuerySplittingBehavior.SplitQuery));
     }
 }

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/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.
@@ -25,13 +24,13 @@ namespace DataLayer
 				.Where(c => !c.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);
@@ -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());
+            => 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());
 
@@ -164,9 +166,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/FileLiberator/AudioFileStorageExt.cs

@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using AaxDecrypter;
 using DataLayer;
 using LibationFileManager;
 using LibationFileManager.Templates;
@@ -35,17 +34,30 @@ 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 _, LibraryBookDto libraryBook, string extension)
+			=> Templates.File.GetFilename(libraryBook, 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 does not exist
+		/// </summary>
+		public static string GetBooksDirectoryFilename(this AudioFileStorage _, LibraryBookDto dto, string extension)
+			=> Templates.File.GetFilename(dto, 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,29 +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);
+					var m4bBook = await Task.Run(() => new Mp4File(m4bPath, FileAccess.Read));
 
 					//AAXClean.Codecs only supports decoding AAC and E-AC-3 audio.
 					if (m4bBook.AudioSampleEntry.Esds is null && m4bBook.AudioSampleEntry.Dec3 is null)
@@ -88,85 +69,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;
+						Mp4Operation.ConversionProgressUpdate += M4bBook_ConversionProgressUpdate;
 						await Mp4Operation;
+
+						if (Mp4Operation.IsCanceled)
+						{
+							FileUtility.SaferDelete(mp3File.Name);
+							return new StatusHandler { "Cancelled" };
 						}
-
-						if (cancellationToken.IsCancellationRequested)
-							FileUtility.SaferDelete(tempPath);
-
-						cancellationToken.ThrowIfCancellationRequested();
-
+						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);
 						}
-					finally
-					{
-						if (Mp4Operation is not null)
-							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);
-					}
-				}
-				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
+					{
+						if (Mp4Operation is not null)
+							Mp4Operation.ConversionProgressUpdate -= M4bBook_ConversionProgressUpdate;
+
+						m4bBook.InputStream.Close();
+						mp3File.Close();
+					}
+				}
 			}
 			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,143 +1,141 @@
-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;
+        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 Task CancelAsync() => abDownloader?.CancelAsync() ?? Task.CompletedTask;
 
         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);
+            }
+
             OnBegin(libraryBook);
-			cancellationTokenSource = new CancellationTokenSource();
-			var cancellationToken = cancellationTokenSource.Token;
 
             try
             {
                 if (libraryBook.Book.Audio_Exists())
                     return new StatusHandler { "Cannot find decrypt. Final audio file already exists" };
 
-				DownloadValidation(libraryBook);
-
+                downloadValidation(libraryBook);
 				var api = await libraryBook.GetApiAsync();
-				using var downloadOptions = await DownloadOptions.InitiateDownloadAsync(api, Configuration.Instance, libraryBook, cancellationToken);
-				var result = await DownloadAudiobookAsync(api, downloadOptions, cancellationToken);
+                var config = Configuration.Instance;
+				using var downloadOptions = await DownloadOptions.InitiateDownloadAsync(api, config, libraryBook);
 
-				if (!result.Success || getFirstAudioFile(result.ResultFiles) is not TempFile audioFile)
+                bool success = false;
+                try
                 {
-					// 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" };
+                    FilePathCache.Inserted += FilePathCache_Inserted;
+                    FilePathCache.Removed += FilePathCache_Removed;
+
+                    success = await downloadAudiobookAsync(api, config, downloadOptions);
+                }
+                finally
+                {
+                    FilePathCache.Inserted -= FilePathCache_Inserted;
+                    FilePathCache.Removed -= FilePathCache_Removed;
                 }
 
-				if (Configuration.Instance.RetainAaxFile)
+                // decrypt failed
+                if (!success || getFirstAudioFile(entries) == default)
                 {
-					//Add the cached aaxc and key files to the entries list to be moved to the Books directory.
-					result.ResultFiles.AddRange(getAaxcFiles(result.CacheFiles));
-				}
+                    await Task.WhenAll(
+                        entries
+                        .Where(f => f.FileType != FileType.AAXC)
+                        .Select(f => Task.Run(() => FileUtility.SaferDelete(f.Path))));
 
-				//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);
+                    return
+                        abDownloader?.IsCanceled is true
+                        ? new StatusHandler { "Cancelled" }
+                        : new StatusHandler { "Decrypt failed" };
+                }
 
                 var finalStorageDir = getDestinationDirectory(libraryBook);
 
-				//post-download tasks done in parallel.
-				var moveFilesTask = Task.Run(() => MoveFilesToBooksDir(libraryBook, finalStorageDir, result.ResultFiles, cancellationToken));
+                var moveFilesTask = Task.Run(() => moveFilesToBooksDir(libraryBook, entries));
                 Task[] finalTasks =
                 [
+                    Task.Run(() => downloadCoverArt(downloadOptions)),
                     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))
+                    Task.Run(() => WindowsDirectory.SetCoverAsFolderIcon(libraryBook.Book.PictureId, finalStorageDir))
                 ];
 
 				try
                 {
                     await Task.WhenAll(finalTasks);
                 }
-				catch when (!moveFilesTask.IsFaulted)
+                catch
                 {
-					//Swallow DownloadCoverArt, DownloadRecordsAsync, DownloadMetadataAsync, and SetCoverAsFolderIcon exceptions.
+					//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 && !cancellationToken.IsCancellationRequested)
+                    if (moveFilesTask.IsCompletedSuccessfully)
                     {
-						libraryBook.UpdateBookStatus(LiberatedStatus.Liberated, Configuration.LibationVersion, audioFormat, audioVersion);
+                        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;
             }
         }
 
-		private record AudiobookDecryptResult(bool Success, List<TempFile> ResultFiles, List<TempFile> CacheFiles);
-
-		private async Task<AudiobookDecryptResult> DownloadAudiobookAsync(AudibleApi.Api api, DownloadOptions dlOptions, CancellationToken cancellationToken)
+        private async Task<bool> downloadAudiobookAsync(AudibleApi.Api api, Configuration config, DownloadOptions dlOptions)
         {
-			var outpoutDir = AudibleFileStorage.DecryptInProgressDirectory;
+			var outFileName = AudibleFileStorage.Audio.GetInProgressFilename(dlOptions.LibraryBookDto, dlOptions.OutputFormat.ToString().ToLower());
             var cacheDir = AudibleFileStorage.DownloadsInProgressDirectory;
-			var result = new AudiobookDecryptResult(false, [], []);
 
-			try
-			{
             if (dlOptions.DrmType is not DrmType.Adrm and not DrmType.Widevine)
-					abDownloader = new UnencryptedAudiobookDownloader(outpoutDir, cacheDir, dlOptions);
+                abDownloader = new UnencryptedAudiobookDownloader(outFileName, cacheDir, dlOptions);
             else
             {
                 AaxcDownloadConvertBase converter
-						= dlOptions.Config.SplitFilesByChapter && dlOptions.ChapterInfo.Count > 1 ?
-						new AaxcDownloadMultiConverter(outpoutDir, cacheDir, dlOptions) :
-						new AaxcDownloadSingleConverter(outpoutDir, cacheDir, dlOptions);
+                    = config.SplitFilesByChapter ?
+                    new AaxcDownloadMultiConverter(outFileName, cacheDir, dlOptions) :
+                    new AaxcDownloadSingleConverter(outFileName, cacheDir, dlOptions);
 
-					if (dlOptions.Config.AllowLibationFixup)
+                if (config.AllowLibationFixup)
                     converter.RetrievedMetadata += Converter_RetrievedMetadata;
 
                 abDownloader = converter;
@@ -149,48 +147,28 @@ namespace FileLiberator
             abDownloader.RetrievedAuthors += OnAuthorsDiscovered;
             abDownloader.RetrievedNarrators += OnNarratorsDiscovered;
             abDownloader.RetrievedCoverArt += AaxcDownloader_RetrievedCoverArt;
-				abDownloader.TempFileCreated += AbDownloader_TempFileCreated;
+            abDownloader.FileCreated += (_, path) => OnFileCreated(dlOptions.LibraryBook, path);
 
             // REAL WORK DONE HERE
-				bool success = await abDownloader.RunAsync();
-				return result with { Success = success };
-			}
-			catch (Exception ex)
+            var success = await abDownloader.RunAsync();
+
+			if (success && config.SaveMetadataToFile)
             {
-				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;
+                var metadataFile = LibationFileManager.Templates.Templates.File.GetFilename(dlOptions.LibraryBookDto, Path.GetDirectoryName(outFileName), ".metadata.json");
+
+                var item = await api.GetCatalogProductAsync(dlOptions.LibraryBook.Book.AudibleProductId, AudibleApi.CatalogOptions.ResponseGroupOptions.ALL_OPTIONS);
+				item.SourceJson.Add(nameof(ContentMetadata.ChapterInfo), Newtonsoft.Json.Linq.JObject.FromObject(dlOptions.ContentMetadata.ChapterInfo));
+				item.SourceJson.Add(nameof(ContentMetadata.ContentReference), Newtonsoft.Json.Linq.JObject.FromObject(dlOptions.ContentMetadata.ContentReference));
+
+                File.WriteAllText(metadataFile, item.SourceJson.ToString());
+                OnFileCreated(dlOptions.LibraryBook, metadataFile);
             }
-			finally
-			{
-				OnStreamingProgressChanged(new() { ProgressPercentage = 100 });
+			return success;
 		}
 
-			void AbDownloader_TempFileCreated(object? sender, TempFile e)
+		private void Converter_RetrievedMetadata(object sender, AAXClean.AppleTags tags)
 		{
-				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);
-				}
-			}
-		}
-
-		#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)
+            if (sender is not AaxcDownloadConvertBase converter || converter.DownloadOptions is not DownloadOptions options)
 				return;
 
 			#region Prevent erroneous truncation due to incorrect chapter info
@@ -201,13 +179,14 @@ namespace FileLiberator
 			//the chapter. This is never desirable, so pad the last chapter to match
 			//the original audio length.
 
-			var fileDuration = aaxFile.Duration;
+			var fileDuration = converter.AaxFile.Duration;
             if (options.Config.StripAudibleBrandAudio)
                 fileDuration -= TimeSpan.FromMilliseconds(options.ContentMetadata.ChapterInfo.BrandOutroDurationMs);
 
             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 chapters = options.ChapterInfo.Chapters as List<AAXClean.Chapter>;
 			var lastChapter = chapters[^1];
 
 			chapters.Remove(lastChapter);
@@ -235,29 +214,7 @@ namespace FileLiberator
             }
         }
 
-		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.");
-				}
-			}
-
-			if (e is not null)
-				OnCoverImageDiscovered(e);
-		}
-		#endregion
-
-		#region Validation
-
-		private static void DownloadValidation(LibraryBook libraryBook)
+        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.";
@@ -273,226 +230,66 @@ namespace FileLiberator
             };
 
             if (string.IsNullOrWhiteSpace(libraryBook.Account))
-				throw new InvalidOperationException(errorString("Account"));
+                throw new Exception(errorString("Account"));
 
             if (string.IsNullOrWhiteSpace(libraryBook.Book.Locale))
-				throw new InvalidOperationException(errorString("Locale"));
+                throw new Exception(errorString("Locale"));
         }
-		#endregion
 
-		#region Post-success routines
-		/// <summary>Read the audio format from the audio file's metadata.</summary>
-		public AudioFormat GetFileFormatInfo(DownloadOptions options, TempFile firstAudioFile)
+        private void AaxcDownloader_RetrievedCoverArt(object _, byte[] e)
+        {
+            if (Configuration.Instance.AllowLibationFixup)
             {
                 try
                 {
-				return firstAudioFile.Extension.ToLowerInvariant() switch
-				{
-					".m4b" or ".m4a" or ".mp4" => GetMp4AudioFormat(),
-					".mp3" => AudioFormatDecoder.FromMpeg3(firstAudioFile.FilePath),
-					_ => AudioFormat.Default
-				};
+                    e = OnRequestCoverArt();
+                    abDownloader.SetCoverArt(e);
                 }
                 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;
+                    Serilog.Log.Logger.Error(ex, "Failed to retrieve cover art from server.");
+                }
             }
             
-			AudioFormat GetMp4AudioFormat()
-				=> abDownloader is AaxcDownloadConvertBase converter && converter.AaxFile is AAXClean.Mp4File mp4File
-				? AudioFormatDecoder.FromMpeg4(mp4File)
-				: AudioFormatDecoder.FromMpeg4(firstAudioFile.FilePath);
+            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)
+        private static void moveFilesToBooksDir(LibraryBook libraryBook, List<FilePathCache.CacheEntry> entries)
         {
-			cancellationToken.ThrowIfCancellationRequested();
-			AverageSpeed averageSpeed = new();
-
-			var totalSizeToMove = entries.Sum(f => new FileInfo(f.FilePath).Length);
-			long totalBytesMoved = 0;
+            // 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 destFileName
-					= AudibleFileStorage.Audio.GetCustomDirFilename(
-						libraryBook,
-						destinationDir,
-						entry.Extension,
-						entry.PartProperties,
-						Configuration.Instance.OverwriteExisting);
-
                 var realDest
                     = FileUtility.SaferMoveToValidPath(
-						entry.FilePath,
-						destFileName,
+                        entry.Path,
+                        Path.Combine(destinationDir, Path.GetFileName(entry.Path)),
                         Configuration.Instance.ReplacementCharacters,
-						entry.Extension,
-						Configuration.Instance.OverwriteExisting);
-
-				#region File Move Progress
-				totalBytesMoved += new FileInfo(realDest).Length;
-				averageSpeed.AddPosition(totalBytesMoved);
-				var estSecsRemaining = (totalSizeToMove - totalBytesMoved) / averageSpeed.Average;
-
-				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 };
+                        overwrite: Configuration.Instance.OverwriteExisting);
 
                 SetFileTime(libraryBook, realDest);
-				OnFileCreated(libraryBook, realDest);
-				cancellationToken.ThrowIfCancellationRequested();
+				FilePathCache.Insert(libraryBook.Book.AudibleProductId, realDest);
+
+                // 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 (entries.FirstOrDefault(f => getFileType(f) is FileType.Cue) is TempFile cue
-				&& getFirstAudioFile(entries)?.FilePath is LongPath audioFilePath)
+			var cue = entries.FirstOrDefault(f => f.FileType == FileType.Cue);
+            if (cue != default)
             {
-				Cue.UpdateFileName(cue.FilePath, audioFilePath);
-				SetFileTime(libraryBook, cue.FilePath);
+                Cue.UpdateFileName(cue.Path, getFirstAudioFile(entries).Path);
+				SetFileTime(libraryBook, cue.Path);
 			}
 
-			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)
         {
 			var destinationDir = AudibleFileStorage.Audio.GetDestinationDirectory(libraryBook);
@@ -501,12 +298,36 @@ namespace FileLiberator
             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(DownloadOptions options)
+        {
+			if (!Configuration.Instance.DownloadCoverArt) return;
+
+            var coverPath = "[null]";
+
+            try
+            {
+                var destinationDir = getDestinationDirectory(options.LibraryBook);
+                coverPath = AudibleFileStorage.Audio.GetBooksDirectoryFilename(options.LibraryBookDto, ".jpg");
+                coverPath = Path.Combine(destinationDir, Path.GetFileName(coverPath));
+
+                if (File.Exists(coverPath))
+                    FileUtility.SaferDelete(coverPath);
+
+                var picBytes = PictureStorage.GetPictureSynchronously(new(options.LibraryBook.Book.PictureLarge ?? options.LibraryBook.Book.PictureId, PictureSize.Native));
+                if (picBytes.Length > 0)
+                {
+                    File.WriteAllBytes(coverPath, picBytes);
+                    SetFileTime(options.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 {options.LibraryBook.Book.AudibleProductId} to {coverPath} catalog product.");
+            }
+        }
     }
 }

Source/FileLiberator/DownloadOptions.Factory.cs

@@ -10,7 +10,7 @@ using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Net.Http;
-using System.Threading;
+using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 
 #nullable enable
@@ -18,13 +18,15 @@ namespace FileLiberator;
 
 public partial class DownloadOptions
 {
+	private const string Ec3Codec = "ec+3";
+	private const string Ac4Codec = "ac-4";
+
 	/// <summary>
 	/// Initiate an audiobook download from the audible api.
 	/// </summary>
-	public static async Task<DownloadOptions> InitiateDownloadAsync(Api api, Configuration config, LibraryBook libraryBook, CancellationToken token)
+	public static async Task<DownloadOptions> InitiateDownloadAsync(Api api, Configuration config, LibraryBook libraryBook)
 	{
-		var license = await ChooseContent(api, libraryBook, config, token);
-		token.ThrowIfCancellationRequested();
+		var license = await ChooseContent(api, libraryBook, config);
 
 		//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
@@ -34,8 +36,9 @@ public partial class DownloadOptions
 		if (metadata.ChapterInfo.RuntimeLengthMs == license.ContentMetadata.ChapterInfo.RuntimeLengthMs)
 			license.ContentMetadata.ChapterInfo = metadata.ChapterInfo;
 
-		token.ThrowIfCancellationRequested();
-		return BuildDownloadOptions(libraryBook, config, license);
+		var options = BuildDownloadOptions(libraryBook, config, license);
+
+		return options;
 	}
 
 	private class LicenseInfo
@@ -54,24 +57,20 @@ public partial class DownloadOptions
 			=> voucher is null ? null : [new KeyData(voucher.Key, voucher.Iv)];
 	}
 
-	private static async Task<LicenseInfo> ChooseContent(Api api, LibraryBook libraryBook, Configuration config, CancellationToken token)
+	private static async Task<LicenseInfo> ChooseContent(Api api, LibraryBook libraryBook, Configuration config)
 	{
 		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;
+			//try to request a widevine content license using the user's spatial audio settings
+			var codecChoice = config.SpatialAudioCodec is Configuration.SpatialCodec.AC_4 ? Ac4Codec : Ec3Codec;
 
 			var contentLic
 				= await api.GetDownloadLicenseAsync(
@@ -80,15 +79,14 @@ public partial class DownloadOptions
 					ChapterTitlesType.Tree,
 					DrmType.Widevine,
 					config.RequestSpatial,
-					aacCodecChoice,
-					spatialCodecChoice);
+					codecChoice);
 
 			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));
+			using var mpdResponse = await client.GetAsync(contentLic.LicenseResponse);
+			var dash = new MpegDash(mpdResponse.Content.ReadAsStream());
 
 			if (!dash.TryGetUri(new Uri(contentLic.LicenseResponse), out var contentUri))
 				throw new InvalidDataException("Failed to get mpeg-dash content download url.");
@@ -111,6 +109,7 @@ public partial class DownloadOptions
 		}
 	}
 
+
 	private static DownloadOptions BuildDownloadOptions(LibraryBook libraryBook, Configuration config, LicenseInfo licInfo)
 	{
 		long chapterStartMs
@@ -124,6 +123,13 @@ public partial class DownloadOptions
 			RuntimeLength = TimeSpan.FromMilliseconds(licInfo.ContentMetadata.ChapterInfo.RuntimeLengthMs),
 		};
 
+		if (TryGetAudioInfo(licInfo.ContentMetadata.ContentUrl, out int? bitrate, out int? sampleRate, out int? channels))
+		{
+			dlOptions.LibraryBookDto.BitRate = bitrate;
+			dlOptions.LibraryBookDto.SampleRate = sampleRate;
+			dlOptions.LibraryBookDto.Channels = channels;
+		}
+
 		var titleConcat = config.CombineNestedChapterTitles ? ": " : null;
 		var chapters
 			= flattenChapters(licInfo.ContentMetadata.ChapterInfo.Chapters, titleConcat)
@@ -150,6 +156,43 @@ public partial class DownloadOptions
 		return dlOptions;
 	}
 
+	/// <summary>
+	/// The most reliable way to get these audio file properties is from the filename itself.
+	/// Using AAXClean to read the metadata works well for everything except AC-4 bitrate.
+	/// </summary>
+	private static bool TryGetAudioInfo(ContentUrl? contentUrl, out int? bitrate, out int? sampleRate, out int? channels)
+	{
+		bitrate = sampleRate = channels = null;
+
+		if (contentUrl?.OfflineUrl is not string url || !Uri.TryCreate(url, default, out var uri))
+			return false;
+
+		var file = Path.GetFileName(uri.LocalPath);
+
+		var match = AdrmAudioProperties().Match(file);
+		if (match.Success)
+		{
+			bitrate = int.Parse(match.Groups[1].Value);
+			sampleRate = int.Parse(match.Groups[2].Value);
+			channels = int.Parse(match.Groups[3].Value);
+			return true;
+		}
+		else if ((match = WidevineAudioProperties().Match(file)).Success)
+		{
+			bitrate = int.Parse(match.Groups[2].Value);
+			sampleRate = int.Parse(match.Groups[1].Value) * 1000;
+			channels = match.Groups[3].Value switch
+			{
+				"ec3" => 6,
+				"ac4" => 3,
+				_ => null
+			};
+			return true;
+		}
+
+		return false;
+	}
+
 	public static LameConfig GetLameOptions(Configuration config)
 	{
 		LameConfig lameConfig = new()
@@ -304,4 +347,12 @@ public partial class DownloadOptions
 			chapters.Remove(chapters[^1]);
 		}
 	}
+
+	static double RelativePercentDifference(long num1, long num2)
+		=> Math.Abs(num1 - num2) / (double)(num1 + num2);
+
+	[GeneratedRegex(@".+_(\d+)_(\d+)-(\w+).mp4", RegexOptions.Singleline | RegexOptions.IgnoreCase)]
+	private static partial Regex WidevineAudioProperties();
+	[GeneratedRegex(@".+_lc_(\d+)_(\d+)_(\d+).aax", RegexOptions.Singleline | RegexOptions.IgnoreCase)]
+	private static partial Regex AdrmAudioProperties();
 }

Source/FileLiberator/DownloadOptions.cs

@@ -3,8 +3,10 @@ using AAXClean;
 using Dinah.Core;
 using DataLayer;
 using LibationFileManager;
+using System.Threading.Tasks;
 using System;
 using System.IO;
+using ApplicationServices;
 using LibationFileManager.Templates;
 
 #nullable enable
@@ -26,12 +28,15 @@ namespace FileLiberator
 		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 float? SeriesNumber => LibraryBookDto.FirstSeries?.Number;
 		public NAudio.Lame.LameConfig? LameConfig { get; }
 		public string UserAgent => AudibleApi.Resources.Download_User_Agent;
+		public bool TrimOutputToChapterLength => Config.AllowLibationFixup && Config.StripAudibleBrandAudio;
 		public bool StripUnabridged => Config.AllowLibationFixup && Config.StripUnabridged;
 		public bool CreateCueSheet => Config.CreateCueSheet;
+		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;
@@ -40,9 +45,45 @@ namespace FileLiberator
 		public AudibleApi.Common.DrmType DrmType { get; }
 		public AudibleApi.Common.ContentMetadata ContentMetadata { get; }
 
+		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 async Task<string> SaveClipsAndBookmarksAsync(string fileName)
+		{
+			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;
+		}
+
 		public Configuration Config { get; }
 		private readonly IDisposable cancellation;
 		public void Dispose()
@@ -74,7 +115,7 @@ namespace FileLiberator
 			//If DrmType is not Adrm or Widevine, the delivered file is an unencrypted mp3.
 			OutputFormat
 				= licInfo.DrmType is not AudibleApi.Common.DrmType.Adrm and not AudibleApi.Common.DrmType.Widevine ||
-				(config.AllowLibationFixup && config.DecryptToLossy && licInfo.ContentMetadata.ContentReference.Codec != AudibleApi.Codecs.AC_4)
+				(config.AllowLibationFixup && config.DecryptToLossy && licInfo.ContentMetadata.ContentReference.Codec != Ac4Codec)
 				? OutputFormat.Mp3
 				: OutputFormat.M4b;
 
@@ -82,6 +123,7 @@ namespace FileLiberator
 
 			// no null/empty check for key/iv. unencrypted files do not have them
 			LibraryBookDto = LibraryBook.ToDto();
+			LibraryBookDto.Codec = licInfo.ContentMetadata.ContentReference.Codec;
 
 			cancellation =
 				config

Source/FileLiberator/UtilityExtensions.cs

@@ -5,7 +5,6 @@ using System.Threading.Tasks;
 using AudibleUtilities;
 using DataLayer;
 using Dinah.Core;
-using LibationFileManager;
 using LibationFileManager.Templates;
 
 #nullable enable
@@ -62,13 +61,7 @@ namespace FileLiberator
 				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
+				Language = libraryBook.Book.Language
 			};
 		}
 
@@ -83,7 +76,7 @@ namespace FileLiberator
 				.Select(sb
 					=> new SeriesDto(
 						sb.Series.Name,
-						sb.Book.IsEpisodeParent() ? null : sb.Order,
+						sb.Book.IsEpisodeParent() ? null : sb.Index,
 						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.1.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/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();
@@ -39,7 +39,7 @@ public class NamingTemplate
 		// 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()
+		public static readonly ReplacementCharacters Default
+			= IsWindows
+			? new()
+			{
+				Replacements = new Replacement[]
 				{
-			Replacements = [
 					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()
+					Replacement.Pipe("⏐"),
+				}
+			}
+			: new()
+			{
+				Replacements = new Replacement[]
 				{
-			Replacements = [
 					Replacement.OtherInvalid("_"),
 					Replacement.FilenameForwardSlash("∕"),
 					Replacement.FilenameBackSlash("\\"),
 					Replacement.OpenQuote("“"),
 					Replacement.CloseQuote("”"),
-					Replacement.OtherQuote("\"")]
+					Replacement.OtherQuote("\"")
+				}
 			};
 
-		private static readonly ReplacementCharacters LoFi_NTFS = new()
+		public static readonly ReplacementCharacters LoFiDefault
+			= IsWindows
+			? new()
+			{
+				Replacements = new Replacement[]
 				{
-			Replacements = [
 					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()
+					Replacement.Colon("-"),
+				}
+			}
+			: new ()
+			{
+				Replacements = new Replacement[]
 				{
-			Replacements = [
 					Replacement.OtherInvalid("_"),
 					Replacement.FilenameForwardSlash("_"),
 					Replacement.FilenameBackSlash("\\"),
 					Replacement.OpenQuote("\""),
 					Replacement.CloseQuote("\""),
-					Replacement.OtherQuote("\"")]
+					Replacement.OtherQuote("\"")
+				}
 			};
 
-		private static readonly ReplacementCharacters BareBones_NTFS = new()
+		public static readonly ReplacementCharacters Barebones
+			= IsWindows
+			? new ()
+			{
+				Replacements = new Replacement[]
 				{
-			Replacements = [
 					Replacement.OtherInvalid("_"),
 					Replacement.FilenameForwardSlash("_"),
 					Replacement.FilenameBackSlash("_"),
 					Replacement.OpenQuote("_"),
 					Replacement.CloseQuote("_"),
-					Replacement.OtherQuote("_")]
-		};
-
-		private static readonly ReplacementCharacters BareBones_Other = new()
+					Replacement.OtherQuote("_")
+				}
+			}
+			: new ()
+			{
+				Replacements = new Replacement[]
 				{
-			Replacements = [
 					Replacement.OtherInvalid("_"),
 					Replacement.FilenameForwardSlash("_"),
 					Replacement.FilenameBackSlash("\\"),
 					Replacement.OpenQuote("\""),
 					Replacement.CloseQuote("\""),
-					Replacement.OtherQuote("\"")]
+					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; } = [];
 
-		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,7 +267,7 @@ namespace FileManager
 
 				if (
 					(
-						CharIsPathInvalid(c)
+						invalidPathChars.Contains(c)
 						|| (	// Replace any other legal characters that they user wants.
 								c != Path.DirectorySeparatorChar
 								&& c != Path.AltDirectorySeparatorChar
@@ -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/HangoverAvalonia.csproj

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

Source/Libation.sln

@@ -102,8 +102,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Libation UI", "Libation UI"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Libation CLI", "Libation CLI", "{47E27674-595D-4F7A-8CFB-127E768E1D1E}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AssertionHelper", "_Tests\AssertionHelper\AssertionHelper.csproj", "{CFE7A0E5-37FE-40BE-A70B-41B5104181C4}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -222,10 +220,6 @@ Global
 		{E90C4651-AF11-41B4-A839-10082D0391F9}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{E90C4651-AF11-41B4-A839-10082D0391F9}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{E90C4651-AF11-41B4-A839-10082D0391F9}.Release|Any CPU.Build.0 = Release|Any CPU
-		{CFE7A0E5-37FE-40BE-A70B-41B5104181C4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{CFE7A0E5-37FE-40BE-A70B-41B5104181C4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{CFE7A0E5-37FE-40BE-A70B-41B5104181C4}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{CFE7A0E5-37FE-40BE-A70B-41B5104181C4}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -264,7 +258,6 @@ Global
 		{FDDABAFE-35AD-42FC-AC95-0B1FE0DF0DDE} = {8679CAC8-9164-4007-BDD2-F004810EDA14}
 		{53758A35-1C7E-4702-9B96-433ABA457B37} = {8679CAC8-9164-4007-BDD2-F004810EDA14}
 		{47E27674-595D-4F7A-8CFB-127E768E1D1E} = {8679CAC8-9164-4007-BDD2-F004810EDA14}
-		{CFE7A0E5-37FE-40BE-A70B-41B5104181C4} = {67E66E82-5532-4440-AFB3-9FB1DF9DEF53}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {615E00ED-BAEF-4E8E-A92A-9B82D87942A9}

Source/LibationAvalonia/App.axaml.cs

@@ -16,8 +16,6 @@ using Dinah.Core;
 using LibationAvalonia.Themes;
 using Avalonia.Data.Core.Plugins;
 using System.Linq;
-using LibationUiBase.Forms;
-using Avalonia.Controls;
 
 #nullable enable
 namespace LibationAvalonia
@@ -44,9 +42,6 @@ namespace LibationAvalonia
 
 			if (ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop)
 			{
-				MessageBoxBase.ShowAsyncImpl = (owner, message, caption, buttons, icon, defaultButton, saveAndRestorePosition) =>
-					MessageBox.Show(owner as Window, message, caption, buttons, icon, defaultButton, saveAndRestorePosition);
-
 				// Avoid duplicate validations from both Avalonia and the CommunityToolkit. 
 				// More info: https://docs.avaloniaui.net/docs/guides/development-guides/data-validation#manage-validationplugins
 				DisableAvaloniaDataAnnotationValidation();
@@ -120,10 +115,7 @@ namespace LibationAvalonia
 						ShowMainWindow(desktop);
 					}
 					else
-					{
-						e.Cancel = true;
-						await CancelInstallation(setupDialog);
-					}
+						await CancelInstallation();
 				}
 				else if (setupDialog.IsReturningUser)
 				{
@@ -131,8 +123,7 @@ namespace LibationAvalonia
 				}
 				else
 				{
-					e.Cancel = true;
-					await CancelInstallation(setupDialog);
+					await CancelInstallation();
 					return;
 				}
 
@@ -143,11 +134,11 @@ namespace LibationAvalonia
 				var body = "An unrecoverable error occurred. Since this error happened before logging could be initialized, this error can not be written to the log file.";
 				try
 				{
-					await MessageBox.ShowAdminAlert(setupDialog, body, title, ex);
+					await MessageBox.ShowAdminAlert(null, body, title, ex);
 				}
 				catch
 				{
-					await MessageBox.Show(setupDialog, $"{body}\r\n\r\n{ex.Message}\r\n\r\n{ex.StackTrace}", title, MessageBoxButtons.OK, MessageBoxIcon.Error);
+					await MessageBox.Show($"{body}\r\n\r\n{ex.Message}\r\n\r\n{ex.StackTrace}", title, MessageBoxButtons.OK, MessageBoxIcon.Error);
 				}
 				return;
 			}
@@ -194,7 +185,6 @@ namespace LibationAvalonia
 			{
 				// path did not result in valid settings
 				var continueResult = await MessageBox.Show(
-					libationFilesDialog,
 					$"No valid settings were found at this location.\r\nWould you like to create a new install settings in this folder?\r\n\r\n{libationFilesDialog.SelectedDirectory}",
 					"New install?",
 					MessageBoxButtons.YesNo,
@@ -212,18 +202,18 @@ namespace LibationAvalonia
 						ShowMainWindow(desktop);
 					}
 					else
-						await CancelInstallation(libationFilesDialog);
+						await CancelInstallation();
 				}
 				else
-					await CancelInstallation(libationFilesDialog);
+					await CancelInstallation();
 			}
 
 			libationFilesDialog.Close();
 		}
 
-		static async Task CancelInstallation(Window window)
+		static async Task CancelInstallation()
 		{
-			await MessageBox.Show(window, "Initial set up cancelled.", "Cancelled", MessageBoxButtons.OK, MessageBoxIcon.Warning);
+			await MessageBox.Show("Initial set up cancelled.", "Cancelled", MessageBoxButtons.OK, MessageBoxIcon.Warning);
 			Environment.Exit(0);
 		}
 

Source/LibationAvalonia/AvaloniaUtils.cs

@@ -4,7 +4,6 @@ using Avalonia.Markup.Xaml.MarkupExtensions;
 using Avalonia.Media.Imaging;
 using Avalonia.VisualTree;
 using LibationFileManager;
-using LibationUiBase.Forms;
 using System.Threading.Tasks;
 
 #nullable enable

Source/LibationAvalonia/Controls/DataGridCheckBoxColumnExt.cs

@@ -9,7 +9,7 @@ namespace LibationAvalonia.Controls
 		{
 			//Only SeriesEntry types have three-state checks, individual LibraryEntry books are binary.
 			var ele = base.GenerateEditingElementDirect(cell, dataItem) as CheckBox;
-			ele.IsThreeState = dataItem is SeriesEntry;
+			ele.IsThreeState = dataItem is ISeriesEntry;
 			return ele;
 		}
 	}

Source/LibationAvalonia/Controls/DataGridContextMenus.cs

@@ -34,11 +34,11 @@ namespace LibationAvalonia.Controls
 		private static void Cell_ContextRequested(object sender, ContextRequestedEventArgs e)
 		{
 			if (sender is DataGridCell cell &&
-				cell.DataContext is GridEntry clickedEntry &&
+				cell.DataContext is IGridEntry clickedEntry &&
 				OwningColumnProperty.GetValue(cell) is DataGridColumn column &&
 				OwningGridProperty.GetValue(column) is DataGrid grid)
 			{
-				var allSelected = grid.SelectedItems.OfType<GridEntry>().ToArray();
+				var allSelected = grid.SelectedItems.OfType<IGridEntry>().ToArray();
 				var clickedIndex = Array.IndexOf(allSelected, clickedEntry);
 				if (clickedIndex == -1)
 				{
@@ -101,7 +101,7 @@ namespace LibationAvalonia.Controls
 		private static string RemoveLineBreaks(string text)
 			=> text.Replace("\r\n", "").Replace('\r', ' ').Replace('\n', ' ');
 
-		private string GetRowClipboardContents(GridEntry gridEntry)
+		private string GetRowClipboardContents(IGridEntry gridEntry)
 		{
 			var contents = Grid.Columns.Where(c => c.IsVisible).OrderBy(c => c.DisplayIndex).Select(c => RemoveLineBreaks(GetCellValue(c, gridEntry))).ToArray();
 			return string.Join("\t", contents);
@@ -109,7 +109,7 @@ namespace LibationAvalonia.Controls
 
 		public required DataGrid Grid { get; init; }
 		public required DataGridColumn Column { get; init; }
-		public required GridEntry[] GridEntries { get; init; }
+		public required IGridEntry[] GridEntries { get; init; }
 		public required ContextMenu ContextMenu { get; init; }
 		public AvaloniaList<Control> ContextMenuItems
 			=> ContextMenu.ItemsSource as AvaloniaList<Control>;

Source/LibationAvalonia/Controls/DirectoryOrCustomSelectControl.axaml.cs

@@ -1,6 +1,5 @@
 using Avalonia;
 using Avalonia.Controls;
-using Avalonia.Platform.Storage;
 using Dinah.Core;
 using LibationFileManager;
 using ReactiveUI;
@@ -91,7 +90,7 @@ namespace LibationAvalonia.Controls
 
 			var selectedFolders = await (VisualRoot as Window).StorageProvider.OpenFolderPickerAsync(options);
 
-			directoryState.CustomDir = selectedFolders.SingleOrDefault()?.TryGetLocalPath() ?? directoryState.CustomDir;
+			directoryState.CustomDir = selectedFolders.SingleOrDefault()?.Path?.LocalPath ?? directoryState.CustomDir;
 		}
 
 		private void DirectoryOrCustomSelectControl_PropertyChanged(object sender, AvaloniaPropertyChangedEventArgs e)

Source/LibationAvalonia/Controls/LinkLabel.axaml.cs

@@ -92,14 +92,16 @@ namespace LibationAvalonia.Controls
 			base.UpdateDataValidation(property, state, error);
 			if (property == CommandProperty)
 			{
-				var canExecure = !state.HasFlag(BindingValueType.HasError);
-				if (canExecure != _commandCanExecute)
+				if (state == BindingValueType.BindingError)
 				{
-					_commandCanExecute = canExecure;
+					if (_commandCanExecute)
+					{
+						_commandCanExecute = false;
 						UpdateIsEffectivelyEnabled();
 					}
 				}
 			}
+		}
 
 		public void CanExecuteChanged(object sender, EventArgs e)
 		{

Source/LibationAvalonia/Controls/Settings/Audio.axaml

@@ -47,33 +47,27 @@
 					SelectedItem="{CompiledBinding FileDownloadQuality}"/>
 			</Grid>
 
-			<Grid ColumnDefinitions="*,Auto">
+
+			<Grid ColumnDefinitions="*,*">
+
 				<CheckBox
-					ToolTip.Tip="{CompiledBinding UseWidevineTip}"
+					IsChecked="{CompiledBinding UseWidevine, Mode=TwoWay}"
 					IsCheckedChanged="UseWidevine_IsCheckedChanged"
-					IsChecked="{CompiledBinding UseWidevine, Mode=TwoWay}">
+					ToolTip.Tip="{CompiledBinding UseWidevineTip}">
 					<TextBlock Text="{CompiledBinding UseWidevineText}" />
 				</CheckBox>
+				
 				<CheckBox
 					Grid.Column="1"
-					ToolTip.Tip="{CompiledBinding Request_xHE_AACTip}"
-					IsEnabled="{CompiledBinding UseWidevine}"
-					IsChecked="{CompiledBinding Request_xHE_AAC, Mode=TwoWay}">
-					<TextBlock Text="{CompiledBinding Request_xHE_AACText}" />
-				</CheckBox>
-			</Grid>
-
-			<Grid ColumnDefinitions="*,Auto">
-				<CheckBox
+					HorizontalAlignment="Right"
 					ToolTip.Tip="{CompiledBinding RequestSpatialTip}"
 					IsEnabled="{CompiledBinding UseWidevine}"
 					IsChecked="{CompiledBinding RequestSpatial, Mode=TwoWay}">
 					<TextBlock Text="{CompiledBinding RequestSpatialText}" />
 				</CheckBox>
-				<Grid
-					Grid.Column="1"
-					ColumnDefinitions="Auto,Auto"
-					VerticalAlignment="Top"
+			</Grid>
+
+			<Grid ColumnDefinitions="*,Auto"
 				  ToolTip.Tip="{CompiledBinding SpatialAudioCodecTip}">
 				<Grid.IsEnabled>
 					<MultiBinding Converter="{x:Static BoolConverters.And}">
@@ -86,18 +80,19 @@
 				
 				<TextBlock
 					VerticalAlignment="Center"
-						Text="Codec:"/>
+					Text="{CompiledBinding SpatialAudioCodecText}" />
 
 				<controls:WheelComboBox
 					Margin="5,0,0,0"
 					Grid.Column="1"
-						VerticalAlignment="Center"
-						SelectionChanged="SpatialCodec_SelectionChanged"
 					ItemsSource="{CompiledBinding SpatialAudioCodecs}"
 					SelectedItem="{CompiledBinding SpatialAudioCodec}"/>
 			</Grid>
 			
-			</Grid>
+			
+			
+			
+			
 
 			<CheckBox IsChecked="{CompiledBinding CreateCueSheet, Mode=TwoWay}">
 				<TextBlock Text="{CompiledBinding CreateCueSheetText}" />

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

@@ -4,8 +4,6 @@ using LibationAvalonia.Dialogs;
 using LibationAvalonia.ViewModels.Settings;
 using LibationFileManager;
 using LibationFileManager.Templates;
-using LibationUiBase.Forms;
-using ReactiveUI;
 using System.Linq;
 using System.Threading.Tasks;
 
@@ -24,15 +22,6 @@ namespace LibationAvalonia.Controls.Settings
 			}
 		}
 
-		private void SpatialCodec_SelectionChanged(object sender, SelectionChangedEventArgs e)
-		{
-			if (_viewModel.SpatialAudioCodec.Value is Configuration.SpatialCodec.AC_4 && _viewModel.DecryptToLossy)
-			{
-				_viewModel.SpatialAudioCodec = _viewModel.SpatialAudioCodecs[0];
-				_viewModel.RaisePropertyChanged(nameof(AudioSettingsVM.SpatialAudioCodec));
-			}
-		}
-
 		private async void UseWidevine_IsCheckedChanged(object sender, Avalonia.Interactivity.RoutedEventArgs e)
 		{
 			if (sender is CheckBox cbox && cbox.IsChecked is true)
@@ -69,10 +58,6 @@ namespace LibationAvalonia.Controls.Settings
 					_viewModel.UseWidevine = false;
 				}
 			}
-			else
-			{
-				_viewModel.Request_xHE_AAC = _viewModel.RequestSpatial = false;
-			}
 		}
 
 		public async void EditChapterTitleTemplateButton_Click(object sender, Avalonia.Interactivity.RoutedEventArgs e)

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

@@ -3,7 +3,6 @@ using LibationAvalonia.Dialogs;
 using LibationAvalonia.ViewModels.Settings;
 using LibationFileManager;
 using LibationFileManager.Templates;
-using LibationUiBase.Forms;
 using System.Threading.Tasks;
 
 namespace LibationAvalonia.Controls.Settings

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

@@ -58,5 +58,10 @@ namespace LibationAvalonia.Controls.Settings
 			}
 			ThemeComboBox.SelectionChanged += ThemeComboBox_SelectionChanged;
 		}
+
+		public void OpenLogFolderButton_Click(object sender, Avalonia.Interactivity.RoutedEventArgs e)
+		{
+			Go.To.Folder(((LongPath)Configuration.Instance.LibationFiles).ShortPathName);
+		}
 	}
 }

Source/LibationAvalonia/Controls/ThemePreviewControl.axaml.cs

@@ -1,10 +1,12 @@
 using Avalonia.Controls;
+using Avalonia.Media.Imaging;
 using DataLayer;
 using Dinah.Core.ErrorHandling;
 using LibationAvalonia.ViewModels;
 using LibationFileManager;
-using LibationUiBase.ProcessQueue;
+using NPOI.Util.Collections;
 using System.Collections.Generic;
+using System.ComponentModel;
 using System.IO;
 using System.Linq;
 using System.Reflection;
@@ -36,11 +38,11 @@ public partial class ThemePreviewControl : UserControl
 			PictureStorage.SetDefaultImage(PictureSize._80x80, ms1.ToArray());
 		}
 
-		QueuedBook = new ProcessBookViewModel(sampleEntries[0]) { Status = ProcessBookStatus.Queued };
-		WorkingBook = new ProcessBookViewModel(sampleEntries[0]) { Status = ProcessBookStatus.Working };
-		CompletedBook = new ProcessBookViewModel(sampleEntries[0]) { Status = ProcessBookStatus.Completed };
-		CancelledBook = new ProcessBookViewModel(sampleEntries[0]) { Status = ProcessBookStatus.Cancelled };
-		FailedBook = new ProcessBookViewModel(sampleEntries[0]) { Status = ProcessBookStatus.Failed };
+		QueuedBook = new ProcessBookViewModel(sampleEntries[0], null) { Status = ProcessBookStatus.Queued };
+		WorkingBook = new ProcessBookViewModel(sampleEntries[0], null) { Status = ProcessBookStatus.Working };
+		CompletedBook = new ProcessBookViewModel(sampleEntries[0], null) { Status = ProcessBookStatus.Completed };
+		CancelledBook = new ProcessBookViewModel(sampleEntries[0], null) { Status = ProcessBookStatus.Cancelled };
+		FailedBook = new ProcessBookViewModel(sampleEntries[0], null) { Status = ProcessBookStatus.Failed };
 
 		//Set the current processable so that the empty queue doesn't try to advance.
 		QueuedBook.AddDownloadPdf();

Source/LibationAvalonia/Dialogs/AboutDialog.axaml.cs

@@ -3,7 +3,6 @@ using LibationAvalonia.Controls;
 using LibationAvalonia.ViewModels;
 using LibationFileManager;
 using LibationUiBase;
-using LibationUiBase.Forms;
 using ReactiveUI;
 using System;
 using System.Collections.Generic;
@@ -61,7 +60,7 @@ namespace LibationAvalonia.Dialogs
 		private void Link_getlibation(object sender, Avalonia.Input.TappedEventArgs e) => Dinah.Core.Go.To.Url(AppScaffolding.LibationScaffolding.WebsiteUrl);
 
 		private void ViewReleaseNotes_Tapped(object sender, Avalonia.Input.TappedEventArgs e)
-			=> Dinah.Core.Go.To.Url($"{AppScaffolding.LibationScaffolding.RepositoryUrl}/releases/tag/v{AppScaffolding.LibationScaffolding.BuildVersion.ToVersionString()}");
+			=> Dinah.Core.Go.To.Url($"{AppScaffolding.LibationScaffolding.RepositoryUrl}/releases/tag/v{AppScaffolding.LibationScaffolding.BuildVersion.ToString(3)}");
 	}
 
 	public class AboutVM : ViewModelBase

Source/LibationAvalonia/Dialogs/AccountsDialog.axaml.cs

@@ -3,7 +3,6 @@ using AudibleUtilities;
 using Avalonia.Collections;
 using Avalonia.Controls;
 using Avalonia.Platform.Storage;
-using LibationUiBase.Forms;
 using ReactiveUI;
 using System;
 using System.Collections.Generic;

Source/LibationAvalonia/Dialogs/BookRecordsDialog.axaml.cs

@@ -7,7 +7,6 @@ using Avalonia.Platform.Storage;
 using Avalonia.Threading;
 using DataLayer;
 using FileLiberator;
-using LibationUiBase.Forms;
 using ReactiveUI;
 using System;
 using System.Collections.Generic;

Source/LibationAvalonia/Dialogs/DialogWindow.cs

@@ -3,7 +3,6 @@ using Avalonia.Controls;
 using Avalonia.Controls.Primitives;
 using Avalonia.Styling;
 using LibationFileManager;
-using LibationUiBase.Forms;
 using System;
 using System.Threading.Tasks;
 

Source/LibationAvalonia/Dialogs/EditQuickFilters.axaml

@@ -24,8 +24,9 @@
 			CanUserSortColumns="False"
 			AutoGenerateColumns="False"
 			IsReadOnly="False"
-			ItemsSource="{CompiledBinding Filters}"
+			ItemsSource="{Binding Filters}"
 			GridLinesVisibility="All">
+
 			<DataGrid.Columns>
 
 				<DataGridTemplateColumn Header="Delete">
@@ -37,7 +38,7 @@
 								VerticalAlignment="Stretch"
 								HorizontalAlignment="Stretch"
 								HorizontalContentAlignment="Center"
-								IsEnabled="{CompiledBinding !IsDefault}"
+								IsEnabled="{Binding !IsDefault}"
 								Click="DeleteButton_Clicked" />
 
 						</DataTemplate>
@@ -47,13 +48,14 @@
 				<DataGridTextColumn
     				Width="*"
 				    IsReadOnly="False"
-				    Binding="{CompiledBinding Name, Mode=TwoWay}"
+				    Binding="{Binding Name, Mode=TwoWay}"
 				    Header="Name"/>
 
+
 				<DataGridTextColumn
 					Width="*"
 					IsReadOnly="False"
-					Binding="{CompiledBinding FilterString, Mode=TwoWay}"
+					Binding="{Binding FilterString, Mode=TwoWay}"
 					Header="Filter"/>
 
 				<DataGridTemplateColumn Header="Move&#xa;Up">
@@ -65,19 +67,16 @@
 								VerticalAlignment="Stretch"
 								HorizontalAlignment="Stretch"
 								HorizontalContentAlignment="Center"
-								Click="MoveUpButton_Clicked">
-								<Button.IsEnabled>
-									<MultiBinding Converter="{x:Static BoolConverters.And}">
-										<CompiledBinding Path="!IsTop" />
-										<CompiledBinding Path="!IsDefault" />
-									</MultiBinding>
-								</Button.IsEnabled>
-							</Button>
+								IsEnabled="{Binding !IsDefault}"
+								ToolTip.Tip="Export account authorization to audible-cli"
+								Click="MoveUpButton_Clicked" />
 
 						</DataTemplate>
 					</DataGridTemplateColumn.CellTemplate>
 				</DataGridTemplateColumn>
 
+
+
 				<DataGridTemplateColumn Header="Move&#xa;Down">
 					<DataGridTemplateColumn.CellTemplate>
 						<DataTemplate>
@@ -87,18 +86,15 @@
 								VerticalAlignment="Stretch"
 								HorizontalAlignment="Stretch"
 								HorizontalContentAlignment="Center"
-								Click="MoveDownButton_Clicked">
-								<Button.IsEnabled>
-									<MultiBinding Converter="{x:Static BoolConverters.And}">
-										<CompiledBinding Path="!IsBottom" />
-										<CompiledBinding Path="!IsDefault" />
-									</MultiBinding>
-								</Button.IsEnabled>
-							</Button>
+								IsEnabled="{Binding !IsDefault}"
+								ToolTip.Tip="Export account authorization to audible-cli"
+								Click="MoveDownButton_Clicked" />
 
 						</DataTemplate>
 					</DataGridTemplateColumn.CellTemplate>
 				</DataGridTemplateColumn>
+
+
 			</DataGrid.Columns>
 		</DataGrid>
 		<Grid

Source/LibationAvalonia/Dialogs/EditQuickFilters.axaml.cs

@@ -1,15 +1,15 @@
 using AudibleUtilities;
-using Avalonia.Collections;
 using Avalonia.Controls;
 using LibationFileManager;
 using ReactiveUI;
+using System.Collections.ObjectModel;
 using System.Linq;
 
 namespace LibationAvalonia.Dialogs
 {
 	public partial class EditQuickFilters : DialogWindow
 	{
-		public AvaloniaList<Filter> Filters { get; } = new();
+		public ObservableCollection<Filter> Filters { get; } = new();
 
 		public class Filter : ViewModels.ViewModelBase
 		{ 
@@ -17,7 +17,10 @@ namespace LibationAvalonia.Dialogs
             public string Name
             {
                 get => _name;
-                set => this.RaiseAndSetIfChanged(ref _name, value);
+                set
+                {
+                    this.RaiseAndSetIfChanged(ref _name, value);
+                }
             }
 
             private string _filterString;
@@ -32,10 +35,6 @@ namespace LibationAvalonia.Dialogs
 				}
 			}
 			public bool IsDefault { get; private set; } = true;
-			private bool _isTop;
-			private bool _isBottom;
-			public bool IsTop { get => _isTop; set => this.RaiseAndSetIfChanged(ref _isTop, value); }
-			public bool IsBottom { get => _isBottom; set => this.RaiseAndSetIfChanged(ref _isBottom, value); }
 
 			public QuickFilters.NamedFilter AsNamedFilter() => new(FilterString, Name);
 
@@ -45,12 +44,12 @@ namespace LibationAvalonia.Dialogs
 			InitializeComponent();
 			if (Design.IsDesignMode)
 			{
-				Filters = [
-					new Filter { Name = "Filter 1", FilterString = "[filter1 string]", IsTop = true },
+				Filters = new ObservableCollection<Filter>([
+					new Filter { Name = "Filter 1", FilterString = "[filter1 string]" },
 					new Filter { Name = "Filter 2", FilterString = "[filter2 string]" },
 					new Filter { Name = "Filter 3", FilterString = "[filter3 string]" },
-					new Filter { Name = "Filter 4", FilterString = "[filter4 string]", IsBottom = true },
-					new Filter()];
+					new Filter { Name = "Filter 4", FilterString = "[filter4 string]" }
+					]);
 				DataContext = this;
 				return;
 			}
@@ -66,8 +65,6 @@ namespace LibationAvalonia.Dialogs
 			ControlToFocusOnShow = this.FindControl<Button>(nameof(saveBtn));
 
 			var allFilters = QuickFilters.Filters.Select(f => new Filter { FilterString = f.Filter, Name = f.Name }).ToList();
-			allFilters[0].IsTop = true;
-			allFilters[^1].IsBottom = true;
 			allFilters.Add(new Filter());
 
 			foreach (var f in allFilters)
@@ -84,7 +81,6 @@ namespace LibationAvalonia.Dialogs
 			var newBlank = new Filter();
 			newBlank.PropertyChanged += Filter_PropertyChanged;
 			Filters.Insert(Filters.Count, newBlank);
-			ReIndexFilters();
 		}
 
 		protected override void SaveAndClose()
@@ -102,54 +98,30 @@ namespace LibationAvalonia.Dialogs
 
 				filter.PropertyChanged -= Filter_PropertyChanged;
 				Filters.Remove(filter);
-				ReIndexFilters();
 			}
 		}
 
 		public void MoveUpButton_Clicked(object sender, Avalonia.Interactivity.RoutedEventArgs e)
 		{
-			if (e.Source is not Button btn || btn.DataContext is not Filter filter || filter.IsDefault)
-				return;
+			if (e.Source is Button btn && btn.DataContext is Filter filter)
+			{
+				var index = Filters.IndexOf(filter);
+				if (index < 1) return;
 
-			var oldIndex = Filters.IndexOf(filter);
-			if (oldIndex < 1) return;
-
-			var filterCount = Filters.Count(f => !f.IsDefault);
-
-			MoveFilter(oldIndex, oldIndex - 1, filterCount);
+				Filters.Remove(filter);
+				Filters.Insert(index - 1, filter);
+			}
 		}
 
 		public void MoveDownButton_Clicked(object sender, Avalonia.Interactivity.RoutedEventArgs e)
 		{
-			if (e.Source is not Button btn || btn.DataContext is not Filter filter || filter.IsDefault)
-				return;
-
-			var filterCount = Filters.Count(f => !f.IsDefault);
-			var oldIndex = Filters.IndexOf(filter);
-			if (oldIndex >= filterCount - 1) return;
-
-			MoveFilter(oldIndex, oldIndex + 1, filterCount);
-		}
-
-		private void MoveFilter(int oldIndex, int newIndex, int filterCount)
+			if (e.Source is Button btn && btn.DataContext is Filter filter)
 			{
-			var filter = Filters[oldIndex];
-			Filters.RemoveAt(oldIndex);
-			Filters.Insert(newIndex, filter);
+				var index = Filters.IndexOf(filter);
+				if (index >= Filters.Count - 2) return;
 
-			Filters[oldIndex].IsTop = oldIndex == 0;
-			Filters[newIndex].IsTop = newIndex == 0;
-			Filters[newIndex].IsBottom = newIndex == filterCount - 1;
-			Filters[oldIndex].IsBottom = oldIndex == filterCount - 1;
-		}
-
-		private void ReIndexFilters()
-		{
-			var filterCount = Filters.Count(f => !f.IsDefault);
-			for (int i = filterCount - 1; i >= 0; i--)
-			{
-				Filters[i].IsTop = i == 0;
-				Filters[i].IsBottom = i == filterCount - 1;
+				Filters.Remove(filter);
+				Filters.Insert(index + 1, filter);
 			}
 		}
 	}

Source/LibationAvalonia/Dialogs/EditReplacementChars.axaml

@@ -6,8 +6,6 @@
 		MinWidth="500" MinHeight="450"
 		Width="500" Height="450"
         x:Class="LibationAvalonia.Dialogs.EditReplacementChars"
-		xmlns:dialogs="clr-namespace:LibationAvalonia.Dialogs"
-		x:DataType="dialogs:EditReplacementChars"
         Title="Illegal Character Replacement">
 
 	<Grid
@@ -25,30 +23,31 @@
 			BeginningEdit="ReplacementGrid_BeginningEdit"
 			CellEditEnding="ReplacementGrid_CellEditEnding"
 			KeyDown="ReplacementGrid_KeyDown"
-			ItemsSource="{CompiledBinding replacements}">
+			ItemsSource="{Binding replacements}">
 
 			<DataGrid.Columns>
 
+
 				<DataGridTemplateColumn Header="Char to&#xa;Replace">
 					<DataGridTemplateColumn.CellTemplate>
-						<DataTemplate x:DataType="dialogs:EditReplacementChars+ReplacementsExt">
-							<TextBox IsReadOnly="{CompiledBinding Mandatory}" Text="{CompiledBinding CharacterToReplace, Mode=TwoWay}" />
+						<DataTemplate>
+							<TextBox IsReadOnly="{Binding Mandatory}" Text="{Binding CharacterToReplace, Mode=TwoWay}" />
 						</DataTemplate>
 					</DataGridTemplateColumn.CellTemplate>
 				</DataGridTemplateColumn>
 				
 				<DataGridTemplateColumn Header="Replacement&#xa;Text">
 					<DataGridTemplateColumn.CellTemplate>
-						<DataTemplate x:DataType="dialogs:EditReplacementChars+ReplacementsExt">
-							<TextBox Text="{CompiledBinding ReplacementText, Mode=TwoWay}" />
+						<DataTemplate>
+							<TextBox Text="{Binding ReplacementText, Mode=TwoWay}" />
 						</DataTemplate>
 					</DataGridTemplateColumn.CellTemplate>
 				</DataGridTemplateColumn>
 
 				<DataGridTemplateColumn Width="*" Header="Description">
 					<DataGridTemplateColumn.CellTemplate>
-						<DataTemplate x:DataType="dialogs:EditReplacementChars+ReplacementsExt">
-							<TextBox IsReadOnly="{CompiledBinding Mandatory}" Text="{CompiledBinding Description, Mode=TwoWay}" />
+						<DataTemplate>
+							<TextBox IsReadOnly="{Binding Mandatory}" Text="{Binding Description, Mode=TwoWay}" />
 						</DataTemplate>
 					</DataGridTemplateColumn.CellTemplate>
 				</DataGridTemplateColumn>
@@ -56,31 +55,21 @@
 			</DataGrid.Columns>
 		</DataGrid>
 
-		<Grid
+		<StackPanel
 			Grid.Row="1"
 			Grid.Column="0"
-			RowDefinitions="Auto,Auto"
 			Margin="5"
-			ColumnDefinitions="Auto,Auto,Auto,Auto">
+			Orientation="Horizontal">
 			
-			<TextBlock IsVisible="{CompiledBinding !EnvironmentIsWindows}" Text="This System:" Margin="0,0,10,0" VerticalAlignment="Center" />
-			<TextBlock IsVisible="{CompiledBinding !EnvironmentIsWindows}" Grid.Row="1" Text="NTFS:" Margin="0,0,10,0" VerticalAlignment="Center" />
-
-			<Button Grid.Column="1" Margin="0,0,10,0" Command="{CompiledBinding Defaults}" CommandParameter="{CompiledBinding EnvironmentIsWindows}" Content="Defaults" />
-			<Button Grid.Column="2" Margin="0,0,10,0" Command="{CompiledBinding LoFiDefaults}" CommandParameter="{CompiledBinding EnvironmentIsWindows}" Content="LoFi Defaults" />
-			<Button Grid.Column="3" Command="{CompiledBinding Barebones}" CommandParameter="{CompiledBinding EnvironmentIsWindows}" Content="Barebones" />
-
-			<Button IsVisible="{CompiledBinding !EnvironmentIsWindows}" Grid.Row="1" Grid.Column="1" Margin="0,10,10,0" Command="{CompiledBinding Defaults}" CommandParameter="True" Content="Defaults" />
-			<Button IsVisible="{CompiledBinding !EnvironmentIsWindows}" Grid.Row="1" Grid.Column="2" Margin="0,10,10,0" Command="{CompiledBinding LoFiDefaults}" CommandParameter="True" Content="LoFi Defaults" />
-			<Button IsVisible="{CompiledBinding !EnvironmentIsWindows}" Grid.Row="1" Grid.Column="3" Margin="0,10,0,0" Command="{CompiledBinding Barebones}" CommandParameter="True" Content="Barebones" />
-
-		</Grid>
+			<Button Margin="0,0,10,0" Command="{Binding Defaults}" Content="Defaults" />
+			<Button Margin="0,0,10,0" Command="{Binding LoFiDefaults}" Content="LoFi Defaults" />
+			<Button Command="{Binding Barebones}" Content="Barebones" />
+		</StackPanel>
 
 		<StackPanel
 			Grid.Row="1"
 			Grid.Column="1"
 			Margin="5"
-			VerticalAlignment="Bottom"
 			Orientation="Horizontal">
 
 			<Button Margin="0,0,10,0" Command="{Binding Close}" Content="Cancel" />

Source/LibationAvalonia/Dialogs/EditReplacementChars.axaml.cs

@@ -13,8 +13,6 @@ namespace LibationAvalonia.Dialogs
 	{
 		Configuration config;
 
-		public bool EnvironmentIsWindows => Configuration.IsWindows;
-
 		private readonly List<ReplacementsExt> SOURCE = new();
 		public DataGridCollectionView replacements { get; }
 		public EditReplacementChars()
@@ -25,7 +23,7 @@ namespace LibationAvalonia.Dialogs
 
 			if (Design.IsDesignMode)
 			{
-				LoadTable(ReplacementCharacters.Default(true).Replacements);
+				LoadTable(ReplacementCharacters.Default.Replacements);
 			}
 
 			DataContext = this;
@@ -37,12 +35,12 @@ namespace LibationAvalonia.Dialogs
 			LoadTable(config.ReplacementCharacters.Replacements);
 		}
 
-		public void Defaults(bool isNtfs)
-			=> LoadTable(ReplacementCharacters.Default(isNtfs).Replacements);
-		public void LoFiDefaults(bool isNtfs)
-			=> LoadTable(ReplacementCharacters.LoFiDefault(isNtfs).Replacements);
-		public void Barebones(bool isNtfs)
-			=> LoadTable(ReplacementCharacters.Barebones(isNtfs).Replacements);
+		public void Defaults()
+			=> LoadTable(ReplacementCharacters.Default.Replacements);
+		public void LoFiDefaults()
+			=> LoadTable(ReplacementCharacters.LoFiDefault.Replacements);
+		public void Barebones()
+			=> LoadTable(ReplacementCharacters.Barebones.Replacements);
 
 		protected override void SaveAndClose()
 		{

Source/LibationAvalonia/Dialogs/EditTemplateDialog.axaml

@@ -6,28 +6,24 @@
 		Width="800" Height="450"
         x:Class="LibationAvalonia.Dialogs.EditTemplateDialog"
 		xmlns:dialogs="clr-namespace:LibationAvalonia.Dialogs"
-		xmlns:controls="clr-namespace:LibationAvalonia.Controls"
-		x:DataType="dialogs:EditTemplateDialog+EditTemplateViewModel"
         Title="EditTemplateDialog">
 
-	<Grid RowDefinitions="Auto,*,Auto" Margin="10">
+	<Grid RowDefinitions="Auto,*,Auto">
 		<Grid
 			Grid.Row="0"
 			RowDefinitions="Auto,Auto"
-			ColumnDefinitions="*,Auto"
-			Margin="0,0,0,10">
+			ColumnDefinitions="*,Auto" Margin="5">
 
 			<TextBlock
 				Grid.Column="0"
 				Grid.Row="0"
-				Margin="0,0,0,10"
-				Text="{CompiledBinding Description}" />
+				Text="{Binding Description}" />
 
 			<TextBox
 				Grid.Column="0"
 				Grid.Row="1"
 				Name="userEditTbox"
-				Text="{CompiledBinding UserTemplateText, Mode=TwoWay}" />
+				Text="{Binding UserTemplateText, Mode=TwoWay}" />
 
 			<Button
 				Grid.Column="1"
@@ -36,10 +32,9 @@
 				VerticalAlignment="Stretch"
 				VerticalContentAlignment="Center"
 				Content="Reset to Default"
-				Command="{CompiledBinding ResetToDefault}"/>
+				Command="{Binding ResetToDefault}"/>
 		</Grid>
-		<Grid Grid.Row="1" ColumnDefinitions="Auto,*"
-			  Margin="0,0,0,10">
+		<Grid Grid.Row="1" ColumnDefinitions="Auto,*">
 
 				<DataGrid
 					Grid.Row="0"
@@ -49,13 +44,13 @@
 					GridLinesVisibility="All"
 					AutoGenerateColumns="False"
 					DoubleTapped="EditTemplateViewModel_DoubleTapped"
-					ItemsSource="{CompiledBinding ListItems}" >
+					ItemsSource="{Binding ListItems}" >
 
 					<DataGrid.Columns>
 						<DataGridTemplateColumn Width="Auto" Header="Tag">
 							<DataGridTemplateColumn.CellTemplate>
 								<DataTemplate>
-									<TextBlock Height="18" Margin="10,0,10,0" VerticalAlignment="Center" Text="{CompiledBinding Item1}" />
+									<TextBlock Height="18" Margin="10,0,10,0" VerticalAlignment="Center" Text="{Binding Item1}" />
 								</DataTemplate>
 							</DataGridTemplateColumn.CellTemplate>
 						</DataGridTemplateColumn>
@@ -66,7 +61,7 @@
 									<TextBlock
 										Height="18"
 										Margin="10,0,10,0"
-										VerticalAlignment="Center" Text="{CompiledBinding Item2}" />
+										VerticalAlignment="Center" Text="{Binding Item2}" />
 								</DataTemplate>
 							</DataGridTemplateColumn.CellTemplate>
 						</DataGridTemplateColumn>
@@ -76,22 +71,23 @@
 			
 			<Grid
 			Grid.Column="1"
-			Margin="10,0,0,0"
+			Margin="5,0,5,0"
 			RowDefinitions="Auto,*,Auto"
 			HorizontalAlignment="Stretch">
 
 				<TextBlock
-					Margin="0,0,0,5"
+					Margin="5,5,5,10"
 					Text="Example:"/>
 				
 				<Border
 					Grid.Row="1"
+					Margin="5"
 					BorderThickness="1"
 					BorderBrush="{DynamicResource DataGridGridLinesBrush}">
 					
 					<TextBlock
 						TextWrapping="WrapWithOverflow"
-						Inlines="{CompiledBinding Inlines}" />
+						Inlines="{Binding Inlines}" />
 
 				</Border>
 
@@ -99,17 +95,13 @@
 					Grid.Row="2"
 					Margin="5"
 					Foreground="Firebrick"
-					Text="{CompiledBinding WarningText}"
-					IsVisible="{CompiledBinding WarningText, Converter={x:Static StringConverters.IsNotNullOrEmpty}}"/>
+					Text="{Binding WarningText}"
+					IsVisible="{Binding WarningText, Converter={x:Static StringConverters.IsNotNullOrEmpty}}"/>
 			</Grid>
 		</Grid>
-		<controls:LinkLabel
-			Grid.Row="2"
-			VerticalAlignment="Center"
-			Text="Read about naming templates on the Wiki"
-			Command="{Binding GoToNamingTemplateWiki}" />
 		<Button
 			Grid.Row="2"
+			Margin="5"
 			Padding="30,5,30,5"
 			HorizontalAlignment="Right"
 			Content="Save"

Source/LibationAvalonia/Dialogs/EditTemplateDialog.axaml.cs

@@ -6,7 +6,6 @@ using Avalonia.Styling;
 using Dinah.Core;
 using LibationFileManager;
 using LibationFileManager.Templates;
-using LibationUiBase.Forms;
 using ReactiveUI;
 using System;
 using System.IO;
@@ -70,7 +69,7 @@ public partial class EditTemplateDialog : DialogWindow
 	public async void SaveButton_Click(object sender, Avalonia.Interactivity.RoutedEventArgs e)
 		=> await SaveAndCloseAsync();
 
-	internal class EditTemplateViewModel : ViewModels.ViewModelBase
+	private class EditTemplateViewModel : ViewModels.ViewModelBase
 	{
 		private readonly Configuration config;
 		public InlineCollection Inlines { get; } = new();
@@ -96,9 +95,6 @@ public partial class EditTemplateDialog : DialogWindow
 
 		}
 
-		public void GoToNamingTemplateWiki()
-			=> Go.To.Url(@"ht" + "tps://github.com/rmcrackan/Libation/blob/master/Documentation/NamingTemplates.md");
-
 		// hold the work-in-progress value. not guaranteed to be valid
 		private string _userTemplateText;
 		public string UserTemplateText

Source/LibationAvalonia/Dialogs/ImageDisplayDialog.axaml.cs

@@ -1,6 +1,5 @@
 using Avalonia.Media.Imaging;
 using Avalonia.Platform.Storage;
-using LibationUiBase.Forms;
 using ReactiveUI;
 using System;
 using System.ComponentModel;

Source/LibationAvalonia/Dialogs/LibationFilesDialog.axaml.cs

@@ -1,5 +1,4 @@
 using LibationFileManager;
-using LibationUiBase.Forms;
 using System.Collections.Generic;
 
 namespace LibationAvalonia.Dialogs

Source/LibationAvalonia/Dialogs/LocateAudiobooksDialog.axaml.cs

@@ -13,12 +13,11 @@ using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 
-#nullable enable
 namespace LibationAvalonia.Dialogs
 {
 	public partial class LocateAudiobooksDialog : DialogWindow
 	{
-		private event EventHandler<FilePathCache.CacheEntry>? FileFound;
+		private event EventHandler<FilePathCache.CacheEntry> FileFound;
 		private readonly CancellationTokenSource tokenSource = new();
 		private readonly List<string> foundAsins = new();
 		private readonly LocatedAudiobooksViewModel _viewModel;
@@ -42,7 +41,7 @@ namespace LibationAvalonia.Dialogs
 			}
 		}
 
-		private void LocateAudiobooksDialog_Closing(object? sender, System.ComponentModel.CancelEventArgs e)
+		private void LocateAudiobooksDialog_Closing(object sender, System.ComponentModel.CancelEventArgs e)
 		{
 			tokenSource.Cancel();
 			//If this dialog is closed before it's completed, Closing is fired
@@ -51,7 +50,7 @@ namespace LibationAvalonia.Dialogs
 			this.SaveSizeAndLocation(Configuration.Instance);
 		}
 
-		private void LocateAudiobooks_FileFound(object? sender, FilePathCache.CacheEntry e)
+		private void LocateAudiobooks_FileFound(object sender, FilePathCache.CacheEntry e)
 		{
 			var newItem = new Tuple<string, string>($"[{e.Id}]", Path.GetFileName(e.Path));
 			_viewModel.FoundFiles.Add(newItem);
@@ -64,13 +63,13 @@ namespace LibationAvalonia.Dialogs
 			}
 		}
 
-		private async void LocateAudiobooksDialog_Opened(object? sender, EventArgs e)
+		private async void LocateAudiobooksDialog_Opened(object sender, EventArgs e)
 		{
 			var folderPicker = new FolderPickerOpenOptions
 			{
 				Title = "Select the folder to search for audiobooks",
 				AllowMultiple = false,
-				SuggestedStartLocation = await StorageProvider.TryGetFolderFromPathAsync(Configuration.Instance.Books?.PathWithoutPrefix ?? "")
+				SuggestedStartLocation = await StorageProvider.TryGetFolderFromPathAsync(Configuration.Instance.Books.PathWithoutPrefix)
 			};
 
 			var selectedFolder = (await StorageProvider.OpenFolderPickerAsync(folderPicker))?.SingleOrDefault()?.TryGetLocalPath();
@@ -90,13 +89,11 @@ namespace LibationAvalonia.Dialogs
 					FilePathCache.Insert(book);
 
 					var lb = context.GetLibraryBook_Flat_NoTracking(book.Id);
-					if (lb is not null && lb.Book?.UserDefinedItem.BookStatus is not LiberatedStatus.Liberated)
+					if (lb?.Book?.UserDefinedItem.BookStatus is not LiberatedStatus.Liberated)
 						await Task.Run(() => lb.UpdateBookStatus(LiberatedStatus.Liberated));
 
-					tokenSource.Token.ThrowIfCancellationRequested();
 					FileFound?.Invoke(this, book);
 				}
-				catch (OperationCanceledException) { }
 				catch (Exception ex)
 				{
 					Serilog.Log.Error(ex, "Error adding found audiobook file to Libation. {@audioFile}", book);

Source/LibationAvalonia/Dialogs/Login/AvaloniaLoginCallback.cs

@@ -1,7 +1,5 @@
 using AudibleApi;
 using AudibleUtilities;
-using Avalonia.Threading;
-using LibationUiBase.Forms;
 using System.Threading.Tasks;
 
 namespace LibationAvalonia.Dialogs.Login
@@ -18,46 +16,42 @@ namespace LibationAvalonia.Dialogs.Login
 		}
 
 		public async Task<string> Get2faCodeAsync(string prompt)
-			=> await Dispatcher.UIThread.InvokeAsync(async () =>
 		{
 			var dialog = new _2faCodeDialog(prompt);
 			if (await dialog.ShowDialogAsync() is DialogResult.OK)
 				return dialog.Code;
+
 			return null;
-			});
+		}
 
 		public async Task<(string password, string guess)> GetCaptchaAnswerAsync(string password, byte[] captchaImage)
-			=> await Dispatcher.UIThread.InvokeAsync(async () =>
 		{
 			var dialog = new CaptchaDialog(password, captchaImage);
 			if (await dialog.ShowDialogAsync() is DialogResult.OK)
 				return (dialog.Password, dialog.Answer);
 			return (null, null);
-			});
+		}
 
 		public async Task<(string name, string value)> GetMfaChoiceAsync(MfaConfig mfaConfig)
-			=> await Dispatcher.UIThread.InvokeAsync(async () =>
 		{
 			var dialog = new MfaDialog(mfaConfig);
 			if (await dialog.ShowDialogAsync() is DialogResult.OK)
 				return (dialog.SelectedName, dialog.SelectedValue);
 			return (null, null);
-			});
+		}
 
 		public async Task<(string email, string password)> GetLoginAsync()
-			=> await Dispatcher.UIThread.InvokeAsync(async () =>
 		{
 			var dialog = new LoginCallbackDialog(_account);
 			if (await dialog.ShowDialogAsync() is DialogResult.OK)
 				return (_account.AccountId, dialog.Password);
 			return (null, null);
-			});
+		}
 
 		public async Task ShowApprovalNeededAsync()
-			=> await Dispatcher.UIThread.InvokeAsync(async () =>
 		{
 			var dialog = new ApprovalNeededDialog();
 			await dialog.ShowDialogAsync();
-			});
+		}
 	}
 }

Source/LibationAvalonia/Dialogs/Login/AvaloniaLoginChoiceEager.cs

@@ -1,8 +1,6 @@
 using AudibleApi;
 using AudibleUtilities;
-using Avalonia.Threading;
 using LibationFileManager;
-using LibationUiBase.Forms;
 using System;
 using System.Threading.Tasks;
 
@@ -22,9 +20,6 @@ namespace LibationAvalonia.Dialogs.Login
 		}
 
 		public async Task<ChoiceOut?> StartAsync(ChoiceIn choiceIn)
-			=> await Dispatcher.UIThread.InvokeAsync(() => StartAsyncInternal(choiceIn));
-
-		private async Task<ChoiceOut?> StartAsyncInternal(ChoiceIn choiceIn)
 		{
 			if (Configuration.IsWindows && Environment.OSVersion.Version.Major >= 10)
 			{

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

@@ -1,7 +1,6 @@
 using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Data;
-using LibationUiBase.Forms;
 using ReactiveUI;
 using System.Collections.Generic;
 using System.Linq;

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

@@ -1,6 +1,5 @@
 using Avalonia.Controls;
 using Dinah.Core;
-using LibationUiBase.Forms;
 using System;
 
 namespace LibationAvalonia.Dialogs.Login

Source/LibationAvalonia/Dialogs/MessageBoxAlertAdminDialog.axaml.cs

@@ -1,7 +1,6 @@
 using Avalonia.Controls;
 using Dinah.Core;
 using FileManager;
-using LibationUiBase.Forms;
 using System;
 
 namespace LibationAvalonia.Dialogs

Source/LibationAvalonia/Dialogs/MessageBoxWindow.axaml

@@ -1,13 +1,12 @@
 <Window xmlns="https://github.com/avaloniaui"
 		xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
 		xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-		xmlns:vm="clr-namespace:LibationAvalonia.ViewModels.Dialogs"
+		xmlns:vm="clr-namespace:LibationAvalonia.ViewModels"
 		xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         mc:Ignorable="d" d:DesignWidth="265" d:DesignHeight="110"
 		MinWidth="265" MinHeight="110"
-		x:DataType="vm:MessageBoxViewModel"
         x:Class="LibationAvalonia.Dialogs.MessageBoxWindow"
-        Title="{CompiledBinding Caption}" ShowInTaskbar="True">
+        Title="{Binding Caption}" ShowInTaskbar="True">
 	
 	<Grid ColumnDefinitions="*" RowDefinitions="*,Auto">
 		
@@ -16,21 +15,13 @@
 				VerticalAlignment="Top">
 			
 				<Panel Height="32" Width="32" Grid.Column="0" Margin="5,0,5,0" VerticalAlignment="Top">				
-					<Panel.IsVisible>
-						<MultiBinding Converter="{x:Static BoolConverters.Or}">
-							<CompiledBinding Path="IsAsterisk" />
-							<CompiledBinding Path="IsError" />
-							<CompiledBinding Path="IsQuestion" />
-							<CompiledBinding Path="IsExclamation" />
-						</MultiBinding>
-					</Panel.IsVisible>
-					<Image IsVisible="{CompiledBinding IsAsterisk}" Stretch="Uniform" Source="/Assets/MBIcons/Asterisk_64.png"/>
-					<Image IsVisible="{CompiledBinding IsError}" Stretch="Uniform" Source="/Assets/MBIcons/Error_64.png"/>
-					<Image IsVisible="{CompiledBinding IsQuestion}" Stretch="Uniform" Source="/Assets/MBIcons/Question_64.png"/>
-					<Image IsVisible="{CompiledBinding IsExclamation}" Stretch="Uniform" Source="/Assets/MBIcons/Exclamation_64.png"/>
+					<Image IsVisible="{Binding IsAsterisk}" Stretch="Uniform" Source="/Assets/MBIcons/Asterisk_64.png"/>
+					<Image IsVisible="{Binding IsError}" Stretch="Uniform" Source="/Assets/MBIcons/Error_64.png"/>
+					<Image IsVisible="{Binding IsQuestion}" Stretch="Uniform" Source="/Assets/MBIcons/Question_64.png"/>
+					<Image IsVisible="{Binding IsExclamation}" Stretch="Uniform" Source="/Assets/MBIcons/Exclamation_64.png"/>
 				</Panel>
 			
-				<TextBlock Margin="5,0,0,0" Name="messageTextBlock" MinHeight="45" MinWidth="193" TextWrapping="WrapWithOverflow" HorizontalAlignment="Left" VerticalAlignment="Top" FontSize="12" Text="{CompiledBinding Message}" />
+				<TextBlock Margin="5,0,0,0" Name="messageTextBlock" MinHeight="45" MinWidth="193" TextWrapping="WrapWithOverflow" HorizontalAlignment="Left" VerticalAlignment="Top" FontSize="12" Text="{Binding Message}" />
 
 			</StackPanel>
 		</DockPanel>
@@ -44,13 +35,13 @@
 			</DockPanel.Styles>
 			<StackPanel Orientation="Horizontal" HorizontalAlignment="Right" Margin="5" DockPanel.Dock="Bottom">
 				<Button Grid.Column="0" MinWidth="75" MinHeight="28" Name="Button1" Click="Button1_Click" Margin="5">
-					<TextBlock VerticalAlignment="Center" HorizontalAlignment="Center" Text="{CompiledBinding Button1Text}"/>
+					<TextBlock VerticalAlignment="Center" HorizontalAlignment="Center" Text="{Binding Button1Text}"/>
 				</Button>
-				<Button Grid.Column="1" IsVisible="{CompiledBinding HasButton2}" MinWidth="75" MinHeight="28" Name="Button2" Click="Button2_Click" Margin="5">
-					<TextBlock VerticalAlignment="Center" HorizontalAlignment="Center" Text="{CompiledBinding Button2Text}"/>
+				<Button Grid.Column="1" IsVisible="{Binding HasButton2}" MinWidth="75" MinHeight="28" Name="Button2" Click="Button2_Click" Margin="5">
+					<TextBlock VerticalAlignment="Center" HorizontalAlignment="Center" Text="{Binding Button2Text}"/>
 				</Button>
-				<Button Grid.Column="2" IsVisible="{CompiledBinding HasButton3}" MinWidth="75" MinHeight="28" Name="Button3" Click="Button3_Click" Margin="5">
-					<TextBlock VerticalAlignment="Center" HorizontalAlignment="Center" Text="{CompiledBinding Button3Text}"/>
+				<Button Grid.Column="2" IsVisible="{Binding HasButton3}" MinWidth="75" MinHeight="28" Name="Button3" Click="Button3_Click" Margin="5">
+					<TextBlock VerticalAlignment="Center" HorizontalAlignment="Center" Text="{Binding Button3Text}"/>
 				</Button>
 			</StackPanel>
 		</DockPanel>

Source/LibationAvalonia/Dialogs/MessageBoxWindow.axaml.cs

@@ -1,5 +1,4 @@
 using LibationAvalonia.ViewModels.Dialogs;
-using LibationUiBase.Forms;
 
 namespace LibationAvalonia.Dialogs
 {

Source/LibationAvalonia/Dialogs/ScanAccountsDialog.axaml.cs

@@ -1,6 +1,6 @@
 using AudibleUtilities;
 using Avalonia.Controls;
-using LibationUiBase.Forms;
+using Avalonia.Interactivity;
 using System.Collections;
 using System.Collections.Generic;
 using System.Linq;

Source/LibationAvalonia/Dialogs/SearchSyntaxDialog.axaml

@@ -2,73 +2,71 @@
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-		xmlns:dialogs="clr-namespace:LibationAvalonia.Dialogs"
-		x:DataType="dialogs:SearchSyntaxDialog"
-        mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="50"
-		MinWidth="500" MinHeight="650"
+        mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="650"
+		MinWidth="800" MinHeight="650"
+		MaxWidth="800" MaxHeight="650"
 		Width="800" Height="650"
         x:Class="LibationAvalonia.Dialogs.SearchSyntaxDialog"
         Title="Filter Options"
 		WindowStartupLocation="CenterOwner">
 
 	<Grid
-		RowDefinitions="Auto,*"
-		ColumnDefinitions="*,*,*,*">
+		Margin="10,0,10,10"
+		RowDefinitions="Auto,Auto,*"
+		ColumnDefinitions="Auto,Auto,Auto,Auto">
 
 		<Grid.Styles>
-			<Style Selector="Grid > Grid">
-				<Setter Property="Margin" Value="10,0" />
-			</Style>
-			<Style Selector="Grid > TextBlock">
-				<Setter Property="TextWrapping" Value="Wrap" />
-			</Style>
 			<Style Selector="TextBlock">
 				<Setter Property="FontSize" Value="12" />
-				<Setter Property="Margin" Value="0,5" />
-			</Style>
-			<Style Selector="ListBox">
-				<Setter Property="Margin" Value="0,5,0,10"/>
-				<Style Selector="^ > ListBoxItem">
-					<Setter Property="Padding" Value="0"/>
-					<Style Selector="^ TextBlock">
-						<Setter Property="Margin" Value="8,1"/>
-					</Style>
-				</Style>
+				<Setter Property="Margin" Value="10" />
 			</Style>
 		</Grid.Styles>
 
-		<Grid
+	    <TextBlock
+			Grid.Row="0"
+			Grid.Column="0"
 			Grid.ColumnSpan="4"
-			RowDefinitions="Auto,Auto">
+			Text="Full Lucene query syntax is supported&#xa;Fields with similar names are synomyns (eg: Author, Authors, AuthorNames)&#xa;&#xa;TAG FORMAT: [tagName]" />
 		
 	    <TextBlock
-				Text="Full Lucene query syntax is supported&#xa;Fields with similar names are synomyns (eg: Author, Authors, AuthorNames)" />
+			Grid.Row="1"
+			Grid.Column="0"
+			Text="STRING FIELDS" />
 		
-			<TextBlock Grid.Row="1" Text="TAG FORMAT: [tagName]" />
-		</Grid>
+	    <TextBlock
+			Grid.Row="1"
+			Grid.Column="1"
+			Text="NUMBER FIELDS" />		
 		
-		<Grid Grid.Row="1" RowDefinitions="Auto,Auto,*">
-			<TextBlock Text="STRING FIELDS" />
-			<TextBlock Grid.Row="1" Text="{CompiledBinding StringUsage}" />
-			<ListBox Grid.Row="2" ItemsSource="{CompiledBinding StringFields}"/>
-		</Grid>
+	    <TextBlock
+			Grid.Row="1"
+			Grid.Column="2"
+			Text="BOOLEAN (TRUE/FALSE) FIELDS" />		
 		
-		<Grid Grid.Row="1" Grid.Column="1" RowDefinitions="Auto,Auto,*">
-			<TextBlock Text="NUMBER FIELDS" />
-			<TextBlock Grid.Row="1" Text="{CompiledBinding NumberUsage}" />
-			<ListBox Grid.Row="2" ItemsSource="{CompiledBinding NumberFields}"/>
-		</Grid>
+	    <TextBlock
+			Grid.Row="1"
+			Grid.Column="3"
+			Text="ID FIELDS" />
 		
-		<Grid Grid.Row="1" Grid.Column="2" RowDefinitions="Auto,Auto,*">
-			<TextBlock Text="BOOLEAN (TRUE/FALSE) FIELDS" />
-			<TextBlock Grid.Row="1" Text="{CompiledBinding BoolUsage}" />
-			<ListBox Grid.Row="2" ItemsSource="{CompiledBinding BoolFields}"/>
-		</Grid>
+	    <TextBlock
+			Grid.Row="2"
+			Grid.Column="0"
+			Text="{Binding StringFields}" />
+		
+	    <TextBlock
+			Grid.Row="2"
+			Grid.Column="1"
+			Text="{Binding NumberFields}" />		
+		
+	    <TextBlock
+			Grid.Row="2"
+			Grid.Column="2"
+			Text="{Binding BoolFields}" />		
+		
+	    <TextBlock
+			Grid.Row="2"
+			Grid.Column="3"
+			Text="{Binding IdFields}" />
 		
-		<Grid Grid.Row="1" Grid.Column="3" RowDefinitions="Auto,Auto,*">
-			<TextBlock Text="ID FIELDS" />
-			<TextBlock Grid.Row="1" Text="{CompiledBinding IdUsage}" />
-			<ListBox Grid.Row="2" ItemsSource="{CompiledBinding IdFields}"/>
-		</Grid>		
 	</Grid>
 </Window>