fix nuget versions

* more nfo cleanup

* add metadata_kind to search index

.github/workflows/artifacts.yml

@@ -190,10 +190,10 @@ 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:

.github/workflows/docker.yml

@@ -24,23 +24,38 @@ 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: arm64
+            path: 'arm64/'
+            suffix: '-arm64'
+            qemu: true
     steps:
       - name: Checkout
         uses: actions/checkout@v2
         with:
           fetch-depth: 0
 
-      - name: Set up Docker Buildx Base
-        uses: docker/setup-buildx-action@v1
-        id: builder-base
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v1
+        if: ${{ matrix.qemu == true }}
 
-      - name: Set up Docker Buildx NVIDIA
+      - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v1
-        id: builder-nvidia
-
-      - name: Set up Docker Buildx VAAPI
-        uses: docker/setup-buildx-action@v1
-        id: builder-vaapi
+        id: docker-buildx
 
       - name: Login to DockerHub
         uses: docker/login-action@v1
@@ -48,41 +63,31 @@ jobs:
           username: ${{ secrets.docker_hub_username }}
           password: ${{ secrets.docker_hub_access_token }}
 
-      - name: Build and push base
+      - name: Build and push
         uses: docker/build-push-action@v2
         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' }}
 
-      - name: Build and push nvidia
+      - name: Build and push
         uses: docker/build-push-action@v2
         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
-
-      - name: Build and push vaapi
-        uses: docker/build-push-action@v2
-        with:
-          builder: ${{ steps.builder-vaapi.outputs.name }}
-          context: .
-          file: ./docker/vaapi/Dockerfile
-          push: true
-          build-args: |
-            INFO_VERSION=${{ inputs.info_version }}-docker-vaapi
-          tags: |
-            jasongdove/ersatztv:${{ inputs.base_version }}-vaapi
-            jasongdove/ersatztv:${{ inputs.tag_version }}-vaapi
+            jasongdove/ersatztv:${{ inputs.base_version }}${{ matrix.suffix }}
+            jasongdove/ersatztv:${{ inputs.tag_version }}${{ matrix.suffix }}
+        if: ${{ matrix.name == 'arm64' }}

CHANGELOG.md

@@ -5,7 +5,65 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 ## [Unreleased]
 
-## [0.5.3-beta] - 2022-04-29
+## [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
@@ -1138,7 +1196,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Initial release to facilitate testing outside of Docker.
 
 
-[Unreleased]: https://github.com/jasongdove/ErsatzTV/compare/v0.5.4-beta...HEAD
+[Unreleased]: https://github.com/jasongdove/ErsatzTV/compare/v0.5.7-beta...HEAD
+[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

ErsatzTV.Application/Channels/Queries/GetChannelGuideHandler.cs

@@ -1,15 +1,21 @@
 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));
 }

ErsatzTV.Application/Configuration/Commands/UpdatePlayoutDaysToBuild.cs

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

ErsatzTV.Application/Configuration/Commands/UpdatePlayoutSettings.cs

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

ErsatzTV.Application/Configuration/Commands/UpdatePlayoutSettingsHandler.cs

@@ -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")

ErsatzTV.Application/Configuration/PlayoutSettingsViewModel.cs

@@ -0,0 +1,7 @@
+namespace ErsatzTV.Application.Configuration;
+
+public class PlayoutSettingsViewModel
+{
+    public int DaysToBuild { get; set; }
+    public bool SkipMissingItems { get; set; }
+}

ErsatzTV.Application/Configuration/Queries/GetPlayoutDaysToBuild.cs

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

ErsatzTV.Application/Configuration/Queries/GetPlayoutDaysToBuildHandler.cs

@@ -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));
-}

ErsatzTV.Application/Configuration/Queries/GetPlayoutSettings.cs

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

ErsatzTV.Application/Configuration/Queries/GetPlayoutSettingsHandler.cs

@@ -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)
+        };
+    }
+}

ErsatzTV.Application/ErsatzTV.Application.csproj

@@ -12,7 +12,7 @@
       <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.2.32">
         <PrivateAssets>all</PrivateAssets>
         <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       </PackageReference>

ErsatzTV.Application/Filler/Commands/CreateFillerPreset.cs

@@ -11,6 +11,7 @@ public record CreateFillerPreset(
     TimeSpan? Duration,
     int? Count,
     int? PadToNearestMinute,
+    bool AllowWatermarks,
     ProgramScheduleItemCollectionType CollectionType,
     int? CollectionId,
     int? MediaItemId,

ErsatzTV.Application/Filler/Commands/CreateFillerPresetHandler.cs

@@ -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,

ErsatzTV.Application/Filler/Commands/UpdateFillerPreset.cs

@@ -12,6 +12,7 @@ public record UpdateFillerPreset(
     TimeSpan? Duration,
     int? Count,
     int? PadToNearestMinute,
+    bool AllowWatermarks,
     ProgramScheduleItemCollectionType CollectionType,
     int? CollectionId,
     int? MediaItemId,

ErsatzTV.Application/Filler/Commands/UpdateFillerPresetHandler.cs

@@ -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;

ErsatzTV.Application/Filler/FillerPresetViewModel.cs

@@ -11,6 +11,7 @@ public record FillerPresetViewModel(
     TimeSpan? Duration,
     int? Count,
     int? PadToNearestMinute,
+    bool AllowWatermarks,
     ProgramScheduleItemCollectionType CollectionType,
     int? CollectionId,
     int? MediaItemId,

ErsatzTV.Application/Filler/Mapper.cs

@@ -13,6 +13,7 @@ internal static class Mapper
             fillerPreset.Duration,
             fillerPreset.Count,
             fillerPreset.PadToNearestMinute,
+            fillerPreset.AllowWatermarks,
             fillerPreset.CollectionType,
             fillerPreset.CollectionId,
             fillerPreset.MediaItemId,

ErsatzTV.Application/MediaSources/Commands/ScanLocalLibraryHandler.cs

@@ -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;
@@ -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
             {

ErsatzTV.Application/ProgramSchedules/Commands/CreateProgramSchedule.cs

@@ -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>>;

ErsatzTV.Application/ProgramSchedules/Commands/CreateProgramScheduleHandler.cs

@@ -44,7 +44,8 @@ public class CreateProgramScheduleHandler :
                     Name = name,
                     KeepMultiPartEpisodesTogether = keepMultiPartEpisodesTogether,
                     TreatCollectionsAsShows = keepMultiPartEpisodesTogether && request.TreatCollectionsAsShows,
-                    ShuffleScheduleItems = request.ShuffleScheduleItems
+                    ShuffleScheduleItems = request.ShuffleScheduleItems,
+                    RandomStartPoint = request.RandomStartPoint
                 };
             });
 

ErsatzTV.Application/ProgramSchedules/Commands/UpdateProgramSchedule.cs

@@ -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>>;

ErsatzTV.Application/ProgramSchedules/Commands/UpdateProgramScheduleHandler.cs

@@ -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();
 

ErsatzTV.Application/ProgramSchedules/Mapper.cs

@@ -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

ErsatzTV.Application/ProgramSchedules/ProgramScheduleViewModel.cs

@@ -5,4 +5,5 @@ public record ProgramScheduleViewModel(
     string Name,
     bool KeepMultiPartEpisodesTogether,
     bool TreatCollectionsAsShows,
-    bool ShuffleScheduleItems);
+    bool ShuffleScheduleItems,
+    bool RandomStartPoint);

ErsatzTV.Application/ProgramSchedules/Queries/GetAllProgramSchedulesHandler.cs

@@ -22,7 +22,8 @@ public class GetAllProgramSchedulesHandler : IRequestHandler<GetAllProgramSchedu
                     ps.Name,
                     ps.KeepMultiPartEpisodesTogether,
                     ps.TreatCollectionsAsShows,
-                    ps.ShuffleScheduleItems))
+                    ps.ShuffleScheduleItems,
+                    ps.RandomStartPoint))
             .ToListAsync(cancellationToken);
     }
 }

ErsatzTV.Application/Search/Queries/QuerySearchTargets.cs

@@ -0,0 +1,3 @@
+namespace ErsatzTV.Application.Search;
+
+public record QuerySearchTargets : IRequest<List<SearchTargetViewModel>>;

ErsatzTV.Application/Search/Queries/QuerySearchTargetsHandler.cs

@@ -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;
+    }
+}

ErsatzTV.Application/Search/SearchTargetResultViewModel.cs

@@ -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
+}

ErsatzTV.Application/Streaming/HlsSessionWorker.cs

@@ -276,7 +276,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;

ErsatzTV.Application/Streaming/Queries/GetPlayoutItemProcessByChannelNumberHandler.cs

@@ -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,6 +25,7 @@ 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 IPlexPathReplacementService _plexPathReplacementService;
     private readonly ISongVideoGenerator _songVideoGenerator;
@@ -39,7 +41,8 @@ public class GetPlayoutItemProcessByChannelNumberHandler : FFmpegProcessHandler<
         IMediaCollectionRepository mediaCollectionRepository,
         ITelevisionRepository televisionRepository,
         IArtistRepository artistRepository,
-        ISongVideoGenerator songVideoGenerator)
+        ISongVideoGenerator songVideoGenerator,
+        ILogger<GetPlayoutItemProcessByChannelNumberHandler> logger)
         : base(dbContextFactory)
     {
         _ffmpegProcessService = ffmpegProcessService;
@@ -51,6 +54,7 @@ public class GetPlayoutItemProcessByChannelNumberHandler : FFmpegProcessHandler<
         _televisionRepository = televisionRepository;
         _artistRepository = artistRepository;
         _songVideoGenerator = songVideoGenerator;
+        _logger = logger;
     }
 
     protected override async Task<Either<BaseError, PlayoutItemProcessModel>> GetProcess(
@@ -178,7 +182,8 @@ public class GetPlayoutItemProcessByChannelNumberHandler : FFmpegProcessHandler<
                 playoutItemWithPath.PlayoutItem.InPoint,
                 playoutItemWithPath.PlayoutItem.OutPoint,
                 request.PtsOffset,
-                request.TargetFramerate);
+                request.TargetFramerate,
+                playoutItemWithPath.PlayoutItem.DisableWatermarks);
 
             var result = new PlayoutItemProcessModel(
                 process,
@@ -201,6 +206,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:
@@ -244,16 +255,16 @@ public class GetPlayoutItemProcessByChannelNumberHandler : FFmpegProcessHandler<
         List<Subtitle> allSubtitles = playoutItemWithPath.PlayoutItem.MediaItem switch
         {
             Episode episode => Optional(episode.EpisodeMetadata).Flatten().HeadOrNone()
-                .Map(mm => mm.Subtitles)
+                .Map(mm => mm.Subtitles ?? new List<Subtitle>())
                 .IfNone(new List<Subtitle>()),
             Movie movie => Optional(movie.MovieMetadata).Flatten().HeadOrNone()
-                .Map(mm => mm.Subtitles)
+                .Map(mm => mm.Subtitles ?? new List<Subtitle>())
                 .IfNone(new List<Subtitle>()),
             MusicVideo musicVideo => Optional(musicVideo.MusicVideoMetadata).Flatten().HeadOrNone()
-                .Map(mm => mm.Subtitles)
+                .Map(mm => mm.Subtitles ?? new List<Subtitle>())
                 .IfNone(new List<Subtitle>()),
             OtherVideo otherVideo => Optional(otherVideo.OtherVideoMetadata).Flatten().HeadOrNone()
-                .Map(mm => mm.Subtitles)
+                .Map(mm => mm.Subtitles ?? new List<Subtitle>())
                 .IfNone(new List<Subtitle>()),
             _ => new List<Subtitle>()
         };
@@ -361,7 +372,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);

ErsatzTV.Application/Subtitles/Commands/ExtractEmbeddedSubtitlesHandler.cs

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

ErsatzTV.Core.Tests/ErsatzTV.Core.Tests.csproj

@@ -10,18 +10,18 @@
       <PackageReference Include="Bugsnag" Version="3.0.1" />
       <PackageReference Include="CliWrap" Version="3.4.4" />
       <PackageReference Include="FluentAssertions" Version="6.6.0" />
-      <PackageReference Include="LanguageExt.Core" Version="4.0.4" />
+      <PackageReference Include="LanguageExt.Core" Version="4.1.0" />
       <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="6.0.1" />
       <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0" />
       <PackageReference Include="Microsoft.Extensions.Logging" Version="6.0.0" />
       <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.1" />
       <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="6.0.0" />
-      <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
-      <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.1.46">
+      <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
+      <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.2.32">
         <PrivateAssets>all</PrivateAssets>
         <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       </PackageReference>
-      <PackageReference Include="Moq" Version="4.17.2" />
+      <PackageReference Include="Moq" Version="4.18.0" />
       <PackageReference Include="NUnit" Version="3.13.3" />
       <PackageReference Include="NUnit3TestAdapter" Version="4.2.1" />
       <PackageReference Include="Serilog" Version="2.11.0" />
@@ -37,12 +37,21 @@
       <Content Include="Resources\ErsatzTV.png">
         <CopyToOutputDirectory>Always</CopyToOutputDirectory>
       </Content>
+      <Content Include="Resources\Nfo\ArtistInvalidCharacters1.nfo">
+        <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+      </Content>
+      <Content Include="Resources\Nfo\ArtistInvalidCharacters2.nfo">
+        <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+      </Content>
       <Content Include="Resources\test.sup">
         <CopyToOutputDirectory>Always</CopyToOutputDirectory>
       </Content>
       <Content Include="Resources\test.srt">
         <CopyToOutputDirectory>Always</CopyToOutputDirectory>
       </Content>
+      <Content Include="Resources\Nfo\EpisodeInvalidCharacters.nfo">
+        <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+      </Content>
     </ItemGroup>
 
 </Project>

ErsatzTV.Core.Tests/FFmpeg/TranscodingTests.cs

@@ -301,6 +301,7 @@ public class TranscodingTests
             oldService,
             new FFmpegPlaybackSettingsCalculator(),
             new FakeStreamSelector(),
+            new Mock<ITempFilePool>().Object,
             LoggerFactory.CreateLogger<FFmpegLibraryProcessService>());
 
         var v = new MediaVersion
@@ -488,7 +489,8 @@ public class TranscodingTests
             TimeSpan.Zero,
             TimeSpan.FromSeconds(5),
             0,
-            None);
+            None,
+            false);
 
         // Console.WriteLine($"ffmpeg arguments {string.Join(" ", process.StartInfo.ArgumentList)}");
 

ErsatzTV.Core.Tests/Metadata/Nfo/ArtistNfoReaderTests.cs

@@ -0,0 +1,216 @@
+using System.Text;
+using Bugsnag;
+using ErsatzTV.Core.Metadata.Nfo;
+using FluentAssertions;
+using Microsoft.Extensions.Logging;
+using Microsoft.IO;
+using Moq;
+using NUnit.Framework;
+using Serilog;
+
+namespace ErsatzTV.Core.Tests.Metadata.Nfo;
+
+[TestFixture]
+public class ArtistNfoReaderTests
+{
+    [SetUp]
+    public void SetUp() => _artistNfoReader = new ArtistNfoReader(
+        new RecyclableMemoryStreamManager(),
+        new Mock<IClient>().Object,
+        _logger);
+
+    private readonly ILogger<ArtistNfoReader> _logger;
+
+    public ArtistNfoReaderTests()
+    {
+        Log.Logger = new LoggerConfiguration()
+            .MinimumLevel.Debug()
+            .WriteTo.Console()
+            .CreateLogger();
+
+        ILoggerFactory loggerFactory = new LoggerFactory().AddSerilog(Log.Logger);
+
+        _logger = loggerFactory.CreateLogger<ArtistNfoReader>();
+    }
+
+    private ArtistNfoReader _artistNfoReader;
+
+    [Test]
+    public async Task ParsingNfo_Should_Return_Error()
+    {
+        await using var stream =
+            new MemoryStream(Encoding.UTF8.GetBytes(@"https://www.themoviedb.org/movie/11-star-wars"));
+
+        Either<BaseError, ArtistNfo> result = await _artistNfoReader.Read(stream);
+
+        result.IsLeft.Should().BeTrue();
+    }
+
+    [Test]
+    public async Task MetadataNfo_Should_Return_Nfo()
+    {
+        await using var stream = new MemoryStream(Encoding.UTF8.GetBytes(@"<artist></artist>"));
+
+        Either<BaseError, ArtistNfo> result = await _artistNfoReader.Read(stream);
+
+        result.IsRight.Should().BeTrue();
+    }
+
+    [Test]
+    public async Task CombinationNfo_Should_Return_Nfo()
+    {
+        await using var stream = new MemoryStream(
+            Encoding.UTF8.GetBytes(
+                @"<artist></artist>
+https://www.themoviedb.org/movie/11-star-wars"));
+
+        Either<BaseError, ArtistNfo> result = await _artistNfoReader.Read(stream);
+
+        result.IsRight.Should().BeTrue();
+    }
+
+    [Test]
+    public async Task FullSample_Should_Return_Nfo()
+    {
+        await using var stream = new MemoryStream(
+            Encoding.UTF8.GetBytes(
+                NormalizeLineEndingsLF(
+                    @"<?xml version=""1.0"" encoding=""UTF-8"" standalone=""yes"" ?>
+<artist>
+    <name>Billy Joel</name>
+    <musicBrainzArtistID>64b94289-9474-4d43-8c93-918ccc1920d1</musicBrainzArtistID>
+    <sortname>Joel, Billy</sortname>
+    <type>Person</type>
+    <gender>Male</gender>
+    <disambiguation></disambiguation>
+    <genre>Pop/Rock</genre>
+    <style>Album Rock</style>
+    <style>Contemporary Pop/Rock</style>
+    <style>Singer/Songwriter</style>
+    <style>Soft Rock</style>
+    <style>Keyboard</style>
+    <mood>Amiable/Good-Natured</mood>
+    <mood>Autumnal</mood>
+    <mood>Nostalgic</mood>
+    <mood>Refined</mood>
+    <mood>Acerbic</mood>
+    <mood>Bittersweet</mood>
+    <mood>Brash</mood>
+    <mood>Cynical/Sarcastic</mood>
+    <mood>Earnest</mood>
+    <yearsactive>1960s - 2010s</yearsactive>
+    <born>1949-05-09</born>
+    <formed>1964</formed>
+    <biography>William Martin &quot;Billy&quot; Joel (born May 9, 1949, New York, USA) is an American pianist, singer-songwriter, and composer. Since releasing his first hit song, &quot;Piano Man&quot;, in 1973, Joel has become the sixth-best-selling recording artist and the third-best-selling solo artist in the United States, according to the RIAA. His compilation album Greatest Hits Vol. 1 &amp; 2 is the third-best-selling album in the United States by discs shipped.&#x0A;Joel had Top 40 hits in the 1970s, 1980s, and 1990s, achieving 33 Top 40 hits in the United States, all of which he wrote himself. He is also a six-time Grammy Award winner, a 23-time Grammy nominee and one of the world&apos;s best-selling artists of all time, having sold over 150 million records worldwide. He was inducted into the Songwriter&apos;s Hall of Fame (1992), the Rock and Roll Hall of Fame (1999), and the Long Island Music Hall of Fame (2006). In 2008, Billboard magazine released a list of the Hot 100 All-Time Top Artists to celebrate the US singles chart&apos;s 50th anniversary, with Billy Joel positioned at No. 23. With the exception of the 2007 songs &quot;All My Life&quot; and &quot;Christmas in Fallujah&quot;, Joel stopped writing and recording popular music after 1993&apos;s River of Dreams, but he continued to tour extensively until 2010. Joel was born in the Bronx, May 9, 1949 and raised in Hicksville, New York in a Levitt home. His father, Howard (born Helmuth), was born in Germany, the son of German merchant and manufacturer Karl Amson Joel, who, after the advent of the Nazi regime, emigrated to Switzerland and later to the United States. Billy Joel&apos;s mother, Rosalind Nyman, was born in England to Philip and Rebecca Nyman. Both of Joel&apos;s parents were Jewish. They divorced in 1960, and his father moved to Vienna, Austria. Billy has a sister, Judith Joel, and a half-brother, Alexander Joel, who is an acclaimed classical conductor in Europe and currently chief musical director of the Staatstheater Braunschweig.&#x0A;Joel&apos;s father was an accomplished classical pianist. Billy reluctantly began piano lessons at an early age, at his mother&apos;s insistence; his teachers included the noted American pianist Morton Estrin and musician/songwriter Timothy Ford. His interest in music, rather than sports, was a source of teasing and bullying in his early years. (He has said in interviews that his piano instructor also taught ballet. Her name was Frances Neiman, and she was a Juilliard trained musician. She gave both classical piano and ballet lessons in the studio attached to the rear of her house, leading neighborhood bullies to mistakenly assume that he was learning to dance.) As a teenager, Joel took up boxing so that he would be able to defend himself. He boxed successfully on the amateur Golden Gloves circuit for a short time, winning twenty-two bouts, but abandoned the sport shortly after breaking his nose in his twenty-fourth boxing match.&#x0A;Joel attended Hicksville High School in 1967, but he did not graduate with his class. He had been helping his single mother make ends meet by playing at a piano bar, which interfered with his school attendance. At the end of his senior year, Joel did not have enough credits to graduate. Rather than attend summer school to earn his diploma, however, Joel decided to immediately begin a career in music. Joel recounted, &quot;I told them, &apos;To hell with it. If I&apos;m not going to Columbia University, I&apos;m going to Columbia Records, and you don&apos;t need a high school diploma over there&apos;.&quot; Columbia did, in fact, become the label that eventually signed him. In 1992, he submitted essays to the school board and was awarded his diploma at Hicksville High&apos;s annual graduation ceremony, 25 years after he had left.</biography>
+    <died></died>
+    <disbanded></disbanded>
+    <thumb spoof="""" cache="""" aspect=""thumb"" preview=""https://assets.fanart.tv/preview/music/64b94289-9474-4d43-8c93-918ccc1920d1/artistthumb/joel-billy-541603848114c.jpg"">https://assets.fanart.tv/fanart/music/64b94289-9474-4d43-8c93-918ccc1920d1/artistthumb/joel-billy-541603848114c.jpg</thumb>
+    <thumb spoof="""" cache="""" aspect=""thumb"" preview=""https://www.theaudiodb.com/images/media/artist/thumb/ttsxwr1425765041.jpg/preview"">https://www.theaudiodb.com/images/media/artist/thumb/ttsxwr1425765041.jpg</thumb>
+    <thumb spoof="""" cache="""" aspect=""thumb"" preview=""https://rovimusic.rovicorp.com/image.jpg?c=73pC-Gp0OovlmiQL7Wp5Yd_M69_UI9rrJSVvWL2-yAg=&amp;f=2"">https://rovimusic.rovicorp.com/image.jpg?c=73pC-Gp0OovlmiQL7Wp5Yd_M69_UI9rrJSVvWL2-yAg=&amp;f=0</thumb>
+    <thumb spoof="""" cache="""" aspect=""thumb"" preview=""https://img.discogs.com/J3bqAiLmdr2gXsetNgSQF2W-f6M=/150x150/smart/filters:strip_icc():format(jpeg):mode_rgb():quality(40)/discogs-images/A-137418-1143052539.jpeg.jpg"">https://img.discogs.com/u7cfC3lZo9JGRdukSttJTZKr9Go=/350x255/smart/filters:strip_icc():format(jpeg):mode_rgb():quality(90)/discogs-images/A-137418-1143052539.jpeg.jpg</thumb>
+    <thumb spoof="""" cache="""" aspect=""clearlogo"" preview=""https://www.theaudiodb.com/images/media/artist/logo/tvqpys1367246337.png/preview"">https://www.theaudiodb.com/images/media/artist/logo/tvqpys1367246337.png</thumb>
+    <thumb spoof="""" cache="""" aspect=""clearart"" preview=""https://www.theaudiodb.com/images/media/artist/clearart/yqpsuq1523892204.png/preview"">https://www.theaudiodb.com/images/media/artist/clearart/yqpsuq1523892204.png</thumb>
+    <thumb spoof="""" cache="""" aspect=""landscape"" preview=""https://www.theaudiodb.com/images/media/artist/widethumb/tywpqx1530815867.jpg/preview"">https://www.theaudiodb.com/images/media/artist/widethumb/tywpqx1530815867.jpg</thumb>
+    <thumb spoof="""" cache="""" aspect=""banner"" preview=""https://assets.fanart.tv/preview/music/64b94289-9474-4d43-8c93-918ccc1920d1/musicbanner/joel-billy-5914e7759bfcd.jpg"">https://assets.fanart.tv/fanart/music/64b94289-9474-4d43-8c93-918ccc1920d1/musicbanner/joel-billy-5914e7759bfcd.jpg</thumb>
+    <thumb spoof="""" cache="""" aspect=""clearlogo"" preview=""https://assets.fanart.tv/preview/music/64b94289-9474-4d43-8c93-918ccc1920d1/hdmusiclogo/joel-billy-550b259604412.png"">https://assets.fanart.tv/fanart/music/64b94289-9474-4d43-8c93-918ccc1920d1/hdmusiclogo/joel-billy-550b259604412.png</thumb>
+    <thumb spoof="""" cache="""" aspect=""fanart"" preview=""https://assets.fanart.tv/preview/music/64b94289-9474-4d43-8c93-918ccc1920d1/artistbackground/joel-billy-4fc0c2dad9ab7.jpg"">https://assets.fanart.tv/fanart/music/64b94289-9474-4d43-8c93-918ccc1920d1/artistbackground/joel-billy-4fc0c2dad9ab7.jpg</thumb>
+    <thumb spoof="""" cache="""" aspect=""fanart"" preview=""https://www.theaudiodb.com/images/media/artist/fanart/uwqtup1521206367.jpg/preview"">https://www.theaudiodb.com/images/media/artist/fanart/uwqtup1521206367.jpg</thumb>
+    <path>F:\Music\ArtistInfoKodi\Billy Joel</path>
+</artist>")));
+
+        Either<BaseError, ArtistNfo> result = await _artistNfoReader.Read(stream);
+
+        result.IsRight.Should().BeTrue();
+
+        foreach (ArtistNfo nfo in result.RightToSeq())
+        {
+            nfo.Name.Should().Be("Billy Joel");
+            nfo.Disambiguation.Should().BeNullOrEmpty();
+            nfo.Genres.Should().BeEquivalentTo(new List<string> { "Pop/Rock" });
+            nfo.Styles.Should().BeEquivalentTo(
+                new List<string>
+                {
+                    "Album Rock",
+                    "Contemporary Pop/Rock",
+                    "Singer/Songwriter",
+                    "Soft Rock",
+                    "Keyboard"
+                });
+            nfo.Moods.Should().BeEquivalentTo(
+                new List<string>
+                {
+                    "Amiable/Good-Natured",
+                    "Autumnal",
+                    "Nostalgic",
+                    "Refined",
+                    "Acerbic",
+                    "Bittersweet",
+                    "Brash",
+                    "Cynical/Sarcastic",
+                    "Earnest"
+                });
+            nfo.Biography.Should().Be(
+                NormalizeLineEndingsLF(
+                    @"William Martin ""Billy"" Joel (born May 9, 1949, New York, USA) is an American pianist, singer-songwriter, and composer. Since releasing his first hit song, ""Piano Man"", in 1973, Joel has become the sixth-best-selling recording artist and the third-best-selling solo artist in the United States, according to the RIAA. His compilation album Greatest Hits Vol. 1 & 2 is the third-best-selling album in the United States by discs shipped.
+Joel had Top 40 hits in the 1970s, 1980s, and 1990s, achieving 33 Top 40 hits in the United States, all of which he wrote himself. He is also a six-time Grammy Award winner, a 23-time Grammy nominee and one of the world's best-selling artists of all time, having sold over 150 million records worldwide. He was inducted into the Songwriter's Hall of Fame (1992), the Rock and Roll Hall of Fame (1999), and the Long Island Music Hall of Fame (2006). In 2008, Billboard magazine released a list of the Hot 100 All-Time Top Artists to celebrate the US singles chart's 50th anniversary, with Billy Joel positioned at No. 23. With the exception of the 2007 songs ""All My Life"" and ""Christmas in Fallujah"", Joel stopped writing and recording popular music after 1993's River of Dreams, but he continued to tour extensively until 2010. Joel was born in the Bronx, May 9, 1949 and raised in Hicksville, New York in a Levitt home. His father, Howard (born Helmuth), was born in Germany, the son of German merchant and manufacturer Karl Amson Joel, who, after the advent of the Nazi regime, emigrated to Switzerland and later to the United States. Billy Joel's mother, Rosalind Nyman, was born in England to Philip and Rebecca Nyman. Both of Joel's parents were Jewish. They divorced in 1960, and his father moved to Vienna, Austria. Billy has a sister, Judith Joel, and a half-brother, Alexander Joel, who is an acclaimed classical conductor in Europe and currently chief musical director of the Staatstheater Braunschweig.
+Joel's father was an accomplished classical pianist. Billy reluctantly began piano lessons at an early age, at his mother's insistence; his teachers included the noted American pianist Morton Estrin and musician/songwriter Timothy Ford. His interest in music, rather than sports, was a source of teasing and bullying in his early years. (He has said in interviews that his piano instructor also taught ballet. Her name was Frances Neiman, and she was a Juilliard trained musician. She gave both classical piano and ballet lessons in the studio attached to the rear of her house, leading neighborhood bullies to mistakenly assume that he was learning to dance.) As a teenager, Joel took up boxing so that he would be able to defend himself. He boxed successfully on the amateur Golden Gloves circuit for a short time, winning twenty-two bouts, but abandoned the sport shortly after breaking his nose in his twenty-fourth boxing match.
+Joel attended Hicksville High School in 1967, but he did not graduate with his class. He had been helping his single mother make ends meet by playing at a piano bar, which interfered with his school attendance. At the end of his senior year, Joel did not have enough credits to graduate. Rather than attend summer school to earn his diploma, however, Joel decided to immediately begin a career in music. Joel recounted, ""I told them, 'To hell with it. If I'm not going to Columbia University, I'm going to Columbia Records, and you don't need a high school diploma over there'."" Columbia did, in fact, become the label that eventually signed him. In 1992, he submitted essays to the school board and was awarded his diploma at Hicksville High's annual graduation ceremony, 25 years after he had left."));
+        }
+    }
+
+    [Test]
+    public async Task MetadataNfo_With_Disambiguation_Should_Return_Nfo()
+    {
+        await using var stream = new MemoryStream(
+            Encoding.UTF8.GetBytes(@"<artist><disambiguation>Test Disambiguation</disambiguation></artist>"));
+
+        Either<BaseError, ArtistNfo> result = await _artistNfoReader.Read(stream);
+
+        result.IsRight.Should().BeTrue();
+        foreach (ArtistNfo nfo in result.RightToSeq())
+        {
+            nfo.Disambiguation.Should().Be("Test Disambiguation");
+        }
+    }
+
+    [Test]
+    public async Task Invalid_Characters_End_Should_Abort_And_Return_Nfo()
+    {
+        string sourceFile = Path.Combine(
+            TestContext.CurrentContext.TestDirectory,
+            "Resources",
+            "Nfo",
+            "ArtistInvalidCharacters1.nfo");
+        Either<BaseError, ArtistNfo> result = await _artistNfoReader.ReadFromFile(sourceFile);
+
+        result.IsRight.Should().BeTrue();
+        foreach (ArtistNfo nfo in result.RightToSeq())
+        {
+            nfo.Name.Should().Be("Test Name");
+        }
+    }
+
+    [Test]
+    public async Task Invalid_Characters_Middle_Should_Continue_And_Return_Nfo()
+    {
+        string sourceFile = Path.Combine(
+            TestContext.CurrentContext.TestDirectory,
+            "Resources",
+            "Nfo",
+            "ArtistInvalidCharacters2.nfo");
+        Either<BaseError, ArtistNfo> result = await _artistNfoReader.ReadFromFile(sourceFile);
+
+        result.IsRight.Should().BeTrue();
+        foreach (ArtistNfo nfo in result.RightToSeq())
+        {
+            nfo.Name.Should().Be("Test Name");
+            nfo.Moods.Should().BeEquivalentTo(new List<string> { "Test Mood" });
+            nfo.Styles.Count.Should().Be(1);
+        }
+    }
+
+    private static string NormalizeLineEndingsLF(string str) =>
+        str
+            .Replace("\r\n", "\n")
+            .Replace("\r", "\n");
+}

ErsatzTV.Core.Tests/Metadata/Nfo/EpisodeNfoReaderTests.cs

@@ -1,17 +1,43 @@
 using System.Text;
+using Bugsnag;
 using ErsatzTV.Core.Metadata.Nfo;
 using FluentAssertions;
+using Microsoft.Extensions.Logging;
+using Microsoft.IO;
+using Moq;
 using NUnit.Framework;
+using Serilog;
 
 namespace ErsatzTV.Core.Tests.Metadata.Nfo;
 
 [TestFixture]
 public class EpisodeNfoReaderTests
 {
+    [SetUp]
+    public void SetUp() => _episodeNfoReader = new EpisodeNfoReader(
+        new RecyclableMemoryStreamManager(),
+        new Mock<IClient>().Object,
+        _logger);
+
+    private readonly ILogger<EpisodeNfoReader> _logger;
+
+    public EpisodeNfoReaderTests()
+    {
+        Log.Logger = new LoggerConfiguration()
+            .MinimumLevel.Debug()
+            .WriteTo.Console()
+            .CreateLogger();
+
+        ILoggerFactory loggerFactory = new LoggerFactory().AddSerilog(Log.Logger);
+
+        _logger = loggerFactory.CreateLogger<EpisodeNfoReader>();
+    }
+
+    private EpisodeNfoReader _episodeNfoReader;
+
     [Test]
     public async Task One()
     {
-        var reader = new EpisodeNfoReader();
         var stream = new MemoryStream(
             Encoding.UTF8.GetBytes(
                 @"<?xml version=""1.0"" encoding=""UTF-8"" standalone=""yes""?>
@@ -19,15 +45,18 @@ public class EpisodeNfoReaderTests
 <episodedetails>
 </episodedetails>"));
 
-        List<TvShowEpisodeNfo> result = await reader.Read(stream);
+        Either<BaseError, List<TvShowEpisodeNfo>> result = await _episodeNfoReader.Read(stream);
 
-        result.Count.Should().Be(1);
+        result.IsRight.Should().BeTrue();
+        foreach (List<TvShowEpisodeNfo> list in result.RightToSeq())
+        {
+            list.Count.Should().Be(1);
+        }
     }
 
     [Test]
     public async Task Two()
     {
-        var reader = new EpisodeNfoReader();
         var stream = new MemoryStream(
             Encoding.UTF8.GetBytes(
                 @"<?xml version=""1.0"" encoding=""UTF-8"" standalone=""yes""?>
@@ -45,19 +74,22 @@ public class EpisodeNfoReaderTests
   <season>1</season>
 </episodedetails>"));
 
-        List<TvShowEpisodeNfo> result = await reader.Read(stream);
+        Either<BaseError, List<TvShowEpisodeNfo>> result = await _episodeNfoReader.Read(stream);
 
-        result.Count.Should().Be(2);
-        result.All(nfo => nfo.ShowTitle == "show").Should().BeTrue();
-        result.All(nfo => nfo.Season == 1).Should().BeTrue();
-        result.Count(nfo => nfo.Title == "episode-one" && nfo.Episode == 1).Should().Be(1);
-        result.Count(nfo => nfo.Title == "episode-two" && nfo.Episode == 2).Should().Be(1);
+        result.IsRight.Should().BeTrue();
+        foreach (List<TvShowEpisodeNfo> list in result.RightToSeq())
+        {
+            list.Count.Should().Be(2);
+            list.All(nfo => nfo.ShowTitle == "show").Should().BeTrue();
+            list.All(nfo => nfo.Season == 1).Should().BeTrue();
+            list.Count(nfo => nfo.Title == "episode-one" && nfo.Episode == 1).Should().Be(1);
+            list.Count(nfo => nfo.Title == "episode-two" && nfo.Episode == 2).Should().Be(1);
+        }
     }
 
     [Test]
     public async Task UniqueIds()
     {
-        var reader = new EpisodeNfoReader();
         var stream = new MemoryStream(
             Encoding.UTF8.GetBytes(
                 @"<?xml version=""1.0"" encoding=""UTF-8"" standalone=""yes""?>
@@ -67,18 +99,21 @@ public class EpisodeNfoReaderTests
   <uniqueid default=""false"" type=""imdb"">tt54321</uniqueid>
 </episodedetails>"));
 
-        List<TvShowEpisodeNfo> result = await reader.Read(stream);
+        Either<BaseError, List<TvShowEpisodeNfo>> result = await _episodeNfoReader.Read(stream);
 
-        result.Count.Should().Be(1);
-        result[0].UniqueIds.Count.Should().Be(2);
-        result[0].UniqueIds.Count(id => id.Default && id.Type == "tvdb" && id.Guid == "12345").Should().Be(1);
-        result[0].UniqueIds.Count(id => !id.Default && id.Type == "imdb" && id.Guid == "tt54321").Should().Be(1);
+        result.IsRight.Should().BeTrue();
+        foreach (List<TvShowEpisodeNfo> list in result.RightToSeq())
+        {
+            list.Count.Should().Be(1);
+            list[0].UniqueIds.Count.Should().Be(2);
+            list[0].UniqueIds.Count(id => id.Default && id.Type == "tvdb" && id.Guid == "12345").Should().Be(1);
+            list[0].UniqueIds.Count(id => !id.Default && id.Type == "imdb" && id.Guid == "tt54321").Should().Be(1);
+        }
     }
 
     [Test]
     public async Task No_ContentRating()
     {
-        var reader = new EpisodeNfoReader();
         var stream = new MemoryStream(
             Encoding.UTF8.GetBytes(
                 @"<?xml version=""1.0"" encoding=""UTF-8"" standalone=""yes""?>
@@ -87,16 +122,19 @@ public class EpisodeNfoReaderTests
   <mpaa/>
 </episodedetails>"));
 
-        List<TvShowEpisodeNfo> result = await reader.Read(stream);
+        Either<BaseError, List<TvShowEpisodeNfo>> result = await _episodeNfoReader.Read(stream);
 
-        result.Count.Should().Be(1);
-        result[0].ContentRating.Should().BeNullOrEmpty();
+        result.IsRight.Should().BeTrue();
+        foreach (List<TvShowEpisodeNfo> list in result.RightToSeq())
+        {
+            list.Count.Should().Be(1);
+            list[0].ContentRating.Should().BeNullOrEmpty();
+        }
     }
 
     [Test]
     public async Task ContentRating()
     {
-        var reader = new EpisodeNfoReader();
         var stream = new MemoryStream(
             Encoding.UTF8.GetBytes(
                 @"<?xml version=""1.0"" encoding=""UTF-8"" standalone=""yes""?>
@@ -108,17 +146,20 @@ public class EpisodeNfoReaderTests
   <mpaa>US:Something / US:SomethingElse</mpaa>
 </episodedetails>"));
 
-        List<TvShowEpisodeNfo> result = await reader.Read(stream);
+        Either<BaseError, List<TvShowEpisodeNfo>> result = await _episodeNfoReader.Read(stream);
 
-        result.Count.Should().Be(2);
-        result.Count(nfo => nfo.ContentRating == "US:Something").Should().Be(1);
-        result.Count(nfo => nfo.ContentRating == "US:Something / US:SomethingElse").Should().Be(1);
+        result.IsRight.Should().BeTrue();
+        foreach (List<TvShowEpisodeNfo> list in result.RightToSeq())
+        {
+            list.Count.Should().Be(2);
+            list.Count(nfo => nfo.ContentRating == "US:Something").Should().Be(1);
+            list.Count(nfo => nfo.ContentRating == "US:Something / US:SomethingElse").Should().Be(1);
+        }
     }
 
     [Test]
     public async Task No_Plot()
     {
-        var reader = new EpisodeNfoReader();
         var stream = new MemoryStream(
             Encoding.UTF8.GetBytes(
                 @"<?xml version=""1.0"" encoding=""UTF-8"" standalone=""yes""?>
@@ -127,16 +168,19 @@ public class EpisodeNfoReaderTests
   <plot/>
 </episodedetails>"));
 
-        List<TvShowEpisodeNfo> result = await reader.Read(stream);
+        Either<BaseError, List<TvShowEpisodeNfo>> result = await _episodeNfoReader.Read(stream);
 
-        result.Count.Should().Be(1);
-        result[0].Plot.Should().BeNullOrEmpty();
+        result.IsRight.Should().BeTrue();
+        foreach (List<TvShowEpisodeNfo> list in result.RightToSeq())
+        {
+            list.Count.Should().Be(1);
+            list[0].Plot.Should().BeNullOrEmpty();
+        }
     }
 
     [Test]
     public async Task Plot()
     {
-        var reader = new EpisodeNfoReader();
         var stream = new MemoryStream(
             Encoding.UTF8.GetBytes(
                 @"<?xml version=""1.0"" encoding=""UTF-8"" standalone=""yes""?>
@@ -145,16 +189,19 @@ public class EpisodeNfoReaderTests
   <plot>Some Plot</plot>
 </episodedetails>"));
 
-        List<TvShowEpisodeNfo> result = await reader.Read(stream);
+        Either<BaseError, List<TvShowEpisodeNfo>> result = await _episodeNfoReader.Read(stream);
 
-        result.Count.Should().Be(1);
-        result[0].Plot.Should().Be("Some Plot");
+        result.IsRight.Should().BeTrue();
+        foreach (List<TvShowEpisodeNfo> list in result.RightToSeq())
+        {
+            list.Count.Should().Be(1);
+            list[0].Plot.Should().Be("Some Plot");
+        }
     }
 
     [Test]
     public async Task Actors()
     {
-        var reader = new EpisodeNfoReader();
         var stream = new MemoryStream(
             Encoding.UTF8.GetBytes(
                 @"<?xml version=""1.0"" encoding=""UTF-8"" standalone=""yes""?>
@@ -172,20 +219,23 @@ public class EpisodeNfoReaderTests
   </actor>
 </episodedetails>"));
 
-        List<TvShowEpisodeNfo> result = await reader.Read(stream);
+        Either<BaseError, List<TvShowEpisodeNfo>> result = await _episodeNfoReader.Read(stream);
 
-        result.Count.Should().Be(1);
-        result[0].Actors.Count.Should().Be(2);
-        result[0].Actors.Count(a => a.Name == "Name 1" && a.Role == "Role 1" && a.Thumb == "Thumb 1")
-            .Should().Be(1);
-        result[0].Actors.Count(a => a.Name == "Name 2" && a.Role == "Role 2" && a.Thumb == "Thumb 2")
-            .Should().Be(1);
+        result.IsRight.Should().BeTrue();
+        foreach (List<TvShowEpisodeNfo> list in result.RightToSeq())
+        {
+            list.Count.Should().Be(1);
+            list[0].Actors.Count.Should().Be(2);
+            list[0].Actors.Count(a => a.Name == "Name 1" && a.Role == "Role 1" && a.Thumb == "Thumb 1")
+                .Should().Be(1);
+            list[0].Actors.Count(a => a.Name == "Name 2" && a.Role == "Role 2" && a.Thumb == "Thumb 2")
+                .Should().Be(1);
+        }
     }
 
     [Test]
     public async Task Writers()
     {
-        var reader = new EpisodeNfoReader();
         var stream = new MemoryStream(
             Encoding.UTF8.GetBytes(
                 @"<?xml version=""1.0"" encoding=""UTF-8"" standalone=""yes""?>
@@ -198,18 +248,21 @@ public class EpisodeNfoReaderTests
   <credits>Writer 3</credits>
 </episodedetails>"));
 
-        List<TvShowEpisodeNfo> result = await reader.Read(stream);
+        Either<BaseError, List<TvShowEpisodeNfo>> result = await _episodeNfoReader.Read(stream);
 
-        result.Count.Should().Be(2);
-        result.Count(nfo => nfo.Writers.Count == 1 && nfo.Writers[0] == "Writer 1").Should().Be(1);
-        result.Count(nfo => nfo.Writers.Count == 2 && nfo.Writers[0] == "Writer 2" && nfo.Writers[1] == "Writer 3")
-            .Should().Be(1);
+        result.IsRight.Should().BeTrue();
+        foreach (List<TvShowEpisodeNfo> list in result.RightToSeq())
+        {
+            list.Count.Should().Be(2);
+            list.Count(nfo => nfo.Writers.Count == 1 && nfo.Writers[0] == "Writer 1").Should().Be(1);
+            list.Count(nfo => nfo.Writers.Count == 2 && nfo.Writers[0] == "Writer 2" && nfo.Writers[1] == "Writer 3")
+                .Should().Be(1);
+        }
     }
 
     [Test]
     public async Task Directors()
     {
-        var reader = new EpisodeNfoReader();
         var stream = new MemoryStream(
             Encoding.UTF8.GetBytes(
                 @"<?xml version=""1.0"" encoding=""UTF-8"" standalone=""yes""?>
@@ -222,13 +275,171 @@ public class EpisodeNfoReaderTests
   <director>Director 3</director>
 </episodedetails>"));
 
-        List<TvShowEpisodeNfo> result = await reader.Read(stream);
+        Either<BaseError, List<TvShowEpisodeNfo>> result = await _episodeNfoReader.Read(stream);
 
-        result.Count.Should().Be(2);
-        result.Count(nfo => nfo.Directors.Count == 1 && nfo.Directors[0] == "Director 1").Should().Be(1);
-        result.Count(
-                nfo => nfo.Directors.Count == 2 && nfo.Directors[0] == "Director 2" &&
-                       nfo.Directors[1] == "Director 3")
-            .Should().Be(1);
+        result.IsRight.Should().BeTrue();
+        foreach (List<TvShowEpisodeNfo> list in result.RightToSeq())
+        {
+            list.Count.Should().Be(2);
+            list.Count(nfo => nfo.Directors.Count == 1 && nfo.Directors[0] == "Director 1").Should().Be(1);
+            list.Count(
+                    nfo => nfo.Directors.Count == 2 && nfo.Directors[0] == "Director 2" &&
+                           nfo.Directors[1] == "Director 3")
+                .Should().Be(1);
+        }
+    }
+
+    [Test]
+    public async Task FullSample_Should_Return_Nfo()
+    {
+        await using var stream = new MemoryStream(
+            Encoding.UTF8.GetBytes(
+                @"<?xml version=""1.0"" encoding=""UTF-8"" standalone=""yes"" ?>
+<episodedetails>
+    <title>Filmed Before a Live Studio Audience</title>
+    <showtitle>WandaVision</showtitle>
+    <ratings>
+        <rating name=""imdb"" max=""10"" default=""true"">
+            <value>7.500000</value>
+            <votes>18766</votes>
+        </rating>
+        <rating name=""tmdb"" max=""10"">
+            <value>7.500000</value>
+            <votes>42</votes>
+        </rating>
+        <rating name=""trakt"" max=""10"">
+            <value>6.952780</value>
+            <votes>3621</votes>
+        </rating>
+    </ratings>
+    <userrating>0</userrating>
+    <top250>0</top250>
+    <season>1</season>
+    <episode>1</episode>
+    <displayseason>-1</displayseason>
+    <displayepisode>-1</displayepisode>
+    <outline></outline>
+    <plot>Wanda and Vision struggle to conceal their powers during dinner with Vision’s boss and his wife.</plot>
+    <tagline></tagline>
+    <runtime>26</runtime>
+    <thumb spoof="""" cache="""" aspect=""thumb"" preview=""https://image.tmdb.org/t/p/w780/cbe8l0Hnbvu07ePgoOopyWYrcdL.jpg"">https://image.tmdb.org/t/p/original/cbe8l0Hnbvu07ePgoOopyWYrcdL.jpg</thumb>
+    <thumb spoof="""" cache="""" aspect=""thumb"" preview=""https://image.tmdb.org/t/p/w780/oNCzeCXFanVEWNpzRzyffhLLfZs.jpg"">https://image.tmdb.org/t/p/original/oNCzeCXFanVEWNpzRzyffhLLfZs.jpg</thumb>
+    <mpaa>Australia:TV-14</mpaa>
+    <playcount>1</playcount>
+    <lastplayed>2021-03-27</lastplayed>
+    <id>1830976</id>
+    <uniqueid type=""imdb"">tt9601584</uniqueid>
+    <uniqueid type=""tmdb"" default=""true"">1830976</uniqueid>
+    <uniqueid type=""tvdb"">8042515</uniqueid>
+    <genre>Sci-Fi &amp; Fantasy</genre>
+    <genre>Mystery</genre>
+    <genre>Drama</genre>
+    <credits>Jac Schaeffer</credits>
+    <director>Matt Shakman</director>
+    <premiered>2021-01-15</premiered>
+    <year>2021</year>
+    <status></status>
+    <code></code>
+    <aired>2021-01-15</aired>
+    <studio>Disney+ (US)</studio>
+    <trailer></trailer>
+    <fileinfo>
+        <streamdetails>
+            <video>
+                <codec>h264</codec>
+                <aspect>1.777778</aspect>
+                <width>1280</width>
+                <height>720</height>
+                <durationinseconds>1593</durationinseconds>
+                <stereomode></stereomode>
+            </video>
+            <audio>
+                <codec>aac</codec>
+                <language>eng</language>
+                <channels>2</channels>
+            </audio>
+        </streamdetails>
+    </fileinfo>
+    <actor>
+        <name>Randall Park</name>
+        <role>Jimmy Woo</role>
+        <order>4</order>
+        <thumb>https://image.tmdb.org/t/p/original/1QJ4cBQZoOaLR8Hc3V2NgBLvB0f.jpg</thumb>
+    </actor>
+    <actor>
+        <name>Kat Dennings</name>
+        <role>Darcy Lewis / The Escape Artist</role>
+        <order>5</order>
+        <thumb>https://image.tmdb.org/t/p/original/rrfyo9z1wW5nY9ZsFlj1Ozfj9g2.jpg</thumb>
+    </actor>
+    <resume>
+        <position>0.000000</position>
+        <total>0.000000</total>
+    </resume>
+    <dateadded>2021-02-02 11:57:44</dateadded>
+</episodedetails>"));
+
+        Either<BaseError, List<TvShowEpisodeNfo>> result = await _episodeNfoReader.Read(stream);
+
+        result.IsRight.Should().BeTrue();
+
+        foreach (TvShowEpisodeNfo nfo in result.RightToSeq().Flatten())
+        {
+            nfo.ShowTitle.Should().Be("WandaVision");
+            nfo.Title.Should().Be("Filmed Before a Live Studio Audience");
+            nfo.Episode.Should().Be(1);
+            nfo.Season.Should().Be(1);
+            nfo.ContentRating.Should().Be("Australia:TV-14");
+
+            nfo.Aired.IsSome.Should().BeTrue();
+            foreach (DateTime aired in nfo.Aired)
+            {
+                aired.Should().Be(new DateTime(2021, 01, 15));
+            }
+
+            nfo.Plot.Should().Be(
+                "Wanda and Vision struggle to conceal their powers during dinner with Vision’s boss and his wife.");
+            nfo.Actors.Should().BeEquivalentTo(
+                new List<ActorNfo>
+                {
+                    new()
+                    {
+                        Name = "Randall Park", Order = 4, Role = "Jimmy Woo",
+                        Thumb = "https://image.tmdb.org/t/p/original/1QJ4cBQZoOaLR8Hc3V2NgBLvB0f.jpg"
+                    },
+                    new()
+                    {
+                        Name = "Kat Dennings", Order = 5, Role = "Darcy Lewis / The Escape Artist",
+                        Thumb = "https://image.tmdb.org/t/p/original/rrfyo9z1wW5nY9ZsFlj1Ozfj9g2.jpg"
+                    }
+                });
+            nfo.Writers.Should().BeEquivalentTo(new List<string> { "Jac Schaeffer" });
+            nfo.Directors.Should().BeEquivalentTo(new List<string> { "Matt Shakman" });
+            nfo.UniqueIds.Should().BeEquivalentTo(
+                new List<UniqueIdNfo>
+                {
+                    new() { Type = "imdb", Guid = "tt9601584", Default = false },
+                    new() { Type = "tmdb", Guid = "1830976", Default = true },
+                    new() { Type = "tvdb", Guid = "8042515", Default = false }
+                });
+        }
+    }
+
+    [Test]
+    public async Task Invalid_Characters_Should_Abort_And_Return_Nfo()
+    {
+        string sourceFile = Path.Combine(
+            TestContext.CurrentContext.TestDirectory,
+            "Resources",
+            "Nfo",
+            "EpisodeInvalidCharacters.nfo");
+        Either<BaseError, List<TvShowEpisodeNfo>> result = await _episodeNfoReader.ReadFromFile(sourceFile);
+
+        result.IsRight.Should().BeTrue();
+        foreach (List<TvShowEpisodeNfo> list in result.RightToSeq())
+        {
+            list.Count.Should().Be(1);
+            list[0].Title.Should().Be("Test Title");
+        }
     }
 }

ErsatzTV.Core.Tests/Metadata/Nfo/MovieNfoReaderTests.cs

@@ -0,0 +1,252 @@
+using System.Text;
+using Bugsnag;
+using ErsatzTV.Core.Metadata.Nfo;
+using FluentAssertions;
+using Microsoft.Extensions.Logging.Abstractions;
+using Microsoft.IO;
+using Moq;
+using NUnit.Framework;
+
+namespace ErsatzTV.Core.Tests.Metadata.Nfo;
+
+[TestFixture]
+public class MovieNfoReaderTests
+{
+    [SetUp]
+    public void SetUp() => _movieNfoReader = new MovieNfoReader(
+        new RecyclableMemoryStreamManager(),
+        new Mock<IClient>().Object,
+        new NullLogger<MovieNfoReader>());
+
+    private MovieNfoReader _movieNfoReader;
+
+    [Test]
+    public async Task ParsingNfo_Should_Return_Error()
+    {
+        await using var stream =
+            new MemoryStream(Encoding.UTF8.GetBytes(@"https://www.themoviedb.org/movie/11-star-wars"));
+
+        Either<BaseError, MovieNfo> result = await _movieNfoReader.Read(stream);
+
+        result.IsLeft.Should().BeTrue();
+    }
+
+    [Test]
+    public async Task MetadataNfo_Should_Return_Nfo()
+    {
+        await using var stream = new MemoryStream(Encoding.UTF8.GetBytes(@"<movie></movie>"));
+
+        Either<BaseError, MovieNfo> result = await _movieNfoReader.Read(stream);
+
+        result.IsRight.Should().BeTrue();
+    }
+
+    [Test]
+    public async Task CombinationNfo_Should_Return_Nfo()
+    {
+        await using var stream = new MemoryStream(
+            Encoding.UTF8.GetBytes(
+                @"<movie></movie>
+https://www.themoviedb.org/movie/11-star-wars"));
+
+        Either<BaseError, MovieNfo> result = await _movieNfoReader.Read(stream);
+
+        result.IsRight.Should().BeTrue();
+    }
+
+    [Test]
+    public async Task FullSample_Should_Return_Nfo()
+    {
+        await using var stream = new MemoryStream(
+            Encoding.UTF8.GetBytes(
+                @"<?xml version=""1.0"" encoding=""UTF-8"" standalone=""yes"" ?>
+<movie>
+    <title>Zack Snyder&apos;s Justice League</title>
+    <originaltitle>Zack Snyder&apos;s Justice League</originaltitle>
+    <sorttitle>Justice League 2</sorttitle>
+    <ratings>
+        <rating name=""imdb"" max=""10"" default=""true"">
+            <value>8.300000</value>
+            <votes>197786</votes>
+        </rating>
+        <rating name=""themoviedb"" max=""10"">
+            <value>8.700000</value>
+            <votes>3461</votes>
+        </rating>
+        <rating name=""trakt"" max=""10"">
+            <value>8.195670</value>
+            <votes>4247</votes>
+        </rating>
+    </ratings>
+    <userrating>0</userrating>
+    <top250>140</top250>
+    <outline></outline>
+    <plot>Determined to ensure Superman&apos;s ultimate sacrifice was not in vain, Bruce Wayne aligns forces with Diana Prince with plans to recruit a team of metahumans to protect the world from an approaching threat of catastrophic proportions.</plot>
+    <tagline></tagline>
+    <runtime>242</runtime>
+    <thumb spoof="""" cache="""" aspect=""poster"" preview="""">https://assets.fanart.tv/fanart/movies/791373/movieposter/zack-snyders-justice-league-603fdb873f474.jpg</thumb>
+    <thumb spoof="""" cache="""" aspect=""poster"" preview="""">https://image.tmdb.org/t/p/original/tnAuB8q5vv7Ax9UAEje5Xi4BXik.jpg</thumb>
+    <thumb spoof="""" cache="""" aspect=""landscape"" preview="""">https://assets.fanart.tv/fanart/movies/791373/moviethumb/zack-snyders-justice-league-6050310135cf6.jpg</thumb>
+    <thumb spoof="""" cache="""" aspect=""landscape"" preview="""">https://image.tmdb.org/t/p/original/wcYBuOZDP6Vi8Ye4qax3Zx9dCan.jpg</thumb>
+    <thumb spoof="""" cache="""" aspect=""keyart"" preview="""">https://assets.fanart.tv/fanart/movies/791373/movieposter/zack-snyders-justice-league-603fdba9bdd16.jpg</thumb>
+    <thumb spoof="""" cache="""" aspect=""clearlogo"" preview="""">https://assets.fanart.tv/fanart/movies/791373/hdmovielogo/zack-snyders-justice-league-5ed3f2e4952e9.png</thumb>
+    <thumb spoof="""" cache="""" aspect=""banner"" preview="""">https://assets.fanart.tv/fanart/movies/791373/moviebanner/zack-snyders-justice-league-6050049514d4c.jpg</thumb>
+    <fanart>
+        <thumb colors="""" preview=""https://assets.fanart.tv/preview/movies/791373/moviebackground/zack-snyders-justice-league-5fee5b9fe0e0d.jpg"">https://assets.fanart.tv/fanart/movies/791373/moviebackground/zack-snyders-justice-league-5fee5b9fe0e0d.jpg</thumb>
+        <thumb colors="""" preview=""https://image.tmdb.org/t/p/w780/43NwryODVEsbBDC0jK3wYfVyb5q.jpg"">https://image.tmdb.org/t/p/original/43NwryODVEsbBDC0jK3wYfVyb5q.jpg</thumb>
+    </fanart>
+    <mpaa>Australia:M</mpaa>
+    <playcount>0</playcount>
+    <lastplayed></lastplayed>
+    <id>791373</id>
+    <uniqueid type=""imdb"">tt12361974</uniqueid>
+    <uniqueid type=""tmdb"" default=""true"">791373</uniqueid>
+    <genre>SuperHero</genre>
+    <tag>TV Recording</tag>
+    <set>
+        <name>Justice League Collection</name>
+        <overview>Based on the DC Comics superhero team</overview>
+    </set>
+    <country>USA</country>
+    <credits>Chris Terrio</credits>
+    <director>Zack Snyder</director>
+    <premiered>2021-03-18</premiered>
+    <year>2021</year>
+    <status></status>
+    <code></code>
+    <aired></aired>
+    <studio>Warner Bros. Pictures</studio>
+    <trailer></trailer>
+    <fileinfo>
+        <streamdetails>
+            <video>
+                <codec>hevc</codec>
+                <aspect>1.777778</aspect>
+                <width>1920</width>
+                <height>1080</height>
+                <durationinseconds>14528</durationinseconds>
+                <stereomode></stereomode>
+            </video>
+            <audio>
+                <codec>ac3</codec>
+                <language>eng</language>
+                <channels>6</channels>
+            </audio>
+            <audio>
+                <codec>ac3</codec>
+                <language>fre</language>
+                <channels>6</channels>
+            </audio>
+            <subtitle>
+                <language>eng</language>
+            </subtitle>
+        </streamdetails>
+    </fileinfo>
+    <actor>
+        <name>Ben Affleck</name>
+        <role>Bruce Wayne / Batman</role>
+        <order>0</order>
+        <thumb>https://image.tmdb.org/t/p/original/u525jeDOzg9hVdvYfeehTGnw7Aa.jpg</thumb>
+    </actor>
+    <actor>
+        <name>Henry Cavill</name>
+        <role>Clark Kent / Superman / Kal-El</role>
+        <order>1</order>
+        <thumb>https://image.tmdb.org/t/p/original/hErUwonrQgY5Y7RfxOfv8Fq11MB.jpg</thumb>
+    </actor>
+    <actor>
+        <name>Gal Gadot</name>
+        <role>Diana Prince / Wonder Woman</role>
+        <order>2</order>
+        <thumb>https://image.tmdb.org/t/p/original/fysvehTvU6bE3JgxaOTRfvQJzJ4.jpg</thumb>
+    </actor>
+    <resume>
+        <position>0.000000</position>
+        <total>0.000000</total>
+    </resume>
+    <dateadded>2021-03-26 11:35:50</dateadded>
+</movie>"));
+
+        Either<BaseError, MovieNfo> result = await _movieNfoReader.Read(stream);
+
+        result.IsRight.Should().BeTrue();
+
+        foreach (MovieNfo nfo in result.RightToSeq())
+        {
+            nfo.Title.Should().Be("Zack Snyder's Justice League");
+            nfo.SortTitle.Should().Be("Justice League 2");
+            nfo.Outline.Should().BeNullOrEmpty();
+            nfo.Year.Should().Be(2021);
+            nfo.ContentRating.Should().Be("Australia:M");
+
+            nfo.Premiered.IsSome.Should().BeTrue();
+            foreach (DateTime premiered in nfo.Premiered)
+            {
+                premiered.Should().Be(new DateTime(2021, 03, 18));
+            }
+
+            nfo.Plot.Should().Be(
+                "Determined to ensure Superman's ultimate sacrifice was not in vain, Bruce Wayne aligns forces with Diana Prince with plans to recruit a team of metahumans to protect the world from an approaching threat of catastrophic proportions.");
+            nfo.Tagline.Should().BeNullOrEmpty();
+            nfo.Genres.Should().BeEquivalentTo(new List<string> { "SuperHero" });
+            nfo.Tags.Should().BeEquivalentTo(new List<string> { "TV Recording" });
+            nfo.Studios.Should().BeEquivalentTo(new List<string> { "Warner Bros. Pictures" });
+            nfo.Actors.Should().BeEquivalentTo(
+                new List<ActorNfo>
+                {
+                    new()
+                    {
+                        Name = "Ben Affleck", Order = 0, Role = "Bruce Wayne / Batman",
+                        Thumb = "https://image.tmdb.org/t/p/original/u525jeDOzg9hVdvYfeehTGnw7Aa.jpg"
+                    },
+                    new()
+                    {
+                        Name = "Henry Cavill", Order = 1, Role = "Clark Kent / Superman / Kal-El",
+                        Thumb = "https://image.tmdb.org/t/p/original/hErUwonrQgY5Y7RfxOfv8Fq11MB.jpg"
+                    },
+                    new()
+                    {
+                        Name = "Gal Gadot", Order = 2, Role = "Diana Prince / Wonder Woman",
+                        Thumb = "https://image.tmdb.org/t/p/original/fysvehTvU6bE3JgxaOTRfvQJzJ4.jpg"
+                    }
+                });
+            nfo.Writers.Should().BeEquivalentTo(new List<string> { "Chris Terrio" });
+            nfo.Directors.Should().BeEquivalentTo(new List<string> { "Zack Snyder" });
+            nfo.UniqueIds.Should().BeEquivalentTo(
+                new List<UniqueIdNfo>
+                {
+                    new() { Type = "imdb", Guid = "tt12361974", Default = false },
+                    new() { Type = "tmdb", Guid = "791373", Default = true }
+                });
+        }
+    }
+
+    [Test]
+    public async Task MetadataNfo_With_Tag_Should_Return_Nfo()
+    {
+        await using var stream = new MemoryStream(Encoding.UTF8.GetBytes(@"<movie><tag>Test Tag</tag></movie>"));
+
+        Either<BaseError, MovieNfo> result = await _movieNfoReader.Read(stream);
+
+        result.IsRight.Should().BeTrue();
+        foreach (MovieNfo nfo in result.RightToSeq())
+        {
+            nfo.Tags.Should().BeEquivalentTo(new List<string> { "Test Tag" });
+        }
+    }
+
+    [Test]
+    public async Task MetadataNfo_With_Outline_Should_Return_Nfo()
+    {
+        await using var stream =
+            new MemoryStream(Encoding.UTF8.GetBytes(@"<movie><outline>Test Outline</outline></movie>"));
+
+        Either<BaseError, MovieNfo> result = await _movieNfoReader.Read(stream);
+
+        result.IsRight.Should().BeTrue();
+        foreach (MovieNfo nfo in result.RightToSeq())
+        {
+            nfo.Outline.Should().Be("Test Outline");
+        }
+    }
+}

ErsatzTV.Core.Tests/Metadata/Nfo/MusicVideoNfoReaderTests.cs

@@ -0,0 +1,189 @@
+using System.Text;
+using Bugsnag;
+using ErsatzTV.Core.Metadata.Nfo;
+using FluentAssertions;
+using Microsoft.Extensions.Logging.Abstractions;
+using Microsoft.IO;
+using Moq;
+using NUnit.Framework;
+
+namespace ErsatzTV.Core.Tests.Metadata.Nfo;
+
+[TestFixture]
+public class MusicVideoNfoReaderTests
+{
+    [SetUp]
+    public void SetUp() => _musicVideoNfoReader = new MusicVideoNfoReader(
+        new RecyclableMemoryStreamManager(),
+        new Mock<IClient>().Object,
+        new NullLogger<MusicVideoNfoReader>());
+
+    private MusicVideoNfoReader _musicVideoNfoReader;
+
+    [Test]
+    public async Task ParsingNfo_Should_Return_Error()
+    {
+        await using var stream =
+            new MemoryStream(Encoding.UTF8.GetBytes(@"https://www.themoviedb.org/movie/11-star-wars"));
+
+        Either<BaseError, MusicVideoNfo> result = await _musicVideoNfoReader.Read(stream);
+
+        result.IsLeft.Should().BeTrue();
+    }
+
+    [Test]
+    public async Task MetadataNfo_Should_Return_Nfo()
+    {
+        await using var stream = new MemoryStream(Encoding.UTF8.GetBytes(@"<musicvideo></musicvideo>"));
+
+        Either<BaseError, MusicVideoNfo> result = await _musicVideoNfoReader.Read(stream);
+
+        result.IsRight.Should().BeTrue();
+    }
+
+    [Test]
+    public async Task CombinationNfo_Should_Return_Nfo()
+    {
+        await using var stream = new MemoryStream(
+            Encoding.UTF8.GetBytes(
+                @"<musicvideo></musicvideo>
+https://www.themoviedb.org/movie/11-star-wars"));
+
+        Either<BaseError, MusicVideoNfo> result = await _musicVideoNfoReader.Read(stream);
+
+        result.IsRight.Should().BeTrue();
+    }
+
+    [Test]
+    public async Task FullSample_Should_Return_Nfo()
+    {
+        await using var stream = new MemoryStream(
+            Encoding.UTF8.GetBytes(
+                NormalizeLineEndingsLF(
+                    @"<?xml version=""1.0"" encoding=""UTF-8"" standalone=""yes"" ?>
+<musicvideo>
+    <title>Dancing Queen</title>
+    <userrating>0</userrating>
+    <top250>0</top250>
+    <track>-1</track>
+    <album>Arrival</album>
+    <outline></outline>
+    <plot>Dancing Queen est un des tubes emblématiques de l&apos;ère disco produits par le groupe suédois ABBA en 1976. Ce tube connaît un regain de popularité en 1994 lors de la sortie de Priscilla, folle du désert, et fait « presque » partie de la distribution du film Muriel.&#x0A;Le groupe a également enregistré une version espagnole de ce titre, La reina del baile, pour le marché d&apos;Amérique latine. On peut retrouver ces versions en espagnol des succès de ABBA sur l&apos;abum Oro. Le 18 juin 1976, ABBA a interprété cette chanson lors d&apos;un spectacle télévisé organisé en l&apos;honneur du roi Charles XVI Gustave de Suède, qui venait de se marier. Le titre sera repris en 2011 par Glee dans la saison 2, épisode 20.</plot>
+    <tagline></tagline>
+    <runtime>2</runtime>
+    <thumb preview=""https://www.theaudiodb.com/images/media/album/thumb/arrival-4ee244732bbde.jpg/preview"">https://www.theaudiodb.com/images/media/album/thumb/arrival-4ee244732bbde.jpg</thumb>
+    <thumb preview=""https://assets.fanart.tv/preview/music/d87e52c5-bb8d-4da8-b941-9f4928627dc8/albumcover/arrival-548ab7a698b49.jpg"">https://assets.fanart.tv/fanart/music/d87e52c5-bb8d-4da8-b941-9f4928627dc8/albumcover/arrival-548ab7a698b49.jpg</thumb>
+    <mpaa></mpaa>
+    <playcount>0</playcount>
+    <lastplayed></lastplayed>
+    <id></id>
+    <genre>Pop</genre>
+    <year>1976</year>
+    <status></status>
+	<director>Director 1</director>
+	<director>Director 2</director>
+	<director>Director 3</director>
+	<director>Director 4</director>
+    <code></code>
+    <aired></aired>
+    <trailer></trailer>
+    <fileinfo>
+        <streamdetails>
+            <video>
+                <codec>hevc</codec>
+                <aspect>1.792230</aspect>
+                <width>716</width>
+                <height>568</height>
+                <durationinseconds>143</durationinseconds>
+                <stereomode></stereomode>
+            </video>
+            <audio>
+                <codec>ac3</codec>
+                <language>eng</language>
+                <channels>2</channels>
+            </audio>
+        </streamdetails>
+    </fileinfo>
+    <artist>ABBA</artist>
+    <resume>
+        <position>0.000000</position>
+        <total>0.000000</total>
+    </resume>
+    <dateadded>2018-09-10 09:46:06</dateadded>
+</musicvideo>")));
+
+        Either<BaseError, MusicVideoNfo> result = await _musicVideoNfoReader.Read(stream);
+
+        result.IsRight.Should().BeTrue();
+
+        foreach (MusicVideoNfo nfo in result.RightToSeq())
+        {
+            nfo.Artists.Should().BeEquivalentTo(new List<string> { "ABBA" });
+            nfo.Title.Should().Be("Dancing Queen");
+            nfo.Album.Should().Be("Arrival");
+            nfo.Plot.Should().Be(
+                NormalizeLineEndingsLF(
+                    @"Dancing Queen est un des tubes emblématiques de l'ère disco produits par le groupe suédois ABBA en 1976. Ce tube connaît un regain de popularité en 1994 lors de la sortie de Priscilla, folle du désert, et fait « presque » partie de la distribution du film Muriel.
+Le groupe a également enregistré une version espagnole de ce titre, La reina del baile, pour le marché d'Amérique latine. On peut retrouver ces versions en espagnol des succès de ABBA sur l'abum Oro. Le 18 juin 1976, ABBA a interprété cette chanson lors d'un spectacle télévisé organisé en l'honneur du roi Charles XVI Gustave de Suède, qui venait de se marier. Le titre sera repris en 2011 par Glee dans la saison 2, épisode 20."));
+
+            nfo.Year.Should().Be(1976);
+            nfo.Aired.IsNone.Should().BeTrue();
+            nfo.Genres.Should().BeEquivalentTo(new List<string> { "Pop" });
+            nfo.Track.Should().Be(-1);
+        }
+    }
+
+    [Test]
+    public async Task MetadataNfo_With_Tags_Should_Return_Nfo()
+    {
+        await using var stream = new MemoryStream(
+            Encoding.UTF8.GetBytes(@"<musicvideo><tag>Test Tag</tag></musicvideo>"));
+
+        Either<BaseError, MusicVideoNfo> result = await _musicVideoNfoReader.Read(stream);
+
+        result.IsRight.Should().BeTrue();
+        foreach (MusicVideoNfo nfo in result.RightToSeq())
+        {
+            nfo.Tags.Should().BeEquivalentTo(new List<string> { "Test Tag" });
+        }
+    }
+
+    [Test]
+    public async Task MetadataNfo_With_Aired_Should_Return_Nfo()
+    {
+        await using var stream = new MemoryStream(
+            Encoding.UTF8.GetBytes(@"<musicvideo><aired>2022-02-03</aired></musicvideo>"));
+
+        Either<BaseError, MusicVideoNfo> result = await _musicVideoNfoReader.Read(stream);
+
+        result.IsRight.Should().BeTrue();
+        foreach (MusicVideoNfo nfo in result.RightToSeq())
+        {
+            nfo.Aired.IsSome.Should().BeTrue();
+            foreach (DateTime aired in nfo.Aired)
+            {
+                aired.Should().Be(new DateTime(2022, 02, 03));
+            }
+        }
+    }
+
+    [Test]
+    public async Task MetadataNfo_With_Studios_Should_Return_Nfo()
+    {
+        await using var stream = new MemoryStream(
+            Encoding.UTF8.GetBytes(@"<musicvideo><studio>Test Studio</studio></musicvideo>"));
+
+        Either<BaseError, MusicVideoNfo> result = await _musicVideoNfoReader.Read(stream);
+
+        result.IsRight.Should().BeTrue();
+        foreach (MusicVideoNfo nfo in result.RightToSeq())
+        {
+            nfo.Studios.Should().BeEquivalentTo(new List<string> { "Test Studio" });
+        }
+    }
+
+    private static string NormalizeLineEndingsLF(string str) =>
+        str
+            .Replace("\r\n", "\n")
+            .Replace("\r", "\n");
+}

ErsatzTV.Core.Tests/Metadata/Nfo/OtherVideoNfoReaderTests.cs

@@ -0,0 +1,252 @@
+using System.Text;
+using Bugsnag;
+using ErsatzTV.Core.Metadata.Nfo;
+using FluentAssertions;
+using Microsoft.Extensions.Logging.Abstractions;
+using Microsoft.IO;
+using Moq;
+using NUnit.Framework;
+
+namespace ErsatzTV.Core.Tests.Metadata.Nfo;
+
+[TestFixture]
+public class OtherVideoNfoReaderTests
+{
+    [SetUp]
+    public void SetUp() => _otherVideoNfoReader = new OtherVideoNfoReader(
+        new RecyclableMemoryStreamManager(),
+        new Mock<IClient>().Object,
+        new NullLogger<OtherVideoNfoReader>());
+
+    private OtherVideoNfoReader _otherVideoNfoReader;
+
+    [Test]
+    public async Task ParsingNfo_Should_Return_Error()
+    {
+        await using var stream =
+            new MemoryStream(Encoding.UTF8.GetBytes(@"https://www.themoviedb.org/movie/11-star-wars"));
+
+        Either<BaseError, OtherVideoNfo> result = await _otherVideoNfoReader.Read(stream);
+
+        result.IsLeft.Should().BeTrue();
+    }
+
+    [Test]
+    public async Task MetadataNfo_Should_Return_Nfo()
+    {
+        await using var stream = new MemoryStream(Encoding.UTF8.GetBytes(@"<movie></movie>"));
+
+        Either<BaseError, OtherVideoNfo> result = await _otherVideoNfoReader.Read(stream);
+
+        result.IsRight.Should().BeTrue();
+    }
+
+    [Test]
+    public async Task CombinationNfo_Should_Return_Nfo()
+    {
+        await using var stream = new MemoryStream(
+            Encoding.UTF8.GetBytes(
+                @"<movie></movie>
+https://www.themoviedb.org/movie/11-star-wars"));
+
+        Either<BaseError, OtherVideoNfo> result = await _otherVideoNfoReader.Read(stream);
+
+        result.IsRight.Should().BeTrue();
+    }
+
+    [Test]
+    public async Task FullSample_Should_Return_Nfo()
+    {
+        await using var stream = new MemoryStream(
+            Encoding.UTF8.GetBytes(
+                @"<?xml version=""1.0"" encoding=""UTF-8"" standalone=""yes"" ?>
+<movie>
+    <title>Zack Snyder&apos;s Justice League</title>
+    <originaltitle>Zack Snyder&apos;s Justice League</originaltitle>
+    <sorttitle>Justice League 2</sorttitle>
+    <ratings>
+        <rating name=""imdb"" max=""10"" default=""true"">
+            <value>8.300000</value>
+            <votes>197786</votes>
+        </rating>
+        <rating name=""themoviedb"" max=""10"">
+            <value>8.700000</value>
+            <votes>3461</votes>
+        </rating>
+        <rating name=""trakt"" max=""10"">
+            <value>8.195670</value>
+            <votes>4247</votes>
+        </rating>
+    </ratings>
+    <userrating>0</userrating>
+    <top250>140</top250>
+    <outline></outline>
+    <plot>Determined to ensure Superman&apos;s ultimate sacrifice was not in vain, Bruce Wayne aligns forces with Diana Prince with plans to recruit a team of metahumans to protect the world from an approaching threat of catastrophic proportions.</plot>
+    <tagline></tagline>
+    <runtime>242</runtime>
+    <thumb spoof="""" cache="""" aspect=""poster"" preview="""">https://assets.fanart.tv/fanart/movies/791373/movieposter/zack-snyders-justice-league-603fdb873f474.jpg</thumb>
+    <thumb spoof="""" cache="""" aspect=""poster"" preview="""">https://image.tmdb.org/t/p/original/tnAuB8q5vv7Ax9UAEje5Xi4BXik.jpg</thumb>
+    <thumb spoof="""" cache="""" aspect=""landscape"" preview="""">https://assets.fanart.tv/fanart/movies/791373/moviethumb/zack-snyders-justice-league-6050310135cf6.jpg</thumb>
+    <thumb spoof="""" cache="""" aspect=""landscape"" preview="""">https://image.tmdb.org/t/p/original/wcYBuOZDP6Vi8Ye4qax3Zx9dCan.jpg</thumb>
+    <thumb spoof="""" cache="""" aspect=""keyart"" preview="""">https://assets.fanart.tv/fanart/movies/791373/movieposter/zack-snyders-justice-league-603fdba9bdd16.jpg</thumb>
+    <thumb spoof="""" cache="""" aspect=""clearlogo"" preview="""">https://assets.fanart.tv/fanart/movies/791373/hdmovielogo/zack-snyders-justice-league-5ed3f2e4952e9.png</thumb>
+    <thumb spoof="""" cache="""" aspect=""banner"" preview="""">https://assets.fanart.tv/fanart/movies/791373/moviebanner/zack-snyders-justice-league-6050049514d4c.jpg</thumb>
+    <fanart>
+        <thumb colors="""" preview=""https://assets.fanart.tv/preview/movies/791373/moviebackground/zack-snyders-justice-league-5fee5b9fe0e0d.jpg"">https://assets.fanart.tv/fanart/movies/791373/moviebackground/zack-snyders-justice-league-5fee5b9fe0e0d.jpg</thumb>
+        <thumb colors="""" preview=""https://image.tmdb.org/t/p/w780/43NwryODVEsbBDC0jK3wYfVyb5q.jpg"">https://image.tmdb.org/t/p/original/43NwryODVEsbBDC0jK3wYfVyb5q.jpg</thumb>
+    </fanart>
+    <mpaa>Australia:M</mpaa>
+    <playcount>0</playcount>
+    <lastplayed></lastplayed>
+    <id>791373</id>
+    <uniqueid type=""imdb"">tt12361974</uniqueid>
+    <uniqueid type=""tmdb"" default=""true"">791373</uniqueid>
+    <genre>SuperHero</genre>
+    <tag>TV Recording</tag>
+    <set>
+        <name>Justice League Collection</name>
+        <overview>Based on the DC Comics superhero team</overview>
+    </set>
+    <country>USA</country>
+    <credits>Chris Terrio</credits>
+    <director>Zack Snyder</director>
+    <premiered>2021-03-18</premiered>
+    <year>2021</year>
+    <status></status>
+    <code></code>
+    <aired></aired>
+    <studio>Warner Bros. Pictures</studio>
+    <trailer></trailer>
+    <fileinfo>
+        <streamdetails>
+            <video>
+                <codec>hevc</codec>
+                <aspect>1.777778</aspect>
+                <width>1920</width>
+                <height>1080</height>
+                <durationinseconds>14528</durationinseconds>
+                <stereomode></stereomode>
+            </video>
+            <audio>
+                <codec>ac3</codec>
+                <language>eng</language>
+                <channels>6</channels>
+            </audio>
+            <audio>
+                <codec>ac3</codec>
+                <language>fre</language>
+                <channels>6</channels>
+            </audio>
+            <subtitle>
+                <language>eng</language>
+            </subtitle>
+        </streamdetails>
+    </fileinfo>
+    <actor>
+        <name>Ben Affleck</name>
+        <role>Bruce Wayne / Batman</role>
+        <order>0</order>
+        <thumb>https://image.tmdb.org/t/p/original/u525jeDOzg9hVdvYfeehTGnw7Aa.jpg</thumb>
+    </actor>
+    <actor>
+        <name>Henry Cavill</name>
+        <role>Clark Kent / Superman / Kal-El</role>
+        <order>1</order>
+        <thumb>https://image.tmdb.org/t/p/original/hErUwonrQgY5Y7RfxOfv8Fq11MB.jpg</thumb>
+    </actor>
+    <actor>
+        <name>Gal Gadot</name>
+        <role>Diana Prince / Wonder Woman</role>
+        <order>2</order>
+        <thumb>https://image.tmdb.org/t/p/original/fysvehTvU6bE3JgxaOTRfvQJzJ4.jpg</thumb>
+    </actor>
+    <resume>
+        <position>0.000000</position>
+        <total>0.000000</total>
+    </resume>
+    <dateadded>2021-03-26 11:35:50</dateadded>
+</movie>"));
+
+        Either<BaseError, OtherVideoNfo> result = await _otherVideoNfoReader.Read(stream);
+
+        result.IsRight.Should().BeTrue();
+
+        foreach (OtherVideoNfo nfo in result.RightToSeq())
+        {
+            nfo.Title.Should().Be("Zack Snyder's Justice League");
+            nfo.SortTitle.Should().Be("Justice League 2");
+            nfo.Outline.Should().BeNullOrEmpty();
+            nfo.Year.Should().Be(2021);
+            nfo.ContentRating.Should().Be("Australia:M");
+
+            nfo.Premiered.IsSome.Should().BeTrue();
+            foreach (DateTime premiered in nfo.Premiered)
+            {
+                premiered.Should().Be(new DateTime(2021, 03, 18));
+            }
+
+            nfo.Plot.Should().Be(
+                "Determined to ensure Superman's ultimate sacrifice was not in vain, Bruce Wayne aligns forces with Diana Prince with plans to recruit a team of metahumans to protect the world from an approaching threat of catastrophic proportions.");
+            nfo.Tagline.Should().BeNullOrEmpty();
+            nfo.Genres.Should().BeEquivalentTo(new List<string> { "SuperHero" });
+            nfo.Tags.Should().BeEquivalentTo(new List<string> { "TV Recording" });
+            nfo.Studios.Should().BeEquivalentTo(new List<string> { "Warner Bros. Pictures" });
+            nfo.Actors.Should().BeEquivalentTo(
+                new List<ActorNfo>
+                {
+                    new()
+                    {
+                        Name = "Ben Affleck", Order = 0, Role = "Bruce Wayne / Batman",
+                        Thumb = "https://image.tmdb.org/t/p/original/u525jeDOzg9hVdvYfeehTGnw7Aa.jpg"
+                    },
+                    new()
+                    {
+                        Name = "Henry Cavill", Order = 1, Role = "Clark Kent / Superman / Kal-El",
+                        Thumb = "https://image.tmdb.org/t/p/original/hErUwonrQgY5Y7RfxOfv8Fq11MB.jpg"
+                    },
+                    new()
+                    {
+                        Name = "Gal Gadot", Order = 2, Role = "Diana Prince / Wonder Woman",
+                        Thumb = "https://image.tmdb.org/t/p/original/fysvehTvU6bE3JgxaOTRfvQJzJ4.jpg"
+                    }
+                });
+            nfo.Writers.Should().BeEquivalentTo(new List<string> { "Chris Terrio" });
+            nfo.Directors.Should().BeEquivalentTo(new List<string> { "Zack Snyder" });
+            nfo.UniqueIds.Should().BeEquivalentTo(
+                new List<UniqueIdNfo>
+                {
+                    new() { Type = "imdb", Guid = "tt12361974", Default = false },
+                    new() { Type = "tmdb", Guid = "791373", Default = true }
+                });
+        }
+    }
+
+    [Test]
+    public async Task MetadataNfo_With_Tag_Should_Return_Nfo()
+    {
+        await using var stream = new MemoryStream(Encoding.UTF8.GetBytes(@"<movie><tag>Test Tag</tag></movie>"));
+
+        Either<BaseError, OtherVideoNfo> result = await _otherVideoNfoReader.Read(stream);
+
+        result.IsRight.Should().BeTrue();
+        foreach (OtherVideoNfo nfo in result.RightToSeq())
+        {
+            nfo.Tags.Should().BeEquivalentTo(new List<string> { "Test Tag" });
+        }
+    }
+
+    [Test]
+    public async Task MetadataNfo_With_Outline_Should_Return_Nfo()
+    {
+        await using var stream =
+            new MemoryStream(Encoding.UTF8.GetBytes(@"<movie><outline>Test Outline</outline></movie>"));
+
+        Either<BaseError, OtherVideoNfo> result = await _otherVideoNfoReader.Read(stream);
+
+        result.IsRight.Should().BeTrue();
+        foreach (OtherVideoNfo nfo in result.RightToSeq())
+        {
+            nfo.Outline.Should().Be("Test Outline");
+        }
+    }
+}

ErsatzTV.Core.Tests/Metadata/Nfo/TvShowNfoReaderTests.cs

@@ -0,0 +1,221 @@
+using System.Text;
+using Bugsnag;
+using ErsatzTV.Core.Metadata.Nfo;
+using FluentAssertions;
+using Microsoft.Extensions.Logging.Abstractions;
+using Microsoft.IO;
+using Moq;
+using NUnit.Framework;
+
+namespace ErsatzTV.Core.Tests.Metadata.Nfo;
+
+[TestFixture]
+public class TvShowNfoReaderTests
+{
+    [SetUp]
+    public void SetUp() => _tvShowNfoReader = new TvShowNfoReader(
+        new RecyclableMemoryStreamManager(),
+        new Mock<IClient>().Object,
+        new NullLogger<TvShowNfoReader>());
+
+    private TvShowNfoReader _tvShowNfoReader;
+
+    [Test]
+    public async Task ParsingNfo_Should_Return_Error()
+    {
+        await using var stream =
+            new MemoryStream(Encoding.UTF8.GetBytes(@"https://www.themoviedb.org/movie/11-star-wars"));
+
+        Either<BaseError, TvShowNfo> result = await _tvShowNfoReader.Read(stream);
+
+        result.IsLeft.Should().BeTrue();
+    }
+
+    [Test]
+    public async Task MetadataNfo_Should_Return_Nfo()
+    {
+        await using var stream = new MemoryStream(Encoding.UTF8.GetBytes(@"<tvshow></tvshow>"));
+
+        Either<BaseError, TvShowNfo> result = await _tvShowNfoReader.Read(stream);
+
+        result.IsRight.Should().BeTrue();
+    }
+
+    [Test]
+    public async Task CombinationNfo_Should_Return_Nfo()
+    {
+        await using var stream = new MemoryStream(
+            Encoding.UTF8.GetBytes(
+                @"<tvshow></tvshow>
+https://www.themoviedb.org/movie/11-star-wars"));
+
+        Either<BaseError, TvShowNfo> result = await _tvShowNfoReader.Read(stream);
+
+        result.IsRight.Should().BeTrue();
+    }
+
+    [Test]
+    public async Task FullSample_Should_Return_Nfo()
+    {
+        await using var stream = new MemoryStream(
+            Encoding.UTF8.GetBytes(
+                @"<?xml version=""1.0"" encoding=""UTF-8"" standalone=""yes"" ?>
+<tvshow>
+    <title>WandaVision</title>
+    <originaltitle>WandaVision</originaltitle>
+    <showtitle>WandaVision</showtitle>
+    <ratings>
+        <rating name=""imdb"" max=""10"" default=""true"">
+            <value>8.200000</value>
+            <votes>105359</votes>
+        </rating>
+        <rating name=""tmdb"" max=""10"">
+            <value>8.500000</value>
+            <votes>7230</votes>
+        </rating>
+        <rating name=""trakt"" max=""10"">
+            <value>8.077950</value>
+            <votes>3284</votes>
+        </rating>
+    </ratings>
+    <userrating>0</userrating>
+    <top250>0</top250>
+    <season>1</season>
+    <episode>9</episode>
+    <displayseason>-1</displayseason>
+    <displayepisode>-1</displayepisode>
+    <outline></outline>
+    <plot>Wanda Maximoff and Vision—two super-powered beings living idealized suburban lives—begin to suspect that everything is not as it seems.</plot>
+    <tagline></tagline>
+    <runtime>0</runtime>
+    <thumb spoof="""" cache="""" aspect=""landscape"" preview=""https://image.tmdb.org/t/p/w780/dUWto4NaeJFrGx7jm8m3KLymUGf.jpg"">https://image.tmdb.org/t/p/original/dUWto4NaeJFrGx7jm8m3KLymUGf.jpg</thumb>
+    <thumb spoof="""" cache="""" aspect=""poster"" preview=""https://image.tmdb.org/t/p/w780/8UsAB1hgwnd80eI2ociyppB6UXL.jpg"">https://image.tmdb.org/t/p/original/8UsAB1hgwnd80eI2ociyppB6UXL.jpg</thumb>
+    <thumb spoof="""" cache="""" aspect=""poster"" preview=""https://assets.fanart.tv/preview/tv/362392/tvposter/wandavision-6009571d1ed1f.jpg"">https://assets.fanart.tv/fanart/tv/362392/tvposter/wandavision-6009571d1ed1f.jpg</thumb>
+    <thumb spoof="""" cache="""" aspect=""clearlogo"" preview=""https://assets.fanart.tv/preview/tv/362392/hdtvlogo/marvels-wandavision-5f6ac3b1e9458.png"">https://assets.fanart.tv/fanart/tv/362392/hdtvlogo/marvels-wandavision-5f6ac3b1e9458.png</thumb>
+    <thumb spoof="""" cache="""" aspect=""clearart"" preview=""https://assets.fanart.tv/preview/tv/362392/hdclearart/wandavision-6009b6875a285.png"">https://assets.fanart.tv/fanart/tv/362392/hdclearart/wandavision-6009b6875a285.png</thumb>
+    <thumb spoof="""" cache="""" aspect=""landscape"" preview=""https://assets.fanart.tv/preview/tv/362392/tvthumb/wandavision-603032a5349b9.jpg"">https://assets.fanart.tv/fanart/tv/362392/tvthumb/wandavision-603032a5349b9.jpg</thumb>
+    <thumb spoof="""" cache="""" season=""1"" type=""season"" aspect=""poster"" preview=""https://image.tmdb.org/t/p/w780/7u443QI5xNIfLgNzEsV43CYZCWX.jpg"">https://image.tmdb.org/t/p/original/7u443QI5xNIfLgNzEsV43CYZCWX.jpg</thumb>
+    <fanart>
+        <thumb colors="""" preview="""">https://image.tmdb.org/t/p/original/57vVjteucIF3bGnZj6PmaoJRScw.jpg</thumb>
+        <thumb colors="""" preview="""">https://assets.fanart.tv/fanart/tv/362392/showbackground/marvels-wandavision-5ff4fef387a43.jpg</thumb>
+    </fanart>
+    <mpaa>Australia:M</mpaa>
+    <playcount>0</playcount>
+    <lastplayed>2021-03-29</lastplayed>
+    <id>85271</id>
+    <uniqueid type=""imdb"">tt9140560</uniqueid>
+    <uniqueid type=""tmdb"" default=""true"">85271</uniqueid>
+    <uniqueid type=""tvdb"">362392</uniqueid>
+    <genre>SuperHero</genre>
+    <premiered>2021-01-15</premiered>
+    <year>2021</year>
+    <status>Ended</status>
+    <code></code>
+    <aired></aired>
+    <studio>Disney+</studio>
+    <actor>
+        <name>Elizabeth Olsen</name>
+        <role>Wanda Maximoff / The Scarlet Witch</role>
+        <order>0</order>
+        <thumb>https://image.tmdb.org/t/p/original/wIU675y4dofIDVuhaNWPizJNtep.jpg</thumb>
+    </actor>
+    <actor>
+        <name>Paul Bettany</name>
+        <role>Vision / The Vision</role>
+        <order>1</order>
+        <thumb>https://image.tmdb.org/t/p/original/vcAVrAOZrpqmi37qjFdztRAv1u9.jpg</thumb>
+    </actor>
+    <namedseason number=""1"">Season 1</namedseason>
+    <resume>
+        <position>0.000000</position>
+        <total>0.000000</total>
+    </resume>
+    <dateadded>2021-03-12 06:15:51</dateadded>
+</tvshow>"));
+
+        Either<BaseError, TvShowNfo> result = await _tvShowNfoReader.Read(stream);
+
+        result.IsRight.Should().BeTrue();
+
+        foreach (TvShowNfo nfo in result.RightToSeq())
+        {
+            nfo.Title.Should().Be("WandaVision");
+            nfo.Year.Should().Be(2021);
+            nfo.Plot.Should().Be(
+                "Wanda Maximoff and Vision—two super-powered beings living idealized suburban lives—begin to suspect that everything is not as it seems.");
+            nfo.ContentRating.Should().Be("Australia:M");
+            nfo.Genres.Should().BeEquivalentTo(new List<string> { "SuperHero" });
+            nfo.Studios.Should().BeEquivalentTo(new List<string> { "Disney+" });
+            nfo.Actors.Should().BeEquivalentTo(
+                new List<ActorNfo>
+                {
+                    new()
+                    {
+                        Name = "Elizabeth Olsen", Order = 0, Role = "Wanda Maximoff / The Scarlet Witch",
+                        Thumb = "https://image.tmdb.org/t/p/original/wIU675y4dofIDVuhaNWPizJNtep.jpg"
+                    },
+                    new()
+                    {
+                        Name = "Paul Bettany", Order = 1, Role = "Vision / The Vision",
+                        Thumb = "https://image.tmdb.org/t/p/original/vcAVrAOZrpqmi37qjFdztRAv1u9.jpg"
+                    }
+                });
+            nfo.UniqueIds.Should().BeEquivalentTo(
+                new List<UniqueIdNfo>
+                {
+                    new() { Type = "imdb", Guid = "tt9140560", Default = false },
+                    new() { Type = "tmdb", Guid = "85271", Default = true },
+                    new() { Type = "tvdb", Guid = "362392", Default = false }
+                });
+            nfo.Premiered.IsSome.Should().BeTrue();
+            foreach (DateTime premiered in nfo.Premiered)
+            {
+                premiered.Should().Be(new DateTime(2021, 1, 15));
+            }
+        }
+    }
+
+    [Test]
+    public async Task MetadataNfo_With_Outline_Should_Return_Nfo()
+    {
+        await using var stream =
+            new MemoryStream(Encoding.UTF8.GetBytes(@"<tvshow><outline>Test Outline</outline></tvshow>"));
+
+        Either<BaseError, TvShowNfo> result = await _tvShowNfoReader.Read(stream);
+
+        result.IsRight.Should().BeTrue();
+        foreach (TvShowNfo nfo in result.RightToSeq())
+        {
+            nfo.Outline.Should().Be("Test Outline");
+        }
+    }
+
+    [Test]
+    public async Task MetadataNfo_With_Tagline_Should_Return_Nfo()
+    {
+        await using var stream =
+            new MemoryStream(Encoding.UTF8.GetBytes(@"<tvshow><tagline>Test Tagline</tagline></tvshow>"));
+
+        Either<BaseError, TvShowNfo> result = await _tvShowNfoReader.Read(stream);
+
+        result.IsRight.Should().BeTrue();
+        foreach (TvShowNfo nfo in result.RightToSeq())
+        {
+            nfo.Tagline.Should().Be("Test Tagline");
+        }
+    }
+
+    [Test]
+    public async Task MetadataNfo_With_Tag_Should_Return_Nfo()
+    {
+        await using var stream = new MemoryStream(Encoding.UTF8.GetBytes(@"<tvshow><tag>Test Tag</tag></tvshow>"));
+
+        Either<BaseError, TvShowNfo> result = await _tvShowNfoReader.Read(stream);
+
+        result.IsRight.Should().BeTrue();
+        foreach (TvShowNfo nfo in result.RightToSeq())
+        {
+            nfo.Tags.Should().BeEquivalentTo(new List<string> { "Test Tag" });
+        }
+    }
+}

ErsatzTV.Core.Tests/Resources/Nfo/ArtistInvalidCharacters1.nfo

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<!--created on whatever - comment-->
+<artist>
+    <name>Test Name</name>
+</artist>
+ÐPS½NÞ5Þ*˜¡¡ã·Ýq×ÍâeVk—¯¬}É

ErsatzTV.Core.Tests/Resources/Nfo/ArtistInvalidCharacters2.nfo

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<!--created on whatever - comment-->
+<artist>
+    <name>Test Name</name>
+    <style>ÐPS½NÞ5Þ*˜¡¡ã·Ýq×ÍâeVk—¯¬}É</style>
+    <mood>Test Mood</mood>
+</artist>

ErsatzTV.Core.Tests/Resources/Nfo/EpisodeInvalidCharacters.nfo

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<!--created on whatever - comment-->
+<episodedetails>
+    <title>Test Title</title>
+</episodedetails>
+ÐPS½NÞ5Þ*˜¡¡ã·Ýq×ÍâeVk—¯¬}É

ErsatzTV.Core.Tests/Scheduling/PlayoutBuilderTests.cs

@@ -70,6 +70,180 @@ public class PlayoutBuilderTests
             result.Items.Head().FinishOffset.TimeOfDay.Should().Be(TimeSpan.FromHours(6));
         }
 
+        [Test]
+        [Timeout(2000)]
+        public async Task OnlyFileNotFoundItem_Should_Abort()
+        {
+            var mediaItems = new List<MediaItem>
+            {
+                TestMovie(1, TimeSpan.FromHours(1), DateTime.Today)
+            };
+
+            mediaItems[0].State = MediaItemState.FileNotFound;
+
+            var configRepo = new Mock<IConfigElementRepository>();
+            configRepo.Setup(
+                    repo => repo.GetValue<bool>(
+                        It.Is<ConfigElementKey>(k => k.Key == ConfigElementKey.PlayoutSkipMissingItems.Key)))
+                .ReturnsAsync(Some(true));
+
+            (PlayoutBuilder builder, Playout playout) =
+                TestDataFloodForItems(mediaItems, PlaybackOrder.Random, configRepo);
+
+            Playout result = await builder.Build(playout, PlayoutBuildMode.Reset);
+
+            configRepo.Verify();
+
+            result.Items.Should().BeEmpty();
+        }
+
+        [Test]
+        public async Task FileNotFoundItem_Should_BeSkipped()
+        {
+            var mediaItems = new List<MediaItem>
+            {
+                TestMovie(1, TimeSpan.FromHours(1), DateTime.Today),
+                TestMovie(2, TimeSpan.FromHours(6), DateTime.Today)
+            };
+
+            mediaItems[0].State = MediaItemState.FileNotFound;
+
+            var configRepo = new Mock<IConfigElementRepository>();
+            configRepo.Setup(
+                    repo => repo.GetValue<bool>(
+                        It.Is<ConfigElementKey>(k => k.Key == ConfigElementKey.PlayoutSkipMissingItems.Key)))
+                .ReturnsAsync(Some(true));
+
+            (PlayoutBuilder builder, Playout playout) =
+                TestDataFloodForItems(mediaItems, PlaybackOrder.Random, configRepo);
+            DateTimeOffset start = HoursAfterMidnight(0);
+            DateTimeOffset finish = start + TimeSpan.FromHours(6);
+
+            Playout result = await builder.Build(playout, PlayoutBuildMode.Reset, start, finish);
+
+            configRepo.Verify();
+
+            result.Items.Count.Should().Be(1);
+            result.Items.Head().MediaItemId.Should().Be(2);
+            result.Items.Head().StartOffset.TimeOfDay.Should().Be(TimeSpan.Zero);
+            result.Items.Head().FinishOffset.TimeOfDay.Should().Be(TimeSpan.FromHours(6));
+        }
+
+        [Test]
+        [Timeout(2000)]
+        public async Task OnlyUnavailableItem_Should_Abort()
+        {
+            var mediaItems = new List<MediaItem>
+            {
+                TestMovie(1, TimeSpan.FromHours(1), DateTime.Today)
+            };
+
+            mediaItems[0].State = MediaItemState.Unavailable;
+
+            var configRepo = new Mock<IConfigElementRepository>();
+            configRepo.Setup(
+                    repo => repo.GetValue<bool>(
+                        It.Is<ConfigElementKey>(k => k.Key == ConfigElementKey.PlayoutSkipMissingItems.Key)))
+                .ReturnsAsync(Some(true));
+
+            (PlayoutBuilder builder, Playout playout) =
+                TestDataFloodForItems(mediaItems, PlaybackOrder.Random, configRepo);
+
+            Playout result = await builder.Build(playout, PlayoutBuildMode.Reset);
+
+            configRepo.Verify();
+
+            result.Items.Should().BeEmpty();
+        }
+
+        [Test]
+        public async Task UnavailableItem_Should_BeSkipped()
+        {
+            var mediaItems = new List<MediaItem>
+            {
+                TestMovie(1, TimeSpan.FromHours(1), DateTime.Today),
+                TestMovie(2, TimeSpan.FromHours(6), DateTime.Today)
+            };
+
+            mediaItems[0].State = MediaItemState.Unavailable;
+
+            var configRepo = new Mock<IConfigElementRepository>();
+            configRepo.Setup(
+                    repo => repo.GetValue<bool>(
+                        It.Is<ConfigElementKey>(k => k.Key == ConfigElementKey.PlayoutSkipMissingItems.Key)))
+                .ReturnsAsync(Some(true));
+
+            (PlayoutBuilder builder, Playout playout) =
+                TestDataFloodForItems(mediaItems, PlaybackOrder.Random, configRepo);
+            DateTimeOffset start = HoursAfterMidnight(0);
+            DateTimeOffset finish = start + TimeSpan.FromHours(6);
+
+            Playout result = await builder.Build(playout, PlayoutBuildMode.Reset, start, finish);
+
+            configRepo.Verify();
+
+            result.Items.Count.Should().Be(1);
+            result.Items.Head().MediaItemId.Should().Be(2);
+            result.Items.Head().StartOffset.TimeOfDay.Should().Be(TimeSpan.Zero);
+            result.Items.Head().FinishOffset.TimeOfDay.Should().Be(TimeSpan.FromHours(6));
+        }
+
+        [Test]
+        public async Task FileNotFound_Should_NotBeSkippedIfConfigured()
+        {
+            var mediaItems = new List<MediaItem>
+            {
+                TestMovie(1, TimeSpan.FromHours(6), DateTime.Today)
+            };
+
+            mediaItems[0].State = MediaItemState.FileNotFound;
+
+            var configRepo = new Mock<IConfigElementRepository>();
+            configRepo.Setup(
+                    repo => repo.GetValue<bool>(
+                        It.Is<ConfigElementKey>(k => k.Key == ConfigElementKey.PlayoutSkipMissingItems.Key)))
+                .ReturnsAsync(Some(false));
+
+            (PlayoutBuilder builder, Playout playout) =
+                TestDataFloodForItems(mediaItems, PlaybackOrder.Random, configRepo);
+            DateTimeOffset start = HoursAfterMidnight(0);
+            DateTimeOffset finish = start + TimeSpan.FromHours(6);
+
+            Playout result = await builder.Build(playout, PlayoutBuildMode.Reset, start, finish);
+
+            result.Items.Count.Should().Be(1);
+            result.Items.Head().StartOffset.TimeOfDay.Should().Be(TimeSpan.Zero);
+            result.Items.Head().FinishOffset.TimeOfDay.Should().Be(TimeSpan.FromHours(6));
+        }
+
+        [Test]
+        public async Task Unavailable_Should_NotBeSkippedIfConfigured()
+        {
+            var mediaItems = new List<MediaItem>
+            {
+                TestMovie(1, TimeSpan.FromHours(6), DateTime.Today)
+            };
+
+            mediaItems[0].State = MediaItemState.Unavailable;
+
+            var configRepo = new Mock<IConfigElementRepository>();
+            configRepo.Setup(
+                    repo => repo.GetValue<bool>(
+                        It.Is<ConfigElementKey>(k => k.Key == ConfigElementKey.PlayoutSkipMissingItems.Key)))
+                .ReturnsAsync(Some(false));
+
+            (PlayoutBuilder builder, Playout playout) =
+                TestDataFloodForItems(mediaItems, PlaybackOrder.Random, configRepo);
+            DateTimeOffset start = HoursAfterMidnight(0);
+            DateTimeOffset finish = start + TimeSpan.FromHours(6);
+
+            Playout result = await builder.Build(playout, PlayoutBuildMode.Reset, start, finish);
+
+            result.Items.Count.Should().Be(1);
+            result.Items.Head().StartOffset.TimeOfDay.Should().Be(TimeSpan.Zero);
+            result.Items.Head().FinishOffset.TimeOfDay.Should().Be(TimeSpan.FromHours(6));
+        }
+
         [Test]
         public async Task InitialFlood_Should_StartAtMidnight()
         {
@@ -376,6 +550,140 @@ public class PlayoutBuilderTests
             result.Items[4].MediaItemId.Should().Be(2);
         }
 
+        [Test]
+        public async Task FloodContent_Should_FloodAroundFixedContent_One_Multiple_Days()
+        {
+            var floodCollection = new Collection
+            {
+                Id = 1,
+                Name = "Flood Items",
+                MediaItems = new List<MediaItem>
+                {
+                    TestMovie(1, TimeSpan.FromHours(1), new DateTime(2020, 1, 1)),
+                    TestMovie(2, TimeSpan.FromHours(1), new DateTime(2020, 2, 1))
+                }
+            };
+
+            var fixedCollection = new Collection
+            {
+                Id = 2,
+                Name = "Fixed Items",
+                MediaItems = new List<MediaItem>
+                {
+                    TestMovie(3, TimeSpan.FromHours(2), new DateTime(2020, 1, 1))
+                }
+            };
+
+            var fakeRepository = new FakeMediaCollectionRepository(
+                Map(
+                    (floodCollection.Id, floodCollection.MediaItems.ToList()),
+                    (fixedCollection.Id, fixedCollection.MediaItems.ToList())));
+
+            var items = new List<ProgramScheduleItem>
+            {
+                new ProgramScheduleItemFlood
+                {
+                    Index = 1,
+                    Collection = floodCollection,
+                    CollectionId = floodCollection.Id,
+                    StartTime = null,
+                    PlaybackOrder = PlaybackOrder.Chronological
+                },
+                new ProgramScheduleItemOne
+                {
+                    Index = 2,
+                    Collection = fixedCollection,
+                    CollectionId = fixedCollection.Id,
+                    StartTime = TimeSpan.FromHours(3),
+                    PlaybackOrder = PlaybackOrder.Chronological
+                }
+            };
+
+            var playout = new Playout
+            {
+                ProgramSchedule = new ProgramSchedule
+                {
+                    Items = items
+                },
+                Channel = new Channel(Guid.Empty) { Id = 1, Name = "Test Channel" },
+                ProgramScheduleAnchors = new List<PlayoutProgramScheduleAnchor>(),
+                Items = new List<PlayoutItem>()
+            };
+
+            var configRepo = new Mock<IConfigElementRepository>();
+            var televisionRepo = new FakeTelevisionRepository();
+            var artistRepo = new Mock<IArtistRepository>();
+            var builder = new PlayoutBuilder(
+                configRepo.Object,
+                fakeRepository,
+                televisionRepo,
+                artistRepo.Object,
+                _logger);
+
+            DateTimeOffset start = HoursAfterMidnight(0);
+            DateTimeOffset finish = start + TimeSpan.FromHours(30);
+
+            Playout result = await builder.Build(playout, PlayoutBuildMode.Reset, start, finish);
+
+            result.Items.Count.Should().Be(28);
+            result.Items[0].StartOffset.TimeOfDay.Should().Be(TimeSpan.Zero);
+            result.Items[0].MediaItemId.Should().Be(1);
+            result.Items[1].StartOffset.TimeOfDay.Should().Be(TimeSpan.FromHours(1));
+            result.Items[1].MediaItemId.Should().Be(2);
+            result.Items[2].StartOffset.TimeOfDay.Should().Be(TimeSpan.FromHours(2));
+            result.Items[2].MediaItemId.Should().Be(1);
+            result.Items[3].StartOffset.TimeOfDay.Should().Be(TimeSpan.FromHours(3));
+            result.Items[3].MediaItemId.Should().Be(3);
+            result.Items[4].StartOffset.TimeOfDay.Should().Be(TimeSpan.FromHours(5));
+            result.Items[4].MediaItemId.Should().Be(2);
+            result.Items[5].StartOffset.TimeOfDay.Should().Be(TimeSpan.FromHours(6));
+            result.Items[5].MediaItemId.Should().Be(1);
+            result.Items[6].StartOffset.TimeOfDay.Should().Be(TimeSpan.FromHours(7));
+            result.Items[6].MediaItemId.Should().Be(2);
+            result.Items[7].StartOffset.TimeOfDay.Should().Be(TimeSpan.FromHours(8));
+            result.Items[7].MediaItemId.Should().Be(1);
+            result.Items[8].StartOffset.TimeOfDay.Should().Be(TimeSpan.FromHours(9));
+            result.Items[8].MediaItemId.Should().Be(2);
+            result.Items[9].StartOffset.TimeOfDay.Should().Be(TimeSpan.FromHours(10));
+            result.Items[9].MediaItemId.Should().Be(1);
+            result.Items[10].StartOffset.TimeOfDay.Should().Be(TimeSpan.FromHours(11));
+            result.Items[10].MediaItemId.Should().Be(2);
+            result.Items[11].StartOffset.TimeOfDay.Should().Be(TimeSpan.FromHours(12));
+            result.Items[11].MediaItemId.Should().Be(1);
+            result.Items[12].StartOffset.TimeOfDay.Should().Be(TimeSpan.FromHours(13));
+            result.Items[12].MediaItemId.Should().Be(2);
+            result.Items[13].StartOffset.TimeOfDay.Should().Be(TimeSpan.FromHours(14));
+            result.Items[13].MediaItemId.Should().Be(1);
+            result.Items[14].StartOffset.TimeOfDay.Should().Be(TimeSpan.FromHours(15));
+            result.Items[14].MediaItemId.Should().Be(2);
+            result.Items[15].StartOffset.TimeOfDay.Should().Be(TimeSpan.FromHours(16));
+            result.Items[15].MediaItemId.Should().Be(1);
+            result.Items[16].StartOffset.TimeOfDay.Should().Be(TimeSpan.FromHours(17));
+            result.Items[16].MediaItemId.Should().Be(2);
+            result.Items[17].StartOffset.TimeOfDay.Should().Be(TimeSpan.FromHours(18));
+            result.Items[17].MediaItemId.Should().Be(1);
+            result.Items[18].StartOffset.TimeOfDay.Should().Be(TimeSpan.FromHours(19));
+            result.Items[18].MediaItemId.Should().Be(2);
+            result.Items[19].StartOffset.TimeOfDay.Should().Be(TimeSpan.FromHours(20));
+            result.Items[19].MediaItemId.Should().Be(1);
+            result.Items[20].StartOffset.TimeOfDay.Should().Be(TimeSpan.FromHours(21));
+            result.Items[20].MediaItemId.Should().Be(2);
+            result.Items[21].StartOffset.TimeOfDay.Should().Be(TimeSpan.FromHours(22));
+            result.Items[21].MediaItemId.Should().Be(1);
+            result.Items[22].StartOffset.TimeOfDay.Should().Be(TimeSpan.FromHours(23));
+            result.Items[22].MediaItemId.Should().Be(2);
+            result.Items[23].StartOffset.TimeOfDay.Should().Be(TimeSpan.Zero);
+            result.Items[23].MediaItemId.Should().Be(1);
+            result.Items[24].StartOffset.TimeOfDay.Should().Be(TimeSpan.FromHours(1));
+            result.Items[24].MediaItemId.Should().Be(2);
+            result.Items[25].StartOffset.TimeOfDay.Should().Be(TimeSpan.FromHours(2));
+            result.Items[25].MediaItemId.Should().Be(1);
+            result.Items[26].StartOffset.TimeOfDay.Should().Be(TimeSpan.FromHours(3));
+            result.Items[26].MediaItemId.Should().Be(3);
+            result.Items[27].StartOffset.TimeOfDay.Should().Be(TimeSpan.FromHours(5));
+            result.Items[27].MediaItemId.Should().Be(2);
+        }
+
         [Test]
         public async Task FloodContent_Should_FloodAroundFixedContent_Multiple()
         {
@@ -2142,11 +2450,20 @@ public class PlayoutBuilderTests
             MovieMetadata = new List<MovieMetadata> { new() { ReleaseDate = aired } },
             MediaVersions = new List<MediaVersion>
             {
-                new() { Duration = duration }
+                new()
+                {
+                    Duration = duration, MediaFiles = new List<MediaFile>
+                    {
+                        new() { Path = $"/fake/path/{id}" }
+                    }
+                }
             }
         };
 
-    private TestData TestDataFloodForItems(List<MediaItem> mediaItems, PlaybackOrder playbackOrder)
+    private TestData TestDataFloodForItems(
+        List<MediaItem> mediaItems,
+        PlaybackOrder playbackOrder,
+        Mock<IConfigElementRepository> configMock = null)
     {
         var mediaCollection = new Collection
         {
@@ -2154,7 +2471,8 @@ public class PlayoutBuilderTests
             MediaItems = mediaItems
         };
 
-        var configRepo = new Mock<IConfigElementRepository>();
+        Mock<IConfigElementRepository> configRepo = configMock ?? new Mock<IConfigElementRepository>();
+
         var collectionRepo = new FakeMediaCollectionRepository(Map((mediaCollection.Id, mediaItems)));
         var televisionRepo = new FakeTelevisionRepository();
         var artistRepo = new Mock<IArtistRepository>();

ErsatzTV.Core.Tests/Scheduling/PlayoutModeSchedulerDurationTests.cs

@@ -25,7 +25,8 @@ public class PlayoutModeSchedulerDurationTests : SchedulerTestBase
             StartTime = null,
             PlayoutDuration = TimeSpan.FromHours(3),
             TailMode = TailMode.None,
-            PlaybackOrder = PlaybackOrder.Chronological
+            PlaybackOrder = PlaybackOrder.Chronological,
+            CustomTitle = "CustomTitle"
         };
 
         var scheduleItemsEnumerator = new OrderedScheduleItemsEnumerator(
@@ -49,7 +50,7 @@ public class PlayoutModeSchedulerDurationTests : SchedulerTestBase
         playoutBuilderState.CurrentTime.Should().Be(startState.CurrentTime.AddHours(3));
         playoutItems.Last().FinishOffset.Should().Be(playoutBuilderState.CurrentTime);
 
-        playoutBuilderState.NextGuideGroup.Should().Be(4);
+        playoutBuilderState.NextGuideGroup.Should().Be(2); // one guide group here because of custom title
         playoutBuilderState.DurationFinish.IsNone.Should().BeTrue();
         playoutBuilderState.InFlood.Should().BeFalse();
         playoutBuilderState.MultipleRemaining.IsNone.Should().BeTrue();
@@ -65,18 +66,21 @@ public class PlayoutModeSchedulerDurationTests : SchedulerTestBase
         playoutItems[0].GuideGroup.Should().Be(1);
         playoutItems[0].FillerKind.Should().Be(FillerKind.None);
         playoutItems[0].GuideFinish.HasValue.Should().BeFalse();
+        playoutItems[0].CustomTitle.Should().Be("CustomTitle");
 
         playoutItems[1].MediaItemId.Should().Be(2);
         playoutItems[1].StartOffset.Should().Be(startState.CurrentTime.AddHours(1));
-        playoutItems[1].GuideGroup.Should().Be(2);
+        playoutItems[1].GuideGroup.Should().Be(1);
         playoutItems[1].FillerKind.Should().Be(FillerKind.None);
         playoutItems[1].GuideFinish.HasValue.Should().BeFalse();
+        playoutItems[1].CustomTitle.Should().Be("CustomTitle");
 
         playoutItems[2].MediaItemId.Should().Be(1);
         playoutItems[2].StartOffset.Should().Be(startState.CurrentTime.AddHours(2));
-        playoutItems[2].GuideGroup.Should().Be(3);
+        playoutItems[2].GuideGroup.Should().Be(1);
         playoutItems[2].FillerKind.Should().Be(FillerKind.None);
         playoutItems[2].GuideFinish.HasValue.Should().BeTrue();
+        playoutItems[2].CustomTitle.Should().Be("CustomTitle");
     }
 
     [Test]

ErsatzTV.Core.Tests/Scheduling/PlayoutModeSchedulerFloodTests.cs

@@ -25,7 +25,8 @@ public class PlayoutModeSchedulerFloodTests : SchedulerTestBase
             StartTime = null,
             PlaybackOrder = PlaybackOrder.Chronological,
             TailFiller = null,
-            FallbackFiller = null
+            FallbackFiller = null,
+            CustomTitle = "CustomTitle"
         };
 
         var enumerator = new ChronologicalMediaCollectionEnumerator(
@@ -55,7 +56,7 @@ public class PlayoutModeSchedulerFloodTests : SchedulerTestBase
         playoutBuilderState.CurrentTime.Should().Be(startState.CurrentTime.AddHours(3));
         playoutItems.Last().FinishOffset.Should().Be(playoutBuilderState.CurrentTime);
 
-        playoutBuilderState.NextGuideGroup.Should().Be(4);
+        playoutBuilderState.NextGuideGroup.Should().Be(2); // one guide group here because of custom title
         playoutBuilderState.DurationFinish.IsNone.Should().BeTrue();
         playoutBuilderState.InFlood.Should().BeFalse();
         playoutBuilderState.MultipleRemaining.IsNone.Should().BeTrue();
@@ -70,16 +71,19 @@ public class PlayoutModeSchedulerFloodTests : SchedulerTestBase
         playoutItems[0].StartOffset.Should().Be(startState.CurrentTime);
         playoutItems[0].GuideGroup.Should().Be(1);
         playoutItems[0].FillerKind.Should().Be(FillerKind.None);
+        playoutItems[0].CustomTitle.Should().Be("CustomTitle");
 
         playoutItems[1].MediaItemId.Should().Be(2);
         playoutItems[1].StartOffset.Should().Be(startState.CurrentTime.AddHours(1));
-        playoutItems[1].GuideGroup.Should().Be(2);
+        playoutItems[1].GuideGroup.Should().Be(1);
         playoutItems[1].FillerKind.Should().Be(FillerKind.None);
+        playoutItems[1].CustomTitle.Should().Be("CustomTitle");
 
         playoutItems[2].MediaItemId.Should().Be(1);
         playoutItems[2].StartOffset.Should().Be(startState.CurrentTime.AddHours(2));
-        playoutItems[2].GuideGroup.Should().Be(3);
+        playoutItems[2].GuideGroup.Should().Be(1);
         playoutItems[2].FillerKind.Should().Be(FillerKind.None);
+        playoutItems[2].CustomTitle.Should().Be("CustomTitle");
     }
 
     [Test]

ErsatzTV.Core.Tests/Scheduling/PlayoutModeSchedulerMultipleTests.cs

@@ -27,7 +27,8 @@ public class PlayoutModeSchedulerMultipleTests : SchedulerTestBase
             PlaybackOrder = PlaybackOrder.Chronological,
             TailFiller = null,
             FallbackFiller = null,
-            Count = 3
+            Count = 3,
+            CustomTitle = "CustomTitle"
         };
 
         var scheduleItemsEnumerator = new OrderedScheduleItemsEnumerator(
@@ -56,7 +57,7 @@ public class PlayoutModeSchedulerMultipleTests : SchedulerTestBase
         playoutBuilderState.CurrentTime.Should().Be(startState.CurrentTime.AddHours(3));
         playoutItems.Last().FinishOffset.Should().Be(playoutBuilderState.CurrentTime);
 
-        playoutBuilderState.NextGuideGroup.Should().Be(4);
+        playoutBuilderState.NextGuideGroup.Should().Be(2); // one guide group here because of custom title
         playoutBuilderState.DurationFinish.IsNone.Should().BeTrue();
         playoutBuilderState.InFlood.Should().BeFalse();
         playoutBuilderState.MultipleRemaining.IsNone.Should().BeTrue();
@@ -71,16 +72,19 @@ public class PlayoutModeSchedulerMultipleTests : SchedulerTestBase
         playoutItems[0].StartOffset.Should().Be(startState.CurrentTime);
         playoutItems[0].GuideGroup.Should().Be(1);
         playoutItems[0].FillerKind.Should().Be(FillerKind.None);
+        playoutItems[0].CustomTitle.Should().Be("CustomTitle");
 
         playoutItems[1].MediaItemId.Should().Be(2);
         playoutItems[1].StartOffset.Should().Be(startState.CurrentTime.AddHours(1));
-        playoutItems[1].GuideGroup.Should().Be(2);
+        playoutItems[1].GuideGroup.Should().Be(1);
         playoutItems[1].FillerKind.Should().Be(FillerKind.None);
+        playoutItems[1].CustomTitle.Should().Be("CustomTitle");
 
         playoutItems[2].MediaItemId.Should().Be(1);
         playoutItems[2].StartOffset.Should().Be(startState.CurrentTime.AddHours(2));
-        playoutItems[2].GuideGroup.Should().Be(3);
+        playoutItems[2].GuideGroup.Should().Be(1);
         playoutItems[2].FillerKind.Should().Be(FillerKind.None);
+        playoutItems[2].CustomTitle.Should().Be("CustomTitle");
     }
 
     [Test]

ErsatzTV.Core.Tests/Scheduling/PlayoutModeSchedulerOneTests.cs

@@ -25,7 +25,8 @@ public class PlayoutModeSchedulerOneTests : SchedulerTestBase
             StartTime = null,
             PlaybackOrder = PlaybackOrder.Chronological,
             TailFiller = null,
-            FallbackFiller = null
+            FallbackFiller = null,
+            CustomTitle = "CustomTitle"
         };
 
         var scheduleItemsEnumerator = new OrderedScheduleItemsEnumerator(
@@ -64,6 +65,7 @@ public class PlayoutModeSchedulerOneTests : SchedulerTestBase
         playoutItems[0].StartOffset.Should().Be(startState.CurrentTime);
         playoutItems[0].GuideGroup.Should().Be(1);
         playoutItems[0].FillerKind.Should().Be(FillerKind.None);
+        playoutItems[0].CustomTitle.Should().Be("CustomTitle");
     }
 
     [Test]

ErsatzTV.Core/Domain/ConfigElementKey.cs

@@ -33,4 +33,5 @@ public class ConfigElementKey
     public static ConfigElementKey FillerPresetsPageSize => new("pages.filler_presets.page_size");
     public static ConfigElementKey LibraryRefreshInterval => new("scanner.library_refresh_interval");
     public static ConfigElementKey PlayoutDaysToBuild => new("playout.days_to_build");
+    public static ConfigElementKey PlayoutSkipMissingItems => new("playout.skip_missing_items");
 }

ErsatzTV.Core/Domain/Filler/FillerPreset.cs

@@ -9,6 +9,7 @@ public class FillerPreset
     public TimeSpan? Duration { get; set; }
     public int? Count { get; set; }
     public int? PadToNearestMinute { get; set; }
+    public bool AllowWatermarks { get; set; }
     public ProgramScheduleItemCollectionType CollectionType { get; set; }
     public int? CollectionId { get; set; }
     public Collection Collection { get; set; }

ErsatzTV.Core/Domain/MediaItem/BackgroundImageMediaVersion.cs

@@ -1,5 +1,31 @@
-namespace ErsatzTV.Core.Domain;
+using ErsatzTV.Core.Interfaces.FFmpeg;
+using ErsatzTV.FFmpeg.Format;
+
+namespace ErsatzTV.Core.Domain;
 
 public class BackgroundImageMediaVersion : MediaVersion
 {
+    public static BackgroundImageMediaVersion ForPath(string path, IDisplaySize resolution) =>
+        new()
+        {
+            Chapters = new List<MediaChapter>(),
+            // image has been pre-generated with correct size
+            Height = resolution.Height,
+            Width = resolution.Width,
+            SampleAspectRatio = "1:1",
+            Streams = new List<MediaStream>
+            {
+                new()
+                {
+                    MediaStreamKind = MediaStreamKind.Video,
+                    Index = 0,
+                    Codec = VideoFormat.GeneratedImage,
+                    PixelFormat = new PixelFormatUnknown().Name // the resulting pixel format is unknown
+                }
+            },
+            MediaFiles = new List<MediaFile>
+            {
+                new() { Path = path }
+            }
+        };
 }

ErsatzTV.Core/Domain/Metadata/MusicVideoArtist.cs

@@ -0,0 +1,7 @@
+namespace ErsatzTV.Core.Domain;
+
+public class MusicVideoArtist
+{
+    public int Id { get; set; }
+    public string Name { get; set; }
+}

ErsatzTV.Core/Domain/Metadata/MusicVideoMetadata.cs

@@ -4,6 +4,8 @@ public class MusicVideoMetadata : Metadata
 {
     public string Album { get; set; }
     public string Plot { get; set; }
+    public int? Track { get; set; }
     public int MusicVideoId { get; set; }
     public MusicVideo MusicVideo { get; set; }
+    public List<MusicVideoArtist> Artists { get; set; }
 }

ErsatzTV.Core/Domain/Metadata/OtherVideoMetadata.cs

@@ -2,6 +2,12 @@
 
 public class OtherVideoMetadata : Metadata
 {
+    public string ContentRating { get; set; }
+    public string Outline { get; set; }
+    public string Plot { get; set; }
+    public string Tagline { get; set; }
     public int OtherVideoId { get; set; }
     public OtherVideo OtherVideo { get; set; }
+    public List<Director> Directors { get; set; }
+    public List<Writer> Writers { get; set; }
 }

ErsatzTV.Core/Domain/PlayoutItem.cs

@@ -22,6 +22,7 @@ public class PlayoutItem
     public string ChapterTitle { get; set; }
     public ChannelWatermark Watermark { get; set; }
     public int? WatermarkId { get; set; }
+    public bool DisableWatermarks { get; set; }
     public string PreferredAudioLanguageCode { get; set; }
     public string PreferredSubtitleLanguageCode { get; set; }
     public ChannelSubtitleMode? SubtitleMode { get; set; }

ErsatzTV.Core/Domain/ProgramSchedule.cs

@@ -7,6 +7,7 @@ public class ProgramSchedule
     public bool KeepMultiPartEpisodesTogether { get; set; }
     public bool TreatCollectionsAsShows { get; set; }
     public bool ShuffleScheduleItems { get; set; }
+    public bool RandomStartPoint { get; set; }
     public List<ProgramScheduleItem> Items { get; set; }
     public List<Playout> Playouts { get; set; }
 }

ErsatzTV.Core/Errors/FailedToReadNfo.cs

@@ -0,0 +1,9 @@
+namespace ErsatzTV.Core.Errors;
+
+public class FailedToReadNfo : BaseError
+{
+    public FailedToReadNfo(string message = null) : base(
+        string.IsNullOrWhiteSpace(message) ? "Failed to read NFO metadata" : $"Failed to read NFO metadata: {message}")
+    {
+    }
+}

ErsatzTV.Core/ErsatzTV.Core.csproj

@@ -10,13 +10,14 @@
       <PackageReference Include="Bugsnag" Version="3.0.1" />
       <PackageReference Include="Destructurama.Attributed" Version="3.0.0" />
       <PackageReference Include="Flurl" Version="3.0.5" />
-      <PackageReference Include="LanguageExt.Core" Version="4.0.4" />
+      <PackageReference Include="LanguageExt.Core" Version="4.1.0" />
       <PackageReference Include="MediatR" Version="10.0.1" />
       <PackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="6.0.0" />
       <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="6.0.0" />
       <PackageReference Include="Microsoft.Extensions.Http" Version="6.0.0" />
       <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.1" />
-      <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.1.46">
+      <PackageReference Include="Microsoft.IO.RecyclableMemoryStream" Version="2.2.0" />
+      <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.2.32">
         <PrivateAssets>all</PrivateAssets>
         <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       </PackageReference>

ErsatzTV.Core/FFmpeg/FFmpegLibraryProcessService.cs

@@ -18,16 +18,19 @@ public class FFmpegLibraryProcessService : IFFmpegProcessService
     private readonly IFFmpegStreamSelector _ffmpegStreamSelector;
     private readonly ILogger<FFmpegLibraryProcessService> _logger;
     private readonly FFmpegPlaybackSettingsCalculator _playbackSettingsCalculator;
+    private readonly ITempFilePool _tempFilePool;
 
     public FFmpegLibraryProcessService(
         FFmpegProcessService ffmpegProcessService,
         FFmpegPlaybackSettingsCalculator playbackSettingsCalculator,
         IFFmpegStreamSelector ffmpegStreamSelector,
+        ITempFilePool tempFilePool,
         ILogger<FFmpegLibraryProcessService> logger)
     {
         _ffmpegProcessService = ffmpegProcessService;
         _playbackSettingsCalculator = playbackSettingsCalculator;
         _ffmpegStreamSelector = ffmpegStreamSelector;
+        _tempFilePool = tempFilePool;
         _logger = logger;
     }
 
@@ -56,7 +59,8 @@ public class FFmpegLibraryProcessService : IFFmpegProcessService
         TimeSpan inPoint,
         TimeSpan outPoint,
         long ptsOffset,
-        Option<int> targetFramerate)
+        Option<int> targetFramerate,
+        bool disableWatermarks)
     {
         MediaStream videoStream = await _ffmpegStreamSelector.SelectVideoStream(videoVersion);
         Option<MediaStream> maybeAudioStream =
@@ -87,8 +91,9 @@ public class FFmpegLibraryProcessService : IFFmpegProcessService
             hlsRealtime,
             targetFramerate);
 
-        Option<WatermarkOptions> watermarkOptions =
-            await _ffmpegProcessService.GetWatermarkOptions(
+        Option<WatermarkOptions> watermarkOptions = disableWatermarks
+            ? None
+            : await _ffmpegProcessService.GetWatermarkOptions(
                 ffprobePath,
                 channel,
                 playoutItemWatermark,
@@ -174,14 +179,7 @@ public class FFmpegLibraryProcessService : IFFmpegProcessService
 
         Option<WatermarkInputFile> watermarkInputFile = GetWatermarkInputFile(watermarkOptions, maybeFadePoints);
 
-        string videoFormat = playbackSettings.VideoFormat switch
-        {
-            FFmpegProfileVideoFormat.Hevc => VideoFormat.Hevc,
-            FFmpegProfileVideoFormat.H264 => VideoFormat.H264,
-            FFmpegProfileVideoFormat.Mpeg2Video => VideoFormat.Mpeg2Video,
-            FFmpegProfileVideoFormat.Copy => VideoFormat.Copy,
-            _ => throw new ArgumentOutOfRangeException($"unexpected video format {playbackSettings.VideoFormat}")
-        };
+        string videoFormat = GetVideoFormat(playbackSettings);
 
         HardwareAccelerationMode hwAccel = playbackSettings.HardwareAcceleration switch
         {
@@ -254,14 +252,128 @@ public class FFmpegLibraryProcessService : IFFmpegProcessService
         return GetCommand(ffmpegPath, videoInputFile, audioInputFile, watermarkInputFile, None, pipeline);
     }
 
-    public Task<Command> ForError(
+    public async Task<Command> ForError(
         string ffmpegPath,
         Channel channel,
         Option<TimeSpan> duration,
         string errorMessage,
         bool hlsRealtime,
-        long ptsOffset) =>
-        _ffmpegProcessService.ForError(ffmpegPath, channel, duration, errorMessage, hlsRealtime, ptsOffset);
+        long ptsOffset)
+    {
+        FFmpegPlaybackSettings playbackSettings = _playbackSettingsCalculator.CalculateErrorSettings(
+            channel.StreamingMode,
+            channel.FFmpegProfile,
+            hlsRealtime);
+
+        IDisplaySize desiredResolution = channel.FFmpegProfile.Resolution;
+
+        var fontSize = (int)Math.Round(channel.FFmpegProfile.Resolution.Height / 20.0);
+        var margin = (int)Math.Round(channel.FFmpegProfile.Resolution.Height * 0.05);
+
+        string subtitleFile = await new SubtitleBuilder(_tempFilePool)
+            .WithResolution(desiredResolution)
+            .WithFontName("Roboto")
+            .WithFontSize(fontSize)
+            .WithAlignment(2)
+            .WithMarginV(margin)
+            .WithPrimaryColor("&HFFFFFF")
+            .WithFormattedContent(errorMessage.Replace(Environment.NewLine, "\\N"))
+            .BuildFile();
+
+        string audioFormat = playbackSettings.AudioFormat switch
+        {
+            FFmpegProfileAudioFormat.Ac3 => AudioFormat.Ac3,
+            _ => AudioFormat.Aac
+        };
+
+        var audioState = new AudioState(
+            audioFormat,
+            playbackSettings.AudioChannels,
+            playbackSettings.AudioBitrate,
+            playbackSettings.AudioBufferSize,
+            playbackSettings.AudioSampleRate,
+            Option<TimeSpan>.None,
+            playbackSettings.NormalizeLoudness);
+
+        var desiredState = new FrameState(
+            playbackSettings.RealtimeOutput,
+            false,
+            GetVideoFormat(playbackSettings),
+            new PixelFormatYuv420P(),
+            new FrameSize(desiredResolution.Width, desiredResolution.Height),
+            new FrameSize(desiredResolution.Width, desiredResolution.Height),
+            playbackSettings.FrameRate,
+            playbackSettings.VideoBitrate,
+            playbackSettings.VideoBufferSize,
+            playbackSettings.VideoTrackTimeScale,
+            playbackSettings.Deinterlace);
+
+        OutputFormatKind outputFormat = channel.StreamingMode == StreamingMode.HttpLiveStreamingSegmenter
+            ? OutputFormatKind.Hls
+            : OutputFormatKind.MpegTs;
+
+        Option<string> hlsPlaylistPath = outputFormat == OutputFormatKind.Hls
+            ? Path.Combine(FileSystemLayout.TranscodeFolder, channel.Number, "live.m3u8")
+            : Option<string>.None;
+
+        Option<string> hlsSegmentTemplate = outputFormat == OutputFormatKind.Hls
+            ? Path.Combine(FileSystemLayout.TranscodeFolder, channel.Number, "live%06d.ts")
+            : Option<string>.None;
+
+        string videoPath = Path.Combine(FileSystemLayout.ResourcesCacheFolder, "background.png");
+
+        var videoVersion = BackgroundImageMediaVersion.ForPath(videoPath, desiredResolution);
+
+        var ffmpegVideoStream = new VideoStream(
+            0,
+            VideoFormat.GeneratedImage,
+            new PixelFormatYuv420P(),
+            new FrameSize(videoVersion.Width, videoVersion.Height),
+            None,
+            true);
+
+        var videoInputFile = new VideoInputFile(videoPath, new List<VideoStream> { ffmpegVideoStream });
+
+        var ffmpegState = new FFmpegState(
+            false,
+            HardwareAccelerationMode.None,
+            None,
+            None,
+            playbackSettings.StreamSeek,
+            duration,
+            channel.StreamingMode != StreamingMode.HttpLiveStreamingDirect,
+            "ErsatzTV",
+            channel.Name,
+            None,
+            outputFormat,
+            hlsPlaylistPath,
+            hlsSegmentTemplate,
+            ptsOffset);
+
+        var ffmpegSubtitleStream = new ErsatzTV.FFmpeg.MediaStream(0, "ass", StreamKind.Video);
+
+        var audioInputFile = new NullAudioInputFile(audioState);
+
+        var subtitleInputFile = new SubtitleInputFile(
+            subtitleFile,
+            new List<ErsatzTV.FFmpeg.MediaStream> { ffmpegSubtitleStream },
+            false);
+
+        _logger.LogDebug("FFmpeg desired error state {FrameState}", desiredState);
+
+        var pipelineBuilder = new PipelineBuilder(
+            videoInputFile,
+            audioInputFile,
+            None,
+            subtitleInputFile,
+            FileSystemLayout.FFmpegReportsFolder,
+            FileSystemLayout.FontsCacheFolder,
+            _logger);
+
+        FFmpegPipeline pipeline = pipelineBuilder.Build(ffmpegState, desiredState);
+
+        return GetCommand(ffmpegPath, videoInputFile, audioInputFile, None, None, pipeline);
+    }
 
     public Command ConcatChannel(string ffmpegPath, bool saveReports, Channel channel, string scheme, string host)
     {
@@ -478,4 +590,14 @@ public class FFmpegLibraryProcessService : IFFmpegProcessService
 
     private static Option<string> VaapiDeviceName(HardwareAccelerationMode accelerationMode, string vaapiDevice) =>
         accelerationMode == HardwareAccelerationMode.Vaapi ? vaapiDevice : Option<string>.None;
+
+    private static string GetVideoFormat(FFmpegPlaybackSettings playbackSettings) =>
+        playbackSettings.VideoFormat switch
+        {
+            FFmpegProfileVideoFormat.Hevc => VideoFormat.Hevc,
+            FFmpegProfileVideoFormat.H264 => VideoFormat.H264,
+            FFmpegProfileVideoFormat.Mpeg2Video => VideoFormat.Mpeg2Video,
+            FFmpegProfileVideoFormat.Copy => VideoFormat.Copy,
+            _ => throw new ArgumentOutOfRangeException($"unexpected video format {playbackSettings.VideoFormat}")
+        };
 }

ErsatzTV.Core/FFmpeg/FFmpegPlaybackSettingsCalculator.cs

@@ -170,14 +170,22 @@ public class FFmpegPlaybackSettingsCalculator
         return result;
     }
 
-    public FFmpegPlaybackSettings CalculateErrorSettings(FFmpegProfile ffmpegProfile) =>
+    public FFmpegPlaybackSettings CalculateErrorSettings(
+        StreamingMode streamingMode,
+        FFmpegProfile ffmpegProfile,
+        bool hlsRealtime) =>
         new()
         {
             HardwareAcceleration = HardwareAccelerationKind.None,
-            ThreadCount = ffmpegProfile.ThreadCount,
+            ThreadCount = 1,
             FormatFlags = CommonFormatFlags,
             VideoFormat = ffmpegProfile.VideoFormat,
-            AudioFormat = ffmpegProfile.AudioFormat
+            AudioFormat = ffmpegProfile.AudioFormat,
+            RealtimeOutput = streamingMode switch
+            {
+                StreamingMode.HttpLiveStreamingSegmenter => hlsRealtime,
+                _ => true
+            }
         };
 
     private static bool NeedToScale(FFmpegProfile ffmpegProfile, MediaVersion version) =>

ErsatzTV.Core/FFmpeg/FFmpegProcessService.cs

@@ -40,92 +40,6 @@ public class FFmpegProcessService
         _logger = logger;
     }
 
-    public async Task<Command> ForError(
-        string ffmpegPath,
-        Channel channel,
-        Option<TimeSpan> duration,
-        string errorMessage,
-        bool hlsRealtime,
-        long ptsOffset)
-    {
-        FFmpegPlaybackSettings playbackSettings =
-            _playbackSettingsCalculator.CalculateErrorSettings(channel.FFmpegProfile);
-
-        IDisplaySize desiredResolution = channel.FFmpegProfile.Resolution;
-
-        var fontSize = (int)Math.Round(channel.FFmpegProfile.Resolution.Height / 20.0);
-        var margin = (int)Math.Round(channel.FFmpegProfile.Resolution.Height * 0.05);
-
-        string subtitleFile = await new SubtitleBuilder(_tempFilePool)
-            .WithResolution(desiredResolution)
-            .WithFontName("Roboto")
-            .WithFontSize(fontSize)
-            .WithAlignment(2)
-            .WithMarginV(margin)
-            .WithPrimaryColor("&HFFFFFF")
-            .WithFormattedContent(errorMessage.Replace(Environment.NewLine, "\\N"))
-            .BuildFile();
-
-        var videoStream = new MediaStream { Index = 0 };
-        var audioStream = new MediaStream { Index = 0 };
-
-        string videoCodec = playbackSettings.VideoFormat switch
-        {
-            FFmpegProfileVideoFormat.Hevc => "libx265",
-            FFmpegProfileVideoFormat.Mpeg2Video => "mpeg2video",
-            _ => "libx264"
-        };
-
-        string audioCodec = playbackSettings.AudioFormat switch
-        {
-            FFmpegProfileAudioFormat.Ac3 => "ac3",
-            _ => "aac"
-        };
-
-        FFmpegProcessBuilder builder = new FFmpegProcessBuilder(ffmpegPath, false, _logger)
-            .WithThreads(1)
-            .WithQuiet()
-            .WithFormatFlags(playbackSettings.FormatFlags)
-            .WithRealtimeOutput(playbackSettings.RealtimeOutput)
-            .WithLoopedImage(Path.Combine(FileSystemLayout.ResourcesCacheFolder, "background.png"))
-            .WithLibavfilter()
-            .WithInput("anullsrc")
-            .WithSubtitleFile(subtitleFile)
-            .WithFilterComplex(
-                videoStream,
-                audioStream,
-                Path.Combine(FileSystemLayout.ResourcesCacheFolder, "background.png"),
-                "fake-audio-path",
-                playbackSettings.VideoFormat)
-            .WithPixfmt("yuv420p")
-            .WithPlaybackArgs(playbackSettings, videoCodec, audioCodec)
-            .WithMetadata(channel, None);
-
-        await duration.IfSomeAsync(d => builder = builder.WithDuration(d));
-
-        Process process = channel.StreamingMode switch
-        {
-            // HLS needs to segment and generate playlist
-            StreamingMode.HttpLiveStreamingSegmenter =>
-                builder.WithHls(
-                        channel.Number,
-                        None,
-                        ptsOffset,
-                        playbackSettings.VideoTrackTimeScale,
-                        playbackSettings.FrameRate)
-                    .Build(),
-            _ => builder.WithFormat("mpegts")
-                .WithPipe()
-                .Build()
-        };
-
-        return Cli.Wrap(process.StartInfo.FileName)
-            .WithArguments(process.StartInfo.ArgumentList)
-            .WithValidation(CommandResultValidation.None)
-            .WithEnvironmentVariables(process.StartInfo.Environment.ToDictionary(kvp => kvp.Key, kvp => kvp.Value))
-            .WithStandardErrorPipe(PipeTarget.ToStream(Stream.Null));
-    }
-
     public Command WrapSegmenter(string ffmpegPath, bool saveReports, Channel channel, string scheme, string host)
     {
         FFmpegPlaybackSettings playbackSettings = _playbackSettingsCalculator.ConcatSettings;
@@ -231,7 +145,10 @@ public class FFmpegProcessService
                     watermarkPath);
 
             FFmpegPlaybackSettings playbackSettings =
-                _playbackSettingsCalculator.CalculateErrorSettings(channel.FFmpegProfile);
+                _playbackSettingsCalculator.CalculateErrorSettings(
+                    StreamingMode.TransportStream,
+                    channel.FFmpegProfile,
+                    false);
 
             FFmpegPlaybackSettings scalePlaybackSettings = _playbackSettingsCalculator.CalculateSettings(
                 StreamingMode.TransportStream,

ErsatzTV.Core/FFmpeg/SongVideoGenerator.cs

@@ -2,7 +2,6 @@
 using ErsatzTV.Core.Domain;
 using ErsatzTV.Core.Interfaces.FFmpeg;
 using ErsatzTV.Core.Interfaces.Images;
-using ErsatzTV.FFmpeg.Format;
 using ErsatzTV.FFmpeg.State;
 
 namespace ErsatzTV.Core.FFmpeg;
@@ -193,7 +192,7 @@ public class SongVideoGenerator : ISongVideoGenerator
                 {
                     string hash = hashes[NextRandom(hashes.Count)];
 
-                    backgroundPath = _imageCache.WriteBlurHash(hash, channel.FFmpegProfile.Resolution);
+                    backgroundPath = await _imageCache.WriteBlurHash(hash, channel.FFmpegProfile.Resolution);
 
                     videoVersion.Height = channel.FFmpegProfile.Resolution.Height;
                     videoVersion.Width = channel.FFmpegProfile.Resolution.Width;
@@ -233,28 +232,7 @@ public class SongVideoGenerator : ISongVideoGenerator
         foreach (string si in maybeSongImage.RightToSeq())
         {
             videoPath = si;
-            videoVersion = new BackgroundImageMediaVersion
-            {
-                Chapters = new List<MediaChapter>(),
-                // song image has been pre-generated with correct size
-                Height = channel.FFmpegProfile.Resolution.Height,
-                Width = channel.FFmpegProfile.Resolution.Width,
-                SampleAspectRatio = "1:1",
-                Streams = new List<MediaStream>
-                {
-                    new()
-                    {
-                        MediaStreamKind = MediaStreamKind.Video,
-                        Index = 0,
-                        Codec = VideoFormat.GeneratedImage,
-                        PixelFormat = new PixelFormatUnknown().Name // the resulting pixel format is unknown
-                    }
-                },
-                MediaFiles = new List<MediaFile>
-                {
-                    new() { Path = si }
-                }
-            };
+            videoVersion = BackgroundImageMediaVersion.ForPath(si, channel.FFmpegProfile.Resolution);
         }
 
         return Tuple(videoPath, videoVersion);

ErsatzTV.Core/Interfaces/FFmpeg/IFFmpegProcessService.cs

@@ -33,7 +33,8 @@ public interface IFFmpegProcessService
         TimeSpan inPoint,
         TimeSpan outPoint,
         long ptsOffset,
-        Option<int> targetFramerate);
+        Option<int> targetFramerate,
+        bool disableWatermarks);
 
     Task<Command> ForError(
         string ffmpegPath,

ErsatzTV.Core/Interfaces/Images/IImageCache.cs

@@ -8,6 +8,6 @@ public interface IImageCache
     Task<Either<BaseError, string>> SaveArtworkToCache(Stream stream, ArtworkKind artworkKind);
     Task<Either<BaseError, string>> CopyArtworkToCache(string path, ArtworkKind artworkKind);
     string GetPathForImage(string fileName, ArtworkKind artworkKind, Option<int> maybeMaxHeight);
-    string CalculateBlurHash(string fileName, ArtworkKind artworkKind, int x, int y);
-    string WriteBlurHash(string blurHash, IDisplaySize targetSize);
+    Task<string> CalculateBlurHash(string fileName, ArtworkKind artworkKind, int x, int y);
+    Task<string> WriteBlurHash(string blurHash, IDisplaySize targetSize);
 }

ErsatzTV.Core/Interfaces/Metadata/ILocalMetadataProvider.cs

@@ -11,6 +11,7 @@ public interface ILocalMetadataProvider
     Task<bool> RefreshSidecarMetadata(Episode episode, string nfoFileName);
     Task<bool> RefreshSidecarMetadata(Artist artist, string nfoFileName);
     Task<bool> RefreshSidecarMetadata(MusicVideo musicVideo, string nfoFileName);
+    Task<bool> RefreshSidecarMetadata(OtherVideo otherVideo, string nfoFileName);
     Task<bool> RefreshTagMetadata(Song song, string ffprobePath);
     Task<bool> RefreshFallbackMetadata(Movie movie);
     Task<bool> RefreshFallbackMetadata(Episode episode);

ErsatzTV.Core/Interfaces/Metadata/Nfo/IArtistNfoReader.cs

@@ -0,0 +1,8 @@
+using ErsatzTV.Core.Metadata.Nfo;
+
+namespace ErsatzTV.Core.Interfaces.Metadata.Nfo;
+
+public interface IArtistNfoReader
+{
+    Task<Either<BaseError, ArtistNfo>> ReadFromFile(string fileName);
+}

ErsatzTV.Core/Interfaces/Metadata/Nfo/IEpisodeNfoReader.cs

@@ -4,5 +4,5 @@ namespace ErsatzTV.Core.Interfaces.Metadata.Nfo;
 
 public interface IEpisodeNfoReader
 {
-    Task<List<TvShowEpisodeNfo>> Read(Stream input);
+    Task<Either<BaseError, List<TvShowEpisodeNfo>>> ReadFromFile(string fileName);
 }

ErsatzTV.Core/Interfaces/Metadata/Nfo/IMovieNfoReader.cs

@@ -0,0 +1,8 @@
+using ErsatzTV.Core.Metadata.Nfo;
+
+namespace ErsatzTV.Core.Interfaces.Metadata.Nfo;
+
+public interface IMovieNfoReader
+{
+    Task<Either<BaseError, MovieNfo>> ReadFromFile(string fileName);
+}

ErsatzTV.Core/Interfaces/Metadata/Nfo/IMusicVideoNfoReader.cs

@@ -0,0 +1,8 @@
+using ErsatzTV.Core.Metadata.Nfo;
+
+namespace ErsatzTV.Core.Interfaces.Metadata.Nfo;
+
+public interface IMusicVideoNfoReader
+{
+    Task<Either<BaseError, MusicVideoNfo>> ReadFromFile(string fileName);
+}

ErsatzTV.Core/Interfaces/Metadata/Nfo/IOtherVideoNfoReader.cs

@@ -0,0 +1,8 @@
+using ErsatzTV.Core.Metadata.Nfo;
+
+namespace ErsatzTV.Core.Interfaces.Metadata.Nfo;
+
+public interface IOtherVideoNfoReader
+{
+    Task<Either<BaseError, OtherVideoNfo>> ReadFromFile(string fileName);
+}

ErsatzTV.Core/Interfaces/Metadata/Nfo/ITvShowNfoReader.cs

@@ -0,0 +1,8 @@
+using ErsatzTV.Core.Metadata.Nfo;
+
+namespace ErsatzTV.Core.Interfaces.Metadata.Nfo;
+
+public interface ITvShowNfoReader
+{
+    Task<Either<BaseError, TvShowNfo>> ReadFromFile(string fileName);
+}

ErsatzTV.Core/Interfaces/Repositories/ILibraryRepository.cs

@@ -11,10 +11,7 @@ public interface ILibraryRepository
     Task<Unit> UpdateLastScan(Library library);
     Task<Unit> UpdateLastScan(LibraryPath libraryPath);
     Task<List<LibraryPath>> GetLocalPaths(int libraryId);
-    Task<Option<LibraryPath>> GetPath(int libraryPathId);
     Task<int> CountMediaItemsByPath(int libraryPathId);
-    Task<List<int>> GetMediaIdsByLocalPath(int libraryPathId);
-    Task DeleteLocalPath(int libraryPathId);
     Task<Unit> SetEtag(LibraryPath libraryPath, Option<LibraryFolder> knownFolder, string path, string etag);
     Task<Unit> CleanEtagsForLibraryPath(LibraryPath libraryPath);
 }

ErsatzTV.Core/Interfaces/Repositories/IMusicVideoRepository.cs

@@ -12,9 +12,11 @@ public interface IMusicVideoRepository
 
     Task<IEnumerable<string>> FindMusicVideoPaths(LibraryPath libraryPath);
     Task<List<int>> DeleteByPath(LibraryPath libraryPath, string path);
+    Task<bool> AddArtist(MusicVideoMetadata metadata, MusicVideoArtist artist);
     Task<bool> AddGenre(MusicVideoMetadata metadata, Genre genre);
     Task<bool> AddTag(MusicVideoMetadata metadata, Tag tag);
     Task<bool> AddStudio(MusicVideoMetadata metadata, Studio studio);
+    Task<bool> RemoveArtist(MusicVideoArtist artist);
     Task<List<MusicVideoMetadata>> GetMusicVideosForCards(List<int> ids);
     Task<IEnumerable<string>> FindOrphanPaths(LibraryPath libraryPath);
     Task<int> GetMusicVideoCount(int artistId);

ErsatzTV.Core/Interfaces/Repositories/IOtherVideoRepository.cs

@@ -8,9 +8,12 @@ public interface IOtherVideoRepository
     Task<Either<BaseError, MediaItemScanResult<OtherVideo>>> GetOrAdd(LibraryPath libraryPath, string path);
     Task<IEnumerable<string>> FindOtherVideoPaths(LibraryPath libraryPath);
     Task<List<int>> DeleteByPath(LibraryPath libraryPath, string path);
+    Task<bool> AddGenre(OtherVideoMetadata metadata, Genre genre);
     Task<bool> AddTag(OtherVideoMetadata metadata, Tag tag);
+    Task<bool> AddStudio(OtherVideoMetadata metadata, Studio studio);
+    Task<bool> AddActor(OtherVideoMetadata metadata, Actor actor);
+    Task<bool> AddDirector(OtherVideoMetadata metadata, Director director);
+    Task<bool> AddWriter(OtherVideoMetadata metadata, Writer writer);
 
     Task<List<OtherVideoMetadata>> GetOtherVideosForCards(List<int> ids);
-    // Task<int> GetOtherVideoCount(int artistId);
-    // Task<List<OtherVideoMetadata>> GetPagedOtherVideos(int artistId, int pageNumber, int pageSize);
 }

ErsatzTV.Core/Iptv/ChannelGuide.cs

@@ -4,6 +4,7 @@ using ErsatzTV.Core.Domain;
 using ErsatzTV.Core.Domain.Filler;
 using ErsatzTV.Core.Emby;
 using ErsatzTV.Core.Jellyfin;
+using Microsoft.IO;
 using Serilog;
 
 namespace ErsatzTV.Core.Iptv;
@@ -12,10 +13,16 @@ public class ChannelGuide
 {
     private readonly List<Channel> _channels;
     private readonly string _host;
+    private readonly RecyclableMemoryStreamManager _recyclableMemoryStreamManager;
     private readonly string _scheme;
 
-    public ChannelGuide(string scheme, string host, List<Channel> channels)
+    public ChannelGuide(
+        RecyclableMemoryStreamManager recyclableMemoryStreamManager,
+        string scheme,
+        string host,
+        List<Channel> channels)
     {
+        _recyclableMemoryStreamManager = recyclableMemoryStreamManager;
         _scheme = scheme;
         _host = host;
         _channels = channels;
@@ -23,7 +30,7 @@ public class ChannelGuide
 
     public string ToXml()
     {
-        using var ms = new MemoryStream();
+        using MemoryStream ms = _recyclableMemoryStreamManager.GetStream();
         using var xml = XmlWriter.Create(ms);
         xml.WriteStartDocument();
 

ErsatzTV.Core/Metadata/FallbackMetadataProvider.cs

@@ -70,7 +70,8 @@ public class FallbackMetadataProvider : IFallbackMetadataProvider
             Studios = new List<Studio>(),
             Actors = new List<Actor>(),
             Directors = new List<Director>(),
-            Writers = new List<Writer>()
+            Writers = new List<Writer>(),
+            Guids = new List<MetadataGuid>()
         };
 
         return fileName != null ? GetMovieMetadata(fileName, metadata) : metadata;
@@ -97,7 +98,14 @@ public class FallbackMetadataProvider : IFallbackMetadataProvider
         {
             MetadataKind = MetadataKind.Fallback,
             Title = fileName ?? path,
-            OtherVideo = otherVideo
+            OtherVideo = otherVideo,
+            Genres = new List<Genre>(),
+            Tags = new List<Tag>(),
+            Studios = new List<Studio>(),
+            Actors = new List<Actor>(),
+            Directors = new List<Director>(),
+            Writers = new List<Writer>(),
+            Guids = new List<MetadataGuid>()
         };
 
         return GetOtherVideoMetadata(path, metadata);
@@ -230,6 +238,7 @@ public class FallbackMetadataProvider : IFallbackMetadataProvider
             metadata.Title = match.Success
                 ? match.Groups[2].Value.Trim()
                 : Path.GetFileNameWithoutExtension(fileName);
+            metadata.Artists = new List<MusicVideoArtist>();
             metadata.Genres = new List<Genre>();
             metadata.Tags = new List<Tag>();
             metadata.Studios = new List<Studio>();

ErsatzTV.Core/Metadata/LocalFolderScanner.cs

@@ -95,20 +95,23 @@ public abstract class LocalFolderScanner
                 _logger.LogDebug("Refreshing {Attribute} for {Path}", "Statistics", path);
                 Either<BaseError, bool> refreshResult =
                     await _localStatisticsProvider.RefreshStatistics(ffmpegPath, ffprobePath, mediaItem.Item);
-                refreshResult.Match(
-                    result =>
+
+                foreach (BaseError error in refreshResult.LeftToSeq())
+                {
+                    _logger.LogWarning(
+                        "Unable to refresh {Attribute} for media item {Path}. Error: {Error}",
+                        "Statistics",
+                        path,
+                        error.Value);
+                }
+
+                foreach (bool result in refreshResult.RightToSeq())
+                {
+                    if (result)
                     {
-                        if (result)
-                        {
-                            mediaItem.IsUpdated = true;
-                        }
-                    },
-                    error =>
-                        _logger.LogWarning(
-                            "Unable to refresh {Attribute} for media item {Path}. Error: {Error}",
-                            "Statistics",
-                            path,
-                            error.Value));
+                        mediaItem.IsUpdated = true;
+                    }
+                }
             }
 
             return mediaItem;
@@ -200,9 +203,21 @@ public abstract class LocalFolderScanner
 
                                 if (metadata is SongMetadata)
                                 {
-                                    artwork.BlurHash43 = _imageCache.CalculateBlurHash(cacheName, artworkKind, 4, 3);
-                                    artwork.BlurHash54 = _imageCache.CalculateBlurHash(cacheName, artworkKind, 5, 4);
-                                    artwork.BlurHash64 = _imageCache.CalculateBlurHash(cacheName, artworkKind, 6, 4);
+                                    artwork.BlurHash43 = await _imageCache.CalculateBlurHash(
+                                        cacheName,
+                                        artworkKind,
+                                        4,
+                                        3);
+                                    artwork.BlurHash54 = await _imageCache.CalculateBlurHash(
+                                        cacheName,
+                                        artworkKind,
+                                        5,
+                                        4);
+                                    artwork.BlurHash64 = await _imageCache.CalculateBlurHash(
+                                        cacheName,
+                                        artworkKind,
+                                        6,
+                                        4);
                                 }
 
                                 await _metadataRepository.UpdateArtworkPath(artwork);
@@ -220,9 +235,21 @@ public abstract class LocalFolderScanner
 
                                 if (metadata is SongMetadata)
                                 {
-                                    artwork.BlurHash43 = _imageCache.CalculateBlurHash(cacheName, artworkKind, 4, 3);
-                                    artwork.BlurHash54 = _imageCache.CalculateBlurHash(cacheName, artworkKind, 5, 4);
-                                    artwork.BlurHash64 = _imageCache.CalculateBlurHash(cacheName, artworkKind, 6, 4);
+                                    artwork.BlurHash43 = await _imageCache.CalculateBlurHash(
+                                        cacheName,
+                                        artworkKind,
+                                        4,
+                                        3);
+                                    artwork.BlurHash54 = await _imageCache.CalculateBlurHash(
+                                        cacheName,
+                                        artworkKind,
+                                        5,
+                                        4);
+                                    artwork.BlurHash64 = await _imageCache.CalculateBlurHash(
+                                        cacheName,
+                                        artworkKind,
+                                        6,
+                                        4);
                                 }
 
                                 metadata.Artwork.Add(artwork);

ErsatzTV.Core/Metadata/LocalMetadataProvider.cs

@@ -1,5 +1,4 @@
-using System.Xml.Serialization;
-using Bugsnag;
+using Bugsnag;
 using ErsatzTV.Core.Domain;
 using ErsatzTV.Core.Extensions;
 using ErsatzTV.Core.Interfaces.Metadata;
@@ -12,10 +11,7 @@ namespace ErsatzTV.Core.Metadata;
 
 public class LocalMetadataProvider : ILocalMetadataProvider
 {
-    private static readonly XmlSerializer MovieSerializer = new(typeof(MovieNfo));
-    private static readonly XmlSerializer TvShowSerializer = new(typeof(TvShowNfo));
-    private static readonly XmlSerializer ArtistSerializer = new(typeof(ArtistNfo));
-    private static readonly XmlSerializer MusicVideoSerializer = new(typeof(MusicVideoNfo));
+    private readonly IArtistNfoReader _artistNfoReader;
     private readonly IArtistRepository _artistRepository;
     private readonly IClient _client;
     private readonly IEpisodeNfoReader _episodeNfoReader;
@@ -23,13 +19,16 @@ public class LocalMetadataProvider : ILocalMetadataProvider
     private readonly ILocalFileSystem _localFileSystem;
     private readonly ILocalStatisticsProvider _localStatisticsProvider;
     private readonly ILogger<LocalMetadataProvider> _logger;
-
     private readonly IMetadataRepository _metadataRepository;
+    private readonly IMovieNfoReader _movieNfoReader;
     private readonly IMovieRepository _movieRepository;
+    private readonly IMusicVideoNfoReader _musicVideoNfoReader;
     private readonly IMusicVideoRepository _musicVideoRepository;
+    private readonly IOtherVideoNfoReader _otherVideoNfoReader;
     private readonly IOtherVideoRepository _otherVideoRepository;
     private readonly ISongRepository _songRepository;
     private readonly ITelevisionRepository _televisionRepository;
+    private readonly ITvShowNfoReader _tvShowNfoReader;
 
     public LocalMetadataProvider(
         IMetadataRepository metadataRepository,
@@ -41,7 +40,12 @@ public class LocalMetadataProvider : ILocalMetadataProvider
         ISongRepository songRepository,
         IFallbackMetadataProvider fallbackMetadataProvider,
         ILocalFileSystem localFileSystem,
+        IMovieNfoReader movieNfoReader,
         IEpisodeNfoReader episodeNfoReader,
+        IArtistNfoReader artistNfoReader,
+        IMusicVideoNfoReader musicVideoNfoReader,
+        ITvShowNfoReader tvShowNfoReader,
+        IOtherVideoNfoReader otherVideoNfoReader,
         ILocalStatisticsProvider localStatisticsProvider,
         IClient client,
         ILogger<LocalMetadataProvider> logger)
@@ -55,7 +59,12 @@ public class LocalMetadataProvider : ILocalMetadataProvider
         _songRepository = songRepository;
         _fallbackMetadataProvider = fallbackMetadataProvider;
         _localFileSystem = localFileSystem;
+        _movieNfoReader = movieNfoReader;
         _episodeNfoReader = episodeNfoReader;
+        _artistNfoReader = artistNfoReader;
+        _musicVideoNfoReader = musicVideoNfoReader;
+        _tvShowNfoReader = tvShowNfoReader;
+        _otherVideoNfoReader = otherVideoNfoReader;
         _localStatisticsProvider = localStatisticsProvider;
         _client = client;
         _logger = logger;
@@ -101,38 +110,77 @@ public class LocalMetadataProvider : ILocalMetadataProvider
         return fallbackMetadata;
     }
 
-    public Task<bool> RefreshSidecarMetadata(Movie movie, string nfoFileName) =>
-        LoadMovieMetadata(movie, nfoFileName).Bind(
-            maybeMetadata => maybeMetadata.Match(
-                metadata => ApplyMetadataUpdate(movie, metadata),
-                () => Task.FromResult(false)));
+    public async Task<bool> RefreshSidecarMetadata(Movie movie, string nfoFileName)
+    {
+        Option<MovieMetadata> maybeMetadata = await LoadMovieMetadata(movie, nfoFileName);
+        foreach (MovieMetadata metadata in maybeMetadata)
+        {
+            return await ApplyMetadataUpdate(movie, metadata);
+        }
 
-    public Task<bool> RefreshSidecarMetadata(Show televisionShow, string nfoFileName) =>
-        LoadTelevisionShowMetadata(nfoFileName).Bind(
-            maybeMetadata => maybeMetadata.Match(
-                metadata => ApplyMetadataUpdate(televisionShow, metadata),
-                () => Task.FromResult(false)));
+        return false;
+    }
 
-    public Task<bool> RefreshSidecarMetadata(Episode episode, string nfoFileName) =>
-        LoadEpisodeMetadata(episode, nfoFileName).Bind(metadata => ApplyMetadataUpdate(episode, metadata));
+    public async Task<bool> RefreshSidecarMetadata(Show televisionShow, string nfoFileName)
+    {
+        Option<ShowMetadata> maybeMetadata = await LoadTelevisionShowMetadata(nfoFileName);
+        foreach (ShowMetadata metadata in maybeMetadata)
+        {
+            return await ApplyMetadataUpdate(televisionShow, metadata);
+        }
 
-    public Task<bool> RefreshSidecarMetadata(Artist artist, string nfoFileName) =>
-        LoadArtistMetadata(nfoFileName).Bind(
-            maybeMetadata => maybeMetadata.Match(
-                metadata => ApplyMetadataUpdate(artist, metadata),
-                () => Task.FromResult(false)));
+        return false;
+    }
 
-    public Task<bool> RefreshSidecarMetadata(MusicVideo musicVideo, string nfoFileName) =>
-        LoadMusicVideoMetadata(nfoFileName).Bind(
-            maybeMetadata => maybeMetadata.Match(
-                metadata => ApplyMetadataUpdate(musicVideo, metadata),
-                () => RefreshFallbackMetadata(musicVideo)));
+    public async Task<bool> RefreshSidecarMetadata(Episode episode, string nfoFileName)
+    {
+        List<EpisodeMetadata> metadata = await LoadEpisodeMetadata(episode, nfoFileName);
+        return await ApplyMetadataUpdate(episode, metadata);
+    }
 
-    public Task<bool> RefreshTagMetadata(Song song, string ffprobePath) =>
-        LoadSongMetadata(song, ffprobePath).Bind(
-            maybeMetadata => maybeMetadata.Match(
-                metadata => ApplyMetadataUpdate(song, metadata),
-                () => RefreshFallbackMetadata(song)));
+    public async Task<bool> RefreshSidecarMetadata(Artist artist, string nfoFileName)
+    {
+        Option<ArtistMetadata> maybeMetadata = await LoadArtistMetadata(nfoFileName);
+        foreach (ArtistMetadata metadata in maybeMetadata)
+        {
+            return await ApplyMetadataUpdate(artist, metadata);
+        }
+
+        return false;
+    }
+
+    public async Task<bool> RefreshSidecarMetadata(MusicVideo musicVideo, string nfoFileName)
+    {
+        Option<MusicVideoMetadata> maybeMetadata = await LoadMusicVideoMetadata(nfoFileName);
+        foreach (MusicVideoMetadata metadata in maybeMetadata)
+        {
+            return await ApplyMetadataUpdate(musicVideo, metadata);
+        }
+
+        return await RefreshFallbackMetadata(musicVideo);
+    }
+
+    public async Task<bool> RefreshSidecarMetadata(OtherVideo otherVideo, string nfoFileName)
+    {
+        Option<OtherVideoMetadata> maybeMetadata = await LoadOtherVideoMetadata(nfoFileName);
+        foreach (OtherVideoMetadata metadata in maybeMetadata)
+        {
+            return await ApplyMetadataUpdate(otherVideo, metadata);
+        }
+
+        return await RefreshFallbackMetadata(otherVideo);
+    }
+
+    public async Task<bool> RefreshTagMetadata(Song song, string ffprobePath)
+    {
+        Option<SongMetadata> maybeMetadata = await LoadSongMetadata(song, ffprobePath);
+        foreach (SongMetadata metadata in maybeMetadata)
+        {
+            return await ApplyMetadataUpdate(song, metadata);
+        }
+
+        return await RefreshFallbackMetadata(song);
+    }
 
     public Task<bool> RefreshFallbackMetadata(Movie movie) =>
         ApplyMetadataUpdate(movie, _fallbackMetadataProvider.GetFallbackMetadata(movie));
@@ -143,20 +191,38 @@ public class LocalMetadataProvider : ILocalMetadataProvider
     public Task<bool> RefreshFallbackMetadata(Artist artist, string artistFolder) =>
         ApplyMetadataUpdate(artist, _fallbackMetadataProvider.GetFallbackMetadataForArtist(artistFolder));
 
-    public Task<bool> RefreshFallbackMetadata(OtherVideo otherVideo) =>
-        _fallbackMetadataProvider.GetFallbackMetadata(otherVideo).Match(
-            metadata => ApplyMetadataUpdate(otherVideo, metadata),
-            () => Task.FromResult(false));
+    public async Task<bool> RefreshFallbackMetadata(OtherVideo otherVideo)
+    {
+        Option<OtherVideoMetadata> maybeMetadata = _fallbackMetadataProvider.GetFallbackMetadata(otherVideo);
+        foreach (OtherVideoMetadata metadata in maybeMetadata)
+        {
+            return await ApplyMetadataUpdate(otherVideo, metadata);
+        }
 
-    public Task<bool> RefreshFallbackMetadata(Song song) =>
-        _fallbackMetadataProvider.GetFallbackMetadata(song).Match(
-            metadata => ApplyMetadataUpdate(song, metadata),
-            () => Task.FromResult(false));
+        return false;
+    }
 
-    public Task<bool> RefreshFallbackMetadata(MusicVideo musicVideo) =>
-        _fallbackMetadataProvider.GetFallbackMetadata(musicVideo).Match(
-            metadata => ApplyMetadataUpdate(musicVideo, metadata),
-            () => Task.FromResult(false));
+    public async Task<bool> RefreshFallbackMetadata(Song song)
+    {
+        Option<SongMetadata> maybeMetadata = _fallbackMetadataProvider.GetFallbackMetadata(song);
+        foreach (SongMetadata metadata in maybeMetadata)
+        {
+            return await ApplyMetadataUpdate(song, metadata);
+        }
+
+        return false;
+    }
+
+    public async Task<bool> RefreshFallbackMetadata(MusicVideo musicVideo)
+    {
+        Option<MusicVideoMetadata> maybeMetadata = _fallbackMetadataProvider.GetFallbackMetadata(musicVideo);
+        foreach (MusicVideoMetadata metadata in maybeMetadata)
+        {
+            return await ApplyMetadataUpdate(musicVideo, metadata);
+        }
+
+        return false;
+    }
 
     public Task<bool> RefreshFallbackMetadata(Show televisionShow, string showFolder) =>
         ApplyMetadataUpdate(televisionShow, _fallbackMetadataProvider.GetFallbackMetadataForShow(showFolder));
@@ -165,9 +231,16 @@ public class LocalMetadataProvider : ILocalMetadataProvider
     {
         try
         {
-            await using FileStream fileStream = File.Open(nfoFileName, FileMode.Open, FileAccess.Read);
-            Option<MusicVideoNfo> maybeNfo = MusicVideoSerializer.Deserialize(fileStream) as MusicVideoNfo;
-            foreach (MusicVideoNfo nfo in maybeNfo)
+            Either<BaseError, MusicVideoNfo> maybeNfo = await _musicVideoNfoReader.ReadFromFile(nfoFileName);
+            foreach (BaseError error in maybeNfo.LeftToSeq())
+            {
+                _logger.LogInformation(
+                    "Failed to read MusicVideo nfo metadata from {Path}: {Error}",
+                    nfoFileName,
+                    error.ToString());
+            }
+
+            foreach (MusicVideoNfo nfo in maybeNfo.RightToSeq())
             {
                 return new MusicVideoMetadata
                 {
@@ -177,8 +250,10 @@ public class LocalMetadataProvider : ILocalMetadataProvider
                     Album = nfo.Album,
                     Title = nfo.Title,
                     Plot = nfo.Plot,
-                    Year = GetYear(nfo.Year, nfo.Premiered),
-                    ReleaseDate = GetAired(nfo.Year, nfo.Premiered),
+                    Track = nfo.Track,
+                    Year = GetYear(nfo.Year, nfo.Aired),
+                    ReleaseDate = GetAired(nfo.Year, nfo.Aired),
+                    Artists = nfo.Artists.Map(a => new MusicVideoArtist { Name = a }).ToList(),
                     Genres = nfo.Genres.Map(g => new Genre { Name = g }).ToList(),
                     Tags = nfo.Tags.Map(t => new Tag { Name = t }).ToList(),
                     Studios = nfo.Studios.Map(s => new Studio { Name = s }).ToList()
@@ -690,6 +765,7 @@ public class LocalMetadataProvider : ILocalMetadataProvider
             existing.Title = metadata.Title;
             existing.Year = metadata.Year;
             existing.Plot = metadata.Plot;
+            existing.Track = metadata.Track;
             existing.Album = metadata.Album;
 
             if (existing.DateAdded == SystemTime.MinValueUtc)
@@ -713,6 +789,28 @@ public class LocalMetadataProvider : ILocalMetadataProvider
                 _musicVideoRepository.AddStudio,
                 (_, _) => Task.FromResult(false));
 
+            foreach (MusicVideoArtist artist in existing.Artists
+                         .Filter(g => metadata.Artists.All(g2 => g2.Name != g.Name))
+                         .ToList())
+            {
+                existing.Artists.Remove(artist);
+                if (await _musicVideoRepository.RemoveArtist(artist))
+                {
+                    updated = true;
+                }
+            }
+
+            foreach (MusicVideoArtist artist in metadata.Artists
+                         .Filter(g => existing.Artists.All(g2 => g2.Name != g.Name))
+                         .ToList())
+            {
+                existing.Artists.Add(artist);
+                if (await _musicVideoRepository.AddArtist(existing, artist))
+                {
+                    updated = true;
+                }
+            }
+
             return await _metadataRepository.Update(existing) || updated;
         }
 
@@ -730,6 +828,10 @@ public class LocalMetadataProvider : ILocalMetadataProvider
         Option<OtherVideoMetadata> maybeMetadata = Optional(otherVideo.OtherVideoMetadata).Flatten().HeadOrNone();
         foreach (OtherVideoMetadata existing in maybeMetadata)
         {
+            existing.ContentRating = metadata.ContentRating;
+            existing.Outline = metadata.Outline;
+            existing.Plot = metadata.Plot;
+            existing.Tagline = metadata.Tagline;
             existing.Title = metadata.Title;
 
             if (existing.DateAdded == SystemTime.MinValueUtc)
@@ -739,6 +841,9 @@ public class LocalMetadataProvider : ILocalMetadataProvider
 
             existing.DateUpdated = metadata.DateUpdated;
             existing.MetadataKind = metadata.MetadataKind;
+            existing.OriginalTitle = metadata.OriginalTitle;
+            existing.ReleaseDate = metadata.ReleaseDate;
+            existing.Year = metadata.Year;
             existing.SortTitle = string.IsNullOrWhiteSpace(metadata.SortTitle)
                 ? _fallbackMetadataProvider.GetSortTitle(metadata.Title)
                 : metadata.SortTitle;
@@ -747,10 +852,70 @@ public class LocalMetadataProvider : ILocalMetadataProvider
             bool updated = await UpdateMetadataCollections(
                 existing,
                 metadata,
-                (_, _) => Task.FromResult(false),
+                _otherVideoRepository.AddGenre,
                 _otherVideoRepository.AddTag,
-                (_, _) => Task.FromResult(false),
-                (_, _) => Task.FromResult(false));
+                _otherVideoRepository.AddStudio,
+                _otherVideoRepository.AddActor);
+
+            foreach (Director director in existing.Directors
+                         .Filter(d => metadata.Directors.All(d2 => d2.Name != d.Name)).ToList())
+            {
+                existing.Directors.Remove(director);
+                if (await _metadataRepository.RemoveDirector(director))
+                {
+                    updated = true;
+                }
+            }
+
+            foreach (Director director in metadata.Directors
+                         .Filter(d => existing.Directors.All(d2 => d2.Name != d.Name)).ToList())
+            {
+                existing.Directors.Add(director);
+                if (await _otherVideoRepository.AddDirector(existing, director))
+                {
+                    updated = true;
+                }
+            }
+
+            foreach (Writer writer in existing.Writers
+                         .Filter(w => metadata.Writers.All(w2 => w2.Name != w.Name)).ToList())
+            {
+                existing.Writers.Remove(writer);
+                if (await _metadataRepository.RemoveWriter(writer))
+                {
+                    updated = true;
+                }
+            }
+
+            foreach (Writer writer in metadata.Writers
+                         .Filter(w => existing.Writers.All(w2 => w2.Name != w.Name)).ToList())
+            {
+                existing.Writers.Add(writer);
+                if (await _otherVideoRepository.AddWriter(existing, writer))
+                {
+                    updated = true;
+                }
+            }
+
+            foreach (MetadataGuid guid in existing.Guids
+                         .Filter(g => metadata.Guids.All(g2 => g2.Guid != g.Guid)).ToList())
+            {
+                existing.Guids.Remove(guid);
+                if (await _metadataRepository.RemoveGuid(guid))
+                {
+                    updated = true;
+                }
+            }
+
+            foreach (MetadataGuid guid in metadata.Guids
+                         .Filter(g => existing.Guids.All(g2 => g2.Guid != g.Guid)).ToList())
+            {
+                existing.Guids.Add(guid);
+                if (await _metadataRepository.AddGuid(existing, guid))
+                {
+                    updated = true;
+                }
+            }
 
             return await _metadataRepository.Update(existing) || updated;
         }
@@ -812,9 +977,16 @@ public class LocalMetadataProvider : ILocalMetadataProvider
     {
         try
         {
-            await using FileStream fileStream = File.Open(nfoFileName, FileMode.Open, FileAccess.Read);
-            Option<TvShowNfo> maybeNfo = TvShowSerializer.Deserialize(fileStream) as TvShowNfo;
-            foreach (TvShowNfo nfo in maybeNfo)
+            Either<BaseError, TvShowNfo> maybeNfo = await _tvShowNfoReader.ReadFromFile(nfoFileName);
+            foreach (BaseError error in maybeNfo.LeftToSeq())
+            {
+                _logger.LogInformation(
+                    "Failed to read TvShow nfo metadata from {Path}: {Error}",
+                    nfoFileName,
+                    error.ToString());
+            }
+
+            foreach (TvShowNfo nfo in maybeNfo.RightToSeq())
             {
                 DateTime dateAdded = DateTime.UtcNow;
                 DateTime dateUpdated = File.GetLastWriteTimeUtc(nfoFileName);
@@ -855,9 +1027,16 @@ public class LocalMetadataProvider : ILocalMetadataProvider
     {
         try
         {
-            await using FileStream fileStream = File.Open(nfoFileName, FileMode.Open, FileAccess.Read);
-            Option<ArtistNfo> maybeNfo = ArtistSerializer.Deserialize(fileStream) as ArtistNfo;
-            foreach (ArtistNfo nfo in maybeNfo)
+            Either<BaseError, ArtistNfo> maybeNfo = await _artistNfoReader.ReadFromFile(nfoFileName);
+            foreach (BaseError error in maybeNfo.LeftToSeq())
+            {
+                _logger.LogInformation(
+                    "Failed to read Artist nfo metadata from {Path}: {Error}",
+                    nfoFileName,
+                    error.ToString());
+            }
+
+            foreach (ArtistNfo nfo in maybeNfo.RightToSeq())
             {
                 return new ArtistMetadata
                 {
@@ -887,10 +1066,17 @@ public class LocalMetadataProvider : ILocalMetadataProvider
     {
         try
         {
-            await using FileStream fileStream = File.Open(nfoFileName, FileMode.Open, FileAccess.Read);
-            List<TvShowEpisodeNfo> nfos = await _episodeNfoReader.Read(fileStream);
+            Either<BaseError, List<TvShowEpisodeNfo>> maybeNfo = await _episodeNfoReader.ReadFromFile(nfoFileName);
+            foreach (BaseError error in maybeNfo.LeftToSeq())
+            {
+                _logger.LogInformation(
+                    "Failed to read Episode nfo metadata from {Path}: {Error}",
+                    nfoFileName,
+                    error.ToString());
+            }
+
             var result = new List<EpisodeMetadata>();
-            foreach (TvShowEpisodeNfo nfo in nfos)
+            foreach (TvShowEpisodeNfo nfo in maybeNfo.RightToSeq().Flatten())
             {
                 DateTime dateAdded = DateTime.UtcNow;
                 DateTime dateUpdated = File.GetLastWriteTimeUtc(nfoFileName);
@@ -935,22 +1121,52 @@ public class LocalMetadataProvider : ILocalMetadataProvider
     {
         try
         {
-            await using FileStream fileStream = File.Open(nfoFileName, FileMode.Open, FileAccess.Read);
-            Option<MovieNfo> maybeNfo = MovieSerializer.Deserialize(fileStream) as MovieNfo;
-            foreach (MovieNfo nfo in maybeNfo)
+            Either<BaseError, MovieNfo> maybeNfo = await _movieNfoReader.ReadFromFile(nfoFileName);
+            foreach (BaseError error in maybeNfo.LeftToSeq())
+            {
+                _logger.LogInformation(
+                    "Failed to read Movie nfo metadata from {Path}: {Error}",
+                    nfoFileName,
+                    error.ToString());
+
+                return _fallbackMetadataProvider.GetFallbackMetadata(movie);
+            }
+
+            foreach (MovieNfo nfo in maybeNfo.RightToSeq())
             {
                 DateTime dateAdded = DateTime.UtcNow;
                 DateTime dateUpdated = File.GetLastWriteTimeUtc(nfoFileName);
 
+                var year = 0;
+                if (nfo.Year > 1000)
+                {
+                    year = nfo.Year;
+                }
+
+                DateTime releaseDate = year > 0
+                    ? new DateTimeOffset(year, 1, 1, 0, 0, 0, TimeSpan.Zero).UtcDateTime
+                    : SystemTime.MinValueUtc;
+
+                foreach (DateTime premiered in nfo.Premiered)
+                {
+                    if (year == 0)
+                    {
+                        year = premiered.Year;
+                    }
+
+                    releaseDate = premiered;
+                }
+
                 return new MovieMetadata
                 {
                     MetadataKind = MetadataKind.Sidecar,
                     DateAdded = dateAdded,
                     DateUpdated = dateUpdated,
                     Title = nfo.Title,
-                    Year = nfo.Year,
+                    SortTitle = nfo.SortTitle,
+                    Year = year,
                     ContentRating = nfo.ContentRating,
-                    ReleaseDate = nfo.Premiered,
+                    ReleaseDate = releaseDate,
                     Plot = nfo.Plot,
                     Outline = nfo.Outline,
                     Tagline = nfo.Tagline,
@@ -976,36 +1192,105 @@ public class LocalMetadataProvider : ILocalMetadataProvider
         }
     }
 
-    private static int? GetYear(int? year, string premiered)
+    private async Task<Option<OtherVideoMetadata>> LoadOtherVideoMetadata(string nfoFileName)
+    {
+        try
+        {
+            Either<BaseError, OtherVideoNfo> maybeNfo = await _otherVideoNfoReader.ReadFromFile(nfoFileName);
+            foreach (BaseError error in maybeNfo.LeftToSeq())
+            {
+                _logger.LogInformation(
+                    "Failed to read OtherVideo nfo metadata from {Path}: {Error}",
+                    nfoFileName,
+                    error.ToString());
+
+                return None;
+            }
+
+            foreach (OtherVideoNfo nfo in maybeNfo.RightToSeq())
+            {
+                DateTime dateAdded = DateTime.UtcNow;
+                DateTime dateUpdated = File.GetLastWriteTimeUtc(nfoFileName);
+
+                var year = 0;
+                if (nfo.Year > 1000)
+                {
+                    year = nfo.Year;
+                }
+
+                DateTime releaseDate = year > 0
+                    ? new DateTimeOffset(year, 1, 1, 0, 0, 0, TimeSpan.Zero).UtcDateTime
+                    : SystemTime.MinValueUtc;
+
+                foreach (DateTime premiered in nfo.Premiered)
+                {
+                    if (year == 0)
+                    {
+                        year = premiered.Year;
+                    }
+
+                    releaseDate = premiered;
+                }
+
+                return new OtherVideoMetadata
+                {
+                    MetadataKind = MetadataKind.Sidecar,
+                    DateAdded = dateAdded,
+                    DateUpdated = dateUpdated,
+                    Title = nfo.Title,
+                    SortTitle = nfo.SortTitle,
+                    Year = year,
+                    ContentRating = nfo.ContentRating,
+                    ReleaseDate = releaseDate,
+                    Plot = nfo.Plot,
+                    Outline = nfo.Outline,
+                    Tagline = nfo.Tagline,
+                    Genres = nfo.Genres.Map(g => new Genre { Name = g }).ToList(),
+                    Tags = nfo.Tags.Map(t => new Tag { Name = t }).ToList(),
+                    Studios = nfo.Studios.Map(s => new Studio { Name = s }).ToList(),
+                    Actors = Actors(nfo.Actors, dateAdded, dateUpdated),
+                    Directors = nfo.Directors.Map(d => new Director { Name = d }).ToList(),
+                    Writers = nfo.Writers.Map(w => new Writer { Name = w }).ToList(),
+                    Guids = nfo.UniqueIds
+                        .Map(id => new MetadataGuid { Guid = $"{id.Type}://{id.Guid}" })
+                        .ToList()
+                };
+            }
+        }
+        catch (Exception ex)
+        {
+            _logger.LogInformation(ex, "Failed to read OtherVideo nfo metadata from {Path}", nfoFileName);
+            _client.Notify(ex);
+        }
+
+        return None;
+    }
+
+    private static int? GetYear(int? year, Option<DateTime> premiered)
     {
         if (year is > 1000)
         {
             return year;
         }
 
-        if (string.IsNullOrWhiteSpace(premiered))
+        foreach (DateTime p in premiered)
         {
-            return null;
-        }
-
-        if (DateTime.TryParse(premiered, out DateTime parsed))
-        {
-            return parsed.Year;
+            return p.Year;
         }
 
         return null;
     }
 
-    private static DateTime? GetAired(int? year, string aired)
+    private static DateTime? GetAired(int? year, Option<DateTime> aired)
     {
         DateTime? fallback = year is > 1000 ? new DateTime(year.Value, 1, 1) : null;
 
-        if (string.IsNullOrWhiteSpace(aired))
+        foreach (DateTime a in aired)
         {
-            return fallback;
+            return a;
         }
 
-        return DateTime.TryParse(aired, out DateTime parsed) ? parsed : fallback;
+        return fallback;
     }
 
     private async Task<bool> UpdateMetadataCollections<T>(

ErsatzTV.Core/Metadata/MusicVideoFolderScanner.cs

@@ -307,6 +307,8 @@ public class MusicVideoFolderScanner : LocalFolderScanner, IMusicVideoFolderScan
                 continue;
             }
 
+            var hasErrors = false;
+
             foreach (string file in allFiles.OrderBy(identity))
             {
                 // TODO: figure out how to rebuild playouts
@@ -321,6 +323,7 @@ public class MusicVideoFolderScanner : LocalFolderScanner, IMusicVideoFolderScan
                 foreach (BaseError error in maybeMusicVideo.LeftToSeq())
                 {
                     _logger.LogWarning("Error processing music video at {Path}: {Error}", file, error.Value);
+                    hasErrors = true;
                 }
 
                 foreach (MediaItemScanResult<MusicVideo> result in maybeMusicVideo.RightToSeq())
@@ -329,10 +332,14 @@ public class MusicVideoFolderScanner : LocalFolderScanner, IMusicVideoFolderScan
                     {
                         await _searchIndex.RebuildItems(_searchRepository, new List<int> { result.Item.Id });
                     }
-
-                    await _libraryRepository.SetEtag(libraryPath, knownFolder, musicVideoFolder, etag);
                 }
             }
+
+            // only do this once per folder and only if all files processed successfully
+            if (!hasErrors)
+            {
+                await _libraryRepository.SetEtag(libraryPath, knownFolder, musicVideoFolder, etag);
+            }
         }
 
         return Unit.Default;

ErsatzTV.Core/Metadata/Nfo/ArtistNfoReader.cs

@@ -0,0 +1,109 @@
+using System.Xml;
+using Bugsnag;
+using ErsatzTV.Core.Errors;
+using ErsatzTV.Core.Interfaces.Metadata.Nfo;
+using Microsoft.Extensions.Logging;
+using Microsoft.IO;
+
+namespace ErsatzTV.Core.Metadata.Nfo;
+
+public class ArtistNfoReader : NfoReader<ArtistNfo>, IArtistNfoReader
+{
+    private readonly IClient _client;
+    private readonly ILogger<ArtistNfoReader> _logger;
+
+    public ArtistNfoReader(
+        RecyclableMemoryStreamManager recyclableMemoryStreamManager,
+        IClient client,
+        ILogger<ArtistNfoReader> logger)
+        : base(recyclableMemoryStreamManager, logger)
+    {
+        _client = client;
+        _logger = logger;
+    }
+
+    public async Task<Either<BaseError, ArtistNfo>> ReadFromFile(string fileName)
+    {
+        // ReSharper disable once ConvertToUsingDeclaration
+        await using (Stream s = await SanitizedStreamForFile(fileName))
+        {
+            return await Read(s);
+        }
+    }
+
+    internal async Task<Either<BaseError, ArtistNfo>> Read(Stream input)
+    {
+        ArtistNfo nfo = null;
+
+        try
+        {
+            var settings = new XmlReaderSettings { Async = true, ConformanceLevel = ConformanceLevel.Fragment };
+            using var reader = XmlReader.Create(input, settings);
+            var done = false;
+
+            while (!done && await reader.ReadAsync())
+            {
+                switch (reader.NodeType)
+                {
+                    case XmlNodeType.Element:
+                        switch (reader.Name.ToLowerInvariant())
+                        {
+                            case "artist":
+                                nfo = new ArtistNfo
+                                {
+                                    Genres = new List<string>(),
+                                    Styles = new List<string>(),
+                                    Moods = new List<string>()
+                                };
+                                break;
+                            case "name":
+                                await ReadStringContent(reader, nfo, (artist, name) => artist.Name = name);
+                                break;
+                            case "disambiguation":
+                                await ReadStringContent(
+                                    reader,
+                                    nfo,
+                                    (artist, disambiguation) => artist.Disambiguation = disambiguation);
+                                break;
+                            case "genre":
+                                await ReadStringContent(reader, nfo, (artist, genre) => artist.Genres.Add(genre));
+                                break;
+                            case "style":
+                                await ReadStringContent(reader, nfo, (artist, style) => artist.Styles.Add(style));
+                                break;
+                            case "mood":
+                                await ReadStringContent(reader, nfo, (artist, mood) => artist.Moods.Add(mood));
+                                break;
+                            case "biography":
+                                await ReadStringContent(
+                                    reader,
+                                    nfo,
+                                    (artist, biography) => artist.Biography = biography);
+                                break;
+                        }
+
+                        break;
+                    case XmlNodeType.EndElement:
+                        if (reader.Name == "artist")
+                        {
+                            done = true;
+                        }
+
+                        break;
+                }
+            }
+
+            return Optional(nfo).ToEither((BaseError)new FailedToReadNfo());
+        }
+        catch (XmlException)
+        {
+            _logger.LogWarning("Invalid XML detected; returning incomplete metadata");
+            return Optional(nfo).ToEither((BaseError)new FailedToReadNfo());
+        }
+        catch (Exception ex)
+        {
+            _client.Notify(ex);
+            return new FailedToReadNfo(ex.ToString());
+        }
+    }
+}

ErsatzTV.Core/Metadata/Nfo/EpisodeNfoReader.cs

@@ -1,197 +1,128 @@
 using System.Xml;
-using System.Xml.Linq;
+using Bugsnag;
+using ErsatzTV.Core.Errors;
 using ErsatzTV.Core.Interfaces.Metadata.Nfo;
+using Microsoft.Extensions.Logging;
+using Microsoft.IO;
 
 namespace ErsatzTV.Core.Metadata.Nfo;
 
-public class EpisodeNfoReader : IEpisodeNfoReader
+public class EpisodeNfoReader : NfoReader<TvShowEpisodeNfo>, IEpisodeNfoReader
 {
-    public async Task<List<TvShowEpisodeNfo>> Read(Stream input)
+    private readonly IClient _client;
+    private readonly ILogger<EpisodeNfoReader> _logger;
+
+    public EpisodeNfoReader(
+        RecyclableMemoryStreamManager recyclableMemoryStreamManager,
+        IClient client,
+        ILogger<EpisodeNfoReader> logger)
+        : base(recyclableMemoryStreamManager, logger)
+    {
+        _client = client;
+        _logger = logger;
+    }
+
+    public async Task<Either<BaseError, List<TvShowEpisodeNfo>>> ReadFromFile(string fileName)
+    {
+        // ReSharper disable once ConvertToUsingDeclaration
+        await using (Stream s = await SanitizedStreamForFile(fileName))
+        {
+            return await Read(s);
+        }
+    }
+
+    internal async Task<Either<BaseError, List<TvShowEpisodeNfo>>> Read(Stream input)
     {
         var result = new List<TvShowEpisodeNfo>();
 
-        var settings = new XmlReaderSettings { Async = true, ConformanceLevel = ConformanceLevel.Fragment };
-        using var reader = XmlReader.Create(input, settings);
-        TvShowEpisodeNfo nfo = null;
-
-        while (await reader.ReadAsync())
+        try
         {
-            switch (reader.NodeType)
-            {
-                case XmlNodeType.Element:
-                    switch (reader.Name.ToLowerInvariant())
-                    {
-                        case "episodedetails":
-                            nfo = new TvShowEpisodeNfo
-                            {
-                                UniqueIds = new List<UniqueIdNfo>(),
-                                Actors = new List<ActorNfo>(),
-                                Writers = new List<string>(),
-                                Directors = new List<string>()
-                            };
-                            break;
-                        case "title":
-                            await ReadTitle(reader, nfo);
-                            break;
-                        case "showtitle":
-                            await ReadShowTitle(reader, nfo);
-                            break;
-                        case "episode":
-                            await ReadEpisode(reader, nfo);
-                            break;
-                        case "season":
-                            await ReadSeason(reader, nfo);
-                            break;
-                        case "uniqueid":
-                            await ReadUniqueId(reader, nfo);
-                            break;
-                        case "mpaa":
-                            await ReadContentRating(reader, nfo);
-                            break;
-                        case "aired":
-                            // TODO: parse the date here
-                            await ReadAired(reader, nfo);
-                            break;
-                        case "plot":
-                            await ReadPlot(reader, nfo);
-                            break;
-                        case "actor":
-                            ReadActor(reader, nfo);
-                            break;
-                        case "credits":
-                            await ReadWriter(reader, nfo);
-                            break;
-                        case "director":
-                            await ReadDirector(reader, nfo);
-                            break;
-                    }
+            using var reader = XmlReader.Create(input, Settings);
+            TvShowEpisodeNfo nfo = null;
 
-                    break;
-                case XmlNodeType.EndElement:
-                    switch (reader.Name.ToLowerInvariant())
-                    {
-                        case "episodedetails":
-                            if (nfo != null)
-                            {
+            while (await reader.ReadAsync())
+            {
+                switch (reader.NodeType)
+                {
+                    case XmlNodeType.Element:
+                        switch (reader.Name.ToLowerInvariant())
+                        {
+                            case "episodedetails":
+                                nfo = new TvShowEpisodeNfo
+                                {
+                                    UniqueIds = new List<UniqueIdNfo>(),
+                                    Actors = new List<ActorNfo>(),
+                                    Writers = new List<string>(),
+                                    Directors = new List<string>()
+                                };
+                                // immediately add so we have something to return if we encounter invalid characters
                                 result.Add(nfo);
-                            }
+                                break;
+                            case "title":
+                                await ReadStringContent(reader, nfo, (episode, title) => episode.Title = title);
+                                break;
+                            case "showtitle":
+                                await ReadStringContent(
+                                    reader,
+                                    nfo,
+                                    (episode, showTitle) => episode.ShowTitle = showTitle);
+                                break;
+                            case "episode":
+                                await ReadIntContent(
+                                    reader,
+                                    nfo,
+                                    (episode, episodeNumber) => episode.Episode = episodeNumber);
+                                break;
+                            case "season":
+                                await ReadIntContent(
+                                    reader,
+                                    nfo,
+                                    (episode, seasonNumber) => episode.Season = seasonNumber);
+                                break;
+                            case "uniqueid":
+                                await ReadUniqueId(reader, nfo, (episode, uniqueId) => episode.UniqueIds.Add(uniqueId));
+                                break;
+                            case "mpaa":
+                                await ReadStringContent(
+                                    reader,
+                                    nfo,
+                                    (episode, contentRating) => episode.ContentRating = contentRating);
+                                break;
+                            case "aired":
+                                await ReadDateTimeContent(reader, nfo, (episode, aired) => episode.Aired = aired);
+                                break;
+                            case "plot":
+                                await ReadStringContent(reader, nfo, (episode, plot) => episode.Plot = plot);
+                                break;
+                            case "actor":
+                                ReadActor(reader, nfo, (episode, actor) => episode.Actors.Add(actor));
+                                break;
+                            case "credits":
+                                await ReadStringContent(reader, nfo, (episode, writer) => episode.Writers.Add(writer));
+                                break;
+                            case "director":
+                                await ReadStringContent(
+                                    reader,
+                                    nfo,
+                                    (episode, director) => episode.Directors.Add(director));
+                                break;
+                        }
 
-                            break;
-                    }
-
-                    break;
-            }
-        }
-
-        return result;
-    }
-
-    private static async Task ReadTitle(XmlReader reader, TvShowEpisodeNfo nfo)
-    {
-        if (nfo != null)
-        {
-            nfo.Title = await reader.ReadElementContentAsStringAsync();
-        }
-    }
-
-    private static async Task ReadShowTitle(XmlReader reader, TvShowEpisodeNfo nfo)
-    {
-        if (nfo != null)
-        {
-            nfo.ShowTitle = await reader.ReadElementContentAsStringAsync();
-        }
-    }
-
-    private static async Task ReadEpisode(XmlReader reader, TvShowEpisodeNfo nfo)
-    {
-        if (nfo != null)
-        {
-            bool _ = int.TryParse(await reader.ReadElementContentAsStringAsync(), out int episode);
-            nfo.Episode = episode;
-        }
-    }
-
-    private static async Task ReadSeason(XmlReader reader, TvShowEpisodeNfo nfo)
-    {
-        if (nfo != null)
-        {
-            bool _ = int.TryParse(await reader.ReadElementContentAsStringAsync(), out int season);
-            nfo.Season = season;
-        }
-    }
-
-    private static async Task ReadUniqueId(XmlReader reader, TvShowEpisodeNfo nfo)
-    {
-        if (nfo != null)
-        {
-            var uniqueId = new UniqueIdNfo();
-            reader.MoveToAttribute("default");
-            uniqueId.Default = bool.TryParse(reader.Value, out bool def) && def;
-            reader.MoveToAttribute("type");
-            uniqueId.Type = reader.Value;
-            reader.MoveToElement();
-            uniqueId.Guid = await reader.ReadElementContentAsStringAsync();
-
-            nfo.UniqueIds.Add(uniqueId);
-        }
-    }
-
-    private static async Task ReadContentRating(XmlReader reader, TvShowEpisodeNfo nfo)
-    {
-        if (nfo != null)
-        {
-            nfo.ContentRating = await reader.ReadElementContentAsStringAsync();
-        }
-    }
-
-    private static async Task ReadAired(XmlReader reader, TvShowEpisodeNfo nfo)
-    {
-        if (nfo != null)
-        {
-            nfo.Aired = await reader.ReadElementContentAsStringAsync();
-        }
-    }
-
-    private static async Task ReadPlot(XmlReader reader, TvShowEpisodeNfo nfo)
-    {
-        if (nfo != null)
-        {
-            nfo.Plot = await reader.ReadElementContentAsStringAsync();
-        }
-    }
-
-    private static void ReadActor(XmlReader reader, TvShowEpisodeNfo nfo)
-    {
-        if (nfo != null)
-        {
-            var actor = new ActorNfo();
-            var element = (XElement)XNode.ReadFrom(reader);
-
-            XElement name = element.Element("name");
-            if (name != null)
-            {
-                actor.Name = name.Value;
+                        break;
+                }
             }
 
-            XElement role = element.Element("role");
-            if (role != null)
-            {
-                actor.Role = role.Value;
-            }
-
-            XElement thumb = element.Element("thumb");
-            if (thumb != null)
-            {
-                actor.Thumb = thumb.Value;
-            }
-
-            nfo.Actors.Add(actor);
+            return result;
+        }
+        catch (XmlException)
+        {
+            _logger.LogWarning("Invalid XML detected; returning incomplete metadata");
+            return result;
+        }
+        catch (Exception ex)
+        {
+            _client.Notify(ex);
+            return new FailedToReadNfo(ex.ToString());
         }
     }
-
-    private static async Task ReadWriter(XmlReader reader, TvShowEpisodeNfo nfo) =>
-        nfo?.Writers.Add(await reader.ReadElementContentAsStringAsync());
-
-    private static async Task ReadDirector(XmlReader reader, TvShowEpisodeNfo nfo) =>
-        nfo?.Directors.Add(await reader.ReadElementContentAsStringAsync());
 }

ErsatzTV.Core/Metadata/Nfo/MovieNfo.cs

@@ -8,6 +8,9 @@ public class MovieNfo
     [XmlElement("title")]
     public string Title { get; set; }
 
+    [XmlElement("sorttitle")]
+    public string SortTitle { get; set; }
+
     [XmlElement("outline")]
     public string Outline { get; set; }
 
@@ -18,7 +21,7 @@ public class MovieNfo
     public string ContentRating { get; set; }
 
     [XmlElement("premiered")]
-    public DateTime Premiered { get; set; }
+    public Option<DateTime> Premiered { get; set; }
 
     [XmlElement("plot")]
     public string Plot { get; set; }

ErsatzTV.Core/Metadata/Nfo/MovieNfoReader.cs

@@ -0,0 +1,140 @@
+using System.Xml;
+using Bugsnag;
+using ErsatzTV.Core.Errors;
+using ErsatzTV.Core.Interfaces.Metadata.Nfo;
+using Microsoft.Extensions.Logging;
+using Microsoft.IO;
+
+namespace ErsatzTV.Core.Metadata.Nfo;
+
+public class MovieNfoReader : NfoReader<MovieNfo>, IMovieNfoReader
+{
+    private readonly IClient _client;
+    private readonly ILogger<MovieNfoReader> _logger;
+
+    public MovieNfoReader(
+        RecyclableMemoryStreamManager recyclableMemoryStreamManager,
+        IClient client,
+        ILogger<MovieNfoReader> logger)
+        : base(recyclableMemoryStreamManager, logger)
+    {
+        _client = client;
+        _logger = logger;
+    }
+
+    public async Task<Either<BaseError, MovieNfo>> ReadFromFile(string fileName)
+    {
+        // ReSharper disable once ConvertToUsingDeclaration
+        await using (Stream s = await SanitizedStreamForFile(fileName))
+        {
+            return await Read(s);
+        }
+    }
+
+    internal async Task<Either<BaseError, MovieNfo>> Read(Stream input)
+    {
+        MovieNfo nfo = null;
+
+        try
+        {
+            var settings = new XmlReaderSettings { Async = true, ConformanceLevel = ConformanceLevel.Fragment };
+            using var reader = XmlReader.Create(input, settings);
+            var done = false;
+
+            while (!done && await reader.ReadAsync())
+            {
+                switch (reader.NodeType)
+                {
+                    case XmlNodeType.Element:
+                        switch (reader.Name.ToLowerInvariant())
+                        {
+                            case "movie":
+                                nfo = new MovieNfo
+                                {
+                                    Genres = new List<string>(),
+                                    Tags = new List<string>(),
+                                    Studios = new List<string>(),
+                                    Actors = new List<ActorNfo>(),
+                                    Writers = new List<string>(),
+                                    Directors = new List<string>(),
+                                    UniqueIds = new List<UniqueIdNfo>()
+                                };
+                                break;
+                            case "title":
+                                await ReadStringContent(reader, nfo, (movie, title) => movie.Title = title);
+                                break;
+                            case "sorttitle":
+                                await ReadStringContent(reader, nfo, (movie, sortTitle) => movie.SortTitle = sortTitle);
+                                break;
+                            case "outline":
+                                await ReadStringContent(reader, nfo, (movie, outline) => movie.Outline = outline);
+                                break;
+                            case "year":
+                                await ReadIntContent(reader, nfo, (movie, year) => movie.Year = year);
+                                break;
+                            case "mpaa":
+                                await ReadStringContent(
+                                    reader,
+                                    nfo,
+                                    (movie, contentRating) => movie.ContentRating = contentRating);
+                                break;
+                            case "premiered":
+                                await ReadDateTimeContent(
+                                    reader,
+                                    nfo,
+                                    (movie, premiered) => movie.Premiered = premiered);
+                                break;
+                            case "plot":
+                                await ReadStringContent(reader, nfo, (movie, plot) => movie.Plot = plot);
+                                break;
+                            case "genre":
+                                await ReadStringContent(reader, nfo, (movie, genre) => movie.Genres.Add(genre));
+                                break;
+                            case "tag":
+                                await ReadStringContent(reader, nfo, (movie, tag) => movie.Tags.Add(tag));
+                                break;
+                            case "studio":
+                                await ReadStringContent(reader, nfo, (movie, studio) => movie.Studios.Add(studio));
+                                break;
+                            case "actor":
+                                ReadActor(reader, nfo, (movie, actor) => movie.Actors.Add(actor));
+                                break;
+                            case "credits":
+                                await ReadStringContent(reader, nfo, (movie, writer) => movie.Writers.Add(writer));
+                                break;
+                            case "director":
+                                await ReadStringContent(
+                                    reader,
+                                    nfo,
+                                    (movie, director) => movie.Directors.Add(director));
+                                break;
+                            case "uniqueid":
+                                await ReadUniqueId(reader, nfo, (movie, uniqueid) => movie.UniqueIds.Add(uniqueid));
+                                break;
+                        }
+
+                        break;
+                    case XmlNodeType.EndElement:
+                        if (reader.Name == "movie")
+                        {
+                            done = true;
+                        }
+
+                        break;
+                }
+            }
+
+            return Optional(nfo).ToEither((BaseError)new FailedToReadNfo());
+        }
+        catch (XmlException)
+        {
+            _logger.LogWarning("Invalid XML detected; returning incomplete metadata");
+            return Optional(nfo).ToEither((BaseError)new FailedToReadNfo());
+        }
+        catch (Exception ex)
+        {
+            _client.Notify(ex);
+            return new FailedToReadNfo(ex.ToString());
+        }
+    }
+}

ErsatzTV.Core/Metadata/Nfo/MusicVideoNfo.cs

@@ -6,7 +6,7 @@ namespace ErsatzTV.Core.Metadata.Nfo;
 public class MusicVideoNfo
 {
     [XmlElement("artist")]
-    public string Artist { get; set; }
+    public List<string> Artists { get; set; }
 
     [XmlElement("title")]
     public string Title { get; set; }
@@ -17,8 +17,11 @@ public class MusicVideoNfo
     [XmlElement("plot")]
     public string Plot { get; set; }
 
-    [XmlElement("premiered")]
-    public string Premiered { get; set; }
+    [XmlElement("track")]
+    public int Track { get; set; }
+
+    [XmlElement("aired")]
+    public Option<DateTime> Aired { get; set; }
 
     [XmlElement("year")]
     public int Year { get; set; }

ErsatzTV.Core/Metadata/Nfo/MusicVideoNfoReader.cs

@@ -0,0 +1,125 @@
+using System.Xml;
+using Bugsnag;
+using ErsatzTV.Core.Errors;
+using ErsatzTV.Core.Interfaces.Metadata.Nfo;
+using Microsoft.Extensions.Logging;
+using Microsoft.IO;
+
+namespace ErsatzTV.Core.Metadata.Nfo;
+
+public class MusicVideoNfoReader : NfoReader<MusicVideoNfo>, IMusicVideoNfoReader
+{
+    private readonly IClient _client;
+    private readonly ILogger<MusicVideoNfoReader> _logger;
+
+    public MusicVideoNfoReader(
+        RecyclableMemoryStreamManager recyclableMemoryStreamManager,
+        IClient client,
+        ILogger<MusicVideoNfoReader> logger)
+        : base(recyclableMemoryStreamManager, logger)
+    {
+        _client = client;
+        _logger = logger;
+    }
+
+    public async Task<Either<BaseError, MusicVideoNfo>> ReadFromFile(string fileName)
+    {
+        // ReSharper disable once ConvertToUsingDeclaration
+        await using (Stream s = await SanitizedStreamForFile(fileName))
+        {
+            return await Read(s);
+        }
+    }
+
+    internal async Task<Either<BaseError, MusicVideoNfo>> Read(Stream input)
+    {
+        MusicVideoNfo nfo = null;
+
+        try
+        {
+            var settings = new XmlReaderSettings { Async = true, ConformanceLevel = ConformanceLevel.Fragment };
+            using var reader = XmlReader.Create(input, settings);
+            var done = false;
+
+            while (!done && await reader.ReadAsync())
+            {
+                switch (reader.NodeType)
+                {
+                    case XmlNodeType.Element:
+                        switch (reader.Name.ToLowerInvariant())
+                        {
+                            case "musicvideo":
+                                nfo = new MusicVideoNfo
+                                {
+                                    Artists = new List<string>(),
+                                    Genres = new List<string>(),
+                                    Tags = new List<string>(),
+                                    Studios = new List<string>()
+                                };
+                                break;
+                            case "artist":
+                                await ReadStringContent(
+                                    reader,
+                                    nfo,
+                                    (musicVideo, artist) => musicVideo.Artists.Add(artist));
+                                break;
+                            case "title":
+                                await ReadStringContent(reader, nfo, (musicVideo, title) => musicVideo.Title = title);
+                                break;
+                            case "album":
+                                await ReadStringContent(reader, nfo, (musicVideo, album) => musicVideo.Album = album);
+                                break;
+                            case "plot":
+                                await ReadStringContent(reader, nfo, (musicVideo, plot) => musicVideo.Plot = plot);
+                                break;
+                            case "track":
+                                await ReadIntContent(reader, nfo, (musicVideo, track) => musicVideo.Track = track);
+                                break;
+                            case "year":
+                                await ReadIntContent(reader, nfo, (musicVideo, year) => musicVideo.Year = year);
+                                break;
+                            case "aired":
+                                await ReadDateTimeContent(reader, nfo, (show, aired) => show.Aired = aired);
+                                break;
+                            case "genre":
+                                await ReadStringContent(
+                                    reader,
+                                    nfo,
+                                    (musicVideo, genre) => musicVideo.Genres.Add(genre));
+                                break;
+                            case "tag":
+                                await ReadStringContent(reader, nfo, (musicVideo, tag) => musicVideo.Tags.Add(tag));
+                                break;
+                            case "studio":
+                                await ReadStringContent(
+                                    reader,
+                                    nfo,
+                                    (musicVideo, studio) => musicVideo.Studios.Add(studio));
+                                break;
+                        }
+
+                        break;
+                    case XmlNodeType.EndElement:
+                        if (reader.Name == "musicvideo")
+                        {
+                            done = true;
+                        }
+
+                        break;
+                }
+            }
+
+            return Optional(nfo).ToEither((BaseError)new FailedToReadNfo());
+        }
+        catch (XmlException)
+        {
+            _logger.LogWarning("Invalid XML detected; returning incomplete metadata");
+            return Optional(nfo).ToEither((BaseError)new FailedToReadNfo());
+        }
+        catch (Exception ex)
+        {
+            _client.Notify(ex);
+            return new FailedToReadNfo(ex.ToString());
+        }
+    }
+}

ErsatzTV.Core/Metadata/Nfo/NfoReader.cs

@@ -0,0 +1,166 @@
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Xml;
+using System.Xml.Linq;
+using Microsoft.Extensions.Logging;
+using Microsoft.IO;
+
+namespace ErsatzTV.Core.Metadata.Nfo;
+
+public abstract class NfoReader<T>
+{
+    private static readonly byte[] Buffer = new byte[8 * 1024 * 1024];
+    private static readonly Regex Pattern = new(@"[\p{C}-[\r\n\t]]+");
+
+    protected static readonly XmlReaderSettings Settings =
+        new()
+        {
+            Async = true,
+            ConformanceLevel = ConformanceLevel.Fragment,
+            ValidationType = ValidationType.None,
+            CheckCharacters = false,
+            IgnoreProcessingInstructions = true,
+            IgnoreComments = true
+        };
+
+    private readonly ILogger _logger;
+
+    private readonly RecyclableMemoryStreamManager _recyclableMemoryStreamManager;
+
+    protected NfoReader(RecyclableMemoryStreamManager recyclableMemoryStreamManager, ILogger logger)
+    {
+        _recyclableMemoryStreamManager = recyclableMemoryStreamManager;
+        _logger = logger;
+    }
+
+    protected async Task<Stream> SanitizedStreamForFile(string fileName)
+    {
+        using (var fs = new FileStream(fileName, FileMode.Open, FileAccess.Read, FileShare.Read, Buffer.Length, true))
+        {
+            while (await fs.ReadAsync(Buffer) > 0)
+            {
+                // read the file
+            }
+
+            string text = Encoding.UTF8.GetString(Buffer);
+            // trim BOM and zero width space, replace controls with replacement character
+            string stripped = Pattern.Replace(text.Trim('\uFEFF', '\u200B'), "\ufffd");
+
+            MemoryStream ms = _recyclableMemoryStreamManager.GetStream();
+            await ms.WriteAsync(Encoding.UTF8.GetBytes(stripped));
+            ms.Position = 0;
+            return ms;
+        }
+    }
+
+    protected async Task ReadStringContent(XmlReader reader, T nfo, Action<T, string> action)
+    {
+        try
+        {
+            if (nfo != null)
+            {
+                string result = await reader.ReadElementContentAsStringAsync();
+                action(nfo, result);
+            }
+        }
+        catch (XmlException ex)
+        {
+            _logger.LogWarning(ex, "Error reading string content from NFO {ElementName}", reader.Name);
+        }
+    }
+
+    protected async Task ReadIntContent(XmlReader reader, T nfo, Action<T, int> action)
+    {
+        try
+        {
+            if (nfo != null && int.TryParse(await reader.ReadElementContentAsStringAsync(), out int result))
+            {
+                action(nfo, result);
+            }
+        }
+        catch (XmlException ex)
+        {
+            _logger.LogWarning(ex, "Error reading int content from NFO {ElementName}", reader.Name);
+        }
+    }
+
+    protected async Task ReadDateTimeContent(XmlReader reader, T nfo, Action<T, DateTime> action)
+    {
+        try
+        {
+            if (nfo != null && DateTime.TryParse(await reader.ReadElementContentAsStringAsync(), out DateTime result))
+            {
+                action(nfo, result);
+            }
+        }
+        catch (XmlException ex)
+        {
+            _logger.LogWarning(ex, "Error reading date content from NFO {ElementName}", reader.Name);
+        }
+    }
+
+    protected void ReadActor(XmlReader reader, T nfo, Action<T, ActorNfo> action)
+    {
+        try
+        {
+            if (nfo != null)
+            {
+                var actor = new ActorNfo();
+                var element = (XElement)XNode.ReadFrom(reader);
+
+                XElement name = element.Element("name");
+                if (name != null)
+                {
+                    actor.Name = name.Value;
+                }
+
+                XElement role = element.Element("role");
+                if (role != null)
+                {
+                    actor.Role = role.Value;
+                }
+
+                XElement order = element.Element("order");
+                if (order != null && int.TryParse(order.Value, out int orderValue))
+                {
+                    actor.Order = orderValue;
+                }
+
+                XElement thumb = element.Element("thumb");
+                if (thumb != null)
+                {
+                    actor.Thumb = thumb.Value;
+                }
+
+                action(nfo, actor);
+            }
+        }
+        catch (XmlException ex)
+        {
+            _logger.LogWarning(ex, "Error reading actor content from NFO {ElementName}", reader.Name);
+        }
+    }
+
+    protected async Task ReadUniqueId(XmlReader reader, T nfo, Action<T, UniqueIdNfo> action)
+    {
+        try
+        {
+            if (nfo != null)
+            {
+                var uniqueId = new UniqueIdNfo();
+                reader.MoveToAttribute("default");
+                uniqueId.Default = bool.TryParse(reader.Value, out bool def) && def;
+                reader.MoveToAttribute("type");
+                uniqueId.Type = reader.Value;
+                reader.MoveToElement();
+                uniqueId.Guid = await reader.ReadElementContentAsStringAsync();
+
+                action(nfo, uniqueId);
+            }
+        }
+        catch (XmlException ex)
+        {
+            _logger.LogWarning(ex, "Error reading uniqueid content from NFO {ElementName}", reader.Name);
+        }
+    }
+}

ErsatzTV.Core/Metadata/Nfo/OtherVideoNfo.cs

@@ -0,0 +1,52 @@
+using System.Xml.Serialization;
+
+namespace ErsatzTV.Core.Metadata.Nfo;
+
+[XmlRoot("movie")]
+public class OtherVideoNfo
+{
+    [XmlElement("title")]
+    public string Title { get; set; }
+
+    [XmlElement("sorttitle")]
+    public string SortTitle { get; set; }
+
+    [XmlElement("outline")]
+    public string Outline { get; set; }
+
+    [XmlElement("year")]
+    public int Year { get; set; }
+
+    [XmlElement("mpaa")]
+    public string ContentRating { get; set; }
+
+    [XmlElement("premiered")]
+    public Option<DateTime> Premiered { get; set; }
+
+    [XmlElement("plot")]
+    public string Plot { get; set; }
+
+    [XmlElement("tagline")]
+    public string Tagline { get; set; }
+
+    [XmlElement("genre")]
+    public List<string> Genres { get; set; }
+
+    [XmlElement("tag")]
+    public List<string> Tags { get; set; }
+
+    [XmlElement("studio")]
+    public List<string> Studios { get; set; }
+
+    [XmlElement("actor")]
+    public List<ActorNfo> Actors { get; set; }
+
+    [XmlElement("credits")]
+    public List<string> Writers { get; set; }
+
+    [XmlElement("director")]
+    public List<string> Directors { get; set; }
+
+    [XmlElement("uniqueid")]
+    public List<UniqueIdNfo> UniqueIds { get; set; }
+}

ErsatzTV.Core/Metadata/Nfo/OtherVideoNfoReader.cs

@@ -0,0 +1,140 @@
+using System.Xml;
+using Bugsnag;
+using ErsatzTV.Core.Errors;
+using ErsatzTV.Core.Interfaces.Metadata.Nfo;
+using Microsoft.Extensions.Logging;
+using Microsoft.IO;
+
+namespace ErsatzTV.Core.Metadata.Nfo;
+
+public class OtherVideoNfoReader : NfoReader<OtherVideoNfo>, IOtherVideoNfoReader
+{
+    private readonly IClient _client;
+    private readonly ILogger<OtherVideoNfoReader> _logger;
+
+    public OtherVideoNfoReader(
+        RecyclableMemoryStreamManager recyclableMemoryStreamManager,
+        IClient client,
+        ILogger<OtherVideoNfoReader> logger)
+        : base(recyclableMemoryStreamManager, logger)
+    {
+        _client = client;
+        _logger = logger;
+    }
+
+    public async Task<Either<BaseError, OtherVideoNfo>> ReadFromFile(string fileName)
+    {
+        // ReSharper disable once ConvertToUsingDeclaration
+        await using (Stream s = await SanitizedStreamForFile(fileName))
+        {
+            return await Read(s);
+        }
+    }
+
+    internal async Task<Either<BaseError, OtherVideoNfo>> Read(Stream input)
+    {
+        OtherVideoNfo nfo = null;
+
+        try
+        {
+            var settings = new XmlReaderSettings { Async = true, ConformanceLevel = ConformanceLevel.Fragment };
+            using var reader = XmlReader.Create(input, settings);
+            var done = false;
+
+            while (!done && await reader.ReadAsync())
+            {
+                switch (reader.NodeType)
+                {
+                    case XmlNodeType.Element:
+                        switch (reader.Name.ToLowerInvariant())
+                        {
+                            case "movie":
+                                nfo = new OtherVideoNfo
+                                {
+                                    Genres = new List<string>(),
+                                    Tags = new List<string>(),
+                                    Studios = new List<string>(),
+                                    Actors = new List<ActorNfo>(),
+                                    Writers = new List<string>(),
+                                    Directors = new List<string>(),
+                                    UniqueIds = new List<UniqueIdNfo>()
+                                };
+                                break;
+                            case "title":
+                                await ReadStringContent(reader, nfo, (movie, title) => movie.Title = title);
+                                break;
+                            case "sorttitle":
+                                await ReadStringContent(reader, nfo, (movie, sortTitle) => movie.SortTitle = sortTitle);
+                                break;
+                            case "outline":
+                                await ReadStringContent(reader, nfo, (movie, outline) => movie.Outline = outline);
+                                break;
+                            case "year":
+                                await ReadIntContent(reader, nfo, (movie, year) => movie.Year = year);
+                                break;
+                            case "mpaa":
+                                await ReadStringContent(
+                                    reader,
+                                    nfo,
+                                    (movie, contentRating) => movie.ContentRating = contentRating);
+                                break;
+                            case "premiered":
+                                await ReadDateTimeContent(
+                                    reader,
+                                    nfo,
+                                    (movie, premiered) => movie.Premiered = premiered);
+                                break;
+                            case "plot":
+                                await ReadStringContent(reader, nfo, (movie, plot) => movie.Plot = plot);
+                                break;
+                            case "genre":
+                                await ReadStringContent(reader, nfo, (movie, genre) => movie.Genres.Add(genre));
+                                break;
+                            case "tag":
+                                await ReadStringContent(reader, nfo, (movie, tag) => movie.Tags.Add(tag));
+                                break;
+                            case "studio":
+                                await ReadStringContent(reader, nfo, (movie, studio) => movie.Studios.Add(studio));
+                                break;
+                            case "actor":
+                                ReadActor(reader, nfo, (movie, actor) => movie.Actors.Add(actor));
+                                break;
+                            case "credits":
+                                await ReadStringContent(reader, nfo, (movie, writer) => movie.Writers.Add(writer));
+                                break;
+                            case "director":
+                                await ReadStringContent(
+                                    reader,
+                                    nfo,
+                                    (movie, director) => movie.Directors.Add(director));
+                                break;
+                            case "uniqueid":
+                                await ReadUniqueId(reader, nfo, (movie, uniqueid) => movie.UniqueIds.Add(uniqueid));
+                                break;
+                        }
+
+                        break;
+                    case XmlNodeType.EndElement:
+                        if (reader.Name == "movie")
+                        {
+                            done = true;
+                        }
+
+                        break;
+                }
+            }
+
+            return Optional(nfo).ToEither((BaseError)new FailedToReadNfo());
+        }
+        catch (XmlException)
+        {
+            _logger.LogWarning("Invalid XML detected; returning incomplete metadata");
+            return Optional(nfo).ToEither((BaseError)new FailedToReadNfo());
+        }
+        catch (Exception ex)
+        {
+            _client.Notify(ex);
+            return new FailedToReadNfo(ex.ToString());
+        }
+    }
+}

ErsatzTV.Core/Metadata/Nfo/TvShowEpisodeNfo.cs

@@ -21,7 +21,7 @@ public class TvShowEpisodeNfo
     public string ContentRating { get; set; }
 
     [XmlElement("aired")]
-    public string Aired { get; set; }
+    public Option<DateTime> Aired { get; set; }
 
     [XmlElement("plot")]
     public string Plot { get; set; }

ErsatzTV.Core/Metadata/Nfo/TvShowNfo.cs

@@ -31,7 +31,7 @@ public class TvShowNfo
     public string ContentRating { get; set; }
 
     [XmlElement("premiered")]
-    public string Premiered { get; set; }
+    public Option<DateTime> Premiered { get; set; }
 
     [XmlElement("genre")]
     public List<string> Genres { get; set; }

ErsatzTV.Core/Metadata/Nfo/TvShowNfoReader.cs

@@ -0,0 +1,126 @@
+using System.Xml;
+using Bugsnag;
+using ErsatzTV.Core.Errors;
+using ErsatzTV.Core.Interfaces.Metadata.Nfo;
+using Microsoft.Extensions.Logging;
+using Microsoft.IO;
+
+namespace ErsatzTV.Core.Metadata.Nfo;
+
+public class TvShowNfoReader : NfoReader<TvShowNfo>, ITvShowNfoReader
+{
+    private readonly IClient _client;
+    private readonly ILogger<TvShowNfoReader> _logger;
+
+    public TvShowNfoReader(
+        RecyclableMemoryStreamManager recyclableMemoryStreamManager,
+        IClient client,
+        ILogger<TvShowNfoReader> logger)
+        : base(recyclableMemoryStreamManager, logger)
+    {
+        _client = client;
+        _logger = logger;
+    }
+
+    public async Task<Either<BaseError, TvShowNfo>> ReadFromFile(string fileName)
+    {
+        // ReSharper disable once ConvertToUsingDeclaration
+        await using (Stream s = await SanitizedStreamForFile(fileName))
+        {
+            return await Read(s);
+        }
+    }
+
+    internal async Task<Either<BaseError, TvShowNfo>> Read(Stream input)
+    {
+        TvShowNfo nfo = null;
+
+        try
+        {
+            var settings = new XmlReaderSettings { Async = true, ConformanceLevel = ConformanceLevel.Fragment };
+            using var reader = XmlReader.Create(input, settings);
+            var done = false;
+
+            while (!done && await reader.ReadAsync())
+            {
+                switch (reader.NodeType)
+                {
+                    case XmlNodeType.Element:
+                        switch (reader.Name.ToLowerInvariant())
+                        {
+                            case "tvshow":
+                                nfo = new TvShowNfo
+                                {
+                                    Genres = new List<string>(),
+                                    Tags = new List<string>(),
+                                    Studios = new List<string>(),
+                                    Actors = new List<ActorNfo>(),
+                                    UniqueIds = new List<UniqueIdNfo>()
+                                };
+                                break;
+                            case "title":
+                                await ReadStringContent(reader, nfo, (show, title) => show.Title = title);
+                                break;
+                            case "year":
+                                await ReadIntContent(reader, nfo, (show, year) => show.Year = year);
+                                break;
+                            case "plot":
+                                await ReadStringContent(reader, nfo, (show, plot) => show.Plot = plot);
+                                break;
+                            case "outline":
+                                await ReadStringContent(reader, nfo, (show, outline) => show.Outline = outline);
+                                break;
+                            case "tagline":
+                                await ReadStringContent(reader, nfo, (show, tagline) => show.Tagline = tagline);
+                                break;
+                            case "mpaa":
+                                await ReadStringContent(
+                                    reader,
+                                    nfo,
+                                    (show, contentRating) => show.ContentRating = contentRating);
+                                break;
+                            case "premiered":
+                                await ReadDateTimeContent(reader, nfo, (show, premiered) => show.Premiered = premiered);
+                                break;
+                            case "genre":
+                                await ReadStringContent(reader, nfo, (show, genre) => show.Genres.Add(genre));
+                                break;
+                            case "tag":
+                                await ReadStringContent(reader, nfo, (show, tag) => show.Tags.Add(tag));
+                                break;
+                            case "studio":
+                                await ReadStringContent(reader, nfo, (show, studio) => show.Studios.Add(studio));
+                                break;
+                            case "actor":
+                                ReadActor(reader, nfo, (episode, actor) => episode.Actors.Add(actor));
+                                break;
+                            case "uniqueid":
+                                await ReadUniqueId(reader, nfo, (episode, uniqueid) => episode.UniqueIds.Add(uniqueid));
+                                break;
+                        }
+
+                        break;
+                    case XmlNodeType.EndElement:
+                        if (reader.Name == "tvshow")
+                        {
+                            done = true;
+                        }
+
+                        break;
+                }
+            }
+
+            return Optional(nfo).ToEither((BaseError)new FailedToReadNfo());
+        }
+        catch (XmlException)
+        {
+            _logger.LogWarning("Invalid XML detected; returning incomplete metadata");
+            return Optional(nfo).ToEither((BaseError)new FailedToReadNfo());
+        }
+        catch (Exception ex)
+        {
+            _client.Notify(ex);
+            return new FailedToReadNfo(ex.ToString());
+        }
+    }
+}

ErsatzTV.Core/Metadata/OtherVideoFolderScanner.cs

@@ -77,15 +77,17 @@ public class OtherVideoFolderScanner : LocalFolderScanner, IOtherVideoFolderScan
 
             var foldersCompleted = 0;
 
+            var allFolders = new System.Collections.Generic.HashSet<string>();
             var folderQueue = new Queue<string>();
 
-            if (ShouldIncludeFolder(libraryPath.Path))
+            if (ShouldIncludeFolder(libraryPath.Path) && allFolders.Add(libraryPath.Path))
             {
                 folderQueue.Enqueue(libraryPath.Path);
             }
 
             foreach (string folder in _localFileSystem.ListSubdirectories(libraryPath.Path)
                          .Filter(ShouldIncludeFolder)
+                         .Filter(allFolders.Add)
                          .OrderBy(identity))
             {
                 folderQueue.Enqueue(folder);
@@ -115,6 +117,7 @@ public class OtherVideoFolderScanner : LocalFolderScanner, IOtherVideoFolderScan
 
                 foreach (string subdirectory in _localFileSystem.ListSubdirectories(otherVideoFolder)
                              .Filter(ShouldIncludeFolder)
+                             .Filter(allFolders.Add)
                              .OrderBy(identity))
                 {
                     folderQueue.Enqueue(subdirectory);
@@ -136,6 +139,8 @@ public class OtherVideoFolderScanner : LocalFolderScanner, IOtherVideoFolderScan
                     "UPDATE: Etag has changed for folder {Folder}",
                     otherVideoFolder);
 
+                var hasErrors = false;
+
                 foreach (string file in allFiles.OrderBy(identity))
                 {
                     Either<BaseError, MediaItemScanResult<OtherVideo>> maybeVideo = await _otherVideoRepository
@@ -148,6 +153,7 @@ public class OtherVideoFolderScanner : LocalFolderScanner, IOtherVideoFolderScan
                     foreach (BaseError error in maybeVideo.LeftToSeq())
                     {
                         _logger.LogWarning("Error processing other video at {Path}: {Error}", file, error.Value);
+                        hasErrors = true;
                     }
 
                     foreach (MediaItemScanResult<OtherVideo> result in maybeVideo.RightToSeq())
@@ -156,10 +162,14 @@ public class OtherVideoFolderScanner : LocalFolderScanner, IOtherVideoFolderScan
                         {
                             await _searchIndex.RebuildItems(_searchRepository, new List<int> { result.Item.Id });
                         }
-
-                        await _libraryRepository.SetEtag(libraryPath, knownFolder, otherVideoFolder, etag);
                     }
                 }
+
+                // only do this once per folder and only if all files processed successfully
+                if (!hasErrors)
+                {
+                    await _libraryRepository.SetEtag(libraryPath, knownFolder, otherVideoFolder, etag);
+                }
             }
 
             foreach (string path in await _otherVideoRepository.FindOtherVideoPaths(libraryPath))
@@ -198,15 +208,38 @@ public class OtherVideoFolderScanner : LocalFolderScanner, IOtherVideoFolderScan
         try
         {
             OtherVideo otherVideo = result.Item;
-            if (!Optional(otherVideo.OtherVideoMetadata).Flatten().Any())
-            {
-                otherVideo.OtherVideoMetadata ??= new List<OtherVideoMetadata>();
+            string path = otherVideo.MediaVersions.Head().MediaFiles.Head().Path;
 
-                string path = otherVideo.MediaVersions.Head().MediaFiles.Head().Path;
-                _logger.LogDebug("Refreshing {Attribute} for {Path}", "Fallback Metadata", path);
-                if (await _localMetadataProvider.RefreshFallbackMetadata(otherVideo))
+            Option<string> maybeNfoFile = new List<string> { Path.ChangeExtension(path, "nfo") }
+                .Filter(_localFileSystem.FileExists)
+                .HeadOrNone();
+
+            if (maybeNfoFile.IsNone)
+            {
+                if (!Optional(otherVideo.OtherVideoMetadata).Flatten().Any())
                 {
-                    result.IsUpdated = true;
+                    _logger.LogDebug("Refreshing {Attribute} for {Path}", "Fallback Metadata", path);
+                    if (await _localMetadataProvider.RefreshFallbackMetadata(otherVideo))
+                    {
+                        result.IsUpdated = true;
+                    }
+                }
+            }
+
+            foreach (string nfoFile in maybeNfoFile)
+            {
+                bool shouldUpdate = Optional(otherVideo.OtherVideoMetadata).Flatten().HeadOrNone().Match(
+                    m => m.MetadataKind == MetadataKind.Fallback ||
+                         m.DateUpdated != _localFileSystem.GetLastWriteTime(nfoFile),
+                    true);
+
+                if (shouldUpdate)
+                {
+                    _logger.LogDebug("Refreshing {Attribute} from {Path}", "Sidecar Metadata", nfoFile);
+                    if (await _localMetadataProvider.RefreshSidecarMetadata(otherVideo, nfoFile))
+                    {
+                        result.IsUpdated = true;
+                    }
                 }
             }
 

ErsatzTV.Core/Metadata/SongFolderScanner.cs

@@ -134,6 +134,8 @@ public class SongFolderScanner : LocalFolderScanner, ISongFolderScanner
                     "UPDATE: Etag has changed for folder {Folder}",
                     songFolder);
 
+                var hasErrors = false;
+
                 foreach (string file in allFiles.OrderBy(identity))
                 {
                     Either<BaseError, MediaItemScanResult<Song>> maybeSong = await _songRepository
@@ -146,6 +148,7 @@ public class SongFolderScanner : LocalFolderScanner, ISongFolderScanner
                     foreach (BaseError error in maybeSong.LeftToSeq())
                     {
                         _logger.LogWarning("Error processing song at {Path}: {Error}", file, error.Value);
+                        hasErrors = true;
                     }
 
                     foreach (MediaItemScanResult<Song> result in maybeSong.RightToSeq())
@@ -154,10 +157,14 @@ public class SongFolderScanner : LocalFolderScanner, ISongFolderScanner
                         {
                             await _searchIndex.RebuildItems(_searchRepository, new List<int> { result.Item.Id });
                         }
-
-                        await _libraryRepository.SetEtag(libraryPath, knownFolder, songFolder, etag);
                     }
                 }
+
+                // only do this once per folder and only if all files processed successfully
+                if (!hasErrors)
+                {
+                    await _libraryRepository.SetEtag(libraryPath, knownFolder, songFolder, etag);
+                }
             }
 
             foreach (string path in await _songRepository.FindSongPaths(libraryPath))

ErsatzTV.Core/Scheduling/ChronologicalMediaComparer.cs

@@ -119,12 +119,18 @@ internal class ChronologicalMediaComparer : IComparer<MediaItem>
         string track1 = x switch
         {
             Song s => s.SongMetadata.HeadOrNone().Match(sm => sm.Track ?? string.Empty, () => string.Empty),
+            MusicVideo mv => mv.MusicVideoMetadata.HeadOrNone()
+                .Match(mvm => mvm.Track ?? int.MaxValue, () => int.MaxValue)
+                .ToString("D10"),
             _ => string.Empty
         };
 
         string track2 = y switch
         {
             Song s => s.SongMetadata.HeadOrNone().Match(sm => sm.Track ?? string.Empty, () => string.Empty),
+            MusicVideo mv => mv.MusicVideoMetadata.HeadOrNone()
+                .Match(mvm => mvm.Track ?? int.MaxValue, () => int.MaxValue)
+                .ToString("D10"),
             _ => string.Empty
         };
 

ErsatzTV.Core/Scheduling/PlayoutBuilder.cs

@@ -1,4 +1,5 @@
 using ErsatzTV.Core.Domain;
+using ErsatzTV.Core.Extensions;
 using ErsatzTV.Core.Interfaces.Repositories;
 using ErsatzTV.Core.Interfaces.Scheduling;
 using LanguageExt.UnsafeValueAccess;
@@ -174,7 +175,8 @@ public class PlayoutBuilder : IPlayoutBuilder
             playout,
             parameters.Start,
             parameters.Finish,
-            parameters.CollectionMediaItems);
+            parameters.CollectionMediaItems,
+            false);
     }
 
     private async Task<Playout> ResetPlayout(Playout playout, PlayoutParameters parameters)
@@ -193,7 +195,8 @@ public class PlayoutBuilder : IPlayoutBuilder
             playout,
             parameters.Start,
             parameters.Finish,
-            parameters.CollectionMediaItems);
+            parameters.CollectionMediaItems,
+            playout.ProgramSchedule.RandomStartPoint);
 
         return playout;
     }
@@ -216,7 +219,8 @@ public class PlayoutBuilder : IPlayoutBuilder
             playout,
             parameters.Start,
             parameters.Finish,
-            parameters.CollectionMediaItems);
+            parameters.CollectionMediaItems,
+            false);
 
         return playout;
     }
@@ -234,7 +238,13 @@ public class PlayoutBuilder : IPlayoutBuilder
             return None;
         }
 
-        Option<CollectionKey> maybeEmptyCollection = await CheckForEmptyCollections(collectionMediaItems);
+        Option<bool> skipMissingItems =
+            await _configElementRepository.GetValue<bool>(ConfigElementKey.PlayoutSkipMissingItems);
+
+        Option<CollectionKey> maybeEmptyCollection = await CheckForEmptyCollections(
+            collectionMediaItems,
+            await skipMissingItems.IfNoneAsync(false));
+
         foreach (CollectionKey emptyCollection in maybeEmptyCollection)
         {
             Option<string> maybeName = await _mediaCollectionRepository.GetNameFromKey(emptyCollection);
@@ -275,7 +285,8 @@ public class PlayoutBuilder : IPlayoutBuilder
         Playout playout,
         DateTimeOffset playoutStart,
         DateTimeOffset playoutFinish,
-        Map<CollectionKey, List<MediaItem>> collectionMediaItems)
+        Map<CollectionKey, List<MediaItem>> collectionMediaItems,
+        bool randomStartPoint)
     {
         DateTimeOffset trimBefore = playoutStart.AddHours(-4);
         DateTimeOffset trimAfter = playoutFinish;
@@ -294,7 +305,10 @@ public class PlayoutBuilder : IPlayoutBuilder
         while (finish < playoutFinish)
         {
             _logger.LogDebug("Building playout from {Start} to {Finish}", start, finish);
-            playout = await BuildPlayoutItems(playout, start, finish, collectionMediaItems, true);
+            playout = await BuildPlayoutItems(playout, start, finish, collectionMediaItems, true, randomStartPoint);
+
+            // only randomize once (at the start of the playout)
+            randomStartPoint = false;
 
             start = playout.Anchor.NextStartOffset;
             finish = finish.AddDays(1);
@@ -309,7 +323,8 @@ public class PlayoutBuilder : IPlayoutBuilder
                 start,
                 playoutFinish,
                 collectionMediaItems,
-                false);
+                false,
+                randomStartPoint);
         }
 
         // remove any items outside the desired range
@@ -323,7 +338,8 @@ public class PlayoutBuilder : IPlayoutBuilder
         DateTimeOffset playoutStart,
         DateTimeOffset playoutFinish,
         Map<CollectionKey, List<MediaItem>> collectionMediaItems,
-        bool saveAnchorDate)
+        bool saveAnchorDate,
+        bool randomStartPoint)
     {
         var sortedScheduleItems = playout.ProgramSchedule.Items.OrderBy(i => i.Index).ToList();
         CollectionEnumeratorState scheduleItemsEnumeratorState =
@@ -341,7 +357,7 @@ public class PlayoutBuilder : IPlayoutBuilder
             PlaybackOrder playbackOrder = maybeScheduleItem
                 .Match(item => item.PlaybackOrder, () => PlaybackOrder.Shuffle);
             IMediaCollectionEnumerator enumerator =
-                await GetMediaCollectionEnumerator(playout, collectionKey, mediaItems, playbackOrder);
+                await GetMediaCollectionEnumerator(playout, collectionKey, mediaItems, playbackOrder, randomStartPoint);
             collectionEnumerators.Add(collectionKey, enumerator);
         }
 
@@ -496,12 +512,13 @@ public class PlayoutBuilder : IPlayoutBuilder
     }
 
     private async Task<Option<CollectionKey>> CheckForEmptyCollections(
-        Map<CollectionKey, List<MediaItem>> collectionMediaItems)
+        Map<CollectionKey, List<MediaItem>> collectionMediaItems,
+        bool skipMissingItems)
     {
         foreach ((CollectionKey _, List<MediaItem> items) in collectionMediaItems)
         {
             var zeroItems = new List<MediaItem>();
-            // var missingItems = new List<MediaItem>();
+            var missingItems = new List<MediaItem>();
 
             foreach (MediaItem item in items)
             {
@@ -520,18 +537,17 @@ public class PlayoutBuilder : IPlayoutBuilder
                     _ => true
                 };
 
-                // if (item.State == MediaItemState.FileNotFound)
-                // {
-                //     _logger.LogWarning(
-                //         "Skipping media item that does not exist on disk  {MediaItem} - {MediaItemTitle} - {Path}",
-                //         item.Id,
-                //         DisplayTitle(item),
-                //         item.GetHeadVersion().MediaFiles.Head().Path);
-                //
-                //     missingItems.Add(item);
-                // }
-                // else
-                if (isZero)
+                if (skipMissingItems && item.State is MediaItemState.FileNotFound or MediaItemState.Unavailable)
+                {
+                    _logger.LogWarning(
+                        "Skipping media item that does not exist on disk  {MediaItem} - {MediaItemTitle} - {Path}",
+                        item.Id,
+                        DisplayTitle(item),
+                        item.GetHeadVersion().MediaFiles.Head().Path);
+
+                    missingItems.Add(item);
+                }
+                else if (isZero)
                 {
                     _logger.LogWarning(
                         "Skipping media item with zero duration {MediaItem} - {MediaItemTitle}",
@@ -542,7 +558,7 @@ public class PlayoutBuilder : IPlayoutBuilder
                 }
             }
 
-            // items.RemoveAll(missingItems.Contains);
+            items.RemoveAll(missingItems.Contains);
             items.RemoveAll(zeroItems.Contains);
         }
 
@@ -636,7 +652,8 @@ public class PlayoutBuilder : IPlayoutBuilder
         Playout playout,
         CollectionKey collectionKey,
         List<MediaItem> mediaItems,
-        PlaybackOrder playbackOrder)
+        PlaybackOrder playbackOrder,
+        bool randomStartPoint)
     {
         Option<PlayoutProgramScheduleAnchor> maybeAnchor = playout.ProgramScheduleAnchors
             .OrderByDescending(a => a.AnchorDate is null)
@@ -674,9 +691,21 @@ public class PlayoutBuilder : IPlayoutBuilder
             }
         }
 
+        // index shouldn't ever be greater than zero with randomStartPoint since anchors shouldn't exist, but
+        randomStartPoint = randomStartPoint && state.Index == 0;
+
         switch (playbackOrder)
         {
             case PlaybackOrder.Chronological:
+                if (randomStartPoint)
+                {
+                    state = new CollectionEnumeratorState
+                    {
+                        Seed = state.Seed,
+                        Index = Random.Next(0, mediaItems.Count - 1)
+                    };
+                }
+
                 return new ChronologicalMediaCollectionEnumerator(mediaItems, state);
             case PlaybackOrder.Random:
                 return new RandomizedMediaCollectionEnumerator(mediaItems, state);
@@ -687,7 +716,8 @@ public class PlayoutBuilder : IPlayoutBuilder
             case PlaybackOrder.ShuffleInOrder:
                 return new ShuffleInOrderCollectionEnumerator(
                     await GetCollectionItemsForShuffleInOrder(collectionKey),
-                    state);
+                    state,
+                    playout.ProgramSchedule.RandomStartPoint);
             default:
                 // TODO: handle this error case differently?
                 return new RandomizedMediaCollectionEnumerator(mediaItems, state);

ErsatzTV.Core/Scheduling/PlayoutModeSchedulerBase.cs

@@ -93,7 +93,8 @@ public abstract class PlayoutModeSchedulerBase<T> : IPlayoutModeScheduler<T> whe
                     InPoint = TimeSpan.Zero,
                     OutPoint = itemDuration,
                     FillerKind = FillerKind.Tail,
-                    GuideGroup = nextState.NextGuideGroup
+                    GuideGroup = nextState.NextGuideGroup,
+                    DisableWatermarks = !scheduleItem.TailFiller.AllowWatermarks
                 };
 
                 newItems.Add(playoutItem);
@@ -135,7 +136,8 @@ public abstract class PlayoutModeSchedulerBase<T> : IPlayoutModeScheduler<T> whe
                     InPoint = TimeSpan.Zero,
                     OutPoint = TimeSpan.Zero,
                     GuideGroup = nextState.NextGuideGroup,
-                    FillerKind = FillerKind.Fallback
+                    FillerKind = FillerKind.Fallback,
+                    DisableWatermarks = !scheduleItem.FallbackFiller.AllowWatermarks
                 };
 
                 newItems.Add(playoutItem);
@@ -341,12 +343,22 @@ public abstract class PlayoutModeSchedulerBase<T> : IPlayoutModeScheduler<T> whe
                 case FillerMode.Duration when filler.Duration.HasValue:
                     IMediaCollectionEnumerator e1 = enumerators[CollectionKey.ForFillerPreset(filler)];
                     result.AddRange(
-                        AddDurationFiller(playoutBuilderState, e1, filler.Duration.Value, FillerKind.PreRoll));
+                        AddDurationFiller(
+                            playoutBuilderState,
+                            e1,
+                            filler.Duration.Value,
+                            FillerKind.PreRoll,
+                            filler.AllowWatermarks));
                     break;
                 case FillerMode.Count when filler.Count.HasValue:
                     IMediaCollectionEnumerator e2 = enumerators[CollectionKey.ForFillerPreset(filler)];
                     result.AddRange(
-                        AddCountFiller(playoutBuilderState, e2, filler.Count.Value, FillerKind.PreRoll));
+                        AddCountFiller(
+                            playoutBuilderState,
+                            e2,
+                            filler.Count.Value,
+                            FillerKind.PreRoll,
+                            filler.AllowWatermarks));
                     break;
             }
         }
@@ -374,7 +386,8 @@ public abstract class PlayoutModeSchedulerBase<T> : IPlayoutModeScheduler<T> whe
                                         playoutBuilderState,
                                         e1,
                                         filler.Duration.Value,
-                                        FillerKind.MidRoll));
+                                        FillerKind.MidRoll,
+                                        filler.AllowWatermarks));
                             }
                         }
 
@@ -391,7 +404,8 @@ public abstract class PlayoutModeSchedulerBase<T> : IPlayoutModeScheduler<T> whe
                                         playoutBuilderState,
                                         e2,
                                         filler.Count.Value,
-                                        FillerKind.MidRoll));
+                                        FillerKind.MidRoll,
+                                        filler.AllowWatermarks));
                             }
                         }
 
@@ -408,12 +422,22 @@ public abstract class PlayoutModeSchedulerBase<T> : IPlayoutModeScheduler<T> whe
                 case FillerMode.Duration when filler.Duration.HasValue:
                     IMediaCollectionEnumerator e1 = enumerators[CollectionKey.ForFillerPreset(filler)];
                     result.AddRange(
-                        AddDurationFiller(playoutBuilderState, e1, filler.Duration.Value, FillerKind.PostRoll));
+                        AddDurationFiller(
+                            playoutBuilderState,
+                            e1,
+                            filler.Duration.Value,
+                            FillerKind.PostRoll,
+                            filler.AllowWatermarks));
                     break;
                 case FillerMode.Count when filler.Count.HasValue:
                     IMediaCollectionEnumerator e2 = enumerators[CollectionKey.ForFillerPreset(filler)];
                     result.AddRange(
-                        AddCountFiller(playoutBuilderState, e2, filler.Count.Value, FillerKind.PostRoll));
+                        AddCountFiller(
+                            playoutBuilderState,
+                            e2,
+                            filler.Count.Value,
+                            FillerKind.PostRoll,
+                            filler.AllowWatermarks));
                     break;
             }
         }
@@ -464,7 +488,8 @@ public abstract class PlayoutModeSchedulerBase<T> : IPlayoutModeScheduler<T> whe
                             playoutBuilderState,
                             pre1,
                             remainingToFill,
-                            FillerKind.PreRoll));
+                            FillerKind.PreRoll,
+                            padFiller.AllowWatermarks));
                     totalDuration =
                         TimeSpan.FromMilliseconds(result.Sum(pi => (pi.Finish - pi.Start).TotalMilliseconds));
                     remainingToFill = targetTime - totalDuration - playoutItem.StartOffset;
@@ -487,7 +512,8 @@ public abstract class PlayoutModeSchedulerBase<T> : IPlayoutModeScheduler<T> whe
                             playoutBuilderState,
                             mid1,
                             remainingToFill,
-                            FillerKind.MidRoll));
+                            FillerKind.MidRoll,
+                            padFiller.AllowWatermarks));
                     TimeSpan average = effectiveChapters.Count == 0
                         ? remainingToFill
                         : remainingToFill / (effectiveChapters.Count - 1);
@@ -540,7 +566,8 @@ public abstract class PlayoutModeSchedulerBase<T> : IPlayoutModeScheduler<T> whe
                             playoutBuilderState,
                             post1,
                             remainingToFill,
-                            FillerKind.PostRoll));
+                            FillerKind.PostRoll,
+                            padFiller.AllowWatermarks));
                     totalDuration =
                         TimeSpan.FromMilliseconds(result.Sum(pi => (pi.Finish - pi.Start).TotalMilliseconds));
                     remainingToFill = targetTime - totalDuration - playoutItem.StartOffset;
@@ -576,7 +603,8 @@ public abstract class PlayoutModeSchedulerBase<T> : IPlayoutModeScheduler<T> whe
         PlayoutBuilderState playoutBuilderState,
         IMediaCollectionEnumerator enumerator,
         int count,
-        FillerKind fillerKind)
+        FillerKind fillerKind,
+        bool allowWatermarks)
     {
         var result = new List<PlayoutItem>();
 
@@ -594,7 +622,8 @@ public abstract class PlayoutModeSchedulerBase<T> : IPlayoutModeScheduler<T> whe
                     InPoint = TimeSpan.Zero,
                     OutPoint = itemDuration,
                     GuideGroup = playoutBuilderState.NextGuideGroup,
-                    FillerKind = fillerKind
+                    FillerKind = fillerKind,
+                    DisableWatermarks = !allowWatermarks
                 };
 
                 result.Add(playoutItem);
@@ -605,24 +634,24 @@ public abstract class PlayoutModeSchedulerBase<T> : IPlayoutModeScheduler<T> whe
         return result;
     }
 
-    private static List<PlayoutItem> AddDurationFiller(
+    private List<PlayoutItem> AddDurationFiller(
         PlayoutBuilderState playoutBuilderState,
         IMediaCollectionEnumerator enumerator,
         TimeSpan duration,
-        FillerKind fillerKind)
+        FillerKind fillerKind,
+        bool allowWatermarks)
     {
         var result = new List<PlayoutItem>();
 
-        while (enumerator.Current.IsSome)
+        TimeSpan remainingToFill = duration;
+        var skipped = false;
+        while (enumerator.Current.IsSome && remainingToFill > TimeSpan.Zero)
         {
             foreach (MediaItem mediaItem in enumerator.Current)
             {
-                // TODO: retry up to x times when item doesn't fit?
-
                 TimeSpan itemDuration = DurationForMediaItem(mediaItem);
-                duration -= itemDuration;
 
-                if (duration >= TimeSpan.Zero)
+                if (remainingToFill - itemDuration >= TimeSpan.Zero)
                 {
                     var playoutItem = new PlayoutItem
                     {
@@ -632,17 +661,37 @@ public abstract class PlayoutModeSchedulerBase<T> : IPlayoutModeScheduler<T> whe
                         InPoint = TimeSpan.Zero,
                         OutPoint = itemDuration,
                         GuideGroup = playoutBuilderState.NextGuideGroup,
-                        FillerKind = fillerKind
+                        FillerKind = fillerKind,
+                        DisableWatermarks = !allowWatermarks
                     };
 
+                    remainingToFill -= itemDuration;
                     result.Add(playoutItem);
                     enumerator.MoveNext();
                 }
-            }
+                else if (skipped)
+                {
+                    // set to zero so it breaks out of the while loop
+                    remainingToFill = TimeSpan.Zero;
+                }
+                else
+                {
+                    if (itemDuration >= duration * 2)
+                    {
+                        _logger.LogWarning(
+                            "Filler item is too long {FillerDuration} to fill {GapDuration}; skipping to next filler item",
+                            itemDuration,
+                            duration);
 
-            if (duration < TimeSpan.Zero)
-            {
-                break;
+                        skipped = true;
+                        enumerator.MoveNext();
+                    }
+                    else
+                    {
+                        // set to zero so it breaks out of the while loop
+                        remainingToFill = TimeSpan.Zero;
+                    }
+                }
             }
         }
 
@@ -670,7 +719,8 @@ public abstract class PlayoutModeSchedulerBase<T> : IPlayoutModeScheduler<T> whe
                     InPoint = TimeSpan.Zero,
                     OutPoint = TimeSpan.Zero,
                     GuideGroup = playoutBuilderState.NextGuideGroup,
-                    FillerKind = FillerKind.Fallback
+                    FillerKind = FillerKind.Fallback,
+                    DisableWatermarks = !scheduleItem.FallbackFiller.AllowWatermarks
                 };
 
                 enumerator.MoveNext();

ErsatzTV.Core/Scheduling/PlayoutModeSchedulerFlood.cs

@@ -50,6 +50,7 @@ public class PlayoutModeSchedulerFlood : PlayoutModeSchedulerBase<ProgramSchedul
                 FillerKind = scheduleItem.GuideMode == GuideMode.Filler
                     ? FillerKind.Tail
                     : FillerKind.None,
+                CustomTitle = scheduleItem.CustomTitle,
                 WatermarkId = scheduleItem.WatermarkId,
                 PreferredAudioLanguageCode = scheduleItem.PreferredAudioLanguageCode,
                 PreferredSubtitleLanguageCode = scheduleItem.PreferredSubtitleLanguageCode,
@@ -94,7 +95,11 @@ public class PlayoutModeSchedulerFlood : PlayoutModeSchedulerBase<ProgramSchedul
                 {
                     CurrentTime = itemEndTimeWithFiller,
                     InFlood = true,
-                    NextGuideGroup = nextState.IncrementGuideGroup
+
+                    // only bump guide group if we don't have a custom title
+                    NextGuideGroup = string.IsNullOrWhiteSpace(scheduleItem.CustomTitle)
+                        ? nextState.IncrementGuideGroup
+                        : nextState.NextGuideGroup
                 };
 
                 contentEnumerator.MoveNext();
@@ -108,10 +113,18 @@ public class PlayoutModeSchedulerFlood : PlayoutModeSchedulerBase<ProgramSchedul
         nextState = nextState with
         {
             InFlood = nextState.CurrentTime >= hardStop,
-            NextGuideGroup = nextState.DecrementGuideGroup
+
+            // only decrement guide group if it was bumped
+            NextGuideGroup = playoutItems.Select(pi => pi.GuideGroup).Distinct().Count() != 1
+                ? nextState.DecrementGuideGroup
+                : nextState.NextGuideGroup
         };
 
-        nextState.ScheduleItemsEnumerator.MoveNext();
+        // only advance to the next schedule item if we aren't still in a flood
+        if (!nextState.InFlood)
+        {
+            nextState.ScheduleItemsEnumerator.MoveNext();
+        }
 
         ProgramScheduleItem peekItem = nextScheduleItem;
         DateTimeOffset peekItemStart = GetStartTimeAfter(nextState, peekItem);

ErsatzTV.Core/Scheduling/PlayoutModeSchedulerMultiple.cs

@@ -60,6 +60,7 @@ public class PlayoutModeSchedulerMultiple : PlayoutModeSchedulerBase<ProgramSche
                 FillerKind = scheduleItem.GuideMode == GuideMode.Filler
                     ? FillerKind.Tail
                     : FillerKind.None,
+                CustomTitle = scheduleItem.CustomTitle,
                 WatermarkId = scheduleItem.WatermarkId,
                 PreferredAudioLanguageCode = scheduleItem.PreferredAudioLanguageCode,
                 PreferredSubtitleLanguageCode = scheduleItem.PreferredSubtitleLanguageCode,
@@ -81,7 +82,11 @@ public class PlayoutModeSchedulerMultiple : PlayoutModeSchedulerBase<ProgramSche
             {
                 CurrentTime = itemEndTimeWithFiller,
                 MultipleRemaining = nextState.MultipleRemaining.Map(i => i - 1),
-                NextGuideGroup = nextState.IncrementGuideGroup
+
+                // only bump guide group if we don't have a custom title
+                NextGuideGroup = string.IsNullOrWhiteSpace(scheduleItem.CustomTitle)
+                    ? nextState.IncrementGuideGroup
+                    : nextState.NextGuideGroup
             };
 
             contentEnumerator.MoveNext();
@@ -96,7 +101,11 @@ public class PlayoutModeSchedulerMultiple : PlayoutModeSchedulerBase<ProgramSche
             nextState = nextState with
             {
                 MultipleRemaining = None,
-                NextGuideGroup = nextState.DecrementGuideGroup
+
+                // only decrement guide group if it was bumped
+                NextGuideGroup = playoutItems.Select(pi => pi.GuideGroup).Distinct().Count() != 1
+                    ? nextState.DecrementGuideGroup
+                    : nextState.NextGuideGroup
             };
 
             nextState.ScheduleItemsEnumerator.MoveNext();

ErsatzTV.Core/Scheduling/PlayoutModeSchedulerOne.cs

@@ -41,6 +41,7 @@ public class PlayoutModeSchedulerOne : PlayoutModeSchedulerBase<ProgramScheduleI
                 FillerKind = scheduleItem.GuideMode == GuideMode.Filler
                     ? FillerKind.Tail
                     : FillerKind.None,
+                CustomTitle = scheduleItem.CustomTitle,
                 WatermarkId = scheduleItem.WatermarkId,
                 PreferredAudioLanguageCode = scheduleItem.PreferredAudioLanguageCode,
                 PreferredSubtitleLanguageCode = scheduleItem.PreferredSubtitleLanguageCode,