incr ver

Bump actions/configure-pages from 4 to 5

.cdmurls.json

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

.github/ISSUE_TEMPLATE/bug_report.md

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

.github/ISSUE_TEMPLATE/feature_request.md

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

.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,83 @@
+# build-linux.yml
+# Reusable workflow that builds the Linux and MacOS (x64 and arm64) versions of Libation.
+---
+name: build
+
+on:
+  workflow_call:
+    inputs:
+      libation-version:
+        type: string
+        required: true
+      dotnet-version:
+        type: string
+        required: true
+      run-unit-tests:
+        type: boolean
+      publish-r2r:
+        type: boolean
+      retention-days:
+        type: number
+      architecture:
+        type: string
+        description: "CPU architecture targeted by the build."
+        required: true
+      OS:
+        type: string
+        description: >
+          The operating system targeted by the build.
+          
+          There must be a corresponding Bundle_$OS.sh script file in ./Scripts
+        required: true
+
+jobs:
+  build:
+    name: "${{ inputs.OS }}-${{ inputs.architecture }}"
+    runs-on: ubuntu-latest
+    env:
+      RUNTIME_ID: "linux-${{ inputs.architecture }}"
+    steps:
+      - uses: actions/checkout@v6
+      
+      - uses: actions/setup-dotnet@v5
+        with:
+          dotnet-version: ${{ inputs.dotnet-version }}
+          dotnet-quality: "ga"
+
+      - name: Unit test
+        if: ${{ inputs.run-unit-tests }}
+        working-directory: ./Source
+        run: dotnet test
+
+      - name: Publish
+        id: publish
+        working-directory: ./Source
+        run: |
+          PUBLISH_ARGS=(
+            '--runtime' '${{ env.RUNTIME_ID }}'
+            '--configuration' 'Release'
+            '--output' '../bin'
+            '-p:PublishProtocol=FileSystem'
+            "-p:PublishReadyToRun=${{ inputs.publish-r2r }}"
+            '-p:SelfContained=true')
+            
+          dotnet publish LibationAvalonia/LibationAvalonia.csproj "${PUBLISH_ARGS[@]}"
+          dotnet publish LoadByOS/LinuxConfigApp/LinuxConfigApp.csproj "${PUBLISH_ARGS[@]}"
+          dotnet publish LibationCli/LibationCli.csproj "${PUBLISH_ARGS[@]}"
+          dotnet publish HangoverAvalonia/HangoverAvalonia.csproj "${PUBLISH_ARGS[@]}"
+
+      - name: Build bundle
+        id: bundle
+        run: |
+          SCRIPT=./Scripts/Bundle_${{ inputs.OS }}.sh
+          chmod +rx ${SCRIPT}
+          ${SCRIPT} ./bin "${{ inputs.libation-version }}" "${{ inputs.architecture }}"
+          artifact=$(ls ./bundle)
+          echo "artifact=${artifact}" >> "${GITHUB_OUTPUT}"
+
+      - uses: actions/upload-artifact@v6
+        with:
+          name: ${{ steps.bundle.outputs.artifact }}
+          path: ./bundle/${{ steps.bundle.outputs.artifact }}
+          if-no-files-found: error
+          retention-days: ${{ inputs.retention-days }}

.github/workflows/build-mac.yml

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

.github/workflows/build-windows.yml

@@ -0,0 +1,87 @@
+# build-windows.yml
+# Reusable workflow that builds the Windows versions of Libation.
+---
+name: build
+
+on:
+  workflow_call:
+    inputs:
+      libation-version:
+        type: string
+        required: true
+      dotnet-version:
+        type: string
+        required: true
+      run-unit-tests:
+        type: boolean
+      publish-r2r:
+        type: boolean
+      retention-days:
+        type: number
+
+jobs:
+  build:
+    name: "Windows-${{ matrix.release_name }}-${{ matrix.architecture }} (${{ matrix.ui }})"
+    runs-on: windows-latest
+    strategy:
+      matrix:
+        ui: [Avalonia]
+        architecture: [x64]
+        release_name: [chardonnay]
+        include:
+          - architecture: x64
+            ui: WinForms
+            release_name: classic
+            prefix: Classic-
+          - architecture: arm64
+            ui: Avalonia
+            release_name: chardonnay
+    steps:
+      - uses: actions/checkout@v6
+      
+      - uses: actions/setup-dotnet@v5
+        with:
+          dotnet-version: ${{ inputs.dotnet-version }}
+          dotnet-quality: "ga"
+
+      - name: Unit test
+        if: ${{ inputs.run-unit-tests }}
+        working-directory: ./Source
+        run: dotnet test
+        
+      - name: Publish
+        working-directory: ./Source
+        run: |
+          $PUBLISH_ARGS=@(
+            "--runtime", "win-${{ matrix.architecture }}",
+            "--configuration", "Release",
+            "--output", "../bin",
+            "-p:PublishProtocol=FileSystem",
+            "-p:PublishReadyToRun=${{ inputs.publish-r2r }}",
+            "-p:SelfContained=true")            
+          
+          dotnet publish "Libation${{ matrix.ui }}/Libation${{ matrix.ui }}.csproj" $PUBLISH_ARGS
+          dotnet publish "LoadByOS/WindowsConfigApp/WindowsConfigApp.csproj" $PUBLISH_ARGS
+          dotnet publish "LibationCli/LibationCli.csproj" $PUBLISH_ARGS
+          dotnet publish "Hangover${{ matrix.ui }}/Hangover${{ matrix.ui }}.csproj" $PUBLISH_ARGS
+
+      - name: Zip artifact
+        id: zip
+        working-directory: ./bin
+        run: |
+          $delfiles = @(
+            "WindowsConfigApp.exe",
+            "WindowsConfigApp.runtimeconfig.json",
+            "WindowsConfigApp.deps.json")
+          
+          foreach ($file in $delfiles){ if (test-path $file){ Remove-Item $file } }
+          $artifact="${{ matrix.prefix }}Libation.${{ inputs.libation-version }}-windows-${{ matrix.release_name }}-${{ matrix.architecture }}.zip"
+          "artifact=$artifact" >> $env:GITHUB_OUTPUT
+          Compress-Archive -Path * -DestinationPath "$artifact"
+
+      - uses: actions/upload-artifact@v6
+        with:
+          name: ${{ steps.zip.outputs.artifact }}
+          path: ./bin/${{ steps.zip.outputs.artifact }}
+          if-no-files-found: error
+          retention-days: ${{ inputs.retention-days }}

.github/workflows/build.yml

@@ -0,0 +1,69 @@
+# build.yml
+# Reusable workflow that builds Libation for all platforms.
+---
+name: build
+
+on:
+  workflow_call:
+    inputs:
+      libation-version:
+        type: string
+        description: "Libation version number"
+        required: true
+      dotnet-version:
+        type: string
+        default: "10.x"
+        description: ".NET version to target"
+      run-unit-tests:
+        type: boolean
+        description: "Whether to run unit tests prior to publishing."
+      publish-r2r:
+        type: boolean
+        description: "Whether to publish assemblies as ReadyToRun."
+      release:
+        type: boolean
+        description: "Whether this workflow is being called as a release"
+      retention-days:
+        type: number
+        description: "Number of days the artifacts are to be retained."
+
+jobs:    
+  windows:
+    uses: ./.github/workflows/build-windows.yml
+    with:
+      libation-version: ${{ inputs.libation-version }}
+      dotnet-version: ${{ inputs.dotnet-version }}
+      run-unit-tests: ${{ inputs.run-unit-tests }}
+      publish-r2r: ${{ inputs.publish-r2r }}
+      retention-days: ${{ inputs.retention-days }}
+      
+  macOS:
+    strategy:
+      matrix:
+        architecture: [x64, arm64]
+    uses: ./.github/workflows/build-mac.yml
+    with:
+      libation-version: ${{ inputs.libation-version }}
+      dotnet-version: ${{ inputs.dotnet-version }}
+      run-unit-tests: ${{ inputs.run-unit-tests }}
+      publish-r2r: ${{ inputs.publish-r2r }}
+      retention-days: ${{ inputs.retention-days }}
+      architecture: ${{ matrix.architecture }}
+      sign-app: ${{ inputs.release || vars.SIGN_MAC_APP_ON_VALIDATE == 'true' }}
+    secrets: inherit
+
+  linux:
+    strategy:
+      matrix:
+        OS: [Redhat, Debian]
+        architecture: [x64, arm64]
+    uses: ./.github/workflows/build-linux.yml
+    with:
+      libation-version: ${{ inputs.libation-version }}
+      dotnet-version: ${{ inputs.dotnet-version }}
+      run-unit-tests: ${{ inputs.run-unit-tests }}
+      publish-r2r: ${{ inputs.publish-r2r }}
+      retention-days: ${{ inputs.retention-days }}
+      architecture: ${{ matrix.architecture }}
+      OS: ${{ matrix.OS }}
+

.github/workflows/deploy.yml

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

.github/workflows/docker.yml

@@ -0,0 +1,63 @@
+# 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
+      release:
+        type: boolean
+        description: "Is this a release build?"
+        required: true
+    secrets:
+      docker_username:
+        required: true
+      docker_token:
+        required: true
+
+jobs:
+  build_and_push:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v6
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Login to Docker Hub
+        if: ${{ inputs.release }}
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.docker_username }}
+          password: ${{ secrets.docker_token }}
+
+      - name: Generate docker image tags
+        id: metadata
+        uses: docker/metadata-action@v5
+        with:
+          flavor: |
+            latest=true
+          images: |
+            name=${{ secrets.docker_username }}/libation
+          tags: |
+            type=raw,value=${{ inputs.version }},enable=${{ inputs.release }}
+
+      - name: Build and push image
+        uses: docker/build-push-action@v6
+        with:
+          platforms: linux/amd64,linux/arm64
+          push: ${{ steps.metadata.outputs.tags != ''}}
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
+          tags: ${{ steps.metadata.outputs.tags }}
+          labels: ${{ steps.metadata.outputs.labels }}

.github/workflows/release.yml

@@ -0,0 +1,60 @@
+# 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-slim
+    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 }}
+      release: true
+    secrets:
+      docker_username: ${{ secrets.DOCKERHUB_USERNAME }}
+      docker_token: ${{ secrets.DOCKERHUB_TOKEN }}
+
+  build:
+    needs: [prerelease]
+    uses: ./.github/workflows/build.yml
+    secrets: inherit
+    with:
+      libation-version: ${{ needs.prerelease.outputs.version }}
+      publish-r2r: true
+      release: true
+
+  release:
+    needs: [prerelease, build]
+    runs-on: ubuntu-latest
+    steps:
+      - name: Download artifacts
+        uses: actions/download-artifact@v7
+        with:
+          path: artifacts
+          pattern: "*(Classic-)Libation.*"
+
+      - name: Release
+        id: release
+        uses: softprops/action-gh-release@v2
+        with:
+          name: Libation ${{ needs.prerelease.outputs.version }}
+          body: <Put a body here>
+          token: ${{ secrets.GITHUB_TOKEN }}
+          draft: true
+          prerelease: false
+          files: |
+            artifacts/*/*

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

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

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

@@ -0,0 +1,21 @@
+name: Check desktop file
+"on":
+  pull_request:
+    branches: ["master"]
+    paths:
+      - .github/workflows/validate-desktop-file.yml
+      - Source/LoadByOS/LinuxConfigApp/Libation.desktop
+  push:
+    branches: ["master"]
+    paths:
+      - .github/workflows/validate-desktop-file.yml
+      - Source/LoadByOS/LinuxConfigApp/Libation.desktop
+
+jobs:
+  validate-desktop-file:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v6
+      - run: sudo apt --yes install desktop-file-utils
+      - name: Check the desktop file
+        run: desktop-file-validate Source/LoadByOS/LinuxConfigApp/Libation.desktop

.github/workflows/validate.yml

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

.gitignore

@@ -4,6 +4,7 @@
 ## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore
 
 # User-specific files
+*.rsuser
 *.suo
 *.user
 *.userosscache
@@ -12,6 +13,9 @@
 # User-specific files (MonoDevelop/Xamarin Studio)
 *.userprefs
 
+# Mono auto generated files
+mono_crash.*
+
 # Build results
 [Dd]ebug/
 [Dd]ebugPublic/
@@ -19,10 +23,15 @@
 [Rr]eleases/
 x64/
 x86/
+[Ww][Ii][Nn]32/
+[Aa][Rr][Mm]/
+[Aa][Rr][Mm]64/
 bld/
 [Bb]in/
 [Oo]bj/
+[Oo]ut/
 [Ll]og/
+[Ll]ogs/
 
 # Visual Studio 2015/2017 cache/options directory
 .vs/
@@ -36,9 +45,10 @@ Generated\ Files/
 [Tt]est[Rr]esult*/
 [Bb]uild[Ll]og.*
 
-# NUNIT
+# NUnit
 *.VisualState.xml
 TestResult.xml
+nunit-*.xml
 
 # Build Results of an ATL Project
 [Dd]ebugPS/
@@ -52,7 +62,9 @@ BenchmarkDotNet.Artifacts/
 project.lock.json
 project.fragment.lock.json
 artifacts/
-**/Properties/launchSettings.json
+
+# ASP.NET Scaffolding
+ScaffoldingReadMe.txt
 
 # StyleCop
 StyleCopReport.xml
@@ -60,7 +72,7 @@ StyleCopReport.xml
 # Files built by Visual Studio
 *_i.c
 *_p.c
-*_i.h
+*_h.h
 *.ilk
 *.meta
 *.obj
@@ -77,6 +89,7 @@ StyleCopReport.xml
 *.tlh
 *.tmp
 *.tmp_proj
+*_wpftmp.csproj
 *.log
 *.vspscc
 *.vssscc
@@ -119,9 +132,6 @@ _ReSharper*/
 *.[Rr]e[Ss]harper
 *.DotSettings.user
 
-# JustCode is a .NET coding add-in
-.JustCode
-
 # TeamCity is a build add-in
 _TeamCity*
 
@@ -132,6 +142,11 @@ _TeamCity*
 .axoCover/*
 !.axoCover/settings.json
 
+# Coverlet is a free, cross platform Code Coverage Tool
+coverage*.json
+coverage*.xml
+coverage*.info
+
 # Visual Studio code coverage results
 *.coverage
 *.coveragexml
@@ -169,7 +184,7 @@ publish/
 *.azurePubxml
 # Note: Comment the next line if you want to checkin your web deploy settings,
 # but database connection strings (with potential passwords) will be unencrypted
-*.pubxml
+#*.pubxml
 *.publishproj
 
 # Microsoft Azure Web App publish settings. Comment the next line if you want to
@@ -179,6 +194,8 @@ PublishScripts/
 
 # NuGet Packages
 *.nupkg
+# NuGet Symbol Packages
+*.snupkg
 # The packages folder can be ignored because of Package Restore
 **/[Pp]ackages/*
 # except build/, which is used as an MSBuild target.
@@ -203,12 +220,14 @@ BundleArtifacts/
 Package.StoreAssociation.xml
 _pkginfo.txt
 *.appx
+*.appxbundle
+*.appxupload
 
 # Visual Studio cache files
 # files ending in .cache can be ignored
 *.[Cc]ache
 # but keep track of directories ending in .cache
-!*.[Cc]ache/
+!?*.[Cc]ache/
 
 # Others
 ClientBin/
@@ -221,7 +240,7 @@ ClientBin/
 *.publishsettings
 orleans.codegen.cs
 
-# Including strong name files can present a security risk 
+# Including strong name files can present a security risk
 # (https://github.com/github/gitignore/pull/2483#issue-259490424)
 #*.snk
 
@@ -252,6 +271,9 @@ ServiceFabricBackup/
 *.bim.layout
 *.bim_*.settings
 *.rptproj.rsuser
+*- [Bb]ackup.rdl
+*- [Bb]ackup ([0-9]).rdl
+*- [Bb]ackup ([0-9][0-9]).rdl
 
 # Microsoft Fakes
 FakesAssemblies/
@@ -287,12 +309,8 @@ paket-files/
 # FAKE - F# Make
 .fake/
 
-# JetBrains Rider
-.idea/
-*.sln.iml
-
-# CodeRush
-.cr/
+# CodeRush personal settings
+.cr/personal
 
 # Python Tools for Visual Studio (PTVS)
 __pycache__/
@@ -317,7 +335,7 @@ __pycache__/
 # OpenCover UI analysis results
 OpenCover/
 
-# Azure Stream Analytics local run output 
+# Azure Stream Analytics local run output
 ASALocalRun/
 
 # MSBuild Binary and Structured Log
@@ -326,10 +344,41 @@ ASALocalRun/
 # NVidia Nsight GPU debugger configuration file
 *.nvuser
 
-# MFractors (Xamarin productivity tool) working folder 
+# MFractors (Xamarin productivity tool) working folder
 .mfractor/
 
+# Local History for Visual Studio
+.localhistory/
+
+# BeatPulse healthcheck temp database
+healthchecksdb
+
+# Backup folder for Package Reference Convert tool in Visual Studio 2017
+MigrationBackup/
+
+# Ionide (cross platform F# VS Code tools) working folder
+.ionide/
+
+# Fody - auto-generated XML schema
+FodyWeavers.xsd
+
+
+### manually ignored files
+
+# Windows shortcuts
+*.lnk
 
-# manually ignored files
 /__TODO.txt
 /DataLayer/LibationContext.db
+*/bin-Avalonia
+
+# macOS Directory Info
+.DS_Store
+
+# JetBrains Rider Settings
+**/.idea/
+
+# VitePress
+node_modules
+.vitepress/cache
+.vitepress/dist   

.releaseindex.json

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

.vitepress/config.js

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

.vitepress/theme/custom.css

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

.vitepress/theme/index.js

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

.vscode/launch.json

@@ -0,0 +1,32 @@
+{
+    // Use IntelliSense to learn about possible attributes.
+    // Hover to view descriptions of existing attributes.
+    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [
+
+        {
+            "name": ".NET Core Launch (console) Windows",
+            "type": "coreclr",
+            "request": "launch",
+            "preLaunchTask": "build",
+            "program": "${workspaceFolder}/Source/bin/Avalonia/Debug/Libation.dll",
+            "args": [],
+            "cwd": "${workspaceFolder}",
+            "stopAtEntry": false,
+            "console": "internalConsole"
+        },
+        {
+            "name": ".NET Core Launch (console) Linux",
+            "type": "coreclr",
+            "request": "launch",
+            "preLaunchTask": "build_linux",
+            "program": "${workspaceFolder}/Source/bin/Avalonia/Debug/Libation.dll",
+            "args": [],
+            "cwd": "${workspaceFolder}",
+            "stopAtEntry": false,
+            "console": "internalConsole"
+        }
+
+    ]
+}

.vscode/tasks.json

@@ -0,0 +1,59 @@
+{
+    // See https://go.microsoft.com/fwlink/?LinkId=733558
+    // for the documentation about the tasks.json format
+    "version": "2.0.0",
+    "tasks": [
+        {
+            "label": "build",
+            "dependsOn": [
+                "build_libation",
+                "build_linuxconfigapp"
+            ]
+        },
+        {
+            "label": "build_libation",
+            "type": "shell",
+            "command": "dotnet",
+            "args": [
+                "build",
+                "${workspaceFolder}/Source/LibationAvalonia/LibationAvalonia.csproj"
+            ],
+            "group": "build",
+            "presentation": {
+                //"reveal": "silent"
+            },
+            "problemMatcher": "$msCompile"
+        },
+        {
+            "label": "build_linuxconfigapp",
+            "type": "shell",
+            "command": "dotnet",
+            "args": [
+                "build",
+                "${workspaceFolder}/Source/LoadByOS/LinuxConfigApp/LinuxConfigApp.csproj"
+            ],
+            "group": "build",
+            "presentation": {
+                //"reveal": "silent"
+            },
+            "problemMatcher": "$msCompile"
+        },
+        {
+           "label": "build_linux",
+            "type": "shell",
+            "command": "dotnet",
+            "args": [
+                "build",
+                "${workspaceFolder}/Source/LibationAvalonia/LibationAvalonia.csproj",
+                "-p:TargetFramework=net9.0",
+                "-p:TargetFrameworks=net9.0",
+                "-p:RuntimeIdentifier=linux-x64"
+            ],
+            "group": "build",
+            "presentation": {
+                //"reveal": "silent"
+            },
+            "problemMatcher": "$msCompile"
+        }
+    ]
+}

AaxDecrypter/AAXChapters.cs

@@ -1,40 +0,0 @@
-using System.Diagnostics;
-using System.Globalization;
-using System.Linq;
-using Dinah.Core.Diagnostics;
-
-namespace AaxDecrypter
-{
-    public class AAXChapters : Chapters
-    {
-        public AAXChapters(string file)
-        {
-            var info = new ProcessStartInfo
-            {
-                FileName = DecryptSupportLibraries.ffprobePath,
-                Arguments = "-loglevel panic -show_chapters -print_format xml \"" + file + "\""
-            };
-            var xml = info.RunHidden().Output;
-
-            var xmlDocument = new System.Xml.XmlDocument();
-            xmlDocument.LoadXml(xml);
-            var chaptersXml = xmlDocument.SelectNodes("/ffprobe/chapters/chapter")
-                .Cast<System.Xml.XmlNode>()
-                .Where(n => n.Name == "chapter");
-
-            foreach (var cnode in chaptersXml)
-            {
-                double startTime = double.Parse(cnode.Attributes["start_time"].Value.Replace(",", "."), CultureInfo.InvariantCulture);
-                double endTime = double.Parse(cnode.Attributes["end_time"].Value.Replace(",", "."), CultureInfo.InvariantCulture);
-
-                string chapterTitle = cnode.ChildNodes
-                    .Cast<System.Xml.XmlNode>()
-                    .Where(childnode => childnode.Attributes["key"].Value == "title")
-                    .Select(childnode => childnode.Attributes["value"].Value)
-                    .FirstOrDefault();
-
-                AddChapter(new Chapter(startTime, endTime, chapterTitle));
-            }
-        }
-    }
-}

AaxDecrypter/AaxDecrypter.csproj

@@ -1,77 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <Reference Include="taglib-sharp">
-      <HintPath>lib\taglib-sharp.dll</HintPath>
-    </Reference>
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\..\Dinah.Core\Dinah.Core\Dinah.Core.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <None Update="DecryptLib\AtomicParsley.exe">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Update="DecryptLib\avcodec-57.dll">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Update="DecryptLib\avdevice-57.dll">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Update="DecryptLib\avfilter-6.dll">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Update="DecryptLib\avformat-57.dll">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Update="DecryptLib\avutil-55.dll">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Update="DecryptLib\cygcrypto-1.0.0.dll">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Update="DecryptLib\cyggcc_s-1.dll">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Update="DecryptLib\cygmp4v2-2.dll">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Update="DecryptLib\cygstdc++-6.dll">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Update="DecryptLib\cygwin1.dll">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Update="DecryptLib\cygz.dll">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Update="DecryptLib\ffmpeg.exe">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Update="DecryptLib\ffprobe.exe">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Update="DecryptLib\mp4trackdump.exe">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Update="DecryptLib\postproc-54.dll">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Update="DecryptLib\swresample-2.dll">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Update="DecryptLib\swscale-4.dll">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Update="DecryptLib\taglib-sharp.dll">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-  </ItemGroup>
-
-</Project>

AaxDecrypter/AaxToM4bConverter.cs

@@ -1,339 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Globalization;
-using System.IO;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-using Dinah.Core;
-using Dinah.Core.Diagnostics;
-using Dinah.Core.IO;
-using Dinah.Core.StepRunner;
-
-namespace AaxDecrypter
-{
-    public interface ISimpleAaxToM4bConverter
-    {
-        event EventHandler<int> DecryptProgressUpdate;
-
-        bool Run();
-
-        string AppName { get; set; }
-        string inputFileName { get; }
-        byte[] coverBytes { get;  }
-        string outDir { get; }
-        string outputFileName { get; }
-
-        Chapters chapters { get; }
-        Tags tags { get; }
-        EncodingInfo encodingInfo { get; }
-
-        void SetOutputFilename(string outFileName);
-    }
-    public interface IAdvancedAaxToM4bConverter : ISimpleAaxToM4bConverter
-    {
-        bool Step1_CreateDir();
-        bool Step2_DecryptAax();
-        bool Step3_Chapterize();
-        bool Step4_InsertCoverArt();
-        bool Step5_Cleanup();
-        bool Step6_AddTags();
-        bool End_CreateCue();
-        bool End_CreateNfo();
-    }
-    /// <summary>full c# app. integrated logging. no UI</summary>
-    public class AaxToM4bConverter : IAdvancedAaxToM4bConverter
-    {
-        public event EventHandler<int> DecryptProgressUpdate;
-
-        public string inputFileName { get; }
-        public string decryptKey { get; private set; }
-
-        private StepSequence steps { get; }
-        public byte[] coverBytes { get; private set; }
-
-        public string AppName { get; set; } = nameof(AaxToM4bConverter);
-
-        public string outDir { get; private set; }
-        public string outputFileName { get; private set; }
-
-        public Chapters chapters { get; private set; }
-        public Tags tags { get; private set; }
-        public EncodingInfo encodingInfo { get; private set; }
-
-        private Func<Task<string>> getKeyFuncAsync { get; }
-
-        public static async Task<AaxToM4bConverter> CreateAsync(string inputFile, string decryptKey, Func<Task<string>> getKeyFunc, Chapters chapters = null)
-        {
-            var converter = new AaxToM4bConverter(inputFile, decryptKey, getKeyFunc);
-            converter.chapters = chapters ?? new AAXChapters(inputFile);
-            await converter.prelimProcessing();
-            converter.printPrelim();
-
-            return converter;
-        }
-        private AaxToM4bConverter(string inputFile, string decryptKey, Func<Task<string>> getKeyFunc)
-        {
-			ArgumentValidator.EnsureNotNullOrWhiteSpace(inputFile, nameof(inputFile));
-            if (!File.Exists(inputFile))
-                throw new ArgumentNullException(nameof(inputFile), "File does not exist");
-
-            steps = new StepSequence
-            {
-                Name = "Convert Aax To M4b",
-
-                ["Step 1: Create Dir"] = Step1_CreateDir,
-                ["Step 2: Decrypt Aax"] = Step2_DecryptAax,
-                ["Step 3: Chapterize and tag"] = Step3_Chapterize,
-                ["Step 4: Insert Cover Art"] = Step4_InsertCoverArt,
-                ["Step 5: Cleanup"] = Step5_Cleanup,
-                ["Step 6: Add Tags"] = Step6_AddTags,
-                ["End: Create Cue"] = End_CreateCue,
-                ["End: Create Nfo"] = End_CreateNfo
-            };
-
-            inputFileName = inputFile;
-            this.decryptKey = decryptKey;
-            this.getKeyFuncAsync = getKeyFunc;
-        }
-
-        private async Task prelimProcessing()
-        {
-            tags = new Tags(inputFileName);
-            encodingInfo = new EncodingInfo(inputFileName);
-
-            var defaultFilename = Path.Combine(
-                Path.GetDirectoryName(inputFileName),
-                PathLib.ToPathSafeString(tags.author),
-                PathLib.ToPathSafeString(tags.title) + ".m4b"
-                );
-
-			// set default name
-			SetOutputFilename(defaultFilename);
-
-            await Task.Run(() => saveCover(inputFileName));
-        }
-
-        private void saveCover(string aaxFile)
-        {
-			using var file = TagLib.File.Create(aaxFile, "audio/mp4", TagLib.ReadStyle.Average);
-			coverBytes = file.Tag.Pictures[0].Data.Data;
-		}
-
-        private void printPrelim()
-        {
-            Console.WriteLine($"Audible Book ID = {tags.id}");
-
-            Console.WriteLine($"Book: {tags.title}");
-            Console.WriteLine($"Author: {tags.author}");
-            Console.WriteLine($"Narrator: {tags.narrator}");
-            Console.WriteLine($"Year: {tags.year}");
-            Console.WriteLine($"Total Time: {tags.duration.GetTotalTimeFormatted()} in {chapters.Count} chapters");
-            Console.WriteLine($"WARNING-Source is {encodingInfo.originalBitrate} kbits @ {encodingInfo.sampleRate}Hz, {encodingInfo.channels} channels");
-        }
-
-        public bool Run()
-        {
-            var (IsSuccess, Elapsed) = steps.Run();
-
-            if (!IsSuccess)
-            {
-                Console.WriteLine("WARNING-Conversion failed");
-                return false;
-            }
-
-            var speedup = (int)(tags.duration.TotalSeconds / (long)Elapsed.TotalSeconds);
-            Console.WriteLine("Speedup is " + speedup + "x realtime.");
-            Console.WriteLine("Done");
-            return true;
-        }
-
-        public void SetOutputFilename(string outFileName)
-        {
-            outputFileName = PathLib.ReplaceExtension(outFileName, ".m4b");
-            outDir = Path.GetDirectoryName(outputFileName);
-
-            if (File.Exists(outputFileName))
-                File.Delete(outputFileName);
-        }
-
-        private string outputFileWithNewExt(string extension) => PathLib.ReplaceExtension(outputFileName, extension);
-
-        public bool Step1_CreateDir()
-        {
-            ProcessRunner.WorkingDir = outDir;
-            Directory.CreateDirectory(outDir);
-            return true;
-        }
-
-        public bool Step2_DecryptAax()
-        {
-            DecryptProgressUpdate?.Invoke(this, 0);
-
-            var tempRipFile = Path.Combine(outDir, "funny.aac");
-
-            var fail = "WARNING-Decrypt failure. ";
-
-            int returnCode;
-            if (string.IsNullOrWhiteSpace(decryptKey))
-            {
-                returnCode = getKey_decrypt(tempRipFile);
-            }
-            else
-            {
-                returnCode = decrypt(tempRipFile);
-                if (returnCode == -99)
-                {
-                    Console.WriteLine($"{fail}Incorrect decrypt key: {decryptKey}");
-                    decryptKey = null;
-                    returnCode = getKey_decrypt(tempRipFile);
-                }
-            }
-
-            if (returnCode == 100)
-                Console.WriteLine($"{fail}Thread completed without changing return code. This shouldn't be possible");
-            else if (returnCode == 0)
-            {
-                // success!
-                FileExt.SafeMove(tempRipFile, outputFileWithNewExt(".mp4"));
-                DecryptProgressUpdate?.Invoke(this, 100);
-                return true;
-            }
-            else if (returnCode == -99)
-                Console.WriteLine($"{fail}Incorrect decrypt key: {decryptKey}");
-            else // any other returnCode
-                Console.WriteLine($"{fail}Unknown failure code: {returnCode}");
-
-            FileExt.SafeDelete(tempRipFile);
-            DecryptProgressUpdate?.Invoke(this, 0);
-            return false;
-        }
-
-        private int getKey_decrypt(string tempRipFile)
-        {
-            decryptKey = getKey();
-            return decrypt(tempRipFile);
-        }
-
-        // I am NOT happy about doing async this way. Async needs to be added to Step framework
-        string getKey() => getKeyFuncAsync().GetAwaiter().GetResult();
-
-        private int decrypt(string tempRipFile)
-        {
-            FileExt.SafeDelete(tempRipFile);
-
-            Console.WriteLine("Decrypting with key " + decryptKey);
-
-            var returnCode = 100;
-            var thread = new Thread(() => returnCode = ngDecrypt());
-            thread.Start();
-
-            double fileLen = new FileInfo(inputFileName).Length;
-            while (thread.IsAlive && returnCode == 100)
-            {
-                Thread.Sleep(500);
-                if (File.Exists(tempRipFile))
-                {
-                    double tempLen = new FileInfo(tempRipFile).Length;
-                    var percentProgress = tempLen / fileLen * 100.0;
-                    DecryptProgressUpdate?.Invoke(this, (int)percentProgress);
-                }
-            }
-
-            return returnCode;
-        }
-
-        private int ngDecrypt()
-        {
-            var info = new ProcessStartInfo
-            {
-                FileName = DecryptSupportLibraries.mp4trackdumpPath,
-                Arguments = "-c " + encodingInfo.channels + " -r " + encodingInfo.sampleRate + " \"" + inputFileName + "\""
-            };
-            info.EnvironmentVariables["VARIABLE"] = decryptKey;
-
-            var result = info.RunHidden();
-
-            // bad checksum -- bad decrypt key
-            if (result.Output.Contains("checksums mismatch, aborting!"))
-                return -99;
-
-            return result.ExitCode;
-        }
-
-		// temp file names for steps 3, 4, 5
-        string tempChapsGuid { get; } = Guid.NewGuid().ToString().ToUpper().Replace("-", "");
-        string tempChapsPath => Path.Combine(outDir, $"tempChaps_{tempChapsGuid}.mp4");
-        string mp4_file => outputFileWithNewExt(".mp4");
-        string ff_txt_file => mp4_file + ".ff.txt";
-
-        public bool Step3_Chapterize()
-        {
-            var str1 = "";
-            if (chapters.FirstChapter.StartTime != 0.0)
-            {
-                str1 = " -ss " + chapters.FirstChapter.StartTime.ToString("0.000", CultureInfo.InvariantCulture) + " -t " + chapters.LastChapter.EndTime.ToString("0.000", CultureInfo.InvariantCulture) + " ";
-            }
-
-            var ffmpegTags = tags.GenerateFfmpegTags();
-            var ffmpegChapters = chapters.GenerateFfmpegChapters();
-            File.WriteAllText(ff_txt_file, ffmpegTags + ffmpegChapters);
-
-            var tagAndChapterInfo = new ProcessStartInfo
-            {
-                FileName = DecryptSupportLibraries.ffmpegPath,
-                Arguments = "-y -i \"" + mp4_file + "\" -f ffmetadata -i \"" + ff_txt_file + "\" -map_metadata 1  -bsf:a aac_adtstoasc -c:a copy" + str1 + " -map 0 \"" + tempChapsPath + "\""
-            };
-            tagAndChapterInfo.RunHidden();
-
-            return true;
-        }
-
-        public bool Step4_InsertCoverArt()
-        {
-            // save cover image as temp file
-            var coverPath = Path.Combine(outDir, "cover-" + Guid.NewGuid() + ".jpg");
-            FileExt.CreateFile(coverPath, coverBytes);
-
-            var insertCoverArtInfo = new ProcessStartInfo
-            {
-                FileName = DecryptSupportLibraries.atomicParsleyPath,
-                Arguments = "\"" + tempChapsPath + "\" --encodingTool \"" + AppName + "\" --artwork \"" + coverPath + "\" --overWrite"
-            };
-            insertCoverArtInfo.RunHidden();
-
-            // delete temp file
-            FileExt.SafeDelete(coverPath);
-
-            return true;
-        }
-
-        public bool Step5_Cleanup()
-        {
-            FileExt.SafeDelete(mp4_file);
-            FileExt.SafeDelete(ff_txt_file);
-            FileExt.SafeMove(tempChapsPath, outputFileName);
-
-            return true;
-        }
-
-        public bool Step6_AddTags()
-        {
-            tags.AddAppleTags(outputFileName);
-            return true;
-        }
-
-        public bool End_CreateCue()
-        {
-            File.WriteAllText(outputFileWithNewExt(".cue"), Cue.CreateContents(Path.GetFileName(outputFileName), chapters));
-            return true;
-        }
-
-        public bool End_CreateNfo()
-        {
-            File.WriteAllText(outputFileWithNewExt(".nfo"), NFO.CreateContents(AppName, tags, encodingInfo, chapters));
-            return true;
-        }
-    }
-}

AaxDecrypter/Chapter.cs

@@ -1,27 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace AaxDecrypter
-{
-    public class Chapter
-    {
-        public Chapter(double startTime, double endTime, string title)
-        {
-            StartTime = startTime;
-            EndTime = endTime;
-            Title = title;
-        }
-        /// <summary>
-        /// Chapter start time, in seconds.
-        /// </summary>
-        public double StartTime { get; private set; }
-        /// <summary>
-        /// Chapter end time, in seconds.
-        /// </summary>
-        public double EndTime { get; private set; }
-        public string Title { get; private set; }
-    }
-}

AaxDecrypter/Chapters.cs

@@ -1,40 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace AaxDecrypter
-{
-    public abstract class Chapters
-    {
-        private List<Chapter> _chapterList = new();
-        public int Count => _chapterList.Count;
-        public Chapter FirstChapter => _chapterList[0];
-        public Chapter LastChapter => _chapterList[Count - 1];
-        public IEnumerable<Chapter> ChapterList => _chapterList.AsEnumerable();
-        public IEnumerable<TimeSpan> GetBeginningTimes() => ChapterList.Select(c => TimeSpan.FromSeconds(c.StartTime));
-        protected void AddChapter(Chapter chapter)
-        {
-            _chapterList.Add(chapter);
-        }
-        protected void AddChapters(IEnumerable<Chapter> chapters)
-        {
-            _chapterList.AddRange(chapters);
-        }
-        public string GenerateFfmpegChapters()
-        {
-            var stringBuilder = new StringBuilder();
-
-            foreach (Chapter c in ChapterList)
-            {
-                stringBuilder.Append("[CHAPTER]\n");
-                stringBuilder.Append("TIMEBASE=1/1000\n");
-                stringBuilder.Append("START=" + c.StartTime * 1000 + "\n");
-                stringBuilder.Append("END=" + c.EndTime * 1000 + "\n");
-                stringBuilder.Append("title=" + c.Title + "\n");
-            }
-
-            return stringBuilder.ToString();
-        }
-    }
-}

AaxDecrypter/DecryptSupportLibraries.cs

@@ -1,21 +0,0 @@
-using System.IO;
-
-namespace AaxDecrypter
-{
-    public static class DecryptSupportLibraries
-    {
-        // OTHER EXTERNAL DEPENDENCIES
-        // ffprobe has these pre-req.s as I'm using it:
-        // avcodec-57.dll, avdevice-57.dll, avfilter-6.dll, avformat-57.dll, avutil-55.dll, postproc-54.dll, swresample-2.dll, swscale-4.dll, taglib-sharp.dll
-        //
-        // something else needs the cygwin files (cyg*.dll)
-
-        private static string appPath_ { get; } = Path.GetDirectoryName(Dinah.Core.Exe.FileLocationOnDisk);
-        private static string decryptLib_ { get; } = Path.Combine(appPath_, "DecryptLib");
-
-        public static string ffmpegPath { get; } = Path.Combine(decryptLib_, "ffmpeg.exe");
-        public static string ffprobePath { get; } = Path.Combine(decryptLib_, "ffprobe.exe");
-        public static string atomicParsleyPath { get; } = Path.Combine(decryptLib_, "AtomicParsley.exe");
-        public static string mp4trackdumpPath { get; } = Path.Combine(decryptLib_, "mp4trackdump.exe");
-    }
-}

AaxDecrypter/EncodingInfo.cs

@@ -1,41 +0,0 @@
-using System;
-using System.Diagnostics;
-using Dinah.Core.Diagnostics;
-
-namespace AaxDecrypter
-{
-    public class EncodingInfo
-    {
-        public int sampleRate { get; } = 44100;
-        public int channels { get; } = 2;
-        public int originalBitrate { get; }
-
-        public EncodingInfo(string file)
-        {
-            var info = new ProcessStartInfo
-            {
-                FileName = DecryptSupportLibraries.ffprobePath,
-                Arguments = "-loglevel panic -show_streams -print_format flat \"" + file + "\""
-            };
-            var end = info.RunHidden().Output;
-
-            foreach (string str2 in end.Split('\n'))
-            {
-                string[] strArray = str2.Split('=');
-                switch (strArray[0])
-                {
-                    case "streams.stream.0.channels":
-                        this.channels = int.Parse(strArray[1].Replace("\"", "").TrimEnd('\r', '\n'));
-                        break;
-                    case "streams.stream.0.sample_rate":
-                        this.sampleRate = int.Parse(strArray[1].Replace("\"", "").TrimEnd('\r', '\n'));
-                        break;
-                    case "streams.stream.0.bit_rate":
-                        string s = strArray[1].Replace("\"", "").TrimEnd('\r', '\n');
-                        this.originalBitrate = (int)Math.Round(double.Parse(s) / 1000.0, MidpointRounding.AwayFromZero);
-                        break;
-                }
-            }
-        }
-    }
-}

AaxDecrypter/NFO.cs

@@ -1,54 +0,0 @@
-namespace AaxDecrypter
-{
-    public static class NFO
-    {
-        public static string CreateContents(string ripper, Tags tags, EncodingInfo encodingInfo, Chapters chapters)
-        {
-            var _hours = (int)tags.duration.TotalHours;
-            var myDuration
-                = (_hours > 0 ? _hours + " hours, " : "")
-                + tags.duration.Minutes + " minutes, "
-                + tags.duration.Seconds + " seconds";
-
-            var header
-                = "General Information\r\n"
-                + "===================\r\n"
-                + $" Title:                  {tags.title}\r\n"
-                + $" Author:                 {tags.author}\r\n"
-                + $" Read By:                {tags.narrator}\r\n"
-                + $" Copyright:              {tags.year}\r\n"
-                + $" Audiobook Copyright:    {tags.year}\r\n";
-            if (tags.genre != "")
-                header += $" Genre:                  {tags.genre}\r\n";
-
-            var s
-                = header
-                + $" Publisher:              {tags.publisher}\r\n"
-                + $" Duration:               {myDuration}\r\n"
-                + $" Chapters:               {chapters.Count}\r\n"
-                + "\r\n"
-                + "\r\n"
-                + "Media Information\r\n"
-                + "=================\r\n"
-                + " Source Format:          Audible AAX\r\n"
-                + $" Source Sample Rate:     {encodingInfo.sampleRate} Hz\r\n"
-                + $" Source Channels:        {encodingInfo.channels}\r\n"
-                + $" Source Bitrate:         {encodingInfo.originalBitrate} kbits\r\n"
-                + "\r\n"
-                + " Lossless Encode:        Yes\r\n"
-                + " Encoded Codec:          AAC / M4B\r\n"
-                + $" Encoded Sample Rate:    {encodingInfo.sampleRate} Hz\r\n"
-                + $" Encoded Channels:       {encodingInfo.channels}\r\n"
-                + $" Encoded Bitrate:        {encodingInfo.originalBitrate} kbits\r\n"
-                + "\r\n"
-                + $" Ripper:                 {ripper}\r\n"
-                + "\r\n"
-                + "\r\n"
-                + "Book Description\r\n"
-                + "================\r\n"
-                + tags.comments;
-
-            return s;
-        }
-    }
-}

AaxDecrypter/Tags.cs

@@ -1,67 +0,0 @@
-using System;
-using TagLib;
-using TagLib.Mpeg4;
-using Dinah.Core;
-
-namespace AaxDecrypter
-{
-    public class Tags
-    {
-        public string title { get; }
-        public string album { get; }
-        public string author { get; }
-        public string comments { get; }
-        public string narrator { get; }
-        public string year { get; }
-        public string publisher { get; }
-        public string id { get; }
-        public string genre { get; }
-        public TimeSpan duration { get; }
-
-        // input file
-        public Tags(string file)
-        {
-            using var tagLibFile = TagLib.File.Create(file, "audio/mp4", ReadStyle.Average);
-			title = tagLibFile.Tag.Title.Replace(" (Unabridged)", "");
-			album = tagLibFile.Tag.Album.Replace(" (Unabridged)", "");
-			author = tagLibFile.Tag.FirstPerformer ?? "[unknown]";
-			year = tagLibFile.Tag.Year.ToString();
-			comments = tagLibFile.Tag.Comment ?? "";
-			duration = tagLibFile.Properties.Duration;
-			genre = tagLibFile.Tag.FirstGenre ?? "";
-
-            var tag = tagLibFile.GetTag(TagTypes.Apple, true);
-			publisher = tag.Publisher ?? "";
-			narrator = string.IsNullOrWhiteSpace(tagLibFile.Tag.FirstComposer) ? tag.Narrator : tagLibFile.Tag.FirstComposer;
-			comments = !string.IsNullOrWhiteSpace(tag.LongDescription) ? tag.LongDescription : tag.Description;
-			id = tag.AudibleCDEK;
-		}
-
-        // my best guess of what this step is doing:
-        // re-publish the data we read from the input file => output file
-        public void AddAppleTags(string file)
-        {
-            using var tagLibFile = TagLib.File.Create(file, "audio/mp4", ReadStyle.Average);
-            var tag = (AppleTag)tagLibFile.GetTag(TagTypes.Apple, true);
-			tag.Publisher = publisher;
-			tag.LongDescription = comments;
-			tag.Description = comments;
-            tagLibFile.Save();
-		}
-
-        public string GenerateFfmpegTags()
-            => $";FFMETADATA1"
-            + $"\nmajor_brand=aax"
-            + $"\nminor_version=1"
-            + $"\ncompatible_brands=aax M4B mp42isom"
-            + $"\ndate={year}"
-            + $"\ngenre={genre}"
-            + $"\ntitle={title}"
-            + $"\nartist={author}"
-            + $"\nalbum={album}"
-            + $"\ncomposer={narrator}"
-            + $"\ncomment={comments.Truncate(254)}"
-            + $"\ndescription={comments}"
-            + $"\n";
-    }
-}

ApplicationServices/ApplicationServices.csproj

@@ -1,20 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="CsvHelper" Version="27.0.2" />
-    <PackageReference Include="NPOI" Version="2.5.3" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\..\audible api\AudibleApi\AudibleApiDTOs\AudibleApiDTOs.csproj" />
-    <ProjectReference Include="..\..\audible api\AudibleApi\AudibleApi\AudibleApi.csproj" />
-    <ProjectReference Include="..\DtoImporterService\DtoImporterService.csproj" />
-    <ProjectReference Include="..\InternalUtilities\InternalUtilities.csproj" />
-    <ProjectReference Include="..\LibationSearchEngine\LibationSearchEngine.csproj" />
-  </ItemGroup>
-
-</Project>

ApplicationServices/DbContexts.cs

@@ -1,16 +0,0 @@
-using System;
-using DataLayer;
-using FileManager;
-
-namespace ApplicationServices
-{
-	public static class DbContexts
-	{
-		//// idea for future command/query separation
-		// public static LibationContext GetCommandContext() { }
-		// public static LibationContext GetQueryContext() { }
-
-		public static LibationContext GetContext()
-			=> LibationContext.Create(SqliteStorage.ConnectionString);
-	}
-}

ApplicationServices/LibraryCommands.cs

@@ -1,123 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using AudibleApi;
-using DataLayer;
-using Dinah.Core;
-using DtoImporterService;
-using InternalUtilities;
-using Serilog;
-
-namespace ApplicationServices
-{
-	public static class LibraryCommands
-	{
-		public static async Task<(int totalCount, int newCount)> ImportAccountAsync(Func<Account, ILoginCallback> loginCallbackFactoryFunc, params Account[] accounts)
-		{
-			if (accounts is null || accounts.Length == 0)
-				return (0, 0);
-
-			try
-			{
-				var importItems = await scanAccountsAsync(loginCallbackFactoryFunc, accounts);
-
-				var totalCount = importItems.Count;
-				Log.Logger.Information($"GetAllLibraryItems: Total count {totalCount}");
-
-				var newCount = await importIntoDbAsync(importItems);
-				Log.Logger.Information($"Import: New count {newCount}");
-
-				await Task.Run(() => SearchEngineCommands.FullReIndex());
-				Log.Logger.Information("FullReIndex: success");
-
-				return (totalCount, newCount);
-			}
-			catch (AudibleApi.Authentication.LoginFailedException lfEx)
-			{
-				lfEx.MoveResponseBodyFile(FileManager.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 importing library. Login failed. {@DebugInfo}", new {
-					lfEx.RequestUrl,
-					ResponseStatusCodeNumber = (int)lfEx.ResponseStatusCode,
-					ResponseStatusCodeDesc = lfEx.ResponseStatusCode,
-					lfEx.ResponseInputFields,
-					lfEx.ResponseBodyFilePath
-				});
-				throw;
-			}
-			catch (Exception ex)
-			{
-				Log.Logger.Error(ex, "Error importing library");
-				throw;
-			}
-		}
-
-		private static async Task<List<ImportItem>> scanAccountsAsync(Func<Account, ILoginCallback> loginCallbackFactoryFunc, Account[] accounts)
-		{
-			var tasks = new List<Task<List<ImportItem>>>();
-			foreach (var account in accounts)
-			{
-				var callback = loginCallbackFactoryFunc(account);
-
-				// get APIs in serial, esp b/c of logins
-				var api = await AudibleApiActions.GetApiAsync(callback, account);
-
-				// add scanAccountAsync as a TASK: do not await
-				tasks.Add(scanAccountAsync(api, account));
-			}
-
-			// import library in parallel
-			var arrayOfLists = await Task.WhenAll(tasks);
-			var importItems = arrayOfLists.SelectMany(a => a).ToList();
-			return importItems;
-		}
-
-		private static async Task<List<ImportItem>> scanAccountAsync(Api api, Account account)
-		{
-			ArgumentValidator.EnsureNotNull(account, nameof(account));
-
-			Log.Logger.Information("ImportLibraryAsync. {@DebugInfo}", new
-			{
-				Account = account?.MaskedLogEntry ?? "[null]"
-			});
-
-			var dtoItems = await AudibleApiActions.GetLibraryValidatedAsync(api);
-			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)
-		{
-			using var context = DbContexts.GetContext();
-			var libraryImporter = new LibraryImporter(context);
-			var newCount = await Task.Run(() => libraryImporter.Import(importItems));
-			context.SaveChanges();
-
-			return newCount;
-		}
-
-		public static int UpdateTags(this LibationContext context, Book book, string newTags)
-		{
-			try
-			{
-				book.UserDefinedItem.Tags = newTags;
-
-				var qtyChanges = context.SaveChanges();
-
-				if (qtyChanges > 0)
-					SearchEngineCommands.UpdateBookTags(book);
-
-				return qtyChanges;
-			}
-			catch (Exception ex)
-			{
-				Log.Logger.Error(ex, "Error updating tags");
-				throw;
-			}
-		}
-	}
-}

ApplicationServices/LibraryExporter.cs

@@ -1,268 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using CsvHelper;
-using CsvHelper.Configuration.Attributes;
-using DataLayer;
-using NPOI.XSSF.UserModel;
-using Serilog;
-
-namespace ApplicationServices
-{
-	public class ExportDto
-	{
-		public static string GetName(string fieldName)
-		{
-			var property = typeof(ExportDto).GetProperty(fieldName);
-			var attribute = property.GetCustomAttributes(typeof(NameAttribute), true)[0];
-			var description = (NameAttribute)attribute;
-			var text = description.Names;
-			return text[0];
-		}
-
-		[Name("Account")]
-		public string Account { get; set; }
-
-		[Name("Date Added to library")]
-		public DateTime DateAdded { get; set; }
-
-		[Name("Audible Product Id")]
-		public string AudibleProductId { get; set; }
-
-		[Name("Locale")]
-		public string Locale { get; set; }
-
-		[Name("Title")]
-		public string Title { get; set; }
-
-		[Name("Authors")]
-		public string AuthorNames { get; set; }
-
-		[Name("Narrators")]
-		public string NarratorNames { get; set; }
-
-		[Name("Length In Minutes")]
-		public int LengthInMinutes { get; set; }
-
-		[Name("Publisher")]
-		public string Publisher { get; set; }
-
-		[Name("Pdf url")]
-		public string PdfUrl { get; set; }
-
-		[Name("Series Names")]
-		public string SeriesNames { get; set; }
-
-		[Name("Series Order")]
-		public string SeriesOrder { get; set; }
-
-		[Name("Community Rating: Overall")]
-		public float? CommunityRatingOverall { get; set; }
-
-		[Name("Community Rating: Performance")]
-		public float? CommunityRatingPerformance { get; set; }
-
-		[Name("Community Rating: Story")]
-		public float? CommunityRatingStory { get; set; }
-
-		[Name("Cover Id")]
-		public string PictureId { get; set; }
-
-		[Name("Is Abridged?")]
-		public bool IsAbridged { get; set; }
-
-		[Name("Date Published")]
-		public DateTime? DatePublished { get; set; }
-
-		[Name("Categories")]
-		public string CategoriesNames { get; set; }
-
-		[Name("My Rating: Overall")]
-		public float? MyRatingOverall { get; set; }
-
-		[Name("My Rating: Performance")]
-		public float? MyRatingPerformance { get; set; }
-
-		[Name("My Rating: Story")]
-		public float? MyRatingStory { get; set; }
-
-		[Name("My Libation Tags")]
-		public string MyLibationTags { get; set; }
-	}
-	public static class LibToDtos
-	{
-		public static List<ExportDto> ToDtos(this IEnumerable<LibraryBook> library)
-			=> library.Select(a => new ExportDto
-			{
-				Account = a.Account,
-				DateAdded = a.DateAdded,
-				AudibleProductId = a.Book.AudibleProductId,
-				Locale = a.Book.Locale,
-				Title = a.Book.Title,
-				AuthorNames = a.Book.AuthorNames,
-				NarratorNames = a.Book.NarratorNames,
-				LengthInMinutes = a.Book.LengthInMinutes,
-				Publisher = a.Book.Publisher,
-				PdfUrl = a.Book.Supplements?.FirstOrDefault()?.Url,
-				SeriesNames = a.Book.SeriesNames,
-				SeriesOrder = a.Book.SeriesLink.Any() ? a.Book.SeriesLink?.Select(sl => $"{sl.Index} : {sl.Series.Name}").Aggregate((a, b) => $"{a}, {b}") : "",
-				CommunityRatingOverall = a.Book.Rating?.OverallRating,
-				CommunityRatingPerformance = a.Book.Rating?.PerformanceRating,
-				CommunityRatingStory = a.Book.Rating?.StoryRating,
-				PictureId = a.Book.PictureId,
-				IsAbridged = a.Book.IsAbridged,
-				DatePublished = a.Book.DatePublished,
-				CategoriesNames = a.Book.CategoriesNames.Any() ? a.Book.CategoriesNames.Aggregate((a, b) => $"{a}, {b}") : "",
-				MyRatingOverall = a.Book.UserDefinedItem.Rating.OverallRating,
-				MyRatingPerformance = a.Book.UserDefinedItem.Rating.PerformanceRating,
-				MyRatingStory = a.Book.UserDefinedItem.Rating.StoryRating,
-				MyLibationTags = a.Book.UserDefinedItem.Tags
-			}).ToList();
-	}
-	public static class LibraryExporter
-	{
-		public static void ToCsv(string saveFilePath)
-		{
-			using var context = DbContexts.GetContext();
-			var dtos = context.GetLibrary_Flat_NoTracking().ToDtos();
-
-			if (!dtos.Any())
-				return;
-
-			using var writer = new System.IO.StreamWriter(saveFilePath);
-			using var csv = new CsvWriter(writer, System.Globalization.CultureInfo.CurrentCulture);
-
-			csv.WriteHeader(typeof(ExportDto));
-			csv.NextRecord();
-			csv.WriteRecords(dtos);
-		}
-
-		public static void ToJson(string saveFilePath)
-		{
-			using var context = DbContexts.GetContext();
-			var dtos = context.GetLibrary_Flat_NoTracking().ToDtos();
-
-			var json = Newtonsoft.Json.JsonConvert.SerializeObject(dtos, Newtonsoft.Json.Formatting.Indented);
-			System.IO.File.WriteAllText(saveFilePath, json);
-		}
-
-		public static void ToXlsx(string saveFilePath)
-		{
-			using var context = DbContexts.GetContext();
-			var dtos = context.GetLibrary_Flat_NoTracking().ToDtos();
-
-			var workbook = new XSSFWorkbook();
-			var sheet = workbook.CreateSheet("Library");
-
-			var detailSubtotalFont = workbook.CreateFont();
-			detailSubtotalFont.IsBold = true;
-
-			var detailSubtotalCellStyle = workbook.CreateCellStyle();
-			detailSubtotalCellStyle.SetFont(detailSubtotalFont);
-
-			// headers
-			var rowIndex = 0;
-			var row = sheet.CreateRow(rowIndex);
-
-			var columns = new[] {
-				nameof (ExportDto.Account),
-				nameof (ExportDto.DateAdded),
-				nameof (ExportDto.AudibleProductId),
-				nameof (ExportDto.Locale),
-				nameof (ExportDto.Title),
-				nameof (ExportDto.AuthorNames),
-				nameof (ExportDto.NarratorNames),
-				nameof (ExportDto.LengthInMinutes),
-				nameof (ExportDto.Publisher),
-				nameof (ExportDto.PdfUrl),
-				nameof (ExportDto.SeriesNames),
-				nameof (ExportDto.SeriesOrder),
-				nameof (ExportDto.CommunityRatingOverall),
-				nameof (ExportDto.CommunityRatingPerformance),
-				nameof (ExportDto.CommunityRatingStory),
-				nameof (ExportDto.PictureId),
-				nameof (ExportDto.IsAbridged),
-				nameof (ExportDto.DatePublished),
-				nameof (ExportDto.CategoriesNames),
-				nameof (ExportDto.MyRatingOverall),
-				nameof (ExportDto.MyRatingPerformance),
-				nameof (ExportDto.MyRatingStory),
-				nameof (ExportDto.MyLibationTags)
-			};
-			var col = 0;
-			foreach (var c in columns)
-			{
-				var cell = row.CreateCell(col++);
-				var name = ExportDto.GetName(c);
-				cell.SetCellValue(name);
-				cell.CellStyle = detailSubtotalCellStyle;
-			}
-
-			var dateFormat = workbook.CreateDataFormat();
-			var dateStyle = workbook.CreateCellStyle();
-			dateStyle.DataFormat = dateFormat.GetFormat("MM/dd/yyyy HH:mm:ss");
-
-			rowIndex++;
-
-			// Add data rows
-			foreach (var dto in dtos)
-			{
-				col = 0;
-
-				row = sheet.CreateRow(rowIndex);
-
-				row.CreateCell(col++).SetCellValue(dto.Account);
-
-				var dateAddedCell = row.CreateCell(col++);
-				dateAddedCell.CellStyle = dateStyle;
-				dateAddedCell.SetCellValue(dto.DateAdded);
-
-				row.CreateCell(col++).SetCellValue(dto.AudibleProductId);
-				row.CreateCell(col++).SetCellValue(dto.Locale);
-				row.CreateCell(col++).SetCellValue(dto.Title);
-				row.CreateCell(col++).SetCellValue(dto.AuthorNames);
-				row.CreateCell(col++).SetCellValue(dto.NarratorNames);
-				row.CreateCell(col++).SetCellValue(dto.LengthInMinutes);
-				row.CreateCell(col++).SetCellValue(dto.Publisher);
-				row.CreateCell(col++).SetCellValue(dto.PdfUrl);
-				row.CreateCell(col++).SetCellValue(dto.SeriesNames);
-				row.CreateCell(col++).SetCellValue(dto.SeriesOrder);
-
-				col = createCell(row, col, dto.CommunityRatingOverall);
-				col = createCell(row, col, dto.CommunityRatingPerformance);
-				col = createCell(row, col, dto.CommunityRatingStory);
-
-				row.CreateCell(col++).SetCellValue(dto.PictureId);
-				row.CreateCell(col++).SetCellValue(dto.IsAbridged);
-
-				var datePubCell = row.CreateCell(col++);
-				datePubCell.CellStyle = dateStyle;
-				if (dto.DatePublished.HasValue)
-					datePubCell.SetCellValue(dto.DatePublished.Value);
-				else
-					datePubCell.SetCellValue("");
-
-				row.CreateCell(col++).SetCellValue(dto.CategoriesNames);
-
-				col = createCell(row, col, dto.MyRatingOverall);
-				col = createCell(row, col, dto.MyRatingPerformance);
-				col = createCell(row, col, dto.MyRatingStory);
-
-				row.CreateCell(col++).SetCellValue(dto.MyLibationTags);
-
-				rowIndex++;
-			}
-
-			using var fileData = new System.IO.FileStream(saveFilePath, System.IO.FileMode.Create);
-			workbook.Write(fileData);
-		}
-		private static int createCell(NPOI.SS.UserModel.IRow row, int col, float? nullableFloat)
-		{
-			if (nullableFloat.HasValue)
-				row.CreateCell(col++).SetCellValue(nullableFloat.Value);
-			else
-				row.CreateCell(col++).SetCellValue("");
-			return col;
-		}
-	}
-}

ApplicationServices/SearchEngineCommands.cs

@@ -1,56 +0,0 @@
-using System;
-using System.IO;
-using DataLayer;
-using LibationSearchEngine;
-
-namespace ApplicationServices
-{
-	public static class SearchEngineCommands
-	{
-		public static void FullReIndex()
-		{
-			var engine = new SearchEngine(DbContexts.GetContext());
-			engine.CreateNewIndex();
-		}
-
-		public static SearchResultSet Search(string searchString) => performSearchEngineFunc_safe(e =>
-			e.Search(searchString)
-		);
-
-		public static void UpdateBookTags(Book book) => performSearchEngineAction_safe(e =>
-			e.UpdateTags(book.AudibleProductId, book.UserDefinedItem.Tags)
-		);
-
-		public static void UpdateIsLiberated(Book book) => performSearchEngineAction_safe(e =>
-			e.UpdateIsLiberated(book.AudibleProductId)
-		);
-
-		private static void performSearchEngineAction_safe(Action<SearchEngine> action)
-		{
-			var engine = new SearchEngine(DbContexts.GetContext());
-			try
-			{
-				action(engine);
-			}
-			catch (FileNotFoundException)
-			{
-				FullReIndex();
-				action(engine);
-			}
-		}
-
-		private static T performSearchEngineFunc_safe<T>(Func<SearchEngine, T> action)
-		{
-			var engine = new SearchEngine(DbContexts.GetContext());
-			try
-			{
-				return action(engine);
-			}
-			catch (FileNotFoundException)
-			{
-				FullReIndex();
-				return action(engine);
-			}
-		}
-	}
-}

DataLayer/Configurations/BookConfig.cs

@@ -1,71 +0,0 @@
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Metadata.Builders;
-
-namespace DataLayer.Configurations
-{
-    internal class BookConfig : IEntityTypeConfiguration<Book>
-    {
-        public void Configure(EntityTypeBuilder<Book> entity)
-        {
-            entity.HasKey(b => b.BookId);
-            entity.HasIndex(b => b.AudibleProductId);
-
-            entity.OwnsOne(b => b.Rating);
-
-            //
-            // CRUCIAL: ignore unmapped collections, even get-only
-            //
-            entity.Ignore(nameof(Book.Authors));
-            entity.Ignore(nameof(Book.Narrators));
-			//// these don't seem to matter
-			//entity.Ignore(nameof(Book.AuthorNames));
-			//entity.Ignore(nameof(Book.NarratorNames));
-			//entity.Ignore(nameof(Book.HasPdfs));
-
-			// OwnsMany: "Can only ever appear on navigation properties of other entity types.
-			//  Are automatically loaded, and can only be tracked by a DbContext alongside their owner."
-			entity
-				.OwnsMany(b => b.Supplements, b_s =>
-				{
-					b_s.WithOwner(s => s.Book)
-						.HasForeignKey(s => s.BookId);
-					b_s.HasKey(s => s.SupplementId);
-				});
-            // even though it's owned, we need to map its backing field
-            entity
-                .Metadata
-                .FindNavigation(nameof(Book.Supplements))
-                .SetPropertyAccessMode(PropertyAccessMode.Field);
-
-			// owns it 1:1, store in separate table
-			entity
-				.OwnsOne(b => b.UserDefinedItem, b_udi =>
-				{
-					b_udi.WithOwner(udi => udi.Book)
-						.HasForeignKey(udi => udi.BookId);
-					b_udi.Property(udi => udi.BookId).ValueGeneratedNever();
-					b_udi.ToTable(nameof(Book.UserDefinedItem));
-
-					// owns it 1:1, store in same table
-					b_udi.OwnsOne(udi => udi.Rating);
-				});
-
-			entity
-                .Metadata
-                .FindNavigation(nameof(Book.ContributorsLink))
-                // PropertyAccessMode.Field : Contributions is a get-only property, not a field, so use its backing field
-                .SetPropertyAccessMode(PropertyAccessMode.Field);
-
-            entity
-                .Metadata
-                .FindNavigation(nameof(Book.SeriesLink))
-                // PropertyAccessMode.Field : Series is a get-only property, not a field, so use its backing field
-                .SetPropertyAccessMode(PropertyAccessMode.Field);
-
-            entity
-                .HasOne(b => b.Category)
-                .WithMany()
-                .HasForeignKey(b => b.CategoryId);
-		}
-    }
-}

DataLayer/Configurations/LibraryBookConfig.cs

@@ -1,18 +0,0 @@
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Metadata.Builders;
-
-namespace DataLayer.Configurations
-{
-    internal class LibraryBookConfig : IEntityTypeConfiguration<LibraryBook>
-    {
-        public void Configure(EntityTypeBuilder<LibraryBook> entity)
-        {
-            entity.HasKey(b => b.BookId);
-
-            entity
-                .HasOne(le => le.Book)
-                .WithOne()
-                .HasForeignKey<LibraryBook>(le => le.BookId);
-        }
-    }
-}

DataLayer/EfClasses/Role.cs

@@ -1,4 +0,0 @@
-namespace DataLayer
-{
-    public enum Role { Author = 1, Narrator = 2, Publisher = 3 }
-}

DataLayer/EfClasses/SeriesBook.cs

@@ -1,40 +0,0 @@
-using Dinah.Core;
-
-namespace DataLayer
-{
-    public class SeriesBook
-    {
-        internal int SeriesId { get; private set; }
-        internal int BookId { get; private set; }
-
-        /// <summary>
-        /// <para>"index" not "order". This is both for sequence and display</para>
-        /// <para>Float allows for in-between books. eg: 2.5</para>
-        /// <para>To show 2 editions as the same book in a series, give them the same index</para>
-        /// <para>null IS NOT the same as 0. Some series call a book "book 0"</para>
-        /// </summary>
-        public float? Index { get; private set; }
-
-        public Series Series { get; private set; }
-        public Book Book { get; private set; }
-
-        private SeriesBook() { }
-        internal SeriesBook(Series series, Book book, float? index = null)
-        {
-            ArgumentValidator.EnsureNotNull(series, nameof(series));
-            ArgumentValidator.EnsureNotNull(book, nameof(book));
-
-            Series = series;
-            Book = book;
-            Index = index;
-        }
-
-        public void UpdateIndex(float? index)
-        {
-            if (index.HasValue)
-                Index = index.Value;
-        }
-
-		public override string ToString() => $"Series={Series} Book={Book}";
-	}
-}

DataLayer/EfClasses/UserDefinedItem.cs

@@ -1,84 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text.RegularExpressions;
-using Dinah.Core;
-
-namespace DataLayer
-{
-    public class UserDefinedItem
-    {
-        internal int BookId { get; private set; }
-        public Book Book { get; private set; }
-
-        private UserDefinedItem() { }
-        internal UserDefinedItem(Book book)
-		{
-			ArgumentValidator.EnsureNotNull(book, nameof(book));
-            Book = book;
-
-			// import previously saved tags
-			ArgumentValidator.EnsureNotNullOrWhiteSpace(book.AudibleProductId, nameof(book.AudibleProductId));
-			Tags = FileManager.TagsPersistence.GetTags(book.AudibleProductId);
-		}
-
-        private string _tags = "";
-        public string Tags
-        {
-            get => _tags;
-            set => _tags = sanitize(value);
-		}
-
-		public IEnumerable<string> TagsEnumerated => Tags == "" ? new string[0] : Tags.Split(null as char[], StringSplitOptions.RemoveEmptyEntries);
-
-		#region sanitize tags: space delimited. Inline/denormalized. Lower case. Alpha numeric and hyphen
-		// only legal chars are letters numbers underscores and separating whitespace
-		//
-		// technically, the only char.s which aren't easily supported are  \  [  ]
-		// however, whitelisting is far safer than blacklisting (eg: new lines, non-printable character)
-		// it's easy to expand whitelist as needed
-		// for lucene, ToLower() isn't needed because search is case-inspecific. for here, it prevents duplicates
-		//
-		// there are also other allowed but misleading characters. eg: the ^ operator defines a 'boost' score
-		// full list of characters which must be escaped:
-		//   + - && || ! ( ) { } [ ] ^ " ~ * ? : \
-		static Regex regex { get; } = new Regex(@"[^\w\d\s_]", RegexOptions.Compiled);
-        private static string sanitize(string input)
-        {
-            if (string.IsNullOrWhiteSpace(input))
-                return "";
-
-            var str = input
-                .Trim()
-                .ToLowerInvariant()
-                // assume a hyphen is supposed to be an underscore
-                .Replace("-", "_");
-
-            var unique = regex
-                // turn illegal characters into a space. this will also take care of turning new lines into spaces
-                .Replace(str, " ")
-                // split and remove excess spaces
-                .Split(new[] { ' ' }, StringSplitOptions.RemoveEmptyEntries)
-                // de-dup
-                .Distinct()
-                // this will prevent order from being relevant
-                .OrderBy(a => a);
-
-            // currently, the string is the canonical set. if we later make the collection into the canonical set:
-            //   var tags = new Hashset<string>(list); // de-dup, order doesn't matter but can seem random due to hashing algo
-            //   var isEqual = tagsNew.SetEquals(tagsOld);
-
-            return string.Join(" ", unique);
-        }
-        #endregion
-
-        // owned: not an optional one-to-one
-        /// <summary>The user's individual book rating</summary>
-        public Rating Rating { get; private set; } = new Rating(0, 0, 0);
-
-        public void UpdateRating(float overallRating, float performanceRating, float storyRating)
-            => Rating.Update(overallRating, performanceRating, storyRating);
-
-		public override string ToString() => $"{Book} {Rating} {Tags}";
-	}
-}

DataLayer/LibationContextFactory.cs

@@ -1,11 +0,0 @@
-using Dinah.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore;
-
-namespace DataLayer
-{
-    public class LibationContextFactory : DesignTimeDbContextFactoryBase<LibationContext>
-    {
-        protected override LibationContext CreateNewInstance(DbContextOptions<LibationContext> options) => new LibationContext(options);
-        protected override void UseDatabaseEngine(DbContextOptionsBuilder optionsBuilder, string connectionString) => optionsBuilder.UseSqlite(connectionString);
-    }
-}

DataLayer/QueryObjects/BookQueries.cs

@@ -1,35 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Linq.Expressions;
-using Microsoft.EntityFrameworkCore;
-
-namespace DataLayer
-{
-    public static class BookQueries
-    {
-        public static Book GetBook_Flat_NoTracking(this LibationContext context, string productId)
-            => context
-                .Books
-                .AsNoTracking()
-                .GetBook(productId);
-
-        public static Book GetBook(this IQueryable<Book> books, string productId)
-            => books
-                .GetBooks()
-                .SingleOrDefault(b => b.AudibleProductId == productId);
-
-        /// <summary>This is still IQueryable. YOU MUST CALL ToList() YOURSELF</summary>
-        public static IQueryable<Book> GetBooks(this IQueryable<Book> books, Expression<Func<Book, bool>> predicate)
-            => books
-                .GetBooks()
-                .Where(predicate);
-
-        public static IQueryable<Book> GetBooks(this IQueryable<Book> books)
-            => books
-                // owned items are always loaded. eg: book.UserDefinedItem, book.Supplements
-                .Include(b => b.SeriesLink).ThenInclude(sb => sb.Series)
-                .Include(b => b.ContributorsLink).ThenInclude(c => c.Contributor)
-                .Include(b => b.Category).ThenInclude(c => c.ParentCategory);
-    }
-}

DataLayer/QueryObjects/GenericPaging.cs

@@ -1,19 +0,0 @@
-using System;
-using System.Linq;
-
-namespace DataLayer
-{
-    public static class GenericPaging
-    {
-        public static IQueryable<T> Page<T>(this IQueryable<T> query, int pageNumZeroStart, int pageSize)
-        {
-            if (pageSize < 1)
-                throw new ArgumentOutOfRangeException(nameof(pageSize), "pageSize must be at least 1");
-
-            if (pageNumZeroStart > 0)
-                query = query.Skip(pageNumZeroStart * pageSize);
-
-            return query.Take(pageSize);
-        }
-    }
-}

DataLayer/QueryObjects/LibraryQueries.cs

@@ -1,41 +0,0 @@
-using System.Collections.Generic;
-using System.Linq;
-using Microsoft.EntityFrameworkCore;
-
-namespace DataLayer
-{
-    public static class LibraryQueries
-	{
-		public static List<LibraryBook> GetLibrary_Flat_WithTracking(this LibationContext context)
-			=> context
-				.Library
-				.GetLibrary()
-				.ToList();
-
-		public static List<LibraryBook> GetLibrary_Flat_NoTracking(this LibationContext context)
-            => context
-                .Library
-                .AsNoTracking()
-                .GetLibrary()
-                .ToList();
-
-        public static LibraryBook GetLibraryBook_Flat_NoTracking(this LibationContext context, string productId)
-            => context
-                .Library
-                .AsNoTracking()
-                .GetLibraryBook(productId);
-
-        /// <summary>This is still IQueryable. YOU MUST CALL ToList() YOURSELF</summary>
-        public 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)
-                .Include(le => le.Book).ThenInclude(b => b.ContributorsLink).ThenInclude(c => c.Contributor)
-                .Include(le => le.Book).ThenInclude(b => b.Category).ThenInclude(c => c.ParentCategory);
-
-        public static LibraryBook GetLibraryBook(this IQueryable<LibraryBook> library, string productId)
-            => library
-                .GetLibrary()
-                .SingleOrDefault(le => le.Book.AudibleProductId == productId);
-    }
-}

DataLayer/TagPersistenceInterceptor.cs

@@ -1,30 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using Dinah.Core.Collections.Generic;
-using Dinah.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore;
-
-namespace DataLayer
-{
-    internal class TagPersistenceInterceptor : IDbInterceptor
-    {
-        public void Executed(DbContext context) { }
-
-        public void Executing(DbContext context)
-		{
-			var tagsCollection
-				= context
-				.ChangeTracker
-				.Entries()
-				.Where(e => e.State.In(EntityState.Modified, EntityState.Added))
-				.Select(e => e.Entity as UserDefinedItem)
-				.Where(udi => udi != null)
-				// do NOT filter out entires with blank tags. blank is the valid way to show the absence of tags
-				.Select(t => (t.Book.AudibleProductId, t.Tags))
-				.ToList();
-
-			FileManager.TagsPersistence.Save(tagsCollection);
-		}
-	}
-}

DataLayer/Utilities/LocalDatabaseInfo.cs

@@ -1,38 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-
-namespace DataLayer.Utilities
-{
-	public static class LocalDatabaseInfo
-	{
-		public static List<string> GetLocalDBInstances()
-		{
-			// Start the child process.
-			using var p = new System.Diagnostics.Process
-			{
-				StartInfo = new System.Diagnostics.ProcessStartInfo
-				{
-					UseShellExecute = false,
-					RedirectStandardOutput = true,
-					FileName = "cmd.exe",
-					Arguments = "/C sqllocaldb info",
-					CreateNoWindow = true,
-					WindowStyle = System.Diagnostics.ProcessWindowStyle.Hidden
-				}
-			};
-			p.Start();
-			var output = p.StandardOutput.ReadToEnd();
-			p.WaitForExit();
-
-			// if LocalDb is not installed then it will return that 'sqllocaldb' is not recognized as an internal or external command operable program or batch file
-			return string.IsNullOrWhiteSpace(output) || output.Contains("not recognized")
-				? new List<string>()
-				: output
-					.Split(new string[] { Environment.NewLine }, StringSplitOptions.None)
-					.Select(i => i.Trim())
-					.Where(i => !string.IsNullOrEmpty(i))
-					.ToList();
-		}
-	}
-}

DataLayer/_HowTo- EF Core.txt

@@ -1,57 +0,0 @@
-FOR QUICK MIGRATION INSTRUCTIONS:
-_DB_NOTES.txt
-
-
-HOW TO CREATE: EF CORE PROJECT
-==============================
-example is for sqlite but the same works with MsSql
-
-
-nuget
-Microsoft.EntityFrameworkCore.Tools (needed for using Package Manager Console)
-Microsoft.EntityFrameworkCore.Sqlite
-
-MIGRATIONS
-  require core, not standard
-  this can be a problem b/c standard and framework can only reference standard, not core
-TO USE MIGRATIONS (core and/or standard)
-  add to csproj
-    <PropertyGroup>
-      <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
-    </PropertyGroup>
-TO USE MIGRATIONS AS *BOTH* CORE AND STANDARD
-  edit csproj
-    pluralize this xml tag
-      from: TargetFramework
-      to: TargetFrameworks
-    inside of TargetFrameworks
-      from: netstandard2.1
-      to: netcoreapp3.1;netstandard2.1
-
-run. error
-SQLite Error 1: 'no such table: Blogs'.
-
-set project "Set as StartUp Project"
-
-Tools >> Nuget Package Manager >> Package Manager Console
-default project: Examples\SQLite_NETCore2_0
-
-PM> add-migration InitialCreate
-PM> Update-Database
-
-if add-migration xyz throws and error, don't take the error msg at face value. try again with add-migration xyz -verbose
-
-new sqlite .db file created: Copy always/Copy if newer
-or copy .db file to destination
-
-relative:
-   optionsBuilder.UseSqlite("Data Source=blogging.db");
-absolute  (use fwd slashes):
-   optionsBuilder.UseSqlite("Data Source=C:/foo/bar/blogging.db");
-
-
-REFERENCE ARTICLES
-------------------
-https://docs.microsoft.com/en-us/ef/core/get-started/netcore/new-db-sqlite
-https://carlos.mendible.com/2016/07/11/step-by-step-dotnet-core-and-entity-framework-core/
-https://www.benday.com/2017/12/19/ef-core-2-0-migrations-without-hard-coded-connection-strings/

DataLayer/appsettings.json

@@ -1,6 +0,0 @@
-{
-  "ConnectionStrings": {
-    "// this connection string is ONLY used for DataLayer's Migrations. this appsettings.json file is NOT used at all by application; it is overwritten":  "",
-    "LibationContext": "Data Source=LibationContext.db;Foreign Keys=False;"
-  }
-}

Directory.Build.props

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

Docker/appsettings.json

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

Docker/liberate.sh

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

Dockerfile

@@ -0,0 +1,42 @@
+# Dockerfile
+FROM --platform=${BUILDPLATFORM} mcr.microsoft.com/dotnet/sdk:10.0 AS build
+ARG TARGETARCH
+
+COPY Source /Source
+RUN dotnet publish \
+    /Source/LibationCli/LibationCli.csproj \
+    --os linux \
+    --arch ${TARGETARCH} \
+    --configuration Release \
+    --output /Source/bin/Publish/Linux-chardonnay \
+    -p:PublishProtocol=FileSystem \
+    -p:PublishReadyToRun=true \
+    -p:SelfContained=true
+
+FROM mcr.microsoft.com/dotnet/runtime:10.0
+ARG USER_UID=1001
+ARG USER_GID=1001
+
+# Set the character set that will be used for folder and filenames when liberating
+ENV LANG=C.UTF-8
+ENV LC_ALL=C.UTF-8
+
+ENV SLEEP_TIME=-1
+ENV LIBATION_CONFIG_INTERNAL=/config-internal
+ENV LIBATION_CONFIG_DIR=/config
+ENV LIBATION_DB_DIR=/db
+ENV LIBATION_DB_FILE=
+ENV LIBATION_CREATE_DB=true
+ENV LIBATION_BOOKS_DIR=/data
+
+
+RUN apt-get update && apt-get -y upgrade && \
+    apt-get install -y jq && \
+    mkdir -m777 ${LIBATION_CONFIG_INTERNAL} ${LIBATION_BOOKS_DIR}
+
+COPY --from=build /Source/bin/Publish/Linux-chardonnay /libation
+COPY Docker/* /libation
+
+USER ${USER_UID}:${USER_GID}
+
+CMD ["/libation/liberate.sh"]

DtoImporterService/BookImporter.cs

@@ -1,166 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using AudibleApiDTOs;
-using DataLayer;
-using InternalUtilities;
-
-namespace DtoImporterService
-{
-	public class BookImporter : ItemsImporterBase
-	{
-		public BookImporter(LibationContext context) : base(context) { }
-
-		public override IEnumerable<Exception> Validate(IEnumerable<ImportItem> importItems) => new BookValidator().Validate(importItems.Select(i => i.DtoItem));
-
-		protected override int DoImport(IEnumerable<ImportItem> importItems)
-		{
-			// pre-req.s
-			new ContributorImporter(DbContext).Import(importItems);
-			new SeriesImporter(DbContext).Import(importItems);
-			new CategoryImporter(DbContext).Import(importItems);
-
-			// get distinct
-			var productIds = importItems.Select(i => i.DtoItem.ProductId).ToList();
-
-			// load db existing => .Local
-			loadLocal_books(productIds);
-
-			// upsert
-			var qtyNew = upsertBooks(importItems);
-			return qtyNew;
-		}
-
-		private void loadLocal_books(List<string> productIds)
-		{
-			var localProductIds = DbContext.Books.Local.Select(b => b.AudibleProductId);
-			var remainingProductIds = productIds
-				.Distinct()
-				.Except(localProductIds)
-				.ToList();
-
-			// GetBooks() eager loads Series, category, et al
-			if (remainingProductIds.Any())
-				DbContext.Books.GetBooks(b => remainingProductIds.Contains(b.AudibleProductId)).ToList();
-		}
-
-		private int upsertBooks(IEnumerable<ImportItem> importItems)
-		{
-			var qtyNew = 0;
-
-			foreach (var item in importItems)
-			{
-				var book = DbContext.Books.Local.SingleOrDefault(p => p.AudibleProductId == item.DtoItem.ProductId);
-				if (book is null)
-				{
-					book = createNewBook(item);
-					qtyNew++;
-				}
-
-				updateBook(item, book);
-			}
-
-			return qtyNew;
-		}
-
-		private Book createNewBook(ImportItem importItem)
-		{
-			var item = importItem.DtoItem;
-
-			// absence of authors is very rare, but possible
-			if (!item.Authors?.Any() ?? true)
-				item.Authors = new[] { new Person { Name = "", Asin = null } };
-
-			// nested logic is required so order of names is retained. else, contributors may appear in the order they were inserted into the db
-			var authors = item
-				.Authors
-				.Select(a => DbContext.Contributors.Local.Single(c => a.Name == c.Name))
-				.ToList();
-
-			var narrators
-				= item.Narrators is null || !item.Narrators.Any()
-				// if no narrators listed, author is the narrator
-				? authors
-				// nested logic is required so order of names is retained. else, contributors may appear in the order they were inserted into the db
-				: item
-					.Narrators
-					.Select(n => DbContext.Contributors.Local.Single(c => n.Name == c.Name))
-					.ToList();
-
-			// categories are laid out for a breadcrumb. category is 1st, subcategory is 2nd
-			// absence of categories is also possible
-
-			// CATEGORY HACK: only use the 1st 2 categories
-			// (real impl: var lastCategory = item.Categories.LastOrDefault()?.CategoryId ?? "";)
-			var lastCategory
-				= item.Categories.Length == 0 ? ""
-				: item.Categories.Length == 1 ? item.Categories[0].CategoryId
-				// 2+
-				: item.Categories[1].CategoryId;
-
-			var category = DbContext.Categories.Local.SingleOrDefault(c => c.AudibleCategoryId == lastCategory);
-
-			var book = DbContext.Books.Add(new Book(
-				new AudibleProductId(item.ProductId),
-				item.Title,
-				item.Description,
-				item.LengthInMinutes,
-				authors,
-				narrators,
-				category,
-				importItem.LocaleName)
-			).Entity;
-
-			var publisherName = item.Publisher;
-			if (!string.IsNullOrWhiteSpace(publisherName))
-			{
-				var publisher = DbContext.Contributors.Local.Single(c => publisherName == c.Name);
-				book.ReplacePublisher(publisher);
-			}
-
-			book.UpdateBookDetails(item.IsAbridged, item.DatePublished);
-
-			if (!string.IsNullOrWhiteSpace(item.SupplementUrl))
-				book.AddSupplementDownloadUrl(item.SupplementUrl);
-
-			return book;
-		}
-
-		private void updateBook(ImportItem importItem, Book book)
-		{
-			var item = importItem.DtoItem;
-
-			// set/update book-specific info which may have changed
-			book.PictureId = item.PictureId;
-			book.UpdateProductRating(item.Product_OverallStars, item.Product_PerformanceStars, item.Product_StoryStars);
-
-			// needed during v3 => v4 migration
-			book.UpdateLocale(importItem.LocaleName);
-
-			// 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);
-
-			// update series even for existing books. these are occasionally updated
-			// these will upsert over library-scraped series, but will not leave orphans
-			if (item.Series != null)
-			{
-				foreach (var seriesEntry in item.Series)
-				{
-					var series = DbContext.Series.Local.Single(s => seriesEntry.SeriesId == s.AudibleSeriesId);
-
-					var index = 0f;
-					try
-					{
-						index = seriesEntry.Index;
-					}
-					catch (Exception ex)
-					{
-						Serilog.Log.Logger.Error(ex, $"Error parsing series index. Title: {item.Title}. ASIN: {item.Asin}. Series index: {seriesEntry.Sequence}");
-					}
-
-					book.UpsertSeries(series, index);
-				}
-			}
-		}
-	}
-}

DtoImporterService/CategoryImporter.cs

@@ -1,85 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using AudibleApiDTOs;
-using DataLayer;
-using InternalUtilities;
-
-namespace DtoImporterService
-{
-	public class CategoryImporter : ItemsImporterBase
-	{
-		public CategoryImporter(LibationContext context) : base(context) { }
-
-		public override IEnumerable<Exception> Validate(IEnumerable<ImportItem> importItems) => new CategoryValidator().Validate(importItems.Select(i => i.DtoItem));
-
-		protected override int DoImport(IEnumerable<ImportItem> importItems)
-		{
-			// get distinct
-			var categoryIds = importItems
-				.Select(i => i.DtoItem)
-				.GetCategoriesDistinct()
-				.Select(c => c.CategoryId).ToList();
-
-			// load db existing => .Local
-			loadLocal_categories(categoryIds);
-
-			// upsert
-			var categoryPairs = importItems
-				.Select(i => i.DtoItem)
-				.GetCategoryPairsDistinct()
-				.ToList();
-			var qtyNew = upsertCategories(categoryPairs);
-			return qtyNew;
-		}
-
-		private void loadLocal_categories(List<string> categoryIds)
-		{
-			var localIds = DbContext.Categories.Local.Select(c => c.AudibleCategoryId);
-			var remainingCategoryIds = categoryIds
-				.Distinct()
-				.Except(localIds)
-				.ToList();
-
-			// load existing => local
-			// remember to include default/empty/missing
-			var emptyName = Contributor.GetEmpty().Name;
-			if (remainingCategoryIds.Any())
-				DbContext.Categories.Where(c => remainingCategoryIds.Contains(c.AudibleCategoryId) || c.Name == emptyName).ToList();
-		}
-
-		// only use after loading contributors => local
-		private int upsertCategories(List<Ladder[]> categoryPairs)
-		{
-			var qtyNew = 0;
-
-			foreach (var pair in categoryPairs)
-			{
-				for (var i = 0; i < pair.Length; i++)
-				{
-					// CATEGORY HACK: not yet supported: depth beyond 0 and 1
-					if (i > 1)
-						break;
-
-					var id = pair[i].CategoryId;
-					var name = pair[i].CategoryName;
-
-					Category parentCategory = null;
-					if (i == 1)
-						parentCategory = DbContext.Categories.Local.Single(c => c.AudibleCategoryId == pair[0].CategoryId);
-
-					var category = DbContext.Categories.Local.SingleOrDefault(c => c.AudibleCategoryId == id);
-					if (category is null)
-					{
-						category = DbContext.Categories.Add(new Category(new AudibleCategoryId(id), name)).Entity;
-						qtyNew++;
-					}
-
-					category.UpdateParentCategory(parentCategory);
-				}
-			}
-
-			return qtyNew;
-		}
-	}
-}

DtoImporterService/ContributorImporter.cs

@@ -1,102 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using AudibleApiDTOs;
-using DataLayer;
-using InternalUtilities;
-
-namespace DtoImporterService
-{
-	public class ContributorImporter : ItemsImporterBase
-	{
-		public ContributorImporter(LibationContext context) : base(context) { }
-
-		public override IEnumerable<Exception> Validate(IEnumerable<ImportItem> importItems) => new ContributorValidator().Validate(importItems.Select(i => i.DtoItem));
-
-		protected override int DoImport(IEnumerable<ImportItem> importItems)
-		{
-			// get distinct
-			var authors = importItems
-				.Select(i => i.DtoItem)
-				.GetAuthorsDistinct()
-				.ToList();
-			var narrators = importItems
-				.Select(i => i.DtoItem)
-				.GetNarratorsDistinct()
-				.ToList();
-			var publishers = importItems
-				.Select(i => i.DtoItem)
-				.GetPublishersDistinct()
-				.ToList();
-
-			// load db existing => .Local
-			var allNames = publishers
-				.Union(authors.Select(n => n.Name))
-				.Union(narrators.Select(n => n.Name))
-				.Where(name => !string.IsNullOrWhiteSpace(name))
-				.ToList();
-			loadLocal_contributors(allNames);
-
-			// upsert
-			var qtyNew = 0;
-			qtyNew += upsertPeople(authors);
-			qtyNew += upsertPeople(narrators);
-			qtyNew += upsertPublishers(publishers);
-			return qtyNew;
-		}
-
-		private void loadLocal_contributors(List<string> contributorNames)
-		{
-			//// BAD: very inefficient
-			// var x = context.Contributors.Local.Where(c => !contribNames.Contains(c.Name));
-
-			// GOOD: Except() is efficient. Due to hashing, it's close to O(n)
-			var localNames = DbContext.Contributors.Local.Select(c => c.Name);
-			var remainingContribNames = contributorNames
-				.Distinct()
-				.Except(localNames)
-				.ToList();
-
-			// load existing => local
-			// remember to include default/empty/missing
-			var emptyName = Contributor.GetEmpty().Name;
-			if (remainingContribNames.Any())
-				DbContext.Contributors.Where(c => remainingContribNames.Contains(c.Name) || c.Name == emptyName).ToList();
-		}
-
-		// only use after loading contributors => local
-		private int upsertPeople(List<Person> people)
-		{
-			var qtyNew = 0;
-
-			foreach (var p in people)
-			{
-				var person = DbContext.Contributors.Local.SingleOrDefault(c => c.Name == p.Name);
-				if (person == null)
-				{
-					person = DbContext.Contributors.Add(new Contributor(p.Name, p.Asin)).Entity;
-					qtyNew++;
-				}
-			}
-
-			return qtyNew;
-		}
-
-		// only use after loading contributors => local
-		private int upsertPublishers(List<string> publishers)
-		{
-			var qtyNew = 0;
-
-			foreach (var publisherName in publishers)
-			{
-				if (DbContext.Contributors.Local.SingleOrDefault(c => c.Name == publisherName) == null)
-				{
-					DbContext.Contributors.Add(new Contributor(publisherName));
-					qtyNew++;
-				}
-			}
-
-			return qtyNew;
-		}
-	}
-}

DtoImporterService/DtoImporterService.csproj

@@ -1,13 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\..\audible api\AudibleApi\AudibleApiDTOs\AudibleApiDTOs.csproj" />
-    <ProjectReference Include="..\DataLayer\DataLayer.csproj" />
-    <ProjectReference Include="..\InternalUtilities\InternalUtilities.csproj" />
-  </ItemGroup>
-
-</Project>

DtoImporterService/LibraryImporter.cs

@@ -1,62 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using AudibleApiDTOs;
-using DataLayer;
-using InternalUtilities;
-
-namespace DtoImporterService
-{
-	public class LibraryImporter : ItemsImporterBase
-	{
-		public LibraryImporter(LibationContext context) : base(context) { }
-
-		public override IEnumerable<Exception> Validate(IEnumerable<ImportItem> importItems) => new LibraryValidator().Validate(importItems.Select(i => i.DtoItem));
-
-		protected override int DoImport(IEnumerable<ImportItem> importItems)
-		{
-			new BookImporter(DbContext).Import(importItems);
-
-			var qtyNew = upsertLibraryBooks(importItems);
-			return qtyNew;
-		}
-
-		private int upsertLibraryBooks(IEnumerable<ImportItem> importItems)
-		{
-			// technically, we should be able to have duplicate books from separate accounts.
-			// this would violate the current pk and would be difficult to deal with elsewhere:
-			// - what to show in the grid
-			// - which to consider liberated
-			//
-			// sqlite cannot alter pk. the work around is an extensive headache. it'll be fixed in pre .net5/efcore5
-			//
-			// currently, inserting LibraryBook will throw error if the same book is in multiple accounts for the same region.
-			//
-			// CURRENT SOLUTION: don't re-insert
-
-			var currentLibraryProductIds = DbContext.Library.Select(l => l.Book.AudibleProductId).ToList();
-			var newItems = importItems.Where(dto => !currentLibraryProductIds.Contains(dto.DtoItem.ProductId)).ToList();
-
-			foreach (var newItem in newItems)
-			{
-				var libraryBook = new LibraryBook(
-					DbContext.Books.Local.Single(b => b.AudibleProductId == newItem.DtoItem.ProductId),
-					newItem.DtoItem.DateAdded,
-					newItem.AccountId);
-				DbContext.Library.Add(libraryBook);
-			}
-
-			// needed for v3 => v4 upgrade
-			var toUpdate = DbContext.Library.Where(l => l.Account == null);
-			foreach (var u in toUpdate)
-			{
-				var item = importItems.FirstOrDefault(ii => ii.DtoItem.ProductId == u.Book.AudibleProductId);
-				if (item != null)
-					u.UpdateAccount(item.AccountId);
-			}
-
-			var qtyNew = newItems.Count;
-			return qtyNew;
-		}
-	}
-}

DtoImporterService/SeriesImporter.cs

@@ -1,63 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using AudibleApiDTOs;
-using DataLayer;
-using InternalUtilities;
-
-namespace DtoImporterService
-{
-	public class SeriesImporter : ItemsImporterBase
-	{
-		public SeriesImporter(LibationContext context) : base(context) { }
-
-		public override IEnumerable<Exception> Validate(IEnumerable<ImportItem> importItems) => new SeriesValidator().Validate(importItems.Select(i => i.DtoItem));
-
-		protected override int DoImport(IEnumerable<ImportItem> importItems)
-		{
-			// get distinct
-			var series = importItems
-				.Select(i => i.DtoItem)
-				.GetSeriesDistinct()
-				.ToList();
-
-			// load db existing => .Local
-			loadLocal_series(series);
-
-			// upsert
-			var qtyNew = upsertSeries(series);
-			return qtyNew;
-		}
-
-		private void loadLocal_series(List<AudibleApiDTOs.Series> series)
-		{
-			var seriesIds = series.Select(s => s.SeriesId).ToList();
-			var localIds = DbContext.Series.Local.Select(s => s.AudibleSeriesId).ToList();
-			var remainingSeriesIds = seriesIds
-				.Distinct()
-				.Except(localIds)
-				.ToList();
-
-			if (remainingSeriesIds.Any())
-				DbContext.Series.Where(s => remainingSeriesIds.Contains(s.AudibleSeriesId)).ToList();
-		}
-
-		private int upsertSeries(List<AudibleApiDTOs.Series> requestedSeries)
-		{
-			var qtyNew = 0;
-
-			foreach (var s in requestedSeries)
-			{
-				var series = DbContext.Series.Local.SingleOrDefault(c => c.AudibleSeriesId == s.SeriesId);
-				if (series is null)
-				{
-					series = DbContext.Series.Add(new DataLayer.Series(new AudibleSeriesId(s.SeriesId))).Entity;
-					qtyNew++;
-				}
-				series.UpdateName(s.SeriesName);
-			}
-
-			return qtyNew;
-		}
-	}
-}

FileLiberator/BackupBook.cs

@@ -1,65 +0,0 @@
-using System;
-using System.Linq;
-using System.Threading.Tasks;
-using DataLayer;
-using Dinah.Core.ErrorHandling;
-using FileManager;
-
-namespace FileLiberator
-{
-    /// <summary>
-    /// Download DRM book and decrypt audiobook files
-    /// 
-    /// Processes:
-    /// Download: download aax file: the DRM encrypted audiobook
-    /// Decrypt: remove DRM encryption from audiobook. Store final book
-    /// Backup: perform all steps (downloaded, decrypt) still needed to get final book
-    /// </summary>
-    public class BackupBook : IProcessable
-    {
-        public event EventHandler<LibraryBook> Begin;
-        public event EventHandler<string> StatusUpdate;
-        public event EventHandler<LibraryBook> Completed;
-
-        public DownloadBook DownloadBook { get; } = new DownloadBook();
-        public DecryptBook DecryptBook { get; } = new DecryptBook();
-		public DownloadPdf DownloadPdf { get; } = new DownloadPdf();
-
-		public bool Validate(LibraryBook libraryBook)
-            => !AudibleFileStorage.Audio.Exists(libraryBook.Book.AudibleProductId);
-
-		// do NOT use ConfigureAwait(false) on ProcessAsync()
-		// often calls events which prints to forms in the UI context
-		public async Task<StatusHandler> ProcessAsync(LibraryBook libraryBook)
-        {
-            Begin?.Invoke(this, libraryBook);
-
-            try
-			{
-				{
-					var statusHandler = await DownloadBook.TryProcessAsync(libraryBook);
-					if (statusHandler.HasErrors)
-						return statusHandler;
-				}
-
-				{
-					var statusHandler = await DecryptBook.TryProcessAsync(libraryBook);
-					if (statusHandler.HasErrors)
-						return statusHandler;
-				}
-
-				{
-					var statusHandler = await DownloadPdf.TryProcessAsync(libraryBook);
-					if (statusHandler.HasErrors)
-						return statusHandler;
-				}
-
-				return new StatusHandler();
-			}
-			finally
-            {
-                Completed?.Invoke(this, libraryBook);
-            }
-        }
-	}
-}

FileLiberator/DecryptBook.cs

@@ -1,207 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Threading.Tasks;
-using AaxDecrypter;
-using AudibleApi;
-using DataLayer;
-using Dinah.Core;
-using Dinah.Core.ErrorHandling;
-using FileManager;
-using InternalUtilities;
-
-namespace FileLiberator
-{
-    /// <summary>
-    /// Decrypt audiobook files
-    /// 
-    /// Processes:
-    /// Download: download aax file: the DRM encrypted audiobook
-    /// Decrypt: remove DRM encryption from audiobook. Store final book
-    /// Backup: perform all steps (downloaded, decrypt) still needed to get final book
-    /// </summary>
-    public class DecryptBook : IDecryptable
-    {
-        public event EventHandler<LibraryBook> Begin;
-        public event EventHandler<string> StatusUpdate;
-        public event EventHandler<string> DecryptBegin;
-
-        public event EventHandler<string> TitleDiscovered;
-        public event EventHandler<string> AuthorsDiscovered;
-        public event EventHandler<string> NarratorsDiscovered;
-        public event EventHandler<byte[]> CoverImageFilepathDiscovered;
-        public event EventHandler<int> UpdateProgress;
-
-        public event EventHandler<string> DecryptCompleted;
-        public event EventHandler<LibraryBook> Completed;
-
-        public bool Validate(LibraryBook libraryBook)
-            => AudibleFileStorage.AAX.Exists(libraryBook.Book.AudibleProductId)
-            && !AudibleFileStorage.Audio.Exists(libraryBook.Book.AudibleProductId);
-
-		// do NOT use ConfigureAwait(false) on ProcessAsync()
-		// often calls events which prints to forms in the UI context
-		public async Task<StatusHandler> ProcessAsync(LibraryBook libraryBook)
-        {
-            Begin?.Invoke(this, libraryBook);
-
-            try
-            {
-                var aaxFilename = AudibleFileStorage.AAX.GetPath(libraryBook.Book.AudibleProductId);
-
-                if (aaxFilename == null)
-                    return new StatusHandler { "aaxFilename parameter is null" };
-                if (!File.Exists(aaxFilename))
-                    return new StatusHandler { $"Cannot find AAX file: {aaxFilename}" };
-                if (AudibleFileStorage.Audio.Exists(libraryBook.Book.AudibleProductId))
-                    return new StatusHandler { "Cannot find decrypt. Final audio file already exists" };
-
-				var api = await AudibleApiActions.GetApiAsync(libraryBook.Account, libraryBook.Book.Locale);
-
-                var chapters = await downloadChapterNames(libraryBook, api);
-
-                var outputAudioFilename = await aaxToM4bConverterDecrypt(aaxFilename, libraryBook, chapters, api);
-
-                // decrypt failed
-                if (outputAudioFilename == null)
-                    return new StatusHandler { "Decrypt failed" };
-
-                var destinationDir = moveFilesToBooksDir(libraryBook.Book, outputAudioFilename);
-
-                var config = Configuration.Instance;
-                if (config.RetainAaxFiles)
-                {
-                    var newAaxFilename = FileUtility.GetValidFilename(
-                        destinationDir,
-                        Path.GetFileNameWithoutExtension(aaxFilename),
-                        "aax");
-                    File.Move(aaxFilename, newAaxFilename);
-                }
-                else
-                {
-                    Dinah.Core.IO.FileExt.SafeDelete(aaxFilename);
-                }
-
-                var finalAudioExists = AudibleFileStorage.Audio.Exists(libraryBook.Book.AudibleProductId);
-                if (!finalAudioExists)
-                    return new StatusHandler { "Cannot find final audio file after decryption" };
-
-                return new StatusHandler();
-            }
-            finally
-            {
-                Completed?.Invoke(this, libraryBook);
-            }
-        }
-
-        private static async Task<Chapters> downloadChapterNames(LibraryBook libraryBook, Api api)
-        {
-            try
-            {
-                var contentMetadata = await api.GetLibraryBookMetadataAsync(libraryBook.Book.AudibleProductId);
-                if (contentMetadata?.ChapterInfo is null)
-                    return null;
-
-                return new DownloadedChapters(contentMetadata.ChapterInfo);
-            }
-            catch
-            {
-                return null;
-            }
-        }
-
-        private async Task<string> aaxToM4bConverterDecrypt(string aaxFilename, LibraryBook libraryBook, Chapters chapters, Api api)
-        {
-            DecryptBegin?.Invoke(this, $"Begin decrypting {aaxFilename}");
-
-            try
-            {
-                using var persister = AudibleApiStorage.GetAccountsSettingsPersister();
-
-                var account = persister
-                    .AccountsSettings
-                    .GetAccount(libraryBook.Account, libraryBook.Book.Locale);
-
-                var converter = await AaxToM4bConverter.CreateAsync(aaxFilename, account.DecryptKey, api.GetActivationBytesAsync, chapters);
-                converter.AppName = "Libation";
-
-                TitleDiscovered?.Invoke(this, converter.tags.title);
-                AuthorsDiscovered?.Invoke(this, converter.tags.author);
-                NarratorsDiscovered?.Invoke(this, converter.tags.narrator);
-                CoverImageFilepathDiscovered?.Invoke(this, converter.coverBytes);
-
-                // override default which was set in CreateAsync
-                var proposedOutputFile = Path.Combine(AudibleFileStorage.DecryptInProgress, $"[{libraryBook.Book.AudibleProductId}].m4b");
-                converter.SetOutputFilename(proposedOutputFile);
-                converter.DecryptProgressUpdate += (s, progress) => UpdateProgress?.Invoke(this, progress);
-
-                // REAL WORK DONE HERE
-                var success = await Task.Run(() => converter.Run());
-
-                // decrypt failed
-                if (!success)
-                    return null;
-
-                account.DecryptKey = converter.decryptKey;
-
-                return converter.outputFileName;
-            }
-            finally
-            {
-                DecryptCompleted?.Invoke(this, $"Completed decrypting {aaxFilename}");
-            }
-        }
-
-        private static string moveFilesToBooksDir(Book product, string outputAudioFilename)
-		{
-			// create final directory. move each file into it. MOVE AUDIO FILE LAST
-			// new dir: safetitle_limit50char + " [" + productId + "]"
-
-			var destinationDir = AudibleFileStorage.Audio.GetDestDir(product.Title, product.AudibleProductId);
-			Directory.CreateDirectory(destinationDir);
-
-			var sortedFiles = getProductFilesSorted(product, outputAudioFilename);
-
-			var musicFileExt = Path.GetExtension(outputAudioFilename).Trim('.');
-
-            // audio filename: safetitle_limit50char + " [" + productId + "]." + audio_ext
-            var audioFileName = FileUtility.GetValidFilename(destinationDir, product.Title, musicFileExt, product.AudibleProductId);
-
-            foreach (var f in sortedFiles)
-            {
-                var dest
-                    = AudibleFileStorage.Audio.IsFileTypeMatch(f)
-                    ? audioFileName
-                    // non-audio filename: safetitle_limit50char + " [" + productId + "][" + audio_ext +"]." + non_audio_ext
-                    : FileUtility.GetValidFilename(destinationDir, product.Title, f.Extension, product.AudibleProductId, musicFileExt);
-
-                if (Path.GetExtension(dest).Trim('.').ToLower() == "cue")
-                    Cue.UpdateFileName(f, audioFileName);
-
-                File.Move(f.FullName, dest);
-			}
-
-            return destinationDir;
-        }
-
-		private static List<FileInfo> getProductFilesSorted(Book product, string outputAudioFilename)
-		{
-			// files are: temp path\author\[asin].ext
-			var m4bDir = new FileInfo(outputAudioFilename).Directory;
-			var files = m4bDir
-				.EnumerateFiles()
-				.Where(f => f.Name.ContainsInsensitive(product.AudibleProductId))
-				.ToList();
-
-			// move audio files to the end of the collection so these files are moved last
-			var musicFiles = files.Where(f => AudibleFileStorage.Audio.IsFileTypeMatch(f));
-			var sortedFiles = files
-				.Except(musicFiles)
-				.Concat(musicFiles)
-				.ToList();
-
-			return sortedFiles;
-		}
-	}
-}

FileLiberator/DownloadBook.cs

@@ -1,122 +0,0 @@
-using System;
-using System.IO;
-using System.Threading.Tasks;
-using AudibleApi;
-using DataLayer;
-using Dinah.Core;
-using Dinah.Core.ErrorHandling;
-using FileManager;
-using InternalUtilities;
-
-namespace FileLiberator
-{
-    /// <summary>
-    /// Download DRM book
-    /// 
-    /// Processes:
-    /// Download: download aax file: the DRM encrypted audiobook
-    /// Decrypt: remove DRM encryption from audiobook. Store final book
-    /// Backup: perform all steps (downloaded, decrypt) still needed to get final book
-    /// </summary>
-    public class DownloadBook : DownloadableBase
-    {
-		private const string SERVICE_UNAVAILABLE = "Content Delivery Companion Service is not available.";
-
-        public override bool Validate(LibraryBook libraryBook)
-            => !AudibleFileStorage.Audio.Exists(libraryBook.Book.AudibleProductId)
-            && !AudibleFileStorage.AAX.Exists(libraryBook.Book.AudibleProductId);
-
-		public override async Task<StatusHandler> ProcessItemAsync(LibraryBook libraryBook)
-		{
-			var tempAaxFilename = getDownloadPath(libraryBook);
-			var actualFilePath = await downloadBookAsync(libraryBook, tempAaxFilename);
-			moveBook(libraryBook, actualFilePath);
-			return verifyDownload(libraryBook);
-		}
-
-		private static string getDownloadPath(LibraryBook libraryBook)
-			=> FileUtility.GetValidFilename(
-				AudibleFileStorage.DownloadsInProgress,
-				libraryBook.Book.Title,
-				"aax",
-				libraryBook.Book.AudibleProductId);
-
-		private async Task<string> downloadBookAsync(LibraryBook libraryBook, string tempAaxFilename)
-		{
-			validate(libraryBook);
-
-			var api = await GetApiAsync(libraryBook);
-
-			var actualFilePath = await PerformDownloadAsync(
-				tempAaxFilename,
-				(p) => api.DownloadAaxWorkaroundAsync(libraryBook.Book.AudibleProductId, tempAaxFilename, p));
-
-			System.Threading.Thread.Sleep(100);
-			// if bad file download, a 0-33 byte file will be created
-			// if service unavailable, a 52 byte string will be saved as file
-			var length = new FileInfo(actualFilePath).Length;
-
-			if (length > 100)
-				return actualFilePath;
-
-			var contents = File.ReadAllText(actualFilePath);
-			File.Delete(actualFilePath);
-
-			var exMsg = contents.StartsWithInsensitive(SERVICE_UNAVAILABLE)
-				? SERVICE_UNAVAILABLE
-				: "Error downloading file";
-
-			var ex = new Exception(exMsg);
-			Serilog.Log.Logger.Error(ex, "Download error {@DebugInfo}", new
-			{
-				libraryBook.Book.Title,
-				libraryBook.Book.AudibleProductId,
-				libraryBook.Book.Locale,
-				Account = libraryBook.Account?.ToMask() ?? "[empty]",
-				tempAaxFilename,
-				actualFilePath,
-				length,
-				contents
-			});
-			throw ex;
-		}
-
-		private static void validate(LibraryBook libraryBook)
-		{
-			string errorString(string field)
-				=> $"{errorTitle()}\r\nCannot download book. {field} is not known. Try re-importing the account which owns this book.";
-
-			string errorTitle()
-			{
-				var title
-					= (libraryBook.Book.Title.Length > 53)
-					? $"{libraryBook.Book.Title.Truncate(50)}..."
-					: libraryBook.Book.Title;
-				var errorBookTitle = $"{title} [{libraryBook.Book.AudibleProductId}]";
-				return errorBookTitle;
-			};
-
-			if (string.IsNullOrWhiteSpace(libraryBook.Account))
-				throw new Exception(errorString("Account"));
-
-			if (string.IsNullOrWhiteSpace(libraryBook.Book.Locale))
-				throw new Exception(errorString("Locale"));
-		}
-
-		private void moveBook(LibraryBook libraryBook, string actualFilePath)
-		{
-			var newAaxFilename = FileUtility.GetValidFilename(
-				AudibleFileStorage.DownloadsFinal,
-				libraryBook.Book.Title,
-				"aax",
-				libraryBook.Book.AudibleProductId);
-			File.Move(actualFilePath, newAaxFilename);
-			Invoke_StatusUpdate($"Successfully downloaded. Moved to: {newAaxFilename}");
-		}
-
-		private static StatusHandler verifyDownload(LibraryBook libraryBook)
-			=> !AudibleFileStorage.AAX.Exists(libraryBook.Book.AudibleProductId)
-			? new StatusHandler { "Downloaded AAX file cannot be found" }
-			: new StatusHandler();
-	}
-}

FileLiberator/DownloadFile.cs

@@ -1,35 +0,0 @@
-using System;
-using System.Net.Http;
-using System.Threading.Tasks;
-using Dinah.Core.Net.Http;
-
-namespace FileLiberator
-{
-	// frustratingly copy pasta from DownloadableBase and DownloadPdf
-	public class DownloadFile : IDownloadable
-	{
-		public event EventHandler<string> DownloadBegin;
-		public event EventHandler<DownloadProgress> DownloadProgressChanged;
-		public event EventHandler<string> DownloadCompleted;
-
-		public async Task<string> PerformDownloadFileAsync(string downloadUrl, string proposedDownloadFilePath)
-		{
-			var client = new HttpClient();
-
-			var progress = new Progress<DownloadProgress>();
-			progress.ProgressChanged += (_, e) => DownloadProgressChanged?.Invoke(this, e);
-
-			DownloadBegin?.Invoke(this, proposedDownloadFilePath);
-
-			try
-			{
-				var actualDownloadedFilePath = await client.DownloadFileAsync(downloadUrl, proposedDownloadFilePath, progress);
-				return actualDownloadedFilePath;
-			}
-			finally
-			{
-				DownloadCompleted?.Invoke(this, proposedDownloadFilePath);
-			}
-		}
-	}
-}

FileLiberator/DownloadPdf.cs

@@ -1,62 +0,0 @@
-using System;
-using System.IO;
-using System.Linq;
-using System.Net.Http;
-using System.Threading.Tasks;
-using DataLayer;
-using Dinah.Core.ErrorHandling;
-using Dinah.Core.Net.Http;
-using FileManager;
-
-namespace FileLiberator
-{
-	public class DownloadPdf : DownloadableBase
-	{
-		public override bool Validate(LibraryBook libraryBook)
-			=> !string.IsNullOrWhiteSpace(getdownloadUrl(libraryBook))
-			&& !AudibleFileStorage.PDF.Exists(libraryBook.Book.AudibleProductId);
-
-		public override async Task<StatusHandler> ProcessItemAsync(LibraryBook libraryBook)
-		{
-			var proposedDownloadFilePath = getProposedDownloadFilePath(libraryBook);
-			await downloadPdfAsync(libraryBook, proposedDownloadFilePath);
-			return verifyDownload(libraryBook);
-		}
-
-		private static StatusHandler verifyDownload(LibraryBook libraryBook)
-			=> !AudibleFileStorage.PDF.Exists(libraryBook.Book.AudibleProductId)
-			? new StatusHandler { "Downloaded PDF cannot be found" }
-			: new StatusHandler();
-
-		private static string getProposedDownloadFilePath(LibraryBook libraryBook)
-		{
-			// if audio file exists, get it's dir. else return base Book dir
-			var existingPath = Path.GetDirectoryName(AudibleFileStorage.Audio.GetPath(libraryBook.Book.AudibleProductId));
-			var file = getdownloadUrl(libraryBook);
-
-			if (existingPath != null)
-				return Path.Combine(existingPath, Path.GetFileName(file));
-
-			var full = FileUtility.GetValidFilename(
-				AudibleFileStorage.PDF.StorageDirectory,
-				libraryBook.Book.Title,
-				Path.GetExtension(file),
-				libraryBook.Book.AudibleProductId);
-			return full;
-		}
-
-		private async Task downloadPdfAsync(LibraryBook libraryBook, string proposedDownloadFilePath)
-		{
-			var api = await GetApiAsync(libraryBook);
-			var downloadUrl = await api.GetPdfDownloadLinkAsync(libraryBook.Book.AudibleProductId);
-
-			var client = new HttpClient();
-			var actualDownloadedFilePath = await PerformDownloadAsync(
-				proposedDownloadFilePath,
-				(p) => client.DownloadFileAsync(downloadUrl, proposedDownloadFilePath, p));
-		}
-
-		private static string getdownloadUrl(LibraryBook libraryBook)
-			=> libraryBook?.Book?.Supplements?.FirstOrDefault()?.Url;
-	}
-}

FileLiberator/DownloadableBase.cs

@@ -1,64 +0,0 @@
-using System;
-using System.Threading.Tasks;
-using DataLayer;
-using Dinah.Core.ErrorHandling;
-using Dinah.Core.Net.Http;
-
-namespace FileLiberator
-{
-	public abstract class DownloadableBase : IDownloadableProcessable
-	{
-		public event EventHandler<LibraryBook> Begin;
-		public event EventHandler<LibraryBook> Completed;
-
-		public event EventHandler<string> DownloadBegin;
-		public event EventHandler<DownloadProgress> DownloadProgressChanged;
-		public event EventHandler<string> DownloadCompleted;
-
-		public event EventHandler<string> StatusUpdate;
-		protected void Invoke_StatusUpdate(string message) => StatusUpdate?.Invoke(this, message);
-
-        public abstract bool Validate(LibraryBook libraryBook);
-
-        public abstract Task<StatusHandler> ProcessItemAsync(LibraryBook libraryBook);
-
-		// do NOT use ConfigureAwait(false) on ProcessAsync()
-		// often calls events which prints to forms in the UI context
-		public async Task<StatusHandler> ProcessAsync(LibraryBook libraryBook)
-        {
-            Begin?.Invoke(this, libraryBook);
-
-            try
-            {
-                return await ProcessItemAsync(libraryBook);
-            }
-            finally
-            {
-                Completed?.Invoke(this, libraryBook);
-            }
-        }
-
-		protected static Task<AudibleApi.Api> GetApiAsync(LibraryBook libraryBook)
-			=> InternalUtilities.AudibleApiActions.GetApiAsync(libraryBook.Account, libraryBook.Book.Locale);
-
-		protected async Task<string> PerformDownloadAsync(string proposedDownloadFilePath, Func<Progress<DownloadProgress>, Task<string>> func)
-		{
-			var progress = new Progress<DownloadProgress>();
-			progress.ProgressChanged += (_, e) => DownloadProgressChanged?.Invoke(this, e);
-
-			DownloadBegin?.Invoke(this, proposedDownloadFilePath);
-
-			try
-			{
-				var result = await func(progress);
-				StatusUpdate?.Invoke(this, result);
-
-				return result;
-			}
-			finally
-			{
-				DownloadCompleted?.Invoke(this, proposedDownloadFilePath);
-			}
-		}
-	}
-}

FileLiberator/DownloadedChapters.cs

@@ -1,22 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Globalization;
-using System.Linq;
-using System.Text;
-using AaxDecrypter;
-using AudibleApiDTOs;
-using Dinah.Core.Diagnostics;
-
-
-namespace FileLiberator
-{
-    public class DownloadedChapters : Chapters
-    {
-        public DownloadedChapters(ChapterInfo chapterInfo)
-        {
-            AddChapters(chapterInfo.Chapters
-                .Select(c => new AaxDecrypter.Chapter(c.StartOffsetMs / 1000d, (c.StartOffsetMs + c.LengthMs) / 1000d, c.Title)));
-        }
-    }
-}

FileLiberator/FileLiberator.csproj

@@ -1,16 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\..\Dinah.Core\Dinah.Core\Dinah.Core.csproj" />
-    <ProjectReference Include="..\AaxDecrypter\AaxDecrypter.csproj" />
-    <ProjectReference Include="..\ApplicationServices\ApplicationServices.csproj" />
-    <ProjectReference Include="..\DataLayer\DataLayer.csproj" />
-    <ProjectReference Include="..\FileManager\FileManager.csproj" />
-    <ProjectReference Include="..\InternalUtilities\InternalUtilities.csproj" />
-  </ItemGroup>
-
-</Project>

FileLiberator/IDecryptable.cs

@@ -1,17 +0,0 @@
-using System;
-
-namespace FileLiberator
-{
-    public interface IDecryptable : IProcessable
-    {
-        event EventHandler<string> DecryptBegin;
-
-        event EventHandler<string> TitleDiscovered;
-        event EventHandler<string> AuthorsDiscovered;
-        event EventHandler<string> NarratorsDiscovered;
-        event EventHandler<byte[]> CoverImageFilepathDiscovered;
-        event EventHandler<int> UpdateProgress;
-
-        event EventHandler<string> DecryptCompleted;
-    }
-}

FileLiberator/IDownloadable.cs

@@ -1,12 +0,0 @@
-using System;
-using Dinah.Core.Net.Http;
-
-namespace FileLiberator
-{
-    public interface IDownloadable 
-    {
-        event EventHandler<string> DownloadBegin;
-        event EventHandler<DownloadProgress> DownloadProgressChanged;
-        event EventHandler<string> DownloadCompleted;
-    }
-}

FileLiberator/IDownloadableProcessable.cs

@@ -1,4 +0,0 @@
-namespace FileLiberator
-{
-    public interface IDownloadableProcessable : IDownloadable, IProcessable { }
-}

FileLiberator/IProcessable.cs

@@ -1,23 +0,0 @@
-using System;
-using System.Threading.Tasks;
-using DataLayer;
-using Dinah.Core.ErrorHandling;
-
-namespace FileLiberator
-{
-    public interface IProcessable
-    {
-        event EventHandler<LibraryBook> Begin;
-
-        /// <summary>General string message to display. DON'T rely on this for success, failure, or control logic</summary>
-        event EventHandler<string> StatusUpdate;
-
-        event EventHandler<LibraryBook> Completed;
-
-		/// <returns>True == Valid</returns>
-		bool Validate(LibraryBook libraryBook);
-
-        /// <returns>True == success</returns>
-        Task<StatusHandler> ProcessAsync(LibraryBook libraryBook);
-    }
-}

FileLiberator/IProcessableExt.cs

@@ -1,66 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using ApplicationServices;
-using DataLayer;
-using Dinah.Core;
-using Dinah.Core.ErrorHandling;
-
-namespace FileLiberator
-{
-    public static class IProcessableExt
-    {
-        //
-        // DO NOT USE ConfigureAwait(false) WITH ProcessAsync() unless ensuring ProcessAsync() implementation is cross-thread compatible
-        // ProcessAsync() often does a lot with forms in the UI context
-        //
-
-
-        // when used in foreach: stateful. deferred execution
-        public static IEnumerable<LibraryBook> GetValidLibraryBooks(this IProcessable processable)
-            => DbContexts.GetContext()
-            .GetLibrary_Flat_NoTracking()
-            .Where(libraryBook => processable.Validate(libraryBook));
-
-        public static LibraryBook GetSingleLibraryBook(string productId)
-        {
-            using var context = DbContexts.GetContext();
-            var libraryBook = context
-                .Library
-                .GetLibrary()
-                .SingleOrDefault(lb => lb.Book.AudibleProductId == productId);
-            return libraryBook;
-        }
-
-        public static async Task<StatusHandler> ProcessSingleAsync(this IProcessable processable, LibraryBook libraryBook)
-        {
-            if (!processable.Validate(libraryBook))
-                return new StatusHandler { "Validation failed" };
-
-            return await processable.ProcessBookAsync_NoValidation(libraryBook);
-        }
-
-        public static async Task<StatusHandler> ProcessBookAsync_NoValidation(this IProcessable processable, LibraryBook libraryBook)
-        {
-            Serilog.Log.Logger.Information("Begin " + nameof(ProcessBookAsync_NoValidation) + " {@DebugInfo}", new
-            {
-                libraryBook.Book.Title,
-                libraryBook.Book.AudibleProductId,
-                libraryBook.Book.Locale,
-                Account = libraryBook.Account?.ToMask() ?? "[empty]"
-            });
-
-            var status
-                = (await processable.ProcessAsync(libraryBook))
-                ?? new StatusHandler { "Processable should never return a null status" };
-
-            return status;
-        }
-
-		public static async Task<StatusHandler> TryProcessAsync(this IProcessable processable, LibraryBook libraryBook)
-			=> processable.Validate(libraryBook)
-			? await processable.ProcessAsync(libraryBook)
-			: new StatusHandler();
-	}
-}

FileManager/AudibleFileStorage.cs

@@ -1,179 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Text.RegularExpressions;
-using Dinah.Core;
-using Dinah.Core.Collections.Generic;
-
-namespace FileManager
-{
-    // could add images here, but for now images are stored in a well-known location
-    public enum FileType { Unknown, Audio, AAX, PDF }
-
-	/// <summary>
-	/// Files are large. File contents are never read by app.
-	/// Paths are varied.
-	/// Files are written during download/decrypt/backup/liberate.
-	/// Paths are read at app launch and during download/decrypt/backup/liberate.
-	/// Many files are often looked up at once
-	/// </summary>
-	public abstract class AudibleFileStorage : Enumeration<AudibleFileStorage>
-	{
-		public abstract string[] Extensions { get; }
-		public abstract string StorageDirectory { get; }
-
-		#region static
-		public static AudioFileStorage Audio { get; } = new AudioFileStorage();
-		public static AudibleFileStorage AAX { get; } = new AaxFileStorage();
-		public static AudibleFileStorage PDF { get; } = new PdfFileStorage();
-
-		public static string DownloadsInProgress
-        {
-            get
-            {
-                if (!Configuration.Instance.DownloadsInProgressEnum.In("WinTemp", "LibationFiles"))
-                    Configuration.Instance.DownloadsInProgressEnum = "WinTemp";
-                var AaxRootDir
-                    = Configuration.Instance.DownloadsInProgressEnum == "WinTemp"
-                    ? Configuration.WinTemp
-                    : Configuration.Instance.LibationFiles;
-
-                return Directory.CreateDirectory(Path.Combine(AaxRootDir, "DownloadsInProgress")).FullName;
-            }
-        }
-
-        public static string DecryptInProgress
-        {
-            get
-            {
-                if (!Configuration.Instance.DecryptInProgressEnum.In("WinTemp", "LibationFiles"))
-                    Configuration.Instance.DecryptInProgressEnum = "WinTemp";
-
-                var M4bRootDir
-                    = Configuration.Instance.DecryptInProgressEnum == "WinTemp"
-                    ? Configuration.WinTemp
-                    : Configuration.Instance.LibationFiles;
-
-                return Directory.CreateDirectory(Path.Combine(M4bRootDir, "DecryptInProgress")).FullName;
-            }
-        }
-
-        // not customizable. don't move to config
-        public static string DownloadsFinal => new DirectoryInfo(Configuration.Instance.LibationFiles).CreateSubdirectory("DownloadsFinal").FullName;
-
-        public static string BooksDirectory
-        {
-            get
-            {
-                if (string.IsNullOrWhiteSpace(Configuration.Instance.Books))
-                    Configuration.Instance.Books = Path.Combine(Configuration.Instance.LibationFiles, "Books");
-                return Directory.CreateDirectory(Configuration.Instance.Books).FullName;
-            }
-        }
-        #endregion
-
-        #region instance
-        public FileType FileType => (FileType)Value;
-
-		private IEnumerable<string> extensions_noDots { get; }
-		private string extAggr { get; }
-
-        protected AudibleFileStorage(FileType fileType) : base((int)fileType, fileType.ToString())
-		{
-			extensions_noDots = Extensions.Select(ext => ext.Trim('.')).ToList();
-			extAggr = extensions_noDots.Aggregate((a, b) => $"{a}|{b}");
-		}
-
-        /// <summary>
-        /// Example for full books:
-        /// Search recursively in _books directory. Full book exists if either are true
-        /// - a directory name has the product id and an audio file is immediately inside
-        /// - any audio filename contains the product id
-        /// </summary>
-        public bool Exists(string productId) => GetPath(productId) != null;
-
-		public string GetPath(string productId)
-        {
-            var cachedFile = FilePathCache.GetPath(productId, FileType);
-            if (cachedFile != null)
-                return cachedFile;
-
-            var firstOrNull =
-				Directory
-				.EnumerateFiles(StorageDirectory, "*.*", SearchOption.AllDirectories)
-				.FirstOrDefault(s => Regex.IsMatch(s, $@"{productId}.*?\.({extAggr})$", RegexOptions.IgnoreCase));
-
-			if (firstOrNull is null)
-				return null;
-
-			FilePathCache.Upsert(productId, FileType, firstOrNull);
-			return firstOrNull;
-        }
-
-        public string GetDestDir(string title, string asin)
-        {
-            // to prevent the paths from getting too long, we don't need after the 1st ":" for the folder
-            var underscoreIndex = title.IndexOf(':');
-            var titleDir
-                = underscoreIndex < 4
-                ? title
-                : title.Substring(0, underscoreIndex);
-            var finalDir = FileUtility.GetValidFilename(StorageDirectory, titleDir, null, asin);
-            return finalDir;
-        }
-
-        public bool IsFileTypeMatch(FileInfo fileInfo)
-            => extensions_noDots.ContainsInsensative(fileInfo.Extension.Trim('.'));
-        #endregion
-    }
-
-    public class AudioFileStorage : AudibleFileStorage
-    {
-        public const string SKIP_FILE_EXT = "libhack";
-
-		public override string[] Extensions { get; } = new[] { "m4b", "mp3", "aac", "mp4", "m4a", "ogg", "flac", SKIP_FILE_EXT };
-
-        // we always want to use the latest config value, therefore
-        // - DO use 'get' arrow "=>"
-        // - do NOT use assign "="
-        public override string StorageDirectory => BooksDirectory;
-
-        public AudioFileStorage() : base(FileType.Audio) { }
-
-        public string CreateSkipFile(string title, string asin, string contents = null)
-        {
-            var destinationDir = GetDestDir(title, asin);
-            Directory.CreateDirectory(destinationDir);
-
-            var path = FileUtility.GetValidFilename(destinationDir, title, SKIP_FILE_EXT, asin);
-            File.WriteAllText(path, contents ?? string.Empty);
-
-            return path;
-        }
-    }
-
-    public class AaxFileStorage : AudibleFileStorage
-    {
-        public override string[] Extensions { get; } = new[] { "aax" };
-
-        // we always want to use the latest config value, therefore
-        // - DO use 'get' arrow "=>"
-        // - do NOT use assign "="
-        public override string StorageDirectory => DownloadsFinal;
-
-        public AaxFileStorage() : base(FileType.AAX) { }
-    }
-
-    public class PdfFileStorage : AudibleFileStorage
-    {
-		public override string[] Extensions { get; } = new[] { "pdf", "zip" };
-
-        // we always want to use the latest config value, therefore
-        // - DO use 'get' arrow "=>"
-        // - do NOT use assign "="
-        public override string StorageDirectory => BooksDirectory;
-
-        public PdfFileStorage() : base(FileType.PDF) { }
-    }
-}

FileManager/Configuration.cs

@@ -1,190 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.IO;
-using System.Linq;
-using Dinah.Core;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
-
-namespace FileManager
-{
-    public class Configuration
-    {
-        // settings will be persisted when all are true
-        // - property (not field)
-        // - string
-        // - public getter
-        // - public setter
-
-        #region // properties to test reflection
-        /*
-        // field should NOT be populated
-        public string TestField;
-        // int should NOT be populated
-        public int TestInt { get; set; }
-        // read-only should NOT be populated
-        public string TestGet { get; } // get only: should NOT get auto-populated
-        // set-only should NOT be populated
-        public string TestSet { private get; set; }
-
-        // get and set: SHOULD be auto-populated
-        public string TestGetSet { get; set; }
-        */
-        #endregion
-
-        private PersistentDictionary persistentDictionary;
-
-        public bool FilesExist
-            => File.Exists(APPSETTINGS_JSON)
-            && File.Exists(SettingsFilePath)
-            && Directory.Exists(LibationFiles)
-            && Directory.Exists(Books);
-
-        public string SettingsFilePath => Path.Combine(LibationFiles, "Settings.json");
-
-        [Description("Location for book storage. Includes destination of newly liberated books")]
-        public string Books
-        {
-            get => persistentDictionary.GetString(nameof(Books));
-            set => persistentDictionary.Set(nameof(Books), value);
-        }
-
-        private const string APP_DIR = "AppDir";
-        public static string AppDir { get; } = Path.GetFullPath(Path.Combine(Path.GetDirectoryName(Exe.FileLocationOnDisk), LIBATION_FILES));
-        public static string MyDocs { get; } = Path.GetFullPath(Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments), LIBATION_FILES));
-        public static string WinTemp { get; } = Path.GetFullPath(Path.Combine(Path.GetTempPath(), "Libation"));
-
-        private Dictionary<string, string> wellKnownPaths { get; } = new Dictionary<string, string>
-        {
-            [APP_DIR] = AppDir,
-            ["MyDocs"] = MyDocs,
-            ["WinTemp"] = WinTemp
-        };
-        private string libationFilesPathCache;
-
-        // default setting and directory creation occur in class responsible for files.
-        // config class is only responsible for path. not responsible for setting defaults, dir validation, or dir creation
-        // exceptions: appsettings.json, LibationFiles dir, Settings.json
-
-        // temp/working dir(s) should be outside of dropbox
-        [Description("Temporary location of files while they're in process of being downloaded.\r\nWhen download is complete, the final file will be in [LibationFiles]\\DownloadsFinal")]
-        public string DownloadsInProgressEnum
-        {
-            get => persistentDictionary.GetString(nameof(DownloadsInProgressEnum));
-            set => persistentDictionary.Set(nameof(DownloadsInProgressEnum), value);
-        }
-
-        // temp/working dir(s) should be outside of dropbox
-        [Description("Temporary location of files while they're in process of being decrypted.\r\nWhen decryption is complete, the final file will be in Books location")]
-        public string DecryptInProgressEnum
-        {
-            get => persistentDictionary.GetString(nameof(DecryptInProgressEnum));
-            set => persistentDictionary.Set(nameof(DecryptInProgressEnum), value);
-        }
-
-        [Description("Retain .aax files after decrypting?")]
-        public bool RetainAaxFiles
-        {
-            get => persistentDictionary.Get<bool>(nameof(RetainAaxFiles));
-            set => persistentDictionary.Set(nameof(RetainAaxFiles), value);
-        }
-
-        // note: any potential file manager static ctors can't compensate if storage dir is changed at run time via settings. this is partly bad architecture. but the side effect is desirable. if changing LibationFiles location: restart app
-
-        // singleton stuff
-        public static Configuration Instance { get; } = new Configuration();
-        private Configuration() { }
-
-        private const string APPSETTINGS_JSON = "appsettings.json";
-        private const string LIBATION_FILES = "LibationFiles";
-
-        [Description("Location for storage of program-created files")]
-        public string LibationFiles => libationFilesPathCache ?? getLibationFiles();
-        private string getLibationFiles()
-        {
-            var value = getLiberationFilesSettingFromJson();
-
-            // this looks weird but is correct for translating wellKnownPaths
-            if (wellKnownPaths.ContainsKey(value))
-                value = wellKnownPaths[value];
-
-            // must write here before SettingsFilePath in next step reads cache
-            libationFilesPathCache = value;
-
-            // load json values into memory. create if not exists
-            persistentDictionary = new PersistentDictionary(SettingsFilePath);
-
-            return libationFilesPathCache;
-        }
-        private string getLiberationFilesSettingFromJson()
-        {
-            try
-            {
-                if (File.Exists(APPSETTINGS_JSON))
-                {
-                    var appSettingsContents = File.ReadAllText(APPSETTINGS_JSON);
-                    var jObj = JObject.Parse(appSettingsContents);
-
-                    if (jObj.ContainsKey(LIBATION_FILES))
-                    {
-                        var value = jObj[LIBATION_FILES].Value<string>();
-
-                        // do not check whether directory exists. special/meta directory (eg: AppDir) is valid
-                        if (!string.IsNullOrWhiteSpace(value))
-                            return value;
-                    }
-                }
-            }
-            catch { }
-
-            File.WriteAllText(APPSETTINGS_JSON, new JObject { { LIBATION_FILES, APP_DIR } }.ToString(Formatting.Indented));
-            return APP_DIR;
-        }
-
-        public object GetObject(string propertyName) => persistentDictionary.GetObject(propertyName);
-        public void SetObject(string propertyName, object newValue) => persistentDictionary.Set(propertyName, newValue);
-        public void SetWithJsonPath(string jsonPath, string propertyName, string newValue) => persistentDictionary.SetWithJsonPath(jsonPath, propertyName, newValue);
-
-        public static string GetDescription(string propertyName)
-        {
-            var attribute = typeof(Configuration)
-                .GetProperty(propertyName)
-                ?.GetCustomAttributes(typeof(DescriptionAttribute), true)
-                .SingleOrDefault()
-                as DescriptionAttribute;
-
-            return attribute?.Description;
-        }
-
-        public bool TrySetLibationFiles(string directory)
-        {
-            if (!Directory.Exists(directory) && !wellKnownPaths.ContainsKey(directory))
-                return false;
-
-            // if moving from default, delete old settings file and dir (if empty)
-            if (LibationFiles.EqualsInsensitive(AppDir))
-            {
-                File.Delete(SettingsFilePath);
-                System.Threading.Thread.Sleep(100);
-                if (!Directory.EnumerateDirectories(AppDir).Any() && !Directory.EnumerateFiles(AppDir).Any())
-                    Directory.Delete(AppDir);
-            }
-
-
-            libationFilesPathCache = null;
-
-
-            var contents = File.ReadAllText(APPSETTINGS_JSON);
-            var jObj = JObject.Parse(contents);
-
-            jObj[LIBATION_FILES] = directory;
-
-            var output = JsonConvert.SerializeObject(jObj, Formatting.Indented);
-            File.WriteAllText(APPSETTINGS_JSON, output);
-
-
-            return true;
-        }
-    }
-}

FileManager/FileManager.csproj

@@ -1,17 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="HtmlAgilityPack" Version="1.11.33" />
-    <PackageReference Include="Octokit" Version="0.50.0" />
-    <PackageReference Include="Polly" Version="7.2.2" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\..\Dinah.Core\Dinah.Core\Dinah.Core.csproj" />
-  </ItemGroup>
-
-</Project>

FileManager/FilePathCache.cs

@@ -1,94 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using Dinah.Core.Collections.Immutable;
-using Newtonsoft.Json;
-
-namespace FileManager
-{
-	public static class FilePathCache
-    {
-        internal class CacheEntry
-        {
-            public string Id { get; set; }
-            public FileType FileType { get; set; }
-            public string Path { get; set; }
-        }
-
-        static Cache<CacheEntry> cache { get; } = new Cache<CacheEntry>();
-
-        public static string JsonFile => Path.Combine(Configuration.Instance.LibationFiles, "FilePaths.json");
-
-        static FilePathCache()
-        {
-			// load json into memory. if file doesn't exist, nothing to do. save() will create if needed
-			if (File.Exists(JsonFile))
-			{
-				var list = JsonConvert.DeserializeObject<List<CacheEntry>>(File.ReadAllText(JsonFile));
-				cache = new Cache<CacheEntry>(list);
-			}
-        }
-
-        public static bool Exists(string id, FileType type) => GetPath(id, type) != null;
-
-        public static string GetPath(string id, FileType type)
-        {
-            var entry = cache.SingleOrDefault(i => i.Id == id && i.FileType == type);
-
-            if (entry == null)
-                return null;
-
-            if (!File.Exists(entry.Path))
-            {
-                remove(entry);
-                return null;
-            }
-
-            return entry.Path;
-        }
-
-        private static void remove(CacheEntry entry)
-		{
-			cache.Remove(entry);
-			save();
-		}
-
-        public static void Upsert(string id, FileType type, string path)
-        {
-            if (!File.Exists(path))
-                throw new FileNotFoundException("Cannot add path to cache. File not found");
-
-			var entry = cache.SingleOrDefault(i => i.Id == id && i.FileType == type);
-
-			if (entry is null)
-				cache.Add(new CacheEntry { Id = id, FileType = type, Path = path });
-			else
-				entry.Path = path;
-
-			save();
-		}
-
-		// cache is thread-safe and lock free. but file saving is not
-		private static object locker { get; } = new object();
-		private static void save()
-		{
-			// create json if not exists
-			static void resave() => File.WriteAllText(JsonFile, JsonConvert.SerializeObject(cache.ToList(), Formatting.Indented));
-
-			lock (locker)
-			{
-				try { resave(); }
-				catch (IOException)
-				{
-					try { resave(); }
-					catch (IOException ex)
-					{
-						Serilog.Log.Logger.Error(ex, "Error saving FilePaths.json");
-						throw;
-					}
-				}
-			}
-        }
-    }
-}

FileManager/FileUtility.cs

@@ -1,52 +0,0 @@
-using System;
-using System.IO;
-
-namespace FileManager
-{
-    public static class FileUtility
-    {
-        public static string GetValidFilename(string dirFullPath, string filename, string extension, params string[] metadataSuffixes)
-        {
-            if (string.IsNullOrWhiteSpace(dirFullPath))
-                throw new ArgumentException($"{nameof(dirFullPath)} may not be null or whitespace", nameof(dirFullPath));
-
-            // file max length = 255. dir max len = 247
-
-            // sanitize
-            filename = GetAsciiTag(filename);
-            // manage length
-            if (filename.Length > 50)
-                filename = filename.Substring(0, 50) + "[...]";
-
-            // append id. it is 10 or 14 char in the common cases
-            if (metadataSuffixes != null && metadataSuffixes.Length > 0)
-                filename += " [" + string.Join("][", metadataSuffixes) + "]";
-
-            // this method may also be used for directory names, so no guarantee of extension
-            if (!string.IsNullOrWhiteSpace(extension))
-                extension = '.' + extension.Trim('.');
-
-            // ensure uniqueness
-            var fullfilename = Path.Combine(dirFullPath, filename + extension);
-            var i = 0;
-            while (File.Exists(fullfilename))
-                fullfilename = Path.Combine(dirFullPath, filename + $" ({++i})" + extension);
-
-            return fullfilename;
-        }
-
-        public static string GetAsciiTag(string property)
-        {
-            if (property == null)
-                return "";
-
-            // omit characters which are invalid. EXCEPTION: change colon to underscore
-            property = property.Replace(':', '_');
-
-            // GetInvalidFileNameChars contains everything in GetInvalidPathChars plus ':', '*', '?', '\\', '/'
-            foreach (var ch in Path.GetInvalidFileNameChars())
-                property = property.Replace(ch.ToString(), "");
-            return property;
-        }
-    }
-}

FileManager/PersistentDictionary.cs

@@ -1,129 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
-
-namespace FileManager
-{
-    public class PersistentDictionary
-    {
-        public string Filepath { get; }
-
-        // optimize for strings. expectation is most settings will be strings and a rare exception will be something else
-        private Dictionary<string, string> stringCache { get; } = new Dictionary<string, string>();
-        private Dictionary<string, object> objectCache { get; } = new Dictionary<string, object>();
-
-        public PersistentDictionary(string filepath)
-        {
-            Filepath = filepath;
-
-            if (File.Exists(Filepath))
-                return;
-
-            // will create any missing directories, incl subdirectories. if all already exist: no action
-            Directory.CreateDirectory(Path.GetDirectoryName(filepath));
-
-            File.WriteAllText(Filepath, "{}");
-            System.Threading.Thread.Sleep(100);
-        }
-
-        public string GetString(string propertyName)
-        {
-            if (!stringCache.ContainsKey(propertyName))
-            {
-                var jObject = readFile();
-                stringCache[propertyName] = jObject.ContainsKey(propertyName) ? jObject[propertyName].Value<string>() : null;
-            }
-
-            return stringCache[propertyName];
-        }
-
-        public T Get<T>(string propertyName)
-        {
-            var o = GetObject(propertyName);
-            if (o is null) return default;
-            if (o is JToken jt) return jt.Value<T>();
-            return (T)o;
-        }
-
-        public object GetObject(string propertyName)
-        {
-            if (!objectCache.ContainsKey(propertyName))
-            {
-                var jObject = readFile();
-                objectCache[propertyName] = jObject.ContainsKey(propertyName) ? jObject[propertyName].Value<object>() : null;
-            }
-
-            return objectCache[propertyName];
-        }
-
-        private object locker { get; } = new object();
-        public void Set(string propertyName, string newValue)
-        {
-            // only do this check in string cache, NOT object cache
-            if (stringCache[propertyName] == newValue)
-                return;
-
-            // set cache
-            stringCache[propertyName] = newValue;
-
-            writeFile(propertyName, newValue);
-        }
-
-        public void Set(string propertyName, object newValue)
-        {
-            // set cache
-            objectCache[propertyName] = newValue;
-
-            var parsedNewValue = JToken.Parse(JsonConvert.SerializeObject(newValue));
-            writeFile(propertyName, parsedNewValue);
-        }
-
-        private void writeFile(string propertyName, JToken newValue)
-        {
-            try
-            {
-                var str = newValue?.ToString();
-                var formattedValue
-                    = str is null ? "[null]"
-                    : string.IsNullOrEmpty(str) ? "[empty]"
-                    : string.IsNullOrWhiteSpace(str) ? $"[whitespace. Length={str.Length}]"
-                    : str.Length > 100 ? $"[Length={str.Length}] {str[0..50]}...{str[^50..^0]}"
-                    : str;
-                Serilog.Log.Logger.Information($"Config changed. {propertyName}={formattedValue}");
-            }
-            catch { }
-
-            // write new setting to file
-            lock (locker)
-            {
-                var jObject = readFile();
-                jObject[propertyName] = newValue;
-                File.WriteAllText(Filepath, JsonConvert.SerializeObject(jObject, Formatting.Indented));
-            }
-        }
-
-        // special case: no caching. no logging
-        public void SetWithJsonPath(string jsonPath, string propertyName, string newValue)
-        {
-            lock (locker)
-            {
-                var jObject = readFile();
-                var token = jObject.SelectToken(jsonPath);
-                var debug_oldValue = (string)token[propertyName];
-
-                token[propertyName] = newValue;
-                File.WriteAllText(Filepath, JsonConvert.SerializeObject(jObject, Formatting.Indented));
-            }
-        }
-
-        private JObject readFile()
-        {
-            var settingsJsonContents = File.ReadAllText(Filepath);
-            var jObject = JsonConvert.DeserializeObject<JObject>(settingsJsonContents);
-            return jObject;
-        }
-    }
-}

FileManager/PictureStorage.cs

@@ -1,113 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Net.Http;
-
-namespace FileManager
-{
-	public enum PictureSize { _80x80, _300x300, _500x500 }
-	public struct PictureDefinition
-	{
-		public string PictureId { get; }
-		public PictureSize Size { get; }
-
-		public PictureDefinition(string pictureId, PictureSize pictureSize)
-		{
-			PictureId = pictureId;
-			Size = pictureSize;
-		}
-	}
-    public static class PictureStorage
-    {
-        // not customizable. don't move to config
-        private static string ImagesDirectory { get; }
-            = new DirectoryInfo(Configuration.Instance.LibationFiles).CreateSubdirectory("Images").FullName;
-
-		private static string getPath(PictureDefinition def)
-			=> Path.Combine(ImagesDirectory, $"{def.PictureId}{def.Size}.jpg");
-
-		private static System.Timers.Timer timer { get; }
-		static PictureStorage()
-		{
-			timer = new System.Timers.Timer(700)
-			{
-				AutoReset = true,
-				Enabled = true
-			};
-			timer.Elapsed += (_, __) => timerDownload();
-		}
-
-		public static event EventHandler<string> PictureCached;
-
-		private static Dictionary<PictureDefinition, byte[]> cache { get; } = new Dictionary<PictureDefinition, byte[]>();
-		public static (bool isDefault, byte[] bytes) GetPicture(PictureDefinition def)
-		{
-			if (!cache.ContainsKey(def))
-			{
-				var path = getPath(def);
-				cache[def]
-					= File.Exists(path)
-					? File.ReadAllBytes(path)
-					: null;
-			}
-			return (cache[def] == null, cache[def] ?? getDefaultImage(def.Size));
-		}
-
-		private static Dictionary<PictureSize, byte[]> defaultImages { get; } = new Dictionary<PictureSize, byte[]>();
-		public static void SetDefaultImage(PictureSize pictureSize, byte[] bytes)
-			=> defaultImages[pictureSize] = bytes;
-		private static byte[] getDefaultImage(PictureSize size)
-			=> defaultImages.ContainsKey(size)
-			? defaultImages[size]
-			: new byte[0];
-
-		// necessary to avoid IO errors. ReadAllBytes and WriteAllBytes can conflict in some cases, esp when debugging
-		private static bool isProcessing;
-		private static void timerDownload()
-		{
-			// must live outside try-catch, else 'finally' can reset another thread's lock
-			if (isProcessing)
-				return;
-
-			try
-			{
-				isProcessing = true;
-
-				var def = cache
-					.Where(kvp => kvp.Value is null)
-					.Select(kvp => kvp.Key)
-					// 80x80 should be 1st since it's enum value == 0
-					.OrderBy(d => d.PictureId)
-					.FirstOrDefault();
-
-				// no more null entries. all requsted images are cached
-				if (string.IsNullOrWhiteSpace(def.PictureId))
-					return;
-
-				var bytes = downloadBytes(def);
-				saveFile(def, bytes);
-				cache[def] = bytes;
-
-				PictureCached?.Invoke(nameof(PictureStorage), def.PictureId);
-			}
-			finally
-			{
-				isProcessing = false;
-			}
-		}
-
-		private static HttpClient imageDownloadClient { get; } = new HttpClient();
-		private static byte[] downloadBytes(PictureDefinition def)
-		{
-			var sz = def.Size.ToString().Split('x')[1];
-			return imageDownloadClient.GetByteArrayAsync("ht" + $"tps://images-na.ssl-images-amazon.com/images/I/{def.PictureId}._SL{sz}_.jpg").Result;
-		}
-
-		private static void saveFile(PictureDefinition def, byte[] bytes)
-		{
-			var path = getPath(def);
-			File.WriteAllBytes(path, bytes);
-		}
-	}
-}

FileManager/QuickFilters.cs

@@ -1,116 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using Dinah.Core.Collections.Generic;
-using Newtonsoft.Json;
-
-namespace FileManager
-{
-    public static class QuickFilters
-    {
-        internal class FilterState
-        {
-            public bool UseDefault { get; set; }
-            public List<string> Filters { get; set; } = new List<string>();
-        }
-
-        static FilterState inMemoryState { get; } = new FilterState();
-
-        public static string JsonFile => Path.Combine(Configuration.Instance.LibationFiles, "QuickFilters.json");
-
-        static QuickFilters()
-        {
-            // load json into memory. if file doesn't exist, nothing to do. save() will create if needed
-            if (File.Exists(JsonFile))
-                inMemoryState = JsonConvert.DeserializeObject<FilterState>(File.ReadAllText(JsonFile));
-        }
-
-        public static bool UseDefault
-        {
-            get => inMemoryState.UseDefault;
-            set
-            {
-                lock (locker)
-                {
-                    inMemoryState.UseDefault = value;
-                    save();
-                }
-            }
-        }
-
-        public static IEnumerable<string> Filters => inMemoryState.Filters.AsReadOnly();
-
-        public static void Add(string filter)
-        {
-            if (string.IsNullOrWhiteSpace(filter))
-                return;
-            filter = filter.Trim();
-
-            lock (locker)
-            {
-                // check for duplicate
-                if (inMemoryState.Filters.ContainsInsensative(filter))
-                    return;
-
-                inMemoryState.Filters.Add(filter);
-                save();
-            }
-        }
-
-        public static void Remove(string filter)
-        {
-            lock (locker)
-            {
-                inMemoryState.Filters.Remove(filter);
-                save();
-            }
-        }
-
-        public static void Edit(string oldFilter, string newFilter)
-        {
-            lock (locker)
-            {
-                var index = inMemoryState.Filters.IndexOf(oldFilter);
-                if (index < 0)
-                    return;
-
-                inMemoryState.Filters = inMemoryState.Filters.Select(f => f == oldFilter ? newFilter : f).ToList();
-
-                save();
-            }
-        }
-
-        public static void ReplaceAll(IEnumerable<string> filters)
-        {
-            filters = filters
-                .Where(f => !string.IsNullOrWhiteSpace(f))
-                .Distinct()
-                .Select(f => f.Trim());
-            lock (locker)
-            {
-                inMemoryState.Filters = new List<string>(filters);
-                save();
-            }
-        }
-
-        private static object locker { get; } = new object();
-
-        // ONLY call this within lock()
-        private static void save()
-        {
-            // create json if not exists
-            void resave() => File.WriteAllText(JsonFile, JsonConvert.SerializeObject(inMemoryState, Formatting.Indented));
-            try { resave(); }
-            catch (IOException)
-            {
-                try { resave(); }
-				catch (IOException ex)
-				{
-					Serilog.Log.Logger.Error(ex, "Error saving QuickFilters.json");
-					throw;
-				}
-			}
-        }
-    }
-}

FileManager/SqliteStorage.cs

@@ -1,11 +0,0 @@
-using System.IO;
-
-namespace FileManager
-{
-	public static class SqliteStorage
-	{
-		// not customizable. don't move to config
-		private static string databasePath => Path.Combine(Configuration.Instance.LibationFiles, "LibationContext.db");
-		public static string ConnectionString => $"Data Source={databasePath};Foreign Keys=False;";
-	}
-}

FileManager/TagsPersistence.cs

@@ -1,61 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using Newtonsoft.Json;
-using Polly;
-using Polly.Retry;
-
-namespace FileManager
-{
-    /// <summary>
-    /// Tags must also be stored in db for search performance. Stored in json file to survive a db reset.
-    /// json is only read when a product is first loaded into the db
-    /// json is only written to when tags are edited
-    /// json access is infrequent and one-off
-    /// </summary>
-    public static class TagsPersistence
-    {
-		private static string TagsFile => Path.Combine(Configuration.Instance.LibationFiles, "BookTags.json");
-
-        private static object locker { get; } = new object();
-
-		// if failed, retry only 1 time after a wait of 100 ms
-		// 1st save attempt sometimes fails with
-		//   The requested operation cannot be performed on a file with a user-mapped section open.
-		private static RetryPolicy policy { get; }
-			= Policy.Handle<Exception>()
-			.WaitAndRetry(new[] { TimeSpan.FromMilliseconds(100) });
-
-		public static void Save(IEnumerable<(string productId, string tags)> tagsCollection)
-		{
-			ensureCache();
-
-			// on initial reload, there's a huge benefit to adding to cache individually then updating the file only once
-			foreach ((string productId, string tags) in tagsCollection)
-				cache[productId] = tags;
-
-			lock (locker)
-				policy.Execute(() => File.WriteAllText(TagsFile, JsonConvert.SerializeObject(cache, Formatting.Indented)));
-		}
-
-		private static Dictionary<string, string> cache;
-
-		public static string GetTags(string productId)
-        {
-			ensureCache();
-
-			cache.TryGetValue(productId, out string value);
-			return value;
-        }
-
-		private static void ensureCache()
-		{
-			if (cache is null)
-				lock (locker)
-					cache = !File.Exists(TagsFile)
-						? new Dictionary<string, string>()
-						: JsonConvert.DeserializeObject<Dictionary<string, string>>(File.ReadAllText(TagsFile));
-		}
-	}
-}