adjust block unique constraint (#1634)

* upgrade dependencies

* allow blocks with same name in different groups

* code cleanup

.config/dotnet-tools.json

@@ -3,7 +3,7 @@
   "isRoot": true,
   "tools": {
     "jetbrains.resharper.globaltools": {
-      "version": "2023.2.0",
+      "version": "2023.3.3",
       "commands": [
         "jb"
       ]

ErsatzTV.Application/Channels/Commands/CreateChannel.cs

@@ -3,8 +3,7 @@ using ErsatzTV.Core.Domain;
 
 namespace ErsatzTV.Application.Channels;
 
-public record CreateChannel
+public record CreateChannel(
-(
     string Name,
     string Number,
     string Group,

ErsatzTV.Application/Channels/Commands/RefreshChannelDataHandler.cs

@@ -22,9 +22,9 @@ namespace ErsatzTV.Application.Channels;
 
 public class RefreshChannelDataHandler : IRequestHandler<RefreshChannelData>
 {
+    private readonly IConfigElementRepository _configElementRepository;
     private readonly IDbContextFactory<TvContext> _dbContextFactory;
     private readonly ILocalFileSystem _localFileSystem;
-    private readonly IConfigElementRepository _configElementRepository;
     private readonly ILogger<RefreshChannelDataHandler> _logger;
     private readonly RecyclableMemoryStreamManager _recyclableMemoryStreamManager;
 
@@ -367,7 +367,7 @@ public class RefreshChannelDataHandler : IRequestHandler<RefreshChannelData>
                     item,
                     start,
                     stop,
-                    hasCustomTitle: false,
+                    false,
                     templateContext,
                     movieTemplate,
                     episodeTemplate,
@@ -491,9 +491,9 @@ public class RefreshChannelDataHandler : IRequestHandler<RefreshChannelData>
             {
                 ProgrammeStart = start,
                 ProgrammeStop = stop,
-                ChannelNumber = request.ChannelNumber,
+                request.ChannelNumber,
                 HasCustomTitle = hasCustomTitle,
-                CustomTitle = displayItem.CustomTitle,
+                displayItem.CustomTitle,
                 MovieTitle = title,
                 MovieHasPlot = !string.IsNullOrWhiteSpace(metadata.Plot),
                 MoviePlot = metadata.Plot,
@@ -546,9 +546,9 @@ public class RefreshChannelDataHandler : IRequestHandler<RefreshChannelData>
                 {
                     ProgrammeStart = start,
                     ProgrammeStop = stop,
-                    ChannelNumber = request.ChannelNumber,
+                    request.ChannelNumber,
                     HasCustomTitle = hasCustomTitle,
-                    CustomTitle = displayItem.CustomTitle,
+                    displayItem.CustomTitle,
                     ShowTitle = title,
                     EpisodeHasTitle = !string.IsNullOrWhiteSpace(subtitle),
                     EpisodeTitle = subtitle,
@@ -560,7 +560,7 @@ public class RefreshChannelDataHandler : IRequestHandler<RefreshChannelData>
                     EpisodeHasArtwork = !string.IsNullOrWhiteSpace(artworkPath),
                     EpisodeArtworkUrl = artworkPath,
                     SeasonNumber = templateEpisode.Season?.SeasonNumber ?? 0,
-                    EpisodeNumber = metadata.EpisodeNumber,
+                    metadata.EpisodeNumber,
                     ShowHasContentRating = !string.IsNullOrWhiteSpace(showMetadata.ContentRating),
                     ShowContentRating = showMetadata.ContentRating,
                     ShowGuids = showMetadata.Guids.Map(g => g.Guid),
@@ -606,9 +606,9 @@ public class RefreshChannelDataHandler : IRequestHandler<RefreshChannelData>
             {
                 ProgrammeStart = start,
                 ProgrammeStop = stop,
-                ChannelNumber = request.ChannelNumber,
+                request.ChannelNumber,
                 HasCustomTitle = hasCustomTitle,
-                CustomTitle = displayItem.CustomTitle,
+                displayItem.CustomTitle,
                 ArtistTitle = title,
                 MusicVideoTitle = subtitle,
                 MusicVideoHasPlot = !string.IsNullOrWhiteSpace(metadata.Plot),
@@ -663,9 +663,9 @@ public class RefreshChannelDataHandler : IRequestHandler<RefreshChannelData>
             {
                 ProgrammeStart = start,
                 ProgrammeStop = stop,
-                ChannelNumber = request.ChannelNumber,
+                request.ChannelNumber,
                 HasCustomTitle = hasCustomTitle,
-                CustomTitle = displayItem.CustomTitle,
+                displayItem.CustomTitle,
                 SongTitle = subtitle,
                 SongArtists = metadata.Artists,
                 SongAlbumArtists = metadata.AlbumArtists,
@@ -682,7 +682,7 @@ public class RefreshChannelDataHandler : IRequestHandler<RefreshChannelData>
                 SongAlbum = metadata.Album,
                 SongHasReleaseDate = metadata.ReleaseDate.HasValue,
                 SongReleaseDate = metadata.ReleaseDate,
-                SongStudios = metadata.Studios.Map(s => s.Name),
+                SongStudios = metadata.Studios.Map(s => s.Name)
             };
 
             var scriptObject = new ScriptObject();
@@ -715,9 +715,9 @@ public class RefreshChannelDataHandler : IRequestHandler<RefreshChannelData>
             {
                 ProgrammeStart = start,
                 ProgrammeStop = stop,
-                ChannelNumber = request.ChannelNumber,
+                request.ChannelNumber,
                 HasCustomTitle = hasCustomTitle,
-                CustomTitle = displayItem.CustomTitle,
+                displayItem.CustomTitle,
                 OtherVideoTitle = title,
                 OtherVideoHasPlot = !string.IsNullOrWhiteSpace(metadata.Plot),
                 OtherVideoPlot = metadata.Plot,
@@ -863,10 +863,12 @@ public class RefreshChannelDataHandler : IRequestHandler<RefreshChannelData>
             _ => 440
         };
 
-        if (artworkPath.StartsWith("http://", StringComparison.OrdinalIgnoreCase) || artworkPath.StartsWith("https://", StringComparison.OrdinalIgnoreCase))
+        if (artworkPath.StartsWith("http://", StringComparison.OrdinalIgnoreCase) ||
+            artworkPath.StartsWith("https://", StringComparison.OrdinalIgnoreCase))
         {
             return artworkPath;
         }
+
         if (artworkPath.StartsWith("jellyfin://", StringComparison.OrdinalIgnoreCase))
         {
             artworkPath = JellyfinUrl.PlaceholderProxyForArtwork(artworkPath, artworkKind, height);
@@ -1077,12 +1079,13 @@ public class RefreshChannelDataHandler : IRequestHandler<RefreshChannelData>
         var artwork = new List<Artwork>();
         if (!string.IsNullOrWhiteSpace(program.Icon))
         {
-            artwork.Add(new Artwork
+            artwork.Add(
-            {
+                new Artwork
-                ArtworkKind = ArtworkKind.Thumbnail,
+                {
-                Path = program.Icon,
+                    ArtworkKind = ArtworkKind.Thumbnail,
-                SourcePath = program.Icon
+                    Path = program.Icon,
-            });
+                    SourcePath = program.Icon
+                });
         }
 
         return new Episode
@@ -1100,7 +1103,7 @@ public class RefreshChannelDataHandler : IRequestHandler<RefreshChannelData>
                 {
                     EpisodeNumber = program.Episode,
                     Title = program.Title
-                },
+                }
             ],
             Season = new Season
             {
@@ -1125,12 +1128,13 @@ public class RefreshChannelDataHandler : IRequestHandler<RefreshChannelData>
         var artwork = new List<Artwork>();
         if (!string.IsNullOrWhiteSpace(program.Icon))
         {
-            artwork.Add(new Artwork
+            artwork.Add(
-            {
+                new Artwork
-                ArtworkKind = ArtworkKind.Poster,
+                {
-                Path = program.Icon,
+                    ArtworkKind = ArtworkKind.Poster,
-                SourcePath = program.Icon
+                    Path = program.Icon,
-            });
+                    SourcePath = program.Icon
+                });
         }
 
         return new Movie

ErsatzTV.Application/Channels/Commands/UpdateChannel.cs

@@ -3,8 +3,7 @@ using ErsatzTV.Core.Domain;
 
 namespace ErsatzTV.Application.Channels;
 
-public record UpdateChannel
+public record UpdateChannel(
-(
     int ChannelId,
     string Name,
     string Number,

ErsatzTV.Application/Channels/Queries/GetChannelGuide.cs

@@ -3,5 +3,5 @@ using ErsatzTV.Core.Iptv;
 
 namespace ErsatzTV.Application.Channels;
 
-public record GetChannelGuide
+public record GetChannelGuide(string Scheme, string Host, string BaseUrl, string AccessToken)
-    (string Scheme, string Host, string BaseUrl, string AccessToken) : IRequest<Either<BaseError, ChannelGuide>>;
+    : IRequest<Either<BaseError, ChannelGuide>>;

ErsatzTV.Application/Configuration/Commands/UpdateGeneralSettingsHandler.cs

@@ -26,16 +26,24 @@ public class UpdateGeneralSettingsHandler : IRequestHandler<UpdateGeneralSetting
         await _configElementRepository.Upsert(ConfigElementKey.MinimumLogLevel, generalSettings.DefaultMinimumLogLevel);
         _loggingLevelSwitches.DefaultLevelSwitch.MinimumLevel = generalSettings.DefaultMinimumLogLevel;
 
-        await _configElementRepository.Upsert(ConfigElementKey.MinimumLogLevelScanning, generalSettings.ScanningMinimumLogLevel);
+        await _configElementRepository.Upsert(
+            ConfigElementKey.MinimumLogLevelScanning,
+            generalSettings.ScanningMinimumLogLevel);
         _loggingLevelSwitches.ScanningLevelSwitch.MinimumLevel = generalSettings.ScanningMinimumLogLevel;
 
-        await _configElementRepository.Upsert(ConfigElementKey.MinimumLogLevelScheduling, generalSettings.SchedulingMinimumLogLevel);
+        await _configElementRepository.Upsert(
+            ConfigElementKey.MinimumLogLevelScheduling,
+            generalSettings.SchedulingMinimumLogLevel);
         _loggingLevelSwitches.SchedulingLevelSwitch.MinimumLevel = generalSettings.SchedulingMinimumLogLevel;
 
-        await _configElementRepository.Upsert(ConfigElementKey.MinimumLogLevelStreaming, generalSettings.StreamingMinimumLogLevel);
+        await _configElementRepository.Upsert(
+            ConfigElementKey.MinimumLogLevelStreaming,
+            generalSettings.StreamingMinimumLogLevel);
         _loggingLevelSwitches.StreamingLevelSwitch.MinimumLevel = generalSettings.StreamingMinimumLogLevel;
 
-        await _configElementRepository.Upsert(ConfigElementKey.MinimumLogLevelHttp, generalSettings.HttpMinimumLogLevel);
+        await _configElementRepository.Upsert(
+            ConfigElementKey.MinimumLogLevelHttp,
+            generalSettings.HttpMinimumLogLevel);
         _loggingLevelSwitches.HttpLevelSwitch.MinimumLevel = generalSettings.HttpMinimumLogLevel;
 
         return Unit.Default;

ErsatzTV.Application/Emby/Commands/UpdateEmbyLibraryPreferences.cs

@@ -2,7 +2,6 @@
 
 namespace ErsatzTV.Application.Emby;
 
-public record UpdateEmbyLibraryPreferences
+public record UpdateEmbyLibraryPreferences(List<EmbyLibraryPreference> Preferences) : IRequest<Either<BaseError, Unit>>;
-    (List<EmbyLibraryPreference> Preferences) : IRequest<Either<BaseError, Unit>>;
 
 public record EmbyLibraryPreference(int Id, bool ShouldSyncItems);

ErsatzTV.Application/Emby/Commands/UpdateEmbyLibraryPreferencesHandler.cs

@@ -6,7 +6,7 @@ namespace ErsatzTV.Application.Emby;
 
 public class
     UpdateEmbyLibraryPreferencesHandler : IRequestHandler<UpdateEmbyLibraryPreferences,
-        Either<BaseError, Unit>>
+    Either<BaseError, Unit>>
 {
     private readonly IMediaSourceRepository _mediaSourceRepository;
     private readonly ISearchIndex _searchIndex;

ErsatzTV.Application/Emby/EmbyLibraryViewModel.cs

@@ -4,9 +4,9 @@ using ErsatzTV.Core.Domain;
 namespace ErsatzTV.Application.Emby;
 
 public record EmbyLibraryViewModel(
-        int Id,
+    int Id,
-        string Name,
+    string Name,
-        LibraryMediaKind MediaKind,
+    LibraryMediaKind MediaKind,
-        bool ShouldSyncItems,
+    bool ShouldSyncItems,
-        int MediaSourceId)
+    int MediaSourceId)
     : LibraryViewModel("Emby", Id, Name, MediaKind, MediaSourceId, string.Empty);

ErsatzTV.Application/Emby/Queries/GetEmbyPathReplacementsBySourceId.cs

@@ -1,4 +1,3 @@
 namespace ErsatzTV.Application.Emby;
 
-public record GetEmbyPathReplacementsBySourceId
+public record GetEmbyPathReplacementsBySourceId(int EmbyMediaSourceId) : IRequest<List<EmbyPathReplacementViewModel>>;
-    (int EmbyMediaSourceId) : IRequest<List<EmbyPathReplacementViewModel>>;

ErsatzTV.Application/ErsatzTV.Application.csproj

@@ -15,13 +15,13 @@
       <PackageReference Include="MediatR" Version="12.2.0" />
       <PackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="8.0.0" />
       <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="8.0.0" />
-      <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.8.14">
+      <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.9.28">
         <PrivateAssets>all</PrivateAssets>
         <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       </PackageReference>
       <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
       <PackageReference Include="Serilog.Formatting.Compact.Reader" Version="3.0.0" />
-      <PackageReference Include="WebMarkupMin.Core" Version="2.14.0" />
+      <PackageReference Include="WebMarkupMin.Core" Version="2.16.0" />
       <PackageReference Include="Winista.MimeDetect" Version="1.1.0" />
     </ItemGroup>
 

ErsatzTV.Application/FFmpegProfiles/Commands/CopyFFmpegProfile.cs

@@ -2,5 +2,4 @@
 
 namespace ErsatzTV.Application.FFmpegProfiles;
 
-public record CopyFFmpegProfile
+public record CopyFFmpegProfile(int FFmpegProfileId, string Name) : IRequest<Either<BaseError, FFmpegProfileViewModel>>;
-    (int FFmpegProfileId, string Name) : IRequest<Either<BaseError, FFmpegProfileViewModel>>;

ErsatzTV.Application/FFmpegProfiles/Queries/GetFFmpegProfileByIdForApiHandler.cs

@@ -8,7 +8,7 @@ namespace ErsatzTV.Application.FFmpegProfiles;
 
 public class
     GetFFmpegProfileByIdForApiHandler : IRequestHandler<GetFFmpegFullProfileByIdForApi,
-        Option<FFmpegFullProfileResponseModel>>
+    Option<FFmpegFullProfileResponseModel>>
 {
     private readonly IDbContextFactory<TvContext> _dbContextFactory;
 

ErsatzTV.Application/FFmpegProfiles/Queries/GetSupportedHardwareAccelerationKindsHandler.cs

@@ -10,7 +10,7 @@ namespace ErsatzTV.Application.FFmpegProfiles;
 
 public class
     GetSupportedHardwareAccelerationKindsHandler : IRequestHandler<GetSupportedHardwareAccelerationKinds,
-        List<HardwareAccelerationKind>>
+    List<HardwareAccelerationKind>>
 {
     private readonly IDbContextFactory<TvContext> _dbContextFactory;
     private readonly IHardwareCapabilitiesFactory _hardwareCapabilitiesFactory;

ErsatzTV.Application/Images/Queries/GetCachedImagePath.cs

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

ErsatzTV.Application/Jellyfin/Commands/SynchronizeJellyfinAdminUserIdHandler.cs

@@ -10,7 +10,7 @@ namespace ErsatzTV.Application.Jellyfin;
 
 public class
     SynchronizeJellyfinAdminUserIdHandler : IRequestHandler<SynchronizeJellyfinAdminUserId,
-        Either<BaseError, Unit>>
+    Either<BaseError, Unit>>
 {
     private readonly IJellyfinApiClient _jellyfinApiClient;
     private readonly IJellyfinSecretStore _jellyfinSecretStore;

ErsatzTV.Application/Jellyfin/Commands/SynchronizeJellyfinLibraryById.cs

@@ -16,8 +16,8 @@ public record SynchronizeJellyfinLibraryByIdIfNeeded(int JellyfinLibraryId) : IS
     public bool DeepScan => false;
 }
 
-public record ForceSynchronizeJellyfinLibraryById
+public record ForceSynchronizeJellyfinLibraryById(int JellyfinLibraryId, bool DeepScan)
-    (int JellyfinLibraryId, bool DeepScan) : ISynchronizeJellyfinLibraryById
+    : ISynchronizeJellyfinLibraryById
 {
     public bool ForceScan => true;
 }

ErsatzTV.Application/Jellyfin/Commands/UpdateJellyfinLibraryPreferences.cs

@@ -2,7 +2,7 @@
 
 namespace ErsatzTV.Application.Jellyfin;
 
-public record UpdateJellyfinLibraryPreferences
+public record UpdateJellyfinLibraryPreferences(List<JellyfinLibraryPreference> Preferences)
-    (List<JellyfinLibraryPreference> Preferences) : IRequest<Either<BaseError, Unit>>;
+    : IRequest<Either<BaseError, Unit>>;
 
 public record JellyfinLibraryPreference(int Id, bool ShouldSyncItems);

ErsatzTV.Application/Jellyfin/Commands/UpdateJellyfinLibraryPreferencesHandler.cs

@@ -6,7 +6,7 @@ namespace ErsatzTV.Application.Jellyfin;
 
 public class
     UpdateJellyfinLibraryPreferencesHandler : IRequestHandler<UpdateJellyfinLibraryPreferences,
-        Either<BaseError, Unit>>
+    Either<BaseError, Unit>>
 {
     private readonly IMediaSourceRepository _mediaSourceRepository;
     private readonly ISearchIndex _searchIndex;

ErsatzTV.Application/Jellyfin/JellyfinLibraryViewModel.cs

@@ -4,9 +4,9 @@ using ErsatzTV.Core.Domain;
 namespace ErsatzTV.Application.Jellyfin;
 
 public record JellyfinLibraryViewModel(
-        int Id,
+    int Id,
-        string Name,
+    string Name,
-        LibraryMediaKind MediaKind,
+    LibraryMediaKind MediaKind,
-        bool ShouldSyncItems,
+    bool ShouldSyncItems,
-        int MediaSourceId)
+    int MediaSourceId)
     : LibraryViewModel("Jellyfin", Id, Name, MediaKind, MediaSourceId, string.Empty);

ErsatzTV.Application/Jellyfin/Queries/GetAllJellyfinMediaSourcesHandler.cs

@@ -5,7 +5,7 @@ namespace ErsatzTV.Application.Jellyfin;
 
 public class
     GetAllJellyfinMediaSourcesHandler : IRequestHandler<GetAllJellyfinMediaSources,
-        List<JellyfinMediaSourceViewModel>>
+    List<JellyfinMediaSourceViewModel>>
 {
     private readonly IMediaSourceRepository _mediaSourceRepository;
 

ErsatzTV.Application/Jellyfin/Queries/GetJellyfinLibrariesBySourceIdHandler.cs

@@ -5,7 +5,7 @@ namespace ErsatzTV.Application.Jellyfin;
 
 public class
     GetJellyfinLibrariesBySourceIdHandler : IRequestHandler<GetJellyfinLibrariesBySourceId,
-        List<JellyfinLibraryViewModel>>
+    List<JellyfinLibraryViewModel>>
 {
     private readonly IMediaSourceRepository _mediaSourceRepository;
 

ErsatzTV.Application/Jellyfin/Queries/GetJellyfinMediaSourceById.cs

@@ -1,4 +1,3 @@
 namespace ErsatzTV.Application.Jellyfin;
 
-public record GetJellyfinMediaSourceById
+public record GetJellyfinMediaSourceById(int JellyfinMediaSourceId) : IRequest<Option<JellyfinMediaSourceViewModel>>;
-    (int JellyfinMediaSourceId) : IRequest<Option<JellyfinMediaSourceViewModel>>;

ErsatzTV.Application/Jellyfin/Queries/GetJellyfinMediaSourceByIdHandler.cs

@@ -5,7 +5,7 @@ namespace ErsatzTV.Application.Jellyfin;
 
 public class
     GetJellyfinMediaSourceByIdHandler : IRequestHandler<GetJellyfinMediaSourceById,
-        Option<JellyfinMediaSourceViewModel>>
+    Option<JellyfinMediaSourceViewModel>>
 {
     private readonly IMediaSourceRepository _mediaSourceRepository;
 

ErsatzTV.Application/Jellyfin/Queries/GetJellyfinPathReplacementsBySourceId.cs

@@ -1,4 +1,4 @@
 namespace ErsatzTV.Application.Jellyfin;
 
-public record GetJellyfinPathReplacementsBySourceId
+public record GetJellyfinPathReplacementsBySourceId(int JellyfinMediaSourceId)
-    (int JellyfinMediaSourceId) : IRequest<List<JellyfinPathReplacementViewModel>>;
+    : IRequest<List<JellyfinPathReplacementViewModel>>;

ErsatzTV.Application/Libraries/Commands/CallLibraryScannerHandler.cs

@@ -13,6 +13,7 @@ using ErsatzTV.Infrastructure.Data;
 using Microsoft.EntityFrameworkCore;
 using Newtonsoft.Json;
 using Serilog;
+using Serilog.Core;
 using Serilog.Events;
 using Serilog.Formatting.Compact.Reader;
 
@@ -20,6 +21,7 @@ namespace ErsatzTV.Application.Libraries;
 
 public abstract class CallLibraryScannerHandler<TRequest>
 {
+    private readonly int _batchSize = 100;
     private readonly ChannelWriter<ISearchIndexBackgroundServiceRequest> _channel;
     private readonly IConfigElementRepository _configElementRepository;
     private readonly IDbContextFactory<TvContext> _dbContextFactory;
@@ -27,7 +29,6 @@ public abstract class CallLibraryScannerHandler<TRequest>
     private readonly IRuntimeInfo _runtimeInfo;
     private readonly List<int> _toReindex = [];
     private readonly List<int> _toRemove = [];
-    private readonly int _batchSize = 100;
     private string _libraryName;
 
     protected CallLibraryScannerHandler(
@@ -104,7 +105,7 @@ public abstract class CallLibraryScannerHandler<TRequest>
                 if (logEvent.Properties.TryGetValue("SourceContext", out LogEventPropertyValue property))
                 {
                     log = log.ForContext(
-                        Serilog.Core.Constants.SourceContextPropertyName,
+                        Constants.SourceContextPropertyName,
                         property.ToString().Trim('"'));
                 }
 

ErsatzTV.Application/Libraries/Commands/CreateLocalLibraryHandler.cs

@@ -32,7 +32,7 @@ public class CreateLocalLibraryHandler : LocalLibraryHandlerBase,
     {
         await using TvContext dbContext = await _dbContextFactory.CreateDbContextAsync(cancellationToken);
         Validation<BaseError, LocalLibrary> validation = await Validate(dbContext, request);
-        return await LanguageExtensions.Apply(validation, localLibrary => PersistLocalLibrary(dbContext, localLibrary));
+        return await validation.Apply(localLibrary => PersistLocalLibrary(dbContext, localLibrary));
     }
 
     private async Task<LocalLibraryViewModel> PersistLocalLibrary(

ErsatzTV.Application/Libraries/Commands/CreateLocalLibraryPath.cs

@@ -2,5 +2,5 @@
 
 namespace ErsatzTV.Application.Libraries;
 
-public record CreateLocalLibraryPath
+public record CreateLocalLibraryPath(int LibraryId, string Path)
-    (int LibraryId, string Path) : IRequest<Either<BaseError, LocalLibraryPathViewModel>>;
+    : IRequest<Either<BaseError, LocalLibraryPathViewModel>>;

ErsatzTV.Application/Libraries/Commands/DeleteLocalLibraryHandler.cs

@@ -28,7 +28,7 @@ public class DeleteLocalLibraryHandler : LocalLibraryHandlerBase,
     {
         await using TvContext dbContext = await _dbContextFactory.CreateDbContextAsync(cancellationToken);
         Validation<BaseError, LocalLibrary> validation = await LocalLibraryMustExist(dbContext, request);
-        return await LanguageExtensions.Apply(validation, localLibrary => DoDeletion(dbContext, localLibrary));
+        return await validation.Apply(localLibrary => DoDeletion(dbContext, localLibrary));
     }
 
     private async Task<Unit> DoDeletion(TvContext dbContext, LocalLibrary localLibrary)

ErsatzTV.Application/Libraries/Commands/MoveLocalLibraryPathHandler.cs

@@ -39,7 +39,7 @@ public class MoveLocalLibraryPathHandler : IRequestHandler<MoveLocalLibraryPath,
     {
         await using TvContext dbContext = await _dbContextFactory.CreateDbContextAsync(cancellationToken);
         Validation<BaseError, Parameters> validation = await Validate(dbContext, request);
-        return await LanguageExtensions.Apply(validation, parameters => MovePath(dbContext, parameters));
+        return await validation.Apply(parameters => MovePath(dbContext, parameters));
     }
 
     private async Task<Unit> MovePath(TvContext dbContext, Parameters parameters)

ErsatzTV.Application/Libraries/Commands/UpdateLocalLibraryHandler.cs

@@ -37,7 +37,7 @@ public class UpdateLocalLibraryHandler : LocalLibraryHandlerBase,
     {
         await using TvContext dbContext = await _dbContextFactory.CreateDbContextAsync(cancellationToken);
         Validation<BaseError, Parameters> validation = await Validate(dbContext, request);
-        return await LanguageExtensions.Apply(validation, parameters => UpdateLocalLibrary(dbContext, parameters));
+        return await validation.Apply(parameters => UpdateLocalLibrary(dbContext, parameters));
     }
 
     private async Task<LocalLibraryViewModel> UpdateLocalLibrary(TvContext dbContext, Parameters parameters)

ErsatzTV.Application/Libraries/PlexLibraryViewModel.cs

@@ -3,9 +3,9 @@
 namespace ErsatzTV.Application.Libraries;
 
 public record PlexLibraryViewModel(
-        int Id,
+    int Id,
-        string Name,
+    string Name,
-        LibraryMediaKind MediaKind,
+    LibraryMediaKind MediaKind,
-        int MediaSourceId,
+    int MediaSourceId,
-        string MediaSourceName)
+    string MediaSourceName)
     : LibraryViewModel("Plex", Id, Name, MediaKind, MediaSourceId, MediaSourceName);

ErsatzTV.Application/MediaCards/ArtistCardViewModel.cs

@@ -2,8 +2,7 @@
 
 namespace ErsatzTV.Application.MediaCards;
 
-public record ArtistCardViewModel
+public record ArtistCardViewModel(
-(
     int ArtistId,
     string Title,
     string Subtitle,

ErsatzTV.Application/MediaCards/ImageCardViewModel.cs

@@ -2,8 +2,7 @@
 
 namespace ErsatzTV.Application.MediaCards;
 
-public record ImageCardViewModel
+public record ImageCardViewModel(
-(
     int ImageId,
     string Title,
     string Subtitle,

ErsatzTV.Application/MediaCards/MovieCardViewModel.cs

@@ -2,8 +2,7 @@
 
 namespace ErsatzTV.Application.MediaCards;
 
-public record MovieCardViewModel
+public record MovieCardViewModel(
-(
     int MovieId,
     string Title,
     string Subtitle,

ErsatzTV.Application/MediaCards/MusicVideoCardViewModel.cs

@@ -2,8 +2,7 @@
 
 namespace ErsatzTV.Application.MediaCards;
 
-public record MusicVideoCardViewModel
+public record MusicVideoCardViewModel(
-(
     int MusicVideoId,
     string Title,
     string Subtitle,

ErsatzTV.Application/MediaCards/OtherVideoCardViewModel.cs

@@ -2,8 +2,7 @@
 
 namespace ErsatzTV.Application.MediaCards;
 
-public record OtherVideoCardViewModel
+public record OtherVideoCardViewModel(
-(
     int OtherVideoId,
     string Title,
     string Subtitle,

ErsatzTV.Application/MediaCards/Queries/GetMusicVideoCards.cs

@@ -1,4 +1,3 @@
 namespace ErsatzTV.Application.MediaCards;
 
-public record GetMusicVideoCards
+public record GetMusicVideoCards(int ArtistId, int PageNumber, int PageSize) : IRequest<MusicVideoCardResultsViewModel>;
-    (int ArtistId, int PageNumber, int PageSize) : IRequest<MusicVideoCardResultsViewModel>;

ErsatzTV.Application/MediaCards/Queries/GetTelevisionEpisodeCards.cs

@@ -1,4 +1,4 @@
 namespace ErsatzTV.Application.MediaCards;
 
-public record GetTelevisionEpisodeCards
+public record GetTelevisionEpisodeCards(int TelevisionSeasonId, int PageNumber, int PageSize)
-    (int TelevisionSeasonId, int PageNumber, int PageSize) : IRequest<TelevisionEpisodeCardResultsViewModel>;
+    : IRequest<TelevisionEpisodeCardResultsViewModel>;

ErsatzTV.Application/MediaCards/Queries/GetTelevisionSeasonCards.cs

@@ -1,4 +1,4 @@
 namespace ErsatzTV.Application.MediaCards;
 
-public record GetTelevisionSeasonCards
+public record GetTelevisionSeasonCards(int TelevisionShowId, int PageNumber, int PageSize)
-    (int TelevisionShowId, int PageNumber, int PageSize) : IRequest<TelevisionSeasonCardResultsViewModel>;
+    : IRequest<TelevisionSeasonCardResultsViewModel>;

ErsatzTV.Application/MediaCards/Queries/GetTelevisionSeasonCardsHandler.cs

@@ -6,7 +6,7 @@ namespace ErsatzTV.Application.MediaCards;
 
 public class
     GetTelevisionSeasonCardsHandler : IRequestHandler<GetTelevisionSeasonCards,
-        TelevisionSeasonCardResultsViewModel>
+    TelevisionSeasonCardResultsViewModel>
 {
     private readonly IMediaSourceRepository _mediaSourceRepository;
     private readonly ITelevisionRepository _televisionRepository;

ErsatzTV.Application/MediaCards/SongCardViewModel.cs

@@ -2,8 +2,7 @@
 
 namespace ErsatzTV.Application.MediaCards;
 
-public record SongCardViewModel
+public record SongCardViewModel(
-(
     int SongId,
     string Title,
     string Subtitle,

ErsatzTV.Application/MediaCards/TelevisionEpisodeCardViewModel.cs

@@ -2,8 +2,7 @@
 
 namespace ErsatzTV.Application.MediaCards;
 
-public record TelevisionEpisodeCardViewModel
+public record TelevisionEpisodeCardViewModel(
-(
     int EpisodeId,
     DateTime Aired,
     string ShowTitle,

ErsatzTV.Application/MediaCards/TelevisionSeasonCardViewModel.cs

@@ -2,8 +2,7 @@
 
 namespace ErsatzTV.Application.MediaCards;
 
-public record TelevisionSeasonCardViewModel
+public record TelevisionSeasonCardViewModel(
-(
     string ShowTitle,
     int TelevisionSeasonId,
     int TelevisionSeasonNumber,

ErsatzTV.Application/MediaCards/TelevisionShowCardViewModel.cs

@@ -2,8 +2,7 @@
 
 namespace ErsatzTV.Application.MediaCards;
 
-public record TelevisionShowCardViewModel
+public record TelevisionShowCardViewModel(
-(
     int TelevisionShowId,
     string Title,
     string Subtitle,

ErsatzTV.Application/MediaCollections/Commands/AddArtistToCollection.cs

@@ -2,5 +2,4 @@
 
 namespace ErsatzTV.Application.MediaCollections;
 
-public record AddArtistToCollection
+public record AddArtistToCollection(int CollectionId, int ArtistId) : IRequest<Either<BaseError, Unit>>;
-    (int CollectionId, int ArtistId) : IRequest<Either<BaseError, Unit>>;

ErsatzTV.Application/MediaCollections/Commands/AddArtistToCollectionHandler.cs

@@ -33,7 +33,7 @@ public class AddArtistToCollectionHandler :
     {
         await using TvContext dbContext = await _dbContextFactory.CreateDbContextAsync(cancellationToken);
         Validation<BaseError, Parameters> validation = await Validate(dbContext, request);
-        return await LanguageExtensions.Apply(validation, parameters => ApplyAddArtistRequest(dbContext, parameters));
+        return await validation.Apply(parameters => ApplyAddArtistRequest(dbContext, parameters));
     }
 
     private async Task<Unit> ApplyAddArtistRequest(TvContext dbContext, Parameters parameters)

ErsatzTV.Application/MediaCollections/Commands/AddEpisodeToCollectionHandler.cs

@@ -33,9 +33,7 @@ public class AddEpisodeToCollectionHandler :
     {
         await using TvContext dbContext = await _dbContextFactory.CreateDbContextAsync(cancellationToken);
         Validation<BaseError, Parameters> validation = await Validate(dbContext, request);
-        return await LanguageExtensions.Apply(
+        return await validation.Apply(parameters => ApplyAddTelevisionEpisodeRequest(dbContext, parameters));
-            validation,
-            parameters => ApplyAddTelevisionEpisodeRequest(dbContext, parameters));
     }
 
     private async Task<Unit> ApplyAddTelevisionEpisodeRequest(TvContext dbContext, Parameters parameters)

ErsatzTV.Application/MediaCollections/Commands/AddItemsToCollection.cs

@@ -2,8 +2,7 @@
 
 namespace ErsatzTV.Application.MediaCollections;
 
-public record AddItemsToCollection
+public record AddItemsToCollection(
-(
     int CollectionId,
     List<int> MovieIds,
     List<int> ShowIds,

ErsatzTV.Application/MediaCollections/Commands/AddMovieToCollectionHandler.cs

@@ -33,7 +33,7 @@ public class AddMovieToCollectionHandler :
     {
         await using TvContext dbContext = await _dbContextFactory.CreateDbContextAsync(cancellationToken);
         Validation<BaseError, Parameters> validation = await Validate(dbContext, request);
-        return await LanguageExtensions.Apply(validation, parameters => ApplyAddMovieRequest(dbContext, parameters));
+        return await validation.Apply(parameters => ApplyAddMovieRequest(dbContext, parameters));
     }
 
     private async Task<Unit> ApplyAddMovieRequest(TvContext dbContext, Parameters parameters)

ErsatzTV.Application/MediaCollections/Commands/AddMusicVideoToCollection.cs

@@ -2,5 +2,4 @@
 
 namespace ErsatzTV.Application.MediaCollections;
 
-public record AddMusicVideoToCollection
+public record AddMusicVideoToCollection(int CollectionId, int MusicVideoId) : IRequest<Either<BaseError, Unit>>;
-    (int CollectionId, int MusicVideoId) : IRequest<Either<BaseError, Unit>>;

ErsatzTV.Application/MediaCollections/Commands/AddMusicVideoToCollectionHandler.cs

@@ -33,9 +33,7 @@ public class AddMusicVideoToCollectionHandler :
     {
         await using TvContext dbContext = await _dbContextFactory.CreateDbContextAsync(cancellationToken);
         Validation<BaseError, Parameters> validation = await Validate(dbContext, request);
-        return await LanguageExtensions.Apply(
+        return await validation.Apply(parameters => ApplyAddMusicVideoRequest(dbContext, parameters));
-            validation,
-            parameters => ApplyAddMusicVideoRequest(dbContext, parameters));
     }
 
     private async Task<Unit> ApplyAddMusicVideoRequest(TvContext dbContext, Parameters parameters)

ErsatzTV.Application/MediaCollections/Commands/AddOtherVideoToCollection.cs

@@ -2,5 +2,4 @@
 
 namespace ErsatzTV.Application.MediaCollections;
 
-public record AddOtherVideoToCollection
+public record AddOtherVideoToCollection(int CollectionId, int OtherVideoId) : IRequest<Either<BaseError, Unit>>;
-    (int CollectionId, int OtherVideoId) : IRequest<Either<BaseError, Unit>>;

ErsatzTV.Application/MediaCollections/Commands/AddOtherVideoToCollectionHandler.cs

@@ -33,9 +33,7 @@ public class AddOtherVideoToCollectionHandler :
     {
         await using TvContext dbContext = await _dbContextFactory.CreateDbContextAsync(cancellationToken);
         Validation<BaseError, Parameters> validation = await Validate(dbContext, request);
-        return await LanguageExtensions.Apply(
+        return await validation.Apply(parameters => ApplyAddOtherVideoRequest(dbContext, parameters));
-            validation,
-            parameters => ApplyAddOtherVideoRequest(dbContext, parameters));
     }
 
     private async Task<Unit> ApplyAddOtherVideoRequest(TvContext dbContext, Parameters parameters)

ErsatzTV.Application/MediaCollections/Commands/AddSeasonToCollectionHandler.cs

@@ -33,7 +33,7 @@ public class AddSeasonToCollectionHandler :
     {
         await using TvContext dbContext = await _dbContextFactory.CreateDbContextAsync(cancellationToken);
         Validation<BaseError, Parameters> validation = await Validate(dbContext, request);
-        return await LanguageExtensions.Apply(validation, parameters => ApplyAddSeasonRequest(dbContext, parameters));
+        return await validation.Apply(parameters => ApplyAddSeasonRequest(dbContext, parameters));
     }
 
     private async Task<Unit> ApplyAddSeasonRequest(TvContext dbContext, Parameters parameters)

ErsatzTV.Application/MediaCollections/Commands/AddShowToCollectionHandler.cs

@@ -33,7 +33,7 @@ public class AddShowToCollectionHandler :
     {
         await using TvContext dbContext = await _dbContextFactory.CreateDbContextAsync(cancellationToken);
         Validation<BaseError, Parameters> validation = await Validate(dbContext, request);
-        return await LanguageExtensions.Apply(validation, parameters => ApplyAddShowRequest(dbContext, parameters));
+        return await validation.Apply(parameters => ApplyAddShowRequest(dbContext, parameters));
     }
 
     private async Task<Unit> ApplyAddShowRequest(TvContext dbContext, Parameters parameters)

ErsatzTV.Application/MediaCollections/Commands/AddSongToCollection.cs

@@ -2,5 +2,4 @@
 
 namespace ErsatzTV.Application.MediaCollections;
 
-public record AddSongToCollection
+public record AddSongToCollection(int CollectionId, int SongId) : IRequest<Either<BaseError, Unit>>;
-    (int CollectionId, int SongId) : IRequest<Either<BaseError, Unit>>;

ErsatzTV.Application/MediaCollections/Commands/AddSongToCollectionHandler.cs

@@ -33,7 +33,7 @@ public class AddSongToCollectionHandler :
     {
         await using TvContext dbContext = await _dbContextFactory.CreateDbContextAsync(cancellationToken);
         Validation<BaseError, Parameters> validation = await Validate(dbContext, request);
-        return await LanguageExtensions.Apply(validation, parameters => ApplyAddSongRequest(dbContext, parameters));
+        return await validation.Apply(parameters => ApplyAddSongRequest(dbContext, parameters));
     }
 
     private async Task<Unit> ApplyAddSongRequest(TvContext dbContext, Parameters parameters)

ErsatzTV.Application/MediaCollections/Commands/CreateMultiCollection.cs

@@ -9,5 +9,5 @@ public record CreateMultiCollectionItem(
     bool ScheduleAsGroup,
     PlaybackOrder PlaybackOrder);
 
-public record CreateMultiCollection
+public record CreateMultiCollection(string Name, List<CreateMultiCollectionItem> Items)
-    (string Name, List<CreateMultiCollectionItem> Items) : IRequest<Either<BaseError, MultiCollectionViewModel>>;
+    : IRequest<Either<BaseError, MultiCollectionViewModel>>;

ErsatzTV.Application/MediaCollections/Commands/CreateSmartCollection.cs

@@ -2,5 +2,4 @@
 
 namespace ErsatzTV.Application.MediaCollections;
 
-public record CreateSmartCollection
+public record CreateSmartCollection(string Query, string Name) : IRequest<Either<BaseError, SmartCollectionViewModel>>;
-    (string Query, string Name) : IRequest<Either<BaseError, SmartCollectionViewModel>>;

ErsatzTV.Application/MediaCollections/Commands/DeleteTraktListHandler.cs

@@ -44,7 +44,7 @@ public class DeleteTraktListHandler : TraktCommandBase, IRequestHandler<DeleteTr
         {
             await using TvContext dbContext = await _dbContextFactory.CreateDbContextAsync(cancellationToken);
             Validation<BaseError, TraktList> validation = await TraktListMustExist(dbContext, request.TraktListId);
-            return await LanguageExtensions.Apply(validation, c => DoDeletion(dbContext, c));
+            return await validation.Apply(c => DoDeletion(dbContext, c));
         }
         finally
         {

ErsatzTV.Application/MediaCollections/Commands/RemoveItemsFromCollectionHandler.cs

@@ -32,7 +32,7 @@ public class RemoveItemsFromCollectionHandler : IRequestHandler<RemoveItemsFromC
     {
         await using TvContext dbContext = await _dbContextFactory.CreateDbContextAsync(cancellationToken);
         Validation<BaseError, Collection> validation = await Validate(dbContext, request);
-        return await LanguageExtensions.Apply(validation, c => ApplyRemoveItemsRequest(dbContext, request, c));
+        return await validation.Apply(c => ApplyRemoveItemsRequest(dbContext, request, c));
     }
 
     private async Task<Unit> ApplyRemoveItemsRequest(

ErsatzTV.Application/MediaCollections/Commands/UpdateCollection.cs

@@ -2,8 +2,7 @@
 
 namespace ErsatzTV.Application.MediaCollections;
 
-public record UpdateCollection
+public record UpdateCollection(int CollectionId, string Name) : IRequest<Either<BaseError, Unit>>
-    (int CollectionId, string Name) : IRequest<Either<BaseError, Unit>>
 {
     public Option<bool> UseCustomPlaybackOrder { get; set; } = None;
 }

ErsatzTV.Application/MediaCollections/Commands/UpdateCollectionCustomOrder.cs

@@ -2,8 +2,7 @@
 
 namespace ErsatzTV.Application.MediaCollections;
 
-public record UpdateCollectionCustomOrder
+public record UpdateCollectionCustomOrder(
-(
     int CollectionId,
     List<MediaItemCustomOrder> MediaItemCustomOrders) : IRequest<Either<BaseError, Unit>>;
 

ErsatzTV.Application/MediaCollections/Commands/UpdateCollectionCustomOrderHandler.cs

@@ -32,7 +32,7 @@ public class UpdateCollectionCustomOrderHandler : IRequestHandler<UpdateCollecti
     {
         await using TvContext dbContext = await _dbContextFactory.CreateDbContextAsync(cancellationToken);
         Validation<BaseError, Collection> validation = await Validate(dbContext, request);
-        return await LanguageExtensions.Apply(validation, c => ApplyUpdateRequest(dbContext, c, request));
+        return await validation.Apply(c => ApplyUpdateRequest(dbContext, c, request));
     }
 
     private async Task<Unit> ApplyUpdateRequest(

ErsatzTV.Application/MediaCollections/Commands/UpdateCollectionHandler.cs

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

ErsatzTV.Application/MediaCollections/Commands/UpdateMultiCollection.cs

@@ -9,8 +9,7 @@ public record UpdateMultiCollectionItem(
     bool ScheduleAsGroup,
     PlaybackOrder PlaybackOrder);
 
-public record UpdateMultiCollection
+public record UpdateMultiCollection(
-(
     int MultiCollectionId,
     string Name,
     List<UpdateMultiCollectionItem> Items) : IRequest<Either<BaseError, Unit>>;

ErsatzTV.Application/MediaCollections/Commands/UpdateMultiCollectionHandler.cs

@@ -14,9 +14,9 @@ namespace ErsatzTV.Application.MediaCollections;
 public class UpdateMultiCollectionHandler : IRequestHandler<UpdateMultiCollection, Either<BaseError, Unit>>
 {
     private readonly ChannelWriter<IBackgroundServiceRequest> _channel;
-    private readonly ISearchTargets _searchTargets;
     private readonly IDbContextFactory<TvContext> _dbContextFactory;
     private readonly IMediaCollectionRepository _mediaCollectionRepository;
+    private readonly ISearchTargets _searchTargets;
 
     public UpdateMultiCollectionHandler(
         IDbContextFactory<TvContext> dbContextFactory,
@@ -36,7 +36,7 @@ public class UpdateMultiCollectionHandler : IRequestHandler<UpdateMultiCollectio
     {
         await using TvContext dbContext = await _dbContextFactory.CreateDbContextAsync(cancellationToken);
         Validation<BaseError, MultiCollection> validation = await Validate(dbContext, request);
-        return await LanguageExtensions.Apply(validation, c => ApplyUpdateRequest(dbContext, c, request));
+        return await validation.Apply(c => ApplyUpdateRequest(dbContext, c, request));
     }
 
     private async Task<Unit> ApplyUpdateRequest(TvContext dbContext, MultiCollection c, UpdateMultiCollection request)

ErsatzTV.Application/MediaCollections/Commands/UpdateSmartCollectionHandler.cs

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

ErsatzTV.Application/Playouts/Commands/BuildPlayoutHandler.cs

@@ -17,13 +17,13 @@ namespace ErsatzTV.Application.Playouts;
 
 public class BuildPlayoutHandler : IRequestHandler<BuildPlayout, Either<BaseError, Unit>>
 {
+    private readonly IBlockPlayoutBuilder _blockPlayoutBuilder;
     private readonly IClient _client;
     private readonly IDbContextFactory<TvContext> _dbContextFactory;
     private readonly IEntityLocker _entityLocker;
+    private readonly IExternalJsonPlayoutBuilder _externalJsonPlayoutBuilder;
     private readonly IFFmpegSegmenterService _ffmpegSegmenterService;
     private readonly IPlayoutBuilder _playoutBuilder;
-    private readonly IBlockPlayoutBuilder _blockPlayoutBuilder;
-    private readonly IExternalJsonPlayoutBuilder _externalJsonPlayoutBuilder;
     private readonly ChannelWriter<IBackgroundServiceRequest> _workerChannel;
 
     public BuildPlayoutHandler(
@@ -100,7 +100,8 @@ public class BuildPlayoutHandler : IRequestHandler<BuildPlayout, Either<BaseErro
             foreach (string channelNumber in maybeChannelNumber)
             {
                 string fileName = Path.Combine(FileSystemLayout.ChannelGuideCacheFolder, $"{channelNumber}.xml");
-                if (hasChanges || !File.Exists(fileName) || playout.ProgramSchedulePlayoutType is ProgramSchedulePlayoutType.ExternalJson)
+                if (hasChanges || !File.Exists(fileName) ||
+                    playout.ProgramSchedulePlayoutType is ProgramSchedulePlayoutType.ExternalJson)
                 {
                     await _workerChannel.WriteAsync(new RefreshChannelData(channelNumber), cancellationToken);
                 }

ErsatzTV.Application/Playouts/Commands/CreateExternalJsonPlayoutHandler.cs

@@ -14,9 +14,9 @@ namespace ErsatzTV.Application.Playouts;
 public class CreateExternalJsonPlayoutHandler
     : IRequestHandler<CreateExternalJsonPlayout, Either<BaseError, CreatePlayoutResponse>>
 {
-    private readonly ILocalFileSystem _localFileSystem;
     private readonly ChannelWriter<IBackgroundServiceRequest> _channel;
     private readonly IDbContextFactory<TvContext> _dbContextFactory;
+    private readonly ILocalFileSystem _localFileSystem;
 
     public CreateExternalJsonPlayoutHandler(
         ILocalFileSystem localFileSystem,

ErsatzTV.Application/Playouts/Commands/CreateFloodPlayoutHandler.cs

@@ -41,7 +41,9 @@ public class CreateFloodPlayoutHandler : IRequestHandler<CreateFloodPlayout, Eit
         return new CreatePlayoutResponse(playout.Id);
     }
 
-    private static async Task<Validation<BaseError, Playout>> Validate(TvContext dbContext, CreateFloodPlayout request) =>
+    private static async Task<Validation<BaseError, Playout>> Validate(
+        TvContext dbContext,
+        CreateFloodPlayout request) =>
         (await ValidateChannel(dbContext, request), await ValidateProgramSchedule(dbContext, request),
             ValidatePlayoutType(request))
         .Apply(

ErsatzTV.Application/Playouts/Commands/ReplacePlayoutAlternateScheduleItems.cs

@@ -2,5 +2,5 @@ using ErsatzTV.Core;
 
 namespace ErsatzTV.Application.Playouts;
 
-public record ReplacePlayoutAlternateScheduleItems
+public record ReplacePlayoutAlternateScheduleItems(int PlayoutId, List<ReplacePlayoutAlternateSchedule> Items)
-    (int PlayoutId, List<ReplacePlayoutAlternateSchedule> Items) : IRequest<Either<BaseError, Unit>>;
+    : IRequest<Either<BaseError, Unit>>;

ErsatzTV.Application/Playouts/Commands/UpdateExternalJsonPlayoutHandler.cs

@@ -8,7 +8,9 @@ using Microsoft.EntityFrameworkCore;
 
 namespace ErsatzTV.Application.Playouts;
 
-public class UpdateExternalJsonPlayoutHandler : IRequestHandler<UpdateExternalJsonPlayout, Either<BaseError, PlayoutNameViewModel>>
+public class
+    UpdateExternalJsonPlayoutHandler : IRequestHandler<UpdateExternalJsonPlayout,
+    Either<BaseError, PlayoutNameViewModel>>
 {
     private readonly IDbContextFactory<TvContext> _dbContextFactory;
     private readonly ChannelWriter<IBackgroundServiceRequest> _workerChannel;
@@ -52,7 +54,9 @@ public class UpdateExternalJsonPlayoutHandler : IRequestHandler<UpdateExternalJs
             Optional(playout.DailyRebuildTime));
     }
 
-    private static Task<Validation<BaseError, Playout>> Validate(TvContext dbContext, UpdateExternalJsonPlayout request) =>
+    private static Task<Validation<BaseError, Playout>> Validate(
+        TvContext dbContext,
+        UpdateExternalJsonPlayout request) =>
         PlayoutMustExist(dbContext, request);
 
     private static Task<Validation<BaseError, Playout>> PlayoutMustExist(

ErsatzTV.Application/Playouts/Commands/UpdatePlayout.cs

@@ -2,5 +2,5 @@
 
 namespace ErsatzTV.Application.Playouts;
 
-public record UpdatePlayout
+public record UpdatePlayout(int PlayoutId, Option<TimeSpan> DailyRebuildTime)
-    (int PlayoutId, Option<TimeSpan> DailyRebuildTime) : IRequest<Either<BaseError, PlayoutNameViewModel>>;
+    : IRequest<Either<BaseError, PlayoutNameViewModel>>;

ErsatzTV.Application/Playouts/Queries/GetFuturePlayoutItemsById.cs

@@ -1,4 +1,4 @@
 namespace ErsatzTV.Application.Playouts;
 
-public record GetFuturePlayoutItemsById
+public record GetFuturePlayoutItemsById(int PlayoutId, bool ShowFiller, int PageNum, int PageSize)
-    (int PlayoutId, bool ShowFiller, int PageNum, int PageSize) : IRequest<PagedPlayoutItemsViewModel>;
+    : IRequest<PagedPlayoutItemsViewModel>;

ErsatzTV.Application/Plex/Commands/UpdatePlexLibraryPreferences.cs

@@ -2,7 +2,6 @@
 
 namespace ErsatzTV.Application.Plex;
 
-public record UpdatePlexLibraryPreferences
+public record UpdatePlexLibraryPreferences(List<PlexLibraryPreference> Preferences) : IRequest<Either<BaseError, Unit>>;
-    (List<PlexLibraryPreference> Preferences) : IRequest<Either<BaseError, Unit>>;
 
 public record PlexLibraryPreference(int Id, bool ShouldSyncItems);

ErsatzTV.Application/Plex/Commands/UpdatePlexLibraryPreferencesHandler.cs

@@ -6,7 +6,7 @@ namespace ErsatzTV.Application.Plex;
 
 public class
     UpdatePlexLibraryPreferencesHandler : IRequestHandler<UpdatePlexLibraryPreferences,
-        Either<BaseError, Unit>>
+    Either<BaseError, Unit>>
 {
     private readonly IMediaSourceRepository _mediaSourceRepository;
     private readonly ISearchIndex _searchIndex;

ErsatzTV.Application/Plex/Commands/UpdatePlexPathReplacements.cs

@@ -2,8 +2,7 @@
 
 namespace ErsatzTV.Application.Plex;
 
-public record UpdatePlexPathReplacements
+public record UpdatePlexPathReplacements(
-(
     int PlexMediaSourceId,
     List<PlexPathReplacementItem> PathReplacements) : IRequest<Either<BaseError, Unit>>;
 

ErsatzTV.Application/Plex/Queries/GetPlexConnectionParameters.cs

@@ -2,5 +2,5 @@
 
 namespace ErsatzTV.Application.Plex;
 
-public record GetPlexConnectionParameters
+public record GetPlexConnectionParameters(int PlexMediaSourceId)
-    (int PlexMediaSourceId) : IRequest<Either<BaseError, PlexConnectionParametersViewModel>>;
+    : IRequest<Either<BaseError, PlexConnectionParametersViewModel>>;

ErsatzTV.Application/Plex/Queries/GetPlexPathReplacementsBySourceId.cs

@@ -1,4 +1,3 @@
 namespace ErsatzTV.Application.Plex;
 
-public record GetPlexPathReplacementsBySourceId
+public record GetPlexPathReplacementsBySourceId(int PlexMediaSourceId) : IRequest<List<PlexPathReplacementViewModel>>;
-    (int PlexMediaSourceId) : IRequest<List<PlexPathReplacementViewModel>>;

ErsatzTV.Application/ProgramSchedules/Commands/AddProgramScheduleItemHandler.cs

@@ -29,7 +29,7 @@ public class AddProgramScheduleItemHandler : ProgramScheduleItemCommandBase,
     {
         await using TvContext dbContext = await _dbContextFactory.CreateDbContextAsync(cancellationToken);
         Validation<BaseError, ProgramSchedule> validation = await Validate(dbContext, request);
-        return await LanguageExtensions.Apply(validation, ps => PersistItem(dbContext, request, ps));
+        return await validation.Apply(ps => PersistItem(dbContext, request, ps));
     }
 
     private async Task<ProgramScheduleItemViewModel> PersistItem(

ErsatzTV.Application/ProgramSchedules/Commands/CopyProgramSchedule.cs

@@ -2,5 +2,5 @@
 
 namespace ErsatzTV.Application.ProgramSchedules;
 
-public record CopyProgramSchedule
+public record CopyProgramSchedule(int ProgramScheduleId, string Name)
-    (int ProgramScheduleId, string Name) : IRequest<Either<BaseError, ProgramScheduleViewModel>>;
+    : IRequest<Either<BaseError, ProgramScheduleViewModel>>;

ErsatzTV.Application/ProgramSchedules/Commands/ReplaceProgramScheduleItems.cs

@@ -32,6 +32,5 @@ public record ReplaceProgramScheduleItem(
     string PreferredSubtitleLanguageCode,
     ChannelSubtitleMode? SubtitleMode) : IProgramScheduleItemRequest;
 
-public record ReplaceProgramScheduleItems
+public record ReplaceProgramScheduleItems(int ProgramScheduleId, List<ReplaceProgramScheduleItem> Items) : IRequest<
-    (int ProgramScheduleId, List<ReplaceProgramScheduleItem> Items) : IRequest<
+    Either<BaseError, IEnumerable<ProgramScheduleItemViewModel>>>;
-        Either<BaseError, IEnumerable<ProgramScheduleItemViewModel>>>;

ErsatzTV.Application/ProgramSchedules/Commands/UpdateProgramSchedule.cs

@@ -2,8 +2,7 @@
 
 namespace ErsatzTV.Application.ProgramSchedules;
 
-public record UpdateProgramSchedule
+public record UpdateProgramSchedule(
-(
     int ProgramScheduleId,
     string Name,
     bool KeepMultiPartEpisodesTogether,

ErsatzTV.Application/ProgramSchedules/Commands/UpdateProgramScheduleHandler.cs

@@ -29,7 +29,7 @@ public class UpdateProgramScheduleHandler :
     {
         await using TvContext dbContext = await _dbContextFactory.CreateDbContextAsync(cancellationToken);
         Validation<BaseError, ProgramSchedule> validation = await Validate(dbContext, request);
-        return await LanguageExtensions.Apply(validation, ps => ApplyUpdateRequest(dbContext, ps, request));
+        return await validation.Apply(ps => ApplyUpdateRequest(dbContext, ps, request));
     }
 
     private async Task<UpdateProgramScheduleResult> ApplyUpdateRequest(

ErsatzTV.Application/Scheduling/Commands/CreateBlockGroupHandler.cs

@@ -8,7 +8,9 @@ namespace ErsatzTV.Application.Scheduling;
 public class CreateBlockGroupHandler(IDbContextFactory<TvContext> dbContextFactory)
     : IRequestHandler<CreateBlockGroup, Either<BaseError, BlockGroupViewModel>>
 {
-    public async Task<Either<BaseError, BlockGroupViewModel>> Handle(CreateBlockGroup request, CancellationToken cancellationToken)
+    public async Task<Either<BaseError, BlockGroupViewModel>> Handle(
+        CreateBlockGroup request,
+        CancellationToken cancellationToken)
     {
         await using TvContext dbContext = await dbContextFactory.CreateDbContextAsync(cancellationToken);
         Validation<BaseError, BlockGroup> validation = await Validate(request);

ErsatzTV.Application/Scheduling/Commands/CreateBlockHandler.cs

@@ -13,7 +13,7 @@ public class CreateBlockHandler(IDbContextFactory<TvContext> dbContextFactory)
         CancellationToken cancellationToken)
     {
         await using TvContext dbContext = await dbContextFactory.CreateDbContextAsync(cancellationToken);
-        Validation<BaseError, Block> validation = await Validate(request);
+        Validation<BaseError, Block> validation = await Validate(dbContext, request);
         return await validation.Apply(profile => PersistBlock(dbContext, profile));
     }
 
@@ -24,17 +24,30 @@ public class CreateBlockHandler(IDbContextFactory<TvContext> dbContextFactory)
         return Mapper.ProjectToViewModel(block);
     }
 
-    private static Task<Validation<BaseError, Block>> Validate(CreateBlock request) =>
+    private static async Task<Validation<BaseError, Block>> Validate(TvContext dbContext, CreateBlock request) =>
-        Task.FromResult(
+        await ValidateBlockName(dbContext, request).MapT(
-            ValidateName(request).Map(
+            name => new Block
-                name => new Block
+            {
-                {
+                BlockGroupId = request.BlockGroupId,
-                    BlockGroupId = request.BlockGroupId,
+                Name = name,
-                    Name = name,
+                Minutes = 30
-                    Minutes = 30
+            });
-                }));
 
-    private static Validation<BaseError, string> ValidateName(CreateBlock createBlock) =>
+    private static async Task<Validation<BaseError, string>> ValidateBlockName(
-        createBlock.NotEmpty(x => x.Name)
+        TvContext dbContext,
-            .Bind(_ => createBlock.NotLongerThan(50)(x => x.Name));
+        CreateBlock request)
+    {
+        if (request.Name.Length > 50)
+        {
+            return BaseError.New($"Block name \"{request.Name}\" is invalid");
+        }
+
+        Option<Block> maybeExisting = await dbContext.Blocks
+            .FirstOrDefaultAsync(r => r.BlockGroupId == request.BlockGroupId && r.Name == request.Name)
+            .Map(Optional);
+
+        return maybeExisting.IsSome
+            ? BaseError.New($"A block named \"{request.Name}\" already exists in that block group")
+            : request.Name;
+    }
 }

ErsatzTV.Application/Scheduling/Commands/ReplacePlayoutTemplateItemsHandler.cs

@@ -42,7 +42,7 @@ public class ReplacePlayoutTemplateItemsHandler(
                     playout.Templates.Remove(remove);
                 }
 
-                var now = DateTime.UtcNow;
+                DateTime now = DateTime.UtcNow;
 
                 foreach (ReplacePlayoutTemplate add in toAdd)
                 {

ErsatzTV.Application/Scheduling/Queries/GetTemplateItemsHandler.cs

@@ -3,7 +3,8 @@ using Microsoft.EntityFrameworkCore;
 
 namespace ErsatzTV.Application.Scheduling;
 
-public class GetTemplateItemsHandler(IDbContextFactory<TvContext> dbContextFactory) : IRequestHandler<GetTemplateItems, List<TemplateItemViewModel>>
+public class GetTemplateItemsHandler(IDbContextFactory<TvContext> dbContextFactory)
+    : IRequestHandler<GetTemplateItems, List<TemplateItemViewModel>>
 {
     public async Task<List<TemplateItemViewModel>> Handle(GetTemplateItems request, CancellationToken cancellationToken)
     {

ErsatzTV.Application/Search/Queries/QuerySearchIndexArtists.cs

@@ -2,5 +2,5 @@
 
 namespace ErsatzTV.Application.Search;
 
-public record QuerySearchIndexArtists
+public record QuerySearchIndexArtists(string Query, int PageNumber, int PageSize)
-    (string Query, int PageNumber, int PageSize) : IRequest<ArtistCardResultsViewModel>;
+    : IRequest<ArtistCardResultsViewModel>;

ErsatzTV.Application/Search/Queries/QuerySearchIndexEpisodes.cs

@@ -2,5 +2,5 @@
 
 namespace ErsatzTV.Application.Search;
 
-public record QuerySearchIndexEpisodes
+public record QuerySearchIndexEpisodes(string Query, int PageNumber, int PageSize)
-    (string Query, int PageNumber, int PageSize) : IRequest<TelevisionEpisodeCardResultsViewModel>;
+    : IRequest<TelevisionEpisodeCardResultsViewModel>;

ErsatzTV.Application/Search/Queries/QuerySearchIndexImages.cs

@@ -2,5 +2,4 @@
 
 namespace ErsatzTV.Application.Search;
 
-public record QuerySearchIndexImages
+public record QuerySearchIndexImages(string Query, int PageNumber, int PageSize) : IRequest<ImageCardResultsViewModel>;
-    (string Query, int PageNumber, int PageSize) : IRequest<ImageCardResultsViewModel>;

ErsatzTV.Application/Search/Queries/QuerySearchIndexMovies.cs

@@ -2,5 +2,4 @@
 
 namespace ErsatzTV.Application.Search;
 
-public record QuerySearchIndexMovies
+public record QuerySearchIndexMovies(string Query, int PageNumber, int PageSize) : IRequest<MovieCardResultsViewModel>;
-    (string Query, int PageNumber, int PageSize) : IRequest<MovieCardResultsViewModel>;

ErsatzTV.Application/Search/Queries/QuerySearchIndexMusicVideos.cs

@@ -2,5 +2,5 @@
 
 namespace ErsatzTV.Application.Search;
 
-public record QuerySearchIndexMusicVideos
+public record QuerySearchIndexMusicVideos(string Query, int PageNumber, int PageSize)
-    (string Query, int PageNumber, int PageSize) : IRequest<MusicVideoCardResultsViewModel>;
+    : IRequest<MusicVideoCardResultsViewModel>;

ErsatzTV.Application/Search/Queries/QuerySearchIndexOtherVideos.cs

@@ -2,5 +2,5 @@
 
 namespace ErsatzTV.Application.Search;
 
-public record QuerySearchIndexOtherVideos
+public record QuerySearchIndexOtherVideos(string Query, int PageNumber, int PageSize)
-    (string Query, int PageNumber, int PageSize) : IRequest<OtherVideoCardResultsViewModel>;
+    : IRequest<OtherVideoCardResultsViewModel>;

ErsatzTV.Application/Search/Queries/QuerySearchIndexOtherVideosHandler.cs

@@ -9,7 +9,7 @@ namespace ErsatzTV.Application.Search;
 
 public class
     QuerySearchIndexOtherVideosHandler : IRequestHandler<QuerySearchIndexOtherVideos,
-        OtherVideoCardResultsViewModel>
+    OtherVideoCardResultsViewModel>
 {
     private readonly IClient _client;
     private readonly IOtherVideoRepository _otherVideoRepository;

ErsatzTV.Application/Search/Queries/QuerySearchIndexSeasons.cs

@@ -2,5 +2,5 @@
 
 namespace ErsatzTV.Application.Search;
 
-public record QuerySearchIndexSeasons
+public record QuerySearchIndexSeasons(string Query, int PageNumber, int PageSize)
-    (string Query, int PageNumber, int PageSize) : IRequest<TelevisionSeasonCardResultsViewModel>;
+    : IRequest<TelevisionSeasonCardResultsViewModel>;

ErsatzTV.Application/Search/Queries/QuerySearchIndexShows.cs

@@ -2,5 +2,5 @@
 
 namespace ErsatzTV.Application.Search;
 
-public record QuerySearchIndexShows
+public record QuerySearchIndexShows(string Query, int PageNumber, int PageSize)
-    (string Query, int PageNumber, int PageSize) : IRequest<TelevisionShowCardResultsViewModel>;
+    : IRequest<TelevisionShowCardResultsViewModel>;

ErsatzTV.Application/Search/Queries/QuerySearchIndexSongs.cs

@@ -2,5 +2,4 @@
 
 namespace ErsatzTV.Application.Search;
 
-public record QuerySearchIndexSongs
+public record QuerySearchIndexSongs(string Query, int PageNumber, int PageSize) : IRequest<SongCardResultsViewModel>;
-    (string Query, int PageNumber, int PageSize) : IRequest<SongCardResultsViewModel>;