update changelog for release v0.3.1-alpha [no ci]

2021-11-30 10:51:00 -06:00
1558 changed files with 50119 additions and 256538 deletions
@@ -3,7 +3,7 @@
  "isRoot": true,
  "tools": {
    "jetbrains.resharper.globaltools": {
-      "version": "2022.1.0",
+      "version": "2021.2.2",
      "commands": [
        "jb"
      ]
@@ -6,21 +6,3 @@ updates:
      interval: daily
    assignees:
      - jasongdove
-  - package-ecosystem: docker
-    directory: "/docker"
-    schedule:
-      interval: daily
-    assignees:
-      - jasongdove
-  - package-ecosystem: docker
-    directory: "/docker/nvidia"
-    schedule:
-      interval: daily
-    assignees:
-      - jasongdove
-  - package-ecosystem: docker
-    directory: "/docker/vaapi"
-    schedule:
-      interval: daily
-    assignees:
-      - jasongdove
@@ -1,255 +0,0 @@
-name: Build Artifacts
-on:
-  workflow_call:
-    inputs:
-      release_tag:
-        description: 'Release tag'
-        required: true
-        type: string
-      release_version:
-        description: 'Release version number (e.g. v0.3.7-alpha)'
-        required: true
-        type: string
-      info_version:
-        description: 'Informational version number (e.g. 0.3.7-alpha)'
-        required: true
-        type: string
-    secrets:
-      apple_developer_certificate_p12_base64:
-        required: true
-      apple_developer_certificate_password:
-        required: true
-      ac_username:
-        required: true
-      ac_password:
-        required: true
-      gh_token:
-        required: true
-jobs:
-  build_and_upload_mac:
-    name: Mac Build & Upload
-    runs-on: ${{ matrix.os }}
-    if: contains(github.event.head_commit.message, '[no build]') == false
-    strategy:
-      matrix:
-        include:
-          - os: macos-latest
-            kind: macOS
-            target: osx-x64
-          - os: macos-latest
-            kind: macOS
-            target: osx-arm64
-    steps:
-      - name: Get the sources
-        uses: actions/checkout@v2
-        with:
-          fetch-depth: 0
-          submodules: true
-
-      - name: Setup .NET Core
-        uses: actions/setup-dotnet@v1
-        with:
-          dotnet-version: 6.0.x
-
-      - name: Setup Node.js
-        uses: actions/setup-node@v2
-        with:
-          node-version: '14'
-
-      - name: Cache NPM dependencies
-        uses: bahmutov/npm-install@v1.4.5
-        with:
-          working-directory: ErsatzTV/client-app
-
-      - name: Clean
-        run: dotnet clean --configuration Release && dotnet nuget locals all --clear
-
-      - name: Install dependencies
-        run: dotnet restore -r "${{ matrix.target}}"
-
-      - name: Import Code-Signing Certificates
-        uses: Apple-Actions/import-codesign-certs@v1
-        with:
-          p12-file-base64: ${{ secrets.apple_developer_certificate_p12_base64 }}
-          p12-password: ${{ secrets.apple_developer_certificate_password }}
-
-      - name: Calculate Release Name
-        shell: bash
-        run: |
-          release_name="ErsatzTV-${{ inputs.release_version }}-${{ matrix.target }}"
-          echo "RELEASE_NAME=${release_name}" >> $GITHUB_ENV
-
-      - name: Build
-        shell: bash
-        run: dotnet publish ErsatzTV/ErsatzTV.csproj --framework net6.0 --runtime "${{ matrix.target }}" -c Release -o publish -p:InformationalVersion="${{ inputs.release_version }}-${{ matrix.target }}" -p:EnableCompressionInSingleFile=true -p:DebugType=Embedded -p:PublishSingleFile=true --self-contained true
-
-      - name: Bundle
-        shell: bash
-        run: |
-          brew install coreutils
-          plutil -replace CFBundleShortVersionString -string "${{ inputs.info_version }}" ErsatzTV-macOS/ErsatzTV-macOS/Info.plist
-          plutil -replace CFBundleVersion -string "${{ inputs.info_version }}" ErsatzTV-macOS/ErsatzTV-macOS/Info.plist
-          scripts/macOS/bundle.sh
-
-      - name: Sign
-        shell: bash
-        run: scripts/macOS/sign.sh
-      
-      - name: Create DMG
-        shell: bash
-        run: |
-          brew install create-dmg
-          create-dmg \
-            --volname "ErsatzTV" \
-            --volicon "artwork/ErsatzTV.icns" \
-            --window-pos 200 120 \
-            --window-size 800 400 \
-            --icon-size 100 \
-            --icon "ErsatzTV.app" 200 190 \
-            --hide-extension "ErsatzTV.app" \
-            --app-drop-link 600 185 \
-            "ErsatzTV.dmg" \
-            "ErsatzTV.app/"
-
-      - name: Notarize
-        shell: bash
-        run: |
-          curl -o gon.zip -L -s "https://github.com/mitchellh/gon/releases/latest/download/gon_macos.zip"
-          unzip -o -q gon.zip
-          ./gon -log-level=debug -log-json ./gon.json
-        env:
-          AC_USERNAME: ${{ secrets.ac_username }}
-          AC_PASSWORD: ${{ secrets.ac_password }}
-
-      - name: Cleanup
-        shell: bash
-        run: |
-          mv ErsatzTV.dmg "${{ env.RELEASE_NAME }}.dmg"
-          rm -r publish
-          rm -r ErsatzTV.app
-
-      - name: Delete old release assets
-        uses: mknejp/delete-release-assets@v1
-        with:
-          token: ${{ secrets.gh_token }}
-          tag: ${{ inputs.release_tag }}
-          fail-if-no-assets: false
-          assets: |
-            *${{ matrix.target }}.dmg
-
-      - name: Publish
-        uses: softprops/action-gh-release@v1
-        with:
-          prerelease: true
-          tag_name: ${{ inputs.release_tag }}
-          files: |
-            ${{ env.RELEASE_NAME }}.dmg
-        env:
-          GITHUB_TOKEN: ${{ secrets.gh_token }}
-  build_and_upload:
-    name: Build & Upload
-    runs-on: ${{ matrix.os }}
-    if: contains(github.event.head_commit.message, '[no build]') == false
-    strategy:
-      matrix:
-        include:
-          - os: ubuntu-latest
-            kind: linux
-            target: linux-x64
-          - os: ubuntu-latest
-            kind: linux
-            target: linux-arm
-          - os: ubuntu-latest
-            kind: linux
-            target: linux-arm64
-          - os: windows-latest
-            kind: windows
-            target: win-x64
-    steps:
-      - name: Get the sources
-        uses: actions/checkout@v2
-        with:
-          fetch-depth: 0
-
-      - name: Setup .NET Core
-        uses: actions/setup-dotnet@v1
-        with:
-          dotnet-version: 6.0.x
-
-      - name: Setup Node.js
-        uses: actions/setup-node@v2
-        with:
-          node-version: '14'
-
-      - name: Cache NPM dependencies
-        uses: bahmutov/npm-install@v1.4.5
-        with:
-          working-directory: ErsatzTV/client-app
-
-      - name: Clean
-        run: dotnet clean --configuration Release && dotnet nuget locals all --clear
-
-      - name: Install dependencies
-        run: dotnet restore -r "${{ matrix.target}}"
-
-      - uses: suisei-cn/actions-download-file@v1
-        if: ${{ matrix.kind }} == "windows"
-        id: downloadffmpeg
-        name: Download ffmpeg
-        with:
-          url: "https://github.com/GyanD/codexffmpeg/releases/download/5.0/ffmpeg-5.0-full_build.7z"
-          target: ffmpeg/
-
-      - name: Build
-        shell: bash
-        run: |
-          # Define some variables for things we need
-          release_name="ErsatzTV-${{ inputs.release_version }}-${{ matrix.target }}"
-          echo "RELEASE_NAME=${release_name}" >> $GITHUB_ENV
-
-          # Build everything
-          dotnet publish ErsatzTV/ErsatzTV.csproj --framework net6.0 --runtime "${{ matrix.target }}" -c Release -o "$release_name" -p:InformationalVersion="${{ inputs.release_version }}-${{ matrix.target }}" -p:EnableCompressionInSingleFile=true -p:DebugType=Embedded -p:PublishSingleFile=true --self-contained true
-
-          # Build Windows launcher
-          if [ "${{ matrix.kind }}" == "windows" ]; then
-            dotnet publish ErsatzTV-Windows/ErsatzTV-Windows.csproj --framework net6.0-windows --runtime "${{ matrix.target }}" -c Release -o "$release_name" -p:InformationalVersion="${{ inputs.release_version }}-${{ matrix.target }}" -p:EnableCompressionInSingleFile=true -p:DebugType=Embedded -p:PublishSingleFile=true --self-contained true
-          fi
-
-          # Download ffmpeg
-          if [ "${{ matrix.kind }}" == "windows" ]; then
-            7z e "ffmpeg/${{ steps.downloadffmpeg.outputs.filename }}" -o"$release_name" '*.exe' -r
-            rm -f "$release_name/ffplay.exe"
-          fi
-
-          # Pack files
-          if [ "${{ matrix.kind }}" == "windows" ]; then
-            7z a -tzip "${release_name}.zip" "./${release_name}/*"
-          else
-            tar czvf "${release_name}.tar.gz" "$release_name"
-          fi
-
-          # Delete output directory
-          rm -r "$release_name"
-        env:
-          AC_USERNAME: ${{ secrets.ac_username }}
-          AC_PASSWORD: ${{ secrets.ac_password }}
-
-      - name: Delete old release assets
-        uses: mknejp/delete-release-assets@v1
-        with:
-          token: ${{ secrets.gh_token }}
-          tag: ${{ inputs.release_tag }}
-          fail-if-no-assets: false
-          assets: |
-            *${{ matrix.target }}.zip
-            *${{ matrix.target }}.tar.gz
-      - name: Publish
-        uses: softprops/action-gh-release@v1
-        with:
-          prerelease: true
-          tag_name: ${{ inputs.release_tag }}
-          files: |
-            ${{ env.RELEASE_NAME }}.zip
-            ${{ env.RELEASE_NAME }}.tar.gz
-        env:
-          GITHUB_TOKEN: ${{ secrets.gh_token }}
@@ -1,58 +1,110 @@
 name: Build
 on:
  workflow_dispatch:
+  pull_request:
  push:
    branches:
      - main
 jobs:
-  calculate_version:
-    name: Calculate version information
-    runs-on: ubuntu-latest
+  build_and_test:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ windows-latest, ubuntu-latest, macos-latest ]
    steps:
      - name: Get the sources
        uses: actions/checkout@v2
+
+      - name: Setup .NET Core
+        uses: actions/setup-dotnet@v1
+        with:
+          dotnet-version: 6.0.x
+
+      - name: Clean
+        run: dotnet clean --configuration Release && dotnet nuget locals all --clear
+
+      - name: Install dependencies
+        run: dotnet restore
+
+      - name: Build
+        run: dotnet build --configuration Release --no-restore
+
+      - name: Test
+        run: dotnet test --no-restore --verbosity normal
+  build_and_push:
+    name: Build & Publish to Docker Hub
+    needs: build_and_test
+    runs-on: ubuntu-latest
+    if: github.event_name == 'push' && !contains(github.event.head_commit.message, '[no docker]')
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
        with:
          fetch-depth: 0
-      - name: Extract Docker Tag
+
+      - name: Extract Git Tag
        shell: bash
        run: |
          tag=$(git describe --tags --abbrev=0)
          tag2="${tag:1}"
          short=$(git rev-parse --short HEAD)
-          final="${tag2/beta/$short}"
+          final="${tag2/alpha/$short}"
          echo "GIT_TAG=${final}" >> $GITHUB_ENV
-      - name: Extract Artifacts Version
-        shell: bash
-        run: |
-          tag=$(git describe --tags --abbrev=0)
-          short=$(git rev-parse --short HEAD)
-          final="${tag/beta/$short}"
-          echo "ARTIFACTS_VERSION=${final}" >> $GITHUB_ENV
-          echo "INFO_VERSION=${tag:1}" >> $GITHUB_ENV
-    outputs:
-      git_tag: ${{ env.GIT_TAG }}
-      artifacts_version: ${{ env.ARTIFACTS_VERSION }}
-      info_version: ${{ env.INFO_VERSION }}
-  build_and_upload:
-    uses: jasongdove/ersatztv/.github/workflows/artifacts.yml@main
-    needs: calculate_version
-    with:
-      release_tag: develop
-      release_version: ${{ needs.calculate_version.outputs.artifacts_version }}
-      info_version: ${{ needs.calculate_version.outputs.info_version }}
-    secrets:
-      apple_developer_certificate_p12_base64: ${{ secrets.APPLE_DEVELOPER_CERTIFICATE_P12_BASE64 }}
-      apple_developer_certificate_password: ${{ secrets.APPLE_DEVELOPER_CERTIFICATE_PASSWORD }}
-      ac_username: ${{ secrets.AC_USERNAME }}
-      ac_password: ${{ secrets.AC_PASSWORD }}
-      gh_token: ${{ secrets.GITHUB_TOKEN }}
-  build_and_push:
-    uses: jasongdove/ersatztv/.github/workflows/docker.yml@main
-    needs: calculate_version
-    with:
-      base_version: develop
-      info_version: ${{ needs.calculate_version.outputs.git_tag }}
-      tag_version: ${{ github.sha }}
-    secrets:
-      docker_hub_username: ${{ secrets.DOCKER_HUB_USERNAME }}
-      docker_hub_access_token: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}
+
+      - name: Set up Docker Buildx Base
+        uses: docker/setup-buildx-action@v1
+        id: builder-base
+
+      - name: Set up Docker Buildx NVIDIA
+        uses: docker/setup-buildx-action@v1
+        id: builder-nvidia
+
+      - name: Set up Docker Buildx VAAPI
+        uses: docker/setup-buildx-action@v1
+        id: builder-vaapi
+
+      - name: Login to DockerHub
+        uses: docker/login-action@v1
+        with:
+          username: ${{ secrets.DOCKER_HUB_USERNAME }}
+          password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}
+
+      - name: Build and push base
+        uses: docker/build-push-action@v2
+        with:
+          builder: ${{ steps.builder-base.outputs.name }}
+          context: .
+          file: ./docker/Dockerfile
+          push: true
+          build-args: |
+            INFO_VERSION=${{ env.GIT_TAG }}-docker
+          tags: |
+            jasongdove/ersatztv:develop
+            jasongdove/ersatztv:${{ github.sha }}
+
+      - name: Build and push nvidia
+        uses: docker/build-push-action@v2
+        with:
+          builder: ${{ steps.builder-nvidia.outputs.name }}
+          context: .
+          file: ./docker/nvidia/Dockerfile
+          push: true
+          build-args: |
+            INFO_VERSION=${{ env.GIT_TAG }}-docker-nvidia
+          tags: |
+            jasongdove/ersatztv:develop-nvidia
+            jasongdove/ersatztv:${{ github.sha }}-nvidia
+
+      - name: Build and push vaapi
+        uses: docker/build-push-action@v2
+        with:
+          builder: ${{ steps.builder-vaapi.outputs.name }}
+          context: .
+          file: ./docker/vaapi/Dockerfile
+          push: true
+          build-args: |
+            INFO_VERSION=${{ env.GIT_TAG }}-docker-vaapi
+          tags: |
+            jasongdove/ersatztv:develop-vaapi
+            jasongdove/ersatztv:${{ github.sha }}-vaapi
@@ -1,88 +0,0 @@
-name: Build & Publish to Docker Hub
-on:
-  workflow_call:
-    inputs:
-      base_version:
-        description: 'Base version (latest or develop)'
-        required: true
-        type: string
-      info_version:
-        description: 'Informational version number (e.g. 0.3.7-alpha)'
-        required: true
-        type: string
-      tag_version:
-        description: 'Docker tag version (e.g. v0.3.7)'
-        required: true
-        type: string
-    secrets:
-      docker_hub_username:
-        required: true
-      docker_hub_access_token:
-        required: true
-jobs:
-  build_and_push:
-    name: Build & Publish
-    runs-on: ubuntu-latest
-    if: contains(github.event.head_commit.message, '[no build]') == false
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-        with:
-          fetch-depth: 0
-
-      - name: Set up Docker Buildx Base
-        uses: docker/setup-buildx-action@v1
-        id: builder-base
-
-      - name: Set up Docker Buildx NVIDIA
-        uses: docker/setup-buildx-action@v1
-        id: builder-nvidia
-
-      - name: Set up Docker Buildx VAAPI
-        uses: docker/setup-buildx-action@v1
-        id: builder-vaapi
-
-      - name: Login to DockerHub
-        uses: docker/login-action@v1
-        with:
-          username: ${{ secrets.docker_hub_username }}
-          password: ${{ secrets.docker_hub_access_token }}
-
-      - name: Build and push base
-        uses: docker/build-push-action@v2
-        with:
-          builder: ${{ steps.builder-base.outputs.name }}
-          context: .
-          file: ./docker/Dockerfile
-          push: true
-          build-args: |
-            INFO_VERSION=${{ inputs.info_version }}-docker
-          tags: |
-            jasongdove/ersatztv:${{ inputs.base_version }}
-            jasongdove/ersatztv:${{ inputs.tag_version }}
-
-      - name: Build and push nvidia
-        uses: docker/build-push-action@v2
-        with:
-          builder: ${{ steps.builder-nvidia.outputs.name }}
-          context: .
-          file: ./docker/nvidia/Dockerfile
-          push: true
-          build-args: |
-            INFO_VERSION=${{ inputs.info_version }}-docker-nvidia
-          tags: |
-            jasongdove/ersatztv:${{ inputs.base_version }}-nvidia
-            jasongdove/ersatztv:${{ inputs.tag_version }}-nvidia
-
-      - name: Build and push vaapi
-        uses: docker/build-push-action@v2
-        with:
-          builder: ${{ steps.builder-vaapi.outputs.name }}
-          context: .
-          file: ./docker/vaapi/Dockerfile
-          push: true
-          build-args: |
-            INFO_VERSION=${{ inputs.info_version }}-docker-vaapi
-          tags: |
-            jasongdove/ersatztv:${{ inputs.base_version }}-vaapi
-            jasongdove/ersatztv:${{ inputs.tag_version }}-vaapi
@@ -3,13 +3,14 @@ on:
  push:
    branches:
      - main
+
 jobs:
  build:
    name: Deploy docs
    runs-on: ubuntu-latest
    steps:
      - name: Checkout master
-        uses: actions/checkout@v2
+        uses: actions/checkout@v1

      - name: Deploy docs
        uses: mhausenblas/mkdocs-deploy-gh-pages@master
@@ -1,30 +0,0 @@
-name: Pull Request
-on:
-  pull_request:
-jobs:
-  build_and_test:
-    runs-on: ${{ matrix.os }}
-    strategy:
-      fail-fast: false
-      matrix:
-        os: [ windows-latest, ubuntu-latest, macos-latest ]
-    steps:
-      - name: Get the sources
-        uses: actions/checkout@v2
-
-      - name: Setup .NET Core
-        uses: actions/setup-dotnet@v1
-        with:
-          dotnet-version: 6.0.x
-
-      - name: Clean
-        run: dotnet clean --configuration Release && dotnet nuget locals all --clear
-
-      - name: Install dependencies
-        run: dotnet restore
-
-      - name: Build
-        run: dotnet build --configuration Release --no-restore
-
-      - name: Test
-        run: dotnet test --no-restore --verbosity normal
@@ -1,53 +1,145 @@
-name: Release
+name: Publish
 on:
  release:
    types: [ published ]
 jobs:
-  calculate_version:
-    name: Calculate version information
-    runs-on: ubuntu-latest
+  release:
+    name: Release
+    strategy:
+      matrix:
+        include:
+          - os: ubuntu-latest
+            kind: linux
+            target: linux-x64
+          - os: ubuntu-latest
+            kind: linux
+            target: linux-arm
+          - os: windows-latest
+            kind: windows
+            target: win-x64
+          - os: macos-latest
+            kind: macOS
+            target: osx-x64
+          - os: macos-latest
+            kind: macOS
+            target: osx-arm64
+    runs-on: ${{ matrix.os }}
    steps:
      - name: Get the sources
        uses: actions/checkout@v2
+
+      - name: Setup .NET Core
+        uses: actions/setup-dotnet@v1
+        with:
+          dotnet-version: 6.0.x
+
+      - name: Clean
+        run: dotnet clean --configuration Release && dotnet nuget locals all --clear
+
+      - name: Install dependencies
+        run: dotnet restore
+
+      - name: Build
+        shell: bash
+        run: |
+          # Define some variables for things we need
+          tag=$(git describe --tags --abbrev=0)
+          release_name="ErsatzTV-$tag-${{ matrix.target }}"
+
+          # Build everything
+          dotnet publish ErsatzTV/ErsatzTV.csproj --framework net6.0 --runtime "${{ matrix.target }}" -c Release -o "$release_name" /property:InformationalVersion="${tag:1}-${{ matrix.target }}" /property:EnableCompressionInSingleFile=true /property:PublishSingleFile=true --self-contained true
+
+          # Pack files
+          if [ "${{ matrix.target }}" == "win-x64" ]; then
+            7z a -tzip "${release_name}.zip" "./${release_name}/*"
+          elif [ "${{ matrix.target }}" == "linux-arm" ]; then
+            cp lib/linux-arm/* "$release_name/"
+            tar czvf "${release_name}.tar.gz" "$release_name"
+          else
+            tar czvf "${release_name}.tar.gz" "$release_name"
+          fi
+
+          # Delete output directory
+          rm -r "$release_name"
+
+      - name: Publish
+        uses: softprops/action-gh-release@v1
+        with:
+          prerelease: true
+          files: |
+            ErsatzTV*.zip
+            ErsatzTV*.tar.gz
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+  build_and_push:
+    name: Build & Publish to Docker Hub
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
        with:
          fetch-depth: 0
-      - name: Extract Docker Tag
+
+      - name: Extract Git Tag
        shell: bash
        run: |
          tag=$(git describe --tags --abbrev=0)
          echo "GIT_TAG=${tag:1}" >> $GITHUB_ENV
-          echo "DOCKER_TAG=${tag/-beta/}" >> $GITHUB_ENV
-      - name: Extract Artifacts Version
-        shell: bash
-        run: |
-          tag=$(git describe --tags --abbrev=0)
-          echo "ARTIFACTS_VERSION=${tag}" >> $GITHUB_ENV
-          echo "INFO_VERSION=${tag:1}" >> $GITHUB_ENV
-    outputs:
-      git_tag: ${{ env.GIT_TAG }}
-      docker_tag: ${{ env.DOCKER_TAG }}
-      artifacts_version: ${{ env.ARTIFACTS_VERSION }}
-      info_version: ${{ env.INFO_VERSION }}
-  build_and_upload:
-    uses: jasongdove/ersatztv/.github/workflows/artifacts.yml@main
-    needs: calculate_version
-    with:
-      release_tag: ${{ needs.calculate_version.outputs.artifacts_version }}
-      release_version: ${{ needs.calculate_version.outputs.artifacts_version }}
-      info_version: ${{ needs.calculate_version.outputs.info_version }}
-    secrets:
-      apple_developer_certificate_p12_base64: ${{ secrets.APPLE_DEVELOPER_CERTIFICATE_P12_BASE64 }}
-      apple_developer_certificate_password: ${{ secrets.APPLE_DEVELOPER_CERTIFICATE_PASSWORD }}
-      ac_username: ${{ secrets.AC_USERNAME }}
-      ac_password: ${{ secrets.AC_PASSWORD }}
-      gh_token: ${{ secrets.GITHUB_TOKEN }}
-  build_and_push:
-    uses: jasongdove/ersatztv/.github/workflows/docker.yml@main
-    needs: calculate_version
-    with:
-      base_version: latest
-      info_version: ${{ needs.calculate_version.outputs.git_tag }}
-      tag_version: ${{ needs.calculate_version.outputs.docker_tag }}
-    secrets:
-      docker_hub_username: ${{ secrets.DOCKER_HUB_USERNAME }}
-      docker_hub_access_token: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}
+          echo "DOCKER_TAG=${tag/-alpha/}" >> $GITHUB_ENV
+
+      - name: Set up Docker Buildx Base
+        uses: docker/setup-buildx-action@v1
+        id: builder-base
+
+      - name: Set up Docker Buildx NVIDIA
+        uses: docker/setup-buildx-action@v1
+        id: builder-nvidia
+
+      - name: Set up Docker Buildx VAAPI
+        uses: docker/setup-buildx-action@v1
+        id: builder-vaapi
+
+      - name: Login to DockerHub
+        uses: docker/login-action@v1
+        with:
+          username: ${{ secrets.DOCKER_HUB_USERNAME }}
+          password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}
+
+      - name: Build and push base
+        uses: docker/build-push-action@v2
+        with:
+          builder: ${{ steps.builder-base.outputs.name }}
+          context: .
+          file: ./docker/Dockerfile
+          push: true
+          build-args: |
+            INFO_VERSION=${{ env.GIT_TAG }}-docker
+          tags: |
+            jasongdove/ersatztv:latest
+            jasongdove/ersatztv:${{ env.DOCKER_TAG }}
+
+      - name: Build and push nvidia
+        uses: docker/build-push-action@v2
+        with:
+          builder: ${{ steps.builder-nvidia.outputs.name }}
+          context: .
+          file: ./docker/nvidia/Dockerfile
+          push: true
+          build-args: |
+            INFO_VERSION=${{ env.GIT_TAG }}-docker-nvidia
+          tags: |
+            jasongdove/ersatztv:latest-nvidia
+            jasongdove/ersatztv:${{ env.DOCKER_TAG }}-nvidia
+
+      - name: Build and push vaapi
+        uses: docker/build-push-action@v2
+        with:
+          builder: ${{ steps.builder-vaapi.outputs.name }}
+          context: .
+          file: ./docker/vaapi/Dockerfile
+          push: true
+          build-args: |
+            INFO_VERSION=${{ env.GIT_TAG }}-docker-vaapi
+          tags: |
+            jasongdove/ersatztv:latest-vaapi
+            jasongdove/ersatztv:${{ env.DOCKER_TAG }}-vaapi
@@ -1,22 +0,0 @@
-name: Lint VueJS Files on PR Request
-on:
-  pull_request:
-jobs:
-  vue-lint:
-    runs-on: ubuntu-latest
-    steps:
-      # Checkout the current repo
-      - name: Checkout current repository
-        uses: actions/checkout@v2
-      # Setup NodeJS version 14  
-      - name: Setup NodeJS V14.x.x
-        uses: actions/setup-node@v2
-        with:
-          node-version: '14'
-      # CD into the current client directory and lint and build the client
-      - name: Lint and Build the client  
-        run: |
-          cd ./ErsatzTV/client-app/
-          npm ci --no-optional
-          npm run lint
-          npm run build --if-present
@@ -43,4 +43,3 @@ scripts/generate-api-sdk/swagger.json

 docker-compose.override.yml

-ErsatzTV/wwwroot/v2/
@@ -1,3 +0,0 @@
-[submodule "ErsatzTV-macOS"]
-	path = ErsatzTV-macOS
-	url = git@github.com:jasongdove/ErsatzTV-macOS.git
@@ -5,270 +5,6 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).

 ## [Unreleased]

-## [0.5.2-beta] - 2022-04-22
-### Fixed
- Fix unlocking libraries when scanning fails for any reason
- Fix software overlay of actual size watermark
-
-### Added
- Add support for burning in embedded and external text subtitles
-  - **This requires a one-time full library scan, which may take a long time with large libraries.**
- Sync Plex, Jellyfin and Emby collections as tags on movies, shows, seasons and episodes
-  - This allows smart collections that use queries like `tag:"Collection Name"`
-  - Note that Emby has an outstanding collections bug that prevents updates when removing items from a collection
- Sync Plex labels as tags on movies and shows
-  - This allows smart collections that use queries like `tag:"Plex Label Name"`
- Add `Deep Scan` button for Plex libraries
-  - This scanning mode is *slow* but is required to detect some changes like labels
-
-### Changed
- Improve the speed and change detection of the Plex library scanners
-
-## [0.5.1-beta] - 2022-04-17
-### Fixed
- Fix subtitles edge case with NVENC
- Only select picture subtitles (text subtitles are not yet supported)
-  - Supported picture subtitles are `hdmv_pgs_subtitle` and `dvd_subtitle`
- Fix subtitles using software encoders, videotoolbox, VAAPI
- Fix setting VAAPI driver name
- Fix ffmpeg troubleshooting reports
- Fix bug where filler would behave as if it were configured to pad even though a different mode was selected
- Fix bug where mid-roll count filler would skip scheduling the final chapter in an episode 
-
-### Added
- Add `Empty Trash` button to `Trash` page
-
-## [0.5.0-beta] - 2022-04-13
-### Fixed
- Fix `HLS Segmenter` bug where it would drift off of the schedule if a playout was changed while the segmenter was running
- Ensure clients that use HDHomeRun emulation (like Plex) always get an `MPEG-TS` stream, regardless of the configured streaming mode
- Fix scheduling bug that caused some days to be skipped when fixed start times were used with fallback filler
-
-### Added
- Add `Preferred Subtitle Language` and `Subtitle Mode` to channel settings
-  - `Preferred Subtitle Language` will filter all subtitle streams based on language
-  - `Subtitle Mode` will further filter subtitle streams based on attributes (forced, default)
-  - If picture-based subtitles are found after filtering, they will be burned into the video stream
- Detect non-zero ffmpeg exit code from `HLS Segmenter` and `MPEG-TS`, log error output and display error output on stream
- Add `Watermark` setting to schedule items; this allows override the channel watermark. Watermark priority is:
-  - Schedule Item
-  - Channel
-  - Global
-
-### Changed
- Remove legacy transcoder logic option; all channels will use the new transcoder logic
- Renamed channel setting `Preferred Language` to `Preferred Audio Language`
- Reworked playout build logic to maintain collection progress in some scenarios. There are now three build modes:
-  - `Continue` - add new items to the end of an existing playout
-    - This mode is used when playouts are automatically extended in the background
-  - `Refresh` - this mode will try to maintain collection progress while rebuilding the entire playout
-    - This mode is used when a schedule is updated, or when collection modifications trigger a playout rebuild
-  - `Reset` - this mode will rebuild the entire playout and will NOT maintain progress
-    - This mode is only used when the `Reset Playout` button is clicked on the Playouts page
-  - **This requires rebuilding all playouts, which will happen on startup after upgrading**
- Use ffmpeg to resize images; this should help reduce ErsatzTV's memory use
- Use ffprobe to check for animated logos and watermarks; this should help reduce ErsatzTV's memory use
- Allow two decimals in channel numbers (e.g. `5.73`)
-
-## [0.4.5-alpha] - 2022-03-29
-### Fixed
- Fix streaming mode inconsistencies when `mode` parameter is unspecified
- Fix startup on Windows 7
-
-### Added
- Add option to automatically deinterlace video when transcoding
-  - Previously, this was always enabled; the purpose of the option is to allow disabling any deinterlace filters
-  - Note that there is no performance gain to disabling the option with progressive content; filters are only ever applied to interlaced content
-
-### Changed
- Change FFmpeg Profile video codec and audio codec text fields to select fields
-  - The appropriate video encoder will be determined based on the video format and hardware acceleration selections
- Remove FFmpeg Profile `Transcode`, `Normalize Video` and `Normalize Audio` settings
-  - All content will be transcoded and have audio and video normalized
-  - The only exception to this rule is `HLS Direct` streaming mode, which directly copies video and audio streams
- Always try to connect to Plex at `http://localhost:32400` even if that address isn't advertised by the Plex API
-  - If Plex isn't on the localhost, all other addresses will be checked as with previous releases
-
-## [0.4.4-alpha] - 2022-03-10
-### Fixed
- Fix `HLS Direct` streaming mode
- Fix bug with `HLS Segmenter` (and `MPEG-TS`) on Windows that caused errors at program boundaries
-
-### Added
- Perform additional duration analysis on files with missing duration metadata
- Add `nouveau` VAAPI driver option
-
-## [0.4.3-alpha] - 2022-03-05
-### Fixed
- Fix song sorting with `Chronological` and `Shuffle In Order` playback orders
- Fix watermark on scaled and/or padded video with NVIDIA acceleration
- Fix playback of interlaced mpeg2video content with NVIDIA acceleration
- Fix playback of all interlaced content with QSV acceleration
- Fix adding songs to collections from search results page
- Fix bug scheduling mid-roll filler with content that contains one chapter
-  - No mid-roll filler will be inserted for content with zero or one chapters
- Fix thread sync bug with `HLS Segmenter` (and `MPEG-TS`) streaming modes
- Fix path replacement bug when media server path is left blank
-
-### Added
- Add automated error reporting via Bugsnag
-  - This can be disabled by editing the `appsettings.json` file or by setting the `Bugsnag:Enable` environment variable to `false`
- Add `album_artist` to song metadata and to search index
- Display `album_artist` on some song videos when it's different than the `artist`
-
-### Changed
- Framerate normalization will never normalize framerate below 24fps
-  - Instead, content with a lower framerate will be normalized up to 24fps
- `Shuffle In Order` will group songs by album artist instead of by track artist
-
-## [0.4.2-alpha] - 2022-02-26
-### Fixed
- Add improved but experimental transcoder logic, which can be toggled on and off in `Settings`
- Fix `HLS Segmenter` bug when source video packet contains no duration (`N/A`)
- Fix green line at the bottom of some content scaled using QSV acceleration
-
-### Added
- Add configurable channel group (M3U) and categories (XMLTV)
- Add `Shuffle Schedule Items` option to schedule configuration
-  - When this is enabled, schedule items will be shuffled rather than looped in order
-  - **To support this, all playouts will be rebuilt (one time) after upgrading to this version**
-
-### Changed
- Disable framerate normalization by default and on all ffmpeg profiles
-  - If framerate normalization is desired (not typically needed), it can be re-enabled manually
- Show watermarks over songs
- Hide unused local libraries
-
-## [0.4.1-alpha] - 2022-02-10
-### Fixed
- Normalize smart quotes in search queries as they are unsupported by the search library
- Fix incorrect watermark time calculations caused by working ahead in `HLS Segmenter`
- Fix ui crash adding empty path to local library
- Fix ui crash loading collection editor
- Properly flag items as `File Not Found` when local library path (folder) is missing from disk
- Fix playback bug with unknown pixel format
- Fix playback of interlaced mpeg2video on NVIDIA, VAAPI
-
-### Added
- Include `Series` category tag for all episodes in XMLTV
- Include movie, episode (show), music video (artist) genres as `category` tags in XMLTV
- Add framerate normalization to `HLS Segmenter` and `MPEG-TS` streaming modes
- Add `HLS Segmenter Initial Segment Count` setting to allow segmenter to work ahead before allowing client playback
-
-### Changed
- Intermittent watermarks will now fade in and out
- Show collection name in some playout build error messages
- Use hardware-accelerated filter for watermarks on NVIDIA
- Use hardware-accelerated deinterlace for some content on NVIDIA
-
-## [0.4.0-alpha] - 2022-01-29
-### Fixed
- Fix m3u `mode` query param to properly override streaming mode for all channels
-  - `segmenter` for `HLS Segmenter`
-  - `hls-direct` for `HLS Direct`
-  - `ts` for `MPEG-TS`
-  - `ts-legacy` for `MPEG-TS (Legacy)`
-  - omitting the `mode` parameter returns each channel as configured
- Link `File Not Found` health check to `Trash` page to allow deletion
- Fix `HLS Segmenter` streaming mode with multiple ffmpeg-based clients
-  - Jellyfin (web) and TiviMate (Android) were specifically tested
-
-### Added
- Hide console window on macOS and Windows; tray menu can be used to access UI, logs and to stop the app
- Also write logs to text files in the `logs` config subfolder
- Add `added_date` to search index
-    - This requires rebuilding the search index and search results may be empty or incomplete until the rebuild is complete
- Add `added_inthelast`, `added_notinthelast` search field for relative added date queries
-    - Syntax is a number and a unit (days, weeks, months, years) like `1 week` or `2 years`
-
-## [0.3.8-alpha] - 2022-01-23
-### Fixed
- Fix issue preventing some versions of ffmpeg (usually 4.4.x) from streaming MPEG-TS (Legacy) channels at all
-  - The issue appears to be caused by using a thread count other than `1`
-  - Thread count is now forced to `1` for all streaming modes other than HLS Segmenter
- Fix bug with HLS Segmenter in cultures where `.` is a group/thousands separator
- Fix search results page crashing with some media kinds
- Always use MPEG-TS or MPEG-TS (Legacy) streaming mode with HDHR (Plex)
-  - Other configured modes will fall back to MPEG-TS when accessed by Plex
-
-### Changed
- Upgrade ffmpeg from 4.4 to 5.0 in all docker images
-    - Upgrading from 4.4 to 5.0 is recommended for all installations
-
-## [0.3.7-alpha] - 2022-01-17
-### Fixed
- Fix local folder scanners to properly detect removed/re-added folders with unchanged contents
- Fix double-click startup on mac
- Fix trakt list sync when show does not contain a year
- Properly unlock libraries when a scan is unable to be performed because ffmpeg or ffprobe have not been found
-
-### Added
- Add trash system for local libraries to maintain collection and schedule integrity through media share outages
-  - When items are missing from disk, they will be flagged and present in the `Media` > `Trash` page
-  - The trash page can be used to permanently remove missing items from the database
-  - When items reappear at the expected location on disk, they will be unflagged and removed from the trash
- Add basic Mac hardware acceleration using VideoToolbox
-
-### Changed
- Local libraries only: when items are missing from disk, they will be added to the trash and no longer removed from collections, etc.
- Show song thumbnail in song list
-
-## [0.3.6-alpha] - 2022-01-10
-### Fixed
- Properly index `minutes` field when adding new items during scan (vs when rebuilding index)
- Fix some nvenc edge cases where only padding is needed for normalization
- Properly overwrite environment variables for ffmpeg processes (`LIBVA_DRIVER_NAME`, `FFREPORT`)
-
-### Added
- Add music video `artist` to search index
-  - This requires rebuilding the search index and search results may be empty or incomplete until the rebuild is complete
-
-### Changed
- Remove `HLS Hybrid` streaming mode; all channels have been reconfigured to use the superior `HLS Segmenter` streaming mode
- Update `MPEG-TS` streaming mode to internally use the HLS segmenter
-  - This improves compatibility with many clients and also improves performance at program boundaries
- Renamed existing `MPEG-TS` mode as `MPEG-TS (Legacy)`
-  - This mode will be removed in a future release
-
-## [0.3.5-alpha] - 2022-01-05
-### Fixed
- Fix bundled ffmpeg version in base docker image (NOT nvidia or vaapi) which prevented playback since v0.3.0-alpha
- Use software decoding for mpeg4 content when VAAPI acceleration is enabled
- Fix hardware acceleration health check to recognize QSV on non-Windows platforms
-
-### Changed
- Treat `setsar` as a hardware filter, avoiding unneeded `hwdownload` and `hwupload` steps when padding isn't required
-
-## [0.3.4-alpha] - 2021-12-21
-### Fixed
- Fix other video and song scanners to include videos contained directly in top-level folders that are added to a library
- Allow saving ffmpeg troubleshooting reports on Windows
-
-## [0.3.3-alpha] - 2021-12-12
-### Fixed
- Fix bug with saving multiple blurhash versions for cover art; all cover art will be automatically rescanned
- Fix song detail margin when no cover art exists and no watermark exists
- Fix synchronizing virtual shows and seasons from Jellyfin
- Properly sort channels in M3U
-
-### Changed
- Use blurhash of ErsatzTV colors instead of solid colors for default song backgrounds
- Use select control instead of autocomplete control in many places
-    - The autocomplete control is not intuitive to use and has focus bugs
-
-## [0.3.2-alpha] - 2021-12-03
-### Fixed
- Fix artwork upload on Windows
- Fix unicode song metadata on Windows
- Fix unicode console output on Windows
- Fix TV Show NFO metadata processing when `year` is missing
- Fix song detail outline to help legibility on white backgrounds
- Optimize song artwork scanning to prevent re-processing album artwork for each song
-
-### Changed
- Use custom log database backend which should be more portable (i.e. work in osx-arm64)
- Use cover art blurhashes for song backgrounds instead of solid colors or box blur
-
 ## [0.3.1-alpha] - 2021-11-30
 ### Fixed
 - Fix song page links in UI
@@ -1101,23 +837,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Initial release to facilitate testing outside of Docker.


-[Unreleased]: https://github.com/jasongdove/ErsatzTV/compare/v0.5.2-beta...HEAD
-[0.5.2-beta]: https://github.com/jasongdove/ErsatzTV/compare/v0.5.1-beta...v0.5.2-beta
-[0.5.1-beta]: https://github.com/jasongdove/ErsatzTV/compare/v0.5.0-beta...v0.5.1-beta
-[0.5.0-beta]: https://github.com/jasongdove/ErsatzTV/compare/v0.4.5-alpha...v0.5.0-beta
-[0.4.5-alpha]: https://github.com/jasongdove/ErsatzTV/compare/v0.4.4-alpha...v0.4.5-alpha
-[0.4.4-alpha]: https://github.com/jasongdove/ErsatzTV/compare/v0.4.3-alpha...v0.4.4-alpha
-[0.4.3-alpha]: https://github.com/jasongdove/ErsatzTV/compare/v0.4.2-alpha...v0.4.3-alpha
-[0.4.2-alpha]: https://github.com/jasongdove/ErsatzTV/compare/v0.4.1-alpha...v0.4.2-alpha
-[0.4.1-alpha]: https://github.com/jasongdove/ErsatzTV/compare/v0.4.0-alpha...v0.4.1-alpha
-[0.4.0-alpha]: https://github.com/jasongdove/ErsatzTV/compare/v0.3.8-alpha...v0.4.0-alpha
-[0.3.8-alpha]: https://github.com/jasongdove/ErsatzTV/compare/v0.3.7-alpha...v0.3.8-alpha
-[0.3.7-alpha]: https://github.com/jasongdove/ErsatzTV/compare/v0.3.6-alpha...v0.3.7-alpha
-[0.3.6-alpha]: https://github.com/jasongdove/ErsatzTV/compare/v0.3.5-alpha...v0.3.6-alpha
-[0.3.5-alpha]: https://github.com/jasongdove/ErsatzTV/compare/v0.3.4-alpha...v0.3.5-alpha
-[0.3.4-alpha]: https://github.com/jasongdove/ErsatzTV/compare/v0.3.3-alpha...v0.3.4-alpha
-[0.3.3-alpha]: https://github.com/jasongdove/ErsatzTV/compare/v0.3.2-alpha...v0.3.3-alpha
-[0.3.2-alpha]: https://github.com/jasongdove/ErsatzTV/compare/v0.3.1-alpha...v0.3.2-alpha
+[Unreleased]: https://github.com/jasongdove/ErsatzTV/compare/v0.3.1-alpha...HEAD
 [0.3.1-alpha]: https://github.com/jasongdove/ErsatzTV/compare/v0.3.0-alpha...v0.3.1-alpha
 [0.3.0-alpha]: https://github.com/jasongdove/ErsatzTV/compare/v0.2.5-alpha...v0.3.0-alpha
 [0.2.5-alpha]: https://github.com/jasongdove/ErsatzTV/compare/v0.2.4-alpha...v0.2.5-alpha
@@ -1,33 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-    <PropertyGroup>
-        <OutputType>WinExe</OutputType>
-        <TargetFramework>net6.0-windows</TargetFramework>
-        <RootNamespace>ErsatzTV_Windows</RootNamespace>
-        <Nullable>enable</Nullable>
-        <UseWindowsForms>true</UseWindowsForms>
-        <ImplicitUsings>enable</ImplicitUsings>
-        <ApplicationIcon>Ersatztv.ico</ApplicationIcon>
-    </PropertyGroup>
-
-    <ItemGroup>
-      <Content Include="Ersatztv.ico">
-        <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-      </Content>
-    </ItemGroup>
-
-    <ItemGroup>
-      <PackageReference Include="CliWrap" Version="3.4.3" />
-    </ItemGroup>
-
-    <ItemGroup>
-      <ProjectReference Include="..\ErsatzTV.Core\ErsatzTV.Core.csproj" />
-    </ItemGroup>
-
-    <ItemGroup>
-      <Compile Update="Program.cs">
-        <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-      </Compile>
-    </ItemGroup>
-
-</Project>
@@ -1,14 +0,0 @@
-namespace ErsatzTV_Windows;
-
-public static class Program
-{
-    /// <summary>
-    ///  The main entry point for the application.
-    /// </summary>
-    [STAThread]
-    public static void Main()
-    {
-        ApplicationConfiguration.Initialize();
-        Application.Run(new TrayApplicationContext());
-    }
-}
@@ -1,81 +0,0 @@
-using ErsatzTV.Core;
-using System.Diagnostics;
-using CliWrap;
-
-namespace ErsatzTV_Windows;
-
-public class TrayApplicationContext : ApplicationContext
-{
-    private readonly NotifyIcon _trayIcon;
-    private readonly CancellationTokenSource _tokenSource;
-
-    public TrayApplicationContext()
-    {
-        _trayIcon = new NotifyIcon
-        {
-            Icon = new Icon("./Ersatztv.ico"),
-            ContextMenuStrip = new ContextMenuStrip(),
-            Visible = true
-        };
-
-        _tokenSource = new CancellationTokenSource();
-
-        AddMenuItem("Launch Web UI", LaunchWebUI);
-        AddMenuItem("Show Logs", ShowLogs);
-        _trayIcon.ContextMenuStrip.Items.Add(new ToolStripSeparator());
-        AddMenuItem("Exit", Exit);
-
-        string folder = AppContext.BaseDirectory;
-        string exe = Path.Combine(folder, "ErsatzTV.exe");
-
-        if (File.Exists(exe))
-        {
-
-            Cli.Wrap(exe)
-                .WithWorkingDirectory(folder)
-                .WithValidation(CommandResultValidation.None)
-                .ExecuteAsync(_tokenSource.Token);
-        }
-    }
-
-    private void AddMenuItem(string name, EventHandler action)
-    {
-        var item = new ToolStripMenuItem(name);
-        item.Click += action;
-        _trayIcon.ContextMenuStrip.Items.Add(item);
-    }
-
-    private void LaunchWebUI(object? sender, EventArgs e)
-    {
-        var process = new Process();
-        process.StartInfo.UseShellExecute = true;
-        process.StartInfo.FileName = "http://localhost:8409";
-        process.Start();
-    }
-
-    private void ShowLogs(object? sender, EventArgs e)
-    {
-        if (!Directory.Exists(FileSystemLayout.LogsFolder))
-        {
-            Directory.CreateDirectory(FileSystemLayout.LogsFolder);
-        }
-
-        var process = new Process();
-        process.StartInfo.UseShellExecute = true;
-        process.StartInfo.FileName = FileSystemLayout.LogsFolder;
-        process.Start();
-    }
-
-    protected override void Dispose(bool disposing)
-    {
-        _tokenSource?.Cancel();
-        base.Dispose(disposing);
-    }
-
-    private void Exit(object? sender, EventArgs e)
-    {
-        // Hide tray icon, otherwise it will remain shown until user mouses over it
-        _trayIcon.Visible = false;
-        Application.Exit();
-    }
-}
@@ -1,14 +1,16 @@
-using System.Globalization;
+using System.Collections.Generic;
+using System.Globalization;

-namespace ErsatzTV.Application.Artists;
-
-public record ArtistViewModel(
-    string Name,
-    string Disambiguation,
-    string Biography,
-    string Thumbnail,
-    string FanArt,
-    List<string> Genres,
-    List<string> Styles,
-    List<string> Moods,
-    List<CultureInfo> Languages);
+namespace ErsatzTV.Application.Artists
+{
+    public record ArtistViewModel(
+        string Name,
+        string Disambiguation,
+        string Biography,
+        string Thumbnail,
+        string FanArt,
+        List<string> Genres,
+        List<string> Styles,
+        List<string> Moods,
+        List<CultureInfo> Languages);
+}
@@ -1,40 +1,46 @@
-using System.Globalization;
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
 using ErsatzTV.Core.Domain;
+using LanguageExt;
+using static LanguageExt.Prelude;

-namespace ErsatzTV.Application.Artists;
-
-internal static class Mapper
+namespace ErsatzTV.Application.Artists
 {
-    internal static ArtistViewModel ProjectToViewModel(Artist artist, List<string> languages)
+    internal static class Mapper
    {
-        ArtistMetadata metadata = Optional(artist.ArtistMetadata).Flatten().Head();
-        return new ArtistViewModel(
-            metadata.Title,
-            metadata.Disambiguation,
-            metadata.Biography,
-            Artwork(metadata, ArtworkKind.Thumbnail),
-            Artwork(metadata, ArtworkKind.FanArt),
-            metadata.Genres.Map(g => g.Name).ToList(),
-            metadata.Styles.Map(s => s.Name).ToList(),
-            metadata.Moods.Map(m => m.Name).ToList(),
-            LanguagesForArtist(languages));
-    }
+        internal static ArtistViewModel ProjectToViewModel(Artist artist, List<string> languages)
+        {
+            ArtistMetadata metadata = Optional(artist.ArtistMetadata).Flatten().Head();
+            return new ArtistViewModel(
+                metadata.Title,
+                metadata.Disambiguation,
+                metadata.Biography,
+                Artwork(metadata, ArtworkKind.Thumbnail),
+                Artwork(metadata, ArtworkKind.FanArt),
+                metadata.Genres.Map(g => g.Name).ToList(),
+                metadata.Styles.Map(s => s.Name).ToList(),
+                metadata.Moods.Map(m => m.Name).ToList(),
+                LanguagesForArtist(languages));
+        }

-    private static string Artwork(Metadata metadata, ArtworkKind artworkKind) =>
-        Optional(metadata.Artwork.FirstOrDefault(a => a.ArtworkKind == artworkKind))
-            .Match(a => a.Path, string.Empty);
+        private static string Artwork(Metadata metadata, ArtworkKind artworkKind) =>
+            Optional(metadata.Artwork.FirstOrDefault(a => a.ArtworkKind == artworkKind))
+                .Match(a => a.Path, string.Empty);

-    private static List<CultureInfo> LanguagesForArtist(List<string> languages)
-    {
-        CultureInfo[] allCultures = CultureInfo.GetCultures(CultureTypes.NeutralCultures);
+        private static List<CultureInfo> LanguagesForArtist(List<string> languages)
+        {
+            CultureInfo[] allCultures = CultureInfo.GetCultures(CultureTypes.NeutralCultures);

-        return languages
-            .Distinct()
-            .Map(
-                lang => allCultures.Filter(
-                    ci => string.Equals(ci.ThreeLetterISOLanguageName, lang, StringComparison.OrdinalIgnoreCase)))
-            .Sequence()
-            .Flatten()
-            .ToList();
+            return languages
+                .Distinct()
+                .Map(
+                    lang => allCultures.Filter(
+                        ci => string.Equals(ci.ThreeLetterISOLanguageName, lang, StringComparison.OrdinalIgnoreCase)))
+                .Sequence()
+                .Flatten()
+                .ToList();
+        }
    }
 }
@@ -1,5 +1,8 @@
-using ErsatzTV.Application.MediaItems;
+using System.Collections.Generic;
+using ErsatzTV.Application.MediaItems;
+using MediatR;

-namespace ErsatzTV.Application.Artists;
-
-public record GetAllArtists : IRequest<List<NamedMediaItemViewModel>>;
+namespace ErsatzTV.Application.Artists.Queries
+{
+    public record GetAllArtists : IRequest<List<NamedMediaItemViewModel>>;
+}
@@ -1,22 +1,29 @@
-using ErsatzTV.Application.MediaItems;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using ErsatzTV.Application.MediaItems;
 using ErsatzTV.Core.Interfaces.Repositories;
+using LanguageExt;
+using MediatR;
 using static ErsatzTV.Application.MediaItems.Mapper;

-namespace ErsatzTV.Application.Artists;
-
-public class GetAllArtistsHandler : IRequestHandler<GetAllArtists, List<NamedMediaItemViewModel>>
+namespace ErsatzTV.Application.Artists.Queries
 {
-    private readonly IArtistRepository _artistRepository;
+    public class GetAllArtistsHandler : IRequestHandler<GetAllArtists, List<NamedMediaItemViewModel>>
+    {
+        private readonly IArtistRepository _artistRepository;

-    public GetAllArtistsHandler(IArtistRepository artistRepository) => _artistRepository = artistRepository;
+        public GetAllArtistsHandler(IArtistRepository artistRepository) => _artistRepository = artistRepository;

-    public Task<List<NamedMediaItemViewModel>> Handle(
-        GetAllArtists request,
-        CancellationToken cancellationToken) =>
-        _artistRepository.GetAllArtists()
-            .Map(
-                list => list.Filter(
-                    a => !string.IsNullOrWhiteSpace(
-                        a.ArtistMetadata.HeadOrNone().Match(am => am.Title, () => string.Empty))))
-            .Map(list => list.Map(ProjectToViewModel).ToList());
+        public Task<List<NamedMediaItemViewModel>> Handle(
+            GetAllArtists request,
+            CancellationToken cancellationToken) =>
+            _artistRepository.GetAllArtists()
+                .Map(
+                    list => list.Filter(
+                        a => !string.IsNullOrWhiteSpace(
+                            a.ArtistMetadata.HeadOrNone().Match(am => am.Title, () => string.Empty))))
+                .Map(list => list.Map(ProjectToViewModel).ToList());
+    }
 }
@@ -1,3 +1,7 @@
-namespace ErsatzTV.Application.Artists;
+using LanguageExt;
+using MediatR;

-public record GetArtistById(int ArtistId) : IRequest<Option<ArtistViewModel>>;
+namespace ErsatzTV.Application.Artists.Queries
+{
+    public record GetArtistById(int ArtistId) : IRequest<Option<ArtistViewModel>>;
+}
@@ -1,32 +1,38 @@
-using ErsatzTV.Core.Domain;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+using ErsatzTV.Core.Domain;
 using ErsatzTV.Core.Interfaces.Repositories;
+using LanguageExt;
+using MediatR;
 using static ErsatzTV.Application.Artists.Mapper;

-namespace ErsatzTV.Application.Artists;
-
-public class GetArtistByIdHandler : IRequestHandler<GetArtistById, Option<ArtistViewModel>>
+namespace ErsatzTV.Application.Artists.Queries
 {
-    private readonly IArtistRepository _artistRepository;
-    private readonly ISearchRepository _searchRepository;
-
-    public GetArtistByIdHandler(IArtistRepository artistRepository, ISearchRepository searchRepository)
+    public class GetArtistByIdHandler : IRequestHandler<GetArtistById, Option<ArtistViewModel>>
    {
-        _artistRepository = artistRepository;
-        _searchRepository = searchRepository;
-    }
+        private readonly IArtistRepository _artistRepository;
+        private readonly ISearchRepository _searchRepository;

-    public async Task<Option<ArtistViewModel>> Handle(
-        GetArtistById request,
-        CancellationToken cancellationToken)
-    {
-        Option<Artist> maybeArtist = await _artistRepository.GetArtist(request.ArtistId);
-        return await maybeArtist.Match<Task<Option<ArtistViewModel>>>(
-            async artist =>
-            {
-                List<string> mediaCodes = await _searchRepository.GetLanguagesForArtist(artist);
-                List<string> languageCodes = await _searchRepository.GetAllLanguageCodes(mediaCodes);
-                return ProjectToViewModel(artist, languageCodes);
-            },
-            () => Task.FromResult(Option<ArtistViewModel>.None));
+        public GetArtistByIdHandler(IArtistRepository artistRepository, ISearchRepository searchRepository)
+        {
+            _artistRepository = artistRepository;
+            _searchRepository = searchRepository;
+        }
+
+        public async Task<Option<ArtistViewModel>> Handle(
+            GetArtistById request,
+            CancellationToken cancellationToken)
+        {
+            Option<Artist> maybeArtist = await _artistRepository.GetArtist(request.ArtistId);
+            return await maybeArtist.Match<Task<Option<ArtistViewModel>>>(
+                async artist =>
+                {
+                    List<string> mediaCodes = await _searchRepository.GetLanguagesForArtist(artist);
+                    List<string> languageCodes = await _searchRepository.GetAllLanguageCodes(mediaCodes);
+                    return ProjectToViewModel(artist, languageCodes);
+                },
+                () => Task.FromResult(Option<ArtistViewModel>.None));
+        }
    }
 }
@@ -1,19 +1,15 @@
 using ErsatzTV.Core.Domain;

-namespace ErsatzTV.Application.Channels;
-
-public record ChannelViewModel(
-    int Id,
-    string Number,
-    string Name,
-    string Group,
-    string Categories,
-    int FFmpegProfileId,
-    string Logo,
-    string PreferredAudioLanguageCode,
-    StreamingMode StreamingMode,
-    int? WatermarkId,
-    int? FallbackFillerId,
-    int PlayoutCount,
-    string PreferredSubtitleLanguageCode,
-    ChannelSubtitleMode SubtitleMode);
+namespace ErsatzTV.Application.Channels
+{
+    public record ChannelViewModel(
+        int Id,
+        string Number,
+        string Name,
+        int FFmpegProfileId,
+        string Logo,
+        string PreferredLanguageCode,
+        StreamingMode StreamingMode,
+        int? WatermarkId,
+        int? FallbackFillerId);
+}
@@ -1,19 +1,18 @@
 using ErsatzTV.Core;
 using ErsatzTV.Core.Domain;
+using LanguageExt;
+using MediatR;

-namespace ErsatzTV.Application.Channels;
-
-public record CreateChannel
-(
-    string Name,
-    string Number,
-    string Group,
-    string Categories,
-    int FFmpegProfileId,
-    string Logo,
-    string PreferredAudioLanguageCode,
-    StreamingMode StreamingMode,
-    int? WatermarkId,
-    int? FallbackFillerId,
-    string PreferredSubtitleLanguageCode,
-    ChannelSubtitleMode SubtitleMode) : IRequest<Either<BaseError, CreateChannelResult>>;
+namespace ErsatzTV.Application.Channels.Commands
+{
+    public record CreateChannel
+    (
+        string Name,
+        string Number,
+        int FFmpegProfileId,
+        string Logo,
+        string PreferredLanguageCode,
+        StreamingMode StreamingMode,
+        int? WatermarkId,
+        int? FallbackFillerId) : IRequest<Either<BaseError, CreateChannelResult>>;
+}
@@ -1,174 +1,162 @@
-using System.Globalization;
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
 using System.Text.RegularExpressions;
+using System.Threading;
+using System.Threading.Tasks;
 using ErsatzTV.Core;
 using ErsatzTV.Core.Domain;
 using ErsatzTV.Core.Domain.Filler;
 using ErsatzTV.Infrastructure.Data;
 using ErsatzTV.Infrastructure.Extensions;
+using LanguageExt;
+using MediatR;
 using Microsoft.EntityFrameworkCore;
+using static LanguageExt.Prelude;

-namespace ErsatzTV.Application.Channels;
-
-public class CreateChannelHandler : IRequestHandler<CreateChannel, Either<BaseError, CreateChannelResult>>
+namespace ErsatzTV.Application.Channels.Commands
 {
-    private readonly IDbContextFactory<TvContext> _dbContextFactory;
-
-    public CreateChannelHandler(IDbContextFactory<TvContext> dbContextFactory) => _dbContextFactory = dbContextFactory;
-
-    public async Task<Either<BaseError, CreateChannelResult>> Handle(
-        CreateChannel request,
-        CancellationToken cancellationToken)
+    public class CreateChannelHandler : IRequestHandler<CreateChannel, Either<BaseError, CreateChannelResult>>
    {
-        await using TvContext dbContext = await _dbContextFactory.CreateDbContextAsync(cancellationToken);
-        Validation<BaseError, Channel> validation = await Validate(dbContext, request);
-        return await LanguageExtensions.Apply(validation, c => PersistChannel(dbContext, c));
-    }
+        private readonly IDbContextFactory<TvContext> _dbContextFactory;

-    private static async Task<CreateChannelResult> PersistChannel(TvContext dbContext, Channel channel)
-    {
-        await dbContext.Channels.AddAsync(channel);
-        await dbContext.SaveChangesAsync();
-        return new CreateChannelResult(channel.Id);
-    }
+        public CreateChannelHandler(IDbContextFactory<TvContext> dbContextFactory) => _dbContextFactory = dbContextFactory;

-    private static async Task<Validation<BaseError, Channel>> Validate(TvContext dbContext, CreateChannel request) =>
-        (ValidateName(request), await ValidateNumber(dbContext, request),
-            await FFmpegProfileMustExist(dbContext, request),
-            ValidatePreferredAudioLanguage(request),
-            ValidatePreferredSubtitleLanguage(request),
-            await WatermarkMustExist(dbContext, request),
-            await FillerPresetMustExist(dbContext, request))
-        .Apply(
-            (
-                name,
-                number,
-                ffmpegProfileId,
-                preferredAudioLanguageCode,
-                preferredSubtitleLanguageCode,
-                watermarkId,
-                fillerPresetId) =>
-            {
-                var artwork = new List<Artwork>();
-                if (!string.IsNullOrWhiteSpace(request.Logo))
-                {
-                    artwork.Add(
-                        new Artwork
-                        {
-                            Path = request.Logo,
-                            ArtworkKind = ArtworkKind.Logo,
-                            DateAdded = DateTime.UtcNow,
-                            DateUpdated = DateTime.UtcNow
-                        });
-                }
-
-                var channel = new Channel(Guid.NewGuid())
-                {
-                    Name = name,
-                    Number = number,
-                    Group = request.Group,
-                    Categories = request.Categories,
-                    FFmpegProfileId = ffmpegProfileId,
-                    StreamingMode = request.StreamingMode,
-                    Artwork = artwork,
-                    PreferredAudioLanguageCode = preferredAudioLanguageCode,
-                    PreferredSubtitleLanguageCode = preferredSubtitleLanguageCode,
-                    SubtitleMode = request.SubtitleMode
-                };
-
-                foreach (int id in watermarkId)
-                {
-                    channel.WatermarkId = id;
-                }
-
-                foreach (int id in fillerPresetId)
-                {
-                    channel.FallbackFillerId = id;
-                }
-
-                return channel;
-            });
-
-    private static Validation<BaseError, string> ValidateName(CreateChannel createChannel) =>
-        createChannel.NotEmpty(c => c.Name)
-            .Bind(_ => createChannel.NotLongerThan(50)(c => c.Name));
-
-    private static Validation<BaseError, string> ValidatePreferredAudioLanguage(CreateChannel createChannel) =>
-        Optional(createChannel.PreferredAudioLanguageCode ?? string.Empty)
-            .Filter(
-                lc => string.IsNullOrWhiteSpace(lc) || CultureInfo.GetCultures(CultureTypes.NeutralCultures).Any(
-                    ci => string.Equals(ci.ThreeLetterISOLanguageName, lc, StringComparison.OrdinalIgnoreCase)))
-            .ToValidation<BaseError>("Preferred audio language code is invalid");
-
-    private static Validation<BaseError, string> ValidatePreferredSubtitleLanguage(CreateChannel createChannel) =>
-        Optional(createChannel.PreferredSubtitleLanguageCode ?? string.Empty)
-            .Filter(
-                lc => string.IsNullOrWhiteSpace(lc) || CultureInfo.GetCultures(CultureTypes.NeutralCultures).Any(
-                    ci => string.Equals(ci.ThreeLetterISOLanguageName, lc, StringComparison.OrdinalIgnoreCase)))
-            .ToValidation<BaseError>("Preferred subtitle language code is invalid");
-
-    private static async Task<Validation<BaseError, string>> ValidateNumber(
-        TvContext dbContext,
-        CreateChannel createChannel)
-    {
-        Option<Channel> maybeExistingChannel = await dbContext.Channels
-            .SelectOneAsync(c => c.Number, c => c.Number == createChannel.Number);
-        return maybeExistingChannel.Match<Validation<BaseError, string>>(
-            _ => BaseError.New("Channel number must be unique"),
-            () =>
-            {
-                if (Regex.IsMatch(createChannel.Number, Channel.NumberValidator))
-                {
-                    return createChannel.Number;
-                }
-
-                return BaseError.New("Invalid channel number; two decimals are allowed for subchannels");
-            });
-    }
-
-    private static Task<Validation<BaseError, int>> FFmpegProfileMustExist(
-        TvContext dbContext,
-        CreateChannel createChannel) =>
-        dbContext.FFmpegProfiles
-            .CountAsync(p => p.Id == createChannel.FFmpegProfileId)
-            .Map(Optional)
-            .Filter(c => c > 0)
-            .MapT(_ => createChannel.FFmpegProfileId)
-            .Map(o => o.ToValidation<BaseError>($"FFmpegProfile {createChannel.FFmpegProfileId} does not exist."));
-
-    private static async Task<Validation<BaseError, Option<int>>> WatermarkMustExist(
-        TvContext dbContext,
-        CreateChannel createChannel)
-    {
-        if (createChannel.WatermarkId is null)
+        public async Task<Either<BaseError, CreateChannelResult>> Handle(
+            CreateChannel request,
+            CancellationToken cancellationToken)
        {
-            return Option<int>.None;
+            await using TvContext dbContext = _dbContextFactory.CreateDbContext();
+            Validation<BaseError, Channel> validation = await Validate(dbContext, request);
+            return await validation.Apply(c => PersistChannel(dbContext, c));
        }

-        return await dbContext.ChannelWatermarks
-            .CountAsync(w => w.Id == createChannel.WatermarkId)
-            .Map(Optional)
-            .Filter(c => c > 0)
-            .MapT(_ => Optional(createChannel.WatermarkId))
-            .Map(o => o.ToValidation<BaseError>($"Watermark {createChannel.WatermarkId} does not exist."));
-    }
-
-    private static async Task<Validation<BaseError, Option<int>>> FillerPresetMustExist(
-        TvContext dbContext,
-        CreateChannel createChannel)
-    {
-        if (createChannel.FallbackFillerId is null)
+        private static async Task<CreateChannelResult> PersistChannel(TvContext dbContext, Channel channel)
        {
-            return Option<int>.None;
+            await dbContext.Channels.AddAsync(channel);
+            await dbContext.SaveChangesAsync();
+            return new CreateChannelResult(channel.Id);
        }

-        return await dbContext.FillerPresets
-            .Filter(fp => fp.FillerKind == FillerKind.Fallback)
-            .CountAsync(w => w.Id == createChannel.FallbackFillerId)
-            .Map(Optional)
-            .Filter(c => c > 0)
-            .MapT(_ => Optional(createChannel.FallbackFillerId))
-            .Map(
-                o => o.ToValidation<BaseError>(
-                    $"Fallback filler {createChannel.FallbackFillerId} does not exist."));
+        private static async Task<Validation<BaseError, Channel>> Validate(TvContext dbContext, CreateChannel request) =>
+            (ValidateName(request), await ValidateNumber(dbContext, request),
+                await FFmpegProfileMustExist(dbContext, request),
+                ValidatePreferredLanguage(request),
+                await WatermarkMustExist(dbContext, request),
+                await FillerPresetMustExist(dbContext, request))
+            .Apply(
+                (name, number, ffmpegProfileId, preferredLanguageCode, watermarkId, fillerPresetId) =>
+                {
+                    var artwork = new List<Artwork>();
+                    if (!string.IsNullOrWhiteSpace(request.Logo))
+                    {
+                        artwork.Add(
+                            new Artwork
+                            {
+                                Path = request.Logo,
+                                ArtworkKind = ArtworkKind.Logo,
+                                DateAdded = DateTime.UtcNow,
+                                DateUpdated = DateTime.UtcNow
+                            });
+                    }
+
+                    var channel = new Channel(Guid.NewGuid())
+                    {
+                        Name = name,
+                        Number = number,
+                        FFmpegProfileId = ffmpegProfileId,
+                        StreamingMode = request.StreamingMode,
+                        Artwork = artwork,
+                        PreferredLanguageCode = preferredLanguageCode
+                    };
+
+                    foreach (int id in watermarkId)
+                    {
+                        channel.WatermarkId = id;
+                    }
+
+                    foreach (int id in fillerPresetId)
+                    {
+                        channel.FallbackFillerId = id;
+                    }
+
+                    return channel;
+                });
+
+        private static Validation<BaseError, string> ValidateName(CreateChannel createChannel) =>
+            createChannel.NotEmpty(c => c.Name)
+                .Bind(_ => createChannel.NotLongerThan(50)(c => c.Name));
+
+        private static Validation<BaseError, string> ValidatePreferredLanguage(CreateChannel createChannel) =>
+            Optional(createChannel.PreferredLanguageCode ?? string.Empty)
+                .Filter(
+                    lc => string.IsNullOrWhiteSpace(lc) || CultureInfo.GetCultures(CultureTypes.NeutralCultures).Any(
+                        ci => string.Equals(ci.ThreeLetterISOLanguageName, lc, StringComparison.OrdinalIgnoreCase)))
+                .ToValidation<BaseError>("Preferred language code is invalid");
+
+        private static async Task<Validation<BaseError, string>> ValidateNumber(TvContext dbContext, CreateChannel createChannel)
+        {
+            Option<Channel> maybeExistingChannel = await dbContext.Channels
+                .SelectOneAsync(c => c.Number, c => c.Number == createChannel.Number);
+            return maybeExistingChannel.Match<Validation<BaseError, string>>(
+                _ => BaseError.New("Channel number must be unique"),
+                () =>
+                {
+                    if (Regex.IsMatch(createChannel.Number, Channel.NumberValidator))
+                    {
+                        return createChannel.Number;
+                    }
+
+                    return BaseError.New("Invalid channel number; one decimal is allowed for subchannels");
+                });
+        }
+
+        private static Task<Validation<BaseError, int>> FFmpegProfileMustExist(
+            TvContext dbContext,
+            CreateChannel createChannel) =>
+            dbContext.FFmpegProfiles
+                .CountAsync(p => p.Id == createChannel.FFmpegProfileId)
+                .Map(Optional)
+                .Filter(c => c > 0)
+                .MapT(_ => createChannel.FFmpegProfileId)
+                .Map(o => o.ToValidation<BaseError>($"FFmpegProfile {createChannel.FFmpegProfileId} does not exist."));
+
+        private static async Task<Validation<BaseError, Option<int>>> WatermarkMustExist(
+            TvContext dbContext,
+            CreateChannel createChannel)
+        {
+            if (createChannel.WatermarkId is null)
+            {
+                return Option<int>.None;
+            }
+
+            return await dbContext.ChannelWatermarks
+                .CountAsync(w => w.Id == createChannel.WatermarkId)
+                .Map(Optional)
+                .Filter(c => c > 0)
+                .MapT(_ => Optional(createChannel.WatermarkId))
+                .Map(o => o.ToValidation<BaseError>($"Watermark {createChannel.WatermarkId} does not exist."));
+        }
+
+        private static async Task<Validation<BaseError, Option<int>>> FillerPresetMustExist(
+            TvContext dbContext,
+            CreateChannel createChannel)
+        {
+            if (createChannel.FallbackFillerId is null)
+            {
+                return Option<int>.None;
+            }
+
+            return await dbContext.FillerPresets
+                .Filter(fp => fp.FillerKind == FillerKind.Fallback)
+                .CountAsync(w => w.Id == createChannel.FallbackFillerId)
+                .Map(Optional)
+                .Filter(c => c > 0)
+                .MapT(_ => Optional(createChannel.FallbackFillerId))
+                .Map(
+                    o => o.ToValidation<BaseError>(
+                        $"Fallback filler {createChannel.FallbackFillerId} does not exist."));
+        }
    }
 }
@@ -1,3 +1,4 @@
-namespace ErsatzTV.Application.Channels;
-
-public record CreateChannelResult(int ChannelId) : EntityIdResult(ChannelId);
+namespace ErsatzTV.Application.Channels.Commands
+{
+    public record CreateChannelResult(int ChannelId) : EntityIdResult(ChannelId);
+}
@@ -1,5 +1,9 @@
-using ErsatzTV.Core;
+using System.Threading.Tasks;
+using ErsatzTV.Core;
+using LanguageExt;
+using MediatR;

-namespace ErsatzTV.Application.Channels;
-
-public record DeleteChannel(int ChannelId) : IRequest<Either<BaseError, Task>>;
+namespace ErsatzTV.Application.Channels.Commands
+{
+    public record DeleteChannel(int ChannelId) : IRequest<Either<BaseError, Task>>;
+}
@@ -1,23 +1,28 @@
-using ErsatzTV.Core;
+using System.Threading;
+using System.Threading.Tasks;
+using ErsatzTV.Core;
 using ErsatzTV.Core.Interfaces.Repositories;
+using LanguageExt;
+using MediatR;

-namespace ErsatzTV.Application.Channels;
-
-public class DeleteChannelHandler : IRequestHandler<DeleteChannel, Either<BaseError, Task>>
+namespace ErsatzTV.Application.Channels.Commands
 {
-    private readonly IChannelRepository _channelRepository;
+    public class DeleteChannelHandler : IRequestHandler<DeleteChannel, Either<BaseError, Task>>
+    {
+        private readonly IChannelRepository _channelRepository;

-    public DeleteChannelHandler(IChannelRepository channelRepository) => _channelRepository = channelRepository;
+        public DeleteChannelHandler(IChannelRepository channelRepository) => _channelRepository = channelRepository;

-    public async Task<Either<BaseError, Task>> Handle(DeleteChannel request, CancellationToken cancellationToken) =>
-        (await ChannelMustExist(request))
-        .Map(DoDeletion)
-        .ToEither<Task>();
+        public async Task<Either<BaseError, Task>> Handle(DeleteChannel request, CancellationToken cancellationToken) =>
+            (await ChannelMustExist(request))
+            .Map(DoDeletion)
+            .ToEither<Task>();

-    private Task DoDeletion(int channelId) => _channelRepository.Delete(channelId);
+        private Task DoDeletion(int channelId) => _channelRepository.Delete(channelId);

-    private async Task<Validation<BaseError, int>> ChannelMustExist(DeleteChannel deleteChannel) =>
-        (await _channelRepository.Get(deleteChannel.ChannelId))
-        .ToValidation<BaseError>($"Channel {deleteChannel.ChannelId} does not exist.")
-        .Map(c => c.Id);
+        private async Task<Validation<BaseError, int>> ChannelMustExist(DeleteChannel deleteChannel) =>
+            (await _channelRepository.Get(deleteChannel.ChannelId))
+            .ToValidation<BaseError>($"Channel {deleteChannel.ChannelId} does not exist.")
+            .Map(c => c.Id);
+    }
 }
@@ -1,20 +1,19 @@
 using ErsatzTV.Core;
 using ErsatzTV.Core.Domain;
+using LanguageExt;
+using MediatR;

-namespace ErsatzTV.Application.Channels;
-
-public record UpdateChannel
-(
-    int ChannelId,
-    string Name,
-    string Number,
-    string Group,
-    string Categories,
-    int FFmpegProfileId,
-    string Logo,
-    string PreferredAudioLanguageCode,
-    StreamingMode StreamingMode,
-    int? WatermarkId,
-    int? FallbackFillerId,
-    string PreferredSubtitleLanguageCode,
-    ChannelSubtitleMode SubtitleMode) : IRequest<Either<BaseError, ChannelViewModel>>;
+namespace ErsatzTV.Application.Channels.Commands
+{
+    public record UpdateChannel
+    (
+        int ChannelId,
+        string Name,
+        string Number,
+        int FFmpegProfileId,
+        string Logo,
+        string PreferredLanguageCode,
+        StreamingMode StreamingMode,
+        int? WatermarkId,
+        int? FallbackFillerId) : IRequest<Either<BaseError, ChannelViewModel>>;
+}
@@ -1,138 +1,122 @@
-using System.Globalization;
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
 using System.Text.RegularExpressions;
-using System.Threading.Channels;
-using ErsatzTV.Application.Subtitles;
+using System.Threading;
+using System.Threading.Tasks;
 using ErsatzTV.Core;
 using ErsatzTV.Core.Domain;
 using ErsatzTV.Infrastructure.Data;
 using ErsatzTV.Infrastructure.Extensions;
+using LanguageExt;
+using MediatR;
 using Microsoft.EntityFrameworkCore;
 using static ErsatzTV.Application.Channels.Mapper;
-using Channel = ErsatzTV.Core.Domain.Channel;
+using static LanguageExt.Prelude;

-namespace ErsatzTV.Application.Channels;
-
-public class UpdateChannelHandler : IRequestHandler<UpdateChannel, Either<BaseError, ChannelViewModel>>
+namespace ErsatzTV.Application.Channels.Commands
 {
-    private readonly IDbContextFactory<TvContext> _dbContextFactory;
-    private readonly ChannelWriter<ISubtitleWorkerRequest> _ffmpegWorkerChannel;
-
-    public UpdateChannelHandler(
-        ChannelWriter<ISubtitleWorkerRequest> ffmpegWorkerChannel,
-        IDbContextFactory<TvContext> dbContextFactory)
+    public class UpdateChannelHandler : IRequestHandler<UpdateChannel, Either<BaseError, ChannelViewModel>>
    {
-        _ffmpegWorkerChannel = ffmpegWorkerChannel;
-        _dbContextFactory = dbContextFactory;
-    }
+        private readonly IDbContextFactory<TvContext> _dbContextFactory;

-    public async Task<Either<BaseError, ChannelViewModel>> Handle(
-        UpdateChannel request,
-        CancellationToken cancellationToken)
-    {
-        await using TvContext dbContext = await _dbContextFactory.CreateDbContextAsync(cancellationToken);
-        Validation<BaseError, Channel> validation = await Validate(dbContext, request);
-        return await LanguageExtensions.Apply(validation, c => ApplyUpdateRequest(dbContext, c, request));
-    }
+        public UpdateChannelHandler(IDbContextFactory<TvContext> dbContextFactory) =>
+            _dbContextFactory = dbContextFactory;

-    private async Task<ChannelViewModel> ApplyUpdateRequest(TvContext dbContext, Channel c, UpdateChannel update)
-    {
-        c.Name = update.Name;
-        c.Number = update.Number;
-        c.Group = update.Group;
-        c.Categories = update.Categories;
-        c.FFmpegProfileId = update.FFmpegProfileId;
-        c.PreferredAudioLanguageCode = update.PreferredAudioLanguageCode;
-        c.PreferredSubtitleLanguageCode = update.PreferredSubtitleLanguageCode;
-        c.SubtitleMode = update.SubtitleMode;
-        c.Artwork ??= new List<Artwork>();
-
-        if (!string.IsNullOrWhiteSpace(update.Logo))
+        public async Task<Either<BaseError, ChannelViewModel>> Handle(
+            UpdateChannel request,
+            CancellationToken cancellationToken)
        {
-            Option<Artwork> maybeLogo =
-                Optional(c.Artwork).Flatten().FirstOrDefault(a => a.ArtworkKind == ArtworkKind.Logo);
+            await using TvContext dbContext = _dbContextFactory.CreateDbContext();
+            Validation<BaseError, Channel> validation = await Validate(dbContext, request);
+            return await validation.Apply(c => ApplyUpdateRequest(dbContext, c, request));
+        }

-            maybeLogo.Match(
-                artwork =>
-                {
-                    artwork.Path = update.Logo;
-                    artwork.DateUpdated = DateTime.UtcNow;
-                },
-                () =>
-                {
-                    var artwork = new Artwork
+        private async Task<ChannelViewModel> ApplyUpdateRequest(TvContext dbContext, Channel c, UpdateChannel update)
+        {
+            c.Name = update.Name;
+            c.Number = update.Number;
+            c.FFmpegProfileId = update.FFmpegProfileId;
+            c.PreferredLanguageCode = update.PreferredLanguageCode;
+            c.Artwork ??= new List<Artwork>();
+
+            if (!string.IsNullOrWhiteSpace(update.Logo))
+            {
+                Option<Artwork> maybeLogo =
+                    Optional(c.Artwork).Flatten().FirstOrDefault(a => a.ArtworkKind == ArtworkKind.Logo);
+
+                maybeLogo.Match(
+                    artwork =>
                    {
-                        Path = update.Logo,
-                        DateAdded = DateTime.UtcNow,
-                        DateUpdated = DateTime.UtcNow,
-                        ArtworkKind = ArtworkKind.Logo
-                    };
-                    c.Artwork.Add(artwork);
-                });
-        }
-
-        c.StreamingMode = update.StreamingMode;
-        c.WatermarkId = update.WatermarkId;
-        c.FallbackFillerId = update.FallbackFillerId;
-        await dbContext.SaveChangesAsync();
-
-        if (c.SubtitleMode != ChannelSubtitleMode.None)
-        {
-            Option<Playout> maybePlayout = await dbContext.Playouts
-                .SelectOneAsync(p => p.ChannelId, p => p.ChannelId == c.Id);
-
-            foreach (Playout playout in maybePlayout)
-            {
-                await _ffmpegWorkerChannel.WriteAsync(new ExtractEmbeddedSubtitles(playout.Id));
+                        artwork.Path = update.Logo;
+                        artwork.DateUpdated = DateTime.UtcNow;
+                    },
+                    () =>
+                    {
+                        var artwork = new Artwork
+                        {
+                            Path = update.Logo,
+                            DateAdded = DateTime.UtcNow,
+                            DateUpdated = DateTime.UtcNow,
+                            ArtworkKind = ArtworkKind.Logo
+                        };
+                        c.Artwork.Add(artwork);
+                    });
            }
+            
+            c.StreamingMode = update.StreamingMode;
+            c.WatermarkId = update.WatermarkId;
+            c.FallbackFillerId = update.FallbackFillerId;
+            await dbContext.SaveChangesAsync();
+            return ProjectToViewModel(c);
        }

-        return ProjectToViewModel(c);
-    }
+        private async Task<Validation<BaseError, Channel>> Validate(TvContext dbContext, UpdateChannel request) =>
+            (await ChannelMustExist(dbContext, request), ValidateName(request),
+                await ValidateNumber(dbContext, request),
+                ValidatePreferredLanguage(request))
+            .Apply((channelToUpdate, _, _, _) => channelToUpdate);

-    private async Task<Validation<BaseError, Channel>> Validate(TvContext dbContext, UpdateChannel request) =>
-        (await ChannelMustExist(dbContext, request), ValidateName(request),
-            await ValidateNumber(dbContext, request),
-            ValidatePreferredAudioLanguage(request))
-        .Apply((channelToUpdate, _, _, _) => channelToUpdate);
+        private static Task<Validation<BaseError, Channel>> ChannelMustExist(
+            TvContext dbContext,
+            UpdateChannel updateChannel) =>
+            dbContext.Channels
+                .Include(c => c.Artwork)
+                .Include(c => c.Watermark)
+                .SelectOneAsync(c => c.Id, c => c.Id == updateChannel.ChannelId)
+                .Map(o => o.ToValidation<BaseError>("Channel does not exist."));

-    private static Task<Validation<BaseError, Channel>> ChannelMustExist(
-        TvContext dbContext,
-        UpdateChannel updateChannel) =>
-        dbContext.Channels
-            .Include(c => c.Artwork)
-            .Include(c => c.Watermark)
-            .SelectOneAsync(c => c.Id, c => c.Id == updateChannel.ChannelId)
-            .Map(o => o.ToValidation<BaseError>("Channel does not exist."));
+        private static Validation<BaseError, string> ValidateName(UpdateChannel updateChannel) =>
+            updateChannel.NotEmpty(c => c.Name)
+                .Bind(_ => updateChannel.NotLongerThan(50)(c => c.Name));

-    private static Validation<BaseError, string> ValidateName(UpdateChannel updateChannel) =>
-        updateChannel.NotEmpty(c => c.Name)
-            .Bind(_ => updateChannel.NotLongerThan(50)(c => c.Name));
-
-    private static async Task<Validation<BaseError, string>> ValidateNumber(
-        TvContext dbContext,
-        UpdateChannel updateChannel)
-    {
-        int matchId = await dbContext.Channels
-            .SelectOneAsync(c => c.Number, c => c.Number == updateChannel.Number)
-            .Match(c => c.Id, () => updateChannel.ChannelId);
-
-        if (matchId == updateChannel.ChannelId)
+        private static async Task<Validation<BaseError, string>> ValidateNumber(
+            TvContext dbContext,
+            UpdateChannel updateChannel)
        {
-            if (Regex.IsMatch(updateChannel.Number, Channel.NumberValidator))
+            int matchId = await dbContext.Channels
+                .SelectOneAsync(c => c.Number, c => c.Number == updateChannel.Number)
+                .Match(c => c.Id, () => updateChannel.ChannelId);
+
+            if (matchId == updateChannel.ChannelId)
            {
-                return updateChannel.Number;
+                if (Regex.IsMatch(updateChannel.Number, Channel.NumberValidator))
+                {
+                    return updateChannel.Number;
+                }
+
+                return BaseError.New("Invalid channel number; one decimal is allowed for subchannels");
            }

-            return BaseError.New("Invalid channel number; two decimals are allowed for subchannels");
+            return BaseError.New("Channel number must be unique");
        }

-        return BaseError.New("Channel number must be unique");
+        private static Validation<BaseError, string> ValidatePreferredLanguage(UpdateChannel updateChannel) =>
+            Optional(updateChannel.PreferredLanguageCode ?? string.Empty)
+                .Filter(
+                    lc => string.IsNullOrWhiteSpace(lc) || CultureInfo.GetCultures(CultureTypes.NeutralCultures).Any(
+                        ci => string.Equals(ci.ThreeLetterISOLanguageName, lc, StringComparison.OrdinalIgnoreCase)))
+                .ToValidation<BaseError>("Preferred language code is invalid");
    }
-
-    private static Validation<BaseError, string> ValidatePreferredAudioLanguage(UpdateChannel updateChannel) =>
-        Optional(updateChannel.PreferredAudioLanguageCode ?? string.Empty)
-            .Filter(
-                lc => string.IsNullOrWhiteSpace(lc) || CultureInfo.GetCultures(CultureTypes.NeutralCultures).Any(
-                    ci => string.Equals(ci.ThreeLetterISOLanguageName, lc, StringComparison.OrdinalIgnoreCase)))
-            .ToValidation<BaseError>("Preferred audio language code is invalid");
 }
@@ -1,47 +1,29 @@
-using ErsatzTV.Core.Api.Channels;
+using System.Linq;
 using ErsatzTV.Core.Domain;
+using static LanguageExt.Prelude;

-namespace ErsatzTV.Application.Channels;
-
-internal static class Mapper
+namespace ErsatzTV.Application.Channels
 {
-    internal static ChannelViewModel ProjectToViewModel(Channel channel) =>
-        new(
-            channel.Id,
-            channel.Number,
-            channel.Name,
-            channel.Group,
-            channel.Categories,
-            channel.FFmpegProfileId,
-            GetLogo(channel),
-            channel.PreferredAudioLanguageCode,
-            channel.StreamingMode,
-            channel.WatermarkId,
-            channel.FallbackFillerId,
-            channel.Playouts?.Count ?? 0,
-            channel.PreferredSubtitleLanguageCode,
-            channel.SubtitleMode);
+    internal static class Mapper
+    {
+        internal static ChannelViewModel ProjectToViewModel(Channel channel) =>
+            new(
+                channel.Id,
+                channel.Number,
+                channel.Name,
+                channel.FFmpegProfileId,
+                GetLogo(channel),
+                channel.PreferredLanguageCode,
+                channel.StreamingMode,
+                channel.WatermarkId,
+                channel.FallbackFillerId);

-    internal static ChannelResponseModel ProjectToResponseModel(Channel channel) =>
-        new(
-            channel.Id,
-            channel.Number,
-            channel.Name,
-            channel.FFmpegProfile.Name,
-            channel.PreferredAudioLanguageCode,
-            GetStreamingMode(channel));
+        private static string GetLogo(Channel channel) =>
+            Optional(channel.Artwork.FirstOrDefault(a => a.ArtworkKind == ArtworkKind.Logo))
+                .Match(a => a.Path, string.Empty);

-    private static string GetLogo(Channel channel) =>
-        Optional(channel.Artwork.FirstOrDefault(a => a.ArtworkKind == ArtworkKind.Logo))
-            .Match(a => a.Path, string.Empty);
-
-    private static string GetStreamingMode(Channel channel) =>
-        channel.StreamingMode switch
-        {
-            StreamingMode.TransportStream => "MPEG-TS (Legacy)",
-            StreamingMode.TransportStreamHybrid => "MPEG-TS",
-            StreamingMode.HttpLiveStreamingDirect => "HLS Direct",
-            StreamingMode.HttpLiveStreamingSegmenter => "HLS Segmenter",
-            _ => throw new ArgumentOutOfRangeException()
-        };
+        private static string GetWatermark(Channel channel) =>
+            Optional(channel.Artwork.FirstOrDefault(a => a.ArtworkKind == ArtworkKind.Watermark))
+                .Match(a => a.Path, string.Empty);
+    }
 }
@@ -1,3 +1,7 @@
-namespace ErsatzTV.Application.Channels;
+using System.Collections.Generic;
+using MediatR;

-public record GetAllChannels : IRequest<List<ChannelViewModel>>;
+namespace ErsatzTV.Application.Channels.Queries
+{
+    public record GetAllChannels : IRequest<List<ChannelViewModel>>;
+}
@@ -1,5 +0,0 @@
-using ErsatzTV.Core.Api.Channels;
-
-namespace ErsatzTV.Application.Channels;
-
-public record GetAllChannelsForApi : IRequest<List<ChannelResponseModel>>;
@@ -1,21 +0,0 @@
-using ErsatzTV.Core.Api.Channels;
-using ErsatzTV.Core.Domain;
-using ErsatzTV.Core.Interfaces.Repositories;
-using static ErsatzTV.Application.Channels.Mapper;
-
-namespace ErsatzTV.Application.Channels;
-
-public class GetAllChannelsForApiHandler : IRequestHandler<GetAllChannelsForApi, List<ChannelResponseModel>>
-{
-    private readonly IChannelRepository _channelRepository;
-
-    public GetAllChannelsForApiHandler(IChannelRepository channelRepository) => _channelRepository = channelRepository;
-
-    public async Task<List<ChannelResponseModel>> Handle(
-        GetAllChannelsForApi request,
-        CancellationToken cancellationToken)
-    {
-        IEnumerable<Channel> channels = Optional(await _channelRepository.GetAll()).Flatten();
-        return channels.Map(ProjectToResponseModel).ToList();
-    }
-}
@@ -1,14 +1,21 @@
-using ErsatzTV.Core.Interfaces.Repositories;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using ErsatzTV.Core.Interfaces.Repositories;
+using MediatR;
 using static ErsatzTV.Application.Channels.Mapper;
+using static LanguageExt.Prelude;

-namespace ErsatzTV.Application.Channels;
-
-public class GetAllChannelsHandler : IRequestHandler<GetAllChannels, List<ChannelViewModel>>
+namespace ErsatzTV.Application.Channels.Queries
 {
-    private readonly IChannelRepository _channelRepository;
+    public class GetAllChannelsHandler : IRequestHandler<GetAllChannels, List<ChannelViewModel>>
+    {
+        private readonly IChannelRepository _channelRepository;

-    public GetAllChannelsHandler(IChannelRepository channelRepository) => _channelRepository = channelRepository;
+        public GetAllChannelsHandler(IChannelRepository channelRepository) => _channelRepository = channelRepository;

-    public async Task<List<ChannelViewModel>> Handle(GetAllChannels request, CancellationToken cancellationToken) =>
-        Optional(await _channelRepository.GetAll()).Flatten().Map(ProjectToViewModel).ToList();
+        public async Task<List<ChannelViewModel>> Handle(GetAllChannels request, CancellationToken cancellationToken) =>
+            Optional(await _channelRepository.GetAll()).Flatten().Map(ProjectToViewModel).ToList();
+    }
 }
@@ -1,3 +1,7 @@
-namespace ErsatzTV.Application.Channels;
+using LanguageExt;
+using MediatR;

-public record GetChannelById(int Id) : IRequest<Option<ChannelViewModel>>;
+namespace ErsatzTV.Application.Channels.Queries
+{
+    public record GetChannelById(int Id) : IRequest<Option<ChannelViewModel>>;
+}
@@ -1,15 +1,20 @@
-using ErsatzTV.Core.Interfaces.Repositories;
+using System.Threading;
+using System.Threading.Tasks;
+using ErsatzTV.Core.Interfaces.Repositories;
+using LanguageExt;
+using MediatR;
 using static ErsatzTV.Application.Channels.Mapper;

-namespace ErsatzTV.Application.Channels;
-
-public class GetChannelByIdHandler : IRequestHandler<GetChannelById, Option<ChannelViewModel>>
+namespace ErsatzTV.Application.Channels.Queries
 {
-    private readonly IChannelRepository _channelRepository;
+    public class GetChannelByIdHandler : IRequestHandler<GetChannelById, Option<ChannelViewModel>>
+    {
+        private readonly IChannelRepository _channelRepository;

-    public GetChannelByIdHandler(IChannelRepository channelRepository) => _channelRepository = channelRepository;
+        public GetChannelByIdHandler(IChannelRepository channelRepository) => _channelRepository = channelRepository;

-    public Task<Option<ChannelViewModel>> Handle(GetChannelById request, CancellationToken cancellationToken) =>
-        _channelRepository.Get(request.Id)
-            .MapT(ProjectToViewModel);
+        public Task<Option<ChannelViewModel>> Handle(GetChannelById request, CancellationToken cancellationToken) =>
+            _channelRepository.Get(request.Id)
+                .MapT(ProjectToViewModel);
+    }
 }
@@ -1,3 +0,0 @@
-namespace ErsatzTV.Application.Channels;
-
-public record GetChannelByNumber(string ChannelNumber) : IRequest<Option<ChannelViewModel>>;
@@ -1,14 +0,0 @@
-using ErsatzTV.Core.Interfaces.Repositories;
-using static ErsatzTV.Application.Channels.Mapper;
-
-namespace ErsatzTV.Application.Channels;
-
-public class GetChannelByNumberHandler : IRequestHandler<GetChannelByNumber, Option<ChannelViewModel>>
-{
-    private readonly IChannelRepository _channelRepository;
-
-    public GetChannelByNumberHandler(IChannelRepository channelRepository) => _channelRepository = channelRepository;
-
-    public Task<Option<ChannelViewModel>> Handle(GetChannelByNumber request, CancellationToken cancellationToken) =>
-        _channelRepository.GetByNumber(request.ChannelNumber).MapT(ProjectToViewModel);
-}
@@ -1,3 +0,0 @@
-namespace ErsatzTV.Application.Channels;
-
-public record GetChannelFramerate(string ChannelNumber) : IRequest<Option<int>>;
@@ -1,102 +0,0 @@
-using ErsatzTV.Core.Domain;
-using ErsatzTV.Core.Extensions;
-using ErsatzTV.Infrastructure.Data;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.Extensions.Logging;
-
-namespace ErsatzTV.Application.Channels;
-
-public class GetChannelFramerateHandler : IRequestHandler<GetChannelFramerate, Option<int>>
-{
-    private readonly IDbContextFactory<TvContext> _dbContextFactory;
-    private readonly ILogger<GetChannelFramerateHandler> _logger;
-
-    public GetChannelFramerateHandler(
-        IDbContextFactory<TvContext> dbContextFactory,
-        ILogger<GetChannelFramerateHandler> logger)
-    {
-        _dbContextFactory = dbContextFactory;
-        _logger = logger;
-    }
-
-    public async Task<Option<int>> Handle(GetChannelFramerate request, CancellationToken cancellationToken)
-    {
-        // TODO: expand to check everything in collection rather than what's scheduled?
-        _logger.LogDebug("Checking frame rates for channel {ChannelNumber}", request.ChannelNumber);
-
-        await using TvContext dbContext = await _dbContextFactory.CreateDbContextAsync(cancellationToken);
-
-        List<Playout> playouts = await dbContext.Playouts
-            .Include(p => p.Items)
-            .ThenInclude(pi => pi.MediaItem)
-            .ThenInclude(mi => (mi as Movie).MediaVersions)
-            .Include(p => p.Items)
-            .ThenInclude(pi => pi.MediaItem)
-            .ThenInclude(mi => (mi as Episode).MediaVersions)
-            .Include(p => p.Items)
-            .ThenInclude(pi => pi.MediaItem)
-            .ThenInclude(mi => (mi as Song).MediaVersions)
-            .Include(p => p.Items)
-            .ThenInclude(pi => pi.MediaItem)
-            .ThenInclude(mi => (mi as MusicVideo).MediaVersions)
-            .Include(p => p.Items)
-            .ThenInclude(pi => pi.MediaItem)
-            .ThenInclude(mi => (mi as OtherVideo).MediaVersions)
-            .Filter(p => p.Channel.Number == request.ChannelNumber)
-            .ToListAsync(cancellationToken);
-
-        var frameRates = playouts.Map(p => p.Items.Map(i => i.MediaItem.GetHeadVersion()))
-            .Flatten()
-            .Map(mv => mv.RFrameRate)
-            .ToList();
-
-        var distinct = frameRates.Distinct().ToList();
-        if (distinct.Count > 1)
-        {
-            // TODO: something more intelligent than minimum framerate?
-            int result = frameRates.Map(ParseFrameRate).Min();
-            if (result < 24)
-            {
-                _logger.LogInformation(
-                    "Normalizing frame rate for channel {ChannelNumber} from {Distinct} to {FrameRate} instead of min value {MinFrameRate}",
-                    request.ChannelNumber,
-                    distinct,
-                    24,
-                    result);
-
-                return 24;
-            }
-
-            _logger.LogInformation(
-                "Normalizing frame rate for channel {ChannelNumber} from {Distinct} to {FrameRate}",
-                request.ChannelNumber,
-                distinct,
-                result);
-            return result;
-        }
-
-        _logger.LogInformation(
-            "All content on channel {ChannelNumber} has the same frame rate of {FrameRate}; will not normalize",
-            request.ChannelNumber,
-            distinct[0]);
-        return None;
-    }
-
-    private int ParseFrameRate(string frameRate)
-    {
-        if (!int.TryParse(frameRate, out int fr))
-        {
-            string[] split = (frameRate ?? string.Empty).Split("/");
-            if (int.TryParse(split[0], out int left) && int.TryParse(split[1], out int right))
-            {
-                fr = (int)Math.Round(left / (double)right);
-            }
-            else
-            {
-                fr = 24;
-            }
-        }
-
-        return fr;
-    }
-}
@@ -1,5 +1,7 @@
 using ErsatzTV.Core.Iptv;
+using MediatR;

-namespace ErsatzTV.Application.Channels;
-
-public record GetChannelGuide(string Scheme, string Host) : IRequest<ChannelGuide>;
+namespace ErsatzTV.Application.Channels.Queries
+{
+    public record GetChannelGuide(string Scheme, string Host) : IRequest<ChannelGuide>;
+}
@@ -1,15 +1,20 @@
-using ErsatzTV.Core.Interfaces.Repositories;
+using System.Threading;
+using System.Threading.Tasks;
+using ErsatzTV.Core.Interfaces.Repositories;
 using ErsatzTV.Core.Iptv;
+using LanguageExt;
+using MediatR;

-namespace ErsatzTV.Application.Channels;
-
-public class GetChannelGuideHandler : IRequestHandler<GetChannelGuide, ChannelGuide>
+namespace ErsatzTV.Application.Channels.Queries
 {
-    private readonly IChannelRepository _channelRepository;
+    public class GetChannelGuideHandler : IRequestHandler<GetChannelGuide, ChannelGuide>
+    {
+        private readonly IChannelRepository _channelRepository;

-    public GetChannelGuideHandler(IChannelRepository channelRepository) => _channelRepository = channelRepository;
+        public GetChannelGuideHandler(IChannelRepository channelRepository) => _channelRepository = channelRepository;

-    public Task<ChannelGuide> Handle(GetChannelGuide request, CancellationToken cancellationToken) =>
-        _channelRepository.GetAllForGuide()
-            .Map(channels => new ChannelGuide(request.Scheme, request.Host, channels));
+        public Task<ChannelGuide> Handle(GetChannelGuide request, CancellationToken cancellationToken) =>
+            _channelRepository.GetAllForGuide()
+                .Map(channels => new ChannelGuide(request.Scheme, request.Host, channels));
+    }
 }
@@ -1,5 +1,8 @@
-using ErsatzTV.Core.Hdhr;
+using System.Collections.Generic;
+using ErsatzTV.Core.Hdhr;
+using MediatR;

-namespace ErsatzTV.Application.Channels;
-
-public record GetChannelLineup(string Scheme, string Host) : IRequest<List<LineupItem>>;
+namespace ErsatzTV.Application.Channels.Queries
+{
+    public record GetChannelLineup(string Scheme, string Host) : IRequest<List<LineupItem>>;
+}
@@ -1,15 +1,22 @@
-using ErsatzTV.Core.Hdhr;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using ErsatzTV.Core.Hdhr;
 using ErsatzTV.Core.Interfaces.Repositories;
+using LanguageExt;
+using MediatR;

-namespace ErsatzTV.Application.Channels;
-
-public class GetChannelLineupHandler : IRequestHandler<GetChannelLineup, List<LineupItem>>
+namespace ErsatzTV.Application.Channels.Queries
 {
-    private readonly IChannelRepository _channelRepository;
+    public class GetChannelLineupHandler : IRequestHandler<GetChannelLineup, List<LineupItem>>
+    {
+        private readonly IChannelRepository _channelRepository;

-    public GetChannelLineupHandler(IChannelRepository channelRepository) => _channelRepository = channelRepository;
+        public GetChannelLineupHandler(IChannelRepository channelRepository) => _channelRepository = channelRepository;

-    public Task<List<LineupItem>> Handle(GetChannelLineup request, CancellationToken cancellationToken) =>
-        _channelRepository.GetAll()
-            .Map(channels => channels.Map(c => new LineupItem(request.Scheme, request.Host, c)).ToList());
+        public Task<List<LineupItem>> Handle(GetChannelLineup request, CancellationToken cancellationToken) =>
+            _channelRepository.GetAll()
+                .Map(channels => channels.Map(c => new LineupItem(request.Scheme, request.Host, c)).ToList());
+    }
 }
@@ -1,5 +1,7 @@
 using ErsatzTV.Core.Iptv;
+using MediatR;

-namespace ErsatzTV.Application.Channels;
-
-public record GetChannelPlaylist(string Scheme, string Host, string Mode) : IRequest<ChannelPlaylist>;
+namespace ErsatzTV.Application.Channels.Queries
+{
+    public record GetChannelPlaylist(string Scheme, string Host, string Mode) : IRequest<ChannelPlaylist>;
+}
@@ -1,50 +1,52 @@
-using ErsatzTV.Core.Domain;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+using ErsatzTV.Core.Domain;
 using ErsatzTV.Core.Interfaces.Repositories;
 using ErsatzTV.Core.Iptv;
+using LanguageExt;
+using MediatR;

-namespace ErsatzTV.Application.Channels;
-
-public class GetChannelPlaylistHandler : IRequestHandler<GetChannelPlaylist, ChannelPlaylist>
+namespace ErsatzTV.Application.Channels.Queries
 {
-    private readonly IChannelRepository _channelRepository;
-
-    public GetChannelPlaylistHandler(IChannelRepository channelRepository) =>
-        _channelRepository = channelRepository;
-
-    public Task<ChannelPlaylist> Handle(GetChannelPlaylist request, CancellationToken cancellationToken) =>
-        _channelRepository.GetAll()
-            .Map(channels => EnsureMode(channels, request.Mode))
-            .Map(channels => new ChannelPlaylist(request.Scheme, request.Host, channels));
-
-    private static List<Channel> EnsureMode(IEnumerable<Channel> channels, string mode)
+    public class GetChannelPlaylistHandler : IRequestHandler<GetChannelPlaylist, ChannelPlaylist>
    {
-        var result = new List<Channel>();
-        foreach (Channel channel in channels)
-        {
-            switch (mode.ToLowerInvariant())
-            {
-                case "segmenter":
-                    channel.StreamingMode = StreamingMode.HttpLiveStreamingSegmenter;
-                    result.Add(channel);
-                    break;
-                case "hls-direct":
-                    channel.StreamingMode = StreamingMode.HttpLiveStreamingDirect;
-                    result.Add(channel);
-                    break;
-                case "ts-legacy":
-                    channel.StreamingMode = StreamingMode.TransportStream;
-                    result.Add(channel);
-                    break;
-                case "ts":
-                    channel.StreamingMode = StreamingMode.TransportStreamHybrid;
-                    result.Add(channel);
-                    break;
-                default:
-                    result.Add(channel);
-                    break;
-            }
-        }
+        private readonly IChannelRepository _channelRepository;

-        return result;
+        public GetChannelPlaylistHandler(IChannelRepository channelRepository) =>
+            _channelRepository = channelRepository;
+
+        public Task<ChannelPlaylist> Handle(GetChannelPlaylist request, CancellationToken cancellationToken) =>
+            _channelRepository.GetAll()
+                .Map(channels => EnsureMode(channels, request.Mode))
+                .Map(channels => new ChannelPlaylist(request.Scheme, request.Host, channels));
+
+        private static List<Channel> EnsureMode(IEnumerable<Channel> channels, string mode)
+        {
+            var result = new List<Channel>();
+            foreach (Channel channel in channels)
+            {
+                switch (mode.ToLowerInvariant())
+                {
+                    case "segmenter":
+                        channel.StreamingMode = StreamingMode.HttpLiveStreamingSegmenter;
+                        result.Add(channel);
+                        break;
+                    case "hls-direct":
+                        channel.StreamingMode = StreamingMode.HttpLiveStreamingDirect;
+                        result.Add(channel);
+                        break;
+                    case "ts":
+                        channel.StreamingMode = StreamingMode.TransportStream;
+                        result.Add(channel);
+                        break;
+                    default:
+                        result.Add(channel);
+                        break;
+                }
+            }
+
+            return result;
+        }
    }
 }
@@ -1,5 +1,7 @@
 using ErsatzTV.Core.Domain;
+using LanguageExt;

-namespace ErsatzTV.Application.Configuration;
-
-public record SaveConfigElementByKey(ConfigElementKey Key, string Value) : IRequest<Unit>;
+namespace ErsatzTV.Application.Configuration.Commands
+{
+    public record SaveConfigElementByKey(ConfigElementKey Key, string Value) : MediatR.IRequest<Unit>;
+}
@@ -1,17 +1,21 @@
-using ErsatzTV.Core.Interfaces.Repositories;
+using System.Threading;
+using System.Threading.Tasks;
+using ErsatzTV.Core.Interfaces.Repositories;
+using LanguageExt;

-namespace ErsatzTV.Application.Configuration;
-
-public class SaveConfigElementByKeyHandler : IRequestHandler<SaveConfigElementByKey, Unit>
+namespace ErsatzTV.Application.Configuration.Commands
 {
-    private readonly IConfigElementRepository _configElementRepository;
-
-    public SaveConfigElementByKeyHandler(IConfigElementRepository configElementRepository) =>
-        _configElementRepository = configElementRepository;
-
-    public async Task<Unit> Handle(SaveConfigElementByKey request, CancellationToken cancellationToken)
+    public class SaveConfigElementByKeyHandler : MediatR.IRequestHandler<SaveConfigElementByKey, Unit>
    {
-        await _configElementRepository.Upsert(request.Key, request.Value);
-        return Unit.Default;
+        private readonly IConfigElementRepository _configElementRepository;
+
+        public SaveConfigElementByKeyHandler(IConfigElementRepository configElementRepository) =>
+            _configElementRepository = configElementRepository;
+
+        public async Task<Unit> Handle(SaveConfigElementByKey request, CancellationToken cancellationToken)
+        {
+            await _configElementRepository.Upsert(request.Key, request.Value);
+            return Unit.Default;
+        }
    }
 }
@@ -1,5 +1,7 @@
 using ErsatzTV.Core;
+using LanguageExt;

-namespace ErsatzTV.Application.Configuration;
-
-public record UpdateLibraryRefreshInterval(int LibraryRefreshInterval) : IRequest<Either<BaseError, Unit>>;
+namespace ErsatzTV.Application.Configuration.Commands
+{
+    public record UpdateLibraryRefreshInterval(int LibraryRefreshInterval) : MediatR.IRequest<Either<BaseError, Unit>>;
+}
@@ -1,31 +1,33 @@
-using ErsatzTV.Core;
+using System.Threading;
+using System.Threading.Tasks;
+using ErsatzTV.Core;
 using ErsatzTV.Core.Domain;
 using ErsatzTV.Core.Interfaces.Repositories;
+using LanguageExt;
+using static LanguageExt.Prelude;

-namespace ErsatzTV.Application.Configuration;
-
-public class UpdateLibraryRefreshIntervalHandler :
-    IRequestHandler<UpdateLibraryRefreshInterval, Either<BaseError, Unit>>
+namespace ErsatzTV.Application.Configuration.Commands
 {
-    private readonly IConfigElementRepository _configElementRepository;
+    public class UpdateLibraryRefreshIntervalHandler :
+        MediatR.IRequestHandler<UpdateLibraryRefreshInterval, Either<BaseError, Unit>>
+    {
+        private readonly IConfigElementRepository _configElementRepository;

-    public UpdateLibraryRefreshIntervalHandler(IConfigElementRepository configElementRepository) =>
-        _configElementRepository = configElementRepository;
+        public UpdateLibraryRefreshIntervalHandler(IConfigElementRepository configElementRepository) =>
+            _configElementRepository = configElementRepository;

-    public Task<Either<BaseError, Unit>> Handle(
-        UpdateLibraryRefreshInterval request,
-        CancellationToken cancellationToken) =>
-        Validate(request)
-            .MapT(
-                _ => _configElementRepository.Upsert(
-                    ConfigElementKey.LibraryRefreshInterval,
-                    request.LibraryRefreshInterval))
-            .Bind(v => v.ToEitherAsync());
+        public Task<Either<BaseError, Unit>> Handle(
+            UpdateLibraryRefreshInterval request,
+            CancellationToken cancellationToken) =>
+            Validate(request)
+                .MapT(_ => _configElementRepository.Upsert(ConfigElementKey.LibraryRefreshInterval, request.LibraryRefreshInterval))
+                .Bind(v => v.ToEitherAsync());

-    private static Task<Validation<BaseError, Unit>> Validate(UpdateLibraryRefreshInterval request) =>
-        Optional(request.LibraryRefreshInterval)
-            .Where(lri => lri > 0)
-            .Map(_ => Unit.Default)
-            .ToValidation<BaseError>("Tuner count must be greater than zero")
-            .AsTask();
+        private static Task<Validation<BaseError, Unit>> Validate(UpdateLibraryRefreshInterval request) =>
+            Optional(request.LibraryRefreshInterval)
+                .Where(lri => lri > 0)
+                .Map(_ => Unit.Default)
+                .ToValidation<BaseError>("Tuner count must be greater than zero")
+                .AsTask();
+    }
 }
@@ -1,5 +1,7 @@
 using ErsatzTV.Core;
+using LanguageExt;

-namespace ErsatzTV.Application.Configuration;
-
-public record UpdatePlayoutDaysToBuild(int DaysToBuild) : IRequest<Either<BaseError, Unit>>;
+namespace ErsatzTV.Application.Configuration.Commands
+{
+    public record UpdatePlayoutDaysToBuild(int DaysToBuild) : MediatR.IRequest<Either<BaseError, Unit>>;
+}
@@ -1,59 +1,66 @@
-using System.Threading.Channels;
-using ErsatzTV.Application.Playouts;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Channels;
+using System.Threading.Tasks;
+using ErsatzTV.Application.Playouts.Commands;
 using ErsatzTV.Core;
 using ErsatzTV.Core.Domain;
 using ErsatzTV.Core.Interfaces.Repositories;
-using ErsatzTV.Core.Scheduling;
 using ErsatzTV.Infrastructure.Data;
+using LanguageExt;
 using Microsoft.EntityFrameworkCore;
+using static LanguageExt.Prelude;

-namespace ErsatzTV.Application.Configuration;
-
-public class UpdatePlayoutDaysToBuildHandler : IRequestHandler<UpdatePlayoutDaysToBuild, Either<BaseError, Unit>>
+namespace ErsatzTV.Application.Configuration.Commands
 {
-    private readonly IConfigElementRepository _configElementRepository;
-    private readonly IDbContextFactory<TvContext> _dbContextFactory;
-    private readonly ChannelWriter<IBackgroundServiceRequest> _workerChannel;
-
-    public UpdatePlayoutDaysToBuildHandler(
-        IConfigElementRepository configElementRepository,
-        IDbContextFactory<TvContext> dbContextFactory,
-        ChannelWriter<IBackgroundServiceRequest> workerChannel)
+    public class
+        UpdatePlayoutDaysToBuildHandler : MediatR.IRequestHandler<UpdatePlayoutDaysToBuild, Either<BaseError, Unit>>
    {
-        _configElementRepository = configElementRepository;
-        _dbContextFactory = dbContextFactory;
-        _workerChannel = workerChannel;
-    }
+        private readonly IConfigElementRepository _configElementRepository;
+        private readonly IDbContextFactory<TvContext> _dbContextFactory;
+        private readonly ChannelWriter<IBackgroundServiceRequest> _workerChannel;

-    public async Task<Either<BaseError, Unit>> Handle(
-        UpdatePlayoutDaysToBuild request,
-        CancellationToken cancellationToken)
-    {
-        await using TvContext dbContext = _dbContextFactory.CreateDbContext();
-        Validation<BaseError, Unit> validation = await Validate(request);
-        return await validation.Apply<Unit, Unit>(_ => ApplyUpdate(dbContext, request.DaysToBuild));
-    }
-
-    private async Task<Unit> ApplyUpdate(TvContext dbContext, int daysToBuild)
-    {
-        await _configElementRepository.Upsert(ConfigElementKey.PlayoutDaysToBuild, daysToBuild);
-
-        // continue all playouts to proper number of days
-        List<Playout> playouts = await dbContext.Playouts
-            .Include(p => p.Channel)
-            .ToListAsync();
-        foreach (int playoutId in playouts.OrderBy(p => decimal.Parse(p.Channel.Number)).Map(p => p.Id))
+        public UpdatePlayoutDaysToBuildHandler(
+            IConfigElementRepository configElementRepository,
+            IDbContextFactory<TvContext> dbContextFactory,
+            ChannelWriter<IBackgroundServiceRequest> workerChannel)
        {
-            await _workerChannel.WriteAsync(new BuildPlayout(playoutId, PlayoutBuildMode.Continue));
+            _configElementRepository = configElementRepository;
+            _dbContextFactory = dbContextFactory;
+            _workerChannel = workerChannel;
        }

-        return Unit.Default;
-    }
+        public async Task<Either<BaseError, Unit>> Handle(
+            UpdatePlayoutDaysToBuild request,
+            CancellationToken cancellationToken)
+        {
+            await using TvContext dbContext = _dbContextFactory.CreateDbContext();
+            Validation<BaseError, Unit> validation = await Validate(request);
+            return await validation.Apply<Unit, Unit>(_ => ApplyUpdate(dbContext, request.DaysToBuild));
+        }

-    private static Task<Validation<BaseError, Unit>> Validate(UpdatePlayoutDaysToBuild request) =>
-        Optional(request.DaysToBuild)
-            .Where(days => days > 0)
-            .Map(_ => Unit.Default)
-            .ToValidation<BaseError>("Days to build must be greater than zero")
-            .AsTask();
+        private async Task<Unit> ApplyUpdate(TvContext dbContext, int daysToBuild)
+        {
+            await _configElementRepository.Upsert(ConfigElementKey.PlayoutDaysToBuild, daysToBuild);
+            
+            // build all playouts to proper number of days
+            List<Playout> playouts = await dbContext.Playouts
+                .Include(p => p.Channel)
+                .ToListAsync();
+            foreach (int playoutId in playouts.OrderBy(p => decimal.Parse(p.Channel.Number)).Map(p => p.Id))
+            {
+                await _workerChannel.WriteAsync(new BuildPlayout(playoutId));
+            }
+            
+            return Unit.Default;
+        }
+
+        private static Task<Validation<BaseError, Unit>> Validate(UpdatePlayoutDaysToBuild request) =>
+            Optional(request.DaysToBuild)
+                .Where(days => days > 0)
+                .Map(_ => Unit.Default)
+                .ToValidation<BaseError>("Days to build must be greater than zero")
+                .AsTask();
+    }
 }
@@ -1,3 +1,4 @@
-namespace ErsatzTV.Application.Configuration;
-
-public record ConfigElementViewModel(string Key, string Value);
+namespace ErsatzTV.Application.Configuration
+{
+    public record ConfigElementViewModel(string Key, string Value);
+}
@@ -1,9 +1,10 @@
 using ErsatzTV.Core.Domain;

-namespace ErsatzTV.Application.Configuration;
-
-internal static class Mapper
+namespace ErsatzTV.Application.Configuration
 {
-    internal static ConfigElementViewModel ProjectToViewModel(ConfigElement element) =>
-        new(element.Key, element.Value);
+    internal static class Mapper
+    {
+        internal static ConfigElementViewModel ProjectToViewModel(ConfigElement element) =>
+            new(element.Key, element.Value);
+    }
 }
@@ -1,5 +1,8 @@
 using ErsatzTV.Core.Domain;
+using LanguageExt;
+using MediatR;

-namespace ErsatzTV.Application.Configuration;
-
-public record GetConfigElementByKey(ConfigElementKey Key) : IRequest<Option<ConfigElementViewModel>>;
+namespace ErsatzTV.Application.Configuration.Queries
+{
+    public record GetConfigElementByKey(ConfigElementKey Key) : IRequest<Option<ConfigElementViewModel>>;
+}
@@ -1,17 +1,22 @@
-using ErsatzTV.Core.Interfaces.Repositories;
+using System.Threading;
+using System.Threading.Tasks;
+using ErsatzTV.Core.Interfaces.Repositories;
+using LanguageExt;
+using MediatR;
 using static ErsatzTV.Application.Configuration.Mapper;

-namespace ErsatzTV.Application.Configuration;
-
-public class GetConfigElementByKeyHandler : IRequestHandler<GetConfigElementByKey, Option<ConfigElementViewModel>>
+namespace ErsatzTV.Application.Configuration.Queries
 {
-    private readonly IConfigElementRepository _configElementRepository;
+    public class GetConfigElementByKeyHandler : IRequestHandler<GetConfigElementByKey, Option<ConfigElementViewModel>>
+    {
+        private readonly IConfigElementRepository _configElementRepository;

-    public GetConfigElementByKeyHandler(IConfigElementRepository configElementRepository) =>
-        _configElementRepository = configElementRepository;
+        public GetConfigElementByKeyHandler(IConfigElementRepository configElementRepository) =>
+            _configElementRepository = configElementRepository;

-    public Task<Option<ConfigElementViewModel>> Handle(
-        GetConfigElementByKey request,
-        CancellationToken cancellationToken) =>
-        _configElementRepository.Get(request.Key).MapT(ProjectToViewModel);
+        public Task<Option<ConfigElementViewModel>> Handle(
+            GetConfigElementByKey request,
+            CancellationToken cancellationToken) =>
+            _configElementRepository.Get(request.Key).MapT(ProjectToViewModel);
+    }
 }
@@ -1,3 +1,6 @@
-namespace ErsatzTV.Application.Configuration;
+using MediatR;

-public record GetLibraryRefreshInterval : IRequest<int>;
+namespace ErsatzTV.Application.Configuration.Queries
+{
+    public record GetLibraryRefreshInterval : IRequest<int>;
+}
@@ -1,16 +1,21 @@
-using ErsatzTV.Core.Domain;
+using System.Threading;
+using System.Threading.Tasks;
+using ErsatzTV.Core.Domain;
 using ErsatzTV.Core.Interfaces.Repositories;
+using LanguageExt;
+using MediatR;

-namespace ErsatzTV.Application.Configuration;
-
-public class GetLibraryRefreshIntervalHandler : IRequestHandler<GetLibraryRefreshInterval, int>
+namespace ErsatzTV.Application.Configuration.Queries
 {
-    private readonly IConfigElementRepository _configElementRepository;
+    public class GetLibraryRefreshIntervalHandler : IRequestHandler<GetLibraryRefreshInterval, int>
+    {
+        private readonly IConfigElementRepository _configElementRepository;

-    public GetLibraryRefreshIntervalHandler(IConfigElementRepository configElementRepository) =>
-        _configElementRepository = configElementRepository;
+        public GetLibraryRefreshIntervalHandler(IConfigElementRepository configElementRepository) =>
+            _configElementRepository = configElementRepository;

-    public Task<int> Handle(GetLibraryRefreshInterval request, CancellationToken cancellationToken) =>
-        _configElementRepository.GetValue<int>(ConfigElementKey.LibraryRefreshInterval)
-            .Map(result => result.IfNone(6));
+        public Task<int> Handle(GetLibraryRefreshInterval request, CancellationToken cancellationToken) =>
+            _configElementRepository.GetValue<int>(ConfigElementKey.LibraryRefreshInterval)
+                .Map(result => result.IfNone(6));
+    }
 }
@@ -1,3 +1,6 @@
-namespace ErsatzTV.Application.Configuration;
+using MediatR;

-public record GetPlayoutDaysToBuild : IRequest<int>;
+namespace ErsatzTV.Application.Configuration.Queries
+{
+    public record GetPlayoutDaysToBuild : IRequest<int>;
+}
@@ -1,16 +1,21 @@
-using ErsatzTV.Core.Domain;
+using System.Threading;
+using System.Threading.Tasks;
+using ErsatzTV.Core.Domain;
 using ErsatzTV.Core.Interfaces.Repositories;
+using LanguageExt;
+using MediatR;

-namespace ErsatzTV.Application.Configuration;
-
-public class GetPlayoutDaysToBuildHandler : IRequestHandler<GetPlayoutDaysToBuild, int>
+namespace ErsatzTV.Application.Configuration.Queries
 {
-    private readonly IConfigElementRepository _configElementRepository;
+    public class GetPlayoutDaysToBuildHandler : IRequestHandler<GetPlayoutDaysToBuild, int>
+    {
+        private readonly IConfigElementRepository _configElementRepository;

-    public GetPlayoutDaysToBuildHandler(IConfigElementRepository configElementRepository) =>
-        _configElementRepository = configElementRepository;
+        public GetPlayoutDaysToBuildHandler(IConfigElementRepository configElementRepository) =>
+            _configElementRepository = configElementRepository;

-    public Task<int> Handle(GetPlayoutDaysToBuild request, CancellationToken cancellationToken) =>
-        _configElementRepository.GetValue<int>(ConfigElementKey.PlayoutDaysToBuild)
-            .Map(result => result.IfNone(2));
+        public Task<int> Handle(GetPlayoutDaysToBuild request, CancellationToken cancellationToken) =>
+            _configElementRepository.GetValue<int>(ConfigElementKey.PlayoutDaysToBuild)
+                .Map(result => result.IfNone(2));
+    }
 }
@@ -1,5 +1,7 @@
 using ErsatzTV.Core;
+using LanguageExt;

-namespace ErsatzTV.Application.Emby;
-
-public record DisconnectEmby : IRequest<Either<BaseError, Unit>>;
+namespace ErsatzTV.Application.Emby.Commands
+{
+    public record DisconnectEmby : MediatR.IRequest<Either<BaseError, Unit>>;
+}
@@ -1,41 +1,46 @@
-using ErsatzTV.Core;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+using ErsatzTV.Core;
 using ErsatzTV.Core.Domain;
 using ErsatzTV.Core.Interfaces.Emby;
 using ErsatzTV.Core.Interfaces.Locking;
 using ErsatzTV.Core.Interfaces.Repositories;
 using ErsatzTV.Core.Interfaces.Search;
+using LanguageExt;

-namespace ErsatzTV.Application.Emby;
-
-public class DisconnectEmbyHandler : IRequestHandler<DisconnectEmby, Either<BaseError, Unit>>
+namespace ErsatzTV.Application.Emby.Commands
 {
-    private readonly IEmbySecretStore _embySecretStore;
-    private readonly IEntityLocker _entityLocker;
-    private readonly IMediaSourceRepository _mediaSourceRepository;
-    private readonly ISearchIndex _searchIndex;
-
-    public DisconnectEmbyHandler(
-        IMediaSourceRepository mediaSourceRepository,
-        IEmbySecretStore embySecretStore,
-        IEntityLocker entityLocker,
-        ISearchIndex searchIndex)
+    public class DisconnectEmbyHandler : MediatR.IRequestHandler<DisconnectEmby, Either<BaseError, Unit>>
    {
-        _mediaSourceRepository = mediaSourceRepository;
-        _embySecretStore = embySecretStore;
-        _entityLocker = entityLocker;
-        _searchIndex = searchIndex;
-    }
+        private readonly IEmbySecretStore _embySecretStore;
+        private readonly IEntityLocker _entityLocker;
+        private readonly IMediaSourceRepository _mediaSourceRepository;
+        private readonly ISearchIndex _searchIndex;

-    public async Task<Either<BaseError, Unit>> Handle(
-        DisconnectEmby request,
-        CancellationToken cancellationToken)
-    {
-        List<int> ids = await _mediaSourceRepository.DeleteAllEmby();
-        await _searchIndex.RemoveItems(ids);
-        _searchIndex.Commit();
-        await _embySecretStore.DeleteAll();
-        _entityLocker.UnlockRemoteMediaSource<EmbyMediaSource>();
+        public DisconnectEmbyHandler(
+            IMediaSourceRepository mediaSourceRepository,
+            IEmbySecretStore embySecretStore,
+            IEntityLocker entityLocker,
+            ISearchIndex searchIndex)
+        {
+            _mediaSourceRepository = mediaSourceRepository;
+            _embySecretStore = embySecretStore;
+            _entityLocker = entityLocker;
+            _searchIndex = searchIndex;
+        }

-        return Unit.Default;
+        public async Task<Either<BaseError, Unit>> Handle(
+            DisconnectEmby request,
+            CancellationToken cancellationToken)
+        {
+            List<int> ids = await _mediaSourceRepository.DeleteAllEmby();
+            await _searchIndex.RemoveItems(ids);
+            _searchIndex.Commit();
+            await _embySecretStore.DeleteAll();
+            _entityLocker.UnlockRemoteMediaSource<EmbyMediaSource>();
+
+            return Unit.Default;
+        }
    }
 }
@@ -1,6 +1,8 @@
 using ErsatzTV.Core;
 using ErsatzTV.Core.Emby;
+using LanguageExt;

-namespace ErsatzTV.Application.Emby;
-
-public record SaveEmbySecrets(EmbySecrets Secrets) : IRequest<Either<BaseError, Unit>>;
+namespace ErsatzTV.Application.Emby.Commands
+{
+    public record SaveEmbySecrets(EmbySecrets Secrets) : MediatR.IRequest<Either<BaseError, Unit>>;
+}
@@ -1,56 +1,60 @@
-using System.Threading.Channels;
+using System.Threading;
+using System.Threading.Channels;
+using System.Threading.Tasks;
 using ErsatzTV.Core;
 using ErsatzTV.Core.Emby;
 using ErsatzTV.Core.Interfaces.Emby;
 using ErsatzTV.Core.Interfaces.Repositories;
+using LanguageExt;

-namespace ErsatzTV.Application.Emby;
-
-public class SaveEmbySecretsHandler : IRequestHandler<SaveEmbySecrets, Either<BaseError, Unit>>
+namespace ErsatzTV.Application.Emby.Commands
 {
-    private readonly ChannelWriter<IEmbyBackgroundServiceRequest> _channel;
-    private readonly IEmbyApiClient _embyApiClient;
-    private readonly IEmbySecretStore _embySecretStore;
-    private readonly IMediaSourceRepository _mediaSourceRepository;
-
-    public SaveEmbySecretsHandler(
-        IEmbySecretStore embySecretStore,
-        IEmbyApiClient embyApiClient,
-        IMediaSourceRepository mediaSourceRepository,
-        ChannelWriter<IEmbyBackgroundServiceRequest> channel)
+    public class SaveEmbySecretsHandler : MediatR.IRequestHandler<SaveEmbySecrets, Either<BaseError, Unit>>
    {
-        _embySecretStore = embySecretStore;
-        _embyApiClient = embyApiClient;
-        _mediaSourceRepository = mediaSourceRepository;
-        _channel = channel;
+        private readonly ChannelWriter<IEmbyBackgroundServiceRequest> _channel;
+        private readonly IEmbyApiClient _embyApiClient;
+        private readonly IEmbySecretStore _embySecretStore;
+        private readonly IMediaSourceRepository _mediaSourceRepository;
+
+        public SaveEmbySecretsHandler(
+            IEmbySecretStore embySecretStore,
+            IEmbyApiClient embyApiClient,
+            IMediaSourceRepository mediaSourceRepository,
+            ChannelWriter<IEmbyBackgroundServiceRequest> channel)
+        {
+            _embySecretStore = embySecretStore;
+            _embyApiClient = embyApiClient;
+            _mediaSourceRepository = mediaSourceRepository;
+            _channel = channel;
+        }
+
+        public Task<Either<BaseError, Unit>> Handle(SaveEmbySecrets request, CancellationToken cancellationToken) =>
+            Validate(request)
+                .MapT(PerformSave)
+                .Bind(v => v.ToEitherAsync());
+
+        private async Task<Validation<BaseError, Parameters>> Validate(SaveEmbySecrets request)
+        {
+            Either<BaseError, EmbyServerInformation> maybeServerInformation = await _embyApiClient
+                .GetServerInformation(request.Secrets.Address, request.Secrets.ApiKey);
+
+            return maybeServerInformation.Match(
+                info => Validation<BaseError, Parameters>.Success(new Parameters(request.Secrets, info)),
+                error => error);
+        }
+
+        private async Task<Unit> PerformSave(Parameters parameters)
+        {
+            await _embySecretStore.SaveSecrets(parameters.Secrets);
+            await _mediaSourceRepository.UpsertEmby(
+                parameters.Secrets.Address,
+                parameters.ServerInformation.ServerName,
+                parameters.ServerInformation.OperatingSystem);
+            await _channel.WriteAsync(new SynchronizeEmbyMediaSources());
+
+            return Unit.Default;
+        }
+
+        private record Parameters(EmbySecrets Secrets, EmbyServerInformation ServerInformation);
    }
-
-    public Task<Either<BaseError, Unit>> Handle(SaveEmbySecrets request, CancellationToken cancellationToken) =>
-        Validate(request)
-            .MapT(PerformSave)
-            .Bind(v => v.ToEitherAsync());
-
-    private async Task<Validation<BaseError, Parameters>> Validate(SaveEmbySecrets request)
-    {
-        Either<BaseError, EmbyServerInformation> maybeServerInformation = await _embyApiClient
-            .GetServerInformation(request.Secrets.Address, request.Secrets.ApiKey);
-
-        return maybeServerInformation.Match(
-            info => Validation<BaseError, Parameters>.Success(new Parameters(request.Secrets, info)),
-            error => error);
-    }
-
-    private async Task<Unit> PerformSave(Parameters parameters)
-    {
-        await _embySecretStore.SaveSecrets(parameters.Secrets);
-        await _mediaSourceRepository.UpsertEmby(
-            parameters.Secrets.Address,
-            parameters.ServerInformation.ServerName,
-            parameters.ServerInformation.OperatingSystem);
-        await _channel.WriteAsync(new SynchronizeEmbyMediaSources());
-
-        return Unit.Default;
-    }
-
-    private record Parameters(EmbySecrets Secrets, EmbyServerInformation ServerInformation);
 }
@@ -1,6 +0,0 @@
-using ErsatzTV.Core;
-
-namespace ErsatzTV.Application.Emby;
-
-public record SynchronizeEmbyCollections(int EmbyMediaSourceId) : IRequest<Either<BaseError, Unit>>,
-    IEmbyBackgroundServiceRequest;
@@ -1,73 +0,0 @@
-using ErsatzTV.Core;
-using ErsatzTV.Core.Domain;
-using ErsatzTV.Core.Emby;
-using ErsatzTV.Core.Interfaces.Emby;
-using ErsatzTV.Core.Interfaces.Repositories;
-
-namespace ErsatzTV.Application.Emby;
-
-public class SynchronizeEmbyCollectionsHandler : IRequestHandler<SynchronizeEmbyCollections, Either<BaseError, Unit>>
-{
-    private readonly IEmbySecretStore _embySecretStore;
-    private readonly IMediaSourceRepository _mediaSourceRepository;
-    private readonly IEmbyCollectionScanner _scanner;
-
-    public SynchronizeEmbyCollectionsHandler(
-        IMediaSourceRepository mediaSourceRepository,
-        IEmbySecretStore embySecretStore,
-        IEmbyCollectionScanner scanner)
-    {
-        _mediaSourceRepository = mediaSourceRepository;
-        _embySecretStore = embySecretStore;
-        _scanner = scanner;
-    }
-
-
-    public async Task<Either<BaseError, Unit>> Handle(
-        SynchronizeEmbyCollections request,
-        CancellationToken cancellationToken)
-    {
-        Validation<BaseError, ConnectionParameters> validation = await Validate(request);
-        return await validation.Match(
-            SynchronizeCollections,
-            error => Task.FromResult<Either<BaseError, Unit>>(error.Join()));
-    }
-
-    private Task<Validation<BaseError, ConnectionParameters>> Validate(SynchronizeEmbyCollections request) =>
-        MediaSourceMustExist(request)
-            .BindT(MediaSourceMustHaveActiveConnection)
-            .BindT(MediaSourceMustHaveApiKey);
-
-    private Task<Validation<BaseError, EmbyMediaSource>> MediaSourceMustExist(
-        SynchronizeEmbyCollections request) =>
-        _mediaSourceRepository.GetEmby(request.EmbyMediaSourceId)
-            .Map(o => o.ToValidation<BaseError>("Emby media source does not exist."));
-
-    private Validation<BaseError, ConnectionParameters> MediaSourceMustHaveActiveConnection(
-        EmbyMediaSource embyMediaSource)
-    {
-        Option<EmbyConnection> maybeConnection = embyMediaSource.Connections.HeadOrNone();
-        return maybeConnection.Map(connection => new ConnectionParameters(connection))
-            .ToValidation<BaseError>("Emby media source requires an active connection");
-    }
-
-    private async Task<Validation<BaseError, ConnectionParameters>> MediaSourceMustHaveApiKey(
-        ConnectionParameters connectionParameters)
-    {
-        EmbySecrets secrets = await _embySecretStore.ReadSecrets();
-        return Optional(secrets.Address == connectionParameters.ActiveConnection.Address)
-            .Where(match => match)
-            .Map(_ => connectionParameters with { ApiKey = secrets.ApiKey })
-            .ToValidation<BaseError>("Emby media source requires an api key");
-    }
-
-    private async Task<Either<BaseError, Unit>> SynchronizeCollections(ConnectionParameters connectionParameters) =>
-        await _scanner.ScanCollections(
-            connectionParameters.ActiveConnection.Address,
-            connectionParameters.ApiKey);
-
-    private record ConnectionParameters(EmbyConnection ActiveConnection)
-    {
-        public string ApiKey { get; set; }
-    }
-}
@@ -1,6 +1,8 @@
 using ErsatzTV.Core;
+using LanguageExt;

-namespace ErsatzTV.Application.Emby;
-
-public record SynchronizeEmbyLibraries(int EmbyMediaSourceId) : IRequest<Either<BaseError, Unit>>,
-    IEmbyBackgroundServiceRequest;
+namespace ErsatzTV.Application.Emby.Commands
+{
+    public record SynchronizeEmbyLibraries(int EmbyMediaSourceId) : MediatR.IRequest<Either<BaseError, Unit>>,
+        IEmbyBackgroundServiceRequest;
+}
@@ -1,111 +1,118 @@
-using ErsatzTV.Core;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using ErsatzTV.Core;
 using ErsatzTV.Core.Domain;
 using ErsatzTV.Core.Emby;
 using ErsatzTV.Core.Interfaces.Emby;
 using ErsatzTV.Core.Interfaces.Repositories;
 using ErsatzTV.Core.Interfaces.Search;
+using LanguageExt;
 using Microsoft.Extensions.Logging;
+using static LanguageExt.Prelude;

-namespace ErsatzTV.Application.Emby;
-
-public class
-    SynchronizeEmbyLibrariesHandler : IRequestHandler<SynchronizeEmbyLibraries, Either<BaseError, Unit>>
+namespace ErsatzTV.Application.Emby.Commands
 {
-    private readonly IEmbyApiClient _embyApiClient;
-    private readonly IEmbySecretStore _embySecretStore;
-    private readonly ILogger<SynchronizeEmbyLibrariesHandler> _logger;
-    private readonly IMediaSourceRepository _mediaSourceRepository;
-    private readonly ISearchIndex _searchIndex;
-
-    public SynchronizeEmbyLibrariesHandler(
-        IMediaSourceRepository mediaSourceRepository,
-        IEmbySecretStore embySecretStore,
-        IEmbyApiClient embyApiClient,
-        ILogger<SynchronizeEmbyLibrariesHandler> logger,
-        ISearchIndex searchIndex)
+    public class
+        SynchronizeEmbyLibrariesHandler : MediatR.IRequestHandler<SynchronizeEmbyLibraries, Either<BaseError, Unit>>
    {
-        _mediaSourceRepository = mediaSourceRepository;
-        _embySecretStore = embySecretStore;
-        _embyApiClient = embyApiClient;
-        _logger = logger;
-        _searchIndex = searchIndex;
-    }
+        private readonly IEmbyApiClient _embyApiClient;
+        private readonly IEmbySecretStore _embySecretStore;
+        private readonly ILogger<SynchronizeEmbyLibrariesHandler> _logger;
+        private readonly IMediaSourceRepository _mediaSourceRepository;
+        private readonly ISearchIndex _searchIndex;

-    public Task<Either<BaseError, Unit>> Handle(
-        SynchronizeEmbyLibraries request,
-        CancellationToken cancellationToken) =>
-        Validate(request)
-            .MapT(SynchronizeLibraries)
-            .Bind(v => v.ToEitherAsync());
+        public SynchronizeEmbyLibrariesHandler(
+            IMediaSourceRepository mediaSourceRepository,
+            IEmbySecretStore embySecretStore,
+            IEmbyApiClient embyApiClient,
+            ILogger<SynchronizeEmbyLibrariesHandler> logger,
+            ISearchIndex searchIndex)
+        {
+            _mediaSourceRepository = mediaSourceRepository;
+            _embySecretStore = embySecretStore;
+            _embyApiClient = embyApiClient;
+            _logger = logger;
+            _searchIndex = searchIndex;
+        }

-    private Task<Validation<BaseError, ConnectionParameters>> Validate(SynchronizeEmbyLibraries request) =>
-        MediaSourceMustExist(request)
-            .BindT(MediaSourceMustHaveActiveConnection)
-            .BindT(MediaSourceMustHaveApiKey);
+        public Task<Either<BaseError, Unit>> Handle(
+            SynchronizeEmbyLibraries request,
+            CancellationToken cancellationToken) =>
+            Validate(request)
+                .MapT(SynchronizeLibraries)
+                .Bind(v => v.ToEitherAsync());

-    private Task<Validation<BaseError, EmbyMediaSource>> MediaSourceMustExist(
-        SynchronizeEmbyLibraries request) =>
-        _mediaSourceRepository.GetEmby(request.EmbyMediaSourceId)
-            .Map(o => o.ToValidation<BaseError>("Emby media source does not exist."));
+        private Task<Validation<BaseError, ConnectionParameters>> Validate(SynchronizeEmbyLibraries request) =>
+            MediaSourceMustExist(request)
+                .BindT(MediaSourceMustHaveActiveConnection)
+                .BindT(MediaSourceMustHaveApiKey);

-    private Validation<BaseError, ConnectionParameters> MediaSourceMustHaveActiveConnection(
-        EmbyMediaSource embyMediaSource)
-    {
-        Option<EmbyConnection> maybeConnection = embyMediaSource.Connections.HeadOrNone();
-        return maybeConnection.Map(connection => new ConnectionParameters(embyMediaSource, connection))
-            .ToValidation<BaseError>("Emby media source requires an active connection");
-    }
+        private Task<Validation<BaseError, EmbyMediaSource>> MediaSourceMustExist(
+            SynchronizeEmbyLibraries request) =>
+            _mediaSourceRepository.GetEmby(request.EmbyMediaSourceId)
+                .Map(o => o.ToValidation<BaseError>("Emby media source does not exist."));

-    private async Task<Validation<BaseError, ConnectionParameters>> MediaSourceMustHaveApiKey(
-        ConnectionParameters connectionParameters)
-    {
-        EmbySecrets secrets = await _embySecretStore.ReadSecrets();
-        return Optional(secrets.Address == connectionParameters.ActiveConnection.Address)
-            .Where(match => match)
-            .Map(_ => connectionParameters with { ApiKey = secrets.ApiKey })
-            .ToValidation<BaseError>("Emby media source requires an api key");
-    }
+        private Validation<BaseError, ConnectionParameters> MediaSourceMustHaveActiveConnection(
+            EmbyMediaSource embyMediaSource)
+        {
+            Option<EmbyConnection> maybeConnection = embyMediaSource.Connections.HeadOrNone();
+            return maybeConnection.Map(connection => new ConnectionParameters(embyMediaSource, connection))
+                .ToValidation<BaseError>("Emby media source requires an active connection");
+        }

-    private async Task<Unit> SynchronizeLibraries(ConnectionParameters connectionParameters)
-    {
-        Either<BaseError, List<EmbyLibrary>> maybeLibraries = await _embyApiClient.GetLibraries(
-            connectionParameters.ActiveConnection.Address,
-            connectionParameters.ApiKey);
+        private async Task<Validation<BaseError, ConnectionParameters>> MediaSourceMustHaveApiKey(
+            ConnectionParameters connectionParameters)
+        {
+            EmbySecrets secrets = await _embySecretStore.ReadSecrets();
+            return Optional(secrets.Address == connectionParameters.ActiveConnection.Address)
+                .Where(match => match)
+                .Map(_ => connectionParameters with { ApiKey = secrets.ApiKey })
+                .ToValidation<BaseError>("Emby media source requires an api key");
+        }

-        await maybeLibraries.Match(
-            async libraries =>
-            {
-                var existing = connectionParameters.EmbyMediaSource.Libraries.OfType<EmbyLibrary>()
-                    .ToList();
-                var toAdd = libraries.Filter(library => existing.All(l => l.ItemId != library.ItemId)).ToList();
-                var toRemove = existing.Filter(library => libraries.All(l => l.ItemId != library.ItemId)).ToList();
-                List<int> ids = await _mediaSourceRepository.UpdateLibraries(
-                    connectionParameters.EmbyMediaSource.Id,
-                    toAdd,
-                    toRemove);
-                if (ids.Any())
+        private async Task<Unit> SynchronizeLibraries(ConnectionParameters connectionParameters)
+        {
+            Either<BaseError, List<EmbyLibrary>> maybeLibraries = await _embyApiClient.GetLibraries(
+                connectionParameters.ActiveConnection.Address,
+                connectionParameters.ApiKey);
+
+            await maybeLibraries.Match(
+                async libraries =>
                {
-                    await _searchIndex.RemoveItems(ids);
-                    _searchIndex.Commit();
-                }
-            },
-            error =>
-            {
-                _logger.LogWarning(
-                    "Unable to synchronize libraries from emby server {EmbyServer}: {Error}",
-                    connectionParameters.EmbyMediaSource.ServerName,
-                    error.Value);
+                    var existing = connectionParameters.EmbyMediaSource.Libraries.OfType<EmbyLibrary>()
+                        .ToList();
+                    var toAdd = libraries.Filter(library => existing.All(l => l.ItemId != library.ItemId)).ToList();
+                    var toRemove = existing.Filter(library => libraries.All(l => l.ItemId != library.ItemId)).ToList();
+                    List<int> ids = await _mediaSourceRepository.UpdateLibraries(
+                        connectionParameters.EmbyMediaSource.Id,
+                        toAdd,
+                        toRemove);
+                    if (ids.Any())
+                    {
+                        await _searchIndex.RemoveItems(ids);
+                        _searchIndex.Commit();
+                    }
+                },
+                error =>
+                {
+                    _logger.LogWarning(
+                        "Unable to synchronize libraries from emby server {EmbyServer}: {Error}",
+                        connectionParameters.EmbyMediaSource.ServerName,
+                        error.Value);

-                return Task.CompletedTask;
-            });
+                    return Task.CompletedTask;
+                });

-        return Unit.Default;
-    }
+            return Unit.Default;
+        }

-    private record ConnectionParameters(
-        EmbyMediaSource EmbyMediaSource,
-        EmbyConnection ActiveConnection)
-    {
-        public string ApiKey { get; set; }
+        private record ConnectionParameters(
+            EmbyMediaSource EmbyMediaSource,
+            EmbyConnection ActiveConnection)
+        {
+            public string ApiKey { get; set; }
+        }
    }
 }
@@ -1,20 +1,23 @@
 using ErsatzTV.Core;
+using LanguageExt;
+using MediatR;

-namespace ErsatzTV.Application.Emby;
-
-public interface ISynchronizeEmbyLibraryById : IRequest<Either<BaseError, string>>,
-    IEmbyBackgroundServiceRequest
+namespace ErsatzTV.Application.Emby.Commands
 {
-    int EmbyLibraryId { get; }
-    bool ForceScan { get; }
-}
+    public interface ISynchronizeEmbyLibraryById : IRequest<Either<BaseError, string>>,
+        IEmbyBackgroundServiceRequest
+    {
+        int EmbyLibraryId { get; }
+        bool ForceScan { get; }
+    }

-public record SynchronizeEmbyLibraryByIdIfNeeded(int EmbyLibraryId) : ISynchronizeEmbyLibraryById
-{
-    public bool ForceScan => false;
-}
+    public record SynchronizeEmbyLibraryByIdIfNeeded(int EmbyLibraryId) : ISynchronizeEmbyLibraryById
+    {
+        public bool ForceScan => false;
+    }

-public record ForceSynchronizeEmbyLibraryById(int EmbyLibraryId) : ISynchronizeEmbyLibraryById
-{
-    public bool ForceScan => true;
+    public record ForceSynchronizeEmbyLibraryById(int EmbyLibraryId) : ISynchronizeEmbyLibraryById
+    {
+        public bool ForceScan => true;
+    }
 }
@@ -1,101 +1,96 @@
-using System.Threading.Channels;
+using System;
+using System.IO;
+using System.Threading;
+using System.Threading.Tasks;
 using ErsatzTV.Core;
 using ErsatzTV.Core.Domain;
 using ErsatzTV.Core.Emby;
 using ErsatzTV.Core.Interfaces.Emby;
 using ErsatzTV.Core.Interfaces.Locking;
 using ErsatzTV.Core.Interfaces.Repositories;
+using LanguageExt;
+using MediatR;
 using Microsoft.Extensions.Logging;
+using static LanguageExt.Prelude;
+using Unit = LanguageExt.Unit;

-namespace ErsatzTV.Application.Emby;
-
-public class SynchronizeEmbyLibraryByIdHandler :
-    IRequestHandler<ForceSynchronizeEmbyLibraryById, Either<BaseError, string>>,
-    IRequestHandler<SynchronizeEmbyLibraryByIdIfNeeded, Either<BaseError, string>>
+namespace ErsatzTV.Application.Emby.Commands
 {
-    private readonly IConfigElementRepository _configElementRepository;
-    private readonly IEmbyMovieLibraryScanner _embyMovieLibraryScanner;
-
-    private readonly IEmbySecretStore _embySecretStore;
-    private readonly IEmbyTelevisionLibraryScanner _embyTelevisionLibraryScanner;
-    private readonly ChannelWriter<IEmbyBackgroundServiceRequest> _embyWorkerChannel;
-    private readonly IEntityLocker _entityLocker;
-    private readonly ILibraryRepository _libraryRepository;
-    private readonly ILogger<SynchronizeEmbyLibraryByIdHandler> _logger;
-
-    private readonly IMediaSourceRepository _mediaSourceRepository;
-
-    public SynchronizeEmbyLibraryByIdHandler(
-        IMediaSourceRepository mediaSourceRepository,
-        IEmbySecretStore embySecretStore,
-        IEmbyMovieLibraryScanner embyMovieLibraryScanner,
-        IEmbyTelevisionLibraryScanner embyTelevisionLibraryScanner,
-        ILibraryRepository libraryRepository,
-        IEntityLocker entityLocker,
-        IConfigElementRepository configElementRepository,
-        ChannelWriter<IEmbyBackgroundServiceRequest> embyWorkerChannel,
-        ILogger<SynchronizeEmbyLibraryByIdHandler> logger)
+    public class SynchronizeEmbyLibraryByIdHandler :
+        IRequestHandler<ForceSynchronizeEmbyLibraryById, Either<BaseError, string>>,
+        IRequestHandler<SynchronizeEmbyLibraryByIdIfNeeded, Either<BaseError, string>>
    {
-        _mediaSourceRepository = mediaSourceRepository;
-        _embySecretStore = embySecretStore;
-        _embyMovieLibraryScanner = embyMovieLibraryScanner;
-        _embyTelevisionLibraryScanner = embyTelevisionLibraryScanner;
-        _libraryRepository = libraryRepository;
-        _entityLocker = entityLocker;
-        _configElementRepository = configElementRepository;
-        _embyWorkerChannel = embyWorkerChannel;
-        _logger = logger;
-    }
+        private readonly IConfigElementRepository _configElementRepository;
+        private readonly IEmbyMovieLibraryScanner _embyMovieLibraryScanner;

-    public Task<Either<BaseError, string>> Handle(
-        ForceSynchronizeEmbyLibraryById request,
-        CancellationToken cancellationToken) => Handle(request);
+        private readonly IEmbySecretStore _embySecretStore;
+        private readonly IEmbyTelevisionLibraryScanner _embyTelevisionLibraryScanner;
+        private readonly IEntityLocker _entityLocker;
+        private readonly ILibraryRepository _libraryRepository;
+        private readonly ILogger<SynchronizeEmbyLibraryByIdHandler> _logger;

-    public Task<Either<BaseError, string>> Handle(
-        SynchronizeEmbyLibraryByIdIfNeeded request,
-        CancellationToken cancellationToken) => Handle(request);
+        private readonly IMediaSourceRepository _mediaSourceRepository;

-    private Task<Either<BaseError, string>>
-        Handle(ISynchronizeEmbyLibraryById request) =>
-        Validate(request)
-            .MapT(parameters => Synchronize(parameters).Map(_ => parameters.Library.Name))
-            .Bind(v => v.ToEitherAsync());
+        public SynchronizeEmbyLibraryByIdHandler(
+            IMediaSourceRepository mediaSourceRepository,
+            IEmbySecretStore embySecretStore,
+            IEmbyMovieLibraryScanner embyMovieLibraryScanner,
+            IEmbyTelevisionLibraryScanner embyTelevisionLibraryScanner,
+            ILibraryRepository libraryRepository,
+            IEntityLocker entityLocker,
+            IConfigElementRepository configElementRepository,
+            ILogger<SynchronizeEmbyLibraryByIdHandler> logger)
+        {
+            _mediaSourceRepository = mediaSourceRepository;
+            _embySecretStore = embySecretStore;
+            _embyMovieLibraryScanner = embyMovieLibraryScanner;
+            _embyTelevisionLibraryScanner = embyTelevisionLibraryScanner;
+            _libraryRepository = libraryRepository;
+            _entityLocker = entityLocker;
+            _configElementRepository = configElementRepository;
+            _logger = logger;
+        }

-    private async Task<Unit> Synchronize(RequestParameters parameters)
-    {
-        try
+        public Task<Either<BaseError, string>> Handle(
+            ForceSynchronizeEmbyLibraryById request,
+            CancellationToken cancellationToken) => Handle(request);
+
+        public Task<Either<BaseError, string>> Handle(
+            SynchronizeEmbyLibraryByIdIfNeeded request,
+            CancellationToken cancellationToken) => Handle(request);
+
+        private Task<Either<BaseError, string>>
+            Handle(ISynchronizeEmbyLibraryById request) =>
+            Validate(request)
+                .MapT(parameters => Synchronize(parameters).Map(_ => parameters.Library.Name))
+                .Bind(v => v.ToEitherAsync());
+
+        private async Task<Unit> Synchronize(RequestParameters parameters)
        {
            var lastScan = new DateTimeOffset(parameters.Library.LastScan ?? SystemTime.MinValueUtc, TimeSpan.Zero);
            DateTimeOffset nextScan = lastScan + TimeSpan.FromHours(parameters.LibraryRefreshInterval);
            if (parameters.ForceScan || nextScan < DateTimeOffset.Now)
            {
-                Either<BaseError, Unit> result = parameters.Library.MediaKind switch
+                switch (parameters.Library.MediaKind)
                {
-                    LibraryMediaKind.Movies =>
+                    case LibraryMediaKind.Movies:
                        await _embyMovieLibraryScanner.ScanLibrary(
                            parameters.ConnectionParameters.ActiveConnection.Address,
                            parameters.ConnectionParameters.ApiKey,
                            parameters.Library,
-                            parameters.FFmpegPath,
-                            parameters.FFprobePath),
-                    LibraryMediaKind.Shows =>
+                            parameters.FFprobePath);
+                        break;
+                    case LibraryMediaKind.Shows:
                        await _embyTelevisionLibraryScanner.ScanLibrary(
                            parameters.ConnectionParameters.ActiveConnection.Address,
                            parameters.ConnectionParameters.ApiKey,
                            parameters.Library,
-                            parameters.FFmpegPath,
-                            parameters.FFprobePath),
-                    _ => BaseError.New("Unsupported library media kind")
-                };
-
-                if (result.IsRight)
-                {
-                    parameters.Library.LastScan = DateTime.UtcNow;
-                    await _libraryRepository.UpdateLastScan(parameters.Library);
-
-                    await _embyWorkerChannel.WriteAsync(
-                        new SynchronizeEmbyCollections(parameters.Library.MediaSourceId));
+                            parameters.FFprobePath);
+                        break;
                }
+
+                parameters.Library.LastScan = DateTime.UtcNow;
+                await _libraryRepository.UpdateLastScan(parameters.Library);
            }
            else
            {
@@ -104,96 +99,83 @@ public class SynchronizeEmbyLibraryByIdHandler :
                    parameters.Library.Name);
            }

+            _entityLocker.UnlockLibrary(parameters.Library.Id);
            return Unit.Default;
        }
-        finally
-        {
-            _entityLocker.UnlockLibrary(parameters.Library.Id);
-        }
-    }

-    private async Task<Validation<BaseError, RequestParameters>> Validate(
-        ISynchronizeEmbyLibraryById request) =>
-        (await ValidateConnection(request), await EmbyLibraryMustExist(request),
-            await ValidateLibraryRefreshInterval(), await ValidateFFmpegPath(), await ValidateFFprobePath())
-        .Apply(
-            (connectionParameters, embyLibrary, libraryRefreshInterval, ffmpegPath, ffprobePath) =>
-                new RequestParameters(
+        private async Task<Validation<BaseError, RequestParameters>> Validate(
+            ISynchronizeEmbyLibraryById request) =>
+            (await ValidateConnection(request), await EmbyLibraryMustExist(request),
+                await ValidateLibraryRefreshInterval(), await ValidateFFprobePath())
+            .Apply(
+                (connectionParameters, embyLibrary, libraryRefreshInterval, ffprobePath) => new RequestParameters(
                    connectionParameters,
                    embyLibrary,
                    request.ForceScan,
                    libraryRefreshInterval,
-                    ffmpegPath,
                    ffprobePath
                ));

-    private Task<Validation<BaseError, ConnectionParameters>> ValidateConnection(
-        ISynchronizeEmbyLibraryById request) =>
-        EmbyMediaSourceMustExist(request)
-            .BindT(MediaSourceMustHaveActiveConnection)
-            .BindT(MediaSourceMustHaveApiKey);
+        private Task<Validation<BaseError, ConnectionParameters>> ValidateConnection(
+            ISynchronizeEmbyLibraryById request) =>
+            EmbyMediaSourceMustExist(request)
+                .BindT(MediaSourceMustHaveActiveConnection)
+                .BindT(MediaSourceMustHaveApiKey);

-    private Task<Validation<BaseError, EmbyMediaSource>> EmbyMediaSourceMustExist(
-        ISynchronizeEmbyLibraryById request) =>
-        _mediaSourceRepository.GetEmbyByLibraryId(request.EmbyLibraryId)
-            .Map(
-                v => v.ToValidation<BaseError>(
-                    $"Emby media source for library {request.EmbyLibraryId} does not exist."));
+        private Task<Validation<BaseError, EmbyMediaSource>> EmbyMediaSourceMustExist(
+            ISynchronizeEmbyLibraryById request) =>
+            _mediaSourceRepository.GetEmbyByLibraryId(request.EmbyLibraryId)
+                .Map(
+                    v => v.ToValidation<BaseError>(
+                        $"Emby media source for library {request.EmbyLibraryId} does not exist."));

-    private Validation<BaseError, ConnectionParameters> MediaSourceMustHaveActiveConnection(
-        EmbyMediaSource embyMediaSource)
-    {
-        Option<EmbyConnection> maybeConnection = embyMediaSource.Connections.HeadOrNone();
-        return maybeConnection.Map(connection => new ConnectionParameters(embyMediaSource, connection))
-            .ToValidation<BaseError>("Emby media source requires an active connection");
-    }
+        private Validation<BaseError, ConnectionParameters> MediaSourceMustHaveActiveConnection(
+            EmbyMediaSource embyMediaSource)
+        {
+            Option<EmbyConnection> maybeConnection = embyMediaSource.Connections.HeadOrNone();
+            return maybeConnection.Map(connection => new ConnectionParameters(embyMediaSource, connection))
+                .ToValidation<BaseError>("Emby media source requires an active connection");
+        }

-    private async Task<Validation<BaseError, ConnectionParameters>> MediaSourceMustHaveApiKey(
-        ConnectionParameters connectionParameters)
-    {
-        EmbySecrets secrets = await _embySecretStore.ReadSecrets();
-        return Optional(secrets.Address == connectionParameters.ActiveConnection.Address)
-            .Where(match => match)
-            .Map(_ => connectionParameters with { ApiKey = secrets.ApiKey })
-            .ToValidation<BaseError>("Emby media source requires an api key");
-    }
+        private async Task<Validation<BaseError, ConnectionParameters>> MediaSourceMustHaveApiKey(
+            ConnectionParameters connectionParameters)
+        {
+            EmbySecrets secrets = await _embySecretStore.ReadSecrets();
+            return Optional(secrets.Address == connectionParameters.ActiveConnection.Address)
+                .Where(match => match)
+                .Map(_ => connectionParameters with { ApiKey = secrets.ApiKey })
+                .ToValidation<BaseError>("Emby media source requires an api key");
+        }

-    private Task<Validation<BaseError, EmbyLibrary>> EmbyLibraryMustExist(
-        ISynchronizeEmbyLibraryById request) =>
-        _mediaSourceRepository.GetEmbyLibrary(request.EmbyLibraryId)
-            .Map(v => v.ToValidation<BaseError>($"Emby library {request.EmbyLibraryId} does not exist."));
+        private Task<Validation<BaseError, EmbyLibrary>> EmbyLibraryMustExist(
+            ISynchronizeEmbyLibraryById request) =>
+            _mediaSourceRepository.GetEmbyLibrary(request.EmbyLibraryId)
+                .Map(v => v.ToValidation<BaseError>($"Emby library {request.EmbyLibraryId} does not exist."));

-    private Task<Validation<BaseError, int>> ValidateLibraryRefreshInterval() =>
-        _configElementRepository.GetValue<int>(ConfigElementKey.LibraryRefreshInterval)
-            .FilterT(lri => lri > 0)
-            .Map(lri => lri.ToValidation<BaseError>("Library refresh interval is invalid"));
+        private Task<Validation<BaseError, int>> ValidateLibraryRefreshInterval() =>
+            _configElementRepository.GetValue<int>(ConfigElementKey.LibraryRefreshInterval)
+                .FilterT(lri => lri > 0)
+                .Map(lri => lri.ToValidation<BaseError>("Library refresh interval is invalid"));

-    private Task<Validation<BaseError, string>> ValidateFFmpegPath() =>
-        _configElementRepository.GetValue<string>(ConfigElementKey.FFmpegPath)
-            .FilterT(File.Exists)
-            .Map(
-                ffmpegPath =>
-                    ffmpegPath.ToValidation<BaseError>("FFmpeg path does not exist on the file system"));
+        private Task<Validation<BaseError, string>> ValidateFFprobePath() =>
+            _configElementRepository.GetValue<string>(ConfigElementKey.FFprobePath)
+                .FilterT(File.Exists)
+                .Map(
+                    ffprobePath =>
+                        ffprobePath.ToValidation<BaseError>("FFprobe path does not exist on the file system"));

-    private Task<Validation<BaseError, string>> ValidateFFprobePath() =>
-        _configElementRepository.GetValue<string>(ConfigElementKey.FFprobePath)
-            .FilterT(File.Exists)
-            .Map(
-                ffprobePath =>
-                    ffprobePath.ToValidation<BaseError>("FFprobe path does not exist on the file system"));
+        private record RequestParameters(
+            ConnectionParameters ConnectionParameters,
+            EmbyLibrary Library,
+            bool ForceScan,
+            int LibraryRefreshInterval,
+            string FFprobePath);

-    private record RequestParameters(
-        ConnectionParameters ConnectionParameters,
-        EmbyLibrary Library,
-        bool ForceScan,
-        int LibraryRefreshInterval,
-        string FFmpegPath,
-        string FFprobePath);
-
-    private record ConnectionParameters(
-        EmbyMediaSource EmbyMediaSource,
-        EmbyConnection ActiveConnection)
-    {
-        public string ApiKey { get; set; }
+        private record ConnectionParameters(
+            EmbyMediaSource EmbyMediaSource,
+            EmbyConnection ActiveConnection)
+        {
+            public string ApiKey { get; set; }
+        }
    }
 }
@@ -1,7 +1,11 @@
-using ErsatzTV.Core;
+using System.Collections.Generic;
+using ErsatzTV.Core;
 using ErsatzTV.Core.Domain;
+using LanguageExt;
+using MediatR;

-namespace ErsatzTV.Application.Emby;
-
-public record SynchronizeEmbyMediaSources : IRequest<Either<BaseError, List<EmbyMediaSource>>>,
-    IEmbyBackgroundServiceRequest;
+namespace ErsatzTV.Application.Emby.Commands
+{
+    public record SynchronizeEmbyMediaSources : IRequest<Either<BaseError, List<EmbyMediaSource>>>,
+        IEmbyBackgroundServiceRequest;
+}
@@ -1,35 +1,41 @@
-using System.Threading.Channels;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Channels;
+using System.Threading.Tasks;
 using ErsatzTV.Core;
 using ErsatzTV.Core.Domain;
 using ErsatzTV.Core.Interfaces.Repositories;
+using LanguageExt;
+using MediatR;

-namespace ErsatzTV.Application.Emby;
-
-public class SynchronizeEmbyMediaSourcesHandler : IRequestHandler<SynchronizeEmbyMediaSources,
-    Either<BaseError, List<EmbyMediaSource>>>
+namespace ErsatzTV.Application.Emby.Commands
 {
-    private readonly ChannelWriter<IEmbyBackgroundServiceRequest> _channel;
-    private readonly IMediaSourceRepository _mediaSourceRepository;
-
-    public SynchronizeEmbyMediaSourcesHandler(
-        IMediaSourceRepository mediaSourceRepository,
-        ChannelWriter<IEmbyBackgroundServiceRequest> channel)
+    public class SynchronizeEmbyMediaSourcesHandler : IRequestHandler<SynchronizeEmbyMediaSources,
+        Either<BaseError, List<EmbyMediaSource>>>
    {
-        _mediaSourceRepository = mediaSourceRepository;
-        _channel = channel;
-    }
+        private readonly ChannelWriter<IEmbyBackgroundServiceRequest> _channel;
+        private readonly IMediaSourceRepository _mediaSourceRepository;

-    public async Task<Either<BaseError, List<EmbyMediaSource>>> Handle(
-        SynchronizeEmbyMediaSources request,
-        CancellationToken cancellationToken)
-    {
-        List<EmbyMediaSource> mediaSources = await _mediaSourceRepository.GetAllEmby();
-        foreach (EmbyMediaSource mediaSource in mediaSources)
+        public SynchronizeEmbyMediaSourcesHandler(
+            IMediaSourceRepository mediaSourceRepository,
+            ChannelWriter<IEmbyBackgroundServiceRequest> channel)
        {
-            // await _channel.WriteAsync(new SynchronizeEmbyAdminUserId(mediaSource.Id), cancellationToken);
-            await _channel.WriteAsync(new SynchronizeEmbyLibraries(mediaSource.Id), cancellationToken);
+            _mediaSourceRepository = mediaSourceRepository;
+            _channel = channel;
        }

-        return mediaSources;
+        public async Task<Either<BaseError, List<EmbyMediaSource>>> Handle(
+            SynchronizeEmbyMediaSources request,
+            CancellationToken cancellationToken)
+        {
+            List<EmbyMediaSource> mediaSources = await _mediaSourceRepository.GetAllEmby();
+            foreach (EmbyMediaSource mediaSource in mediaSources)
+            {
+                // await _channel.WriteAsync(new SynchronizeEmbyAdminUserId(mediaSource.Id), cancellationToken);
+                await _channel.WriteAsync(new SynchronizeEmbyLibraries(mediaSource.Id), cancellationToken);
+            }
+
+            return mediaSources;
+        }
    }
 }
@@ -1,8 +1,11 @@
-using ErsatzTV.Core;
+using System.Collections.Generic;
+using ErsatzTV.Core;
+using LanguageExt;

-namespace ErsatzTV.Application.Emby;
+namespace ErsatzTV.Application.Emby.Commands
+{
+    public record UpdateEmbyLibraryPreferences
+        (List<EmbyLibraryPreference> Preferences) : MediatR.IRequest<Either<BaseError, Unit>>;

-public record UpdateEmbyLibraryPreferences
-    (List<EmbyLibraryPreference> Preferences) : IRequest<Either<BaseError, Unit>>;
-
-public record EmbyLibraryPreference(int Id, bool ShouldSyncItems);
+    public record EmbyLibraryPreference(int Id, bool ShouldSyncItems);
+}
@@ -1,36 +1,42 @@
-using ErsatzTV.Core;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using ErsatzTV.Core;
 using ErsatzTV.Core.Interfaces.Repositories;
 using ErsatzTV.Core.Interfaces.Search;
+using LanguageExt;

-namespace ErsatzTV.Application.Emby;
-
-public class
-    UpdateEmbyLibraryPreferencesHandler : IRequestHandler<UpdateEmbyLibraryPreferences,
-        Either<BaseError, Unit>>
+namespace ErsatzTV.Application.Emby.Commands
 {
-    private readonly IMediaSourceRepository _mediaSourceRepository;
-    private readonly ISearchIndex _searchIndex;
-
-    public UpdateEmbyLibraryPreferencesHandler(
-        IMediaSourceRepository mediaSourceRepository,
-        ISearchIndex searchIndex)
+    public class
+        UpdateEmbyLibraryPreferencesHandler : MediatR.IRequestHandler<UpdateEmbyLibraryPreferences,
+            Either<BaseError, Unit>>
    {
-        _mediaSourceRepository = mediaSourceRepository;
-        _searchIndex = searchIndex;
-    }
+        private readonly IMediaSourceRepository _mediaSourceRepository;
+        private readonly ISearchIndex _searchIndex;

-    public async Task<Either<BaseError, Unit>> Handle(
-        UpdateEmbyLibraryPreferences request,
-        CancellationToken cancellationToken)
-    {
-        var toDisable = request.Preferences.Filter(p => p.ShouldSyncItems == false).Map(p => p.Id).ToList();
-        List<int> ids = await _mediaSourceRepository.DisableEmbyLibrarySync(toDisable);
-        await _searchIndex.RemoveItems(ids);
-        _searchIndex.Commit();
+        public UpdateEmbyLibraryPreferencesHandler(
+            IMediaSourceRepository mediaSourceRepository,
+            ISearchIndex searchIndex)
+        {
+            _mediaSourceRepository = mediaSourceRepository;
+            _searchIndex = searchIndex;
+        }

-        IEnumerable<int> toEnable = request.Preferences.Filter(p => p.ShouldSyncItems).Map(p => p.Id);
-        await _mediaSourceRepository.EnableEmbyLibrarySync(toEnable);
+        public async Task<Either<BaseError, Unit>> Handle(
+            UpdateEmbyLibraryPreferences request,
+            CancellationToken cancellationToken)
+        {
+            var toDisable = request.Preferences.Filter(p => p.ShouldSyncItems == false).Map(p => p.Id).ToList();
+            List<int> ids = await _mediaSourceRepository.DisableEmbyLibrarySync(toDisable);
+            await _searchIndex.RemoveItems(ids);
+            _searchIndex.Commit();

-        return Unit.Default;
+            IEnumerable<int> toEnable = request.Preferences.Filter(p => p.ShouldSyncItems).Map(p => p.Id);
+            await _mediaSourceRepository.EnableEmbyLibrarySync(toEnable);
+
+            return Unit.Default;
+        }
    }
 }
@@ -1,9 +1,12 @@
-using ErsatzTV.Core;
+using System.Collections.Generic;
+using ErsatzTV.Core;
+using LanguageExt;

-namespace ErsatzTV.Application.Emby;
+namespace ErsatzTV.Application.Emby.Commands
+{
+    public record UpdateEmbyPathReplacements(
+        int EmbyMediaSourceId,
+        List<EmbyPathReplacementItem> PathReplacements) : MediatR.IRequest<Either<BaseError, Unit>>;

-public record UpdateEmbyPathReplacements(
-    int EmbyMediaSourceId,
-    List<EmbyPathReplacementItem> PathReplacements) : IRequest<Either<BaseError, Unit>>;
-
-public record EmbyPathReplacementItem(int Id, string EmbyPath, string LocalPath);
+    public record EmbyPathReplacementItem(int Id, string EmbyPath, string LocalPath);
+}
@@ -1,49 +1,55 @@
-using ErsatzTV.Core;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using ErsatzTV.Core;
 using ErsatzTV.Core.Domain;
 using ErsatzTV.Core.Interfaces.Repositories;
+using LanguageExt;

-namespace ErsatzTV.Application.Emby;
-
-public class UpdateEmbyPathReplacementsHandler : IRequestHandler<UpdateEmbyPathReplacements,
-    Either<BaseError, Unit>>
+namespace ErsatzTV.Application.Emby.Commands
 {
-    private readonly IMediaSourceRepository _mediaSourceRepository;
-
-    public UpdateEmbyPathReplacementsHandler(IMediaSourceRepository mediaSourceRepository) =>
-        _mediaSourceRepository = mediaSourceRepository;
-
-    public Task<Either<BaseError, Unit>> Handle(
-        UpdateEmbyPathReplacements request,
-        CancellationToken cancellationToken) =>
-        Validate(request)
-            .MapT(pms => MergePathReplacements(request, pms))
-            .Bind(v => v.ToEitherAsync());
-
-    private Task<Unit> MergePathReplacements(
-        UpdateEmbyPathReplacements request,
-        EmbyMediaSource embyMediaSource)
+    public class UpdateEmbyPathReplacementsHandler : MediatR.IRequestHandler<UpdateEmbyPathReplacements,
+        Either<BaseError, Unit>>
    {
-        embyMediaSource.PathReplacements ??= new List<EmbyPathReplacement>();
+        private readonly IMediaSourceRepository _mediaSourceRepository;

-        var incoming = request.PathReplacements.Map(Project).ToList();
+        public UpdateEmbyPathReplacementsHandler(IMediaSourceRepository mediaSourceRepository) =>
+            _mediaSourceRepository = mediaSourceRepository;

-        var toAdd = incoming.Filter(r => r.Id < 1).ToList();
-        var toRemove = embyMediaSource.PathReplacements.Filter(r => incoming.All(pr => pr.Id != r.Id)).ToList();
-        var toUpdate = incoming.Except(toAdd).ToList();
+        public Task<Either<BaseError, Unit>> Handle(
+            UpdateEmbyPathReplacements request,
+            CancellationToken cancellationToken) =>
+            Validate(request)
+                .MapT(pms => MergePathReplacements(request, pms))
+                .Bind(v => v.ToEitherAsync());

-        return _mediaSourceRepository.UpdatePathReplacements(embyMediaSource.Id, toAdd, toUpdate, toRemove);
+        private Task<Unit> MergePathReplacements(
+            UpdateEmbyPathReplacements request,
+            EmbyMediaSource embyMediaSource)
+        {
+            embyMediaSource.PathReplacements ??= new List<EmbyPathReplacement>();
+
+            var incoming = request.PathReplacements.Map(Project).ToList();
+
+            var toAdd = incoming.Filter(r => r.Id < 1).ToList();
+            var toRemove = embyMediaSource.PathReplacements.Filter(r => incoming.All(pr => pr.Id != r.Id)).ToList();
+            var toUpdate = incoming.Except(toAdd).ToList();
+
+            return _mediaSourceRepository.UpdatePathReplacements(embyMediaSource.Id, toAdd, toUpdate, toRemove);
+        }
+
+        private static EmbyPathReplacement Project(EmbyPathReplacementItem vm) =>
+            new() { Id = vm.Id, EmbyPath = vm.EmbyPath, LocalPath = vm.LocalPath };
+
+        private Task<Validation<BaseError, EmbyMediaSource>> Validate(UpdateEmbyPathReplacements request) =>
+            EmbyMediaSourceMustExist(request);
+
+        private Task<Validation<BaseError, EmbyMediaSource>> EmbyMediaSourceMustExist(
+            UpdateEmbyPathReplacements request) =>
+            _mediaSourceRepository.GetEmby(request.EmbyMediaSourceId)
+                .Map(
+                    v => v.ToValidation<BaseError>(
+                        $"Emby media source {request.EmbyMediaSourceId} does not exist."));
    }
-
-    private static EmbyPathReplacement Project(EmbyPathReplacementItem vm) =>
-        new() { Id = vm.Id, EmbyPath = vm.EmbyPath, LocalPath = vm.LocalPath };
-
-    private Task<Validation<BaseError, EmbyMediaSource>> Validate(UpdateEmbyPathReplacements request) =>
-        EmbyMediaSourceMustExist(request);
-
-    private Task<Validation<BaseError, EmbyMediaSource>> EmbyMediaSourceMustExist(
-        UpdateEmbyPathReplacements request) =>
-        _mediaSourceRepository.GetEmby(request.EmbyMediaSourceId)
-            .Map(
-                v => v.ToValidation<BaseError>(
-                    $"Emby media source {request.EmbyMediaSourceId} does not exist."));
 }
@@ -1,3 +1,4 @@
-namespace ErsatzTV.Application.Emby;
-
-public record EmbyConnectionParametersViewModel(string Address);
+namespace ErsatzTV.Application.Emby
+{
+    public record EmbyConnectionParametersViewModel(string Address);
+}
@@ -1,7 +1,8 @@
 using ErsatzTV.Application.Libraries;
 using ErsatzTV.Core.Domain;

-namespace ErsatzTV.Application.Emby;
-
-public record EmbyLibraryViewModel(int Id, string Name, LibraryMediaKind MediaKind, bool ShouldSyncItems)
-    : LibraryViewModel("Emby", Id, Name, MediaKind);
+namespace ErsatzTV.Application.Emby
+{
+    public record EmbyLibraryViewModel(int Id, string Name, LibraryMediaKind MediaKind, bool ShouldSyncItems)
+        : LibraryViewModel("Emby", Id, Name, MediaKind);
+}
@@ -1,8 +1,9 @@
 using ErsatzTV.Application.MediaSources;

-namespace ErsatzTV.Application.Emby;
-
-public record EmbyMediaSourceViewModel(int Id, string Name, string Address) : RemoteMediaSourceViewModel(
-    Id,
-    Name,
-    Address);
+namespace ErsatzTV.Application.Emby
+{
+    public record EmbyMediaSourceViewModel(int Id, string Name, string Address) : RemoteMediaSourceViewModel(
+        Id,
+        Name,
+        Address);
+}
@@ -1,3 +1,4 @@
-namespace ErsatzTV.Application.Emby;
-
-public record EmbyPathReplacementViewModel(int Id, string EmbyPath, string LocalPath);
+namespace ErsatzTV.Application.Emby
+{
+    public record EmbyPathReplacementViewModel(int Id, string EmbyPath, string LocalPath);
+}
@@ -1,18 +1,19 @@
 using ErsatzTV.Core.Domain;

-namespace ErsatzTV.Application.Emby;
-
-internal static class Mapper
+namespace ErsatzTV.Application.Emby
 {
-    internal static EmbyMediaSourceViewModel ProjectToViewModel(EmbyMediaSource embyMediaSource) =>
-        new(
-            embyMediaSource.Id,
-            embyMediaSource.ServerName,
-            embyMediaSource.Connections.HeadOrNone().Match(c => c.Address, string.Empty));
+    internal static class Mapper
+    {
+        internal static EmbyMediaSourceViewModel ProjectToViewModel(EmbyMediaSource embyMediaSource) =>
+            new(
+                embyMediaSource.Id,
+                embyMediaSource.ServerName,
+                embyMediaSource.Connections.HeadOrNone().Match(c => c.Address, string.Empty));

-    internal static EmbyLibraryViewModel ProjectToViewModel(EmbyLibrary library) =>
-        new(library.Id, library.Name, library.MediaKind, library.ShouldSyncItems);
+        internal static EmbyLibraryViewModel ProjectToViewModel(EmbyLibrary library) =>
+            new(library.Id, library.Name, library.MediaKind, library.ShouldSyncItems);

-    internal static EmbyPathReplacementViewModel ProjectToViewModel(EmbyPathReplacement pathReplacement) =>
-        new(pathReplacement.Id, pathReplacement.EmbyPath, pathReplacement.LocalPath);
+        internal static EmbyPathReplacementViewModel ProjectToViewModel(EmbyPathReplacement pathReplacement) =>
+            new(pathReplacement.Id, pathReplacement.EmbyPath, pathReplacement.LocalPath);
+    }
 }
@@ -1,3 +1,7 @@
-namespace ErsatzTV.Application.Emby;
+using System.Collections.Generic;
+using MediatR;

-public record GetAllEmbyMediaSources : IRequest<List<EmbyMediaSourceViewModel>>;
+namespace ErsatzTV.Application.Emby.Queries
+{
+    public record GetAllEmbyMediaSources : IRequest<List<EmbyMediaSourceViewModel>>;
+}
@@ -1,17 +1,24 @@
-using ErsatzTV.Core.Interfaces.Repositories;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using ErsatzTV.Core.Interfaces.Repositories;
+using LanguageExt;
+using MediatR;
 using static ErsatzTV.Application.Emby.Mapper;

-namespace ErsatzTV.Application.Emby;
-
-public class GetAllEmbyMediaSourcesHandler : IRequestHandler<GetAllEmbyMediaSources, List<EmbyMediaSourceViewModel>>
+namespace ErsatzTV.Application.Emby.Queries
 {
-    private readonly IMediaSourceRepository _mediaSourceRepository;
+    public class GetAllEmbyMediaSourcesHandler : IRequestHandler<GetAllEmbyMediaSources, List<EmbyMediaSourceViewModel>>
+    {
+        private readonly IMediaSourceRepository _mediaSourceRepository;

-    public GetAllEmbyMediaSourcesHandler(IMediaSourceRepository mediaSourceRepository) =>
-        _mediaSourceRepository = mediaSourceRepository;
+        public GetAllEmbyMediaSourcesHandler(IMediaSourceRepository mediaSourceRepository) =>
+            _mediaSourceRepository = mediaSourceRepository;

-    public Task<List<EmbyMediaSourceViewModel>> Handle(
-        GetAllEmbyMediaSources request,
-        CancellationToken cancellationToken) =>
-        _mediaSourceRepository.GetAllEmby().Map(list => list.Map(ProjectToViewModel).ToList());
+        public Task<List<EmbyMediaSourceViewModel>> Handle(
+            GetAllEmbyMediaSources request,
+            CancellationToken cancellationToken) =>
+            _mediaSourceRepository.GetAllEmby().Map(list => list.Map(ProjectToViewModel).ToList());
+    }
 }
@@ -1,5 +1,8 @@
 using ErsatzTV.Core;
+using LanguageExt;
+using MediatR;

-namespace ErsatzTV.Application.Emby;
-
-public record GetEmbyConnectionParameters : IRequest<Either<BaseError, EmbyConnectionParametersViewModel>>;
+namespace ErsatzTV.Application.Emby.Queries
+{
+    public record GetEmbyConnectionParameters : IRequest<Either<BaseError, EmbyConnectionParametersViewModel>>;
+}
@@ -1,66 +1,73 @@
-using ErsatzTV.Core;
+using System;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using ErsatzTV.Core;
 using ErsatzTV.Core.Domain;
 using ErsatzTV.Core.Interfaces.Repositories;
+using LanguageExt;
+using MediatR;
 using Microsoft.Extensions.Caching.Memory;

-namespace ErsatzTV.Application.Emby;
-
-public class GetEmbyConnectionParametersHandler : IRequestHandler<GetEmbyConnectionParameters,
-    Either<BaseError, EmbyConnectionParametersViewModel>>
+namespace ErsatzTV.Application.Emby.Queries
 {
-    private readonly IMediaSourceRepository _mediaSourceRepository;
-    private readonly IMemoryCache _memoryCache;
-
-    public GetEmbyConnectionParametersHandler(
-        IMemoryCache memoryCache,
-        IMediaSourceRepository mediaSourceRepository)
+    public class GetEmbyConnectionParametersHandler : IRequestHandler<GetEmbyConnectionParameters,
+        Either<BaseError, EmbyConnectionParametersViewModel>>
    {
-        _memoryCache = memoryCache;
-        _mediaSourceRepository = mediaSourceRepository;
-    }
+        private readonly IMediaSourceRepository _mediaSourceRepository;
+        private readonly IMemoryCache _memoryCache;

-    public async Task<Either<BaseError, EmbyConnectionParametersViewModel>> Handle(
-        GetEmbyConnectionParameters request,
-        CancellationToken cancellationToken)
-    {
-        if (_memoryCache.TryGetValue(request, out EmbyConnectionParametersViewModel parameters))
+        public GetEmbyConnectionParametersHandler(
+            IMemoryCache memoryCache,
+            IMediaSourceRepository mediaSourceRepository)
        {
-            return parameters;
+            _memoryCache = memoryCache;
+            _mediaSourceRepository = mediaSourceRepository;
        }

-        Either<BaseError, EmbyConnectionParametersViewModel> maybeParameters =
-            await Validate()
-                .MapT(cp => new EmbyConnectionParametersViewModel(cp.ActiveConnection.Address))
-                .Map(v => v.ToEither<EmbyConnectionParametersViewModel>());
-
-        return maybeParameters.Match(
-            p =>
+        public async Task<Either<BaseError, EmbyConnectionParametersViewModel>> Handle(
+            GetEmbyConnectionParameters request,
+            CancellationToken cancellationToken)
+        {
+            if (_memoryCache.TryGetValue(request, out EmbyConnectionParametersViewModel parameters))
            {
-                _memoryCache.Set(request, p, TimeSpan.FromHours(1));
-                return maybeParameters;
-            },
-            error => error);
+                return parameters;
+            }
+
+            Either<BaseError, EmbyConnectionParametersViewModel> maybeParameters =
+                await Validate()
+                    .MapT(cp => new EmbyConnectionParametersViewModel(cp.ActiveConnection.Address))
+                    .Map(v => v.ToEither<EmbyConnectionParametersViewModel>());
+
+            return maybeParameters.Match(
+                p =>
+                {
+                    _memoryCache.Set(request, p, TimeSpan.FromHours(1));
+                    return maybeParameters;
+                },
+                error => error);
+        }
+
+        private Task<Validation<BaseError, ConnectionParameters>> Validate() =>
+            EmbyMediaSourceMustExist()
+                .BindT(MediaSourceMustHaveActiveConnection);
+
+        private Task<Validation<BaseError, EmbyMediaSource>> EmbyMediaSourceMustExist() =>
+            _mediaSourceRepository.GetAllEmby().Map(list => list.HeadOrNone())
+                .Map(
+                    v => v.ToValidation<BaseError>(
+                        "Emby media source does not exist."));
+
+        private Validation<BaseError, ConnectionParameters> MediaSourceMustHaveActiveConnection(
+            EmbyMediaSource embyMediaSource)
+        {
+            Option<EmbyConnection> maybeConnection = embyMediaSource.Connections.FirstOrDefault();
+            return maybeConnection.Map(connection => new ConnectionParameters(embyMediaSource, connection))
+                .ToValidation<BaseError>("Emby media source requires an active connection");
+        }
+
+        private record ConnectionParameters(
+            EmbyMediaSource EmbyMediaSource,
+            EmbyConnection ActiveConnection);
    }
-
-    private Task<Validation<BaseError, ConnectionParameters>> Validate() =>
-        EmbyMediaSourceMustExist()
-            .BindT(MediaSourceMustHaveActiveConnection);
-
-    private Task<Validation<BaseError, EmbyMediaSource>> EmbyMediaSourceMustExist() =>
-        _mediaSourceRepository.GetAllEmby().Map(list => list.HeadOrNone())
-            .Map(
-                v => v.ToValidation<BaseError>(
-                    "Emby media source does not exist."));
-
-    private Validation<BaseError, ConnectionParameters> MediaSourceMustHaveActiveConnection(
-        EmbyMediaSource embyMediaSource)
-    {
-        Option<EmbyConnection> maybeConnection = embyMediaSource.Connections.FirstOrDefault();
-        return maybeConnection.Map(connection => new ConnectionParameters(embyMediaSource, connection))
-            .ToValidation<BaseError>("Emby media source requires an active connection");
-    }
-
-    private record ConnectionParameters(
-        EmbyMediaSource EmbyMediaSource,
-        EmbyConnection ActiveConnection);
 }
@@ -1,3 +1,7 @@
-namespace ErsatzTV.Application.Emby;
+using System.Collections.Generic;
+using MediatR;

-public record GetEmbyLibrariesBySourceId(int EmbyMediaSourceId) : IRequest<List<EmbyLibraryViewModel>>;
+namespace ErsatzTV.Application.Emby.Queries
+{
+    public record GetEmbyLibrariesBySourceId(int EmbyMediaSourceId) : IRequest<List<EmbyLibraryViewModel>>;
+}
@@ -1,19 +1,26 @@
-using ErsatzTV.Core.Interfaces.Repositories;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using ErsatzTV.Core.Interfaces.Repositories;
+using LanguageExt;
+using MediatR;
 using static ErsatzTV.Application.Emby.Mapper;

-namespace ErsatzTV.Application.Emby;
-
-public class
-    GetEmbyLibrariesBySourceIdHandler : IRequestHandler<GetEmbyLibrariesBySourceId, List<EmbyLibraryViewModel>>
+namespace ErsatzTV.Application.Emby.Queries
 {
-    private readonly IMediaSourceRepository _mediaSourceRepository;
+    public class
+        GetEmbyLibrariesBySourceIdHandler : IRequestHandler<GetEmbyLibrariesBySourceId, List<EmbyLibraryViewModel>>
+    {
+        private readonly IMediaSourceRepository _mediaSourceRepository;

-    public GetEmbyLibrariesBySourceIdHandler(IMediaSourceRepository mediaSourceRepository) =>
-        _mediaSourceRepository = mediaSourceRepository;
+        public GetEmbyLibrariesBySourceIdHandler(IMediaSourceRepository mediaSourceRepository) =>
+            _mediaSourceRepository = mediaSourceRepository;

-    public Task<List<EmbyLibraryViewModel>> Handle(
-        GetEmbyLibrariesBySourceId request,
-        CancellationToken cancellationToken) =>
-        _mediaSourceRepository.GetEmbyLibraries(request.EmbyMediaSourceId)
-            .Map(list => list.Map(ProjectToViewModel).ToList());
+        public Task<List<EmbyLibraryViewModel>> Handle(
+            GetEmbyLibrariesBySourceId request,
+            CancellationToken cancellationToken) =>
+            _mediaSourceRepository.GetEmbyLibraries(request.EmbyMediaSourceId)
+                .Map(list => list.Map(ProjectToViewModel).ToList());
+    }
 }
@@ -1,3 +1,7 @@
-namespace ErsatzTV.Application.Emby;
+using LanguageExt;
+using MediatR;

-public record GetEmbyMediaSourceById(int EmbyMediaSourceId) : IRequest<Option<EmbyMediaSourceViewModel>>;
+namespace ErsatzTV.Application.Emby.Queries
+{
+    public record GetEmbyMediaSourceById(int EmbyMediaSourceId) : IRequest<Option<EmbyMediaSourceViewModel>>;
+}
@@ -1,18 +1,23 @@
-using ErsatzTV.Core.Interfaces.Repositories;
+using System.Threading;
+using System.Threading.Tasks;
+using ErsatzTV.Core.Interfaces.Repositories;
+using LanguageExt;
+using MediatR;
 using static ErsatzTV.Application.Emby.Mapper;

-namespace ErsatzTV.Application.Emby;
-
-public class
-    GetEmbyMediaSourceByIdHandler : IRequestHandler<GetEmbyMediaSourceById, Option<EmbyMediaSourceViewModel>>
+namespace ErsatzTV.Application.Emby.Queries
 {
-    private readonly IMediaSourceRepository _mediaSourceRepository;
+    public class
+        GetEmbyMediaSourceByIdHandler : IRequestHandler<GetEmbyMediaSourceById, Option<EmbyMediaSourceViewModel>>
+    {
+        private readonly IMediaSourceRepository _mediaSourceRepository;

-    public GetEmbyMediaSourceByIdHandler(IMediaSourceRepository mediaSourceRepository) =>
-        _mediaSourceRepository = mediaSourceRepository;
+        public GetEmbyMediaSourceByIdHandler(IMediaSourceRepository mediaSourceRepository) =>
+            _mediaSourceRepository = mediaSourceRepository;

-    public Task<Option<EmbyMediaSourceViewModel>> Handle(
-        GetEmbyMediaSourceById request,
-        CancellationToken cancellationToken) =>
-        _mediaSourceRepository.GetEmby(request.EmbyMediaSourceId).MapT(ProjectToViewModel);
+        public Task<Option<EmbyMediaSourceViewModel>> Handle(
+            GetEmbyMediaSourceById request,
+            CancellationToken cancellationToken) =>
+            _mediaSourceRepository.GetEmby(request.EmbyMediaSourceId).MapT(ProjectToViewModel);
+    }
 }
@@ -1,4 +1,8 @@
-namespace ErsatzTV.Application.Emby;
+using System.Collections.Generic;
+using MediatR;

-public record GetEmbyPathReplacementsBySourceId
-    (int EmbyMediaSourceId) : IRequest<List<EmbyPathReplacementViewModel>>;
+namespace ErsatzTV.Application.Emby.Queries
+{
+    public record GetEmbyPathReplacementsBySourceId
+        (int EmbyMediaSourceId) : IRequest<List<EmbyPathReplacementViewModel>>;
+}
@@ -1,19 +1,26 @@
-using ErsatzTV.Core.Interfaces.Repositories;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using ErsatzTV.Core.Interfaces.Repositories;
+using LanguageExt;
+using MediatR;
 using static ErsatzTV.Application.Emby.Mapper;

-namespace ErsatzTV.Application.Emby;
-
-public class GetEmbyPathReplacementsBySourceIdHandler : IRequestHandler<GetEmbyPathReplacementsBySourceId,
-    List<EmbyPathReplacementViewModel>>
+namespace ErsatzTV.Application.Emby.Queries
 {
-    private readonly IMediaSourceRepository _mediaSourceRepository;
+    public class GetEmbyPathReplacementsBySourceIdHandler : IRequestHandler<GetEmbyPathReplacementsBySourceId,
+        List<EmbyPathReplacementViewModel>>
+    {
+        private readonly IMediaSourceRepository _mediaSourceRepository;

-    public GetEmbyPathReplacementsBySourceIdHandler(IMediaSourceRepository mediaSourceRepository) =>
-        _mediaSourceRepository = mediaSourceRepository;
+        public GetEmbyPathReplacementsBySourceIdHandler(IMediaSourceRepository mediaSourceRepository) =>
+            _mediaSourceRepository = mediaSourceRepository;

-    public Task<List<EmbyPathReplacementViewModel>> Handle(
-        GetEmbyPathReplacementsBySourceId request,
-        CancellationToken cancellationToken) =>
-        _mediaSourceRepository.GetEmbyPathReplacements(request.EmbyMediaSourceId)
-            .Map(list => list.Map(ProjectToViewModel).ToList());
+        public Task<List<EmbyPathReplacementViewModel>> Handle(
+            GetEmbyPathReplacementsBySourceId request,
+            CancellationToken cancellationToken) =>
+            _mediaSourceRepository.GetEmbyPathReplacements(request.EmbyMediaSourceId)
+                .Map(list => list.Map(ProjectToViewModel).ToList());
+    }
 }
@@ -1,5 +1,7 @@
 using ErsatzTV.Core.Emby;
+using MediatR;

-namespace ErsatzTV.Application.Emby;
-
-public record GetEmbySecrets : IRequest<EmbySecrets>;
+namespace ErsatzTV.Application.Emby.Queries
+{
+    public record GetEmbySecrets : IRequest<EmbySecrets>;
+}
@@ -1,15 +1,19 @@
-using ErsatzTV.Core.Emby;
+using System.Threading;
+using System.Threading.Tasks;
+using ErsatzTV.Core.Emby;
 using ErsatzTV.Core.Interfaces.Emby;
+using MediatR;

-namespace ErsatzTV.Application.Emby;
-
-public class GetEmbySecretsHandler : IRequestHandler<GetEmbySecrets, EmbySecrets>
+namespace ErsatzTV.Application.Emby.Queries
 {
-    private readonly IEmbySecretStore _embySecretStore;
+    public class GetEmbySecretsHandler : IRequestHandler<GetEmbySecrets, EmbySecrets>
+    {
+        private readonly IEmbySecretStore _embySecretStore;

-    public GetEmbySecretsHandler(IEmbySecretStore embySecretStore) =>
-        _embySecretStore = embySecretStore;
+        public GetEmbySecretsHandler(IEmbySecretStore embySecretStore) =>
+            _embySecretStore = embySecretStore;

-    public Task<EmbySecrets> Handle(GetEmbySecrets request, CancellationToken cancellationToken) =>
-        _embySecretStore.ReadSecrets();
+        public Task<EmbySecrets> Handle(GetEmbySecrets request, CancellationToken cancellationToken) =>
+            _embySecretStore.ReadSecrets();
+    }
 }
@@ -1,3 +1,4 @@
-namespace ErsatzTV.Application;
-
-public record EntityIdResult(int Id);
+namespace ErsatzTV.Application
+{
+    public record EntityIdResult(int Id);
+}
@@ -3,15 +3,13 @@
    <PropertyGroup>
        <TargetFramework>net6.0</TargetFramework>
        <NoWarn>VSTHRD200</NoWarn>
-        <ImplicitUsings>enable</ImplicitUsings>
+        <DebugType>embedded</DebugType>
    </PropertyGroup>

    <ItemGroup>
-      <PackageReference Include="Bugsnag" Version="3.0.1" />
-      <PackageReference Include="CliWrap" Version="3.4.3" />
-      <PackageReference Include="MediatR" Version="10.0.1" />
+      <PackageReference Include="MediatR" Version="9.0.0" />
      <PackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="6.0.0" />
-      <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.1.46">
+      <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.0.64">
        <PrivateAssets>all</PrivateAssets>
        <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
      </PackageReference>
@@ -1,44 +0,0 @@
-<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
-	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=artists_005Cqueries/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=channels_005Ccommands/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=channels_005Cqueries/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=configuration_005Ccommands/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=configuration_005Cqueries/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=emby_005Ccommands/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=emby_005Cqueries/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=ffmpegprofiles_005Ccommands/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=ffmpegprofiles_005Cqueries/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=filler_005Ccommands/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=filler_005Cqueries/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=hdhr_005Ccommands/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=hdhr_005Cqueries/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=health_005Cqueries/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=images_005Ccommands/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=images_005Cqueries/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=jellyfin_005Ccommands/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=jellyfin_005Cqueries/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=libraries_005Ccommands/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=libraries_005Cqueries/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=logs_005Cqueries/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=maintenance_005Ccommands/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=mediacards_005Cqueries/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=mediacollections_005Ccommands/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=mediacollections_005Cqueries/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=mediaitems_005Cqueries/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=mediasources_005Ccommands/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=movies_005Cqueries/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=playouts_005Ccommands/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=playouts_005Cqueries/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=plex_005Ccommands/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=plex_005Cqueries/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=programschedules_005Ccommands/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=programschedules_005Cqueries/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=resolutions_005Cqueries/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=search_005Ccommands/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=search_005Cqueries/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=streaming_005Ccommands/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=streaming_005Cqueries/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=subtitles_005Ccommands/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=television_005Cqueries/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=watermarks_005Ccommands/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=watermarks_005Cqueries/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
@@ -1,6 +1,9 @@
 using ErsatzTV.Core;
+using LanguageExt;
+using MediatR;

-namespace ErsatzTV.Application.FFmpegProfiles;
-
-public record CopyFFmpegProfile
-    (int FFmpegProfileId, string Name) : IRequest<Either<BaseError, FFmpegProfileViewModel>>;
+namespace ErsatzTV.Application.FFmpegProfiles.Commands
+{
+    public record CopyFFmpegProfile
+        (int FFmpegProfileId, string Name) : IRequest<Either<BaseError, FFmpegProfileViewModel>>;
+}
@@ -1,32 +1,37 @@
-using ErsatzTV.Core;
+using System.Threading;
+using System.Threading.Tasks;
+using ErsatzTV.Core;
 using ErsatzTV.Core.Interfaces.Repositories;
+using LanguageExt;
+using MediatR;
 using static ErsatzTV.Application.FFmpegProfiles.Mapper;

-namespace ErsatzTV.Application.FFmpegProfiles;
-
-public class
-    CopyFFmpegProfileHandler : IRequestHandler<CopyFFmpegProfile, Either<BaseError, FFmpegProfileViewModel>>
+namespace ErsatzTV.Application.FFmpegProfiles.Commands
 {
-    private readonly IFFmpegProfileRepository _ffmpegProfileRepository;
+    public class
+        CopyFFmpegProfileHandler : IRequestHandler<CopyFFmpegProfile, Either<BaseError, FFmpegProfileViewModel>>
+    {
+        private readonly IFFmpegProfileRepository _ffmpegProfileRepository;

-    public CopyFFmpegProfileHandler(IFFmpegProfileRepository ffmpegProfileRepository) =>
-        _ffmpegProfileRepository = ffmpegProfileRepository;
+        public CopyFFmpegProfileHandler(IFFmpegProfileRepository ffmpegProfileRepository) =>
+            _ffmpegProfileRepository = ffmpegProfileRepository;

-    public Task<Either<BaseError, FFmpegProfileViewModel>> Handle(
-        CopyFFmpegProfile request,
-        CancellationToken cancellationToken) =>
-        Validate(request)
-            .MapT(PerformCopy)
-            .Bind(v => v.ToEitherAsync());
+        public Task<Either<BaseError, FFmpegProfileViewModel>> Handle(
+            CopyFFmpegProfile request,
+            CancellationToken cancellationToken) =>
+            Validate(request)
+                .MapT(PerformCopy)
+                .Bind(v => v.ToEitherAsync());

-    private Task<FFmpegProfileViewModel> PerformCopy(CopyFFmpegProfile request) =>
-        _ffmpegProfileRepository.Copy(request.FFmpegProfileId, request.Name)
-            .Map(ProjectToViewModel);
+        private Task<FFmpegProfileViewModel> PerformCopy(CopyFFmpegProfile request) =>
+            _ffmpegProfileRepository.Copy(request.FFmpegProfileId, request.Name)
+                .Map(ProjectToViewModel);

-    private Task<Validation<BaseError, CopyFFmpegProfile>> Validate(CopyFFmpegProfile request) =>
-        ValidateName(request).AsTask().MapT(_ => request);
+        private Task<Validation<BaseError, CopyFFmpegProfile>> Validate(CopyFFmpegProfile request) =>
+            ValidateName(request).AsTask().MapT(_ => request);

-    private Validation<BaseError, string> ValidateName(CopyFFmpegProfile request) =>
-        request.NotEmpty(x => x.Name)
-            .Bind(_ => request.NotLongerThan(50)(x => x.Name));
+        private Validation<BaseError, string> ValidateName(CopyFFmpegProfile request) =>
+            request.NotEmpty(x => x.Name)
+                .Bind(_ => request.NotLongerThan(50)(x => x.Name));
+    }
 }
--- a/Show More
+++ b/Show More