Bug fix #459 , New feature/setting #366

Upgrade AAXClean.Codecs to 0.5.12, add moov relocation, and fix #459

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,31 @@
+---
+name: Bug report
+about: Create a report to help us improve Libation
+title: ''
+labels: bug
+assignees: ''
+---
+
+**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.

.github/ISSUE_TEMPLATE/feature_request.md

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

.github/workflows/build-windows.yml

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

.github/workflows/build.yml

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

.github/workflows/deb.yml

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

.github/workflows/docker.yml

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

.github/workflows/release.yml

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

.github/workflows/validate.yml

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

.gitignore

@@ -184,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
@@ -370,3 +370,4 @@ FodyWeavers.xsd
 
 /__TODO.txt
 /DataLayer/LibationContext.db
+*/bin-Avalonia

.releaseindex.json

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

AaxDecrypter/AaxDecrypter.csproj

@@ -1,16 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="AAXClean" Version="0.1.10" />
-    <PackageReference Include="Dinah.Core" Version="2.0.2.1" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\FileManager\FileManager.csproj" />
-  </ItemGroup>
-
-</Project>

AaxDecrypter/AaxcDownloadMultiConverter.cs

@@ -1,146 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using AAXClean;
-using Dinah.Core.StepRunner;
-using FileManager;
-
-namespace AaxDecrypter
-{
-	public class AaxcDownloadMultiConverter : AaxcDownloadConvertBase
-	{
-		protected override StepSequence Steps { get; }
-
-        private Func<string, int, int, NewSplitCallback, string> multipartFileNameCallback { get; }
-        private static string DefaultMultipartFilename(string outputFileName, int partsPosition, int partsTotal, NewSplitCallback newSplitCallback)
-        {
-            var template = Path.ChangeExtension(outputFileName, null) + " - <ch# 0> - <title>" + Path.GetExtension(outputFileName);
-
-            var fileTemplate = new FileTemplate(template) { IllegalCharacterReplacements = " " };
-            fileTemplate.AddParameterReplacement("ch# 0", FileUtility.GetSequenceFormatted(partsPosition, partsTotal));
-            fileTemplate.AddParameterReplacement("title", newSplitCallback?.Chapter?.Title ?? "");
-
-            return fileTemplate.GetFilePath();
-        }
-
-        private static TimeSpan minChapterLength { get; } = TimeSpan.FromSeconds(3);
-		private List<string> multiPartFilePaths { get; } = new List<string>();
-
-        public AaxcDownloadMultiConverter(string outFileName, string cacheDirectory, DownloadLicense dlLic, OutputFormat outputFormat,
-            Func<string, int, int, NewSplitCallback, string> multipartFileNameCallback = null)
-			: base(outFileName, cacheDirectory, dlLic, outputFormat)
-        {
-            Steps = new StepSequence
-            {
-                Name = "Download and Convert Aaxc To " + OutputFormat,
-
-                ["Step 1: Get Aaxc Metadata"] = Step_GetMetadata,
-                ["Step 2: Download Decrypted Audiobook"] = Step_DownloadAudiobookAsMultipleFilesPerChapter,
-                ["Step 3: Cleanup"] = Step_Cleanup,
-            };
-            this.multipartFileNameCallback = multipartFileNameCallback ?? DefaultMultipartFilename;
-        }
-
-        /*
-https://github.com/rmcrackan/Libation/pull/127#issuecomment-939088489
-
-If the chapter truly is empty, that is, 0 audio frames in length, then yes it is ignored.
-If the chapter is shorter than 3 seconds long but still has some audio frames, those frames are combined with the following chapter and not split into a new file.
-
-I also implemented file naming by chapter title. When 2 or more consecutive chapters are combined, the first of the combined chapter's title is used in the file name. For example, given an audiobook with the following chapters:
-
-00:00:00 - 00:00:02 | Part 1
-00:00:02 - 00:35:00 | Chapter 1
-00:35:02 - 01:02:00 | Chapter 2
-01:02:00 - 01:02:02 | Part 2
-01:02:02 - 01:41:00 | Chapter 3
-01:41:00 - 02:05:00 | Chapter 4
-
-The book will be split into the following files:
-
-00:00:00 - 00:35:00 | Book - 01 - Part 1.m4b
-00:35:00 - 01:02:00 | Book - 02 - Chapter 2.m4b
-01:02:00 - 01:41:00 | Book - 03 - Part 2.m4b
-01:41:00 - 02:05:00 | Book - 04 - Chapter 4.m4b
-
-That naming may not be desirable for everyone, but it's an easy change to instead use the last of the combined chapter's title in the file name.
-         */
-        private bool Step_DownloadAudiobookAsMultipleFilesPerChapter()
-        {
-            var zeroProgress = Step_DownloadAudiobook_Start();
-
-            var chapters = DownloadLicense.ChapterInfo.Chapters.ToList();
-
-            // Ensure split files are at least minChapterLength in duration.
-            var splitChapters = new ChapterInfo();
-
-            var runningTotal = TimeSpan.Zero;
-            string title = "";
-
-            for (int i = 0; i < chapters.Count; i++)
-            {
-                if (runningTotal == TimeSpan.Zero)
-                    title = chapters[i].Title;
-
-                runningTotal += chapters[i].Duration;
-
-                if (runningTotal >= minChapterLength)
-                {
-                    splitChapters.AddChapter(title, runningTotal);
-                    runningTotal = TimeSpan.Zero;
-                }
-            }
-
-            // reset, just in case
-            multiPartFilePaths.Clear();
-
-            AaxFile.ConversionProgressUpdate += AaxFile_ConversionProgressUpdate;
-            if (OutputFormat == OutputFormat.M4b)
-                ConvertToMultiMp4a(splitChapters);
-            else
-                ConvertToMultiMp3(splitChapters);
-            AaxFile.ConversionProgressUpdate -= AaxFile_ConversionProgressUpdate;
-
-            Step_DownloadAudiobook_End(zeroProgress);
-
-            var success = !IsCanceled;
-
-            if (success)
-                foreach (var path in multiPartFilePaths)
-                    OnFileCreated(path);
-
-            return success;
-        }
-
-        private void ConvertToMultiMp4a(ChapterInfo splitChapters)
-        {
-            var chapterCount = 0;
-            AaxFile.ConvertToMultiMp4a(splitChapters, newSplitCallback =>
-                createOutputFileStream(++chapterCount, splitChapters, newSplitCallback)
-            );
-        }
-
-        private void ConvertToMultiMp3(ChapterInfo splitChapters)
-        {
-            var chapterCount = 0;
-            AaxFile.ConvertToMultiMp3(splitChapters, newSplitCallback =>
-            {
-                createOutputFileStream(++chapterCount, splitChapters, newSplitCallback);
-                newSplitCallback.LameConfig.ID3.Track = chapterCount.ToString();
-            });
-        }
-
-        private void createOutputFileStream(int currentChapter, ChapterInfo splitChapters, NewSplitCallback newSplitCallback)
-        {
-            var fileName = multipartFileNameCallback(OutputFileName, currentChapter, splitChapters.Count, newSplitCallback);
-            fileName = FileUtility.GetValidFilename(fileName);
-
-            multiPartFilePaths.Add(fileName);
-
-            FileUtility.SaferDelete(fileName);
-
-            newSplitCallback.OutputFile = File.Open(fileName, FileMode.OpenOrCreate);
-        }
-    }
-}

AaxDecrypter/AaxcDownloadSingleConverter.cs

@@ -1,53 +0,0 @@
-using System;
-using System.IO;
-using AAXClean;
-using Dinah.Core.StepRunner;
-using FileManager;
-
-namespace AaxDecrypter
-{
-	public class AaxcDownloadSingleConverter : AaxcDownloadConvertBase
-	{
-		protected override StepSequence Steps { get; }
-
-        public AaxcDownloadSingleConverter(string outFileName, string cacheDirectory, DownloadLicense dlLic, OutputFormat outputFormat)
-			: base(outFileName, cacheDirectory, dlLic, outputFormat)
-        {
-            Steps = new StepSequence
-            {
-                Name = "Download and Convert Aaxc To " + OutputFormat,
-
-                ["Step 1: Get Aaxc Metadata"] = Step_GetMetadata,
-                ["Step 2: Download Decrypted Audiobook"] = Step_DownloadAudiobookAsSingleFile,
-                ["Step 3: Create Cue"] = Step_CreateCue,
-                ["Step 4: Cleanup"] = Step_Cleanup,
-            };
-        }
-
-        private bool Step_DownloadAudiobookAsSingleFile()
-        {
-            var zeroProgress = Step_DownloadAudiobook_Start();
-
-            FileUtility.SaferDelete(OutputFileName);
-
-            var outputFile = File.Open(OutputFileName, FileMode.OpenOrCreate, FileAccess.ReadWrite);
-
-            AaxFile.ConversionProgressUpdate += AaxFile_ConversionProgressUpdate;
-            var decryptionResult
-                = OutputFormat == OutputFormat.M4b
-                ? AaxFile.ConvertToMp4a(outputFile, DownloadLicense.ChapterInfo)
-                : AaxFile.ConvertToMp3(outputFile);
-            AaxFile.ConversionProgressUpdate -= AaxFile_ConversionProgressUpdate;
-
-            DownloadLicense.ChapterInfo = AaxFile.Chapters;
-
-            Step_DownloadAudiobook_End(zeroProgress);
-
-            var success = decryptionResult == ConversionResult.NoErrorsDetected && !IsCanceled;
-            if (success)
-                base.OnFileCreated(OutputFileName);
-
-            return success;
-        }
-    }
-}

AaxDecrypter/DownloadLicense.cs

@@ -1,24 +0,0 @@
-using AAXClean;
-using Dinah.Core;
-
-namespace AaxDecrypter
-{
-    public class DownloadLicense
-    {
-        public string DownloadUrl { get; }
-        public string AudibleKey { get; }
-        public string AudibleIV { get; }
-        public string UserAgent { get; }
-        public ChapterInfo ChapterInfo { get; set; }
-
-        public DownloadLicense(string downloadUrl, string audibleKey, string audibleIV, string userAgent)
-        {
-            DownloadUrl = ArgumentValidator.EnsureNotNullOrEmpty(downloadUrl, nameof(downloadUrl));
-            UserAgent = ArgumentValidator.EnsureNotNullOrEmpty(userAgent, nameof(userAgent));
-
-            // no null/empty check. unencrypted files do not have these
-            AudibleKey = audibleKey;
-            AudibleIV = audibleIV;
-        }
-    }
-}

AaxDecrypter/NetworkFileStream.cs

@@ -1,446 +0,0 @@
-using Dinah.Core;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
-using System;
-using System.IO;
-using System.Linq;
-using System.Net;
-using System.Threading;
-
-namespace AaxDecrypter
-{
-    /// <summary>
-    /// A <see cref="CookieContainer"/> for a single Uri.
-    /// </summary>
-    public class SingleUriCookieContainer : CookieContainer
-    {
-        private Uri baseAddress;
-        public Uri Uri
-        { 
-            get => baseAddress; 
-            set 
-            { 
-                baseAddress = new UriBuilder(value.Scheme, value.Host).Uri; 
-            } 
-        }
-
-        public CookieCollection GetCookies()
-        {
-            return GetCookies(Uri);
-        }
-    }
-
-    /// <summary>
-    /// A resumable, simultaneous file downloader and reader.
-    /// </summary>
-    public class NetworkFileStream : Stream, IUpdatable
-    {
-        public event EventHandler Updated;
-
-        #region Public Properties
-
-        /// <summary>
-        /// Location to save the downloaded data.
-        /// </summary>
-        [JsonProperty(Required = Required.Always)]
-        public string SaveFilePath { get; }
-
-        /// <summary>
-        /// Http(s) address of the file to download.
-        /// </summary>
-        [JsonProperty(Required = Required.Always)]
-        public Uri Uri { get; private set; }
-
-        /// <summary>
-        /// All cookies set by caller or by the remote server.
-        /// </summary>
-        [JsonProperty(Required = Required.Always)]
-        public SingleUriCookieContainer CookieContainer { get; }
-
-        /// <summary>
-        /// Http headers to be sent to the server with the request.
-        /// </summary>
-        [JsonProperty(Required = Required.Always)]
-        public WebHeaderCollection RequestHeaders { get; private set; }
-
-        /// <summary>
-        /// The position in <see cref="SaveFilePath"/> that has been written and flushed to disk.
-        /// </summary>
-        [JsonProperty(Required = Required.Always)]
-        public long WritePosition { get; private set; }
-
-        /// <summary>
-        /// The total length of the <see cref="Uri"/> file to download.
-        /// </summary>
-        [JsonProperty(Required = Required.Always)]
-        public long ContentLength { get; private set; }
-
-        #endregion
-
-        #region Private Properties
-        private HttpWebRequest HttpRequest { get; set; }
-        private FileStream _writeFile { get; }
-        private FileStream _readFile { get; }
-        private Stream _networkStream { get; set; }
-        private bool hasBegunDownloading { get; set; }
-        public bool IsCancelled { get; private set; }
-        private EventWaitHandle downloadEnded { get; set; } 
-        private EventWaitHandle downloadedPiece { get; set; } 
-
-        #endregion
-
-        #region Constants
-
-        //Download buffer size
-        private const int DOWNLOAD_BUFF_SZ = 4 * 1024;
-
-        //NetworkFileStream will flush all data in _writeFile to disk after every
-        //DATA_FLUSH_SZ bytes are written to the file stream.
-        private const int DATA_FLUSH_SZ = 1024 * 1024;
-
-        #endregion
-
-        #region Constructor
-
-        /// <summary>
-        /// A resumable, simultaneous file downloader and reader.
-        /// </summary>
-        /// <param name="saveFilePath">Path to a location on disk to save the downloaded data from <paramref name="uri"/></param>
-        /// <param name="uri">Http(s) address of the file to download.</param>
-        /// <param name="writePosition">The position in <paramref name="uri"/> to begin downloading.</param>
-        /// <param name="requestHeaders">Http headers to be sent to the server with the <see cref="HttpWebRequest"/>.</param>
-        /// <param name="cookies">A <see cref="SingleUriCookieContainer"/> with cookies to send with the <see cref="HttpWebRequest"/>. It will also be populated with any cookies set by the server. </param>
-        public NetworkFileStream(string saveFilePath, Uri uri, long writePosition = 0, WebHeaderCollection requestHeaders = null, SingleUriCookieContainer cookies = null)
-        {
-            ArgumentValidator.EnsureNotNullOrWhiteSpace(saveFilePath, nameof(saveFilePath));
-            ArgumentValidator.EnsureNotNullOrWhiteSpace(uri?.AbsoluteUri, nameof(uri));
-            ArgumentValidator.EnsureGreaterThan(writePosition, nameof(writePosition), -1);
-
-            if (!Directory.Exists(Path.GetDirectoryName(saveFilePath)))
-                throw new ArgumentException($"Specified {nameof(saveFilePath)} directory \"{Path.GetDirectoryName(saveFilePath)}\" does not exist.");
-
-            SaveFilePath = saveFilePath;
-            Uri = uri;
-            WritePosition = writePosition;
-            RequestHeaders = requestHeaders ?? new WebHeaderCollection();
-            CookieContainer = cookies ?? new SingleUriCookieContainer { Uri = uri };
-            
-            _writeFile = new FileStream(SaveFilePath, FileMode.OpenOrCreate, FileAccess.Write, FileShare.ReadWrite)
-            {
-                Position = WritePosition
-            };
-
-            _readFile = new FileStream(SaveFilePath, FileMode.Open, FileAccess.Read, FileShare.ReadWrite);
-
-            SetUriForSameFile(uri);
-        }
-
-        #endregion
-               
-        #region Downloader
-
-        /// <summary>
-        /// Update the <see cref="JsonFilePersister"/>.
-        /// </summary>
-        private void Update()
-        {
-            RequestHeaders = HttpRequest.Headers;
-            Updated?.Invoke(this, EventArgs.Empty);
-        }
-
-        /// <summary>
-        /// Set a different <see cref="System.Uri"/> to the same file targeted by this instance of <see cref="NetworkFileStream"/>
-        /// </summary>
-        /// <param name="uriToSameFile">New <see cref="System.Uri"/> host must match existing host.</param>
-        public void SetUriForSameFile(Uri uriToSameFile)
-        {
-            ArgumentValidator.EnsureNotNullOrWhiteSpace(uriToSameFile?.AbsoluteUri, nameof(uriToSameFile));
-
-            if (uriToSameFile.Host != Uri.Host)
-                throw new ArgumentException($"New uri to the same file must have the same host.\r\n Old Host :{Uri.Host}\r\nNew Host: {uriToSameFile.Host}");
-            if (hasBegunDownloading)
-                throw new InvalidOperationException("Cannot change Uri after download has started.");
-
-            Uri = uriToSameFile;
-            HttpRequest = WebRequest.CreateHttp(Uri);
-
-            HttpRequest.CookieContainer = CookieContainer;
-            HttpRequest.Headers = RequestHeaders;
-            //If NetworkFileStream is resuming, Header will already contain a range.
-            HttpRequest.Headers.Remove("Range");
-            HttpRequest.AddRange(WritePosition);
-        }
-
-        /// <summary>
-        /// Begins downloading <see cref="Uri"/> to <see cref="SaveFilePath"/> in a background thread.
-        /// </summary>
-        private void BeginDownloading()
-        {
-            downloadEnded = new EventWaitHandle(false, EventResetMode.ManualReset);
-
-            if (ContentLength != 0 && WritePosition == ContentLength)
-            {
-                hasBegunDownloading = true;
-                downloadEnded.Set();
-                return;
-            }
-
-            if (ContentLength != 0 && WritePosition > ContentLength)
-                throw new WebException($"Specified write position (0x{WritePosition:X10}) is larger than  {nameof(ContentLength)} (0x{ContentLength:X10}).");
-
-            var response = HttpRequest.GetResponse() as HttpWebResponse;
-
-            if (response.StatusCode != HttpStatusCode.PartialContent)
-                throw new WebException($"Server at {Uri.Host} responded with unexpected status code: {response.StatusCode}.");
-
-            if (response.Headers.GetValues("Accept-Ranges").FirstOrDefault(r => r.EqualsInsensitive("bytes")) is null)
-                throw new WebException($"Server at {Uri.Host} does not support Http ranges");
-
-            //Content length is the length of the range request, and it is only equal
-            //to the complete file length if requesting Range: bytes=0-
-            if (WritePosition == 0)
-                ContentLength = response.ContentLength;
-
-            _networkStream = response.GetResponseStream();
-            downloadedPiece = new EventWaitHandle(false, EventResetMode.AutoReset);
-
-            //Download the file in the background.
-            new Thread(() => DownloadFile())
-            { IsBackground = true }
-            .Start();
-
-            hasBegunDownloading = true;
-            return;
-        }
-
-        /// <summary>
-        /// Downlod <see cref="Uri"/> to <see cref="SaveFilePath"/>.
-        /// </summary>
-        private void DownloadFile()
-        {
-            var downloadPosition = WritePosition;
-            var nextFlush = downloadPosition + DATA_FLUSH_SZ;
-
-            var buff = new byte[DOWNLOAD_BUFF_SZ];
-            do
-            {
-                var bytesRead = _networkStream.Read(buff, 0, DOWNLOAD_BUFF_SZ);
-                _writeFile.Write(buff, 0, bytesRead);
-
-                downloadPosition += bytesRead;
-
-                if (downloadPosition > nextFlush)
-                {
-                    _writeFile.Flush();
-                    WritePosition = downloadPosition;
-                    Update();
-                    nextFlush = downloadPosition + DATA_FLUSH_SZ;
-                    downloadedPiece.Set();
-                }
-
-            } while (downloadPosition < ContentLength && !IsCancelled);
-
-            _writeFile.Close();
-            _networkStream.Close();
-            WritePosition = downloadPosition;
-            Update();
-
-            downloadedPiece.Set();
-            downloadEnded.Set();
-
-            if (!IsCancelled && WritePosition < ContentLength)
-                throw new WebException($"Downloaded size (0x{WritePosition:X10}) is less than {nameof(ContentLength)} (0x{ContentLength:X10}).");
-
-            if (WritePosition > ContentLength)
-                throw new WebException($"Downloaded size (0x{WritePosition:X10}) is greater than {nameof(ContentLength)} (0x{ContentLength:X10}).");
-
-        }
-
-        #endregion
-
-        #region Json Connverters
-
-        public static JsonSerializerSettings GetJsonSerializerSettings()
-        {
-            var settings = new JsonSerializerSettings();
-            settings.Converters.Add(new CookieContainerConverter());
-            settings.Converters.Add(new WebHeaderCollectionConverter());
-            return settings;
-        }
-
-        internal class CookieContainerConverter : JsonConverter
-        {
-            public override bool CanConvert(Type objectType)
-                => objectType == typeof(SingleUriCookieContainer);
-
-            public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
-            {
-                var jObj = JObject.Load(reader);
-
-                var result = new SingleUriCookieContainer()
-                {
-                    Uri = new Uri(jObj["Uri"].Value<string>()),
-                    Capacity = jObj["Capacity"].Value<int>(),
-                    MaxCookieSize = jObj["MaxCookieSize"].Value<int>(),
-                    PerDomainCapacity = jObj["PerDomainCapacity"].Value<int>()
-                };
-
-                var cookieList = jObj["Cookies"].ToList();
-
-                foreach (var cookie in cookieList)
-                {
-                    result.Add(
-                        new Cookie
-                        {
-                            Comment = cookie["Comment"].Value<string>(),
-                            HttpOnly = cookie["HttpOnly"].Value<bool>(),
-                            Discard = cookie["Discard"].Value<bool>(),
-                            Domain = cookie["Domain"].Value<string>(),
-                            Expired = cookie["Expired"].Value<bool>(),
-                            Expires = cookie["Expires"].Value<DateTime>(),
-                            Name = cookie["Name"].Value<string>(),
-                            Path = cookie["Path"].Value<string>(),
-                            Port = cookie["Port"].Value<string>(),
-                            Secure = cookie["Secure"].Value<bool>(),
-                            Value = cookie["Value"].Value<string>(),
-                            Version = cookie["Version"].Value<int>(),
-                        });
-                }
-
-                return result;
-            }
-
-            public override bool CanWrite => true;
-
-            public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
-            {
-                var cookies = value as SingleUriCookieContainer;
-                var obj = (JObject)JToken.FromObject(value);
-                var container = cookies.GetCookies();
-                var propertyNames = container.Select(c => JToken.FromObject(c));
-                obj.AddFirst(new JProperty("Cookies", new JArray(propertyNames)));
-                obj.WriteTo(writer);
-            }
-        }
-
-        internal class WebHeaderCollectionConverter : JsonConverter
-        {
-            public override bool CanConvert(Type objectType)
-                => objectType == typeof(WebHeaderCollection);
-
-            public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
-            {
-                var jObj = JObject.Load(reader);
-                var result = new WebHeaderCollection();
-
-                foreach (var kvp in jObj)
-                    result.Add(kvp.Key, kvp.Value.Value<string>());
-
-                return result;
-            }
-
-            public override bool CanWrite => true;
-
-            public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
-            {
-                var jObj = new JObject();
-                var type = value.GetType();
-                var headers = value as WebHeaderCollection;
-                var jHeaders = headers.AllKeys.Select(k => new JProperty(k, headers[k]));
-                jObj.Add(jHeaders);
-                jObj.WriteTo(writer);
-            }
-        }
-
-        #endregion
-
-        #region Download Stream Reader
-
-        [JsonIgnore]
-        public override bool CanRead => true;
-
-        [JsonIgnore]
-        public override bool CanSeek => true;
-
-        [JsonIgnore]
-        public override bool CanWrite => false;
-
-        [JsonIgnore]
-        public override long Length
-        {
-            get
-            {
-                if (!hasBegunDownloading)
-                    BeginDownloading();
-                return ContentLength;
-            }
-        }
-
-        [JsonIgnore]
-        public override long Position { get => _readFile.Position; set => Seek(value, SeekOrigin.Begin); }
-
-        [JsonIgnore]
-        public override bool CanTimeout => false;
-
-        [JsonIgnore]
-        public override int ReadTimeout { get => base.ReadTimeout; set => base.ReadTimeout = value; }
-
-        [JsonIgnore]
-        public override int WriteTimeout { get => base.WriteTimeout; set => base.WriteTimeout = value; }
-
-        public override void Flush() => throw new NotImplementedException();
-        public override void SetLength(long value) => throw new NotImplementedException();
-        public override void Write(byte[] buffer, int offset, int count) => throw new NotImplementedException();
-
-        public override int Read(byte[] buffer, int offset, int count)
-        {
-            if (!hasBegunDownloading)
-                BeginDownloading();
-
-            var toRead = Math.Min(count, Length - Position);
-            WaitToPosition(Position + toRead);
-            return _readFile.Read(buffer, offset, count);
-        }
-
-        public override long Seek(long offset, SeekOrigin origin)
-        {
-            var newPosition = origin switch
-			{
-				SeekOrigin.Current => Position + offset,
-				SeekOrigin.End => ContentLength + offset,
-				_ => offset,
-			};
-
-            WaitToPosition(newPosition);
-            return _readFile.Position = newPosition;
-        }
-
-        /// <summary>
-        /// Blocks until the file has downloaded to at least <paramref name="requiredPosition"/>, then returns.
-        /// </summary>
-        /// <param name="requiredPosition">The minimum required flished data length in <see cref="SaveFilePath"/>.</param>
-        private void WaitToPosition(long requiredPosition)
-		{
-            while (requiredPosition > WritePosition && !IsCancelled && hasBegunDownloading && !downloadedPiece.WaitOne(1000)) ;
-        }
-
-        public override void Close()
-        {
-            IsCancelled = true;
-
-            while (downloadEnded is not null && !downloadEnded.WaitOne(1000)) ;
-
-            _readFile.Close();
-            _writeFile.Close();
-            _networkStream?.Close();
-            Update();
-        }
-
-        #endregion
-        ~NetworkFileStream()
-        {
-            downloadEnded?.Close();
-            downloadedPiece?.Close();
-        }
-    }
-}

AaxDecrypter/UnencryptedAudiobookDownloader.cs

@@ -1,76 +0,0 @@
-using System;
-using System.Threading;
-using Dinah.Core.Net.Http;
-using Dinah.Core.StepRunner;
-using FileManager;
-
-namespace AaxDecrypter
-{
-	public class UnencryptedAudiobookDownloader : AudiobookDownloadBase
-	{
-		protected override StepSequence Steps { get; }
-
-		public UnencryptedAudiobookDownloader(string outFileName, string cacheDirectory, DownloadLicense dlLic)
-			: base(outFileName, cacheDirectory, dlLic)
-		{
-			Steps = new StepSequence
-			{
-				Name = "Download Mp3 Audiobook",
-
-				["Step 1: Get Mp3 Metadata"] = Step_GetMetadata,
-				["Step 2: Download Audiobook"] = Step_DownloadAudiobookAsSingleFile,
-				["Step 3: Create Cue"] = Step_CreateCue,
-				["Step 4: Cleanup"] = Step_Cleanup,
-			};
-		}
-
-		public override void Cancel()
-		{
-			IsCanceled = true;
-			CloseInputFileStream();
-		}
-
-		protected bool Step_GetMetadata()
-		{
-			OnRetrievedCoverArt(null);
-
-			return !IsCanceled;
-		}
-
-		private bool Step_DownloadAudiobookAsSingleFile()
-		{
-			DateTime startTime = DateTime.Now;
-
-			// MUST put InputFileStream.Length first, because it starts background downloader.
-
-			while (InputFileStream.Length > InputFileStream.WritePosition && !InputFileStream.IsCancelled) 
-			{
-				var rate = InputFileStream.WritePosition / (DateTime.Now - startTime).TotalSeconds;
-
-				var estTimeRemaining = (InputFileStream.Length - InputFileStream.WritePosition) / rate;
-
-				if (double.IsNormal(estTimeRemaining))
-					OnDecryptTimeRemaining(TimeSpan.FromSeconds(estTimeRemaining));
-
-				var progressPercent = (double)InputFileStream.WritePosition / InputFileStream.Length;
-
-				OnDecryptProgressUpdate(
-					new DownloadProgress
-					{
-						ProgressPercentage = 100 * progressPercent,
-						BytesReceived = (long)(InputFileStream.Length * progressPercent),
-						TotalBytesToReceive = InputFileStream.Length
-					});
-				Thread.Sleep(200);
-			}
-
-			CloseInputFileStream();
-
-			var realOutputFileName = FileUtility.SaferMoveToValidPath(InputFileStream.SaveFilePath, OutputFileName);
-			SetOutputFileName(realOutputFileName);
-			OnFileCreated(realOutputFileName);
-
-			return !IsCanceled;
-		}
-	}
-}

AppScaffolding/.msbump

@@ -1,4 +0,0 @@
-{
-  "//": "https://github.com/BalassaMarton/MSBump",
-  BumpRevision: true
-}

AppScaffolding/AppScaffolding.csproj

@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
-    <Version>6.3.2.1</Version>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="MSBump" Version="2.3.2">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
-    <PackageReference Include="Octokit" Version="0.50.0" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\AudibleUtilities\AudibleUtilities.csproj" />
-  </ItemGroup>
-
-</Project>

AppScaffolding/LibationScaffolding.cs

@@ -1,363 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Reflection;
-using AudibleUtilities;
-using Dinah.Core;
-using Dinah.Core.IO;
-using Dinah.Core.Logging;
-using LibationFileManager;
-using Newtonsoft.Json.Linq;
-using Serilog;
-
-namespace AppScaffolding
-{
-	public static class LibationScaffolding
-	{
-		// AppScaffolding
-		private static Assembly _executingAssembly;
-		private static Assembly ExecutingAssembly
-			=> _executingAssembly ??= Assembly.GetExecutingAssembly();
-
-		// LibationWinForms or LibationCli
-		private static Assembly _entryAssembly;
-		private static Assembly EntryAssembly
-			=> _entryAssembly ??= Assembly.GetEntryAssembly();
-
-		// previously: System.Reflection.Assembly.GetExecutingAssembly().GetName().Version;
-		private static Version _buildVersion;
-		public static Version BuildVersion
-			=> _buildVersion
-			??= new[] { ExecutingAssembly.GetName(), EntryAssembly.GetName() }
-			.Max(a => a.Version);
-
-		/// <summary>Run migrations before loading Configuration for the first time. Then load and return Configuration</summary>
-		public static Configuration RunPreConfigMigrations()
-		{
-			// must occur before access to Configuration instance
-			Migrations.migrate_to_v5_2_0__pre_config();
-
-			//***********************************************//
-			//                                               //
-			//   do not use Configuration before this line   //
-			//                                               //
-			//***********************************************//
-			return Configuration.Instance;
-		}
-
-		/// <summary>most migrations go in here</summary>
-		public static void RunPostConfigMigrations(Configuration config)
-		{
-			AudibleApiStorage.EnsureAccountsSettingsFileExists();
-
-			//
-			// migrations go below here
-			//
-
-			Migrations.migrate_to_v5_2_0__post_config(config);
-			Migrations.migrate_to_v5_7_1(config);
-			Migrations.migrate_to_v6_1_2(config);
-			Migrations.migrate_to_v6_2_0(config);
-			Migrations.migrate_to_v6_2_9(config);
-		}
-
-		/// <summary>Initialize logging. Run after migration</summary>
-		public static void RunPostMigrationScaffolding(Configuration config)
-		{
-			ensureSerilogConfig(config);
-			configureLogging(config);
-			logStartupState(config);
-		}
-
-		private static void ensureSerilogConfig(Configuration config)
-		{
-			if (config.GetObject("Serilog") != null)
-				return;
-
-			// "Serilog": {
-			//   "MinimumLevel": "Information"
-			//   "WriteTo": [
-			//     {
-			//       "Name": "Console"
-			//     },
-			//     {
-			//       "Name": "File",
-			//       "Args": {
-			//         "rollingInterval": "Day",
-			//         "outputTemplate": ...
-			//       }
-			//     }
-			//   ],
-			//   "Using": [ "Dinah.Core" ],
-			//   "Enrich": [ "WithCaller" ]
-			// }
-			var serilogObj = new JObject
-			{
-				{ "MinimumLevel", "Information" },
-				{ "WriteTo", new JArray
-					{
-						new JObject { {"Name", "Console" } },
-						new JObject
-						{
-							{ "Name", "File" },
-							{ "Args",
-								new JObject
-								{
-									// for this sink to work, a path must be provided. we override this below
-									{ "path", Path.Combine(config.LibationFiles, "_Log.log") },
-									{ "rollingInterval", "Month" },
-									// Serilog template formatting examples
-									// - default:                    "{Timestamp:yyyy-MM-dd HH:mm:ss.fff zzz} [{Level:u3}] {Message:lj}{NewLine}{Exception}"
-									//   output example:             2019-11-26 08:48:40.224 -05:00 [DBG] Begin Libation
-									// - with class and method info: "{Timestamp:yyyy-MM-dd HH:mm:ss.fff zzz} [{Level:u3}] (at {Caller}) {Message:lj}{NewLine}{Exception}";
-									//   output example:             2019-11-26 08:48:40.224 -05:00 [DBG] (at LibationWinForms.Program.init()) Begin Libation
-									{ "outputTemplate", "{Timestamp:yyyy-MM-dd HH:mm:ss.fff zzz} [{Level:u3}] (at {Caller}) {Message:lj}{NewLine}{Exception}" }
-								}
-							}
-						}
-					}
-				},
-				{ "Using", new JArray{ "Dinah.Core" } }, // dll's name, NOT namespace
-				{ "Enrich", new JArray{ "WithCaller" } },
-			};
-			config.SetObject("Serilog", serilogObj);
-		}
-
-		// to restore original: Console.SetOut(origOut);
-		private static TextWriter origOut { get; } = Console.Out;
-
-		private static void configureLogging(Configuration config)
-		{
-			config.ConfigureLogging();
-
-			// capture most Console.WriteLine() and write to serilog. See below tests for details.
-			// Some dependencies print helpful info via Console.WriteLine. We'd like to log it.
-			//
-			// Serilog also writes to Console so this might be asking for trouble. ie: infinite loops.
-			// SerilogTextWriter needs to be more robust and tested. Esp the Write() methods.
-			// Empirical testing so far has shown no issues.
-			Console.SetOut(new MultiTextWriter(origOut, new SerilogTextWriter()));
-
-			#region Console => Serilog tests
-			/*
-			// all below apply to "Console." and "Console.Out."
-
-			// captured
-			Console.WriteLine("str");
-			Console.WriteLine(new { a = "anon" });
-			Console.WriteLine("{0}", "format");
-			Console.WriteLine("{0}{1}", "zero|", "one");
-			Console.WriteLine("{0}{1}{2}", "zero|", "one|", "two");
-			Console.WriteLine("{0}", new object[] { "arr" });
-
-			// not captured
-			Console.WriteLine();
-			Console.WriteLine(true);
-			Console.WriteLine('0');
-			Console.WriteLine(1);
-			Console.WriteLine(2m);
-			Console.WriteLine(3f);
-			Console.WriteLine(4d);
-			Console.WriteLine(5L);
-			Console.WriteLine((uint)6);
-			Console.WriteLine((ulong)7);
-
-			Console.Write("str");
-			Console.Write(true);
-			Console.Write('0');
-			Console.Write(1);
-			Console.Write(2m);
-			Console.Write(3f);
-			Console.Write(4d);
-			Console.Write(5L);
-			Console.Write((uint)6);
-			Console.Write((ulong)7);
-			Console.Write(new { a = "anon" });
-			Console.Write("{0}", "format");
-			Console.Write("{0}{1}", "zero|", "one");
-			Console.Write("{0}{1}{2}", "zero|", "one|", "two");
-			Console.Write("{0}", new object[] { "arr" });
-			*/
-			#endregion
-
-			// .Here() captures debug info via System.Runtime.CompilerServices attributes. Warning: expensive
-			//var withLineNumbers_outputTemplate = "[{Timestamp:HH:mm:ss} {Level}] {SourceContext}{NewLine}{Message}{NewLine}in method {MemberName} at {FilePath}:{LineNumber}{NewLine}{Exception}{NewLine}";
-			//Log.Logger.Here().Debug("Begin Libation. Debug with line numbers");
-		}
-
-		private static void logStartupState(Configuration config)
-		{
-			// begin logging session with a form feed
-			Log.Logger.Information("\r\n\f");
-			Log.Logger.Information("Begin. {@DebugInfo}", new
-			{
-				AppName = EntryAssembly.GetName().Name,
-				Version = BuildVersion.ToString(),
-#if DEBUG
-				Mode = "Debug",
-#else
-				Mode = "Release",
-#endif
-
-				LogLevel_Verbose_Enabled = Log.Logger.IsVerboseEnabled(),
-				LogLevel_Debug_Enabled = Log.Logger.IsDebugEnabled(),
-				LogLevel_Information_Enabled = Log.Logger.IsInformationEnabled(),
-				LogLevel_Warning_Enabled = Log.Logger.IsWarningEnabled(),
-				LogLevel_Error_Enabled = Log.Logger.IsErrorEnabled(),
-				LogLevel_Fatal_Enabled = Log.Logger.IsFatalEnabled(),
-
-				config.LibationFiles,
-				AudibleFileStorage.BooksDirectory,
-
-				config.InProgress,
-
-				AudibleFileStorage.DownloadsInProgressDirectory,
-				DownloadsInProgressFiles = Directory.EnumerateFiles(AudibleFileStorage.DownloadsInProgressDirectory).Count(),
-
-				AudibleFileStorage.DecryptInProgressDirectory,
-				DecryptInProgressFiles = Directory.EnumerateFiles(AudibleFileStorage.DecryptInProgressDirectory).Count(),
-			});
-		}
-
-		public static (bool hasUpgrade, string zipUrl, string htmlUrl, string zipName) GetLatestRelease()
-		{
-			(bool, string, string, string) isFalse = (false, null, null, null);
-
-			// timed out
-			var latest = getLatestRelease(TimeSpan.FromSeconds(10));
-			if (latest is null)
-				return isFalse;
-
-			var latestVersionString = latest.TagName.Trim('v');
-			if (!Version.TryParse(latestVersionString, out var latestRelease))
-				return isFalse;
-
-			// we're up to date
-			if (latestRelease <= BuildVersion)
-				return isFalse;
-
-			// we have an update
-			var zip = latest.Assets.FirstOrDefault(a => a.BrowserDownloadUrl.EndsWith(".zip"));
-			var zipUrl = zip?.BrowserDownloadUrl;
-
-			Log.Logger.Information("Update available: {@DebugInfo}", new
-			{
-				latestRelease = latestRelease.ToString(),
-				latest.HtmlUrl,
-				zipUrl
-			});
-
-			return (true, zipUrl, latest.HtmlUrl, zip.Name);
-		}
-		private static Octokit.Release getLatestRelease(TimeSpan timeout)
-		{
-			try
-			{
-				var task = System.Threading.Tasks.Task.Run(() => getLatestRelease());
-				if (task.Wait(timeout))
-					return task.Result;
-
-				Log.Logger.Information("Timed out");
-			}
-			catch (AggregateException aggEx)
-			{
-				Log.Logger.Error(aggEx, "Checking for new version too often");
-			}
-			return null;
-		}
-		private static Octokit.Release getLatestRelease()
-		{
-			var gitHubClient = new Octokit.GitHubClient(new Octokit.ProductHeaderValue("Libation"));
-
-			// https://octokitnet.readthedocs.io/en/latest/releases/
-			var releases = gitHubClient.Repository.Release.GetAll("rmcrackan", "Libation").GetAwaiter().GetResult();
-			var latest = releases.First(r => !r.Draft && !r.Prerelease);
-			return latest;
-		}
-	}
-
-	internal static class Migrations
-	{
-		#region migrate to v5.2.0
-		// get rid of meta-directories, combine DownloadsInProgressEnum and DecryptInProgressEnum => InProgress
-		public static void migrate_to_v5_2_0__pre_config()
-		{
-			{
-				var settingsKey = "DownloadsInProgressEnum";
-				if (UNSAFE_MigrationHelper.Settings_TryGet(settingsKey, out var value))
-				{
-					UNSAFE_MigrationHelper.Settings_Delete(settingsKey);
-					UNSAFE_MigrationHelper.Settings_Insert("InProgress", translatePath(value));
-				}
-			}
-
-			{
-				UNSAFE_MigrationHelper.Settings_Delete("DecryptInProgressEnum");
-			}
-
-			{ // appsettings.json
-				var appSettingsKey = UNSAFE_MigrationHelper.LIBATION_FILES_KEY;
-				if (UNSAFE_MigrationHelper.APPSETTINGS_TryGet(appSettingsKey, out var value))
-					UNSAFE_MigrationHelper.APPSETTINGS_Update(appSettingsKey, translatePath(value));
-			}
-		}
-
-		private static string translatePath(string path)
-			=> path switch
-			{
-				"AppDir" => @".\LibationFiles",
-				"MyDocs" => Path.GetFullPath(Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments), "LibationFiles")),
-				"UserProfile" => Path.GetFullPath(Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile), "Libation")),
-				"WinTemp" => Path.GetFullPath(Path.Combine(Path.GetTempPath(), "Libation")),
-				_ => path
-			};
-
-		public static void migrate_to_v5_2_0__post_config(Configuration config)
-		{
-			if (!config.Exists(nameof(config.AllowLibationFixup)))
-				config.AllowLibationFixup = true;
-
-			if (!config.Exists(nameof(config.DecryptToLossy)))
-				config.DecryptToLossy = false;
-		}
-		#endregion
-
-		// add config.BadBook
-		public static void migrate_to_v5_7_1(Configuration config)
-		{
-			if (!config.Exists(nameof(config.BadBook)))
-				config.BadBook = Configuration.BadBookAction.Ask;
-		}
-
-		// add config.DownloadEpisodes , config.ImportEpisodes
-		public static void migrate_to_v6_1_2(Configuration config)
-		{
-			if (!config.Exists(nameof(config.DownloadEpisodes)))
-				config.DownloadEpisodes = true;
-
-			if (!config.Exists(nameof(config.ImportEpisodes)))
-				config.ImportEpisodes = true;
-		}
-
-		// add config.SplitFilesByChapter
-		public static void migrate_to_v6_2_0(Configuration config)
-		{
-			if (!config.Exists(nameof(config.SplitFilesByChapter)))
-				config.SplitFilesByChapter = false;
-		}
-
-		// add file naming templates
-		public static void migrate_to_v6_2_9(Configuration config)
-		{
-			if (!config.Exists(nameof(config.FolderTemplate)))
-				config.FolderTemplate = Templates.Folder.DefaultTemplate;
-
-			if (!config.Exists(nameof(config.FileTemplate)))
-				config.FileTemplate = Templates.File.DefaultTemplate;
-
-			if (!config.Exists(nameof(config.ChapterFileTemplate)))
-				config.ChapterFileTemplate = Templates.ChapterFile.DefaultTemplate;
-		}
-	}
-}

ApplicationServices/ApplicationServices.csproj

@@ -1,17 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="CsvHelper" Version="27.1.1" />
-    <PackageReference Include="NPOI" Version="2.5.5" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\DtoImporterService\DtoImporterService.csproj" />
-    <ProjectReference Include="..\LibationSearchEngine\LibationSearchEngine.csproj" />
-  </ItemGroup>
-
-</Project>

ApplicationServices/LibraryCommands.cs

@@ -1,286 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using AudibleApi;
-using AudibleUtilities;
-using DataLayer;
-using Dinah.Core;
-using DtoImporterService;
-using LibationFileManager;
-using Serilog;
-using static DtoImporterService.PerfLogger;
-
-namespace ApplicationServices
-{
-	public static class LibraryCommands
-	{
-		public static async Task<List<LibraryBook>> FindInactiveBooks(Func<Account, Task<ApiExtended>> apiExtendedfunc, List<LibraryBook> existingLibrary, params Account[] accounts)
-		{
-			logRestart();
-
-			//These are the minimum response groups required for the
-			//library scanner to pass all validation and filtering.
-			var libraryResponseGroups =
-				LibraryOptions.ResponseGroupOptions.ProductAttrs |
-				LibraryOptions.ResponseGroupOptions.ProductDesc |
-				LibraryOptions.ResponseGroupOptions.Relationships;
-
-			if (accounts is null || accounts.Length == 0)
-				return new List<LibraryBook>();
-
-			try
-			{
-				logTime($"pre {nameof(scanAccountsAsync)} all");
-				var libraryItems = await scanAccountsAsync(apiExtendedfunc, accounts, libraryResponseGroups);
-				logTime($"post {nameof(scanAccountsAsync)} all");
-
-				var totalCount = libraryItems.Count;
-				Log.Logger.Information($"GetAllLibraryItems: Total count {totalCount}");
-
-				var missingBookList = existingLibrary.Where(b => !libraryItems.Any(i => i.DtoItem.Asin == b.Book.AudibleProductId)).ToList();
-
-				return missingBookList;
-			}
-			catch (AudibleApi.Authentication.LoginFailedException lfEx)
-			{
-				lfEx.SaveFiles(Configuration.Instance.LibationFiles);
-
-				// nuget Serilog.Exceptions would automatically log custom properties
-				//   However, it comes with a scary warning when used with EntityFrameworkCore which I'm not yet ready to implement:
-				//   https://github.com/RehanSaeed/Serilog.Exceptions
-				// work-around: use 3rd param. don't just put exception object in 3rd param -- info overload: stack trace, etc
-				Log.Logger.Error(lfEx, "Error scanning library. Login failed. {@DebugInfo}", new
-				{
-					lfEx.RequestUrl,
-					ResponseStatusCodeNumber = (int)lfEx.ResponseStatusCode,
-					ResponseStatusCodeDesc = lfEx.ResponseStatusCode,
-					lfEx.ResponseInputFields,
-					lfEx.ResponseBodyFilePaths
-				});
-				throw;
-			}
-			catch (Exception ex)
-			{
-				Log.Logger.Error(ex, "Error scanning library");
-				throw;
-			}
-			finally
-			{
-				stop();
-				var putBreakPointHere = logOutput;
-			}
-		}
-
-		#region FULL LIBRARY scan and import
-		public static async Task<(int totalCount, int newCount)> ImportAccountAsync(Func<Account, Task<ApiExtended>> apiExtendedfunc, params Account[] accounts)
-		{
-			logRestart();
-
-			if (accounts is null || accounts.Length == 0)
-				return (0, 0);
-
-			try
-			{
-				logTime($"pre {nameof(scanAccountsAsync)} all");
-				var importItems = await scanAccountsAsync(apiExtendedfunc, accounts, LibraryOptions.ResponseGroupOptions.ALL_OPTIONS);
-				logTime($"post {nameof(scanAccountsAsync)} all");
-
-				var totalCount = importItems.Count;
-				Log.Logger.Information($"GetAllLibraryItems: Total count {totalCount}");
-
-				Log.Logger.Information("Begin long-running import");
-				logTime($"pre {nameof(importIntoDbAsync)}");
-				var newCount = await importIntoDbAsync(importItems);
-				logTime($"post {nameof(importIntoDbAsync)}");
-				Log.Logger.Information($"Import complete. New count {newCount}");
-
-				return (totalCount, newCount);
-			}
-			catch (AudibleApi.Authentication.LoginFailedException lfEx)
-			{
-				lfEx.SaveFiles(Configuration.Instance.LibationFiles);
-
-				// nuget Serilog.Exceptions would automatically log custom properties
-				//   However, it comes with a scary warning when used with EntityFrameworkCore which I'm not yet ready to implement:
-				//   https://github.com/RehanSaeed/Serilog.Exceptions
-				// work-around: use 3rd param. don't just put exception object in 3rd param -- info overload: stack trace, etc
-				Log.Logger.Error(lfEx, "Error importing library. Login failed. {@DebugInfo}", new
-				{
-					lfEx.RequestUrl,
-					ResponseStatusCodeNumber = (int)lfEx.ResponseStatusCode,
-					ResponseStatusCodeDesc = lfEx.ResponseStatusCode,
-					lfEx.ResponseInputFields,
-					lfEx.ResponseBodyFilePaths
-				});
-				throw;
-			}
-			catch (Exception ex)
-			{
-				Log.Logger.Error(ex, "Error importing library");
-				throw;
-			}
-			finally
-			{
-				stop();
-				var putBreakPointHere = logOutput;
-			}
-		}
-
-		private static async Task<List<ImportItem>> scanAccountsAsync(Func<Account, Task<ApiExtended>> apiExtendedfunc, Account[] accounts, LibraryOptions.ResponseGroupOptions libraryResponseGroups)
-		{
-			var tasks = new List<Task<List<ImportItem>>>();
-			foreach (var account in accounts)
-			{
-				// get APIs in serial b/c of logins. do NOT move inside of parallel (Task.WhenAll)
-				var apiExtended = await apiExtendedfunc(account);
-
-				// add scanAccountAsync as a TASK: do not await
-				tasks.Add(scanAccountAsync(apiExtended, account, libraryResponseGroups));
-			}
-
-			// 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(ApiExtended apiExtended, Account account, LibraryOptions.ResponseGroupOptions libraryResponseGroups)
-		{
-			ArgumentValidator.EnsureNotNull(account, nameof(account));
-
-			Log.Logger.Information("ImportLibraryAsync. {@DebugInfo}", new
-			{
-				Account = account?.MaskedLogEntry ?? "[null]"
-			});
-
-			logTime($"pre scanAccountAsync {account.AccountName}");
-
-			var dtoItems = await apiExtended.GetLibraryValidatedAsync(libraryResponseGroups, Configuration.Instance.ImportEpisodes);
-
-			logTime($"post scanAccountAsync {account.AccountName} qty: {dtoItems.Count}");
-
-			return dtoItems.Select(d => new ImportItem { DtoItem = d, AccountId = account.AccountId, LocaleName = account.Locale?.Name }).ToList();
-		}
-
-		private static async Task<int> importIntoDbAsync(List<ImportItem> importItems)
-		{
-			logTime("importIntoDbAsync -- pre db");
-			using var context = DbContexts.GetContext();
-			var libraryImporter = new LibraryBookImporter(context);
-			var newCount = await Task.Run(() => libraryImporter.Import(importItems));
-			logTime("importIntoDbAsync -- post Import()");
-			var qtyChanges = context.SaveChanges();
-			logTime("importIntoDbAsync -- post SaveChanges");
-
-			if (qtyChanges > 0)
-				await Task.Run(() => finalizeLibrarySizeChange());
-			logTime("importIntoDbAsync -- post finalizeLibrarySizeChange");
-
-			return newCount;
-		}
-		#endregion
-
-		#region remove books
-		public static Task<List<LibraryBook>> RemoveBooksAsync(List<string> idsToRemove) => Task.Run(() => removeBooks(idsToRemove));
-		private static List<LibraryBook> removeBooks(List<string> idsToRemove)
-		{
-			using var context = DbContexts.GetContext();
-			var libBooks = context.GetLibrary_Flat_NoTracking();
-
-			var removeLibraryBooks = libBooks.Where(lb => idsToRemove.Contains(lb.Book.AudibleProductId)).ToList();
-			context.LibraryBooks.RemoveRange(removeLibraryBooks);
-			context.Books.RemoveRange(removeLibraryBooks.Select(lb => lb.Book));
-
-			var qtyChanges = context.SaveChanges();
-			if (qtyChanges > 0)
-				finalizeLibrarySizeChange();
-
-			return removeLibraryBooks;
-		}
-		#endregion
-
-		// call this whenever books are added or removed from library
-		private static void finalizeLibrarySizeChange()
-		{
-			SearchEngineCommands.FullReIndex();
-			LibrarySizeChanged?.Invoke(null, null);
-		}
-
-		/// <summary>Occurs when books are added or removed from library</summary>
-		public static event EventHandler LibrarySizeChanged;
-
-		/// <summary>
-		/// Occurs when <see cref="UserDefinedItem.Tags"/>, <see cref="UserDefinedItem.BookStatus"/>, or <see cref="UserDefinedItem.PdfStatus"/>
-		/// changed values are successfully persisted.
-		/// </summary>
-		public static event EventHandler<string> BookUserDefinedItemCommitted;
-
-		#region Update book details
-		public static int UpdateUserDefinedItem(Book book)
-		{
-			try
-			{
-				using var context = DbContexts.GetContext();
-
-				// Attach() NoTracking entities before SaveChanges()
-				context.Attach(book.UserDefinedItem).State = Microsoft.EntityFrameworkCore.EntityState.Modified;
-				var qtyChanges = context.SaveChanges();
-				if (qtyChanges > 0)
-				{
-					SearchEngineCommands.UpdateLiberatedStatus(book);
-					SearchEngineCommands.UpdateBookTags(book);
-					BookUserDefinedItemCommitted?.Invoke(null, book.AudibleProductId);
-				}
-
-				return qtyChanges;
-			}
-			catch (Exception ex)
-			{
-				Log.Logger.Error(ex, $"Error updating {nameof(book.UserDefinedItem)}");
-				throw;
-			}
-		}
-		#endregion
-
-		// must be here instead of in db layer due to AaxcExists
-		public static LiberatedStatus Liberated_Status(Book book)
-			=> book.Audio_Exists ? book.UserDefinedItem.BookStatus
-			: AudibleFileStorage.AaxcExists(book.AudibleProductId) ? LiberatedStatus.PartialDownload
-			: LiberatedStatus.NotLiberated;
-
-		// exists here for feature predictability. It makes sense for this to be where Liberated_Status is
-		public static LiberatedStatus? Pdf_Status(Book book) => book.UserDefinedItem.PdfStatus;
-
-		// below are queries, not commands. maybe I should make a LibraryQueries. except there's already one of those...
-
-		public record LibraryStats(int booksFullyBackedUp, int booksDownloadedOnly, int booksNoProgress, int booksError, int pdfsDownloaded, int pdfsNotDownloaded) { }
-		public static LibraryStats GetCounts()
-		{
-			var libraryBooks = DbContexts.GetLibrary_Flat_NoTracking();
-
-			var results = libraryBooks
-				.AsParallel()
-				.Select(lb => Liberated_Status(lb.Book))
-				.ToList();
-			var booksFullyBackedUp = results.Count(r => r == LiberatedStatus.Liberated);
-			var booksDownloadedOnly = results.Count(r => r == LiberatedStatus.PartialDownload);
-			var booksNoProgress = results.Count(r => r == LiberatedStatus.NotLiberated);
-			var booksError = results.Count(r => r == LiberatedStatus.Error);
-
-			Log.Logger.Information("Book counts. {@DebugInfo}", new { total = results.Count, booksFullyBackedUp, booksDownloadedOnly, booksNoProgress, booksError });
-
-			var boolResults = libraryBooks
-				.AsParallel()
-				.Where(lb => lb.Book.HasPdf)
-				.Select(lb => Pdf_Status(lb.Book))
-				.ToList();
-			var pdfsDownloaded = boolResults.Count(r => r == LiberatedStatus.Liberated);
-			var pdfsNotDownloaded = boolResults.Count(r => r == LiberatedStatus.NotLiberated);
-
-			Log.Logger.Information("PDF counts. {@DebugInfo}", new { total = boolResults.Count, pdfsDownloaded, pdfsNotDownloaded });
-
-			return new(booksFullyBackedUp, booksDownloadedOnly, booksNoProgress, booksError, pdfsDownloaded, pdfsNotDownloaded);
-		}
-	}
-}

ApplicationServices/SearchEngineCommands.cs

@@ -1,57 +0,0 @@
-using System;
-using System.IO;
-using DataLayer;
-using LibationSearchEngine;
-
-namespace ApplicationServices
-{
-	public static class SearchEngineCommands
-	{
-		public static void FullReIndex(SearchEngine engine = null)
-		{
-			engine ??= new SearchEngine();
-			var library = DbContexts.GetLibrary_Flat_NoTracking();
-			engine.CreateNewIndex(library);
-		}
-
-		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 UpdateLiberatedStatus(Book book) => performSearchEngineAction_safe(e =>
-			e.UpdateLiberatedStatus(book)
-		);
-
-		private static void performSearchEngineAction_safe(Action<SearchEngine> action)
-		{
-			var engine = new SearchEngine();
-			try
-			{
-				action(engine);
-			}
-			catch (FileNotFoundException)
-			{
-				FullReIndex(engine);
-				action(engine);
-			}
-		}
-
-		private static T performSearchEngineFunc_safe<T>(Func<SearchEngine, T> func)
-		{
-			var engine = new SearchEngine();
-			try
-			{
-				return func(engine);
-			}
-			catch (FileNotFoundException)
-			{
-				FullReIndex(engine);
-				return func(engine);
-			}
-		}
-	}
-}

AudibleUtilities/AudibleUtilities.csproj

@@ -1,15 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="AudibleApi" Version="2.3.2.1" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\LibationFileManager\LibationFileManager.csproj" />
-  </ItemGroup>
-
-</Project>

DataLayer/QueryObjects/LibraryBookQueries.cs

@@ -1,44 +0,0 @@
-using System.Collections.Generic;
-using System.Linq;
-using Microsoft.EntityFrameworkCore;
-
-namespace DataLayer
-{
-    // only library importing should use tracking. All else should be NoTracking.
-    // only library importing should directly query Book. All else should use LibraryBook
-    public static class LibraryBookQueries
-	{
-        //// tracking is a bad idea for main grid. it prevents anything else from updating entities unless getting them from the grid
-		//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
-                .LibraryBooks
-                .AsNoTrackingWithIdentityResolution()
-                .GetLibrary()
-                .ToList();
-
-        public static LibraryBook GetLibraryBook_Flat_NoTracking(this LibationContext context, string productId)
-            => context
-                .LibraryBooks
-                .AsNoTrackingWithIdentityResolution()
-                .GetLibraryBook(productId);
-
-        public static LibraryBook GetLibraryBook(this IQueryable<LibraryBook> library, string productId)
-            => library
-                .GetLibrary()
-                .SingleOrDefault(lb => lb.Book.AudibleProductId == 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);
-    }
-}

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();
-
-			LibationFileManager.TagsPersistence.Save(tagsCollection);
-		}
-	}
-}

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;"
-  }
-}

Docker/liberate.sh

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

Dockerfile

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

Documentation/Advanced.md

@@ -0,0 +1,85 @@
+## [Download Libation](https://github.com/rmcrackan/Libation/releases/latest)
+
+### If you found this useful, tell a friend. If you found this REALLY useful, you can click here to [PalPal.me](https://paypal.me/mcrackan?locale.x=en_us)
+...or just tell more friends. As long as I'm maintaining this software, it will remain **free** and **open source**.
+
+
+
+# Advanced: Table of Contents
+
+- [Files and folders](#files-and-folders)
+- [Settings](#settings)
+- [Custom File Naming](#custom-file-naming)
+- [Command Line Interface](#command-line-interface)
+
+
+
+### Files and folders
+
+To make upgrades and reinstalls easier, Libation separates all of its responsibilities to a few different folders. If you don't want to mess with this stuff: ignore it. Read on if you like a little more control over your files.
+
+* In Libation's initial folder are the files that make up the program. Since nothing else is here, just copy new files here to upgrade the program. Delete this folder to delete Libation.
+
+* In a separate folder, Libation keeps track of all of the files it creates like settings and downloaded images. After an upgrade, Libation might think that's its being run for the first time. Just click ADVANCED SETUP and point to this folder. Libation will reload your library and settings.
+
+* The last important folder is the "books location." This is where Libation looks for your downloaded and decrypted books. This is how it knows which books still need to be downloaded. The Audible id must be somewhere in the book's file or folder name for Libation to detect your downloaded book.
+
+### Settings
+
+* Allow Libation to fix up audiobook metadata. After decrypting a title, Libation attempts to fix details like chapters and cover art. Some power users and/or control freaks prefer to manage this themselves. By unchecking this setting, Libation will only decrypt the book and will leave metadata as-is, warts and all.
+
+### Custom File Naming
+
+In Settings, on the Download/Decrypt tab, you can specify the format in which you want your files to be named. As you edit these templates, a live example will be shown. Parameters are listed for folders, files, and files split by chapter including an explanation of what each naming option means. For instance: you can use template `<title short> - <ch# 0> of <ch count> - <ch title>` to create the file `A Study in Scarlet - 04 of 10 - A Flight for Life.m4b`.
+
+These templates apply to GUI and CLI.
+
+### Command Line Interface
+
+Libationcli.exe allows limited access to Libation's functionalities as a CLI.
+
+Warnings about relying solely on on the CLI:
+* CLI will not perform any upgrades.
+* It will show that there is an upgrade, but that will likely scroll by too fast to notice.
+* It will not perform all post-upgrade migrations. Some migrations are only be possible by launching GUI.
+
+```
+help
+  libationcli --help
+  
+verb-specific help
+  libationcli scan --help
+  
+scan all libraries
+  libationcli scan
+scan only libraries for specific accounts
+  libationcli scan nickname1 nickname2
+  
+convert all m4b files to mp3
+  libationcli convert
+  
+liberate all books and pdfs
+  libationcli liberate
+liberate pdfs only
+  libationcli liberate --pdf
+  libationcli liberate -p
+  
+export library to file
+  libationcli export --path "C:\foo\bar\my.json" --json
+  libationcli export -p "C:\foo\bar\my.json" -j
+  libationcli export -p "C:\foo\bar\my.csv" --csv
+  libationcli export -p "C:\foo\bar\my.csv" -c
+  libationcli export -p "C:\foo\bar\my.xlsx" --xlsx
+  libationcli export -p "C:\foo\bar\my.xlsx" -x
+
+Set download statuses throughout library based on whether each book's audio file can be found.   
+Must include at least one flag: --downloaded , --not-downloaded.  
+Downloaded: If the audio file can be found, set download status to 'Downloaded'.  
+Not Downloaded: If the audio file cannot be found, set download status to 'Not Downloaded'  
+UI: Visible Books \> Set 'Downloaded' status automatically. Visible books. Prompts before saving changes  
+CLI: Full library. No prompt
+
+  libationcli set-status -d
+  libationcli set-status -n
+  libationcli set-status -d -n
+```

Documentation/Docker.md

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

Documentation/GettingStarted.md

@@ -0,0 +1,143 @@
+## [Download Libation](https://github.com/rmcrackan/Libation/releases/latest)
+
+### If you found this useful, tell a friend. If you found this REALLY useful, you can click here to [PalPal.me](https://paypal.me/mcrackan?locale.x=en_us)
+...or just tell more friends. As long as I'm maintaining this software, it will remain **free** and **open source**.
+
+
+
+# Getting started: Table of Contents
+
+- [Download Libation](#download-libation-1)
+- [Installation](#installation)
+- [Create Accounts](#create-accounts)
+- [Import your library](#import-your-library)
+- [Download your books -- DRM-free!](#download-your-books----drm-free)
+- [Download PDF attachments](#download-pdf-attachments)
+- [Details of downloaded files](#details-of-downloaded-files)
+- [Export your library](#export-your-library)
+
+
+
+### [Download Libation](https://github.com/rmcrackan/Libation/releases)
+
+### Installation
+
+* Windows
+
+Extract the zip file to a folder and then run `Libation.exe` from inside of that folder. Do not put it in Program Files. The inability to edit files from there causes problems with configuration and updating.
+
+* [Ubuntu Linux](InstallOnLinux.md)
+* [MacOS](InstallOnMac.md)
+
+### Create Accounts
+
+Create your account(s):
+
+![Create your accounts, menu](images/v40_accounts.png)
+
+New locale options include many more regions including old audible accounts which pre-date the amazon acquisition
+
+![Choose your account locales](images/v40_locales.png)
+
+### Import your library
+
+Be default, Libation will periodically scan the accounts you added above with a checkbox next to them. Nothing for you to do. You can also scan manually.
+
+Select Import > Scan Library:
+
+![Import step 1](images/Import1.png)
+
+Or if you have multiple accounts, you'll get to choose whether to scan all accounts or just the ones you select:
+
+![Import which accounts](images/v40_import.png)
+
+If this is a new installation, or you're scanning an account you haven't scanned before, you'll be prompted to enter your password for the Audible account.
+
+![Login password](images/alt-login1.png)
+
+Enter the password and click Submit. Audible will prompt you with a CAPTCHA image. 
+
+![Login captcha](images/alt-login2.png)
+
+Enter the CAPTCHA answer characters and click Submit. If all has gone well, Libation will start scanning the account. 
+
+In rare instances, the Captcha image/response will fail in an endless loop. If this happens, delete the problem account, and then click Save. Re-add the account and click Save again. Now try to scan the account again. This time, instead of typing your password, click the link that says "Or click here". This will open the Audible External Login dialog shown below.
+
+![Login alternative setup](images/alt-login3.png)
+
+You can either copy the URL shown and paste it into your browser or launch the browser directly by clicking Launch in Browser. Audible will display its standard login page. Login, including answering the CAPTCHA on the next page. In some cases, you might have to approve the login from the email account associated with that login, but once the login is successful, you'll see an error message.
+
+![Login alternative login result](images/alt-login4.png)
+
+This actually means you've successfully logged in. Copy the entire URL shown in your browser and return to Libation. Paste that URL into the text box at the bottom of the Audible External Login window and click Submit.
+
+You'll see this window while it's scanning:
+
+![Import step 2](images/Import2.png)
+
+Success! We see how many new titles are imported:
+
+![Import step 3](images/Import3.png)
+
+### Download your books -- DRM-free!
+
+Automatically download some or all of your audible books. This shows you how much of your library is not yet downloaded and decrypted:
+
+The stoplights will tell you a title's status:
+
+* Green: downloaded and decrypted
+* Yellow: downloaded but still encrypted with DRM
+* Red: not downloaded
+* PDF icon without arrow: downloaded
+* PDF with arrow: not downloaded
+
+Or hover over the button to see the status.
+
+![Liberate book step 1](images/LiberateBook1.png)
+
+Select Liberate > Begin Book Backups
+
+You can also click on the stop light to download only that title and its PDF
+
+![Liberate book step 2](images/LiberateBook2.png)
+
+First the original book with DRM is downloaded
+
+![Liberate book step 3](images/LiberateBook3.png)
+
+Then it's decrypted so you can use it on any device you choose. The very first time you decrypt a book, this step will take a while. Every other book will go much faster. The first time, Libation has to figure out the special decryption key which allows your personal books to be unlocked.
+
+![Liberate book step 4](images/LiberateBook4.png)
+
+And voila! If you have multiple books not yet liberated, Libation will automatically move on to the next.
+
+![Liberate book step 5](images/LiberateBook5.png)
+
+The Audible id must be somewhere in the book's file or folder name for Libation to detect your downloaded book.
+
+### Download PDF attachments
+
+For books which include PDF downloads, Libation can download these for you as well and will attempt to store them with the book. "Book backup" will already download an available PDF. This additional option is useful when Audible adds a PDF to your book after you've already backed it up.
+
+Select Liberate > Begin PDF Backups
+
+![PDF download step 2](images/PdfDownload2.png)
+
+The downloads work just like with books, only with no additional decryption needed.
+
+![PDF download step 3](images/PdfDownload3.png)
+
+### Details of downloaded files
+
+![Post download](images/PostDownload.png)
+
+When you set up Libation, you'll specify a Books directory. Libation looks inside that directory and all subdirectories to look for files or folders with each library book's audible id. This way, organization is completely up to you. When you download + decrypt a book, you get several files
+
+* .m4b: your audiobook in m4b format. This is the most pure version of your audiobook and retains the highest quality. Now that it's decrypted, you can play it on any audio player and put it on any device. If you'd like, you can also use 3rd party tools to turn it into an mp3. The freedom to do what you want with your files was the original inspiration for Libation.
+* .cue: this is a file which logs where chapter breaks occur. Many tools are able to use this if you want to split your book into files along chapter lines.
+
+### Export your library
+
+![Export](images/Export.png)
+
+Export your library to Excel, CSV, or JSON

Documentation/InstallOnLinux.md

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

Documentation/InstallOnMac.md

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

Documentation/SearchingAndFiltering.md

@@ -0,0 +1,79 @@
+## [Download Libation](https://github.com/rmcrackan/Libation/releases/latest)
+
+### If you found this useful, tell a friend. If you found this REALLY useful, you can click here to [PalPal.me](https://paypal.me/mcrackan?locale.x=en_us)
+...or just tell more friends. As long as I'm maintaining this software, it will remain **free** and **open source**.
+
+
+
+# Searching and filtering: Table of Contents
+
+- [Tags](#tags)
+- [Searches](#searches)
+- [Search examples](#search-examples)
+- [Filters](#filters)
+
+
+
+### Tags
+
+To add tags to a title, click the tags button
+
+![Tags step 1](images/Tags1.png)
+
+Add as many tags as you'd like. Tags are separated by a space. Each tag can contain letters, numbers, and underscores
+
+![Tags step 2](images/Tags2.png)
+
+Tags are saved non-case specific for easy search. There is one special tag "hidden" which will also grey-out the book
+
+![Tags step 3](images/Tags3.png)
+
+To edit tags, just click the button again.
+
+### Searches
+
+Libation's advanced searching is built on the powerful Lucene search engine. Simple searches are effortless and powerful searches are simple. To search, just type and click Filter or press enter
+
+* Type anything in the search box to search common fields: title, authors, narrators, and the book's audible id
+* Use Lucene's "Query Parser Syntax" for advanced searching.
+    * Easy tutorial: http://www.lucenetutorial.com/lucene-query-syntax.html
+    * Full official guide: https://lucene.apache.org/core/2_9_4/queryparsersyntax.html
+* Tons of search fields, specific to audiobooks
+* Synonyms so you don't have to memorize magic words. Eg: author and author**s** will both work
+* Click [?] button for a full list of search fields and synonyms ![Filter options](images/FilterOptionsButton.png)
+* Search by tag like \[this\]
+* When tags have an underscore you can use part of the tag. This is useful for quick categories. The below examples make this more clear.
+
+### Search examples
+
+Search for anything with the word potter
+
+![Search example: potter](images/SearchExamplePotter.png)
+
+If you only want to see Harry Potter
+
+![Search example: "harry potter"](images/SearchExampleHarryPotter.png)
+
+If you only want to see potter except for Harry Potter. You can also use "-" instead of "NOT"
+
+![Search example: "potter NOT harry"](images/SearchExamplePotterNotHarry.png)
+![Search example: "potter -harry"](images/SearchExamplePotterNotHarry2.png)
+
+To see only books written by Neil Gaiman where he also narrates his own book. (If you don't include AND, you'll see everything written by Neil Gaiman and also all books in your library which are self-narrated.)
+
+![Search example: author:gaiman AND authornarrated](images/SearchExampleGaimanAuthorNarrated.png)
+
+I tagged autobiographies as auto_bio and biographies written by someone else as bio. I can get only autobiographies with \[auto_bio\] or get both by searching \[bio\]
+
+![Search example: \[bio\]](images/SearchExampleBio.png)
+![Search example: \[auto_bio\]](images/SearchExampleAutoBio.png)
+
+### Filters
+
+If you have a search you want to save, click Add To Quick Filters to save it in your Quick Filters list. To use it again, select it from the Quick Filters list.
+
+To edit this list go to Quick Filters > Edit quick filters. Here you can re-order the list, delete filters, double-click a filter to edit it, or double-click the bottom blank box to add a new filter.
+
+Check "Quick Filters > Start Libation with 1st filter Default" to have your top filter automatically applied when Libation starts. In this top example, I want to always start without these: at books I've tagged hidden, books I've tagged as free_audible_originals, and books which I have rated.
+
+![default filters](images/FiltersDefault.png)

DtoImporterService/BookImporter.cs

@@ -1,173 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using AudibleApi.Common;
-using AudibleUtilities;
-using DataLayer;
-
-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).Distinct().ToList();
-			
-			// load db existing => .Local
-			loadLocal_books(productIds);
-			
-			// upsert
-			var qtyNew = upsertBooks(importItems);
-			return qtyNew;
-		}
-
-		private void loadLocal_books(List<string> productIds)
-		{
-			// if this context has already loaded books, don't need to reload them. vestige from when context was long-lived. in practice, we now typically use a fresh context. this is quick though so no harm in leaving it.
-			var localProductIds = DbContext.Books.Local.Select(b => b.AudibleProductId).ToList();
-			var remainingProductIds = productIds
-				.Except(localProductIds)
-				.ToList();
-
-			#region // explanation of DbContext.Books.GetBooks(b => remainingProductIds.Contains(b.AudibleProductId)).ToList();
-			/*
-			articles suggest loading to Local with
-			    context.Books.Load();
-			we want Books and associated fields
-			    context.Books.GetBooks(b => remainingProductIds.Contains(b.AudibleProductId)).ToList();
-			this is emulating Load() but with also getting associated fields
-
-			from: Microsoft.EntityFrameworkCore.EntityFrameworkQueryableExtensions
-			// Summary:
-			//     Enumerates the query. When using Entity Framework, this causes the results of
-			//     the query to be loaded into the associated context. This is equivalent to calling
-			//     ToList and then throwing away the list (without the overhead of actually creating
-			//     the list).
-			public static void Load<TSource>([NotNullAttribute] this IQueryable<TSource> source); 
-			*/
-			#endregion
-
-			// 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.FirstOrDefault(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;
-
-			var contentType = item.IsEpisodes ? DataLayer.ContentType.Episode : DataLayer.ContentType.Product;
-
-			// 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.TitleWithSubtitle,
-				item.Description,
-				item.LengthInMinutes,
-				contentType,
-				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 (item.PdfUrl is not null)
-				book.AddSupplementDownloadUrl(item.PdfUrl.ToString());
-
-			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);
-
-			// 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.FirstOrDefault(s => seriesEntry.SeriesId == s.AudibleSeriesId);
-					book.UpsertSeries(series, seriesEntry.Sequence);
-				}
-			}
-		}
-	}
-}

DtoImporterService/DtoImporterService.csproj

@@ -1,12 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\AudibleUtilities\AudibleUtilities.csproj" />
-    <ProjectReference Include="..\DataLayer\DataLayer.csproj" />
-  </ItemGroup>
-
-</Project>

DtoImporterService/SeriesImporter.cs

@@ -1,63 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using AudibleApi.Common;
-using AudibleUtilities;
-using DataLayer;
-
-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<AudibleApi.Common.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<AudibleApi.Common.Series> requestedSeries)
-		{
-			var qtyNew = 0;
-
-			foreach (var s in requestedSeries)
-			{
-				var series = DbContext.Series.Local.FirstOrDefault(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/AudioDecodable.cs

@@ -1,44 +0,0 @@
-using System;
-
-namespace FileLiberator
-{
-    public abstract class AudioDecodable : Processable
-    {
-        public event EventHandler<Action<byte[]>> RequestCoverArt;
-        public event EventHandler<string> TitleDiscovered;
-        public event EventHandler<string> AuthorsDiscovered;
-        public event EventHandler<string> NarratorsDiscovered;
-        public event EventHandler<byte[]> CoverImageDiscovered;
-        public abstract void Cancel();
-
-        protected void OnRequestCoverArt(Action<byte[]> setCoverArtDel)
-		{
-            Serilog.Log.Logger.Debug("Event fired {@DebugInfo}", new { Name = nameof(RequestCoverArt) });
-            RequestCoverArt?.Invoke(this, setCoverArtDel);
-        }
-
-        protected void OnTitleDiscovered(string title)
-		{
-            Serilog.Log.Logger.Debug("Event fired {@DebugInfo}", new { Name = nameof(TitleDiscovered), Title = title });
-            TitleDiscovered?.Invoke(this, title);
-		}
-
-        protected void OnAuthorsDiscovered(string authors)
-		{
-            Serilog.Log.Logger.Debug("Event fired {@DebugInfo}", new { Name = nameof(AuthorsDiscovered), Authors = authors });
-            AuthorsDiscovered?.Invoke(this, authors);
-		}
-
-        protected void OnNarratorsDiscovered(string narrators)
-		{
-            Serilog.Log.Logger.Debug("Event fired {@DebugInfo}", new { Name = nameof(NarratorsDiscovered), Narrators = narrators });
-            NarratorsDiscovered?.Invoke(this, narrators);
-		}
-
-        protected void OnCoverImageDiscovered(byte[] coverImage)
-		{
-            Serilog.Log.Logger.Debug("Event fired {@DebugInfo}", new { Name = nameof(CoverImageDiscovered), CoverImageBytes = coverImage?.Length });
-            CoverImageDiscovered?.Invoke(this, coverImage);
-        }
-    }
-}

FileLiberator/AudioFileStorageExt.cs

@@ -1,82 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using DataLayer;
-using Dinah.Core;
-using FileManager;
-using LibationFileManager;
-
-namespace FileLiberator
-{
-    public static class AudioFileStorageExt
-    {
-        private static void AddParameterReplacement(this FileTemplate fileTemplate, TemplateTags templateTags, object value)
-            => fileTemplate.AddParameterReplacement(templateTags.TagName, value);
-
-        internal class MultipartRenamer
-        {
-            public LibraryBook libraryBook { get; }
-
-            public MultipartRenamer(LibraryBook libraryBook) => this.libraryBook = libraryBook;
-
-            internal string MultipartFilename(string outputFileName, int partsPosition, int partsTotal, AAXClean.NewSplitCallback newSplitCallback)
-                => MultipartFilename(Configuration.Instance.ChapterFileTemplate, AudibleFileStorage.DecryptInProgressDirectory, Path.GetExtension(outputFileName), partsPosition, partsTotal, newSplitCallback?.Chapter?.Title ?? "");
-
-            internal string MultipartFilename(string template, string fullDirPath, string extension, int partsPosition, int partsTotal, string chapterTitle)
-            {
-                var fileTemplate = GetFileTemplateSingle(template, libraryBook, fullDirPath, extension);
-
-                fileTemplate.AddParameterReplacement(TemplateTags.ChCount, partsTotal);
-                fileTemplate.AddParameterReplacement(TemplateTags.ChNumber, partsPosition);
-                fileTemplate.AddParameterReplacement(TemplateTags.ChNumber0, FileUtility.GetSequenceFormatted(partsPosition, partsTotal));
-                fileTemplate.AddParameterReplacement(TemplateTags.ChTitle, chapterTitle);
-
-                return fileTemplate.GetFilePath();
-            }
-        }
-
-        public static Func<string, int, int, AAXClean.NewSplitCallback, string> CreateMultipartRenamerFunc(this AudioFileStorage _, LibraryBook libraryBook)
-            => new MultipartRenamer(libraryBook).MultipartFilename;
-
-        public static string GetInProgressFilename(this AudioFileStorage _, LibraryBook libraryBook, string extension)
-            => GetCustomDirFilename(_, libraryBook, AudibleFileStorage.DecryptInProgressDirectory, extension);
-
-        public static string GetBooksDirectoryFilename(this AudioFileStorage _, LibraryBook libraryBook, string extension)
-            => GetCustomDirFilename(_, libraryBook, AudibleFileStorage.BooksDirectory, extension);
-
-        public static string GetDestinationDirectory(this AudioFileStorage _, LibraryBook libraryBook)
-            => GetFileTemplateSingle(Configuration.Instance.FolderTemplate, libraryBook, AudibleFileStorage.BooksDirectory, null)
-            .GetFilePath();
-
-        public static string GetCustomDirFilename(this AudioFileStorage _, LibraryBook libraryBook, string dirFullPath, string extension)
-            => GetFileTemplateSingle(Configuration.Instance.FileTemplate, libraryBook, dirFullPath, extension)
-            .GetFilePath();
-
-        internal static FileTemplate GetFileTemplateSingle(string template, LibraryBook libraryBook, string dirFullPath, string extension)
-        {
-            ArgumentValidator.EnsureNotNullOrWhiteSpace(template, nameof(template));
-            ArgumentValidator.EnsureNotNull(libraryBook, nameof(libraryBook));
-            ArgumentValidator.EnsureNotNullOrWhiteSpace(dirFullPath, nameof(dirFullPath));
-
-            var fullfilename = Path.Combine(dirFullPath, template + FileUtility.GetStandardizedExtension(extension));
-            var fileTemplate = new FileTemplate(fullfilename) { IllegalCharacterReplacements = "_" };
-
-            var title = libraryBook.Book.Title ?? "";
-
-            fileTemplate.AddParameterReplacement(TemplateTags.Id, libraryBook.Book.AudibleProductId);
-            fileTemplate.AddParameterReplacement(TemplateTags.Title, title);
-            fileTemplate.AddParameterReplacement(TemplateTags.TitleShort, title.IndexOf(':') < 1 ? title : title.Substring(0, title.IndexOf(':')));
-            fileTemplate.AddParameterReplacement(TemplateTags.Author, libraryBook.Book.AuthorNames);
-            fileTemplate.AddParameterReplacement(TemplateTags.FirstAuthor, libraryBook.Book.Authors.FirstOrDefault()?.Name);
-            fileTemplate.AddParameterReplacement(TemplateTags.Narrator, libraryBook.Book.NarratorNames);
-            fileTemplate.AddParameterReplacement(TemplateTags.FirstNarrator, libraryBook.Book.Narrators.FirstOrDefault()?.Name);
-
-            var seriesLink = libraryBook.Book.SeriesLink.FirstOrDefault();
-            fileTemplate.AddParameterReplacement(TemplateTags.Series, seriesLink?.Series.Name);
-            fileTemplate.AddParameterReplacement(TemplateTags.SeriesNumber, seriesLink?.Order);
-
-            return fileTemplate;
-        }
-    }
-}

FileLiberator/ConvertToMp3.cs

@@ -1,92 +0,0 @@
-using System;
-using System.IO;
-using System.Threading.Tasks;
-using AAXClean;
-using DataLayer;
-using Dinah.Core;
-using Dinah.Core.ErrorHandling;
-using Dinah.Core.Net.Http;
-using FileManager;
-using LibationFileManager;
-
-namespace FileLiberator
-{
-    public class ConvertToMp3 : AudioDecodable
-    {
-        private Mp4File m4bBook;
-
-		private long fileSize;
-        private static string Mp3FileName(string m4bPath) => Path.ChangeExtension(m4bPath ?? "", ".mp3");
-
-        public override void Cancel() => m4bBook?.Cancel();
-
-        public override bool Validate(LibraryBook libraryBook)
-        {
-            var path = AudibleFileStorage.Audio.GetPath(libraryBook.Book.AudibleProductId);
-            return path?.ToLower()?.EndsWith(".m4b") == true && !File.Exists(Mp3FileName(path));
-        }
-
-        public override async Task<StatusHandler> ProcessAsync(LibraryBook libraryBook)
-        {
-            OnBegin(libraryBook);
-
-            OnStreamingBegin($"Begin converting {libraryBook} to mp3");
-
-            try
-            {
-                var m4bPath = AudibleFileStorage.Audio.GetPath(libraryBook.Book.AudibleProductId);
-                m4bBook = new Mp4File(m4bPath, FileAccess.Read);
-                m4bBook.ConversionProgressUpdate += M4bBook_ConversionProgressUpdate;
-
-                fileSize = m4bBook.InputStream.Length;
-
-                OnTitleDiscovered(m4bBook.AppleTags.Title);
-                OnAuthorsDiscovered(m4bBook.AppleTags.FirstAuthor);
-                OnNarratorsDiscovered(m4bBook.AppleTags.Narrator);
-                OnCoverImageDiscovered(m4bBook.AppleTags.Cover);
-
-                using var mp3File = File.OpenWrite(Path.GetTempFileName());
-
-                var result = await Task.Run(() => m4bBook.ConvertToMp3(mp3File));
-                m4bBook.InputStream.Close();
-                mp3File.Close();
-
-                var proposedMp3Path = Mp3FileName(m4bPath);
-                var realMp3Path = FileUtility.SaferMoveToValidPath(mp3File.Name, proposedMp3Path);
-                OnFileCreated(libraryBook, realMp3Path);
-
-                var statusHandler = new StatusHandler();
-
-                if (result == ConversionResult.Failed)
-                    statusHandler.AddError("Conversion failed");
-
-                return statusHandler;
-            }
-            finally
-            {
-                OnStreamingCompleted($"Completed converting to mp3: {libraryBook.Book.Title}");
-                OnCompleted(libraryBook);
-            }
-        }
-
-        private void M4bBook_ConversionProgressUpdate(object sender, ConversionProgressEventArgs e)
-        {
-            var duration = m4bBook.Duration;
-            double remainingSecsToProcess = (duration - e.ProcessPosition).TotalSeconds;
-            double estTimeRemaining = remainingSecsToProcess / e.ProcessSpeed;
-
-            if (double.IsNormal(estTimeRemaining))
-                OnStreamingTimeRemaining(TimeSpan.FromSeconds(estTimeRemaining));
-
-            double progressPercent = 100 * e.ProcessPosition.TotalSeconds / duration.TotalSeconds;
-
-            OnStreamingProgressChanged(
-                new DownloadProgress
-                {
-                    ProgressPercentage = progressPercent,
-                    BytesReceived = (long)(fileSize * progressPercent),
-                    TotalBytesToReceive = fileSize
-                });
-        }
-    }
-}

FileLiberator/DownloadDecryptBook.cs

@@ -1,210 +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 LibationFileManager;
-
-namespace FileLiberator
-{
-    public class DownloadDecryptBook : AudioDecodable
-    {
-        private AudiobookDownloadBase abDownloader;
-
-        public override bool Validate(LibraryBook libraryBook) => !libraryBook.Book.Audio_Exists;
-
-        public override void Cancel() => abDownloader?.Cancel();
-
-        public override async Task<StatusHandler> ProcessAsync(LibraryBook libraryBook)
-        {
-            var entries = new List<FilePathCache.CacheEntry>();
-            // these only work so minimally b/c CacheEntry is a record.
-            // in case of parallel decrypts, only capture the ones for this book id.
-            // if user somehow starts multiple decrypts of the same book in parallel: on their own head be it
-            void FilePathCache_Inserted(object sender, FilePathCache.CacheEntry e)
-            {
-                if (e.Id.EqualsInsensitive(libraryBook.Book.AudibleProductId))
-                    entries.Add(e);
-            }
-            void FilePathCache_Removed(object sender, FilePathCache.CacheEntry e)
-            {
-                if (e.Id.EqualsInsensitive(libraryBook.Book.AudibleProductId))
-                    entries.Remove(e);
-            }
-
-            OnBegin(libraryBook);
-
-            try
-            {
-                if (libraryBook.Book.Audio_Exists)
-                    return new StatusHandler { "Cannot find decrypt. Final audio file already exists" };
-
-                bool success = false;
-                try
-                {
-                    FilePathCache.Inserted += FilePathCache_Inserted;
-                    FilePathCache.Removed += FilePathCache_Removed;
-
-                    success = await downloadAudiobookAsync(libraryBook);
-                }
-                finally
-                {
-                    FilePathCache.Inserted -= FilePathCache_Inserted;
-                    FilePathCache.Removed -= FilePathCache_Removed;
-                }
-
-                // decrypt failed
-                if (!success)
-                    return new StatusHandler { "Decrypt failed" };
-
-                // moves new files from temp dir to final dest
-                var movedAudioFile = moveFilesToBooksDir(libraryBook, entries);
-
-                // decrypt failed
-                if (!movedAudioFile)
-                    return new StatusHandler { "Cannot find final audio file after decryption" };
-
-                libraryBook.Book.UserDefinedItem.BookStatus = LiberatedStatus.Liberated;
-
-                return new StatusHandler();
-            }
-            finally
-            {
-                OnCompleted(libraryBook);
-            }
-        }
-
-        private async Task<bool> downloadAudiobookAsync(LibraryBook libraryBook)
-        {
-            OnStreamingBegin($"Begin decrypting {libraryBook}");
-
-            try
-            {
-                downloadValidation(libraryBook);
-
-                var api = await libraryBook.GetApiAsync();
-                var contentLic = await api.GetDownloadLicenseAsync(libraryBook.Book.AudibleProductId);
-
-                var audiobookDlLic = new DownloadLicense
-                    (
-                    contentLic?.ContentMetadata?.ContentUrl?.OfflineUrl,
-                    contentLic?.Voucher?.Key,
-                    contentLic?.Voucher?.Iv,
-                    Resources.USER_AGENT
-                    );
-
-                //I assume if ContentFormat == "MPEG" that the delivered file is an unencrypted mp3.
-                //I also assume that if DrmType != Adrm, the file will be an mp3.
-                //These assumptions may be wrong, and only time and bug reports will tell.
-                var outputFormat = 
-                    contentLic.ContentMetadata.ContentReference.ContentFormat == "MPEG" ||
-                    (Configuration.Instance.AllowLibationFixup && Configuration.Instance.DecryptToLossy) ? 
-                    OutputFormat.Mp3 : OutputFormat.M4b;
-
-                if (Configuration.Instance.AllowLibationFixup || outputFormat == OutputFormat.Mp3)
-                {
-                    audiobookDlLic.ChapterInfo = new AAXClean.ChapterInfo();
-
-                    foreach (var chap in contentLic.ContentMetadata?.ChapterInfo?.Chapters)
-                        audiobookDlLic.ChapterInfo.AddChapter(chap.Title, TimeSpan.FromMilliseconds(chap.LengthMs));
-                }
-
-                var outFileName = AudibleFileStorage.Audio.GetInProgressFilename(libraryBook, outputFormat.ToString().ToLower());
-
-                var cacheDir = AudibleFileStorage.DownloadsInProgressDirectory;
-
-                abDownloader
-                    = contentLic.DrmType != AudibleApi.Common.DrmType.Adrm ? new UnencryptedAudiobookDownloader(outFileName, cacheDir, audiobookDlLic)
-                    : Configuration.Instance.SplitFilesByChapter ? new AaxcDownloadMultiConverter(
-                        outFileName, cacheDir, audiobookDlLic, outputFormat,
-                        AudibleFileStorage.Audio.CreateMultipartRenamerFunc(libraryBook)
-                        )
-                    : new AaxcDownloadSingleConverter(outFileName, cacheDir, audiobookDlLic, outputFormat);
-                abDownloader.DecryptProgressUpdate += (_, progress) => OnStreamingProgressChanged(progress);
-                abDownloader.DecryptTimeRemaining += (_, remaining) => OnStreamingTimeRemaining(remaining);
-                abDownloader.RetrievedTitle += (_, title) => OnTitleDiscovered(title);
-                abDownloader.RetrievedAuthors += (_, authors) => OnAuthorsDiscovered(authors);
-                abDownloader.RetrievedNarrators += (_, narrators) => OnNarratorsDiscovered(narrators);
-                abDownloader.RetrievedCoverArt += AaxcDownloader_RetrievedCoverArt;
-                abDownloader.FileCreated += (_, path) => OnFileCreated(libraryBook, path);
-
-                // REAL WORK DONE HERE
-                var success = await Task.Run(abDownloader.Run);
-                return success;
-            }
-            finally
-            {
-                OnStreamingCompleted($"Completed downloading and decrypting {libraryBook.Book.Title}");
-            }
-        }
-
-        private static void downloadValidation(LibraryBook libraryBook)
-        {
-            string errorString(string field)
-                => $"{errorTitle()}\r\nCannot download book. {field} is not known. Try re-importing the account which owns this book.";
-
-            string errorTitle()
-            {
-                var title
-                    = (libraryBook.Book.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 AaxcDownloader_RetrievedCoverArt(object sender, byte[] e)
-        {
-            if (e is not null)
-                OnCoverImageDiscovered(e);
-            else if (Configuration.Instance.AllowLibationFixup)
-                OnRequestCoverArt(abDownloader.SetCoverArt);
-        }
-
-        /// <summary>Move new files to 'Books' directory</summary>
-        /// <returns>True if audiobook file(s) were successfully created and can be located on disk. Else false.</returns>
-        private static bool moveFilesToBooksDir(LibraryBook libraryBook, List<FilePathCache.CacheEntry> entries)
-        {
-            // create final directory. move each file into it
-            var destinationDir = AudibleFileStorage.Audio.GetDestinationDirectory(libraryBook);
-            Directory.CreateDirectory(destinationDir);
-
-            FilePathCache.CacheEntry getFirstAudio() => entries.FirstOrDefault(f => f.FileType == FileType.Audio);
-
-			if (getFirstAudio() == default)
-				return false;
-
-			for (var i = 0; i < entries.Count; i++)
-			{
-				var entry = entries[i];
-
-				var realDest = FileUtility.SaferMoveToValidPath(entry.Path, Path.Combine(destinationDir, Path.GetFileName(entry.Path)));
-				FilePathCache.Insert(libraryBook.Book.AudibleProductId, realDest);
-
-				// propogate corrected path. Must update cache with corrected path. Also want updated path for cue file (after this for-loop)
-				entries[i] = entry with { Path = realDest };
-			}
-
-			var cue = entries.FirstOrDefault(f => f.FileType == FileType.Cue);
-			if (cue != default)
-				Cue.UpdateFileName(cue.Path, getFirstAudio().Path);
-
-			AudibleFileStorage.Audio.Refresh();
-
-			return true;
-		}
-	}
-}

FileLiberator/DownloadFile.cs

@@ -1,32 +0,0 @@
-using System;
-using System.Net.Http;
-using System.Threading.Tasks;
-using Dinah.Core.Net.Http;
-
-namespace FileLiberator
-{
-	// currently only used to download the .zip flies for upgrade
-	public class DownloadFile : Streamable
-	{
-		public async Task<string> PerformDownloadFileAsync(string downloadUrl, string proposedDownloadFilePath)
-		{
-			var client = new HttpClient();
-
-			var progress = new Progress<DownloadProgress>();
-			progress.ProgressChanged += (_, e) => OnStreamingProgressChanged(e);
-
-			OnStreamingBegin(proposedDownloadFilePath);
-
-			try
-			{
-				var actualDownloadedFilePath = await client.DownloadFileAsync(downloadUrl, proposedDownloadFilePath, progress);
-				OnFileCreated("Upgrade", actualDownloadedFilePath);
-				return actualDownloadedFilePath;
-			}
-			finally
-			{
-				OnStreamingCompleted(proposedDownloadFilePath);
-			}
-		}
-	}
-}

FileLiberator/FileLiberator.csproj

@@ -1,13 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\AaxDecrypter\AaxDecrypter.csproj" />
-    <ProjectReference Include="..\DataLayer\DataLayer.csproj" />
-    <ProjectReference Include="..\AudibleUtilities\AudibleUtilities.csproj" />
-  </ItemGroup>
-
-</Project>

FileLiberator/Streamable.cs

@@ -1,45 +0,0 @@
-using System;
-using Dinah.Core.Net.Http;
-
-namespace FileLiberator
-{
-    public abstract class Streamable
-    {
-        public event EventHandler<string> StreamingBegin;
-        public event EventHandler<DownloadProgress> StreamingProgressChanged;
-        public event EventHandler<TimeSpan> StreamingTimeRemaining;
-        public event EventHandler<string> StreamingCompleted;
-        /// <summary>Fired when a file is successfully saved to disk</summary>
-        public event EventHandler<(string id, string path)> FileCreated;
-
-        protected void OnStreamingBegin(string filePath)
-        {
-            Serilog.Log.Logger.Debug("Event fired {@DebugInfo}", new { Name = nameof(StreamingBegin), Message = filePath });
-            StreamingBegin?.Invoke(this, filePath);
-        }
-
-        protected void OnStreamingProgressChanged(DownloadProgress progress)
-        {
-            StreamingProgressChanged?.Invoke(this, progress);
-        }
-
-        protected void OnStreamingTimeRemaining(TimeSpan timeRemaining)
-        {
-            StreamingTimeRemaining?.Invoke(this, timeRemaining);
-        }
-
-        protected void OnStreamingCompleted(string filePath)
-        {
-            Serilog.Log.Logger.Debug("Event fired {@DebugInfo}", new { Name = nameof(StreamingCompleted), Message = filePath });
-            StreamingCompleted?.Invoke(this, filePath);
-        }
-
-        protected void OnFileCreated(DataLayer.LibraryBook libraryBook, string path) => OnFileCreated(libraryBook.Book.AudibleProductId, path);
-        protected void OnFileCreated(string id, string path)
-        {
-            Serilog.Log.Logger.Information("File created {@DebugInfo}", new { Name = nameof(FileCreated), id, path });
-            LibationFileManager.FilePathCache.Insert(id, path);
-            FileCreated?.Invoke(this, (id, path));
-        }
-    }
-}

FileLiberator/UtilityExtensions.cs

@@ -1,26 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using DataLayer;
-using Dinah.Core;
-
-namespace FileLiberator
-{
-	public static class UtilityExtensions
-	{
-		public static (string id, string title, string locale, string account) LogFriendly(this LibraryBook libraryBook)
-			=> (
-			id: libraryBook.Book.AudibleProductId,
-			title: libraryBook.Book.Title,
-			locale: libraryBook.Book.Locale,
-			account: libraryBook.Account.ToMask()
-			);
-
-		public static async Task<AudibleApi.Api> GetApiAsync(this LibraryBook libraryBook)
-		{
-			var apiExtended = await AudibleUtilities.ApiExtended.CreateAsync(libraryBook.Account, libraryBook.Book.Locale);
-			return apiExtended.Api;
-		}
-	}
-}

FileManager/FileManager.csproj

@@ -1,12 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Dinah.Core" Version="2.0.2.1" />
-    <PackageReference Include="Polly" Version="7.2.2" />
-  </ItemGroup>
-
-</Project>

FileManager/FileTemplate.cs

@@ -1,52 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using Dinah.Core;
-
-namespace FileManager
-{
-    /// <summary>Get valid filename. Advanced features incl. parameterized template</summary>
-    public class FileTemplate
-    {
-        /// <summary>Proposed full file path. May contain optional html-styled template tags. Eg: &lt;name&gt;</summary>
-        public string Template { get; }
-
-        /// <param name="template">Proposed file name with optional html-styled template tags.</param>
-        public FileTemplate(string template) => Template = ArgumentValidator.EnsureNotNullOrWhiteSpace(template, nameof(template));
-
-        /// <summary>Optional step 1: Replace html-styled template tags with parameters. Eg {"name", "Bill Gates"} => /&lt;name&gt;/ => /Bill Gates/</summary>
-        public Dictionary<string, object> ParameterReplacements { get; } = new Dictionary<string, object>();
-
-        /// <summary>Convenience method</summary>
-        public void AddParameterReplacement(string key, object value)
-            // using .Add() instead of "[key] = value" will make unintended overwriting throw exception
-            => ParameterReplacements.Add(key, value);
-
-        /// <summary>If set, truncate each parameter replacement to this many characters. Default 50</summary>
-        public int? ParameterMaxSize { get; set; } = 50;
-
-        /// <summary>Optional step 2: Replace all illegal characters with this. Default=<see cref="string.Empty"/></summary>
-        public string IllegalCharacterReplacements { get; set; }
-
-        /// <summary>Generate a valid path for this file or directory</summary>
-        public string GetFilePath()
-        {
-            var filename = Template;
-
-            foreach (var r in ParameterReplacements)
-                filename = filename.Replace($"<{formatKey(r.Key)}>", formatValue(r.Value));
-
-            return FileUtility.GetValidFilename(filename, IllegalCharacterReplacements);
-        }
-
-        private static string formatKey(string key)
-            => key
-            .Replace("<", "")
-            .Replace(">", "");
-
-        private string formatValue(object value)
-            => ParameterMaxSize.HasValue && ParameterMaxSize.Value > 0
-            ? value?.ToString().Truncate(ParameterMaxSize.Value)
-            : value?.ToString();
-    }
-}

FileManager/FileUtility.cs

@@ -1,179 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using Dinah.Core;
-using Polly;
-using Polly.Retry;
-
-namespace FileManager
-{
-    public static class FileUtility
-    {
-        /// <summary>
-        /// "txt" => ".txt"
-        /// <br />".txt" => ".txt"
-        /// <br />null or whitespace => ""
-        /// </summary>
-        public static string GetStandardizedExtension(string extension)
-            => string.IsNullOrWhiteSpace(extension)
-            ? (extension ?? "")?.Trim()
-            : '.' + extension.Trim().Trim('.');
-
-        /// <summary>
-        /// Return position with correct number of leading zeros.
-        /// <br />- 2 of 9 => "2"
-        /// <br />- 2 of 90 => "02"
-        /// <br />- 2 of 900 => "002"
-        /// </summary>
-        /// <param name="position">position in sequence. The 'x' in 'x of y'</param>
-        /// <param name="total">total qty in sequence. The 'y' in 'x of y'</param>
-        public static string GetSequenceFormatted(int position, int total)
-        {
-            ArgumentValidator.EnsureGreaterThan(position, nameof(position), 0);
-            ArgumentValidator.EnsureGreaterThan(total, nameof(total), 0);
-            if (position > total)
-                throw new ArgumentException($"{position} may not be greater than {total}");
-
-            return position.ToString().PadLeft(total.ToString().Length, '0');
-        }
-
-        private const int MAX_FILENAME_LENGTH = 255;
-        private const int MAX_DIRECTORY_LENGTH = 247;
-
-        /// <summary>
-        /// Ensure valid file name path: 
-        /// <br/>- remove invalid chars
-        /// <br/>- ensure uniqueness
-        /// <br/>- enforce max file length
-        /// </summary>
-        public static string GetValidFilename(string path, string illegalCharacterReplacements = "")
-        {
-            ArgumentValidator.EnsureNotNull(path, nameof(path));
-
-            // remove invalid chars
-            path = GetSafePath(path, illegalCharacterReplacements);
-
-            // ensure uniqueness and check lengths
-            var dir = Path.GetDirectoryName(path);
-            dir = dir.Truncate(MAX_DIRECTORY_LENGTH);
-
-            var filename = Path.GetFileNameWithoutExtension(path);
-            var fileStem = Path.Combine(dir, filename);
-
-            var extension = Path.GetExtension(path);
-
-            var fullfilename = fileStem.Truncate(MAX_FILENAME_LENGTH - extension.Length) + extension;
-
-            var i = 0;
-            while (File.Exists(fullfilename))
-            {
-                var increm = $" ({++i})";
-                fullfilename = fileStem.Truncate(MAX_FILENAME_LENGTH - increm.Length - extension.Length) + increm + extension;
-            }
-
-            return fullfilename;
-        }
-
-        // GetInvalidFileNameChars contains everything in GetInvalidPathChars plus ':', '*', '?', '\\', '/'
-
-        /// <summary>Use with file name, not full path. Valid path charaters which are invalid file name characters will be replaced: ':', '\\', '/'</summary>
-        public static string GetSafeFileName(string str, string illegalCharacterReplacements = "")
-            => string.Join(illegalCharacterReplacements ?? "", str.Split(Path.GetInvalidFileNameChars()));
-
-        /// <summary>Use with full path, not file name. Valid path charaters which are invalid file name characters will be retained: '\\', '/'</summary>
-        public static string GetSafePath(string path, string illegalCharacterReplacements = "")
-        {
-            ArgumentValidator.EnsureNotNull(path, nameof(path));
-
-            var invalidChars = Path.GetInvalidPathChars().Union(new[] {
-                '*', '?',
-                // these are weird. If you run Path.GetInvalidPathChars() in C# interactive, these characters are included.
-                // In live code, Path.GetInvalidPathChars() does not include them
-                '"', '<', '>'
-            }).ToArray();
-
-            var fixedPath = string
-                .Join(illegalCharacterReplacements ?? "", path.Split(invalidChars))
-                .Replace(Path.AltDirectorySeparatorChar, Path.DirectorySeparatorChar);
-
-            // replace all colons except within the first 2 chars
-            var builder = new System.Text.StringBuilder();
-            for (var i = 0; i < fixedPath.Length; i++)
-            {
-                var c = fixedPath[i];
-                if (i >= 2 && c == ':')
-                    builder.Append(illegalCharacterReplacements);
-                else
-                    builder.Append(c);
-            }
-            fixedPath = builder.ToString();
-
-            var dblSeparator = $"{Path.DirectorySeparatorChar}{Path.DirectorySeparatorChar}";
-            while (fixedPath.Contains(dblSeparator))
-                fixedPath = fixedPath.Replace(dblSeparator, $"{Path.DirectorySeparatorChar}");
-
-            return fixedPath;
-        }
-
-        /// <summary>
-        /// Move file.
-        /// <br/>- Ensure valid file name path: remove invalid chars, ensure uniqueness, enforce max file length
-        /// <br/>- Perform <see cref="SaferMove"/>
-        /// <br/>- Return valid path
-        /// </summary>
-        public static string SaferMoveToValidPath(string source, string destination)
-        {
-            destination = GetValidFilename(destination);
-            SaferMove(source, destination);
-            return destination;
-        }
-
-        private static int maxRetryAttempts { get; } = 3;
-        private static TimeSpan pauseBetweenFailures { get; } = TimeSpan.FromMilliseconds(100);
-        private static RetryPolicy retryPolicy { get; } =
-            Policy
-            .Handle<Exception>()
-            .WaitAndRetry(maxRetryAttempts, i => pauseBetweenFailures);
-
-        /// <summary>Delete file. No error when source does not exist. Retry up to 3 times before throwing exception.</summary>
-        public static void SaferDelete(string source)
-            => retryPolicy.Execute(() =>
-            {
-                try
-                {
-                    if (File.Exists(source))
-                    {
-                        File.Delete(source);
-                        Serilog.Log.Logger.Information("File successfully deleted", new { source });
-                    }
-                }
-                catch (Exception e)
-                {
-                    Serilog.Log.Logger.Error(e, "Failed to delete file", new { source });
-                    throw;
-                }
-            });
-
-        /// <summary>Move file. No error when source does not exist. Retry up to 3 times before throwing exception.</summary>
-		public static void SaferMove(string source, string destination)
-            => retryPolicy.Execute(() =>
-            {
-                try
-                {
-                    if (File.Exists(source))
-                    {
-                        SaferDelete(destination);
-                        Directory.CreateDirectory(Path.GetDirectoryName(destination));
-                        File.Move(source, destination);
-                        Serilog.Log.Logger.Information("File successfully moved", new { source, destination });
-                    }
-                }
-                catch (Exception e)
-                {
-                    Serilog.Log.Logger.Error(e, "Failed to move file", new { source, destination });
-                    throw;
-                }
-            });
-    }
-}

Hoopla/Hoopla.csproj

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

Hoopla/HooplaDownloader.newer.ps1

@@ -1,847 +0,0 @@
-<#
-.SYNOPSIS
-    Downloads, decrypts and repackages content from Hoopla
-
-.DESCRIPTION
-    Uses a HooplaDigital.com account to download DRM-free copies of ebooks, comics,
-    and/or audiobooks available on the platform. Content that is not already borrowed
-    on the account will be borrowed if slots are available. Content that is not borrowed
-    cannot be downloaded.
-
-    * E-Books are downloaded to epub files (most) or cbz (rare, picture books).
-    * Comic books are downloaded to cbz files.
-    * Audiobooks are downloaded to m4a files. (single file, and very little metadata available
-      from Hoopla, such as chapters)
-
-.PARAMETER Credential
-    Credential to use for logging into Hoopla site.
-    (Cannot be used with Username and Password parameters)
-
-.PARAMETER Username
-    Username to use for logging into Hoopla site.
-    (Cannot be used with Credential parameter)
-
-.PARAMETER Password
-    Password to use for logging into Hoopla site.
-    (Cannot be used with Credential parameter)
-
-.PARAMETER TitleId
-    Specifies one or more title IDs of content to download.
-
-.PARAMETER OutputFolder
-    Sets the output folder for downloaded content. Defaults to current directory.
-
-.PARAMETER PatronId
-    Override default patron id for Hoopla. (This is rarely required as most user accounts are only tied
-    to a single patron).
-
-.PARAMETER EpubZipBin
-    Specifies path to epubzip binary. Else look for one beside script, or in system path.
-
-.PARAMETER FfmpegBin
-    Specifies path to ffmpeg binary. Else look for one beside script, or in system path.
-
-.PARAMETER KeepDecryptedData
-    If set, don't delete the intermediary data after decryption, before final output file.
-    For ebooks, this is xml, images, and the manifest. For comics, it is images. For audiobooks,
-    it is mp4 ts files. This is typically only useful for development or troubleshooting.
-
-.PARAMETER KeepEncryptedData
-    If set, don't delete the encrypted data as downloaded from Hoopla's servers. This is typically
-    only useful for development or troubleshooting.
-
-.PARAMETER AllBorrowed
-    This parameter is deprecated. If TitleId is not set, it is implied that all borrowed titles will
-    be downloaded.
-
-.PARAMETER AudioBookForceSingleFile
-    If set, leave audiobook as single file, as if chapter data is not present.
-
-.EXAMPLE
-    .\Invoke-HooplaDownload.ps1 123456
-    Downloads Hoopla content with title id 123456
-
-.NOTES
-    Author: kabutops728 - My Anonamouse
-    Version: 2.9
-#>
-
-[CmdletBinding(DefaultParameterSetName='CredentialSingleTitle')]
-param(
-    [int64[]]
-    $TitleId,
-
-    [Parameter(Mandatory,ParameterSetName='CredentialSingleTitle')]
-    [Management.Automation.PSCredential]
-    $Credential,
-
-    [Parameter(Mandatory,ParameterSetName='UserPassSingleTitle')]
-    [string]
-    $Username,
-
-    [Parameter(Mandatory,ParameterSetName='UserPassSingleTitle')]
-    [string]
-    $Password,
-
-    [ValidateScript({Test-Path -LiteralPath $_ -IsValid -PathType Container})]
-    [string]$OutputFolder = $PSScriptRoot,
-
-    [int64]$PatronId,
-
-    [string]$EpubZipBin,
-
-    [string]$FfmpegBin,
-
-    [switch]$KeepDecryptedData,
-
-    [switch]$KeepEncryptedData,
-
-    [switch]$AudioBookForceSingleFile,
-
-    # Deprecated
-    [switch]$AllBorrowed
-)
-
-$USER_AGENT = 'Hoopla Android/4.27'
-
-$HEADERS = @{
-    'app' = 'ANDROID'
-    'app-version' = '4.27.1'
-    'device-module' = 'KFKAWI'
-    'device-version' = ''
-    'hoopla-verson' = '4.27.1'
-    'kids-mode' = 'false'
-    'os' = 'ANDROID'
-    'os-version' = '6.0.1'
-    'ws-api' = '2.1'
-    'Host' = 'hoopla-ws.hoopladigital.com'
-}
-
-$URL_HOOPLA_WS_BASE = 'https://hoopla-ws.hoopladigital.com'
-$URL_HOOPLA_LIC_BASE = 'https://hoopla-license2.hoopladigital.com'
-
-$COMIC_IMAGE_EXTS = @('.jpg','.png','.jpeg','.gif','.bmp','.tif','.tiff')
-
-enum HooplaKind
-{
-    EBOOK = 5
-    MUSIC = 6
-    MOVIE = 7
-    AUDIOBOOK = 8
-    TELEVISION = 9
-    COMIC = 10
-}
-
-$SUPPORTED_KINDS = @([HooplaKind]::EBOOK, [HooplaKind]::COMIC, [HooplaKind]::AUDIOBOOK)
-
-Function Connect-Hoopla
-{
-    param(
-        [Parameter(Mandatory)][Management.Automation.PSCredential]$Credential
-    )
-
-    $username = $Credential.UserName
-    $password = $Credential.GetNetworkCredential().Password
-
-    $res = Invoke-RestMethod -Uri "$URL_HOOPLA_WS_BASE/tokens" -Method Post -Headers $HEADERS -UserAgent $USER_AGENT -Body @{username = $username; password = $password}
-
-    if ($res.tokenStatus -ne 'SUCCESS')
-    {
-        throw $res.message
-    }
-
-    $res.token
-}
-
-Function Get-HooplaUsers
-{
-    param(
-        [Parameter(Mandatory)][string]$Token
-    )
-
-    $h = $HEADERS.Clone()
-    $h['Authorization'] = "Bearer $Token"
-
-    Invoke-RestMethod -Uri "$URL_HOOPLA_WS_BASE/users" -Method Get -Headers $h -UserAgent $USER_AGENT
-}
-
-Function Get-HooplaTitleInfo
-{
-    param(
-        [Parameter(Mandatory)][int64]$PatronId,
-        [Parameter(Mandatory)][string]$Token,
-        [Parameter(Mandatory)][int64]$TitleId
-    )
-
-    $h = $HEADERS.Clone()
-    $h['Authorization'] = "Bearer $Token"
-    $h['patron-id'] = $PatronId
-
-    Invoke-RestMethod -Uri "$URL_HOOPLA_WS_BASE/v2/titles/$TitleId" -Method Get -Headers $h -UserAgent $USER_AGENT
-}
-
-Function Get-HooplaBorrowsRemaining
-{
-    param(
-        [Parameter(Mandatory)][string]$UserId,
-        [Parameter(Mandatory)][int64]$PatronId,
-        [Parameter(Mandatory)][string]$Token
-    )
-
-    $h = $HEADERS.Clone()
-    $h['Authorization'] = "Bearer $Token"
-    $h['patron-id'] = $PatronId
-
-    Invoke-RestMethod -Uri "$URL_HOOPLA_WS_BASE/users/$UserId/patrons/$PatronId/borrows-remaining" -Method Get -Headers $h -UserAgent $USER_AGENT
-}
-
-Function Get-HooplaBorrowedTitles
-{
-    param(
-        [Parameter(Mandatory)][string]$UserId,
-        [Parameter(Mandatory)][int64]$PatronId,
-        [Parameter(Mandatory)][string]$Token
-    )
-
-    $h = $HEADERS.Clone()
-    $h['Authorization'] = "Bearer $Token"
-    $h['patron-id'] = $PatronId
-
-    Invoke-RestMethod -Uri "$URL_HOOPLA_WS_BASE/users/$UserId/borrowed-titles" -Method Get -Headers $h -UserAgent $USER_AGENT
-}
-
-Function Invoke-HooplaBorrow
-{
-    param(
-        [Parameter(Mandatory)][string]$UserId,
-        [Parameter(Mandatory)][int64]$PatronId,
-        [Parameter(Mandatory)][string]$Token,
-        [Parameter(Mandatory)][int64]$TitleId
-    )
-
-    $h = $HEADERS.Clone()
-    $h['Authorization'] = "Bearer $Token"
-    $h['patron-id'] = $PatronId
-
-    Invoke-RestMethod -Uri "$URL_HOOPLA_WS_BASE/users/$UserId/patrons/$PatronId/borrowed-titles/$TitleId" -Method Post -Headers $h -UserAgent $USER_AGENT
-}
-
-Function Invoke-HooplaZipDownload
-{
-    param(
-        [Parameter(Mandatory)][int64]$PatronId,
-        [Parameter(Mandatory)][string]$Token,
-        [Parameter(Mandatory)][int64]$CircId,
-        [Parameter(Mandatory)][ValidateScript({Test-Path -LiteralPath $_ -IsValid -PathType Leaf})][string]$OutFile
-    )
-
-    $h = $HEADERS.Clone()
-    $h['Authorization'] = "Bearer $Token"
-    $h['patron-id'] = $PatronId
-
-    $res = Invoke-WebRequest -Uri "$URL_HOOPLA_WS_BASE/patrons/downloads/$CircId/url" -Method Get -Headers $h -UserAgent $USER_AGENT -UseBasicParsing
-
-    if ($PSVersionTable.PSVersion.Major -ge 6)
-    {
-        Invoke-WebRequest -Uri $res.Headers['Location'][0] -Method Get -UseBasicParsing -OutFile $OutFile
-    }
-    else
-    {
-        Invoke-WebRequest -Uri $res.Headers['Location'] -Method Get -UseBasicParsing -OutFile $OutFile
-    }
-}
-
-Function Get-HooplaKey
-{
-    param(
-        [Parameter(Mandatory)][int64]$PatronId,
-        [Parameter(Mandatory)][string]$Token,
-        [Parameter(Mandatory)][int64]$CircId
-    )
-
-    $h = $HEADERS.Clone()
-    $h['Authorization'] = "Bearer $Token"
-    $h['patron-id'] = $PatronId
-
-    Invoke-RestMethod -Uri "$URL_HOOPLA_LIC_BASE/downloads/$CircId/key" -Method Get -Headers $h -UserAgent $USER_AGENT
-}
-
-Function Get-FileKeyKey
-{
-    param(
-        [Parameter(Mandatory)][int64]$CircId,
-        [Parameter(Mandatory)][DateTime]$Due,
-        [Parameter(Mandatory)][int64]$PatronId
-    )
-
-    $combined = '{0:yyyyMMddHHmmss}:{1}:{2}' -f $Due, $PatronId, $CircId
-
-    [Security.Cryptography.HashAlgorithm]::Create('SHA1').ComputeHash([Text.Encoding]::UTF8.GetBytes($combined)) | Select-Object -First 16
-}
-
-Function Decrypt-FileKey
-{
-    param(
-        [Parameter(Mandatory)][byte[]]$FileKeyEnc,
-        [Parameter(Mandatory)][byte[]]$FileKeyKey
-    )
-
-    $aesManaged = New-Object "System.Security.Cryptography.AesManaged"
-    $aesManaged.Mode = [Security.Cryptography.CipherMode]::ECB
-    $aesManaged.Padding = [Security.Cryptography.PaddingMode]::PKCS7
-    $aesManaged.BlockSize = 128
-    $aesManaged.KeySize = 128
-    $aesManaged.Key = $FileKeyKey
-
-    $decryptor = $aesManaged.CreateDecryptor();
-
-    $unencryptedData = $decryptor.TransformFinalBlock($FileKeyEnc, 0, $FileKeyEnc.Length);
-    $aesManaged.Dispose()
-
-    $unencryptedData
-}
-
-Function Decrypt-File
-{
-    param(
-        [Parameter(Mandatory)][byte[]]$FileKey,
-        [Parameter(Mandatory)][string]$MediaKey,
-        [Parameter(Mandatory)][string]$InputFileName,
-        [Parameter(Mandatory)][string]$OutputFileName
-    )
-
-    $aesManaged = New-Object "System.Security.Cryptography.AesManaged"
-    $aesManaged.Mode = [Security.Cryptography.CipherMode]::CBC
-    $aesManaged.Padding = [Security.Cryptography.PaddingMode]::PKCS7
-    $aesManaged.BlockSize = 128
-    $aesManaged.KeySize = 256
-    $aesManaged.Key = $FileKey
-    $aesManaged.IV = [Text.Encoding]::UTF8.GetBytes($MediaKey) | Select-Object -First 16
-
-
-    $fileStreamReader = New-Object -TypeName 'System.IO.FileStream' -ArgumentList $InputFileName, ([IO.FileMode]::Open), ([IO.FileShare]::Read)
-    $fileStreamWriter = New-Object -TypeName 'System.IO.FileStream' -ArgumentList $OutputFileName, ([IO.FileMode]::Create)
-
-    $FileStreamReader.Seek(0, [IO.SeekOrigin]::Begin) | Out-Null
-
-    $decryptor = $aesManaged.CreateDecryptor()
-    $cryptoStream = New-Object -TypeName 'System.Security.Cryptography.CryptoStream' -ArgumentList $fileStreamWriter, $decryptor, ([Security.Cryptography.CryptoStreamMode]::Write)
-    $fileStreamReader.CopyTo($cryptoStream)
-
-    $cryptoStream.FlushFinalBlock()
-    $cryptoStream.Close()
-    $fileStreamReader.Close()
-    $fileStreamWriter.Close()
-
-    $aesManaged.Dispose()
-}
-
-Function Test-Mp4
-{
-    param(
-        [Parameter(Mandatory, Position=0)]
-        [Alias('LiteralPath')]
-        [string]$Path
-    )
-
-    $fileStream = New-Object -TypeName 'System.IO.FileStream' -ArgumentList $Path, ([IO.FileMode]::Open), ([IO.FileShare]::Read)
-    $fileReader = New-Object -TypeName 'System.IO.BinaryReader' -ArgumentList $fileStream -ErrorAction Stop
-    $head = $fileReader.ReadBytes(8)
-    
-    $fileReader.Dispose()
-    $fileStream.Dispose()
-
-    return [Text.Encoding]::ASCII.GetString(($head | Select-Object -Skip 4)) -eq 'ftyp'
-}
-
-Function Remove-InvalidFileNameChars
-{
-    param(
-        [Parameter(Mandatory,Position=0,
-        ValueFromPipeline=$true,
-        ValueFromPipelineByPropertyName=$true)]
-      [String]$Name
-    )
-
-    $invalidChars = [IO.Path]::GetInvalidFileNameChars() -join ''
-    $re = "[{0}]" -f [RegEx]::Escape($invalidChars)
-    $Name -replace $re, '_'
-}
-
-Function Convert-HooplaDecryptedToEpub
-{
-    param(
-        [Parameter(Mandatory)][string]$InputFolder,
-        [Parameter(Mandatory)][string]$OutFolder
-    )
-
-    $container = [xml](Get-Content -LiteralPath (Join-Path -Path $InputFolder -ChildPath 'META-INF\container.xml') -Raw)
-    $rootFile = $container.container.rootfiles.rootfile | Select-Object -ExpandProperty Full-Path
-    $contentFile = (Join-Path -Path $InputFolder -ChildPath $rootFile).Trim()
-    $contentRoot = Get-Item -LiteralPath $contentFile | Select-Object -ExpandProperty Directory
-    $content = [xml](Get-Content -LiteralPath $contentFile)
-
-    $fileList = $content.package.manifest.item | Select-Object -ExpandProperty href | ForEach-Object -Process { (Join-Path -Path $contentRoot -ChildPath ([Web.HttpUtility]::UrlDecode($_))).Trim() }
-    $fileList += $contentFile
-    $fileList = $fileList | Sort-Object -Unique
-
-    $title = $content.package.metadata.title | Select-Object -First 1
-    if ($title.GetType() -ne [String])
-    {
-        $title = $content.package.metadata.title | Select-Object -First 1 | Select-Object -ExpandProperty '#text'
-    }
-
-    $author = $content.package.metadata.creator | Select-Object -First 1
-    if ($author.GetType() -ne [String])
-    {
-        $author = $content.package.metadata.creator | Select-Object -First 1 | Select-Object -ExpandProperty '#text'
-    }
-    
-    # Usually, content root is a subfolder of the input folder. But sometimes, they are the same. Make sure we declutter the input root if they differ, and always keep the mimetype file.
-    $mimeTypeFile = Join-Path -Path $InputFolder -ChildPath 'mimetype'
-
-    $extra = @(Get-ChildItem -LiteralPath $contentRoot -File -Recurse | Where-Object -FilterScript { ($_.FullName -notin $fileList) -and ($_.FullName -ne $mimeTypeFile) })
-    $extra += Get-ChildItem -LiteralPath $InputFolder -File | Where-Object -FilterScript { ($_.FullName -notin $fileList) -and ($_.FullName -ne $mimeTypeFile) }
-
-    $extra = $extra | Sort-Object -Property FullName -Unique
-    $extra | Remove-Item
-
-    $containerXmlFolder = Join-Path -Path $contentRoot.FullName -ChildPath 'META-INF'
-    $containerXmlPath = Join-Path -Path $containerXmlFolder -ChildPath 'container.xml'
-    if (!(Test-Path -LiteralPath $containerXmlPath -PathType Leaf))
-    {
-        New-Item -Path $containerXmlFolder -ItemType Directory -Force | Out-Null
-        $xml = @"
-<?xml version="1.0"?>
-<container version="1.0" xmlns="urn:oasis:names:tc:opendocument:xmlns:container">
-   <rootfiles>
-      <rootfile full-path="content.opf" media-type="application/oebps-package+xml"/>
-   </rootfiles>
-</container>
-
-"@
-        $xml | Out-File -LiteralPath $containerXmlPath -Encoding ascii
-    }
-
-    $finalFile = ('{0} - {1}.epub' -f $title, $author) | Remove-InvalidFileNameChars
-
-    Push-Location
-    Set-Location -LiteralPath $InputFolder
-
-    $finalFileFullPath = (Join-Path -Path $OutFolder -ChildPath $finalFile)
-    if ($VerbosePreference -eq 'Continue')
-    {
-        & $EpubZipBin $finalFileFullPath
-    }
-    else
-    {
-        & $EpubZipBin $finalFileFullPath >$null 2>&1
-    }
-    Pop-Location
-
-    Get-Item -LiteralPath $finalFileFullPath
-}
-
-Function Convert-HooplaDecryptedToCbz
-{
-    param(
-        [Parameter(Mandatory)][string]$InputFolder,
-        [Parameter(Mandatory)][string]$OutFolder,
-        [Parameter(Mandatory)][string]$Name
-    )
-
-    $fileName = $Name | Remove-InvalidFileNameChars
-    $tempOutFile = Join-Path -Path $OutFolder -ChildPath "$fileName.zip"
-    $finalOutFile = Join-Path -Path $OutFolder -ChildPath "$fileName.cbz"
-
-    Compress-Archive -Path (
-        Get-ChildItem -LiteralPath $InputFolder | Where-Object -FilterScript { $_.Extension -in $COMIC_IMAGE_EXTS } | Select-Object -ExpandProperty FullName
-    ) -CompressionLevel Fastest -DestinationPath $tempOutFile
-
-    Rename-Item -LiteralPath $tempOutFile -NewName $finalOutFile
-
-    Get-Item $finalOutFile
-}
-
-Function Convert-HooplaDecryptedToM4a
-{
-    param(
-        [Parameter(Mandatory)][string]$InputFolder,
-        [Parameter(Mandatory)][string]$OutFolder,
-        [Parameter(Mandatory)][string]$Name,
-        [Parameter(Mandatory)][string]$Title,
-        [Parameter(Mandatory)][string]$Author,
-        [Parameter(Mandatory)][int]$Year,
-        [string]$Subtitle,
-        [object]$ChapterData
-        
-    )
-
-    if ($Author)
-    {
-        $baseFileName = ('{0} - {1}' -f $Name, $Author) | Remove-InvalidFileNameChars
-    }
-    else
-    {
-        $baseFileName = $Name | Remove-InvalidFileNameChars
-    }
-
-    $finalOutFile = Join-Path -Path $OutFolder -ChildPath ('{0}.m4a' -f $baseFileName)
-    $inFile = Get-ChildItem -LiteralPath $InputFolder -Filter '*.m3u8' | Select-Object -First 1 | Select-Object -ExpandProperty FullName
-
-    Push-Location
-    Set-Location $InputFolder
-    $ffArgs = @(
-        '-y',
-        '-i', $infile,
-        '-metadata', ('title="{0}"' -f $Title),
-        '-metadata', ('year="{0}"'  -f $Year),
-        '-metadata', ('author="{0}"'  -f $Author),
-        '-metadata', 'genre="Audiobook"'
-    )
-
-    if ($Subtitle)
-    {
-        $ffArgs += '-metadata', ('subtitle="{0}"' -f $Subtitle)
-    }
-
-    $ffArgs += @(
-        '-c:a', 'copy',
-        $finalOutFile
-    )
-
-    if ($VerbosePreference -eq 'Continue')
-    {
-        & $FfmpegBin @ffArgs
-        #& $FfmpegBin -y -i $inFile -metadata "title=`"$Title`"" -metadata "year=`"$Year`"" -metadata "author=`"$Author`"" -metadata "genre=`"Audiobook`"" '-c:a' copy $finalOutFile
-    }
-    else
-    {
-        & $FfmpegBin @ffArgs >$null 2>&1
-        #& $FfmpegBin -y -i $inFile -metadata "title=`"$Title`"" -metadata "year=`"$Year`"" -metadata "author=`"$Author`"" -metadata "genre=`"Audiobook`"" '-c:a' copy $finalOutFile >$null 2>&1
-    }
-
-    if ($ChapterData -and (!$AudioBookForceSingleFile))
-    {
-        $outDir = New-Item -Path (Join-Path -Path $OutFolder -ChildPath $baseFileName) -ItemType Directory
-        $chapterCount = $ChapterData | Select-Object -ExpandProperty chapter | Measure-Object -Maximum | Select-Object -ExpandProperty Maximum
-        $ChapterData | ForEach-Object -Process {
-            $ffArgs = @(
-                '-y',
-                '-i', $finalOutFile,
-                '-ss', $_.start,
-                '-t', $_.duration,
-                '-metadata', ('title="{0}"' -f $_.title),
-                '-metadata', ('album="{0}"' -f $Title),
-                '-metadata', ('year="{0}"'  -f $Year),
-                '-metadata', ('author="{0}"'  -f $Author),
-                '-metadata', 'genre="Audiobook"'
-                '-metadata', ('track={0}/{1}' -f $_.ordinal, $chapterCount)
-            )
-
-            if ($Subtitle)
-            {
-                $ffArgs += '-metadata', ('subtitle="{0}"' -f $Subtitle)
-            }
-
-            $ffArgs += @(
-                '-c', 'copy',
-                (Join-Path -Path $outDir.FullName -ChildPath ('{0} - {1} - {2}.m4a' -f $baseFileName, $_.ordinal, ($_.title | Remove-InvalidFileNameChars)))
-            )
-
-            if ($VerbosePreference -eq 'Continue')
-            {
-                & $FfmpegBin @ffArgs
-            }
-            else
-            {
-                & $FfmpegBin @ffArgs >$null 2>&1
-            }
-        }
-
-        Remove-Item $finalOutFile
-        $finalOutFile = $outDir
-    }
-
-    Pop-Location
-
-    Get-Item $finalOutFile
-}
-
-if (!$Credential)
-{
-    $ssPassword = ConvertTo-SecureString $Password -AsPlainText -Force
-    $Credential = New-Object -TypeName 'System.Management.Automation.PSCredential' -ArgumentList $Username, $ssPassword
-}
-
-if ((!$AllBorrowed) -and ($null -eq $TitleId))
-{
-    Write-Warning 'No -TitleId specified. All currently-borrowed titles will be downloaded.'
-    $AllBorrowed = $true
-}
-
-$AppExtension = ''
-if (($PSVersionTable.PSVersion -lt '6.0') -or $IsWindows)
-{
-    $AppExtension = '.exe'
-}
-
-$cmd = ''
-if ($EpubZipBin)
-{
-    $cmd = Get-Command -Name $EpubZipBin -ErrorAction SilentlyContinue
-    if (!$cmd)
-    {
-        Write-Warning "Epubzip binary specified was not found ($EpubZipBin). Will try to use alternate version if available."
-    }
-}
-
-if (!$cmd)
-{
-    $cmd = Get-Command -Name (Join-Path -Path $PSScriptRoot -ChildPath "epubzip$AppExtension") -ErrorAction SilentlyContinue
-    if (!$cmd)
-    {
-        $cmd = Get-Command -Name "epubzip$AppExtension" -ErrorAction SilentlyContinue
-        if (!$cmd)
-        {
-            Write-Warning "Epubzip binary not found ($EpubZipBin). If you are downloading ebooks (rather than comics or audiobooks), you may wish to download the binary from https://github.com/dino-/epub-tools/releases, specify a different path with -EpubZipBin, or specify -KeepDecryptedData so that you can manually pack afterward."
-        }
-    }
-
-    $EpubZipBin = $cmd.Source
-}
-
-Write-Verbose ('Using epubzip bin: "{0}"' -f $EpubZipBin)
-
-$cmd = ''
-if ($FfmpegBin)
-{
-    $cmd = Get-Command -Name $FfmpegBin -ErrorAction SilentlyContinue
-    if (!$cmd)
-    {
-        Write-Warning "FFMpeg binary specified was not found ($FfmpegBin). Will try to use alternate version if available."
-    }
-}
-
-if (!$cmd)
-{
-    $cmd = Get-Command -Name (Join-Path -Path $PSScriptRoot -ChildPath "ffmpeg$AppExtension") -ErrorAction SilentlyContinue
-    if (!$cmd)
-    {
-        $cmd = Get-Command -Name "ffmpeg$AppExtension" -ErrorAction SilentlyContinue
-        if (!$cmd)
-        {
-            Write-Warning "FFmpeg binary not found. If you are downloading audiobooks (rather than ebooks or comics), you may wish to download the binary from https://ffmpeg.zeranoe.com/builds/, specify a different path with -FfmpegBin, or specify -KeepDecryptedData so that you can manually convert afterward."
-        }
-    }
-
-    $FfmpegBin = $cmd.Source
-}
-
-Write-Verbose ('Using ffpmeg bin: "{0}"' -f $FfmpegBin)
-
-if (!(Test-Path -LiteralPath $OutputFolder -PathType Container))
-{
-    Write-Warning "Output folder doesn't exist. Creating."
-    New-Item -Path $OutputFolder -ItemType Directory | Out-Null
-}
-
-$OutputFolder = Get-Item -LiteralPath $OutputFolder | Select-Object -ExpandProperty $_.FullName
-
-$token = Connect-Hoopla -Credential $Credential
-Write-Verbose "Logged in. Received token $($token -replace '\-.*', '-****-****-****-************')"
-
-$users = Get-HooplaUsers $token
-Write-Verbose "Found $($users.patrons.Count) patrons"
-
-$userId = $users.id
-if (!$PatronId)
-{
-    if ($users.patrons.Count -eq 0)
-    {
-        throw "No patrons found on account. Account may not be correctly set up with library."
-    }
-    elseif ($users.patrons.Count -gt 1)
-    {
-        Write-Warning (
-            "Multiple patrons found on account. Using first one, {0} ({1}). You can specify -PatronId to override" -f $users.patrons[0].id, $users.patrons[0].libraryName
-        )
-    }
-
-    $PatronId = $users.patrons[0].id
-    Write-Verbose "Using PatronId $PatronId"
-}
-
-$borrowedRaw = Get-HooplaBorrowedTitles -Token $token -UserId $userId -PatronId $PatronId
-$borrowed = $borrowedRaw | Where-Object -FilterScript { $_.kind.id -in $SUPPORTED_KINDS }
-Write-Verbose "Found $($borrowed.Count) ($($borrowedRaw.Count)) titles already borrowed"
-$toDownload = @()
-
-if ($AllBorrowed)
-{
-    $toDownload = $borrowed
-}
-else
-{
-    $toDownload = $borrowed | Where-Object -FilterScript { $_.id -in $TitleId }
-
-    $allBorrowedTitles = $borrowed | Select-Object -ExpandProperty id
-    $toBorrow = $TitleId | Where-Object -FilterScript { $_ -notin $allBorrowedTitles }
-    
-    if ($toBorrow)
-    {
-        $borrowsRemainingData = Get-HooplaBorrowsRemaining -UserId $userId -PatronId $PatronId -Token $token
-        Write-Host $borrowsRemainingData.borrowsRemainingMessage
-
-        $borrowsRemaining = $borrowsRemainingData.borrowsRemaining
-
-        $toBorrow | ForEach-Object -Process {
-            Write-Host "Title $_ is not already borrowed or is not a supported kind. Looking up data about it."
-            $titleInfo = Get-HooplaTitleInfo -PatronId $PatronId -Token $token -TitleId $_
-            if ($titleInfo.kind.id -in $SUPPORTED_KINDS)
-            {
-                if ((--$borrowsRemaining) -le 0)
-                {
-                    Write-Warning "Title $_ ($($titleInfo.Title)) not borrowed already, but we're out of remaining borrows allowed. Skipping..."
-                }
-                else
-                {
-                    Write-Host "Borrowing title $_ ($($titleInfo.Title))..."
-                    $res = Invoke-HooplaBorrow -UserId $userId -PatronId $PatronId -Token $token -TitleId $titleInfo.id
-                    Write-Host "Response: $($res.message)"
-                    $newToDownload = $res.titles | Where-Object -FilterScript { $_.id -eq $titleInfo.id }
-                    if ($newToDownload)
-                    {
-                        $toDownload += $newToDownload
-                    }
-                    else
-                    {
-                        Write-Warning "Failed to borrow title $_ ($($titleInfo.Title))..."
-                    }
-                }
-            }
-            else
-            {
-                Write-Warning "Title $_ is not a supported kind ($($titleInfo.kind.name)). Skipping..."
-            }
-        }
-    } 
-}
-
-$tempFolder = [IO.Path]::GetTempPath()
-
-$now = Get-Date
-
-$toDownload | ForEach-Object -Process {
-    $info = $_
-    $contentKind = [HooplaKind]$_.kind.id
-    if ($_.contents.mediaType)
-    {
-        $contentKind = [HooplaKind]$_.contents.mediaType
-    }
-    $contents = $info.contents
-    $circId = $contents.circId
-    $mediaKey = $contents.mediaKey
-    $dueUnix = [Math]::Truncate($info.contents.due / 1000)
-    $due = (New-Object DateTime 1970, 1, 1, 0, 0, 0, ([DateTimeKind]::Utc)).AddSeconds($dueUnix)
-
-    $circFileName = (Join-Path -Path $tempFolder -ChildPath "$($circId).zip")
-
-    Invoke-HooplaZipDownload -PatronId $patronId -Token $token -CircId $circId -OutFile $circFileName
-    $keyData = Get-HooplaKey -PatronId $patronId -Token $token -CircId $circId
-
-    $fileKeyKey = Get-FileKeyKey -CircId $circId -Due $due -PatronId $patronId
-    $fileKey = Decrypt-FileKey -FileKeyEnc ([Convert]::FromBase64String($keyData."$mediaKey")) -FileKeyKey $fileKeyKey
-
-    $encDir = Join-Path -Path $tempFolder -ChildPath ('enc-{0}-{1:yyyyMMddHHmmss}' -f $circId, $now)
-    New-Item -Path $encDir -ItemType Directory | Out-Null
-    Expand-Archive -LiteralPath $circFileName -DestinationPath $encDir
-
-    Remove-Item -LiteralPath $circFileName
-
-    $decDir = Join-Path -Path $tempFolder -ChildPath ('dec-{0}-{1:yyyyMMddHHmmss}' -f $circId, $now)
-    New-Item -Path $decDir -ItemType Directory | Out-Null
-
-    $activity = 'Decrypting Content ({0})' -f $_.title
-    Write-Progress -Activity $activity -PercentComplete 0
-    $zipFiles = Get-ChildItem $encDir -Recurse -File
-    $decDone = 0
-    $decTotal = $zipFiles.Count
-    $zipFiles | ForEach-Object -Process {
-        $outFile = $_.FullName.Replace($encDir, $decDir)
-        $outDir = $_.DirectoryName.Replace($encDir, $decDir)
-        
-        if (!(Test-Path -LiteralPath $outDir))
-        {
-            New-Item -Path $outDir -ItemType Directory -Force | Out-Null
-        }
-
-        if (($contentKind -eq [HooplaKind]::AUDIOBOOK) -and ($_.Extension -eq '.m3u8'))
-        {
-            $lines = Get-Content -LiteralPath $_.FullName | Where-Object -FilterScript {$_ -notmatch '^#EXT-X-KEY'}
-            # Out-File doesn't support utf8 w/o BOM
-            [IO.File]::WriteAllLines($outFile, $lines)
-            return
-        }
-
-        if ($_.Length)
-        {
-            # Hack. Some ebooks contain audio files that download as unencrypted
-            if (($_.Extension -eq '.m4a') -and (Test-Mp4 -LiteralPath $_.FullName))
-            {
-                Write-Verbose -Message ('Coping unencrypted {0}' -f $_.FullName)
-                Copy-Item -LiteralPath $_.FullName -Destination $outFile
-            }
-            else
-            {
-                Write-Verbose -Message ('Decrypting {0}' -f $_.FullName)
-                Decrypt-File -FileKey $fileKey -MediaKey $mediaKey -InputFileName $_.FullName -OutputFileName $outFile
-            }
-        }
-        else
-        {
-            Write-Verbose -Message ('Writing empty file {0}' -f $_.FullName)
-            '' | Out-File -LiteralPath $outFile
-        }
-
-        Write-Progress -Activity $activity -PercentComplete ((++$decDone) / $decTotal * 100)
-    }
-    Write-Progress -Activity $activity -Completed
-
-    switch ($contentKind)
-    {
-        ([HooplaKind]::EBOOK) {
-            Convert-HooplaDecryptedToEpub -InputFolder $decDir -OutFolder $OutputFolder
-        }
-
-        ([HooplaKind]::COMIC) {
-            $title = $contents.title
-            $subtitle = $contents.subtitle
-            $name = $title
-            if ($subtitle) {
-                $name += ", $subtitle"
-            }
-            Convert-HooplaDecryptedToCbz -InputFolder $decDir -OutFolder $OutputFolder -Name $name
-        }
-
-        ([HooplaKind]::AUDIOBOOK) {
-            Convert-HooplaDecryptedToM4a -InputFolder $decDir -OutFolder $OutputFolder -Name $info.title -Title $info.title `
-                -Year $info.year -Author $info.artist.name -Subtitle $contents.subtitle -ChapterData $contents.chapters
-        }
-    }    
-
-    if (!$KeepDecryptedData)
-    {
-        Remove-Item -LiteralPath $decDir -Recurse
-    }
-    else
-    {
-        Write-Host ('Decrypted data for {0} ({1}) stored in {2}' -f $_.id, $_.title, $decDir)
-    }
-
-    if (!$KeepEncryptedData)
-    {
-        Remove-Item -LiteralPath $encDir -Recurse
-    }
-}
-

Hoopla/_README.txt

@@ -1,13 +0,0 @@
-From a Libation user about possibility of integrating Hoopla:
-
-I have a powershell script.  I didn't write it, and neither did the person that gave it to me.  It works most of the time (98%).  Some titles, it doesn't play well with, but does allow to keep the downloaded data, whether the decrypt was successful, or not, and then you can mess with the data, from there.
-
-If you run the script with no parameters, then all the books in your library will download, and decrypt into the same directory as the script, into a folder named Completed.
-
-If you run the script with the command:
-  '.\HooplaDownloader.newer.ps1 -KeepDecryptedData'
-then it will, and will notify you, when complete, where it was stored.
-
-There is a parameter to download a specific titleID#, whether it's in your library, or not, but I've not played with it that far, as the method to accomplish it still reserves it to your library, and then proceeds as normal.  I can tell you, if it's a "trial and error concern", the title will not be removed from your library, after you run the script, whether it succeeds or not.  So, if it fails, you can retry, or try the  -KeepDecryptedData option.  I received no documentation for it, which is why I'm telling you as much as I know about using it.
-
-[ see HooplaDownloader.newer.ps1 ]

Hoopla/temp.cs

@@ -1,9 +0,0 @@
-using System;
-
-namespace Hoopla
-{
-	public class temp
-	{
-		// placeholder
-	}
-}

LibationCli/LibationCli.csproj

@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-    <TargetFramework>net5.0</TargetFramework>
-
-    <PublishTrimmed>true</PublishTrimmed>
-    <PublishReadyToRun>true</PublishReadyToRun>
-    <RuntimeIdentifier>win-x64</RuntimeIdentifier>
-    <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
-    <AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
-  </PropertyGroup>
-
-  <!--
-  When LibationWinForms and LibationCli output to the same dir, LibationCli must build before LibationWinForms
-  
-  VS > rt-clik solution > Project Build Order...
-  Dependencies [tab]
-  Projects: LibationWinForms
-  manually check LibationCli
-  -->
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-    <OutputPath>..\LibationWinForms\bin\Debug</OutputPath>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
-    <OutputPath>..\LibationWinForms\bin\Release</OutputPath>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="CommandLineParser" Version="2.8.0" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\ApplicationServices\ApplicationServices.csproj" />
-    <ProjectReference Include="..\AppScaffolding\AppScaffolding.csproj" />
-    <ProjectReference Include="..\FileLiberator\FileLiberator.csproj" />
-  </ItemGroup>
-
-</Project>

LibationFileManager/Configuration.cs

@@ -1,388 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.IO;
-using System.Linq;
-using Dinah.Core;
-using Dinah.Core.Logging;
-using FileManager;
-using Microsoft.Extensions.Configuration;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
-using Serilog;
-using Serilog.Events;
-
-namespace LibationFileManager
-{
-    public class Configuration
-    {
-        public bool LibationSettingsAreValid
-            => File.Exists(APPSETTINGS_JSON)
-            && SettingsFileIsValid(SettingsFilePath);
-
-        public static bool SettingsFileIsValid(string settingsFile)
-        {
-            if (!Directory.Exists(Path.GetDirectoryName(settingsFile)) || !File.Exists(settingsFile))
-                return false;
-
-            var pDic = new PersistentDictionary(settingsFile, isReadOnly: true);
-
-            var booksDir = pDic.GetString(nameof(Books));
-            if (booksDir is null || !Directory.Exists(booksDir))
-                return false;
-
-            if (string.IsNullOrWhiteSpace(pDic.GetString(nameof(InProgress))))
-                return false;
-
-            return true;
-        }
-
-        #region persistent configuration settings/values
-
-        // 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
-
-        // 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
-
-        private PersistentDictionary persistentDictionary;
-
-        public T GetNonString<T>(string propertyName) => persistentDictionary.GetNonString<T>(propertyName);
-        public object GetObject(string propertyName) => persistentDictionary.GetObject(propertyName);
-        public void SetObject(string propertyName, object newValue) => persistentDictionary.SetNonString(propertyName, newValue);
-
-        /// <summary>WILL ONLY set if already present. WILL NOT create new</summary>
-        public void SetWithJsonPath(string jsonPath, string propertyName, string newValue, bool suppressLogging = false)
-        {
-            var settingWasChanged = persistentDictionary.SetWithJsonPath(jsonPath, propertyName, newValue, suppressLogging);
-            if (settingWasChanged)
-                configuration?.Reload();
-        }
-
-        public string SettingsFilePath => Path.Combine(LibationFiles, "Settings.json");
-
-        public static string GetDescription(string propertyName)
-        {
-            var attribute = typeof(Configuration)
-                .GetProperty(propertyName)
-                ?.GetCustomAttributes(typeof(DescriptionAttribute), true)
-                .SingleOrDefault()
-                as DescriptionAttribute;
-
-            return attribute?.Description;
-        }
-
-        public bool Exists(string propertyName) => persistentDictionary.Exists(propertyName);       
-
-        [Description("Location for book storage. Includes destination of newly liberated books")]
-        public string Books
-        {
-            get => persistentDictionary.GetString(nameof(Books));
-            set => persistentDictionary.SetString(nameof(Books), value);
-        }
-
-        // temp/working dir(s) should be outside of dropbox
-        [Description("Temporary location of files while they're in process of being downloaded and decrypted.\r\nWhen decryption is complete, the final file will be in Books location\r\nRecommend not using a folder which is backed up real time. Eg: Dropbox, iCloud, Google Drive")]
-        public string InProgress
-        {
-            get => persistentDictionary.GetString(nameof(InProgress));
-            set => persistentDictionary.SetString(nameof(InProgress), value);
-        }
-
-        [Description("Allow Libation to fix up audiobook metadata")]
-        public bool AllowLibationFixup
-        {
-            get => persistentDictionary.GetNonString<bool>(nameof(AllowLibationFixup));
-            set => persistentDictionary.SetNonString(nameof(AllowLibationFixup), value);
-        }
-
-        [Description("Decrypt to lossy format?")]
-        public bool DecryptToLossy
-        {
-            get => persistentDictionary.GetNonString<bool>(nameof(DecryptToLossy));
-            set => persistentDictionary.SetNonString(nameof(DecryptToLossy), value);
-        }
-        
-        [Description("Split my books into multiple files by chapter")]
-        public bool SplitFilesByChapter
-        {
-            get => persistentDictionary.GetNonString<bool>(nameof(SplitFilesByChapter));
-            set => persistentDictionary.SetNonString(nameof(SplitFilesByChapter), value);
-        }
-
-        public enum BadBookAction
-        {
-            [Description("Ask each time what action to take.")]
-            Ask = 0,
-            [Description("Stop processing books.")]
-            Abort = 1,
-            [Description("Retry book later. Skip for now. Continue processing books.")]
-            Retry = 2,
-            [Description("Permanently ignore book. Continue processing books. Do not try book again.")]
-            Ignore = 3
-        }
-
-        [Description("When liberating books and there is an error, Libation should:")]
-        public BadBookAction BadBook
-        {
-            get
-            {
-                var badBookStr = persistentDictionary.GetString(nameof(BadBook));
-				return Enum.TryParse<BadBookAction>(badBookStr, out var badBookEnum) ? badBookEnum : BadBookAction.Ask;
-            }
-            set => persistentDictionary.SetString(nameof(BadBook), value.ToString());
-        }
-
-        [Description("Import episodes? (eg: podcasts) When unchecked, episodes will not be imported into Libation.")]
-        public bool ImportEpisodes
-        {
-            get => persistentDictionary.GetNonString<bool>(nameof(ImportEpisodes));
-            set => persistentDictionary.SetNonString(nameof(ImportEpisodes), value);
-        }
-
-        [Description("Download episodes? (eg: podcasts). When unchecked, episodes already in Libation will not be downloaded.")]
-        public bool DownloadEpisodes
-        {
-            get => persistentDictionary.GetNonString<bool>(nameof(DownloadEpisodes));
-            set => persistentDictionary.SetNonString(nameof(DownloadEpisodes), value);
-		}
-
-        #region templates: custom file naming
-
-        [Description("How to format the folders in which files will be saved")]
-		public string FolderTemplate
-        {
-            get => getTemplate(nameof(FolderTemplate), Templates.Folder);
-            set => setTemplate(nameof(FolderTemplate), Templates.Folder, value);
-        }
-
-        [Description("How to format the saved pdf and audio files")]
-		public string FileTemplate
-        {
-            get => getTemplate(nameof(FileTemplate), Templates.File);
-            set => setTemplate(nameof(FileTemplate), Templates.File, value);
-        }
-
-        [Description("How to format the saved audio files when split by chapters")]
-        public string ChapterFileTemplate
-        {
-            get => getTemplate(nameof(ChapterFileTemplate), Templates.ChapterFile);
-            set => setTemplate(nameof(ChapterFileTemplate), Templates.ChapterFile, value);
-        }
-
-        private string getTemplate(string settingName, Templates templ)
-        {
-            var value = persistentDictionary.GetString(settingName).Trim();
-            return templ.IsValid(value) ? value : templ.DefaultTemplate;
-        }
-        private void setTemplate(string settingName, Templates templ, string newValue)
-        {
-            var template = newValue.Trim();
-            if (templ.IsValid(template))
-                persistentDictionary.SetString(settingName, template);
-        }
-        #endregion
-
-        #endregion
-
-        #region known directories
-        public static string AppDir_Relative => $@".\{LIBATION_FILES_KEY}";
-        public static string AppDir_Absolute => Path.GetFullPath(Path.Combine(Path.GetDirectoryName(Exe.FileLocationOnDisk), LIBATION_FILES_KEY));
-        public static string MyDocs => Path.GetFullPath(Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments), "Libation"));
-        public static string WinTemp => Path.GetFullPath(Path.Combine(Path.GetTempPath(), "Libation"));
-        public static string UserProfile => Path.GetFullPath(Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile), "Libation"));
-
-        public enum KnownDirectories
-        {
-            None = 0,
-
-            [Description("My Users folder")]
-            UserProfile = 1,
-
-            [Description("The same folder that Libation is running from")]
-            AppDir = 2,
-
-            [Description("Windows temporary folder")]
-            WinTemp = 3,
-
-            [Description("My Documents")]
-            MyDocs = 4,
-
-            [Description("Your settings folder (aka: Libation Files)")]
-            LibationFiles = 5
-        }
-        // use func calls so we always get the latest value of LibationFiles
-        private static List<(KnownDirectories directory, Func<string> getPathFunc)> directoryOptionsPaths { get; } = new()
-        {
-            (KnownDirectories.None, () => null),
-            (KnownDirectories.UserProfile, () => UserProfile),
-            (KnownDirectories.AppDir, () => AppDir_Relative),
-            (KnownDirectories.WinTemp, () => WinTemp),
-            (KnownDirectories.MyDocs, () => MyDocs),
-            // this is important to not let very early calls try to accidentally load LibationFiles too early.
-            // also, keep this at bottom of this list
-            (KnownDirectories.LibationFiles, () => libationFilesPathCache)
-        };
-        public static string GetKnownDirectoryPath(KnownDirectories directory)
-        {
-            var dirFunc = directoryOptionsPaths.SingleOrDefault(dirFunc => dirFunc.directory == directory);
-            return dirFunc == default ? null : dirFunc.getPathFunc();
-        }
-        public static KnownDirectories GetKnownDirectory(string directory)
-        {
-            // especially important so a very early call doesn't match null => LibationFiles
-            if (string.IsNullOrWhiteSpace(directory))
-                return KnownDirectories.None;
-
-            // 'First' instead of 'Single' because LibationFiles could match other directories. eg: default value of LibationFiles == UserProfile.
-            // since it's a list, order matters and non-LibationFiles will be returned first
-            var dirFunc = directoryOptionsPaths.FirstOrDefault(dirFunc => dirFunc.getPathFunc() == directory);
-            return dirFunc == default ? KnownDirectories.None : dirFunc.directory;
-        }
-        #endregion
-
-        #region logging
-        private IConfigurationRoot configuration;
-
-        public void ConfigureLogging()
-        {
-            configuration = new ConfigurationBuilder()
-                .AddJsonFile(SettingsFilePath, optional: false, reloadOnChange: true)
-                .Build();
-            Log.Logger = new LoggerConfiguration()
-                .ReadFrom.Configuration(configuration)
-                .CreateLogger();
-        }
-
-        [Description("The importance of a log event")]
-        public LogEventLevel LogLevel
-        {
-            get
-            {
-                var logLevelStr = persistentDictionary.GetStringFromJsonPath("Serilog", "MinimumLevel");
-                return Enum.TryParse<LogEventLevel>(logLevelStr, out var logLevelEnum) ? logLevelEnum : LogEventLevel.Information;
-            }
-            set
-            {
-                var valueWasChanged = persistentDictionary.SetWithJsonPath("Serilog", "MinimumLevel", value.ToString());
-                if (!valueWasChanged)
-                {
-                    Log.Logger.Information("LogLevel.set attempt. No change");
-                    return;
-                }
-
-                configuration.Reload();
-
-                Log.Logger.Information("Updated LogLevel MinimumLevel. {@DebugInfo}", new
-                {
-                    LogLevel_Verbose_Enabled = Log.Logger.IsVerboseEnabled(),
-                    LogLevel_Debug_Enabled = Log.Logger.IsDebugEnabled(),
-                    LogLevel_Information_Enabled = Log.Logger.IsInformationEnabled(),
-                    LogLevel_Warning_Enabled = Log.Logger.IsWarningEnabled(),
-                    LogLevel_Error_Enabled = Log.Logger.IsErrorEnabled(),
-                    LogLevel_Fatal_Enabled = Log.Logger.IsFatalEnabled()
-                });
-            }
-        }
-		#endregion
-
-		#region singleton stuff
-		public static Configuration Instance { get; } = new Configuration();
-        private Configuration() { }
-        #endregion
-
-        #region LibationFiles
-        private static string APPSETTINGS_JSON { get; } = Path.Combine(Path.GetDirectoryName(System.Reflection.Assembly.GetEntryAssembly().Location), "appsettings.json");
-        private const string LIBATION_FILES_KEY = "LibationFiles";
-
-        [Description("Location for storage of program-created files")]
-        public string LibationFiles
-        {
-            get
-            {
-                if (libationFilesPathCache is not null)
-                    return libationFilesPathCache;
-
-                // FIRST: must write here before SettingsFilePath in next step reads cache
-                libationFilesPathCache = getLiberationFilesSettingFromJson();
-
-                // SECOND. before setting to json file with SetWithJsonPath, PersistentDictionary must exist
-                persistentDictionary = new PersistentDictionary(SettingsFilePath);
-
-                // Config init in ensureSerilogConfig() only happens when serilog setting is first created (prob on 1st run).
-                // This Set() enforces current LibationFiles every time we restart Libation or redirect LibationFiles
-                var logPath = Path.Combine(LibationFiles, "Log.log");
-
-                // BAD: Serilog.WriteTo[1].Args
-                //      "[1]" assumes ordinal position
-                // GOOD: Serilog.WriteTo[?(@.Name=='File')].Args
-                var jsonpath = "Serilog.WriteTo[?(@.Name=='File')].Args";
-
-                SetWithJsonPath(jsonpath, "path", logPath, true);
-
-                return libationFilesPathCache;
-            }
-        }
-
-        private static string libationFilesPathCache;
-
-        private string getLiberationFilesSettingFromJson()
-        {
-            string startingContents = null;
-            try
-            {
-                if (File.Exists(APPSETTINGS_JSON))
-                {
-                    startingContents = File.ReadAllText(APPSETTINGS_JSON);
-                    var startingJObj = JObject.Parse(startingContents);
-
-                    if (startingJObj.ContainsKey(LIBATION_FILES_KEY))
-                    {
-                        var startingValue = startingJObj[LIBATION_FILES_KEY].Value<string>();
-                        if (!string.IsNullOrWhiteSpace(startingValue))
-                            return startingValue;
-                    }
-                }
-            }
-            catch { }
-
-            // not found. write to file. read from file
-            var endingContents = new JObject { { LIBATION_FILES_KEY, UserProfile } }.ToString(Formatting.Indented);
-            if (startingContents != endingContents)
-            {
-                File.WriteAllText(APPSETTINGS_JSON, endingContents);
-                System.Threading.Thread.Sleep(100);
-            }
-
-            // do not check whether directory exists. special/meta directory (eg: AppDir) is valid
-            // verify from live file. no try/catch. want failures to be visible
-            var jObjFinal = JObject.Parse(File.ReadAllText(APPSETTINGS_JSON));
-            var valueFinal = jObjFinal[LIBATION_FILES_KEY].Value<string>();
-            return valueFinal;
-        }
-
-        public void SetLibationFiles(string directory)
-        {
-            libationFilesPathCache = null;
-
-            var startingContents = File.ReadAllText(APPSETTINGS_JSON);
-            var jObj = JObject.Parse(startingContents);
-
-            jObj[LIBATION_FILES_KEY] = directory;
-
-            var endingContents = JsonConvert.SerializeObject(jObj, Formatting.Indented);
-            if (startingContents == endingContents)
-                return;
-
-            // now it's set in the file again but no settings have moved yet
-            File.WriteAllText(APPSETTINGS_JSON, endingContents);
-
-            try
-            {
-                Log.Logger.Information("Libation files changed {@DebugInfo}", new { APPSETTINGS_JSON, LIBATION_FILES_KEY, directory });
-            }
-            catch { }
-        }
-        #endregion
-    }
-}

LibationFileManager/LibationFileManager.csproj

@@ -1,15 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="5.0.0" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\FileManager\FileManager.csproj" />
-  </ItemGroup>
-
-</Project>

LibationFileManager/TagsPersistence.cs

@@ -1,64 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using Newtonsoft.Json;
-using Polly;
-using Polly.Retry;
-
-namespace LibationFileManager
-{
-    /// <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();
-
-			if (!tagsCollection.Any())
-				return;
-
-			// 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));
-		}
-	}
-}

LibationFileManager/TemplateTags.cs

@@ -1,37 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using Dinah.Core;
-
-namespace LibationFileManager
-{
-    public sealed class TemplateTags : Enumeration<TemplateTags>
-    {
-        public string TagName => DisplayName;
-        public string Description { get; }
-        public bool IsChapterOnly { get; }
-
-        private static int value = 0;
-        private TemplateTags(string tagName, string description, bool isChapterOnly = false) : base(value++, tagName)
-        {
-            Description = description;
-            IsChapterOnly = isChapterOnly;
-        }
-
-        public static TemplateTags Id { get; } = new TemplateTags("id", "Audible ID");
-        public static TemplateTags Title { get; } = new TemplateTags("title", "Full title");
-        public static TemplateTags TitleShort { get; } = new TemplateTags("title short", "Title. Stop at first colon");
-        public static TemplateTags Author { get; } = new TemplateTags("author", "Author(s)");
-        public static TemplateTags FirstAuthor { get; } = new TemplateTags("first author", "First author");
-        public static TemplateTags Narrator { get; } = new TemplateTags("narrator", "Narrator(s)");
-        public static TemplateTags FirstNarrator { get; } = new TemplateTags("first narrator", "First narrator");
-        public static TemplateTags Series { get; } = new TemplateTags("series", "Name of series");
-        // can't also have a leading zeros version. Too many weird edge cases. Eg: "1-4"
-        public static TemplateTags SeriesNumber { get; } = new TemplateTags("series#", "Number order in series");
-
-        public static TemplateTags ChCount { get; } = new TemplateTags("ch count", "Number of chapters", true);
-        public static TemplateTags ChTitle { get; } = new TemplateTags("ch title", "Chapter title", true);
-        public static TemplateTags ChNumber { get; } = new TemplateTags("ch#", "Chapter number", true);
-        public static TemplateTags ChNumber0 { get; } = new TemplateTags("ch# 0", "Chapter number with leading zeros", true);
-    }
-}

LibationFileManager/Templates.cs

@@ -1,88 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-
-namespace LibationFileManager
-{
-    public abstract class Templates
-    {
-        public static Templates Folder { get; } = new FolderTemplate();
-        public static Templates File { get; } = new FileTemplate();
-        public static Templates ChapterFile { get; } = new ChapterFileTemplate();
-
-        public abstract string DefaultTemplate { get; }
-
-        public abstract bool IsValid(string template);
-        public abstract bool IsRecommended(string template);
-        public abstract int TagCount(string template);
-
-        public static bool ContainsChapterOnlyTags(string template)
-            => TemplateTags.GetAll()
-            .Where(t => t.IsChapterOnly)
-            .Any(t => ContainsTag(template, t.TagName));
-
-        public static bool ContainsTag(string template, string tag) => template.Contains($"<{tag}>");
-
-        protected static bool fileIsValid(string template)
-            // File name only; not path. all other path chars are valid enough to pass this check and will be handled on final save.
-            // null is invalid. whitespace is valid but not recommended
-            => template is not null
-            && !template.Contains(':')
-            && !template.Contains(System.IO.Path.DirectorySeparatorChar)
-            && !template.Contains(System.IO.Path.AltDirectorySeparatorChar);
-
-        protected bool isRecommended(string template, bool isChapter)
-            => IsValid(template)
-            && !string.IsNullOrWhiteSpace(template)
-            && TagCount(template) > 0
-            && ContainsChapterOnlyTags(template) == isChapter;
-
-        protected static int tagCount(string template, Func<TemplateTags, bool> func)
-            => TemplateTags.GetAll()
-            .Where(func)
-            // for <id><id> == 1, use:
-            //   .Count(t => template.Contains($"<{t.TagName}>"))
-            // .Sum() impl: <id><id> == 2
-            .Sum(t => template.Split($"<{t.TagName}>").Length - 1);
-
-        private class FolderTemplate : Templates
-        {
-			public override string DefaultTemplate { get; } = "<title short> [<id>]";
-
-			public override bool IsValid(string template)
-                // must be relative. no colons. all other path chars are valid enough to pass this check and will be handled on final save.
-                // null is invalid. whitespace is valid but not recommended
-                => template is not null
-                && !template.Contains(':');
-
-            public override bool IsRecommended(string template) => isRecommended(template, false);
-
-            public override int TagCount(string template) => tagCount(template, t => !t.IsChapterOnly);
-        }
-
-        private class FileTemplate : Templates
-        {
-			public override string DefaultTemplate { get; } = "<title> [<id>]";
-
-            public override bool IsValid(string template) => fileIsValid(template);
-
-            public override bool IsRecommended(string template) => isRecommended(template, false);
-
-            public override int TagCount(string template) => tagCount(template, t => !t.IsChapterOnly);
-        }
-
-        private class ChapterFileTemplate : Templates
-        {
-            public override string DefaultTemplate { get; } = "<title> [<id>] - <ch# 0> - <ch title>";
-
-            public override bool IsValid(string template) => fileIsValid(template);
-
-            public override bool IsRecommended(string template)
-                => isRecommended(template, true)
-                // recommended to incl. <ch#> or <ch# 0>
-                && (ContainsTag(template, TemplateTags.ChNumber.TagName) || ContainsTag(template, TemplateTags.ChNumber0.TagName));
-
-            public override int TagCount(string template) => tagCount(template, t => true);
-        }
-    }
-}

LibationSearchEngine/LibationSearchEngine.csproj

@@ -1,19 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <Content Include="_lucene resources.txt" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="LuceneNet303r2" Version="3.0.3.2" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\DataLayer\DataLayer.csproj" />
-  </ItemGroup>
-
-</Project>

LibationWinForms/BookLiberation/AudioConvertForm.cs

@@ -1,34 +0,0 @@
-using System;
-using DataLayer;
-using LibationFileManager;
-
-namespace LibationWinForms.BookLiberation
-{
-	class AudioConvertForm : AudioDecodeForm
-	{
-		public AudioConvertForm()
-		{
-			this.Load += (_, _) => this.RestoreSizeAndLocation(Configuration.Instance);
-			this.FormClosing += (_, _) => this.SaveSizeAndLocation(Configuration.Instance);
-		}
-
-		#region AudioDecodeForm overrides
-		public override string DecodeActionName => "Converting";
-		#endregion
-
-		#region Processable event handler overrides
-		public override void Processable_Begin(object sender, LibraryBook libraryBook)
-		{
-			LogMe.Info($"Convert Step, Begin: {libraryBook.Book}");
-
-			base.Processable_Begin(sender, libraryBook);
-		}
-		public override void Processable_Completed(object sender, LibraryBook libraryBook)
-		{
-			base.Processable_Completed(sender, libraryBook);
-			LogMe.Info($"Convert Step, Completed: {libraryBook.Book}{Environment.NewLine}");
-		}
-
-		#endregion
-	}
-}

LibationWinForms/BookLiberation/AudioDecodeForm.Designer.cs

@@ -1,104 +0,0 @@
-namespace LibationWinForms.BookLiberation
-{
-    partial class AudioDecodeForm
-    {
-        /// <summary>
-        /// Required designer variable.
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary>
-        /// Clean up any resources being used.
-        /// </summary>
-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing && (components != null))
-            {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
-        #region Windows Form Designer generated code
-
-        /// <summary>
-        /// Required method for Designer support - do not modify
-        /// the contents of this method with the code editor.
-        /// </summary>
-        private void InitializeComponent()
-        {
-			this.pictureBox1 = new System.Windows.Forms.PictureBox();
-			this.bookInfoLbl = new System.Windows.Forms.Label();
-			this.progressBar1 = new System.Windows.Forms.ProgressBar();
-			this.remainingTimeLbl = new System.Windows.Forms.Label();
-			((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
-			this.SuspendLayout();
-			// 
-			// pictureBox1
-			// 
-			this.pictureBox1.Location = new System.Drawing.Point(14, 14);
-			this.pictureBox1.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
-			this.pictureBox1.Name = "pictureBox1";
-			this.pictureBox1.Size = new System.Drawing.Size(117, 115);
-			this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
-			this.pictureBox1.TabIndex = 0;
-			this.pictureBox1.TabStop = false;
-			// 
-			// bookInfoLbl
-			// 
-			this.bookInfoLbl.AutoSize = true;
-			this.bookInfoLbl.Location = new System.Drawing.Point(138, 14);
-			this.bookInfoLbl.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-			this.bookInfoLbl.Name = "bookInfoLbl";
-			this.bookInfoLbl.Size = new System.Drawing.Size(121, 15);
-			this.bookInfoLbl.TabIndex = 0;
-			this.bookInfoLbl.Text = "[multi-line book info]";
-			// 
-			// progressBar1
-			// 
-			this.progressBar1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-			this.progressBar1.Location = new System.Drawing.Point(14, 143);
-			this.progressBar1.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
-			this.progressBar1.Name = "progressBar1";
-			this.progressBar1.Size = new System.Drawing.Size(611, 27);
-			this.progressBar1.TabIndex = 2;
-			// 
-			// remainingTimeLbl
-			// 
-			this.remainingTimeLbl.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-			this.remainingTimeLbl.Location = new System.Drawing.Point(632, 143);
-			this.remainingTimeLbl.Name = "remainingTimeLbl";
-			this.remainingTimeLbl.Size = new System.Drawing.Size(60, 31);
-			this.remainingTimeLbl.TabIndex = 3;
-			this.remainingTimeLbl.Text = "ETA:\r\n";
-			this.remainingTimeLbl.TextAlign = System.Drawing.ContentAlignment.TopRight;
-			// 
-			// DecryptForm
-			// 
-			this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
-			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-			this.ClientSize = new System.Drawing.Size(707, 183);
-			this.Controls.Add(this.remainingTimeLbl);
-			this.Controls.Add(this.progressBar1);
-			this.Controls.Add(this.bookInfoLbl);
-			this.Controls.Add(this.pictureBox1);
-			this.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
-			this.Name = "DecryptForm";
-			this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
-			this.Text = "DecryptForm";
-			((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();
-			this.ResumeLayout(false);
-			this.PerformLayout();
-
-        }
-
-        #endregion
-
-        private System.Windows.Forms.PictureBox pictureBox1;
-        private System.Windows.Forms.Label bookInfoLbl;
-        private System.Windows.Forms.ProgressBar progressBar1;
-        private System.Windows.Forms.Label remainingTimeLbl;
-    }
-}

LibationWinForms/BookLiberation/AudioDecodeForm.cs

@@ -1,117 +0,0 @@
-using System;
-using DataLayer;
-using Dinah.Core.Net.Http;
-using Dinah.Core.Threading;
-using LibationFileManager;
-using LibationWinForms.BookLiberation.BaseForms;
-
-namespace LibationWinForms.BookLiberation
-{
-	public partial class AudioDecodeForm : LiberationBaseForm
-	{
-		public virtual string DecodeActionName { get; } = "Decoding";
-		public AudioDecodeForm() => InitializeComponent();
-
-		private Func<byte[]> GetCoverArtDelegate;
-
-		// book info
-		private string title;
-		private string authorNames;
-		private string narratorNames;
-
-		#region Processable event handler overrides
-		public override void Processable_Begin(object sender, LibraryBook libraryBook)
-		{
-			base.Processable_Begin(sender, libraryBook);
-
-			GetCoverArtDelegate = () => PictureStorage.GetPictureSynchronously(
-						new PictureDefinition(
-							libraryBook.Book.PictureId,
-							PictureSize._500x500));
-
-			//Set default values from library
-			AudioDecodable_TitleDiscovered(sender, libraryBook.Book.Title);
-			AudioDecodable_AuthorsDiscovered(sender, string.Join(", ", libraryBook.Book.Authors));
-			AudioDecodable_NarratorsDiscovered(sender, string.Join(", ", libraryBook.Book.NarratorNames));
-			AudioDecodable_CoverImageDiscovered(sender,
-					PictureStorage.GetPicture(
-						new PictureDefinition(
-							libraryBook.Book.PictureId,
-							PictureSize._80x80)).bytes);
-		}
-		#endregion
-
-		#region Streamable event handler overrides
-		public override void Streamable_StreamingProgressChanged(object sender, DownloadProgress downloadProgress)
-		{
-			base.Streamable_StreamingProgressChanged(sender, downloadProgress);
-			if (!downloadProgress.ProgressPercentage.HasValue)
-				return;
-
-			if (downloadProgress.ProgressPercentage == 0)
-				updateRemainingTime(0);
-			else
-				progressBar1.UIThreadAsync(() => progressBar1.Value = (int)downloadProgress.ProgressPercentage);
-		}
-
-		public override void Streamable_StreamingTimeRemaining(object sender, TimeSpan timeRemaining)
-		{
-			base.Streamable_StreamingTimeRemaining(sender, timeRemaining);
-			updateRemainingTime((int)timeRemaining.TotalSeconds);
-		}
-
-		#endregion
-
-		#region AudioDecodable event handlers
-		public override void AudioDecodable_RequestCoverArt(object sender, Action<byte[]> setCoverArtDelegate)
-		{
-			base.AudioDecodable_RequestCoverArt(sender, setCoverArtDelegate);
-			setCoverArtDelegate(GetCoverArtDelegate?.Invoke());
-		}
-
-		public override void AudioDecodable_TitleDiscovered(object sender, string title)
-		{
-			base.AudioDecodable_TitleDiscovered(sender, title);
-			this.UIThreadAsync(() => this.Text = DecodeActionName + " " + title);
-			this.title = title;
-			updateBookInfo();
-		}
-
-		public override void AudioDecodable_AuthorsDiscovered(object sender, string authors)
-		{
-			base.AudioDecodable_AuthorsDiscovered(sender, authors);
-			authorNames = authors;
-			updateBookInfo();
-		}
-
-		public override void AudioDecodable_NarratorsDiscovered(object sender, string narrators)
-		{
-			base.AudioDecodable_NarratorsDiscovered(sender, narrators);
-			narratorNames = narrators;
-			updateBookInfo();
-		}
-
-		public override void AudioDecodable_CoverImageDiscovered(object sender, byte[] coverArt)
-		{
-			base.AudioDecodable_CoverImageDiscovered(sender, coverArt);
-			pictureBox1.UIThreadAsync(() => pictureBox1.Image = Dinah.Core.Drawing.ImageReader.ToImage(coverArt));
-		}
-		#endregion
-
-		// thread-safe UI updates
-		private void updateBookInfo()
-			=> bookInfoLbl.UIThreadAsync(() => bookInfoLbl.Text = $"{title}\r\nBy {authorNames}\r\nNarrated by {narratorNames}");
-
-		private void updateRemainingTime(int remaining)
-			=> remainingTimeLbl.UIThreadAsync(() => remainingTimeLbl.Text = $"ETA:\r\n{formatTime(remaining)}");
-
-		private string formatTime(int seconds)
-		{
-			var timeSpan = new TimeSpan(0, 0, seconds);
-			return
-				timeSpan.TotalHours >= 1 ? $"{timeSpan:%h}h {timeSpan:mm}m {timeSpan:ss}s"
-				: timeSpan.TotalMinutes >= 1 ? $"{timeSpan:%m}m {timeSpan:ss}s"
-				: $"{seconds} sec";
-		}
-	}
-}

LibationWinForms/BookLiberation/AudioDecryptForm.cs

@@ -1,34 +0,0 @@
-using System;
-using DataLayer;
-using LibationFileManager;
-
-namespace LibationWinForms.BookLiberation
-{
-	class AudioDecryptForm : AudioDecodeForm
-	{
-		public AudioDecryptForm()
-		{
-			this.Load += (_, _) => this.RestoreSizeAndLocation(Configuration.Instance);
-			this.FormClosing += (_, _) => this.SaveSizeAndLocation(Configuration.Instance);
-		}
-
-		#region AudioDecodeForm overrides
-		public override string DecodeActionName => "Decrypting";
-		#endregion
-
-		#region Processable event handler overrides
-		public override void Processable_Begin(object sender, LibraryBook libraryBook)
-		{
-			LogMe.Info($"Download & Decrypt Step, Begin: {libraryBook.Book}");
-
-			base.Processable_Begin(sender, libraryBook);
-		}
-		public override void Processable_Completed(object sender, LibraryBook libraryBook)
-		{
-			base.Processable_Completed(sender, libraryBook);
-			LogMe.Info($"Download & Decrypt Step, Completed: {libraryBook.Book}{Environment.NewLine}");
-		}
-
-		#endregion
-	}
-}

LibationWinForms/BookLiberation/AutomatedBackupsForm.Designer.cs

@@ -1,93 +0,0 @@
-namespace LibationWinForms.BookLiberation
-{
-    partial class AutomatedBackupsForm
-    {
-        /// <summary>
-        /// Required designer variable.
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary>
-        /// Clean up any resources being used.
-        /// </summary>
-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing && (components != null))
-            {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
-        #region Windows Form Designer generated code
-
-        /// <summary>
-        /// Required method for Designer support - do not modify
-        /// the contents of this method with the code editor.
-        /// </summary>
-        private void InitializeComponent()
-        {
-            this.keepGoingCb = new System.Windows.Forms.CheckBox();
-            this.logTb = new System.Windows.Forms.TextBox();
-            this.label1 = new System.Windows.Forms.Label();
-            this.SuspendLayout();
-            // 
-            // keepGoingCb
-            // 
-            this.keepGoingCb.AutoSize = true;
-            this.keepGoingCb.Checked = true;
-            this.keepGoingCb.CheckState = System.Windows.Forms.CheckState.Checked;
-            this.keepGoingCb.Location = new System.Drawing.Point(12, 12);
-            this.keepGoingCb.Name = "keepGoingCb";
-            this.keepGoingCb.Size = new System.Drawing.Size(325, 17);
-            this.keepGoingCb.TabIndex = 0;
-            this.keepGoingCb.Text = "Keep going. Uncheck to stop when current backup is complete";
-            this.keepGoingCb.UseVisualStyleBackColor = true;
-            // 
-            // logTb
-            // 
-            this.logTb.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-            this.logTb.Location = new System.Drawing.Point(12, 48);
-            this.logTb.Multiline = true;
-            this.logTb.Name = "logTb";
-            this.logTb.ReadOnly = true;
-            this.logTb.ScrollBars = System.Windows.Forms.ScrollBars.Both;
-            this.logTb.Size = new System.Drawing.Size(960, 202);
-            this.logTb.TabIndex = 1;
-            // 
-            // label1
-            // 
-            this.label1.AutoSize = true;
-            this.label1.Location = new System.Drawing.Point(9, 32);
-            this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(501, 13);
-            this.label1.TabIndex = 2;
-            this.label1.Text = "NOTE: if the working directories are inside of Dropbox, some book liberation acti" +
-    "ons may hang indefinitely";
-            // 
-            // AutomatedBackupsForm
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(984, 262);
-            this.Controls.Add(this.label1);
-            this.Controls.Add(this.logTb);
-            this.Controls.Add(this.keepGoingCb);
-            this.Name = "AutomatedBackupsForm";
-            this.Text = "Automated Backups";
-            this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.AutomatedBackupsForm_FormClosing);
-            this.ResumeLayout(false);
-            this.PerformLayout();
-
-        }
-
-        #endregion
-
-        private System.Windows.Forms.CheckBox keepGoingCb;
-        private System.Windows.Forms.TextBox logTb;
-        private System.Windows.Forms.Label label1;
-    }
-}

LibationWinForms/BookLiberation/AutomatedBackupsForm.cs

@@ -1,34 +0,0 @@
-using System;
-using System.Windows.Forms;
-using Dinah.Core.Threading;
-
-namespace LibationWinForms.BookLiberation
-{
-	public partial class AutomatedBackupsForm : Form
-	{
-		public bool KeepGoingChecked => keepGoingCb.Checked;
-
-		public bool KeepGoing => keepGoingCb.Enabled && keepGoingCb.Checked;
-
-		public AutomatedBackupsForm()
-		{
-			InitializeComponent();
-		}
-
-		public void WriteLine(string text)
-		{
-			if (!IsDisposed)
-				logTb.UIThreadAsync(() => logTb.AppendText($"{DateTime.Now} {text}{Environment.NewLine}"));
-		}
-
-		public void FinalizeUI()
-		{
-			keepGoingCb.Enabled = false;
-
-			if (!IsDisposed)
-				logTb.AppendText("");
-		}
-
-		private void AutomatedBackupsForm_FormClosing(object sender, FormClosingEventArgs e) => keepGoingCb.Checked = false;
-	}
-}

LibationWinForms/BookLiberation/BaseForms/LiberationBaseForm.cs

@@ -1,162 +0,0 @@
-using System;
-using System.Windows.Forms;
-using DataLayer;
-using Dinah.Core.Net.Http;
-using Dinah.Core.Threading;
-using FileLiberator;
-
-namespace LibationWinForms.BookLiberation.BaseForms
-{
-	public class LiberationBaseForm : Form
-	{
-		protected Streamable Streamable { get; private set; }
-		protected LogMe LogMe { get; private set; }
-		private SynchronizeInvoker Invoker { get; init; } 
-
-		public LiberationBaseForm()
-		{
-			//SynchronizationContext.Current will be null until the process contains a Form.
-			//If this is the first form created, it will not exist until after execution
-			//reaches inside the constructor (after base class has been initialized).
-			Invoker = new SynchronizeInvoker();
-		}
-
-		public void RegisterFileLiberator(Streamable streamable, LogMe logMe = null)
-		{
-			if (streamable is null) return;
-
-			Streamable = streamable;
-			LogMe = logMe;
-
-			Subscribe(streamable);
-
-			if (Streamable is Processable processable)
-				Subscribe(processable);
-			if (Streamable is AudioDecodable audioDecodable)
-				Subscribe(audioDecodable);
-		}
-
-		#region Event Subscribers and Unsubscribers
-		private void Subscribe(Streamable streamable)
-		{
-			UnsubscribeStreamable(this, EventArgs.Empty);
-
-			streamable.StreamingBegin += OnStreamingBeginShow;
-			streamable.StreamingBegin += Streamable_StreamingBegin;
-			streamable.StreamingProgressChanged += Streamable_StreamingProgressChanged;
-			streamable.StreamingTimeRemaining += Streamable_StreamingTimeRemaining;
-			streamable.StreamingCompleted += Streamable_StreamingCompleted;
-			streamable.StreamingCompleted += OnStreamingCompletedClose;
-
-			Disposed += UnsubscribeStreamable;
-		}
-		private void Subscribe(Processable processable)
-		{
-			UnsubscribeProcessable(this, null);
-
-			processable.Begin += Processable_Begin;
-			processable.StatusUpdate += Processable_StatusUpdate;
-			processable.Completed += Processable_Completed;
-
-			//The form is created on Processable.Begin and we
-			//dispose of it on Processable.Completed
-			processable.Completed += OnCompletedDispose;
-
-			//Don't unsubscribe from Dispose because it fires when
-			//Streamable.StreamingCompleted closes the form, and
-			//the Processable events need to live past that event.
-			processable.Completed += UnsubscribeProcessable;
-		}
-		private void Subscribe(AudioDecodable audioDecodable)
-		{
-			UnsubscribeAudioDecodable(this, EventArgs.Empty);
-
-			audioDecodable.RequestCoverArt += AudioDecodable_RequestCoverArt;
-			audioDecodable.TitleDiscovered += AudioDecodable_TitleDiscovered;
-			audioDecodable.AuthorsDiscovered += AudioDecodable_AuthorsDiscovered;
-			audioDecodable.NarratorsDiscovered += AudioDecodable_NarratorsDiscovered;
-			audioDecodable.CoverImageDiscovered += AudioDecodable_CoverImageDiscovered;
-
-			Disposed += UnsubscribeAudioDecodable;
-		}
-		private void UnsubscribeStreamable(object sender, EventArgs e)
-		{
-			Disposed -= UnsubscribeStreamable;
-
-			Streamable.StreamingBegin -= OnStreamingBeginShow;
-			Streamable.StreamingBegin -= Streamable_StreamingBegin;
-			Streamable.StreamingProgressChanged -= Streamable_StreamingProgressChanged;
-			Streamable.StreamingTimeRemaining -= Streamable_StreamingTimeRemaining;
-			Streamable.StreamingCompleted -= Streamable_StreamingCompleted;
-			Streamable.StreamingCompleted -= OnStreamingCompletedClose;
-		}
-		private void UnsubscribeProcessable(object sender, LibraryBook e)
-		{
-			if (Streamable is not Processable processable)
-				return;
-
-			processable.Completed -= UnsubscribeProcessable;
-			processable.Completed -= OnCompletedDispose;
-			processable.Completed -= Processable_Completed;
-			processable.StatusUpdate -= Processable_StatusUpdate;
-			processable.Begin -= Processable_Begin;
-		}
-		private void UnsubscribeAudioDecodable(object sender, EventArgs e)
-		{
-			if (Streamable is not AudioDecodable audioDecodable)
-				return;
-
-			Disposed -= UnsubscribeAudioDecodable;
-			audioDecodable.RequestCoverArt -= AudioDecodable_RequestCoverArt;
-			audioDecodable.TitleDiscovered -= AudioDecodable_TitleDiscovered;
-			audioDecodable.AuthorsDiscovered -= AudioDecodable_AuthorsDiscovered;
-			audioDecodable.NarratorsDiscovered -= AudioDecodable_NarratorsDiscovered;
-			audioDecodable.CoverImageDiscovered -= AudioDecodable_CoverImageDiscovered;
-
-			audioDecodable.Cancel();
-		}
-		#endregion
-
-		#region Form creation and disposal handling
-
-		/// <summary>
-		/// If the form was shown using Show (not ShowDialog), Form.Close calls Form.Dispose
-		/// </summary>
-		private void OnStreamingCompletedClose(object sender, string completedString) => this.UIThreadAsync(Close);
-		private void OnCompletedDispose(object sender, LibraryBook e) => this.UIThreadAsync(Dispose);
-
-		/// <summary>
-		/// If StreamingBegin is fired from a worker thread, the window will be created on that
-		/// worker thread. We need to make certain that we show the window on the UI thread (same 
-		/// thread that created form), otherwise the renderer will be on a worker thread which 
-		/// could cause it to freeze. Form.BeginInvoke won't work until the form is created 
-		/// (ie. shown) because Control doesn't get a window handle until it is Shown.
-		/// </summary>
-		private void OnStreamingBeginShow(object sender, string beginString) => Invoker.UIThreadAsync(Show);
-
-		#endregion
-
-		#region Streamable event handlers
-		public virtual void Streamable_StreamingBegin(object sender, string beginString) { }
-		public virtual void Streamable_StreamingProgressChanged(object sender, DownloadProgress downloadProgress) { }
-		public virtual void Streamable_StreamingTimeRemaining(object sender, TimeSpan timeRemaining) { }
-		public virtual void Streamable_StreamingCompleted(object sender, string completedString) { }
-
-		#endregion
-
-		#region Processable event handlers
-		public virtual void Processable_Begin(object sender, LibraryBook libraryBook) { }
-		public virtual void Processable_StatusUpdate(object sender, string statusUpdate) { }
-		public virtual void Processable_Completed(object sender, LibraryBook libraryBook) { }
-
-		#endregion
-
-		#region AudioDecodable event handlers
-		public virtual void AudioDecodable_RequestCoverArt(object sender, Action<byte[]> setCoverArtDelegate) { }
-		public virtual void AudioDecodable_TitleDiscovered(object sender, string title) { }
-		public virtual void AudioDecodable_AuthorsDiscovered(object sender, string authors) { }
-		public virtual void AudioDecodable_NarratorsDiscovered(object sender, string narrators) { }
-		public virtual void AudioDecodable_CoverImageDiscovered(object sender, byte[] coverArt) { }
-		#endregion
-	}
-}

LibationWinForms/BookLiberation/DownloadForm.Designer.cs

@@ -1,109 +0,0 @@
-using DataLayer;
-using System;
-
-namespace LibationWinForms.BookLiberation
-{
-    partial class DownloadForm
-    {
-        /// <summary>
-        /// Required designer variable.
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary>
-        /// Clean up any resources being used.
-        /// </summary>
-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing && (components != null))
-            {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
-        #region Windows Form Designer generated code
-
-        /// <summary>
-        /// Required method for Designer support - do not modify
-        /// the contents of this method with the code editor.
-        /// </summary>
-        private void InitializeComponent()
-        {
-            this.filenameLbl = new System.Windows.Forms.Label();
-            this.progressBar1 = new System.Windows.Forms.ProgressBar();
-            this.progressLbl = new System.Windows.Forms.Label();
-            this.lastUpdateLbl = new System.Windows.Forms.Label();
-            this.SuspendLayout();
-            // 
-            // filenameLbl
-            // 
-            this.filenameLbl.AutoSize = true;
-            this.filenameLbl.Location = new System.Drawing.Point(12, 9);
-            this.filenameLbl.Name = "filenameLbl";
-            this.filenameLbl.Size = new System.Drawing.Size(52, 13);
-            this.filenameLbl.TabIndex = 0;
-            this.filenameLbl.Text = "[filename]";
-            // 
-            // progressBar1
-            // 
-            this.progressBar1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-            this.progressBar1.Location = new System.Drawing.Point(15, 67);
-            this.progressBar1.Name = "progressBar1";
-            this.progressBar1.Size = new System.Drawing.Size(877, 23);
-            this.progressBar1.TabIndex = 4;
-            // 
-            // progressLbl
-            // 
-            this.progressLbl.Location = new System.Drawing.Point(12, 36);
-            this.progressLbl.Name = "progressLbl";
-            this.progressLbl.Size = new System.Drawing.Size(173, 13);
-            this.progressLbl.TabIndex = 5;
-            this.progressLbl.Text = "[2,999,999,999] of [2,999,999,999]";
-            this.progressLbl.TextAlign = System.Drawing.ContentAlignment.TopRight;
-            // 
-            // lastUpdateLbl
-            // 
-            this.lastUpdateLbl.AutoSize = true;
-            this.lastUpdateLbl.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.lastUpdateLbl.ForeColor = System.Drawing.Color.DarkRed;
-            this.lastUpdateLbl.Location = new System.Drawing.Point(361, 36);
-            this.lastUpdateLbl.Name = "lastUpdateLbl";
-            this.lastUpdateLbl.Size = new System.Drawing.Size(81, 13);
-            this.lastUpdateLbl.TabIndex = 6;
-            this.lastUpdateLbl.Text = "Last updated";
-            this.lastUpdateLbl.Visible = false;
-            // 
-            // DownloadForm
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(904, 102);
-            this.Controls.Add(this.lastUpdateLbl);
-            this.Controls.Add(this.progressLbl);
-            this.Controls.Add(this.progressBar1);
-            this.Controls.Add(this.filenameLbl);
-            this.MaximizeBox = false;
-            this.MinimizeBox = false;
-            this.Name = "DownloadForm";
-            this.ShowIcon = false;
-            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
-            this.Text = "Downloading";
-            this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.DownloadForm_FormClosing);
-            this.Load += new System.EventHandler(this.DownloadForm_Load);
-            this.ResumeLayout(false);
-            this.PerformLayout();
-
-        }
-
-
-		#endregion
-
-		private System.Windows.Forms.Label filenameLbl;
-        private System.Windows.Forms.ProgressBar progressBar1;
-        private System.Windows.Forms.Label progressLbl;
-        private System.Windows.Forms.Label lastUpdateLbl;
-    }
-}