From 7a4245e6429f84e73e66bf0ac9c59d695057c8ff Mon Sep 17 00:00:00 2001 From: Jason Dove Date: Sun, 28 Feb 2021 09:28:47 -0600 Subject: [PATCH] fix compiler warnings --- ErsatzTV.Application/MediaItems/Mapper.cs | 9 ++------- ErsatzTV.Application/Playouts/Mapper.cs | 6 ++++-- ErsatzTV.Core/FFmpeg/FFmpegProcessService.cs | 3 ++- ErsatzTV.Core/Metadata/LocalFolderScanner.cs | 3 ++- ErsatzTV.Core/Metadata/LocalStatisticsProvider.cs | 6 ++++-- ErsatzTV.Core/Plex/PlexMovieLibraryScanner.cs | 5 +++-- ErsatzTV.Core/Scheduling/PlayoutBuilder.cs | 9 ++++++--- 7 files changed, 23 insertions(+), 18 deletions(-) diff --git a/ErsatzTV.Application/MediaItems/Mapper.cs b/ErsatzTV.Application/MediaItems/Mapper.cs index 4df219464..ef60cf274 100644 --- a/ErsatzTV.Application/MediaItems/Mapper.cs +++ b/ErsatzTV.Application/MediaItems/Mapper.cs @@ -48,7 +48,8 @@ namespace ErsatzTV.Application.MediaItems MediaVersion version = mediaItem switch { Movie m => m.MediaVersions.Head(), - Episode e => e.MediaVersions.Head() + Episode e => e.MediaVersions.Head(), + _ => throw new ArgumentOutOfRangeException(nameof(mediaItem)) }; return string.Format( @@ -60,12 +61,6 @@ namespace ErsatzTV.Application.MediaItems private static string GetLibraryName(MediaItem item) => "Library Name"; - // source switch - // { - // LocalMediaSource lms => "Local Media Source", - // _ => "unknown source" - // }; - public static NamedMediaItemViewModel ProjectToViewModel(Show show) => new(show.Id, show.ShowMetadata.HeadOrNone().Map(sm => $"{sm?.Title} ({sm?.Year})").IfNone("???")); diff --git a/ErsatzTV.Application/Playouts/Mapper.cs b/ErsatzTV.Application/Playouts/Mapper.cs index e2803d0ef..c2c9b20ee 100644 --- a/ErsatzTV.Application/Playouts/Mapper.cs +++ b/ErsatzTV.Application/Playouts/Mapper.cs @@ -1,4 +1,5 @@ -using ErsatzTV.Core.Domain; +using System; +using ErsatzTV.Core.Domain; namespace ErsatzTV.Application.Playouts { @@ -38,7 +39,8 @@ namespace ErsatzTV.Application.Playouts MediaVersion version = mediaItem switch { Movie m => m.MediaVersions.Head(), - Episode e => e.MediaVersions.Head() + Episode e => e.MediaVersions.Head(), + _ => throw new ArgumentOutOfRangeException(nameof(mediaItem)) }; return string.Format( diff --git a/ErsatzTV.Core/FFmpeg/FFmpegProcessService.cs b/ErsatzTV.Core/FFmpeg/FFmpegProcessService.cs index 19d9b0871..90f45c503 100644 --- a/ErsatzTV.Core/FFmpeg/FFmpegProcessService.cs +++ b/ErsatzTV.Core/FFmpeg/FFmpegProcessService.cs @@ -21,7 +21,8 @@ namespace ErsatzTV.Core.FFmpeg MediaVersion version = item.MediaItem switch { Movie m => m.MediaVersions.Head(), - Episode e => e.MediaVersions.Head() + Episode e => e.MediaVersions.Head(), + _ => throw new ArgumentOutOfRangeException(nameof(item)) }; FFmpegPlaybackSettings playbackSettings = _playbackSettingsCalculator.CalculateSettings( diff --git a/ErsatzTV.Core/Metadata/LocalFolderScanner.cs b/ErsatzTV.Core/Metadata/LocalFolderScanner.cs index 24d8a4328..c5d6b2b3d 100644 --- a/ErsatzTV.Core/Metadata/LocalFolderScanner.cs +++ b/ErsatzTV.Core/Metadata/LocalFolderScanner.cs @@ -71,7 +71,8 @@ namespace ErsatzTV.Core.Metadata MediaVersion version = mediaItem switch { Movie m => m.MediaVersions.Head(), - Episode e => e.MediaVersions.Head() + Episode e => e.MediaVersions.Head(), + _ => throw new ArgumentOutOfRangeException(nameof(mediaItem)) }; string path = version.MediaFiles.Head().Path; diff --git a/ErsatzTV.Core/Metadata/LocalStatisticsProvider.cs b/ErsatzTV.Core/Metadata/LocalStatisticsProvider.cs index 333f9f171..94de1705a 100644 --- a/ErsatzTV.Core/Metadata/LocalStatisticsProvider.cs +++ b/ErsatzTV.Core/Metadata/LocalStatisticsProvider.cs @@ -36,7 +36,8 @@ namespace ErsatzTV.Core.Metadata string filePath = mediaItem switch { Movie m => m.MediaVersions.Head().MediaFiles.Head().Path, - Episode e => e.MediaVersions.Head().MediaFiles.Head().Path + Episode e => e.MediaVersions.Head().MediaFiles.Head().Path, + _ => throw new ArgumentOutOfRangeException(nameof(mediaItem)) }; FFprobe ffprobe = await GetProbeOutput(ffprobePath, filePath); @@ -55,7 +56,8 @@ namespace ErsatzTV.Core.Metadata MediaVersion mediaItemVersion = mediaItem switch { Movie m => m.MediaVersions.Head(), - Episode e => e.MediaVersions.Head() + Episode e => e.MediaVersions.Head(), + _ => throw new ArgumentOutOfRangeException(nameof(mediaItem)) }; bool durationChange = mediaItemVersion.Duration != version.Duration; diff --git a/ErsatzTV.Core/Plex/PlexMovieLibraryScanner.cs b/ErsatzTV.Core/Plex/PlexMovieLibraryScanner.cs index 2c00197e8..cba58716b 100644 --- a/ErsatzTV.Core/Plex/PlexMovieLibraryScanner.cs +++ b/ErsatzTV.Core/Plex/PlexMovieLibraryScanner.cs @@ -5,6 +5,7 @@ using ErsatzTV.Core.Interfaces.Plex; using ErsatzTV.Core.Interfaces.Repositories; using LanguageExt; using Microsoft.Extensions.Logging; +using static LanguageExt.Prelude; namespace ErsatzTV.Core.Plex { @@ -67,10 +68,10 @@ namespace ErsatzTV.Core.Plex return Unit.Default; } - private async Task> UpdateIfNeeded(PlexMovie plexMovie) => + private Task> UpdateIfNeeded(PlexMovie plexMovie) => // .BindT(movie => UpdateStatistics(movie, ffprobePath).MapT(_ => movie)) // .BindT(UpdateMetadata) // .BindT(UpdatePoster); - plexMovie; + Right(plexMovie).AsTask(); } } diff --git a/ErsatzTV.Core/Scheduling/PlayoutBuilder.cs b/ErsatzTV.Core/Scheduling/PlayoutBuilder.cs index ed1487ef7..b92d381e2 100644 --- a/ErsatzTV.Core/Scheduling/PlayoutBuilder.cs +++ b/ErsatzTV.Core/Scheduling/PlayoutBuilder.cs @@ -147,7 +147,8 @@ namespace ErsatzTV.Core.Scheduling MediaVersion version = mediaItem switch { Movie m => m.MediaVersions.Head(), - Episode e => e.MediaVersions.Head() + Episode e => e.MediaVersions.Head(), + _ => throw new ArgumentOutOfRangeException(nameof(mediaItem)) }; var playoutItem = new PlayoutItem @@ -195,7 +196,8 @@ namespace ErsatzTV.Core.Scheduling MediaVersion peekVersion = peekMediaItem switch { Movie m => m.MediaVersions.Head(), - Episode e => e.MediaVersions.Head() + Episode e => e.MediaVersions.Head(), + _ => throw new ArgumentOutOfRangeException(nameof(peekMediaItem)) }; ProgramScheduleItem peekScheduleItem = @@ -227,7 +229,8 @@ namespace ErsatzTV.Core.Scheduling MediaVersion peekVersion = peekMediaItem switch { Movie m => m.MediaVersions.Head(), - Episode e => e.MediaVersions.Head() + Episode e => e.MediaVersions.Head(), + _ => throw new ArgumentOutOfRangeException(nameof(peekMediaItem)) }; // remember when we need to finish this duration item