prep for release v25.4.0 [no ci]

* reorganize troubleshooting page

* add yaml troubleshooting tool

.config/dotnet-tools.json

@@ -3,10 +3,11 @@
   "isRoot": true,
   "tools": {
     "jetbrains.resharper.globaltools": {
-      "version": "2024.1.1",
+      "version": "2025.1.4",
       "commands": [
         "jb"
-      ]
+      ],
+      "rollForward": false
     }
   }
 }

.editorconfig

@@ -7,6 +7,22 @@ insert_final_newline=false
 indent_style=space
 indent_size=4
 
+[*.json]
+ij_json_array_wrapping = normal
+ij_json_keep_blank_lines_in_code = 0
+ij_json_keep_indents_on_empty_lines = false
+ij_json_keep_line_breaks = true
+ij_json_keep_trailing_comma = false
+ij_json_object_wrapping = normal
+ij_json_property_alignment = do_not_align
+ij_json_space_after_colon = true
+ij_json_space_after_comma = true
+ij_json_space_before_colon = false
+ij_json_space_before_comma = false
+ij_json_spaces_within_braces = true
+ij_json_spaces_within_brackets = true
+ij_json_wrap_long_lines = false
+
 # Microsoft .NET properties
 csharp_new_line_before_members_in_object_initializers=false
 csharp_preferred_modifier_order=public, private, protected, internal, new, abstract, virtual, sealed, override, static, readonly, extern, unsafe, volatile, async:suggestion
@@ -15,7 +31,7 @@ csharp_style_expression_bodied_constructors=true:none
 csharp_style_expression_bodied_methods=true:none
 csharp_style_expression_bodied_properties=true:suggestion
 csharp_style_var_elsewhere=false:suggestion
-csharp_style_var_for_built_in_types=false:suggestion
+csharp_style_var_for_built_in_types=false:none
 csharp_style_var_when_type_is_apparent=true:suggestion
 dotnet_naming_rule.local_constants_rule.severity=warning
 dotnet_naming_rule.local_constants_rule.style=all_upper_style
@@ -66,7 +82,7 @@ resharper_built_in_type_reference_style_highlighting=hint
 resharper_redundant_base_qualifier_highlighting=warning
 resharper_suggest_var_or_type_built_in_types_highlighting=hint
 resharper_suggest_var_or_type_elsewhere_highlighting=hint
-resharper_suggest_var_or_type_simple_types_highlighting=hint
+resharper_suggest_var_or_type_simple_types_highlighting=none
 resharper_web_config_module_not_resolved_highlighting=warning
 resharper_web_config_type_not_resolved_highlighting=warning
 resharper_web_config_wrong_module_highlighting=warning

.github/workflows/artifacts.yml

@@ -29,14 +29,13 @@ 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-13
+          - os: macos-14
             kind: macOS
             target: osx-x64
-          - os: macos-13
+          - os: macos-14
             kind: macOS
             target: osx-arm64
     steps:
@@ -46,7 +45,7 @@ jobs:
           fetch-depth: 0
           submodules: true
 
-      - name: Setup .NET Core
+      - name: Setup dotnet
         uses: actions/setup-dotnet@v4
         with:
           dotnet-version: 9.0.203
@@ -126,22 +125,20 @@ jobs:
           token: ${{ secrets.gh_token }}
           tag: ${{ inputs.release_tag }}
           fail-if-no-assets: false
-          assets: |
-            *${{ matrix.target }}.dmg
+          assets: "*${{ matrix.target }}.dmg"
 
       - name: Publish
         uses: softprops/action-gh-release@v1
         with:
           prerelease: false
           tag_name: ${{ inputs.release_tag }}
-          files: |
-            ${{ env.RELEASE_NAME }}.dmg
+          files: "${{ env.RELEASE_NAME }}.dmg"
         env:
           GITHUB_TOKEN: ${{ secrets.gh_token }}
-  build_and_upload:
-    name: Build & Upload
+
+  build_and_upload_linux:
+    name: Build & Upload Linux
     runs-on: ${{ matrix.os }}
-    if: contains(github.event.head_commit.message, '[no build]') == false
     strategy:
       matrix:
         include:
@@ -154,19 +151,16 @@ jobs:
           - os: ubuntu-latest
             kind: linux
             target: linux-arm
-          - os: ubuntu-latest
+          - os: ubuntu-24.04-arm
             kind: linux
             target: linux-arm64
-          - os: windows-latest
-            kind: windows
-            target: win-x64
     steps:
       - name: Get the sources
         uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
-      - name: Setup .NET Core
+      - name: Setup dotnet
         uses: actions/setup-dotnet@v4
         with:
           dotnet-version: 9.0.203
@@ -177,14 +171,6 @@ jobs:
       - name: Install dependencies
         run: dotnet restore -r "${{ matrix.target }}"
 
-      - uses: suisei-cn/actions-download-file@v1.3.0
-        if: ${{ matrix.kind == 'windows' }}
-        id: downloadffmpeg
-        name: Download ffmpeg
-        with:
-          url: "https://github.com/BtbN/FFmpeg-Builds/releases/download/autobuild-2025-06-12-14-05/ffmpeg-n7.1.1-22-g0f1fe3d153-win64-gpl-7.1.zip"
-          target: ffmpeg/
-
       - name: Build
         shell: bash
         run: |
@@ -199,26 +185,7 @@ jobs:
           mkdir "$release_name"
           mv scanner/* "$release_name/"
           mv main/* "$release_name/"
-
-          # Build Windows launcher
-          if [ "${{ matrix.kind }}" == "windows" ]; then
-            cargo build --manifest-path=ErsatzTV-Windows/Cargo.toml --release --all-features
-            ls -l ErsatzTV-Windows/target/release
-            mv ErsatzTV-Windows/target/release/ersatztv_windows.exe "$release_name/ErsatzTV-Windows.exe"
-          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
+          tar czvf "${release_name}.tar.gz" "$release_name"
 
           # Delete output directory
           rm -r "$release_name"
@@ -230,17 +197,128 @@ jobs:
           token: ${{ secrets.gh_token }}
           tag: ${{ inputs.release_tag }}
           fail-if-no-assets: false
-          assets: |
-            *${{ matrix.target }}.zip
-            *${{ matrix.target }}.tar.gz
+          assets: "*${{ matrix.target }}.tar.gz"
 
       - name: Publish
         uses: softprops/action-gh-release@v1
         with:
           prerelease: false
           tag_name: ${{ inputs.release_tag }}
-          files: |
-            ${{ env.RELEASE_NAME }}.zip
-            ${{ env.RELEASE_NAME }}.tar.gz
+          files: "${{ env.RELEASE_NAME }}.tar.gz"
+        env:
+          GITHUB_TOKEN: ${{ secrets.gh_token }}
+
+  build_dotnet_windows:
+    name: Build dotnet for Windows
+    runs-on: ubuntu-latest
+    steps:
+      - name: Get the sources
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Setup dotnet
+        uses: actions/setup-dotnet@v4
+        with:
+          dotnet-version: 9.0.203
+
+      - name: Clean
+        run: dotnet clean --configuration Release && dotnet nuget locals all --clear
+
+      - name: Install dependencies
+        run: dotnet restore -r "win-x64"
+
+      - name: Build dotnet projects
+        shell: bash
+        run: |
+          sed -i '/Scanner/d' ErsatzTV/ErsatzTV.csproj
+          dotnet publish ErsatzTV.Scanner/ErsatzTV.Scanner.csproj --framework net9.0 --runtime "win-x64" -c Release -o "scanner" -p:RestoreEnablePackagePruning=true -p:InformationalVersion="${{ inputs.release_version }}-win-x64" -p:EnableCompressionInSingleFile=true -p:DebugType=Embedded -p:PublishSingleFile=true --self-contained true
+          dotnet publish ErsatzTV/ErsatzTV.csproj --framework net9.0 --runtime "win-x64" -c Release -o "main" -p:RestoreEnablePackagePruning=true -p:InformationalVersion="${{ inputs.release_version }}-win-x64" -p:EnableCompressionInSingleFile=true -p:DebugType=Embedded -p:PublishSingleFile=true --self-contained true
+
+      - name: Upload .NET Artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: dotnet-windows-build
+          path: |
+            scanner/
+            main/
+          retention-days: 1
+
+  build_rust_windows:
+    name: Build rust for Windows
+    runs-on: windows-latest
+    steps:
+      - name: Get the sources
+        uses: actions/checkout@v4
+
+      - name: Build Windows Launcher
+        shell: bash
+        run: cargo build --manifest-path=ErsatzTV-Windows/Cargo.toml --release --all-features
+
+      - name: Upload Rust Artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: rust-windows-build
+          path: ErsatzTV-Windows/target/release/ersatztv_windows.exe
+          retention-days: 1
+
+  package_and_upload_windows:
+    name: Package & Upload Windows
+    runs-on: ubuntu-latest
+    needs: [build_dotnet_windows, build_rust_windows]
+    steps:
+      - name: Download dotnet artifacts
+        uses: actions/download-artifact@v4
+        with:
+          name: dotnet-windows-build
+          path: dotnet-build
+
+      - name: Download rust artifacts
+        uses: actions/download-artifact@v4
+        with:
+          name: rust-windows-build
+          path: rust-build
+
+      - name: Download ffmpeg
+        uses: suisei-cn/actions-download-file@v1.3.0
+        id: downloadffmpeg
+        with:
+          url: "https://github.com/ErsatzTV/ErsatzTV-ffmpeg/releases/download/7.1.1/ffmpeg-n7.1.1-56-gc2184b65d2-win64-gpl-7.1.zip"
+          target: ffmpeg/
+
+      - name: Package artifacts
+        shell: bash
+        run: |
+          release_name="ErsatzTV-${{ inputs.release_version }}-win-x64"
+          echo "RELEASE_NAME=${release_name}" >> $GITHUB_ENV
+          mkdir "$release_name"
+          
+          mv dotnet-build/scanner/* "$release_name/"
+          mv dotnet-build/main/* "$release_name/"
+
+          # dotnet shouldn't copy the resources here, but it does
+          rm -rf "$release_name/Resources"
+
+          mv rust-build/ersatztv_windows.exe "$release_name/ErsatzTV-Windows.exe"
+          7z e "ffmpeg/${{ steps.downloadffmpeg.outputs.filename }}" -o"$release_name" '*.exe' -r
+          rm -f "$release_name/ffplay.exe"
+          
+          7z a -tzip "${release_name}.zip" "./${release_name}/*"
+
+      - name: Delete old release assets
+        uses: mknejp/delete-release-assets@v1
+        if: ${{ inputs.release_tag == 'develop' }}
+        with:
+          token: ${{ secrets.gh_token }}
+          tag: ${{ inputs.release_tag }}
+          fail-if-no-assets: false
+          assets: "*win-x64.zip"
+
+      - name: Publish
+        uses: softprops/action-gh-release@v1
+        with:
+          prerelease: false
+          tag_name: ${{ inputs.release_tag }}
+          files: "${{ env.RELEASE_NAME }}.zip"
         env:
           GITHUB_TOKEN: ${{ secrets.gh_token }}

.github/workflows/ci.yml

@@ -46,7 +46,7 @@ jobs:
       ac_username: ${{ secrets.AC_USERNAME }}
       ac_password: ${{ secrets.AC_PASSWORD }}
       gh_token: ${{ secrets.GITHUB_TOKEN }}
-  build_and_push:
+  build_images:
     uses: ersatztv/ersatztv/.github/workflows/docker.yml@main
     needs: calculate_version
     with:

.github/workflows/docker.yml

@@ -1,4 +1,4 @@
-name: Build & Publish to Docker Hub
+name: Build & Publish to Docker Hub
 on:
   workflow_call:
     inputs:
@@ -20,33 +20,28 @@ on:
       docker_hub_access_token:
         required: true
 jobs:
-  build_and_push:
-    name: Build & Publish
-    runs-on: ubuntu-latest
+  build_images:
+    name: Build ${{ matrix.name }} image
+    runs-on: ${{ matrix.os }}
     if: contains(github.event.head_commit.message, '[no build]') == false
     strategy:
       matrix:
         include:
-          - name: base
+          - name: amd64
+            os: ubuntu-latest
             path: ''
-            suffix: ''
-            qemu: false
-          - name: nvidia
-            path: 'nvidia/'
-            suffix: '-nvidia'
-            qemu: false
-          - name: vaapi
-            path: 'vaapi/'
-            suffix: '-vaapi'
-            qemu: false
+            suffix: '-amd64'
+            platform: 'linux/amd64'
           - name: arm32v7
+            os: ubuntu-latest
             path: 'arm32v7/'
             suffix: '-arm'
-            qemu: true
+            platform: 'linux/arm/v7'
           - name: arm64
+            os: ubuntu-24.04-arm
             path: 'arm64/'
             suffix: '-arm64'
-            qemu: true
+            platform: 'linux/arm64'
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -54,12 +49,11 @@ jobs:
           fetch-depth: 0
 
       - name: Set up QEMU
+        if: ${{ matrix.name == 'arm32v7' }}
         uses: docker/setup-qemu-action@v3
-        if: ${{ matrix.qemu == true }}
 
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
-        id: docker-buildx
 
       - name: Login to DockerHub
         uses: docker/login-action@v3
@@ -74,52 +68,74 @@ jobs:
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Build and push
+      - name: Build and push by digest
+        id: build
         uses: docker/build-push-action@v5
         with:
-          builder: ${{ steps.docker-buildx.outputs.name }}
           context: .
           file: ./docker/${{ matrix.path }}Dockerfile
           push: true
+          provenance: false
+          platforms: ${{ matrix.platform }}
           build-args: |
             INFO_VERSION=${{ inputs.info_version }}-docker${{ matrix.suffix }}
-          tags: |
-            jasongdove/ersatztv:${{ inputs.base_version }}${{ matrix.suffix }}
-            jasongdove/ersatztv:${{ inputs.tag_version }}${{ matrix.suffix }}
-            ghcr.io/ersatztv/ersatztv:${{ inputs.base_version }}${{ matrix.suffix }}
-            ghcr.io/ersatztv/ersatztv:${{ inputs.tag_version }}${{ matrix.suffix }}
-        if: ${{ matrix.name != 'arm64' && matrix.name != 'arm32v7' }}
+          outputs: |
+            type=image,name=jasongdove/ersatztv,name-canonical=true,push-by-digest=true
+            type=image,name=ghcr.io/ersatztv/ersatztv,name-canonical=true,push-by-digest=true
 
-      - name: Build and push
-        uses: docker/build-push-action@v5
-        with:
-          builder: ${{ steps.docker-buildx.outputs.name }}
-          context: .
-          file: ./docker/${{ matrix.path }}Dockerfile
-          push: true
-          platforms: 'linux/arm64'
-          build-args: |
-            INFO_VERSION=${{ inputs.info_version }}-docker${{ matrix.suffix }}
-          tags: |
-            jasongdove/ersatztv:${{ inputs.base_version }}${{ matrix.suffix }}
-            jasongdove/ersatztv:${{ inputs.tag_version }}${{ matrix.suffix }}
-            ghcr.io/ersatztv/ersatztv:${{ inputs.base_version }}${{ matrix.suffix }}
-            ghcr.io/ersatztv/ersatztv:${{ inputs.tag_version }}${{ matrix.suffix }}
-        if: ${{ matrix.name == 'arm64' }}
+      - name: Save digest to artifact
+        run: echo ${{ steps.build.outputs.digest }} > digest.txt
 
-      - name: Build and push
-        uses: docker/build-push-action@v5
+      - name: Upload digest artifact
+        uses: actions/upload-artifact@v4
         with:
-          builder: ${{ steps.docker-buildx.outputs.name }}
-          context: .
-          file: ./docker/${{ matrix.path }}Dockerfile
-          push: true
-          platforms: 'linux/arm/v7'
-          build-args: |
-            INFO_VERSION=${{ inputs.info_version }}-docker${{ matrix.suffix }}
-          tags: |
-            jasongdove/ersatztv:${{ inputs.base_version }}${{ matrix.suffix }}
-            jasongdove/ersatztv:${{ inputs.tag_version }}${{ matrix.suffix }}
-            ghcr.io/ersatztv/ersatztv:${{ inputs.base_version }}${{ matrix.suffix }}
-            ghcr.io/ersatztv/ersatztv:${{ inputs.tag_version }}${{ matrix.suffix }}
-        if: ${{ matrix.name == 'arm32v7' }}
+          name: digest-${{ matrix.name }}
+          path: digest.txt
+
+  merge_manifests:
+    name: Merge Manifests
+    runs-on: ubuntu-latest
+    needs: build_images
+    steps:
+      - name: Login to DockerHub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.docker_hub_username }}
+          password: ${{ secrets.docker_hub_access_token }}
+
+      - name: Log in to the Container registry
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Download all digest artifacts
+        uses: actions/download-artifact@v4
+        with:
+          path: digests/
+
+      - name: Read digests from artifacts
+        id: digests
+        run: |
+          AMD64_HASH=$(cat digests/digest-amd64/digest.txt)
+          ARM32V7_HASH=$(cat digests/digest-arm32v7/digest.txt)
+          ARM64_HASH=$(cat digests/digest-arm64/digest.txt)
+
+          DOCKER_HUB_DIGESTS="jasongdove/ersatztv@${AMD64_HASH} jasongdove/ersatztv@${ARM64_HASH} jasongdove/ersatztv@${ARM32V7_HASH}"
+          GHCR_DIGESTS="ghcr.io/ersatztv/ersatztv@${AMD64_HASH} ghcr.io/ersatztv/ersatztv@${ARM64_HASH} ghcr.io/ersatztv/ersatztv@${ARM32V7_HASH}"
+
+          echo "docker_hub_digests=${DOCKER_HUB_DIGESTS}" >> $GITHUB_OUTPUT
+          echo "ghcr_digests=${GHCR_DIGESTS}" >> $GITHUB_OUTPUT
+
+      - name: Create and push manifests
+        run: |
+          docker manifest create jasongdove/ersatztv:${{ inputs.base_version }} ${{ steps.digests.outputs.docker_hub_digests }}
+          docker manifest push jasongdove/ersatztv:${{ inputs.base_version }}
+          docker manifest create jasongdove/ersatztv:${{ inputs.tag_version }} ${{ steps.digests.outputs.docker_hub_digests }}
+          docker manifest push jasongdove/ersatztv:${{ inputs.tag_version }}
+
+          docker manifest create ghcr.io/ersatztv/ersatztv:${{ inputs.base_version }} ${{ steps.digests.outputs.ghcr_digests }}
+          docker manifest push ghcr.io/ersatztv/ersatztv:${{ inputs.base_version }}
+          docker manifest create ghcr.io/ersatztv/ersatztv:${{ inputs.tag_version }} ${{ steps.digests.outputs.ghcr_digests }}
+          docker manifest push ghcr.io/ersatztv/ersatztv:${{ inputs.tag_version }}

.github/workflows/pr.yml

@@ -8,7 +8,7 @@ jobs:
       - name: Get the sources
         uses: actions/checkout@v4
 
-      - name: Setup .NET Core
+      - name: Setup dotnet
         uses: actions/setup-dotnet@v4
         with:
           dotnet-version: 9.0.203
@@ -33,12 +33,23 @@ jobs:
           cd ErsatzTV-Windows
           cargo build --release --all-features
   build_and_test_linux:
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        include:
+          - os: ubuntu-latest
+            target: linux-x64
+          - os: ubuntu-latest
+            target: linux-musl-x64
+          - os: ubuntu-latest
+            target: linux-arm
+          - os: ubuntu-24.04-arm
+            target: linux-arm64
     steps:
       - name: Get the sources
         uses: actions/checkout@v4
 
-      - name: Setup .NET Core
+      - name: Setup dotnet
         uses: actions/setup-dotnet@v4
         with:
           dotnet-version: 9.0.203
@@ -47,18 +58,18 @@ jobs:
         run: dotnet clean --configuration Release && dotnet nuget locals all --clear
 
       - name: Install dependencies
-        run: dotnet restore -p:RestoreEnablePackagePruning=true -r linux-x64
+        run: dotnet restore -p:RestoreEnablePackagePruning=true -r "${{ matrix.target }}"
 
       - name: Prep project file
         run: sed -i '/Scanner/d' ErsatzTV/ErsatzTV.csproj
 
       - name: Build
-        run: dotnet build ErsatzTV/ErsatzTV.csproj --runtime linux-x64 --configuration Release --no-restore && dotnet build --configuration Release --no-restore
+        run: dotnet build ErsatzTV/ErsatzTV.csproj --runtime "${{ matrix.target }}" --configuration Release --no-restore && dotnet build --configuration Release --no-restore
 
       - name: Test
         run: dotnet test --blame-hang-timeout "2m" --no-restore --verbosity normal
   build_and_test_mac:
-    runs-on: macos-13
+    runs-on: macos-14
     steps:
       - name: Get the sources
         uses: actions/checkout@v4
@@ -66,7 +77,7 @@ jobs:
           fetch-depth: 0
           submodules: true
 
-      - name: Setup .NET Core
+      - name: Setup dotnet
         uses: actions/setup-dotnet@v4
         with:
           dotnet-version: 9.0.203

.github/workflows/release.yml

@@ -41,7 +41,7 @@ jobs:
       ac_username: ${{ secrets.AC_USERNAME }}
       ac_password: ${{ secrets.AC_PASSWORD }}
       gh_token: ${{ secrets.GITHUB_TOKEN }}
-  build_and_push:
+  build_images:
     uses: ersatztv/ersatztv/.github/workflows/docker.yml@main
     needs: calculate_version
     with:

.gitignore

@@ -40,6 +40,7 @@ msbuild.wrn
 core
 
 scripts/generate-api-sdk/swagger.json
+scripts/download-test-content.sh
 
 docker-compose.override.yml
 

CHANGELOG.md

@@ -5,6 +5,258 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 ## [Unreleased]
 
+## [25.4.0] - 2025-08-05
+### Added
+- Add `Troubleshoot Playback` to overflow menu on all media cards
+  - This should eliminate the need to lookup media ids for content
+- Add subtitle selection to playback troubleshooting. This is limited to:
+  - Sidecar text subtitles (e.g. `srt` files)
+  - Embedded image subtitles
+  - Embedded text subtitles that have already been extracted by ETV
+- Add light mode and light/dark mode toggle to app bar
+- YAML playout: add `pre_roll` instruction to enable and disable a pre-roll sequence
+  - With value of `true` and `sequence` property, will enable automatic pre-roll for all content in the playout to the sequence with the provided key
+  - With value of `false`, will disable automatic pre-roll in the playout
+- YAML playout: add `post_roll` instruction to enable and disable a post-roll sequence
+  - With value of `true` and `sequence` property, will enable automatic post-roll for all content in the playout to the sequence with the provided key
+  - With value of `false`, will disable automatic post-roll in the playout
+- YAML playout: add `mid_roll` instruction to enable and disable a mid-roll sequence
+  - With value of `true` and `sequence` property, will enable automatic mid-roll for (`count` and `all`) content in the playout to the sequence with the provided key
+  - With value of `false`, will disable automatic post-roll in the playout
+  - `expression` can be used to influence which chapters are selected for mid roll (same as in filler preset)
+- YAML playout: add `rewind` instruction to set start of playout relative to the current time
+  - Value should be formatted as `HH:MM:SS` e.g. `00:05:30` for 5 minutes 30 seconds (before now)
+  - This is instruction is mostly useful for debugging transitions, and can only be used as a reset instruction
+- YAML playout: add `import` section to allow importing partial YAML definitions that include `content` and `sequence` entries
+- Add YAML playout validation (using JSON Schema)
+  - Invalid YAML playout definitions will fail to build and will log validation failures as warnings
+  - `content` is fully validated
+  - `sequence` is fully validated
+  - `reset` is fully validated
+  - `playout` is fully validated
+- Add `Playlist` collection type to filler presets
+  - This will force filler mode `Count`
+  - Whenever the filler is used, it will schedule `Count` times full time through the playlist
+    - If the playlist has 3 items and none set to play all, it will schedule 3 items when `Count = 1`
+    - If the playlist has 3 items and none set to play all, it will schedule 6 items when `Count = 2`
+  - Using the same playlist in the same schedule for anything other than filler may cause undesired behavior
+- Detect supported VideoToolbox hardware decoders and encoders
+  - Software decoders/encoders will automatically be used when hardware versions are unavailable
+- Add VideoToolbox Capabilities to Troubleshooting page
+- Add `Use Chapters As Media Items` option to filler preset
+  - This option allows scheduling individual chapters as filler
+  - The chapters are shuffled or otherwise sorted together just like normal filler would be
+- Add smart collection edit page to allow renaming smart collections
+  - Previous edit link behavior (performing search using smart collection query) now uses magnifying glass icon
+- Add channel `Transcode Mode` setting
+  - This setting is currently disabled and only has the value `On Demand`
+- Add channel `Idle Behavior` setting to control the transcoding behavior after all clients have disconnected
+  - `Stop On Disconnect` - stops the transcoder after all clients have disconnected + the global idle timeout
+  - `Keep Running` - transcoder will run until manually stopped
+- Add support for music video thumbnails that end in `-thumb`
+  - For example `Music Video.mkv` could have a corresponding thumbnail `Music Video-thumb.jpg`
+- Reorganize troubleshooting page
+  - Add `YAML Validation` tool in `Troubleshooting` > `Tools`
+
+### Fixed
+- Fix app startup with MySql/MariaDB
+- YAML playout: fix `pad_to_next` always running over time
+- Fix playback with text subtitles when seeking into content, i.e. when first joining a channel
+- Fix playback with `.ass` and `.ssa` text subtitles
+- Fix green padding with 10-bit source content and i965 VAAPI driver
+- Fix building playouts with empty schedules
+- Fix schedule start time calculation when daily playout build goes beyond midnight and into a different alternate schedule
+- Fix compatibility with older NVIDIA devices (compute capability 3.0+) in unified docker image
+- Fix transitions when using NVIDIA, QSV and VAAPI acceleration
+- Fix playback of remote streams on channels where framerate normalization is enabled
+
+### Changed
+- Always tell ffmpeg to stop encoding with a specific duration
+  - This was removed to try to improve transitions with ffmpeg 7.x, but has been causing issues with other content
+- Move search debug logging to its own log category; add `Searching Minimum Log Level` to `Settings` > `Logging`
+- Classic schedules: always schedule the full `Duration` amount instead of stopping mid-duration
+  - This allows duration items to be scheduled beyond midnight
+  - e.g. fixed start time 22:00 with 4 hour duration will schedule until 02:00 instead of stopping at midnight
+- Rename channel setting `Progress Mode` to `Playout Mode`
+  - This controls the progression of the channel's playout, and has nothing to do with transcoding
+  - `Always` is now called `Continuous` (playout progresses with wall clock)
+  - `On Demand` is unchanged (playout only progresses while a client is watching the channel)
+- Replace channel `Active Mode` setting with new `Is Enabled` and `Show In EPG` settings
+  - `Active` channels will be converted to `Is Enabled` = true and `Show In EPG` = true
+  - `Hidden` channels will be converted to `Is Enabled` = true and `Show In EPG` = false
+  - `Inactive` channels will be converted to `Is Enabled` = false and `Show In EPG` = false
+
+## [25.3.1] - 2025-07-24
+### Fixed
+- Fix fallback filler playback
+
+## [25.3.0] - 2025-07-24
+### Added
+- Add new channel stream (audio and subtitle) selector system
+  - Channel editor has a new field `Stream Selector Mode`
+    - `Default` maintains existing behavior
+    - `Custom` uses a YAML config file
+  - The YAML config contains a prioritized list of stream selector "items" (audio and subtitle criteria pairs)
+  - The items are tested against the media from top to bottom, and when (at least) a matching audio track is found, stream selection occurs
+  - As an example, the custom stream selector config can specify (in priority order):
+    - english audio (and disable subtitles)
+    - any other audio (and english subtitles, if they exist)
+  - Criteria can include
+    - Stream language
+    - Stream title (allowed title and/or blocked title)
+    - Stream condition, which is an expression that can use
+      - `id` (index)
+      - `title`
+      - `lang`
+      - `default`
+      - `forced`
+      - `sdh` (subtitle only)
+      - `external` (subtitle only)
+      - `codec`
+      - `channels` (audio only)
+    - An example subtitle condition: `lang like 'en%' and external`
+    - An example audio condition: `title like '%movie%' and channels > 2`
+- Add new channel setting `Active Mode`
+  - `Active` - default value, channel streams as normal and has normal visibility
+  - `Hidden` - channel streams as normal and is hidden from M3U/XMLTV/HDHR
+  - `Inactive` - channel cannot stream (will 404) and is hidden from M3U/XMLTV/HDHR
+- Synchronize Plex "network" metadata for Plex show libraries
+  - Shows will have new `network` search field
+  - Episodes will have new `show_network` search field
+- YAML playout: add `stop_before_end` setting to `pad_until` and `duration` instructions
+  - When `stop_before_end: false`, content can run over the desired time before executing the next instruction
+- YAML playout: add `offline_tail` setting to `pad_until` instruction
+  - This can be used to stop primary content before the desired time (`stop_before_end: true` and `offline_tail: false`)
+  - You can then have a second `pad_until` with the same target time and different content
+- YAML playout: make `tomorrow` an expression on `pad_until` instruction
+  - `true` and `false` still work as normal
+  - The current time (as a decimal) can also be used in the expression, e.g. `now > 23`
+    - `now = hours + minutes / 60.0 + seconds / 3600.0`
+    - So `10:30 AM` would be `10.5`, `10:45 PM` would be `22.75`, etc
+- YAML playout: make `skip_items` an expression
+  - The following parameters can be used:
+    - `count`: the total number of items in the content
+    - `random`: a random number between zero and (count - 1)
+  - For example:
+    - `count / 2` will start in the middle of the content
+    - `random` will start at a random point in the content
+    - `2` (similar to before this change) will skip the first two items in the content
+- YAML playout: make `count` an expression
+    - The following parameters can be used:
+        - `count`: the total number of items in the content
+        - `random`: a random number between zero and (count - 1)
+    - For example:
+        - `count / 2` will play half of the items in the content
+        - `random % 4 + 1` will play between 1 and 4 items
+        - `2` (similar to before this change) will play exactly two items
+- YAML playout: add `disable_watermarks` property to all content instructions
+  - This property defaults to `false` (meaning watermarks are allowed by default)
+  - Setting to `true` will prevent watermarks from ever appearing over the content
+- YAML playout: add `watermark` instruction
+  - With value of `true` and `name` property, will override the watermark in the playout to the watermark with the provided name
+  - With value of `false`, will restore default watermark value (channel watermark, global watermark)
+- Show health check warning and error badges in nav menu
+- Add `Expression` for mid-roll filler to allow custom logic for using or skipping chapter markers
+  - The following parameters can be used:
+    - `total_points`: total number of potential mid-roll points
+    - `matched_points`: number of mid-roll points that have already matched the expression
+    - `total_duration`: total duration of the content, in seconds
+    - `total_progress`: normalized position from 0 to 1
+    - `last_mid_filler`: seconds since last mid-roll filler
+    - `remaining_duration`: duration of the content after this mid-roll point, in seconds
+    - `point`: the position of the mid-roll point, in seconds
+    - `num`: the mid-roll point number, starting with 1
+- Add `Disable Watermarks` checkbox to block items
+  - Block items that have this checked will never display a watermark, even with Deco set to override watermark
+- Add `ETV_MAXIMUM_UPLOAD_MB` environment variable to allow uploading large watermarks
+  - Default value is 10
+- Update ffmpeg health check to link to ErsatzTV-FFmpeg release that contains binaries for win64, linux64, linuxarm64
+- Add `Playback Troubleshooting` page
+  - This tool lets you play specific content without needing a test channel or schedule
+  - You can specify
+    - The media item id (found in ETV media info, and ETV movie URLs)
+    - The ffmpeg profile to use
+    - The watermark to use (if any)
+  - Clicking `Play` will play up to 30 seconds of the specified content using the desired settings
+  - Clicking `Download Results` will generate a zip archive containing:
+    - The FFmpeg report of the playback attempt
+    - The media info for the content
+    - The `Troubleshooting` > `General` output
+- Support `(Part [english number])` name suffixes for multi-part episode grouping, for example:
+  - `Awesome Episode (Part One)`
+  - `Better Episode (Part Two)`
+  - `Not So Great (Part Three)`
+- Add Trakt List option `Auto Refresh` to automatically update list from trakt.tv once each day
+- Add Trakt List option `Generate Playlist` to automatically generate ETV Playlist from matched Trakt List items
+- Read `country` field from movie NFO files and include in search index as `country`
+- Add *experimental* and *incomplete* `Remote Stream` library kind
+    - Remote Stream libraries have fallback metadata added like Other Video libraries (every folder is a tag)
+    - Remote Stream library items consist of YAML (`.yml`) files with the following fields
+      - `url`: the URL of the content that can be played directly by ffmpeg
+      - `script`: the process name and arguments for a command that will output content to stdout
+      - `is_live`: *required* property that indicates whether the remote stream contains live content
+          - When this is set to `true`, ETV cannot work ahead on transcoding this item, which is a necessary tradeoff for supporting live content
+          - When this is set to `false`, ETV will treat the stream as VOD and attempt to work ahead on transcoding like any other local item
+              - This *will* cause errors when the content is actually live, so it's important to configure this correctly
+      - `duration`: when the content is live and does not have duration metadata, this must be provided to allow scheduling
+    - The remote stream definition (YAML file) may provide either a `url` or a `script`
+      - If both are provided, `url` will be used
+- Include number of chapters in search index as `chapters`
+
+### Changed
+- Allow `Other Video` libraries and `Image` libraries to use the same folders
+- Try to mitigate inotify limit error by disabling automatic reloading of `appsettings.json` config files
+- Support `movie`, `musicvideo` and `episodedetails` top-level tags in other video NFO files
+  - Note that no change has been made to the metadata tags that are actually parsed, but this should help with various types of content
+- Remove some limits on multithreading that are no longer needed with latest ffmpeg
+  - Mixed transcoding (software decode, hardware filters/encode) can now use multiple decode threads
+- Split main `Settings` page into multiple pages
+- Update UI layout on all pages to be less cramped and to work better on mobile
+- Add CPU and Video Controller info to `Troubleshooting` > `General` output
+- Enable write-ahead logging (WAL) mode on SQLite databases
+- Add `Multiple Mode` option to schedule items editor and remove support for count values of zero
+  - `Count`: same behavior as before, requires a number of media items to play and will always schedule the same number
+  - `Collection Size`: similar to count of zero before, will play all media items from the collection before continuing to the next schedule item
+  - `Playlist Item Size`: will play all media items from the current playlist item before continuing to the next schedule item
+  - `Multi-Episode Group Size`: will play all media items from the current multi-part episode group, or one ungrouped media item
+- Change watermark width and margins to allow decimals
+- Move `Add To Collection` button to overflow menu on all media cards, and add `Show Media Info` to overflow menu
+  - This allows showing media info for all media kinds
+- Unify on a multi-platform base docker tag (`latest` and `develop`)
+  - `amd64`, `arm64`, `arm/v7` platforms are now all supported in the base docker tag
+  - Other docker platform tags are deprecated and will receive no new updates after the next release
+  - A health check has been added to notify users (on `-arm` or `-arm64` tags) of this change
+
+### Fixed
+- Fix QSV acceleration in docker with older Intel devices
+- Fix HDR transcoding with NVIDIA accel for:
+    - All NVIDIA docker users
+    - Windows NVIDIA users who have set the `ETV_DISABLE_VULKAN` env var
+- Fix audio sync issue with QSV acceleration
+- YAML playout: fix history for marathon and playlist content
+  - This allows playouts to be extended correctly, instead of always resetting to the earliest item in each group
+- Fix using channel External Logo URL as watermark
+- Fix display of SVG channel logo and watermark in admin UI
+  - Existing SVG logos and watermarks will have to be re-uploaded to display properly in the admin UI
+  - This does not affect streaming at all; existing artwork still works fine for streaming
+- Classify HDHR endpoints as streaming endpoints
+  - This allows these endpoints to be accessed through port `ETV_STREAMING_PORT` (default `8409`)
+  - This only matters if you configured `ETV_UI_PORT` to be a different value, which makes UI endpoints inaccessible on the streaming port
+- Update Plex movie/other video plot ("summary") during library deep scan
+- Fix compatibility with ffmpeg 7.2+ when using NVIDIA accel and 10-bit source content
+- Fix some NVIDIA edge cases when media servers don't provide video bit depth information
+- Fix VAAPI tonemap failure
+- Fix green bars after VAAPI tonemap
+- Fix bug where playout mode `Multiple` would ignore fixed start time
+- Fix block playout EPG generation to use `XMLTV Time Zone` setting
+- Fix adding "official" Trakt lists
+- Fix searching for `collection` names with spaces or other special characters, e.g. `collection:"Movies - Action"`
+- Fix QSV transcoding errors when scaling
+- Fix QSV frame freezing in browser
+- Fix some stream continuity issues, and some cases where audio sync is lost at transition
+- Fix HDR transcoding with AMD VAAPI accel
+- Allow paths longer than 255 characters in MySql databases
+
 ## [25.2.0] - 2025-06-24
 ### Added
 - Add `linux-musl-x64` artifact for users running Alpine x64
@@ -45,8 +297,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Add `collection` (name) to search index for manual collections created within ETV
   - Collections synchronized from media servers are still indexed as `tag`
 - Allow searching by `smart_collection` (name)
-  - Quotes are *always* required when using this feature
-    - e.g. `smart_collection:"one" NOT smart_collection:"two"`
+  - Quotes are *always* required around each collection name when using this feature
+    - e.g. `smart_collection:"one" OR smart_collection:"two"`
   - Cycles will be detected and logged, and searches with cycles will not work as expected
 - Add all `ETV_*` environment variables to Troubleshooting > General info
 - Add `External Logo URL` field to channel editor
@@ -2253,7 +2505,10 @@ 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/ErsatzTV/ErsatzTV/compare/v25.2.0...HEAD
+[Unreleased]: https://github.com/ErsatzTV/ErsatzTV/compare/v25.4.0...HEAD
+[25.4.0]: https://github.com/ErsatzTV/ErsatzTV/compare/v25.3.1...v25.4.0
+[25.3.1]: https://github.com/ErsatzTV/ErsatzTV/compare/v25.3.0...v25.3.1
+[25.3.0]: https://github.com/ErsatzTV/ErsatzTV/compare/v25.2.0...v25.3.0
 [25.2.0]: https://github.com/ErsatzTV/ErsatzTV/compare/v25.1.0...v25.2.0
 [25.1.0]: https://github.com/ErsatzTV/ErsatzTV/compare/v0.8.8-beta...v25.1.0
 [0.8.8-beta]: https://github.com/ErsatzTV/ErsatzTV/compare/v0.8.7-beta...v0.8.8-beta

ErsatzTV.Application/Artists/Mapper.cs

@@ -29,9 +29,10 @@ internal static class Mapper
         CultureInfo[] allCultures = CultureInfo.GetCultures(CultureTypes.NeutralCultures);
 
         return languages
-            .Map(
-                lang => allCultures.Filter(
-                    ci => string.Equals(ci.ThreeLetterISOLanguageName, lang, StringComparison.OrdinalIgnoreCase)))
+            .Map(lang => allCultures.Filter(ci => string.Equals(
+                ci.ThreeLetterISOLanguageName,
+                lang,
+                StringComparison.OrdinalIgnoreCase)))
             .Flatten()
             .Distinct()
             .ToList();

ErsatzTV.Application/Artworks/ArtworkContentTypeModel.cs

@@ -0,0 +1,17 @@
+using System.Net;
+using ErsatzTV.Core.Domain;
+
+namespace ErsatzTV.Application.Artworks;
+
+public record ArtworkContentTypeModel(string Path, string ContentType)
+{
+    public static readonly ArtworkContentTypeModel None = new(string.Empty, string.Empty);
+
+    public bool IsExternalUrl => Artwork.IsExternalUrl(Path);
+
+    public bool HasContentType => !string.IsNullOrWhiteSpace(ContentType);
+
+    public string UrlWithContentType => string.IsNullOrWhiteSpace(ContentType)
+        ? Path
+        : $"{Path}?contentType={WebUtility.UrlEncode(ContentType)}";
+}

ErsatzTV.Application/Artworks/Queries/GetArtworkHandler.cs

@@ -6,24 +6,25 @@ using Microsoft.EntityFrameworkCore;
 
 namespace ErsatzTV.Application.Artworks;
 
-public class GetArtworkHandler(IDbContextFactory<TvContext> dbContextFactory) : IRequestHandler<GetArtwork, Either<BaseError, Artwork>>
+public class GetArtworkHandler(IDbContextFactory<TvContext> dbContextFactory)
+    : IRequestHandler<GetArtwork, Either<BaseError, Artwork>>
 {
     private readonly IDbContextFactory<TvContext> _dbContextFactory = dbContextFactory;
 
     public async Task<Either<BaseError, Artwork>> Handle(
-        GetArtwork request, 
+        GetArtwork request,
         CancellationToken cancellationToken)
     {
-        try {
+        try
+        {
             await using TvContext dbContext = await _dbContextFactory.CreateDbContextAsync(cancellationToken);
 
             Option<Artwork> artwork = await dbContext.Artwork
                 .AsNoTracking()
                 .SelectOneAsync(a => a.Id, a => a.Id == request.Id)
                 .MapT(Project);
-            
+
             return artwork.ToEither(BaseError.New("Artwork not found"));
-        
         }
         catch (Exception ex)
         {
@@ -31,12 +32,11 @@ public class GetArtworkHandler(IDbContextFactory<TvContext> dbContextFactory) :
         }
     }
 
-    private static Artwork Project(Artwork artwork)
-    {
-        return new Artwork {
+    private static Artwork Project(Artwork artwork) =>
+        new()
+        {
             Id = artwork.Id,
             Path = artwork.Path,
             ArtworkKind = artwork.ArtworkKind
         };
-    }
 }

ErsatzTV.Application/Channels/ChannelViewModel.cs

@@ -1,5 +1,6 @@
-using ErsatzTV.Core.Domain;
 using System.Net;
+using ErsatzTV.Application.Artworks;
+using ErsatzTV.Core.Domain;
 
 namespace ErsatzTV.Application.Channels;
 
@@ -10,10 +11,12 @@ public record ChannelViewModel(
     string Group,
     string Categories,
     int FFmpegProfileId,
-    string Logo,
+    ArtworkContentTypeModel Logo,
+    ChannelStreamSelectorMode StreamSelectorMode,
+    string StreamSelector,
     string PreferredAudioLanguageCode,
     string PreferredAudioTitle,
-    ChannelProgressMode ProgressMode,
+    ChannelPlayoutMode PlayoutMode,
     StreamingMode StreamingMode,
     int? WatermarkId,
     int? FallbackFillerId,
@@ -22,7 +25,11 @@ public record ChannelViewModel(
     ChannelSubtitleMode SubtitleMode,
     ChannelMusicVideoCreditsMode MusicVideoCreditsMode,
     string MusicVideoCreditsTemplate,
-    ChannelSongVideoMode SongVideoMode)
+    ChannelSongVideoMode SongVideoMode,
+    ChannelTranscodeMode TranscodeMode,
+    ChannelIdleBehavior IdleBehavior,
+    bool IsEnabled,
+    bool ShowInEpg)
 {
     public string WebEncodedName => WebUtility.UrlEncode(Name);
 }

ErsatzTV.Application/Channels/Commands/CreateChannel.cs

@@ -1,4 +1,5 @@
-using ErsatzTV.Core;
+using ErsatzTV.Application.Artworks;
+using ErsatzTV.Core;
 using ErsatzTV.Core.Domain;
 
 namespace ErsatzTV.Application.Channels;
@@ -9,10 +10,12 @@ public record CreateChannel(
     string Group,
     string Categories,
     int FFmpegProfileId,
-    string Logo,
+    ArtworkContentTypeModel Logo,
+    ChannelStreamSelectorMode StreamSelectorMode,
+    string StreamSelector,
     string PreferredAudioLanguageCode,
     string PreferredAudioTitle,
-    ChannelProgressMode ProgressMode,
+    ChannelPlayoutMode PlayoutMode,
     StreamingMode StreamingMode,
     int? WatermarkId,
     int? FallbackFillerId,
@@ -20,4 +23,8 @@ public record CreateChannel(
     ChannelSubtitleMode SubtitleMode,
     ChannelMusicVideoCreditsMode MusicVideoCreditsMode,
     string MusicVideoCreditsTemplate,
-    ChannelSongVideoMode SongVideoMode) : IRequest<Either<BaseError, CreateChannelResult>>;
+    ChannelSongVideoMode SongVideoMode,
+    ChannelTranscodeMode TranscodeMode,
+    ChannelIdleBehavior IdleBehavior,
+    bool IsEnabled,
+    bool ShowInEpg) : IRequest<Either<BaseError, CreateChannelResult>>;

ErsatzTV.Application/Channels/Commands/CreateChannelHandler.cs

@@ -40,64 +40,72 @@ public class CreateChannelHandler(
             await FFmpegProfileMustExist(dbContext, request),
             await WatermarkMustExist(dbContext, request),
             await FillerPresetMustExist(dbContext, request))
-        .Apply(
-            (
-                name,
-                number,
-                ffmpegProfileId,
-                watermarkId,
-                fillerPresetId) =>
+        .Apply((
+            name,
+            number,
+            ffmpegProfileId,
+            watermarkId,
+            fillerPresetId) =>
+        {
+            var artwork = new List<Artwork>();
+            if (!string.IsNullOrWhiteSpace(request.Logo?.Path))
             {
-                var artwork = new List<Artwork>();
-                if (!string.IsNullOrWhiteSpace(request.Logo))
+                string logo = request.Logo.Path;
+                if (logo.StartsWith("iptv/logos/", StringComparison.Ordinal))
                 {
-                    string logo = request.Logo;
-                    if (logo.StartsWith("iptv/logos/", StringComparison.Ordinal))
+                    logo = logo.Replace("iptv/logos/", string.Empty);
+                }
+
+                artwork.Add(
+                    new Artwork
                     {
-                        logo = logo.Replace("iptv/logos/", string.Empty);
-                    }
+                        Path = logo,
+                        ArtworkKind = ArtworkKind.Logo,
+                        OriginalContentType = !string.IsNullOrEmpty(request.Logo.ContentType)
+                            ? request.Logo.ContentType
+                            : null,
+                        DateAdded = DateTime.UtcNow,
+                        DateUpdated = DateTime.UtcNow
+                    });
+            }
 
-                    artwork.Add(
-                        new Artwork
-                        {
-                            Path = 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,
+                PlayoutMode = request.PlayoutMode,
+                StreamingMode = request.StreamingMode,
+                Artwork = artwork,
+                StreamSelectorMode = request.StreamSelectorMode,
+                StreamSelector = request.StreamSelector,
+                PreferredAudioLanguageCode = request.PreferredAudioLanguageCode,
+                PreferredAudioTitle = request.PreferredAudioTitle,
+                PreferredSubtitleLanguageCode = request.PreferredSubtitleLanguageCode,
+                SubtitleMode = request.SubtitleMode,
+                MusicVideoCreditsMode = request.MusicVideoCreditsMode,
+                MusicVideoCreditsTemplate = request.MusicVideoCreditsTemplate,
+                SongVideoMode = request.SongVideoMode,
+                TranscodeMode = request.TranscodeMode,
+                IdleBehavior = request.IdleBehavior,
+                IsEnabled = request.IsEnabled,
+                ShowInEpg = request.IsEnabled && request.ShowInEpg
+            };
 
-                var channel = new Channel(Guid.NewGuid())
-                {
-                    Name = name,
-                    Number = number,
-                    Group = request.Group,
-                    Categories = request.Categories,
-                    FFmpegProfileId = ffmpegProfileId,
-                    ProgressMode = request.ProgressMode,
-                    StreamingMode = request.StreamingMode,
-                    Artwork = artwork,
-                    PreferredAudioLanguageCode = request.PreferredAudioLanguageCode,
-                    PreferredAudioTitle = request.PreferredAudioTitle,
-                    PreferredSubtitleLanguageCode = request.PreferredSubtitleLanguageCode,
-                    SubtitleMode = request.SubtitleMode,
-                    MusicVideoCreditsMode = request.MusicVideoCreditsMode,
-                    MusicVideoCreditsTemplate = request.MusicVideoCreditsTemplate,
-                    SongVideoMode = request.SongVideoMode
-                };
+            foreach (int id in watermarkId)
+            {
+                channel.WatermarkId = id;
+            }
 
-                foreach (int id in watermarkId)
-                {
-                    channel.WatermarkId = id;
-                }
+            foreach (int id in fillerPresetId)
+            {
+                channel.FallbackFillerId = id;
+            }
 
-                foreach (int id in fillerPresetId)
-                {
-                    channel.FallbackFillerId = id;
-                }
-
-                return channel;
-            });
+            return channel;
+        });
 
     private static Validation<BaseError, string> ValidateName(CreateChannel createChannel) =>
         createChannel.NotEmpty(c => c.Name)
@@ -164,8 +172,7 @@ public class CreateChannelHandler(
             .Map(Optional)
             .Filter(c => c > 0)
             .MapT(_ => Optional(createChannel.FallbackFillerId))
-            .Map(
-                o => o.ToValidation<BaseError>(
-                    $"Fallback filler {createChannel.FallbackFillerId} does not exist."));
+            .Map(o => o.ToValidation<BaseError>(
+                $"Fallback filler {createChannel.FallbackFillerId} does not exist."));
     }
 }

ErsatzTV.Application/Channels/Commands/RefreshChannelDataHandler.cs

@@ -49,6 +49,18 @@ public class RefreshChannelDataHandler : IRequestHandler<RefreshChannelData>
 
         _localFileSystem.EnsureFolderExists(FileSystemLayout.ChannelGuideCacheFolder);
 
+        string targetFile = Path.Combine(FileSystemLayout.ChannelGuideCacheFolder, $"{request.ChannelNumber}.xml");
+        await using TvContext dbContext = await _dbContextFactory.CreateDbContextAsync(cancellationToken);
+
+        int hiddenCount = await dbContext.Channels
+            .Where(c => c.Number == request.ChannelNumber && c.ShowInEpg == false)
+            .CountAsync(cancellationToken);
+        if (hiddenCount > 0)
+        {
+            File.Delete(targetFile);
+            return;
+        }
+
         string movieTemplateFileName = GetMovieTemplateFileName();
         string episodeTemplateFileName = GetEpisodeTemplateFileName();
         string musicVideoTemplateFileName = GetMusicVideoTemplateFileName();
@@ -85,8 +97,6 @@ public class RefreshChannelDataHandler : IRequestHandler<RefreshChannelData>
         string otherVideoText = await File.ReadAllTextAsync(otherVideoTemplateFileName, cancellationToken);
         var otherVideoTemplate = Template.Parse(otherVideoText, otherVideoTemplateFileName);
 
-        await using TvContext dbContext = await _dbContextFactory.CreateDbContextAsync(cancellationToken);
-
         List<Playout> playouts = await dbContext.Playouts
             .AsNoTracking()
             .Filter(pi => pi.Channel.Number == request.ChannelNumber)
@@ -244,7 +254,6 @@ public class RefreshChannelDataHandler : IRequestHandler<RefreshChannelData>
         string tempFile = Path.GetTempFileName();
         await File.WriteAllBytesAsync(tempFile, ms.ToArray(), cancellationToken);
 
-        string targetFile = Path.Combine(FileSystemLayout.ChannelGuideCacheFolder, $"{request.ChannelNumber}.xml");
         File.Move(tempFile, targetFile, true);
     }
 
@@ -287,7 +296,8 @@ public class RefreshChannelDataHandler : IRequestHandler<RefreshChannelData>
             int finishIndex = j;
             while (finishIndex + 1 < sorted.Count && (sorted[finishIndex + 1].GuideGroup == startItem.GuideGroup
                                                       || sorted[finishIndex + 1].FillerKind is FillerKind.GuideMode
-                                                          or FillerKind.PostRoll or FillerKind.Tail or FillerKind.Fallback or FillerKind.DecoDefault))
+                                                          or FillerKind.PostRoll or FillerKind.Tail
+                                                          or FillerKind.Fallback or FillerKind.DecoDefault))
             {
                 finishIndex++;
             }
@@ -336,7 +346,7 @@ public class RefreshChannelDataHandler : IRequestHandler<RefreshChannelData>
         }
     }
 
-    private static async Task WriteBlockPlayoutXml(
+    private async Task WriteBlockPlayoutXml(
         RefreshChannelData request,
         List<PlayoutItem> sorted,
         XmlTemplateContext templateContext,
@@ -348,6 +358,10 @@ public class RefreshChannelDataHandler : IRequestHandler<RefreshChannelData>
         XmlMinifier minifier,
         XmlWriter xml)
     {
+        XmltvTimeZone xmltvTimeZone = await _configElementRepository
+            .GetValue<XmltvTimeZone>(ConfigElementKey.XmltvTimeZone)
+            .IfNoneAsync(XmltvTimeZone.Local);
+
         var groups = sorted.GroupBy(s => new { s.GuideStart, s.GuideFinish, s.GuideGroup });
         foreach (var group in groups)
         {
@@ -363,7 +377,12 @@ public class RefreshChannelDataHandler : IRequestHandler<RefreshChannelData>
 
             TimeSpan perItem = groupDuration / itemsToInclude.Count;
 
-            DateTimeOffset currentStart = new DateTimeOffset(groupStart, TimeSpan.Zero).ToLocalTime();
+            DateTimeOffset currentStart = xmltvTimeZone switch
+            {
+                XmltvTimeZone.Utc => new DateTimeOffset(groupStart, TimeSpan.Zero),
+                _ => new DateTimeOffset(groupStart, TimeSpan.Zero).ToLocalTime()
+            };
+
             DateTimeOffset currentFinish = currentStart + perItem;
 
             foreach (PlayoutItem item in itemsToInclude)

ErsatzTV.Application/Channels/Commands/RefreshChannelListHandler.cs

@@ -118,7 +118,7 @@ public class RefreshChannelListHandler : IRequestHandler<RefreshChannelList>
         const string QUERY = @"select C.Number, C.Name, C.Categories, A.Path as ArtworkPath
                                from Channel C
                                left outer join Artwork A on C.Id = A.ChannelId and A.ArtworkKind = 2
-                               where C.Id in (select ChannelId from Playout)
+                               where C.Id in (select ChannelId from Playout) and C.IsEnabled = 1 and C.ShowInEPG = 1
                                order by CAST(C.Number as double)";
         // TODO: this needs to be fixed for sqlite/mariadb
 

ErsatzTV.Application/Channels/Commands/UpdateChannel.cs

@@ -1,4 +1,5 @@
-using ErsatzTV.Core;
+using ErsatzTV.Application.Artworks;
+using ErsatzTV.Core;
 using ErsatzTV.Core.Domain;
 
 namespace ErsatzTV.Application.Channels;
@@ -10,10 +11,12 @@ public record UpdateChannel(
     string Group,
     string Categories,
     int FFmpegProfileId,
-    string Logo,
+    ArtworkContentTypeModel Logo,
+    ChannelStreamSelectorMode StreamSelectorMode,
+    string StreamSelector,
     string PreferredAudioLanguageCode,
     string PreferredAudioTitle,
-    ChannelProgressMode ProgressMode,
+    ChannelPlayoutMode PlayoutMode,
     StreamingMode StreamingMode,
     int? WatermarkId,
     int? FallbackFillerId,
@@ -21,4 +24,8 @@ public record UpdateChannel(
     ChannelSubtitleMode SubtitleMode,
     ChannelMusicVideoCreditsMode MusicVideoCreditsMode,
     string MusicVideoCreditsTemplate,
-    ChannelSongVideoMode SongVideoMode) : IRequest<Either<BaseError, ChannelViewModel>>;
+    ChannelSongVideoMode SongVideoMode,
+    ChannelTranscodeMode TranscodeMode,
+    ChannelIdleBehavior IdleBehavior,
+    bool IsEnabled,
+    bool ShowInEpg) : IRequest<Either<BaseError, ChannelViewModel>>;

ErsatzTV.Application/Channels/Commands/UpdateChannelHandler.cs

@@ -1,5 +1,4 @@
-using System.Globalization;
-using System.Text.RegularExpressions;
+using System.Text.RegularExpressions;
 using System.Threading.Channels;
 using ErsatzTV.Application.Subtitles;
 using ErsatzTV.Core;
@@ -35,6 +34,8 @@ public class UpdateChannelHandler(
         c.Group = update.Group;
         c.Categories = update.Categories;
         c.FFmpegProfileId = update.FFmpegProfileId;
+        c.StreamSelectorMode = update.StreamSelectorMode;
+        c.StreamSelector = update.StreamSelector;
         c.PreferredAudioLanguageCode = update.PreferredAudioLanguageCode;
         c.PreferredAudioTitle = update.PreferredAudioTitle;
         c.PreferredSubtitleLanguageCode = update.PreferredSubtitleLanguageCode;
@@ -42,11 +43,15 @@ public class UpdateChannelHandler(
         c.MusicVideoCreditsMode = update.MusicVideoCreditsMode;
         c.MusicVideoCreditsTemplate = update.MusicVideoCreditsTemplate;
         c.SongVideoMode = update.SongVideoMode;
+        c.TranscodeMode = update.TranscodeMode;
+        c.IdleBehavior = update.IdleBehavior;
+        c.IsEnabled = update.IsEnabled;
+        c.ShowInEpg = update.IsEnabled && update.ShowInEpg;
         c.Artwork ??= [];
 
-        if (!string.IsNullOrWhiteSpace(update.Logo))
+        if (!string.IsNullOrWhiteSpace(update.Logo?.Path))
         {
-            string logo = update.Logo;
+            string logo = update.Logo.Path;
             if (logo.StartsWith("iptv/logos/", StringComparison.Ordinal))
             {
                 logo = logo.Replace("iptv/logos/", string.Empty);
@@ -56,6 +61,9 @@ public class UpdateChannelHandler(
             foreach (Artwork artwork in maybeLogo)
             {
                 artwork.Path = logo;
+                artwork.OriginalContentType = !string.IsNullOrEmpty(update.Logo.ContentType)
+                    ? update.Logo.ContentType
+                    : null;
                 artwork.DateUpdated = DateTime.UtcNow;
             }
 
@@ -64,6 +72,9 @@ public class UpdateChannelHandler(
                 var artwork = new Artwork
                 {
                     Path = logo,
+                    OriginalContentType = !string.IsNullOrEmpty(update.Logo.ContentType)
+                        ? update.Logo.ContentType
+                        : null,
                     DateAdded = DateTime.UtcNow,
                     DateUpdated = DateTime.UtcNow,
                     ArtworkKind = ArtworkKind.Logo
@@ -84,7 +95,7 @@ public class UpdateChannelHandler(
             }
         }
 
-        c.ProgressMode = update.ProgressMode;
+        c.PlayoutMode = update.PlayoutMode;
         c.StreamingMode = update.StreamingMode;
         c.WatermarkId = update.WatermarkId;
         c.FallbackFillerId = update.FallbackFillerId;

ErsatzTV.Application/Channels/Mapper.cs

@@ -1,4 +1,5 @@
-using ErsatzTV.Core.Api.Channels;
+using ErsatzTV.Application.Artworks;
+using ErsatzTV.Core.Api.Channels;
 using ErsatzTV.Core.Domain;
 
 namespace ErsatzTV.Application.Channels;
@@ -14,9 +15,11 @@ internal static class Mapper
             channel.Categories,
             channel.FFmpegProfileId,
             GetLogo(channel),
+            channel.StreamSelectorMode,
+            channel.StreamSelector,
             channel.PreferredAudioLanguageCode,
             channel.PreferredAudioTitle,
-            channel.ProgressMode,
+            channel.PlayoutMode,
             channel.StreamingMode,
             channel.WatermarkId,
             channel.FallbackFillerId,
@@ -25,7 +28,11 @@ internal static class Mapper
             channel.SubtitleMode,
             channel.MusicVideoCreditsMode,
             channel.MusicVideoCreditsTemplate,
-            channel.SongVideoMode);
+            channel.SongVideoMode,
+            channel.TranscodeMode,
+            channel.IdleBehavior,
+            channel.IsEnabled,
+            channel.ShowInEpg);
 
     internal static ChannelResponseModel ProjectToResponseModel(Channel channel) =>
         new(
@@ -42,7 +49,7 @@ internal static class Mapper
     internal static ResolutionAndBitrateViewModel ProjectToViewModel(Resolution resolution, int bitrate) =>
         new(resolution.Height, resolution.Width, bitrate);
 
-    private static string GetLogo(Channel channel)
+    private static ArtworkContentTypeModel GetLogo(Channel channel)
     {
         Option<Artwork> maybeArtwork = channel.Artwork
             .Where(a => a.ArtworkKind == ArtworkKind.Logo)
@@ -50,10 +57,12 @@ internal static class Mapper
 
         foreach (Artwork artwork in maybeArtwork)
         {
-            return artwork.IsExternalUrl() ? artwork.Path : $"iptv/logos/{artwork.Path}";
+            return artwork.IsExternalUrl()
+                ? new ArtworkContentTypeModel(artwork.Path, string.Empty)
+                : new ArtworkContentTypeModel($"iptv/logos/{artwork.Path}", artwork.OriginalContentType);
         }
 
-        return string.Empty;
+        return ArtworkContentTypeModel.None;
     }
 
     private static string GetStreamingMode(Channel channel) =>

ErsatzTV.Application/Channels/Queries/GetChannelByIdHandler.cs

@@ -3,13 +3,10 @@ using static ErsatzTV.Application.Channels.Mapper;
 
 namespace ErsatzTV.Application.Channels;
 
-public class GetChannelByIdHandler : IRequestHandler<GetChannelById, Option<ChannelViewModel>>
+public class GetChannelByIdHandler(IChannelRepository channelRepository)
+    : IRequestHandler<GetChannelById, Option<ChannelViewModel>>
 {
-    private readonly IChannelRepository _channelRepository;
-
-    public GetChannelByIdHandler(IChannelRepository channelRepository) => _channelRepository = channelRepository;
-
     public Task<Option<ChannelViewModel>> Handle(GetChannelById request, CancellationToken cancellationToken) =>
-        _channelRepository.GetChannel(request.Id)
+        channelRepository.GetChannel(request.Id)
             .MapT(ProjectToViewModel);
 }

ErsatzTV.Application/Channels/Queries/GetChannelFramerateHandler.cs

@@ -21,82 +21,100 @@ public class GetChannelFramerateHandler : IRequestHandler<GetChannelFramerate, O
 
     public async Task<Option<int>> Handle(GetChannelFramerate request, CancellationToken cancellationToken)
     {
-        await using TvContext dbContext = await _dbContextFactory.CreateDbContextAsync(cancellationToken);
-
-        FFmpegProfile ffmpegProfile = await dbContext.Channels
-            .Filter(c => c.Number == request.ChannelNumber)
-            .Include(c => c.FFmpegProfile)
-            .Map(c => c.FFmpegProfile)
-            .SingleAsync(cancellationToken);
-
-        if (!ffmpegProfile.NormalizeFramerate)
+        try
         {
-            return Option<int>.None;
-        }
+            await using TvContext dbContext = await _dbContextFactory.CreateDbContextAsync(cancellationToken);
 
-        // TODO: expand to check everything in collection rather than what's scheduled?
-        _logger.LogDebug("Checking frame rates for channel {ChannelNumber}", request.ChannelNumber);
+            FFmpegProfile ffmpegProfile = await dbContext.Channels
+                .AsNoTracking()
+                .Filter(c => c.Number == request.ChannelNumber)
+                .Include(c => c.FFmpegProfile)
+                .Map(c => c.FFmpegProfile)
+                .SingleAsync(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)
+            if (!ffmpegProfile.NormalizeFramerate)
             {
-                _logger.LogInformation(
-                    "Normalizing frame rate for channel {ChannelNumber} from {Distinct} to {FrameRate} instead of min value {MinFrameRate}",
-                    request.ChannelNumber,
-                    distinct,
-                    24,
-                    result);
-
-                return 24;
+                return Option<int>.None;
             }
 
-            _logger.LogInformation(
-                "Normalizing frame rate for channel {ChannelNumber} from {Distinct} to {FrameRate}",
-                request.ChannelNumber,
-                distinct,
-                result);
-            return result;
-        }
+            // TODO: expand to check everything in collection rather than what's scheduled?
+            _logger.LogDebug("Checking frame rates for channel {ChannelNumber}", request.ChannelNumber);
 
-        if (distinct.Count != 0)
-        {
-            _logger.LogInformation(
-                "All content on channel {ChannelNumber} has the same frame rate of {FrameRate}; will not normalize",
-                request.ChannelNumber,
-                distinct[0]);
+            List<Playout> playouts = await dbContext.Playouts
+                .AsNoTracking()
+                .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)
+                .Include(p => p.Items)
+                .ThenInclude(pi => pi.MediaItem)
+                .ThenInclude(mi => (mi as Image).MediaVersions)
+                .Include(p => p.Items)
+                .ThenInclude(pi => pi.MediaItem)
+                .ThenInclude(mi => (mi as RemoteStream).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;
+            }
+
+            if (distinct.Count != 0)
+            {
+                _logger.LogInformation(
+                    "All content on channel {ChannelNumber} has the same frame rate of {FrameRate}; will not normalize",
+                    request.ChannelNumber,
+                    distinct[0]);
+            }
+            else
+            {
+                _logger.LogInformation(
+                    "No content on channel {ChannelNumber} has frame rate information; will not normalize",
+                    request.ChannelNumber);
+            }
         }
-        else
+        catch (Exception ex)
         {
-            _logger.LogInformation(
-                "No content on channel {ChannelNumber} has frame rate information; will not normalize",
+            _logger.LogWarning(
+                ex,
+                "Unexpected error checking frame rates on channel {ChannelNumber}",
                 request.ChannelNumber);
         }
 

ErsatzTV.Application/Channels/Queries/GetChannelGuideHandler.cs

@@ -1,3 +1,4 @@
+using System.Collections.Immutable;
 using System.Text;
 using ErsatzTV.Core;
 using ErsatzTV.Core.Interfaces.Metadata;
@@ -29,6 +30,12 @@ public class GetChannelGuideHandler : IRequestHandler<GetChannelGuide, Either<Ba
         CancellationToken cancellationToken)
     {
         await using TvContext dbContext = await _dbContextFactory.CreateDbContextAsync(cancellationToken);
+        var hiddenChannelNumbers = dbContext.Channels
+            .Where(c => c.ShowInEpg == false)
+            .Select(c => c.Number)
+            .AsEnumerable()
+            .Select(n => $"{n}.xml")
+            .ToImmutableHashSet();
 
         string channelsFile = Path.Combine(FileSystemLayout.ChannelGuideCacheFolder, "channels.xml");
         if (!_localFileSystem.FileExists(channelsFile))
@@ -60,6 +67,11 @@ public class GetChannelGuideHandler : IRequestHandler<GetChannelGuide, Either<Ba
                 continue;
             }
 
+            if (hiddenChannelNumbers.Contains(Path.GetFileName(fileName)))
+            {
+                continue;
+            }
+
             string channelDataFragment = await File.ReadAllTextAsync(fileName, Encoding.UTF8, cancellationToken);
 
             channelDataFragment = channelDataFragment

ErsatzTV.Application/Channels/Queries/GetChannelLineupHandler.cs

@@ -11,5 +11,6 @@ public class GetChannelLineupHandler : IRequestHandler<GetChannelLineup, List<Li
 
     public Task<List<LineupItem>> Handle(GetChannelLineup request, CancellationToken cancellationToken) =>
         _channelRepository.GetAll()
-            .Map(channels => channels.Map(c => new LineupItem(request.Scheme, request.Host, c)).ToList());
+            .Map(channels => channels.Where(c => c.IsEnabled)
+                .Map(c => new LineupItem(request.Scheme, request.Host, c)).ToList());
 }

ErsatzTV.Application/Channels/Queries/GetChannelPlaylistHandler.cs

@@ -14,20 +14,24 @@ public class GetChannelPlaylistHandler : IRequestHandler<GetChannelPlaylist, Cha
     public Task<ChannelPlaylist> Handle(GetChannelPlaylist request, CancellationToken cancellationToken) =>
         _channelRepository.GetAll()
             .Map(channels => EnsureMode(channels, request.Mode))
-            .Map(
-                channels => new ChannelPlaylist(
-                    request.Scheme,
-                    request.Host,
-                    request.BaseUrl,
-                    channels,
-                    request.UserAgent,
-                    request.AccessToken));
+            .Map(channels => new ChannelPlaylist(
+                request.Scheme,
+                request.Host,
+                request.BaseUrl,
+                channels,
+                request.UserAgent,
+                request.AccessToken));
 
     private static List<Channel> EnsureMode(IEnumerable<Channel> channels, string mode)
     {
         var result = new List<Channel>();
         foreach (Channel channel in channels)
         {
+            if (channel.IsEnabled == false)
+            {
+                continue;
+            }
+
             switch (mode.ToLowerInvariant())
             {
                 case "segmenter":

ErsatzTV.Application/Channels/Queries/GetChannelStreamSelectors.cs

@@ -0,0 +1,3 @@
+namespace ErsatzTV.Application.Channels;
+
+public record GetChannelStreamSelectors : IRequest<List<string>>;

ErsatzTV.Application/Channels/Queries/GetChannelStreamSelectorsHandler.cs

@@ -0,0 +1,14 @@
+using ErsatzTV.Core;
+using ErsatzTV.Core.Interfaces.Metadata;
+
+namespace ErsatzTV.Application.Channels;
+
+public class GetChannelStreamSelectorsHandler(ILocalFileSystem localFileSystem)
+    : IRequestHandler<GetChannelStreamSelectors, List<string>>
+{
+    public Task<List<string>> Handle(GetChannelStreamSelectors request, CancellationToken cancellationToken) =>
+        localFileSystem.ListFiles(FileSystemLayout.ChannelStreamSelectorsFolder)
+            .Map(Path.GetFileName)
+            .ToList()
+            .AsTask();
+}

ErsatzTV.Application/Configuration/Commands/UpdateGeneralSettings.cs

@@ -1,5 +0,0 @@
-using ErsatzTV.Core;
-
-namespace ErsatzTV.Application.Configuration;
-
-public record UpdateGeneralSettings(GeneralSettingsViewModel GeneralSettings) : IRequest<Either<BaseError, Unit>>;

ErsatzTV.Application/Configuration/Commands/UpdateLibraryRefreshIntervalHandler.cs

@@ -16,10 +16,9 @@ public class UpdateLibraryRefreshIntervalHandler :
         UpdateLibraryRefreshInterval request,
         CancellationToken cancellationToken) =>
         Validate(request)
-            .MapT(
-                _ => _configElementRepository.Upsert(
-                    ConfigElementKey.LibraryRefreshInterval,
-                    request.LibraryRefreshInterval))
+            .MapT(_ => _configElementRepository.Upsert(
+                ConfigElementKey.LibraryRefreshInterval,
+                request.LibraryRefreshInterval))
             .Bind(v => v.ToEitherAsync());
 
     private static Task<Validation<BaseError, Unit>> Validate(UpdateLibraryRefreshInterval request) =>

ErsatzTV.Application/Configuration/Commands/UpdateLoggingSettings.cs

@@ -0,0 +1,5 @@
+using ErsatzTV.Core;
+
+namespace ErsatzTV.Application.Configuration;
+
+public record UpdateLoggingSettings(LoggingSettingsViewModel LoggingSettings) : IRequest<Either<BaseError, Unit>>;

ErsatzTV.Application/Configuration/Commands/UpdateLoggingSettingsHandler.cs

@@ -4,12 +4,12 @@ using ErsatzTV.Core.Interfaces.Repositories;
 
 namespace ErsatzTV.Application.Configuration;
 
-public class UpdateGeneralSettingsHandler : IRequestHandler<UpdateGeneralSettings, Either<BaseError, Unit>>
+public class UpdateLoggingSettingsHandler : IRequestHandler<UpdateLoggingSettings, Either<BaseError, Unit>>
 {
     private readonly IConfigElementRepository _configElementRepository;
     private readonly LoggingLevelSwitches _loggingLevelSwitches;
 
-    public UpdateGeneralSettingsHandler(
+    public UpdateLoggingSettingsHandler(
         LoggingLevelSwitches loggingLevelSwitches,
         IConfigElementRepository configElementRepository)
     {
@@ -18,33 +18,38 @@ public class UpdateGeneralSettingsHandler : IRequestHandler<UpdateGeneralSetting
     }
 
     public async Task<Either<BaseError, Unit>> Handle(
-        UpdateGeneralSettings request,
-        CancellationToken cancellationToken) => await ApplyUpdate(request.GeneralSettings);
+        UpdateLoggingSettings request,
+        CancellationToken cancellationToken) => await ApplyUpdate(request.LoggingSettings);
 
-    private async Task<Unit> ApplyUpdate(GeneralSettingsViewModel generalSettings)
+    private async Task<Unit> ApplyUpdate(LoggingSettingsViewModel loggingSettings)
     {
-        await _configElementRepository.Upsert(ConfigElementKey.MinimumLogLevel, generalSettings.DefaultMinimumLogLevel);
-        _loggingLevelSwitches.DefaultLevelSwitch.MinimumLevel = generalSettings.DefaultMinimumLogLevel;
+        await _configElementRepository.Upsert(ConfigElementKey.MinimumLogLevel, loggingSettings.DefaultMinimumLogLevel);
+        _loggingLevelSwitches.DefaultLevelSwitch.MinimumLevel = loggingSettings.DefaultMinimumLogLevel;
 
         await _configElementRepository.Upsert(
             ConfigElementKey.MinimumLogLevelScanning,
-            generalSettings.ScanningMinimumLogLevel);
-        _loggingLevelSwitches.ScanningLevelSwitch.MinimumLevel = generalSettings.ScanningMinimumLogLevel;
+            loggingSettings.ScanningMinimumLogLevel);
+        _loggingLevelSwitches.ScanningLevelSwitch.MinimumLevel = loggingSettings.ScanningMinimumLogLevel;
 
         await _configElementRepository.Upsert(
             ConfigElementKey.MinimumLogLevelScheduling,
-            generalSettings.SchedulingMinimumLogLevel);
-        _loggingLevelSwitches.SchedulingLevelSwitch.MinimumLevel = generalSettings.SchedulingMinimumLogLevel;
+            loggingSettings.SchedulingMinimumLogLevel);
+        _loggingLevelSwitches.SchedulingLevelSwitch.MinimumLevel = loggingSettings.SchedulingMinimumLogLevel;
+
+        await _configElementRepository.Upsert(
+            ConfigElementKey.MinimumLogLevelSearching,
+            loggingSettings.SearchingMinimumLogLevel);
+        _loggingLevelSwitches.SearchingLevelSwitch.MinimumLevel = loggingSettings.SearchingMinimumLogLevel;
 
         await _configElementRepository.Upsert(
             ConfigElementKey.MinimumLogLevelStreaming,
-            generalSettings.StreamingMinimumLogLevel);
-        _loggingLevelSwitches.StreamingLevelSwitch.MinimumLevel = generalSettings.StreamingMinimumLogLevel;
+            loggingSettings.StreamingMinimumLogLevel);
+        _loggingLevelSwitches.StreamingLevelSwitch.MinimumLevel = loggingSettings.StreamingMinimumLogLevel;
 
         await _configElementRepository.Upsert(
             ConfigElementKey.MinimumLogLevelHttp,
-            generalSettings.HttpMinimumLogLevel);
-        _loggingLevelSwitches.HttpLevelSwitch.MinimumLevel = generalSettings.HttpMinimumLogLevel;
+            loggingSettings.HttpMinimumLogLevel);
+        _loggingLevelSwitches.HttpLevelSwitch.MinimumLevel = loggingSettings.HttpMinimumLogLevel;
 
         return Unit.Default;
     }

ErsatzTV.Application/Configuration/LoggingSettingsViewModel.cs

@@ -2,11 +2,12 @@ using Serilog.Events;
 
 namespace ErsatzTV.Application.Configuration;
 
-public class GeneralSettingsViewModel
+public class LoggingSettingsViewModel
 {
     public LogEventLevel DefaultMinimumLogLevel { get; set; }
     public LogEventLevel ScanningMinimumLogLevel { get; set; }
     public LogEventLevel SchedulingMinimumLogLevel { get; set; }
+    public LogEventLevel SearchingMinimumLogLevel { get; set; }
     public LogEventLevel StreamingMinimumLogLevel { get; set; }
     public LogEventLevel HttpMinimumLogLevel { get; set; }
 }

ErsatzTV.Application/Configuration/Queries/GetGeneralSettings.cs

@@ -1,3 +0,0 @@
-namespace ErsatzTV.Application.Configuration;
-
-public record GetGeneralSettings : IRequest<GeneralSettingsViewModel>;

ErsatzTV.Application/Configuration/Queries/GetLoggingSettings.cs

@@ -0,0 +1,3 @@
+namespace ErsatzTV.Application.Configuration;
+
+public record GetLoggingSettings : IRequest<LoggingSettingsViewModel>;

ErsatzTV.Application/Configuration/Queries/GetLoggingSettingsHandler.cs

@@ -4,14 +4,14 @@ using Serilog.Events;
 
 namespace ErsatzTV.Application.Configuration;
 
-public class GetGeneralSettingsHandler : IRequestHandler<GetGeneralSettings, GeneralSettingsViewModel>
+public class GetLoggingSettingsHandler : IRequestHandler<GetLoggingSettings, LoggingSettingsViewModel>
 {
     private readonly IConfigElementRepository _configElementRepository;
 
-    public GetGeneralSettingsHandler(IConfigElementRepository configElementRepository) =>
+    public GetLoggingSettingsHandler(IConfigElementRepository configElementRepository) =>
         _configElementRepository = configElementRepository;
 
-    public async Task<GeneralSettingsViewModel> Handle(GetGeneralSettings request, CancellationToken cancellationToken)
+    public async Task<LoggingSettingsViewModel> Handle(GetLoggingSettings request, CancellationToken cancellationToken)
     {
         Option<LogEventLevel> maybeDefaultLevel =
             await _configElementRepository.GetValue<LogEventLevel>(ConfigElementKey.MinimumLogLevel);
@@ -22,17 +22,21 @@ public class GetGeneralSettingsHandler : IRequestHandler<GetGeneralSettings, Gen
         Option<LogEventLevel> maybeSchedulingLevel =
             await _configElementRepository.GetValue<LogEventLevel>(ConfigElementKey.MinimumLogLevelScheduling);
 
+        Option<LogEventLevel> maybeSearchingLevel =
+            await _configElementRepository.GetValue<LogEventLevel>(ConfigElementKey.MinimumLogLevelSearching);
+
         Option<LogEventLevel> maybeStreamingLevel =
             await _configElementRepository.GetValue<LogEventLevel>(ConfigElementKey.MinimumLogLevelStreaming);
 
         Option<LogEventLevel> maybeHttpLevel =
             await _configElementRepository.GetValue<LogEventLevel>(ConfigElementKey.MinimumLogLevelHttp);
 
-        return new GeneralSettingsViewModel
+        return new LoggingSettingsViewModel
         {
             DefaultMinimumLogLevel = await maybeDefaultLevel.IfNoneAsync(LogEventLevel.Information),
             ScanningMinimumLogLevel = await maybeScanningLevel.IfNoneAsync(LogEventLevel.Information),
             SchedulingMinimumLogLevel = await maybeSchedulingLevel.IfNoneAsync(LogEventLevel.Information),
+            SearchingMinimumLogLevel = await maybeSearchingLevel.IfNoneAsync(LogEventLevel.Information),
             StreamingMinimumLogLevel = await maybeStreamingLevel.IfNoneAsync(LogEventLevel.Information),
             HttpMinimumLogLevel = await maybeHttpLevel.IfNoneAsync(LogEventLevel.Information)
         };

ErsatzTV.Application/Emby/Commands/UpdateEmbyPathReplacementsHandler.cs

@@ -43,7 +43,6 @@ public class UpdateEmbyPathReplacementsHandler : IRequestHandler<UpdateEmbyPathR
     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."));
+            .Map(v => v.ToValidation<BaseError>(
+                $"Emby media source {request.EmbyMediaSourceId} does not exist."));
 }

ErsatzTV.Application/Emby/Queries/GetEmbyConnectionParametersHandler.cs

@@ -54,9 +54,8 @@ public class GetEmbyConnectionParametersHandler : IRequestHandler<GetEmbyConnect
 
     private Task<Validation<BaseError, EmbyMediaSource>> EmbyMediaSourceMustExist() =>
         _mediaSourceRepository.GetAllEmby().Map(list => list.HeadOrNone())
-            .Map(
-                v => v.ToValidation<BaseError>(
-                    "Emby media source does not exist."));
+            .Map(v => v.ToValidation<BaseError>(
+                "Emby media source does not exist."));
 
     private Validation<BaseError, ConnectionParameters> MediaSourceMustHaveActiveConnection(
         EmbyMediaSource embyMediaSource)

ErsatzTV.Application/ErsatzTV.Application.csproj

@@ -9,25 +9,25 @@
     </PropertyGroup>
 
     <ItemGroup>
-      <PackageReference Include="Bugsnag" Version="4.0.0" />
-      <PackageReference Include="CliWrap" Version="3.9.0" />
-      <PackageReference Include="Humanizer.Core" Version="2.14.1" />
-      <PackageReference Include="MediatR" Version="12.5.0" />
-      <PackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="9.0.6" />
-      <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="9.0.6" />
-      <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.14.15">
-        <PrivateAssets>all</PrivateAssets>
-        <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-      </PackageReference>
-      <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-      <PackageReference Include="Serilog.Formatting.Compact.Reader" Version="4.0.0" />
-      <PackageReference Include="WebMarkupMin.Core" Version="2.19.0" />
-      <PackageReference Include="Winista.MimeDetect" Version="1.1.0" />
+        <PackageReference Include="Bugsnag" Version="4.1.0" />
+        <PackageReference Include="CliWrap" Version="3.9.0" />
+        <PackageReference Include="Humanizer.Core" Version="2.14.1" />
+        <PackageReference Include="MediatR" Version="[12.5.0]" />
+        <PackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="9.0.7" />
+        <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="9.0.7" />
+        <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.14.15">
+            <PrivateAssets>all</PrivateAssets>
+            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+        </PackageReference>
+        <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
+        <PackageReference Include="Serilog.Formatting.Compact.Reader" Version="4.0.0" />
+        <PackageReference Include="WebMarkupMin.Core" Version="2.19.0" />
+        <PackageReference Include="Winista.MimeDetect" Version="1.1.0" />
     </ItemGroup>
 
     <ItemGroup>
-      <ProjectReference Include="..\ErsatzTV.Core\ErsatzTV.Core.csproj" />
-      <ProjectReference Include="..\ErsatzTV.Infrastructure\ErsatzTV.Infrastructure.csproj" />
+        <ProjectReference Include="..\ErsatzTV.Core\ErsatzTV.Core.csproj" />
+        <ProjectReference Include="..\ErsatzTV.Infrastructure\ErsatzTV.Infrastructure.csproj" />
     </ItemGroup>
 
-</Project>
+</Project>

ErsatzTV.Application/ErsatzTV.Application.csproj.DotSettings

@@ -1,5 +1,6 @@
 <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/=artworks_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>
@@ -44,5 +45,7 @@
 	<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/=templates_005Cqueries/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=troubleshooting_005Ccommands/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=validators/@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>

ErsatzTV.Application/FFmpegProfiles/Commands/CreateFFmpegProfileHandler.cs

@@ -42,34 +42,38 @@ public class CreateFFmpegProfileHandler :
         TvContext dbContext,
         CreateFFmpegProfile request) =>
         (ValidateName(request), ValidateThreadCount(request), await ResolutionMustExist(dbContext, request))
-        .Apply(
-            (name, threadCount, resolutionId) => new FFmpegProfile
-            {
-                Name = name,
-                ThreadCount = threadCount,
-                HardwareAcceleration = request.HardwareAcceleration,
-                VaapiDriver = request.VaapiDriver,
-                VaapiDevice = request.VaapiDevice,
-                QsvExtraHardwareFrames = request.QsvExtraHardwareFrames,
-                ResolutionId = resolutionId,
-                ScalingBehavior = request.ScalingBehavior,
-                VideoFormat = request.VideoFormat,
-                VideoProfile = request.VideoProfile,
-                VideoPreset = request.VideoPreset,
-                AllowBFrames = request.AllowBFrames,
-                BitDepth = request.BitDepth,
-                VideoBitrate = request.VideoBitrate,
-                VideoBufferSize = request.VideoBufferSize,
-                TonemapAlgorithm = request.TonemapAlgorithm,
-                AudioFormat = request.AudioFormat,
-                AudioBitrate = request.AudioBitrate,
-                AudioBufferSize = request.AudioBufferSize,
-                NormalizeLoudnessMode = request.NormalizeLoudnessMode,
-                AudioChannels = request.AudioChannels,
-                AudioSampleRate = request.AudioSampleRate,
-                NormalizeFramerate = request.NormalizeFramerate,
-                DeinterlaceVideo = request.DeinterlaceVideo
-            });
+        .Apply((name, threadCount, resolutionId) => new FFmpegProfile
+        {
+            Name = name,
+            ThreadCount = threadCount,
+            HardwareAcceleration = request.HardwareAcceleration,
+            VaapiDriver = request.VaapiDriver,
+            VaapiDevice = request.VaapiDevice,
+            QsvExtraHardwareFrames = request.QsvExtraHardwareFrames,
+            ResolutionId = resolutionId,
+            ScalingBehavior = request.ScalingBehavior,
+            VideoFormat = request.VideoFormat,
+            VideoProfile = request.VideoProfile,
+            VideoPreset = request.VideoPreset,
+            AllowBFrames = request.AllowBFrames,
+
+            // mpeg2video only supports 8-bit content
+            BitDepth = request.VideoFormat is FFmpegProfileVideoFormat.Mpeg2Video
+                ? FFmpegProfileBitDepth.EightBit
+                : request.BitDepth,
+
+            VideoBitrate = request.VideoBitrate,
+            VideoBufferSize = request.VideoBufferSize,
+            TonemapAlgorithm = request.TonemapAlgorithm,
+            AudioFormat = request.AudioFormat,
+            AudioBitrate = request.AudioBitrate,
+            AudioBufferSize = request.AudioBufferSize,
+            NormalizeLoudnessMode = request.NormalizeLoudnessMode,
+            AudioChannels = request.AudioChannels,
+            AudioSampleRate = request.AudioSampleRate,
+            NormalizeFramerate = request.NormalizeFramerate,
+            DeinterlaceVideo = request.DeinterlaceVideo
+        });
 
     private static Validation<BaseError, string> ValidateName(CreateFFmpegProfile createFFmpegProfile) =>
         createFFmpegProfile.NotEmpty(x => x.Name)

ErsatzTV.Application/FFmpegProfiles/Commands/UpdateFFmpegProfileHandler.cs

@@ -48,7 +48,7 @@ public class
         p.AllowBFrames = update.AllowBFrames;
 
         // mpeg2video only supports 8-bit content
-        p.BitDepth = update.VideoFormat == FFmpegProfileVideoFormat.Mpeg2Video
+        p.BitDepth = update.VideoFormat is FFmpegProfileVideoFormat.Mpeg2Video
             ? FFmpegProfileBitDepth.EightBit
             : update.BitDepth;
 

ErsatzTV.Application/Filler/Commands/CreateFillerPreset.cs

@@ -16,5 +16,8 @@ public record CreateFillerPreset(
     int? CollectionId,
     int? MediaItemId,
     int? MultiCollectionId,
-    int? SmartCollectionId
+    int? SmartCollectionId,
+    int? PlaylistId,
+    string Expression,
+    bool UseChaptersAsMediaItems
 ) : IRequest<Either<BaseError, Unit>>;

ErsatzTV.Application/Filler/Commands/CreateFillerPresetHandler.cs

@@ -36,7 +36,10 @@ public class CreateFillerPresetHandler : IRequestHandler<CreateFillerPreset, Eit
                 CollectionId = request.CollectionId,
                 MediaItemId = request.MediaItemId,
                 MultiCollectionId = request.MultiCollectionId,
-                SmartCollectionId = request.SmartCollectionId
+                SmartCollectionId = request.SmartCollectionId,
+                PlaylistId = request.PlaylistId,
+                Expression = request.FillerKind is FillerKind.MidRoll ? request.Expression : null,
+                UseChaptersAsMediaItems = request.FillerKind is not FillerKind.Fallback && request.UseChaptersAsMediaItems
             };
 
             await dbContext.FillerPresets.AddAsync(fillerPreset, cancellationToken);

ErsatzTV.Application/Filler/Commands/UpdateFillerPreset.cs

@@ -17,5 +17,8 @@ public record UpdateFillerPreset(
     int? CollectionId,
     int? MediaItemId,
     int? MultiCollectionId,
-    int? SmartCollectionId
+    int? SmartCollectionId,
+    int? PlaylistId,
+    string Expression,
+    bool UseChaptersAsMediaItems
 ) : IRequest<Either<BaseError, Unit>>;

ErsatzTV.Application/Filler/Commands/UpdateFillerPresetHandler.cs

@@ -37,6 +37,9 @@ public class UpdateFillerPresetHandler : IRequestHandler<UpdateFillerPreset, Eit
         existing.MediaItemId = request.MediaItemId;
         existing.MultiCollectionId = request.MultiCollectionId;
         existing.SmartCollectionId = request.SmartCollectionId;
+        existing.PlaylistId = request.PlaylistId;
+        existing.Expression = request.FillerKind is FillerKind.MidRoll ? request.Expression : null;
+        existing.UseChaptersAsMediaItems = request.FillerKind is not FillerKind.Fallback && request.UseChaptersAsMediaItems;
 
         await dbContext.SaveChangesAsync();
 

ErsatzTV.Application/Filler/FillerPresetViewModel.cs

@@ -1,4 +1,5 @@
-using ErsatzTV.Core.Domain;
+using ErsatzTV.Application.MediaCollections;
+using ErsatzTV.Core.Domain;
 using ErsatzTV.Core.Domain.Filler;
 
 namespace ErsatzTV.Application.Filler;
@@ -16,4 +17,7 @@ public record FillerPresetViewModel(
     int? CollectionId,
     int? MediaItemId,
     int? MultiCollectionId,
-    int? SmartCollectionId);
+    int? SmartCollectionId,
+    PlaylistViewModel Playlist,
+    string Expression,
+    bool UseChaptersAsMediaItems);

ErsatzTV.Application/Filler/Mapper.cs

@@ -18,5 +18,10 @@ internal static class Mapper
             fillerPreset.CollectionId,
             fillerPreset.MediaItemId,
             fillerPreset.MultiCollectionId,
-            fillerPreset.SmartCollectionId);
+            fillerPreset.SmartCollectionId,
+            fillerPreset.Playlist is not null
+                ? MediaCollections.Mapper.ProjectToViewModel(fillerPreset.Playlist)
+                : null,
+            fillerPreset.Expression,
+            fillerPreset.UseChaptersAsMediaItems);
 }

ErsatzTV.Application/Filler/Queries/GetFillerPresetByIdHandler.cs

@@ -5,19 +5,17 @@ using static ErsatzTV.Application.Filler.Mapper;
 
 namespace ErsatzTV.Application.Filler;
 
-public class GetFillerPresetByIdHandler : IRequestHandler<GetFillerPresetById, Option<FillerPresetViewModel>>
+public class GetFillerPresetByIdHandler(IDbContextFactory<TvContext> dbContextFactory)
+    : IRequestHandler<GetFillerPresetById, Option<FillerPresetViewModel>>
 {
-    private readonly IDbContextFactory<TvContext> _dbContextFactory;
-
-    public GetFillerPresetByIdHandler(IDbContextFactory<TvContext> dbContextFactory) =>
-        _dbContextFactory = dbContextFactory;
-
     public async Task<Option<FillerPresetViewModel>> Handle(
         GetFillerPresetById request,
         CancellationToken cancellationToken)
     {
-        await using TvContext dbContext = _dbContextFactory.CreateDbContext();
+        await using TvContext dbContext = await dbContextFactory.CreateDbContextAsync(cancellationToken);
         return await dbContext.FillerPresets
+            .AsNoTracking()
+            .Include(i => i.Playlist)
             .SelectOneAsync(c => c.Id, c => c.Id == request.Id)
             .MapT(ProjectToViewModel);
     }

ErsatzTV.Application/HDHR/Commands/UpdateHDHRTunerCountHandler.cs

@@ -16,10 +16,9 @@ public class UpdateHDHRTunerCountHandler : IRequestHandler<UpdateHDHRTunerCount,
         UpdateHDHRTunerCount request,
         CancellationToken cancellationToken) =>
         Validate(request)
-            .MapT(
-                _ => _configElementRepository.Upsert(
-                    ConfigElementKey.HDHRTunerCount,
-                    request.TunerCount.ToString(CultureInfo.InvariantCulture)))
+            .MapT(_ => _configElementRepository.Upsert(
+                ConfigElementKey.HDHRTunerCount,
+                request.TunerCount.ToString(CultureInfo.InvariantCulture)))
             .Bind(v => v.ToEitherAsync());
 
     private static Task<Validation<BaseError, Unit>> Validate(UpdateHDHRTunerCount request) =>

ErsatzTV.Application/HDHR/Queries/GetHDHRUUIDHandler.cs

@@ -13,12 +13,11 @@ public class GetHDHRUUIDHandler : IRequestHandler<GetHDHRUUID, Guid>
     public async Task<Guid> Handle(GetHDHRUUID request, CancellationToken cancellationToken)
     {
         Option<Guid> maybeGuid = await _configElementRepository.GetValue<Guid>(ConfigElementKey.HDHRUUID);
-        return await maybeGuid.IfNoneAsync(
-            async () =>
-            {
-                Guid guid = Guid.NewGuid();
-                await _configElementRepository.Upsert(ConfigElementKey.HDHRUUID, guid);
-                return guid;
-            });
+        return await maybeGuid.IfNoneAsync(async () =>
+        {
+            var guid = Guid.NewGuid();
+            await _configElementRepository.Upsert(ConfigElementKey.HDHRUUID, guid);
+            return guid;
+        });
     }
 }

ErsatzTV.Application/Images/Commands/SaveArtworkToDisk.cs

@@ -4,4 +4,5 @@ using ErsatzTV.Core.Domain;
 namespace ErsatzTV.Application.Images;
 
 // ReSharper disable once SuggestBaseTypeForParameter
-public record SaveArtworkToDisk(Stream Stream, ArtworkKind ArtworkKind) : IRequest<Either<BaseError, string>>;
+public record SaveArtworkToDisk(Stream Stream, ArtworkKind ArtworkKind, string ContentType)
+    : IRequest<Either<BaseError, string>>;

ErsatzTV.Application/Images/Commands/UpdateImageFolderDurationHandler.cs

@@ -97,9 +97,8 @@ public class UpdateImageFolderDurationHandler(IDbContextFactory<TvContext> dbCon
 
             // update all images in this folder
             await dbContext.ImageMetadata
-                .Filter(
-                    im => im.Image.MediaVersions.Any(
-                        mv => mv.MediaFiles.Any(mf => mf.LibraryFolderId == currentFolder.Id)))
+                .Filter(im =>
+                    im.Image.MediaVersions.Any(mv => mv.MediaFiles.Any(mf => mf.LibraryFolderId == currentFolder.Id)))
                 .ExecuteUpdateAsync(
                     setters => setters.SetProperty(im => im.DurationSeconds, effectiveDuration),
                     cancellationToken);

ErsatzTV.Application/Images/Queries/GetCachedImagePath.cs

@@ -3,5 +3,6 @@ using ErsatzTV.Core.Domain;
 
 namespace ErsatzTV.Application.Images;
 
-public record GetCachedImagePath(string FileName, ArtworkKind ArtworkKind, int? MaxHeight = null) : IRequest<
-    Either<BaseError, CachedImagePathViewModel>>;
+public record GetCachedImagePath(string FileName, ArtworkKind ArtworkKind, string ContentType, int? MaxHeight = null)
+    : IRequest<
+        Either<BaseError, CachedImagePathViewModel>>;

ErsatzTV.Application/Images/Queries/GetCachedImagePathHandler.cs

@@ -42,7 +42,7 @@ public class
     {
         try
         {
-            MimeType mimeType;
+            string mimeType;
 
             string cachePath = _imageCache.GetPathForImage(
                 request.FileName,
@@ -84,7 +84,7 @@ public class
 
                     File.Move(withExtension, cachePath);
 
-                    mimeType = new MimeType("image/jpeg");
+                    mimeType = "image/jpeg";
                 }
                 else
                 {
@@ -93,10 +93,12 @@ public class
             }
             else
             {
-                mimeType = MimeTypes.GetMimeTypeFromFile(cachePath);
+                mimeType = !string.IsNullOrWhiteSpace(request.ContentType)
+                    ? request.ContentType
+                    : MimeTypes.GetMimeTypeFromFile(cachePath).Name;
             }
 
-            return new CachedImagePathViewModel(cachePath, mimeType.Name);
+            return new CachedImagePathViewModel(cachePath, mimeType);
         }
         catch (Exception ex)
         {

ErsatzTV.Application/Jellyfin/Commands/UpdateJellyfinPathReplacementsHandler.cs

@@ -43,7 +43,6 @@ public class UpdateJellyfinPathReplacementsHandler : IRequestHandler<UpdateJelly
     private Task<Validation<BaseError, JellyfinMediaSource>> JellyfinMediaSourceMustExist(
         UpdateJellyfinPathReplacements request) =>
         _mediaSourceRepository.GetJellyfin(request.JellyfinMediaSourceId)
-            .Map(
-                v => v.ToValidation<BaseError>(
-                    $"Jellyfin media source {request.JellyfinMediaSourceId} does not exist."));
+            .Map(v => v.ToValidation<BaseError>(
+                $"Jellyfin media source {request.JellyfinMediaSourceId} does not exist."));
 }

ErsatzTV.Application/Jellyfin/Queries/GetJellyfinConnectionParametersHandler.cs

@@ -48,9 +48,8 @@ public class GetJellyfinConnectionParametersHandler : IRequestHandler<GetJellyfi
 
     private Task<Validation<BaseError, JellyfinMediaSource>> JellyfinMediaSourceMustExist() =>
         _mediaSourceRepository.GetAllJellyfin().Map(list => list.HeadOrNone())
-            .Map(
-                v => v.ToValidation<BaseError>(
-                    "Jellyfin media source does not exist."));
+            .Map(v => v.ToValidation<BaseError>(
+                "Jellyfin media source does not exist."));
 
     private Validation<BaseError, ConnectionParameters> MediaSourceMustHaveActiveConnection(
         JellyfinMediaSource jellyfinMediaSource)

ErsatzTV.Application/Libraries/Commands/CallLibraryScannerHandler.cs

@@ -54,9 +54,9 @@ public abstract class CallLibraryScannerHandler<TRequest>
         {
             using var forcefulCts = new CancellationTokenSource();
 
-            await using CancellationTokenRegistration link = cancellationToken.Register(
-                () => forcefulCts.CancelAfter(TimeSpan.FromSeconds(10))
-            );
+            await using CancellationTokenRegistration link =
+                cancellationToken.Register(() => forcefulCts.CancelAfter(TimeSpan.FromSeconds(10))
+                );
 
             CommandResult process = await Cli.Wrap(scanner)
                 .WithArguments(arguments)

ErsatzTV.Application/Libraries/Commands/CreateLocalLibraryHandler.cs

@@ -64,13 +64,12 @@ public class CreateLocalLibraryHandler : LocalLibraryHandlerBase,
             .OrderBy(lms => lms.Id)
             .FirstOrDefaultAsync()
             .Map(Optional)
-            .MapT(
-                lms => new LocalLibrary
-                {
-                    Name = request.Name,
-                    Paths = request.Paths.Map(p => new LibraryPath { Path = p }).ToList(),
-                    MediaKind = request.MediaKind,
-                    MediaSourceId = lms.Id
-                })
+            .MapT(lms => new LocalLibrary
+            {
+                Name = request.Name,
+                Paths = request.Paths.Map(p => new LibraryPath { Path = p }).ToList(),
+                MediaKind = request.MediaKind,
+                MediaSourceId = lms.Id
+            })
             .Map(o => o.ToValidation<BaseError>("LocalMediaSource does not exist."));
 }

ErsatzTV.Application/Libraries/Commands/CreateLocalLibraryPath.cs

@@ -1,6 +0,0 @@
-using ErsatzTV.Core;
-
-namespace ErsatzTV.Application.Libraries;
-
-public record CreateLocalLibraryPath(int LibraryId, string Path)
-    : IRequest<Either<BaseError, LocalLibraryPathViewModel>>;

ErsatzTV.Application/Libraries/Commands/CreateLocalLibraryPathHandler.cs

@@ -1,51 +0,0 @@
-using ErsatzTV.Core;
-using ErsatzTV.Core.Domain;
-using ErsatzTV.Core.Interfaces.Repositories;
-using static ErsatzTV.Application.Libraries.Mapper;
-
-namespace ErsatzTV.Application.Libraries;
-
-public class CreateLocalLibraryPathHandler : IRequestHandler<CreateLocalLibraryPath,
-    Either<BaseError, LocalLibraryPathViewModel>>
-{
-    private readonly ILibraryRepository _libraryRepository;
-
-    public CreateLocalLibraryPathHandler(ILibraryRepository libraryRepository) =>
-        _libraryRepository = libraryRepository;
-
-    public Task<Either<BaseError, LocalLibraryPathViewModel>> Handle(
-        CreateLocalLibraryPath request,
-        CancellationToken cancellationToken) =>
-        Validate(request).MapT(PersistLocalLibraryPath).Bind(v => v.ToEitherAsync());
-
-    private Task<LocalLibraryPathViewModel> PersistLocalLibraryPath(LibraryPath p) =>
-        _libraryRepository.Add(p).Map(ProjectToViewModel);
-
-    private Task<Validation<BaseError, LibraryPath>> Validate(CreateLocalLibraryPath request) =>
-        ValidateFolder(request)
-            .MapT(
-                folder =>
-                    new LibraryPath
-                    {
-                        LibraryId = request.LibraryId,
-                        Path = folder
-                    });
-
-    private async Task<Validation<BaseError, string>> ValidateFolder(CreateLocalLibraryPath request)
-    {
-        List<string> allPaths = await _libraryRepository.GetLocalPaths(request.LibraryId)
-            .Map(list => list.Map(c => c.Path).ToList());
-
-        return Optional(request.Path)
-            .Where(folder => allPaths.ForAll(f => !AreSubPaths(f, folder)))
-            .ToValidation<BaseError>("Path must not belong to another library path");
-    }
-
-    private static bool AreSubPaths(string path1, string path2)
-    {
-        string one = path1 + Path.DirectorySeparatorChar;
-        string two = path2 + Path.DirectorySeparatorChar;
-        return one == two || one.StartsWith(two, StringComparison.OrdinalIgnoreCase) ||
-               two.StartsWith(one, StringComparison.OrdinalIgnoreCase);
-    }
-}

ErsatzTV.Application/Libraries/Commands/LocalLibraryHandlerBase.cs

@@ -19,23 +19,44 @@ public abstract class LocalLibraryHandlerBase
         LocalLibrary localLibrary,
         int? existingLibraryId = null)
     {
-        List<string> allPaths = await dbContext.LocalLibraries
+        List<LocalPath> allPaths = await dbContext.LocalLibraries
             .Include(ll => ll.Paths)
             .Filter(ll => existingLibraryId == null || ll.Id != existingLibraryId)
             .ToListAsync()
-            .Map(list => list.SelectMany(ll => ll.Paths).Map(lp => lp.Path).ToList());
+            .Map(list => list.SelectMany(ll => ll.Paths.Map(lp => new LocalPath(ll.MediaKind, lp.Path))).ToList());
 
-        return Optional(localLibrary.Paths.Count(folder => allPaths.Any(f => AreSubPaths(f, folder.Path))))
+        var localPaths = localLibrary.Paths.Map(lp => new LocalPath(localLibrary.MediaKind, lp.Path)).ToList();
+
+        return Optional(localPaths.Count(folder => allPaths.Any(f => AreSubPaths(f, folder))))
             .Where(length => length == 0)
             .Map(_ => localLibrary)
             .ToValidation<BaseError>("Path must not belong to another library path");
     }
 
-    private static bool AreSubPaths(string path1, string path2)
+    private static bool AreSubPaths(LocalPath path1, LocalPath path2)
     {
-        string one = path1 + Path.DirectorySeparatorChar;
-        string two = path2 + Path.DirectorySeparatorChar;
-        return one == two || one.StartsWith(two, StringComparison.OrdinalIgnoreCase) ||
-               two.StartsWith(one, StringComparison.OrdinalIgnoreCase);
+        string one = path1.Path + Path.DirectorySeparatorChar;
+        string two = path2.Path + Path.DirectorySeparatorChar;
+
+        bool isConflict = one == two || one.StartsWith(two, StringComparison.OrdinalIgnoreCase) ||
+                          two.StartsWith(one, StringComparison.OrdinalIgnoreCase);
+
+        // Images and OtherVideos do not conflict
+        if (isConflict)
+        {
+            bool imagesAndOtherVideos = path1.MediaKind is LibraryMediaKind.Images &&
+                                        path2.MediaKind is LibraryMediaKind.OtherVideos
+                                        || path2.MediaKind is LibraryMediaKind.Images &&
+                                        path1.MediaKind is LibraryMediaKind.OtherVideos;
+
+            if (imagesAndOtherVideos)
+            {
+                isConflict = false;
+            }
+        }
+
+        return isConflict;
     }
+
+    protected record LocalPath(LibraryMediaKind MediaKind, string Path);
 }

ErsatzTV.Application/Libraries/Commands/UpdateLocalLibraryHandler.cs

@@ -102,9 +102,8 @@ public class UpdateLocalLibraryHandler : LocalLibraryHandlerBase,
         UpdateLocalLibrary request) =>
         LocalLibraryMustExist(dbContext, request)
             .BindT(parameters => NameMustBeValid(request, parameters.Incoming).MapT(_ => parameters))
-            .BindT(
-                parameters => PathsMustBeValid(dbContext, parameters.Incoming, parameters.Existing.Id)
-                    .MapT(_ => parameters));
+            .BindT(parameters => PathsMustBeValid(dbContext, parameters.Incoming, parameters.Existing.Id)
+                .MapT(_ => parameters));
 
     private static Task<Validation<BaseError, Parameters>> LocalLibraryMustExist(
         TvContext dbContext,
@@ -112,18 +111,18 @@ public class UpdateLocalLibraryHandler : LocalLibraryHandlerBase,
         dbContext.LocalLibraries
             .Include(ll => ll.Paths)
             .SelectOneAsync(ll => ll.Id, ll => ll.Id == request.Id)
-            .MapT(
-                existing =>
+            .MapT(existing =>
+            {
+                var incoming = new LocalLibrary
                 {
-                    var incoming = new LocalLibrary
-                    {
-                        Name = request.Name,
-                        Paths = request.Paths.Map(p => new LibraryPath { Id = p.Id, Path = p.Path }).ToList(),
-                        MediaSourceId = existing.Id
-                    };
+                    Name = request.Name,
+                    Paths = request.Paths.Map(p => new LibraryPath { Id = p.Id, Path = p.Path }).ToList(),
+                    MediaKind = existing.MediaKind,
+                    MediaSourceId = existing.Id
+                };
 
-                    return new Parameters(existing, incoming);
-                })
+                return new Parameters(existing, incoming);
+            })
             .Map(o => o.ToValidation<BaseError>("LocalLibrary does not exist."));
 
     private static string NormalizePath(string path) =>

ErsatzTV.Application/Libraries/Queries/GetAllLocalLibrariesHandler.cs

@@ -14,10 +14,9 @@ public class GetAllLocalLibrariesHandler : IRequestHandler<GetAllLocalLibraries,
         GetAllLocalLibraries request,
         CancellationToken cancellationToken) =>
         _libraryRepository.GetAll()
-            .Map(
-                list => list
-                    .OfType<LocalLibrary>()
-                    .OrderBy(l => l.MediaKind)
-                    .Map(ProjectToViewModel)
-                    .ToList());
+            .Map(list => list
+                .OfType<LocalLibrary>()
+                .OrderBy(l => l.MediaKind)
+                .Map(ProjectToViewModel)
+                .ToList());
 }

ErsatzTV.Application/Libraries/Queries/GetConfiguredLibrariesHandler.cs

@@ -15,12 +15,11 @@ public class GetConfiguredLibrariesHandler : IRequestHandler<GetConfiguredLibrar
         GetConfiguredLibraries request,
         CancellationToken cancellationToken) =>
         _libraryRepository.GetAll()
-            .Map(
-                list => list.Filter(ShouldIncludeLibrary)
-                    .OrderBy(l => l.MediaSource is LocalMediaSource ? 0 : 1)
-                    .ThenBy(l => l.GetType().Name)
-                    .ThenBy(l => l.MediaKind)
-                    .Map(ProjectToViewModel).ToList());
+            .Map(list => list.Filter(ShouldIncludeLibrary)
+                .OrderBy(l => l.MediaSource is LocalMediaSource ? 0 : 1)
+                .ThenBy(l => l.GetType().Name)
+                .ThenBy(l => l.MediaKind)
+                .Map(ProjectToViewModel).ToList());
 
     private static bool ShouldIncludeLibrary(Library library) =>
         library switch

ErsatzTV.Application/Libraries/Queries/GetExternalCollectionsHandler.cs

@@ -46,8 +46,13 @@ public class GetExternalCollectionsHandler : IRequestHandler<GetExternalCollecti
             .Map(jms => jms.Id)
             .ToListAsync(cancellationToken);
 
-        return jellyfinMediaSourceIds.Map(
-            id => new LibraryViewModel("Jellyfin", 0, "Collections", 0, id, string.Empty));
+        return jellyfinMediaSourceIds.Map(id => new LibraryViewModel(
+            "Jellyfin",
+            0,
+            "Collections",
+            0,
+            id,
+            string.Empty));
     }
 
     private static async Task<IEnumerable<LibraryViewModel>> GetPlexExternalCollections(
@@ -59,7 +64,6 @@ public class GetExternalCollectionsHandler : IRequestHandler<GetExternalCollecti
             .Map(pms => pms.Id)
             .ToListAsync(cancellationToken);
 
-        return plexMediaSourceIds.Map(
-            id => new LibraryViewModel("Plex", 0, "Collections", 0, id, string.Empty));
+        return plexMediaSourceIds.Map(id => new LibraryViewModel("Plex", 0, "Collections", 0, id, string.Empty));
     }
 }

ErsatzTV.Application/Logs/Queries/GetRecentLogEntriesHandler.cs

@@ -27,9 +27,9 @@ public class GetRecentLogEntriesHandler : IRequestHandler<GetRecentLogEntries, P
 
             if (!string.IsNullOrWhiteSpace(request.Filter))
             {
-                entries = entries.Filter(
-                    le => le.Level.ToString().Contains(request.Filter, StringComparison.OrdinalIgnoreCase) ||
-                          le.Message.Contains(request.Filter, StringComparison.OrdinalIgnoreCase));
+                entries = entries.Filter(le =>
+                    le.Level.ToString().Contains(request.Filter, StringComparison.OrdinalIgnoreCase) ||
+                    le.Message.Contains(request.Filter, StringComparison.OrdinalIgnoreCase));
             }
 
             int count = entries.Count();

ErsatzTV.Application/MediaCards/ActorCardViewModel.cs

@@ -3,4 +3,4 @@
 namespace ErsatzTV.Application.MediaCards;
 
 public record ActorCardViewModel(int Id, string Name, string Role, string Thumb, MediaItemState State) :
-    MediaCardViewModel(Id, Name, Role, Name, Thumb, State);
+    MediaCardViewModel(Id, Name, Role, Name, Thumb, State, HasMediaInfo: false);

ErsatzTV.Application/MediaCards/ArtistCardViewModel.cs

@@ -14,4 +14,5 @@ public record ArtistCardViewModel(
     Subtitle,
     SortTitle,
     Poster,
-    State);
+    State,
+    HasMediaInfo: false);

ErsatzTV.Application/MediaCards/CollectionCardResultsViewModel.cs

@@ -10,7 +10,8 @@ public record CollectionCardResultsViewModel(
     List<MusicVideoCardViewModel> MusicVideoCards,
     List<OtherVideoCardViewModel> OtherVideoCards,
     List<SongCardViewModel> SongCards,
-    List<ImageCardViewModel> ImageCards)
+    List<ImageCardViewModel> ImageCards,
+    List<RemoteStreamCardViewModel> RemoteStreamCards)
 {
     public bool UseCustomPlaybackOrder { get; set; }
 }

ErsatzTV.Application/MediaCards/ImageCardViewModel.cs

@@ -14,7 +14,8 @@ public record ImageCardViewModel(
     Subtitle,
     SortTitle,
     Poster,
-    State)
+    State,
+    HasMediaInfo: true)
 {
     public int CustomIndex { get; set; }
 }

ErsatzTV.Application/MediaCards/Mapper.cs

@@ -155,6 +155,15 @@ internal static class Mapper
             string.Empty, // TODO: thumbnail?
             imageMetadata.Image.State);
 
+    internal static RemoteStreamCardViewModel ProjectToViewModel(RemoteStreamMetadata remoteStreamMetadata) =>
+        new(
+            remoteStreamMetadata.RemoteStreamId,
+            remoteStreamMetadata.Title,
+            remoteStreamMetadata.OriginalTitle,
+            remoteStreamMetadata.SortTitle,
+            string.Empty, // TODO: thumbnail?
+            remoteStreamMetadata.RemoteStream.State);
+
     internal static ArtistCardViewModel ProjectToViewModel(ArtistMetadata artistMetadata) =>
         new(
             artistMetadata.ArtistId,
@@ -171,8 +180,8 @@ internal static class Mapper
             Option<EmbyMediaSource> maybeEmby) =>
         new(
                 collection.Name,
-                collection.MediaItems.OfType<Movie>().Map(
-                    m => ProjectToViewModel(m.MovieMetadata.Head(), maybeJellyfin, maybeEmby) with
+                collection.MediaItems.OfType<Movie>().Map(m =>
+                    ProjectToViewModel(m.MovieMetadata.Head(), maybeJellyfin, maybeEmby) with
                     {
                         CustomIndex = GetCustomIndex(collection, m.Id)
                     }).ToList(),
@@ -183,13 +192,12 @@ internal static class Mapper
                     .ToList(),
                 // collection view doesn't use local paths
                 collection.MediaItems.OfType<Episode>()
-                    .Map(
-                        e => ProjectToViewModel(
-                            e.EpisodeMetadata.Head(),
-                            maybeJellyfin,
-                            maybeEmby,
-                            false,
-                            string.Empty))
+                    .Map(e => ProjectToViewModel(
+                        e.EpisodeMetadata.Head(),
+                        maybeJellyfin,
+                        maybeEmby,
+                        true,
+                        string.Empty))
                     .ToList(),
                 collection.MediaItems.OfType<Artist>().Map(a => ProjectToViewModel(a.ArtistMetadata.Head())).ToList(),
                 // collection view doesn't use local paths
@@ -200,7 +208,9 @@ internal static class Mapper
                     .ToList(),
                 collection.MediaItems.OfType<Song>().Map(s => ProjectToViewModel(s.SongMetadata.Head()))
                     .ToList(),
-                collection.MediaItems.OfType<Image>().Map(i => ProjectToViewModel(i.ImageMetadata.Head())).ToList())
+                collection.MediaItems.OfType<Image>().Map(i => ProjectToViewModel(i.ImageMetadata.Head())).ToList(),
+                collection.MediaItems.OfType<RemoteStream>().Map(i => ProjectToViewModel(i.RemoteStreamMetadata.Head()))
+                    .ToList())
             { UseCustomPlaybackOrder = collection.UseCustomPlaybackOrder };
 
     internal static ActorCardViewModel ProjectToViewModel(

ErsatzTV.Application/MediaCards/MediaCardViewModel.cs

@@ -8,4 +8,5 @@ public record MediaCardViewModel(
     string Subtitle,
     string SortTitle,
     string Poster,
-    MediaItemState State);
+    MediaItemState State,
+    bool HasMediaInfo);

ErsatzTV.Application/MediaCards/MovieCardViewModel.cs

@@ -14,7 +14,8 @@ public record MovieCardViewModel(
     Subtitle,
     SortTitle,
     Poster,
-    State)
+    State,
+    HasMediaInfo: true)
 {
     public int CustomIndex { get; set; }
 }

ErsatzTV.Application/MediaCards/MusicVideoCardViewModel.cs

@@ -18,7 +18,8 @@ public record MusicVideoCardViewModel(
     Subtitle,
     SortTitle,
     Poster,
-    State)
+    State,
+    HasMediaInfo: true)
 {
     public int CustomIndex { get; set; }
 }

ErsatzTV.Application/MediaCards/OtherVideoCardViewModel.cs

@@ -14,7 +14,8 @@ public record OtherVideoCardViewModel(
     Subtitle,
     SortTitle,
     Poster,
-    State)
+    State,
+    HasMediaInfo: true)
 {
     public int CustomIndex { get; set; }
 }

ErsatzTV.Application/MediaCards/Queries/GetCollectionCardsHandler.cs

@@ -79,9 +79,11 @@ public class GetCollectionCardsHandler :
             .ThenInclude(i => (i as Episode).Season)
             .ThenInclude(s => s.Show)
             .ThenInclude(s => s.ShowMetadata)
+            .ThenInclude(sm => sm.Artwork)
             .Include(c => c.MediaItems)
             .ThenInclude(i => (i as Episode).Season)
             .ThenInclude(s => s.SeasonMetadata)
+            .ThenInclude(sm => sm.Artwork)
             .Include(c => c.MediaItems)
             .ThenInclude(i => (i as Episode).MediaVersions)
             .ThenInclude(mv => mv.MediaFiles)
@@ -103,6 +105,12 @@ public class GetCollectionCardsHandler :
             .Include(c => c.MediaItems)
             .ThenInclude(i => (i as Image).MediaVersions)
             .ThenInclude(mv => mv.MediaFiles)
+            .Include(c => c.MediaItems)
+            .ThenInclude(i => (i as RemoteStream).RemoteStreamMetadata)
+            .ThenInclude(ovm => ovm.Artwork)
+            .Include(c => c.MediaItems)
+            .ThenInclude(i => (i as RemoteStream).MediaVersions)
+            .ThenInclude(mv => mv.MediaFiles)
             .SelectOneAsync(c => c.Id, c => c.Id == request.Id)
             .Map(c => c.ToEither(BaseError.New("Unable to load collection")))
             .MapT(c => ProjectToViewModel(c, maybeJellyfin, maybeEmby));

ErsatzTV.Application/MediaCards/RemoteStreamCardResultsViewModel.cs

@@ -0,0 +1,5 @@
+using ErsatzTV.Core.Search;
+
+namespace ErsatzTV.Application.MediaCards;
+
+public record RemoteStreamCardResultsViewModel(int Count, List<RemoteStreamCardViewModel> Cards, SearchPageMap PageMap);

ErsatzTV.Application/MediaCards/RemoteStreamCardViewModel.cs

@@ -0,0 +1,21 @@
+using ErsatzTV.Core.Domain;
+
+namespace ErsatzTV.Application.MediaCards;
+
+public record RemoteStreamCardViewModel(
+    int RemoteStreamId,
+    string Title,
+    string Subtitle,
+    string SortTitle,
+    string Poster,
+    MediaItemState State) : MediaCardViewModel(
+    RemoteStreamId,
+    Title,
+    Subtitle,
+    SortTitle,
+    Poster,
+    State,
+    HasMediaInfo: true)
+{
+    public int CustomIndex { get; set; }
+}

ErsatzTV.Application/MediaCards/SongCardViewModel.cs

@@ -14,7 +14,8 @@ public record SongCardViewModel(
     Subtitle,
     SortTitle,
     Poster,
-    State)
+    State,
+    HasMediaInfo: true)
 {
     public int CustomIndex { get; set; }
 }

ErsatzTV.Application/MediaCards/TelevisionEpisodeCardViewModel.cs

@@ -24,4 +24,5 @@ public record TelevisionEpisodeCardViewModel(
     $"Episode {Episode}",
     SortTitle,
     Poster,
-    State);
+    State,
+    HasMediaInfo: true);

ErsatzTV.Application/MediaCards/TelevisionSeasonCardViewModel.cs

@@ -17,4 +17,5 @@ public record TelevisionSeasonCardViewModel(
     Subtitle,
     SortTitle,
     Poster,
-    State);
+    State,
+    HasMediaInfo: false);

ErsatzTV.Application/MediaCards/TelevisionShowCardViewModel.cs

@@ -14,4 +14,5 @@ public record TelevisionShowCardViewModel(
     Subtitle,
     SortTitle,
     Poster,
-    State);
+    State,
+    HasMediaInfo: false);

ErsatzTV.Application/MediaCollections/Commands/AddArtistToCollectionHandler.cs

@@ -15,9 +15,9 @@ public class AddArtistToCollectionHandler :
     IRequestHandler<AddArtistToCollection, Either<BaseError, Unit>>
 {
     private readonly ChannelWriter<IBackgroundServiceRequest> _channel;
-    private readonly ChannelWriter<ISearchIndexBackgroundServiceRequest> _searchChannel;
     private readonly IDbContextFactory<TvContext> _dbContextFactory;
     private readonly IMediaCollectionRepository _mediaCollectionRepository;
+    private readonly ChannelWriter<ISearchIndexBackgroundServiceRequest> _searchChannel;
 
     public AddArtistToCollectionHandler(
         IDbContextFactory<TvContext> dbContextFactory,

ErsatzTV.Application/MediaCollections/Commands/AddEpisodeToCollectionHandler.cs

@@ -15,9 +15,9 @@ public class AddEpisodeToCollectionHandler :
     IRequestHandler<AddEpisodeToCollection, Either<BaseError, Unit>>
 {
     private readonly ChannelWriter<IBackgroundServiceRequest> _channel;
-    private readonly ChannelWriter<ISearchIndexBackgroundServiceRequest> _searchChannel;
     private readonly IDbContextFactory<TvContext> _dbContextFactory;
     private readonly IMediaCollectionRepository _mediaCollectionRepository;
+    private readonly ChannelWriter<ISearchIndexBackgroundServiceRequest> _searchChannel;
 
     public AddEpisodeToCollectionHandler(
         IDbContextFactory<TvContext> dbContextFactory,

ErsatzTV.Application/MediaCollections/Commands/AddImageToCollectionHandler.cs

@@ -14,9 +14,9 @@ namespace ErsatzTV.Application.MediaCollections;
 public class AddImageToCollectionHandler : IRequestHandler<AddImageToCollection, Either<BaseError, Unit>>
 {
     private readonly ChannelWriter<IBackgroundServiceRequest> _channel;
-    private readonly ChannelWriter<ISearchIndexBackgroundServiceRequest> _searchChannel;
     private readonly IDbContextFactory<TvContext> _dbContextFactory;
     private readonly IMediaCollectionRepository _mediaCollectionRepository;
+    private readonly ChannelWriter<ISearchIndexBackgroundServiceRequest> _searchChannel;
 
     public AddImageToCollectionHandler(
         IDbContextFactory<TvContext> dbContextFactory,

ErsatzTV.Application/MediaCollections/Commands/AddItemsToCollection.cs

@@ -12,4 +12,5 @@ public record AddItemsToCollection(
     List<int> MusicVideoIds,
     List<int> OtherVideoIds,
     List<int> SongIds,
-    List<int> ImageIds) : IRequest<Either<BaseError, Unit>>;
+    List<int> ImageIds,
+    List<int> RemoteStreamIds) : IRequest<Either<BaseError, Unit>>;

ErsatzTV.Application/MediaCollections/Commands/AddItemsToCollectionHandler.cs

@@ -15,10 +15,10 @@ public class AddItemsToCollectionHandler :
     IRequestHandler<AddItemsToCollection, Either<BaseError, Unit>>
 {
     private readonly ChannelWriter<IBackgroundServiceRequest> _channel;
-    private readonly ChannelWriter<ISearchIndexBackgroundServiceRequest> _searchChannel;
     private readonly IDbContextFactory<TvContext> _dbContextFactory;
     private readonly IMediaCollectionRepository _mediaCollectionRepository;
     private readonly IMovieRepository _movieRepository;
+    private readonly ChannelWriter<ISearchIndexBackgroundServiceRequest> _searchChannel;
     private readonly ITelevisionRepository _televisionRepository;
 
     public AddItemsToCollectionHandler(
@@ -60,6 +60,7 @@ public class AddItemsToCollectionHandler :
             .Append(request.OtherVideoIds)
             .Append(request.SongIds)
             .Append(request.ImageIds)
+            .Append(request.RemoteStreamIds)
             .ToList();
 
         var toAddIds = allItems.Where(item => collection.MediaItems.All(mi => mi.Id != item)).ToList();

ErsatzTV.Application/MediaCollections/Commands/AddItemsToPlaylist.cs

@@ -12,4 +12,5 @@ public record AddItemsToPlaylist(
     List<int> MusicVideoIds,
     List<int> OtherVideoIds,
     List<int> SongIds,
-    List<int> ImageIds) : IRequest<Either<BaseError, Unit>>;
+    List<int> ImageIds,
+    List<int> RemoteStreamIds) : IRequest<Either<BaseError, Unit>>;

ErsatzTV.Application/MediaCollections/Commands/AddMediaItemToCollection.cs

@@ -0,0 +1,5 @@
+using ErsatzTV.Core;
+
+namespace ErsatzTV.Application.MediaCollections;
+
+public record AddMediaItemToCollection(int CollectionId, int MediaItemId) : IRequest<Either<BaseError, Unit>>;

ErsatzTV.Application/MediaCollections/Commands/AddMediaItemToCollectionHandler.cs

@@ -0,0 +1,83 @@
+using System.Threading.Channels;
+using ErsatzTV.Application.Playouts;
+using ErsatzTV.Application.Search;
+using ErsatzTV.Core;
+using ErsatzTV.Core.Domain;
+using ErsatzTV.Core.Interfaces.Repositories;
+using ErsatzTV.Core.Scheduling;
+using ErsatzTV.Infrastructure.Data;
+using ErsatzTV.Infrastructure.Extensions;
+using Microsoft.EntityFrameworkCore;
+
+namespace ErsatzTV.Application.MediaCollections;
+
+public class AddMediaItemToCollectionHandler :
+    IRequestHandler<AddMediaItemToCollection, Either<BaseError, Unit>>
+{
+    private readonly ChannelWriter<IBackgroundServiceRequest> _channel;
+    private readonly IDbContextFactory<TvContext> _dbContextFactory;
+    private readonly IMediaCollectionRepository _mediaCollectionRepository;
+    private readonly ChannelWriter<ISearchIndexBackgroundServiceRequest> _searchChannel;
+
+    public AddMediaItemToCollectionHandler(
+        IDbContextFactory<TvContext> dbContextFactory,
+        IMediaCollectionRepository mediaCollectionRepository,
+        ChannelWriter<IBackgroundServiceRequest> channel,
+        ChannelWriter<ISearchIndexBackgroundServiceRequest> searchChannel)
+    {
+        _dbContextFactory = dbContextFactory;
+        _mediaCollectionRepository = mediaCollectionRepository;
+        _channel = channel;
+        _searchChannel = searchChannel;
+    }
+
+    public async Task<Either<BaseError, Unit>> Handle(
+        AddMediaItemToCollection request,
+        CancellationToken cancellationToken)
+    {
+        await using TvContext dbContext = await _dbContextFactory.CreateDbContextAsync(cancellationToken);
+        Validation<BaseError, Parameters> validation = await Validate(dbContext, request);
+        return await validation.Apply(parameters => ApplyAddMediaItemRequest(dbContext, parameters));
+    }
+
+    private async Task<Unit> ApplyAddMediaItemRequest(TvContext dbContext, Parameters parameters)
+    {
+        parameters.Collection.MediaItems.Add(parameters.MediaItem);
+        if (await dbContext.SaveChangesAsync() > 0)
+        {
+            await _searchChannel.WriteAsync(new ReindexMediaItems([parameters.MediaItem.Id]));
+
+            // refresh all playouts that use this collection
+            foreach (int playoutId in await _mediaCollectionRepository
+                         .PlayoutIdsUsingCollection(parameters.Collection.Id))
+            {
+                await _channel.WriteAsync(new BuildPlayout(playoutId, PlayoutBuildMode.Refresh));
+            }
+        }
+
+        return Unit.Default;
+    }
+
+    private static async Task<Validation<BaseError, Parameters>> Validate(
+        TvContext dbContext,
+        AddMediaItemToCollection request) =>
+        (await CollectionMustExist(dbContext, request), await ValidateMediaItem(dbContext, request))
+        .Apply((collection, episode) => new Parameters(collection, episode));
+
+    private static Task<Validation<BaseError, Collection>> CollectionMustExist(
+        TvContext dbContext,
+        AddMediaItemToCollection request) =>
+        dbContext.Collections
+            .Include(c => c.MediaItems)
+            .SelectOneAsync(c => c.Id, c => c.Id == request.CollectionId)
+            .Map(o => o.ToValidation<BaseError>("Collection does not exist."));
+
+    private static Task<Validation<BaseError, MediaItem>> ValidateMediaItem(
+        TvContext dbContext,
+        AddMediaItemToCollection request) =>
+        dbContext.MediaItems
+            .SelectOneAsync(m => m.Id, e => e.Id == request.MediaItemId)
+            .Map(o => o.ToValidation<BaseError>("MediaItem does not exist"));
+
+    private sealed record Parameters(Collection Collection, MediaItem MediaItem);
+}

ErsatzTV.Application/MediaCollections/Commands/AddMovieToCollectionHandler.cs

@@ -15,9 +15,9 @@ public class AddMovieToCollectionHandler :
     IRequestHandler<AddMovieToCollection, Either<BaseError, Unit>>
 {
     private readonly ChannelWriter<IBackgroundServiceRequest> _channel;
-    private readonly ChannelWriter<ISearchIndexBackgroundServiceRequest> _searchChannel;
     private readonly IDbContextFactory<TvContext> _dbContextFactory;
     private readonly IMediaCollectionRepository _mediaCollectionRepository;
+    private readonly ChannelWriter<ISearchIndexBackgroundServiceRequest> _searchChannel;
 
     public AddMovieToCollectionHandler(
         IDbContextFactory<TvContext> dbContextFactory,

ErsatzTV.Application/MediaCollections/Commands/AddMusicVideoToCollectionHandler.cs

@@ -15,9 +15,9 @@ public class AddMusicVideoToCollectionHandler :
     IRequestHandler<AddMusicVideoToCollection, Either<BaseError, Unit>>
 {
     private readonly ChannelWriter<IBackgroundServiceRequest> _channel;
-    private readonly ChannelWriter<ISearchIndexBackgroundServiceRequest> _searchChannel;
     private readonly IDbContextFactory<TvContext> _dbContextFactory;
     private readonly IMediaCollectionRepository _mediaCollectionRepository;
+    private readonly ChannelWriter<ISearchIndexBackgroundServiceRequest> _searchChannel;
 
     public AddMusicVideoToCollectionHandler(
         IDbContextFactory<TvContext> dbContextFactory,

ErsatzTV.Application/MediaCollections/Commands/AddOtherVideoToCollectionHandler.cs

@@ -15,9 +15,9 @@ public class AddOtherVideoToCollectionHandler :
     IRequestHandler<AddOtherVideoToCollection, Either<BaseError, Unit>>
 {
     private readonly ChannelWriter<IBackgroundServiceRequest> _channel;
-    private readonly ChannelWriter<ISearchIndexBackgroundServiceRequest> _searchChannel;
     private readonly IDbContextFactory<TvContext> _dbContextFactory;
     private readonly IMediaCollectionRepository _mediaCollectionRepository;
+    private readonly ChannelWriter<ISearchIndexBackgroundServiceRequest> _searchChannel;
 
     public AddOtherVideoToCollectionHandler(
         IDbContextFactory<TvContext> dbContextFactory,

ErsatzTV.Application/MediaCollections/Commands/AddSeasonToCollectionHandler.cs

@@ -15,9 +15,9 @@ public class AddSeasonToCollectionHandler :
     IRequestHandler<AddSeasonToCollection, Either<BaseError, Unit>>
 {
     private readonly ChannelWriter<IBackgroundServiceRequest> _channel;
-    private readonly ChannelWriter<ISearchIndexBackgroundServiceRequest> _searchChannel;
     private readonly IDbContextFactory<TvContext> _dbContextFactory;
     private readonly IMediaCollectionRepository _mediaCollectionRepository;
+    private readonly ChannelWriter<ISearchIndexBackgroundServiceRequest> _searchChannel;
 
     public AddSeasonToCollectionHandler(
         IDbContextFactory<TvContext> dbContextFactory,

ErsatzTV.Application/MediaCollections/Commands/AddShowToCollectionHandler.cs

@@ -15,9 +15,9 @@ public class AddShowToCollectionHandler :
     IRequestHandler<AddShowToCollection, Either<BaseError, Unit>>
 {
     private readonly ChannelWriter<IBackgroundServiceRequest> _channel;
-    private readonly ChannelWriter<ISearchIndexBackgroundServiceRequest> _searchChannel;
     private readonly IDbContextFactory<TvContext> _dbContextFactory;
     private readonly IMediaCollectionRepository _mediaCollectionRepository;
+    private readonly ChannelWriter<ISearchIndexBackgroundServiceRequest> _searchChannel;
 
     public AddShowToCollectionHandler(
         IDbContextFactory<TvContext> dbContextFactory,

ErsatzTV.Application/MediaCollections/Commands/AddSongToCollectionHandler.cs

@@ -15,9 +15,9 @@ public class AddSongToCollectionHandler :
     IRequestHandler<AddSongToCollection, Either<BaseError, Unit>>
 {
     private readonly ChannelWriter<IBackgroundServiceRequest> _channel;
-    private readonly ChannelWriter<ISearchIndexBackgroundServiceRequest> _searchChannel;
     private readonly IDbContextFactory<TvContext> _dbContextFactory;
     private readonly IMediaCollectionRepository _mediaCollectionRepository;
+    private readonly ChannelWriter<ISearchIndexBackgroundServiceRequest> _searchChannel;
 
     public AddSongToCollectionHandler(
         IDbContextFactory<TvContext> dbContextFactory,

ErsatzTV.Application/MediaCollections/Commands/AddTraktList.cs

@@ -2,4 +2,9 @@
 
 namespace ErsatzTV.Application.MediaCollections;
 
-public record AddTraktList(string TraktListUrl) : IRequest<Either<BaseError, Unit>>, IBackgroundServiceRequest;
+public record AddTraktList(string TraktListUrl, string User, string List, bool Unlock)
+    : IRequest<Either<BaseError, Unit>>, IBackgroundServiceRequest
+{
+    public static AddTraktList FromUrl(string traktListUrl) => new(traktListUrl, string.Empty, string.Empty, true);
+    public static AddTraktList Existing(string user, string list, bool unlock) => new(string.Empty, user, list, unlock);
+}

ErsatzTV.Application/MediaCollections/Commands/AddTraktListHandler.cs

@@ -42,15 +42,23 @@ public partial class AddTraktListHandler : TraktCommandBase, IRequestHandler<Add
         }
         finally
         {
-            _entityLocker.UnlockTrakt();
+            if (request.Unlock)
+            {
+                _entityLocker.UnlockTrakt();
+            }
         }
     }
 
     private static Validation<BaseError, Parameters> ValidateUrl(AddTraktList request)
     {
+        if (!string.IsNullOrWhiteSpace(request.User) && !string.IsNullOrWhiteSpace(request.List))
+        {
+            return new Parameters(request.User, request.List);
+        }
+
         // if we get a url, ensure it's for trakt.tv
         Match match = Uri.IsWellFormedUriString(request.TraktListUrl, UriKind.Absolute)
-            ? UriTraktListRegex().Match(request.TraktListUrl)
+            ? MatchTraktListUrl(request.TraktListUrl)
             : ShorthandTraktListRegex().Match(request.TraktListUrl);
 
         if (match.Success)
@@ -63,6 +71,17 @@ public partial class AddTraktListHandler : TraktCommandBase, IRequestHandler<Add
         return BaseError.New("Invalid Trakt list url");
     }
 
+    private static Match MatchTraktListUrl(string traktListUrl)
+    {
+        Match match = UriTraktListRegex().Match(traktListUrl);
+        if (!match.Success)
+        {
+            match = UriTraktListRegex2().Match(traktListUrl);
+        }
+
+        return match;
+    }
+
     private async Task<Either<BaseError, Unit>> DoAdd(Parameters parameters)
     {
         await using TvContext dbContext = await _dbContextFactory.CreateDbContextAsync();
@@ -72,6 +91,7 @@ public partial class AddTraktListHandler : TraktCommandBase, IRequestHandler<Add
 
         foreach (TraktList list in maybeList.RightToSeq())
         {
+            list.User = parameters.User.ToLowerInvariant();
             maybeList = await SaveList(dbContext, list);
         }
 
@@ -89,11 +109,14 @@ public partial class AddTraktListHandler : TraktCommandBase, IRequestHandler<Add
         return maybeList.Map(_ => Unit.Default);
     }
 
-    private sealed record Parameters(string User, string List);
-
     [GeneratedRegex(@"https:\/\/trakt\.tv\/users\/([\w\-_]+)\/(?:lists\/)?([\w\-_]+)")]
     private static partial Regex UriTraktListRegex();
 
+    [GeneratedRegex(@"https:\/\/trakt\.tv\/lists\/([\w\-_]+)\/([\w\-_]+)")]
+    private static partial Regex UriTraktListRegex2();
+
     [GeneratedRegex(@"([\w\-_]+)\/(?:lists\/)?([\w\-_]+)")]
     private static partial Regex ShorthandTraktListRegex();
+
+    private sealed record Parameters(string User, string List);
 }

ErsatzTV.Application/MediaCollections/Commands/CreateCollectionHandler.cs

@@ -39,12 +39,11 @@ public class CreateCollectionHandler :
     private static Task<Validation<BaseError, Collection>> Validate(
         TvContext dbContext,
         CreateCollection request) =>
-        ValidateName(dbContext, request).MapT(
-            name => new Collection
-            {
-                Name = name,
-                MediaItems = new List<MediaItem>()
-            });
+        ValidateName(dbContext, request).MapT(name => new Collection
+        {
+            Name = name,
+            MediaItems = new List<MediaItem>()
+        });
 
     private static async Task<Validation<BaseError, string>> ValidateName(
         TvContext dbContext,

ErsatzTV.Application/MediaCollections/Commands/CreateMultiCollectionHandler.cs

@@ -51,45 +51,42 @@ public class CreateMultiCollectionHandler :
     private static Task<Validation<BaseError, MultiCollection>> Validate(
         TvContext dbContext,
         CreateMultiCollection request) =>
-        ValidateName(dbContext, request).MapT(
-            name => new MultiCollection
-            {
-                Name = name,
-                MultiCollectionItems = request.Items.Bind(
-                        i =>
-                        {
-                            if (i.CollectionId.HasValue)
+        ValidateName(dbContext, request).MapT(name => new MultiCollection
+        {
+            Name = name,
+            MultiCollectionItems = request.Items.Bind(i =>
+                {
+                    if (i.CollectionId.HasValue)
+                    {
+                        return Some(
+                            new MultiCollectionItem
                             {
-                                return Some(
-                                    new MultiCollectionItem
-                                    {
-                                        CollectionId = i.CollectionId.Value,
-                                        ScheduleAsGroup = i.ScheduleAsGroup,
-                                        PlaybackOrder = i.PlaybackOrder
-                                    });
-                            }
+                                CollectionId = i.CollectionId.Value,
+                                ScheduleAsGroup = i.ScheduleAsGroup,
+                                PlaybackOrder = i.PlaybackOrder
+                            });
+                    }
 
-                            return Option<MultiCollectionItem>.None;
-                        })
-                    .ToList(),
-                MultiCollectionSmartItems = request.Items.Bind(
-                        i =>
-                        {
-                            if (i.SmartCollectionId.HasValue)
+                    return Option<MultiCollectionItem>.None;
+                })
+                .ToList(),
+            MultiCollectionSmartItems = request.Items.Bind(i =>
+                {
+                    if (i.SmartCollectionId.HasValue)
+                    {
+                        return Some(
+                            new MultiCollectionSmartItem
                             {
-                                return Some(
-                                    new MultiCollectionSmartItem
-                                    {
-                                        SmartCollectionId = i.SmartCollectionId.Value,
-                                        ScheduleAsGroup = i.ScheduleAsGroup,
-                                        PlaybackOrder = i.PlaybackOrder
-                                    });
-                            }
+                                SmartCollectionId = i.SmartCollectionId.Value,
+                                ScheduleAsGroup = i.ScheduleAsGroup,
+                                PlaybackOrder = i.PlaybackOrder
+                            });
+                    }
 
-                            return Option<MultiCollectionSmartItem>.None;
-                        })
-                    .ToList()
-            });
+                    return Option<MultiCollectionSmartItem>.None;
+                })
+                .ToList()
+        });
 
     private static async Task<Validation<BaseError, string>> ValidateName(
         TvContext dbContext,