update changelog for release v0.6.7-beta [no ci]

include other videos (ungrouped) in shuffle in order (#953 )
* include other videos (ungrouped) in shuffle in order * fix id conflict
2022-09-05 13:15:04 -05:00 · 2022-09-05 09:20:11 -05:00 · 2022-09-05 08:41:39 -05:00 · 2022-09-04 20:28:28 -05:00 · 2022-09-04 18:07:03 -05:00 · 2022-09-04 14:25:05 -05:00
495 changed files with 91938 additions and 7593 deletions
@@ -1,6 +1,6 @@

 [*]
-charset=utf-8-bom
+charset=utf-8
 end_of_line=lf
 trim_trailing_whitespace=false
 insert_final_newline=false
@@ -41,18 +41,18 @@ jobs:
            target: osx-arm64
    steps:
      - name: Get the sources
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
        with:
          fetch-depth: 0
          submodules: true

      - name: Setup .NET Core
-        uses: actions/setup-dotnet@v1
+        uses: actions/setup-dotnet@v2
        with:
          dotnet-version: 6.0.x

      - name: Setup Node.js
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v3
        with:
          node-version: '14'

@@ -108,15 +108,16 @@ jobs:
            --icon "ErsatzTV.app" 200 190 \
            --hide-extension "ErsatzTV.app" \
            --app-drop-link 600 185 \
+            --skip-jenkins \
            "ErsatzTV.dmg" \
            "ErsatzTV.app/"

      - name: Notarize
        shell: bash
        run: |
-          curl -o gon.zip -L -s "https://github.com/mitchellh/gon/releases/latest/download/gon_macos.zip"
-          unzip -o -q gon.zip
-          ./gon -log-level=debug -log-json ./gon.json
+          brew tap mitchellh/gon
+          brew install mitchellh/gon/gon
+          gon -log-level=debug -log-json ./gon.json
        env:
          AC_USERNAME: ${{ secrets.ac_username }}
          AC_PASSWORD: ${{ secrets.ac_password }}
@@ -167,17 +168,17 @@ jobs:
            target: win-x64
    steps:
      - name: Get the sources
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
        with:
          fetch-depth: 0

      - name: Setup .NET Core
-        uses: actions/setup-dotnet@v1
+        uses: actions/setup-dotnet@v2
        with:
          dotnet-version: 6.0.x

      - name: Setup Node.js
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v3
        with:
          node-version: '14'

@@ -190,14 +191,14 @@ jobs:
        run: dotnet clean --configuration Release && dotnet nuget locals all --clear

      - name: Install dependencies
-        run: dotnet restore -r "${{ matrix.target}}"
+        run: dotnet restore -r "${{ matrix.target }}"

      - uses: suisei-cn/actions-download-file@v1
-        if: ${{ matrix.kind }} == "windows"
+        if: ${{ matrix.kind == 'windows' }}
        id: downloadffmpeg
        name: Download ffmpeg
        with:
-          url: "https://github.com/GyanD/codexffmpeg/releases/download/5.0/ffmpeg-5.0-full_build.7z"
+          url: "https://github.com/GyanD/codexffmpeg/releases/download/5.1/ffmpeg-5.1-full_build.7z"
          target: ffmpeg/

      - name: Build
@@ -10,7 +10,7 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Get the sources
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
        with:
          fetch-depth: 0
      - name: Extract Docker Tag
@@ -24,65 +24,89 @@ jobs:
    name: Build & Publish
    runs-on: ubuntu-latest
    if: contains(github.event.head_commit.message, '[no build]') == false
+    strategy:
+      matrix:
+        include:
+          - name: base
+            path: ''
+            suffix: ''
+            qemu: false
+          - name: nvidia
+            path: 'nvidia/'
+            suffix: '-nvidia'
+            qemu: false
+          - name: vaapi
+            path: 'vaapi/'
+            suffix: '-vaapi'
+            qemu: false
+          - name: arm32v7
+            path: 'arm32v7/'
+            suffix: '-arm'
+            qemu: true
+          - name: arm64
+            path: 'arm64/'
+            suffix: '-arm64'
+            qemu: true
    steps:
      - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
        with:
          fetch-depth: 0

-      - name: Set up Docker Buildx Base
-        uses: docker/setup-buildx-action@v1
-        id: builder-base
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+        if: ${{ matrix.qemu == true }}

-      - name: Set up Docker Buildx NVIDIA
-        uses: docker/setup-buildx-action@v1
-        id: builder-nvidia
-
-      - name: Set up Docker Buildx VAAPI
-        uses: docker/setup-buildx-action@v1
-        id: builder-vaapi
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+        id: docker-buildx

      - name: Login to DockerHub
-        uses: docker/login-action@v1
+        uses: docker/login-action@v2
        with:
          username: ${{ secrets.docker_hub_username }}
          password: ${{ secrets.docker_hub_access_token }}

-      - name: Build and push base
-        uses: docker/build-push-action@v2
+      - name: Build and push
+        uses: docker/build-push-action@v3
        with:
-          builder: ${{ steps.builder-base.outputs.name }}
+          builder: ${{ steps.docker-buildx.outputs.name }}
          context: .
-          file: ./docker/Dockerfile
+          file: ./docker/${{ matrix.path }}Dockerfile
          push: true
          build-args: |
-            INFO_VERSION=${{ inputs.info_version }}-docker
+            INFO_VERSION=${{ inputs.info_version }}-docker${{ matrix.suffix }}
          tags: |
-            jasongdove/ersatztv:${{ inputs.base_version }}
-            jasongdove/ersatztv:${{ inputs.tag_version }}
+            jasongdove/ersatztv:${{ inputs.base_version }}${{ matrix.suffix }}
+            jasongdove/ersatztv:${{ inputs.tag_version }}${{ matrix.suffix }}
+        if: ${{ matrix.name != 'arm64' && matrix.name != 'arm32v7' }}

-      - name: Build and push nvidia
-        uses: docker/build-push-action@v2
+      - name: Build and push
+        uses: docker/build-push-action@v3
        with:
-          builder: ${{ steps.builder-nvidia.outputs.name }}
+          builder: ${{ steps.docker-buildx.outputs.name }}
          context: .
-          file: ./docker/nvidia/Dockerfile
+          file: ./docker/${{ matrix.path }}Dockerfile
          push: true
+          platforms: 'linux/arm64'
          build-args: |
-            INFO_VERSION=${{ inputs.info_version }}-docker-nvidia
+            INFO_VERSION=${{ inputs.info_version }}-docker${{ matrix.suffix }}
          tags: |
-            jasongdove/ersatztv:${{ inputs.base_version }}-nvidia
-            jasongdove/ersatztv:${{ inputs.tag_version }}-nvidia
+            jasongdove/ersatztv:${{ inputs.base_version }}${{ matrix.suffix }}
+            jasongdove/ersatztv:${{ inputs.tag_version }}${{ matrix.suffix }}
+        if: ${{ matrix.name == 'arm64' }}

-      - name: Build and push vaapi
-        uses: docker/build-push-action@v2
+      - name: Build and push
+        uses: docker/build-push-action@v3
        with:
-          builder: ${{ steps.builder-vaapi.outputs.name }}
+          builder: ${{ steps.docker-buildx.outputs.name }}
          context: .
-          file: ./docker/vaapi/Dockerfile
+          file: ./docker/${{ matrix.path }}Dockerfile
          push: true
+          platforms: 'linux/arm/v7'
          build-args: |
-            INFO_VERSION=${{ inputs.info_version }}-docker-vaapi
+            INFO_VERSION=${{ inputs.info_version }}-docker${{ matrix.suffix }}
          tags: |
-            jasongdove/ersatztv:${{ inputs.base_version }}-vaapi
-            jasongdove/ersatztv:${{ inputs.tag_version }}-vaapi
+            jasongdove/ersatztv:${{ inputs.base_version }}${{ matrix.suffix }}
+            jasongdove/ersatztv:${{ inputs.tag_version }}${{ matrix.suffix }}
+        if: ${{ matrix.name == 'arm32v7' }}
@@ -3,13 +3,16 @@ on:
  push:
    branches:
      - main
+    paths:
+      - docs/**
+      - mkdocs.yml
 jobs:
  build:
    name: Deploy docs
    runs-on: ubuntu-latest
    steps:
      - name: Checkout master
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3

      - name: Deploy docs
        uses: mhausenblas/mkdocs-deploy-gh-pages@master
@@ -10,10 +10,10 @@ jobs:
        os: [ windows-latest, ubuntu-latest, macos-latest ]
    steps:
      - name: Get the sources
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3

      - name: Setup .NET Core
-        uses: actions/setup-dotnet@v1
+        uses: actions/setup-dotnet@v2
        with:
          dotnet-version: 6.0.x

@@ -8,7 +8,7 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Get the sources
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
        with:
          fetch-depth: 0
      - name: Extract Docker Tag
@@ -7,10 +7,10 @@ jobs:
    steps:
      # Checkout the current repo
      - name: Checkout current repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
      # Setup NodeJS version 14  
      - name: Setup NodeJS V14.x.x
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v3
        with:
          node-version: '14'
      # CD into the current client directory and lint and build the client
@@ -5,6 +5,216 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).

 ## [Unreleased]

+## [0.6.7-beta] - 2022-09-05
+### Fixed
+- When all audio streams are selected with `HLS Direct`, explicitly copy them without transcoding
+  - This only happens when the channel does not have a `Preferred Audio Language`
+- Fix scanner crash caused by invalid mtime
+- `VAAPI`: Downgrade libva from 2.15 to 2.14
+- Fix bug with XMLTV that caused some filler to display with primary content details
+- Multiple fixes for content scaling with `Nvidia`, `Qsv` and `Vaapi` accelerations
+- Properly scale image-based subtitles
+- Fix bug where a schedule containing a single item (fixed start and flood) would never finish building a playout
+  - Logic was also added to detect infinite playout build loops in the future and stop them
+- Fix bug where `Other Videos` wouldn't be included in scheduling mode `Shuffle In Order`
+
+### Added
+- Add `Preferred Audio Title` feature
+    - Preference can be configured in channel settings and overridden on schedule items
+    - When a title is specified, audio streams that contain that title (case-insensitive search) will be prioritized
+    - This can be helpful for creating channels that use commentary tracks
+    - External tooling exists to easily update title/name metadata if your audio streams don't already have this metadata
+- Add `Amf` hardware acceleration option for AMD GPUs on Windows
+- Add `QSV Extra Hardware Frames` parameter for tuning QSV acceleration
+  - Performance may improve on some systems after doubling or halving the default value of `64`
+
+## [0.6.6-beta] - 2022-08-17
+### Fixed
+- Use MIME Type `application/x-mpegurl` for all playlists instead of `application/vnd.apple.mpegurl`
+- Replace `setsar` filter with `setdar` filter
+  - `setsar` caused issues scaling between two different aspect ratios
+    - For example, some 4:3 content would appear stretched when scaled to a 16:9 resolution
+  - `setdar` is now only used when aspect ratios match 
+- Prioritize aspect ratio from container when video stream contains conflicting aspect ratio
+  - This is usually caused by bad authoring, but the change should improve scaling behavior for edge cases
+
+### Added
+- Support DSD audio file formats (DFF and DSF) in local song libraries
+- Support OGG audio file formats (OGG, OPUS, OGA, OGX, SPX) in local song libraries
+
+### Changed
+- Always return playlist after a maximum of 8 seconds while starting up an HLS Segmenter session
+- Use multi-variant playlists instead of redirects for HLS Segmenter sessions
+- Upgrade ffmpeg from 5.0 to 5.1 in most docker images (not ARM variants)
+    - Upgrading from 5.0 to 5.1 is also recommended for other installations (Windows, Linux)
+
+## [0.6.5-beta] - 2022-08-02
+### Fixed
+- Fix database initializer; fresh installs with v0.6.4-beta are missing some config data and should upgrade
+
+## [0.6.4-beta] - 2022-07-28
+### Fixed
+- Fix subtitle stream selection when subtitle language is different than audio language
+- Fix bug with unsupported AAC channel layouts
+- Fix NVIDIA second-gen maxwell capabilities detection
+- Return distinct search results for episodes and other videos that have the same title
+  - For example, two other videos both named `Trailer` would previously have displayed as one item in search results
+- Fix schedules that would begin to repeat the same content in the same order after a couple of days
+
+### Added
+- Add `640x480` resolution
+
+## [0.6.3-beta] - 2022-07-04
+### Fixed
+- Maintain stream continuity when playout is rebuilt for a channel that is actively being streamed
+- Properly apply changes to episode title, sort title, outline and plot from Plex
+- Fix search index for other videos and songs
+  - In previous versions, some libraries would incorrectly display only one item
+- Properly display old versions of renamed items in trash
+
+### Added
+- Add `Minimum Log Level` option to `Settings` page
+  - Other methods of configuring the log level will no longer work
+
+## [0.6.2-beta] - 2022-06-18
+### Fixed
+- Fix content repeating for up to a minute near the top of every hour
+- Check whether hardware-accelerated hevc codecs are supported by the NVIDIA card
+  - Software codecs will be used if they are unsupported by the NVIDIA card
+- Fix sorting of channel contents in EPG
+- Fix Jellyfin admin user id sync
+  - Ignore disabled admins and admins who do not have access to all libraries
+
+### Added
+- Add 32-bit `arm` docker tags (`develop-arm` and `latest-arm`)
+
+### Changed
+- Regularly delete old segments from transcode folder while content is actively transcoding
+  - This should help reduce required disk space
+  - To further minimize required disk space, set `Work-Ahead HLS Segmenter Limit` to `0` in `Settings`
+
+## [0.6.1-beta] - 2022-06-03
+### Fixed
+- Fix Jellyfin show library paging
+- Properly locate and identify multiple Plex servers
+- Properly restore `Unavailable`/`File Not Found` items when they are located on disk
+
+### Added
+- Add basic music video credits subtitle generation
+  - This can be enabled in channel settings
+
+## [0.6.0-beta] - 2022-06-01
+### Fixed
+- Additional fix for duplicate `Other Videos` entries; trash may need to be emptied one last time after upgrading
+- Fix watermark opacity in cultures where `,` is a decimal separator
+- Rework playlist filtering to avoid empty playlist responses
+- Fix some QSV/VAAPI memory errors by always requesting 64 extra hardware frames
+
+### Added
+- Enable QSV hardware acceleration for vaapi docker images
+
+### Changed
+- Use paging to synchronize all media from Plex, Jellyfin and Emby
+  - This will reduce memory use and improve reliability of synchronizing large libraries
+- Disable low power mode for `h264_qsv` and `hevc_qsv` encoders
+
+## [0.5.8-beta] - 2022-05-20
+### Fixed
+- Fix error display with `HLS Segmenter` and `MPEG-TS` streaming modes
+- Remove erroneous log messages about normalizing framerate on channels where framerate normalization is disabled
+- Fix unscheduled filler gaps that sometimes happen as playouts are automatically extended each hour
+
+### Added
+- Clean transcode cache folder on startup and after `HLS Segmenter` session terminates for any reason
+
+### Changed
+- Remove thread limitation for scenarios where it is not required
+  - This should give a performance boost to installations that don't use hardware acceleration
+- Use hardware acceleration to display error messages where configured
+
+## [0.5.7-beta] - 2022-05-14
+### Fixed
+- Reduce memory use due to library scan operations
+- Fix some instances of filler getting "stuck" when a filler item is encountered that's too long for the gap
+- Properly ignore Plex `Other Videos` libraries (`movie` libraries where agent is `com.plexapp.agents.none`)
+- Fix `Custom Title` for schedule items with `One`, `Multiple` and `Flood` playout modes 
+- Fix scheduling bug where flood items would sometimes fail to continue after midnight
+
+### Added
+- Add `metadata_kind` field to search index to allow searching for items with a particular metdata source
+  - Valid metadata kinds are `fallback`, `sidecar` (NFO), `external` (from a media server) and `embedded` (songs)
+- Add autocomplete functionality to search bar to quickly navigate to channels, ffmpeg profiles, collections and schedules by name
+- Add global setting to skip missing (file-not-found or unavailable) items when building playouts
+- Add filler preset option to allow watermarks to overlay on top of filler (disabled by default)
+  - This option is applied when new items are added to a playout; rebuilding is needed if you want the change to take effect immediately
+- Read `track` field from music video NFO metadata and use it for chronological sorting (after release date)
+- Add `Random Start Point` option to schedules
+  - When this option is enabled, all `Chronological` or `Shuffle In Order` content groups will have their start points randomized
+  - When this option is disabled, all `Chronological` or `Shuffle In Order` content groups will start with the chronologically earliest item
+
+### Changed
+- Replace invalid (control) characters in NFO metadata with replacement character `�` before parsing
+- Store partial (incomplete) NFO metadata results when invalid XML is encountered
+  - Previously, no metadata would be stored if the XML within the NFO failed to validate
+
+## [0.5.6-beta] - 2022-05-06
+### Fixed
+- Fix processing local movie NFO metadata without a `year` value
+- Fix processing local movie fallback metadata
+- Fix search edge case where very recently added items (hours) would not be returned by relative date queries
+- Fix search index validation on startup; improper validation was causing a rebuild with every startup
+- Block library scanning until search index has been recreated/upgraded
+- Fix occasional erroneous log messages when HLS channel playback times out because all clients have left
+- Fix fallback filler playback
+- Fix stream continuity when error messages are displayed
+- Fix duplicate scanning within `Other Video` libraries (i.e. folders would be scanned multiple times) 
+
+### Added
+- Add `show_genre` and `show_tag` to search index for seasons and episodes
+- Use `aired` value to source release date from music video nfo metadata
+- Add NFO metadata support to `Other Video` libraries
+  - `Other Video` NFO metadata must be in the movie NFO metadata format
+
+## [0.5.5-beta] - 2022-05-03
+### Fixed
+- Fix adding episodes with no title to the search index
+  - This behavior was preventing some items from being removed from the trash
+- Support combination NFO metadata for movies, shows, artists and music videos
+  - Note that ErsatzTV does not scrape any metadata; any URLs after the XML will be ignored
+- Fix bug causing some Jellyfin and Emby content to incorrectly show as unavailable
+- Fix extracting embedded `mov_text` subtitles
+- Properly extract embedded subtitles on playouts where subtitles are only enabled on schedule items (and not on the channel itself)
+
+### Added
+- Add experimental `arm64` docker tags (`develop-arm64` and `latest-arm64`)
+- Use `Sort Title` from Movie NFO metadata if available
+- Support multiple `Artist` entries in music video NFO metadata
+
+## [0.5.4-beta] - 2022-04-29
+### Fixed
+- Cleanly stop all library scans when service termination is requested
+- Fix health check crash when trash contains a show or a season
+- Fix ability of health check crash to crash home page
+- Remove and ignore Season 0/Specials from Plex shows that have no specials
+- Automatically delete and rebuild the search index on startup if it has become corrupt
+- Automatically scan Jellyfin and Emby libraries on startup and periodically
+- Properly remove un-synchronized Plex, Jellyfin and Emby items from the database and search index
+- Fix synchronizing movies within a collection from Jellyfin
+
+### Changed
+- Update Plex, Jellyfin and Emby movie and show library scanners to share a significant amount of code
+  - This should help maintain feature parity going forward
+- Optimize search-index rebuilding to complete 100x faster
+- **No longer use network paths to source content from Jellyfin and Emby**
+  - **If you previously used path replacements to convert network paths to local paths, you should remove them**
+
+### Added
+- Add `unavailable` state for Jellyfin and Emby movie and show libraries
+- Add `height` and `width` to search index for all videos
+- Add `season_number` and `episode_number` to search index for all episodes
+- Add `season_number` to search index for seasons
+- Add `show_title` to search index for seasons and episodes
+
 ## [0.5.3-beta] - 2022-04-24
 ### Fixed
 - Cleanly stop Plex library scan when service termination is requested
@@ -1113,7 +1323,20 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Initial release to facilitate testing outside of Docker.


-[Unreleased]: https://github.com/jasongdove/ErsatzTV/compare/v0.5.3-beta...HEAD
+[Unreleased]: https://github.com/jasongdove/ErsatzTV/compare/v0.6.7-beta...HEAD
+[0.6.7-beta]: https://github.com/jasongdove/ErsatzTV/compare/v0.6.6-beta...v0.6.7-beta
+[0.6.6-beta]: https://github.com/jasongdove/ErsatzTV/compare/v0.6.5-beta...v0.6.6-beta
+[0.6.5-beta]: https://github.com/jasongdove/ErsatzTV/compare/v0.6.4-beta...v0.6.5-beta
+[0.6.4-beta]: https://github.com/jasongdove/ErsatzTV/compare/v0.6.3-beta...v0.6.4-beta
+[0.6.3-beta]: https://github.com/jasongdove/ErsatzTV/compare/v0.6.2-beta...v0.6.3-beta
+[0.6.2-beta]: https://github.com/jasongdove/ErsatzTV/compare/v0.6.1-beta...v0.6.2-beta
+[0.6.1-beta]: https://github.com/jasongdove/ErsatzTV/compare/v0.6.0-beta...v0.6.1-beta
+[0.6.0-beta]: https://github.com/jasongdove/ErsatzTV/compare/v0.5.8-beta...v0.6.0-beta
+[0.5.8-beta]: https://github.com/jasongdove/ErsatzTV/compare/v0.5.7-beta...v0.5.8-beta
+[0.5.7-beta]: https://github.com/jasongdove/ErsatzTV/compare/v0.5.6-beta...v0.5.7-beta
+[0.5.6-beta]: https://github.com/jasongdove/ErsatzTV/compare/v0.5.5-beta...v0.5.6-beta
+[0.5.5-beta]: https://github.com/jasongdove/ErsatzTV/compare/v0.5.4-beta...v0.5.5-beta
+[0.5.4-beta]: https://github.com/jasongdove/ErsatzTV/compare/v0.5.3-beta...v0.5.4-beta
 [0.5.3-beta]: https://github.com/jasongdove/ErsatzTV/compare/v0.5.2-beta...v0.5.3-beta
 [0.5.2-beta]: https://github.com/jasongdove/ErsatzTV/compare/v0.5.1-beta...v0.5.2-beta
 [0.5.1-beta]: https://github.com/jasongdove/ErsatzTV/compare/v0.5.0-beta...v0.5.1-beta
@@ -1204,4 +1427,4 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 [0.0.5-prealpha]: https://github.com/jasongdove/ErsatzTV/compare/v0.0.4-prealpha...v0.0.5-prealpha
 [0.0.4-prealpha]: https://github.com/jasongdove/ErsatzTV/compare/v0.0.3-prealpha...v0.0.4-prealpha
 [0.0.3-prealpha]: https://github.com/jasongdove/ErsatzTV/compare/v0.0.1-prealpha...v0.0.3-prealpha
-[0.0.1-prealpha]: https://github.com/jasongdove/ErsatzTV/releases/tag/v0.0.1-prealpha
+[0.0.1-prealpha]: https://github.com/jasongdove/ErsatzTV/releases/tag/v0.0.1-prealpha
@@ -17,7 +17,7 @@
    </ItemGroup>

    <ItemGroup>
-      <PackageReference Include="CliWrap" Version="3.4.3" />
+      <PackageReference Include="CliWrap" Version="3.5.0" />
    </ItemGroup>

    <ItemGroup>
@@ -30,4 +30,4 @@
      </Compile>
    </ItemGroup>

-</Project>
+</Project>
@@ -11,9 +11,11 @@ public record ChannelViewModel(
    int FFmpegProfileId,
    string Logo,
    string PreferredAudioLanguageCode,
+    string PreferredAudioTitle,
    StreamingMode StreamingMode,
    int? WatermarkId,
    int? FallbackFillerId,
    int PlayoutCount,
    string PreferredSubtitleLanguageCode,
-    ChannelSubtitleMode SubtitleMode);
+    ChannelSubtitleMode SubtitleMode,
+    ChannelMusicVideoCreditsMode MusicVideoCreditsMode);
@@ -12,8 +12,10 @@ public record CreateChannel
    int FFmpegProfileId,
    string Logo,
    string PreferredAudioLanguageCode,
+    string PreferredAudioTitle,
    StreamingMode StreamingMode,
    int? WatermarkId,
    int? FallbackFillerId,
    string PreferredSubtitleLanguageCode,
-    ChannelSubtitleMode SubtitleMode) : IRequest<Either<BaseError, CreateChannelResult>>;
+    ChannelSubtitleMode SubtitleMode,
+    ChannelMusicVideoCreditsMode MusicVideoCreditsMode) : IRequest<Either<BaseError, CreateChannelResult>>;
@@ -21,7 +21,7 @@ public class CreateChannelHandler : IRequestHandler<CreateChannel, Either<BaseEr
    {
        await using TvContext dbContext = await _dbContextFactory.CreateDbContextAsync(cancellationToken);
        Validation<BaseError, Channel> validation = await Validate(dbContext, request);
-        return await LanguageExtensions.Apply(validation, c => PersistChannel(dbContext, c));
+        return await validation.Apply(c => PersistChannel(dbContext, c));
    }

    private static async Task<CreateChannelResult> PersistChannel(TvContext dbContext, Channel channel)
@@ -71,8 +71,10 @@ public class CreateChannelHandler : IRequestHandler<CreateChannel, Either<BaseEr
                    StreamingMode = request.StreamingMode,
                    Artwork = artwork,
                    PreferredAudioLanguageCode = preferredAudioLanguageCode,
+                    PreferredAudioTitle = request.PreferredAudioTitle,
                    PreferredSubtitleLanguageCode = preferredSubtitleLanguageCode,
-                    SubtitleMode = request.SubtitleMode
+                    SubtitleMode = request.SubtitleMode,
+                    MusicVideoCreditsMode = request.MusicVideoCreditsMode
                };

                foreach (int id in watermarkId)
@@ -13,8 +13,10 @@ public record UpdateChannel
    int FFmpegProfileId,
    string Logo,
    string PreferredAudioLanguageCode,
+    string PreferredAudioTitle,
    StreamingMode StreamingMode,
    int? WatermarkId,
    int? FallbackFillerId,
    string PreferredSubtitleLanguageCode,
-    ChannelSubtitleMode SubtitleMode) : IRequest<Either<BaseError, ChannelViewModel>>;
+    ChannelSubtitleMode SubtitleMode,
+    ChannelMusicVideoCreditsMode MusicVideoCreditsMode) : IRequest<Either<BaseError, ChannelViewModel>>;
@@ -31,7 +31,7 @@ public class UpdateChannelHandler : IRequestHandler<UpdateChannel, Either<BaseEr
    {
        await using TvContext dbContext = await _dbContextFactory.CreateDbContextAsync(cancellationToken);
        Validation<BaseError, Channel> validation = await Validate(dbContext, request);
-        return await LanguageExtensions.Apply(validation, c => ApplyUpdateRequest(dbContext, c, request));
+        return await validation.Apply(c => ApplyUpdateRequest(dbContext, c, request));
    }

    private async Task<ChannelViewModel> ApplyUpdateRequest(TvContext dbContext, Channel c, UpdateChannel update)
@@ -42,8 +42,10 @@ public class UpdateChannelHandler : IRequestHandler<UpdateChannel, Either<BaseEr
        c.Categories = update.Categories;
        c.FFmpegProfileId = update.FFmpegProfileId;
        c.PreferredAudioLanguageCode = update.PreferredAudioLanguageCode;
+        c.PreferredAudioTitle = update.PreferredAudioTitle;
        c.PreferredSubtitleLanguageCode = update.PreferredSubtitleLanguageCode;
        c.SubtitleMode = update.SubtitleMode;
+        c.MusicVideoCreditsMode = update.MusicVideoCreditsMode;
        c.Artwork ??= new List<Artwork>();

        if (!string.IsNullOrWhiteSpace(update.Logo))
@@ -15,12 +15,14 @@ internal static class Mapper
            channel.FFmpegProfileId,
            GetLogo(channel),
            channel.PreferredAudioLanguageCode,
+            channel.PreferredAudioTitle,
            channel.StreamingMode,
            channel.WatermarkId,
            channel.FallbackFillerId,
            channel.Playouts?.Count ?? 0,
            channel.PreferredSubtitleLanguageCode,
-            channel.SubtitleMode);
+            channel.SubtitleMode,
+            channel.MusicVideoCreditsMode);

    internal static ChannelResponseModel ProjectToResponseModel(Channel channel) =>
        new(
@@ -21,11 +21,22 @@ 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)
+        {
+            return Option<int>.None;
+        }
+
        // TODO: expand to check everything in collection rather than what's scheduled?
        _logger.LogDebug("Checking frame rates for channel {ChannelNumber}", request.ChannelNumber);

-        await using TvContext dbContext = await _dbContextFactory.CreateDbContextAsync(cancellationToken);
-
        List<Playout> playouts = await dbContext.Playouts
            .Include(p => p.Items)
            .ThenInclude(pi => pi.MediaItem)
@@ -1,15 +1,23 @@
 using ErsatzTV.Core.Interfaces.Repositories;
 using ErsatzTV.Core.Iptv;
+using Microsoft.IO;

 namespace ErsatzTV.Application.Channels;

 public class GetChannelGuideHandler : IRequestHandler<GetChannelGuide, ChannelGuide>
 {
    private readonly IChannelRepository _channelRepository;
+    private readonly RecyclableMemoryStreamManager _recyclableMemoryStreamManager;

-    public GetChannelGuideHandler(IChannelRepository channelRepository) => _channelRepository = channelRepository;
+    public GetChannelGuideHandler(
+        IChannelRepository channelRepository,
+        RecyclableMemoryStreamManager recyclableMemoryStreamManager)
+    {
+        _channelRepository = channelRepository;
+        _recyclableMemoryStreamManager = recyclableMemoryStreamManager;
+    }

    public Task<ChannelGuide> Handle(GetChannelGuide request, CancellationToken cancellationToken) =>
        _channelRepository.GetAllForGuide()
-            .Map(channels => new ChannelGuide(request.Scheme, request.Host, channels));
+            .Map(channels => new ChannelGuide(_recyclableMemoryStreamManager, request.Scheme, request.Host, channels));
 }
@@ -0,0 +1,5 @@
+using ErsatzTV.Core;
+
+namespace ErsatzTV.Application.Configuration;
+
+public record UpdateGeneralSettings(GeneralSettingsViewModel GeneralSettings) : IRequest<Either<BaseError, Unit>>;
@@ -0,0 +1,32 @@
+using ErsatzTV.Core;
+using ErsatzTV.Core.Domain;
+using ErsatzTV.Core.Interfaces.Repositories;
+using Serilog.Core;
+
+namespace ErsatzTV.Application.Configuration;
+
+public class UpdateGeneralSettingsHandler : IRequestHandler<UpdateGeneralSettings, Either<BaseError, Unit>>
+{
+    private readonly IConfigElementRepository _configElementRepository;
+    private readonly LoggingLevelSwitch _loggingLevelSwitch;
+
+    public UpdateGeneralSettingsHandler(
+        LoggingLevelSwitch loggingLevelSwitch,
+        IConfigElementRepository configElementRepository)
+    {
+        _loggingLevelSwitch = loggingLevelSwitch;
+        _configElementRepository = configElementRepository;
+    }
+
+    public async Task<Either<BaseError, Unit>> Handle(
+        UpdateGeneralSettings request,
+        CancellationToken cancellationToken) => await ApplyUpdate(request.GeneralSettings);
+
+    private async Task<Unit> ApplyUpdate(GeneralSettingsViewModel generalSettings)
+    {
+        await _configElementRepository.Upsert(ConfigElementKey.MinimumLogLevel, generalSettings.MinimumLogLevel);
+        _loggingLevelSwitch.MinimumLevel = generalSettings.MinimumLogLevel;
+
+        return Unit.Default;
+    }
+}
@@ -1,5 +0,0 @@
-using ErsatzTV.Core;
-
-namespace ErsatzTV.Application.Configuration;
-
-public record UpdatePlayoutDaysToBuild(int DaysToBuild) : IRequest<Either<BaseError, Unit>>;
@@ -0,0 +1,5 @@
+using ErsatzTV.Core;
+
+namespace ErsatzTV.Application.Configuration;
+
+public record UpdatePlayoutSettings(PlayoutSettingsViewModel PlayoutSettings) : IRequest<Either<BaseError, Unit>>;
@@ -9,13 +9,13 @@ using Microsoft.EntityFrameworkCore;

 namespace ErsatzTV.Application.Configuration;

-public class UpdatePlayoutDaysToBuildHandler : IRequestHandler<UpdatePlayoutDaysToBuild, Either<BaseError, Unit>>
+public class UpdatePlayoutSettingsHandler : IRequestHandler<UpdatePlayoutSettings, Either<BaseError, Unit>>
 {
    private readonly IConfigElementRepository _configElementRepository;
    private readonly IDbContextFactory<TvContext> _dbContextFactory;
    private readonly ChannelWriter<IBackgroundServiceRequest> _workerChannel;

-    public UpdatePlayoutDaysToBuildHandler(
+    public UpdatePlayoutSettingsHandler(
        IConfigElementRepository configElementRepository,
        IDbContextFactory<TvContext> dbContextFactory,
        ChannelWriter<IBackgroundServiceRequest> workerChannel)
@@ -26,17 +26,20 @@ public class UpdatePlayoutDaysToBuildHandler : IRequestHandler<UpdatePlayoutDays
    }

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

-    private async Task<Unit> ApplyUpdate(TvContext dbContext, int daysToBuild)
+    private async Task<Unit> ApplyUpdate(TvContext dbContext, PlayoutSettingsViewModel playoutSettings)
    {
-        await _configElementRepository.Upsert(ConfigElementKey.PlayoutDaysToBuild, daysToBuild);
+        await _configElementRepository.Upsert(ConfigElementKey.PlayoutDaysToBuild, playoutSettings.DaysToBuild);
+        await _configElementRepository.Upsert(
+            ConfigElementKey.PlayoutSkipMissingItems,
+            playoutSettings.SkipMissingItems);

        // continue all playouts to proper number of days
        List<Playout> playouts = await dbContext.Playouts
@@ -50,8 +53,8 @@ public class UpdatePlayoutDaysToBuildHandler : IRequestHandler<UpdatePlayoutDays
        return Unit.Default;
    }

-    private static Task<Validation<BaseError, Unit>> Validate(UpdatePlayoutDaysToBuild request) =>
-        Optional(request.DaysToBuild)
+    private static Task<Validation<BaseError, Unit>> Validate(UpdatePlayoutSettings request) =>
+        Optional(request.PlayoutSettings.DaysToBuild)
            .Where(days => days > 0)
            .Map(_ => Unit.Default)
            .ToValidation<BaseError>("Days to build must be greater than zero")
@@ -0,0 +1,8 @@
+using Serilog.Events;
+
+namespace ErsatzTV.Application.Configuration;
+
+public class GeneralSettingsViewModel
+{
+    public LogEventLevel MinimumLogLevel { get; set; }
+}
@@ -0,0 +1,7 @@
+namespace ErsatzTV.Application.Configuration;
+
+public class PlayoutSettingsViewModel
+{
+    public int DaysToBuild { get; set; }
+    public bool SkipMissingItems { get; set; }
+}
@@ -0,0 +1,3 @@
+namespace ErsatzTV.Application.Configuration;
+
+public record GetGeneralSettings : IRequest<GeneralSettingsViewModel>;
@@ -0,0 +1,24 @@
+using ErsatzTV.Core.Domain;
+using ErsatzTV.Core.Interfaces.Repositories;
+using Serilog.Events;
+
+namespace ErsatzTV.Application.Configuration;
+
+public class GetGeneralSettingsHandler : IRequestHandler<GetGeneralSettings, GeneralSettingsViewModel>
+{
+    private readonly IConfigElementRepository _configElementRepository;
+
+    public GetGeneralSettingsHandler(IConfigElementRepository configElementRepository) =>
+        _configElementRepository = configElementRepository;
+
+    public async Task<GeneralSettingsViewModel> Handle(GetGeneralSettings request, CancellationToken cancellationToken)
+    {
+        Option<LogEventLevel> maybeLogLevel =
+            await _configElementRepository.GetValue<LogEventLevel>(ConfigElementKey.MinimumLogLevel);
+
+        return new GeneralSettingsViewModel
+        {
+            MinimumLogLevel = await maybeLogLevel.IfNoneAsync(LogEventLevel.Information)
+        };
+    }
+}
@@ -1,3 +0,0 @@
-namespace ErsatzTV.Application.Configuration;
-
-public record GetPlayoutDaysToBuild : IRequest<int>;
@@ -1,16 +0,0 @@
-using ErsatzTV.Core.Domain;
-using ErsatzTV.Core.Interfaces.Repositories;
-
-namespace ErsatzTV.Application.Configuration;
-
-public class GetPlayoutDaysToBuildHandler : IRequestHandler<GetPlayoutDaysToBuild, int>
-{
-    private readonly IConfigElementRepository _configElementRepository;
-
-    public GetPlayoutDaysToBuildHandler(IConfigElementRepository configElementRepository) =>
-        _configElementRepository = configElementRepository;
-
-    public Task<int> Handle(GetPlayoutDaysToBuild request, CancellationToken cancellationToken) =>
-        _configElementRepository.GetValue<int>(ConfigElementKey.PlayoutDaysToBuild)
-            .Map(result => result.IfNone(2));
-}
@@ -0,0 +1,3 @@
+namespace ErsatzTV.Application.Configuration;
+
+public record GetPlayoutSettings : IRequest<PlayoutSettingsViewModel>;
@@ -0,0 +1,26 @@
+using ErsatzTV.Core.Domain;
+using ErsatzTV.Core.Interfaces.Repositories;
+
+namespace ErsatzTV.Application.Configuration;
+
+public class GetPlayoutSettingsHandler : IRequestHandler<GetPlayoutSettings, PlayoutSettingsViewModel>
+{
+    private readonly IConfigElementRepository _configElementRepository;
+
+    public GetPlayoutSettingsHandler(IConfigElementRepository configElementRepository) =>
+        _configElementRepository = configElementRepository;
+
+    public async Task<PlayoutSettingsViewModel> Handle(GetPlayoutSettings request, CancellationToken cancellationToken)
+    {
+        Option<int> daysToBuild = await _configElementRepository.GetValue<int>(ConfigElementKey.PlayoutDaysToBuild);
+
+        Option<bool> skipMissingItems =
+            await _configElementRepository.GetValue<bool>(ConfigElementKey.PlayoutSkipMissingItems);
+
+        return new PlayoutSettingsViewModel
+        {
+            DaysToBuild = await daysToBuild.IfNoneAsync(2),
+            SkipMissingItems = await skipMissingItems.IfNoneAsync(false)
+        };
+    }
+}
@@ -8,8 +8,7 @@ using Microsoft.Extensions.Logging;

 namespace ErsatzTV.Application.Emby;

-public class
-    SynchronizeEmbyLibrariesHandler : IRequestHandler<SynchronizeEmbyLibraries, Either<BaseError, Unit>>
+public class SynchronizeEmbyLibrariesHandler : IRequestHandler<SynchronizeEmbyLibraries, Either<BaseError, Unit>>
 {
    private readonly IEmbyApiClient _embyApiClient;
    private readonly IEmbySecretStore _embySecretStore;
@@ -72,32 +71,33 @@ public class
            connectionParameters.ActiveConnection.Address,
            connectionParameters.ApiKey);

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

-                return Task.CompletedTask;
-            });
+        foreach (List<EmbyLibrary> libraries in maybeLibraries.RightToSeq())
+        {
+            var existing = connectionParameters.EmbyMediaSource.Libraries.OfType<EmbyLibrary>()
+                .ToList();
+            var toAdd = libraries.Filter(library => existing.All(l => l.ItemId != library.ItemId)).ToList();
+            var toRemove = existing.Filter(library => libraries.All(l => l.ItemId != library.ItemId)).ToList();
+            var toUpdate = libraries
+                .Filter(l => toAdd.All(a => a.ItemId != l.ItemId) && toRemove.All(r => r.ItemId != l.ItemId)).ToList();
+            List<int> ids = await _mediaSourceRepository.UpdateLibraries(
+                connectionParameters.EmbyMediaSource.Id,
+                toAdd,
+                toRemove,
+                toUpdate);
+            if (ids.Any())
+            {
+                await _searchIndex.RemoveItems(ids);
+                _searchIndex.Commit();
+            }
+        }

        return Unit.Default;
    }
@@ -49,19 +49,24 @@ public class SynchronizeEmbyLibraryByIdHandler :

    public Task<Either<BaseError, string>> Handle(
        ForceSynchronizeEmbyLibraryById request,
-        CancellationToken cancellationToken) => Handle(request);
+        CancellationToken cancellationToken) => HandleImpl(request, cancellationToken);

    public Task<Either<BaseError, string>> Handle(
        SynchronizeEmbyLibraryByIdIfNeeded request,
-        CancellationToken cancellationToken) => Handle(request);
+        CancellationToken cancellationToken) => HandleImpl(request, cancellationToken);

-    private Task<Either<BaseError, string>>
-        Handle(ISynchronizeEmbyLibraryById request) =>
-        Validate(request)
-            .MapT(parameters => Synchronize(parameters).Map(_ => parameters.Library.Name))
-            .Bind(v => v.ToEitherAsync());
+    private async Task<Either<BaseError, string>>
+        HandleImpl(ISynchronizeEmbyLibraryById request, CancellationToken cancellationToken)
+    {
+        Validation<BaseError, RequestParameters> validation = await Validate(request);
+        return await validation.Match(
+            parameters => Synchronize(parameters, cancellationToken),
+            error => Task.FromResult<Either<BaseError, string>>(error.Join()));
+    }

-    private async Task<Unit> Synchronize(RequestParameters parameters)
+    private async Task<Either<BaseError, string>> Synchronize(
+        RequestParameters parameters,
+        CancellationToken cancellationToken)
    {
        try
        {
@@ -77,15 +82,17 @@ public class SynchronizeEmbyLibraryByIdHandler :
                            parameters.ConnectionParameters.ApiKey,
                            parameters.Library,
                            parameters.FFmpegPath,
-                            parameters.FFprobePath),
+                            parameters.FFprobePath,
+                            cancellationToken),
                    LibraryMediaKind.Shows =>
                        await _embyTelevisionLibraryScanner.ScanLibrary(
                            parameters.ConnectionParameters.ActiveConnection.Address,
                            parameters.ConnectionParameters.ApiKey,
                            parameters.Library,
                            parameters.FFmpegPath,
-                            parameters.FFprobePath),
-                    _ => BaseError.New("Unsupported library media kind")
+                            parameters.FFprobePath,
+                            cancellationToken),
+                    _ => Unit.Default
                };

                if (result.IsRight)
@@ -94,17 +101,18 @@ public class SynchronizeEmbyLibraryByIdHandler :
                    await _libraryRepository.UpdateLastScan(parameters.Library);

                    await _embyWorkerChannel.WriteAsync(
-                        new SynchronizeEmbyCollections(parameters.Library.MediaSourceId));
+                        new SynchronizeEmbyCollections(parameters.Library.MediaSourceId),
+                        cancellationToken);
                }
+
+                return result.Map(_ => parameters.Library.Name);
            }
            else
            {
-                _logger.LogDebug(
-                    "Skipping unforced scan of emby media library {Name}",
-                    parameters.Library.Name);
+                _logger.LogDebug("Skipping unforced scan of emby media library {Name}", parameters.Library.Name);
            }

-            return Unit.Default;
+            return parameters.Library.Name;
        }
        finally
        {
@@ -3,5 +3,10 @@ using ErsatzTV.Core.Domain;

 namespace ErsatzTV.Application.Emby;

-public record EmbyLibraryViewModel(int Id, string Name, LibraryMediaKind MediaKind, bool ShouldSyncItems)
-    : LibraryViewModel("Emby", Id, Name, MediaKind);
+public record EmbyLibraryViewModel(
+        int Id,
+        string Name,
+        LibraryMediaKind MediaKind,
+        bool ShouldSyncItems,
+        int MediaSourceId)
+    : LibraryViewModel("Emby", Id, Name, MediaKind, MediaSourceId);
@@ -11,7 +11,7 @@ internal static class Mapper
            embyMediaSource.Connections.HeadOrNone().Match(c => c.Address, string.Empty));

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

    internal static EmbyPathReplacementViewModel ProjectToViewModel(EmbyPathReplacement pathReplacement) =>
        new(pathReplacement.Id, pathReplacement.EmbyPath, pathReplacement.LocalPath);
@@ -7,11 +7,12 @@
    </PropertyGroup>

    <ItemGroup>
-      <PackageReference Include="Bugsnag" Version="3.0.1" />
-      <PackageReference Include="CliWrap" Version="3.4.3" />
+      <PackageReference Include="Bugsnag" Version="3.1.0" />
+      <PackageReference Include="CliWrap" Version="3.5.0" />
+      <PackageReference Include="Humanizer.Core" Version="2.14.1" />
      <PackageReference Include="MediatR" Version="10.0.1" />
      <PackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="6.0.0" />
-      <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.1.46">
+      <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.3.44">
        <PrivateAssets>all</PrivateAssets>
        <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
      </PackageReference>
@@ -10,6 +10,7 @@ public record CreateFFmpegProfile(
    HardwareAccelerationKind HardwareAcceleration,
    VaapiDriver VaapiDriver,
    string VaapiDevice,
+    int? QsvExtraHardwareFrames,
    int ResolutionId,
    FFmpegProfileVideoFormat VideoFormat,
    int VideoBitrate,
@@ -20,7 +20,7 @@ public class CreateFFmpegProfileHandler :
    {
        await using TvContext dbContext = await _dbContextFactory.CreateDbContextAsync(cancellationToken);
        Validation<BaseError, FFmpegProfile> validation = await Validate(dbContext, request);
-        return await LanguageExtensions.Apply(validation, profile => PersistFFmpegProfile(dbContext, profile));
+        return await validation.Apply(profile => PersistFFmpegProfile(dbContext, profile));
    }

    private static async Task<CreateFFmpegProfileResult> PersistFFmpegProfile(
@@ -44,6 +44,7 @@ public class CreateFFmpegProfileHandler :
                HardwareAcceleration = request.HardwareAcceleration,
                VaapiDriver = request.VaapiDriver,
                VaapiDevice = request.VaapiDevice,
+                QsvExtraHardwareFrames = request.QsvExtraHardwareFrames,
                ResolutionId = resolutionId,
                VideoFormat = request.VideoFormat,
                VideoBitrate = request.VideoBitrate,
@@ -15,7 +15,7 @@ public class NewFFmpegProfileHandler : IRequestHandler<NewFFmpegProfile, FFmpegP

    public async Task<FFmpegProfileViewModel> Handle(NewFFmpegProfile request, CancellationToken cancellationToken)
    {
-        await using TvContext dbContext = _dbContextFactory.CreateDbContext();
+        await using TvContext dbContext = await _dbContextFactory.CreateDbContextAsync(cancellationToken);

        int defaultResolutionId = await dbContext.ConfigElements
            .GetValue<int>(ConfigElementKey.FFmpegDefaultResolutionId)
@@ -11,6 +11,7 @@ public record UpdateFFmpegProfile(
    HardwareAccelerationKind HardwareAcceleration,
    VaapiDriver VaapiDriver,
    string VaapiDevice,
+    int? QsvExtraHardwareFrames,
    int ResolutionId,
    FFmpegProfileVideoFormat VideoFormat,
    int VideoBitrate,
@@ -20,7 +20,7 @@ public class
    {
        await using TvContext dbContext = await _dbContextFactory.CreateDbContextAsync(cancellationToken);
        Validation<BaseError, FFmpegProfile> validation = await Validate(dbContext, request);
-        return await LanguageExtensions.Apply(validation, p => ApplyUpdateRequest(dbContext, p, request));
+        return await validation.Apply(p => ApplyUpdateRequest(dbContext, p, request));
    }

    private async Task<UpdateFFmpegProfileResult> ApplyUpdateRequest(
@@ -33,6 +33,7 @@ public class
        p.HardwareAcceleration = update.HardwareAcceleration;
        p.VaapiDriver = update.VaapiDriver;
        p.VaapiDevice = update.VaapiDevice;
+        p.QsvExtraHardwareFrames = update.QsvExtraHardwareFrames;
        p.ResolutionId = update.ResolutionId;
        p.VideoFormat = update.VideoFormat;
        p.VideoBitrate = update.VideoBitrate;
@@ -11,6 +11,7 @@ public record FFmpegProfileViewModel(
    HardwareAccelerationKind HardwareAcceleration,
    VaapiDriver VaapiDriver,
    string VaapiDevice,
+    int? QsvExtraHardwareFrames,
    ResolutionViewModel Resolution,
    FFmpegProfileVideoFormat VideoFormat,
    int VideoBitrate,
@@ -1,4 +1,5 @@
 using ErsatzTV.Application.Resolutions;
+using ErsatzTV.Core.Api.FFmpegProfiles;
 using ErsatzTV.Core.Domain;

 namespace ErsatzTV.Application.FFmpegProfiles;
@@ -13,6 +14,7 @@ internal static class Mapper
            profile.HardwareAcceleration,
            profile.VaapiDriver,
            profile.VaapiDevice,
+            profile.QsvExtraHardwareFrames,
            Project(profile.Resolution),
            profile.VideoFormat,
            profile.VideoBitrate,
@@ -26,6 +28,35 @@ internal static class Mapper
            profile.NormalizeFramerate,
            profile.DeinterlaceVideo == true);

+    internal static FFmpegProfileResponseModel ProjectToResponseModel(FFmpegProfile ffmpegProfile) =>
+        new(
+            ffmpegProfile.Id,
+            ffmpegProfile.Name,
+            $"{ffmpegProfile.Resolution.Width}x{ffmpegProfile.Resolution.Height}",
+            ffmpegProfile.VideoFormat.ToString().ToLowerInvariant(),
+            ffmpegProfile.AudioFormat.ToString().ToLowerInvariant());
+
+    internal static FFmpegFullProfileResponseModel ProjectToFullResponseModel(FFmpegProfile ffmpegProfile) =>
+        new(
+            ffmpegProfile.Id,
+            ffmpegProfile.Name,
+            ffmpegProfile.ThreadCount,
+            (int)ffmpegProfile.HardwareAcceleration,
+            (int)ffmpegProfile.VaapiDriver,
+            ffmpegProfile.VaapiDevice,
+            ffmpegProfile.ResolutionId,
+            (int)ffmpegProfile.VideoFormat,
+            ffmpegProfile.VideoBitrate,
+            ffmpegProfile.VideoBufferSize,
+            (int)ffmpegProfile.AudioFormat,
+            ffmpegProfile.AudioBitrate,
+            ffmpegProfile.AudioBufferSize,
+            ffmpegProfile.NormalizeLoudness,
+            ffmpegProfile.AudioChannels,
+            ffmpegProfile.AudioSampleRate,
+            ffmpegProfile.NormalizeFramerate,
+            ffmpegProfile.DeinterlaceVideo);
+
    private static ResolutionViewModel Project(Resolution resolution) =>
        new(resolution.Id, resolution.Name, resolution.Width, resolution.Height);
 }
@@ -0,0 +1,5 @@
+using ErsatzTV.Core.Api.FFmpegProfiles;
+
+namespace ErsatzTV.Application.FFmpegProfiles;
+
+public record GetAllFFmpegProfilesForApi : IRequest<List<FFmpegProfileResponseModel>>;
@@ -0,0 +1,28 @@
+using ErsatzTV.Core.Api.FFmpegProfiles;
+using ErsatzTV.Core.Domain;
+using ErsatzTV.Infrastructure.Data;
+using Microsoft.EntityFrameworkCore;
+using static ErsatzTV.Application.FFmpegProfiles.Mapper;
+
+namespace ErsatzTV.Application.FFmpegProfiles;
+
+public class
+    GetAllFFmpegProfilesForApiHandler : IRequestHandler<GetAllFFmpegProfilesForApi, List<FFmpegProfileResponseModel>>
+{
+    private readonly IDbContextFactory<TvContext> _dbContextFactory;
+
+    public GetAllFFmpegProfilesForApiHandler(IDbContextFactory<TvContext> dbContextFactory) =>
+        _dbContextFactory = dbContextFactory;
+
+    public async Task<List<FFmpegProfileResponseModel>> Handle(
+        GetAllFFmpegProfilesForApi request,
+        CancellationToken cancellationToken)
+    {
+        await using TvContext dbContext = await _dbContextFactory.CreateDbContextAsync(cancellationToken);
+        List<FFmpegProfile> ffmpegProfiles = await dbContext.FFmpegProfiles
+            .AsNoTracking()
+            .Include(p => p.Resolution)
+            .ToListAsync(cancellationToken);
+        return ffmpegProfiles.Map(ProjectToResponseModel).ToList();
+    }
+}
@@ -0,0 +1,5 @@
+using ErsatzTV.Core.Api.FFmpegProfiles;
+
+namespace ErsatzTV.Application.FFmpegProfiles;
+
+public record GetFFmpegFullProfileByIdForApi(int Id) : IRequest<Option<FFmpegFullProfileResponseModel>>;
@@ -0,0 +1,28 @@
+using ErsatzTV.Core.Api.FFmpegProfiles;
+using ErsatzTV.Infrastructure.Data;
+using ErsatzTV.Infrastructure.Extensions;
+using Microsoft.EntityFrameworkCore;
+using static ErsatzTV.Application.FFmpegProfiles.Mapper;
+
+namespace ErsatzTV.Application.FFmpegProfiles;
+
+public class
+    GetFFmpegProfileByIdForApiHandler : IRequestHandler<GetFFmpegFullProfileByIdForApi,
+        Option<FFmpegFullProfileResponseModel>>
+{
+    private readonly IDbContextFactory<TvContext> _dbContextFactory;
+
+    public GetFFmpegProfileByIdForApiHandler(IDbContextFactory<TvContext> dbContextFactory) =>
+        _dbContextFactory = dbContextFactory;
+
+    public async Task<Option<FFmpegFullProfileResponseModel>> Handle(
+        GetFFmpegFullProfileByIdForApi request,
+        CancellationToken cancellationToken)
+    {
+        await using TvContext dbContext = await _dbContextFactory.CreateDbContextAsync(cancellationToken);
+        return await dbContext.FFmpegProfiles
+            .Include(p => p.Resolution)
+            .SelectOneAsync(p => p.Id, p => p.Id == request.Id)
+            .MapT(ProjectToFullResponseModel);
+    }
+}
@@ -11,6 +11,7 @@ public record CreateFillerPreset(
    TimeSpan? Duration,
    int? Count,
    int? PadToNearestMinute,
+    bool AllowWatermarks,
    ProgramScheduleItemCollectionType CollectionType,
    int? CollectionId,
    int? MediaItemId,
@@ -31,6 +31,7 @@ public class CreateFillerPresetHandler : IRequestHandler<CreateFillerPreset, Eit
                Duration = request.Duration,
                Count = request.Count,
                PadToNearestMinute = request.PadToNearestMinute,
+                AllowWatermarks = request.AllowWatermarks,
                CollectionType = request.CollectionType,
                CollectionId = request.CollectionId,
                MediaItemId = request.MediaItemId,
@@ -12,6 +12,7 @@ public record UpdateFillerPreset(
    TimeSpan? Duration,
    int? Count,
    int? PadToNearestMinute,
+    bool AllowWatermarks,
    ProgramScheduleItemCollectionType CollectionType,
    int? CollectionId,
    int? MediaItemId,
@@ -15,8 +15,7 @@ public class UpdateFillerPresetHandler : IRequestHandler<UpdateFillerPreset, Eit

    public async Task<Either<BaseError, Unit>> Handle(UpdateFillerPreset request, CancellationToken cancellationToken)
    {
-        await using TvContext dbContext = _dbContextFactory.CreateDbContext();
-
+        await using TvContext dbContext = await _dbContextFactory.CreateDbContextAsync(cancellationToken);
        Validation<BaseError, FillerPreset> validation = await FillerPresetMustExist(dbContext, request);
        return await LanguageExtensions.Apply(validation, ps => ApplyUpdateRequest(dbContext, ps, request));
    }
@@ -32,6 +31,7 @@ public class UpdateFillerPresetHandler : IRequestHandler<UpdateFillerPreset, Eit
        existing.Duration = request.Duration;
        existing.Count = request.Count;
        existing.PadToNearestMinute = request.PadToNearestMinute;
+        existing.AllowWatermarks = request.AllowWatermarks;
        existing.CollectionType = request.CollectionType;
        existing.CollectionId = request.CollectionId;
        existing.MediaItemId = request.MediaItemId;
@@ -11,6 +11,7 @@ public record FillerPresetViewModel(
    TimeSpan? Duration,
    int? Count,
    int? PadToNearestMinute,
+    bool AllowWatermarks,
    ProgramScheduleItemCollectionType CollectionType,
    int? CollectionId,
    int? MediaItemId,
@@ -13,6 +13,7 @@ internal static class Mapper
            fillerPreset.Duration,
            fillerPreset.Count,
            fillerPreset.PadToNearestMinute,
+            fillerPreset.AllowWatermarks,
            fillerPreset.CollectionType,
            fillerPreset.CollectionId,
            fillerPreset.MediaItemId,
@@ -13,7 +13,14 @@ public class GetAllHealthCheckResultsHandler : IRequestHandler<GetAllHealthCheck
        GetAllHealthCheckResults request,
        CancellationToken cancellationToken)
    {
-        List<HealthCheckResult> results = await _healthCheckService.PerformHealthChecks(cancellationToken);
-        return results.Filter(r => r.Status != HealthCheckStatus.NotApplicable).ToList();
+        try
+        {
+            List<HealthCheckResult> results = await _healthCheckService.PerformHealthChecks(cancellationToken);
+            return results.Filter(r => r.Status != HealthCheckStatus.NotApplicable).ToList();
+        }
+        catch (Exception ex) when (ex is TaskCanceledException or OperationCanceledException)
+        {
+            return new List<HealthCheckResult>();
+        }
    }
 }
@@ -69,7 +69,7 @@ public class

                    string originalPath = _imageCache.GetPathForImage(request.FileName, request.ArtworkKind, None);

-                    Command process = _ffmpegProcessService.ResizeImage(
+                    Command process = await _ffmpegProcessService.ResizeImage(
                        ffmpegPath,
                        originalPath,
                        withExtension,
@@ -9,9 +9,7 @@ using Microsoft.Extensions.Logging;
 namespace ErsatzTV.Application.Jellyfin;

 public class
-    SynchronizeJellyfinLibrariesHandler : IRequestHandler<SynchronizeJellyfinLibraries,
-        Either<BaseError, Unit>>
-
+    SynchronizeJellyfinLibrariesHandler : IRequestHandler<SynchronizeJellyfinLibraries, Either<BaseError, Unit>>
 {
    private readonly IJellyfinApiClient _jellyfinApiClient;
    private readonly IJellyfinSecretStore _jellyfinSecretStore;
@@ -74,32 +72,34 @@ public class
            connectionParameters.ActiveConnection.Address,
            connectionParameters.ApiKey);

-        await maybeLibraries.Match(
-            async libraries =>
-            {
-                var existing = connectionParameters.JellyfinMediaSource.Libraries.OfType<JellyfinLibrary>()
-                    .ToList();
-                var toAdd = libraries.Filter(library => existing.All(l => l.ItemId != library.ItemId)).ToList();
-                var toRemove = existing.Filter(library => libraries.All(l => l.ItemId != library.ItemId)).ToList();
-                List<int> ids = await _mediaSourceRepository.UpdateLibraries(
-                    connectionParameters.JellyfinMediaSource.Id,
-                    toAdd,
-                    toRemove);
-                if (ids.Any())
-                {
-                    await _searchIndex.RemoveItems(ids);
-                    _searchIndex.Commit();
-                }
-            },
-            error =>
-            {
-                _logger.LogWarning(
-                    "Unable to synchronize libraries from jellyfin server {JellyfinServer}: {Error}",
-                    connectionParameters.JellyfinMediaSource.ServerName,
-                    error.Value);
+        foreach (BaseError error in maybeLibraries.LeftToSeq())
+        {
+            _logger.LogWarning(
+                "Unable to synchronize libraries from jellyfin server {JellyfinServer}: {Error}",
+                connectionParameters.JellyfinMediaSource.ServerName,
+                error.Value);
+        }

-                return Task.CompletedTask;
-            });
+        foreach (List<JellyfinLibrary> libraries in maybeLibraries.RightToSeq())
+        {
+            var existing = connectionParameters.JellyfinMediaSource.Libraries
+                .OfType<JellyfinLibrary>()
+                .ToList();
+            var toAdd = libraries.Filter(library => existing.All(l => l.ItemId != library.ItemId)).ToList();
+            var toRemove = existing.Filter(library => libraries.All(l => l.ItemId != library.ItemId)).ToList();
+            var toUpdate = libraries
+                .Filter(l => toAdd.All(a => a.ItemId != l.ItemId) && toRemove.All(r => r.ItemId != l.ItemId)).ToList();
+            List<int> ids = await _mediaSourceRepository.UpdateLibraries(
+                connectionParameters.JellyfinMediaSource.Id,
+                toAdd,
+                toRemove,
+                toUpdate);
+            if (ids.Any())
+            {
+                await _searchIndex.RemoveItems(ids);
+                _searchIndex.Commit();
+            }
+        }

        return Unit.Default;
    }
@@ -49,19 +49,24 @@ public class SynchronizeJellyfinLibraryByIdHandler :

    public Task<Either<BaseError, string>> Handle(
        ForceSynchronizeJellyfinLibraryById request,
-        CancellationToken cancellationToken) => Handle(request);
+        CancellationToken cancellationToken) => HandleImpl(request, cancellationToken);

    public Task<Either<BaseError, string>> Handle(
        SynchronizeJellyfinLibraryByIdIfNeeded request,
-        CancellationToken cancellationToken) => Handle(request);
+        CancellationToken cancellationToken) => HandleImpl(request, cancellationToken);

-    private Task<Either<BaseError, string>>
-        Handle(ISynchronizeJellyfinLibraryById request) =>
-        Validate(request)
-            .MapT(parameters => Synchronize(parameters).Map(_ => parameters.Library.Name))
-            .Bind(v => v.ToEitherAsync());
+    private async Task<Either<BaseError, string>>
+        HandleImpl(ISynchronizeJellyfinLibraryById request, CancellationToken cancellationToken)
+    {
+        Validation<BaseError, RequestParameters> validation = await Validate(request);
+        return await validation.Match(
+            parameters => Synchronize(parameters, cancellationToken),
+            error => Task.FromResult<Either<BaseError, string>>(error.Join()));
+    }

-    private async Task<Unit> Synchronize(RequestParameters parameters)
+    private async Task<Either<BaseError, string>> Synchronize(
+        RequestParameters parameters,
+        CancellationToken cancellationToken)
    {
        try
        {
@@ -77,15 +82,17 @@ public class SynchronizeJellyfinLibraryByIdHandler :
                            parameters.ConnectionParameters.ApiKey,
                            parameters.Library,
                            parameters.FFmpegPath,
-                            parameters.FFprobePath),
+                            parameters.FFprobePath,
+                            cancellationToken),
                    LibraryMediaKind.Shows =>
                        await _jellyfinTelevisionLibraryScanner.ScanLibrary(
                            parameters.ConnectionParameters.ActiveConnection.Address,
                            parameters.ConnectionParameters.ApiKey,
                            parameters.Library,
                            parameters.FFmpegPath,
-                            parameters.FFprobePath),
-                    _ => BaseError.New("Unsupported library media kind")
+                            parameters.FFprobePath,
+                            cancellationToken),
+                    _ => Unit.Default
                };

                if (result.IsRight)
@@ -94,17 +101,18 @@ public class SynchronizeJellyfinLibraryByIdHandler :
                    await _libraryRepository.UpdateLastScan(parameters.Library);

                    await _jellyfinWorkerChannel.WriteAsync(
-                        new SynchronizeJellyfinCollections(parameters.Library.MediaSourceId));
+                        new SynchronizeJellyfinCollections(parameters.Library.MediaSourceId),
+                        cancellationToken);
                }
+
+                return result.Map(_ => parameters.Library.Name);
            }
            else
            {
-                _logger.LogDebug(
-                    "Skipping unforced scan of jellyfin media library {Name}",
-                    parameters.Library.Name);
+                _logger.LogDebug("Skipping unforced scan of jellyfin media library {Name}", parameters.Library.Name);
            }

-            return Unit.Default;
+            return parameters.Library.Name;
        }
        finally
        {
@@ -3,5 +3,10 @@ using ErsatzTV.Core.Domain;

 namespace ErsatzTV.Application.Jellyfin;

-public record JellyfinLibraryViewModel(int Id, string Name, LibraryMediaKind MediaKind, bool ShouldSyncItems)
-    : LibraryViewModel("Jellyfin", Id, Name, MediaKind);
+public record JellyfinLibraryViewModel(
+        int Id,
+        string Name,
+        LibraryMediaKind MediaKind,
+        bool ShouldSyncItems,
+        int MediaSourceId)
+    : LibraryViewModel("Jellyfin", Id, Name, MediaKind, MediaSourceId);
@@ -11,7 +11,7 @@ internal static class Mapper
            jellyfinMediaSource.Connections.HeadOrNone().Match(c => c.Address, string.Empty));

    internal static JellyfinLibraryViewModel ProjectToViewModel(JellyfinLibrary library) =>
-        new(library.Id, library.Name, library.MediaKind, library.ShouldSyncItems);
+        new(library.Id, library.Name, library.MediaKind, library.ShouldSyncItems, library.MediaSourceId);

    internal static JellyfinPathReplacementViewModel ProjectToViewModel(JellyfinPathReplacement pathReplacement) =>
        new(pathReplacement.Id, pathReplacement.JellyfinPath, pathReplacement.LocalPath);
@@ -32,7 +32,7 @@ public class CreateLocalLibraryHandler : LocalLibraryHandlerBase,
    {
        await using TvContext dbContext = await _dbContextFactory.CreateDbContextAsync(cancellationToken);
        Validation<BaseError, LocalLibrary> validation = await Validate(dbContext, request);
-        return await LanguageExtensions.Apply(validation, localLibrary => PersistLocalLibrary(dbContext, localLibrary));
+        return await validation.Apply(localLibrary => PersistLocalLibrary(dbContext, localLibrary));
    }

    private async Task<LocalLibraryViewModel> PersistLocalLibrary(
@@ -1,7 +1,8 @@
 using Dapper;
 using ErsatzTV.Core;
 using ErsatzTV.Core.Domain;
-using ErsatzTV.Core.Interfaces.Repositories;
+using ErsatzTV.Core.Interfaces.Metadata;
+using ErsatzTV.Core.Interfaces.Repositories.Caching;
 using ErsatzTV.Core.Interfaces.Search;
 using ErsatzTV.Infrastructure.Data;
 using ErsatzTV.Infrastructure.Extensions;
@@ -13,18 +14,21 @@ namespace ErsatzTV.Application.Libraries;
 public class MoveLocalLibraryPathHandler : IRequestHandler<MoveLocalLibraryPath, Either<BaseError, Unit>>
 {
    private readonly IDbContextFactory<TvContext> _dbContextFactory;
+    private readonly IFallbackMetadataProvider _fallbackMetadataProvider;
    private readonly ILogger<MoveLocalLibraryPathHandler> _logger;
    private readonly ISearchIndex _searchIndex;
-    private readonly ISearchRepository _searchRepository;
+    private readonly ICachingSearchRepository _searchRepository;

    public MoveLocalLibraryPathHandler(
        ISearchIndex searchIndex,
-        ISearchRepository searchRepository,
+        ICachingSearchRepository searchRepository,
+        IFallbackMetadataProvider fallbackMetadataProvider,
        IDbContextFactory<TvContext> dbContextFactory,
        ILogger<MoveLocalLibraryPathHandler> logger)
    {
        _searchIndex = searchIndex;
        _searchRepository = searchRepository;
+        _fallbackMetadataProvider = fallbackMetadataProvider;
        _dbContextFactory = dbContextFactory;
        _logger = logger;
    }
@@ -35,7 +39,7 @@ public class MoveLocalLibraryPathHandler : IRequestHandler<MoveLocalLibraryPath,
    {
        await using TvContext dbContext = await _dbContextFactory.CreateDbContextAsync(cancellationToken);
        Validation<BaseError, Parameters> validation = await Validate(dbContext, request);
-        return await LanguageExtensions.Apply(validation, parameters => MovePath(dbContext, parameters));
+        return await validation.Apply(parameters => MovePath(dbContext, parameters));
    }

    private async Task<Unit> MovePath(TvContext dbContext, Parameters parameters)
@@ -57,7 +61,10 @@ public class MoveLocalLibraryPathHandler : IRequestHandler<MoveLocalLibraryPath,
                foreach (MediaItem mediaItem in maybeMediaItem)
                {
                    _logger.LogInformation("Moving item at {Path}", await GetPath(dbContext, mediaItem));
-                    await _searchIndex.UpdateItems(_searchRepository, new List<MediaItem> { mediaItem });
+                    await _searchIndex.UpdateItems(
+                        _searchRepository,
+                        _fallbackMetadataProvider,
+                        new List<MediaItem> { mediaItem });
                }
            }
        }
@@ -2,4 +2,4 @@

 namespace ErsatzTV.Application.Libraries;

-public record LibraryViewModel(string LibraryKind, int Id, string Name, LibraryMediaKind MediaKind);
+public record LibraryViewModel(string LibraryKind, int Id, string Name, LibraryMediaKind MediaKind, int MediaSourceId);
@@ -2,5 +2,5 @@

 namespace ErsatzTV.Application.Libraries;

-public record LocalLibraryViewModel(int Id, string Name, LibraryMediaKind MediaKind)
-    : LibraryViewModel("Local", Id, Name, MediaKind);
+public record LocalLibraryViewModel(int Id, string Name, LibraryMediaKind MediaKind, int MediaSourceId)
+    : LibraryViewModel("Local", Id, Name, MediaKind, MediaSourceId);
@@ -10,14 +10,19 @@ internal static class Mapper
        library switch
        {
            LocalLibrary l => ProjectToViewModel(l),
-            PlexLibrary p => new PlexLibraryViewModel(p.Id, p.Name, p.MediaKind),
-            JellyfinLibrary j => new JellyfinLibraryViewModel(j.Id, j.Name, j.MediaKind, j.ShouldSyncItems),
-            EmbyLibrary e => new EmbyLibraryViewModel(e.Id, e.Name, e.MediaKind, e.ShouldSyncItems),
+            PlexLibrary p => new PlexLibraryViewModel(p.Id, p.Name, p.MediaKind, p.MediaSourceId),
+            JellyfinLibrary j => new JellyfinLibraryViewModel(
+                j.Id,
+                j.Name,
+                j.MediaKind,
+                j.ShouldSyncItems,
+                j.MediaSourceId),
+            EmbyLibrary e => new EmbyLibraryViewModel(e.Id, e.Name, e.MediaKind, e.ShouldSyncItems, e.MediaSourceId),
            _ => throw new ArgumentOutOfRangeException(nameof(library))
        };

    public static LocalLibraryViewModel ProjectToViewModel(LocalLibrary library) =>
-        new(library.Id, library.Name, library.MediaKind);
+        new(library.Id, library.Name, library.MediaKind, library.MediaSourceId);

    public static LocalLibraryPathViewModel ProjectToViewModel(LibraryPath libraryPath) =>
        new(libraryPath.Id, libraryPath.LibraryId, libraryPath.Path);
@@ -2,5 +2,5 @@

 namespace ErsatzTV.Application.Libraries;

-public record PlexLibraryViewModel(int Id, string Name, LibraryMediaKind MediaKind)
-    : LibraryViewModel("Plex", Id, Name, MediaKind);
+public record PlexLibraryViewModel(int Id, string Name, LibraryMediaKind MediaKind, int MediaSourceId)
+    : LibraryViewModel("Plex", Id, Name, MediaKind, MediaSourceId);
@@ -148,7 +148,7 @@ internal static class Mapper
            Collection collection,
            Option<JellyfinMediaSource> maybeJellyfin,
            Option<EmbyMediaSource> maybeEmby) =>
-        new CollectionCardResultsViewModel(
+        new(
            collection.Name,
            collection.MediaItems.OfType<Movie>().Map(
                m => ProjectToViewModel(m.MovieMetadata.Head(), maybeJellyfin, maybeEmby) with
@@ -1,7 +1,8 @@
 using System.Text.RegularExpressions;
 using ErsatzTV.Core;
 using ErsatzTV.Core.Interfaces.Locking;
-using ErsatzTV.Core.Interfaces.Repositories;
+using ErsatzTV.Core.Interfaces.Metadata;
+using ErsatzTV.Core.Interfaces.Repositories.Caching;
 using ErsatzTV.Core.Interfaces.Search;
 using ErsatzTV.Core.Interfaces.Trakt;
 using ErsatzTV.Infrastructure.Data;
@@ -17,12 +18,13 @@ public class AddTraktListHandler : TraktCommandBase, IRequestHandler<AddTraktLis

    public AddTraktListHandler(
        ITraktApiClient traktApiClient,
-        ISearchRepository searchRepository,
+        ICachingSearchRepository searchRepository,
        ISearchIndex searchIndex,
+        IFallbackMetadataProvider fallbackMetadataProvider,
        IDbContextFactory<TvContext> dbContextFactory,
        ILogger<AddTraktListHandler> logger,
        IEntityLocker entityLocker)
-        : base(traktApiClient, searchRepository, searchIndex, logger)
+        : base(traktApiClient, searchRepository, searchIndex, fallbackMetadataProvider, logger)
    {
        _dbContextFactory = dbContextFactory;
        _entityLocker = entityLocker;
@@ -1,7 +1,8 @@
 using ErsatzTV.Core;
 using ErsatzTV.Core.Domain;
 using ErsatzTV.Core.Interfaces.Locking;
-using ErsatzTV.Core.Interfaces.Repositories;
+using ErsatzTV.Core.Interfaces.Metadata;
+using ErsatzTV.Core.Interfaces.Repositories.Caching;
 using ErsatzTV.Core.Interfaces.Search;
 using ErsatzTV.Core.Interfaces.Trakt;
 using ErsatzTV.Infrastructure.Data;
@@ -14,20 +15,23 @@ public class DeleteTraktListHandler : TraktCommandBase, IRequestHandler<DeleteTr
 {
    private readonly IDbContextFactory<TvContext> _dbContextFactory;
    private readonly IEntityLocker _entityLocker;
+    private readonly IFallbackMetadataProvider _fallbackMetadataProvider;
    private readonly ISearchIndex _searchIndex;
-    private readonly ISearchRepository _searchRepository;
+    private readonly ICachingSearchRepository _searchRepository;

    public DeleteTraktListHandler(
        ITraktApiClient traktApiClient,
-        ISearchRepository searchRepository,
+        ICachingSearchRepository searchRepository,
        ISearchIndex searchIndex,
+        IFallbackMetadataProvider fallbackMetadataProvider,
        IDbContextFactory<TvContext> dbContextFactory,
        ILogger<DeleteTraktListHandler> logger,
        IEntityLocker entityLocker)
-        : base(traktApiClient, searchRepository, searchIndex, logger)
+        : base(traktApiClient, searchRepository, searchIndex, fallbackMetadataProvider, logger)
    {
        _searchRepository = searchRepository;
        _searchIndex = searchIndex;
+        _fallbackMetadataProvider = fallbackMetadataProvider;
        _dbContextFactory = dbContextFactory;
        _entityLocker = entityLocker;
    }
@@ -38,8 +42,7 @@ public class DeleteTraktListHandler : TraktCommandBase, IRequestHandler<DeleteTr
    {
        try
        {
-            await using TvContext dbContext = _dbContextFactory.CreateDbContext();
-
+            await using TvContext dbContext = await _dbContextFactory.CreateDbContextAsync(cancellationToken);
            Validation<BaseError, TraktList> validation = await TraktListMustExist(dbContext, request.TraktListId);
            return await LanguageExtensions.Apply(validation, c => DoDeletion(dbContext, c));
        }
@@ -56,13 +59,7 @@ public class DeleteTraktListHandler : TraktCommandBase, IRequestHandler<DeleteTr
        dbContext.TraktLists.Remove(traktList);
        if (await dbContext.SaveChangesAsync() > 0)
        {
-            foreach (int mediaItemId in mediaItemIds)
-            {
-                foreach (MediaItem mediaItem in await _searchRepository.GetItemToIndex(mediaItemId))
-                {
-                    await _searchIndex.UpdateItems(_searchRepository, new[] { mediaItem }.ToList());
-                }
-            }
+            await _searchIndex.RebuildItems(_searchRepository, _fallbackMetadataProvider, mediaItemIds);
        }

        _searchIndex.Commit();
@@ -1,7 +1,8 @@
 using ErsatzTV.Core;
 using ErsatzTV.Core.Domain;
 using ErsatzTV.Core.Interfaces.Locking;
-using ErsatzTV.Core.Interfaces.Repositories;
+using ErsatzTV.Core.Interfaces.Metadata;
+using ErsatzTV.Core.Interfaces.Repositories.Caching;
 using ErsatzTV.Core.Interfaces.Search;
 using ErsatzTV.Core.Interfaces.Trakt;
 using ErsatzTV.Infrastructure.Data;
@@ -18,11 +19,17 @@ public class MatchTraktListItemsHandler : TraktCommandBase,

    public MatchTraktListItemsHandler(
        ITraktApiClient traktApiClient,
-        ISearchRepository searchRepository,
+        ICachingSearchRepository searchRepository,
        ISearchIndex searchIndex,
+        IFallbackMetadataProvider fallbackMetadataProvider,
        IDbContextFactory<TvContext> dbContextFactory,
        ILogger<MatchTraktListItemsHandler> logger,
-        IEntityLocker entityLocker) : base(traktApiClient, searchRepository, searchIndex, logger)
+        IEntityLocker entityLocker) : base(
+        traktApiClient,
+        searchRepository,
+        searchIndex,
+        fallbackMetadataProvider,
+        logger)
    {
        _dbContextFactory = dbContextFactory;
        _entityLocker = entityLocker;
@@ -1,6 +1,7 @@
 using ErsatzTV.Core;
 using ErsatzTV.Core.Domain;
-using ErsatzTV.Core.Interfaces.Repositories;
+using ErsatzTV.Core.Interfaces.Metadata;
+using ErsatzTV.Core.Interfaces.Repositories.Caching;
 using ErsatzTV.Core.Interfaces.Search;
 using ErsatzTV.Core.Interfaces.Trakt;
 using ErsatzTV.Core.Trakt;
@@ -13,18 +14,21 @@ namespace ErsatzTV.Application.MediaCollections;

 public abstract class TraktCommandBase
 {
+    private readonly IFallbackMetadataProvider _fallbackMetadataProvider;
    private readonly ILogger _logger;
    private readonly ISearchIndex _searchIndex;
-    private readonly ISearchRepository _searchRepository;
+    private readonly ICachingSearchRepository _searchRepository;

    protected TraktCommandBase(
        ITraktApiClient traktApiClient,
-        ISearchRepository searchRepository,
+        ICachingSearchRepository searchRepository,
        ISearchIndex searchIndex,
+        IFallbackMetadataProvider fallbackMetadataProvider,
        ILogger logger)
    {
        _searchRepository = searchRepository;
        _searchIndex = searchIndex;
+        _fallbackMetadataProvider = fallbackMetadataProvider;
        _logger = logger;
        TraktApiClient = traktApiClient;
    }
@@ -156,15 +160,9 @@ public abstract class TraktCommandBase
                }
            }

-            await dbContext.SaveChangesAsync();
-
-            foreach (int mediaItemId in ids)
+            if (await dbContext.SaveChangesAsync() > 0)
            {
-                Option<MediaItem> maybeItem = await _searchRepository.GetItemToIndex(mediaItemId);
-                foreach (MediaItem item in maybeItem)
-                {
-                    await _searchIndex.UpdateItems(_searchRepository, new[] { item }.ToList());
-                }
+                await _searchIndex.RebuildItems(_searchRepository, _fallbackMetadataProvider, ids.ToList());
            }

            _searchIndex.Commit();
@@ -5,6 +5,7 @@ using ErsatzTV.Core.Interfaces.Locking;
 using ErsatzTV.Core.Interfaces.Metadata;
 using ErsatzTV.Core.Interfaces.Repositories;
 using ErsatzTV.Core.Metadata;
+using Humanizer;
 using Microsoft.Extensions.Logging;

 namespace ErsatzTV.Application.MediaSources;
@@ -85,56 +86,56 @@ public class ScanLocalLibraryHandler : IRequestHandler<ForceScanLocalLibrary, Ei
                {
                    scanned = true;

-                    switch (localLibrary.MediaKind)
+                    Either<BaseError, Unit> result = localLibrary.MediaKind switch
                    {
-                        case LibraryMediaKind.Movies:
+                        LibraryMediaKind.Movies =>
                            await _movieFolderScanner.ScanFolder(
                                libraryPath,
                                ffmpegPath,
                                ffprobePath,
                                progressMin,
                                progressMax,
-                                cancellationToken);
-                            break;
-                        case LibraryMediaKind.Shows:
+                                cancellationToken),
+                        LibraryMediaKind.Shows =>
                            await _televisionFolderScanner.ScanFolder(
                                libraryPath,
                                ffmpegPath,
                                ffprobePath,
                                progressMin,
                                progressMax,
-                                cancellationToken);
-                            break;
-                        case LibraryMediaKind.MusicVideos:
+                                cancellationToken),
+                        LibraryMediaKind.MusicVideos =>
                            await _musicVideoFolderScanner.ScanFolder(
                                libraryPath,
                                ffmpegPath,
                                ffprobePath,
                                progressMin,
                                progressMax,
-                                cancellationToken);
-                            break;
-                        case LibraryMediaKind.OtherVideos:
+                                cancellationToken),
+                        LibraryMediaKind.OtherVideos =>
                            await _otherVideoFolderScanner.ScanFolder(
                                libraryPath,
                                ffmpegPath,
                                ffprobePath,
                                progressMin,
-                                progressMax);
-                            break;
-                        case LibraryMediaKind.Songs:
+                                progressMax,
+                                cancellationToken),
+                        LibraryMediaKind.Songs =>
                            await _songFolderScanner.ScanFolder(
                                libraryPath,
                                ffprobePath,
                                ffmpegPath,
                                progressMin,
                                progressMax,
-                                cancellationToken);
-                            break;
-                    }
+                                cancellationToken),
+                        _ => Unit.Default
+                    };

-                    libraryPath.LastScan = DateTime.UtcNow;
-                    await _libraryRepository.UpdateLastScan(libraryPath);
+                    if (result.IsRight)
+                    {
+                        libraryPath.LastScan = DateTime.UtcNow;
+                        await _libraryRepository.UpdateLastScan(libraryPath);
+                    }
                }

                await _mediator.Publish(new LibraryScanProgress(libraryPath.LibraryId, progressMax), cancellationToken);
@@ -147,7 +148,7 @@ public class ScanLocalLibraryHandler : IRequestHandler<ForceScanLocalLibrary, Ei
                _logger.LogDebug(
                    "Scan of library {Name} completed in {Duration}",
                    localLibrary.Name,
-                    TimeSpan.FromMilliseconds(sw.ElapsedMilliseconds));
+                    sw.Elapsed.Humanize());
            }
            else
            {
@@ -5,6 +5,7 @@ using ErsatzTV.Core;
 using ErsatzTV.Core.Domain;
 using ErsatzTV.Core.Interfaces.FFmpeg;
 using ErsatzTV.Core.Interfaces.Scheduling;
+using ErsatzTV.Core.Scheduling;
 using ErsatzTV.Infrastructure.Data;
 using ErsatzTV.Infrastructure.Extensions;
 using Microsoft.EntityFrameworkCore;
@@ -37,7 +38,7 @@ public class BuildPlayoutHandler : IRequestHandler<BuildPlayout, Either<BaseErro
    {
        await using TvContext dbContext = await _dbContextFactory.CreateDbContextAsync(cancellationToken);
        Validation<BaseError, Playout> validation = await Validate(dbContext, request);
-        return await LanguageExtensions.Apply(validation, playout => ApplyUpdateRequest(dbContext, request, playout));
+        return await validation.Apply(playout => ApplyUpdateRequest(dbContext, request, playout));
    }

    private async Task<Unit> ApplyUpdateRequest(TvContext dbContext, BuildPlayout request, Playout playout)
@@ -45,7 +46,12 @@ public class BuildPlayoutHandler : IRequestHandler<BuildPlayout, Either<BaseErro
        try
        {
            await _playoutBuilder.Build(playout, request.Mode);
-            if (await dbContext.SaveChangesAsync() > 0)
+
+            // let any active segmenter processes know that the playout has been modified
+            // and therefore the segmenter may need to seek into the next item instead of
+            // starting at the beginning (if already working ahead)
+            bool hasChanges = await dbContext.SaveChangesAsync() > 0;
+            if (request.Mode != PlayoutBuildMode.Continue && hasChanges)
            {
                _ffmpegSegmenterService.PlayoutUpdated(playout.Channel.Number);
            }
@@ -71,31 +71,29 @@ public class
            connectionParameters.ActiveConnection,
            connectionParameters.PlexServerAuthToken);

-        await maybeLibraries.Match(
-            async libraries =>
-            {
-                var existing = connectionParameters.PlexMediaSource.Libraries.OfType<PlexLibrary>().ToList();
-                var toAdd = libraries.Filter(library => existing.All(l => l.Key != library.Key)).ToList();
-                var toRemove = existing.Filter(library => libraries.All(l => l.Key != library.Key)).ToList();
-                List<int> ids = await _mediaSourceRepository.UpdateLibraries(
-                    connectionParameters.PlexMediaSource.Id,
-                    toAdd,
-                    toRemove);
-                if (ids.Any())
-                {
-                    await _searchIndex.RemoveItems(ids);
-                    _searchIndex.Commit();
-                }
-            },
-            error =>
-            {
-                _logger.LogWarning(
-                    "Unable to synchronize libraries from plex server {PlexServer}: {Error}",
-                    connectionParameters.PlexMediaSource.ServerName,
-                    error.Value);
+        foreach (BaseError error in maybeLibraries.LeftToSeq())
+        {
+            _logger.LogWarning(
+                "Unable to synchronize libraries from plex server {PlexServer}: {Error}",
+                connectionParameters.PlexMediaSource.ServerName,
+                error.Value);
+        }

-                return Task.CompletedTask;
-            });
+        foreach (List<PlexLibrary> libraries in maybeLibraries.RightToSeq())
+        {
+            var existing = connectionParameters.PlexMediaSource.Libraries.OfType<PlexLibrary>().ToList();
+            var toAdd = libraries.Filter(library => existing.All(l => l.Key != library.Key)).ToList();
+            var toRemove = existing.Filter(library => libraries.All(l => l.Key != library.Key)).ToList();
+            List<int> ids = await _mediaSourceRepository.UpdateLibraries(
+                connectionParameters.PlexMediaSource.Id,
+                toAdd,
+                toRemove);
+            if (ids.Any())
+            {
+                await _searchIndex.RemoveItems(ids);
+                _searchIndex.Commit();
+            }
+        }

        return Unit.Default;
    }
@@ -26,6 +26,7 @@ public record AddProgramScheduleItem(
    int? FallbackFillerId,
    int? WatermarkId,
    string PreferredAudioLanguageCode,
+    string PreferredAudioTitle,
    string PreferredSubtitleLanguageCode,
    ChannelSubtitleMode? SubtitleMode) : IRequest<Either<BaseError, ProgramScheduleItemViewModel>>,
    IProgramScheduleItemRequest;
@@ -6,4 +6,5 @@ public record CreateProgramSchedule(
    string Name,
    bool KeepMultiPartEpisodesTogether,
    bool TreatCollectionsAsShows,
-    bool ShuffleScheduleItems) : IRequest<Either<BaseError, CreateProgramScheduleResult>>;
+    bool ShuffleScheduleItems,
+    bool RandomStartPoint) : IRequest<Either<BaseError, CreateProgramScheduleResult>>;
@@ -44,7 +44,8 @@ public class CreateProgramScheduleHandler :
                    Name = name,
                    KeepMultiPartEpisodesTogether = keepMultiPartEpisodesTogether,
                    TreatCollectionsAsShows = keepMultiPartEpisodesTogether && request.TreatCollectionsAsShows,
-                    ShuffleScheduleItems = request.ShuffleScheduleItems
+                    ShuffleScheduleItems = request.ShuffleScheduleItems,
+                    RandomStartPoint = request.RandomStartPoint
                };
            });

@@ -24,6 +24,7 @@ public interface IProgramScheduleItemRequest
    int? FallbackFillerId { get; }
    int? WatermarkId { get; }
    string PreferredAudioLanguageCode { get; }
+    string PreferredAudioTitle { get; }
    string PreferredSubtitleLanguageCode { get; }
    ChannelSubtitleMode? SubtitleMode { get; }
 }
@@ -180,6 +180,7 @@ public abstract class ProgramScheduleItemCommandBase
                FallbackFillerId = item.FallbackFillerId,
                WatermarkId = item.WatermarkId,
                PreferredAudioLanguageCode = item.PreferredAudioLanguageCode,
+                PreferredAudioTitle = item.PreferredAudioTitle,
                PreferredSubtitleLanguageCode = item.PreferredSubtitleLanguageCode,
                SubtitleMode = item.SubtitleMode
            },
@@ -203,6 +204,7 @@ public abstract class ProgramScheduleItemCommandBase
                FallbackFillerId = item.FallbackFillerId,
                WatermarkId = item.WatermarkId,
                PreferredAudioLanguageCode = item.PreferredAudioLanguageCode,
+                PreferredAudioTitle = item.PreferredAudioTitle,
                PreferredSubtitleLanguageCode = item.PreferredSubtitleLanguageCode,
                SubtitleMode = item.SubtitleMode
            },
@@ -227,6 +229,7 @@ public abstract class ProgramScheduleItemCommandBase
                FallbackFillerId = item.FallbackFillerId,
                WatermarkId = item.WatermarkId,
                PreferredAudioLanguageCode = item.PreferredAudioLanguageCode,
+                PreferredAudioTitle = item.PreferredAudioTitle,
                PreferredSubtitleLanguageCode = item.PreferredSubtitleLanguageCode,
                SubtitleMode = item.SubtitleMode
            },
@@ -252,6 +255,7 @@ public abstract class ProgramScheduleItemCommandBase
                FallbackFillerId = item.FallbackFillerId,
                WatermarkId = item.WatermarkId,
                PreferredAudioLanguageCode = item.PreferredAudioLanguageCode,
+                PreferredAudioTitle = item.PreferredAudioTitle,
                PreferredSubtitleLanguageCode = item.PreferredSubtitleLanguageCode,
                SubtitleMode = item.SubtitleMode
            },
@@ -26,6 +26,7 @@ public record ReplaceProgramScheduleItem(
    int? FallbackFillerId,
    int? WatermarkId,
    string PreferredAudioLanguageCode,
+    string PreferredAudioTitle,
    string PreferredSubtitleLanguageCode,
    ChannelSubtitleMode? SubtitleMode) : IProgramScheduleItemRequest;

@@ -8,4 +8,5 @@ public record UpdateProgramSchedule
    string Name,
    bool KeepMultiPartEpisodesTogether,
    bool TreatCollectionsAsShows,
-    bool ShuffleScheduleItems) : IRequest<Either<BaseError, UpdateProgramScheduleResult>>;
+    bool ShuffleScheduleItems,
+    bool RandomStartPoint) : IRequest<Either<BaseError, UpdateProgramScheduleResult>>;
@@ -41,13 +41,15 @@ public class UpdateProgramScheduleHandler :
        bool needToRefreshPlayout =
            programSchedule.KeepMultiPartEpisodesTogether != request.KeepMultiPartEpisodesTogether ||
            programSchedule.TreatCollectionsAsShows != request.TreatCollectionsAsShows ||
-            programSchedule.ShuffleScheduleItems != request.ShuffleScheduleItems;
+            programSchedule.ShuffleScheduleItems != request.ShuffleScheduleItems ||
+            programSchedule.RandomStartPoint != request.RandomStartPoint;

        programSchedule.Name = request.Name;
        programSchedule.KeepMultiPartEpisodesTogether = request.KeepMultiPartEpisodesTogether;
        programSchedule.TreatCollectionsAsShows = programSchedule.KeepMultiPartEpisodesTogether &&
                                                  request.TreatCollectionsAsShows;
        programSchedule.ShuffleScheduleItems = request.ShuffleScheduleItems;
+        programSchedule.RandomStartPoint = request.RandomStartPoint;

        await dbContext.SaveChangesAsync();

@@ -10,7 +10,8 @@ internal static class Mapper
            programSchedule.Name,
            programSchedule.KeepMultiPartEpisodesTogether,
            programSchedule.TreatCollectionsAsShows,
-            programSchedule.ShuffleScheduleItems);
+            programSchedule.ShuffleScheduleItems,
+            programSchedule.RandomStartPoint);

    internal static ProgramScheduleItemViewModel ProjectToViewModel(ProgramScheduleItem programScheduleItem) =>
        programScheduleItem switch
@@ -62,6 +63,7 @@ internal static class Mapper
                        ? Watermarks.Mapper.ProjectToViewModel(duration.Watermark)
                        : null,
                    duration.PreferredAudioLanguageCode,
+                    duration.PreferredAudioTitle,
                    duration.PreferredSubtitleLanguageCode,
                    duration.SubtitleMode),
            ProgramScheduleItemFlood flood =>
@@ -109,6 +111,7 @@ internal static class Mapper
                        ? Watermarks.Mapper.ProjectToViewModel(flood.Watermark)
                        : null,
                    flood.PreferredAudioLanguageCode,
+                    flood.PreferredAudioTitle,
                    flood.PreferredSubtitleLanguageCode,
                    flood.SubtitleMode),
            ProgramScheduleItemMultiple multiple =>
@@ -157,6 +160,7 @@ internal static class Mapper
                        ? Watermarks.Mapper.ProjectToViewModel(multiple.Watermark)
                        : null,
                    multiple.PreferredAudioLanguageCode,
+                    multiple.PreferredAudioTitle,
                    multiple.PreferredSubtitleLanguageCode,
                    multiple.SubtitleMode),
            ProgramScheduleItemOne one =>
@@ -204,6 +208,7 @@ internal static class Mapper
                        ? Watermarks.Mapper.ProjectToViewModel(one.Watermark)
                        : null,
                    one.PreferredAudioLanguageCode,
+                    one.PreferredAudioTitle,
                    one.PreferredSubtitleLanguageCode,
                    one.SubtitleMode),
            _ => throw new NotSupportedException(
@@ -30,6 +30,7 @@ public record ProgramScheduleItemDurationViewModel : ProgramScheduleItemViewMode
        FillerPresetViewModel fallbackFiller,
        WatermarkViewModel watermark,
        string preferredAudioLanguageCode,
+        string preferredAudioTitle,
        string preferredSubtitleLanguageCode,
        ChannelSubtitleMode? subtitleMode) : base(
        id,
@@ -52,6 +53,7 @@ public record ProgramScheduleItemDurationViewModel : ProgramScheduleItemViewMode
        fallbackFiller,
        watermark,
        preferredAudioLanguageCode,
+        preferredAudioTitle,
        preferredSubtitleLanguageCode,
        subtitleMode)
    {
@@ -28,6 +28,7 @@ public record ProgramScheduleItemFloodViewModel : ProgramScheduleItemViewModel
        FillerPresetViewModel fallbackFiller,
        WatermarkViewModel watermark,
        string preferredAudioLanguageCode,
+        string preferredAudioTitle,
        string preferredSubtitleLanguageCode,
        ChannelSubtitleMode? subtitleMode) : base(
        id,
@@ -50,6 +51,7 @@ public record ProgramScheduleItemFloodViewModel : ProgramScheduleItemViewModel
        fallbackFiller,
        watermark,
        preferredAudioLanguageCode,
+        preferredAudioTitle,
        preferredSubtitleLanguageCode,
        subtitleMode)
    {
@@ -29,6 +29,7 @@ public record ProgramScheduleItemMultipleViewModel : ProgramScheduleItemViewMode
        FillerPresetViewModel fallbackFiller,
        WatermarkViewModel watermark,
        string preferredAudioLanguageCode,
+        string preferredAudioTitle,
        string preferredSubtitleLanguageCode,
        ChannelSubtitleMode? subtitleMode) : base(
        id,
@@ -51,6 +52,7 @@ public record ProgramScheduleItemMultipleViewModel : ProgramScheduleItemViewMode
        fallbackFiller,
        watermark,
        preferredAudioLanguageCode,
+        preferredAudioTitle,
        preferredSubtitleLanguageCode,
        subtitleMode) =>
        Count = count;
@@ -28,6 +28,7 @@ public record ProgramScheduleItemOneViewModel : ProgramScheduleItemViewModel
        FillerPresetViewModel fallbackFiller,
        WatermarkViewModel watermark,
        string preferredAudioLanguageCode,
+        string preferredAudioTitle,
        string preferredSubtitleLanguageCode,
        ChannelSubtitleMode? subtitleMode) : base(
        id,
@@ -50,6 +51,7 @@ public record ProgramScheduleItemOneViewModel : ProgramScheduleItemViewModel
        fallbackFiller,
        watermark,
        preferredAudioLanguageCode,
+        preferredAudioTitle,
        preferredSubtitleLanguageCode,
        subtitleMode)
    {
@@ -27,6 +27,7 @@ public abstract record ProgramScheduleItemViewModel(
    FillerPresetViewModel FallbackFiller,
    WatermarkViewModel Watermark,
    string PreferredAudioLanguageCode,
+    string PreferredAudioTitle,
    string PreferredSubtitleLanguageCode,
    ChannelSubtitleMode? SubtitleMode)
 {
@@ -5,4 +5,5 @@ public record ProgramScheduleViewModel(
    string Name,
    bool KeepMultiPartEpisodesTogether,
    bool TreatCollectionsAsShows,
-    bool ShuffleScheduleItems);
+    bool ShuffleScheduleItems,
+    bool RandomStartPoint);
@@ -22,7 +22,8 @@ public class GetAllProgramSchedulesHandler : IRequestHandler<GetAllProgramSchedu
                    ps.Name,
                    ps.KeepMultiPartEpisodesTogether,
                    ps.TreatCollectionsAsShows,
-                    ps.ShuffleScheduleItems))
+                    ps.ShuffleScheduleItems,
+                    ps.RandomStartPoint))
            .ToListAsync(cancellationToken);
    }
 }
@@ -1,8 +1,11 @@
-using ErsatzTV.Core;
+using System.Diagnostics;
+using ErsatzTV.Core;
 using ErsatzTV.Core.Domain;
 using ErsatzTV.Core.Interfaces.Metadata;
 using ErsatzTV.Core.Interfaces.Repositories;
+using ErsatzTV.Core.Interfaces.Repositories.Caching;
 using ErsatzTV.Core.Interfaces.Search;
+using Humanizer;
 using Microsoft.Extensions.Logging;

 namespace ErsatzTV.Application.Search;
@@ -10,16 +13,18 @@ namespace ErsatzTV.Application.Search;
 public class RebuildSearchIndexHandler : IRequestHandler<RebuildSearchIndex, Unit>
 {
    private readonly IConfigElementRepository _configElementRepository;
+    private readonly IFallbackMetadataProvider _fallbackMetadataProvider;
    private readonly ILocalFileSystem _localFileSystem;
    private readonly ILogger<RebuildSearchIndexHandler> _logger;
    private readonly ISearchIndex _searchIndex;
-    private readonly ISearchRepository _searchRepository;
+    private readonly ICachingSearchRepository _searchRepository;

    public RebuildSearchIndexHandler(
        ISearchIndex searchIndex,
-        ISearchRepository searchRepository,
+        ICachingSearchRepository searchRepository,
        IConfigElementRepository configElementRepository,
        ILocalFileSystem localFileSystem,
+        IFallbackMetadataProvider fallbackMetadataProvider,
        ILogger<RebuildSearchIndexHandler> logger)
    {
        _searchIndex = searchIndex;
@@ -27,13 +32,18 @@ public class RebuildSearchIndexHandler : IRequestHandler<RebuildSearchIndex, Uni
        _searchRepository = searchRepository;
        _configElementRepository = configElementRepository;
        _localFileSystem = localFileSystem;
+        _fallbackMetadataProvider = fallbackMetadataProvider;
    }

    public async Task<Unit> Handle(RebuildSearchIndex request, CancellationToken cancellationToken)
    {
+        _logger.LogInformation("Initializing search index");
+
        bool indexFolderExists = Directory.Exists(FileSystemLayout.SearchIndexFolder);

-        await _searchIndex.Initialize(_localFileSystem);
+        await _searchIndex.Initialize(_localFileSystem, _configElementRepository);
+
+        _logger.LogInformation("Done initializing search index");

        if (!indexFolderExists ||
            await _configElementRepository.GetValue<int>(ConfigElementKey.SearchIndexVersion) <
@@ -41,12 +51,13 @@ public class RebuildSearchIndexHandler : IRequestHandler<RebuildSearchIndex, Uni
        {
            _logger.LogInformation("Migrating search index to version {Version}", _searchIndex.Version);

-            List<int> itemIds = await _searchRepository.GetItemIdsToIndex();
-            await _searchIndex.Rebuild(_searchRepository, itemIds);
+            var sw = Stopwatch.StartNew();
+            await _searchIndex.Rebuild(_searchRepository, _fallbackMetadataProvider);

            await _configElementRepository.Upsert(ConfigElementKey.SearchIndexVersion, _searchIndex.Version);
+            sw.Stop();

-            _logger.LogInformation("Done migrating search index");
+            _logger.LogInformation("Done migrating search index in {Duration}", sw.Elapsed.Humanize());
        }
        else
        {
@@ -3,10 +3,14 @@ using ErsatzTV.Core.Domain;
 using ErsatzTV.Core.Extensions;
 using ErsatzTV.Core.Interfaces.Emby;
 using ErsatzTV.Core.Interfaces.Jellyfin;
+using ErsatzTV.Core.Interfaces.Metadata;
 using ErsatzTV.Core.Interfaces.Plex;
 using ErsatzTV.Core.Interfaces.Repositories;
 using ErsatzTV.Core.Interfaces.Search;
 using ErsatzTV.Core.Search;
+using ErsatzTV.Infrastructure.Data;
+using ErsatzTV.Infrastructure.Extensions;
+using Microsoft.EntityFrameworkCore;
 using static ErsatzTV.Application.MediaCards.Mapper;

 namespace ErsatzTV.Application.Search;
@@ -14,7 +18,9 @@ namespace ErsatzTV.Application.Search;
 public class
    QuerySearchIndexEpisodesHandler : IRequestHandler<QuerySearchIndexEpisodes, TelevisionEpisodeCardResultsViewModel>
 {
+    private readonly IDbContextFactory<TvContext> _dbContextFactory;
    private readonly IEmbyPathReplacementService _embyPathReplacementService;
+    private readonly IFallbackMetadataProvider _fallbackMetadataProvider;
    private readonly IJellyfinPathReplacementService _jellyfinPathReplacementService;
    private readonly IMediaSourceRepository _mediaSourceRepository;
    private readonly IPlexPathReplacementService _plexPathReplacementService;
@@ -27,7 +33,9 @@ public class
        IMediaSourceRepository mediaSourceRepository,
        IPlexPathReplacementService plexPathReplacementService,
        IJellyfinPathReplacementService jellyfinPathReplacementService,
-        IEmbyPathReplacementService embyPathReplacementService)
+        IEmbyPathReplacementService embyPathReplacementService,
+        IFallbackMetadataProvider fallbackMetadataProvider,
+        IDbContextFactory<TvContext> dbContextFactory)
    {
        _searchIndex = searchIndex;
        _televisionRepository = televisionRepository;
@@ -35,6 +43,8 @@ public class
        _plexPathReplacementService = plexPathReplacementService;
        _jellyfinPathReplacementService = jellyfinPathReplacementService;
        _embyPathReplacementService = embyPathReplacementService;
+        _fallbackMetadataProvider = fallbackMetadataProvider;
+        _dbContextFactory = dbContextFactory;
    }

    public async Task<TelevisionEpisodeCardResultsViewModel> Handle(
@@ -52,8 +62,40 @@ public class
        Option<EmbyMediaSource> maybeEmby = await _mediaSourceRepository.GetAllEmby()
            .Map(list => list.HeadOrNone());

-        List<EpisodeMetadata> episodes = await _televisionRepository
-            .GetEpisodesForCards(searchResult.Items.Map(i => i.Id).ToList());
+        var episodeIds = searchResult.Items.Map(i => i.Id).ToList();
+
+        List<EpisodeMetadata> episodes = await _televisionRepository.GetEpisodesForCards(episodeIds);
+
+        // try to load fallback metadata for episodes that have none
+        // this handles an edge case of trashed items with no saved metadata
+        var missingEpisodes = episodeIds.Except(episodes.Map(e => e.EpisodeId)).ToList();
+        await using TvContext dbContext = await _dbContextFactory.CreateDbContextAsync(cancellationToken);
+        foreach (int missingEpisodeId in missingEpisodes)
+        {
+            Option<Episode> maybeEpisode = await dbContext.Episodes
+                .AsNoTracking()
+                .Include(e => e.MediaVersions)
+                .ThenInclude(e => e.MediaFiles)
+                .Include(e => e.Season)
+                .ThenInclude(s => s.SeasonMetadata)
+                .ThenInclude(sm => sm.Artwork)
+                .Include(e => e.Season)
+                .ThenInclude(s => s.Show)
+                .ThenInclude(s => s.ShowMetadata)
+                .ThenInclude(sm => sm.Artwork)
+                .SelectOneAsync(e => e.Id, e => e.Id == missingEpisodeId);
+
+            foreach (Episode episode in maybeEpisode)
+            {
+                foreach (EpisodeMetadata headMetadata in _fallbackMetadataProvider.GetFallbackMetadata(episode)
+                             .HeadOrNone())
+                {
+                    headMetadata.Episode = episode;
+                    episode.EpisodeMetadata = new List<EpisodeMetadata> { headMetadata };
+                    episodes.Add(headMetadata);
+                }
+            }
+        }

        var items = new List<TelevisionEpisodeCardViewModel>();

@@ -0,0 +1,3 @@
+namespace ErsatzTV.Application.Search;
+
+public record QuerySearchTargets : IRequest<List<SearchTargetViewModel>>;
@@ -0,0 +1,54 @@
+using ErsatzTV.Infrastructure.Data;
+using Microsoft.EntityFrameworkCore;
+
+namespace ErsatzTV.Application.Search;
+
+public class QuerySearchTargetsHandler : IRequestHandler<QuerySearchTargets, List<SearchTargetViewModel>>
+{
+    private readonly IDbContextFactory<TvContext> _dbContextFactory;
+
+    public QuerySearchTargetsHandler(IDbContextFactory<TvContext> dbContextFactory) =>
+        _dbContextFactory = dbContextFactory;
+
+    public async Task<List<SearchTargetViewModel>> Handle(
+        QuerySearchTargets request,
+        CancellationToken cancellationToken)
+    {
+        var result = new List<SearchTargetViewModel>();
+
+        await using TvContext dbContext = await _dbContextFactory.CreateDbContextAsync(cancellationToken);
+
+        result.AddRange(
+            dbContext.Channels
+                .Map(c => new SearchTargetViewModel(c.Id, c.Name, SearchTargetKind.Channel)));
+        result.AddRange(
+            dbContext.FFmpegProfiles
+                .Map(f => new SearchTargetViewModel(f.Id, f.Name, SearchTargetKind.FFmpegProfile)));
+        result.AddRange(
+            dbContext.ChannelWatermarks
+                .Map(w => new SearchTargetViewModel(w.Id, w.Name, SearchTargetKind.ChannelWatermark)));
+        result.AddRange(
+            dbContext.Collections
+                .Map(c => new SearchTargetViewModel(c.Id, c.Name, SearchTargetKind.Collection)));
+        result.AddRange(
+            dbContext.MultiCollections
+                .Map(mc => new SearchTargetViewModel(mc.Id, mc.Name, SearchTargetKind.MultiCollection)));
+        result.AddRange(
+            dbContext.SmartCollections
+                .Map(sc => new SmartCollectionSearchTargetViewModel(sc.Id, sc.Name, sc.Query)));
+
+        var schedules = await dbContext.ProgramSchedules
+            .Map(s => new { s.Id, s.Name })
+            .ToListAsync(cancellationToken);
+
+        result.AddRange(
+            schedules.SelectMany(
+                s => new[]
+                {
+                    new SearchTargetViewModel(s.Id, s.Name, SearchTargetKind.Schedule),
+                    new SearchTargetViewModel(s.Id, s.Name, SearchTargetKind.ScheduleItems)
+                }));
+
+        return result;
+    }
+}
@@ -0,0 +1,18 @@
+namespace ErsatzTV.Application.Search;
+
+public record SearchTargetViewModel(int Id, string Name, SearchTargetKind Kind);
+
+public record SmartCollectionSearchTargetViewModel(int Id, string Name, string Query)
+    : SearchTargetViewModel(Id, Name, SearchTargetKind.SmartCollection);
+
+public enum SearchTargetKind
+{
+    Channel = 1,
+    FFmpegProfile = 2,
+    ChannelWatermark = 3,
+    Collection = 4,
+    MultiCollection = 5,
+    SmartCollection = 6,
+    Schedule = 7,
+    ScheduleItems = 8
+}
@@ -1,4 +1,5 @@
-using ErsatzTV.Core;
+using System.Diagnostics;
+using ErsatzTV.Core;
 using ErsatzTV.Core.Domain;
 using ErsatzTV.Core.Errors;
 using ErsatzTV.Core.FFmpeg;
@@ -78,22 +79,47 @@ public class StartFFmpegSessionHandler : IRequestHandler<StartFFmpegSession, Eit
        IHlsSessionWorker worker,
        CancellationToken cancellationToken)
    {
-        while (!File.Exists(playlistFileName))
+        var sw = Stopwatch.StartNew();
+        try
        {
-            await Task.Delay(TimeSpan.FromMilliseconds(100), cancellationToken);
-        }
+            DateTimeOffset start = DateTimeOffset.Now;
+            DateTimeOffset finish = start.AddSeconds(8);

-        var segmentCount = 0;
-        while (segmentCount < initialSegmentCount)
-        {
-            await Task.Delay(TimeSpan.FromMilliseconds(200), cancellationToken);
-
-            DateTimeOffset now = DateTimeOffset.Now.AddSeconds(-30);
-            Option<TrimPlaylistResult> maybeResult = await worker.TrimPlaylist(now, cancellationToken);
-            foreach (TrimPlaylistResult result in maybeResult)
+            _logger.LogDebug("Waiting for playlist to exist");
+            while (!File.Exists(playlistFileName))
            {
-                segmentCount = result.SegmentCount;
+                await Task.Delay(TimeSpan.FromMilliseconds(100), cancellationToken);
            }
+
+            _logger.LogDebug("Playlist exists");
+
+            var segmentCount = 0;
+            var lastSegmentCount = -1;
+            while (DateTimeOffset.Now < finish && segmentCount < initialSegmentCount)
+            {
+                if (segmentCount != lastSegmentCount)
+                {
+                    lastSegmentCount = segmentCount;
+                    _logger.LogDebug(
+                        "Segment count {SegmentCount} of {InitialSegmentCount}",
+                        segmentCount,
+                        initialSegmentCount);
+                }
+
+                await Task.Delay(TimeSpan.FromMilliseconds(200), cancellationToken);
+
+                DateTimeOffset now = DateTimeOffset.Now.AddSeconds(-30);
+                Option<TrimPlaylistResult> maybeResult = await worker.TrimPlaylist(now, cancellationToken);
+                foreach (TrimPlaylistResult result in maybeResult)
+                {
+                    segmentCount = result.SegmentCount;
+                }
+            }
+        }
+        finally
+        {
+            sw.Stop();
+            _logger.LogDebug("WaitForPlaylistSegments took {Duration}", sw.Elapsed);
        }
    }

@@ -1,4 +1,5 @@
-using System.Text;
+using System.Diagnostics;
+using System.Text;
 using System.Timers;
 using Bugsnag;
 using CliWrap;
@@ -21,12 +22,16 @@ public class HlsSessionWorker : IHlsSessionWorker
    private static readonly SemaphoreSlim Slim = new(1, 1);
    private static int _workAheadCount;
    private readonly IHlsPlaylistFilter _hlsPlaylistFilter;
+    private readonly ILocalFileSystem _localFileSystem;
    private readonly ILogger<HlsSessionWorker> _logger;
    private readonly IServiceScopeFactory _serviceScopeFactory;
    private readonly object _sync = new();
    private string _channelNumber;
    private bool _firstProcess;
+    private bool _hasWrittenSegments;
    private DateTimeOffset _lastAccess;
+    private DateTimeOffset _lastDelete = DateTimeOffset.MinValue;
+    private bool _seekNextItem;
    private Option<int> _targetFramerate;
    private Timer _timer;
    private DateTimeOffset _transcodedUntil;
@@ -34,10 +39,12 @@ public class HlsSessionWorker : IHlsSessionWorker
    public HlsSessionWorker(
        IHlsPlaylistFilter hlsPlaylistFilter,
        IServiceScopeFactory serviceScopeFactory,
+        ILocalFileSystem localFileSystem,
        ILogger<HlsSessionWorker> logger)
    {
        _hlsPlaylistFilter = hlsPlaylistFilter;
        _serviceScopeFactory = serviceScopeFactory;
+        _localFileSystem = localFileSystem;
        _logger = logger;
    }

@@ -58,19 +65,38 @@ public class HlsSessionWorker : IHlsSessionWorker
        DateTimeOffset filterBefore,
        CancellationToken cancellationToken)
    {
+        var sw = Stopwatch.StartNew();
        await Slim.WaitAsync(cancellationToken);
        try
        {
            Option<string[]> maybeLines = await ReadPlaylistLines(cancellationToken);
-            return maybeLines.Map(input => _hlsPlaylistFilter.TrimPlaylist(PlaylistStart, filterBefore, input));
+            foreach (string[] input in maybeLines)
+            {
+                TrimPlaylistResult trimResult = _hlsPlaylistFilter.TrimPlaylist(PlaylistStart, filterBefore, input);
+                if (DateTimeOffset.Now > _lastDelete.AddSeconds(30))
+                {
+                    DeleteOldSegments(trimResult);
+                    _lastDelete = DateTimeOffset.Now;
+                }
+
+                return trimResult;
+            }
+
+            return None;
        }
        finally
        {
            Slim.Release();
+            sw.Stop();
+            // _logger.LogDebug("TrimPlaylist took {Duration}", sw.Elapsed);
        }
    }

-    public void PlayoutUpdated() => _firstProcess = true;
+    public void PlayoutUpdated()
+    {
+        _firstProcess = true;
+        _seekNextItem = true;
+    }

    public async Task Run(string channelNumber, TimeSpan idleTimeout, CancellationToken incomingCancellationToken)
    {
@@ -153,6 +179,15 @@ public class HlsSessionWorker : IHlsSessionWorker
            {
                _timer.Elapsed -= Cancel;
            }
+
+            try
+            {
+                _localFileSystem.EmptyFolder(Path.Combine(FileSystemLayout.TranscodeFolder, _channelNumber));
+            }
+            catch
+            {
+                // do nothing
+            }
        }
    }

@@ -225,6 +260,13 @@ public class HlsSessionWorker : IHlsSessionWorker
                        _logger.LogInformation("HLS process has completed for channel {Channel}", _channelNumber);
                        _transcodedUntil = processModel.Until;
                        _firstProcess = false;
+                        if (_seekNextItem)
+                        {
+                            _firstProcess = true;
+                            _seekNextItem = false;
+                        }
+
+                        _hasWrittenSegments = true;
                        return true;
                    }
                    else
@@ -269,6 +311,14 @@ public class HlsSessionWorker : IHlsSessionWorker
                            if (commandResult.ExitCode == 0)
                            {
                                _firstProcess = false;
+                                if (_seekNextItem)
+                                {
+                                    _firstProcess = true;
+                                    _seekNextItem = false;
+                                }
+
+                                _hasWrittenSegments = true;
+
                                return true;
                            }
                        }
@@ -276,7 +326,7 @@ public class HlsSessionWorker : IHlsSessionWorker
                        return false;
                    }
                }
-                catch (TaskCanceledException)
+                catch (Exception ex) when (ex is TaskCanceledException or OperationCanceledException)
                {
                    _logger.LogInformation("Terminating HLS process for channel {Channel}", _channelNumber);
                    return false;
@@ -322,33 +372,7 @@ public class HlsSessionWorker : IHlsSessionWorker
                    lines);
                await WritePlaylist(trimResult.Playlist, cancellationToken);

-                // delete old segments
-                var allSegments = Directory.GetFiles(
-                        Path.Combine(FileSystemLayout.TranscodeFolder, _channelNumber),
-                        "live*.ts")
-                    .Map(
-                        file =>
-                        {
-                            string fileName = Path.GetFileName(file);
-                            var sequenceNumber = int.Parse(fileName.Replace("live", string.Empty).Split('.')[0]);
-                            return new Segment(file, sequenceNumber);
-                        })
-                    .ToList();
-
-                var toDelete = allSegments.Filter(s => s.SequenceNumber < trimResult.Sequence).ToList();
-                // if (toDelete.Count > 0)
-                // {
-                // _logger.LogInformation(
-                //     "Deleting HLS segments {Min} to {Max} (less than {StartSequence})",
-                //     toDelete.Map(s => s.SequenceNumber).Min(),
-                //     toDelete.Map(s => s.SequenceNumber).Max(),
-                //     trimResult.Sequence);
-                // }
-
-                foreach (Segment segment in toDelete)
-                {
-                    File.Delete(segment.File);
-                }
+                DeleteOldSegments(trimResult);

                PlaylistStart = trimResult.PlaylistStart;
            }
@@ -359,7 +383,38 @@ public class HlsSessionWorker : IHlsSessionWorker
        }
    }

-    private static async Task<long> GetPtsOffset(
+    private void DeleteOldSegments(TrimPlaylistResult trimResult)
+    {
+        // delete old segments
+        var allSegments = Directory.GetFiles(
+                Path.Combine(FileSystemLayout.TranscodeFolder, _channelNumber),
+                "live*.ts")
+            .Map(
+                file =>
+                {
+                    string fileName = Path.GetFileName(file);
+                    var sequenceNumber = int.Parse(fileName.Replace("live", string.Empty).Split('.')[0]);
+                    return new Segment(file, sequenceNumber);
+                })
+            .ToList();
+
+        var toDelete = allSegments.Filter(s => s.SequenceNumber < trimResult.Sequence).ToList();
+        if (toDelete.Count > 0)
+        {
+            // _logger.LogDebug(
+            //     "Deleting HLS segments {Min} to {Max} (less than {StartSequence})",
+            //     toDelete.Map(s => s.SequenceNumber).Min(),
+            //     toDelete.Map(s => s.SequenceNumber).Max(),
+            //     trimResult.Sequence);
+        }
+
+        foreach (Segment segment in toDelete)
+        {
+            File.Delete(segment.File);
+        }
+    }
+
+    private async Task<long> GetPtsOffset(
        IMediator mediator,
        string channelNumber,
        CancellationToken cancellationToken)
@@ -369,10 +424,21 @@ public class HlsSessionWorker : IHlsSessionWorker
        {
            long result = 0;

+            // if we haven't yet written any segments, start at zero
+            if (!_hasWrittenSegments)
+            {
+                return result;
+            }
+
            Either<BaseError, PtsAndDuration> queryResult = await mediator.Send(
                new GetLastPtsDuration(channelNumber),
                cancellationToken);

+            foreach (BaseError error in queryResult.LeftToSeq())
+            {
+                _logger.LogWarning("Unable to determine last pts offset - {Error}", error.ToString());
+            }
+
            foreach ((long pts, long duration) in queryResult.RightToSeq())
            {
                result = pts + duration;
@@ -30,7 +30,7 @@ public class GetConcatProcessByChannelNumberHandler : FFmpegProcessHandler<GetCo
            .GetValue<bool>(ConfigElementKey.FFmpegSaveReports)
            .Map(result => result.IfNone(false));

-        Command process = _ffmpegProcessService.ConcatChannel(
+        Command process = await _ffmpegProcessService.ConcatChannel(
            ffmpegPath,
            saveReports,
            channel,
@@ -31,7 +31,10 @@ public class GetErrorProcessHandler : FFmpegProcessHandler<GetErrorProcess>
            request.MaybeDuration,
            request.ErrorMessage,
            request.HlsRealtime,
-            request.PtsOffset);
+            request.PtsOffset,
+            channel.FFmpegProfile.VaapiDriver,
+            channel.FFmpegProfile.VaapiDevice,
+            Optional(channel.FFmpegProfile.QsvExtraHardwareFrames));

        return new PlayoutItemProcessModel(process, request.MaybeDuration, request.Until);
    }
@@ -14,6 +14,7 @@ using ErsatzTV.Core.Scheduling;
 using ErsatzTV.Infrastructure.Data;
 using ErsatzTV.Infrastructure.Extensions;
 using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Logging;

 namespace ErsatzTV.Application.Streaming;

@@ -24,7 +25,9 @@ public class GetPlayoutItemProcessByChannelNumberHandler : FFmpegProcessHandler<
    private readonly IFFmpegProcessService _ffmpegProcessService;
    private readonly IJellyfinPathReplacementService _jellyfinPathReplacementService;
    private readonly ILocalFileSystem _localFileSystem;
+    private readonly ILogger<GetPlayoutItemProcessByChannelNumberHandler> _logger;
    private readonly IMediaCollectionRepository _mediaCollectionRepository;
+    private readonly IMusicVideoCreditsGenerator _musicVideoCreditsGenerator;
    private readonly IPlexPathReplacementService _plexPathReplacementService;
    private readonly ISongVideoGenerator _songVideoGenerator;
    private readonly ITelevisionRepository _televisionRepository;
@@ -39,7 +42,9 @@ public class GetPlayoutItemProcessByChannelNumberHandler : FFmpegProcessHandler<
        IMediaCollectionRepository mediaCollectionRepository,
        ITelevisionRepository televisionRepository,
        IArtistRepository artistRepository,
-        ISongVideoGenerator songVideoGenerator)
+        ISongVideoGenerator songVideoGenerator,
+        IMusicVideoCreditsGenerator musicVideoCreditsGenerator,
+        ILogger<GetPlayoutItemProcessByChannelNumberHandler> logger)
        : base(dbContextFactory)
    {
        _ffmpegProcessService = ffmpegProcessService;
@@ -51,6 +56,8 @@ public class GetPlayoutItemProcessByChannelNumberHandler : FFmpegProcessHandler<
        _televisionRepository = televisionRepository;
        _artistRepository = artistRepository;
        _songVideoGenerator = songVideoGenerator;
+        _musicVideoCreditsGenerator = musicVideoCreditsGenerator;
+        _logger = logger;
    }

    protected override async Task<Either<BaseError, PlayoutItemProcessModel>> GetProcess(
@@ -92,6 +99,9 @@ public class GetPlayoutItemProcessByChannelNumberHandler : FFmpegProcessHandler<
            .ThenInclude(mi => (mi as MusicVideo).MediaVersions)
            .ThenInclude(mv => mv.Streams)
            .Include(i => i.MediaItem)
+            .ThenInclude(mi => (mi as MusicVideo).Artist)
+            .ThenInclude(mv => mv.ArtistMetadata)
+            .Include(i => i.MediaItem)
            .ThenInclude(mi => (mi as OtherVideo).OtherVideoMetadata)
            .ThenInclude(ovm => ovm.Subtitles)
            .Include(i => i.MediaItem)
@@ -151,7 +161,7 @@ public class GetPlayoutItemProcessByChannelNumberHandler : FFmpegProcessHandler<
                .GetValue<bool>(ConfigElementKey.FFmpegSaveReports)
                .Map(result => result.IfNone(false));

-            List<Subtitle> subtitles = GetSubtitles(playoutItemWithPath);
+            List<Subtitle> subtitles = await GetSubtitles(playoutItemWithPath, channel);

            Command process = await _ffmpegProcessService.ForPlayoutItem(
                ffmpegPath,
@@ -164,6 +174,7 @@ public class GetPlayoutItemProcessByChannelNumberHandler : FFmpegProcessHandler<
                audioPath,
                subtitles,
                playoutItemWithPath.PlayoutItem.PreferredAudioLanguageCode ?? channel.PreferredAudioLanguageCode,
+                playoutItemWithPath.PlayoutItem.PreferredAudioTitle ?? channel.PreferredAudioTitle,
                playoutItemWithPath.PlayoutItem.PreferredSubtitleLanguageCode ?? channel.PreferredSubtitleLanguageCode,
                playoutItemWithPath.PlayoutItem.SubtitleMode ?? channel.SubtitleMode,
                playoutItemWithPath.PlayoutItem.StartOffset,
@@ -173,12 +184,14 @@ public class GetPlayoutItemProcessByChannelNumberHandler : FFmpegProcessHandler<
                maybeGlobalWatermark,
                channel.FFmpegProfile.VaapiDriver,
                channel.FFmpegProfile.VaapiDevice,
+                Optional(channel.FFmpegProfile.QsvExtraHardwareFrames),
                request.HlsRealtime,
                playoutItemWithPath.PlayoutItem.FillerKind,
                playoutItemWithPath.PlayoutItem.InPoint,
                playoutItemWithPath.PlayoutItem.OutPoint,
                request.PtsOffset,
-                request.TargetFramerate);
+                request.TargetFramerate,
+                playoutItemWithPath.PlayoutItem.DisableWatermarks);

            var result = new PlayoutItemProcessModel(
                process,
@@ -201,6 +214,12 @@ public class GetPlayoutItemProcessByChannelNumberHandler : FFmpegProcessHandler<

            DateTimeOffset finish = maybeDuration.Match(d => now.Add(d), () => now);

+            _logger.LogWarning(
+                "Error locating playout item {@Error}. Will display error from {Start} to {Finish}",
+                error,
+                now,
+                finish);
+
            switch (error)
            {
                case UnableToLocatePlayoutItem:
@@ -210,7 +229,10 @@ public class GetPlayoutItemProcessByChannelNumberHandler : FFmpegProcessHandler<
                        maybeDuration,
                        "Channel is Offline",
                        request.HlsRealtime,
-                        request.PtsOffset);
+                        request.PtsOffset,
+                        channel.FFmpegProfile.VaapiDriver,
+                        channel.FFmpegProfile.VaapiDevice,
+                        Optional(channel.FFmpegProfile.QsvExtraHardwareFrames));

                    return new PlayoutItemProcessModel(offlineProcess, maybeDuration, finish);
                case PlayoutItemDoesNotExistOnDisk:
@@ -220,7 +242,10 @@ public class GetPlayoutItemProcessByChannelNumberHandler : FFmpegProcessHandler<
                        maybeDuration,
                        error.Value,
                        request.HlsRealtime,
-                        request.PtsOffset);
+                        request.PtsOffset,
+                        channel.FFmpegProfile.VaapiDriver,
+                        channel.FFmpegProfile.VaapiDevice,
+                        Optional(channel.FFmpegProfile.QsvExtraHardwareFrames));

                    return new PlayoutItemProcessModel(doesNotExistProcess, maybeDuration, finish);
                default:
@@ -230,7 +255,10 @@ public class GetPlayoutItemProcessByChannelNumberHandler : FFmpegProcessHandler<
                        maybeDuration,
                        "Channel is Offline",
                        request.HlsRealtime,
-                        request.PtsOffset);
+                        request.PtsOffset,
+                        channel.FFmpegProfile.VaapiDriver,
+                        channel.FFmpegProfile.VaapiDevice,
+                        Optional(channel.FFmpegProfile.QsvExtraHardwareFrames));

                    return new PlayoutItemProcessModel(errorProcess, maybeDuration, finish);
            }
@@ -239,22 +267,22 @@ public class GetPlayoutItemProcessByChannelNumberHandler : FFmpegProcessHandler<
        return BaseError.New($"Unexpected error locating playout item for channel {channel.Number}");
    }

-    private static List<Subtitle> GetSubtitles(PlayoutItemWithPath playoutItemWithPath)
+    private async Task<List<Subtitle>> GetSubtitles(
+        PlayoutItemWithPath playoutItemWithPath,
+        Channel channel)
    {
        List<Subtitle> allSubtitles = playoutItemWithPath.PlayoutItem.MediaItem switch
        {
-            Episode episode => Optional(episode.EpisodeMetadata).Flatten().HeadOrNone()
-                .Map(mm => mm.Subtitles)
-                .IfNone(new List<Subtitle>()),
-            Movie movie => Optional(movie.MovieMetadata).Flatten().HeadOrNone()
-                .Map(mm => mm.Subtitles)
-                .IfNone(new List<Subtitle>()),
-            MusicVideo musicVideo => Optional(musicVideo.MusicVideoMetadata).Flatten().HeadOrNone()
-                .Map(mm => mm.Subtitles)
-                .IfNone(new List<Subtitle>()),
-            OtherVideo otherVideo => Optional(otherVideo.OtherVideoMetadata).Flatten().HeadOrNone()
-                .Map(mm => mm.Subtitles)
-                .IfNone(new List<Subtitle>()),
+            Episode episode => await Optional(episode.EpisodeMetadata).Flatten().HeadOrNone()
+                .Map(mm => mm.Subtitles ?? new List<Subtitle>())
+                .IfNoneAsync(new List<Subtitle>()),
+            Movie movie => await Optional(movie.MovieMetadata).Flatten().HeadOrNone()
+                .Map(mm => mm.Subtitles ?? new List<Subtitle>())
+                .IfNoneAsync(new List<Subtitle>()),
+            MusicVideo musicVideo => await GetMusicVideoSubtitles(musicVideo, channel),
+            OtherVideo otherVideo => await Optional(otherVideo.OtherVideoMetadata).Flatten().HeadOrNone()
+                .Map(mm => mm.Subtitles ?? new List<Subtitle>())
+                .IfNoneAsync(new List<Subtitle>()),
            _ => new List<Subtitle>()
        };

@@ -292,6 +320,27 @@ public class GetPlayoutItemProcessByChannelNumberHandler : FFmpegProcessHandler<
        return allSubtitles;
    }

+    private async Task<List<Subtitle>> GetMusicVideoSubtitles(MusicVideo musicVideo, Channel channel)
+    {
+        var subtitles = new List<Subtitle>();
+
+        bool musicVideoCredits = channel.MusicVideoCreditsMode == ChannelMusicVideoCreditsMode.GenerateSubtitles;
+        if (musicVideoCredits)
+        {
+            subtitles.AddRange(
+                await _musicVideoCreditsGenerator.GenerateCreditsSubtitle(musicVideo, channel.FFmpegProfile));
+        }
+        else
+        {
+            subtitles.AddRange(
+                await Optional(musicVideo.MusicVideoMetadata).Flatten().HeadOrNone()
+                    .Map(mm => mm.Subtitles)
+                    .IfNoneAsync(new List<Subtitle>()));
+        }
+
+        return subtitles;
+    }
+
    private async Task<Either<BaseError, PlayoutItemWithPath>> CheckForFallbackFiller(
        TvContext dbContext,
        Channel channel,
@@ -361,7 +410,8 @@ public class GetPlayoutItemProcessByChannelNumberHandler : FFmpegProcessHandler<
                Finish = finish.UtcDateTime,
                FillerKind = FillerKind.Fallback,
                InPoint = TimeSpan.Zero,
-                OutPoint = version.Duration
+                OutPoint = version.Duration,
+                DisableWatermarks = !fallbackPreset.AllowWatermarks
            };

            return await ValidatePlayoutItemPath(playoutItem);
@@ -68,7 +68,9 @@ public class ExtractEmbeddedSubtitlesHandler : IRequestHandler<ExtractEmbeddedSu

            // only check the requested playout if subtitles are enabled
            Option<Playout> requestedPlayout = await dbContext.Playouts
-                .Filter(p => p.Channel.SubtitleMode != ChannelSubtitleMode.None)
+                .Filter(
+                    p => p.Channel.SubtitleMode != ChannelSubtitleMode.None ||
+                         p.ProgramSchedule.Items.Any(psi => psi.SubtitleMode != ChannelSubtitleMode.None))
                .SelectOneAsync(p => p.Id, p => p.Id == request.PlayoutId.IfNone(-1));

            playoutIdsToCheck.AddRange(requestedPlayout.Map(p => p.Id));
@@ -77,7 +79,9 @@ public class ExtractEmbeddedSubtitlesHandler : IRequestHandler<ExtractEmbeddedSu
            if (request.PlayoutId.IsNone)
            {
                playoutIdsToCheck = dbContext.Playouts
-                    .Filter(p => p.Channel.SubtitleMode != ChannelSubtitleMode.None)
+                    .Filter(
+                        p => p.Channel.SubtitleMode != ChannelSubtitleMode.None ||
+                             p.ProgramSchedule.Items.Any(psi => psi.SubtitleMode != ChannelSubtitleMode.None))
                    .Map(p => p.Id)
                    .ToList();
            }
@@ -151,7 +155,7 @@ public class ExtractEmbeddedSubtitlesHandler : IRequestHandler<ExtractEmbeddedSu

            return Unit.Default;
        }
-        catch (TaskCanceledException)
+        catch (Exception ex) when (ex is TaskCanceledException or OperationCanceledException)
        {
            return Unit.Default;
        }
@@ -206,7 +210,7 @@ public class ExtractEmbeddedSubtitlesHandler : IRequestHandler<ExtractEmbeddedSu
                .ToListAsync(cancellationToken);
            result.AddRange(otherVideoIds);
        }
-        catch (TaskCanceledException)
+        catch (Exception ex) when (ex is TaskCanceledException or OperationCanceledException)
        {
            // do nothing
        }
@@ -285,7 +289,8 @@ public class ExtractEmbeddedSubtitlesHandler : IRequestHandler<ExtractEmbeddedSu
                        File.Delete(fullOutputPath);
                    }

-                    args.Add("-map").Add($"0:{subtitle.Subtitle.StreamIndex}").Add("-c").Add("copy")
+                    args.Add("-map").Add($"0:{subtitle.Subtitle.StreamIndex}")
+                        .Add("-c:s").Add(subtitle.Subtitle.Codec == "mov_text" ? "text" : "copy")
                        .Add(fullOutputPath);
                }

@@ -381,6 +386,7 @@ public class ExtractEmbeddedSubtitlesHandler : IRequestHandler<ExtractEmbeddedSu
            "subrip" => $"{name}.srt",
            "ass" => $"{name}.ass",
            "webvtt" => $"{name}.vtt",
+            "mov_text" => $"{name}.srt",
            _ => string.Empty
        };

--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Jason Dove	9b8dc0ed80	update changelog for release v0.6.7-beta [no ci]	2022-09-05 13:15:04 -05:00
Jason DoveandGitHub	3cc1286271	include other videos (ungrouped) in shuffle in order (#953 ) * include other videos (ungrouped) in shuffle in order * fix id conflict	2022-09-05 09:20:11 -05:00
Jason DoveandGitHub	df281758b7	properly fix infinite playout build loop (#952 )	2022-09-05 08:41:39 -05:00
Jason DoveandGitHub	25273c18c8	stop infinite playout building loop (#951 )	2022-09-04 20:28:28 -05:00
Jason DoveandGitHub	f1be945423	add qsv extra hardware frames setting (#950 ) * wip add qsv extra_hw_frames setting * fix ffmpeg profile editor * update changelog	2022-09-04 18:07:03 -05:00
Jason DoveandGitHub	9a4f772f53	fix image subtitle scaling (#949 ) * properly scale image-based subtitles for nvidia and software * fix vaapi image subtitle scaling * fix qsv image subtitle scaling * update changelog	2022-09-04 14:25:05 -05:00
Jason DoveandGitHub	d669e8114b	more scaling fixes (#948 ) * remove force_original_aspect_ratio from scale_cuda * remove force_original_aspect_ratio from scale_cuda * fix qsv scaling * fix qsv scaling on linux * fix vaapi scaling edge cases * update changelog	2022-09-03 20:28:18 -05:00
Jason DoveandGitHub	3972e3603b	add amf acceleration (#947 )	2022-09-03 10:39:54 -05:00
dependabot[bot]GitHubdependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	acc22fcb62	Bump MudBlazor from 6.0.14 to 6.0.15 (#945 ) Bumps [MudBlazor](https://github.com/MudBlazor/MudBlazor) from 6.0.14 to 6.0.15. - [Release notes](https://github.com/MudBlazor/MudBlazor/releases) - [Changelog](https://github.com/MudBlazor/MudBlazor/blob/dev/CHANGELOG.md) - [Commits](https://github.com/MudBlazor/MudBlazor/compare/v6.0.14...v6.0.15) --- updated-dependencies: - dependency-name: MudBlazor dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2022-09-01 19:41:34 -05:00
Jason DoveandGitHub	2df360d7fb	fix xmltv filler bug (#944 )	2022-08-31 20:15:25 -05:00
Jason DoveandGitHub	46331ed2c6	add preferred audio title feature (#943 ) * use consistent edit/delete icons * add preferred audio title feature * update dependencies	2022-08-30 17:04:41 -05:00
Jason Dove	3aee3b0515	fix windows build	2022-08-26 09:07:46 -05:00
Jason DoveandGitHub	72c45692b2	update dependencies (#937 )	2022-08-26 08:52:59 -05:00
Jason DoveandGitHub	8edf71ca55	downgrade libva, include vainfo in docker (#936 )	2022-08-25 16:29:20 -05:00
Jason DoveandGitHub	612b9e6524	fix scanner crash caused by invalid mtime (#934 )	2022-08-20 19:56:37 -05:00
Jason DoveandGitHub	7aff65f07b	explicitly copy all audio streams with hls direct (#933 ) * ensure audio streams are always copied with hls direct * update changelog	2022-08-18 14:23:51 -05:00
Jason Dove	5d350fcfad	update changelog for release v0.6.6-beta [no ci]	2022-08-17 20:40:50 -05:00
Jason DoveandGitHub	5546ad204c	upgrade to ffmpeg 5.1 (#931 ) * use ffmpeg 5.1 on windows * remove some debug logs * use latest ffmpeg on arm * use ffmpeg 5.1 base images * update ffmpeg health check for 5.1 * update changelog	2022-08-17 14:57:23 -05:00
Jason DoveandGitHub	d66efa0a1d	prioritize container aspect ratio over stream aspect ratio (#930 ) * prioritize container aspect ratio over stream aspect ratio * use setdar filter	2022-08-16 19:57:38 -05:00
Jason DoveandGitHub	36d3d38530	remove all use of setsar filter (#928 )	2022-08-16 12:25:59 -05:00
Jason DoveandGitHub	8e79141860	use multi-variant playlists for hls segmenter (#926 ) * use multi-variant playlists for hls segmenter * use lowercase mime type	2022-08-13 19:58:08 -05:00
Jason DoveandGitHub	9b3545f7ca	add some temporary debug logging (#925 )	2022-08-13 19:19:47 -05:00
Jason DoveandGitHub	56db20faa0	limit segmenter delay to 8s (#924 ) * always return initial hls playlist after 8 seconds * update dependencies * make fluentvalidation happy	2022-08-12 19:48:24 -05:00
Jason DoveandGitHub	b0bd4c9fed	add ogg file formats to local song library scanner (#914 ) * add ogg file formats to local song library scanner * update dependencies	2022-08-04 16:01:17 -05:00
Jason DoveandGitHub	ba079452e2	add dff and dsf to local song library scanner (#911 )	2022-08-03 11:01:13 -05:00
Jason Dove	f0f2b3da4b	update changelog for release v0.6.5-beta [no ci]	2022-08-02 07:36:45 -05:00
Jason DoveandGitHub	866049543c	fix db initializer (#907 )	2022-07-31 12:30:33 -05:00
Jason Dove	40ed4b8b0e	update changelog for release v0.6.4-beta [no ci]	2022-07-28 12:23:33 -05:00
Jason DoveandGitHub	b43d08ca67	fix repeating schedules (#901 )	2022-07-26 13:04:05 -05:00
Jason DoveandGitHub	5e7e386108	fix search result filtering for episodes and other videos (#900 )	2022-07-25 20:02:07 -05:00
Jason DoveandGitHub	4176df9940	fix nvidia capabilities for second-gen maxwell (#899 )	2022-07-24 12:23:30 -05:00
Jason DoveandGitHub	de2ef959fe	add 640x480 resolution (#898 ) * update dependencies * add 640x480 resolution	2022-07-24 08:17:27 -05:00
Jason DoveandGitHub	b53cfebac1	fix bug with unsupported aac channel layouts (#893 ) * fix bug with unsupported aac channel layouts * update dependencies	2022-07-14 10:52:25 -05:00
Jason DoveandGitHub	6895b9cc6b	fix search repo caching bug (#886 ) * add failing test * fix search repo bug * update dependencies	2022-07-10 15:32:06 -05:00
Jason Dove	c60d6e46f1	fix changelog [no ci]	2022-07-04 15:23:26 -05:00
Jason Dove	c66d190174	update changelog for release v0.6.3-beta [no ci]	2022-07-04 15:20:53 -05:00
Jason DoveandGitHub	5e8da591be	update dependencies (#883 ) * fix database initialization * update dependencies	2022-07-02 20:42:07 -05:00
Jason DoveandGitHub	9c02a6738b	fix missing trashed episodes (#881 ) * fix episodes missing from trash * cleanup	2022-06-29 15:01:49 -05:00
Jason DoveandGitHub	5ed0184bca	add minimum log level setting (#877 )	2022-06-27 10:29:04 -05:00
Jason DoveandGitHub	ae64ca4a93	fix arm images by using ls55 (#876 )	2022-06-26 17:41:39 -05:00
Jason DoveandGitHub	c47099895e	include item state in search index duplicate filter (#875 )	2022-06-26 13:34:54 -05:00
Jason Dove	a2529febba	use brew for gon	2022-06-26 08:30:32 -05:00
Jason Dove	521e0ba8b3	get a new build	2022-06-26 06:46:30 -05:00
Jason Dove	ee0efac9be	only publish docs when docs are updated	2022-06-26 06:21:27 -05:00
Jason DoveandGitHub	bfe7635489	work around github actions issue on mac (#874 )	2022-06-25 19:30:21 -05:00
Jason DoveandGitHub	aa1735f024	fix song and other video search index (#873 )	2022-06-25 18:13:39 -05:00
Jason DoveandGitHub	8deae983c7	add some startup log messages (#872 )	2022-06-25 13:03:37 -05:00
Jason DoveandGitHub	f349646703	apply plex episode metadata updates (#871 ) * update more plex episode metadata * update dependencies	2022-06-22 19:41:05 -05:00
Jason DoveandGitHub	5003e80500	maintain stream continuity after playout reset (#868 ) * maintain stream continuity after playout reset * maintain continuity after error streams	2022-06-18 21:38:25 -05:00
Jason Dove	940d9cd6b5	update changelog for release v0.6.2-beta [no ci]	2022-06-18 13:46:45 -05:00
Jason DoveandGitHub	197c166789	fix jellyfin admin id selection (#867 )	2022-06-17 18:25:22 -05:00
Jason DoveandGitHub	d114db091e	use proper nvidia accel output format for 10-bit content (#865 )	2022-06-17 11:33:10 -05:00
Jason DoveandGitHub	3204da8e43	adjust nvidia capabilities (#864 ) * adjust nvidia capabilities logic * fallback to software encoding for 10-bit h264 * cleanup * more tweaks	2022-06-17 10:50:36 -05:00
Jason DoveandGitHub	100eb14408	fix epg sorting (#863 ) * fix epg sorting * update dependencies	2022-06-17 08:44:26 -05:00
Jason DoveandGitHub	025017ace5	regularly delete old segments (#856 ) * regularly delete old segments * cleanup	2022-06-15 21:12:07 -05:00
Jason DoveandGitHub	6a690c7c10	add more filler logging (#854 )	2022-06-15 10:21:05 -05:00
Jason DoveandGitHub	dd7f77751c	detect nvidia capabilities (#853 ) * fallback to software codecs for old nvidia cards * update dependencies	2022-06-14 19:44:34 -05:00
Jason DoveandGitHub	0c13b8ef1a	force amd64 for arm32v7 sdk build layer (#843 )	2022-06-12 13:54:55 -05:00
Jason DoveandGitHub	c6ca58ab97	build arm32v7 docker image (#842 ) * build arm32v7 docker image * fix	2022-06-12 13:42:27 -05:00
Jason DoveandGitHub	0846fc1d96	update workflow dependencies (#841 )	2022-06-11 13:40:47 -05:00
Jason DoveandGitHub	e41dd68ee0	fix automatic playout building (#840 )	2022-06-11 13:11:04 -05:00
Jason DoveandGitHub	0a92996da8	fix repeating content (#838 ) * fix repeating content * update dependencies	2022-06-08 10:37:56 -05:00
Jason Dove	082bc6145c	update changelog for release v0.6.1-beta [no ci]	2022-06-03 15:05:06 -05:00
Jason DoveandGitHub	bf3f16451b	music video credits tweaks (#834 ) * fix song subtitles * always use generated subtitles * file not found/unavailable fixes	2022-06-03 14:44:52 -05:00
Jake GitHub Jason Dove	3cb37003cb	UI rewrite - ffmpeg profiles (#823 ) * ffmpeg profile functionality, sweetalert2 * add new files * cleanup controller; remove unused classes * apply formatting * cleanup core project * don't use bom * whitespace * remove generated css * remove generated js/map * Remove attempted linter fix, channels button, watermarks page. Fixed handlerror. * Changed deleted confirmation to toast. * Localized strings for language change. Modified Action icons to buttons and left default sizes. Changed Cancel to No where Yes is an option * lint Co-authored-by: Jason Dove <jason@jasondove.me>	2022-06-03 06:28:32 -05:00
Jason DoveandGitHub	9acfd2cd06	fix plex server identification (#833 )	2022-06-03 05:53:41 -05:00
dependabot[bot]GitHubdependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	3242e7ebb8	Bump HtmlSanitizer from 7.1.488 to 7.1.509 (#830 ) Bumps [HtmlSanitizer](https://github.com/mganss/HtmlSanitizer) from 7.1.488 to 7.1.509. - [Release notes](https://github.com/mganss/HtmlSanitizer/releases) - [Commits](https://github.com/mganss/HtmlSanitizer/compare/v7.1.488...v7.1.509) --- updated-dependencies: - dependency-name: HtmlSanitizer dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2022-06-02 21:21:17 -05:00
Jason DoveandGitHub	7644d628e7	generate music video credits (#832 )	2022-06-02 20:50:55 -05:00
Jason DoveandGitHub	b4f19e6de4	fix jellyfin tv paging (#831 )	2022-06-02 12:16:59 -05:00
Jason Dove	0388425763	update changelog for release v0.6.0-beta [no ci]	2022-06-01 18:01:07 -05:00
Jason DoveandGitHub	ca5d303ac7	fix qsv encoder regression and memory errors (#828 ) * fix qsv encoders; only use 64 extra hw frames * update changelog	2022-05-31 06:07:50 -05:00
Jason DoveandGitHub	18e66a92ad	add paging to media server show and collection calls (#827 ) * add paging to media server show library calls * add paging to media server season and episode library calls * formatting * add paging to media server collection calls * add paging to media server collection item calls * update changelog	2022-05-31 05:56:48 -05:00
Jason DoveandGitHub	7d0a56ab98	disable lower-power mode for qsv encoders (#826 )	2022-05-29 20:44:27 -05:00
Jason Dove	5069792d12	update dependencies	2022-05-28 20:41:54 -05:00
Jason Dove	c9789458b9	page media server movie libraries	2022-05-28 20:41:22 -05:00
Jason DoveandGitHub	777a0d09ed	hls segmenter fixes (#824 ) * fix pts warning when channel first starts streaming * rework playlist filtering	2022-05-25 21:05:55 -05:00
Jason DoveandGitHub	4e2ebcc48a	fix watermark opacity filter (#820 )	2022-05-23 10:29:04 -05:00
Jason DoveandGitHub	90fe1d7709	fix hw accel health check for qsv in vaapi docker (#818 )	2022-05-22 19:42:14 -05:00
Jason DoveandGitHub	1576dd026e	enable qsv accel for vaapi docker images (#817 )	2022-05-22 18:43:24 -05:00
Jason DoveandGitHub	ee7a64eea9	fix other video libraries (#816 ) * update depdendencies * reset other video libraries	2022-05-22 12:29:35 -05:00
Jason Dove	9742e1eef7	update changelog for release v0.5.8-beta [no ci]	2022-05-20 09:11:16 -05:00
Jason DoveandGitHub	a61c4b3472	fix a handful of scheduling edge cases (#814 )	2022-05-18 06:00:58 -05:00
Jason DoveandGitHub	ea0d43cf99	use hardware acceleration for error messages (#813 ) * logging fixes * use hardware acceleration for error messages	2022-05-18 05:44:01 -05:00
Jason DoveandGitHub	fd36ea51a7	unlock ffmpeg thread count (#812 ) * revert logging changes * unlock ffmpeg thread count	2022-05-17 21:37:44 -05:00
Jason DoveandGitHub	5213b71d62	add debug logging to track down playlist filtering issue (#811 ) * add debug logging to track down playlist filtering issue * revert work-ahead change	2022-05-17 15:18:12 -05:00
Jason DoveandGitHub	0ba3ac7f50	fix more error stream settings (#810 )	2022-05-17 11:44:12 -05:00
Jason DoveandGitHub	d960fec734	error stream needs video track timescale (#809 )	2022-05-17 10:26:46 -05:00
Jason DoveandGitHub	f272036c6f	reduce hls disk use (#808 ) * reduce hls segmenter disk use * logging improvements * update dependencies	2022-05-17 08:43:28 -05:00
Jason DoveandGitHub	9fe03b6ef3	reduce hls segmenter disk use (#806 )	2022-05-16 21:45:13 -05:00
Jason Dove	f895ab5304	fix nuget versions	2022-05-14 06:37:22 -05:00
Jason Dove	07c54ff45f	update changelog for release v0.5.7-beta [no ci]	2022-05-14 05:54:27 -05:00
Jason DoveandGitHub	6a29ce2049	update dependencies (#805 )	2022-05-13 21:16:43 -05:00
Jason DoveandGitHub	d19e95fb38	add random start point option (#804 )	2022-05-13 20:36:03 -05:00
Jason DoveandGitHub	d78daf8735	fix flood checkpoints (#803 )	2022-05-13 15:31:04 -05:00
Jason DoveandGitHub	4f6522379d	fix custom title scheduling (#802 )	2022-05-13 13:06:05 -05:00
Jason DoveandGitHub	9e0972fec0	properly ignore plex other videos libraries (#801 )	2022-05-13 12:31:34 -05:00
Jason DoveandGitHub	6d564233ed	filler scheduling fix (#800 )	2022-05-12 14:02:06 -05:00
Jason DoveandGitHub	47252b1243	read track from music video nfo metadata (#799 )	2022-05-12 12:31:40 -05:00
Jason DoveandGitHub	bd5b52922d	add option to allow watermarks over filler (#796 )	2022-05-09 17:51:11 -05:00
Jason DoveandGitHub	59c793b9be	add option to skip missing items in playouts (#795 )	2022-05-09 09:21:51 -05:00
Jason DoveandGitHub	3ad1ba01f8	add autocomplete to search bar (#791 )	2022-05-08 19:58:15 -05:00
Jason DoveandGitHub	ab10f0ed81	add `metadata_kind` to search index (#790 ) * more nfo cleanup * add metadata_kind to search index	2022-05-07 21:24:50 -05:00
Jason DoveandGitHub	44dd68fe59	nfo and memory fixes (#789 ) * partial episode nfo metadata * nfo metadata reliability fixes * use recyclable memory streams	2022-05-07 20:32:57 -05:00
Jason Dove	6326189444	update changelog for release v0.5.6-beta [no ci]	2022-05-06 12:42:57 -05:00
Jason Dove	198c693208	fix other video fallback metadata	2022-05-05 20:51:24 -05:00
Jason DoveandGitHub	1431b33a98	support movie nfo metadata in other video libraries (#788 ) * add other video nfo metadata * update docs	2022-05-05 20:38:23 -05:00
Jason DoveandGitHub	e81a8e58ea	fix error continuity (#787 ) * fix fallback filler playback * use new transcoder logic for errors * use realtime option for error streams	2022-05-05 13:31:09 -05:00
Jason DoveandGitHub	daf7114ce2	bug fixes and logging (#786 )	2022-05-05 10:04:24 -05:00
Jason DoveandGitHub	8542bc20b1	update dependencies (#785 )	2022-05-04 20:45:19 -05:00
Jason DoveandGitHub	9decb91bf7	use `aired` for music video release date (#784 )	2022-05-04 11:36:00 -05:00
Jason DoveandGitHub	fcfd579b37	fix search index validation (#782 )	2022-05-03 22:26:44 -05:00
Jason DoveandGitHub	e9be182bed	bug fixes and search tweaks (#781 ) * fix movie nfo processing * fix local movie fallback metadata * use imagesharp again * fix search edge case * add show_genre and show_tag to search index	2022-05-03 21:58:39 -05:00
Jason Dove	610e261cd7	update changelog again [no ci]	2022-05-03 10:23:57 -05:00
Jason Dove	f65818c838	update changelog for release v0.5.5-beta [no ci]	2022-05-03 10:22:10 -05:00
Jason Dove	1651d2895e	update dependencies	2022-05-03 09:45:25 -05:00
Jason Dove	b90c536dcb	try to fix quemu condition	2022-05-03 09:33:02 -05:00
Jason Dove	5c98eb3df5	more conditions	2022-05-02 22:46:22 -05:00
Jason Dove	bdff5eba75	fix conditions	2022-05-02 22:41:11 -05:00
Jason Dove	7d112eda05	fix tag	2022-05-02 22:28:54 -05:00
Jason Dove	4f16431ca0	use specific arm64v8 tags	2022-05-02 22:14:49 -05:00
Jason Dove	69b39c6940	try building arm64 docker image	2022-05-02 22:10:50 -05:00
Jason Dove	fe7181ea1d	workflow fixes	2022-05-02 21:47:37 -05:00
Jason Dove	88b287a094	use matrix for docker build workflow	2022-05-02 21:44:35 -05:00
Jason Dove	7953e3ad85	actually fix windows tests [no ci]	2022-05-02 13:41:05 -05:00
Jason DoveandGitHub	8ba6374165	music video nfo multiple artists (#780 ) * support multiple artist entries in music video nfo metadata * clean up other video and song etags	2022-05-02 12:32:15 -05:00
Jason Dove	973dd4b53d	try to fix tests on windows again [no ci]	2022-05-02 05:54:56 -05:00
Jason DoveandGitHub	6facd745ec	fix extracting embedded mov_text subtitles (#777 ) * fix extracting embedded mov_text subtitles * changelog * cleanup	2022-05-01 21:24:14 -05:00
Jason Dove	32c4c4ec8b	fix failing tests on windows [no ci]	2022-05-01 14:11:55 -05:00
Jason DoveandGitHub	ecb6ed37f0	more local metadata parsing improvements (#776 ) * extract remaining nfo xml serializers * add artist nfo tests * add music video nfo tests * add tv show nfo reader tests * custom artist nfo reader * custom music video nfo reader * custom tv show nfo reader * local metadata parsing cleanup * update changelog	2022-05-01 14:00:10 -05:00
Jason DoveandGitHub	2a8bf57930	ignore emby and jellyfin path infos with unset network path (#775 )	2022-04-30 21:48:37 -05:00
Jason DoveandGitHub	1ebc4b62e3	bug fixes (#774 ) * add custom movie metadata parsing * refactor episode nfo reader * fix emby and jellyfin bugs	2022-04-30 17:39:47 -05:00
Jason DoveandGitHub	4ae671b633	fix trashing episodes with no title (#773 )	2022-04-29 21:49:23 -05:00
Jason Dove	87aa69f4cc	update changelog for release v0.5.4-beta [no ci]	2022-04-29 17:59:12 -05:00
Jason DoveandGitHub	404ea49e35	jellyfin and emby path infos (#771 ) * start adding jellyfin path info; fix some scanning bugs * sync jellyfin libraries before scanning to ensure latest path infos * code cleanup * support emby path infos * fix periodic scanning of emby and jellyfin libraries * bug fixes	2022-04-29 15:07:17 -05:00
Jason DoveandGitHub	4ed40acfbe	rebuild corrupt search index (#770 )	2022-04-28 13:49:06 -05:00
Jason DoveandGitHub	17f540dc99	add more search fields (#769 )	2022-04-28 10:40:27 -05:00
Jason DoveandGitHub	780ebc01ee	add v2 ffmpeg profile page (#768 ) * wip * remove transcode property; use i18n * add api * use computed table headers for i18n	2022-04-28 06:56:01 -05:00
Jason DoveandGitHub	0a0fb71b94	refactor plex, emby and jellyfin television scanners (#767 ) * refactor plex television scanner * refactor emby television scanner * refactor jellyfin television scanner * update changelog	2022-04-27 22:34:25 -05:00
Jason Dove	53d6ecae8d	fix windows build	2022-04-27 14:20:14 -05:00
Jason DoveandGitHub	837f311ec0	add more search fields (#766 ) * properly index show and season state * add height, width, season_number, episode_number to search index * update docs	2022-04-27 13:58:33 -05:00
Jason DoveandGitHub	a9a89d04ea	optimize search-index rebuilding (#765 ) * update dependencies * optimize search-index rebuilding * cleanup logging	2022-04-27 12:23:37 -05:00
Rafael VieiraandGitHub	2e1073eb53	Add support to internationalization (#764 ) * client-app: Improve development documentation * client-app: add basic support to translation * client-app: fix i18n and create lang state * client-app: add language selector * client-app: add translation EN and PT-BR	2022-04-27 10:58:27 -05:00
Jason DoveandGitHub	7687278b80	health check fixes (#763 )	2022-04-26 09:38:03 -05:00
Jason DoveandGitHub	392aebd46f	refactor movie library scanners (#761 ) * catch health check cancellation * local library scanner cleanup * emby and jf library scanner cleanup * rework emby movie library scanner * refactor emby movie library scanner * refactor jellyfin movie library scanner * clear etag until after new media has been processed * refactor plex movie library scanner * update changelog	2022-04-25 20:31:12 -05:00