New feature #469 - <language> and <language short> template options

Bump docker/build-push-action from 3 to 4

.github/dependabot.yml

@@ -0,0 +1,8 @@
+---
+version: 2
+updates:
+  # Maintain dependencies for GitHub Actions
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "daily"

.github/workflows/build-linux.yml

@@ -0,0 +1,81 @@
+# build-linux.yml
+# Reusable workflow that builds the Linux and MacOS versions of Libation.
+---
+name: build
+
+on:
+  workflow_call:
+    inputs:
+      version_override:
+        type: string
+        description: 'Version number override'
+        required: false
+      run_unit_tests:
+        type: boolean
+        description: 'Skip running unit tests'
+        required: false
+        default: true
+
+env:
+  DOTNET_CONFIGURATION: 'Release'
+  DOTNET_VERSION: '7.0.x'
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        os: [Linux, MacOS]
+        ui: [Avalonia]
+        release_name: [chardonnay]
+    steps:
+      - uses: actions/checkout@v3
+      - name: Setup .NET
+        uses: actions/setup-dotnet@v3
+        with:
+          dotnet-version: ${{ env.DOTNET_VERSION }}
+        env:
+          NUGET_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Get version
+        id: get_version
+        run: |
+          inputVersion="${{ inputs.version_override }}"
+          if [[ "${#inputVersion}" -gt 0 ]]
+          then
+            version="${inputVersion}"
+          else
+            version="$(grep -oP '(?<=<Version>).*(?=</Version)' ./Source/AppScaffolding/AppScaffolding.csproj)"
+          fi
+          echo "version=${version}" >> "${GITHUB_OUTPUT}"
+
+      - name: Unit test
+        if: ${{ inputs.run_unit_tests }}
+        working-directory: ./Source
+        run: dotnet test
+
+      - name: Publish
+        working-directory: ./Source
+        run: |
+          dotnet publish -c ${{ env.DOTNET_CONFIGURATION }} -o bin/Publish/${{ matrix.os }}-${{ matrix.release_name }} Libation${{ matrix.ui }}/Libation${{ matrix.ui }}.csproj -p:PublishProfile=Libation${{ matrix.ui }}/Properties/PublishProfiles/${{ matrix.os }}Profile.pubxml
+          dotnet publish -c ${{ env.DOTNET_CONFIGURATION }} -o bin/Publish/${{ matrix.os }}-${{ matrix.release_name }} LoadByOS/${{ matrix.os }}ConfigApp/${{ matrix.os }}ConfigApp.csproj -p:PublishProfile=LoadByOS/Properties/${{ matrix.os }}ConfigApp/PublishProfiles/${{ matrix.os }}Profile.pubxml
+          dotnet publish -c ${{ env.DOTNET_CONFIGURATION }} -o bin/Publish/${{ matrix.os }}-${{ matrix.release_name }} LibationCli/LibationCli.csproj -p:PublishProfile=LibationCli/Properties/PublishProfiles/${{ matrix.os }}Profile.pubxml
+          dotnet publish -c ${{ env.DOTNET_CONFIGURATION }} -o bin/Publish/${{ matrix.os }}-${{ matrix.release_name }} Hangover${{ matrix.ui }}/Hangover${{ matrix.ui }}.csproj -p:PublishProfile=Hangover${{ matrix.ui }}/Properties/PublishProfiles/${{ matrix.os }}Profile.pubxml
+
+      - name: Zip artifact
+        id: zip
+        working-directory: ./Source/bin/Publish/${{ matrix.os }}-${{ matrix.release_name }}
+        run: |
+          delfiles=("libmp3lame.x86.dll" "libmp3lame.x64.dll" "ffmpegaac.x86.dll" "ffmpegaac.x64.dll" "ZipExtractor.exe")
+          for n in "${delfiles[@]}"; do rm "$n"; done
+          osbuild="$(echo '${{ matrix.os }}' | tr '[:upper:]' '[:lower:]')"
+          artifact="Libation.${{ steps.get_version.outputs.version }}-${osbuild}-${{ matrix.release_name }}"
+          echo "artifact=${artifact}" >> "${GITHUB_OUTPUT}"
+          tar -zcvf "../${artifact}.tar.gz" .
+
+      - name: Publish artifact
+        uses: actions/upload-artifact@v3
+        with:
+          name: ${{ steps.zip.outputs.artifact }}.tar.gz
+          path: ./Source/bin/Publish/${{ steps.zip.outputs.artifact }}.tar.gz
+          if-no-files-found: error

.github/workflows/build-windows.yml

@@ -0,0 +1,85 @@
+# build-windows.yml
+# Reusable workflow that builds the Windows versions of Libation.
+---
+name: build
+
+on:
+  workflow_call:
+    inputs:
+      version_override:
+        type: string
+        description: 'Version number override'
+        required: false
+      run_unit_tests:
+        type: boolean
+        description: 'Skip running unit tests'
+        required: false
+        default: true
+
+env:
+  DOTNET_CONFIGURATION: 'Release'
+  DOTNET_VERSION: '7.0.x'
+
+jobs:
+  build:
+    runs-on: windows-latest
+    strategy:
+      matrix:
+        os: [Windows]
+        ui: [Avalonia]
+        release_name: [chardonnay]
+        include:
+          - os: Windows
+            ui: WinForms
+            release_name: classic
+            prefix: Classic-
+    steps:
+      - uses: actions/checkout@v3
+      - name: Setup .NET
+        uses: actions/setup-dotnet@v3
+        with:
+          dotnet-version: ${{ env.DOTNET_VERSION }}
+        env:
+          NUGET_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Get version
+        id: get_version
+        run: |
+          if ("${{ inputs.version_override }}".length -gt 0) {
+            $version = "${{ inputs.version_override }}"
+          } else {
+            $version = (Select-Xml -Path "./Source/AppScaffolding/AppScaffolding.csproj" -XPath "/Project/PropertyGroup/Version").Node.InnerXML.Trim()
+          }
+          "version=$version" >> $env:GITHUB_OUTPUT
+
+      - name: Unit test
+        if: ${{ inputs.run_unit_tests }}
+        working-directory: ./Source
+        run: dotnet test
+
+      - name: Publish
+        working-directory: ./Source
+        run: |
+          dotnet publish -c ${{ env.DOTNET_CONFIGURATION }} -o bin/Publish/${{ matrix.os }}-${{ matrix.release_name }} Libation${{ matrix.ui }}/Libation${{ matrix.ui }}.csproj -p:PublishProfile=Libation${{ matrix.ui }}/Properties/PublishProfiles/${{ matrix.os }}Profile.pubxml
+          dotnet publish -c ${{ env.DOTNET_CONFIGURATION }} -o bin/Publish/${{ matrix.os }}-${{ matrix.release_name }} LoadByOS/${{ matrix.os }}ConfigApp/${{ matrix.os }}ConfigApp.csproj -p:PublishProfile=LoadByOS/Properties/${{ matrix.os }}ConfigApp/PublishProfiles/${{ matrix.os }}Profile.pubxml
+          dotnet publish -c ${{ env.DOTNET_CONFIGURATION }} -o bin/Publish/${{ matrix.os }}-${{ matrix.release_name }} LibationCli/LibationCli.csproj -p:PublishProfile=LibationCli/Properties/PublishProfiles/${{ matrix.os }}Profile.pubxml
+          dotnet publish -c ${{ env.DOTNET_CONFIGURATION }} -o bin/Publish/${{ matrix.os }}-${{ matrix.release_name }} Hangover${{ matrix.ui }}/Hangover${{ matrix.ui }}.csproj -p:PublishProfile=Hangover${{ matrix.ui }}/Properties/PublishProfiles/${{ matrix.os }}Profile.pubxml
+
+      - name: Zip artifact
+        id: zip
+        working-directory: ./Source/bin/Publish
+        run: |
+          $dir = "${{ matrix.os }}-${{ matrix.release_name }}\"
+          $delfiles = @("libmp3lame.so", "ffmpegaac.so", "glass-with-glow_256.svg", "Libation.desktop")
+          foreach ($file in $delfiles){ if (test-path $dir$file){ Remove-Item $dir$file } }
+          $artifact="${{ matrix.prefix }}Libation.${{ steps.get_version.outputs.version }}-" + "${{ matrix.os }}".ToLower() + "-${{ matrix.release_name }}"
+          "artifact=$artifact" >> $env:GITHUB_OUTPUT
+          Compress-Archive -Path "${dir}*" -DestinationPath "$artifact.zip"
+
+      - name: Publish artifact
+        uses: actions/upload-artifact@v3
+        with:
+          name: ${{ steps.zip.outputs.artifact }}.zip
+          path: ./Source/bin/Publish/${{ steps.zip.outputs.artifact }}.zip
+          if-no-files-found: error
+          

.github/workflows/build.yml

@@ -0,0 +1,30 @@
+# build.yml
+# Reusable workflow that builds Libation for all platforms.
+---
+name: build
+
+on:
+  workflow_call:
+    inputs:
+      version_override:
+        type: string
+        description: 'Version number override'
+        required: false
+      run_unit_tests:
+        type: boolean
+        description: 'Skip running unit tests'
+        required: false
+        default: true        
+
+jobs:
+  windows:
+    uses: ./.github/workflows/build-windows.yml
+    with:
+      version_override: ${{ inputs.version_override }}
+      run_unit_tests: ${{ inputs.run_unit_tests }}
+
+  linux:
+    uses: ./.github/workflows/build-linux.yml
+    with:
+      version_override: ${{ inputs.version_override }}
+      run_unit_tests: ${{ inputs.run_unit_tests }}     

.github/workflows/deb.yml

@@ -0,0 +1,38 @@
+# deb.yml
+# Reusable workflow that builds the Linux Debian package.
+---
+name: deb
+
+on:
+  workflow_call:
+    inputs:
+      version:
+        type: string
+        description: 'Version number'
+        required: true
+
+env:
+  FILE_NAME: "Libation.${{ inputs.version }}-linux-chardonnay"
+  
+jobs:
+  build_deb:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      
+      - name: Download Artifact
+        uses: actions/download-artifact@v3
+        with:
+          name: "${{ env.FILE_NAME }}.tar.gz"
+
+      - name: Build .deb
+        id: deb
+        run: |
+          ./Scripts/targz2deb.sh "${{ env.FILE_NAME }}.tar.gz" ${{ inputs.version }}
+      
+      - name: Publish .deb
+        uses: actions/upload-artifact@v3
+        with:
+          name: ${{ env.FILE_NAME }}.deb
+          path: ${{ env.FILE_NAME }}.deb
+          if-no-files-found: error

.github/workflows/docker.yml

@@ -0,0 +1,46 @@
+# docker.yml
+# Reusable workflow that builds a docker image for Libation.
+---
+name: docker
+
+on:
+  workflow_call:
+    inputs:
+      version:
+        type: string
+        description: 'Version number'
+        required: true
+    secrets:
+      docker_username:
+        required: true
+      docker_token:
+        required: true
+
+env:
+  DOCKER_IMAGE: ${{ secrets.docker_username }}/libation
+
+jobs:
+  docker:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+
+      - name: Login to Docker Hub
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.docker_username }}
+          password: ${{ secrets.docker_token }}
+
+      - name: Build and push
+        uses: docker/build-push-action@v4
+        with:
+          push: true
+          build-args: 'FOLDER_NAME=Linux-chardonnay'
+          tags: ${{ env.DOCKER_IMAGE }}:latest,${{ env.DOCKER_IMAGE }}:${{ inputs.version }}

.github/workflows/release.yml

@@ -0,0 +1,67 @@
+# release.yml
+# Builds and creates the release on any tags starting with a `v`
+---
+name: release
+on:
+  push:
+    tags:
+      - 'v*'
+jobs:
+  prerelease:
+    runs-on: ubuntu-latest
+    outputs:
+      version: ${{ steps.get_version.outputs.version }}
+    steps:
+      - name: Get tag version
+        id: get_version
+        run: |
+          export TAG='${{ github.ref_name }}'
+          echo "version=${TAG#v}" >> "${GITHUB_OUTPUT}"
+
+  docker:
+    needs: [prerelease]
+    uses: ./.github/workflows/docker.yml
+    with:
+      version: ${{ needs.prerelease.outputs.version }}
+    secrets:
+      docker_username: ${{ secrets.DOCKERHUB_USERNAME }}
+      docker_token: ${{ secrets.DOCKERHUB_TOKEN }}
+
+  build:
+    needs: [prerelease]
+    uses: ./.github/workflows/build.yml
+    with:
+      version_override: ${{ needs.prerelease.outputs.version }}
+      run_unit_tests: false
+
+  deb:
+    needs: [prerelease,build]
+    uses: ./.github/workflows/deb.yml
+    with:
+      version: ${{ needs.prerelease.outputs.version }}
+      
+  release:
+    needs: [prerelease,build,deb]
+    runs-on: ubuntu-latest
+    steps:
+      - name: Download artifacts
+        uses: actions/download-artifact@v3
+        with:
+          path: artifacts
+
+      - name: Release
+        id: release
+        uses: softprops/action-gh-release@v1
+        with:
+          name: Libation ${{ needs.prerelease.outputs.version }}
+          body: <Put a body here>
+          draft: true
+          prerelease: false
+
+      - name: Upload release assets
+        uses: dwenegar/upload-release-assets@v1
+        env:
+          GITHUB_TOKEN: '${{ secrets.GITHUB_TOKEN }}'
+        with:
+          release_id: '${{ steps.release.outputs.id }}'
+          assets_path: ./artifacts

.github/workflows/validate.yml

@@ -0,0 +1,14 @@
+# validate.yml
+# Validates that Libation will build on a pull request or push to master. 
+---
+name: validate
+
+on:
+  push:
+    branches: [master]
+  pull_request:
+    branches: [master]
+
+jobs:
+  build:
+    uses: ./.github/workflows/build.yml

.releaseindex.json

@@ -1,6 +1,6 @@
 {
-   "WindowsClassic": "Libation\\.\\d+\\.\\d+\\.\\d+-win-classic\\.zip",
-   "WindowsAvalonia":"Libation\\.\\d+\\.\\d+\\.\\d+-win-chardonnay\\.zip",
-   "LinuxAvalonia":  "Libation\\.\\d+\\.\\d+\\.\\d+-linux-chardonnay",
-   "MacOSAvalonia":  "Libation\\.\\d+\\.\\d+\\.\\d+-macos-chardonnay"
+  "WindowsClassic":  "Libation\\.\\d+\\.\\d+\\.\\d+-win(dows)?-classic\\.zip",
+  "WindowsAvalonia": "Libation\\.\\d+\\.\\d+\\.\\d+-win(dows)?-chardonnay\\.zip",
+  "LinuxAvalonia":   "Libation\\.\\d+\\.\\d+\\.\\d+-linux-chardonnay",
+  "MacOSAvalonia":   "Libation\\.\\d+\\.\\d+\\.\\d+-macos-chardonnay"
 }

Docker/liberate.sh

@@ -0,0 +1,68 @@
+#!/bin/bash
+
+# Rewire echo to print date time
+echo() {
+    if [[ -n $1  ]]; then
+        printf "$(date '+%F %T'): %s\n" "$1"
+    fi
+}
+
+# ################################
+# Setup
+# ################################
+echo "Starting"
+if [[ -z "${SLEEP_TIME}" ]]; then
+  echo "No sleep time passed in. Will run once and exit."
+else
+  echo "Sleep time is set to ${SLEEP_TIME}"
+fi
+
+echo ""
+
+# Check if the config directory is passed in, and there is no link to it then create the link.
+if [ -d "/config" ] && [ ! -d "/root/Libation" ]; then
+    echo "Linking config directory to the Libation config directory"
+    ln -s /config/ /root/Libation
+fi
+
+# If no config error and exit
+if [ ! -d "/config" ]; then
+    echo "ERROR: No /config directory. You must pass in a volume containing your config mapped to /config"
+    exit 1
+fi
+
+# If user passes in db from a /db/ folder and a db does not already exist / is not already linked
+FILE=/db/LibationContext.db
+if [ -f "${FILE}" ] && [ ! -f "/config/LibationContext.db" ]; then
+    echo "Linking passed in Libation database from /db/ to the Libation config directory"
+    ln -s $FILE /config/LibationContext.db
+fi
+
+# Confirm we have a db in the config direcotry.
+if [ ! -f "/config/LibationContext.db" ]; then
+    echo "ERROR: No Libation database detected, exiting."
+    exit 1
+fi
+
+# ################################
+# Loop and liberate
+# ################################
+while true
+do
+    echo ""
+    echo "Scanning accounts"
+    /libation/LibationCli scan
+    echo "Liberating books"
+    /libation/LibationCli liberate
+    echo ""
+    
+    # Liberate only once if SLEEP_TIME was set to -1
+    if [ "${SLEEP_TIME}" = -1 ]; then
+      break  
+    fi
+
+    echo "Sleeping for ${SLEEP_TIME}"
+    sleep "${SLEEP_TIME}"
+done
+
+echo "Exiting"

Dockerfile

@@ -0,0 +1,22 @@
+# Dockerfile
+FROM mcr.microsoft.com/dotnet/sdk:7.0 as build-env
+
+COPY Source /Source
+RUN dotnet publish -c Release -o /Source/bin/Publish/Linux-chardonnay /Source/LibationCli/LibationCli.csproj -p:PublishProfile=/Source/LibationCli/Properties/PublishProfiles/LinuxProfile.pubxml
+COPY Docker/liberate.sh /Source/bin/Publish/Linux-chardonnay
+
+
+FROM mcr.microsoft.com/dotnet/runtime:7.0
+
+ENV SLEEP_TIME "30m"
+
+# Sets the character set that will be used for folder and filenames when liberating
+ENV LANG C.UTF-8
+ENV LC_ALL C.UTF-8
+
+RUN mkdir /db /config /data
+
+COPY --from=build-env /Source/bin/Publish/Linux-chardonnay /libation
+
+
+CMD ["./libation/liberate.sh"]

Documentation/Advanced.md

@@ -8,7 +8,6 @@
 # Advanced: Table of Contents
 
 - [Files and folders](#files-and-folders)
-- [Linux and Mac (unofficial)](#linux-and-mac)
 - [Settings](#settings)
 - [Custom File Naming](#custom-file-naming)
 - [Command Line Interface](#command-line-interface)
@@ -25,10 +24,6 @@ To make upgrades and reinstalls easier, Libation separates all of its responsibi
 
 * The last important folder is the "books location." This is where Libation looks for your downloaded and decrypted books. This is how it knows which books still need to be downloaded. The Audible id must be somewhere in the book's file or folder name for Libation to detect your downloaded book.
 
-### Linux and Mac
-
-Although Libation only currently officially supports Windows, some users have had success with WINE. ([Linux](https://github.com/rmcrackan/Libation/issues/28#issuecomment-890594158), [OSX Crossover and WINE](https://github.com/rmcrackan/Libation/issues/150#issuecomment-1004918592), [Linux and WINE](https://github.com/rmcrackan/Libation/issues/28#issuecomment-1161111014))
-
 ### Settings
 
 * Allow Libation to fix up audiobook metadata. After decrypting a title, Libation attempts to fix details like chapters and cover art. Some power users and/or control freaks prefer to manage this themselves. By unchecking this setting, Libation will only decrypt the book and will leave metadata as-is, warts and all.
@@ -76,4 +71,15 @@ export library to file
   libationcli export -p "C:\foo\bar\my.csv" -c
   libationcli export -p "C:\foo\bar\my.xlsx" --xlsx
   libationcli export -p "C:\foo\bar\my.xlsx" -x
+
+Set download statuses throughout library based on whether each book's audio file can be found.   
+Must include at least one flag: --downloaded , --not-downloaded.  
+Downloaded: If the audio file can be found, set download status to 'Downloaded'.  
+Not Downloaded: If the audio file cannot be found, set download status to 'Not Downloaded'  
+UI: Visible Books \> Set 'Downloaded' status automatically. Visible books. Prompts before saving changes  
+CLI: Full library. No prompt
+
+  libationcli set-status -d
+  libationcli set-status -n
+  libationcli set-status -d -n
 ```

Documentation/Docker.md

@@ -0,0 +1,36 @@
+## [Download Libation](https://github.com/rmcrackan/Libation/releases/latest)
+
+### If you found this useful, tell a friend. If you found this REALLY useful, you can click here to [PalPal.me](https://paypal.me/mcrackan?locale.x=en_us)
+...or just tell more friends. As long as I'm maintaining this software, it will remain **free** and **open source**.
+
+
+### Setup
+In order to use the docker image, you'll need to provide it with a copy of the `AccountsSettings.json`, `Settings.json`, and `LibationContext.db` files. These files can usually be found in the Libation folder in your user's home directory. If you haven't run Libation yet, you'll need to launch it to generate these files and setup your accounts. Once you have them, copy these files to a new location, such as `/opt/libation/config`. Before using them we'll need to make a couple edits so that the filepaths referenced are correct when running from the docker image.
+
+In Settings.json, make the following changes:
+* Change `Books` to `/data`
+* Change `InProgress` to `/tmp`
+
+### Running
+Once the configuration files are copied and edited, the docker image can be run with the following command.
+```
+sudo docker run -d \
+  -v /opt/libation/config:/config \
+  -v /opt/libation/books:/data \
+  --name libation \
+  --restart=always \
+  rmcrackan/libation
+```
+
+By default the container will scan for new books every 30 minutes and download any new ones. This is configurable by passing in a value for the `SLEEP_TIME` environment variable. Additionally, if you pass in `-1` it will scan and download books once and then exit.
+
+```
+sudo docker run -d \
+  -v /opt/libation/config:/config \
+  -v /opt/libation/books:/data \
+  -e SLEEP_TIME='10m' \
+  --name libation \
+  --restart=always \
+  rmcrackan/libation
+```
+

Documentation/GettingStarted.md

@@ -22,7 +22,12 @@
 
 ### Installation
 
-To install Libation, extract the zip file to a folder, for example `C:\Libation`, and then run Libation.exe from that folder to begin the configuration process and configure your account(s).
+* Windows
+
+Extract the zip file to a folder and then run `Libation.exe` from inside of that folder. Do not put it in Program Files. The inability to edit files from there causes problems with configuration and updating.
+
+* [Ubuntu Linux](InstallOnLinux.md)
+* [MacOS](InstallOnMac.md)
 
 ### Create Accounts
 

Documentation/InstallOnLinux.md

@@ -0,0 +1,22 @@
+## [Download Libation](https://github.com/rmcrackan/Libation/releases/latest)
+
+### If you found this useful, tell a friend. If you found this REALLY useful, you can click here to [PalPal.me](https://paypal.me/mcrackan?locale.x=en_us)
+...or just tell more friends. As long as I'm maintaining this software, it will remain **free** and **open source**.
+
+
+### Install and Run Libation on Ubuntu
+
+New Libation releases are automatically packed into a debian package and are available from the Libation repository's releases page.
+
+Run this command in your terminal to dowbnload and install Libation, replacing the url with the Latest Libation .deb package url:
+
+```Console
+wget -O libation.deb https://github.com/rmcrackan/Libation/releases/download/vX.X.X/Libation.X.X.X-linux-chardonnay.deb &&
+sudo apt install ./libation.deb
+```
+
+You should now see Libation among your applications.
+
+Additionally, you may launch Libation, LibationCli, and Hangover (the Libation recovery app) via the command line using 'libation, libationcli', and 'hangover' aliases respectively.
+
+Report bugs to https://github.com/rmcrackan/Libation/issues

Documentation/InstallOnMac.md

@@ -0,0 +1,44 @@
+## [Download Libation](https://github.com/rmcrackan/Libation/releases/latest)
+
+### If you found this useful, tell a friend. If you found this REALLY useful, you can click here to [PalPal.me](https://paypal.me/mcrackan?locale.x=en_us)
+...or just tell more friends. As long as I'm maintaining this software, it will remain **free** and **open source**.
+
+
+
+# Run Libation on MacOS
+This walkthrough should get you up and running with Libation on your Mac.
+
+## Install Libation
+
+- Download latest MacOS zip to downloads folder
+- Extract and rename folder to Libation
+- in terminal type cd and then drag your folder of libation to terminal so it looks like `cd/users/YourName/Downloads/Libation`
+- Type following commands
+
+```console
+chmod +x ./Libation
+sudo spctl --add --label "Libation" ./Libation
+./Libation
+```
+
+## Trouble with Gatekeeper?
+
+If Gatekeeper is giving you trouble with Libation:
+
+Disable the block
+
+`sudo spctl --master-disable`
+
+Launch Libation and login, etc. and allow the rules to update then re-enable the block.
+
+`sudo spctl --master-enable`
+
+Once Gatekeeper reenabled, you can open Libation again without it being blocked.
+
+Thanks [joseph-holland](https://github.com/rmcrackan/Libation/issues/327#issuecomment-1268993349)!
+
+Report bugs to https://github.com/rmcrackan/Libation/issues
+
+## Get Libation running on Mac
+
+[Run Libation on MacOS](https://user-images.githubusercontent.com/37587114/213933357-983d8ede-2738-4b32-9c6e-40de21ff09c2.mp4)

README.md

@@ -14,7 +14,6 @@
 - [Getting started](Documentation/GettingStarted.md)
     - [Download Libation](Documentation/GettingStarted.md#download-libation-1)
     - [Installation](Documentation/GettingStarted.md#installation)
-    - [Installation on Ubuntu](Source/LibationAvalonia/README.md)
     - [Create Accounts](Documentation/GettingStarted.md#create-accounts)
     - [Import your library](Documentation/GettingStarted.md#import-your-library)
     - [Download your books -- DRM-free!](Documentation/GettingStarted.md#download-your-books----drm-free)
@@ -28,10 +27,10 @@
     - [Filters](Documentation/SearchingAndFiltering.md#filters)
 - [Advanced](Documentation/Advanced.md)
     - [Files and folders](Documentation/Advanced.md#files-and-folders)
-    - [Linux and Mac (unofficial)](Documentation/Advanced.md#linux-and-mac)
     - [Settings](Documentation/Advanced.md#settings)
     - [Custom File Naming](Documentation/Advanced.md#custom-file-naming)
     - [Command Line Interface](Documentation/Advanced.md#command-line-interface)
+- [Docker](Documentation/Docker.md)
 
 ## Getting started
 
@@ -55,7 +54,7 @@
 
 ### The bad
 
-* Windows only
+* Only fully supported in Windows. (Mac and Linux are in beta)
 * Large file size
 * Made by a programmer, not a designer so the goals are function rather than beauty. And it shows
 

Scripts/targz2deb.sh

@@ -0,0 +1,136 @@
+#!/bin/bash
+
+FILE=$1; shift
+VERSION=$1; shift
+
+if [ -z "$FILE" ]
+then
+  echo "This script must be called with a the Libation Linux bin zip file as an argument."
+  exit
+fi
+
+if [ ! -f "$FILE" ]
+then
+  echo "The file \"$FILE\" does not exist."
+  exit
+fi
+
+if [ -z "$VERSION" ]
+then
+  echo "This script must be called with the Libation version number as an argument."
+  exit
+fi
+
+contains() { case "$1" in *"$2"*) true ;; *) false ;; esac }
+
+if ! contains "$FILE" "$VERSION"
+then
+  echo "This script must be called with a Libation version number that is present in the filename passed."
+  exit
+fi
+
+# remove trailing ".tar.gz"
+FOLDER_MAIN=${FILE::-7}
+echo "Working dir: $FOLDER_MAIN"
+
+if [[ -d "$FOLDER_MAIN" ]]
+then
+  echo "$FOLDER_MAIN directory already exists, aborting."
+  exit
+fi
+
+FOLDER_EXEC="$FOLDER_MAIN/usr/lib/libation"
+echo "Exec dir: $FOLDER_EXEC"
+
+FOLDER_ICON="$FOLDER_MAIN/usr/share/icons/hicolor/scalable/apps/"
+echo "Icon dir: $FOLDER_ICON"
+
+FOLDER_DESKTOP="$FOLDER_MAIN/usr/share/applications"
+echo "Desktop dir: $FOLDER_DESKTOP"
+
+FOLDER_DEBIAN="$FOLDER_MAIN/DEBIAN"
+echo "Debian dir: $FOLDER_DEBIAN"
+
+mkdir -p "$FOLDER_EXEC"
+mkdir -p "$FOLDER_ICON"
+mkdir -p "$FOLDER_DESKTOP"
+mkdir -p "$FOLDER_DEBIAN"
+
+echo "Extracting $FILE to $FOLDER_EXEC..."
+tar -xzf ${FILE} -C ${FOLDER_EXEC}
+
+if [ $? -ne 0 ]
+ then echo "Error extracting ${FILE}"
+ exit
+fi
+
+echo "Copying icon..."
+cp "$FOLDER_EXEC/glass-with-glow_256.svg" "$FOLDER_ICON/libation.svg"
+
+echo "Copying desktop file..."
+cp "$FOLDER_EXEC/Libation.desktop" "$FOLDER_DESKTOP/Libation.desktop"
+
+echo "Workaround for desktop file..."
+sed -i '/^Exec=Libation/c\Exec=/usr/bin/libation' "$FOLDER_DESKTOP/Libation.desktop"
+
+echo "Creating pre-install file..."
+echo "#!/bin/bash
+
+# Pre-install script, removes previous installation program files and sym links
+
+echo \"Removing previously created symlinks...\"
+
+rm /usr/bin/libation
+rm /usr/bin/Libation
+rm /usr/bin/hangover
+rm /usr/bin/Hangover
+rm /usr/bin/libationcli
+rm /usr/bin/LibationCli
+
+echo \"Removing previously installed Libation files...\"
+
+rm -r /usr/lib/libation
+rm -r /usr/lib/Libation
+
+# making sure it won't stop installation
+exit 0
+" >> "$FOLDER_DEBIAN/preinst"
+
+echo "Creating post-install file..."
+echo "#!/bin/bash
+
+gtk-update-icon-cache -f /usr/share/icons/hicolor/
+
+ln -s /usr/lib/libation/Libation /usr/bin/libation
+ln -s /usr/lib/libation/Hangover /usr/bin/hangover
+ln -s /usr/lib/libation/LibationCli /usr/bin/libationcli
+
+# Increase the maximum number of inotify instances
+echo fs.inotify.max_user_instances=524288 | tee -a /etc/sysctl.conf && sysctl -p
+
+# workaround until this file is moved to the user's home directory
+touch /usr/lib/libation/appsettings.json
+chmod 666 /usr/lib/libation/appsettings.json
+" >> "$FOLDER_DEBIAN/postinst"
+
+echo "Creating control file..."
+echo "Package: Libation
+Version: $VERSION
+Architecture: all
+Essential: no
+Priority: optional
+Maintainer: github.com/rmcrackan
+Description: liberate your audiobooks
+" >> "$FOLDER_DEBIAN/control"
+
+echo "Changing permissions for pre- and post-install files..."
+chmod +x "$FOLDER_DEBIAN/preinst"
+chmod +x "$FOLDER_DEBIAN/postinst"
+
+echo "Creating .deb file..."
+dpkg-deb -Zxz --build $FOLDER_MAIN
+
+rm -r "$FOLDER_MAIN"
+
+echo "Done!"
+

Source/AaxDecrypter/AaxDecrypter.csproj

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

Source/AaxDecrypter/AaxcDownloadConvertBase.cs

@@ -1,7 +1,7 @@
-using System;
-using System.Threading.Tasks;
-using AAXClean;
+using AAXClean;
 using Dinah.Core.Net.Http;
+using System;
+using System.Threading.Tasks;
 
 namespace AaxDecrypter
 {
@@ -9,7 +9,23 @@ namespace AaxDecrypter
 	{
 		public event EventHandler<AppleTags> RetrievedMetadata;
 
-		protected AaxFile AaxFile;
+		protected AaxFile AaxFile { get; private set; }
+		private Mp4Operation aaxConversion;
+		protected Mp4Operation AaxConversion
+		{
+			get => aaxConversion;
+			set
+			{
+				if (aaxConversion is not null)
+					aaxConversion.ConversionProgressUpdate -= AaxFile_ConversionProgressUpdate;
+
+				if (value is not null)
+				{
+					aaxConversion = value;
+					aaxConversion.ConversionProgressUpdate += AaxFile_ConversionProgressUpdate;
+				}
+			}
+		}
 
 		protected AaxcDownloadConvertBase(string outFileName, string cacheDirectory, IDownloadOptions dlOptions)
 			: base(outFileName, cacheDirectory, dlOptions) { }
@@ -22,9 +38,23 @@ namespace AaxDecrypter
 				AaxFile.AppleTags.Cover = coverArt;
 		}
 
+		public override async Task CancelAsync()
+		{
+			IsCanceled = true;
+			await (AaxConversion?.CancelAsync() ?? Task.CompletedTask);
+			FinalizeDownload();
+		}
+
+		protected override void FinalizeDownload()
+		{
+			AaxConversion = null;
+			base.FinalizeDownload();
+		}
+
 		protected bool Step_GetMetadata()
 		{
 			AaxFile = new AaxFile(InputFileStream);
+			AaxFile.SetDecryptionKey(DownloadOptions.AudibleKey, DownloadOptions.AudibleIV);
 
 			if (DownloadOptions.StripUnabridged)
 			{
@@ -32,6 +62,9 @@ namespace AaxDecrypter
 				AaxFile.AppleTags.Album = AaxFile.AppleTags.Album?.Replace(" (Unabridged)", "");
 			}
 
+			if (DownloadOptions.FixupFile && !string.IsNullOrWhiteSpace(AaxFile.AppleTags.Narrator))
+				AaxFile.AppleTags.AppleListBox.EditOrAddTag("TCOM", AaxFile.AppleTags.Narrator);
+
 			//Finishing configuring lame encoder.
 			if (DownloadOptions.OutputFormat == OutputFormat.Mp3)
 				MpegUtil.ConfigureLameOptions(
@@ -40,7 +73,6 @@ namespace AaxDecrypter
 					DownloadOptions.Downsample,
 					DownloadOptions.MatchSourceBitrate);
 
-
 			OnRetrievedTitle(AaxFile.AppleTags.TitleSansUnabridged);
 			OnRetrievedAuthors(AaxFile.AppleTags.FirstAuthor ?? "[unknown]");
 			OnRetrievedNarrators(AaxFile.AppleTags.Narrator ?? "[unknown]");
@@ -51,40 +83,15 @@ namespace AaxDecrypter
 			return !IsCanceled;
 		}
 
-		protected DownloadProgress Step_DownloadAudiobook_Start()
+		private void AaxFile_ConversionProgressUpdate(object sender, ConversionProgressEventArgs e)
 		{
-			var zeroProgress = new DownloadProgress
-			{
-				BytesReceived = 0,
-				ProgressPercentage = 0,
-				TotalBytesToReceive = InputFileStream.Length
-			};
-
-			OnDecryptProgressUpdate(zeroProgress);
-
-			AaxFile.SetDecryptionKey(DownloadOptions.AudibleKey, DownloadOptions.AudibleIV);
-			return zeroProgress;
-		}
-
-		protected void Step_DownloadAudiobook_End(DownloadProgress zeroProgress)
-		{
-			AaxFile.Close();
-
-			CloseInputFileStream();
-
-			OnDecryptProgressUpdate(zeroProgress);
-		}
-
-		protected void AaxFile_ConversionProgressUpdate(object sender, ConversionProgressEventArgs e)
-		{
-			var duration = AaxFile.Duration;
-			var remainingSecsToProcess = (duration - e.ProcessPosition).TotalSeconds;
+			var remainingSecsToProcess = (e.TotalDuration - e.ProcessPosition).TotalSeconds;
 			var estTimeRemaining = remainingSecsToProcess / e.ProcessSpeed;
 
 			if (double.IsNormal(estTimeRemaining))
 				OnDecryptTimeRemaining(TimeSpan.FromSeconds(estTimeRemaining));
 
-			var progressPercent = (e.ProcessPosition / e.TotalDuration);
+			var progressPercent = e.ProcessPosition / e.TotalDuration;
 
 			OnDecryptProgressUpdate(
 				new DownloadProgress
@@ -94,14 +101,5 @@ namespace AaxDecrypter
 					TotalBytesToReceive = InputFileStream.Length
 				});
 		}
-
-		public override async Task CancelAsync()
-		{
-			IsCanceled = true;
-			if (AaxFile != null)
-				await AaxFile.CancelAsync();
-			AaxFile?.Dispose();
-			CloseInputFileStream();
-		}
 	}
 }

Source/AaxDecrypter/AaxcDownloadMultiConverter.cs

@@ -1,66 +1,24 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Threading.Tasks;
-using AAXClean;
+using AAXClean;
 using AAXClean.Codecs;
 using FileManager;
+using System;
+using System.IO;
+using System.Threading.Tasks;
 
 namespace AaxDecrypter
 {
 	public class AaxcDownloadMultiConverter : AaxcDownloadConvertBase
 	{
-		private static TimeSpan minChapterLength { get; } = TimeSpan.FromSeconds(3);
-		private List<string> multiPartFilePaths { get; } = new List<string>();
+		private static readonly TimeSpan minChapterLength = TimeSpan.FromSeconds(3);
+		private FileStream workingFileStream;
 
 		public AaxcDownloadMultiConverter(string outFileName, string cacheDirectory, IDownloadOptions dlOptions)
-			: base(outFileName, cacheDirectory, dlOptions) { }
-
-		public override async Task<bool> RunAsync()
+			: base(outFileName, cacheDirectory, dlOptions)
 		{
-			try
-			{
-				Serilog.Log.Information("Begin download and convert Aaxc To {format}", DownloadOptions.OutputFormat);
-
-				//Step 1
-				Serilog.Log.Information("Begin Get Aaxc Metadata");
-				if (await Task.Run(Step_GetMetadata))
-					Serilog.Log.Information("Completed Get Aaxc Metadata");
-				else
-				{
-					Serilog.Log.Information("Failed to Complete Get Aaxc Metadata");
-					return false;
-				}
-
-				//Step 2
-				Serilog.Log.Information("Begin Download Decrypted Audiobook");
-				if (await Step_DownloadAudiobookAsMultipleFilesPerChapter())
-					Serilog.Log.Information("Completed Download Decrypted Audiobook");
-				else
-				{
-					Serilog.Log.Information("Failed to Complete Download Decrypted Audiobook");
-					return false;
-				}
-
-				//Step 3
-				Serilog.Log.Information("Begin Cleanup");
-				if (await Task.Run(Step_Cleanup))
-					Serilog.Log.Information("Completed Cleanup");
-				else
-				{
-					Serilog.Log.Information("Failed to Complete Cleanup");
-					return false;
-				}
-
-				Serilog.Log.Information("Completed download and convert Aaxc To {format}", DownloadOptions.OutputFormat);
-				return true;
-			}
-			catch (Exception ex)
-			{
-				Serilog.Log.Error(ex, "Error encountered in download and convert Aaxc To {format}", DownloadOptions.OutputFormat);
-				return false;
-			}
+			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;
 		}
 
 		/*
@@ -87,10 +45,8 @@ The book will be split into the following files:
 
 That naming may not be desirable for everyone, but it's an easy change to instead use the last of the combined chapter's title in the file name.
 		 */
-		private async Task<bool> Step_DownloadAudiobookAsMultipleFilesPerChapter()
+		protected async override Task<bool> Step_DownloadAndDecryptAudiobookAsync()
 		{
-			var zeroProgress = Step_DownloadAudiobook_Start();
-
 			var chapters = DownloadOptions.ChapterInfo.Chapters;
 
 			// Ensure split files are at least minChapterLength in duration.
@@ -113,77 +69,79 @@ That naming may not be desirable for everyone, but it's an easy change to instea
 				}
 			}
 
-			// reset, just in case
-			multiPartFilePaths.Clear();
+			try
+			{
+				await (AaxConversion = decryptMultiAsync(splitChapters));
 
-			ConversionResult result;
+				if (AaxConversion.IsCompletedSuccessfully)
+					await moveMoovToBeginning(workingFileStream?.Name);
 
-			AaxFile.ConversionProgressUpdate += AaxFile_ConversionProgressUpdate;
-			if (DownloadOptions.OutputFormat == OutputFormat.M4b)
-				result = await ConvertToMultiMp4a(splitChapters);
-			else
-				result = await ConvertToMultiMp3(splitChapters);
-			AaxFile.ConversionProgressUpdate -= AaxFile_ConversionProgressUpdate;
-
-			Step_DownloadAudiobook_End(zeroProgress);
-
-			return result == ConversionResult.NoErrorsDetected;
+				return AaxConversion.IsCompletedSuccessfully;
+			}
+			finally
+			{
+				workingFileStream?.Dispose();
+				FinalizeDownload();
+			}
 		}
 
-		private Task<ConversionResult> ConvertToMultiMp4a(ChapterInfo splitChapters)
+		private Mp4Operation decryptMultiAsync(ChapterInfo splitChapters)
 		{
 			var chapterCount = 0;
-			return AaxFile.ConvertToMultiMp4aAsync
+			return
+				DownloadOptions.OutputFormat == OutputFormat.M4b
+				? AaxFile.ConvertToMultiMp4aAsync
 				(
 					splitChapters,
-					newSplitCallback => Callback(++chapterCount, splitChapters, newSplitCallback),
+					newSplitCallback => newSplit(++chapterCount, splitChapters, newSplitCallback),
 					DownloadOptions.TrimOutputToChapterLength
-				);
-		}
-
-		private Task<ConversionResult> ConvertToMultiMp3(ChapterInfo splitChapters)
-		{
-			var chapterCount = 0;
-			return AaxFile.ConvertToMultiMp3Async
+				)
+				: AaxFile.ConvertToMultiMp3Async
 				(
 					splitChapters,
-					newSplitCallback => Callback(++chapterCount, splitChapters, newSplitCallback),
+					newSplitCallback => newSplit(++chapterCount, splitChapters, newSplitCallback),
 					DownloadOptions.LameConfig,
 					DownloadOptions.TrimOutputToChapterLength
 				);
-		}
 
-
-		private void Callback(int currentChapter, ChapterInfo splitChapters, NewMP3SplitCallback newSplitCallback)
-			=> Callback(currentChapter, splitChapters, newSplitCallback as NewSplitCallback);
-
-		private void Callback(int currentChapter, ChapterInfo splitChapters, NewSplitCallback newSplitCallback)
-		{
-			MultiConvertFileProperties props = new()
+			void newSplit(int currentChapter, ChapterInfo splitChapters, NewSplitCallback newSplitCallback)
 			{
-				OutputFileName = OutputFileName,
-				PartsPosition = currentChapter,
-				PartsTotal = splitChapters.Count,
-				Title = newSplitCallback?.Chapter?.Title,
-			};
-			newSplitCallback.OutputFile = createOutputFileStream(props);
-			newSplitCallback.TrackTitle = DownloadOptions.GetMultipartTitleName(props);
-			newSplitCallback.TrackNumber = currentChapter;
-			newSplitCallback.TrackCount = splitChapters.Count;
+				MultiConvertFileProperties props = new()
+				{
+					OutputFileName = OutputFileName,
+					PartsPosition = currentChapter,
+					PartsTotal = splitChapters.Count,
+					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;
+
+				OnFileCreated(workingFileStream.Name);
+			}
+
+			FileStream createOutputFileStream(MultiConvertFileProperties multiConvertFileProperties)
+			{
+				var fileName = DownloadOptions.GetMultipartFileName(multiConvertFileProperties);
+				FileUtility.SaferDelete(fileName);
+				return File.Open(fileName, FileMode.OpenOrCreate, FileAccess.ReadWrite);
+			}
 		}
 
-		private FileStream createOutputFileStream(MultiConvertFileProperties multiConvertFileProperties)
+		private Mp4Operation moveMoovToBeginning(string filename)
 		{
-			var fileName = DownloadOptions.GetMultipartFileName(multiConvertFileProperties);
-			fileName = FileUtility.GetValidFilename(fileName, DownloadOptions.ReplacementCharacters);
-
-			multiPartFilePaths.Add(fileName);
-
-			FileUtility.SaferDelete(fileName);
-
-			var file = File.Open(fileName, FileMode.OpenOrCreate);
-			OnFileCreated(fileName);
-			return file;
+			if (DownloadOptions.OutputFormat is OutputFormat.M4b
+				&& DownloadOptions.MoveMoovToBeginning
+				&& filename is not null
+				&& File.Exists(filename))
+			{
+				return Mp4File.RelocateMoovAsync(filename);
+			}
+			else return Mp4Operation.CompletedOperation;
 		}
 	}
 }

Source/AaxDecrypter/AaxcDownloadSingleConverter.cs

@@ -1,113 +1,67 @@
-using System;
-using System.IO;
-using System.Threading.Tasks;
-using AAXClean;
+using AAXClean;
 using AAXClean.Codecs;
 using FileManager;
+using System.IO;
+using System.Threading.Tasks;
 
 namespace AaxDecrypter
 {
 	public class AaxcDownloadSingleConverter : AaxcDownloadConvertBase
 	{
 		public AaxcDownloadSingleConverter(string outFileName, string cacheDirectory, IDownloadOptions dlOptions)
-			: base(outFileName, cacheDirectory, dlOptions) { }
-
-		public override async Task<bool> RunAsync()
+			: base(outFileName, cacheDirectory, dlOptions)
 		{
-			try
-			{
-				Serilog.Log.Information("Begin download and convert Aaxc To {format}", DownloadOptions.OutputFormat);
 
-				//Step 1
-				Serilog.Log.Information("Begin Step 1: Get Aaxc Metadata");
-				if (await Task.Run(Step_GetMetadata))
-					Serilog.Log.Information("Completed Step 1: Get Aaxc Metadata");
-				else
-				{
-					Serilog.Log.Information("Failed to Complete Step 1: Get Aaxc Metadata");
-					return false;
-				}
-
-				//Step 2
-				Serilog.Log.Information("Begin Step 2: Download Decrypted Audiobook");
-				if (await Step_DownloadAudiobookAsSingleFile())
-					Serilog.Log.Information("Completed Step 2: Download Decrypted Audiobook");
-				else
-				{
-					Serilog.Log.Information("Failed to Complete Step 2: Download Decrypted Audiobook");
-					return false;
-				}
-
-				//Step 3
-				Serilog.Log.Information("Begin Step 3: Create Cue");
-				if (await Task.Run(Step_CreateCue))
-					Serilog.Log.Information("Completed Step 3: Create Cue");
-				else
-				{
-					Serilog.Log.Information("Failed to Complete Step 3: Create Cue");
-					return false;
-				}
-
-				//Step 4
-				Serilog.Log.Information("Begin Step 4: Cleanup");
-				if (await Task.Run(Step_Cleanup))
-					Serilog.Log.Information("Completed Step 4: Cleanup");
-				else
-				{
-					Serilog.Log.Information("Failed to Complete Step 4: Cleanup");
-					return false;
-				}
-
-				Serilog.Log.Information("Completed download and convert Aaxc To {format}", DownloadOptions.OutputFormat);
-				return true;
-			}
-			catch (Exception ex)
-			{
-				Serilog.Log.Error(ex, "Error encountered in download and convert Aaxc To {format}", DownloadOptions.OutputFormat);
-				return false;
-			}
+			AsyncSteps.Name = $"Download and Convert Aaxc To {DownloadOptions.OutputFormat}";
+			AsyncSteps["Step 1: Get Aaxc Metadata"] = () => Task.Run(Step_GetMetadata);
+			AsyncSteps["Step 2: Download Decrypted Audiobook"] = Step_DownloadAndDecryptAudiobookAsync;
+			AsyncSteps["Step 3: Download Clips and Bookmarks"] = Step_DownloadClipsBookmarksAsync;
+			AsyncSteps["Step 4: Create Cue"] = Step_CreateCueAsync;
 		}
 
-		private async Task<bool> Step_DownloadAudiobookAsSingleFile()
+		protected async override Task<bool> Step_DownloadAndDecryptAudiobookAsync()
 		{
-			var zeroProgress = Step_DownloadAudiobook_Start();
-
 			FileUtility.SaferDelete(OutputFileName);
 
-			var outputFile = File.Open(OutputFileName, FileMode.OpenOrCreate, FileAccess.ReadWrite);
+			using var outputFile = File.Open(OutputFileName, FileMode.OpenOrCreate, FileAccess.ReadWrite);
 			OnFileCreated(OutputFileName);
 
-			AaxFile.ConversionProgressUpdate += AaxFile_ConversionProgressUpdate;
+			try
+			{
+				await (AaxConversion = decryptAsync(outputFile));
 
-			ConversionResult decryptionResult = await decryptAsync(outputFile);
+				if (AaxConversion.IsCompletedSuccessfully
+					&& DownloadOptions.MoveMoovToBeginning
+					&& DownloadOptions.OutputFormat is OutputFormat.M4b)
+				{
+					outputFile.Close();
+					await (AaxConversion = Mp4File.RelocateMoovAsync(OutputFileName));
+				}
 
-			AaxFile.ConversionProgressUpdate -= AaxFile_ConversionProgressUpdate;
-
-			Step_DownloadAudiobook_End(zeroProgress);
-
-			var success = decryptionResult == ConversionResult.NoErrorsDetected && !IsCanceled;
-			if (success)
-				base.OnFileCreated(OutputFileName);
-
-			return success;
+				return AaxConversion.IsCompletedSuccessfully;
+			}
+			finally
+			{
+				FinalizeDownload();
+			}
 		}
 
-		private Task<ConversionResult> decryptAsync(Stream outputFile)
-			=> DownloadOptions.OutputFormat == OutputFormat.Mp3 ? 
-			AaxFile.ConvertToMp3Async
+		private Mp4Operation decryptAsync(Stream outputFile)
+			=> DownloadOptions.OutputFormat == OutputFormat.Mp3
+			? AaxFile.ConvertToMp3Async
 			(
 				outputFile,
 				DownloadOptions.LameConfig,
 				DownloadOptions.ChapterInfo,
 				DownloadOptions.TrimOutputToChapterLength
 			)
-			: DownloadOptions.FixupFile ?
-				AaxFile.ConvertToMp4aAsync
-				(
-					outputFile,
-					DownloadOptions.ChapterInfo,
-					DownloadOptions.TrimOutputToChapterLength
-				)
-				: AaxFile.ConvertToMp4aAsync(outputFile);
+			: DownloadOptions.FixupFile
+			? AaxFile.ConvertToMp4aAsync
+			(
+				outputFile,
+				DownloadOptions.ChapterInfo,
+				DownloadOptions.TrimOutputToChapterLength
+			)
+			: AaxFile.ConvertToMp4aAsync(outputFile);
 	}
 }

Source/AaxDecrypter/AudiobookDownloadBase.cs

@@ -1,10 +1,10 @@
-using System;
-using System.Collections.Generic;
+using Dinah.Core;
+using Dinah.Core.Net.Http;
+using Dinah.Core.StepRunner;
+using FileManager;
+using System;
 using System.IO;
 using System.Threading.Tasks;
-using Dinah.Core;
-using Dinah.Core.Net.Http;
-using FileManager;
 
 namespace AaxDecrypter
 {
@@ -20,19 +20,16 @@ namespace AaxDecrypter
 		public event EventHandler<TimeSpan> DecryptTimeRemaining;
 		public event EventHandler<string> FileCreated;
 
-		public bool IsCanceled { get; set; }
-		public string TempFilePath { get; }
-
-		protected string OutputFileName { get; private set; }
+		public bool IsCanceled { get; protected set; }
+		protected AsyncStepSequence AsyncSteps { get; } = new();
+		protected string OutputFileName { get; }
 		protected IDownloadOptions DownloadOptions { get; }
-		protected NetworkFileStream InputFileStream => (nfsPersister ??= OpenNetworkFileStream()).NetworkFileStream;
+		protected NetworkFileStream InputFileStream => nfsPersister.NetworkFileStream;
 
-		// Don't give the property a 'set'. This should have to be an obvious choice; not accidental
-		protected void SetOutputFileName(string newOutputFileName) => OutputFileName = newOutputFileName;
-
-		private NetworkFileStreamPersister nfsPersister;
-
-		private string jsonDownloadState { get; }
+		private readonly NetworkFileStreamPersister nfsPersister;
+		private readonly DownloadProgress zeroProgress;
+		private readonly string jsonDownloadState;
+		private readonly string tempFilePath;
 
 		protected AudiobookDownloadBase(string outFileName, string cacheDirectory, IDownloadOptions dlOptions)
 		{
@@ -46,15 +43,39 @@ namespace AaxDecrypter
 				Directory.CreateDirectory(cacheDirectory);
 
 			jsonDownloadState = Path.Combine(cacheDirectory, Path.GetFileName(Path.ChangeExtension(OutputFileName, ".json")));
-			TempFilePath = Path.ChangeExtension(jsonDownloadState, ".aaxc");
+			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,
+				ProgressPercentage = 0,
+				TotalBytesToReceive = InputFileStream.Length
+			};
+
+			OnDecryptProgressUpdate(zeroProgress);
+		}
+
+		public async Task<bool> RunAsync()
+		{
+			AsyncSteps[$"Cleanup"] = CleanupAsync;
+			(bool success, var elapsed) = await AsyncSteps.RunAsync();
+
+			var speedup = DownloadOptions.RuntimeLength / elapsed;
+			Serilog.Log.Information($"Speedup is {speedup:F0}x realtime.");
+
+			return success;
+		}
 
 		public abstract Task CancelAsync();
+		protected abstract Task<bool> Step_DownloadAndDecryptAudiobookAsync();
 
 		public virtual void SetCoverArt(byte[] coverArt)
 		{
@@ -62,8 +83,6 @@ namespace AaxDecrypter
 				OnRetrievedCoverArt(coverArt);
 		}
 
-		public abstract Task<bool> RunAsync();
-
 		protected void OnRetrievedTitle(string title)
 			=> RetrievedTitle?.Invoke(this, title);
 		protected void OnRetrievedAuthors(string authors)
@@ -72,97 +91,106 @@ namespace AaxDecrypter
 			=> RetrievedNarrators?.Invoke(this, narrators);
 		protected void OnRetrievedCoverArt(byte[] coverArt)
 			=> RetrievedCoverArt?.Invoke(this, coverArt);
-		protected void OnDecryptProgressUpdate(DownloadProgress downloadProgress) 
+		protected void OnDecryptProgressUpdate(DownloadProgress downloadProgress)
 			=> DecryptProgressUpdate?.Invoke(this, downloadProgress);
 		protected void OnDecryptTimeRemaining(TimeSpan timeRemaining)
 			=> DecryptTimeRemaining?.Invoke(this, timeRemaining);
 		protected void OnFileCreated(string path)
 			=> FileCreated?.Invoke(this, path);
 
-		protected void CloseInputFileStream()
+		protected virtual void FinalizeDownload()
 		{
-			nfsPersister?.NetworkFileStream?.Close();
 			nfsPersister?.Dispose();
+			OnDecryptProgressUpdate(zeroProgress);
 		}
 
-		protected bool Step_CreateCue()
+		protected async Task<bool> Step_DownloadClipsBookmarksAsync()
 		{
-			if (!DownloadOptions.CreateCueSheet) return true;
+			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;
 
 			// not a critical step. its failure should not prevent future steps from running
 			try
 			{
 				var path = Path.ChangeExtension(OutputFileName, ".cue");
-				path = FileUtility.GetValidFilename(path, DownloadOptions.ReplacementCharacters);
-				File.WriteAllText(path, Cue.CreateContents(Path.GetFileName(OutputFileName), DownloadOptions.ChapterInfo));
+				await File.WriteAllTextAsync(path, Cue.CreateContents(Path.GetFileName(OutputFileName), DownloadOptions.ChapterInfo));
 				OnFileCreated(path);
 			}
 			catch (Exception ex)
 			{
-				Serilog.Log.Logger.Error(ex, $"{nameof(Step_CreateCue)}. FAILED");
+				Serilog.Log.Logger.Error(ex, $"{nameof(Step_CreateCueAsync)} Failed");
 			}
 			return !IsCanceled;
 		}
 
-		protected bool Step_Cleanup()
+		private async Task<bool> CleanupAsync()
 		{
-			bool success = !IsCanceled;
-			if (success)
+			if (IsCanceled) return false;
+
+			FileUtility.SaferDelete(jsonDownloadState);
+
+			if (!string.IsNullOrEmpty(DownloadOptions.AudibleKey) &&
+				!string.IsNullOrEmpty(DownloadOptions.AudibleIV) &&
+				DownloadOptions.RetainEncryptedFile)
 			{
-				FileUtility.SaferDelete(jsonDownloadState);
+				string aaxPath = Path.ChangeExtension(tempFilePath, ".aax");
+				FileUtility.SaferMove(tempFilePath, aaxPath);
 
-				if (DownloadOptions.AudibleKey is not null && 
-					DownloadOptions.AudibleIV is not null && 
-					DownloadOptions.RetainEncryptedFile)
-				{
-					string aaxPath = Path.ChangeExtension(TempFilePath, ".aax");
-					FileUtility.SaferMove(TempFilePath, aaxPath);
+				//Write aax decryption key
+				string keyPath = Path.ChangeExtension(aaxPath, ".key");
+				FileUtility.SaferDelete(keyPath);
+				await File.WriteAllTextAsync(keyPath, $"Key={DownloadOptions.AudibleKey}{Environment.NewLine}IV={DownloadOptions.AudibleIV}");
 
-					//Write aax decryption key
-					string keyPath = Path.ChangeExtension(aaxPath, ".key");
-					FileUtility.SaferDelete(keyPath);
-					File.WriteAllText(keyPath, $"Key={DownloadOptions.AudibleKey}\r\nIV={DownloadOptions.AudibleIV}");
-
-					OnFileCreated(aaxPath);
-					OnFileCreated(keyPath);
-				}
-				else
-					FileUtility.SaferDelete(TempFilePath);
+				OnFileCreated(aaxPath);
+				OnFileCreated(keyPath);
 			}
+			else
+				FileUtility.SaferDelete(tempFilePath);
 
-			return success;
+			return !IsCanceled;
 		}
 
 		private NetworkFileStreamPersister OpenNetworkFileStream()
 		{
-			if (!File.Exists(jsonDownloadState))
-				return NewNetworkFilePersister();
-
+			NetworkFileStreamPersister nfsp = default;
 			try
 			{
-				var nfsp = new NetworkFileStreamPersister(jsonDownloadState);
-				// If More than ~1 hour has elapsed since getting the download url, it will expire.
-				// The new url will be to the same file.
+				if (!File.Exists(jsonDownloadState))
+					return nfsp = newNetworkFilePersister();
+
+				nfsp = new NetworkFileStreamPersister(jsonDownloadState);
+				// The download url expires after 1 hour.
+				// The new url points to the same file.
 				nfsp.NetworkFileStream.SetUriForSameFile(new Uri(DownloadOptions.DownloadUrl));
 				return nfsp;
 			}
 			catch
 			{
 				FileUtility.SaferDelete(jsonDownloadState);
-				FileUtility.SaferDelete(TempFilePath);
-				return NewNetworkFilePersister();
+				FileUtility.SaferDelete(tempFilePath);
+				return nfsp = newNetworkFilePersister();
 			}
-		}
-
-		private NetworkFileStreamPersister NewNetworkFilePersister()
-		{
-			var headers = new System.Net.WebHeaderCollection
+			finally
 			{
-				{ "User-Agent", DownloadOptions.UserAgent }
-			};
+				nfsp.NetworkFileStream.SpeedLimit = DownloadOptions.DownloadSpeedBps;
+			}
 
-			var networkFileStream = new NetworkFileStream(TempFilePath, new Uri(DownloadOptions.DownloadUrl), 0, headers);
-			return new NetworkFileStreamPersister(networkFileStream, jsonDownloadState);
+			NetworkFileStreamPersister newNetworkFilePersister()
+			{
+				var networkFileStream = new NetworkFileStream(tempFilePath, new Uri(DownloadOptions.DownloadUrl), 0, new() { { "User-Agent", DownloadOptions.UserAgent } });
+				return new NetworkFileStreamPersister(networkFileStream, jsonDownloadState);
+			}
 		}
 	}
 }

Source/AaxDecrypter/Cue.cs

@@ -1,8 +1,7 @@
-using System;
+using AAXClean;
+using Dinah.Core;
 using System.IO;
 using System.Text;
-using AAXClean;
-using Dinah.Core;
 
 namespace AaxDecrypter
 {
@@ -16,15 +15,14 @@ namespace AaxDecrypter
 
             var startOffset = chapters.StartOffset;
 
-            var trackCount = 0;
+            var trackCount = 1;
             foreach (var c in chapters.Chapters)
             {
                 var startTime = c.StartOffset - startOffset;
-                trackCount++;
 
-                stringBuilder.AppendLine($"TRACK {trackCount} AUDIO");
+                stringBuilder.AppendLine($"TRACK {trackCount++} AUDIO");
                 stringBuilder.AppendLine($"  TITLE \"{c.Title}\"");
-                stringBuilder.AppendLine($"  INDEX 01 {(int)startTime.TotalMinutes}:{startTime:ss}:{(int)(startTime.Milliseconds / 1000d * 75)}");
+                stringBuilder.AppendLine($"  INDEX 01 {(int)startTime.TotalMinutes}:{startTime:ss}:{(int)(startTime.Milliseconds * 75d / 1000):D2}");
             }
 
             return stringBuilder.ToString();
@@ -46,7 +44,7 @@ namespace AaxDecrypter
             for (var i = 0; i < cueContents.Length; i++)
             {
                 var line = cueContents[i];
-                if (!line.Trim().StartsWith("FILE") || !line.Contains(" "))
+                if (!line.Trim().StartsWith("FILE") || !line.Contains(' '))
                     continue;
 
                 var fileTypeBegins = line.LastIndexOf(" ") + 1;

Source/AaxDecrypter/IDownloadOptions.cs

@@ -1,25 +1,32 @@
 using AAXClean;
+using System;
+using System.Threading.Tasks;
 
 namespace AaxDecrypter
 {
     public interface IDownloadOptions
-	{
-        FileManager.ReplacementCharacters ReplacementCharacters { get; }
+    {
+        event EventHandler<long> DownloadSpeedChanged;
         string DownloadUrl { get; }
         string UserAgent { get; }
         string AudibleKey { get; }
         string AudibleIV { get; }
+        TimeSpan RuntimeLength { get; }
         OutputFormat OutputFormat { get; }
         bool TrimOutputToChapterLength { get; }
         bool RetainEncryptedFile { get; }
         bool StripUnabridged { get; }
         bool CreateCueSheet { get; }
+        bool DownloadClipsBookmarks { get; }
+        long DownloadSpeedBps { get; }
         ChapterInfo ChapterInfo { get; }
         bool FixupFile { get; }
         NAudio.Lame.LameConfig LameConfig { get; }
         bool Downsample { get; }
         bool MatchSourceBitrate { get; }
+        bool MoveMoovToBeginning { get; }
         string GetMultipartFileName(MultiConvertFileProperties props);
-        string GetMultipartTitleName(MultiConvertFileProperties props);
-    }    
+        string GetMultipartTitle(MultiConvertFileProperties props);
+        Task<string> SaveClipsAndBookmarksAsync(string fileName);
+    }
 }

Source/AaxDecrypter/MpegUtil.cs

@@ -1,7 +1,5 @@
 using AAXClean;
 using NAudio.Lame;
-using System;
-using System.Linq;
 
 namespace AaxDecrypter
 {

Source/AaxDecrypter/MultiConvertFileProperties.cs

@@ -1,6 +1,4 @@
 using System;
-using System.IO;
-using FileManager;
 
 namespace AaxDecrypter
 {
@@ -10,6 +8,6 @@ namespace AaxDecrypter
         public int PartsPosition { get; set; }
         public int PartsTotal { get; set; }
         public string Title { get; set; }
-
+        public DateTime FileDate { get; } = DateTime.Now;
     }
 }

Source/AaxDecrypter/NetworkFileStream.cs

@@ -1,91 +1,57 @@
 using Dinah.Core;
 using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
 using System;
+using System.Collections.Generic;
 using System.IO;
-using System.Linq;
 using System.Net;
+using System.Net.Http;
 using System.Threading;
+using System.Threading.Tasks;
 
 namespace AaxDecrypter
 {
-	/// <summary>
-	/// A <see cref="CookieContainer"/> for a single Uri.
-	/// </summary>
-	public class SingleUriCookieContainer : CookieContainer
-	{
-		private Uri baseAddress;
-		public Uri Uri
-		{
-			get => baseAddress;
-			set
-			{
-				baseAddress = new UriBuilder(value.Scheme, value.Host).Uri;
-			}
-		}
-
-		public CookieCollection GetCookies()
-		{
-			return GetCookies(Uri);
-		}
-	}
-
-	/// <summary>
-	/// A resumable, simultaneous file downloader and reader.
-	/// </summary>
+	/// <summary>A resumable, simultaneous file downloader and reader. </summary>
 	public class NetworkFileStream : Stream, IUpdatable
 	{
 		public event EventHandler Updated;
 
 		#region Public Properties
 
-		/// <summary>
-		/// Location to save the downloaded data.
-		/// </summary>
+		/// <summary> Location to save the downloaded data. </summary>
 		[JsonProperty(Required = Required.Always)]
 		public string SaveFilePath { get; }
 
-		/// <summary>
-		/// Http(s) address of the file to download.
-		/// </summary>
+		/// <summary> Http(s) address of the file to download. </summary>
 		[JsonProperty(Required = Required.Always)]
 		public Uri Uri { get; private set; }
 
-		/// <summary>
-		/// All cookies set by caller or by the remote server.
-		/// </summary>
+		/// <summary> Http headers to be sent to the server with the request. </summary>
 		[JsonProperty(Required = Required.Always)]
-		public SingleUriCookieContainer CookieContainer { get; }
+		public Dictionary<string, string> RequestHeaders { get; private set; }
 
-		/// <summary>
-		/// Http headers to be sent to the server with the request.
-		/// </summary>
-		[JsonProperty(Required = Required.Always)]
-		public WebHeaderCollection RequestHeaders { get; private set; }
-
-		/// <summary>
-		/// The position in <see cref="SaveFilePath"/> that has been written and flushed to disk.
-		/// </summary>
+		/// <summary> The position in <see cref="SaveFilePath"/> that has been written and flushed to disk. </summary>
 		[JsonProperty(Required = Required.Always)]
 		public long WritePosition { get; private set; }
 
-		/// <summary>
-		/// The total length of the <see cref="Uri"/> file to download.
-		/// </summary>
+		/// <summary> The total length of the <see cref="Uri"/> file to download. </summary>
 		[JsonProperty(Required = Required.Always)]
 		public long ContentLength { get; private set; }
 
+		[JsonIgnore]
+		public bool IsCancelled => _cancellationSource.IsCancellationRequested;
+
+		private long _speedLimit = 0;
+		/// <summary>bytes per second</summary>
+		public long SpeedLimit { get => _speedLimit; set => _speedLimit = value <= 0 ? 0 : Math.Max(value, MIN_BYTES_PER_SECOND); }
+
 		#endregion
 
 		#region Private Properties
-		private HttpWebRequest HttpRequest { get; set; }
 		private FileStream _writeFile { get; }
 		private FileStream _readFile { get; }
-		private Stream _networkStream { get; set; }
-		private bool hasBegunDownloading { get; set; }
-		public bool IsCancelled { get; private set; }
-		private EventWaitHandle downloadEnded { get; set; }
-		private EventWaitHandle downloadedPiece { get; set; }
+		private CancellationTokenSource _cancellationSource { get; } = new();
+		private EventWaitHandle _downloadedPiece { get; set; }
+		private Task _backgroundDownloadTask { get; set; }
 
 		#endregion
 
@@ -98,32 +64,32 @@ namespace AaxDecrypter
 		//DATA_FLUSH_SZ bytes are written to the file stream.
 		private const int DATA_FLUSH_SZ = 1024 * 1024;
 
+		//Number of times per second the download rate is checkd and throttled
+		private const int THROTTLE_FREQUENCY = 8;
+
+		//Minimum throttle rate. The minimum amount of data that can be throttled
+		//on each iteration of the download loop is DOWNLOAD_BUFF_SZ.
+		public const int MIN_BYTES_PER_SECOND = DOWNLOAD_BUFF_SZ * THROTTLE_FREQUENCY;
+
 		#endregion
 
 		#region Constructor
 
-		/// <summary>
-		/// A resumable, simultaneous file downloader and reader.
-		/// </summary>
+		/// <summary> A resumable, simultaneous file downloader and reader. </summary>
 		/// <param name="saveFilePath">Path to a location on disk to save the downloaded data from <paramref name="uri"/></param>
 		/// <param name="uri">Http(s) address of the file to download.</param>
 		/// <param name="writePosition">The position in <paramref name="uri"/> to begin downloading.</param>
 		/// <param name="requestHeaders">Http headers to be sent to the server with the <see cref="HttpWebRequest"/>.</param>
-		/// <param name="cookies">A <see cref="SingleUriCookieContainer"/> with cookies to send with the <see cref="HttpWebRequest"/>. It will also be populated with any cookies set by the server. </param>
-		public NetworkFileStream(string saveFilePath, Uri uri, long writePosition = 0, WebHeaderCollection requestHeaders = null, SingleUriCookieContainer cookies = null)
+		public NetworkFileStream(string saveFilePath, Uri uri, long writePosition = 0, Dictionary<string, string> requestHeaders = null)
 		{
-			ArgumentValidator.EnsureNotNullOrWhiteSpace(saveFilePath, nameof(saveFilePath));
-			ArgumentValidator.EnsureNotNullOrWhiteSpace(uri?.AbsoluteUri, nameof(uri));
-			ArgumentValidator.EnsureGreaterThan(writePosition, nameof(writePosition), -1);
+			SaveFilePath = ArgumentValidator.EnsureNotNullOrWhiteSpace(saveFilePath, nameof(saveFilePath));
+			Uri = ArgumentValidator.EnsureNotNull(uri, nameof(uri));
+			WritePosition = ArgumentValidator.EnsureGreaterThan(writePosition, nameof(writePosition), -1);
 
 			if (!Directory.Exists(Path.GetDirectoryName(saveFilePath)))
 				throw new ArgumentException($"Specified {nameof(saveFilePath)} directory \"{Path.GetDirectoryName(saveFilePath)}\" does not exist.");
 
-			SaveFilePath = saveFilePath;
-			Uri = uri;
-			WritePosition = writePosition;
-			RequestHeaders = requestHeaders ?? new WebHeaderCollection();
-			CookieContainer = cookies ?? new SingleUriCookieContainer { Uri = uri };
+			RequestHeaders = requestHeaders ?? new();
 
 			_writeFile = new FileStream(SaveFilePath, FileMode.OpenOrCreate, FileAccess.Write, FileShare.ReadWrite)
 			{
@@ -139,12 +105,10 @@ namespace AaxDecrypter
 
 		#region Downloader
 
-		/// <summary>
-		/// Update the <see cref="JsonFilePersister"/>.
-		/// </summary>
-		private void Update()
+		/// <summary> Update the <see cref="Dinah.Core.IO.JsonFilePersister{T}"/>. </summary>
+		private void OnUpdate()
 		{
-			RequestHeaders = HttpRequest.Headers;
+			RequestHeaders["Range"] = $"bytes={WritePosition}-";
 			try
 			{
 				Updated?.Invoke(this, EventArgs.Empty);
@@ -155,9 +119,7 @@ namespace AaxDecrypter
 			}
 		}
 
-		/// <summary>
-		/// Set a different <see cref="System.Uri"/> to the same file targeted by this instance of <see cref="NetworkFileStream"/>
-		/// </summary>
+		/// <summary> Set a different <see cref="System.Uri"/> to the same file targeted by this instance of <see cref="NetworkFileStream"/> </summary>
 		/// <param name="uriToSameFile">New <see cref="System.Uri"/> host must match existing host.</param>
 		public void SetUriForSameFile(Uri uriToSameFile)
 		{
@@ -165,37 +127,29 @@ namespace AaxDecrypter
 
 			if (uriToSameFile.Host != Uri.Host)
 				throw new ArgumentException($"New uri to the same file must have the same host.\r\n Old Host :{Uri.Host}\r\nNew Host: {uriToSameFile.Host}");
-			if (hasBegunDownloading)
+			if (_backgroundDownloadTask is not null)
 				throw new InvalidOperationException("Cannot change Uri after download has started.");
 
 			Uri = uriToSameFile;
-			HttpRequest = WebRequest.CreateHttp(Uri);
-
-			HttpRequest.CookieContainer = CookieContainer;
-			HttpRequest.Headers = RequestHeaders;
-			//If NetworkFileStream is resuming, Header will already contain a range.
-			HttpRequest.Headers.Remove("Range");
-			HttpRequest.AddRange(WritePosition);
+			RequestHeaders["Range"] = $"bytes={WritePosition}-";
 		}
 
-		/// <summary>
-		/// Begins downloading <see cref="Uri"/> to <see cref="SaveFilePath"/> in a background thread.
-		/// </summary>
-		private void BeginDownloading()
+		/// <summary> Begins downloading <see cref="Uri"/> to <see cref="SaveFilePath"/> in a background thread. </summary>
+		/// <returns>The downloader <see cref="Task"/></returns>
+		private Task BeginDownloading()
 		{
-			downloadEnded = new EventWaitHandle(false, EventResetMode.ManualReset);
-
 			if (ContentLength != 0 && WritePosition == ContentLength)
-			{
-				hasBegunDownloading = true;
-				downloadEnded.Set();
-				return;
-			}
+				return Task.CompletedTask;
 
 			if (ContentLength != 0 && WritePosition > ContentLength)
 				throw new WebException($"Specified write position (0x{WritePosition:X10}) is larger than  {nameof(ContentLength)} (0x{ContentLength:X10}).");
 
-			var response = HttpRequest.GetResponse() as HttpWebResponse;
+			var request = new HttpRequestMessage(HttpMethod.Get, Uri);
+
+			foreach (var header in RequestHeaders)
+				request.Headers.Add(header.Key, header.Value);
+
+			var response = new HttpClient().Send(request, HttpCompletionOption.ResponseHeadersRead, _cancellationSource.Token);
 
 			if (response.StatusCode != HttpStatusCode.PartialContent)
 				throw new WebException($"Server at {Uri.Host} responded with unexpected status code: {response.StatusCode}.");
@@ -203,24 +157,17 @@ namespace AaxDecrypter
 			//Content length is the length of the range request, and it is only equal
 			//to the complete file length if requesting Range: bytes=0-
 			if (WritePosition == 0)
-				ContentLength = response.ContentLength;
+				ContentLength = response.Content.Headers.ContentLength.GetValueOrDefault();
 
-			_networkStream = response.GetResponseStream();
-			downloadedPiece = new EventWaitHandle(false, EventResetMode.AutoReset);
+			var networkStream = response.Content.ReadAsStream(_cancellationSource.Token);
+			_downloadedPiece = new EventWaitHandle(false, EventResetMode.AutoReset);
 
 			//Download the file in the background.
-			new Thread(() => DownloadFile())
-			{ IsBackground = true }
-			.Start();
-
-			hasBegunDownloading = true;
-			return;
+			return Task.Run(() => DownloadFile(networkStream), _cancellationSource.Token);
 		}
 
-		/// <summary>
-		/// Download <see cref="Uri"/> to <see cref="SaveFilePath"/>.
-		/// </summary>
-		private void DownloadFile()
+		/// <summary> Download <see cref="Uri"/> to <see cref="SaveFilePath"/>.</summary>
+		private async Task DownloadFile(Stream networkStream)
 		{
 			var downloadPosition = WritePosition;
 			var nextFlush = downloadPosition + DATA_FLUSH_SZ;
@@ -228,29 +175,44 @@ namespace AaxDecrypter
 
 			try
 			{
+				DateTime startTime = DateTime.Now;
+				long bytesReadSinceThrottle = 0;
 				int bytesRead;
 				do
 				{
-					bytesRead = _networkStream.Read(buff, 0, DOWNLOAD_BUFF_SZ);
-					_writeFile.Write(buff, 0, bytesRead);
+					bytesRead = await networkStream.ReadAsync(buff, _cancellationSource.Token);
+					await _writeFile.WriteAsync(buff, 0, bytesRead, _cancellationSource.Token);
 
 					downloadPosition += bytesRead;
 
 					if (downloadPosition > nextFlush)
 					{
-						_writeFile.Flush();
+						await _writeFile.FlushAsync(_cancellationSource.Token);
 						WritePosition = downloadPosition;
-						Update();
+						OnUpdate();
 						nextFlush = downloadPosition + DATA_FLUSH_SZ;
-						downloadedPiece.Set();
+						_downloadedPiece.Set();
 					}
 
+					#region throttle
+
+					bytesReadSinceThrottle += bytesRead;
+
+					if (SpeedLimit >= MIN_BYTES_PER_SECOND && bytesReadSinceThrottle > SpeedLimit / THROTTLE_FREQUENCY)
+					{
+						var delayMS = (int)(startTime.AddSeconds(1d / THROTTLE_FREQUENCY) - DateTime.Now).TotalMilliseconds;
+						if (delayMS > 0)
+							await Task.Delay(delayMS, _cancellationSource.Token);
+
+						startTime = DateTime.Now;
+						bytesReadSinceThrottle = 0;
+					}
+
+					#endregion
+
 				} while (downloadPosition < ContentLength && !IsCancelled && bytesRead > 0);
 
-				_writeFile.Close();
-				_networkStream.Close();
 				WritePosition = downloadPosition;
-				Update();
 
 				if (!IsCancelled && WritePosition < ContentLength)
 					throw new WebException($"Downloaded size (0x{WritePosition:X10}) is less than {nameof(ContentLength)} (0x{ContentLength:X10}).");
@@ -258,110 +220,16 @@ namespace AaxDecrypter
 				if (WritePosition > ContentLength)
 					throw new WebException($"Downloaded size (0x{WritePosition:X10}) is greater than {nameof(ContentLength)} (0x{ContentLength:X10}).");
 			}
-			catch (Exception ex)
+			catch (TaskCanceledException)
 			{
-				Serilog.Log.Error(ex, "An error was encountered while downloading {Uri}", Uri);
+				Serilog.Log.Information("Download was cancelled");
 			}
 			finally
 			{
-				downloadedPiece.Set();
-				downloadEnded.Set();
-			}
-		}
-
-		#endregion
-
-		#region Json Connverters
-
-		public static JsonSerializerSettings GetJsonSerializerSettings()
-		{
-			var settings = new JsonSerializerSettings();
-			settings.Converters.Add(new CookieContainerConverter());
-			settings.Converters.Add(new WebHeaderCollectionConverter());
-			return settings;
-		}
-
-		internal class CookieContainerConverter : JsonConverter
-		{
-			public override bool CanConvert(Type objectType)
-				=> objectType == typeof(SingleUriCookieContainer);
-
-			public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
-			{
-				var jObj = JObject.Load(reader);
-
-				var result = new SingleUriCookieContainer()
-				{
-					Uri = new Uri(jObj["Uri"].Value<string>()),
-					Capacity = jObj["Capacity"].Value<int>(),
-					MaxCookieSize = jObj["MaxCookieSize"].Value<int>(),
-					PerDomainCapacity = jObj["PerDomainCapacity"].Value<int>()
-				};
-
-				var cookieList = jObj["Cookies"].ToList();
-
-				foreach (var cookie in cookieList)
-				{
-					result.Add(
-						new Cookie
-						{
-							Comment = cookie["Comment"].Value<string>(),
-							HttpOnly = cookie["HttpOnly"].Value<bool>(),
-							Discard = cookie["Discard"].Value<bool>(),
-							Domain = cookie["Domain"].Value<string>(),
-							Expired = cookie["Expired"].Value<bool>(),
-							Expires = cookie["Expires"].Value<DateTime>(),
-							Name = cookie["Name"].Value<string>(),
-							Path = cookie["Path"].Value<string>(),
-							Port = cookie["Port"].Value<string>(),
-							Secure = cookie["Secure"].Value<bool>(),
-							Value = cookie["Value"].Value<string>(),
-							Version = cookie["Version"].Value<int>(),
-						});
-				}
-
-				return result;
-			}
-
-			public override bool CanWrite => true;
-
-			public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
-			{
-				var cookies = value as SingleUriCookieContainer;
-				var obj = (JObject)JToken.FromObject(value);
-				var container = cookies.GetCookies();
-				var propertyNames = container.Select(c => JToken.FromObject(c));
-				obj.AddFirst(new JProperty("Cookies", new JArray(propertyNames)));
-				obj.WriteTo(writer);
-			}
-		}
-
-		internal class WebHeaderCollectionConverter : JsonConverter
-		{
-			public override bool CanConvert(Type objectType)
-				=> objectType == typeof(WebHeaderCollection);
-
-			public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
-			{
-				var jObj = JObject.Load(reader);
-				var result = new WebHeaderCollection();
-
-				foreach (var kvp in jObj)
-					result.Add(kvp.Key, kvp.Value.Value<string>());
-
-				return result;
-			}
-
-			public override bool CanWrite => true;
-
-			public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
-			{
-				var jObj = new JObject();
-				var type = value.GetType();
-				var headers = value as WebHeaderCollection;
-				var jHeaders = headers.AllKeys.Select(k => new JProperty(k, headers[k]));
-				jObj.Add(jHeaders);
-				jObj.WriteTo(writer);
+				networkStream.Close();
+				_writeFile.Close();
+				_downloadedPiece.Set();
+				OnUpdate();
 			}
 		}
 
@@ -383,8 +251,7 @@ namespace AaxDecrypter
 		{
 			get
 			{
-				if (!hasBegunDownloading)
-					BeginDownloading();
+				_backgroundDownloadTask ??= BeginDownloading();
 				return ContentLength;
 			}
 		}
@@ -401,18 +268,17 @@ namespace AaxDecrypter
 		[JsonIgnore]
 		public override int WriteTimeout { get => base.WriteTimeout; set => base.WriteTimeout = value; }
 
-		public override void Flush() => throw new NotImplementedException();
-		public override void SetLength(long value) => throw new NotImplementedException();
-		public override void Write(byte[] buffer, int offset, int count) => throw new NotImplementedException();
+		public override void Flush() => throw new InvalidOperationException();
+		public override void SetLength(long value) => throw new InvalidOperationException();
+		public override void Write(byte[] buffer, int offset, int count) => throw new InvalidOperationException();
 
 		public override int Read(byte[] buffer, int offset, int count)
 		{
-			if (!hasBegunDownloading)
-				BeginDownloading();
-			
+			_backgroundDownloadTask ??= BeginDownloading();
+
 			var toRead = Math.Min(count, Length - Position);
 			WaitToPosition(Position + toRead);
-			return _readFile.Read(buffer, offset, count);
+			return IsCancelled ? 0 : _readFile.Read(buffer, offset, count);
 		}
 
 		public override long Seek(long offset, SeekOrigin origin)
@@ -428,38 +294,43 @@ namespace AaxDecrypter
 			return _readFile.Position = newPosition;
 		}
 
-		/// <summary>
-		/// Blocks until the file has downloaded to at least <paramref name="requiredPosition"/>, then returns.
-		/// </summary>
-		/// <param name="requiredPosition">The minimum required flished data length in <see cref="SaveFilePath"/>.</param>
+		/// <summary>Blocks until the file has downloaded to at least <paramref name="requiredPosition"/>, then returns. </summary>
+		/// <param name="requiredPosition">The minimum required flushed data length in <see cref="SaveFilePath"/>.</param>
 		private void WaitToPosition(long requiredPosition)
 		{
 			while (WritePosition < requiredPosition
-				&& hasBegunDownloading
-				&& !IsCancelled
-				&& !downloadEnded.WaitOne(0))
+				&& _backgroundDownloadTask?.IsCompleted is false
+				&& !IsCancelled)
 			{
-				downloadedPiece.WaitOne(100);
+				_downloadedPiece.WaitOne(50);
 			}
 		}
 
-		public override void Close()
+		private bool disposed = false;
+
+		/*
+		 * https://learn.microsoft.com/en-us/dotnet/api/system.io.stream.dispose?view=net-7.0
+		 * 
+		 * In derived classes, do not override the Close() method, instead, put all of the
+		 * Stream cleanup logic in the Dispose(Boolean) method.
+		 */
+		protected override void Dispose(bool disposing)
 		{
-			IsCancelled = true;
+			if (disposing && !disposed)
+			{
+				_cancellationSource.Cancel();
+				_backgroundDownloadTask?.GetAwaiter().GetResult();
+				_downloadedPiece?.Dispose();
+				_cancellationSource?.Dispose();
+				_readFile.Dispose();
+				_writeFile.Dispose();
+				OnUpdate();
+			}
 
-			while (downloadEnded is not null && !downloadEnded.WaitOne(100)) ;
-
-			_readFile.Close();
-			_writeFile.Close();
-			_networkStream?.Close();
-			Update();
+			disposed = true;
+			base.Dispose(disposing);
 		}
 
 		#endregion
-		~NetworkFileStream()
-		{
-			downloadEnded?.Close();
-			downloadedPiece?.Close();
-		}
 	}
 }

Source/AaxDecrypter/NetworkFileStreamPersister.cs

@@ -1,11 +1,9 @@
 using Dinah.Core.IO;
-using Newtonsoft.Json;
 
 namespace AaxDecrypter
 {
-    internal class NetworkFileStreamPersister : JsonFilePersister<NetworkFileStream>
-    {
-
+	internal class NetworkFileStreamPersister : JsonFilePersister<NetworkFileStream>
+	{
 		/// <summary>Alias for Target </summary>
 		public NetworkFileStream NetworkFileStream => Target;
 
@@ -17,7 +15,11 @@ namespace AaxDecrypter
 		public NetworkFileStreamPersister(string path, string jsonPath = null)
 			: base(path, jsonPath) { }
 
-		protected override JsonSerializerSettings GetSerializerSettings() => NetworkFileStream.GetJsonSerializerSettings();
-
-    }
+		protected override void Dispose(bool disposing)
+		{
+			if (disposing)
+				NetworkFileStream?.Dispose();
+			base.Dispose(disposing);
+		}
+	}
 }

Source/AaxDecrypter/UnencryptedAudiobookDownloader.cs

@@ -1,85 +1,35 @@
-using System;
-using System.Threading;
-using System.Threading.Tasks;
-using Dinah.Core.Net.Http;
+using Dinah.Core.Net.Http;
 using FileManager;
+using System;
+using System.Threading.Tasks;
 
 namespace AaxDecrypter
 {
 	public class UnencryptedAudiobookDownloader : AudiobookDownloadBase
 	{
-
 		public UnencryptedAudiobookDownloader(string outFileName, string cacheDirectory, IDownloadOptions dlLic)
-			: base(outFileName, cacheDirectory, dlLic) { }
-
-		public override async Task<bool> RunAsync()
+			: base(outFileName, cacheDirectory, dlLic)
 		{
-			try
-			{
-				Serilog.Log.Information("Begin download and convert Aaxc To {format}", DownloadOptions.OutputFormat);
-
-				//Step 1
-				Serilog.Log.Information("Begin Step 1: Get Mp3 Metadata");
-				if (await Task.Run(Step_GetMetadata))
-					Serilog.Log.Information("Completed Step 1: Get Mp3 Metadata");
-				else
-				{
-					Serilog.Log.Information("Failed to Complete Step 1: Get Mp3 Metadata");
-					return false;
-				}
-
-				//Step 2
-				Serilog.Log.Information("Begin Step 2: Download Audiobook");
-				if (await Task.Run(Step_DownloadAudiobookAsSingleFile))
-					Serilog.Log.Information("Completed Step 2: Download Audiobook");
-				else
-				{
-					Serilog.Log.Information("Failed to Complete Step 2: Download Audiobook");
-					return false;
-				}
-
-				//Step 3
-				Serilog.Log.Information("Begin Step 3: Cleanup");
-				if (await Task.Run(Step_Cleanup))
-					Serilog.Log.Information("Completed Step 3: Cleanup");
-				else
-				{
-					Serilog.Log.Information("Failed to Complete Step 3: Cleanup");
-					return false;
-				}
-
-				Serilog.Log.Information("Completed download and convert Aaxc To {format}", DownloadOptions.OutputFormat);
-				return true;
-			}
-			catch (Exception ex)
-			{
-				Serilog.Log.Error(ex, "Error encountered in download and convert Aaxc To {format}", DownloadOptions.OutputFormat);
-				return false;
-			}
+			AsyncSteps.Name = "Download Unencrypted Audiobook";
+			AsyncSteps["Step 1: Download Audiobook"] = Step_DownloadAndDecryptAudiobookAsync;
+			AsyncSteps["Step 2: Download Clips and Bookmarks"] = Step_DownloadClipsBookmarksAsync;
+			AsyncSteps["Step 3: Create Cue"] = Step_CreateCueAsync;
 		}
 
-
 		public override Task CancelAsync()
 		{
 			IsCanceled = true;
-			CloseInputFileStream();
+			FinalizeDownload();
 			return Task.CompletedTask;
 		}
 
-		protected bool Step_GetMetadata()
-		{
-			OnRetrievedCoverArt(null);
-
-			return !IsCanceled;
-		}
-
-		private bool Step_DownloadAudiobookAsSingleFile()
+		protected override async Task<bool> Step_DownloadAndDecryptAudiobookAsync()
 		{
 			DateTime startTime = DateTime.Now;
 
 			// MUST put InputFileStream.Length first, because it starts background downloader.
 
-			while (InputFileStream.Length > InputFileStream.WritePosition && !InputFileStream.IsCancelled) 
+			while (InputFileStream.Length > InputFileStream.WritePosition && !InputFileStream.IsCancelled)
 			{
 				var rate = InputFileStream.WritePosition / (DateTime.Now - startTime).TotalSeconds;
 
@@ -88,25 +38,28 @@ namespace AaxDecrypter
 				if (double.IsNormal(estTimeRemaining))
 					OnDecryptTimeRemaining(TimeSpan.FromSeconds(estTimeRemaining));
 
-				var progressPercent = (double)InputFileStream.WritePosition / InputFileStream.Length;
+				var progressPercent = 100d * InputFileStream.WritePosition / InputFileStream.Length;
 
 				OnDecryptProgressUpdate(
 					new DownloadProgress
 					{
-						ProgressPercentage = 100 * progressPercent,
-						BytesReceived = (long)(InputFileStream.Length * progressPercent),
+						ProgressPercentage = progressPercent,
+						BytesReceived = InputFileStream.WritePosition,
 						TotalBytesToReceive = InputFileStream.Length
 					});
-				Thread.Sleep(200);
+
+				await Task.Delay(200);
 			}
 
-			CloseInputFileStream();
-			
-			var realOutputFileName = FileUtility.SaferMoveToValidPath(InputFileStream.SaveFilePath, OutputFileName, DownloadOptions.ReplacementCharacters);
-			SetOutputFileName(realOutputFileName);
-			OnFileCreated(realOutputFileName);
-
-			return !IsCanceled;
+			if (IsCanceled)
+				return false;
+			else
+			{
+				FinalizeDownload();
+				FileUtility.SaferMove(InputFileStream.SaveFilePath, OutputFileName);
+				OnFileCreated(OutputFileName);
+				return true;
+			}
 		}
 	}
 }

Source/AppScaffolding/AppScaffolding.csproj

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
-    <Version>8.4.2.1</Version>
+    <TargetFramework>net7.0</TargetFramework>
+    <Version>9.2.0.1</Version>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Octokit" Version="2.0.0" />
+    <PackageReference Include="Octokit" Version="5.0.0" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\ApplicationServices\ApplicationServices.csproj" />

Source/AppScaffolding/LibationScaffolding.cs

@@ -5,7 +5,7 @@ using System.Linq;
 using System.Reflection;
 using ApplicationServices;
 using AudibleUtilities;
-using Dinah.Core.Collections.Generic;
+using Dinah.Core;
 using Dinah.Core.IO;
 using Dinah.Core.Logging;
 using LibationFileManager;
@@ -29,6 +29,9 @@ namespace AppScaffolding
 
 	public static class LibationScaffolding
 	{
+		public const string RepositoryUrl = "ht" + "tps://github.com/rmcrackan/Libation";
+		public const string WebsiteUrl = "ht" + "tps://getlibation.com";
+		public const string RepositoryLatestUrl = "ht" + "tps://github.com/rmcrackan/Libation/releases/latest";
 		public static ReleaseIdentifier ReleaseIdentifier { get; private set; }
 		public static VarietyType Variety
 			=> ReleaseIdentifier == ReleaseIdentifier.WindowsClassic ? VarietyType.Classic
@@ -74,109 +77,12 @@ namespace AppScaffolding
 		public static void RunPostConfigMigrations(Configuration config)
 		{
 			AudibleApiStorage.EnsureAccountsSettingsFileExists();
-			PopulateMissingConfigValues(config);
 
 			//
 			// migrations go below here
 			//
 
 			Migrations.migrate_to_v6_6_9(config);
-			Migrations.migrate_from_7_10_1(config);
-		}
-
-		public static void PopulateMissingConfigValues(Configuration config)
-		{
-			config.InProgress ??= Configuration.WinTemp;
-
-            if (!config.Exists(nameof(config.UseCoverAsFolderIcon)))
-                config.UseCoverAsFolderIcon = false;
-
-            if (!config.Exists(nameof(config.BetaOptIn)))
-                config.BetaOptIn = false;
-
-            if (!config.Exists(nameof(config.AllowLibationFixup)))
-				config.AllowLibationFixup = true;
-
-			if (!config.Exists(nameof(config.CreateCueSheet)))
-				config.CreateCueSheet = true;
-
-			if (!config.Exists(nameof(config.RetainAaxFile)))
-				config.RetainAaxFile = false;
-
-			if (!config.Exists(nameof(config.SplitFilesByChapter)))
-				config.SplitFilesByChapter = false;
-
-			if (!config.Exists(nameof(config.StripUnabridged)))
-				config.StripUnabridged = false;
-
-			if (!config.Exists(nameof(config.StripAudibleBrandAudio)))
-				config.StripAudibleBrandAudio = false;
-
-			if (!config.Exists(nameof(config.DecryptToLossy)))
-				config.DecryptToLossy = false;
-
-			if (!config.Exists(nameof(config.LameTargetBitrate)))
-				config.LameTargetBitrate = false;
-
-			if (!config.Exists(nameof(config.LameDownsampleMono)))
-				config.LameDownsampleMono = true;
-
-			if (!config.Exists(nameof(config.LameBitrate)))
-				config.LameBitrate = 64;
-
-			if (!config.Exists(nameof(config.LameConstantBitrate)))
-				config.LameConstantBitrate = false;
-
-			if (!config.Exists(nameof(config.LameMatchSourceBR)))
-				config.LameMatchSourceBR = true;
-
-			if (!config.Exists(nameof(config.LameVBRQuality)))
-				config.LameVBRQuality = 2;
-
-			if (!config.Exists(nameof(config.BadBook)))
-				config.BadBook = Configuration.BadBookAction.Ask;
-
-			if (!config.Exists(nameof(config.ShowImportedStats)))
-				config.ShowImportedStats = true;
-
-			if (!config.Exists(nameof(config.ImportEpisodes)))
-				config.ImportEpisodes = true;
-
-			if (!config.Exists(nameof(config.DownloadEpisodes)))
-				config.DownloadEpisodes = true;
-
-			if (!config.Exists(nameof(config.ReplacementCharacters)))
-				config.ReplacementCharacters = FileManager.ReplacementCharacters.Default;
-
-			if (!config.Exists(nameof(config.FolderTemplate)))
-				config.FolderTemplate = Templates.Folder.DefaultTemplate;
-
-			if (!config.Exists(nameof(config.FileTemplate)))
-				config.FileTemplate = Templates.File.DefaultTemplate;
-
-			if (!config.Exists(nameof(config.ChapterFileTemplate)))
-				config.ChapterFileTemplate = Templates.ChapterFile.DefaultTemplate;
-
-			if (!config.Exists(nameof(config.ChapterTitleTemplate)))
-				config.ChapterTitleTemplate = Templates.ChapterTitle.DefaultTemplate;
-
-			if (!config.Exists(nameof(config.AutoScan)))
-				config.AutoScan = true;
-
-			if (!config.Exists(nameof(config.GridColumnsVisibilities)))
-				config.GridColumnsVisibilities = new Dictionary<string, bool>();
-
-			if (!config.Exists(nameof(config.GridColumnsDisplayIndices)))
-				config.GridColumnsDisplayIndices = new Dictionary<string, int>();
-
-			if (!config.Exists(nameof(config.GridColumnsWidths)))
-				config.GridColumnsWidths = new Dictionary<string, int>();
-
-			if (!config.Exists(nameof(config.DownloadCoverArt)))
-				config.DownloadCoverArt = true;
-
-			if (!config.Exists(nameof(config.AutoDownloadEpisodes)))
-				config.AutoDownloadEpisodes = false;
 		}
 
 		/// <summary>Initialize logging. Wire-up events. Run after migration</summary>
@@ -227,7 +133,7 @@ namespace AppScaffolding
 				{ "Using", new JArray{ "Dinah.Core", "Serilog.Exceptions" } }, // dll's name, NOT namespace
 				{ "Enrich", new JArray{ "WithCaller", "WithExceptionDetails" } },
 			};
-			config.SetObject("Serilog", serilogObj);
+			config.SetNonString(serilogObj, "Serilog");
 		}
 
 		// to restore original: Console.SetOut(origOut);
@@ -370,7 +276,7 @@ namespace AppScaffolding
 				zipUrl
 			});
 
-			return new(zipUrl, latest.HtmlUrl, zip.Name, latestRelease);
+			return new(zipUrl, latest.HtmlUrl, zip.Name, latestRelease, latest.Body);
 		}
 		private static (Octokit.Release, Octokit.ReleaseAsset) getLatestRelease(TimeSpan timeout)
 		{
@@ -457,74 +363,5 @@ namespace AppScaffolding
 				UNSAFE_MigrationHelper.Settings_AddUniqueToArray("Serilog.Enrich", "WithExceptionDetails");
 			}
 		}
-
-		public static void migrate_from_7_10_1(Configuration config)
-		{
-			var lastMigrationThrew = config.GetNonString<bool>($"{nameof(migrate_from_7_10_1)}_ThrewError");
-
-			if (lastMigrationThrew) return;
-
-			try
-			{
-
-				//https://github.com/rmcrackan/Libation/issues/270#issuecomment-1152863629
-				//This migration helps fix databases contaminated with the 7.10.1 hack workaround
-				//and those with improperly identified or missing series. This does not solve cases
-				//where individual episodes are in the db with a valid series link, but said series'
-				//parents have not been imported into the database.  For those cases, Libation will
-				//attempt fixup by retrieving parents from the catalog endpoint
-
-				using var context = DbContexts.GetContext();
-
-				//This migration removes books and series with SERIES_ prefix that were created
-				//as a hack workaround in 7.10.1. Said workaround was removed in 7.10.2
-				string removeHackSeries = "delete " +
-										  "from series " +
-										  "where AudibleSeriesId like 'SERIES%'";
-
-				string removeHackBooks = "delete " +
-										 "from books " +
-										 "where AudibleProductId like 'SERIES%'";
-
-				//Detect series parents that were added to the database as books with ContentType.Episode,
-				//and change them to ContentType.Parent
-				string updateContentType =
-					"UPDATE books " +
-					"SET contenttype = 4 " +
-					"WHERE audibleproductid IN (SELECT books.audibleproductid " +
-												"FROM books " +
-													"INNER JOIN series " +
-														"ON ( books.audibleproductid = " +
-															"series.audibleseriesid) " +
-												"WHERE books.contenttype = 2)";
-
-				//Then detect series parents that were added to the database as books with ContentType.Parent
-				//but are missing a series link, and add the link (don't know how this happened)
-				string addMissingSeriesLink =
-					"INSERT INTO seriesbook " +
-					"SELECT series.seriesid, " +
-							"books.bookid, " +
-							"'- 1' " +
-					"FROM books " +
-						"LEFT OUTER JOIN seriesbook " +
-									"ON books.bookid = seriesbook.bookid " +
-						"INNER JOIN series " +
-									"ON books.audibleproductid = series.audibleseriesid " +
-					"WHERE books.contenttype = 4 " +
-							"AND seriesbook.seriesid IS NULL";
-
-				context.Database.ExecuteSqlRaw(removeHackSeries);
-				context.Database.ExecuteSqlRaw(removeHackBooks);
-				context.Database.ExecuteSqlRaw(updateContentType);
-				context.Database.ExecuteSqlRaw(addMissingSeriesLink);
-
-				LibraryCommands.SaveContext(context);
-			}
-			catch (Exception ex)
-			{
-				Serilog.Log.Logger.Error(ex, "An error occurred while running database migrations in {0}", nameof(migrate_from_7_10_1));
-				config.SetObject($"{nameof(migrate_from_7_10_1)}_ThrewError", true);
-			}
-		}
 	}
 }

Source/AppScaffolding/UpgradeProperties.cs

@@ -1,6 +1,34 @@
 using System;
+using System.Text.RegularExpressions;
 
 namespace AppScaffolding
 {
-    public record UpgradeProperties(string ZipUrl, string HtmlUrl, string ZipName, Version LatestRelease);
+	public record UpgradeProperties
+	{
+		private static readonly Regex linkstripper = new Regex(@"\[(.*)\]\(.*\)");
+		public string ZipUrl { get; }
+		public string HtmlUrl { get; }
+		public string ZipName { get; }
+		public Version LatestRelease { get; }
+		public string Notes { get; }
+
+		public UpgradeProperties(string zipUrl, string htmlUrl, string zipName, Version latestRelease, string notes)
+		{
+			ZipName = zipName;
+			HtmlUrl = htmlUrl;
+			ZipUrl = zipUrl;
+			LatestRelease = latestRelease;
+			Notes = stripMarkdownLinks(notes);
+		}
+		private string stripMarkdownLinks(string body)
+		{
+			body = body.Replace(@"\", "");
+			var matches = linkstripper.Matches(body);
+
+			foreach (Match match in matches)
+				body = body.Replace(match.Groups[0].Value, match.Groups[1].Value);
+
+			return body;
+		}
+	}
 }

Source/ApplicationServices/ApplicationServices.csproj

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

Source/ApplicationServices/BulkSetDownloadStatus.cs

@@ -0,0 +1,78 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using DataLayer;
+using Dinah.Core;
+using LibationFileManager;
+
+namespace ApplicationServices
+{
+    public class BulkSetDownloadStatus
+    {
+        private List<(string message, LiberatedStatus newStatus, IEnumerable<Book> Books)> actionSets { get; } = new();
+
+        public int Count => actionSets.Count;
+
+        public IEnumerable<string> Messages => actionSets.Select(a => a.message);
+        public string AggregateMessage => $"Are you sure you want to set {Messages.Aggregate((a, b) => $"{a} and {b}")}?";
+
+        private List<LibraryBook> _libraryBooks;
+        private bool _setDownloaded;
+        private bool _setNotDownloaded;
+
+        public BulkSetDownloadStatus(List<LibraryBook> libraryBooks, bool setDownloaded, bool setNotDownloaded)
+        {
+            _libraryBooks = libraryBooks;
+            _setDownloaded = setDownloaded;
+            _setNotDownloaded = setNotDownloaded;
+        }
+
+        public int Discover()
+        {
+            var bookExistsList = _libraryBooks
+                .Select(libraryBook => new
+                {
+                    libraryBook.Book,
+                    FileExists = AudibleFileStorage.Audio.GetPath(libraryBook.Book.AudibleProductId) is not null
+                })
+                .ToList();
+
+            if (_setDownloaded)
+            {
+                var books2change = bookExistsList
+                    .Where(a => a.FileExists && a.Book.UserDefinedItem.BookStatus != LiberatedStatus.Liberated)
+                    .Select(a => a.Book)
+                    .ToList();
+
+                if (books2change.Any())
+                    actionSets.Add((
+                        $"{"book".PluralizeWithCount(books2change.Count)} to 'Downloaded'",
+                        LiberatedStatus.Liberated,
+                        books2change));
+            }
+
+            if (_setNotDownloaded)
+            {
+                var books2change = bookExistsList
+                    .Where(a => !a.FileExists && a.Book.UserDefinedItem.BookStatus != LiberatedStatus.NotLiberated)
+                    .Select(a => a.Book)
+                    .ToList();
+
+                if (books2change.Any())
+                    actionSets.Add((
+                        $"{"book".PluralizeWithCount(books2change.Count)} to 'Not Downloaded'",
+                        LiberatedStatus.NotLiberated,
+                        books2change));
+            }
+
+            return Count;
+        }
+
+        public void Execute()
+        {
+            foreach (var a in actionSets)
+                a.Books.UpdateBookStatus(a.newStatus);
+        }
+    }
+}

Source/ApplicationServices/LibraryCommands.cs

@@ -13,221 +13,205 @@ using static DtoImporterService.PerfLogger;
 
 namespace ApplicationServices
 {
-	public static class LibraryCommands
-	{
-		public static event EventHandler<int> ScanBegin;
-		public static event EventHandler ScanEnd;
+    public static class LibraryCommands
+    {
+        public static event EventHandler<int> ScanBegin;
+        public static event EventHandler ScanEnd;
 
-		public static bool Scanning { get; private set; }
-		private static object _lock { get; } = new();
+        public static bool Scanning { get; private set; }
+        private static object _lock { get; } = new();
 
-		static LibraryCommands()
-		{
-			ScanBegin += (_, __) => Scanning = true;
-			ScanEnd += (_, __) => Scanning = false;
-		}
+        static LibraryCommands()
+        {
+            ScanBegin += (_, __) => Scanning = true;
+            ScanEnd += (_, __) => Scanning = false;
+        }
 
         public static async Task<List<LibraryBook>> FindInactiveBooks(Func<Account, Task<ApiExtended>> apiExtendedfunc, IEnumerable<LibraryBook> existingLibrary, params Account[] accounts)
-		{
-			logRestart();
+        {
+            logRestart();
 
-			lock (_lock)
-			{
-				if (Scanning)
-					return new();
-			}
-			ScanBegin?.Invoke(null, accounts.Length);
-
-			//These are the minimum response groups required for the
-			//library scanner to pass all validation and filtering.
-			var libraryOptions = new LibraryOptions
+            lock (_lock)
             {
-				 ResponseGroups
-				 = LibraryOptions.ResponseGroupOptions.ProductAttrs
-				 | LibraryOptions.ResponseGroupOptions.ProductDesc
-				 | LibraryOptions.ResponseGroupOptions.Relationships
-			};
+                if (Scanning)
+                    return new();
+            }
+            ScanBegin?.Invoke(null, accounts.Length);
+
+            //These are the minimum response groups required for the
+            //library scanner to pass all validation and filtering.
+            var libraryOptions = new LibraryOptions
+            {
+                ResponseGroups
+                 = LibraryOptions.ResponseGroupOptions.ProductAttrs
+                 | LibraryOptions.ResponseGroupOptions.ProductDesc
+                 | LibraryOptions.ResponseGroupOptions.Relationships
+            };
             if (accounts is null || accounts.Length == 0)
-				return new List<LibraryBook>();
+                return new List<LibraryBook>();
 
-			try
-			{
-				logTime($"pre {nameof(scanAccountsAsync)} all");
-				var libraryItems = await scanAccountsAsync(apiExtendedfunc, accounts, libraryOptions);
-				logTime($"post {nameof(scanAccountsAsync)} all");
+            try
+            {
+                logTime($"pre {nameof(scanAccountsAsync)} all");
+                var libraryItems = await scanAccountsAsync(apiExtendedfunc, accounts, libraryOptions);
+                logTime($"post {nameof(scanAccountsAsync)} all");
 
-				var totalCount = libraryItems.Count;
-				Log.Logger.Information($"GetAllLibraryItems: Total count {totalCount}");
+                var totalCount = libraryItems.Count;
+                Log.Logger.Information($"GetAllLibraryItems: Total count {totalCount}");
 
-				var missingBookList = existingLibrary.Where(b => !libraryItems.Any(i => i.DtoItem.Asin == b.Book.AudibleProductId)).ToList();
+                var missingBookList = existingLibrary.Where(b => !libraryItems.Any(i => i.DtoItem.Asin == b.Book.AudibleProductId)).ToList();
 
-				return missingBookList;
-			}
-			catch (AudibleApi.Authentication.LoginFailedException lfEx)
-			{
-				lfEx.SaveFiles(Configuration.Instance.LibationFiles);
+                return missingBookList;
+            }
+            catch (AudibleApi.Authentication.LoginFailedException lfEx)
+            {
+                lfEx.SaveFiles(Configuration.Instance.LibationFiles);
 
-				// nuget Serilog.Exceptions would automatically log custom properties
-				//   However, it comes with a scary warning when used with EntityFrameworkCore which I'm not yet ready to implement:
-				//   https://github.com/RehanSaeed/Serilog.Exceptions
-				// work-around: use 3rd param. don't just put exception object in 3rd param -- info overload: stack trace, etc
-				Log.Logger.Error(lfEx, "Error scanning library. Login failed. {@DebugInfo}", new
-				{
-					lfEx.RequestUrl,
-					ResponseStatusCodeNumber = (int)lfEx.ResponseStatusCode,
-					ResponseStatusCodeDesc = lfEx.ResponseStatusCode,
-					lfEx.ResponseInputFields,
-					lfEx.ResponseBodyFilePaths
-				});
-				throw;
-			}
-			catch (Exception ex)
-			{
-				Log.Logger.Error(ex, "Error scanning library");
-				throw;
-			}
-			finally
-			{
-				stop();
-				var putBreakPointHere = logOutput;
-				ScanEnd?.Invoke(null, null);
-			}
-		}
-
-		#region FULL LIBRARY scan and import
-		public static async Task<(int totalCount, int newCount)> ImportAccountAsync(Func<Account, Task<ApiExtended>> apiExtendedfunc, params Account[] accounts)
-		{
-			logRestart();
-
-			if (accounts is null || accounts.Length == 0)
-				return (0, 0);
-
-			try
-			{
-				lock (_lock)
+                // nuget Serilog.Exceptions would automatically log custom properties
+                //   However, it comes with a scary warning when used with EntityFrameworkCore which I'm not yet ready to implement:
+                //   https://github.com/RehanSaeed/Serilog.Exceptions
+                // work-around: use 3rd param. don't just put exception object in 3rd param -- info overload: stack trace, etc
+                Log.Logger.Error(lfEx, "Error scanning library. Login failed. {@DebugInfo}", new
                 {
-					if (Scanning)
-						return (0, 0);
-				}
-				ScanBegin?.Invoke(null, accounts.Length);
+                    lfEx.RequestUrl,
+                    ResponseStatusCodeNumber = (int)lfEx.ResponseStatusCode,
+                    ResponseStatusCodeDesc = lfEx.ResponseStatusCode,
+                    lfEx.ResponseInputFields,
+                    lfEx.ResponseBodyFilePaths
+                });
+                throw;
+            }
+            catch (Exception ex)
+            {
+                Log.Logger.Error(ex, "Error scanning library");
+                throw;
+            }
+            finally
+            {
+                stop();
+                var putBreakPointHere = logOutput;
+                ScanEnd?.Invoke(null, null);
+            }
+        }
 
-				logTime($"pre {nameof(scanAccountsAsync)} all");
-				var libraryOptions = new LibraryOptions
-				{
-					ResponseGroups = LibraryOptions.ResponseGroupOptions.ALL_OPTIONS,
-					ImageSizes = LibraryOptions.ImageSizeOptions._500 | LibraryOptions.ImageSizeOptions._1215
-				};
+        #region FULL LIBRARY scan and import
+        public static async Task<(int totalCount, int newCount)> ImportAccountAsync(Func<Account, Task<ApiExtended>> apiExtendedfunc, params Account[] accounts)
+        {
+            logRestart();
+
+            if (accounts is null || accounts.Length == 0)
+                return (0, 0);
+
+            try
+            {
+                lock (_lock)
+                {
+                    if (Scanning)
+                        return (0, 0);
+                }
+                ScanBegin?.Invoke(null, accounts.Length);
+
+                logTime($"pre {nameof(scanAccountsAsync)} all");
+                var libraryOptions = new LibraryOptions
+                {
+                    ResponseGroups = LibraryOptions.ResponseGroupOptions.ALL_OPTIONS,
+                    ImageSizes = LibraryOptions.ImageSizeOptions._500 | LibraryOptions.ImageSizeOptions._1215
+                };
                 var importItems = await scanAccountsAsync(apiExtendedfunc, accounts, libraryOptions);
-				logTime($"post {nameof(scanAccountsAsync)} all");
+                logTime($"post {nameof(scanAccountsAsync)} all");
 
-				var totalCount = importItems.Count;
-				Log.Logger.Information($"GetAllLibraryItems: Total count {totalCount}");
+                var totalCount = importItems.Count;
+                Log.Logger.Information($"GetAllLibraryItems: Total count {totalCount}");
 
-				if (totalCount == 0)
-					return default;
+                if (totalCount == 0)
+                    return default;
 
+                Log.Logger.Information("Begin long-running import");
+                logTime($"pre {nameof(importIntoDbAsync)}");
+                var newCount = await importIntoDbAsync(importItems);
+                logTime($"post {nameof(importIntoDbAsync)}");
+                Log.Logger.Information($"Import complete. New count {newCount}");
 
-				Log.Logger.Information("Begin scan for orphaned episode parents");
-				var newParents = await findAndAddMissingParents(accounts);
-				Log.Logger.Information($"Orphan episode scan complete. New parents count {newParents}");
+                return (totalCount, newCount);
+            }
+            catch (AudibleApi.Authentication.LoginFailedException lfEx)
+            {
+                lfEx.SaveFiles(Configuration.Instance.LibationFiles);
 
-				if (newParents >= 0)
-				{
-					//If any episodes are still orphaned, their series have been
-					//removed from the catalog and we'll never be able to find them.
+                // nuget Serilog.Exceptions would automatically log custom properties
+                //   However, it comes with a scary warning when used with EntityFrameworkCore which I'm not yet ready to implement:
+                //   https://github.com/RehanSaeed/Serilog.Exceptions
+                // work-around: use 3rd param. don't just put exception object in 3rd param -- info overload: stack trace, etc
+                Log.Logger.Error(lfEx, "Error importing library. Login failed. {@DebugInfo}", new
+                {
+                    lfEx.RequestUrl,
+                    ResponseStatusCodeNumber = (int)lfEx.ResponseStatusCode,
+                    ResponseStatusCodeDesc = lfEx.ResponseStatusCode,
+                    lfEx.ResponseInputFields,
+                    lfEx.ResponseBodyFilePaths
+                });
+                throw;
+            }
+            catch (Exception ex)
+            {
+                Log.Logger.Error(ex, "Error importing library");
+                throw;
+            }
+            finally
+            {
+                stop();
+                var putBreakPointHere = logOutput;
+                ScanEnd?.Invoke(null, null);
+            }
+        }
 
-					//only do this if findAndAddMissingParents returned >= 0. If it
-					//returned < 0, an error happened and there's still a chance that
-					//a future successful run will find missing parents.
-					removedOrphanedEpisodes();
-				}
+        private static async Task<List<ImportItem>> scanAccountsAsync(Func<Account, Task<ApiExtended>> apiExtendedfunc, Account[] accounts, LibraryOptions libraryOptions)
+        {
+            var tasks = new List<Task<List<ImportItem>>>();
+            foreach (var account in accounts)
+            {
+                // get APIs in serial b/c of logins. do NOT move inside of parallel (Task.WhenAll)
+                var apiExtended = await apiExtendedfunc(account);
 
-				Log.Logger.Information("Begin long-running import");
-				logTime($"pre {nameof(importIntoDbAsync)}");
-				var newCount = await importIntoDbAsync(importItems);
-				logTime($"post {nameof(importIntoDbAsync)}");
-				Log.Logger.Information($"Import complete. New count {newCount}");
+                // add scanAccountAsync as a TASK: do not await
+                tasks.Add(scanAccountAsync(apiExtended, account, libraryOptions));
+            }
 
-				return (totalCount, newCount);
-			}
-			catch (AudibleApi.Authentication.LoginFailedException lfEx)
-			{
-				lfEx.SaveFiles(Configuration.Instance.LibationFiles);
+            // import library in parallel
+            var arrayOfLists = await Task.WhenAll(tasks);
+            var importItems = arrayOfLists.SelectMany(a => a).ToList();
+            return importItems;
+        }
 
-				// nuget Serilog.Exceptions would automatically log custom properties
-				//   However, it comes with a scary warning when used with EntityFrameworkCore which I'm not yet ready to implement:
-				//   https://github.com/RehanSaeed/Serilog.Exceptions
-				// work-around: use 3rd param. don't just put exception object in 3rd param -- info overload: stack trace, etc
-				Log.Logger.Error(lfEx, "Error importing library. Login failed. {@DebugInfo}", new
-				{
-					lfEx.RequestUrl,
-					ResponseStatusCodeNumber = (int)lfEx.ResponseStatusCode,
-					ResponseStatusCodeDesc = lfEx.ResponseStatusCode,
-					lfEx.ResponseInputFields,
-					lfEx.ResponseBodyFilePaths
-				});
-				throw;
-			}
-			catch (Exception ex)
-			{
-				Log.Logger.Error(ex, "Error importing library");
-				throw;
-			}
-			finally
-			{
-				stop();
-				var putBreakPointHere = logOutput;
-				ScanEnd?.Invoke(null, null);
-			}
-		}
+        private static async Task<List<ImportItem>> scanAccountAsync(ApiExtended apiExtended, Account account, LibraryOptions libraryOptions)
+        {
+            ArgumentValidator.EnsureNotNull(account, nameof(account));
 
-		private static async Task<List<ImportItem>> scanAccountsAsync(Func<Account, Task<ApiExtended>> apiExtendedfunc, Account[] accounts, LibraryOptions libraryOptions)
-		{
-			var tasks = new List<Task<List<ImportItem>>>();
-			foreach (var account in accounts)
-			{
-				// get APIs in serial b/c of logins. do NOT move inside of parallel (Task.WhenAll)
-				var apiExtended = await apiExtendedfunc(account);
+            Log.Logger.Information("ImportLibraryAsync. {@DebugInfo}", new
+            {
+                Account = account?.MaskedLogEntry ?? "[null]"
+            });
 
-				// add scanAccountAsync as a TASK: do not await
-				tasks.Add(scanAccountAsync(apiExtended, account, libraryOptions));
-			}
+            logTime($"pre scanAccountAsync {account.AccountName}");
 
-			// import library in parallel
-			var arrayOfLists = await Task.WhenAll(tasks);
-			var importItems = arrayOfLists.SelectMany(a => a).ToList();
-			return importItems;
-		}
+            var dtoItems = await apiExtended.GetLibraryValidatedAsync(libraryOptions, Configuration.Instance.ImportEpisodes);
 
-		private static async Task<List<ImportItem>> scanAccountAsync(ApiExtended apiExtended, Account account, LibraryOptions libraryOptions)
-		{
-			ArgumentValidator.EnsureNotNull(account, nameof(account));
+            logTime($"post scanAccountAsync {account.AccountName} qty: {dtoItems.Count}");
 
-			Log.Logger.Information("ImportLibraryAsync. {@DebugInfo}", new
-			{
-				Account = account?.MaskedLogEntry ?? "[null]"
-			});
+            return dtoItems.Select(d => new ImportItem { DtoItem = d, AccountId = account.AccountId, LocaleName = account.Locale?.Name }).ToList();
+        }
 
-			logTime($"pre scanAccountAsync {account.AccountName}");
-
-			var dtoItems = await apiExtended.GetLibraryValidatedAsync(libraryOptions, Configuration.Instance.ImportEpisodes);
-
-			logTime($"post scanAccountAsync {account.AccountName} qty: {dtoItems.Count}");
-
-			return dtoItems.Select(d => new ImportItem { DtoItem = d, AccountId = account.AccountId, LocaleName = account.Locale?.Name }).ToList();
-		}
-
-		private static async Task<int> importIntoDbAsync(List<ImportItem> importItems)
+        private static async Task<int> importIntoDbAsync(List<ImportItem> importItems)
         {
             logTime("importIntoDbAsync -- pre db");
             using var context = DbContexts.GetContext();
             var libraryBookImporter = new LibraryBookImporter(context);
             var newCount = await Task.Run(() => libraryBookImporter.Import(importItems));
-			logTime("importIntoDbAsync -- post Import()");
+            logTime("importIntoDbAsync -- post Import()");
             int qtyChanges = SaveContext(context);
             logTime("importIntoDbAsync -- post SaveChanges");
 
-			// this is any changes at all to the database, not just new books
+            // this is any changes at all to the database, not just new books
             if (qtyChanges > 0)
                 await Task.Run(() => finalizeLibrarySizeChange());
             logTime("importIntoDbAsync -- post finalizeLibrarySizeChange");
@@ -235,248 +219,249 @@ namespace ApplicationServices
             return newCount;
         }
 
-		static void removedOrphanedEpisodes()
-		{
-			using var context = DbContexts.GetContext();
-			try
-			{
-				var orphanedEpisodes =
-					context
-					.GetLibrary_Flat_NoTracking(includeParents: true)
-					.FindOrphanedEpisodes();
+        public static int SaveContext(LibationContext context)
+        {
+            try
+            {
+                return context.SaveChanges();
+            }
+            catch (Microsoft.EntityFrameworkCore.DbUpdateException ex)
+            {
+                // DbUpdateException exceptions can wreck serilog. Condense it until we can find a better solution. I suspect the culprit is the "WithExceptionDetails" serilog extension
 
-				context.LibraryBooks.RemoveRange(orphanedEpisodes);
-				context.Books.RemoveRange(orphanedEpisodes.Select(lb => lb.Book));
+                static string format(Exception ex) => $"\r\nMessage: {ex.Message}\r\nStack Trace:\r\n{ex.StackTrace}";
 
-			}
-			catch (Exception ex)
-			{
-				Serilog.Log.Logger.Error(ex, "An error occurred while trying to remove orphaned episodes from the database");
-			}
-		}
-
-		static async Task<int> findAndAddMissingParents(Account[] accounts)
-		{
-			using var context = DbContexts.GetContext();
-
-			var library = context.GetLibrary_Flat_NoTracking(includeParents: true);
-
-			try
-			{
-				var orphanedEpisodes = library.FindOrphanedEpisodes().ToList();
-
-				if (!orphanedEpisodes.Any())
-					return -1;
-
-				var orphanedSeries =
-					orphanedEpisodes
-					.SelectMany(lb => lb.Book.SeriesLink)
-					.DistinctBy(s => s.Series.AudibleSeriesId)
-					.ToList();
-
-				// The Catalog endpoint does not require authentication.
-				var api = new ApiUnauthenticated(accounts[0].Locale);
-
-				var seriesParents = orphanedSeries.Select(o => o.Series.AudibleSeriesId).ToList();
-				var items = await api.GetCatalogProductsAsync(seriesParents, CatalogOptions.ResponseGroupOptions.ALL_OPTIONS);
-
-				List<ImportItem> newParentsImportItems = new();
-				foreach (var sp in orphanedSeries)
-				{
-					var seriesItem = items.First(i => i.Asin == sp.Series.AudibleSeriesId);
-
-					if (seriesItem.Relationships is null)
-						continue;
-
-					var episode = orphanedEpisodes.First(l => l.Book.AudibleProductId == sp.Book.AudibleProductId);
-
-					seriesItem.PurchaseDate = new DateTimeOffset(episode.DateAdded);
-					seriesItem.Series = new AudibleApi.Common.Series[]
-					{
-						new AudibleApi.Common.Series{ Asin = seriesItem.Asin, Title = seriesItem.TitleWithSubtitle, Sequence = "-1"}
-					};
-
-					newParentsImportItems.Add(new ImportItem { DtoItem = seriesItem, AccountId = episode.Account, LocaleName = episode.Book.Locale });
-				}
-
-				var newCoutn = new LibraryBookImporter(context)
-					.Import(newParentsImportItems);
-
-				await context.SaveChangesAsync();
-
-				return newCoutn;
-			}
-			catch (Exception ex)
-			{
-				Serilog.Log.Logger.Error(ex, "An error occurred while trying to scan for orphaned episode parents.");
-				return -1;
-			}
-		}
-
-		public static int SaveContext(LibationContext context)
-		{
-			try
-			{
-				return context.SaveChanges();
-			}
-			catch (Microsoft.EntityFrameworkCore.DbUpdateException ex)
-			{
-				// DbUpdateException exceptions can wreck serilog. Condense it until we can find a better solution. I suspect the culprit is the "WithExceptionDetails" serilog extension
-
-				static string format(Exception ex) => $"\r\nMessage: {ex.Message}\r\nStack Trace:\r\n{ex.StackTrace}";
-
-				var msg = "Microsoft.EntityFrameworkCore.DbUpdateException";
-				if (ex.InnerException is null)
-					throw new Exception($"{msg}{format(ex)}");
-				throw new Exception(
-					$"{msg}{format(ex)}",
-					new Exception($"Inner Exception{format(ex.InnerException)}"));
-			}
+                var msg = "Microsoft.EntityFrameworkCore.DbUpdateException";
+                if (ex.InnerException is null)
+                    throw new Exception($"{msg}{format(ex)}");
+                throw new Exception(
+                    $"{msg}{format(ex)}",
+                    new Exception($"Inner Exception{format(ex.InnerException)}"));
+            }
         }
         #endregion
 
-        #region remove books
-        public static Task<List<LibraryBook>> RemoveBooksAsync(List<string> idsToRemove) => Task.Run(() => removeBooks(idsToRemove));
-		private static List<LibraryBook> removeBooks(List<string> idsToRemove)
-		{
-			using var context = DbContexts.GetContext();
-			var libBooks = context.GetLibrary_Flat_NoTracking();
-
-			var removeLibraryBooks = libBooks.Where(lb => idsToRemove.Contains(lb.Book.AudibleProductId)).ToList();
-			context.LibraryBooks.RemoveRange(removeLibraryBooks);
-			context.Books.RemoveRange(removeLibraryBooks.Select(lb => lb.Book));
-
-			var qtyChanges = context.SaveChanges();
-			if (qtyChanges > 0)
-				finalizeLibrarySizeChange();
-
-			return removeLibraryBooks;
-		}
-		#endregion
-
-		// call this whenever books are added or removed from library
-		private static void finalizeLibrarySizeChange() => LibrarySizeChanged?.Invoke(null, null);
-
-		/// <summary>Occurs when the size of the library changes. ie: books are added or removed</summary>
-		public static event EventHandler LibrarySizeChanged;
-
-		/// <summary>
-		/// Occurs when the size of the library does not change but book(s) details do. Especially when <see cref="UserDefinedItem.Tags"/>, <see cref="UserDefinedItem.BookStatus"/>, or <see cref="UserDefinedItem.PdfStatus"/> changed values are successfully persisted.
-		/// </summary>
-		public static event EventHandler<IEnumerable<Book>> BookUserDefinedItemCommitted;
-
-		#region Update book details
-		public static int UpdateBookStatus(this Book book, LiberatedStatus bookStatus)
-		{
-			book.UserDefinedItem.BookStatus = bookStatus;
-			return UpdateUserDefinedItem(book);
-		}
-		public static int UpdatePdfStatus(this Book book, LiberatedStatus pdfStatus)
-		{
-			book.UserDefinedItem.PdfStatus = pdfStatus;
-			return UpdateUserDefinedItem(book);
-		}
-		public static int UpdateBook(
-			this Book book,
-			string tags = null,
-			LiberatedStatus? bookStatus = null,
-			LiberatedStatus? pdfStatus = null)
-			=> UpdateBooks(tags, bookStatus, pdfStatus, book);
-		public static int UpdateBooks(
-			string tags = null,
-			LiberatedStatus? bookStatus = null,
-			LiberatedStatus? pdfStatus = null,
-			params Book[] books)
+        #region remove/restore books
+        public static Task<int> RemoveBooksAsync(List<string> idsToRemove) => Task.Run(() => removeBooks(idsToRemove));
+        public static int RemoveBook(string idToRemove) => removeBooks(new() { idToRemove });
+        private static int removeBooks(List<string> idsToRemove)
         {
-			foreach (var book in books)
-			{
-				// blank tags are expected. null tags are not
-				if (tags is not null && book.UserDefinedItem.Tags != tags)
-					book.UserDefinedItem.Tags = tags;
+            try
+            {
+                if (idsToRemove is null || !idsToRemove.Any())
+                    return 0;
 
-				if (bookStatus is not null && book.UserDefinedItem.BookStatus != bookStatus.Value)
-					book.UserDefinedItem.BookStatus = bookStatus.Value;
+                using var context = DbContexts.GetContext();
+                var libBooks = context.GetLibrary_Flat_NoTracking();
+                var removeLibraryBooks = libBooks.Where(lb => idsToRemove.Contains(lb.Book.AudibleProductId)).ToList();
 
-				// even though PdfStatus is nullable, there's no case where we'd actually overwrite with null
-				if (pdfStatus is not null && book.UserDefinedItem.PdfStatus != pdfStatus.Value)
-					book.UserDefinedItem.PdfStatus = pdfStatus.Value;
-			}
+                // Attach() NoTracking entities before SaveChanges()
+                foreach (var lb in removeLibraryBooks)
+                {
+                    lb.IsDeleted = true;
+                    context.Attach(lb).State = Microsoft.EntityFrameworkCore.EntityState.Modified;
+                }
 
-			return UpdateUserDefinedItem(books);
-		}
-		public static int UpdateUserDefinedItem(params Book[] books) => UpdateUserDefinedItem(books.ToList());
-		public static int UpdateUserDefinedItem(IEnumerable<Book> books)
-		{
-			try
-			{
-				if (books is null || !books.Any())
-					return 0;
+                var qtyChanges = context.SaveChanges();
+                if (qtyChanges > 0)
+                    finalizeLibrarySizeChange();
 
-				using var context = DbContexts.GetContext();
+                return qtyChanges;
+            }
+            catch (Exception ex)
+            {
+                Log.Logger.Error(ex, "Error removing books");
+                throw;
+            }
+        }
 
-				// Attach() NoTracking entities before SaveChanges()
-				foreach (var book in books)
-					context.Attach(book.UserDefinedItem).State = Microsoft.EntityFrameworkCore.EntityState.Modified;
+        public static int RestoreBooks(this List<LibraryBook> libraryBooks)
+        {
+            try
+            {
+                if (libraryBooks is null || !libraryBooks.Any())
+                    return 0;
 
-				var qtyChanges = context.SaveChanges();
-				if (qtyChanges > 0)
-					BookUserDefinedItemCommitted?.Invoke(null, books);
+                using var context = DbContexts.GetContext();
 
-				return qtyChanges;
-			}
-			catch (Exception ex)
-			{
-				Log.Logger.Error(ex, $"Error updating {nameof(Book.UserDefinedItem)}");
-				throw;
-			}
-		}
-		#endregion
+                // Attach() NoTracking entities before SaveChanges()
+                foreach (var lb in libraryBooks)
+                {
+                    lb.IsDeleted = false;
+                    context.Attach(lb).State = Microsoft.EntityFrameworkCore.EntityState.Modified;
+                }
 
-		// must be here instead of in db layer due to AaxcExists
-		public static LiberatedStatus Liberated_Status(Book book)
-			=> book.Audio_Exists() ? book.UserDefinedItem.BookStatus
-			: AudibleFileStorage.AaxcExists(book.AudibleProductId) ? LiberatedStatus.PartialDownload
-			: LiberatedStatus.NotLiberated;
+                var qtyChanges = context.SaveChanges();
+                if (qtyChanges > 0)
+                    finalizeLibrarySizeChange();
 
-		// exists here for feature predictability. It makes sense for this to be where Liberated_Status is
-		public static LiberatedStatus? Pdf_Status(Book book) => book.UserDefinedItem.PdfStatus;
+                return qtyChanges;
+            }
+            catch (Exception ex)
+            {
+                Log.Logger.Error(ex, "Error restoring books");
+                throw;
+            }
+        }
+        #endregion
 
-		// below are queries, not commands. maybe I should make a LibraryQueries. except there's already one of those...
+        // call this whenever books are added or removed from library
+        private static void finalizeLibrarySizeChange() => LibrarySizeChanged?.Invoke(null, null);
 
-		public record LibraryStats(int booksFullyBackedUp, int booksDownloadedOnly, int booksNoProgress, int booksError, int pdfsDownloaded, int pdfsNotDownloaded)
-		{
-			public int PendingBooks => booksNoProgress + booksDownloadedOnly;
-			public bool HasPendingBooks => PendingBooks > 0;
+        /// <summary>Occurs when the size of the library changes. ie: books are added or removed</summary>
+        public static event EventHandler LibrarySizeChanged;
 
-			public bool HasBookResults => 0 < (booksFullyBackedUp + booksDownloadedOnly + booksNoProgress + booksError);
-			public bool HasPdfResults => 0 < (pdfsNotDownloaded + pdfsDownloaded);
-		}
-		public static LibraryStats GetCounts()
-		{
-			var libraryBooks = DbContexts.GetLibrary_Flat_NoTracking();
+        /// <summary>
+        /// Occurs when the size of the library does not change but book(s) details do. Especially when <see cref="UserDefinedItem.Tags"/>, <see cref="UserDefinedItem.BookStatus"/>, or <see cref="UserDefinedItem.PdfStatus"/> changed values are successfully persisted.
+        /// </summary>
+        public static event EventHandler<IEnumerable<Book>> BookUserDefinedItemCommitted;
 
-			var results = libraryBooks
-				.AsParallel()
-				.Select(lb => Liberated_Status(lb.Book))
-				.ToList();
-			var booksFullyBackedUp = results.Count(r => r == LiberatedStatus.Liberated);
-			var booksDownloadedOnly = results.Count(r => r == LiberatedStatus.PartialDownload);
-			var booksNoProgress = results.Count(r => r == LiberatedStatus.NotLiberated);
-			var booksError = results.Count(r => r == LiberatedStatus.Error);
+        #region Update book details
+        public static int UpdateUserDefinedItem(
+            this Book book,
+            string tags = null,
+            LiberatedStatus? bookStatus = null,
+            LiberatedStatus? pdfStatus = null,
+            Rating rating = null)
+            => new[] { book }.UpdateUserDefinedItem(tags, bookStatus, pdfStatus, rating);
 
-			Log.Logger.Information("Book counts. {@DebugInfo}", new { total = results.Count, booksFullyBackedUp, booksDownloadedOnly, booksNoProgress, booksError });
+        public static int UpdateUserDefinedItem(
+            this IEnumerable<Book> books,
+            string tags = null,
+            LiberatedStatus? bookStatus = null,
+            LiberatedStatus? pdfStatus = null,
+            Rating rating = null)
+            => updateUserDefinedItem(
+                books,
+                udi => {
+                    // blank tags are expected. null tags are not
+                    if (tags is not null)
+                        udi.Tags = tags;
 
-			var boolResults = libraryBooks
-				.AsParallel()
-				.Where(lb => lb.Book.HasPdf())
-				.Select(lb => Pdf_Status(lb.Book))
-				.ToList();
-			var pdfsDownloaded = boolResults.Count(r => r == LiberatedStatus.Liberated);
-			var pdfsNotDownloaded = boolResults.Count(r => r == LiberatedStatus.NotLiberated);
+                    if (bookStatus.HasValue)
+                        udi.BookStatus = bookStatus.Value;
 
-			Log.Logger.Information("PDF counts. {@DebugInfo}", new { total = boolResults.Count, pdfsDownloaded, pdfsNotDownloaded });
+                    // method handles null logic
+                    udi.SetPdfStatus(pdfStatus);
 
-			return new(booksFullyBackedUp, booksDownloadedOnly, booksNoProgress, booksError, pdfsDownloaded, pdfsNotDownloaded);
-		}
-	}
+                    if (rating is not null)
+                        udi.UpdateRating(rating.OverallRating, rating.PerformanceRating, rating.StoryRating);
+                });
+
+        public static int UpdateBookStatus(this Book book, LiberatedStatus bookStatus)
+            => book.UpdateUserDefinedItem(udi => udi.BookStatus = bookStatus);
+        public static int UpdateBookStatus(this IEnumerable<Book> books, LiberatedStatus bookStatus)
+            => books.UpdateUserDefinedItem(udi => udi.BookStatus = bookStatus);
+        public static int UpdateBookStatus(this LibraryBook libraryBook, LiberatedStatus bookStatus)
+            => libraryBook.UpdateUserDefinedItem(udi => udi.BookStatus = bookStatus);
+        public static int UpdateBookStatus(this IEnumerable<LibraryBook> libraryBooks, LiberatedStatus bookStatus)
+            => libraryBooks.UpdateUserDefinedItem(udi => udi.BookStatus = bookStatus);
+
+        public static int UpdatePdfStatus(this Book book, LiberatedStatus pdfStatus)
+            => book.UpdateUserDefinedItem(udi => udi.SetPdfStatus(pdfStatus));
+        public static int UpdatePdfStatus(this IEnumerable<Book> books, LiberatedStatus pdfStatus)
+            => books.UpdateUserDefinedItem(udi => udi.SetPdfStatus(pdfStatus));
+        public static int UpdatePdfStatus(this LibraryBook libraryBook, LiberatedStatus pdfStatus)
+            => libraryBook.UpdateUserDefinedItem(udi => udi.SetPdfStatus(pdfStatus));
+        public static int UpdatePdfStatus(this IEnumerable<LibraryBook> libraryBooks, LiberatedStatus pdfStatus)
+            => libraryBooks.UpdateUserDefinedItem(udi => udi.SetPdfStatus(pdfStatus));
+
+        public static int UpdateTags(this Book book, string tags)
+            => book.UpdateUserDefinedItem(udi => udi.Tags = tags);
+        public static int UpdateTags(this IEnumerable<Book> books, string tags)
+            => books.UpdateUserDefinedItem(udi => udi.Tags = tags);
+        public static int UpdateTags(this LibraryBook libraryBook, string tags)
+            => libraryBook.UpdateUserDefinedItem(udi => udi.Tags = tags);
+        public static int UpdateTags(this IEnumerable<LibraryBook> libraryBooks, string tags)
+            => libraryBooks.UpdateUserDefinedItem(udi => udi.Tags = tags);
+
+        public static int UpdateUserDefinedItem(this LibraryBook libraryBook, Action<UserDefinedItem> action)
+            => libraryBook.Book.updateUserDefinedItem(action);
+        public static int UpdateUserDefinedItem(this IEnumerable<LibraryBook> libraryBooks, Action<UserDefinedItem> action)
+            => libraryBooks.Select(lb => lb.Book).updateUserDefinedItem(action);
+
+        public static int UpdateUserDefinedItem(this Book book, Action<UserDefinedItem> action) => book.updateUserDefinedItem(action);
+        public static int UpdateUserDefinedItem(this IEnumerable<Book> books, Action<UserDefinedItem> action) => books.updateUserDefinedItem(action);
+
+        private static int updateUserDefinedItem(this Book book, Action<UserDefinedItem> action) => new[] { book }.updateUserDefinedItem(action);
+        private static int updateUserDefinedItem(this IEnumerable<Book> books, Action<UserDefinedItem> action)
+        {
+            try
+            {
+                if (books is null || !books.Any())
+                    return 0;
+
+                foreach (var book in books)
+                    action?.Invoke(book.UserDefinedItem);
+
+                using var context = DbContexts.GetContext();
+
+                // Attach() NoTracking entities before SaveChanges()
+                foreach (var book in books)
+                {
+                    context.Attach(book.UserDefinedItem).State = Microsoft.EntityFrameworkCore.EntityState.Modified;
+                    context.Attach(book.UserDefinedItem.Rating).State = Microsoft.EntityFrameworkCore.EntityState.Modified;
+                }
+
+                var qtyChanges = context.SaveChanges();
+                if (qtyChanges > 0)
+                    BookUserDefinedItemCommitted?.Invoke(null, books);
+
+                return qtyChanges;
+            }
+            catch (Exception ex)
+            {
+                Log.Logger.Error(ex, $"Error updating {nameof(Book.UserDefinedItem)}");
+                throw;
+            }
+        }
+        #endregion
+
+        // must be here instead of in db layer due to AaxcExists
+        public static LiberatedStatus Liberated_Status(Book book)
+            => book.Audio_Exists() ? book.UserDefinedItem.BookStatus
+            : AudibleFileStorage.AaxcExists(book.AudibleProductId) ? LiberatedStatus.PartialDownload
+            : LiberatedStatus.NotLiberated;
+
+        // exists here for feature predictability. It makes sense for this to be where Liberated_Status is
+        public static LiberatedStatus? Pdf_Status(Book book) => book.UserDefinedItem.PdfStatus;
+
+        // below are queries, not commands. maybe I should make a LibraryQueries. except there's already one of those...
+
+        public record LibraryStats(int booksFullyBackedUp, int booksDownloadedOnly, int booksNoProgress, int booksError, int pdfsDownloaded, int pdfsNotDownloaded)
+        {
+            public int PendingBooks => booksNoProgress + booksDownloadedOnly;
+            public bool HasPendingBooks => PendingBooks > 0;
+
+            public bool HasBookResults => 0 < (booksFullyBackedUp + booksDownloadedOnly + booksNoProgress + booksError);
+            public bool HasPdfResults => 0 < (pdfsNotDownloaded + pdfsDownloaded);
+        }
+        public static LibraryStats GetCounts()
+        {
+            var libraryBooks = DbContexts.GetLibrary_Flat_NoTracking();
+
+            var results = libraryBooks
+                .AsParallel()
+                .Select(lb => Liberated_Status(lb.Book))
+                .ToList();
+            var booksFullyBackedUp = results.Count(r => r == LiberatedStatus.Liberated);
+            var booksDownloadedOnly = results.Count(r => r == LiberatedStatus.PartialDownload);
+            var booksNoProgress = results.Count(r => r == LiberatedStatus.NotLiberated);
+            var booksError = results.Count(r => r == LiberatedStatus.Error);
+
+            Log.Logger.Information("Book counts. {@DebugInfo}", new { total = results.Count, booksFullyBackedUp, booksDownloadedOnly, booksNoProgress, booksError });
+
+            var boolResults = libraryBooks
+                .AsParallel()
+                .Where(lb => lb.Book.HasPdf())
+                .Select(lb => Pdf_Status(lb.Book))
+                .ToList();
+            var pdfsDownloaded = boolResults.Count(r => r == LiberatedStatus.Liberated);
+            var pdfsNotDownloaded = boolResults.Count(r => r == LiberatedStatus.NotLiberated);
+
+            Log.Logger.Information("PDF counts. {@DebugInfo}", new { total = boolResults.Count, pdfsDownloaded, pdfsNotDownloaded });
+
+            return new(booksFullyBackedUp, booksDownloadedOnly, booksNoProgress, booksError, pdfsDownloaded, pdfsNotDownloaded);
+        }
+    }
 }

Source/ApplicationServices/LibraryExporter.cs

@@ -103,7 +103,10 @@ namespace ApplicationServices
 
         [Name("Audio Format")]
 		public string AudioFormat { get; set; }
-	}
+
+		[Name("Language")]
+        public string Language { get; set; }
+    }
 	public static class LibToDtos
 	{
 		public static List<ExportDto> ToDtos(this IEnumerable<LibraryBook> library)
@@ -136,7 +139,8 @@ namespace ApplicationServices
 				BookStatus = a.Book.UserDefinedItem.BookStatus.ToString(),
 				PdfStatus = a.Book.UserDefinedItem.PdfStatus.ToString(),
 				ContentType = a.Book.ContentType.ToString(),
-				AudioFormat = a.Book.AudioFormat.ToString()
+				AudioFormat = a.Book.AudioFormat.ToString(),
+				Language = a.Book.Language
 			}).ToList();
 	}
 	public static class LibraryExporter
@@ -207,8 +211,9 @@ namespace ApplicationServices
 				nameof(ExportDto.BookStatus),
 				nameof(ExportDto.PdfStatus),
 				nameof(ExportDto.ContentType),
-				nameof(ExportDto.AudioFormat)
-			};
+				nameof(ExportDto.AudioFormat),
+                nameof(ExportDto.Language)
+            };
 			var col = 0;
 			foreach (var c in columns)
 			{
@@ -273,9 +278,10 @@ namespace ApplicationServices
 				row.CreateCell(col++).SetCellValue(dto.BookStatus);
 				row.CreateCell(col++).SetCellValue(dto.PdfStatus);
 				row.CreateCell(col++).SetCellValue(dto.ContentType);
-				row.CreateCell(col++).SetCellValue(dto.AudioFormat);
+                row.CreateCell(col++).SetCellValue(dto.AudioFormat);
+                row.CreateCell(col++).SetCellValue(dto.Language);
 
-				rowIndex++;
+                rowIndex++;
 			}
 
 			using var fileData = new System.IO.FileStream(saveFilePath, System.IO.FileMode.Create);

Source/ApplicationServices/RecordExporter.cs

@@ -0,0 +1,198 @@
+using AudibleApi.Common;
+using CsvHelper;
+using DataLayer;
+using Newtonsoft.Json.Linq;
+using NPOI.XSSF.UserModel;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace ApplicationServices
+{
+	public static class RecordExporter
+	{
+		public static void ToXlsx(string saveFilePath, IEnumerable<IRecord> records)
+		{
+			if (!records.Any())
+				return;
+
+			using var workbook = new XSSFWorkbook();
+			var sheet = workbook.CreateSheet("Records");
+
+			var detailSubtotalFont = workbook.CreateFont();
+			detailSubtotalFont.IsBold = true;
+
+			var detailSubtotalCellStyle = workbook.CreateCellStyle();
+			detailSubtotalCellStyle.SetFont(detailSubtotalFont);
+
+			// headers
+			var rowIndex = 0;
+			var row = sheet.CreateRow(rowIndex);
+
+			var columns = new List<string>
+			{
+				nameof(Type.Name),
+				nameof(IRecord.Created),
+				nameof(IRecord.Start) + "_ms",
+			};
+
+			if (records.OfType<IAnnotation>().Any())
+			{
+				columns.Add(nameof(IAnnotation.AnnotationId));
+				columns.Add(nameof(IAnnotation.LastModified));
+			}
+			if (records.OfType<IRangeAnnotation>().Any())
+			{
+				columns.Add(nameof(IRangeAnnotation.End) + "_ms");
+				columns.Add(nameof(IRangeAnnotation.Text));
+			}
+			if (records.OfType<Clip>().Any())
+				columns.Add(nameof(Clip.Title));
+
+			var col = 0;
+			foreach (var c in columns)
+			{
+				var cell = row.CreateCell(col++);
+				cell.SetCellValue(c);
+				cell.CellStyle = detailSubtotalCellStyle;
+			}
+
+			var dateFormat = workbook.CreateDataFormat();
+			var dateStyle = workbook.CreateCellStyle();
+			dateStyle.DataFormat = dateFormat.GetFormat("MM/dd/yyyy HH:mm:ss");
+
+			// Add data rows
+			foreach (var record in records)
+			{
+				col = 0;
+
+				row = sheet.CreateRow(++rowIndex);
+
+				row.CreateCell(col++).SetCellValue(record.GetType().Name);
+
+				var dateCreatedCell = row.CreateCell(col++);
+				dateCreatedCell.CellStyle = dateStyle;
+				dateCreatedCell.SetCellValue(record.Created.DateTime);
+
+				row.CreateCell(col++).SetCellValue(record.Start.TotalMilliseconds);
+
+				if (record is IAnnotation annotation)
+				{
+					row.CreateCell(col++).SetCellValue(annotation.AnnotationId);
+
+					var lastModifiedCell = row.CreateCell(col++);
+					lastModifiedCell.CellStyle = dateStyle;
+					lastModifiedCell.SetCellValue(annotation.LastModified.DateTime);
+
+					if (annotation is IRangeAnnotation rangeAnnotation)
+					{
+						row.CreateCell(col++).SetCellValue(rangeAnnotation.End.TotalMilliseconds);
+						row.CreateCell(col++).SetCellValue(rangeAnnotation.Text);
+
+						if (rangeAnnotation is Clip clip)
+							row.CreateCell(col++).SetCellValue(clip.Title);
+					}
+				}
+			}
+
+			using var fileData = new System.IO.FileStream(saveFilePath, System.IO.FileMode.Create);
+			workbook.Write(fileData);
+		}
+
+		public static void ToJson(string saveFilePath, LibraryBook libraryBook, IEnumerable<IRecord> records)
+		{
+			if (!records.Any())
+				return;
+
+			var recordsEx = extendRecords(records);
+
+			var recordsObj = new JObject
+			{
+				{ "title", libraryBook.Book.Title},
+				{ "asin", libraryBook.Book.AudibleProductId},
+				{ "exportTime", DateTime.Now},
+				{ "records", JArray.FromObject(recordsEx) }
+			};
+
+			System.IO.File.WriteAllText(saveFilePath, recordsObj.ToString(Newtonsoft.Json.Formatting.Indented));
+		}		
+
+		public static void ToCsv(string saveFilePath, IEnumerable<IRecord> records)
+		{
+			if (!records.Any())
+				return;
+
+			using var writer = new System.IO.StreamWriter(saveFilePath);
+			using var csv = new CsvWriter(writer, System.Globalization.CultureInfo.CurrentCulture);
+
+			//Write headers for the present record type that has the most properties
+			if (records.OfType<Clip>().Any())
+				csv.WriteHeader(typeof(ClipEx));
+			else if (records.OfType<Note>().Any())
+				csv.WriteHeader(typeof(NoteEx));
+			else if (records.OfType<Bookmark>().Any())
+				csv.WriteHeader(typeof(BookmarkEx));
+			else
+				csv.WriteHeader(typeof(LastHeardEx));
+
+			var recordsEx = extendRecords(records);
+
+			csv.NextRecord();
+			csv.WriteRecords(recordsEx.OfType<ClipEx>()); 
+			csv.WriteRecords(recordsEx.OfType<NoteEx>()); 
+			csv.WriteRecords(recordsEx.OfType<BookmarkEx>()); 
+			csv.WriteRecords(recordsEx.OfType<LastHeardEx>()); 
+		}
+
+		private static IEnumerable<IRecordEx> extendRecords(IEnumerable<IRecord> records)
+			=> records
+			.Select<IRecord, IRecordEx>(
+				r => r switch
+				{
+					Clip c => new ClipEx(nameof(Clip), c),
+					Note n => new NoteEx(nameof(Note), n),
+					Bookmark b => new BookmarkEx(nameof(Bookmark), b),
+					LastHeard l => new LastHeardEx(nameof(LastHeard), l),
+					_ => throw new InvalidOperationException(),
+				});
+
+
+		private interface IRecordEx { string Type { get; } }
+
+		private record LastHeardEx : LastHeard, IRecordEx
+		{
+			public string Type { get; }
+			public LastHeardEx(string type, LastHeard original) : base(original)
+			{
+				Type = type;
+			}
+		}
+
+		private record BookmarkEx : Bookmark, IRecordEx
+		{
+			public string Type { get; }
+			public BookmarkEx(string type, Bookmark original) : base(original)
+			{
+				Type = type;
+			}
+		}
+
+		private record NoteEx : Note, IRecordEx
+		{
+			public string Type { get; }
+			public NoteEx(string type, Note original) : base(original)
+			{
+				Type = type;
+			}
+		}
+
+		private record ClipEx : Clip, IRecordEx
+		{
+			public string Type { get; }
+			public ClipEx(string type, Clip original) : base(original)
+			{
+				Type = type;
+			}
+		}
+	}
+}

Source/ApplicationServices/SearchEngineCommands.cs

@@ -43,23 +43,18 @@ namespace ApplicationServices
 			else
 			{
 				foreach (var book in books)
-				{
-					UpdateLiberatedStatus(book);
-					UpdateBookTags(book);
-				}
+					UpdateUserDefinedItems(book);
 			}
 		}
 
-		public static void FullReIndex() => performSafeCommand(e =>
-			fullReIndex(e)
-		);
+		public static void FullReIndex() => performSafeCommand(fullReIndex);
 
-		internal static void UpdateLiberatedStatus(Book book) => performSafeCommand(e =>
-			e.UpdateLiberatedStatus(book)
-		);
-
-		internal static void UpdateBookTags(Book book) => performSafeCommand(e =>
-			e.UpdateTags(book.AudibleProductId, book.UserDefinedItem.Tags)
+		internal static void UpdateUserDefinedItems(Book book) => performSafeCommand(e =>
+			{
+				e.UpdateLiberatedStatus(book);
+				e.UpdateTags(book.AudibleProductId, book.UserDefinedItem.Tags);
+				e.UpdateUserRatings(book);
+			}
 		);
 
 		private static void performSafeCommand(Action<SearchEngine> action)
@@ -87,7 +82,6 @@ namespace ApplicationServices
 				isUpdating = true;
 
 				action(new SearchEngine());
-
 				if (!prevIsUpdating)
 					SearchEngineUpdated?.Invoke(null, null);
 			}

Source/AudibleUtilities/AudibleUtilities.csproj

@@ -1,11 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="AudibleApi" Version="4.6.3.1" />
+    <PackageReference Include="AudibleApi" Version="7.3.2.1" />
   </ItemGroup>
 
   <ItemGroup>

Source/DataLayer/Configurations/CategoryConfig.cs

@@ -9,6 +9,9 @@ namespace DataLayer.Configurations
         {
             entity.HasKey(c => c.CategoryId);
             entity.HasIndex(c => c.AudibleCategoryId);
+
+            // seeds go here. examples in Dinah.EntityFrameworkCore.Tests\DbContextFactoryExample.cs
+            entity.HasData(Category.GetEmpty());
         }
     }
 }

Source/DataLayer/Configurations/ContributorConfig.cs

@@ -17,6 +17,9 @@ namespace DataLayer.Configurations
                 .Metadata
                 .FindNavigation(nameof(Contributor.BooksLink))
                 .SetPropertyAccessMode(PropertyAccessMode.Field);
+
+            // seeds go here. examples in Dinah.EntityFrameworkCore.Tests\DbContextFactoryExample.cs
+            entity.HasData(Contributor.GetEmpty());
         }
     }
 }

Source/DataLayer/DataLayer.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
   </PropertyGroup>
 
   <PropertyGroup>
@@ -10,14 +10,14 @@
   </PropertyGroup>
   
   <ItemGroup>
-    <PackageReference Include="Dinah.Core" Version="5.1.0.1" />
-    <PackageReference Include="Dinah.EntityFrameworkCore" Version="5.0.0.1" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="6.0.7">
+    <PackageReference Include="Dinah.Core" Version="7.2.1.1" />
+    <PackageReference Include="Dinah.EntityFrameworkCore" Version="7.1.1.1" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.2">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="6.0.7" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="6.0.7">
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="7.0.2" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.2">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

Source/DataLayer/EfClasses/Book.cs

@@ -50,6 +50,7 @@ namespace DataLayer
         // book details
         public bool IsAbridged { get; private set; }
         public DateTime? DatePublished { get; private set; }
+        public string Language { get; private set; }
 
         // non-null. use "empty pattern"
         internal int CategoryId { get; private set; }
@@ -215,11 +216,12 @@ namespace DataLayer
         public void UpdateProductRating(float overallRating, float performanceRating, float storyRating)
             => Rating.Update(overallRating, performanceRating, storyRating);
 
-        public void UpdateBookDetails(bool isAbridged, DateTime? datePublished)
+        public void UpdateBookDetails(bool isAbridged, DateTime? datePublished, string language)
         {
             // don't overwrite with default values
             IsAbridged |= isAbridged;
             DatePublished = datePublished ?? DatePublished;
+            Language = language?.FirstCharToUpper() ?? Language;
         }
 
         public void UpdateCategory(Category category, DbContext context = null)

Source/DataLayer/EfClasses/LibraryBook.cs

@@ -11,6 +11,8 @@ namespace DataLayer
         public DateTime DateAdded { get; private set; }
         public string Account { get; private set; }
 
+        public bool IsDeleted { get; set; }
+
         private LibraryBook() { }
         public LibraryBook(Book book, DateTime dateAdded, string account)
         {

Source/DataLayer/EfClasses/UserDefinedItem.cs

@@ -146,10 +146,19 @@ namespace DataLayer
                 }
             }
         }
+        public void SetPdfStatus(LiberatedStatus? pdfStatus)
+        {
+            // don't change whether pdf is actually available. if null, leave as null. if not null, only assign non-null
+
+            // null => non-null : only when adding a supplement
+
+            if (pdfStatus.HasValue && PdfStatus.HasValue)
+                PdfStatus = pdfStatus;
+        }
         public LiberatedStatus? PdfStatus
         {
             get => _pdfStatus;
-            set
+            internal set
             {
                 if (_pdfStatus != value)
                 {

Source/DataLayer/EntityExtensions.cs

@@ -93,10 +93,12 @@ namespace DataLayer
 
             var starString = new string(STAR, fullStars);
 
-            if (score - fullStars >= 0.25f)
-                starString += HALF;
+            if (score - fullStars >= 0.75f)
+                starString += STAR;
+            else if (score - fullStars >= 0.25f)
+				starString += HALF;
 
-            return starString;
+			return starString;
         }
     }
 }

Source/DataLayer/LibationContext.cs

@@ -47,15 +47,6 @@ namespace DataLayer
             modelBuilder.ApplyConfiguration(new SeriesBookConfig());
             modelBuilder.ApplyConfiguration(new CategoryConfig());
 
-            // seeds go here. examples in Dinah.EntityFrameworkCore.Tests\DbContextFactoryExample.cs
-
-            modelBuilder
-                .Entity<Category>()
-				.HasData(Category.GetEmpty());
-			modelBuilder
-				.Entity<Contributor>()
-				.HasData(Contributor.GetEmpty());
-
 			// views are now supported via "keyless entity types" (instead of "entity types" or the prev "query types"):
 			// https://docs.microsoft.com/en-us/ef/core/modeling/keyless-entity-types
 		}

Source/DataLayer/Migrations/20221214205106_LibraryBookIsDeleted.Designer.cs

@@ -0,0 +1,401 @@
+// <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("20221214205106_LibraryBookIsDeleted")]
+    partial class LibraryBookIsDeleted
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder.HasAnnotation("ProductVersion", "7.0.0");
+
+            modelBuilder.Entity("DataLayer.Book", b =>
+                {
+                    b.Property<int>("BookId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("AudibleProductId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("CategoryId")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("ContentType")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<DateTime?>("DatePublished")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("IsAbridged")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("LengthInMinutes")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Locale")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("PictureId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("PictureLarge")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Title")
+                        .HasColumnType("TEXT");
+
+                    b.Property<long>("_audioFormat")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("BookId");
+
+                    b.HasIndex("AudibleProductId");
+
+                    b.HasIndex("CategoryId");
+
+                    b.ToTable("Books");
+                });
+
+            modelBuilder.Entity("DataLayer.BookContributor", b =>
+                {
+                    b.Property<int>("BookId")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("ContributorId")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("Role")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<byte>("Order")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("BookId", "ContributorId", "Role");
+
+                    b.HasIndex("BookId");
+
+                    b.HasIndex("ContributorId");
+
+                    b.ToTable("BookContributor");
+                });
+
+            modelBuilder.Entity("DataLayer.Category", b =>
+                {
+                    b.Property<int>("CategoryId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("AudibleCategoryId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int?>("ParentCategoryCategoryId")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("CategoryId");
+
+                    b.HasIndex("AudibleCategoryId");
+
+                    b.HasIndex("ParentCategoryCategoryId");
+
+                    b.ToTable("Categories");
+
+                    b.HasData(
+                        new
+                        {
+                            CategoryId = -1,
+                            AudibleCategoryId = "",
+                            Name = ""
+                        });
+                });
+
+            modelBuilder.Entity("DataLayer.Contributor", b =>
+                {
+                    b.Property<int>("ContributorId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("AudibleContributorId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("ContributorId");
+
+                    b.HasIndex("Name");
+
+                    b.ToTable("Contributors");
+
+                    b.HasData(
+                        new
+                        {
+                            ContributorId = -1,
+                            Name = ""
+                        });
+                });
+
+            modelBuilder.Entity("DataLayer.LibraryBook", b =>
+                {
+                    b.Property<int>("BookId")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Account")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("DateAdded")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("BookId");
+
+                    b.ToTable("LibraryBooks");
+                });
+
+            modelBuilder.Entity("DataLayer.Series", b =>
+                {
+                    b.Property<int>("SeriesId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("AudibleSeriesId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("SeriesId");
+
+                    b.HasIndex("AudibleSeriesId");
+
+                    b.ToTable("Series");
+                });
+
+            modelBuilder.Entity("DataLayer.SeriesBook", b =>
+                {
+                    b.Property<int>("SeriesId")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("BookId")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Order")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("SeriesId", "BookId");
+
+                    b.HasIndex("BookId");
+
+                    b.HasIndex("SeriesId");
+
+                    b.ToTable("SeriesBook");
+                });
+
+            modelBuilder.Entity("DataLayer.Book", b =>
+                {
+                    b.HasOne("DataLayer.Category", "Category")
+                        .WithMany()
+                        .HasForeignKey("CategoryId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.OwnsOne("DataLayer.Rating", "Rating", b1 =>
+                        {
+                            b1.Property<int>("BookId")
+                                .HasColumnType("INTEGER");
+
+                            b1.Property<float>("OverallRating")
+                                .HasColumnType("REAL");
+
+                            b1.Property<float>("PerformanceRating")
+                                .HasColumnType("REAL");
+
+                            b1.Property<float>("StoryRating")
+                                .HasColumnType("REAL");
+
+                            b1.HasKey("BookId");
+
+                            b1.ToTable("Books");
+
+                            b1.WithOwner()
+                                .HasForeignKey("BookId");
+                        });
+
+                    b.OwnsMany("DataLayer.Supplement", "Supplements", b1 =>
+                        {
+                            b1.Property<int>("SupplementId")
+                                .ValueGeneratedOnAdd()
+                                .HasColumnType("INTEGER");
+
+                            b1.Property<int>("BookId")
+                                .HasColumnType("INTEGER");
+
+                            b1.Property<string>("Url")
+                                .HasColumnType("TEXT");
+
+                            b1.HasKey("SupplementId");
+
+                            b1.HasIndex("BookId");
+
+                            b1.ToTable("Supplement");
+
+                            b1.WithOwner("Book")
+                                .HasForeignKey("BookId");
+
+                            b1.Navigation("Book");
+                        });
+
+                    b.OwnsOne("DataLayer.UserDefinedItem", "UserDefinedItem", b1 =>
+                        {
+                            b1.Property<int>("BookId")
+                                .HasColumnType("INTEGER");
+
+                            b1.Property<int>("BookStatus")
+                                .HasColumnType("INTEGER");
+
+                            b1.Property<int?>("PdfStatus")
+                                .HasColumnType("INTEGER");
+
+                            b1.Property<string>("Tags")
+                                .HasColumnType("TEXT");
+
+                            b1.HasKey("BookId");
+
+                            b1.ToTable("UserDefinedItem", (string)null);
+
+                            b1.WithOwner("Book")
+                                .HasForeignKey("BookId");
+
+                            b1.OwnsOne("DataLayer.Rating", "Rating", b2 =>
+                                {
+                                    b2.Property<int>("UserDefinedItemBookId")
+                                        .HasColumnType("INTEGER");
+
+                                    b2.Property<float>("OverallRating")
+                                        .HasColumnType("REAL");
+
+                                    b2.Property<float>("PerformanceRating")
+                                        .HasColumnType("REAL");
+
+                                    b2.Property<float>("StoryRating")
+                                        .HasColumnType("REAL");
+
+                                    b2.HasKey("UserDefinedItemBookId");
+
+                                    b2.ToTable("UserDefinedItem");
+
+                                    b2.WithOwner()
+                                        .HasForeignKey("UserDefinedItemBookId");
+                                });
+
+                            b1.Navigation("Book");
+
+                            b1.Navigation("Rating");
+                        });
+
+                    b.Navigation("Category");
+
+                    b.Navigation("Rating");
+
+                    b.Navigation("Supplements");
+
+                    b.Navigation("UserDefinedItem");
+                });
+
+            modelBuilder.Entity("DataLayer.BookContributor", b =>
+                {
+                    b.HasOne("DataLayer.Book", "Book")
+                        .WithMany("ContributorsLink")
+                        .HasForeignKey("BookId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("DataLayer.Contributor", "Contributor")
+                        .WithMany("BooksLink")
+                        .HasForeignKey("ContributorId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Book");
+
+                    b.Navigation("Contributor");
+                });
+
+            modelBuilder.Entity("DataLayer.Category", b =>
+                {
+                    b.HasOne("DataLayer.Category", "ParentCategory")
+                        .WithMany()
+                        .HasForeignKey("ParentCategoryCategoryId");
+
+                    b.Navigation("ParentCategory");
+                });
+
+            modelBuilder.Entity("DataLayer.LibraryBook", b =>
+                {
+                    b.HasOne("DataLayer.Book", "Book")
+                        .WithOne()
+                        .HasForeignKey("DataLayer.LibraryBook", "BookId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Book");
+                });
+
+            modelBuilder.Entity("DataLayer.SeriesBook", b =>
+                {
+                    b.HasOne("DataLayer.Book", "Book")
+                        .WithMany("SeriesLink")
+                        .HasForeignKey("BookId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("DataLayer.Series", "Series")
+                        .WithMany("BooksLink")
+                        .HasForeignKey("SeriesId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Book");
+
+                    b.Navigation("Series");
+                });
+
+            modelBuilder.Entity("DataLayer.Book", b =>
+                {
+                    b.Navigation("ContributorsLink");
+
+                    b.Navigation("SeriesLink");
+                });
+
+            modelBuilder.Entity("DataLayer.Contributor", b =>
+                {
+                    b.Navigation("BooksLink");
+                });
+
+            modelBuilder.Entity("DataLayer.Series", b =>
+                {
+                    b.Navigation("BooksLink");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}

Source/DataLayer/Migrations/20221214205106_LibraryBookIsDeleted.cs

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

Source/DataLayer/Migrations/20230201162454_AddBookLanguage.Designer.cs

@@ -0,0 +1,404 @@
+// <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("20230201162454_AddBookLanguage")]
+    partial class AddBookLanguage
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder.HasAnnotation("ProductVersion", "7.0.2");
+
+            modelBuilder.Entity("DataLayer.Book", b =>
+                {
+                    b.Property<int>("BookId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("AudibleProductId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("CategoryId")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("ContentType")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<DateTime?>("DatePublished")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("IsAbridged")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Language")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("LengthInMinutes")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Locale")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("PictureId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("PictureLarge")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Title")
+                        .HasColumnType("TEXT");
+
+                    b.Property<long>("_audioFormat")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("BookId");
+
+                    b.HasIndex("AudibleProductId");
+
+                    b.HasIndex("CategoryId");
+
+                    b.ToTable("Books");
+                });
+
+            modelBuilder.Entity("DataLayer.BookContributor", b =>
+                {
+                    b.Property<int>("BookId")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("ContributorId")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("Role")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<byte>("Order")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("BookId", "ContributorId", "Role");
+
+                    b.HasIndex("BookId");
+
+                    b.HasIndex("ContributorId");
+
+                    b.ToTable("BookContributor");
+                });
+
+            modelBuilder.Entity("DataLayer.Category", b =>
+                {
+                    b.Property<int>("CategoryId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("AudibleCategoryId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int?>("ParentCategoryCategoryId")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("CategoryId");
+
+                    b.HasIndex("AudibleCategoryId");
+
+                    b.HasIndex("ParentCategoryCategoryId");
+
+                    b.ToTable("Categories");
+
+                    b.HasData(
+                        new
+                        {
+                            CategoryId = -1,
+                            AudibleCategoryId = "",
+                            Name = ""
+                        });
+                });
+
+            modelBuilder.Entity("DataLayer.Contributor", b =>
+                {
+                    b.Property<int>("ContributorId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("AudibleContributorId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("ContributorId");
+
+                    b.HasIndex("Name");
+
+                    b.ToTable("Contributors");
+
+                    b.HasData(
+                        new
+                        {
+                            ContributorId = -1,
+                            Name = ""
+                        });
+                });
+
+            modelBuilder.Entity("DataLayer.LibraryBook", b =>
+                {
+                    b.Property<int>("BookId")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Account")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("DateAdded")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("BookId");
+
+                    b.ToTable("LibraryBooks");
+                });
+
+            modelBuilder.Entity("DataLayer.Series", b =>
+                {
+                    b.Property<int>("SeriesId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("AudibleSeriesId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("SeriesId");
+
+                    b.HasIndex("AudibleSeriesId");
+
+                    b.ToTable("Series");
+                });
+
+            modelBuilder.Entity("DataLayer.SeriesBook", b =>
+                {
+                    b.Property<int>("SeriesId")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("BookId")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Order")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("SeriesId", "BookId");
+
+                    b.HasIndex("BookId");
+
+                    b.HasIndex("SeriesId");
+
+                    b.ToTable("SeriesBook");
+                });
+
+            modelBuilder.Entity("DataLayer.Book", b =>
+                {
+                    b.HasOne("DataLayer.Category", "Category")
+                        .WithMany()
+                        .HasForeignKey("CategoryId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.OwnsOne("DataLayer.Rating", "Rating", b1 =>
+                        {
+                            b1.Property<int>("BookId")
+                                .HasColumnType("INTEGER");
+
+                            b1.Property<float>("OverallRating")
+                                .HasColumnType("REAL");
+
+                            b1.Property<float>("PerformanceRating")
+                                .HasColumnType("REAL");
+
+                            b1.Property<float>("StoryRating")
+                                .HasColumnType("REAL");
+
+                            b1.HasKey("BookId");
+
+                            b1.ToTable("Books");
+
+                            b1.WithOwner()
+                                .HasForeignKey("BookId");
+                        });
+
+                    b.OwnsMany("DataLayer.Supplement", "Supplements", b1 =>
+                        {
+                            b1.Property<int>("SupplementId")
+                                .ValueGeneratedOnAdd()
+                                .HasColumnType("INTEGER");
+
+                            b1.Property<int>("BookId")
+                                .HasColumnType("INTEGER");
+
+                            b1.Property<string>("Url")
+                                .HasColumnType("TEXT");
+
+                            b1.HasKey("SupplementId");
+
+                            b1.HasIndex("BookId");
+
+                            b1.ToTable("Supplement");
+
+                            b1.WithOwner("Book")
+                                .HasForeignKey("BookId");
+
+                            b1.Navigation("Book");
+                        });
+
+                    b.OwnsOne("DataLayer.UserDefinedItem", "UserDefinedItem", b1 =>
+                        {
+                            b1.Property<int>("BookId")
+                                .HasColumnType("INTEGER");
+
+                            b1.Property<int>("BookStatus")
+                                .HasColumnType("INTEGER");
+
+                            b1.Property<int?>("PdfStatus")
+                                .HasColumnType("INTEGER");
+
+                            b1.Property<string>("Tags")
+                                .HasColumnType("TEXT");
+
+                            b1.HasKey("BookId");
+
+                            b1.ToTable("UserDefinedItem", (string)null);
+
+                            b1.WithOwner("Book")
+                                .HasForeignKey("BookId");
+
+                            b1.OwnsOne("DataLayer.Rating", "Rating", b2 =>
+                                {
+                                    b2.Property<int>("UserDefinedItemBookId")
+                                        .HasColumnType("INTEGER");
+
+                                    b2.Property<float>("OverallRating")
+                                        .HasColumnType("REAL");
+
+                                    b2.Property<float>("PerformanceRating")
+                                        .HasColumnType("REAL");
+
+                                    b2.Property<float>("StoryRating")
+                                        .HasColumnType("REAL");
+
+                                    b2.HasKey("UserDefinedItemBookId");
+
+                                    b2.ToTable("UserDefinedItem");
+
+                                    b2.WithOwner()
+                                        .HasForeignKey("UserDefinedItemBookId");
+                                });
+
+                            b1.Navigation("Book");
+
+                            b1.Navigation("Rating");
+                        });
+
+                    b.Navigation("Category");
+
+                    b.Navigation("Rating");
+
+                    b.Navigation("Supplements");
+
+                    b.Navigation("UserDefinedItem");
+                });
+
+            modelBuilder.Entity("DataLayer.BookContributor", b =>
+                {
+                    b.HasOne("DataLayer.Book", "Book")
+                        .WithMany("ContributorsLink")
+                        .HasForeignKey("BookId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("DataLayer.Contributor", "Contributor")
+                        .WithMany("BooksLink")
+                        .HasForeignKey("ContributorId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Book");
+
+                    b.Navigation("Contributor");
+                });
+
+            modelBuilder.Entity("DataLayer.Category", b =>
+                {
+                    b.HasOne("DataLayer.Category", "ParentCategory")
+                        .WithMany()
+                        .HasForeignKey("ParentCategoryCategoryId");
+
+                    b.Navigation("ParentCategory");
+                });
+
+            modelBuilder.Entity("DataLayer.LibraryBook", b =>
+                {
+                    b.HasOne("DataLayer.Book", "Book")
+                        .WithOne()
+                        .HasForeignKey("DataLayer.LibraryBook", "BookId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Book");
+                });
+
+            modelBuilder.Entity("DataLayer.SeriesBook", b =>
+                {
+                    b.HasOne("DataLayer.Book", "Book")
+                        .WithMany("SeriesLink")
+                        .HasForeignKey("BookId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("DataLayer.Series", "Series")
+                        .WithMany("BooksLink")
+                        .HasForeignKey("SeriesId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Book");
+
+                    b.Navigation("Series");
+                });
+
+            modelBuilder.Entity("DataLayer.Book", b =>
+                {
+                    b.Navigation("ContributorsLink");
+
+                    b.Navigation("SeriesLink");
+                });
+
+            modelBuilder.Entity("DataLayer.Contributor", b =>
+                {
+                    b.Navigation("BooksLink");
+                });
+
+            modelBuilder.Entity("DataLayer.Series", b =>
+                {
+                    b.Navigation("BooksLink");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}

Source/DataLayer/Migrations/20230201162454_AddBookLanguage.cs

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

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", "6.0.6");
+            modelBuilder.HasAnnotation("ProductVersion", "7.0.2");
 
             modelBuilder.Entity("DataLayer.Book", b =>
                 {
@@ -41,6 +41,9 @@ namespace DataLayer.Migrations
                     b.Property<bool>("IsAbridged")
                         .HasColumnType("INTEGER");
 
+                    b.Property<string>("Language")
+                        .HasColumnType("TEXT");
+
                     b.Property<int>("LengthInMinutes")
                         .HasColumnType("INTEGER");
 
@@ -160,6 +163,9 @@ namespace DataLayer.Migrations
                     b.Property<DateTime>("DateAdded")
                         .HasColumnType("TEXT");
 
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("INTEGER");
+
                     b.HasKey("BookId");
 
                     b.ToTable("LibraryBooks");

Source/DataLayer/QueryObjects/LibraryBookQueries.cs

@@ -37,6 +37,20 @@ namespace DataLayer
 
         /// <summary>This is still IQueryable. YOU MUST CALL ToList() YOURSELF</summary>
         public static IQueryable<LibraryBook> GetLibrary(this IQueryable<LibraryBook> library)
+            => library
+                .Where(lb => !lb.IsDeleted)
+                .getLibrary();
+
+        public static List<LibraryBook> GetDeletedLibraryBooks(this LibationContext context)
+            => context
+                .LibraryBooks
+                .AsNoTrackingWithIdentityResolution()
+                .Where(lb => lb.IsDeleted)
+                .getLibrary()
+                .ToList();
+
+        /// <summary>This is still IQueryable. YOU MUST CALL ToList() YOURSELF</summary>
+        private static IQueryable<LibraryBook> getLibrary(this IQueryable<LibraryBook> library)
             => library
                 // owned items are always loaded. eg: book.UserDefinedItem, book.Supplements
                 .Include(le => le.Book).ThenInclude(b => b.SeriesLink).ThenInclude(sb => sb.Series)
@@ -44,7 +58,7 @@ namespace DataLayer
                 .Include(le => le.Book).ThenInclude(b => b.Category).ThenInclude(c => c.ParentCategory);
 
         public static IEnumerable<LibraryBook> ParentedEpisodes(this IEnumerable<LibraryBook> libraryBooks)
-            => libraryBooks.Where(lb => lb.Book.IsEpisodeParent()).SelectMany(s => libraryBooks.FindChildren(s));
+            => libraryBooks.Where(lb => lb.Book.IsEpisodeParent()).SelectMany(libraryBooks.FindChildren);
 
         public static IEnumerable<LibraryBook> FindOrphanedEpisodes(this IEnumerable<LibraryBook> libraryBooks)
 		    => libraryBooks

Source/DtoImporterService/BookImporter.cs

@@ -152,9 +152,9 @@ namespace DtoImporterService
 				book.ReplacePublisher(publisher);
 			}
 
-			book.UpdateBookDetails(item.IsAbridged, item.DatePublished);
+            book.UpdateBookDetails(item.IsAbridged, item.DatePublished, item.Language);
 
-			if (item.PdfUrl is not null)
+            if (item.PdfUrl is not null)
 				book.AddSupplementDownloadUrl(item.PdfUrl.ToString());
 
 			return book;
@@ -174,7 +174,15 @@ namespace DtoImporterService
 			if (item.PictureLarge is not null)
 				book.PictureLarge = item.PictureLarge;
 
-			book.UpdateProductRating(item.Product_OverallStars, item.Product_PerformanceStars, item.Product_StoryStars);
+            // 2023-02-01
+            // updateBook must update language on books which were imported before the migration which added language.
+            // Can eventually delete this
+            book.UpdateBookDetails(item.IsAbridged, item.DatePublished, item.Language);
+
+            book.UpdateProductRating(
+				(float)(item.Rating?.OverallDistribution?.AverageRating ?? 0),
+				(float)(item.Rating?.PerformanceDistribution?.AverageRating ?? 0),
+				(float)(item.Rating?.StoryDistribution?.AverageRating ?? 0));
 
 			// important to update user-specific info. this will have changed if user has rated/reviewed the book since last library import
 			book.UserDefinedItem.UpdateRating(item.MyUserRating_Overall, item.MyUserRating_Performance, item.MyUserRating_Story);

Source/DtoImporterService/DtoImporterService.csproj

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

Source/FileLiberator/ConvertToMp3.cs

@@ -15,12 +15,12 @@ namespace FileLiberator
 	public class ConvertToMp3 : AudioDecodable
 	{
 		public override string Name => "Convert to Mp3";
-		private Mp4File m4bBook;
-
+		private Mp4Operation Mp4Operation;
+		private TimeSpan bookDuration;
 		private long fileSize;
 		private static string Mp3FileName(string m4bPath) => Path.ChangeExtension(m4bPath ?? "", ".mp3");
 
-		public override Task CancelAsync() => m4bBook?.CancelAsync() ?? Task.CompletedTask;
+		public override Task CancelAsync() => Mp4Operation?.CancelAsync() ?? Task.CompletedTask;		
 
 		public static bool ValidateMp3(LibraryBook libraryBook)
 		{
@@ -43,9 +43,9 @@ namespace FileLiberator
 					var proposedMp3Path = Mp3FileName(m4bPath);
 					if (File.Exists(proposedMp3Path) || !File.Exists(m4bPath)) continue;
 
-					m4bBook = await Task.Run(() => new Mp4File(m4bPath, FileAccess.Read));
-					m4bBook.ConversionProgressUpdate += M4bBook_ConversionProgressUpdate;
+					var m4bBook = await Task.Run(() => new Mp4File(m4bPath, FileAccess.Read));
 
+					bookDuration = m4bBook.Duration;
 					fileSize = m4bBook.InputStream.Length;
 
 					OnTitleDiscovered(m4bBook.AppleTags.Title);
@@ -64,42 +64,54 @@ namespace FileLiberator
 						config.LameMatchSourceBR);
 
 					using var mp3File = File.OpenWrite(Path.GetTempFileName());
-					var result = await m4bBook.ConvertToMp3Async(mp3File, lameConfig);
-					m4bBook.InputStream.Close();
-					mp3File.Close();
-
-					if (result == ConversionResult.Failed)
+					try
 					{
-						FileUtility.SaferDelete(mp3File.Name);
+						Mp4Operation = m4bBook.ConvertToMp3Async(mp3File, lameConfig);
+						Mp4Operation.ConversionProgressUpdate += M4bBook_ConversionProgressUpdate;
+						await Mp4Operation;
+
+						if (Mp4Operation.IsCanceled)
+						{
+							FileUtility.SaferDelete(mp3File.Name);
+							return new StatusHandler { "Cancelled" };
+						}
+						else
+						{
+							var realMp3Path = FileUtility.SaferMoveToValidPath(mp3File.Name, proposedMp3Path, Configuration.Instance.ReplacementCharacters, "mp3");
+							OnFileCreated(libraryBook, realMp3Path);
+						}
+					}
+					catch (Exception ex)
+					{
+						Serilog.Log.Error(ex, "AAXClean error");
 						return new StatusHandler { "Conversion failed" };
 					}
-					else if (result == ConversionResult.Cancelled)
+					finally
 					{
-						FileUtility.SaferDelete(mp3File.Name);
-						return new StatusHandler { "Cancelled" };
-					}
+						if (Mp4Operation is not null)
+							Mp4Operation.ConversionProgressUpdate -= M4bBook_ConversionProgressUpdate;
 
-					var realMp3Path = FileUtility.SaferMoveToValidPath(mp3File.Name, proposedMp3Path, Configuration.Instance.ReplacementCharacters);
-					OnFileCreated(libraryBook, realMp3Path);
+						m4bBook.InputStream.Close();
+						mp3File.Close();
+					}
 				}
-				return new StatusHandler();
 			}
 			finally
 			{
 				OnCompleted(libraryBook);
 			}
+			return new StatusHandler();
 		}
 
 		private void M4bBook_ConversionProgressUpdate(object sender, ConversionProgressEventArgs e)
 		{
-			var duration = m4bBook.Duration;
-			var remainingSecsToProcess = (duration - e.ProcessPosition).TotalSeconds;
+			var remainingSecsToProcess = (bookDuration - e.ProcessPosition).TotalSeconds;
 			var estTimeRemaining = remainingSecsToProcess / e.ProcessSpeed;
-
+				
 			if (double.IsNormal(estTimeRemaining))
 				OnStreamingTimeRemaining(TimeSpan.FromSeconds(estTimeRemaining));
 
-			double progressPercent = 100 * e.ProcessPosition.TotalSeconds / duration.TotalSeconds;
+			double progressPercent = 100 * e.ProcessPosition.TotalSeconds / bookDuration.TotalSeconds;
 
 			OnStreamingProgressChanged(
 				new DownloadProgress

Source/FileLiberator/DownloadDecryptBook.cs

@@ -5,7 +5,6 @@ using System.Linq;
 using System.Threading.Tasks;
 using AaxDecrypter;
 using ApplicationServices;
-using AudibleApi;
 using DataLayer;
 using Dinah.Core;
 using Dinah.Core.ErrorHandling;
@@ -104,7 +103,7 @@ namespace FileLiberator
 
             var api = await libraryBook.GetApiAsync();
             var contentLic = await api.GetDownloadLicenseAsync(libraryBook.Book.AudibleProductId);
-            var dlOptions = BuildDownloadOptions(libraryBook, config, contentLic);
+            using var dlOptions = BuildDownloadOptions(libraryBook, config, contentLic);
 
             var outFileName = AudibleFileStorage.Audio.GetInProgressFilename(libraryBook, dlOptions.OutputFormat.ToString().ToLower());
             var cacheDir = AudibleFileStorage.DownloadsInProgressDirectory;
@@ -133,45 +132,32 @@ namespace FileLiberator
             abDownloader.FileCreated += (_, path) => OnFileCreated(libraryBook, path);
 
             // REAL WORK DONE HERE
-            var success = await abDownloader.RunAsync();
-
-            return success;
+            return await abDownloader.RunAsync();
         }
 
         private DownloadOptions BuildDownloadOptions(LibraryBook libraryBook, Configuration config, AudibleApi.Common.ContentLicense contentLic)
         {
-            //I assume if ContentFormat == "MPEG" that the delivered file is an unencrypted mp3.
-            //I also assume that if DrmType != Adrm, the file will be an mp3.
-            //These assumptions may be wrong, and only time and bug reports will tell.
+			//If DrmType != Adrm the delivered file is an unencrypted mp3.
 
-            bool encrypted = contentLic.DrmType == AudibleApi.Common.DrmType.Adrm;
+            var outputFormat
+                = contentLic.DrmType != AudibleApi.Common.DrmType.Adrm || (config.AllowLibationFixup && config.DecryptToLossy)
+                ? OutputFormat.Mp3
+                : OutputFormat.M4b;
 
-            var outputFormat = !encrypted || (config.AllowLibationFixup && config.DecryptToLossy) ?
-                     OutputFormat.Mp3 : OutputFormat.M4b;
+            long chapterStartMs
+                = config.StripAudibleBrandAudio
+                ? contentLic.ContentMetadata.ChapterInfo.BrandIntroDurationMs
+                : 0;
 
-            long chapterStartMs = config.StripAudibleBrandAudio ?
-                contentLic.ContentMetadata.ChapterInfo.BrandIntroDurationMs : 0;
-
-            var dlOptions = new DownloadOptions
-                 (
-                    libraryBook,
-                    contentLic?.ContentMetadata?.ContentUrl?.OfflineUrl,
-                    Resources.USER_AGENT
-                 )
+            var dlOptions = new DownloadOptions(config, libraryBook, contentLic?.ContentMetadata?.ContentUrl?.OfflineUrl)
             {
                 AudibleKey = contentLic?.Voucher?.Key,
                 AudibleIV = contentLic?.Voucher?.Iv,
-                OutputFormat = outputFormat,
-                TrimOutputToChapterLength = config.AllowLibationFixup && config.StripAudibleBrandAudio,
-                RetainEncryptedFile = config.RetainAaxFile && encrypted,
-                StripUnabridged = config.AllowLibationFixup && config.StripUnabridged,
-                Downsample = config.AllowLibationFixup && config.LameDownsampleMono,
-                MatchSourceBitrate = config.AllowLibationFixup && config.LameMatchSourceBR && config.LameTargetBitrate,
-                CreateCueSheet = config.CreateCueSheet,
-                LameConfig = GetLameOptions(config),
-                ChapterInfo = new AAXClean.ChapterInfo(TimeSpan.FromMilliseconds(chapterStartMs)),
-                FixupFile = config.AllowLibationFixup
-            };
+				OutputFormat = outputFormat,
+				LameConfig = GetLameOptions(config),
+				ChapterInfo = new AAXClean.ChapterInfo(TimeSpan.FromMilliseconds(chapterStartMs)),
+				RuntimeLength = TimeSpan.FromMilliseconds(contentLic?.ContentMetadata?.ChapterInfo?.RuntimeLengthMs ?? 0),
+			};
 
             var chapters = flattenChapters(contentLic.ContentMetadata.ChapterInfo.Chapters).OrderBy(c => c.StartOffsetMs).ToList();
 
@@ -276,8 +262,10 @@ namespace FileLiberator
 
             foreach (var c in chapters)
             {
-                if (c.Chapters is not null)
-                {
+                if (c.Chapters is null)
+					chaps.Add(c);
+				else
+				{
                     if (c.LengthMs < 10000)
                     {
                         c.Chapters[0].StartOffsetMs = c.StartOffsetMs;
@@ -295,8 +283,6 @@ namespace FileLiberator
                     chaps.AddRange(children);
                     c.Chapters = null;
                 }
-                else
-                    chaps.Add(c);
             }
             return chaps;
         }

Source/FileLiberator/DownloadOptions.cs

@@ -3,44 +3,90 @@ using AAXClean;
 using Dinah.Core;
 using DataLayer;
 using LibationFileManager;
-using FileManager;
+using System.Threading.Tasks;
+using System;
+using System.IO;
+using ApplicationServices;
 
 namespace FileLiberator
 {
-    public class DownloadOptions : IDownloadOptions
-    {
-        public LibraryBookDto LibraryBookDto { get; }
-        public string DownloadUrl { get; }
-        public string UserAgent { get; }
-        public string AudibleKey { get; init; }
-        public string AudibleIV { get; init; }
-        public AaxDecrypter.OutputFormat OutputFormat { get; init; }
-        public bool TrimOutputToChapterLength { get; init; }
-        public bool RetainEncryptedFile { get; init; }
-        public bool StripUnabridged { get; init; }
-        public bool CreateCueSheet { get; init; }
-        public ChapterInfo ChapterInfo { get; init; }
-        public bool FixupFile { get; init; }
-        public NAudio.Lame.LameConfig LameConfig { get; init; }
-        public bool Downsample { get; init; }
-        public bool MatchSourceBitrate { get; init; }
-        public ReplacementCharacters ReplacementCharacters => Configuration.Instance.ReplacementCharacters;
+	public class DownloadOptions : IDownloadOptions, IDisposable
+	{
+		public event EventHandler<long> DownloadSpeedChanged;
+		public LibraryBook LibraryBook { get; }
+		public LibraryBookDto LibraryBookDto { get; }
+		public string DownloadUrl { get; }
+		public string AudibleKey { get; init; }
+		public string AudibleIV { get; init; }
+		public TimeSpan RuntimeLength { get; init; }
+		public OutputFormat OutputFormat { get; init; }
+		public ChapterInfo ChapterInfo { get; init; }
+		public NAudio.Lame.LameConfig LameConfig { get; init; }
+		public string UserAgent => AudibleApi.Resources.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;
+		public bool MoveMoovToBeginning => config.MoveMoovToBeginning;
 
-        public string GetMultipartFileName(MultiConvertFileProperties props)
-            => Templates.ChapterFile.GetFilename(LibraryBookDto, props);
+		public string GetMultipartFileName(MultiConvertFileProperties props)
+			=> Templates.ChapterFile.GetFilename(LibraryBookDto, props);
 
-        public string GetMultipartTitleName(MultiConvertFileProperties props)
-            => Templates.ChapterTitle.GetTitle(LibraryBookDto, props);
+		public string GetMultipartTitle(MultiConvertFileProperties props)
+			=> Templates.ChapterTitle.GetTitle(LibraryBookDto, props);
 
-        public DownloadOptions(LibraryBook libraryBook, string downloadUrl, string userAgent)
-        {
-            LibraryBookDto = ArgumentValidator
-                .EnsureNotNull(libraryBook, nameof(libraryBook))
-                .ToDto();
-            DownloadUrl = ArgumentValidator.EnsureNotNullOrEmpty(downloadUrl, nameof(downloadUrl));
-            UserAgent = ArgumentValidator.EnsureNotNullOrEmpty(userAgent, nameof(userAgent));
+		public async Task<string> SaveClipsAndBookmarksAsync(string fileName)
+		{
+			if (DownloadClipsBookmarks)
+			{
+				var format = config.ClipsBookmarksFileFormat;
 
-            // no null/empty check for key/iv. unencrypted files do not have them
-        }
-    }
+				var formatExtension = format.ToString().ToLowerInvariant();
+				var filePath = Path.ChangeExtension(fileName, formatExtension);
+
+				var api = await LibraryBook.GetApiAsync();
+				var records = await api.GetRecordsAsync(LibraryBook.Book.AudibleProductId);
+
+				switch(format)
+				{
+					case Configuration.ClipBookmarkFormat.CSV:
+						RecordExporter.ToCsv(filePath, records);
+						break;
+					case Configuration.ClipBookmarkFormat.Xlsx:
+						RecordExporter.ToXlsx(filePath, records);
+						break;
+					case Configuration.ClipBookmarkFormat.Json:
+						RecordExporter.ToJson(filePath, LibraryBook, records);
+						break;
+				}
+				return filePath;
+			}
+			return string.Empty;
+		}
+
+		private readonly Configuration config;
+		private readonly IDisposable cancellation;
+		public void Dispose() => cancellation?.Dispose();
+
+		public DownloadOptions(Configuration config, LibraryBook libraryBook, string downloadUrl)
+		{
+			this.config = ArgumentValidator.EnsureNotNull(config, nameof(config));
+			LibraryBook = ArgumentValidator.EnsureNotNull(libraryBook, nameof(libraryBook));
+			DownloadUrl = ArgumentValidator.EnsureNotNullOrEmpty(downloadUrl, nameof(downloadUrl));
+			// no null/empty check for key/iv. unencrypted files do not have them
+
+			LibraryBookDto = LibraryBook.ToDto();
+
+			cancellation =
+				config
+				.ObservePropertyChanged<long>(
+					nameof(Configuration.DownloadSpeedLimit),
+					newVal => DownloadSpeedChanged?.Invoke(this, newVal));
+		}
+	}
 }

Source/FileLiberator/DownloadPdf.cs

@@ -24,7 +24,7 @@ namespace FileLiberator
 		{
 			OnBegin(libraryBook);
 
-			try
+            try
 			{
 				var proposedDownloadFilePath = getProposedDownloadFilePath(libraryBook);
 				var actualDownloadedFilePath = await downloadPdfAsync(libraryBook, proposedDownloadFilePath);
@@ -32,13 +32,22 @@ namespace FileLiberator
 
 				libraryBook.Book.UpdatePdfStatus(result.IsSuccess ? LiberatedStatus.Liberated : LiberatedStatus.NotLiberated);
 
-				return result;
-			}
+                return result;
+            }
+			catch (Exception ex)
+            {
+                Serilog.Log.Logger.Error(ex, "Error downloading PDF");
+
+                var result = new StatusHandler();
+                result.AddError($"Error downloading PDF. See log for details. Error summary: {ex.Message}");
+
+                return result;
+            }
 			finally
 			{
 				OnCompleted(libraryBook);
-			}
-		}
+            }
+        }
 
 		private static string getProposedDownloadFilePath(LibraryBook libraryBook)
 		{

Source/FileLiberator/FileLiberator.csproj

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

Source/FileLiberator/UtilityExtensions.cs

@@ -27,10 +27,13 @@ namespace FileLiberator
 		public static LibraryBookDto ToDto(this LibraryBook libraryBook) => new()
 		{
 			Account = libraryBook.Account,
+			DateAdded = libraryBook.DateAdded,
 
 			AudibleProductId = libraryBook.Book.AudibleProductId,
 			Title = libraryBook.Book.Title ?? "",
 			Locale = libraryBook.Book.Locale,
+			YearPublished = libraryBook.Book.DatePublished?.Year,
+			DatePublished = libraryBook.Book.DatePublished,
 
 			Authors = libraryBook.Book.Authors.Select(c => c.Name).ToList(),
 
@@ -42,6 +45,7 @@ namespace FileLiberator
 			BitRate = libraryBook.Book.AudioFormat.Bitrate,
 			SampleRate = libraryBook.Book.AudioFormat.SampleRate,
 			Channels = libraryBook.Book.AudioFormat.Channels,
+			Language = libraryBook.Book.Language
 		};
 	}
 }

Source/FileManager/FileManager.csproj

@@ -1,11 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Dinah.Core" Version="5.1.0.1" />
+    <PackageReference Include="Dinah.Core" Version="7.2.1.1" />
     <PackageReference Include="Polly" Version="7.2.3" />
   </ItemGroup>
 

Source/FileManager/FileNamingTemplate.cs

@@ -9,11 +9,15 @@ namespace FileManager
 	/// <summary>Get valid filename. Advanced features incl. parameterized template</summary>
 	public class FileNamingTemplate : NamingTemplate
 	{
+		public ReplacementCharacters ReplacementCharacters { get; }
 		/// <param name="template">Proposed file name with optional html-styled template tags.</param>
-		public FileNamingTemplate(string template) : base(template) { }
+		public FileNamingTemplate(string template, ReplacementCharacters replacement) : base(template)
+		{
+			ReplacementCharacters = replacement ?? ReplacementCharacters.Default;
+		}
 
 		/// <summary>Generate a valid path for this file or directory</summary>
-		public LongPath GetFilePath(ReplacementCharacters replacements, bool returnFirstExisting = false)
+		public LongPath GetFilePath(string fileExtension, bool returnFirstExisting = false)
 		{
 			string fileName = 
 				Template.EndsWith(Path.DirectorySeparatorChar) || Template.EndsWith(Path.AltDirectorySeparatorChar) ?
@@ -22,7 +26,7 @@ namespace FileManager
 
 			List<string> pathParts = new();
 
-			var paramReplacements = ParameterReplacements.ToDictionary(r => $"<{formatKey(r.Key)}>", r => formatValue(r.Value, replacements));
+			var paramReplacements = ParameterReplacements.ToDictionary(r => $"<{formatKey(r.Key)}>", r => formatValue(r.Value, ReplacementCharacters));
 
 			while (!string.IsNullOrEmpty(fileName))
 			{
@@ -44,12 +48,20 @@ namespace FileManager
 			var fileNamePart = pathParts[^1];
 			pathParts.Remove(fileNamePart);
 
+			fileNamePart = fileNamePart[..^fileExtension.Length];
+
 			LongPath directory = Path.Join(pathParts.Select(p => replaceFileName(p, paramReplacements, LongPath.MaxFilenameLength)).ToArray());
 
 			//If file already exists, GetValidFilename will append " (n)" to the filename.
 			//This could cause the filename length to exceed MaxFilenameLength, so reduce
 			//allowable filename length by 5 chars, allowing for up to 99 duplicates.
-			return FileUtility.GetValidFilename(Path.Join(directory, replaceFileName(fileNamePart, paramReplacements, LongPath.MaxFilenameLength - 5)), replacements, returnFirstExisting);
+			return FileUtility
+			.GetValidFilename(
+				Path.Join(directory, replaceFileName(fileNamePart, paramReplacements, LongPath.MaxFilenameLength - fileExtension.Length - 5)) + fileExtension,
+				ReplacementCharacters,
+				fileExtension,
+				returnFirstExisting
+				);
 		}
 
 		private static string replaceFileName(string filename, Dictionary<string,string> paramReplacements, int maxFilenameLength)
@@ -88,7 +100,7 @@ namespace FileManager
 
 			//Remove 1 character from the end of the longest filename part until
 			//the total filename is less than max filename length
-			while (filenameParts.Sum(p => p.Length) > maxFilenameLength)
+			while (filenameParts.Sum(p => LongPath.GetFilesystemStringLength(p)) > maxFilenameLength)
 			{
 				int maxLength = filenameParts.Max(p => p.Length);
 				var maxEntry = filenameParts.First(p => p.Length == maxLength);
@@ -105,7 +117,7 @@ namespace FileManager
 
 			// Other illegal characters will be taken care of later. Must take care of slashes now so params can't introduce new folders.
 			// Esp important for file templates.
-			return replacements.ReplaceInvalidFilenameChars(value.ToString());
+			return replacements.ReplaceFilenameChars(value.ToString());
 		}
 	}
 }

Source/FileManager/FileUtility.cs

@@ -6,11 +6,14 @@ using System.Text.RegularExpressions;
 using Dinah.Core;
 using Polly;
 using Polly.Retry;
+using Dinah.Core.Collections.Generic;
 
 namespace FileManager
 {
 	public static class FileUtility
 	{
+
+
 		/// <summary>
 		/// "txt" => ".txt"
 		/// <br />".txt" => ".txt"
@@ -46,32 +49,33 @@ namespace FileManager
 		/// <br/>- ensure uniqueness
 		/// <br/>- enforce max file length
 		/// </summary>
-		public static LongPath GetValidFilename(LongPath path, ReplacementCharacters replacements, bool returnFirstExisting = false)
+		public static LongPath GetValidFilename(LongPath path, ReplacementCharacters replacements, string fileExtension, bool returnFirstExisting = false)
 		{
 			ArgumentValidator.EnsureNotNull(path, nameof(path));
+			ArgumentValidator.EnsureNotNull(fileExtension, nameof(fileExtension));
+			fileExtension = GetStandardizedExtension(fileExtension);
 
 			// remove invalid chars
 			path = GetSafePath(path, replacements);
 
 			// ensure uniqueness and check lengths
 			var dir = Path.GetDirectoryName(path);
-			dir = dir?.Truncate(LongPath.MaxDirectoryLength) ?? string.Empty;
+			dir = dir?.TruncateFilename(LongPath.MaxDirectoryLength) ?? string.Empty;
 
-			var extension = Path.GetExtension(path);
+			var fileName = Path.GetFileName(path);
+			var extIndex = fileName.LastIndexOf(fileExtension, StringComparison.OrdinalIgnoreCase);
+			var filenameWithoutExtension = extIndex >= 0 ? fileName.Remove(extIndex, fileExtension.Length) : fileName;
+			var fileStem
+				= Path.Combine(dir, filenameWithoutExtension.TruncateFilename(LongPath.MaxFilenameLength - fileExtension.Length))
+				.TruncateFilename(LongPath.MaxPathLength - fileExtension.Length);
 
-			var filename = Path.GetFileNameWithoutExtension(path).Truncate(LongPath.MaxFilenameLength - extension.Length);
-			var fileStem = Path.Combine(dir, filename);
-
-
-			var fullfilename = fileStem.Truncate(LongPath.MaxPathLength - extension.Length) + extension;
-
-			fullfilename = removeInvalidWhitespace(fullfilename);
+			var fullfilename = removeInvalidWhitespace(fileStem) + fileExtension;
 
 			var i = 0;
 			while (File.Exists(fullfilename) && !returnFirstExisting)
 			{
 				var increm = $" ({++i})";
-				fullfilename = fileStem.Truncate(LongPath.MaxPathLength - increm.Length - extension.Length) + increm + extension;
+				fullfilename = fileStem.TruncateFilename(LongPath.MaxPathLength - increm.Length - fileExtension.Length) + increm + fileExtension;
 			}
 
 			return fullfilename;
@@ -84,7 +88,7 @@ namespace FileManager
 
 			var pathNoPrefix = path.PathWithoutPrefix;
 
-			pathNoPrefix = replacements.ReplaceInvalidPathChars(pathNoPrefix);
+			pathNoPrefix = replacements.ReplacePathChars(pathNoPrefix);
 			pathNoPrefix = removeDoubleSlashes(pathNoPrefix);
 
 			return pathNoPrefix;
@@ -129,15 +133,28 @@ namespace FileManager
 
 		public static string RemoveLastCharacter(this string str) => string.IsNullOrEmpty(str) ? str : str[..^1];
 
+		public static string TruncateFilename(this string filenameStr, int limit)
+		{
+			if (LongPath.IsWindows) return filenameStr.Truncate(limit);
+
+			int index = filenameStr.Length;
+
+			while (index > 0 && System.Text.Encoding.UTF8.GetByteCount(filenameStr, 0, index) > limit)
+				index--;
+
+			return filenameStr[..index];
+		}
+
 		/// <summary>
 		/// Move file.
 		/// <br/>- Ensure valid file name path: remove invalid chars, ensure uniqueness, enforce max file length
 		/// <br/>- Perform <see cref="SaferMove"/>
 		/// <br/>- Return valid path
 		/// </summary>
-		public static string SaferMoveToValidPath(LongPath source, LongPath destination, ReplacementCharacters replacements)
+		public static string SaferMoveToValidPath(LongPath source, LongPath destination, ReplacementCharacters replacements, string extension = null)
 		{
-			destination = GetValidFilename(destination, replacements);
+			extension = extension ?? Path.GetExtension(source);
+			destination = GetValidFilename(destination, replacements, extension);
 			SaferMove(source, destination);
 			return destination;
 		}
@@ -212,25 +229,23 @@ namespace FileManager
 		{
 			var foundFiles = Enumerable.Empty<LongPath>();
 
-			if (searchOption == SearchOption.AllDirectories)
+			try
 			{
-				try
+				if (searchOption == SearchOption.AllDirectories)
 				{
-					IEnumerable <LongPath> subDirs = Directory.EnumerateDirectories(path).Select(p => (LongPath)p);
+					IEnumerable<LongPath> subDirs = Directory.EnumerateDirectories(path).Select(p => (LongPath)p);
 					// Add files in subdirectories recursively to the list
 					foreach (string dir in subDirs)
 						foundFiles = foundFiles.Concat(SaferEnumerateFiles(dir, searchPattern, searchOption));
 				}
-				catch (UnauthorizedAccessException) { }
-				catch (PathTooLongException) { }
-			}
 
-			try
-			{
 				// Add files from the current directory
 				foundFiles = foundFiles.Concat(Directory.EnumerateFiles(path, searchPattern).Select(f => (LongPath)f));
 			}
 			catch (UnauthorizedAccessException) { }
+			catch (PathTooLongException) { }
+            // Symbolic links will result in DirectoryNotFoundException. Ohter logical directories might also. Just skip them. Don't want to risk (or have to handle) infinite recursion
+            catch (DirectoryNotFoundException) { }
 
 			return foundFiles;
 		}

Source/FileManager/LongPath.cs

@@ -10,22 +10,59 @@ namespace FileManager
 	{
 		//https://docs.microsoft.com/en-us/windows/win32/fileio/maximum-file-path-limitation?tabs=cmd
 
-		public const int MaxDirectoryLength = MaxPathLength - 13;
-		public const int MaxPathLength = short.MaxValue;
 		public const int MaxFilenameLength = 255;
-
-		private const int MAX_PATH = 260;
-		private const string LONG_PATH_PREFIX = "\\\\?\\";
-
-		public string Path { get; init; }
-		public override string ToString() => Path;
-
-		private static readonly PlatformID PlatformID = Environment.OSVersion.Platform;
-
+		public static readonly int MaxDirectoryLength;
+		public static readonly int MaxPathLength;
+		private const int WIN_MAX_PATH = 260;
+		private const string WIN_LONG_PATH_PREFIX = @"\\?\";
+		internal static readonly bool IsWindows = System.Runtime.InteropServices.RuntimeInformation.IsOSPlatform(OSPlatform.Windows);
+		internal static readonly bool IsLinux = System.Runtime.InteropServices.RuntimeInformation.IsOSPlatform(OSPlatform.Linux);
+		internal static readonly bool IsOSX = System.Runtime.InteropServices.RuntimeInformation.IsOSPlatform(OSPlatform.OSX);
 	
+		public string Path { get; }
+
+		static LongPath()
+		{
+			if (IsWindows)
+			{
+				MaxPathLength = short.MaxValue;
+				MaxDirectoryLength = MaxPathLength - 13;
+			}
+			else if (IsOSX)
+			{
+				MaxPathLength = 1024;
+				MaxDirectoryLength = MaxPathLength - MaxFilenameLength;
+			}
+			else
+			{
+				MaxPathLength = 4096;
+				MaxDirectoryLength = MaxPathLength - MaxFilenameLength;
+			}
+		}
+
+		[JsonConstructor]
+		private LongPath(string path)
+		{
+			if (IsWindows && path.Length > MaxPathLength)
+				throw new System.IO.PathTooLongException($"Path exceeds {MaxPathLength} character limit. ({path})");
+			if (!IsWindows && Encoding.UTF8.GetByteCount(path) > MaxPathLength)
+				throw new System.IO.PathTooLongException($"Path exceeds {MaxPathLength} byte limit. ({path})");
+
+			Path = path;
+		}
+		
+		//Filename limits on NTFS and FAT filesystems are based on characters,
+		//but on ext* filesystems they're based on bytes. The ext* filesystems
+		//don't care about encoding, so how unicode characters are encoded is
+		///a choice made by the linux kernel. As best as I can tell, pretty
+		//much everyone uses UTF-8.
+		public static int GetFilesystemStringLength(StringBuilder filename)
+			=> IsWindows ? filename.Length
+			: Encoding.UTF8.GetByteCount(filename.ToString());
+
 		public static implicit operator LongPath(string path)
 		{
-			if (PlatformID is PlatformID.Unix) return new LongPath { Path = path };
+			if (!IsWindows) return new LongPath(path);
 
 			if (path is null) return null;
 
@@ -33,15 +70,15 @@ namespace FileManager
 			//the name to an NT-style name, except when using the "\\?\" prefix 
 			path = path.Replace(System.IO.Path.AltDirectorySeparatorChar, System.IO.Path.DirectorySeparatorChar);
 
-			if (path.StartsWith(LONG_PATH_PREFIX))
-				return new LongPath { Path = path };
-			else if ((path.Length > 2 && path[1] == ':') || path.StartsWith("UNC\\"))
-				return new LongPath { Path = LONG_PATH_PREFIX + path };
-			else if (path.StartsWith("\\\\"))
+			if (path.StartsWith(WIN_LONG_PATH_PREFIX))
+				return new LongPath(path);
+			else if ((path.Length > 2 && path[1] == ':') || path.StartsWith(@"UNC\"))
+				return new LongPath(WIN_LONG_PATH_PREFIX + path);
+			else if (path.StartsWith(@"\\"))
 				//The "\\?\" prefix can also be used with paths constructed according to the
 				//universal naming convention (UNC). To specify such a path using UNC, use
 				//the "\\?\UNC\" prefix.
-				return new LongPath { Path = LONG_PATH_PREFIX + "UNC\\" + path.Substring(2) };
+				return new LongPath(WIN_LONG_PATH_PREFIX + @"UNC\" + path.Substring(2));
 			else
 			{
 				//These prefixes are not used as part of the path itself. They indicate that
@@ -50,9 +87,9 @@ namespace FileManager
 				//a period to represent the current directory, or double dots to represent the
 				//parent directory. Because you cannot use the "\\?\" prefix with a relative
 				//path, relative paths are always limited to a total of MAX_PATH characters.
-				if (path.Length > MAX_PATH)
+				if (path.Length > WIN_MAX_PATH)
 					throw new System.IO.PathTooLongException();
-				return new LongPath { Path = path };
+				return new LongPath(path);
 			}
 		}
 
@@ -63,7 +100,7 @@ namespace FileManager
 		{
 			get
 			{
-				if (PlatformID is PlatformID.Unix) return Path;
+				if (!IsWindows) return Path;
 
 				//Short Path names are useful for navigating to the file in windows explorer,
 				//which will not recognize paths longer than MAX_PATH. Short path names are not
@@ -103,7 +140,7 @@ namespace FileManager
 		{
 			get
 			{
-				if (PlatformID is PlatformID.Unix) return Path;
+				if (!IsWindows) return Path;
 				if (Path is null) return null;
 
 				StringBuilder longPathBuffer = new(MaxPathLength);
@@ -117,13 +154,16 @@ namespace FileManager
 		{
 			get
 			{
-				if (PlatformID is PlatformID.Unix) return Path;
+				if (!IsWindows) return Path;
 				return
-					Path?.StartsWith(LONG_PATH_PREFIX) == true ? Path.Remove(0, LONG_PATH_PREFIX.Length)
+					Path?.StartsWith(WIN_LONG_PATH_PREFIX) == true ? Path.Remove(0, WIN_LONG_PATH_PREFIX.Length)
 					:Path;
 			}
 		}
 
+		public override string ToString() => Path;
+
+
 		[DllImport("kernel32.dll", CharSet = CharSet.Unicode)]
 		private static extern int GetShortPathName([MarshalAs(UnmanagedType.LPWStr)] string path, [MarshalAs(UnmanagedType.LPWStr)] StringBuilder shortPath, int shortPathLength);
 

Source/FileManager/PersistentDictionary.cs

@@ -33,26 +33,43 @@ namespace FileManager
             createNewFile();
         }
 
-        public string GetString(string propertyName)
+        public string GetString(string propertyName, string defaultValue = null)
         {
             if (!stringCache.ContainsKey(propertyName))
             {
                 var jObject = readFile();
-                if (!jObject.ContainsKey(propertyName))
-                    return null;
-                stringCache[propertyName] = jObject[propertyName].Value<string>();
+                if (jObject.ContainsKey(propertyName))
+                    stringCache[propertyName] = jObject[propertyName].Value<string>();
+                else
+                    stringCache[propertyName] = defaultValue;
             }
 
             return stringCache[propertyName];
         }
 
-        public T GetNonString<T>(string propertyName)
+        public T GetNonString<T>(string propertyName, T defaultValue = default)
         {
             var obj = GetObject(propertyName);
-            if (obj is null) return default;
-            if (obj is JValue jValue) return jValue.Value<T>();
-            if (obj is JObject jObject)  return jObject.ToObject<T>();
-            return (T)obj;
+
+            if (obj is null)
+            {
+                objectCache[propertyName] = defaultValue;
+                return defaultValue;
+            }
+            if (obj.GetType().IsAssignableTo(typeof(T))) return (T)obj;
+            if (obj is JObject jObject) return jObject.ToObject<T>();
+            if (obj is JValue jValue)
+            {
+                if (typeof(T).IsAssignableTo(typeof(Enum)))
+                {
+                    return
+                        Enum.TryParse(typeof(T), jValue.Value<string>(), out var enumVal)
+                        ? (T)enumVal
+                        : Enum.GetValues(typeof(T)).Cast<T>().First();
+                }
+                return jValue.Value<T>();
+            }
+            throw new InvalidCastException($"{obj.GetType()} is not convertible to {typeof(T)}");
         }
 
         public object GetObject(string propertyName)
@@ -179,6 +196,7 @@ namespace FileManager
             }
             catch (Exception exDebug)
             {
+                Serilog.Log.Logger.Debug(exDebug, "Silent failure");
                 return false;
             }
 

Source/FileManager/ReplacementCharacters.cs

@@ -7,15 +7,15 @@ using System.Linq;
 
 namespace FileManager
 {
-	public class Replacement : ICloneable
+	public record Replacement
 	{
 		public const int FIXED_COUNT = 6;
 
 		internal const char QUOTE_MARK = '"';
-		[JsonIgnore] public bool Mandatory { get; internal set; }
+		[JsonIgnore] public bool Mandatory { get; set; }
 		[JsonProperty] public char CharacterToReplace { get; private set; }
-		[JsonProperty] public string ReplacementString { get; set; }
-		[JsonProperty] public string Description { get; private set; }
+		[JsonProperty] public string ReplacementString { get; private set; }
+		[JsonProperty] public string Description { get; set; }
 		public override string ToString() => $"{CharacterToReplace} → {ReplacementString} ({Description})";
 
 		public Replacement(char charToReplace, string replacementString, string description)
@@ -30,8 +30,6 @@ namespace FileManager
 			Mandatory = mandatory;
 		}
 
-		public object Clone() => new Replacement(CharacterToReplace, ReplacementString, Description, Mandatory);
-
 		public void Update(char charToReplace, string replacementString, string description)
 		{
 			ReplacementString = replacementString;
@@ -61,59 +59,118 @@ namespace FileManager
 	[JsonConverter(typeof(ReplacementCharactersConverter))]
 	public class ReplacementCharacters
 	{
-		public static readonly ReplacementCharacters Default = new()
+		public override bool Equals(object obj)
 		{
-			Replacements = new List<Replacement>()
+			if (obj is ReplacementCharacters second && Replacements.Count == second.Replacements.Count)
 			{
-				Replacement.OtherInvalid("_"),
-				Replacement.FilenameForwardSlash("∕"),
-				Replacement.FilenameBackSlash(""),
-				Replacement.OpenQuote("“"),
-				Replacement.CloseQuote("”"),
-				Replacement.OtherQuote("＂"),
-				Replacement.OpenAngleBracket("＜"),
-				Replacement.CloseAngleBracket("＞"),
-				Replacement.Colon("꞉"),
-				Replacement.Asterisk("✱"),
-				Replacement.QuestionMark("？"),
-				Replacement.Pipe("⏐"),
-			}
-		};
+				for (int i = 0; i < Replacements.Count; i++)
+					if (Replacements[i] != second.Replacements[i])
+						return false;
 
-		public static readonly ReplacementCharacters LoFiDefault = new()
-		{
-			Replacements = new List<Replacement>()
+				return true;
+			}
+			return false;
+		}
+		public override int GetHashCode() => Replacements.GetHashCode();
+
+		public static readonly ReplacementCharacters Default
+			= IsWindows
+			? new()
 			{
-				Replacement.OtherInvalid("_"),
-				Replacement.FilenameForwardSlash("_"),
-				Replacement.FilenameBackSlash("_"),
-				Replacement.OpenQuote("'"),
-				Replacement.CloseQuote("'"),
-				Replacement.OtherQuote("'"),
-				Replacement.OpenAngleBracket("{"),
-				Replacement.CloseAngleBracket("}"),
-				Replacement.Colon("-"),
+				Replacements = new Replacement[]
+				{
+					Replacement.OtherInvalid("_"),
+					Replacement.FilenameForwardSlash("∕"),
+					Replacement.FilenameBackSlash(""),
+					Replacement.OpenQuote("“"),
+					Replacement.CloseQuote("”"),
+					Replacement.OtherQuote("＂"),
+					Replacement.OpenAngleBracket("＜"),
+					Replacement.CloseAngleBracket("＞"),
+					Replacement.Colon("꞉"),
+					Replacement.Asterisk("✱"),
+					Replacement.QuestionMark("？"),
+					Replacement.Pipe("⏐"),
+				}
 			}
-		};
-
-		public static readonly ReplacementCharacters Barebones = new()
-		{
-			Replacements = new List<Replacement>()
+			: new()
 			{
-				Replacement.OtherInvalid("_"),
-				Replacement.FilenameForwardSlash("_"),
-				Replacement.FilenameBackSlash("_"),
-				Replacement.OpenQuote("_"),
-				Replacement.CloseQuote("_"),
-				Replacement.OtherQuote("_"),
-			}
-		};
+				Replacements = new Replacement[]
+				{
+					Replacement.OtherInvalid("_"),
+					Replacement.FilenameForwardSlash("∕"),
+					Replacement.FilenameBackSlash("\\"),
+					Replacement.OpenQuote("“"),
+					Replacement.CloseQuote("”"),
+					Replacement.OtherQuote("\"")
+				}
+			};
 
-		private static readonly char[] invalidChars = Path.GetInvalidPathChars().Union(new[] {
-				'*', '?', ':',
-				// these are weird. If you run Path.GetInvalidPathChars() in Visual Studio's "C# Interactive", then these characters are included.
-				// In live code, Path.GetInvalidPathChars() does not include them
-				'"', '<', '>'
+		public static readonly ReplacementCharacters LoFiDefault
+			= IsWindows
+			? new()
+			{
+				Replacements = new Replacement[]
+				{
+					Replacement.OtherInvalid("_"),
+					Replacement.FilenameForwardSlash("_"),
+					Replacement.FilenameBackSlash("_"),
+					Replacement.OpenQuote("'"),
+					Replacement.CloseQuote("'"),
+					Replacement.OtherQuote("'"),
+					Replacement.OpenAngleBracket("{"),
+					Replacement.CloseAngleBracket("}"),
+					Replacement.Colon("-"),
+				}
+			}
+			: new ()
+			{
+				Replacements = new Replacement[]
+				{
+					Replacement.OtherInvalid("_"),
+					Replacement.FilenameForwardSlash("_"),
+					Replacement.FilenameBackSlash("\\"),
+					Replacement.OpenQuote("\""),
+					Replacement.CloseQuote("\""),
+					Replacement.OtherQuote("\"")
+				}
+			};
+
+		public static readonly ReplacementCharacters Barebones
+			= IsWindows
+			? new ()
+			{
+				Replacements = new Replacement[]
+				{
+					Replacement.OtherInvalid("_"),
+					Replacement.FilenameForwardSlash("_"),
+					Replacement.FilenameBackSlash("_"),
+					Replacement.OpenQuote("_"),
+					Replacement.CloseQuote("_"),
+					Replacement.OtherQuote("_")
+				}
+			}
+			: new ()
+			{
+				Replacements = new Replacement[]
+				{
+					Replacement.OtherInvalid("_"),
+					Replacement.FilenameForwardSlash("_"),
+					Replacement.FilenameBackSlash("\\"),
+					Replacement.OpenQuote("\""),
+					Replacement.CloseQuote("\""),
+					Replacement.OtherQuote("\"")
+				}
+			};
+
+		private static bool IsWindows => Environment.OSVersion.Platform is PlatformID.Win32NT;
+
+		private static readonly char[] invalidPathChars = Path.GetInvalidFileNameChars().Except(new[] {
+				Path.DirectorySeparatorChar, Path.AltDirectorySeparatorChar
+			}).ToArray();
+
+		private static readonly char[] invalidSlashes = Path.GetInvalidFileNameChars().Intersect(new[] {
+				Path.DirectorySeparatorChar, Path.AltDirectorySeparatorChar
 			}).ToArray();
 
 		public IReadOnlyList<Replacement> Replacements { get; init; }
@@ -158,6 +215,10 @@ namespace FileManager
 					return OtherQuote;
 			}
 
+			if (!IsWindows && toReplace == BackSlash.CharacterToReplace)
+				return BackSlash.ReplacementString;
+
+			//Replace any other non-mandatory characters
 			for (int i = Replacement.FIXED_COUNT; i < Replacements.Count; i++)
 			{
 				var r = Replacements[i];
@@ -167,13 +228,12 @@ namespace FileManager
 			return DefaultReplacement;
 		}
 
-
 		public static bool ContainsInvalidPathChar(string path)
-			=> path.Any(c => invalidChars.Contains(c));
+			=> path.Any(c => invalidPathChars.Contains(c));
 		public static bool ContainsInvalidFilenameChar(string path)
-			=> path.Any(c => invalidChars.Concat(new char[] { '\\', '/' }).Contains(c));
+			=> ContainsInvalidPathChar(path) || path.Any(c => invalidSlashes.Contains(c));
 
-		public string ReplaceInvalidFilenameChars(string fileName)
+		public string ReplaceFilenameChars(string fileName)
 		{
 			if (string.IsNullOrEmpty(fileName)) return string.Empty;
 			var builder = new System.Text.StringBuilder();
@@ -181,7 +241,9 @@ namespace FileManager
 			{
 				var c = fileName[i];
 
-				if (invalidChars.Contains(c) || c == ForwardSlash.CharacterToReplace || c == BackSlash.CharacterToReplace)
+				if (invalidPathChars.Contains(c)
+					|| invalidSlashes.Contains(c)
+					|| Replacements.Any(r => r.CharacterToReplace == c) /* Replace any other legal characters that they user wants. */ )
 				{
 					char preceding = i > 0 ? fileName[i - 1] : default;
 					char succeeding = i < fileName.Length - 1 ? fileName[i + 1] : default;
@@ -189,30 +251,42 @@ namespace FileManager
 				}
 				else
 					builder.Append(c);
-
 			}
 			return builder.ToString();
 		}
 
-		public string ReplaceInvalidPathChars(string pathStr)
+		public string ReplacePathChars(string pathStr)
 		{
 			if (string.IsNullOrEmpty(pathStr)) return string.Empty;
 
-			// replace all colons except within the first 2 chars
 			var builder = new System.Text.StringBuilder();
 			for (var i = 0; i < pathStr.Length; i++)
 			{
 				var c = pathStr[i];
 
-				if (!invalidChars.Contains(c) || (c == ':' && i == 1 && Path.IsPathRooted(pathStr)))
-					builder.Append(c);
-				else
+				if (
+					(
+						invalidPathChars.Contains(c)
+						|| (	// Replace any other legal characters that they user wants.
+								c != Path.DirectorySeparatorChar
+								&& c != Path.AltDirectorySeparatorChar
+								&& Replacements.Any(r => r.CharacterToReplace == c)
+							)
+					)
+					&& !(	// replace all colons except drive letter designator on Windows
+							c == ':'
+							&& i == 1
+							&& Path.IsPathRooted(pathStr)
+							&& IsWindows
+					)
+				)
 				{
-					char preceding = i > 0 ? pathStr[i - 1] : default;
-					char succeeding = i < pathStr.Length - 1 ? pathStr[i + 1] : default;
-					builder.Append(GetPathCharReplacement(c, preceding, succeeding));
+						char preceding = i > 0 ? pathStr[i - 1] : default;
+						char succeeding = i < pathStr.Length - 1 ? pathStr[i + 1] : default;
+						builder.Append(GetPathCharReplacement(c, preceding, succeeding));
 				}
-
+				else
+					builder.Append(c);
 			}
 			return builder.ToString();
 		}
@@ -234,28 +308,19 @@ namespace FileManager
 			//Ensure that the first 6 replacements are for the expected chars and that all replacement strings are valid.
 			//If not, reset to default.
 
-			var default0 = Replacement.OtherInvalid("");
-			var default1 = Replacement.FilenameForwardSlash("");
-			var default2 = Replacement.FilenameBackSlash("");
-			var default3 = Replacement.OpenQuote("");
-			var default4 = Replacement.CloseQuote("");
-			var default5 = Replacement.OtherQuote("");
-
-			if (dict.Count < Replacement.FIXED_COUNT ||
-				dict[0].CharacterToReplace != default0.CharacterToReplace || dict[0].Description != default0.Description ||
-				dict[1].CharacterToReplace != default1.CharacterToReplace || dict[1].Description != default1.Description ||
-				dict[2].CharacterToReplace != default2.CharacterToReplace || dict[2].Description != default2.Description ||
-				dict[3].CharacterToReplace != default3.CharacterToReplace || dict[3].Description != default3.Description ||
-				dict[4].CharacterToReplace != default4.CharacterToReplace || dict[4].Description != default4.Description ||
-				dict[5].CharacterToReplace != default5.CharacterToReplace || dict[5].Description != default5.Description ||
-				dict.Any(r => ReplacementCharacters.ContainsInvalidPathChar(r.ReplacementString))
-				)
-			{
-				dict = ReplacementCharacters.Default.Replacements;
-			}
-			//First FIXED_COUNT are mandatory
 			for (int i = 0; i < Replacement.FIXED_COUNT; i++)
+			{
+				if (dict.Count < Replacement.FIXED_COUNT
+					|| dict[i].CharacterToReplace != ReplacementCharacters.Barebones.Replacements[i].CharacterToReplace
+					|| dict[i].Description != ReplacementCharacters.Barebones.Replacements[i].Description)
+				{
+					dict = ReplacementCharacters.Default.Replacements;
+					break;
+				}
+
+				//First FIXED_COUNT are mandatory
 				dict[i].Mandatory = true;
+			}
 
 			return new ReplacementCharacters { Replacements = dict };
 		}
@@ -265,7 +330,7 @@ namespace FileManager
 			ReplacementCharacters replacements = (ReplacementCharacters)value;
 
 			var propertyNames = replacements.Replacements
-				.Select(c => JObject.FromObject(c)).ToList();
+				.Select(JObject.FromObject).ToList();
 
 			var prop = new JProperty(nameof(Replacement), new JArray(propertyNames));
 

Source/HangoverAvalonia/App.axaml.cs

@@ -17,10 +17,12 @@ namespace HangoverAvalonia
 		{
 			if (ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop)
 			{
-				desktop.MainWindow = new MainWindow
+				var mainWindow = new MainWindow
 				{
-					DataContext = new MainWindowViewModel(),
+					DataContext = new MainVM(),
 				};
+				desktop.MainWindow = mainWindow;
+				mainWindow.OnLoad();
 			}
 
 			base.OnFrameworkInitializationCompleted();

Source/HangoverAvalonia/Controls/CheckedListBox.axaml

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

Source/HangoverAvalonia/Controls/CheckedListBox.axaml.cs

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

Source/HangoverAvalonia/HangoverAvalonia.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
 		<OutputType>WinExe</OutputType>
-		<TargetFramework>net6.0</TargetFramework>
+		<TargetFramework>net7.0</TargetFramework>
 		<!--Avalonia doesen't support TrimMode=link currently,but we are working on that https://github.com/AvaloniaUI/Avalonia/issues/6892 -->
 		<TrimMode>copyused</TrimMode>
 		<BuiltInComInteropSupport>true</BuiltInComInteropSupport>
@@ -50,7 +50,15 @@
 		<None Remove="Assets\hangover.ico" />
 		<None Remove="hangover.ico" />
 	</ItemGroup>
-
+	
+	<ItemGroup>
+		<Compile Update="ViewModels\MainVM.*.cs">
+			<DependentUpon>MainVM.cs</DependentUpon>
+		</Compile>
+		<Compile Update="Views\MainWindow.*.cs">
+			<DependentUpon>MainWindow.axaml</DependentUpon>
+		</Compile>
+	</ItemGroup>
 
 	<ItemGroup>
 		<AvaloniaResource Include="hangover.ico" />
@@ -63,12 +71,14 @@
 		<TrimmableAssembly Include="Avalonia.Themes.Default" />
 	</ItemGroup>
 	<ItemGroup>
-		<PackageReference Include="Avalonia" Version="0.10.17" />
-		<PackageReference Include="Avalonia.Desktop" Version="0.10.17" />
+
+		<PackageReference Include="Avalonia" Version="11.0.0-preview4" />
+		<PackageReference Include="Avalonia.Desktop" Version="11.0.0-preview4" />
 		<!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
-		<PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="0.10.17" />
-		<PackageReference Include="Avalonia.ReactiveUI" Version="0.10.17" />
-		<PackageReference Include="XamlNameReferenceGenerator" Version="1.3.4" />
+		<PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.0.0-preview4" />
+		<PackageReference Include="Avalonia.ReactiveUI" Version="11.0.0-preview4" />
+		<PackageReference Include="Avalonia.Themes.Fluent" Version="11.0.0-preview4" />
+		<PackageReference Include="XamlNameReferenceGenerator" Version="1.5.1" />
 	</ItemGroup>
 	<ItemGroup>
 		<ProjectReference Include="..\HangoverBase\HangoverBase.csproj" />

Source/HangoverAvalonia/Program.cs

@@ -1,5 +1,4 @@
 using Avalonia;
-using Avalonia.Controls.ApplicationLifetimes;
 using Avalonia.ReactiveUI;
 using System;
 

Source/HangoverAvalonia/Properties/PublishProfiles/LinuxProfile.pubxml

@@ -6,9 +6,9 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
   <PropertyGroup>
     <Configuration>Release</Configuration>
     <Platform>Any CPU</Platform>
-    <PublishDir>..\bin\Publish\linux-chardonnay</PublishDir>
+    <PublishDir>..\bin\Publish\Linux-chardonnay</PublishDir>
     <PublishProtocol>FileSystem</PublishProtocol>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <RuntimeIdentifier>linux-x64</RuntimeIdentifier>
     <SelfContained>true</SelfContained>
     <PublishSingleFile>false</PublishSingleFile>

Source/HangoverAvalonia/Properties/PublishProfiles/MacOSProfile.pubxml

@@ -6,9 +6,9 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
   <PropertyGroup>
     <Configuration>Release</Configuration>
     <Platform>Any CPU</Platform>
-    <PublishDir>..\bin\Publish\macos-chardonnay</PublishDir>
+    <PublishDir>..\bin\Publish\MacOS-chardonnay</PublishDir>
     <PublishProtocol>FileSystem</PublishProtocol>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <RuntimeIdentifier>osx-x64</RuntimeIdentifier>
     <SelfContained>true</SelfContained>
     <PublishSingleFile>false</PublishSingleFile>

Source/HangoverAvalonia/Properties/PublishProfiles/WindowsProfile.pubxml

@@ -6,9 +6,9 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
   <PropertyGroup>
     <Configuration>Release</Configuration>
     <Platform>Any CPU</Platform>
-    <PublishDir>..\bin\Publish\win-chardonnay</PublishDir>
+    <PublishDir>..\bin\Publish\Windows-chardonnay</PublishDir>
     <PublishProtocol>FileSystem</PublishProtocol>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <RuntimeIdentifier>win-x64</RuntimeIdentifier>
     <SelfContained>true</SelfContained>
     <PublishSingleFile>false</PublishSingleFile>

Source/HangoverAvalonia/ViewModels/MainVM.Database.cs

@@ -0,0 +1,36 @@
+using HangoverBase;
+using ReactiveUI;
+
+namespace HangoverAvalonia.ViewModels
+{
+	public partial class MainVM
+	{
+		private DatabaseTab _tab;
+
+		private string _databaseFileText;
+		private bool _databaseFound;
+		private string _sqlResults;
+		public string DatabaseFileText { get => _databaseFileText; set => this.RaiseAndSetIfChanged(ref _databaseFileText, value); }
+		public string SqlQuery { get; set; }
+		public bool DatabaseFound { get => _databaseFound; set => this.RaiseAndSetIfChanged(ref _databaseFound, value); }
+		public string SqlResults { get => _sqlResults; set => this.RaiseAndSetIfChanged(ref _sqlResults, value); }
+
+		private void Load_databaseVM()
+		{
+			_tab = new(new(() => SqlQuery, s => SqlResults = s, s => SqlResults = s));
+
+			_tab.LoadDatabaseFile();
+			if (_tab.DbFile is null)
+			{
+				DatabaseFileText = $"Database file not found";
+				DatabaseFound = false;
+				return;
+			}
+
+			DatabaseFileText = $"Database file: {_tab.DbFile}";
+			DatabaseFound = true;
+		}
+
+		public void ExecuteQuery() => _tab.ExecuteQuery();
+	}
+}

Source/HangoverAvalonia/ViewModels/MainVM.Deleted.cs

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

Source/HangoverAvalonia/ViewModels/MainVM.cs

@@ -0,0 +1,11 @@
+namespace HangoverAvalonia.ViewModels
+{
+	public partial class MainVM : ViewModelBase
+	{
+		public MainVM()
+		{
+			Load_databaseVM();
+			Load_deletedVM();
+		}
+	}
+}

Source/HangoverAvalonia/ViewModels/MainWindowViewModel.cs

@@ -1,37 +0,0 @@
-using System;
-using HangoverBase;
-using ReactiveUI;
-
-namespace HangoverAvalonia.ViewModels
-{
-	public class MainWindowViewModel : ViewModelBase
-    {
-        private DatabaseTab _tab;
-
-        private string _databaseFileText;
-        private bool _databaseFound;
-        private string _sqlResults;
-        public string DatabaseFileText { get => _databaseFileText; set => this.RaiseAndSetIfChanged(ref _databaseFileText, value); }
-        public string SqlQuery { get; set; }
-        public bool DatabaseFound { get => _databaseFound; set => this.RaiseAndSetIfChanged(ref _databaseFound, value); }
-        public string SqlResults { get => _sqlResults; set => this.RaiseAndSetIfChanged(ref _sqlResults, value); }
-
-        public MainWindowViewModel()
-        {
-            _tab = new(new(() => SqlQuery, s => SqlResults = s, s => SqlResults = s));
-
-            _tab.LoadDatabaseFile();
-            if (_tab.DbFile is null)
-            {
-                DatabaseFileText = $"Database file not found";
-                DatabaseFound = false;
-                return;
-            }
-
-            DatabaseFileText = $"Database file: {_tab.DbFile}";
-            DatabaseFound = true;
-        }
-
-        public void ExecuteQuery() => _tab.ExecuteQuery();
-    }
-}

Source/HangoverAvalonia/ViewModels/ViewModelBase.cs

@@ -1,7 +1,4 @@
 using ReactiveUI;
-using System;
-using System.Collections.Generic;
-using System.Text;
 
 namespace HangoverAvalonia.ViewModels
 {

Source/HangoverAvalonia/Views/MainWindow.CLI.cs

@@ -0,0 +1,11 @@
+namespace HangoverAvalonia.Views
+{
+	public partial class MainWindow
+	{
+		private void cliTab_VisibleChanged(bool isVisible)
+		{
+			if (!isVisible)
+				return;
+		}
+	}
+}

Source/HangoverAvalonia/Views/MainWindow.Database.cs

@@ -0,0 +1,16 @@
+namespace HangoverAvalonia.Views
+{
+	public partial class MainWindow
+	{
+		private void databaseTab_VisibleChanged(bool isVisible)
+		{
+			if (!isVisible)
+				return;
+		}
+
+		public void Execute_Click(object sender, Avalonia.Interactivity.RoutedEventArgs e)
+		{
+			_viewModel.ExecuteQuery();
+		}
+	}
+}

Source/HangoverAvalonia/Views/MainWindow.Deleted.cs

@@ -0,0 +1,40 @@
+using ApplicationServices;
+using DataLayer;
+using HangoverAvalonia.Controls;
+using System.Linq;
+
+namespace HangoverAvalonia.Views
+{
+	public partial class MainWindow
+	{
+		private void deletedTab_VisibleChanged(bool isVisible)
+		{
+			if (!isVisible)
+				return;
+
+			if (_viewModel.DeletedBooks.Count == 0)
+				_viewModel.reload();
+		}
+		public void Deleted_CheckedListBox_ItemCheck(object sender, ItemCheckEventArgs args)
+		{
+			_viewModel.CheckedBooksCount = deletedCbl.CheckedItems.Count();
+		}
+		public void Deleted_CheckAll_Click(object sender, Avalonia.Interactivity.RoutedEventArgs e)
+		{
+			foreach (var item in deletedCbl.Items)
+				deletedCbl.SetItemChecked(item, true);
+		}
+		public void Deleted_UncheckAll_Click(object sender, Avalonia.Interactivity.RoutedEventArgs e)
+		{
+			foreach (var item in deletedCbl.Items)
+				deletedCbl.SetItemChecked(item, false);
+		}
+		public void Deleted_Save_Click(object sender, Avalonia.Interactivity.RoutedEventArgs e)
+		{
+			var libraryBooksToRestore = deletedCbl.CheckedItems.Cast<LibraryBook>().ToList();
+			var qtyChanges = libraryBooksToRestore.RestoreBooks();
+			if (qtyChanges > 0)
+				_viewModel.reload();
+		}
+	}
+}

Source/HangoverAvalonia/Views/MainWindow.axaml

@@ -3,33 +3,36 @@
         xmlns:vm="using:HangoverAvalonia.ViewModels"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="500"
+		xmlns:controls="clr-namespace:HangoverAvalonia.Controls"
+		mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="500"
 		Width="800" Height="500"
         x:Class="HangoverAvalonia.Views.MainWindow"
         Icon="/Assets/hangover.ico "
         Title="Hangover: Libation debug and recovery tool">
-
 	<Design.DataContext>
-		<vm:MainWindowViewModel/>
+		<vm:MainVM/>
 	</Design.DataContext>
-	
-	<TabControl Grid.Row="0">
+
+	<TabControl Name="tabControl1" Grid.Row="0">
 		<TabControl.Styles>
 			<Style Selector="ItemsPresenter#PART_ItemsPresenter">
-				<Setter Property="Height" Value="18"/>
+				<Setter Property="Height" Value="23"/>
 			</Style>
 			<Style Selector="TabItem">
-				<Setter Property="MinHeight" Value="30"/>
-				<Setter Property="Height" Value="30"/>
-				<Setter Property="Padding" Value="8,2,8,0"/>
+				<Setter Property="MinHeight" Value="40"/>
+				<Setter Property="Height" Value="40"/>
+				<Setter Property="Padding" Value="8,2,8,5"/>
 			</Style>
 			<Style Selector="TabItem#Header TextBlock">
 				<Setter Property="MinHeight" Value="5"/>
 			</Style>
+			<Style Selector="Button">
+				<Setter Property="Padding" Value="20,5,20,5"/>
+			</Style>
 		</TabControl.Styles>
 		
 		<!-- Database Tab -->
-		<TabItem>
+		<TabItem Name="databaseTab">
 			<TabItem.Header>
 				<TextBlock FontSize="14" VerticalAlignment="Center">Database</TextBlock>
 			</TabItem.Header>
@@ -52,7 +55,6 @@
 				
 				<Button
 					Grid.Row="3"
-					Padding="20,5,20,5"
 					Content="Execute"
 					IsEnabled="{Binding DatabaseFound}"
 					Click="Execute_Click" />
@@ -65,8 +67,45 @@
 			</Grid>
 			
 		</TabItem>
+
+		<!-- Deleted Books Tab -->
+		<TabItem Name="deletedTab">
+			<TabItem.Header>
+				<TextBlock FontSize="14" VerticalAlignment="Center">Deleted Books</TextBlock>
+			</TabItem.Header>
+
+			<Grid
+				RowDefinitions="Auto,*,Auto">
+
+				<TextBlock
+					Grid.Row="0"
+					Margin="5"
+					Text="To restore deleted book, check box and save" />
+
+				<controls:CheckedListBox
+					Grid.Row="1"
+					Margin="5,0,5,0"
+					BorderThickness="1"
+					BorderBrush="Gray"
+					Name="deletedCbl"
+					Items="{Binding DeletedBooks}" />
+
+				<Grid
+					Grid.Row="2"
+					Margin="5"
+					ColumnDefinitions="Auto,Auto,Auto,*">
+
+					<Button Grid.Column="0" Margin="0,0,20,0" Content="Check All" Click="Deleted_CheckAll_Click" />
+					<Button Grid.Column="1" Margin="0,0,20,0" Content="Uncheck All" Click="Deleted_UncheckAll_Click" />
+					<TextBlock Grid.Column="2" VerticalAlignment="Center" Text="{Binding CheckedCountText}" />
+					<Button Grid.Column="3" HorizontalAlignment="Right" Content="Save" Click="Deleted_Save_Click" />
+
+				</Grid>
+			</Grid>
+		</TabItem>
+
 		<!-- Command Line Interface Tab -->
-		<TabItem>
+		<TabItem Name="cliTab">
 			<TabItem.Header>
 				<TextBlock FontSize="14" VerticalAlignment="Center">Command Line Interface</TextBlock>
 			</TabItem.Header>			

Source/HangoverAvalonia/Views/MainWindow.axaml.cs

@@ -1,3 +1,4 @@
+using AppScaffolding;
 using Avalonia.Controls;
 using HangoverAvalonia.ViewModels;
 
@@ -5,15 +6,22 @@ namespace HangoverAvalonia.Views
 {
 	public partial class MainWindow : Window
 	{
-		MainWindowViewModel _viewModel => DataContext as MainWindowViewModel;
+		MainVM _viewModel => DataContext as MainVM;
 		public MainWindow()
 		{
 			InitializeComponent();
+
+			var config = LibationScaffolding.RunPreConfigMigrations();
+			LibationScaffolding.RunPostConfigMigrations(config);
+			LibationScaffolding.RunPostMigrationScaffolding(config);
 		}
 
-		public void Execute_Click(object sender, Avalonia.Interactivity.RoutedEventArgs e)
+		public void OnLoad()
 		{
-			_viewModel.ExecuteQuery();
+			deletedCbl.ItemCheck += Deleted_CheckedListBox_ItemCheck;
+			databaseTab.PropertyChanged += (_, e) => { if (e.Property.Name == nameof(TabItem.IsSelected)) databaseTab_VisibleChanged(databaseTab.IsSelected); };
+			deletedTab.PropertyChanged += (_, e) => { if (e.Property.Name == nameof(TabItem.IsSelected)) deletedTab_VisibleChanged(deletedTab.IsSelected); };
+			cliTab.PropertyChanged += (_, e) => { if (e.Property.Name == nameof(TabItem.IsSelected)) cliTab_VisibleChanged(cliTab.IsSelected); };
 		}
 	}
 }

Source/HangoverBase/HangoverBase.csproj

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

Source/HangoverWinForms/Form1.CLI.cs

@@ -11,7 +11,7 @@ namespace HangoverWinForms
 
         private void cliTab_VisibleChanged(object sender, EventArgs e)
         {
-            if (!databaseTab.Visible)
+            if (!cliTab.Visible)
                 return;
         }
     }

Source/HangoverWinForms/Form1.Deleted.cs

@@ -0,0 +1,73 @@
+using ApplicationServices;
+using DataLayer;
+
+namespace HangoverWinForms
+{
+    public partial class Form1
+    {
+        private string deletedCheckedTemplate;
+
+        private void Load_deletedTab()
+        {
+            deletedCheckedTemplate = deletedCheckedLbl.Text;
+        }
+
+        private void deletedTab_VisibleChanged(object sender, EventArgs e)
+        {
+            if (!deletedTab.Visible)
+                return;
+
+            if (deletedCbl.Items.Count == 0)
+                reload();
+        }
+
+        private void deletedCbl_ItemCheck(object sender, ItemCheckEventArgs e)
+        {
+            // CheckedItems.Count is not updated until after the event fires
+            setLabel(e.NewValue);
+        }
+
+        private void checkAllBtn_Click(object sender, EventArgs e)
+        {
+            for (var i = 0; i < deletedCbl.Items.Count; i++)
+                deletedCbl.SetItemChecked(i, true);
+        }
+
+        private void uncheckAllBtn_Click(object sender, EventArgs e)
+        {
+            for (var i = 0; i < deletedCbl.Items.Count; i++)
+                deletedCbl.SetItemChecked(i, false);
+        }
+
+        private void saveBtn_Click(object sender, EventArgs e)
+        {
+            var libraryBooksToRestore = deletedCbl.CheckedItems.Cast<LibraryBook>().ToList();
+            var qtyChanges = libraryBooksToRestore.RestoreBooks();
+            if (qtyChanges > 0)
+                reload();
+        }
+
+        private void reload()
+        {
+            deletedCbl.Items.Clear();
+            var deletedBooks = DbContexts.GetContext().GetDeletedLibraryBooks();
+            foreach (var lb in deletedBooks)
+                deletedCbl.Items.Add(lb);
+
+            setLabel();
+        }
+
+        private void setLabel(CheckState? checkedState = null)
+        {
+            var pre = deletedCbl.CheckedItems.Count;
+            int count = checkedState switch
+            {
+                CheckState.Checked => pre + 1,
+                CheckState.Unchecked => pre - 1,
+                _ => pre,
+            };
+
+            deletedCheckedLbl.Text = string.Format(deletedCheckedTemplate, count, deletedCbl.Items.Count);
+        }
+    }
+}

Source/HangoverWinForms/Form1.Designer.cs

@@ -36,14 +36,23 @@
             this.sqlTb = new System.Windows.Forms.TextBox();
             this.sqlLbl = new System.Windows.Forms.Label();
             this.databaseFileLbl = new System.Windows.Forms.Label();
+            this.deletedTab = new System.Windows.Forms.TabPage();
+            this.deletedCheckedLbl = new System.Windows.Forms.Label();
+            this.label1 = new System.Windows.Forms.Label();
+            this.saveBtn = new System.Windows.Forms.Button();
+            this.uncheckAllBtn = new System.Windows.Forms.Button();
+            this.checkAllBtn = new System.Windows.Forms.Button();
+            this.deletedCbl = new System.Windows.Forms.CheckedListBox();
             this.cliTab = new System.Windows.Forms.TabPage();
             this.tabControl1.SuspendLayout();
             this.databaseTab.SuspendLayout();
+            this.deletedTab.SuspendLayout();
             this.SuspendLayout();
             // 
             // tabControl1
             // 
             this.tabControl1.Controls.Add(this.databaseTab);
+            this.tabControl1.Controls.Add(this.deletedTab);
             this.tabControl1.Controls.Add(this.cliTab);
             this.tabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
             this.tabControl1.Location = new System.Drawing.Point(0, 0);
@@ -119,6 +128,86 @@
             this.databaseFileLbl.TabIndex = 0;
             this.databaseFileLbl.Text = "Database file: ";
             // 
+            // deletedTab
+            // 
+            this.deletedTab.Controls.Add(this.deletedCheckedLbl);
+            this.deletedTab.Controls.Add(this.label1);
+            this.deletedTab.Controls.Add(this.saveBtn);
+            this.deletedTab.Controls.Add(this.uncheckAllBtn);
+            this.deletedTab.Controls.Add(this.checkAllBtn);
+            this.deletedTab.Controls.Add(this.deletedCbl);
+            this.deletedTab.Location = new System.Drawing.Point(4, 24);
+            this.deletedTab.Name = "deletedTab";
+            this.deletedTab.Padding = new System.Windows.Forms.Padding(3);
+            this.deletedTab.Size = new System.Drawing.Size(792, 422);
+            this.deletedTab.TabIndex = 2;
+            this.deletedTab.Text = "Deleted Books";
+            this.deletedTab.UseVisualStyleBackColor = true;
+            // 
+            // deletedCheckedLbl
+            // 
+            this.deletedCheckedLbl.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+            this.deletedCheckedLbl.AutoSize = true;
+            this.deletedCheckedLbl.Location = new System.Drawing.Point(233, 395);
+            this.deletedCheckedLbl.Name = "deletedCheckedLbl";
+            this.deletedCheckedLbl.Size = new System.Drawing.Size(104, 15);
+            this.deletedCheckedLbl.TabIndex = 6;
+            this.deletedCheckedLbl.Text = "Checked: {0} of {1}";
+            // 
+            // label1
+            // 
+            this.label1.AutoSize = true;
+            this.label1.Location = new System.Drawing.Point(8, 3);
+            this.label1.Name = "label1";
+            this.label1.Size = new System.Drawing.Size(239, 15);
+            this.label1.TabIndex = 0;
+            this.label1.Text = "To restore deleted book, check box and save";
+            // 
+            // saveBtn
+            // 
+            this.saveBtn.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this.saveBtn.Location = new System.Drawing.Point(709, 391);
+            this.saveBtn.Name = "saveBtn";
+            this.saveBtn.Size = new System.Drawing.Size(75, 23);
+            this.saveBtn.TabIndex = 5;
+            this.saveBtn.Text = "Save";
+            this.saveBtn.UseVisualStyleBackColor = true;
+            this.saveBtn.Click += new System.EventHandler(this.saveBtn_Click);
+            // 
+            // uncheckAllBtn
+            // 
+            this.uncheckAllBtn.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+            this.uncheckAllBtn.Location = new System.Drawing.Point(129, 391);
+            this.uncheckAllBtn.Name = "uncheckAllBtn";
+            this.uncheckAllBtn.Size = new System.Drawing.Size(98, 23);
+            this.uncheckAllBtn.TabIndex = 4;
+            this.uncheckAllBtn.Text = "Uncheck All";
+            this.uncheckAllBtn.UseVisualStyleBackColor = true;
+            this.uncheckAllBtn.Click += new System.EventHandler(this.uncheckAllBtn_Click);
+            // 
+            // checkAllBtn
+            // 
+            this.checkAllBtn.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+            this.checkAllBtn.Location = new System.Drawing.Point(8, 391);
+            this.checkAllBtn.Name = "checkAllBtn";
+            this.checkAllBtn.Size = new System.Drawing.Size(98, 23);
+            this.checkAllBtn.TabIndex = 3;
+            this.checkAllBtn.Text = "Check All";
+            this.checkAllBtn.UseVisualStyleBackColor = true;
+            this.checkAllBtn.Click += new System.EventHandler(this.checkAllBtn_Click);
+            // 
+            // deletedCbl
+            // 
+            this.deletedCbl.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+            this.deletedCbl.FormattingEnabled = true;
+            this.deletedCbl.Location = new System.Drawing.Point(8, 21);
+            this.deletedCbl.Name = "deletedCbl";
+            this.deletedCbl.Size = new System.Drawing.Size(776, 364);
+            this.deletedCbl.TabIndex = 2;
+            this.deletedCbl.ItemCheck += new System.Windows.Forms.ItemCheckEventHandler(this.deletedCbl_ItemCheck);
+            // 
             // cliTab
             // 
             this.cliTab.Location = new System.Drawing.Point(4, 24);
@@ -140,6 +229,8 @@
             this.tabControl1.ResumeLayout(false);
             this.databaseTab.ResumeLayout(false);
             this.databaseTab.PerformLayout();
+            this.deletedTab.ResumeLayout(false);
+            this.deletedTab.PerformLayout();
             this.ResumeLayout(false);
 
         }
@@ -154,5 +245,12 @@
         private Label sqlLbl;
         private Button sqlExecuteBtn;
         private TabPage cliTab;
+        private TabPage deletedTab;
+        private CheckedListBox deletedCbl;
+        private Label label1;
+        private Button saveBtn;
+        private Button uncheckAllBtn;
+        private Button checkAllBtn;
+        private Label deletedCheckedLbl;
     }
 }

Source/HangoverWinForms/Form1.cs

@@ -1,4 +1,6 @@
-namespace HangoverWinForms
+using AppScaffolding;
+
+namespace HangoverWinForms
 {
     public partial class Form1 : Form
     {
@@ -6,11 +8,17 @@
         {
             InitializeComponent();
 
+            var config = LibationScaffolding.RunPreConfigMigrations();
+            LibationScaffolding.RunPostConfigMigrations(config);
+            LibationScaffolding.RunPostMigrationScaffolding(config);
+
             databaseTab.VisibleChanged += databaseTab_VisibleChanged;
             cliTab.VisibleChanged += cliTab_VisibleChanged;
+            deletedTab.VisibleChanged += deletedTab_VisibleChanged;
 
             Load_databaseTab();
             Load_cliTab();
+            Load_deletedTab();
         }
     }
 }

Source/HangoverWinForms/HangoverWinForms.csproj

@@ -2,7 +2,8 @@
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework>net6.0-windows</TargetFramework>
+    <TargetFramework>net7.0-windows</TargetFramework>
+    <EnableWindowsTargeting>true</EnableWindowsTargeting>
     <UseWindowsForms>true</UseWindowsForms>
     <ApplicationIcon>hangover.ico</ApplicationIcon>
     <ImplicitUsings>enable</ImplicitUsings>

Source/HangoverWinForms/Properties/PublishProfiles/WindowsProfile.pubxml

@@ -8,7 +8,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
     <Platform>Any CPU</Platform>
     <PublishDir>..\bin\Publish\classic</PublishDir>
     <PublishProtocol>FileSystem</PublishProtocol>
-    <TargetFramework>net6.0-windows</TargetFramework>
+    <TargetFramework>net7.0-windows</TargetFramework>
     <RuntimeIdentifier>win-x64</RuntimeIdentifier>
     <SelfContained>true</SelfContained>
     <PublishSingleFile>false</PublishSingleFile>

Source/LibationAvalonia/App.axaml

@@ -8,9 +8,9 @@
 	</Application.DataTemplates>
 	
     <Application.Styles>
-        <FluentTheme Mode="Light"/>
-		<StyleInclude Source="avares://Avalonia.Themes.Default/DefaultTheme.xaml"/>
-		<StyleInclude Source="avares://Avalonia.Themes.Default/Accents/BaseLight.xaml"/>
+		<FluentTheme Mode="Light"/>
+		<StyleInclude Source="avares://Avalonia.Themes.Fluent/FluentLight.xaml"/>
+		<StyleInclude Source="avares://Avalonia.Themes.Fluent/Accents/BaseLight.xaml"/>
 		<StyleInclude Source="/Assets/DataGridTheme.xaml"/>
 		<StyleInclude Source="/Assets/LibationStyles.xaml"/>
 	</Application.Styles>

Source/LibationAvalonia/App.axaml.cs

@@ -42,9 +42,6 @@ namespace LibationAvalonia
 		{
 			LoadStyles();
 
-			var SEGOEUI = new Typeface(new FontFamily(new Uri("avares://Libation/Assets/WINGDING.TTF"), "SEGOEUI_Local"));
-			var gtf = FontManager.Current.GetOrAddGlyphTypeface(SEGOEUI);
-
 			if (ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop)
 			{
 				if (SetupRequired)
@@ -134,8 +131,6 @@ namespace LibationAvalonia
 		{
 			config.Books ??= Path.Combine(Configuration.UserProfile, "Books");
 
-			AppScaffolding.LibationScaffolding.PopulateMissingConfigValues(config);
-
 			var settingsDialog = new SettingsDialog();
 			desktop.MainWindow = settingsDialog;
 			settingsDialog.RestoreSizeAndLocation(Configuration.Instance);

Source/LibationAvalonia/Assets/LibationStyles.xaml

@@ -1,12 +1,16 @@
 <Styles xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
 	<Styles.Resources>
-		<Color x:Key="SeriesEntryGridBackgroundColor">#FFE6FFE6</Color>
+		<Color x:Key="SeriesEntryGridBackgroundColor">#cdffcd</Color>
 
-		<SolidColorBrush x:Key="SeriesEntryGridBackgroundBrush"  Color="{StaticResource SeriesEntryGridBackgroundColor}" />
+		<SolidColorBrush x:Key="SeriesEntryGridBackgroundBrush" Opacity="0.5" Color="{StaticResource SeriesEntryGridBackgroundColor}" />
 		<SolidColorBrush x:Key="ProcessQueueBookFailedBrush" Color="LightCoral" />
 		<SolidColorBrush x:Key="ProcessQueueBookCompletedBrush" Color="PaleGreen" />
 		<SolidColorBrush x:Key="ProcessQueueBookCancelledBrush" Color="Khaki" />
 		<SolidColorBrush x:Key="ProcessQueueBookDefaultBrush" Color="{StaticResource SystemAltHighColor}" />
 		<SolidColorBrush x:Key="ProcessQueueBookBorderBrush" Color="Gray" />
 	</Styles.Resources>
+	<Style Selector="TextBox[IsReadOnly=true]">
+		<Setter Property="Background" Value="LightGray" />
+		<Setter Property="CaretBrush" Value="#00000000" />
+	</Style>
 </Styles>

Source/LibationAvalonia/AvaloniaUtils.cs

@@ -1,4 +1,5 @@
-using Avalonia.Media;
+using Avalonia.Controls;
+using Avalonia.Media;
 using Avalonia.Threading;
 using System;
 using System.Threading;
@@ -16,5 +17,7 @@ namespace LibationAvalonia
 				return brush;
 			return defaultBrush;
 		}
+
+		public static Window GetParentWindow(this IControl control) => control.VisualRoot as Window;
 	}
 }

Source/LibationAvalonia/Controls/DataGridCheckBoxColumnExt.axaml

@@ -1,5 +0,0 @@
-<DataGridCheckBoxColumn xmlns="https://github.com/avaloniaui"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        x:Class="LibationAvalonia.Controls.DataGridCheckBoxColumnExt">
-
-</DataGridCheckBoxColumn >