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

* add music video artist to search index

* properly index minutes field when adding from scan

* bump search index version

.github/workflows/docs.yml

@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout master
-        uses: actions/checkout@v1
+        uses: actions/checkout@v2
 
       - name: Deploy docs
         uses: mhausenblas/mkdocs-deploy-gh-pages@master

.github/workflows/release.yml

@@ -52,9 +52,6 @@ jobs:
           # Pack files
           if [ "${{ matrix.target }}" == "win-x64" ]; then
             7z a -tzip "${release_name}.zip" "./${release_name}/*"
-          elif [ "${{ matrix.target }}" == "linux-arm" ]; then
-            cp lib/linux-arm/* "$release_name/"
-            tar czvf "${release_name}.tar.gz" "$release_name"
           else
             tar czvf "${release_name}.tar.gz" "$release_name"
           fi

CHANGELOG.md

@@ -5,6 +5,82 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 ## [Unreleased]
 
+## [0.3.6-alpha] - 2022-01-10
+### Fixed
+- Properly index `minutes` field when adding new items during scan (vs when rebuilding index)
+- Fix some nvenc edge cases where only padding is needed for normalization
+- Properly overwrite environment variables for ffmpeg processes (`LIBVA_DRIVER_NAME`, `FFREPORT`)
+
+### Added
+- Add music video `artist` to search index
+  - This requires rebuilding the search index and search results may be empty or incomplete until the rebuild is complete
+
+### Changed
+- Remove `HLS Hybrid` streaming mode; all channels have been reconfigured to use the superior `HLS Segmenter` streaming mode
+- Update `MPEG-TS` streaming mode to internally use the HLS segmenter
+  - This improves compatibility with many clients and also improves performance at program boundaries
+- Renamed existing `MPEG-TS` mode as `MPEG-TS (Legacy)`
+  - This mode will be removed in a future release
+
+## [0.3.5-alpha] - 2022-01-05
+### Fixed
+- Fix bundled ffmpeg version in base docker image (NOT nvidia or vaapi) which prevented playback since v0.3.0-alpha
+- Use software decoding for mpeg4 content when VAAPI acceleration is enabled
+- Fix hardware acceleration health check to recognize QSV on non-Windows platforms
+
+### Changed
+- Treat `setsar` as a hardware filter, avoiding unneeded `hwdownload` and `hwupload` steps when padding isn't required
+
+## [0.3.4-alpha] - 2021-12-21
+### Fixed
+- Fix other video and song scanners to include videos contained directly in top-level folders that are added to a library
+- Allow saving ffmpeg troubleshooting reports on Windows
+
+## [0.3.3-alpha] - 2021-12-12
+### Fixed
+- Fix bug with saving multiple blurhash versions for cover art; all cover art will be automatically rescanned
+- Fix song detail margin when no cover art exists and no watermark exists
+- Fix synchronizing virtual shows and seasons from Jellyfin
+- Properly sort channels in M3U
+
+### Changed
+- Use blurhash of ErsatzTV colors instead of solid colors for default song backgrounds
+- Use select control instead of autocomplete control in many places
+    - The autocomplete control is not intuitive to use and has focus bugs
+
+## [0.3.2-alpha] - 2021-12-03
+### Fixed
+- Fix artwork upload on Windows
+- Fix unicode song metadata on Windows`
+- Fix unicode console output on Windows
+- Fix TV Show NFO metadata processing when `year` is missing
+- Fix song detail outline to help legibility on white backgrounds
+- Optimize song artwork scanning to prevent re-processing album artwork for each song
+
+### Changed
+- Use custom log database backend which should be more portable (i.e. work in osx-arm64)
+- Use cover art blurhashes for song backgrounds instead of solid colors or box blur
+
+## [0.3.1-alpha] - 2021-11-30
+### Fixed
+- Fix song page links in UI
+- Show song artist in playout detail
+- Include song artist and cover art in channel guide (xmltv)
+- Use subtitles to display errors, which fixes many edge cases of unescaped characters
+- Properly split song genre tags
+- Properly display all songs that have an identical album and title
+- Fix channel logo and watermark uploads
+- Fix regression introduced with `v0.2.4-alpha` that caused some filler edge cases to crash the playout builder
+
+### Added
+- Add song genres to search index
+- Use embedded song cover art when sidecar cover art is unavailable
+
+### Changed
+- Randomly place song cover art on left or right side of screen
+- Randomly use a solid color from the cover art instead of blurred cover art for song background
+- Randomly select song detail layout (large title/small artist or small artist/title/album)
+
 ## [0.3.0-alpha] - 2021-11-25
 ### Fixed
 - Properly fix database incompatibility introduced with `v0.2.4-alpha` and partially fixed with `v0.2.5-alpha`
@@ -817,7 +893,13 @@ 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.3.0-alpha...HEAD
+[Unreleased]: https://github.com/jasongdove/ErsatzTV/compare/v0.3.6-alpha...HEAD
+[0.3.5-alpha]: https://github.com/jasongdove/ErsatzTV/compare/v0.3.5-alpha...v0.3.6-alpha
+[0.3.5-alpha]: https://github.com/jasongdove/ErsatzTV/compare/v0.3.4-alpha...v0.3.5-alpha
+[0.3.4-alpha]: https://github.com/jasongdove/ErsatzTV/compare/v0.3.3-alpha...v0.3.4-alpha
+[0.3.3-alpha]: https://github.com/jasongdove/ErsatzTV/compare/v0.3.2-alpha...v0.3.3-alpha
+[0.3.2-alpha]: https://github.com/jasongdove/ErsatzTV/compare/v0.3.1-alpha...v0.3.2-alpha
+[0.3.1-alpha]: https://github.com/jasongdove/ErsatzTV/compare/v0.3.0-alpha...v0.3.1-alpha
 [0.3.0-alpha]: https://github.com/jasongdove/ErsatzTV/compare/v0.2.5-alpha...v0.3.0-alpha
 [0.2.5-alpha]: https://github.com/jasongdove/ErsatzTV/compare/v0.2.4-alpha...v0.2.5-alpha
 [0.2.4-alpha]: https://github.com/jasongdove/ErsatzTV/compare/v0.2.3-alpha...v0.2.4-alpha

ErsatzTV.Application/Channels/ChannelViewModel.cs

@@ -11,5 +11,6 @@ namespace ErsatzTV.Application.Channels
         string PreferredLanguageCode,
         StreamingMode StreamingMode,
         int? WatermarkId,
-        int? FallbackFillerId);
+        int? FallbackFillerId,
+        int PlayoutCount);
 }

ErsatzTV.Application/Channels/Mapper.cs

@@ -16,7 +16,8 @@ namespace ErsatzTV.Application.Channels
                 channel.PreferredLanguageCode,
                 channel.StreamingMode,
                 channel.WatermarkId,
-                channel.FallbackFillerId);
+                channel.FallbackFillerId,
+                channel.Playouts?.Count ?? 0);
 
         private static string GetLogo(Channel channel) =>
             Optional(channel.Artwork.FirstOrDefault(a => a.ArtworkKind == ArtworkKind.Logo))

ErsatzTV.Application/FFmpegProfiles/Commands/UpdateFFmpegSettingsHandler.cs

@@ -1,13 +1,11 @@
 using System.Diagnostics;
 using System.IO;
-using System.Runtime.InteropServices;
 using System.Threading;
 using System.Threading.Tasks;
 using ErsatzTV.Core;
 using ErsatzTV.Core.Domain;
 using ErsatzTV.Core.Interfaces.Metadata;
 using ErsatzTV.Core.Interfaces.Repositories;
-using ErsatzTV.Core.Interfaces.Runtime;
 using LanguageExt;
 
 namespace ErsatzTV.Application.FFmpegProfiles.Commands
@@ -16,16 +14,13 @@ namespace ErsatzTV.Application.FFmpegProfiles.Commands
     {
         private readonly IConfigElementRepository _configElementRepository;
         private readonly ILocalFileSystem _localFileSystem;
-        private readonly IRuntimeInfo _runtimeInfo;
 
         public UpdateFFmpegSettingsHandler(
             IConfigElementRepository configElementRepository,
-            ILocalFileSystem localFileSystem,
-            IRuntimeInfo runtimeInfo)
+            ILocalFileSystem localFileSystem)
         {
             _configElementRepository = configElementRepository;
             _localFileSystem = localFileSystem;
-            _runtimeInfo = runtimeInfo;
         }
 
         public Task<Either<BaseError, Unit>> Handle(
@@ -36,8 +31,8 @@ namespace ErsatzTV.Application.FFmpegProfiles.Commands
                 .Bind(v => v.ToEitherAsync());
 
         private async Task<Validation<BaseError, Unit>> Validate(UpdateFFmpegSettings request) =>
-            (await FFmpegMustExist(request), await FFprobeMustExist(request), ReportsAreNotSupportedOnWindows(request))
-            .Apply((_, _, _) => Unit.Default);
+            (await FFmpegMustExist(request), await FFprobeMustExist(request))
+            .Apply((_, _) => Unit.Default);
 
         private Task<Validation<BaseError, Unit>> FFmpegMustExist(UpdateFFmpegSettings request) =>
             ValidateToolPath(request.Settings.FFmpegPath, "ffmpeg");
@@ -45,16 +40,6 @@ namespace ErsatzTV.Application.FFmpegProfiles.Commands
         private Task<Validation<BaseError, Unit>> FFprobeMustExist(UpdateFFmpegSettings request) =>
             ValidateToolPath(request.Settings.FFprobePath, "ffprobe");
 
-        private Validation<BaseError, Unit> ReportsAreNotSupportedOnWindows(UpdateFFmpegSettings request)
-        {
-            if (request.Settings.SaveReports && _runtimeInfo.IsOSPlatform(OSPlatform.Windows))
-            {
-                return BaseError.New("FFmpeg reports are not supported on Windows");
-            }
-
-            return Unit.Default;
-        }
-
         private async Task<Validation<BaseError, Unit>> ValidateToolPath(string path, string name)
         {
             if (!_localFileSystem.FileExists(path))

ErsatzTV.Application/Images/Commands/SaveArtworkToDisk.cs

@@ -1,4 +1,5 @@
-using ErsatzTV.Core;
+using System.IO;
+using ErsatzTV.Core;
 using ErsatzTV.Core.Domain;
 using LanguageExt;
 using MediatR;
@@ -6,5 +7,5 @@ using MediatR;
 namespace ErsatzTV.Application.Images.Commands
 {
     // ReSharper disable once SuggestBaseTypeForParameter
-    public record SaveArtworkToDisk(byte[] Buffer, ArtworkKind ArtworkKind) : IRequest<Either<BaseError, string>>;
+    public record SaveArtworkToDisk(Stream Stream, ArtworkKind ArtworkKind) : IRequest<Either<BaseError, string>>;
 }

ErsatzTV.Application/Images/Commands/SaveArtworkToDiskHandler.cs

@@ -14,6 +14,6 @@ namespace ErsatzTV.Application.Images.Commands
         public SaveArtworkToDiskHandler(IImageCache imageCache) => _imageCache = imageCache;
 
         public Task<Either<BaseError, string>> Handle(SaveArtworkToDisk request, CancellationToken cancellationToken) =>
-            _imageCache.SaveArtworkToCache(request.Buffer, request.ArtworkKind);
+            _imageCache.SaveArtworkToCache(request.Stream, request.ArtworkKind);
     }
 }

ErsatzTV.Application/Playouts/Mapper.cs

@@ -49,8 +49,11 @@ namespace ErsatzTV.Application.Playouts
                         .Map(s => string.IsNullOrWhiteSpace(playoutItem.ChapterTitle) ? s : $"{s} ({playoutItem.ChapterTitle})")
                         .IfNone("[unknown video]");
                 case Song s:
+                    string songArtist = s.SongMetadata.HeadOrNone()
+                        .Map(sm => string.IsNullOrWhiteSpace(sm.Artist) ? string.Empty : $"{sm.Artist} - ")
+                        .IfNone(string.Empty);
                     return s.SongMetadata.HeadOrNone()
-                        .Map(sm => sm.Title ?? string.Empty)
+                        .Map(sm => $"{songArtist}{sm.Title ?? string.Empty}")
                         .Map(t => string.IsNullOrWhiteSpace(playoutItem.ChapterTitle) ? t : $"{s} ({playoutItem.ChapterTitle})")
                         .IfNone("[unknown song]");
                 default:

ErsatzTV.Application/Streaming/Queries/FFmpegProcessHandler.cs

@@ -23,7 +23,7 @@ namespace ErsatzTV.Application.Streaming.Queries
 
         public async Task<Either<BaseError, PlayoutItemProcessModel>> Handle(T request, CancellationToken cancellationToken)
         {
-            await using TvContext dbContext = _dbContextFactory.CreateDbContext();
+            await using TvContext dbContext = await _dbContextFactory.CreateDbContextAsync(cancellationToken);
             Validation<BaseError, Tuple<Channel, string>> validation = await Validate(dbContext, request);
             return await validation.Match(
                 tuple => GetProcess(dbContext, request, tuple.Item1, tuple.Item2),
@@ -56,7 +56,8 @@ namespace ErsatzTV.Application.Streaming.Queries
                         {
                             "hls-direct" => StreamingMode.HttpLiveStreamingDirect,
                             "segmenter" => StreamingMode.HttpLiveStreamingSegmenter,
-                            "ts" => StreamingMode.TransportStream,
+                            "ts" => StreamingMode.TransportStreamHybrid,
+                            "ts-legacy" => StreamingMode.TransportStream,
                             _ => channel.StreamingMode
                         };
 

ErsatzTV.Application/Streaming/Queries/GetConcatProcessByChannelNumber.cs

@@ -6,7 +6,7 @@ namespace ErsatzTV.Application.Streaming.Queries
     {
         public GetConcatProcessByChannelNumber(string scheme, string host, string channelNumber) : base(
             channelNumber,
-            "ts",
+            "ts-legacy",
             DateTimeOffset.Now,
             false,
             true)

ErsatzTV.Application/Streaming/Queries/GetConcatProcessByChannelNumberHandler.cs

@@ -1,11 +1,9 @@
 using System;
 using System.Diagnostics;
-using System.Runtime.InteropServices;
 using System.Threading.Tasks;
 using ErsatzTV.Core;
 using ErsatzTV.Core.Domain;
 using ErsatzTV.Core.Interfaces.FFmpeg;
-using ErsatzTV.Core.Interfaces.Runtime;
 using ErsatzTV.Infrastructure.Data;
 using ErsatzTV.Infrastructure.Extensions;
 using LanguageExt;
@@ -16,16 +14,13 @@ namespace ErsatzTV.Application.Streaming.Queries
     public class GetConcatProcessByChannelNumberHandler : FFmpegProcessHandler<GetConcatProcessByChannelNumber>
     {
         private readonly IFFmpegProcessService _ffmpegProcessService;
-        private readonly IRuntimeInfo _runtimeInfo;
 
         public GetConcatProcessByChannelNumberHandler(
             IDbContextFactory<TvContext> dbContextFactory,
-            IFFmpegProcessService ffmpegProcessService,
-            IRuntimeInfo runtimeInfo)
+            IFFmpegProcessService ffmpegProcessService)
             : base(dbContextFactory)
         {
             _ffmpegProcessService = ffmpegProcessService;
-            _runtimeInfo = runtimeInfo;
         }
 
         protected override async Task<Either<BaseError, PlayoutItemProcessModel>> GetProcess(
@@ -34,7 +29,7 @@ namespace ErsatzTV.Application.Streaming.Queries
             Channel channel,
             string ffmpegPath)
         {
-            bool saveReports = !_runtimeInfo.IsOSPlatform(OSPlatform.Windows) && await dbContext.ConfigElements
+            bool saveReports = await dbContext.ConfigElements
                 .GetValue<bool>(ConfigElementKey.FFmpegSaveReports)
                 .Map(result => result.IfNone(false));
 

ErsatzTV.Application/Streaming/Queries/GetPlayoutItemProcessByChannelNumberHandler.cs

@@ -1,25 +1,19 @@
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
-using System.IO;
 using System.Linq;
-using System.Runtime.InteropServices;
-using System.Text;
 using System.Threading.Tasks;
 using ErsatzTV.Core;
 using ErsatzTV.Core.Domain;
 using ErsatzTV.Core.Domain.Filler;
 using ErsatzTV.Core.Errors;
 using ErsatzTV.Core.Extensions;
-using ErsatzTV.Core.FFmpeg;
 using ErsatzTV.Core.Interfaces.Emby;
 using ErsatzTV.Core.Interfaces.FFmpeg;
-using ErsatzTV.Core.Interfaces.Images;
 using ErsatzTV.Core.Interfaces.Jellyfin;
 using ErsatzTV.Core.Interfaces.Metadata;
 using ErsatzTV.Core.Interfaces.Plex;
 using ErsatzTV.Core.Interfaces.Repositories;
-using ErsatzTV.Core.Interfaces.Runtime;
 using ErsatzTV.Core.Scheduling;
 using ErsatzTV.Infrastructure.Data;
 using ErsatzTV.Infrastructure.Extensions;
@@ -40,9 +34,7 @@ namespace ErsatzTV.Application.Streaming.Queries
         private readonly IJellyfinPathReplacementService _jellyfinPathReplacementService;
         private readonly ILocalFileSystem _localFileSystem;
         private readonly IPlexPathReplacementService _plexPathReplacementService;
-        private readonly IRuntimeInfo _runtimeInfo;
-        private readonly IImageCache _imageCache;
-        private readonly ITempFilePool _tempFilePool;
+        private readonly ISongVideoGenerator _songVideoGenerator;
 
         public GetPlayoutItemProcessByChannelNumberHandler(
             IDbContextFactory<TvContext> dbContextFactory,
@@ -54,9 +46,7 @@ namespace ErsatzTV.Application.Streaming.Queries
             IMediaCollectionRepository mediaCollectionRepository,
             ITelevisionRepository televisionRepository,
             IArtistRepository artistRepository,
-            IRuntimeInfo runtimeInfo,
-            IImageCache imageCache,
-            ITempFilePool tempFilePool)
+            ISongVideoGenerator songVideoGenerator)
             : base(dbContextFactory)
         {
             _ffmpegProcessService = ffmpegProcessService;
@@ -67,9 +57,7 @@ namespace ErsatzTV.Application.Streaming.Queries
             _mediaCollectionRepository = mediaCollectionRepository;
             _televisionRepository = televisionRepository;
             _artistRepository = artistRepository;
-            _runtimeInfo = runtimeInfo;
-            _imageCache = imageCache;
-            _tempFilePool = tempFilePool;
+            _songVideoGenerator = songVideoGenerator;
         }
 
         protected override async Task<Either<BaseError, PlayoutItemProcessModel>> GetProcess(
@@ -142,124 +130,14 @@ namespace ErsatzTV.Application.Streaming.Queries
 
                     if (playoutItemWithPath.PlayoutItem.MediaItem is Song song)
                     {
-                        Option<string> drawtextFile = None;
-                        
-                        videoVersion = new FallbackMediaVersion
-                        {
-                            Id = -1,
-                            Chapters = new List<MediaChapter>(),
-                            Width = 192,
-                            Height = 108,
-                            SampleAspectRatio = "1:1",
-                            Streams = new List<MediaStream>
-                            {
-                                new() { MediaStreamKind = MediaStreamKind.Video, Index = 0 }
-                            }
-                        };
-
-                        string[] backgrounds =
-                        {
-                            "background_blank.png",
-                            "background_e.png",
-                            "background_t.png",
-                            "background_v.png"
-                        };
-
-                        var random = new Random();
-
-                        // use random ETV color by default
-                        string artworkPath = Path.Combine(
-                            FileSystemLayout.ResourcesCacheFolder,
-                            backgrounds[random.Next() % backgrounds.Length]);
-                        
-                        // use thumbnail (cover art) if present
-                        foreach (SongMetadata metadata in song.SongMetadata)
-                        {
-                            string fileName = _tempFilePool.GetNextTempFile(TempFileCategory.DrawText);
-                            drawtextFile = fileName;
-
-                            var sb = new StringBuilder();
-                            if (!string.IsNullOrWhiteSpace(metadata.Artist))
-                            {
-                                sb.AppendLine(metadata.Artist);
-                            }
-
-                            if (!string.IsNullOrWhiteSpace(metadata.Title))
-                            {
-                                sb.AppendLine($"\"{metadata.Title}\"");
-                            }
-
-                            if (!string.IsNullOrWhiteSpace(metadata.Album))
-                            {
-                                sb.AppendLine(metadata.Album);
-                            }
-
-                            await File.WriteAllTextAsync(fileName, sb.ToString());
-
-                            foreach (Artwork artwork in Optional(
-                                metadata.Artwork.Find(a => a.ArtworkKind == ArtworkKind.Thumbnail)))
-                            {
-                                string customPath = _imageCache.GetPathForImage(
-                                    artwork.Path,
-                                    ArtworkKind.Thumbnail,
-                                    Option<int>.None);
-
-                                artworkPath = customPath;
-
-                                // signal that we want to use cover art as watermark
-                                videoVersion = new CoverArtMediaVersion
-                                {
-                                    Chapters = new List<MediaChapter>(),
-                                    // always stretch cover art
-                                    Width = 192,
-                                    Height = 108,
-                                    SampleAspectRatio = "1:1",
-                                    Streams = new List<MediaStream>
-                                    {
-                                        new() { MediaStreamKind = MediaStreamKind.Video, Index = 0 }
-                                    }
-                                };
-                            }
-                        }
-
-                        videoPath = artworkPath;
-
-                        videoVersion.MediaFiles = new List<MediaFile>
-                        {
-                            new() { Path = videoPath }
-                        };
-
-                        Either<BaseError, string> maybeSongImage = await _ffmpegProcessService.GenerateSongImage(
-                            ffmpegPath,
-                            drawtextFile,
+                        (videoPath, videoVersion) = await _songVideoGenerator.GenerateSongVideo(
+                            song,
                             channel,
                             maybeGlobalWatermark,
-                            videoVersion,
-                            videoPath);
-
-                        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 },
-                                },
-                                MediaFiles = new List<MediaFile>
-                                {
-                                    new() { Path = si }
-                                }
-                            };
-                        }
+                            ffmpegPath);
                     }
 
-                    bool saveReports = !_runtimeInfo.IsOSPlatform(OSPlatform.Windows) && await dbContext.ConfigElements
+                    bool saveReports = await dbContext.ConfigElements
                         .GetValue<bool>(ConfigElementKey.FFmpegSaveReports)
                         .Map(result => result.IfNone(false));
 
@@ -310,7 +188,7 @@ namespace ErsatzTV.Application.Streaming.Queries
                         case UnableToLocatePlayoutItem:
                             if (channel.FFmpegProfile.Transcode)
                             {
-                                Process errorProcess = _ffmpegProcessService.ForError(
+                                Process errorProcess = await _ffmpegProcessService.ForError(
                                     ffmpegPath,
                                     channel,
                                     maybeDuration,
@@ -329,7 +207,7 @@ namespace ErsatzTV.Application.Streaming.Queries
                         case PlayoutItemDoesNotExistOnDisk:
                             if (channel.FFmpegProfile.Transcode)
                             {
-                                Process errorProcess = _ffmpegProcessService.ForError(
+                                Process errorProcess = await _ffmpegProcessService.ForError(
                                     ffmpegPath,
                                     channel,
                                     maybeDuration,
@@ -348,7 +226,7 @@ namespace ErsatzTV.Application.Streaming.Queries
                         default:
                             if (channel.FFmpegProfile.Transcode)
                             {
-                                Process errorProcess = _ffmpegProcessService.ForError(
+                                Process errorProcess = await _ffmpegProcessService.ForError(
                                     ffmpegPath,
                                     channel,
                                     maybeDuration,

ErsatzTV.Application/Streaming/Queries/GetWrappedProcessByChannelNumber.cs

@@ -0,0 +1,21 @@
+using System;
+
+namespace ErsatzTV.Application.Streaming.Queries
+{
+    public record GetWrappedProcessByChannelNumber : FFmpegProcessRequest
+    {
+        public GetWrappedProcessByChannelNumber(string scheme, string host, string channelNumber) : base(
+            channelNumber,
+            "ts",
+            DateTimeOffset.Now,
+            false,
+            true)
+        {
+            Scheme = scheme;
+            Host = host;
+        }
+
+        public string Scheme { get; }
+        public string Host { get; }
+    }
+}

ErsatzTV.Application/Streaming/Queries/GetWrappedProcessByChannelNumberHandler.cs

@@ -0,0 +1,46 @@
+using System;
+using System.Diagnostics;
+using System.Threading.Tasks;
+using ErsatzTV.Core;
+using ErsatzTV.Core.Domain;
+using ErsatzTV.Core.Interfaces.FFmpeg;
+using ErsatzTV.Infrastructure.Data;
+using ErsatzTV.Infrastructure.Extensions;
+using LanguageExt;
+using Microsoft.EntityFrameworkCore;
+
+namespace ErsatzTV.Application.Streaming.Queries
+{
+    public class GetWrappedProcessByChannelNumberHandler : FFmpegProcessHandler<GetWrappedProcessByChannelNumber>
+    {
+        private readonly IFFmpegProcessService _ffmpegProcessService;
+
+        public GetWrappedProcessByChannelNumberHandler(
+            IDbContextFactory<TvContext> dbContextFactory,
+            IFFmpegProcessService ffmpegProcessService)
+            : base(dbContextFactory)
+        {
+            _ffmpegProcessService = ffmpegProcessService;
+        }
+
+        protected override async Task<Either<BaseError, PlayoutItemProcessModel>> GetProcess(
+            TvContext dbContext,
+            GetWrappedProcessByChannelNumber request,
+            Channel channel,
+            string ffmpegPath)
+        {
+            bool saveReports = await dbContext.ConfigElements
+                .GetValue<bool>(ConfigElementKey.FFmpegSaveReports)
+                .Map(result => result.IfNone(false));
+
+            Process process = _ffmpegProcessService.WrapSegmenter(
+                ffmpegPath,
+                saveReports,
+                channel,
+                request.Scheme,
+                request.Host);
+
+            return new PlayoutItemProcessModel(process, DateTimeOffset.MaxValue);
+        }
+    }
+}

ErsatzTV.CommandLine/Commands/ChannelCommand.cs

@@ -1,106 +0,0 @@
-using System;
-using System.Linq;
-using System.Threading.Tasks;
-using CliFx;
-using CliFx.Attributes;
-using ErsatzTV.Api.Sdk.Api;
-using ErsatzTV.Api.Sdk.Model;
-using LanguageExt;
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.Logging;
-using static LanguageExt.Prelude;
-
-namespace ErsatzTV.CommandLine.Commands
-{
-    [Command("channel", Description = "Create or rename a channel")]
-    public class ChannelCommand : ICommand
-    {
-        private readonly ChannelsApi _channelsApi;
-        private readonly FFmpegProfileApi _ffmpegProfileApi;
-        private readonly ILogger<ChannelCommand> _logger;
-
-        public ChannelCommand(IConfiguration configuration, ILogger<ChannelCommand> logger)
-        {
-            _logger = logger;
-            _channelsApi = new ChannelsApi(configuration["ServerUrl"]);
-            _ffmpegProfileApi = new FFmpegProfileApi(configuration["ServerUrl"]);
-        }
-
-        [CommandParameter(0, Name = "channel-number", Description = "The channel number")]
-        public int Number { get; set; }
-
-        [CommandParameter(1, Name = "channel-name", Description = "The channel name")]
-        public string Name { get; set; }
-
-        [CommandParameter(2, Name = "streaming-mode", Description = "The streaming mode")]
-        public StreamingMode StreamingMode { get; set; }
-
-        [CommandOption("ffmpeg-profile", Description = "The ffmpeg profile name")]
-        public string FFmpegProfileName { get; set; }
-
-        public async ValueTask ExecuteAsync(IConsole console)
-        {
-            try
-            {
-                Option<ChannelViewModel> maybeChannel = await _channelsApi.ApiChannelsGetAsync()
-                    .Map(list => Optional(list.SingleOrDefault(c => c.Number == Number)));
-
-                FFmpegProfileViewModel ffmpegProfile = await _ffmpegProfileApi.ApiFfmpegProfilesGetAsync()
-                    .Map(
-                        list => Optional(list.SingleOrDefault(p => p.Name == FFmpegProfileName))
-                            .IfNone(new FFmpegProfileViewModel { Id = 1 }));
-
-                await maybeChannel.Match(
-                    channel => RenameChannel(channel, ffmpegProfile),
-                    () => AddChannel(ffmpegProfile));
-            }
-            catch (Exception ex)
-            {
-                _logger.LogError("Unable to synchronize channel: {Message}", ex.Message);
-            }
-        }
-
-        private async ValueTask RenameChannel(ChannelViewModel existing, FFmpegProfileViewModel ffmpegProfile)
-        {
-            int newFFmpegProfileId = string.IsNullOrWhiteSpace(FFmpegProfileName)
-                ? existing.FfmpegProfileId
-                : ffmpegProfile.Id;
-
-            if (existing.Name != Name || existing.FfmpegProfileId != newFFmpegProfileId ||
-                existing.StreamingMode != StreamingMode)
-            {
-                var updateChannel = new UpdateChannel(
-                    existing.Id,
-                    Name,
-                    existing.Number,
-                    newFFmpegProfileId,
-                    existing.Logo,
-                    StreamingMode);
-
-                await _channelsApi.ApiChannelsPatchAsync(updateChannel);
-            }
-
-            _logger.LogInformation(
-                "Successfully synchronized channel {ChannelNumber} - {ChannelName}",
-                Number,
-                Name);
-        }
-
-        private async ValueTask AddChannel(FFmpegProfileViewModel ffmpegProfile)
-        {
-            var createChannel = new CreateChannel(
-                Name,
-                Number,
-                ffmpegProfile.Id,
-                null,
-                StreamingMode);
-
-            await _channelsApi.ApiChannelsPostAsync(createChannel);
-
-            _logger.LogInformation(
-                "Successfully created channel {ChannelNumber} - {ChannelName}",
-                Number,
-                Name);
-        }
-    }
-}

ErsatzTV.CommandLine/Commands/ConfigCommand.cs

@@ -1,31 +0,0 @@
-using System;
-using System.IO;
-using System.Text.Json;
-using System.Threading.Tasks;
-using CliFx;
-using CliFx.Attributes;
-
-namespace ErsatzTV.CommandLine.Commands
-{
-    [Command("config", Description = "Configure ErsatzTV server url")]
-    public class ConfigCommand : ICommand
-    {
-        [CommandParameter(0, Name = "server-url", Description = "The url of the ErsatzTV server")]
-        public string ServerUrl { get; set; }
-
-        public async ValueTask ExecuteAsync(IConsole console)
-        {
-            // TODO: validate URL
-
-            string configFolder = Path.Combine(
-                Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData),
-                "ersatztv");
-
-            string configFile = Path.Combine(configFolder, "cli.json");
-
-            var config = new Config { ServerUrl = ServerUrl };
-            string contents = JsonSerializer.Serialize(config);
-            await File.WriteAllTextAsync(configFile, contents);
-        }
-    }
-}

ErsatzTV.CommandLine/Commands/FFmpegProfileCommand.cs

@@ -1,151 +0,0 @@
-using System;
-using System.Linq;
-using System.Threading.Tasks;
-using CliFx;
-using CliFx.Attributes;
-using ErsatzTV.Api.Sdk.Api;
-using ErsatzTV.Api.Sdk.Model;
-using LanguageExt;
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.Logging;
-using static LanguageExt.Prelude;
-
-namespace ErsatzTV.CommandLine.Commands
-{
-    [Command("ffmpeg-profile", Description = "Synchronize an ffmpeg profile")]
-    public class FFmpegProfileCommand : ICommand
-    {
-        private readonly FFmpegProfileApi _ffmpegProfileApi;
-        private readonly ILogger<FFmpegProfileCommand> _logger;
-
-        public FFmpegProfileCommand(IConfiguration configuration, ILogger<FFmpegProfileCommand> logger)
-        {
-            _logger = logger;
-            _ffmpegProfileApi = new FFmpegProfileApi(configuration["ServerUrl"]);
-        }
-
-        [CommandParameter(0, Name = "profile-name", Description = "The ffmpeg profile name")]
-        public string Name { get; set; }
-
-        [CommandOption("thread-count", Description = "The number of threads")]
-        public int ThreadCount { get; set; } = 0;
-
-        [CommandOption("transcode", Description = "Whether to transcode all media")]
-        public bool Transcode { get; set; } = true;
-
-        // public int ResolutionId { get; set; } = resolution.Id;
-        // Resolution { get; set; } = resolution;
-        [CommandOption("resolution", Description = "The resolution")]
-        public DesiredResolution Resolution { get; set; } = DesiredResolution.W1920H1080;
-
-        [CommandOption("video-codec", Description = "The video codec")]
-        public string VideoCodec { get; set; } = "libx264";
-
-        [CommandOption("audio-codec", Description = "The audio codec")]
-        public string AudioCodec { get; set; } = "ac3";
-
-        [CommandOption("video-bitrate", Description = "The video bitrate in kBit/s")]
-        public int VideoBitrate { get; set; } = 2000;
-
-        [CommandOption("video-buffer-size", Description = "The video buffer size in kBit")]
-        public int VideoBufferSize { get; set; } = 2000;
-
-        [CommandOption("audio-bitrate", Description = "The audio bitrate in kBit/s")]
-        public int AudioBitrate { get; set; } = 192;
-
-        [CommandOption("audio-buffer-size", Description = "The audio buffer size in kBits")]
-        public int AudioBufferSize { get; set; } = 50;
-
-        [CommandOption("audio-volume", Description = "The audio volume as a whole number percent")]
-        public int AudioVolume { get; set; } = 100;
-
-        [CommandOption("audio-channels", Description = "The number of audio channels")]
-        public int AudioChannels { get; set; } = 2;
-
-        [CommandOption("audio-sample-rate", Description = "The audio sample rate in kHz")]
-        public int AudioSampleRate { get; set; } = 48;
-
-        [CommandOption("normalize-resolution", Description = "Whether to normalize the resolution of all media")]
-        public bool NormalizeResolution { get; set; } = true;
-
-        [CommandOption("normalize-video-codec", Description = "Whether to normalize the video codec of all media")]
-        public bool NormalizeVideoCodec { get; set; } = true;
-
-        [CommandOption("normalize-audio-codec", Description = "Whether to normalize the audio codec of all media")]
-        public bool NormalizeAudioCodec { get; set; } = true;
-
-        [CommandOption(
-            "normalize-audio",
-            Description = "Whether to normalize audio channels and sample rate of all media")]
-        public bool NormalizeAudio { get; set; } = true;
-
-        public async ValueTask ExecuteAsync(IConsole console)
-        {
-            try
-            {
-                Option<FFmpegProfileViewModel> maybeFFmpegProfile = await _ffmpegProfileApi.ApiFfmpegProfilesGetAsync()
-                    .Map(list => Optional(list.SingleOrDefault(p => p.Name == Name)));
-
-                await maybeFFmpegProfile.Match(UpdateProfile, AddProfile);
-            }
-            catch (Exception ex)
-            {
-                _logger.LogError("Unable to synchronize ffmpeg profile: {Message}", ex.Message);
-            }
-        }
-
-        private async ValueTask UpdateProfile(FFmpegProfileViewModel existing)
-        {
-            var updateFFmpegProfile = new UpdateFFmpegProfile(
-                existing.Id,
-                Name,
-                ThreadCount,
-                Transcode,
-                (int) Resolution,
-                NormalizeResolution,
-                VideoCodec,
-                NormalizeVideoCodec,
-                VideoBitrate,
-                VideoBufferSize,
-                AudioCodec,
-                NormalizeAudioCodec,
-                AudioBitrate,
-                AudioBufferSize,
-                AudioVolume,
-                AudioChannels,
-                AudioSampleRate,
-                NormalizeAudio);
-
-            await _ffmpegProfileApi.ApiFfmpegProfilesPatchAsync(updateFFmpegProfile);
-
-            _logger.LogInformation("Successfully synchronized ffmpeg profile {ProfileName}", Name);
-        }
-
-        private async ValueTask AddProfile()
-        {
-            var createFFmpegProfile = new CreateFFmpegProfile(
-                Name,
-                ThreadCount,
-                Transcode,
-                (int) Resolution,
-                NormalizeResolution,
-                VideoCodec,
-                NormalizeVideoCodec,
-                VideoBitrate,
-                VideoBufferSize,
-                AudioCodec,
-                NormalizeAudioCodec,
-                AudioBitrate,
-                AudioBufferSize,
-                AudioVolume,
-                AudioChannels,
-                AudioSampleRate,
-                NormalizeAudio);
-
-
-            await _ffmpegProfileApi.ApiFfmpegProfilesPostAsync(createFFmpegProfile);
-
-            _logger.LogInformation("Successfully created ffmpeg profile {ProfileName}", Name);
-        }
-    }
-}

ErsatzTV.CommandLine/Commands/MediaCollections/MediaCollectionClearCommand.cs

@@ -1,86 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-using CliFx;
-using CliFx.Attributes;
-using ErsatzTV.Api.Sdk.Api;
-using ErsatzTV.Api.Sdk.Model;
-using LanguageExt;
-using LanguageExt.Common;
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.Logging;
-using static LanguageExt.Prelude;
-
-namespace ErsatzTV.CommandLine.Commands.MediaCollections
-{
-    [Command("collection clear", Description = "Removes all items from a media collection")]
-    public class MediaCollectionClearCommand : ICommand
-    {
-        private readonly ILogger<MediaCollectionClearCommand> _logger;
-        private readonly string _serverUrl;
-
-        public MediaCollectionClearCommand(IConfiguration configuration, ILogger<MediaCollectionClearCommand> logger)
-        {
-            _logger = logger;
-            _serverUrl = configuration["ServerUrl"];
-        }
-
-        [CommandParameter(0, Name = "collection-name", Description = "The name of the media collection")]
-        public string Name { get; set; }
-
-        public async ValueTask ExecuteAsync(IConsole console)
-        {
-            try
-            {
-                CancellationToken cancellationToken = console.GetCancellationToken();
-
-                Either<Error, Unit> result = await ClearMediaCollection(cancellationToken);
-
-                result.Match(
-                    _ => _logger.LogInformation("Successfully cleared media collection {MediaCollection}", Name),
-                    error => _logger.LogError(
-                        "Unable to clear media collection: {Error}",
-                        error.Message));
-            }
-            catch (Exception ex)
-            {
-                _logger.LogError("Unable to clear media collection: {Error}", ex.Message);
-            }
-        }
-
-        private async Task<Either<Error, Unit>> ClearMediaCollection(CancellationToken cancellationToken) =>
-            await EnsureMediaCollectionExists(cancellationToken)
-                .BindAsync(mediaCollectionId => ClearMediaCollectionImpl(mediaCollectionId, cancellationToken));
-
-        private async Task<Either<Error, int>> EnsureMediaCollectionExists(CancellationToken cancellationToken)
-        {
-            var mediaCollectionsApi = new MediaCollectionsApi(_serverUrl);
-            Option<MediaCollectionViewModel> maybeExisting =
-                (await mediaCollectionsApi.ApiMediaCollectionsGetAsync(cancellationToken))
-                .SingleOrDefault(mc => mc.Name == Name);
-            return await maybeExisting.MatchAsync(
-                existing => existing.Id,
-                async () =>
-                {
-                    var data = new CreateSimpleMediaCollection(Name);
-                    MediaCollectionViewModel result =
-                        await mediaCollectionsApi.ApiMediaCollectionsPostAsync(data, cancellationToken);
-                    return result.Id;
-                });
-        }
-
-        private async Task<Either<Error, Unit>> ClearMediaCollectionImpl(
-            int mediaCollectionId,
-            CancellationToken cancellationToken)
-        {
-            var mediaCollectionsApi = new MediaCollectionsApi(_serverUrl);
-            await mediaCollectionsApi.ApiMediaCollectionsIdItemsPutAsync(
-                mediaCollectionId,
-                new List<int>(),
-                cancellationToken);
-            return unit;
-        }
-    }
-}

ErsatzTV.CommandLine/Commands/MediaCollections/MediaCollectionCreateCommand.cs

@@ -1,72 +0,0 @@
-using System;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-using CliFx;
-using CliFx.Attributes;
-using ErsatzTV.Api.Sdk.Api;
-using ErsatzTV.Api.Sdk.Model;
-using LanguageExt;
-using LanguageExt.Common;
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.Logging;
-using static LanguageExt.Prelude;
-
-namespace ErsatzTV.CommandLine.Commands.MediaCollections
-{
-    [Command("collection create", Description = "Creates a new media collection")]
-    public class MediaCollectionCreateCommand : ICommand
-    {
-        private readonly ILogger<MediaCollectionCreateCommand> _logger;
-        private readonly string _serverUrl;
-
-        public MediaCollectionCreateCommand(IConfiguration configuration, ILogger<MediaCollectionCreateCommand> logger)
-        {
-            _logger = logger;
-            _serverUrl = configuration["ServerUrl"];
-        }
-
-        [CommandParameter(0, Name = "collection-name", Description = "The name of the media collection")]
-        public string Name { get; set; }
-
-        public async ValueTask ExecuteAsync(IConsole console)
-        {
-            try
-            {
-                CancellationToken cancellationToken = console.GetCancellationToken();
-
-                Either<Error, Unit> result = await CreateMediaCollection(cancellationToken);
-                result.IfLeft(error => _logger.LogError("Unable to create media collection: {Error}", error.Message));
-            }
-            catch (Exception ex)
-            {
-                _logger.LogError("Unable to create media collection: {Error}", ex.Message);
-            }
-        }
-
-        private async Task<Either<Error, Unit>> CreateMediaCollection(CancellationToken cancellationToken) =>
-            await EnsureMediaCollectionExists(cancellationToken);
-
-        private async Task<Either<Error, Unit>> EnsureMediaCollectionExists(CancellationToken cancellationToken)
-        {
-            var mediaCollectionsApi = new MediaCollectionsApi(_serverUrl);
-
-            bool needToAdd = await mediaCollectionsApi
-                .ApiMediaCollectionsGetAsync(cancellationToken)
-                .Map(list => list.All(mc => mc.Name != Name));
-
-            if (needToAdd)
-            {
-                var data = new CreateSimpleMediaCollection(Name);
-                await mediaCollectionsApi.ApiMediaCollectionsPostAsync(data, cancellationToken);
-                _logger.LogInformation("Successfully created media collection {MediaCollection}", Name);
-            }
-            else
-            {
-                _logger.LogInformation("Media collection {MediaCollection} is already present", Name);
-            }
-
-            return unit;
-        }
-    }
-}

ErsatzTV.CommandLine/Commands/PlayoutCommand.cs

@@ -1,107 +0,0 @@
-using System;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-using CliFx;
-using CliFx.Attributes;
-using ErsatzTV.Api.Sdk.Api;
-using ErsatzTV.Api.Sdk.Model;
-using LanguageExt;
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.Logging;
-
-namespace ErsatzTV.CommandLine.Commands
-{
-    [Command("playout build", Description = "Builds a playout with the requested channel and schedule")]
-    public class PlayoutCommand : ICommand
-    {
-        private readonly ILogger<PlayoutCommand> _logger;
-        private readonly string _serverUrl;
-
-        public PlayoutCommand(IConfiguration configuration, ILogger<PlayoutCommand> logger)
-        {
-            _logger = logger;
-            _serverUrl = configuration["ServerUrl"];
-        }
-
-        [CommandParameter(0, Name = "channel-number", Description = "The channel number")]
-        public int ChannelNumber { get; set; }
-
-        [CommandParameter(1, Name = "schedule-name", Description = "The schedule name")]
-        public string ScheduleName { get; set; }
-
-        // [Option("--type <type>")]
-        // [Required]
-        // public ProgramSchedulePlayoutType PlayoutType { get; set; }
-
-        public async ValueTask ExecuteAsync(IConsole console)
-        {
-            try
-            {
-                CancellationToken cancellationToken = console.GetCancellationToken();
-
-                var channelsApi = new ChannelsApi(_serverUrl);
-                Option<ChannelViewModel> maybeChannel = await channelsApi.ApiChannelsGetAsync(cancellationToken)
-                    .Map(list => list.SingleOrDefault(c => c.Number == ChannelNumber));
-
-                await maybeChannel.Match(
-                    channel => BuildPlayout(cancellationToken, channel),
-                    () =>
-                    {
-                        _logger.LogError("Unable to locate channel number {ChannelNumber}", ChannelNumber);
-                        return ValueTask.CompletedTask;
-                    });
-            }
-            catch (Exception ex)
-            {
-                _logger.LogError("Unable to build playout: {Error}", ex.Message);
-            }
-        }
-
-        private async ValueTask BuildPlayout(CancellationToken cancellationToken, ChannelViewModel channel)
-        {
-            var programScheduleApi = new ProgramScheduleApi(_serverUrl);
-            Option<ProgramScheduleViewModel> maybeSchedule = await programScheduleApi
-                .ApiSchedulesGetAsync(cancellationToken)
-                .Map(list => list.SingleOrDefault(s => s.Name == ScheduleName));
-
-            await maybeSchedule.Match(
-                schedule => SynchronizePlayoutAsync(channel.Id, schedule.Id, cancellationToken),
-                () =>
-                {
-                    _logger.LogError("Unable to locate schedule {Schedule}", ScheduleName);
-                    return ValueTask.CompletedTask;
-                });
-        }
-
-        private async ValueTask SynchronizePlayoutAsync(
-            int channelId,
-            int scheduleId,
-            CancellationToken cancellationToken)
-        {
-            var playoutApi = new PlayoutApi(_serverUrl);
-            Option<PlayoutViewModel> maybeExisting = await playoutApi.ApiPlayoutsGetAsync(cancellationToken)
-                .Map(list => list.SingleOrDefault(p => p.Channel.Id == channelId));
-            await maybeExisting.Match(
-                existing =>
-                {
-                    var data = new UpdatePlayout(existing.Id, channelId, scheduleId, ProgramSchedulePlayoutType.Flood);
-                    if (existing.Channel.Id != data.ChannelId ||
-                        existing.ProgramSchedule.Id != data.ProgramScheduleId ||
-                        existing.ProgramSchedulePlayoutType != data.ProgramSchedulePlayoutType)
-                    {
-                        return playoutApi.ApiPlayoutsPatchAsync(data, cancellationToken);
-                    }
-
-                    return Task.CompletedTask;
-                },
-                () =>
-                {
-                    var data = new CreatePlayout(channelId, scheduleId, ProgramSchedulePlayoutType.Flood);
-                    return playoutApi.ApiPlayoutsPostAsync(data, cancellationToken);
-                });
-
-            _logger.LogInformation("Successfully built playout for schedule {Schedule}", ScheduleName);
-        }
-    }
-}

ErsatzTV.CommandLine/Commands/Schedules/ScheduleAddItemCommand.cs

@@ -1,140 +0,0 @@
-using System;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-using CliFx;
-using CliFx.Attributes;
-using ErsatzTV.Api.Sdk.Api;
-using ErsatzTV.Api.Sdk.Model;
-using LanguageExt;
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.Logging;
-
-namespace ErsatzTV.CommandLine.Commands.Schedules
-{
-    [Command("schedule add-item", Description = "Adds an item to the end of a schedule")]
-    public class ScheduleAddItemCommand : ICommand
-    {
-        private readonly ILogger<ScheduleAddItemCommand> _logger;
-        private readonly string _serverUrl;
-
-        public ScheduleAddItemCommand(IConfiguration configuration, ILogger<ScheduleAddItemCommand> logger)
-        {
-            _logger = logger;
-            _serverUrl = configuration["ServerUrl"];
-        }
-
-        [CommandParameter(0, Name = "schedule-name", Description = "The schedule name")]
-        public string ScheduleName { get; set; }
-
-        [CommandParameter(1, Name = "collection-name", Description = "The media collection name")]
-        public string CollectionName { get; set; }
-
-        // [CommandParameter(2, Description = "The collection playback order")]
-        // public PlaybackOrder Order { get; set; }
-
-        [CommandOption("start-type", 's', Description = "The playout start type")]
-        public StartType StartType { get; set; } = StartType.Dynamic;
-
-        [CommandOption("start-time", 't', Description = "The playout start time (of day)")]
-        public string StartTime { get; set; } = null;
-
-        [CommandOption("playout-mode", 'm', Description = "The playout mode")]
-        public PlayoutMode PlayoutMode { get; set; } = PlayoutMode.Flood;
-
-        [CommandOption(
-            "multiple-count",
-            'c',
-            Description = "How many items to play from the collection (for Multiple playout mode)")]
-        public int? MultipleCount { get; set; } = null;
-
-        [CommandOption(
-            "playout-duration",
-            'd',
-            Description = "How long to play items from the collection (for Duration playout mode)")]
-        public string PlayoutDuration { get; set; } = null;
-
-        [CommandOption(
-            "offline-tail",
-            'o',
-            Description =
-                "Whether to remain offline for the entire duration, or to start the next item immediately (for Duration playout mode)")]
-        public bool? OfflineTail { get; set; } = null;
-
-        public async ValueTask ExecuteAsync(IConsole console)
-        {
-            try
-            {
-                CancellationToken cancellationToken = console.GetCancellationToken();
-
-                Option<ProgramScheduleViewModel> maybeSchedule = await GetSchedule(cancellationToken);
-                await maybeSchedule.Match(
-                    programSchedule => AddItemToSchedule(cancellationToken, programSchedule),
-                    () =>
-                    {
-                        _logger.LogError("Unable to locate schedule {Schedule}", ScheduleName);
-                        return ValueTask.CompletedTask;
-                    });
-            }
-            catch (Exception ex)
-            {
-                _logger.LogError("Unable to add item to schedule: {Error}", ex.Message);
-            }
-        }
-
-        private async ValueTask AddItemToSchedule(
-            CancellationToken cancellationToken,
-            ProgramScheduleViewModel programSchedule)
-        {
-            var mediaCollectionsApi = new MediaCollectionsApi(_serverUrl);
-            Option<MediaCollectionViewModel> maybeMediaCollection = await mediaCollectionsApi
-                .ApiMediaCollectionsGetAsync(cancellationToken)
-                .Map(list => list.SingleOrDefault(mc => mc.Name == CollectionName));
-
-            await maybeMediaCollection.Match(
-                collection =>
-                    AddScheduleItem(programSchedule.Id, collection.Id, cancellationToken),
-                () =>
-                {
-                    _logger.LogError(
-                        "Unable to locate collection {Collection}",
-                        CollectionName);
-                    return Task.CompletedTask;
-                });
-        }
-
-        private async Task<Option<ProgramScheduleViewModel>> GetSchedule(CancellationToken cancellationToken)
-        {
-            var programScheduleApi = new ProgramScheduleApi(_serverUrl);
-            return await programScheduleApi.ApiSchedulesGetAsync(cancellationToken)
-                .Map(list => list.SingleOrDefault(schedule => schedule.Name == ScheduleName));
-        }
-
-        private async Task AddScheduleItem(
-            int programScheduleId,
-            int mediaCollectionId,
-            CancellationToken cancellationToken)
-        {
-            var programScheduleApi = new ProgramScheduleApi(_serverUrl);
-
-            var request = new AddProgramScheduleItem
-            {
-                ProgramScheduleId = programScheduleId,
-                StartType = StartType,
-                StartTime = StartTime,
-                PlayoutMode = PlayoutMode,
-                MediaCollectionId = mediaCollectionId,
-                PlayoutDuration = PlayoutDuration,
-                MultipleCount = MultipleCount,
-                OfflineTail = OfflineTail
-            };
-
-            await programScheduleApi.ApiSchedulesItemsAddPostAsync(request, cancellationToken);
-
-            _logger.LogInformation(
-                "Collection {Collection} has been added to schedule {Schedule}",
-                CollectionName,
-                ScheduleName);
-        }
-    }
-}

ErsatzTV.CommandLine/Commands/Schedules/ScheduleCreateCommand.cs

@@ -1,86 +0,0 @@
-using System;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-using CliFx;
-using CliFx.Attributes;
-using ErsatzTV.Api.Sdk.Api;
-using ErsatzTV.Api.Sdk.Model;
-using LanguageExt;
-using LanguageExt.Common;
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.Logging;
-using static LanguageExt.Prelude;
-
-namespace ErsatzTV.CommandLine.Commands.Schedules
-{
-    [Command("schedule create", Description = "Creates a new schedule")]
-    public class ScheduleCreateCommand : ICommand
-    {
-        private readonly ILogger<ScheduleCreateCommand> _logger;
-        private readonly string _serverUrl;
-
-        public ScheduleCreateCommand(IConfiguration configuration, ILogger<ScheduleCreateCommand> logger)
-        {
-            _logger = logger;
-            _serverUrl = configuration["ServerUrl"];
-        }
-
-        [CommandParameter(0, Name = "schedule-name", Description = "The schedule name")]
-        public string Name { get; set; }
-
-        [CommandParameter(1, Name = "playback-order", Description = "The collection playback order")]
-        public PlaybackOrder Order { get; set; }
-
-        [CommandOption("reset", Description = "Resets the schedule to contain no items")]
-        public bool Reset { get; set; }
-
-        public async ValueTask ExecuteAsync(IConsole console)
-        {
-            try
-            {
-                CancellationToken cancellationToken = console.GetCancellationToken();
-
-                Either<Error, Unit> result = await EnsureScheduleExistsAsync(cancellationToken);
-                result.IfLeft(error => _logger.LogError("Unable to create schedule: {Error}", error.Message));
-            }
-            catch (Exception ex)
-            {
-                _logger.LogError("Unable to create schedule: {Error}", ex.Message);
-            }
-        }
-
-        private async Task<Either<Error, Unit>> EnsureScheduleExistsAsync(CancellationToken cancellationToken)
-        {
-            var programScheduleApi = new ProgramScheduleApi(_serverUrl);
-
-            Option<ProgramScheduleViewModel> maybeExisting = await programScheduleApi
-                .ApiSchedulesGetAsync(cancellationToken)
-                .Map(list => list.SingleOrDefault(schedule => schedule.Name == Name));
-
-            await maybeExisting.Match(
-                existing =>
-                {
-                    // TODO: update playback order if changed?
-                    _logger.LogInformation("Schedule {Schedule} is already present", Name);
-
-                    if (Reset)
-                    {
-                        return programScheduleApi
-                            .ApiSchedulesProgramScheduleIdItemsDeleteAsync(existing.Id, cancellationToken)
-                            .Iter(_ => _logger.LogInformation("Successfully reset schedule {Schedule}", Name));
-                    }
-
-                    return Task.CompletedTask;
-                },
-                () =>
-                {
-                    var data = new CreateProgramSchedule(Name, Order);
-                    return programScheduleApi.ApiSchedulesPostAsync(data, cancellationToken)
-                        .Iter(_ => _logger.LogInformation("Successfully created schedule {Schedule}", Name));
-                });
-
-            return unit;
-        }
-    }
-}

ErsatzTV.CommandLine/Config.cs

@@ -1,7 +0,0 @@
-namespace ErsatzTV.CommandLine
-{
-    public class Config
-    {
-        public string ServerUrl { get; set; }
-    }
-}

ErsatzTV.CommandLine/DesiredResolution.cs

@@ -1,10 +0,0 @@
-namespace ErsatzTV.CommandLine
-{
-    public enum DesiredResolution
-    {
-        W720H480 = 1,
-        W1280H720 = 2,
-        W1920H1080 = 3,
-        W3840H2160 = 4
-    }
-}

ErsatzTV.CommandLine/ErsatzTV.CommandLine.csproj

@@ -1,35 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-    <PropertyGroup>
-        <OutputType>Exe</OutputType>
-        <TargetFramework>net5.0</TargetFramework>
-        <AssemblyName>ersatztv-cli</AssemblyName>
-        <LangVersion>9</LangVersion>
-        <PackageVersion>0.0.1</PackageVersion>
-        <AssemblyVersion>0.0.1</AssemblyVersion>
-    </PropertyGroup>
-
-    <ItemGroup>
-      <PackageReference Include="CliFx" Version="1.6.0" />
-      <PackageReference Include="LanguageExt.Core" Version="3.4.15" />
-      <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="5.0.0" />
-      <PackageReference Include="Microsoft.Extensions.Hosting" Version="5.0.0" />
-      <PackageReference Include="Microsoft.Extensions.Logging" Version="5.0.0" />
-      <PackageReference Include="RestSharp" Version="106.11.7" />
-      <PackageReference Include="Serilog" Version="2.10.0" />
-      <PackageReference Include="Serilog.Extensions.Hosting" Version="4.1.2" />
-      <PackageReference Include="Serilog.Extensions.Logging" Version="3.0.1" />
-      <PackageReference Include="Serilog.Sinks.Console" Version="3.1.1" />
-    </ItemGroup>
-
-    <ItemGroup>
-      <ProjectReference Include="..\generated\ErsatzTV.Api.Sdk\src\ErsatzTV.Api.Sdk\ErsatzTV.Api.Sdk.csproj" />
-    </ItemGroup>
-
-    <ItemGroup>
-      <Reference Include="Microsoft.Extensions.Hosting.Abstractions, Version=5.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60">
-        <HintPath>..\..\..\..\..\..\usr\share\dotnet\packs\Microsoft.AspNetCore.App.Ref\5.0.0\ref\net5.0\Microsoft.Extensions.Hosting.Abstractions.dll</HintPath>
-      </Reference>
-    </ItemGroup>
-
-</Project>

ErsatzTV.CommandLine/Program.cs

@@ -1,75 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Threading.Tasks;
-using CliFx;
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Hosting;
-using Serilog;
-using Serilog.Events;
-
-namespace ErsatzTV.CommandLine
-{
-    public class Program
-    {
-        public static async Task<int> Main(string[] args)
-        {
-            Log.Logger = new LoggerConfiguration()
-                .MinimumLevel.Information()
-                .MinimumLevel.Override("Microsoft", LogEventLevel.Warning)
-                .Enrich.FromLogContext()
-                .WriteTo.Console()
-                .CreateLogger();
-
-            IHost host = CreateHostBuilder(args).Build();
-            try
-            {
-                return await new CliApplicationBuilder()
-                    .AddCommandsFromThisAssembly()
-                    .UseTypeActivator(host.Services.GetService)
-                    .Build()
-                    .RunAsync(args);
-            }
-            catch (Exception ex)
-            {
-                Log.Fatal(ex, "Host terminated unexpectedly");
-                return 1;
-            }
-            finally
-            {
-                Log.CloseAndFlush();
-            }
-        }
-
-        public static IHostBuilder CreateHostBuilder(string[] args) =>
-            Host.CreateDefaultBuilder(args)
-                .ConfigureServices(
-                    (_, services) =>
-                    {
-                        services.AddSingleton<IConsole, SystemConsole>();
-                        IEnumerable<Type> typesThatImplementICommand = typeof(Program).Assembly.GetTypes()
-                            .Where(x => typeof(ICommand).IsAssignableFrom(x))
-                            .Where(x => !x.IsAbstract);
-                        foreach (Type t in typesThatImplementICommand)
-                        {
-                            services.AddTransient(t);
-                        }
-                    })
-                .ConfigureAppConfiguration(
-                    (_, configuration) =>
-                    {
-                        configuration.Sources.Clear();
-
-                        string configFolder = Path.Combine(
-                            Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData),
-                            "ersatztv");
-
-                        configuration.SetBasePath(configFolder);
-                        configuration.AddJsonFile("cli.json", true, true);
-                    })
-                .UseSerilog()
-                .UseConsoleLifetime();
-    }
-}

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

@@ -6,7 +6,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-      <PackageReference Include="FluentAssertions" Version="6.2.0" />
+      <PackageReference Include="FluentAssertions" Version="6.3.0" />
       <PackageReference Include="LanguageExt.Core" Version="4.0.3" />
       <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0" />
       <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
@@ -16,7 +16,7 @@
       </PackageReference>
       <PackageReference Include="Moq" Version="4.16.1" />
       <PackageReference Include="NUnit" Version="3.13.2" />
-      <PackageReference Include="NUnit3TestAdapter" Version="4.1.0" />
+      <PackageReference Include="NUnit3TestAdapter" Version="4.2.0" />
       <PackageReference Include="Serilog" Version="2.10.0" />
       <PackageReference Include="Serilog.Extensions.Logging" Version="3.1.0" />
       <PackageReference Include="Serilog.Sinks.Debug" Version="2.0.0" />

ErsatzTV.Core.Tests/FFmpeg/FFmpegComplexFilterBuilderTests.cs

@@ -297,37 +297,37 @@ namespace ErsatzTV.Core.Tests.FFmpeg
                 true,
                 true,
                 false,
-                "[0:0]deinterlace_qsv,scale_qsv=w=1920:h=1000,hwdownload,format=nv12,setsar=1,hwupload=extra_hw_frames=64[v]",
+                "[0:0]deinterlace_qsv,scale_qsv=w=1920:h=1000,setsar=1[v]",
                 "[v]")]
             [TestCase(
                 true,
                 false,
                 true,
-                "[0:0]deinterlace_qsv,hwdownload,format=nv12,setsar=1,pad=1920:1080:(ow-iw)/2:(oh-ih)/2,hwupload=extra_hw_frames=64[v]",
+                "[0:0]deinterlace_qsv,setsar=1,hwdownload,format=nv12,pad=1920:1080:(ow-iw)/2:(oh-ih)/2,hwupload=extra_hw_frames=64[v]",
                 "[v]")]
             [TestCase(
                 true,
                 true,
                 true,
-                "[0:0]deinterlace_qsv,scale_qsv=w=1920:h=1000,hwdownload,format=nv12,setsar=1,pad=1920:1080:(ow-iw)/2:(oh-ih)/2,hwupload=extra_hw_frames=64[v]",
+                "[0:0]deinterlace_qsv,scale_qsv=w=1920:h=1000,setsar=1,hwdownload,format=nv12,pad=1920:1080:(ow-iw)/2:(oh-ih)/2,hwupload=extra_hw_frames=64[v]",
                 "[v]")]
             [TestCase(
                 false,
                 true,
                 false,
-                "[0:0]scale_qsv=w=1920:h=1000,hwdownload,format=nv12,setsar=1,hwupload=extra_hw_frames=64[v]",
+                "[0:0]scale_qsv=w=1920:h=1000,setsar=1[v]",
                 "[v]")]
             [TestCase(
                 false,
                 false,
                 true,
-                "[0:0]hwdownload,format=nv12,setsar=1,pad=1920:1080:(ow-iw)/2:(oh-ih)/2,hwupload=extra_hw_frames=64[v]",
+                "[0:0]setsar=1,hwdownload,format=nv12,pad=1920:1080:(ow-iw)/2:(oh-ih)/2,hwupload=extra_hw_frames=64[v]",
                 "[v]")]
             [TestCase(
                 false,
                 true,
                 true,
-                "[0:0]scale_qsv=w=1920:h=1000,hwdownload,format=nv12,setsar=1,pad=1920:1080:(ow-iw)/2:(oh-ih)/2,hwupload=extra_hw_frames=64[v]",
+                "[0:0]scale_qsv=w=1920:h=1000,setsar=1,hwdownload,format=nv12,pad=1920:1080:(ow-iw)/2:(oh-ih)/2,hwupload=extra_hw_frames=64[v]",
                 "[v]")]
             public void Should_Return_QSV_Video_Filter(
                 bool deinterlace,
@@ -368,37 +368,37 @@ namespace ErsatzTV.Core.Tests.FFmpeg
                 true,
                 true,
                 false,
-                "[0:0]yadif_cuda,scale_cuda=1920:1000,hwdownload,format=nv12,setsar=1,hwupload[v]",
+                "[0:0]yadif_cuda,scale_cuda=1920:1000,setsar=1[v]",
                 "[v]")]
             [TestCase(
                 true,
                 false,
                 true,
-                "[0:0]yadif_cuda,hwdownload,format=nv12,setsar=1,pad=1920:1080:(ow-iw)/2:(oh-ih)/2,hwupload[v]",
+                "[0:0]yadif_cuda,setsar=1,hwdownload,format=nv12,pad=1920:1080:(ow-iw)/2:(oh-ih)/2,hwupload[v]",
                 "[v]")]
             [TestCase(
                 true,
                 true,
                 true,
-                "[0:0]yadif_cuda,scale_cuda=1920:1000,hwdownload,format=nv12,setsar=1,pad=1920:1080:(ow-iw)/2:(oh-ih)/2,hwupload[v]",
+                "[0:0]yadif_cuda,scale_cuda=1920:1000,setsar=1,hwdownload,format=nv12,pad=1920:1080:(ow-iw)/2:(oh-ih)/2,hwupload[v]",
                 "[v]")]
             [TestCase(
                 false,
                 true,
                 false,
-                "[0:0]scale_cuda=1920:1000,hwdownload,format=nv12,setsar=1,hwupload[v]",
+                "[0:0]scale_cuda=1920:1000,setsar=1[v]",
                 "[v]")]
             [TestCase(
                 false,
                 false,
                 true,
-                "[0:0]hwdownload,format=nv12,setsar=1,pad=1920:1080:(ow-iw)/2:(oh-ih)/2,hwupload[v]",
+                "[0:0]setsar=1,hwdownload,format=nv12,pad=1920:1080:(ow-iw)/2:(oh-ih)/2,hwupload[v]",
                 "[v]")]
             [TestCase(
                 false,
                 true,
                 true,
-                "[0:0]scale_cuda=1920:1000,hwdownload,format=nv12,setsar=1,pad=1920:1080:(ow-iw)/2:(oh-ih)/2,hwupload[v]",
+                "[0:0]scale_cuda=1920:1000,setsar=1,hwdownload,format=nv12,pad=1920:1080:(ow-iw)/2:(oh-ih)/2,hwupload[v]",
                 "[v]")]
             public void Should_Return_NVENC_Video_Filter(
                 bool deinterlace,
@@ -409,7 +409,8 @@ namespace ErsatzTV.Core.Tests.FFmpeg
             {
                 FFmpegComplexFilterBuilder builder = new FFmpegComplexFilterBuilder()
                     .WithHardwareAcceleration(HardwareAccelerationKind.Nvenc)
-                    .WithDeinterlace(deinterlace);
+                    .WithDeinterlace(deinterlace)
+                    .WithInputPixelFormat("h264");
 
                 if (scale)
                 {
@@ -440,42 +441,42 @@ namespace ErsatzTV.Core.Tests.FFmpeg
                 true,
                 true,
                 false,
-                "[0:0]deinterlace_vaapi,scale_vaapi=format=nv12:w=1920:h=1000,hwdownload,format=nv12|vaapi,setsar=1,hwupload[v]",
+                "[0:0]deinterlace_vaapi,scale_vaapi=format=nv12:w=1920:h=1000,setsar=1[v]",
                 "[v]")]
             [TestCase(
                 "h264",
                 true,
                 false,
                 true,
-                "[0:0]deinterlace_vaapi,hwdownload,format=nv12|vaapi,setsar=1,pad=1920:1080:(ow-iw)/2:(oh-ih)/2,hwupload[v]",
+                "[0:0]deinterlace_vaapi,setsar=1,hwdownload,format=nv12|vaapi,pad=1920:1080:(ow-iw)/2:(oh-ih)/2,hwupload[v]",
                 "[v]")]
             [TestCase(
                 "h264",
                 true,
                 true,
                 true,
-                "[0:0]deinterlace_vaapi,scale_vaapi=format=nv12:w=1920:h=1000,hwdownload,format=nv12|vaapi,setsar=1,pad=1920:1080:(ow-iw)/2:(oh-ih)/2,hwupload[v]",
+                "[0:0]deinterlace_vaapi,scale_vaapi=format=nv12:w=1920:h=1000,setsar=1,hwdownload,format=nv12|vaapi,pad=1920:1080:(ow-iw)/2:(oh-ih)/2,hwupload[v]",
                 "[v]")]
             [TestCase(
                 "h264",
                 false,
                 true,
                 false,
-                "[0:0]scale_vaapi=format=nv12:w=1920:h=1000,hwdownload,format=nv12|vaapi,setsar=1,hwupload[v]",
+                "[0:0]scale_vaapi=format=nv12:w=1920:h=1000,setsar=1[v]",
                 "[v]")]
             [TestCase(
                 "h264",
                 false,
                 false,
                 true,
-                "[0:0]hwdownload,format=nv12|vaapi,setsar=1,pad=1920:1080:(ow-iw)/2:(oh-ih)/2,hwupload[v]",
+                "[0:0]setsar=1,hwdownload,format=nv12|vaapi,pad=1920:1080:(ow-iw)/2:(oh-ih)/2,hwupload[v]",
                 "[v]")]
             [TestCase(
                 "h264",
                 false,
                 true,
                 true,
-                "[0:0]scale_vaapi=format=nv12:w=1920:h=1000,hwdownload,format=nv12|vaapi,setsar=1,pad=1920:1080:(ow-iw)/2:(oh-ih)/2,hwupload[v]",
+                "[0:0]scale_vaapi=format=nv12:w=1920:h=1000,setsar=1,hwdownload,format=nv12|vaapi,pad=1920:1080:(ow-iw)/2:(oh-ih)/2,hwupload[v]",
                 "[v]")]
             [TestCase("mpeg4", true, false, false, "[0:0]hwupload,deinterlace_vaapi[v]", "[v]")]
             [TestCase(
@@ -483,28 +484,28 @@ namespace ErsatzTV.Core.Tests.FFmpeg
                 true,
                 true,
                 false,
-                "[0:0]hwupload,deinterlace_vaapi,scale_vaapi=format=nv12:w=1920:h=1000,hwdownload,format=nv12|vaapi,setsar=1,hwupload[v]",
+                "[0:0]hwupload,deinterlace_vaapi,scale_vaapi=format=nv12:w=1920:h=1000,setsar=1[v]",
                 "[v]")]
             [TestCase(
                 "mpeg4",
                 true,
                 false,
                 true,
-                "[0:0]hwupload,deinterlace_vaapi,hwdownload,format=nv12|vaapi,setsar=1,pad=1920:1080:(ow-iw)/2:(oh-ih)/2,hwupload[v]",
+                "[0:0]hwupload,deinterlace_vaapi,setsar=1,hwdownload,format=nv12|vaapi,pad=1920:1080:(ow-iw)/2:(oh-ih)/2,hwupload[v]",
                 "[v]")]
             [TestCase(
                 "mpeg4",
                 true,
                 true,
                 true,
-                "[0:0]hwupload,deinterlace_vaapi,scale_vaapi=format=nv12:w=1920:h=1000,hwdownload,format=nv12|vaapi,setsar=1,pad=1920:1080:(ow-iw)/2:(oh-ih)/2,hwupload[v]",
+                "[0:0]hwupload,deinterlace_vaapi,scale_vaapi=format=nv12:w=1920:h=1000,setsar=1,hwdownload,format=nv12|vaapi,pad=1920:1080:(ow-iw)/2:(oh-ih)/2,hwupload[v]",
                 "[v]")]
             [TestCase(
                 "mpeg4",
                 false,
                 true,
                 false,
-                "[0:0]hwupload,scale_vaapi=format=nv12:w=1920:h=1000,hwdownload,format=nv12|vaapi,setsar=1,hwupload[v]",
+                "[0:0]hwupload,scale_vaapi=format=nv12:w=1920:h=1000,setsar=1[v]",
                 "[v]")]
             [TestCase(
                 "mpeg4",
@@ -518,7 +519,7 @@ namespace ErsatzTV.Core.Tests.FFmpeg
                 false,
                 true,
                 true,
-                "[0:0]hwupload,scale_vaapi=format=nv12:w=1920:h=1000,hwdownload,format=nv12|vaapi,setsar=1,pad=1920:1080:(ow-iw)/2:(oh-ih)/2,hwupload[v]",
+                "[0:0]hwupload,scale_vaapi=format=nv12:w=1920:h=1000,setsar=1,hwdownload,format=nv12|vaapi,pad=1920:1080:(ow-iw)/2:(oh-ih)/2,hwupload[v]",
                 "[v]")]
             public void Should_Return_VAAPI_Video_Filter(
                 string codec,

ErsatzTV.Core.Tests/FFmpeg/TranscodingTests.cs

@@ -104,6 +104,8 @@ namespace ErsatzTV.Core.Tests.FFmpeg
             string inputPixelFormat,
             [ValueSource(typeof(TestData), nameof(TestData.Resolutions))]
             Resolution profileResolution,
+            [Values(true, false)]
+            bool pad,
             // [ValueSource(typeof(TestData), nameof(TestData.SoftwareCodecs))] string profileCodec,
             // [ValueSource(typeof(TestData), nameof(TestData.NoAcceleration))] HardwareAccelerationKind profileAcceleration)
             [ValueSource(typeof(TestData), nameof(TestData.NvidiaCodecs))] string profileCodec,
@@ -112,13 +114,15 @@ namespace ErsatzTV.Core.Tests.FFmpeg
             // [ValueSource(typeof(TestData), nameof(TestData.VaapiAcceleration))] HardwareAccelerationKind profileAcceleration)
         {
             string name = GetStringSha256Hash(
-                $"{inputCodec}_{inputPixelFormat}_{profileResolution}_{profileCodec}_{profileAcceleration}");
+                $"{inputCodec}_{inputPixelFormat}_{pad}_{profileResolution}_{profileCodec}_{profileAcceleration}");
 
             string file = Path.Combine(TestContext.CurrentContext.TestDirectory, $"{name}.mkv");
             if (!File.Exists(file))
             {
+                string resolution = pad ? "1920x1060" : "1920x1080";
+                
                 var args =
-                    $"-y -f lavfi -i anullsrc=channel_layout=stereo:sample_rate=44100 -f lavfi -i testsrc=duration=1:size=1920x1080:rate=30 -c:a aac -c:v {inputCodec} -shortest -pix_fmt {inputPixelFormat} -strict -2 {file}";
+                    $"-y -f lavfi -i anullsrc=channel_layout=stereo:sample_rate=44100 -f lavfi -i testsrc=duration=1:size={resolution}:rate=30 -c:a aac -c:v {inputCodec} -shortest -pix_fmt {inputPixelFormat} -strict -2 {file}";
                 var p1 = new Process
                 {
                     StartInfo = new ProcessStartInfo
@@ -146,8 +150,8 @@ namespace ErsatzTV.Core.Tests.FFmpeg
 
             var metadataRepository = new Mock<IMetadataRepository>();
             metadataRepository
-                .Setup(r => r.UpdateLocalStatistics(It.IsAny<int>(), It.IsAny<MediaVersion>(), It.IsAny<bool>()))
-                .Callback<int, MediaVersion, bool>((_, version, _) => v = version);
+                .Setup(r => r.UpdateLocalStatistics(It.IsAny<MediaItem>(), It.IsAny<MediaVersion>(), It.IsAny<bool>()))
+                .Callback<MediaItem, MediaVersion, bool>((_, version, _) => v = version);
 
             var localStatisticsProvider = new LocalStatisticsProvider(
                 metadataRepository.Object,
@@ -200,6 +204,8 @@ namespace ErsatzTV.Core.Tests.FFmpeg
                 TimeSpan.FromSeconds(5));
 
             process.StartInfo.RedirectStandardError = true;
+            
+            // Console.WriteLine($"ffmpeg arguments {string.Join(" ", process.StartInfo.ArgumentList)}");
 
             process.Start().Should().BeTrue();
 

ErsatzTV.Core.Tests/Jellyfin/JellyfinPathReplacementServiceTests.cs

@@ -0,0 +1,211 @@
+using System.Collections.Generic;
+using System.Runtime.InteropServices;
+using System.Threading.Tasks;
+using ErsatzTV.Core.Domain;
+using ErsatzTV.Core.Interfaces.Repositories;
+using ErsatzTV.Core.Interfaces.Runtime;
+using ErsatzTV.Core.Jellyfin;
+using FluentAssertions;
+using LanguageExt;
+using Microsoft.Extensions.Logging;
+using Moq;
+using NUnit.Framework;
+
+namespace ErsatzTV.Core.Tests.Jellyfin
+{
+    [TestFixture]
+    public class JellyfinPathReplacementServiceTests
+    {
+        [Test]
+        public async Task JellyfinWindows_To_EtvWindows()
+        {
+            var replacements = new List<JellyfinPathReplacement>
+            {
+                new()
+                {
+                    Id = 1,
+                    JellyfinPath = @"C:\Something\Some Shared Folder",
+                    LocalPath = @"C:\Something Else\Some Shared Folder",
+                    JellyfinMediaSource = new JellyfinMediaSource { OperatingSystem = "Windows" }
+                }
+            };
+
+            var repo = new Mock<IMediaSourceRepository>();
+            repo.Setup(x => x.GetJellyfinPathReplacementsByLibraryId(It.IsAny<int>())).Returns(replacements.AsTask());
+
+            var runtime = new Mock<IRuntimeInfo>();
+            runtime.Setup(x => x.IsOSPlatform(OSPlatform.Windows)).Returns(true);
+
+            var service = new JellyfinPathReplacementService(
+                repo.Object,
+                runtime.Object,
+                new Mock<ILogger<JellyfinPathReplacementService>>().Object);
+
+            string result = await service.GetReplacementJellyfinPath(
+                0,
+                @"C:\Something\Some Shared Folder\Some Movie\Some Movie.mkv");
+
+            result.Should().Be(@"C:\Something Else\Some Shared Folder\Some Movie\Some Movie.mkv");
+        }
+
+        [Test]
+        public async Task JellyfinWindows_To_EtvLinux()
+        {
+            var replacements = new List<JellyfinPathReplacement>
+            {
+                new()
+                {
+                    Id = 1,
+                    JellyfinPath = @"C:\Something\Some Shared Folder",
+                    LocalPath = @"/mnt/something else/Some Shared Folder",
+                    JellyfinMediaSource = new JellyfinMediaSource { OperatingSystem = "Windows" }
+                }
+            };
+
+            var repo = new Mock<IMediaSourceRepository>();
+            repo.Setup(x => x.GetJellyfinPathReplacementsByLibraryId(It.IsAny<int>())).Returns(replacements.AsTask());
+
+            var runtime = new Mock<IRuntimeInfo>();
+            runtime.Setup(x => x.IsOSPlatform(OSPlatform.Windows)).Returns(false);
+
+            var service = new JellyfinPathReplacementService(
+                repo.Object,
+                runtime.Object,
+                new Mock<ILogger<JellyfinPathReplacementService>>().Object);
+
+            string result = await service.GetReplacementJellyfinPath(
+                0,
+                @"C:\Something\Some Shared Folder\Some Movie\Some Movie.mkv");
+
+            result.Should().Be(@"/mnt/something else/Some Shared Folder/Some Movie/Some Movie.mkv");
+        }
+
+        [Test]
+        public async Task JellyfinWindows_To_EtvLinux_UncPath()
+        {
+            var replacements = new List<JellyfinPathReplacement>
+            {
+                new()
+                {
+                    Id = 1,
+                    JellyfinPath = @"\\192.168.1.100\Something\Some Shared Folder",
+                    LocalPath = @"/mnt/something else/Some Shared Folder",
+                    JellyfinMediaSource = new JellyfinMediaSource { OperatingSystem = "Windows" }
+                }
+            };
+
+            var repo = new Mock<IMediaSourceRepository>();
+            repo.Setup(x => x.GetJellyfinPathReplacementsByLibraryId(It.IsAny<int>())).Returns(replacements.AsTask());
+
+            var runtime = new Mock<IRuntimeInfo>();
+            runtime.Setup(x => x.IsOSPlatform(OSPlatform.Windows)).Returns(false);
+
+            var service = new JellyfinPathReplacementService(
+                repo.Object,
+                runtime.Object,
+                new Mock<ILogger<JellyfinPathReplacementService>>().Object);
+
+            string result = await service.GetReplacementJellyfinPath(
+                0,
+                @"\\192.168.1.100\Something\Some Shared Folder\Some Movie\Some Movie.mkv");
+
+            result.Should().Be(@"/mnt/something else/Some Shared Folder/Some Movie/Some Movie.mkv");
+        }
+
+        [Test]
+        public async Task JellyfinWindows_To_EtvLinux_UncPathWithTrailingSlash()
+        {
+            var replacements = new List<JellyfinPathReplacement>
+            {
+                new()
+                {
+                    Id = 1,
+                    JellyfinPath = @"\\192.168.1.100\Something\Some Shared Folder\",
+                    LocalPath = @"/mnt/something else/Some Shared Folder/",
+                    JellyfinMediaSource = new JellyfinMediaSource { OperatingSystem = "Windows" }
+                }
+            };
+
+            var repo = new Mock<IMediaSourceRepository>();
+            repo.Setup(x => x.GetJellyfinPathReplacementsByLibraryId(It.IsAny<int>())).Returns(replacements.AsTask());
+
+            var runtime = new Mock<IRuntimeInfo>();
+            runtime.Setup(x => x.IsOSPlatform(OSPlatform.Windows)).Returns(false);
+
+            var service = new JellyfinPathReplacementService(
+                repo.Object,
+                runtime.Object,
+                new Mock<ILogger<JellyfinPathReplacementService>>().Object);
+
+            string result = await service.GetReplacementJellyfinPath(
+                0,
+                @"\\192.168.1.100\Something\Some Shared Folder\Some Movie\Some Movie.mkv");
+
+            result.Should().Be(@"/mnt/something else/Some Shared Folder/Some Movie/Some Movie.mkv");
+        }
+
+        [Test]
+        public async Task JellyfinLinux_To_EtvWindows()
+        {
+            var replacements = new List<JellyfinPathReplacement>
+            {
+                new()
+                {
+                    Id = 1,
+                    JellyfinPath = @"/mnt/something/Some Shared Folder",
+                    LocalPath = @"C:\Something Else\Some Shared Folder",
+                    JellyfinMediaSource = new JellyfinMediaSource { OperatingSystem = "Linux" }
+                }
+            };
+
+            var repo = new Mock<IMediaSourceRepository>();
+            repo.Setup(x => x.GetJellyfinPathReplacementsByLibraryId(It.IsAny<int>())).Returns(replacements.AsTask());
+
+            var runtime = new Mock<IRuntimeInfo>();
+            runtime.Setup(x => x.IsOSPlatform(OSPlatform.Windows)).Returns(true);
+
+            var service = new JellyfinPathReplacementService(
+                repo.Object,
+                runtime.Object,
+                new Mock<ILogger<JellyfinPathReplacementService>>().Object);
+
+            string result = await service.GetReplacementJellyfinPath(
+                0,
+                @"/mnt/something/Some Shared Folder/Some Movie/Some Movie.mkv");
+
+            result.Should().Be(@"C:\Something Else\Some Shared Folder\Some Movie\Some Movie.mkv");
+        }
+
+        [Test]
+        public async Task JellyfinLinux_To_EtvLinux()
+        {
+            var replacements = new List<JellyfinPathReplacement>
+            {
+                new()
+                {
+                    Id = 1,
+                    JellyfinPath = @"/mnt/something/Some Shared Folder",
+                    LocalPath = @"/mnt/something else/Some Shared Folder",
+                    JellyfinMediaSource = new JellyfinMediaSource { OperatingSystem = "Linux" }
+                }
+            };
+
+            var repo = new Mock<IMediaSourceRepository>();
+            repo.Setup(x => x.GetJellyfinPathReplacementsByLibraryId(It.IsAny<int>())).Returns(replacements.AsTask());
+
+            var runtime = new Mock<IRuntimeInfo>();
+            runtime.Setup(x => x.IsOSPlatform(OSPlatform.Windows)).Returns(false);
+
+            var service = new JellyfinPathReplacementService(
+                repo.Object,
+                runtime.Object,
+                new Mock<ILogger<JellyfinPathReplacementService>>().Object);
+
+            string result = await service.GetReplacementJellyfinPath(
+                0,
+                @"/mnt/something/Some Shared Folder/Some Movie/Some Movie.mkv");
+
+            result.Should().Be(@"/mnt/something else/Some Shared Folder/Some Movie/Some Movie.mkv");
+        }
+    }
+}

ErsatzTV.Core.Tests/Scheduling/ShuffledMediaCollectionEnumeratorTests.cs

@@ -0,0 +1,90 @@
+using System.Collections.Generic;
+using ErsatzTV.Core.Domain;
+using ErsatzTV.Core.Scheduling;
+using FluentAssertions;
+using LanguageExt;
+using LanguageExt.UnsafeValueAccess;
+using NUnit.Framework;
+
+namespace ErsatzTV.Core.Tests.Scheduling
+{
+    [TestFixture]
+    public class ShuffledMediaCollectionEnumeratorTests
+    {
+        private readonly List<GroupedMediaItem> _mediaItems = new()
+        {
+            new GroupedMediaItem(new MediaItem { Id = 1 }, new List<MediaItem>()),
+            new GroupedMediaItem(new MediaItem { Id = 2 }, new List<MediaItem>()),
+            new GroupedMediaItem(new MediaItem { Id = 3 }, new List<MediaItem>())
+        };
+        
+        [Test]
+        public void Peek_Zero_Should_Match_Current()
+        {
+            var state = new CollectionEnumeratorState { Index = 0, Seed = 0 };
+            var enumerator = new ShuffledMediaCollectionEnumerator(_mediaItems, state);
+
+            Option<MediaItem> peek = enumerator.Peek(0);
+            Option<MediaItem> current = enumerator.Current;
+
+            peek.IsSome.Should().BeTrue();
+            current.IsSome.Should().BeTrue();
+            peek.ValueUnsafe().Id.Should().Be(1);
+            current.ValueUnsafe().Id.Should().Be(1);
+        }
+        
+        [Test]
+        public void Peek_One_Should_Match_Next()
+        {
+            var state = new CollectionEnumeratorState { Index = 0, Seed = 0 };
+            var enumerator = new ShuffledMediaCollectionEnumerator(_mediaItems, state);
+
+            Option<MediaItem> peek = enumerator.Peek(1);
+
+            enumerator.MoveNext();
+            Option<MediaItem> next = enumerator.Current;
+
+            peek.IsSome.Should().BeTrue();
+            next.IsSome.Should().BeTrue();
+            peek.ValueUnsafe().Id.Should().Be(2);
+            next.ValueUnsafe().Id.Should().Be(2);
+        }
+        
+        [Test]
+        public void Peek_Two_Should_Match_NextNext()
+        {
+            var state = new CollectionEnumeratorState { Index = 0, Seed = 0 };
+            var enumerator = new ShuffledMediaCollectionEnumerator(_mediaItems, state);
+
+            Option<MediaItem> peek = enumerator.Peek(2);
+
+            enumerator.MoveNext();
+            enumerator.MoveNext();
+            Option<MediaItem> next = enumerator.Current;
+
+            peek.IsSome.Should().BeTrue();
+            next.IsSome.Should().BeTrue();
+            peek.ValueUnsafe().Id.Should().Be(3);
+            next.ValueUnsafe().Id.Should().Be(3);
+        }
+        
+        [Test]
+        public void Peek_Three_Should_Match_NextNextNext()
+        {
+            var state = new CollectionEnumeratorState { Index = 0, Seed = 0 };
+            var enumerator = new ShuffledMediaCollectionEnumerator(_mediaItems, state);
+
+            Option<MediaItem> peek = enumerator.Peek(3);
+
+            enumerator.MoveNext();
+            enumerator.MoveNext();
+            enumerator.MoveNext();
+            Option<MediaItem> next = enumerator.Current;
+
+            peek.IsSome.Should().BeTrue();
+            next.IsSome.Should().BeTrue();
+            peek.ValueUnsafe().Id.Should().Be(2);
+            next.ValueUnsafe().Id.Should().Be(2);
+        }
+    }
+}

ErsatzTV.Core/Domain/Metadata/Artwork.cs

@@ -6,6 +6,10 @@ namespace ErsatzTV.Core.Domain
     {
         public int Id { get; set; }
         public string Path { get; set; }
+        public string SourcePath { get; set; }
+        public string BlurHash43 { get; set; }
+        public string BlurHash54 { get; set; }
+        public string BlurHash64 { get; set; }
         public ArtworkKind ArtworkKind { get; set; }
         public DateTime DateAdded { get; set; }
         public DateTime DateUpdated { get; set; }

ErsatzTV.Core/Domain/StreamingMode.cs

@@ -4,7 +4,8 @@
     {
         TransportStream = 1,
         HttpLiveStreamingDirect = 2,
-        HttpLiveStreamingHybrid = 3,
-        HttpLiveStreamingSegmenter = 4
+//        HttpLiveStreamingHybrid = 3,
+        HttpLiveStreamingSegmenter = 4,
+        TransportStreamHybrid = 5
     }
 }

ErsatzTV.Core/FFmpeg/FFmpegComplexFilterBuilder.cs

@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Globalization;
-using System.IO;
 using System.Linq;
 using System.Runtime.InteropServices;
 using System.Text;
@@ -26,7 +25,8 @@ namespace ErsatzTV.Core.FFmpeg
         private Option<int> _watermarkIndex;
         private string _pixelFormat;
         private string _videoEncoder;
-        private Option<string> _drawtext;
+        private Option<string> _subtitle;
+        private bool _boxBlur;
 
         public FFmpegComplexFilterBuilder WithHardwareAcceleration(HardwareAccelerationKind hardwareAccelerationKind)
         {
@@ -94,34 +94,32 @@ namespace ErsatzTV.Core.FFmpeg
             _watermarkIndex = watermarkIndex;
             return this;
         }
-        
-        public FFmpegComplexFilterBuilder WithDrawtextFile(
-            MediaVersion videoVersion,
-            Option<string> drawtextFile)
+
+        public FFmpegComplexFilterBuilder WithBoxBlur(bool boxBlur)
         {
-            foreach (string file in drawtextFile)
+            _boxBlur = boxBlur;
+            return this;
+        }
+
+        public FFmpegComplexFilterBuilder WithSubtitleFile(Option<string> subtitleFile)
+        {
+            foreach (string file in subtitleFile)
             {
                 string effectiveFile = file;
+                string fontsDir = FileSystemLayout.ResourcesCacheFolder;
                 
-                if (videoVersion is FallbackMediaVersion or CoverArtMediaVersion)
+                if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
                 {
-                    string fontPath = Path.Combine(FileSystemLayout.ResourcesCacheFolder, "OPTIKabel-Heavy.otf");
+                    fontsDir = fontsDir
+                        .Replace(@"\", @"/\")
+                        .Replace(@":/", @"\\:/");
                     
-                    if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
-                    {
-                        fontPath = fontPath
-                            .Replace(@"\", @"/\")
-                            .Replace(@":/", @"\\:/");
-                        
-                        effectiveFile = effectiveFile
-                            .Replace(@"\", @"/\")
-                            .Replace(@":/", @"\\:/");
-                    }
-
-                    // TODO: calculate by percent
-                    _drawtext =
-                        $"drawtext=fontfile={fontPath}:textfile={effectiveFile}:x=50:y=H-175:fontsize=36:fontcolor=white";
+                    effectiveFile = effectiveFile
+                        .Replace(@"\", @"/\")
+                        .Replace(@":/", @"\\:/");
                 }
+
+                _subtitle = $"subtitles={effectiveFile}:fontsdir={fontsDir}";
             }
 
             return this;
@@ -144,6 +142,11 @@ namespace ErsatzTV.Core.FFmpeg
             bool isHardwareDecode = acceleration switch
             {
                 HardwareAccelerationKind.Vaapi => !isSong && _inputCodec != "mpeg4",
+                
+                // we need an initial hwupload_cuda when only padding with these pixel formats
+                HardwareAccelerationKind.Nvenc when _scaleToSize.IsNone && _padToSize.IsSome =>
+                    !isSong && !_pixelFormat.Contains("p10le") && !_pixelFormat.Contains("444"),
+
                 HardwareAccelerationKind.Nvenc => !isSong,
                 HardwareAccelerationKind.Qsv => !isSong,
                 _ => false
@@ -252,7 +255,12 @@ namespace ErsatzTV.Core.FFmpeg
                 });
 
             bool scaleOrPad = _scaleToSize.IsSome || _padToSize.IsSome;
-            bool usesSoftwareFilters = scaleOrPad || _watermark.IsSome;
+            bool usesSoftwareFilters = _padToSize.IsSome || _watermark.IsSome;
+
+            if (scaleOrPad && _boxBlur == false)
+            {
+                videoFilterQueue.Add("setsar=1");
+            }
 
             if (usesSoftwareFilters)
             {
@@ -270,20 +278,15 @@ namespace ErsatzTV.Core.FFmpeg
                     };
                     videoFilterQueue.Add(format);
                 }
-
-                if (scaleOrPad)
+                
+                if (_boxBlur)
                 {
-                    videoFilterQueue.Add("setsar=1");
+                    videoFilterQueue.Add("boxblur=40");
                 }
 
                 if (videoOnly)
                 {
-                    videoFilterQueue.Add("boxblur=40[b];[b]split[b1][b2];[b1]format=rgba,geq=r=0:g=0:b=0:a=120*(Y/H)[fg];[b2][fg]overlay=format=auto");
-                }
-
-                if (isSong)
-                {
-                    videoFilterQueue.Add("fps=30");
+                    videoFilterQueue.Add("deband");
                 }
 
                 foreach (ChannelWatermark watermark in _watermark)
@@ -332,9 +335,9 @@ namespace ErsatzTV.Core.FFmpeg
 
             _padToSize.IfSome(size => videoFilterQueue.Add($"pad={size.Width}:{size.Height}:(ow-iw)/2:(oh-ih)/2"));
             
-            foreach (string drawtext in _drawtext)
+            foreach (string subtitle in _subtitle)
             {
-                videoFilterQueue.Add(drawtext);
+                videoFilterQueue.Add(subtitle);
             }
 
             string outputPixelFormat = null;

ErsatzTV.Core/FFmpeg/FFmpegPlaybackSettingsCalculator.cs

@@ -71,7 +71,7 @@ namespace ErsatzTV.Core.FFmpeg
                     result.VideoCodec = "copy";
                     result.Deinterlace = false;
                     break;
-                case StreamingMode.HttpLiveStreamingHybrid:
+                case StreamingMode.TransportStreamHybrid:
                 case StreamingMode.HttpLiveStreamingSegmenter:
                 case StreamingMode.TransportStream:
                     result.HardwareAcceleration = ffmpegProfile.HardwareAcceleration;
@@ -121,6 +121,11 @@ namespace ErsatzTV.Core.FFmpeg
                                     (HardwareAccelerationKind.Qsv, "h264", _) => "h264_qsv",
                                     (HardwareAccelerationKind.Qsv, "hevc", _) => "hevc_qsv",
                                     (HardwareAccelerationKind.Qsv, "mpeg2video", _) => "mpeg2_qsv",
+                                    
+                                    // temp disable mpeg4 hardware decoding for all vaapi
+                                    // TODO: check for codec support
+                                    (HardwareAccelerationKind.Vaapi, "mpeg4", _) => "mpeg4",
+                                    
                                     _ => null
                                 };
                         }

ErsatzTV.Core/FFmpeg/FFmpegProcessBuilder.cs

@@ -22,6 +22,7 @@ using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
+using System.Runtime.InteropServices;
 using System.Text;
 using ErsatzTV.Core.Domain;
 using ErsatzTV.Core.Interfaces.FFmpeg;
@@ -190,7 +191,21 @@ namespace ErsatzTV.Core.FFmpeg
         public FFmpegProcessBuilder WithInput(string input)
         {
             _arguments.Add("-i");
-            _arguments.Add($"{input}");
+            _arguments.Add(input);
+            return this;
+        }
+
+        public FFmpegProcessBuilder WithMap(string map)
+        {
+            _arguments.Add("-map");
+            _arguments.Add(map);
+            return this;
+        }
+
+        public FFmpegProcessBuilder WithCopyCodec()
+        {
+            _arguments.Add("-c");
+            _arguments.Add("copy");
             return this;
         }
 
@@ -221,14 +236,9 @@ namespace ErsatzTV.Core.FFmpeg
             return this;
         }
 
-        public FFmpegProcessBuilder WithDrawtextFile(
-            MediaVersion videoVersion,
-            Option<string> drawtextFile)
+        public FFmpegProcessBuilder WithSubtitleFile(Option<string> subtitleFile)
         {
-            _complexFilterBuilder = _complexFilterBuilder.WithDrawtextFile(
-                videoVersion,
-                drawtextFile);
-
+            _complexFilterBuilder = _complexFilterBuilder.WithSubtitleFile(subtitleFile);
             return this;
         }
 
@@ -282,14 +292,16 @@ namespace ErsatzTV.Core.FFmpeg
         public FFmpegProcessBuilder WithSongInput(
             string videoPath,
             Option<string> codec,
-            Option<string> pixelFormat)
+            Option<string> pixelFormat,
+            bool boxBlur)
         {
             _noAutoScale = true;
             _outputFramerate = 30;
-            
+
             _complexFilterBuilder = _complexFilterBuilder
                 .WithInputCodec(codec)
-                .WithInputPixelFormat(pixelFormat);
+                .WithInputPixelFormat(pixelFormat)
+                .WithBoxBlur(boxBlur);
 
             _arguments.Add("-i");
             _arguments.Add(videoPath);
@@ -297,24 +309,6 @@ namespace ErsatzTV.Core.FFmpeg
             return this;
         }
 
-        public FFmpegProcessBuilder WithFiltergraph(string graph)
-        {
-            _arguments.Add("-vf");
-            _arguments.Add($"{graph}");
-            return this;
-        }
-
-        public FFmpegProcessBuilder WithFilterComplex(string filter, string finalVideo, string finalAudio)
-        {
-            _arguments.Add("-filter_complex");
-            _arguments.Add($"{filter}");
-            _arguments.Add("-map");
-            _arguments.Add(finalVideo);
-            _arguments.Add("-map");
-            _arguments.Add(finalAudio);
-            return this;
-        }
-
         public FFmpegProcessBuilder WithConcat(string concatPlaylist)
         {
             _isConcat = true;
@@ -368,22 +362,6 @@ namespace ErsatzTV.Core.FFmpeg
             return this;
         }
 
-        public FFmpegProcessBuilder WithErrorText(IDisplaySize desiredResolution, string text)
-        {
-            string fontPath = Path.Combine(FileSystemLayout.ResourcesCacheFolder, "Roboto-Regular.ttf");
-            var fontFile = $"fontfile={fontPath}";
-            const string FONT_COLOR = "fontcolor=white";
-            const string X = "x=(w-text_w)/2";
-            const string Y = "y=(h-text_h)/3*2";
-
-            string fontSize = text.Length > 80 ? "fontsize=30" : text.Length > 60 ? "fontsize=40" : "fontsize=60";
-
-            return WithFilterComplex(
-                $"[0:0]scale={desiredResolution.Width}:{desiredResolution.Height},drawtext={fontFile}:{fontSize}:{FONT_COLOR}:{X}:{Y}:text='{text}'[v]",
-                "[v]",
-                "1:a");
-        }
-
         public FFmpegProcessBuilder WithDuration(TimeSpan duration)
         {
             _arguments.Add("-t");
@@ -655,13 +633,13 @@ namespace ErsatzTV.Core.FFmpeg
                 switch (_vaapiDriver)
                 {
                     case VaapiDriver.i965:
-                        startInfo.EnvironmentVariables.Add("LIBVA_DRIVER_NAME", "i965");
+                        startInfo.EnvironmentVariables["LIBVA_DRIVER_NAME"] = "i965";
                         break;
                     case VaapiDriver.iHD:
-                        startInfo.EnvironmentVariables.Add("LIBVA_DRIVER_NAME", "iHD");
+                        startInfo.EnvironmentVariables["LIBVA_DRIVER_NAME"] = "iHD";
                         break;
                     case VaapiDriver.RadeonSI:
-                        startInfo.EnvironmentVariables.Add("LIBVA_DRIVER_NAME", "radeonsi");
+                        startInfo.EnvironmentVariables["LIBVA_DRIVER_NAME"] = "radeonsi";
                         break;
                 }
             }
@@ -671,7 +649,18 @@ namespace ErsatzTV.Core.FFmpeg
                 string fileName = _isConcat
                     ? Path.Combine(FileSystemLayout.FFmpegReportsFolder, "ffmpeg-%t-concat.log")
                     : Path.Combine(FileSystemLayout.FFmpegReportsFolder, "ffmpeg-%t-transcode.log");
-                startInfo.EnvironmentVariables.Add("FFREPORT", $"file={fileName}:level=32");
+
+                // rework filename in a format that works on windows
+                if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
+                {
+                    // \ is escape, so use / for directory separators
+                    fileName = fileName.Replace(@"\", @"/");
+                    
+                    // colon after drive letter needs to be escaped
+                    fileName = fileName.Replace(@":/", @"\:/");
+                }
+
+                startInfo.EnvironmentVariables["FFREPORT"] = $"file={fileName}:level=32";
             }
 
             startInfo.ArgumentList.Add("-nostdin");

ErsatzTV.Core/FFmpeg/FFmpegProcessService.cs

@@ -68,7 +68,7 @@ namespace ErsatzTV.Core.FFmpeg
                 outPoint);
 
             Option<WatermarkOptions> watermarkOptions =
-                await GetWatermarkOptions(channel, globalWatermark, videoVersion);
+                await GetWatermarkOptions(channel, globalWatermark, videoVersion, None, None);
 
             FFmpegProcessBuilder builder = new FFmpegProcessBuilder(ffmpegPath, saveReports, _logger)
                 .WithThreads(playbackSettings.ThreadCount)
@@ -167,7 +167,7 @@ namespace ErsatzTV.Core.FFmpeg
             }
         }
 
-        public Process ForError(
+        public async Task<Process> ForError(
             string ffmpegPath,
             Channel channel,
             Option<TimeSpan> duration,
@@ -179,6 +179,22 @@ namespace ErsatzTV.Core.FFmpeg
 
             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 };
+
             FFmpegProcessBuilder builder = new FFmpegProcessBuilder(ffmpegPath, false, _logger)
                 .WithThreads(1)
                 .WithQuiet()
@@ -187,12 +203,18 @@ namespace ErsatzTV.Core.FFmpeg
                 .WithLoopedImage(Path.Combine(FileSystemLayout.ResourcesCacheFolder, "background.png"))
                 .WithLibavfilter()
                 .WithInput("anullsrc")
-                .WithErrorText(desiredResolution, errorMessage)
+                .WithSubtitleFile(subtitleFile)
+                .WithFilterComplex(
+                    videoStream,
+                    audioStream,
+                    Path.Combine(FileSystemLayout.ResourcesCacheFolder, "background.png"),
+                    "fake-audio-path",
+                    playbackSettings.VideoCodec)
                 .WithPixfmt("yuv420p")
                 .WithPlaybackArgs(playbackSettings)
                 .WithMetadata(channel, None);
 
-            duration.IfSome(d => builder = builder.WithDuration(d));
+            await duration.IfSomeAsync(d => builder = builder.WithDuration(d));
 
             switch (channel.StreamingMode)
             {
@@ -225,6 +247,24 @@ namespace ErsatzTV.Core.FFmpeg
                 .Build();
         }
 
+        public Process WrapSegmenter(string ffmpegPath, bool saveReports, Channel channel, string scheme, string host)
+        {
+            FFmpegPlaybackSettings playbackSettings = _playbackSettingsCalculator.ConcatSettings;
+
+            return new FFmpegProcessBuilder(ffmpegPath, saveReports, _logger)
+                .WithThreads(1)
+                .WithQuiet()
+                .WithFormatFlags(playbackSettings.FormatFlags)
+                .WithRealtimeOutput(playbackSettings.RealtimeOutput)
+                .WithInput($"http://localhost:{Settings.ListenPort}/iptv/channel/{channel.Number}.m3u8?mode=segmenter")
+                .WithMap("0")
+                .WithCopyCodec()
+                .WithMetadata(channel, None)
+                .WithFormat("mpegts")
+                .WithPipe()
+                .Build();
+        }
+
         public Process ConvertToPng(string ffmpegPath, string inputFile, string outputFile)
         {
             return new FFmpegProcessBuilder(ffmpegPath, false, _logger)
@@ -235,13 +275,30 @@ namespace ErsatzTV.Core.FFmpeg
                 .Build();
         }
 
+        public Process ExtractAttachedPicAsPng(string ffmpegPath, string inputFile, int streamIndex, string outputFile)
+        {
+            return new FFmpegProcessBuilder(ffmpegPath, false, _logger)
+                .WithThreads(1)
+                .WithQuiet()
+                .WithInput(inputFile)
+                .WithMap($"0:{streamIndex}")
+                .WithOutputFormat("apng", outputFile)
+                .Build();
+        }
+
         public async Task<Either<BaseError, string>> GenerateSongImage(
             string ffmpegPath,
-            Option<string> drawtextFile,
+            Option<string> subtitleFile,
             Channel channel,
             Option<ChannelWatermark> globalWatermark,
             MediaVersion videoVersion,
-            string videoPath)
+            string videoPath,
+            bool boxBlur,
+            Option<string> watermarkPath,
+            ChannelWatermarkLocation watermarkLocation,
+            int horizontalMarginPercent,
+            int verticalMarginPercent,
+            int watermarkWidthPercent)
         {
             try
             {
@@ -249,8 +306,22 @@ namespace ErsatzTV.Core.FFmpeg
 
                 MediaStream videoStream = await _ffmpegStreamSelector.SelectVideoStream(channel, videoVersion);
 
+                Option<ChannelWatermark> watermarkOverride =
+                    videoVersion is FallbackMediaVersion or CoverArtMediaVersion
+                        ? new ChannelWatermark
+                        {
+                            Mode = ChannelWatermarkMode.Permanent,
+                            HorizontalMarginPercent = horizontalMarginPercent,
+                            VerticalMarginPercent = verticalMarginPercent,
+                            Location = watermarkLocation,
+                            Size = ChannelWatermarkSize.Scaled,
+                            WidthPercent = watermarkWidthPercent,
+                            Opacity = 100
+                        }
+                        : None;
+
                 Option<WatermarkOptions> watermarkOptions =
-                    await GetWatermarkOptions(channel, globalWatermark, videoVersion);
+                    await GetWatermarkOptions(channel, globalWatermark, videoVersion, watermarkOverride, watermarkPath);
 
                 FFmpegPlaybackSettings playbackSettings =
                     _playbackSettingsCalculator.CalculateErrorSettings(channel.FFmpegProfile);
@@ -270,10 +341,9 @@ namespace ErsatzTV.Core.FFmpeg
                     .WithThreads(1)
                     .WithQuiet()
                     .WithFormatFlags(playbackSettings.FormatFlags)
-                    .WithRealtimeOutput(playbackSettings.RealtimeOutput)
-                    .WithSongInput(videoPath, videoStream.Codec, videoStream.PixelFormat)
+                    .WithSongInput(videoPath, videoStream.Codec, videoStream.PixelFormat, boxBlur)
                     .WithWatermark(watermarkOptions, channel.FFmpegProfile.Resolution)
-                    .WithDrawtextFile(videoVersion, drawtextFile);
+                    .WithSubtitleFile(subtitleFile);
 
                 foreach (IDisplaySize scaledSize in scalePlaybackSettings.ScaledSize)
                 {
@@ -317,26 +387,15 @@ namespace ErsatzTV.Core.FFmpeg
         private async Task<WatermarkOptions> GetWatermarkOptions(
             Channel channel,
             Option<ChannelWatermark> globalWatermark,
-            MediaVersion videoVersion)
+            MediaVersion videoVersion,
+            Option<ChannelWatermark> watermarkOverride,
+            Option<string> watermarkPath)
         {
             if (videoVersion is BackgroundImageMediaVersion)
             {
                 return new WatermarkOptions(None, None, None, false);
             }
 
-            Option<ChannelWatermark> watermarkOverride = videoVersion is FallbackMediaVersion or CoverArtMediaVersion
-                ? new ChannelWatermark
-                {
-                    Mode = ChannelWatermarkMode.Permanent,
-                    HorizontalMarginPercent = 3,
-                    VerticalMarginPercent = 5,
-                    Location = ChannelWatermarkLocation.BottomRight,
-                    Size = ChannelWatermarkSize.Scaled,
-                    WidthPercent = 25,
-                    Opacity = 100
-                }
-                : None;
-            
             if (channel.StreamingMode != StreamingMode.HttpLiveStreamingDirect && channel.FFmpegProfile.Transcode &&
                 channel.FFmpegProfile.NormalizeVideo)
             {
@@ -344,7 +403,7 @@ namespace ErsatzTV.Core.FFmpeg
                 {
                     return new WatermarkOptions(
                         watermarkOverride,
-                        videoVersion.MediaFiles.Head().Path,
+                        await watermarkPath.IfNoneAsync(videoVersion.MediaFiles.Head().Path),
                         0,
                         false);
                 }

ErsatzTV.Core/FFmpeg/SongVideoGenerator.cs

@@ -0,0 +1,257 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using ErsatzTV.Core.Domain;
+using ErsatzTV.Core.Interfaces.FFmpeg;
+using ErsatzTV.Core.Interfaces.Images;
+using LanguageExt;
+using static LanguageExt.Prelude;
+
+namespace ErsatzTV.Core.FFmpeg
+{
+    public class SongVideoGenerator : ISongVideoGenerator
+    {
+        private static readonly Random Random = new();
+        private static readonly object RandomLock = new();
+        
+        private readonly ITempFilePool _tempFilePool;
+        private readonly IImageCache _imageCache;
+        private readonly IFFmpegProcessService _ffmpegProcessService;
+
+        public SongVideoGenerator(
+            ITempFilePool tempFilePool,
+            IImageCache imageCache,
+            IFFmpegProcessService ffmpegProcessService)
+        {
+            _tempFilePool = tempFilePool;
+            _imageCache = imageCache;
+            _ffmpegProcessService = ffmpegProcessService;
+        }
+
+        public async Task<Tuple<string, MediaVersion>> GenerateSongVideo(
+            Song song,
+            Channel channel,
+            Option<ChannelWatermark> maybeGlobalWatermark,
+            string ffmpegPath)
+        {
+            Option<string> subtitleFile = None;
+
+            MediaVersion videoVersion = new FallbackMediaVersion
+            {
+                Id = -1,
+                Chapters = new List<MediaChapter>(),
+                Width = 192,
+                Height = 108,
+                SampleAspectRatio = "1:1",
+                Streams = new List<MediaStream>
+                {
+                    new() { MediaStreamKind = MediaStreamKind.Video, Index = 0 }
+                }
+            };
+            
+            string[] backgrounds =
+            {
+                "song_background_1.png",
+                "song_background_2.png",
+                "song_background_3.png"
+            };
+
+            // use random ETV color by default
+            string backgroundPath = Path.Combine(
+                FileSystemLayout.ResourcesCacheFolder,
+                backgrounds[NextRandom(backgrounds.Length)]);
+
+            Option<string> watermarkPath = None;
+
+            var boxBlur = false;
+            
+            const int HORIZONTAL_MARGIN_PERCENT = 3;
+            const int VERTICAL_MARGIN_PERCENT = 5;
+            const int WATERMARK_WIDTH_PERCENT = 25;
+            ChannelWatermarkLocation watermarkLocation = NextRandom(2) == 0
+                ? ChannelWatermarkLocation.BottomLeft
+                : ChannelWatermarkLocation.BottomRight;
+            
+            foreach (SongMetadata metadata in song.SongMetadata)
+            {
+                var fontSize = (int)Math.Round(channel.FFmpegProfile.Resolution.Height / 20.0);
+                var largeFontSize = (int)Math.Round(channel.FFmpegProfile.Resolution.Height / 10.0);
+                bool detailsStyle = NextRandom(2) == 0;
+                
+                var sb = new StringBuilder();
+
+                if (detailsStyle)
+                {
+                    if (!string.IsNullOrWhiteSpace(metadata.Title))
+                    {
+                        sb.Append($"{{\\fs{largeFontSize}}}{metadata.Title}");
+                    }
+                    
+                    if (!string.IsNullOrWhiteSpace(metadata.Artist))
+                    {
+                        sb.Append($"\\N{{\\fs{fontSize}}}{metadata.Artist}");
+                    }
+                }
+                else
+                {
+                    if (!string.IsNullOrWhiteSpace(metadata.Artist))
+                    {
+                        sb.Append(metadata.Artist);
+                    }
+
+                    if (!string.IsNullOrWhiteSpace(metadata.Title))
+                    {
+                        sb.Append($"\\N\"{metadata.Title}\"");
+                    }
+
+                    if (!string.IsNullOrWhiteSpace(metadata.Album))
+                    {
+                        sb.Append($"\\N{metadata.Album}");
+                    }
+                }
+
+                int leftMarginPercent = HORIZONTAL_MARGIN_PERCENT;
+                int rightMarginPercent = HORIZONTAL_MARGIN_PERCENT;
+
+                if (metadata.Artwork.Any(a => a.ArtworkKind == ArtworkKind.Thumbnail))
+                {
+                    switch (watermarkLocation)
+                    {
+                        case ChannelWatermarkLocation.BottomLeft:
+                            leftMarginPercent += WATERMARK_WIDTH_PERCENT + HORIZONTAL_MARGIN_PERCENT;
+                            break;
+                        case ChannelWatermarkLocation.BottomRight:
+                            leftMarginPercent = rightMarginPercent = HORIZONTAL_MARGIN_PERCENT;
+                            rightMarginPercent += WATERMARK_WIDTH_PERCENT + HORIZONTAL_MARGIN_PERCENT;
+                            break;
+                    }
+                }
+
+                var leftMargin = (int)Math.Round(leftMarginPercent / 100.0 * channel.FFmpegProfile.Resolution.Width);
+                var rightMargin = (int)Math.Round(rightMarginPercent / 100.0 * channel.FFmpegProfile.Resolution.Width);
+                var verticalMargin = (int)Math.Round(VERTICAL_MARGIN_PERCENT / 100.0 * channel.FFmpegProfile.Resolution.Height);
+
+                subtitleFile = await new SubtitleBuilder(_tempFilePool)
+                    .WithResolution(channel.FFmpegProfile.Resolution)
+                    .WithFontName("OPTIKabel-Heavy")
+                    .WithFontSize(fontSize)
+                    .WithPrimaryColor("&HFFFFFF")
+                    .WithOutlineColor("&H444444")
+                    .WithAlignment(0)
+                    .WithMarginRight(rightMargin)
+                    .WithMarginLeft(leftMargin)
+                    .WithMarginV(verticalMargin)
+                    .WithBorderStyle(1)
+                    .WithShadow(3)
+                    .WithFormattedContent(sb.ToString())
+                    .BuildFile();
+                
+                // use thumbnail (cover art) if present
+                foreach (Artwork artwork in Optional(
+                    metadata.Artwork.Find(a => a.ArtworkKind == ArtworkKind.Thumbnail)))
+                {
+                    // signal that we want to use cover art as watermark
+                    videoVersion = new CoverArtMediaVersion
+                    {
+                        Chapters = new List<MediaChapter>(),
+                        // always stretch cover art
+                        Width = 192,
+                        Height = 108,
+                        SampleAspectRatio = "1:1",
+                        Streams = new List<MediaStream>
+                        {
+                            new() { MediaStreamKind = MediaStreamKind.Video, Index = 0 }
+                        }
+                    };
+
+                    string customPath = _imageCache.GetPathForImage(
+                        artwork.Path,
+                        ArtworkKind.Thumbnail,
+                        Option<int>.None);
+                    
+                    watermarkPath = customPath;
+
+                    // randomize selected blur hash
+                    var hashes = new List<string>
+                    {
+                        artwork.BlurHash43,
+                        artwork.BlurHash54,
+                        artwork.BlurHash64
+                    }.Filter(s => !string.IsNullOrWhiteSpace(s)).ToList();
+
+                    if (hashes.Any())
+                    {
+                        string hash = hashes[NextRandom(hashes.Count)];
+                        
+                        backgroundPath = await _imageCache.WriteBlurHash(
+                            hash,
+                            channel.FFmpegProfile.Resolution);
+
+                        videoVersion.Height = channel.FFmpegProfile.Resolution.Height;
+                        videoVersion.Width = channel.FFmpegProfile.Resolution.Width;
+                    }
+                    else
+                    {
+                        backgroundPath = customPath;
+                        boxBlur = true;
+                    }
+                }
+            }
+
+            string videoPath = backgroundPath;
+
+            videoVersion.MediaFiles = new List<MediaFile>
+            {
+                new() { Path = videoPath }
+            };
+
+            Either<BaseError, string> maybeSongImage = await _ffmpegProcessService.GenerateSongImage(
+                ffmpegPath,
+                subtitleFile,
+                channel,
+                maybeGlobalWatermark,
+                videoVersion,
+                videoPath,
+                boxBlur,
+                watermarkPath,
+                watermarkLocation,
+                HORIZONTAL_MARGIN_PERCENT,
+                VERTICAL_MARGIN_PERCENT,
+                WATERMARK_WIDTH_PERCENT);
+
+            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 },
+                    },
+                    MediaFiles = new List<MediaFile>
+                    {
+                        new() { Path = si }
+                    }
+                };
+            }
+
+            return Tuple(videoPath, videoVersion);
+        }
+        
+        private static int NextRandom(int max)
+        {
+            lock (RandomLock)
+            {
+                return Random.Next() % max;
+            }
+        }
+    }
+}

ErsatzTV.Core/FFmpeg/SubtitleBuilder.cs

@@ -0,0 +1,138 @@
+using System.IO;
+using System.Text;
+using System.Threading.Tasks;
+using ErsatzTV.Core.Interfaces.FFmpeg;
+using LanguageExt;
+using static LanguageExt.Prelude;
+
+namespace ErsatzTV.Core.FFmpeg
+{
+    public class SubtitleBuilder
+    {
+        private readonly ITempFilePool _tempFilePool;
+        private string _content;
+        private Option<IDisplaySize> _resolution = None;
+        private Option<string> _fontName;
+        private Option<int> _fontSize;
+        private Option<string> _primaryColor;
+        private Option<string> _outlineColor;
+        private Option<int> _alignment;
+        private int _marginRight;
+        private int _marginLeft;
+        private int _marginV;
+        private Option<int> _borderStyle;
+        private Option<int> _shadow;
+
+        public SubtitleBuilder(ITempFilePool tempFilePool)
+        {
+            _tempFilePool = tempFilePool;
+        }
+
+        public SubtitleBuilder WithResolution(IDisplaySize resolution)
+        {
+            _resolution = Some(resolution);
+            return this;
+        }
+
+        public SubtitleBuilder WithFontName(string fontName)
+        {
+            _fontName = fontName;
+            return this;
+        }
+
+        public SubtitleBuilder WithFontSize(int fontSize)
+        {
+            _fontSize = fontSize;
+            return this;
+        }
+
+        public SubtitleBuilder WithPrimaryColor(string primaryColor)
+        {
+            _primaryColor = primaryColor;
+            return this;
+        }
+
+        public SubtitleBuilder WithOutlineColor(string outlineColor)
+        {
+            _outlineColor = outlineColor;
+            return this;
+        }
+
+        public SubtitleBuilder WithAlignment(int alignment)
+        {
+            _alignment = alignment;
+            return this;
+        }
+
+        public SubtitleBuilder WithMarginRight(int marginRight)
+        {
+            _marginRight = marginRight;
+            return this;
+        }
+
+        public SubtitleBuilder WithMarginLeft(int marginLeft)
+        {
+            _marginLeft = marginLeft;
+            return this;
+        }
+        
+        public SubtitleBuilder WithMarginV(int marginV)
+        {
+            _marginV = marginV;
+            return this;
+        }
+
+        public SubtitleBuilder WithBorderStyle(int borderStyle)
+        {
+            _borderStyle = borderStyle;
+            return this;
+        }
+
+        public SubtitleBuilder WithShadow(int shadow)
+        {
+            _shadow = shadow;
+            return this;
+        }
+
+        public SubtitleBuilder WithFormattedContent(string content)
+        {
+            _content = content;
+            return this;
+        }
+        
+        public async Task<string> BuildFile()
+        {
+            string fileName = _tempFilePool.GetNextTempFile(TempFileCategory.Subtitle);
+
+            var sb = new StringBuilder();
+            sb.AppendLine("[Script Info]");
+            sb.AppendLine("ScriptType: v4.00+");
+            sb.AppendLine("WrapStyle: 0");
+            sb.AppendLine("ScaledBorderAndShadow: yes");
+            sb.AppendLine("YCbCr Matrix: None");
+
+            foreach (IDisplaySize resolution in _resolution)
+            {
+                sb.AppendLine($"PlayResX: {resolution.Width}");
+                sb.AppendLine($"PlayResY: {resolution.Height}");
+            }
+
+            sb.AppendLine("[V4+ Styles]");
+            sb.AppendLine("Format: Name, Fontname, Fontsize, PrimaryColour, OutlineColour, BorderStyle, Outline, Shadow, Alignment, Encoding");
+            sb.AppendLine($"Style: Default,{await _fontName.IfNoneAsync("")},{await _fontSize.IfNoneAsync(32)},{await _primaryColor.IfNoneAsync("")},{await _outlineColor.IfNoneAsync("")},{await _borderStyle.IfNoneAsync(0)},1,{await _shadow.IfNoneAsync(0)},{await _alignment.IfNoneAsync(0)},1");
+
+            sb.AppendLine("[Events]");
+            sb.AppendLine("Format: Layer, Start, End, Style, Name, MarginL, MarginR, MarginV, Effect, Text");
+            sb.AppendLine($"Dialogue: 0,0:00:00.00,99:99:99.99,Default,,{_marginLeft},{_marginRight},{_marginV},,{_content}");
+
+            if (!string.IsNullOrWhiteSpace(_content))
+            {
+                sb.AppendLine(_content);
+            }
+
+            await File.WriteAllTextAsync(fileName, sb.ToString());
+
+            return fileName;
+        }
+    }
+}

ErsatzTV.Core/FFmpeg/TempFileCategory.cs

@@ -2,8 +2,9 @@
 {
     public enum TempFileCategory
     {
-        DrawText = 0,
+        Subtitle = 0,
         SongBackground = 1,
-        CoverArt = 2
+        CoverArt = 2,
+        CachedArtwork = 3
     }
 }

ErsatzTV.Core/Hdhr/LineupItem.cs

@@ -22,8 +22,7 @@ namespace ErsatzTV.Core.Hdhr
 
         public string URL => _channel.StreamingMode switch
         {
-            StreamingMode.HttpLiveStreamingDirect or StreamingMode.HttpLiveStreamingHybrid =>
-                $"{_scheme}://{_host}/iptv/channel/{_channel.Number}.m3u8",
+            StreamingMode.HttpLiveStreamingDirect => $"{_scheme}://{_host}/iptv/channel/{_channel.Number}.m3u8",
             _ => $"{_scheme}://{_host}/iptv/channel/{_channel.Number}.ts"
         };
     }

ErsatzTV.Core/Interfaces/FFmpeg/IFFmpegProcessService.cs

@@ -29,7 +29,7 @@ namespace ErsatzTV.Core.Interfaces.FFmpeg
             TimeSpan inPoint,
             TimeSpan outPoint);
 
-        Process ForError(
+        Task<Process> ForError(
             string ffmpegPath,
             Channel channel,
             Option<TimeSpan> duration,
@@ -38,14 +38,24 @@ namespace ErsatzTV.Core.Interfaces.FFmpeg
 
         Process ConcatChannel(string ffmpegPath, bool saveReports, Channel channel, string scheme, string host);
 
+        Process WrapSegmenter(string ffmpegPath, bool saveReports, Channel channel, string scheme, string host);
+
         Process ConvertToPng(string ffmpegPath, string inputFile, string outputFile);
 
+        Process ExtractAttachedPicAsPng(string ffmpegPath, string inputFile, int streamIndex, string outputFile);
+
         Task<Either<BaseError, string>> GenerateSongImage(
             string ffmpegPath,
-            Option<string> drawtextFile,
+            Option<string> subtitleFile,
             Channel channel,
             Option<ChannelWatermark> globalWatermark,
             MediaVersion videoVersion,
-            string videoPath);
+            string videoPath,
+            bool boxBlur,
+            Option<string> watermarkPath,
+            ChannelWatermarkLocation watermarkLocation,
+            int horizontalMarginPercent,
+            int verticalMarginPercent,
+            int watermarkWidthPercent);
     }
 }

ErsatzTV.Core/Interfaces/FFmpeg/ISongVideoGenerator.cs

@@ -0,0 +1,16 @@
+using System;
+using System.Threading.Tasks;
+using ErsatzTV.Core.Domain;
+using LanguageExt;
+
+namespace ErsatzTV.Core.Interfaces.FFmpeg
+{
+    public interface ISongVideoGenerator
+    {
+        Task<Tuple<string, MediaVersion>> GenerateSongVideo(
+            Song song,
+            Channel channel,
+            Option<ChannelWatermark> maybeGlobalWatermark,
+            string ffmpegPath);
+    }
+}

ErsatzTV.Core/Interfaces/Images/IImageCache.cs

@@ -1,5 +1,7 @@
-using System.Threading.Tasks;
+using System.IO;
+using System.Threading.Tasks;
 using ErsatzTV.Core.Domain;
+using ErsatzTV.Core.Interfaces.FFmpeg;
 using LanguageExt;
 
 namespace ErsatzTV.Core.Interfaces.Images
@@ -7,9 +9,11 @@ namespace ErsatzTV.Core.Interfaces.Images
     public interface IImageCache
     {
         Task<Either<BaseError, byte[]>> ResizeImage(byte[] imageBuffer, int height);
-        Task<Either<BaseError, string>> SaveArtworkToCache(byte[] imageBuffer, ArtworkKind artworkKind);
+        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);
         Task<bool> IsAnimated(string fileName);
+        Task<string> CalculateBlurHash(string fileName, ArtworkKind artworkKind, int x, int y);
+        Task<string> WriteBlurHash(string blurHash, IDisplaySize targetSize);
     }
 }

ErsatzTV.Core/Interfaces/Repositories/IMetadataRepository.cs

@@ -15,11 +15,17 @@ namespace ErsatzTV.Core.Interfaces.Repositories
         Task<bool> RemoveActor(Actor actor);
         Task<bool> Update(Domain.Metadata metadata);
         Task<bool> Add(Domain.Metadata metadata);
-        Task<bool> UpdateLocalStatistics(int mediaVersionId, MediaVersion incoming, bool updateVersion = true);
+        Task<bool> UpdateLocalStatistics(MediaItem mediaItem, MediaVersion incoming, bool updateVersion = true);
         Task<bool> UpdatePlexStatistics(int mediaVersionId, MediaVersion incoming);
         Task<Unit> UpdateArtworkPath(Artwork artwork);
         Task<Unit> AddArtwork(Domain.Metadata metadata, Artwork artwork);
         Task<Unit> RemoveArtwork(Domain.Metadata metadata, ArtworkKind artworkKind);
+        Task<bool> CloneArtwork(
+            Domain.Metadata metadata,
+            Option<Artwork> maybeArtwork,
+            ArtworkKind artworkKind,
+            string sourcePath,
+            DateTime lastWriteTime);
         Task<Unit> MarkAsUpdated(ShowMetadata metadata, DateTime dateUpdated);
         Task<Unit> MarkAsUpdated(SeasonMetadata metadata, DateTime dateUpdated);
         Task<Unit> MarkAsUpdated(MovieMetadata metadata, DateTime dateUpdated);

ErsatzTV.Core/Iptv/ChannelGuide.cs

@@ -213,6 +213,29 @@ namespace ErsatzTV.Core.Iptv
                             }
                         }
                     }
+                    
+                    if (!hasCustomTitle && displayItem.MediaItem is Song song)
+                    {
+                        xml.WriteStartElement("category");
+                        xml.WriteAttributeString("lang", "en");
+                        xml.WriteString("Music");
+                        xml.WriteEndElement(); // category
+
+                        foreach (SongMetadata metadata in song.SongMetadata.HeadOrNone())
+                        {
+                            string thumbnail = Optional(metadata.Artwork).Flatten()
+                                .Filter(a => a.ArtworkKind == ArtworkKind.Thumbnail)
+                                .HeadOrNone()
+                                .Match(a => GetArtworkUrl(a, ArtworkKind.Thumbnail), () => string.Empty);
+
+                            if (!string.IsNullOrWhiteSpace(thumbnail))
+                            {
+                                xml.WriteStartElement("icon");
+                                xml.WriteAttributeString("src", thumbnail);
+                                xml.WriteEndElement(); // icon
+                            }
+                        }
+                    }
 
                     if (displayItem.MediaItem is Episode episode && (!hasCustomTitle || isSameCustomShow))
                     {
@@ -344,8 +367,8 @@ namespace ErsatzTV.Core.Iptv
                     .IfNone("[unknown artist]"),
                 OtherVideo ov => ov.OtherVideoMetadata.HeadOrNone().Map(vm => vm.Title ?? string.Empty)
                     .IfNone("[unknown video]"),
-                Song s => s.SongMetadata.HeadOrNone().Map(sm => sm.Title ?? string.Empty)
-                    .IfNone("[unknown song]"),
+                Song s => s.SongMetadata.HeadOrNone().Map(sm => sm.Artist ?? string.Empty)
+                    .IfNone("[unknown artist]"),
                 _ => "[unknown]"
             };
         }
@@ -365,6 +388,9 @@ namespace ErsatzTV.Core.Iptv
                 MusicVideo mv => mv.MusicVideoMetadata.HeadOrNone().Match(
                     mvm => mvm.Title ?? string.Empty,
                     () => string.Empty),
+                Song s => s.SongMetadata.HeadOrNone().Match(
+                    mvm => mvm.Title ?? string.Empty,
+                    () => string.Empty),
                 _ => string.Empty
             };
         }

ErsatzTV.Core/Iptv/ChannelPlaylist.cs

@@ -26,7 +26,7 @@ namespace ErsatzTV.Core.Iptv
 
             var xmltv = $"{_scheme}://{_host}/iptv/xmltv.xml";
             sb.AppendLine($"#EXTM3U url-tvg=\"{xmltv}\" x-tvg-url=\"{xmltv}\"");
-            foreach (Channel channel in _channels.OrderBy(c => c.Number))
+            foreach (Channel channel in _channels.OrderBy(c => decimal.Parse(c.Number)))
             {
                 string logo = Optional(channel.Artwork).Flatten()
                     .Filter(a => a.ArtworkKind == ArtworkKind.Logo)
@@ -43,9 +43,9 @@ namespace ErsatzTV.Core.Iptv
                 string format = channel.StreamingMode switch
                 {
                     StreamingMode.HttpLiveStreamingDirect => "m3u8?mode=hls-direct",
-                    StreamingMode.HttpLiveStreamingHybrid => "m3u8",
                     StreamingMode.HttpLiveStreamingSegmenter => "m3u8?mode=segmenter",
-                    _ => "ts"
+                    StreamingMode.TransportStreamHybrid => "ts",
+                    _ => "ts?mode=legacy"
                 };
 
                 string vcodec = channel.FFmpegProfile.VideoCodec.Split("_").Head();

ErsatzTV.Core/Metadata/LocalFolderScanner.cs

@@ -116,7 +116,12 @@ namespace ErsatzTV.Core.Metadata
             }
         }
 
-        protected async Task<bool> RefreshArtwork(string artworkFile, Domain.Metadata metadata, ArtworkKind artworkKind, Option<string> ffmpegPath)
+        protected async Task<bool> RefreshArtwork(
+            string artworkFile,
+            Domain.Metadata metadata,
+            ArtworkKind artworkKind,
+            Option<string> ffmpegPath,
+            Option<int> attachedPicIndex)
         {
             DateTime lastWriteTime = _localFileSystem.GetLastWriteTime(artworkFile);
 
@@ -134,15 +139,45 @@ namespace ErsatzTV.Core.Metadata
                 {
                     _logger.LogDebug("Refreshing {Attribute} from {Path}", artworkKind, artworkFile);
 
-                    // if ffmpeg path is passed, we want to convert to png
+                    string sourcePath = artworkFile;
+                    if (await _metadataRepository.CloneArtwork(
+                        metadata,
+                        maybeArtwork,
+                        artworkKind,
+                        sourcePath,
+                        lastWriteTime))
+                    {
+                        return true;
+                    }
+
+                    // if ffmpeg path is passed, we need pre-processing
                     foreach (string path in ffmpegPath)
                     {
-                        string tempName = _tempFilePool.GetNextTempFile(TempFileCategory.CoverArt);
-                        using Process process = _ffmpegProcessService.ConvertToPng(path, artworkFile, tempName);
-                        process.Start();
-                        await process.WaitForExitAsync();
+                        artworkFile = await attachedPicIndex.Match(
+                            async picIndex =>
+                            {
+                                // extract attached pic (and convert to png)
+                                string tempName = _tempFilePool.GetNextTempFile(TempFileCategory.CoverArt);
+                                using Process process = _ffmpegProcessService.ExtractAttachedPicAsPng(
+                                    path,
+                                    artworkFile,
+                                    picIndex,
+                                    tempName);
+                                process.Start();
+                                await process.WaitForExitAsync();
 
-                        artworkFile = tempName;
+                                return tempName;
+                            },
+                            async () =>
+                            {
+                                // no attached pic index means convert to png
+                                string tempName = _tempFilePool.GetNextTempFile(TempFileCategory.CoverArt);
+                                using Process process = _ffmpegProcessService.ConvertToPng(path, artworkFile, tempName);
+                                process.Start();
+                                await process.WaitForExitAsync();
+
+                                return tempName;
+                            });
                     }
 
                     Either<BaseError, string> maybeCacheName =
@@ -155,7 +190,28 @@ namespace ErsatzTV.Core.Metadata
                                 async artwork =>
                                 {
                                     artwork.Path = cacheName;
+                                    artwork.SourcePath = sourcePath;
                                     artwork.DateUpdated = lastWriteTime;
+
+                                    if (metadata is SongMetadata)
+                                    {
+                                        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);
                                 },
                                 async () =>
@@ -163,10 +219,31 @@ namespace ErsatzTV.Core.Metadata
                                     var artwork = new Artwork
                                     {
                                         Path = cacheName,
+                                        SourcePath = sourcePath,
                                         DateAdded = DateTime.UtcNow,
                                         DateUpdated = lastWriteTime,
                                         ArtworkKind = artworkKind
                                     };
+
+                                    if (metadata is SongMetadata)
+                                    {
+                                        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);
                                     await _metadataRepository.AddArtwork(metadata, artwork);
                                 });

ErsatzTV.Core/Metadata/LocalMetadataProvider.cs

@@ -228,9 +228,6 @@ namespace ErsatzTV.Core.Metadata
                             Tags = new List<Tag>()
                         };
                         
-                        // TODO: check for cover artwork, and use for watermark if not embedded
-                        // maybe add album as entity rather than string?
-
                         if (tags.TryGetValue(MetadataFormatTag.Album, out string album))
                         {
                             result.Album = album;
@@ -248,14 +245,12 @@ namespace ErsatzTV.Core.Metadata
 
                         if (tags.TryGetValue(MetadataFormatTag.Genre, out string genre))
                         {
-                            // TODO: split genres? or is this only ever one?
-                            result.Genres.Add(new Genre { Name = genre });
+                            result.Genres.AddRange(SplitGenres(genre).Map(n => new Genre { Name = n }));
                         }
 
                         if (tags.TryGetValue(MetadataFormatTag.Title, out string title))
                         {
                             result.Title = title;
-                            result.OriginalTitle = title;
                         }
 
                         if (tags.TryGetValue(MetadataFormatTag.Track, out string track))
@@ -268,9 +263,10 @@ namespace ErsatzTV.Core.Metadata
                             if (string.IsNullOrWhiteSpace(result.Title))
                             {
                                 result.Title = fallbackMetadata.Title;
-                                result.OriginalTitle = fallbackMetadata.OriginalTitle;
                             }
 
+                            result.OriginalTitle = fallbackMetadata.OriginalTitle;
+
                             // preserve folder tagging - maybe someone uses this
                             foreach (Tag tag in fallbackMetadata.Tags)
                             {
@@ -973,9 +969,9 @@ namespace ErsatzTV.Core.Metadata
             }
         }
 
-        private static int? GetYear(int year, string premiered)
+        private static int? GetYear(int? year, string premiered)
         {
-            if (year > 1000)
+            if (year is > 1000)
             {
                 return year;
             }
@@ -993,9 +989,9 @@ namespace ErsatzTV.Core.Metadata
             return null;
         }
 
-        private static DateTime? GetAired(int year, string aired)
+        private static DateTime? GetAired(int? year, string aired)
         {
-            DateTime? fallback = year > 1000 ? new DateTime(year, 1, 1) : null;
+            DateTime? fallback = year is > 1000 ? new DateTime(year.Value, 1, 1) : null;
 
             if (string.IsNullOrWhiteSpace(aired))
             {
@@ -1140,5 +1136,17 @@ namespace ErsatzTV.Core.Metadata
 
             return result;
         }
+        
+        private static IEnumerable<string> SplitGenres(string genre)
+        {
+            char[] delimiters = new[] { '/', '|', ';', '\\' }
+                .Filter(d => genre.IndexOf(d, StringComparison.OrdinalIgnoreCase) != -1)
+                .DefaultIfEmpty(',')
+                .ToArray();
+            
+            return genre.Split(delimiters, StringSplitOptions.RemoveEmptyEntries)
+                .Where(i => !string.IsNullOrWhiteSpace(i))
+                .Select(i => i.Trim());
+        }
     }
 }

ErsatzTV.Core/Metadata/LocalStatisticsProvider.cs

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Diagnostics;
 using System.Globalization;
 using System.Linq;
+using System.Text;
 using System.Threading.Tasks;
 using ErsatzTV.Core.Domain;
 using ErsatzTV.Core.Extensions;
@@ -131,7 +132,7 @@ namespace ErsatzTV.Core.Metadata
 
             version.DateUpdated = _localFileSystem.GetLastWriteTime(filePath);
 
-            return await _metadataRepository.UpdateLocalStatistics(mediaItemVersion.Id, version) && durationChange;
+            return await _metadataRepository.UpdateLocalStatistics(mediaItem, version) && durationChange;
         }
 
         private Task<Either<BaseError, FFprobe>> GetProbeOutput(string ffprobePath, string filePath)
@@ -141,7 +142,9 @@ namespace ErsatzTV.Core.Metadata
                 FileName = ffprobePath,
                 RedirectStandardOutput = true,
                 RedirectStandardError = true,
-                UseShellExecute = false
+                UseShellExecute = false,
+                StandardOutputEncoding = Encoding.UTF8,
+                StandardErrorEncoding = Encoding.UTF8
             };
 
             startInfo.ArgumentList.Add("-v");

ErsatzTV.Core/Metadata/MediaItemScanResult.cs

@@ -6,7 +6,7 @@ namespace ErsatzTV.Core.Metadata
     {
         public MediaItemScanResult(T item) => Item = item;
 
-        public T Item { get; }
+        public T Item { get; set; }
 
         public bool IsAdded { get; set; }
         public bool IsUpdated { get; set; }

ErsatzTV.Core/Metadata/MovieFolderScanner.cs

@@ -239,7 +239,7 @@ namespace ErsatzTV.Core.Metadata
                     async posterFile =>
                     {
                         MovieMetadata metadata = movie.MovieMetadata.Head();
-                        await RefreshArtwork(posterFile, metadata, artworkKind, None);
+                        await RefreshArtwork(posterFile, metadata, artworkKind, None, None);
                     });
 
                 return result;

ErsatzTV.Core/Metadata/MusicVideoFolderScanner.cs

@@ -222,7 +222,7 @@ namespace ErsatzTV.Core.Metadata
                     async artworkFile =>
                     {
                         ArtistMetadata metadata = artist.ArtistMetadata.Head();
-                        await RefreshArtwork(artworkFile, metadata, artworkKind, None);
+                        await RefreshArtwork(artworkFile, metadata, artworkKind, None, None);
                     });
 
                 return result;
@@ -385,7 +385,7 @@ namespace ErsatzTV.Core.Metadata
                     async thumbnailFile =>
                     {
                         MusicVideoMetadata metadata = musicVideo.MusicVideoMetadata.Head();
-                        await RefreshArtwork(thumbnailFile, metadata, ArtworkKind.Thumbnail, None);
+                        await RefreshArtwork(thumbnailFile, metadata, ArtworkKind.Thumbnail, None, None);
                     });
 
                 return result;

ErsatzTV.Core/Metadata/Nfo/TvShowNfo.cs

@@ -9,8 +9,15 @@ namespace ErsatzTV.Core.Metadata.Nfo
         [XmlElement("title")]
         public string Title { get; set; }
 
+        [XmlIgnore]
+        public int? Year { get; set; }
+
         [XmlElement("year")]
-        public int Year { get; set; }
+        public string YearAsText
+        {
+            get => Year.HasValue ? Year.ToString() : null;
+            set => Year = !string.IsNullOrWhiteSpace(value) ? int.Parse(value) : default(int?);
+        }
 
         [XmlElement("plot")]
         public string Plot { get; set; }

ErsatzTV.Core/Metadata/OtherVideoFolderScanner.cs

@@ -77,9 +77,15 @@ namespace ErsatzTV.Core.Metadata
             var foldersCompleted = 0;
 
             var folderQueue = new Queue<string>();
+
+            if (ShouldIncludeFolder(libraryPath.Path))
+            {
+                folderQueue.Enqueue(libraryPath.Path);
+            }
+
             foreach (string folder in _localFileSystem.ListSubdirectories(libraryPath.Path)
-                .Filter(ShouldIncludeFolder)
-                .OrderBy(identity))
+                         .Filter(ShouldIncludeFolder)
+                         .OrderBy(identity))
             {
                 folderQueue.Enqueue(folder);
             }

ErsatzTV.Core/Metadata/SongFolderScanner.cs

@@ -79,9 +79,15 @@ namespace ErsatzTV.Core.Metadata
             var foldersCompleted = 0;
 
             var folderQueue = new Queue<string>();
+            
+            if (ShouldIncludeFolder(libraryPath.Path))
+            {
+                folderQueue.Enqueue(libraryPath.Path);
+            }
+
             foreach (string folder in _localFileSystem.ListSubdirectories(libraryPath.Path)
-                .Filter(ShouldIncludeFolder)
-                .OrderBy(identity))
+                         .Filter(ShouldIncludeFolder)
+                         .OrderBy(identity))
             {
                 folderQueue.Enqueue(folder);
             }
@@ -130,7 +136,7 @@ namespace ErsatzTV.Core.Metadata
                         .GetOrAdd(libraryPath, file)
                         .BindT(video => UpdateStatistics(video, ffprobePath))
                         .BindT(video => UpdateMetadata(video, ffprobePath))
-                        .BindT(video => UpdateThumbnail(video, ffprobePath, ffmpegPath));
+                        .BindT(video => UpdateThumbnail(video, ffmpegPath));
 
                     await maybeSong.Match(
                         async result =>
@@ -208,19 +214,31 @@ namespace ErsatzTV.Core.Metadata
 
         private async Task<Either<BaseError, MediaItemScanResult<Song>>> UpdateThumbnail(
             MediaItemScanResult<Song> result,
-            string ffprobePath,
             string ffmpegPath)
         {
             try
             {
+                // reload the song from the database at this point
+                if (result.IsAdded)
+                {
+                    LibraryPath libraryPath = result.Item.LibraryPath;
+                    string path = result.Item.GetHeadVersion().MediaFiles.Head().Path;
+                    foreach (MediaItemScanResult<Song> s in (await _songRepository.GetOrAdd(libraryPath, path))
+                        .RightToSeq())
+                    {
+                        result.Item = s.Item;
+                    }
+                }
+
                 Song song = result.Item;
+
                 await LocateThumbnail(song).Match(
                     async thumbnailFile =>
                     {
                         SongMetadata metadata = song.SongMetadata.Head();
-                        await RefreshArtwork(thumbnailFile, metadata, ArtworkKind.Thumbnail, ffmpegPath);
+                        await RefreshArtwork(thumbnailFile, metadata, ArtworkKind.Thumbnail, ffmpegPath, None);
                     },
-                    () => Task.CompletedTask); // TODO: check for embedded artwork
+                    () => ExtractEmbeddedArtwork(song, ffmpegPath));
         
                 return result;
             }
@@ -245,5 +263,19 @@ namespace ErsatzTV.Core.Metadata
                         .HeadOrNone();
                 }).Flatten();
         }
+
+        private async Task ExtractEmbeddedArtwork(Song song, string ffmpegPath)
+        {
+            Option<MediaStream> maybeArtworkStream = Optional(song.GetHeadVersion().Streams.Find(ms => ms.AttachedPic));
+            foreach (MediaStream artworkStream in maybeArtworkStream)
+            {
+                await RefreshArtwork(
+                    song.GetHeadVersion().MediaFiles.Head().Path,
+                    song.SongMetadata.Head(),
+                    ArtworkKind.Thumbnail,
+                    ffmpegPath,
+                    artworkStream.Index);
+            }
+        }
     }
 }

ErsatzTV.Core/Metadata/TelevisionFolderScanner.cs

@@ -367,7 +367,7 @@ namespace ErsatzTV.Core.Metadata
                     async artworkFile =>
                     {
                         ShowMetadata metadata = show.ShowMetadata.Head();
-                        await RefreshArtwork(artworkFile, metadata, artworkKind, None);
+                        await RefreshArtwork(artworkFile, metadata, artworkKind, None, None);
                     });
 
                 return result;
@@ -386,7 +386,7 @@ namespace ErsatzTV.Core.Metadata
                     async posterFile =>
                     {
                         SeasonMetadata metadata = season.SeasonMetadata.Head();
-                        await RefreshArtwork(posterFile, metadata, ArtworkKind.Poster, None);
+                        await RefreshArtwork(posterFile, metadata, ArtworkKind.Poster, None, None);
                     });
 
                 return season;
@@ -406,7 +406,7 @@ namespace ErsatzTV.Core.Metadata
                     {
                         foreach (EpisodeMetadata metadata in episode.EpisodeMetadata)
                         {
-                            await RefreshArtwork(posterFile, metadata, ArtworkKind.Thumbnail, None);
+                            await RefreshArtwork(posterFile, metadata, ArtworkKind.Thumbnail, None, None);
                         }
                     });
 

ErsatzTV.Core/Scheduling/CloneableRandom.cs

@@ -0,0 +1,41 @@
+using System;
+
+namespace ErsatzTV.Core.Scheduling
+{
+    public class CloneableRandom
+    {
+        private readonly int _seed;
+        private readonly Random _random;
+        private int _count;
+        
+        public CloneableRandom(int seed)
+        {
+            _seed = seed;
+            _random = new Random(_seed);
+        }
+
+        public CloneableRandom Clone()
+        {
+            var clone = new CloneableRandom(_seed);
+            
+            for (var i = 0; i < _count; i++)
+            {
+                clone.Next();
+            }
+
+            return clone;
+        }
+
+        public int Next()
+        {
+            _count++;
+            return _random.Next();
+        }
+
+        public int Next(int maxValue)
+        {
+            _count++;
+            return _random.Next(maxValue);
+        }
+    }
+}

ErsatzTV.Core/Scheduling/ShuffledMediaCollectionEnumerator.cs

@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Reflection;
 using ErsatzTV.Core.Domain;
 using ErsatzTV.Core.Interfaces.Scheduling;
 using LanguageExt;
@@ -13,7 +12,7 @@ namespace ErsatzTV.Core.Scheduling
     {
         private readonly int _mediaItemCount;
         private readonly IList<GroupedMediaItem> _mediaItems;
-        private Random _random;
+        private CloneableRandom _random;
         private IList<MediaItem> _shuffled;
 
         public ShuffledMediaCollectionEnumerator(
@@ -29,7 +28,7 @@ namespace ErsatzTV.Core.Scheduling
                 state.Seed = new Random(state.Seed).Next();
             }
 
-            _random = new Random(state.Seed);
+            _random = new CloneableRandom(state.Seed);
             _shuffled = Shuffle(_mediaItems, _random);
 
             State = new CollectionEnumeratorState { Seed = state.Seed };
@@ -45,7 +44,7 @@ namespace ErsatzTV.Core.Scheduling
 
         public void MoveNext()
         {
-            if ((State.Index + 1) % _shuffled.Count == 0)
+            if ((State.Index + 1) % _mediaItemCount == 0)
             {
                 Option<MediaItem> tail = Current;
 
@@ -53,7 +52,7 @@ namespace ErsatzTV.Core.Scheduling
                 do
                 {
                     State.Seed = _random.Next();
-                    _random = new Random(State.Seed);
+                    _random = new CloneableRandom(State.Seed);
                     _shuffled = Shuffle(_mediaItems, _random);
                 } while (_mediaItems.Count > 1 && Current == tail);
             }
@@ -62,29 +61,28 @@ namespace ErsatzTV.Core.Scheduling
                 State.Index++;
             }
 
-            State.Index %= _shuffled.Count;
+            State.Index %= _mediaItemCount;
         }
 
         public Option<MediaItem> Peek(int offset)
         {
+            if (offset == 0)
+            {
+                return Current;
+            }
+
             if ((State.Index + offset) % _mediaItemCount == 0)
             {
                 IList<MediaItem> shuffled;
                 Option<MediaItem> tail = Current;
-                
+
                 // clone the random
-                var randomCopy = new Random();
-                FieldInfo seedArrayInfo = typeof(Random).GetField(
-                    "_seedArray",
-                    BindingFlags.NonPublic | BindingFlags.Instance);
-                var seedArray = seedArrayInfo.GetValue(_random) as int[];
-                int[] seedArrayCopy = seedArray.ToArray();
-                seedArrayInfo.SetValue(randomCopy, seedArrayCopy);
+                CloneableRandom randomCopy = _random.Clone();
                 
                 do
                 {
                     int newSeed = randomCopy.Next();
-                    randomCopy = new Random(newSeed);
+                    randomCopy = new CloneableRandom(newSeed);
                     shuffled = Shuffle(_mediaItems, randomCopy);
                 } while (_mediaItems.Count > 1 && shuffled[0] == tail);
 
@@ -94,7 +92,7 @@ namespace ErsatzTV.Core.Scheduling
             return _shuffled.Any() ? _shuffled[(State.Index + offset) % _mediaItemCount] : None;
         }
 
-        private IList<MediaItem> Shuffle(IEnumerable<GroupedMediaItem> list, Random random)
+        private IList<MediaItem> Shuffle(IEnumerable<GroupedMediaItem> list, CloneableRandom random)
         {
             GroupedMediaItem[] copy = list.ToArray();
 

ErsatzTV.Infrastructure/Data/Repositories/ChannelRepository.cs

@@ -7,6 +7,7 @@ using LanguageExt;
 using Microsoft.EntityFrameworkCore;
 using static LanguageExt.Prelude;
 
+
 namespace ErsatzTV.Infrastructure.Data.Repositories
 {
     public class ChannelRepository : IChannelRepository
@@ -42,10 +43,11 @@ namespace ErsatzTV.Infrastructure.Data.Repositories
 
         public async Task<List<Channel>> GetAll()
         {
-            await using TvContext dbContext = _dbContextFactory.CreateDbContext();
+            await using TvContext dbContext = await _dbContextFactory.CreateDbContextAsync();
             return await dbContext.Channels
                 .Include(c => c.FFmpegProfile)
                 .Include(c => c.Artwork)
+                .Include(c => c.Playouts)
                 .ToListAsync();
         }
 

ErsatzTV.Infrastructure/Data/Repositories/MetadataRepository.cs

@@ -4,6 +4,7 @@ using System.Linq;
 using System.Threading.Tasks;
 using Dapper;
 using ErsatzTV.Core.Domain;
+using ErsatzTV.Core.Extensions;
 using ErsatzTV.Core.Interfaces.Repositories;
 using LanguageExt;
 using Microsoft.EntityFrameworkCore;
@@ -110,14 +111,17 @@ namespace ErsatzTV.Infrastructure.Data.Repositories
         }
 
         public async Task<bool> UpdateLocalStatistics(
-            int mediaVersionId,
+            MediaItem mediaItem,
             MediaVersion incoming,
             bool updateVersion = true)
         {
-            await using TvContext dbContext = _dbContextFactory.CreateDbContext();
+            int mediaVersionId = mediaItem.GetHeadVersion().Id;
+            
+            await using TvContext dbContext = await _dbContextFactory.CreateDbContextAsync();
             Option<MediaVersion> maybeVersion = await dbContext.MediaVersions
                 .Include(v => v.Streams)
                 .Include(v => v.Chapters)
+                .Include(v => v.MediaFiles)
                 .OrderBy(v => v.Id)
                 .SingleOrDefaultAsync(v => v.Id == mediaVersionId)
                 .Map(Optional);
@@ -161,6 +165,9 @@ namespace ErsatzTV.Infrastructure.Data.Repositories
                         existingStream.Title = incomingStream.Title;
                         existingStream.Default = incomingStream.Default;
                         existingStream.Forced = incomingStream.Forced;
+                        existingStream.AttachedPic = incomingStream.AttachedPic;
+                        existingStream.PixelFormat = incomingStream.PixelFormat;
+                        existingStream.BitsPerRawSample = incomingStream.BitsPerRawSample;
                     }
                     
                     var chaptersToAdd = incoming.Chapters
@@ -188,7 +195,37 @@ namespace ErsatzTV.Infrastructure.Data.Repositories
                         existingChapter.Title = incomingChapter.Title;
                     }
 
-                    return await dbContext.SaveChangesAsync() > 0;
+                    if (await dbContext.SaveChangesAsync() <= 0)
+                    {
+                        return false;
+                    }
+
+                    // reload the media versions so we can properly index the duration
+                    switch (mediaItem)
+                    {
+                        case Movie movie:
+                            movie.MediaVersions.Clear();
+                            movie.MediaVersions.Add(existing);
+                            break;
+                        case Episode episode:
+                            episode.MediaVersions.Clear();
+                            episode.MediaVersions.Add(existing);
+                            break;
+                        case MusicVideo musicVideo:
+                            musicVideo.MediaVersions.Clear();
+                            musicVideo.MediaVersions.Add(existing);
+                            break;
+                        case OtherVideo otherVideo:
+                            otherVideo.MediaVersions.Clear();
+                            otherVideo.MediaVersions.Add(existing);
+                            break;
+                        case Song song:
+                            song.MediaVersions.Clear();
+                            song.MediaVersions.Add(existing);
+                            break;
+                    }
+
+                    return true;
                 },
                 () => Task.FromResult(false));
         }
@@ -206,51 +243,52 @@ namespace ErsatzTV.Infrastructure.Data.Repositories
 
         public Task<Unit> UpdateArtworkPath(Artwork artwork) =>
             _dbConnection.ExecuteAsync(
-                "UPDATE Artwork SET Path = @Path, DateUpdated = @DateUpdated WHERE Id = @Id",
-                new { artwork.Path, artwork.DateUpdated, artwork.Id }).ToUnit();
+                "UPDATE Artwork SET Path = @Path, SourcePath = @SourcePath, DateUpdated = @DateUpdated, BlurHash43 = @BlurHash43, BlurHash54 = @BlurHash54, BlurHash64 = @BlurHash64 WHERE Id = @Id",
+                new { artwork.Path, artwork.SourcePath, artwork.DateUpdated, artwork.BlurHash43, artwork.BlurHash54, artwork.BlurHash64, artwork.Id }).ToUnit();
 
         public Task<Unit> AddArtwork(Metadata metadata, Artwork artwork)
         {
             var parameters = new
             {
-                artwork.ArtworkKind, metadata.Id, artwork.DateAdded, artwork.DateUpdated, artwork.Path
+                artwork.ArtworkKind, metadata.Id, artwork.DateAdded, artwork.DateUpdated, artwork.Path,
+                artwork.SourcePath, artwork.BlurHash43, artwork.BlurHash54, artwork.BlurHash64
             };
 
             return metadata switch
             {
                 MovieMetadata => _dbConnection.ExecuteAsync(
-                        @"INSERT INTO Artwork (ArtworkKind, MovieMetadataId, DateAdded, DateUpdated, Path)
-                            VALUES (@ArtworkKind, @Id, @DateAdded, @DateUpdated, @Path)",
+                        @"INSERT INTO Artwork (ArtworkKind, MovieMetadataId, DateAdded, DateUpdated, Path, SourcePath, BlurHash43, BlurHash54, BlurHash64)
+                            VALUES (@ArtworkKind, @Id, @DateAdded, @DateUpdated, @Path, @SourcePath, @BlurHash43, @BlurHash54, @BlurHash64)",
                         parameters)
                     .ToUnit(),
                 ShowMetadata => _dbConnection.ExecuteAsync(
-                        @"INSERT INTO Artwork (ArtworkKind, ShowMetadataId, DateAdded, DateUpdated, Path)
-                            VALUES (@ArtworkKind, @Id, @DateAdded, @DateUpdated, @Path)",
+                        @"INSERT INTO Artwork (ArtworkKind, ShowMetadataId, DateAdded, DateUpdated, Path, SourcePath, BlurHash43, BlurHash54, BlurHash64)
+                            VALUES (@ArtworkKind, @Id, @DateAdded, @DateUpdated, @Path, @SourcePath, @BlurHash43, @BlurHash54, @BlurHash64)",
                         parameters)
                     .ToUnit(),
                 SeasonMetadata => _dbConnection.ExecuteAsync(
-                        @"INSERT INTO Artwork (ArtworkKind, SeasonMetadataId, DateAdded, DateUpdated, Path)
-                            VALUES (@ArtworkKind, @Id, @DateAdded, @DateUpdated, @Path)",
+                        @"INSERT INTO Artwork (ArtworkKind, SeasonMetadataId, DateAdded, DateUpdated, Path, SourcePath, BlurHash43, BlurHash54, BlurHash64)
+                            VALUES (@ArtworkKind, @Id, @DateAdded, @DateUpdated, @Path, @SourcePath, @BlurHash43, @BlurHash54, @BlurHash64)",
                         parameters)
                     .ToUnit(),
                 EpisodeMetadata => _dbConnection.ExecuteAsync(
-                        @"INSERT INTO Artwork (ArtworkKind, EpisodeMetadataId, DateAdded, DateUpdated, Path)
-                            VALUES (@ArtworkKind, @Id, @DateAdded, @DateUpdated, @Path)",
+                        @"INSERT INTO Artwork (ArtworkKind, EpisodeMetadataId, DateAdded, DateUpdated, Path, SourcePath, BlurHash43, BlurHash54, BlurHash64)
+                            VALUES (@ArtworkKind, @Id, @DateAdded, @DateUpdated, @Path, @SourcePath, @BlurHash43, @BlurHash54, @BlurHash64)",
                         parameters)
                     .ToUnit(),
                 ArtistMetadata => _dbConnection.ExecuteAsync(
-                        @"INSERT INTO Artwork (ArtworkKind, ArtistMetadataId, DateAdded, DateUpdated, Path)
-                            Values (@ArtworkKind, @Id, @DateAdded, @DateUpdated, @Path)",
+                        @"INSERT INTO Artwork (ArtworkKind, ArtistMetadataId, DateAdded, DateUpdated, Path, SourcePath, BlurHash43, BlurHash54, BlurHash64)
+                            Values (@ArtworkKind, @Id, @DateAdded, @DateUpdated, @Path, @SourcePath, @BlurHash43, @BlurHash54, @BlurHash64)",
                         parameters)
                     .ToUnit(),
                 MusicVideoMetadata => _dbConnection.ExecuteAsync(
-                        @"INSERT INTO Artwork (ArtworkKind, MusicVideoMetadataId, DateAdded, DateUpdated, Path)
-                            VALUES (@ArtworkKind, @Id, @DateAdded, @DateUpdated, @Path)",
+                        @"INSERT INTO Artwork (ArtworkKind, MusicVideoMetadataId, DateAdded, DateUpdated, Path, SourcePath, BlurHash43, BlurHash54, BlurHash64)
+                            VALUES (@ArtworkKind, @Id, @DateAdded, @DateUpdated, @Path, @SourcePath, @BlurHash43, @BlurHash54, @BlurHash64)",
                         parameters)
                     .ToUnit(),
                 SongMetadata => _dbConnection.ExecuteAsync(
-                        @"INSERT INTO Artwork (ArtworkKind, SongMetadataId, DateAdded, DateUpdated, Path)
-                            VALUES (@ArtworkKind, @Id, @DateAdded, @DateUpdated, @Path)",
+                        @"INSERT INTO Artwork (ArtworkKind, SongMetadataId, DateAdded, DateUpdated, Path, SourcePath, BlurHash43, BlurHash54, BlurHash64)
+                            VALUES (@ArtworkKind, @Id, @DateAdded, @DateUpdated, @Path, @SourcePath, @BlurHash43, @BlurHash54, @BlurHash64)",
                         parameters)
                     .ToUnit(),
                 _ => Task.FromResult(Unit.Default)
@@ -263,6 +301,52 @@ namespace ErsatzTV.Infrastructure.Data.Repositories
                 OR ShowMetadataId = @Id OR SeasonMetadataId = @Id OR EpisodeMetadataId = @Id)",
                 new { ArtworkKind = artworkKind, metadata.Id }).ToUnit();
 
+        public async Task<bool> CloneArtwork(
+            Metadata metadata,
+            Option<Artwork> maybeArtwork,
+            ArtworkKind artworkKind,
+            string sourcePath,
+            DateTime lastWriteTime)
+        {
+            await using TvContext dbContext = await _dbContextFactory.CreateDbContextAsync();
+            Option<Artwork> maybeExisting = await dbContext.Artwork
+                .AsNoTracking()
+                .Filter(
+                    a => a.SourcePath == sourcePath && a.ArtworkKind == artworkKind && a.DateUpdated == lastWriteTime)
+                .FirstOrDefaultAsync()
+                .Map(Optional);
+            foreach (Artwork existing in maybeExisting)
+            {
+                Artwork artwork = await maybeArtwork.IfNoneAsync(new Artwork());
+                if (maybeArtwork.IsNone)
+                {
+                    metadata.Artwork.Add(artwork);
+                }
+
+                artwork.Path = existing.Path;
+                artwork.SourcePath = existing.SourcePath;
+                artwork.ArtworkKind = artworkKind;
+                artwork.BlurHash43 = existing.BlurHash43;
+                artwork.BlurHash54 = existing.BlurHash54;
+                artwork.BlurHash64 = existing.BlurHash64;
+                artwork.DateAdded = existing.DateAdded;
+                artwork.DateUpdated = existing.DateUpdated;
+
+                if (maybeArtwork.IsNone)
+                {
+                    await AddArtwork(metadata, artwork);
+                }
+                else
+                {
+                    await UpdateArtworkPath(artwork);
+                }
+
+                return true;
+            }
+
+            return false;
+        }
+
         public Task<Unit> MarkAsUpdated(ShowMetadata metadata, DateTime dateUpdated) =>
             _dbConnection.ExecuteAsync(
                 @"UPDATE ShowMetadata SET DateUpdated = @DateUpdated WHERE Id = @Id",

ErsatzTV.Infrastructure/Data/Repositories/MusicVideoRepository.cs

@@ -30,9 +30,11 @@ namespace ErsatzTV.Infrastructure.Data.Repositories
             LibraryPath libraryPath,
             string path)
         {
-            await using TvContext dbContext = _dbContextFactory.CreateDbContext();
+            await using TvContext dbContext = await _dbContextFactory.CreateDbContextAsync();
             Option<MusicVideo> maybeExisting = await dbContext.MusicVideos
                 .AsNoTracking()
+                .Include(mv => mv.Artist)
+                .ThenInclude(a => a.ArtistMetadata)
                 .Include(mv => mv.MusicVideoMetadata)
                 .ThenInclude(mvm => mvm.Artwork)
                 .Include(mv => mv.MusicVideoMetadata)
@@ -196,6 +198,8 @@ namespace ErsatzTV.Infrastructure.Data.Repositories
 
                 await dbContext.MusicVideos.AddAsync(musicVideo);
                 await dbContext.SaveChangesAsync();
+                await dbContext.Entry(musicVideo).Reference(m => m.Artist).LoadAsync();
+                await dbContext.Entry(musicVideo.Artist).Collection(a => a.ArtistMetadata).LoadAsync();
                 await dbContext.Entry(musicVideo).Reference(m => m.LibraryPath).LoadAsync();
                 await dbContext.Entry(musicVideo.LibraryPath).Reference(lp => lp.Library).LoadAsync();
                 return new MediaItemScanResult<MusicVideo>(musicVideo) { IsAdded = true };

ErsatzTV.Infrastructure/Data/Repositories/SearchRepository.cs

@@ -83,6 +83,8 @@ namespace ErsatzTV.Infrastructure.Data.Repositories
                 .ThenInclude(mm => mm.Studios)
                 .Include(mi => (mi as Show).ShowMetadata)
                 .ThenInclude(mm => mm.Actors)
+                .Include(mi => (mi as MusicVideo).Artist)
+                .ThenInclude(mm => mm.ArtistMetadata)
                 .Include(mi => (mi as MusicVideo).MusicVideoMetadata)
                 .ThenInclude(mm => mm.Genres)
                 .Include(mi => (mi as MusicVideo).MusicVideoMetadata)
@@ -103,6 +105,8 @@ namespace ErsatzTV.Infrastructure.Data.Repositories
                 .ThenInclude(mm => mm.Streams)
                 .Include(mi => (mi as Song).SongMetadata)
                 .ThenInclude(mm => mm.Tags)
+                .Include(mi => (mi as Song).SongMetadata)
+                .ThenInclude(mm => mm.Genres)
                 .Include(mi => (mi as Song).MediaVersions)
                 .ThenInclude(mm => mm.Streams)
                 .Include(mi => mi.TraktListItems)

ErsatzTV.Infrastructure/Data/TvContext.cs

@@ -37,6 +37,7 @@ namespace ErsatzTV.Infrastructure.Data
         public DbSet<MediaStream> MediaStreams { get; set; }
         public DbSet<Movie> Movies { get; set; }
         public DbSet<MovieMetadata> MovieMetadata { get; set; }
+        public DbSet<Artwork> Artwork { get; set; }
         public DbSet<Artist> Artists { get; set; }
         public DbSet<ArtistMetadata> ArtistMetadata { get; set; }
         public DbSet<MusicVideo> MusicVideos { get; set; }

ErsatzTV.Infrastructure/ErsatzTV.Infrastructure.csproj

@@ -8,16 +8,17 @@
     </PropertyGroup>
 
     <ItemGroup>
+      <PackageReference Include="Blurhash.ImageSharp" Version="1.1.1" />
       <PackageReference Include="Dapper" Version="2.0.123" />
       <PackageReference Include="Lucene.Net" Version="4.8.0-beta00015" />
       <PackageReference Include="Lucene.Net.Analysis.Common" Version="4.8.0-beta00015" />
       <PackageReference Include="Lucene.Net.QueryParser" Version="4.8.0-beta00015" />
-      <PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.0" />
-      <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="6.0.0">
+      <PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.1" />
+      <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="6.0.1">
         <PrivateAssets>all</PrivateAssets>
         <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       </PackageReference>
-      <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="6.0.0" />
+      <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="6.0.1" />
       <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.0.64">
         <PrivateAssets>all</PrivateAssets>
         <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

ErsatzTV.Infrastructure/Health/Checks/FFmpegVersionHealthCheck.cs

@@ -11,7 +11,7 @@ namespace ErsatzTV.Infrastructure.Health.Checks
 {
     public class FFmpegVersionHealthCheck : BaseHealthCheck, IFFmpegVersionHealthCheck
     {
-        private const string BundledVersion = "N-104321-ga742ba60f1";
+        private const string BundledVersion = "N-105153-g8abc192236";
         private readonly IConfigElementRepository _configElementRepository;
 
         public FFmpegVersionHealthCheck(IConfigElementRepository configElementRepository)

ErsatzTV.Infrastructure/Health/Checks/HardwareAccelerationHealthCheck.cs

@@ -113,11 +113,7 @@ namespace ErsatzTV.Infrastructure.Health.Checks
                         result.Add(HardwareAccelerationKind.Nvenc);
                         break;
                     case "qsv":
-                        // qsv is only supported on windows
-                        if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
-                        {
-                            result.Add(HardwareAccelerationKind.Qsv);
-                        }
+                        result.Add(HardwareAccelerationKind.Qsv);
                         break;
                 }
             }

ErsatzTV.Infrastructure/Images/ImageCache.cs

@@ -5,6 +5,8 @@ using System.Text;
 using System.Threading.Tasks;
 using ErsatzTV.Core;
 using ErsatzTV.Core.Domain;
+using ErsatzTV.Core.FFmpeg;
+using ErsatzTV.Core.Interfaces.FFmpeg;
 using ErsatzTV.Core.Interfaces.Images;
 using ErsatzTV.Core.Interfaces.Metadata;
 using LanguageExt;
@@ -12,6 +14,7 @@ using Microsoft.Extensions.Caching.Memory;
 using Microsoft.Extensions.Logging;
 using SixLabors.ImageSharp;
 using SixLabors.ImageSharp.Formats.Jpeg;
+using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.ImageSharp.Processing;
 
 namespace ErsatzTV.Infrastructure.Images
@@ -22,13 +25,19 @@ namespace ErsatzTV.Infrastructure.Images
         private readonly ILocalFileSystem _localFileSystem;
         private readonly ILogger<ImageCache> _logger;
         private readonly IMemoryCache _memoryCache;
+        private readonly ITempFilePool _tempFilePool;
 
         static ImageCache() => Crypto = SHA1.Create();
 
-        public ImageCache(ILocalFileSystem localFileSystem, IMemoryCache memoryCache, ILogger<ImageCache> logger)
+        public ImageCache(
+            ILocalFileSystem localFileSystem,
+            IMemoryCache memoryCache,
+            ITempFilePool tempFilePool,
+            ILogger<ImageCache> logger)
         {
             _localFileSystem = localFileSystem;
             _memoryCache = memoryCache;
+            _tempFilePool = tempFilePool;
             _logger = logger;
         }
 
@@ -53,11 +62,17 @@ namespace ErsatzTV.Infrastructure.Images
             return outStream.ToArray();
         }
 
-        public async Task<Either<BaseError, string>> SaveArtworkToCache(byte[] imageBuffer, ArtworkKind artworkKind)
+        public async Task<Either<BaseError, string>> SaveArtworkToCache(Stream stream, ArtworkKind artworkKind)
         {
             try
             {
-                byte[] hash = Crypto.ComputeHash(imageBuffer);
+                string tempFileName = _tempFilePool.GetNextTempFile(TempFileCategory.CachedArtwork);
+                // ReSharper disable once UseAwaitUsing
+                using (var fs = new FileStream(tempFileName, FileMode.OpenOrCreate, FileAccess.Write))
+                {
+                    await stream.CopyToAsync(fs);
+                }
+                byte[] hash = await ComputeFileHash(tempFileName);
                 string hex = BitConverter.ToString(hash).Replace("-", string.Empty);
                 string subfolder = hex[..2];
                 string baseFolder = artworkKind switch
@@ -76,7 +91,8 @@ namespace ErsatzTV.Infrastructure.Images
                     Directory.CreateDirectory(baseFolder);
                 }
 
-                await File.WriteAllBytesAsync(target, imageBuffer);
+                await _localFileSystem.CopyFile(tempFileName, target);
+
                 return hex;
             }
             catch (Exception ex)
@@ -85,6 +101,18 @@ namespace ErsatzTV.Infrastructure.Images
             }
         }
 
+        private static async Task<byte[]> ComputeFileHash(string fileName)
+        {
+            using var md5 = MD5.Create();
+            // ReSharper disable once UseAwaitUsing
+            // ReSharper disable once ConvertToUsingDeclaration
+            using (var fs = new FileStream(fileName, FileMode.Open, FileAccess.Read))
+            {
+                fs.Position = 0;
+                return await md5.ComputeHashAsync(fs);
+            }
+        }
+
         public async Task<Either<BaseError, string>> CopyArtworkToCache(string path, ArtworkKind artworkKind)
         {
             try
@@ -154,5 +182,32 @@ namespace ErsatzTV.Infrastructure.Images
                 return false;
             }
         }
+
+        public async Task<string> CalculateBlurHash(string fileName, ArtworkKind artworkKind, int x, int y)
+        {
+            var encoder = new Blurhash.ImageSharp.Encoder();
+            string targetFile = GetPathForImage(fileName, artworkKind, Option<int>.None);
+            await using var fs = new FileStream(targetFile, FileMode.Open, FileAccess.Read);
+            using var image = await Image.LoadAsync<Rgb24>(fs);
+            return encoder.Encode(image, x, y);
+        }
+
+        public async Task<string> WriteBlurHash(string blurHash, IDisplaySize targetSize)
+        {
+            byte[] bytes = Encoding.UTF8.GetBytes(blurHash);
+            string base64 = Convert.ToBase64String(bytes).Replace("+", "_").Replace("/", "-").Replace("=", "");
+            string targetFile = GetPathForImage(base64, ArtworkKind.Poster, targetSize.Height);
+            if (!_localFileSystem.FileExists(targetFile))
+            {
+                string folder = Path.GetDirectoryName(targetFile);
+                _localFileSystem.EnsureFolderExists(folder);
+                
+                var decoder = new Blurhash.ImageSharp.Decoder();
+                using Image<Rgb24> image = decoder.Decode(blurHash, targetSize.Width, targetSize.Height);
+                await image.SaveAsPngAsync(targetFile);
+            }
+
+            return targetFile;
+        }
     }
 }

ErsatzTV.Infrastructure/Jellyfin/JellyfinApiClient.cs

@@ -383,11 +383,6 @@ namespace ErsatzTV.Infrastructure.Jellyfin
         {
             try
             {
-                if (item.LocationType != "FileSystem")
-                {
-                    return None;
-                }
-
                 ShowMetadata metadata = ProjectToShowMetadata(item);
 
                 var show = new JellyfinShow
@@ -481,11 +476,6 @@ namespace ErsatzTV.Infrastructure.Jellyfin
         {
             try
             {
-                if (item.LocationType != "FileSystem")
-                {
-                    return None;
-                }
-
                 DateTime dateAdded = item.DateCreated.UtcDateTime;
                 // DateTime lastWriteTime = DateTimeOffset.FromUnixTimeSeconds(response.UpdatedAt).DateTime;
 

ErsatzTV.Infrastructure/Migrations/20211127205227_Reset_SongMetadataGenres.cs

@@ -0,0 +1,33 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace ErsatzTV.Infrastructure.Migrations
+{
+    public partial class Reset_SongMetadataGenres : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.Sql(@"DELETE FROM Genre WHERE SongMetadataId IS NOT NULL");
+            
+            migrationBuilder.Sql(
+                @"UPDATE LibraryPath SET LastScan = '0001-01-01 00:00:00' WHERE Id IN
+                (SELECT LP.Id FROM LibraryPath LP INNER JOIN Library L on L.Id = LP.LibraryId WHERE MediaKind = 5)");
+
+            migrationBuilder.Sql(
+                @"UPDATE Library SET LastScan = '0001-01-01 00:00:00' WHERE MediaKind = 5");
+
+            migrationBuilder.Sql(
+                @"UPDATE SongMetadata SET DateUpdated = '0001-01-01 00:00:00'");
+            
+            migrationBuilder.Sql(
+                @"UPDATE LibraryFolder SET Etag = NULL WHERE Id IN
+                (SELECT LF.Id FROM LibraryFolder LF INNER JOIN LibraryPath LP on LF.LibraryPathId = LP.Id INNER JOIN Library L on LP.LibraryId = L.Id WHERE MediaKind = 5)");
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+
+        }
+    }
+}

ErsatzTV.Infrastructure/Migrations/20211128033237_Reset_SongMetadataOriginalTitle.cs

@@ -0,0 +1,31 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace ErsatzTV.Infrastructure.Migrations
+{
+    public partial class Reset_SongMetadataOriginalTitle : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.Sql(
+                @"UPDATE LibraryPath SET LastScan = '0001-01-01 00:00:00' WHERE Id IN
+                (SELECT LP.Id FROM LibraryPath LP INNER JOIN Library L on L.Id = LP.LibraryId WHERE MediaKind = 5)");
+
+            migrationBuilder.Sql(
+                @"UPDATE Library SET LastScan = '0001-01-01 00:00:00' WHERE MediaKind = 5");
+
+            migrationBuilder.Sql(
+                @"UPDATE SongMetadata SET DateUpdated = '0001-01-01 00:00:00'");
+            
+            migrationBuilder.Sql(
+                @"UPDATE LibraryFolder SET Etag = NULL WHERE Id IN
+                (SELECT LF.Id FROM LibraryFolder LF INNER JOIN LibraryPath LP on LF.LibraryPathId = LP.Id INNER JOIN Library L on LP.LibraryId = L.Id WHERE MediaKind = 5)");
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+
+        }
+    }
+}

ErsatzTV.Infrastructure/Migrations/20211201191945_Reset_SongMetadataOnWindows.cs

@@ -0,0 +1,34 @@
+using System.Runtime.InteropServices;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace ErsatzTV.Infrastructure.Migrations
+{
+    public partial class Reset_SongMetadataOnWindows : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
+            {
+                migrationBuilder.Sql(
+                    @"UPDATE LibraryPath SET LastScan = '0001-01-01 00:00:00' WHERE Id IN
+                (SELECT LP.Id FROM LibraryPath LP INNER JOIN Library L on L.Id = LP.LibraryId WHERE MediaKind = 5)");
+
+                migrationBuilder.Sql(
+                    @"UPDATE Library SET LastScan = '0001-01-01 00:00:00' WHERE MediaKind = 5");
+
+                migrationBuilder.Sql(
+                    @"UPDATE SongMetadata SET DateUpdated = '0001-01-01 00:00:00'");
+            
+                migrationBuilder.Sql(
+                    @"UPDATE LibraryFolder SET Etag = NULL WHERE Id IN
+                (SELECT LF.Id FROM LibraryFolder LF INNER JOIN LibraryPath LP on LF.LibraryPathId = LP.Id INNER JOIN Library L on LP.LibraryId = L.Id WHERE MediaKind = 5)");
+            }
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+        }
+    }
+}

ErsatzTV.Infrastructure/Migrations/20211203040447_Add_ArtworkBlurHash.cs

@@ -0,0 +1,25 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace ErsatzTV.Infrastructure.Migrations
+{
+    public partial class Add_ArtworkBlurHash : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<string>(
+                name: "BlurHash",
+                table: "Artwork",
+                type: "TEXT",
+                nullable: true);
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "BlurHash",
+                table: "Artwork");
+        }
+    }
+}

ErsatzTV.Infrastructure/Migrations/20211203174753_Add_MoreArtworkBlurHashes.cs

@@ -0,0 +1,45 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace ErsatzTV.Infrastructure.Migrations
+{
+    public partial class Add_MoreArtworkBlurHashes : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.RenameColumn(
+                name: "BlurHash",
+                table: "Artwork",
+                newName: "BlurHash64");
+
+            migrationBuilder.AddColumn<string>(
+                name: "BlurHash43",
+                table: "Artwork",
+                type: "TEXT",
+                nullable: true);
+
+            migrationBuilder.AddColumn<string>(
+                name: "BlurHash54",
+                table: "Artwork",
+                type: "TEXT",
+                nullable: true);
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "BlurHash43",
+                table: "Artwork");
+
+            migrationBuilder.DropColumn(
+                name: "BlurHash54",
+                table: "Artwork");
+
+            migrationBuilder.RenameColumn(
+                name: "BlurHash64",
+                table: "Artwork",
+                newName: "BlurHash");
+        }
+    }
+}

ErsatzTV.Infrastructure/Migrations/20211203182334_Reset_SongMetadataBlurHash.cs

@@ -0,0 +1,31 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace ErsatzTV.Infrastructure.Migrations
+{
+    public partial class Reset_SongMetadataBlurHash : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.Sql(
+                @"UPDATE LibraryPath SET LastScan = '0001-01-01 00:00:00' WHERE Id IN
+                (SELECT LP.Id FROM LibraryPath LP INNER JOIN Library L on L.Id = LP.LibraryId WHERE MediaKind = 5)");
+
+            migrationBuilder.Sql(
+                @"UPDATE Library SET LastScan = '0001-01-01 00:00:00' WHERE MediaKind = 5");
+
+            migrationBuilder.Sql(
+                @"UPDATE Artwork SET DateUpdated = '0001-01-01 00:00:00' WHERE SongMetadataId IS NOT NULL");
+            
+            migrationBuilder.Sql(
+                @"UPDATE LibraryFolder SET Etag = NULL WHERE Id IN
+                (SELECT LF.Id FROM LibraryFolder LF INNER JOIN LibraryPath LP on LF.LibraryPathId = LP.Id INNER JOIN Library L on LP.LibraryId = L.Id WHERE MediaKind = 5)");
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+
+        }
+    }
+}

ErsatzTV.Infrastructure/Migrations/20211203191336_Add_ArtworkSourcePath.cs

@@ -0,0 +1,25 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace ErsatzTV.Infrastructure.Migrations
+{
+    public partial class Add_ArtworkSourcePath : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<string>(
+                name: "SourcePath",
+                table: "Artwork",
+                type: "TEXT",
+                nullable: true);
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "SourcePath",
+                table: "Artwork");
+        }
+    }
+}

ErsatzTV.Infrastructure/Migrations/20211204191304_Reset_SongMetadataBlurHashProper.cs

@@ -0,0 +1,31 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace ErsatzTV.Infrastructure.Migrations
+{
+    public partial class Reset_SongMetadataBlurHashProper : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.Sql(
+                @"UPDATE LibraryPath SET LastScan = '0001-01-01 00:00:00' WHERE Id IN
+                (SELECT LP.Id FROM LibraryPath LP INNER JOIN Library L on L.Id = LP.LibraryId WHERE MediaKind = 5)");
+
+            migrationBuilder.Sql(
+                @"UPDATE Library SET LastScan = '0001-01-01 00:00:00' WHERE MediaKind = 5");
+
+            migrationBuilder.Sql(
+                @"UPDATE Artwork SET DateUpdated = '0001-01-01 00:00:00' WHERE SongMetadataId IS NOT NULL");
+            
+            migrationBuilder.Sql(
+                @"UPDATE LibraryFolder SET Etag = NULL WHERE Id IN
+                (SELECT LF.Id FROM LibraryFolder LF INNER JOIN LibraryPath LP on LF.LibraryPathId = LP.Id INNER JOIN Library L on LP.LibraryId = L.Id WHERE MediaKind = 5)");
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+
+        }
+    }
+}

ErsatzTV.Infrastructure/Migrations/20220105234915_Remove_HLSHybridStreamingMode.cs

@@ -0,0 +1,22 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace ErsatzTV.Infrastructure.Migrations
+{
+    public partial class Remove_HLSHybridStreamingMode : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            // replace HLS Hybrid with HLS Segmenter
+            migrationBuilder.Sql("UPDATE Channel SET StreamingMode = 4 WHERE StreamingMode = 3");
+
+            // replace MPEG-TS (Legacy) with new MPEG-TS
+            migrationBuilder.Sql("UPDATE Channel SET StreamingMode = 5 WHERE StreamingMode = 1");
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+        }
+    }
+}

ErsatzTV.Infrastructure/Migrations/TvContextModelSnapshot.cs

@@ -15,7 +15,7 @@ namespace ErsatzTV.Infrastructure.Migrations
         protected override void BuildModel(ModelBuilder modelBuilder)
         {
 #pragma warning disable 612, 618
-            modelBuilder.HasAnnotation("ProductVersion", "6.0.0");
+            modelBuilder.HasAnnotation("ProductVersion", "6.0.1");
 
             modelBuilder.Entity("ErsatzTV.Core.Domain.Actor", b =>
                 {
@@ -144,6 +144,15 @@ namespace ErsatzTV.Infrastructure.Migrations
                     b.Property<int>("ArtworkKind")
                         .HasColumnType("INTEGER");
 
+                    b.Property<string>("BlurHash43")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("BlurHash54")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("BlurHash64")
+                        .HasColumnType("TEXT");
+
                     b.Property<int?>("ChannelId")
                         .HasColumnType("INTEGER");
 
@@ -177,6 +186,9 @@ namespace ErsatzTV.Infrastructure.Migrations
                     b.Property<int?>("SongMetadataId")
                         .HasColumnType("INTEGER");
 
+                    b.Property<string>("SourcePath")
+                        .HasColumnType("TEXT");
+
                     b.HasKey("Id");
 
                     b.HasIndex("ArtistMetadataId");

ErsatzTV.Infrastructure/Search/SearchIndex.cs

@@ -79,7 +79,7 @@ namespace ErsatzTV.Infrastructure.Search
             _initialized = false;
         }
 
-        public int Version => 18;
+        public int Version => 19;
 
         public Task<bool> Initialize(ILocalFileSystem localFileSystem)
         {
@@ -675,6 +675,14 @@ namespace ErsatzTV.Infrastructure.Search
                     {
                         doc.Add(new TextField(StudioField, studio.Name, Field.Store.NO));
                     }
+                    
+                    if (musicVideo.Artist != null)
+                    {
+                        foreach (ArtistMetadata artistMetadata in musicVideo.Artist.ArtistMetadata)
+                        {
+                            doc.Add(new TextField(ArtistField, artistMetadata.Title, Field.Store.NO));
+                        }
+                    }
 
                     _writer.UpdateDocument(new Term(IdField, musicVideo.Id.ToString()), doc);
                 }
@@ -867,6 +875,11 @@ namespace ErsatzTV.Infrastructure.Search
                         doc.Add(new TextField(TagField, tag.Name, Field.Store.NO));
                     }
 
+                    foreach (Genre genre in metadata.Genres)
+                    {
+                        doc.Add(new TextField(GenreField, genre.Name, Field.Store.NO));
+                    }
+
                     _writer.UpdateDocument(new Term(IdField, song.Id.ToString()), doc);
                 }
                 catch (Exception ex)
@@ -903,6 +916,7 @@ namespace ErsatzTV.Infrastructure.Search
                     $"{em.Title}_{em.Year}_{em.Episode.Season.SeasonNumber}_{em.EpisodeNumber}"
                         .ToLowerInvariant(),
                 OtherVideoMetadata ovm => $"{ovm.OriginalTitle}".ToLowerInvariant(),
+                SongMetadata sm => $"{sm.OriginalTitle}".ToLowerInvariant(),
                 _ => $"{metadata.Title}_{metadata.Year}".ToLowerInvariant()
             };
         

ErsatzTV/Controllers/InternalController.cs

@@ -27,7 +27,7 @@ namespace ErsatzTV.Controllers
         public Task<IActionResult> GetConcatPlaylist(string channelNumber) =>
             _mediator.Send(new GetConcatPlaylistByChannelNumber(Request.Scheme, Request.Host.ToString(), channelNumber))
                 .ToActionResult();
-
+        
         [HttpGet("ffmpeg/stream/{channelNumber}")]
         public Task<IActionResult> GetStream(
             string channelNumber,

ErsatzTV/Controllers/IptvController.cs

@@ -52,14 +52,24 @@ namespace ErsatzTV.Controllers
                 .Map<ChannelGuide, IActionResult>(Ok);
 
         [HttpGet("iptv/channel/{channelNumber}.ts")]
-        public Task<IActionResult> GetTransportStreamVideo(string channelNumber) =>
-            _mediator.Send(new GetConcatProcessByChannelNumber(Request.Scheme, Request.Host.ToString(), channelNumber))
+        public async Task<IActionResult> GetTransportStreamVideo(
+            string channelNumber,
+            [FromQuery]
+            string mode = null)
+        {
+            FFmpegProcessRequest request = mode switch
+            {
+                "legacy" => new GetConcatProcessByChannelNumber(Request.Scheme, Request.Host.ToString(), channelNumber),
+                _ => new GetWrappedProcessByChannelNumber(Request.Scheme, Request.Host.ToString(), channelNumber)
+            };
+
+            return await _mediator.Send(request)
                 .Map(
                     result => result.Match<IActionResult>(
                         processModel =>
                         {
                             Process process = processModel.Process;
-                            
+
                             _logger.LogInformation("Starting ts stream for channel {ChannelNumber}", channelNumber);
                             // _logger.LogDebug(
                             //     "ffmpeg concat arguments {FFmpegArguments}",
@@ -68,6 +78,7 @@ namespace ErsatzTV.Controllers
                             return new FileStreamResult(process.StandardOutput.BaseStream, "video/mp2t");
                         },
                         error => BadRequest(error.Value)));
+        }
 
         [HttpGet("iptv/session/{channelNumber}/hls.m3u8")]
         public async Task<IActionResult> GetLivePlaylist(string channelNumber)

ErsatzTV/ErsatzTV.csproj

@@ -14,15 +14,15 @@
 
     <ItemGroup>
       <PackageReference Include="Blazored.LocalStorage" Version="4.1.5" />
-      <PackageReference Include="FluentValidation" Version="10.3.4" />
-      <PackageReference Include="FluentValidation.AspNetCore" Version="10.3.4" />
+      <PackageReference Include="FluentValidation" Version="10.3.6" />
+      <PackageReference Include="FluentValidation.AspNetCore" Version="10.3.6" />
       <PackageReference Include="HtmlSanitizer" Version="6.0.453" />
       <PackageReference Include="LanguageExt.Core" Version="4.0.3" />
       <PackageReference Include="Markdig" Version="0.26.0" />
-      <PackageReference Include="MediatR.Courier.DependencyInjection" Version="3.0.1" />
+      <PackageReference Include="MediatR.Courier.DependencyInjection" Version="4.0.0" />
       <PackageReference Include="MediatR.Extensions.Microsoft.DependencyInjection" Version="9.0.0" />
-      <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.0" />
-      <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="6.0.0">
+      <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.1" />
+      <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="6.0.1">
         <PrivateAssets>all</PrivateAssets>
         <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       </PackageReference>
@@ -30,14 +30,14 @@
         <PrivateAssets>all</PrivateAssets>
         <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       </PackageReference>
-      <PackageReference Include="MudBlazor" Version="6.0.2" />
-      <PackageReference Include="NaturalSort.Extension" Version="3.1.0" />
+      <PackageReference Include="MudBlazor" Version="6.0.4" />
+      <PackageReference Include="NaturalSort.Extension" Version="3.2.0" />
       <PackageReference Include="PPioli.FluentValidation.Blazor" Version="5.0.0" />
       <PackageReference Include="Refit.HttpClientFactory" Version="6.1.15" />
       <PackageReference Include="Serilog" Version="2.10.0" />
       <PackageReference Include="Serilog.AspNetCore" Version="4.1.0" />
       <PackageReference Include="Serilog.Settings.Configuration" Version="3.3.0" />
-      <PackageReference Include="Serilog.Sinks.SQLite" Version="5.0.0" />
+      <PackageReference Include="Serilog.Sinks.SQLite" Version="6.0.0" />
       <PackageReference Include="System.IO.FileSystem.Primitives" Version="4.3.0" />
       <PackageReference Include="System.Text.Encoding.Extensions" Version="4.3.0" />
       <PackageReference Include="System.Runtime.Handles" Version="4.3.0" />
@@ -51,10 +51,9 @@
 
     <ItemGroup>
       <EmbeddedResource Include="Resources\background.png" />
-      <EmbeddedResource Include="Resources\background_blank.png" />
-      <EmbeddedResource Include="Resources\background_e.png" />
-      <EmbeddedResource Include="Resources\background_t.png" />
-      <EmbeddedResource Include="Resources\background_v.png" />
+      <EmbeddedResource Include="Resources\song_background_1.png" />
+      <EmbeddedResource Include="Resources\song_background_2.png" />
+      <EmbeddedResource Include="Resources\song_background_3.png" />
       <EmbeddedResource Include="Resources\ErsatzTV.png" />
       <EmbeddedResource Include="Resources\Roboto-Regular.ttf" />
       <EmbeddedResource Include="Resources\OPTIKabel-Heavy.otf" />

ErsatzTV/Pages/ChannelEditor.razor

@@ -32,9 +32,9 @@
                     <MudTextField Label="Number" @bind-Value="_model.Number" For="@(() => _model.Number)" Immediate="true"/>
                     <MudTextField Class="mt-3" Label="Name" @bind-Value="_model.Name" For="@(() => _model.Name)"/>
                     <MudSelect Class="mt-3" Label="Streaming Mode" @bind-Value="_model.StreamingMode" For="@(() => _model.StreamingMode)">
-                        <MudSelectItem Value="@(StreamingMode.TransportStream)">MPEG-TS</MudSelectItem>
+                        <MudSelectItem Value="@(StreamingMode.TransportStreamHybrid)">MPEG-TS</MudSelectItem>
+                        <MudSelectItem Value="@(StreamingMode.TransportStream)">MPEG-TS (Legacy)</MudSelectItem>
                         <MudSelectItem Value="@(StreamingMode.HttpLiveStreamingDirect)">HLS Direct</MudSelectItem>
-                        <MudSelectItem Value="@(StreamingMode.HttpLiveStreamingHybrid)">HLS Hybrid</MudSelectItem>
                         <MudSelectItem Value="@(StreamingMode.HttpLiveStreamingSegmenter)">HLS Segmenter</MudSelectItem>
                     </MudSelect>
                     <MudSelect Class="mt-3" Label="FFmpeg Profile" @bind-Value="_model.FFmpegProfileId" For="@(() => _model.FFmpegProfileId)"
@@ -154,7 +154,7 @@
             _model.Number = (maxNumber + 1).ToString();
             _model.Name = "New Channel";
             _model.FFmpegProfileId = ffmpegSettings.DefaultFFmpegProfileId;
-            _model.StreamingMode = StreamingMode.TransportStream;
+            _model.StreamingMode = StreamingMode.TransportStreamHybrid;
         }
     }
 
@@ -199,9 +199,8 @@
     {
         try
         {
-            var buffer = new byte[e.File.Size];
-            await e.File.OpenReadStream(maxAllowedSize: 10 * 1024 * 1024).ReadAsync(buffer);
-            Either<BaseError, string> maybeCacheFileName = await _mediator.Send(new SaveArtworkToDisk(buffer, ArtworkKind.Logo));
+            Either<BaseError, string> maybeCacheFileName =
+                await _mediator.Send(new SaveArtworkToDisk(e.File.OpenReadStream(maxAllowedSize: 10 * 1024 * 1024), ArtworkKind.Logo));
             maybeCacheFileName.Match(
                 relativeFileName =>
                 {
@@ -210,12 +209,14 @@
                 },
                 error =>
                 {
+                    Console.WriteLine($"error saving {error}");
                     _snackbar.Add($"Unexpected error saving channel logo: {error.Value}", Severity.Error);
                     _logger.LogError("Unexpected error saving channel logo: {Error}", error.Value);
                 });
         }
-        catch (IOException)
+        catch (IOException ex)
         {
+            Console.WriteLine(ex);
             _snackbar.Add("Channel logo exceeds maximum allowed file size of 10 MB", Severity.Error);
             _logger.LogError("Channel logo exceeds maximum allowed file size of 10 MB");
         }

ErsatzTV/Pages/Channels.razor

@@ -140,9 +140,9 @@
 
     private static string GetStreamingMode(StreamingMode streamingMode) => streamingMode switch {
         StreamingMode.HttpLiveStreamingDirect => "HLS Direct",
-        StreamingMode.HttpLiveStreamingHybrid => "HLS Hybrid",
         StreamingMode.HttpLiveStreamingSegmenter => "HLS Segmenter",
-        _ => "MPEG-TS"
+        StreamingMode.TransportStreamHybrid => "MPEG-TS",
+        _ => "MPEG-TS (Legacy)"
         };
 
 }

ErsatzTV/Pages/FillerPresetEditor.razor

@@ -52,57 +52,75 @@
                     </MudSelect>
                     @if (_model.CollectionType == ProgramScheduleItemCollectionType.Collection)
                     {
-                        <MudAutocomplete Class="mt-3"
-                                         T="MediaCollectionViewModel"
-                                         Label="Collection"
-                                         @bind-value="_model.Collection"
-                                         SearchFunc="@SearchMediaCollections"
-                                         ToStringFunc="@(c => c?.Name)"/>
+                        <MudSelect Class="mt-3"
+                                   T="MediaCollectionViewModel"
+                                   Label="Collection"
+                                   @bind-value="_model.Collection">
+                            @foreach (MediaCollectionViewModel collection in _mediaCollections)
+                            {
+                                <MudSelectItem Value="@collection">@collection.Name</MudSelectItem>
+                            }
+                        </MudSelect>
                     }
                     @if (_model.CollectionType == ProgramScheduleItemCollectionType.MultiCollection)
                     {
-                        <MudAutocomplete Class="mt-3"
-                                         T="MultiCollectionViewModel"
-                                         Label="Multi Collection"
-                                         @bind-value="_model.MultiCollection"
-                                         SearchFunc="@SearchMultiCollections"
-                                         ToStringFunc="@(c => c?.Name)"/>
+                        <MudSelect Class="mt-3"
+                                   T="MultiCollectionViewModel"
+                                   Label="Multi Collection"
+                                   @bind-value="_model.MultiCollection">
+                            @foreach (MultiCollectionViewModel collection in _multiCollections)
+                            {
+                                <MudSelectItem Value="@collection">@collection.Name</MudSelectItem>
+                            }
+                        </MudSelect>
                     }
                     @if (_model.CollectionType == ProgramScheduleItemCollectionType.SmartCollection)
                     {
-                        <MudAutocomplete Class="mt-3"
-                                         T="SmartCollectionViewModel"
-                                         Label="Smart Collection"
-                                         @bind-value="_model.SmartCollection"
-                                         SearchFunc="@SearchSmartCollections"
-                                         ToStringFunc="@(c => c?.Name)"/>
+                        <MudSelect Class="mt-3"
+                                   T="SmartCollectionViewModel"
+                                   Label="Smart Collection"
+                                   @bind-value="_model.SmartCollection">
+                            @foreach (SmartCollectionViewModel collection in _smartCollections)
+                            {
+                                <MudSelectItem Value="@collection">@collection.Name</MudSelectItem>
+                            }
+                        </MudSelect>
                     }
                     @if (_model.CollectionType == ProgramScheduleItemCollectionType.TelevisionShow)
                     {
-                        <MudAutocomplete Class="mt-3"
-                                         T="NamedMediaItemViewModel"
-                                         Label="Television Show"
-                                         @bind-value="_model.MediaItem"
-                                         SearchFunc="@SearchTelevisionShows"
-                                         ToStringFunc="@(s => s?.Name)"/>
+                        <MudSelect Class="mt-3"
+                                   T="NamedMediaItemViewModel"
+                                   Label="Television Show"
+                                   @bind-value="_model.MediaItem">
+                            @foreach (NamedMediaItemViewModel show in _televisionShows)
+                            {
+                                <MudSelectItem Value="@show">@show.Name</MudSelectItem>
+                            }
+                        </MudSelect>
                     }
                     @if (_model.CollectionType == ProgramScheduleItemCollectionType.TelevisionSeason)
                     {
-                        <MudAutocomplete Class="mt-3"
-                                         T="NamedMediaItemViewModel"
-                                         Label="Television Season"
-                                         @bind-value="_model.MediaItem"
-                                         SearchFunc="@SearchTelevisionSeasons"
-                                         ToStringFunc="@(s => s?.Name)"/>
+                        <MudSelect Class="mt-3"
+                                   T="NamedMediaItemViewModel"
+                                   Label="Television Season"
+                                   @bind-value="_model.MediaItem">
+                            @foreach (NamedMediaItemViewModel season in _televisionSeasons)
+                            {
+                                <MudSelectItem Value="@season">@season.Name</MudSelectItem>
+                            }
+                        </MudSelect>
                     }
                     @if (_model.CollectionType == ProgramScheduleItemCollectionType.Artist)
                     {
-                        <MudAutocomplete Class="mt-3"
-                                         T="NamedMediaItemViewModel"
-                                         Label="Artist"
-                                         @bind-value="_model.MediaItem"
-                                         SearchFunc="@SearchArtists"
-                                         ToStringFunc="@(s => s?.Name)"/>
+                        <MudSelect Class="mt-3"
+                                   T="NamedMediaItemViewModel"
+                                   Label="Artist"
+                                   @bind-value="_model.MediaItem">
+                            @foreach (NamedMediaItemViewModel artist in _artists)
+                            {
+                                <MudSelectItem Value="@artist">@artist.Name</MudSelectItem>
+                            }
+                        </MudSelect>
                     }
                 </MudCardContent>
                 <MudCardActions>
@@ -206,22 +224,4 @@
                 () => _navigationManager.NavigateTo("/media/filler/presets"));
         }
     }
-
-    private Task<IEnumerable<MediaCollectionViewModel>> SearchMediaCollections(string value) =>
-        _mediaCollections.Filter(c => c.Name.Contains(value ?? string.Empty, StringComparison.OrdinalIgnoreCase)).AsTask();
-
-    private Task<IEnumerable<MultiCollectionViewModel>> SearchMultiCollections(string value) =>
-        _multiCollections.Filter(c => c.Name.Contains(value ?? string.Empty, StringComparison.OrdinalIgnoreCase)).AsTask();
-
-    private Task<IEnumerable<SmartCollectionViewModel>> SearchSmartCollections(string value) =>
-        _smartCollections.Filter(c => c.Name.Contains(value ?? string.Empty, StringComparison.OrdinalIgnoreCase)).AsTask();
-
-    private Task<IEnumerable<NamedMediaItemViewModel>> SearchTelevisionShows(string value) =>
-        _televisionShows.Filter(s => s.Name.Contains(value ?? string.Empty, StringComparison.OrdinalIgnoreCase)).AsTask();
-
-    private Task<IEnumerable<NamedMediaItemViewModel>> SearchTelevisionSeasons(string value) =>
-        _televisionSeasons.Filter(s => s.Name.Contains(value ?? string.Empty, StringComparison.OrdinalIgnoreCase)).AsTask();
-
-    private Task<IEnumerable<NamedMediaItemViewModel>> SearchArtists(string value) =>
-        _artists.Filter(s => s.Name.Contains(value ?? string.Empty, StringComparison.OrdinalIgnoreCase)).AsTask();
 }

ErsatzTV/Pages/MultiCollectionEditor.razor

@@ -17,23 +17,37 @@
             <MudCard>
                 <MudCardContent>
                     <MudTextField Class="mt-3" Label="Name" @bind-Value="_model.Name" For="@(() => _model.Name)"/>
-                    <MudAutocomplete @ref="_collectionAutocomplete"
-                                     Class="mt-4"
-                                     T="MediaCollectionViewModel"
-                                     Label="Collection"
-                                     @bind-value="_selectedCollection"
-                                     SearchFunc="@SearchCollections"
-                                     ToStringFunc="@(c => c?.Name)"/>
+                    <MudSelect @ref="_collectionSelect"
+                               Class="mt-4"
+                               T="MediaCollectionViewModel"
+                               Label="Collection"
+                               @bind-value="_selectedCollection"
+                               HelperText="Disabled collections are already present in this multi collection">
+                        @foreach (MediaCollectionViewModel collection in _collections)
+                        {
+                            <MudSelectItem Disabled="@(_model.Items.Any(i => i.Collection.Id == collection.Id))"
+                                           Value="@collection">
+                                @collection.Name
+                            </MudSelectItem>
+                        }
+                    </MudSelect>
                     <MudButton Variant="Variant.Filled" Color="Color.Secondary" OnClick="@(_ => AddCollection())" Class="mt-4 mr-auto">
                         Add Collection
                     </MudButton>
-                    <MudAutocomplete @ref="_smartCollectionAutocomplete"
-                                     Class="mt-4"
-                                     T="SmartCollectionViewModel"
-                                     Label="Smart Collection"
-                                     @bind-value="_selectedSmartCollection"
-                                     SearchFunc="@SearchSmartCollections"
-                                     ToStringFunc="@(c => c?.Name)"/>
+                    <MudSelect @ref="_smartCollectionSelect"
+                               Class="mt-4"
+                               T="SmartCollectionViewModel"
+                               Label="Smart Collection"
+                               @bind-value="_selectedSmartCollection"
+                               HelperText="Disabled collections are already present in this multi collection">
+                        @foreach (SmartCollectionViewModel collection in _smartCollections)
+                        {
+                            <MudSelectItem Disabled="@(_model.Items.Any(i => i.Collection.Id == collection.Id))"
+                                           Value="@collection">
+                                @collection.Name
+                            </MudSelectItem>
+                        }
+                    </MudSelect>
                     <MudButton Variant="Variant.Filled" Color="Color.Secondary" OnClick="@(_ => AddSmartCollection())" Class="mt-4 mr-auto">
                         Add Smart Collection
                     </MudButton>
@@ -100,8 +114,8 @@
     private List<SmartCollectionViewModel> _smartCollections;
     private MediaCollectionViewModel _selectedCollection;
     private SmartCollectionViewModel _selectedSmartCollection;
-    private MudAutocomplete<MediaCollectionViewModel> _collectionAutocomplete;
-    private MudAutocomplete<SmartCollectionViewModel> _smartCollectionAutocomplete;
+    private MudSelect<MediaCollectionViewModel> _collectionSelect;
+    private MudSelect<SmartCollectionViewModel> _smartCollectionSelect;
     
     protected override async Task OnParametersSetAsync()
     {
@@ -211,7 +225,7 @@
             });
 
             _selectedCollection = null;
-            _collectionAutocomplete.Reset();
+            _collectionSelect.Reset();
         }
     }
 
@@ -226,14 +240,7 @@
             });
 
             _selectedSmartCollection = null;
-            _smartCollectionAutocomplete.Reset();
+            _smartCollectionSelect.Reset();
         }
     }
-
-    private Task<IEnumerable<MediaCollectionViewModel>> SearchCollections(string value) =>
-        _collections.Filter(c => _model.Items.All(i => i.Collection != c) && c.Name.Contains(value ?? string.Empty, StringComparison.OrdinalIgnoreCase)).AsTask();
-
-    private Task<IEnumerable<SmartCollectionViewModel>> SearchSmartCollections(string value) =>
-        _smartCollections.Filter(c => _model.Items.OfType<MultiCollectionSmartItemEditViewModel>().All(i => i.SmartCollection != c) && c.Name.Contains(value ?? string.Empty, StringComparison.OrdinalIgnoreCase)).AsTask();
-
 }

ErsatzTV/Pages/PlayoutEditor.razor

@@ -16,8 +16,26 @@
             <FluentValidator/>
             <MudCard>
                 <MudCardContent>
-                    <MudAutocomplete T="ChannelViewModel" Label="Channel" @bind-value="_model.Channel" SearchFunc="@SearchChannels" ToStringFunc="@(c => c is null ? null : $"{c.Number} - {c.Name}")"/>
-                    <MudAutocomplete Class="mt-3" T="ProgramScheduleViewModel" Label="Schedule" @bind-value="_model.ProgramSchedule" SearchFunc="@SearchProgramSchedules" ToStringFunc="@(s => s?.Name)"/>
+                    <MudSelect T="ChannelViewModel"
+                               Label="Channel"
+                               @bind-value="_model.Channel"
+                               HelperText="Disabled channels already have a playout">
+                        @foreach (ChannelViewModel channel in _channels)
+                        {
+                            <MudSelectItem Disabled="@(channel.PlayoutCount > 0)" Value="@channel">
+                                @($"{channel.Number} - {channel.Name}")
+                            </MudSelectItem>
+                        }
+                    </MudSelect>
+                    <MudSelect Class="mt-3"
+                                     T="ProgramScheduleViewModel"
+                                     Label="Schedule"
+                                     @bind-value="_model.ProgramSchedule">
+                         @foreach (ProgramScheduleViewModel schedule in _programSchedules)
+                         {
+                             <MudSelectItem Value="@schedule">@schedule.Name</MudSelectItem>
+                         }
+                    </MudSelect>
                 </MudCardContent>
                 <MudCardActions>
                     <MudButton ButtonType="ButtonType.Submit" Variant="Variant.Filled" Color="Color.Primary">
@@ -52,13 +70,6 @@
         _messageStore = new ValidationMessageStore(_editContext);
     }
 
-    private Task<IEnumerable<ChannelViewModel>> SearchChannels(string value) =>
-        _channels.Filter(c => $"{c.Number} - {c.Name}".Contains(value ?? string.Empty, StringComparison.OrdinalIgnoreCase)).AsTask();
-
-    private Task<IEnumerable<ProgramScheduleViewModel>> SearchProgramSchedules(string value) =>
-        _programSchedules.Filter(c => c.Name.Contains(value ?? string.Empty, StringComparison.OrdinalIgnoreCase)).AsTask();
-
-
     private async Task HandleSubmitAsync()
     {
         _messageStore.Clear();

ErsatzTV/Pages/ScheduleItemsEditor.razor

@@ -105,57 +105,75 @@
                             </MudSelect>
                             @if (_selectedItem.CollectionType == ProgramScheduleItemCollectionType.Collection)
                             {
-                                <MudAutocomplete Class="mt-3"
-                                                 T="MediaCollectionViewModel"
-                                                 Label="Collection"
-                                                 @bind-value="_selectedItem.Collection"
-                                                 SearchFunc="@SearchMediaCollections"
-                                                 ToStringFunc="@(c => c?.Name)"/>
+                                <MudSelect Class="mt-3"
+                                           T="MediaCollectionViewModel"
+                                           Label="Collection"
+                                           @bind-value="_selectedItem.Collection">
+                                    @foreach (MediaCollectionViewModel collection in _mediaCollections)
+                                    {
+                                        <MudSelectItem Value="@collection">@collection.Name</MudSelectItem>
+                                    }
+                                </MudSelect>
                             }
                             @if (_selectedItem.CollectionType == ProgramScheduleItemCollectionType.MultiCollection)
                             {
-                                <MudAutocomplete Class="mt-3"
-                                                 T="MultiCollectionViewModel"
-                                                 Label="Multi Collection"
-                                                 @bind-value="_selectedItem.MultiCollection"
-                                                 SearchFunc="@SearchMultiCollections"
-                                                 ToStringFunc="@(c => c?.Name)"/>
+                                <MudSelect Class="mt-3"
+                                           T="MultiCollectionViewModel"
+                                           Label="Multi Collection"
+                                           @bind-value="_selectedItem.MultiCollection">
+                                    @foreach (MultiCollectionViewModel collection in _multiCollections)
+                                    {
+                                        <MudSelectItem Value="@collection">@collection.Name</MudSelectItem>
+                                    }
+                                </MudSelect>
                             }
                             @if (_selectedItem.CollectionType == ProgramScheduleItemCollectionType.SmartCollection)
                             {
-                                <MudAutocomplete Class="mt-3"
-                                                 T="SmartCollectionViewModel"
-                                                 Label="Smart Collection"
-                                                 @bind-value="_selectedItem.SmartCollection"
-                                                 SearchFunc="@SearchSmartCollections"
-                                                 ToStringFunc="@(c => c?.Name)"/>
+                                <MudSelect Class="mt-3"
+                                           T="SmartCollectionViewModel"
+                                           Label="Smart Collection"
+                                           @bind-value="_selectedItem.SmartCollection">
+                                    @foreach (SmartCollectionViewModel collection in _smartCollections)
+                                    {
+                                        <MudSelectItem Value="@collection">@collection.Name</MudSelectItem>
+                                    }
+                                </MudSelect>
                             }
                             @if (_selectedItem.CollectionType == ProgramScheduleItemCollectionType.TelevisionShow)
                             {
-                                <MudAutocomplete Class="mt-3"
-                                                 T="NamedMediaItemViewModel"
-                                                 Label="Television Show"
-                                                 @bind-value="_selectedItem.MediaItem"
-                                                 SearchFunc="@SearchTelevisionShows"
-                                                 ToStringFunc="@(s => s?.Name)"/>
+                                <MudSelect Class="mt-3"
+                                           T="NamedMediaItemViewModel"
+                                           Label="Television Show"
+                                           @bind-value="_selectedItem.MediaItem">
+                                    @foreach (NamedMediaItemViewModel show in _televisionShows)
+                                    {
+                                        <MudSelectItem Value="@show">@show.Name</MudSelectItem>
+                                    }
+                                </MudSelect>
                             }
                             @if (_selectedItem.CollectionType == ProgramScheduleItemCollectionType.TelevisionSeason)
                             {
-                                <MudAutocomplete Class="mt-3"
-                                                 T="NamedMediaItemViewModel"
-                                                 Label="Television Season"
-                                                 @bind-value="_selectedItem.MediaItem"
-                                                 SearchFunc="@SearchTelevisionSeasons"
-                                                 ToStringFunc="@(s => s?.Name)"/>
+                                <MudSelect Class="mt-3"
+                                           T="NamedMediaItemViewModel"
+                                           Label="Television Season"
+                                           @bind-value="_selectedItem.MediaItem">
+                                    @foreach (NamedMediaItemViewModel season in _televisionSeasons)
+                                    {
+                                        <MudSelectItem Value="@season">@season.Name</MudSelectItem>
+                                    }
+                                </MudSelect>
                             }
                             @if (_selectedItem.CollectionType == ProgramScheduleItemCollectionType.Artist)
                             {
-                                <MudAutocomplete Class="mt-3"
-                                                 T="NamedMediaItemViewModel"
-                                                 Label="Artist"
-                                                 @bind-value="_selectedItem.MediaItem"
-                                                 SearchFunc="@SearchArtists"
-                                                 ToStringFunc="@(s => s?.Name)"/>
+                                <MudSelect Class="mt-3"
+                                           T="NamedMediaItemViewModel"
+                                           Label="Artist"
+                                           @bind-value="_selectedItem.MediaItem">
+                                    @foreach (NamedMediaItemViewModel artist in _artists)
+                                    {
+                                        <MudSelectItem Value="@artist">@artist.Name</MudSelectItem>
+                                    }
+                                </MudSelect>
                             }
                             <MudSelect Class="mt-3" Label="Playback Order" @bind-Value="@_selectedItem.PlaybackOrder" For="@(() => _selectedItem.PlaybackOrder)">
                                 @switch (_selectedItem.CollectionType)
@@ -202,47 +220,57 @@
                 <div style="flex-grow: 1; max-width: 400px;">
                     <MudCard>
                         <MudCardContent>
-                            <MudAutocomplete Class="mt-3"
-                                             T="FillerPresetViewModel"
-                                             Label="Pre-Roll Filler"
-                                             @bind-value="_selectedItem.PreRollFiller"
-                                             SearchFunc="@(arg => SearchFillerPresets(FillerKind.PreRoll, arg))"
-                                             ToStringFunc="@(c => c?.Name)"
-                                             ResetValueOnEmptyText="true"
-                                             Clearable="true"/>
-                            <MudAutocomplete Class="mt-3"
-                                             T="FillerPresetViewModel"
-                                             Label="Mid-Roll Filler"
-                                             @bind-value="_selectedItem.MidRollFiller"
-                                             SearchFunc="@(arg => SearchFillerPresets(FillerKind.MidRoll, arg))"
-                                             ToStringFunc="@(c => c?.Name)"
-                                             ResetValueOnEmptyText="true"
-                                             Clearable="true"/>
-                            <MudAutocomplete Class="mt-3"
-                                             T="FillerPresetViewModel"
-                                             Label="Post-Roll Filler"
-                                             @bind-value="_selectedItem.PostRollFiller"
-                                             SearchFunc="@(arg => SearchFillerPresets(FillerKind.PostRoll, arg))"
-                                             ToStringFunc="@(c => c?.Name)"
-                                             ResetValueOnEmptyText="true"
-                                             Clearable="true"/>
-                            <MudAutocomplete Class="mt-3"
-                                             T="FillerPresetViewModel"
-                                             Label="Tail Filler"
-                                             @bind-value="_selectedItem.TailFiller"
-                                             SearchFunc="@(arg => SearchFillerPresets(FillerKind.Tail, arg))"
-                                             ToStringFunc="@(c => c?.Name)"
-                                             ResetValueOnEmptyText="true"
-                                             Clearable="true"/>
-                            <MudAutocomplete Class="mt-3"
-                                             T="FillerPresetViewModel"
-                                             Label="Fallback Filler"
-                                             @bind-value="_selectedItem.FallbackFiller"
-                                             SearchFunc="@(arg => SearchFillerPresets(FillerKind.Fallback, arg))"
-                                             ToStringFunc="@(c => c?.Name)"
-                                             ResetValueOnEmptyText="true"
-                                             Clearable="true"/>
-                            </MudCardContent>
+                            <MudSelect Class="mt-3"
+                                       T="FillerPresetViewModel"
+                                       Label="Pre-Roll Filler"
+                                       @bind-value="_selectedItem.PreRollFiller"
+                                       Clearable="true">
+                                @foreach (FillerPresetViewModel filler in _fillerPresets.Where(f => f.FillerKind == FillerKind.PreRoll))
+                                {
+                                    <MudSelectItem Value="@filler">@filler.Name</MudSelectItem>
+                                }
+                            </MudSelect>
+                            <MudSelect Class="mt-3"
+                                       T="FillerPresetViewModel"
+                                       Label="Mid-Roll Filler"
+                                       @bind-value="_selectedItem.MidRollFiller"
+                                       Clearable="true">
+                                @foreach (FillerPresetViewModel filler in _fillerPresets.Where(f => f.FillerKind == FillerKind.MidRoll))
+                                {
+                                    <MudSelectItem Value="@filler">@filler.Name</MudSelectItem>
+                                }
+                            </MudSelect>
+                            <MudSelect Class="mt-3"
+                                       T="FillerPresetViewModel"
+                                       Label="Post-Roll Filler"
+                                       @bind-value="_selectedItem.PostRollFiller"
+                                       Clearable="true">
+                                @foreach (FillerPresetViewModel filler in _fillerPresets.Where(f => f.FillerKind == FillerKind.PostRoll))
+                                {
+                                    <MudSelectItem Value="@filler">@filler.Name</MudSelectItem>
+                                }
+                            </MudSelect>
+                            <MudSelect Class="mt-3"
+                                       T="FillerPresetViewModel"
+                                       Label="Tail Filler"
+                                       @bind-value="_selectedItem.TailFiller"
+                                       Clearable="true">
+                                @foreach (FillerPresetViewModel filler in _fillerPresets.Where(f => f.FillerKind == FillerKind.Tail))
+                                {
+                                    <MudSelectItem Value="@filler">@filler.Name</MudSelectItem>
+                                }
+                            </MudSelect>
+                            <MudSelect Class="mt-3"
+                                       T="FillerPresetViewModel"
+                                       Label="Fallback Filler"
+                                       @bind-value="_selectedItem.FallbackFiller"
+                                       Clearable="true">
+                                @foreach (FillerPresetViewModel filler in _fillerPresets.Where(f => f.FillerKind == FillerKind.Fallback))
+                                {
+                                    <MudSelectItem Value="@filler">@filler.Name</MudSelectItem>
+                                }
+                            </MudSelect>
+                        </MudCardContent>
                     </MudCard>
                 </div>
             </div>
@@ -379,24 +407,6 @@
         (toSwap.Index, item.Index) = (item.Index, toSwap.Index);
     }
 
-    private Task<IEnumerable<MediaCollectionViewModel>> SearchMediaCollections(string value) =>
-        _mediaCollections.Filter(c => c.Name.Contains(value ?? string.Empty, StringComparison.OrdinalIgnoreCase)).AsTask();
-
-    private Task<IEnumerable<MultiCollectionViewModel>> SearchMultiCollections(string value) =>
-        _multiCollections.Filter(c => c.Name.Contains(value ?? string.Empty, StringComparison.OrdinalIgnoreCase)).AsTask();
-
-    private Task<IEnumerable<SmartCollectionViewModel>> SearchSmartCollections(string value) =>
-        _smartCollections.Filter(c => c.Name.Contains(value ?? string.Empty, StringComparison.OrdinalIgnoreCase)).AsTask();
-
-    private Task<IEnumerable<NamedMediaItemViewModel>> SearchTelevisionShows(string value) =>
-        _televisionShows.Filter(s => s.Name.Contains(value ?? string.Empty, StringComparison.OrdinalIgnoreCase)).AsTask();
-
-    private Task<IEnumerable<NamedMediaItemViewModel>> SearchTelevisionSeasons(string value) =>
-        _televisionSeasons.Filter(s => s.Name.Contains(value ?? string.Empty, StringComparison.OrdinalIgnoreCase)).AsTask();
-
-    private Task<IEnumerable<NamedMediaItemViewModel>> SearchArtists(string value) =>
-        _artists.Filter(s => s.Name.Contains(value ?? string.Empty, StringComparison.OrdinalIgnoreCase)).AsTask();
-
     private Task<IEnumerable<FillerPresetViewModel>> SearchFillerPresets(FillerKind fillerKind, string value) =>
         _fillerPresets.Filter(p => p.FillerKind == fillerKind && p.Name.Contains(value ?? string.Empty, StringComparison.OrdinalIgnoreCase)).AsTask();
 

ErsatzTV/Pages/SongList.razor

@@ -1,5 +1,5 @@
-@page "/music/songs"
-@page "/music/songs/page/{PageNumber:int}"
+@page "/media/music/songs"
+@page "/media/music/songs/page/{PageNumber:int}"
 @using LanguageExt.UnsafeValueAccess
 @using ErsatzTV.Application.MediaCards
 @using ErsatzTV.Application.MediaCollections
@@ -69,7 +69,7 @@
 @if (_data.PageMap.IsSome)
 {
     <LetterBar PageMap="@_data.PageMap.ValueUnsafe()"
-               BaseUri="/music/songs"
+               BaseUri="/media/music/songs"
                Query="@_query"/>
 }
 
@@ -101,7 +101,7 @@
 
     private void PrevPage()
     {
-        var uri = $"/music/songs/page/{PageNumber - 1}";
+        var uri = $"/media/music/songs/page/{PageNumber - 1}";
         if (!string.IsNullOrWhiteSpace(_query))
         {
             (string key, string value) = _query.EncodeQuery();
@@ -112,7 +112,7 @@
 
     private void NextPage()
     {
-        var uri = $"/music/songs/page/{PageNumber + 1}";
+        var uri = $"/media/music/songs/page/{PageNumber + 1}";
         if (!string.IsNullOrWhiteSpace(_query))
         {
             (string key, string value) = _query.EncodeQuery();